diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index f191bd9aaba67..9d66ee40d6f59 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -35,4 +35,4 @@
  - [ ] Pull request has a meaningful description of its purpose
  - [ ] All commits are accompanied by meaningful commit messages
  - [ ] All new or changed code is covered with unit/integration tests (if applicable)
- - [ ] All automated tests passed successfully (all builds on Travis CI are green)
+ - [ ] All automated tests passed successfully (all builds are green)
diff --git a/.gitignore b/.gitignore
index 75e5f11d8a8e7..a79b7990a7576 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,8 @@ atlassian*
 /pub/media/import/*
 !/pub/media/import/.htaccess
 /pub/media/logo/*
+/pub/media/custom_options/*
+!/pub/media/custom_options/.htaccess
 /pub/media/theme/*
 /pub/media/theme_customization/*
 !/pub/media/theme_customization/.htaccess
diff --git a/.htaccess b/.htaccess
index 4298b10d9ca7a..cc59be5480798 100644
--- a/.htaccess
+++ b/.htaccess
@@ -29,6 +29,8 @@
 
 ############################################
 ## default index file
+## Specifies option, to use methods arguments in backtrace or not
+    SetEnv MAGE_DEBUG_SHOW_ARGS 1
 
     DirectoryIndex index.php
 
@@ -364,6 +366,15 @@
             Require all denied
         </IfVersion>
     </Files>
+    <Files .user.ini>
+        <IfVersion < 2.4>
+            order allow,deny
+            deny from all
+        </IfVersion>
+        <IfVersion >= 2.4>
+            Require all denied
+        </IfVersion>
+    </Files>
 
 # For 404s and 403s that aren't handled by the application, show plain 404 response
 ErrorDocument 404 /pub/errors/404.php
diff --git a/.htaccess.sample b/.htaccess.sample
index a521a347232f5..b405fd3a22b75 100644
--- a/.htaccess.sample
+++ b/.htaccess.sample
@@ -341,6 +341,15 @@
             Require all denied
         </IfVersion>
     </Files>
+    <Files .user.ini>
+        <IfVersion < 2.4>
+            order allow,deny
+            deny from all
+        </IfVersion>
+        <IfVersion >= 2.4>
+            Require all denied
+        </IfVersion>
+    </Files>
 
 # For 404s and 403s that aren't handled by the application, show plain 404 response
 ErrorDocument 404 /pub/errors/404.php
diff --git a/.travis.yml b/.travis.yml.sample
similarity index 100%
rename from .travis.yml
rename to .travis.yml.sample
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95772083f3a76..4fb34dd58c46d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,623 @@
+2.2.8
+=============
+* GitHub issues:
+    * [#15196](https://github.com/magento/magento2/issues/15196) -- 2.2.4 : Magento 2 integration tests enables all modules (fixed in [magento/magento2#16361](https://github.com/magento/magento2/pull/16361))
+    * [#13720](https://github.com/magento/magento2/issues/13720) -- Only 2 related products are showing in backend . (fixed in [magento/magento2#17885](https://github.com/magento/magento2/pull/17885))
+    * [#14050](https://github.com/magento/magento2/issues/14050) -- Import related products issue (fixed in [magento/magento2#17885](https://github.com/magento/magento2/pull/17885))
+    * [#17890](https://github.com/magento/magento2/issues/17890) -- Magento 2.2.5 Product swatches does not shows correct value for related store view (fixed in [magento/magento2#17891](https://github.com/magento/magento2/pull/17891))
+    * [#17567](https://github.com/magento/magento2/issues/17567) -- Currency symbol cannot be changed back to default value from admin panel in Single-store mode (fixed in [magento/magento2#17966](https://github.com/magento/magento2/pull/17966))
+    * [#5402](https://github.com/magento/magento2/issues/5402) -- Menu does not work when you change from Mobile to Desktop mode (fixed in [magento/magento2#17990](https://github.com/magento/magento2/pull/17990))
+    * [#13405](https://github.com/magento/magento2/issues/13405) -- No such entity error when saving product in single-store mode if website_id <> 1 (fixed in [magento/magento2#18001](https://github.com/magento/magento2/pull/18001))
+    * [#5797](https://github.com/magento/magento2/issues/5797) -- [2.1.0] module:uninstall can remove code it uses itself (fixed in [magento/magento2#18002](https://github.com/magento/magento2/pull/18002))
+    * [#17780](https://github.com/magento/magento2/issues/17780) -- Module uninstall does not work with composer (fixed in [magento/magento2#18002](https://github.com/magento/magento2/pull/18002))
+    * [#7557](https://github.com/magento/magento2/issues/7557) -- Backend Security key broken for controllers with frontname not equal to route ID (fixed in [magento/magento2#18018](https://github.com/magento/magento2/pull/18018))
+    * [#12095](https://github.com/magento/magento2/issues/12095) -- Update 2.2.1: One or more integrations have been reset because of a change to their xml configs. (fixed in [magento/magento2#14065](https://github.com/magento/magento2/pull/14065))
+    * [#17582](https://github.com/magento/magento2/issues/17582) -- ./bin/magento config:show fails with a fatal error (fixed in [magento/magento2#17993](https://github.com/magento/magento2/pull/17993))
+    * [#17999](https://github.com/magento/magento2/issues/17999) -- Sitemap grid display incorrect base URL in the grid if using multiple stores (fixed in [magento/magento2#18000](https://github.com/magento/magento2/pull/18000))
+    * [#9830](https://github.com/magento/magento2/issues/9830) -- Null order in Magento\Sales\Block\Order\PrintShipment.php (fixed in [magento/magento2#17998](https://github.com/magento/magento2/pull/17998))
+    * [#10530](https://github.com/magento/magento2/issues/10530) -- Print order error on magento 2.1.8 (fixed in [magento/magento2#17998](https://github.com/magento/magento2/pull/17998))
+    * [#10440](https://github.com/magento/magento2/issues/10440) -- Missing $debugHintsPath when sending email via command (fixed in [magento/magento2#17984](https://github.com/magento/magento2/pull/17984))
+    * [#18079](https://github.com/magento/magento2/issues/18079) -- Inconsistent return type for getStoreId() (fixed in [magento/magento2#18086](https://github.com/magento/magento2/pull/18086))
+    * [#18138](https://github.com/magento/magento2/issues/18138) -- WYSIWYG editor fails to parse directives of files with special characters in URL (so random files) (fixed in [magento/magento2#18215](https://github.com/magento/magento2/pull/18215))
+    * [#18101](https://github.com/magento/magento2/issues/18101) -- Wrong sort order for customer groups in customer grid filter (fixed in [magento/magento2#18280](https://github.com/magento/magento2/pull/18280))
+    * [#17977](https://github.com/magento/magento2/issues/17977) -- Show Method if Not Applicable for Free Shipping doesn't work. (fixed in [magento/magento2#17982](https://github.com/magento/magento2/pull/17982))
+    * [#17023](https://github.com/magento/magento2/issues/17023) -- CSV Import of `sku,attribute` empties `url_key` value (fixed in [magento/magento2#17882](https://github.com/magento/magento2/pull/17882))
+    * [#18330](https://github.com/magento/magento2/issues/18330) -- Checkout - Infinite loading indicator when server returned error (fixed in [magento/magento2#18369](https://github.com/magento/magento2/pull/18369))
+    * [#16497](https://github.com/magento/magento2/issues/16497) -- Magento 2.2.5: Google Analytics not added to head correctly (fixed in [magento/magento2#18375](https://github.com/magento/magento2/pull/18375))
+    * [#17152](https://github.com/magento/magento2/issues/17152) -- Failure of "Send Order Email Copy" spams customers, every minute, forever. (fixed in [magento/magento2#18376](https://github.com/magento/magento2/pull/18376))
+    * [#18162](https://github.com/magento/magento2/issues/18162) -- Cannot edit customer using inline edit if password is expired (fixed in [magento/magento2#18414](https://github.com/magento/magento2/pull/18414))
+    * [#3283](https://github.com/magento/magento2/issues/3283) -- «Yes/No» attributes should be allowed in the Layered Navigation (fixed in [magento/magento2#17823](https://github.com/magento/magento2/pull/17823))
+    * [#17493](https://github.com/magento/magento2/issues/17493) -- Catalog Rule & Selected Categories with level > 3 (fixed in [magento/magento2#18175](https://github.com/magento/magento2/pull/18175))
+    * [#17770](https://github.com/magento/magento2/issues/17770) -- Table rate fail when using ZIP+4 shipping address (fixed in [magento/magento2#18166](https://github.com/magento/magento2/pull/18166))
+    * [#13156](https://github.com/magento/magento2/issues/13156) -- Updating attribute option data through API will set unwanted source_model on the attribute (fixed in [magento/magento2#18390](https://github.com/magento/magento2/pull/18390))
+    * [#17190](https://github.com/magento/magento2/issues/17190) -- system.log rapidly increasing after Magento CE 2.2.5 update (cron logs) (fixed in [magento/magento2#18389](https://github.com/magento/magento2/pull/18389))
+    * [#15085](https://github.com/magento/magento2/issues/15085) -- StockRegistryInterface :: getLowStockItems() returns StockStatusCollection instead of StockItemCollection (fixed in [magento/magento2#18427](https://github.com/magento/magento2/pull/18427))
+    * [#15652](https://github.com/magento/magento2/issues/15652) -- REST API create order POST /V1/orders (fixed in [magento/magento2#15683](https://github.com/magento/magento2/pull/15683))
+    * [#4942](https://github.com/magento/magento2/issues/4942) -- On editing a Bundle product from shopping cart the user defined quantities of the options are overwritten (fixed in [magento/magento2#15905](https://github.com/magento/magento2/pull/15905))
+    * [#17514](https://github.com/magento/magento2/issues/17514) -- Add Australian regions (fixed in [magento/magento2#17516](https://github.com/magento/magento2/pull/17516))
+    * [#12479](https://github.com/magento/magento2/issues/12479) -- Saving Customer Model directly causes loss of data (fixed in [magento/magento2#17968](https://github.com/magento/magento2/pull/17968))
+    * [#9219](https://github.com/magento/magento2/issues/9219) -- Custom Product Attribute changes 'backend_type' when 'is_user_defined = 1' and get updated/saved in Admin Backend (fixed in [magento/magento2#18196](https://github.com/magento/magento2/pull/18196))
+    * [#18164](https://github.com/magento/magento2/issues/18164) -- Checkout - Cannot read property 'code' of undefined (fixed in [magento/magento2#18495](https://github.com/magento/magento2/pull/18495))
+    * [#14555](https://github.com/magento/magento2/issues/14555) -- Communication's component validator does not propagate exceptions, obscuring the cause of the error (fixed in [magento/magento2#18554](https://github.com/magento/magento2/pull/18554))
+    * [#18477](https://github.com/magento/magento2/issues/18477) -- Set maximum Qty Allowed in Shopping Cart is 0 still allow adding to cart (fixed in [magento/magento2#18552](https://github.com/magento/magento2/pull/18552))
+    * [#12070](https://github.com/magento/magento2/issues/12070) -- M2.2.0 Admin Grid column ordering/positioning not working when single store mode set On (fixed in [magento/magento2#18561](https://github.com/magento/magento2/pull/18561))
+    * [#18581](https://github.com/magento/magento2/issues/18581) -- Calendar Icon aligement Issue  (fixed in [magento/magento2#18593](https://github.com/magento/magento2/pull/18593))
+    * [#18585](https://github.com/magento/magento2/issues/18585) -- Navigation arrows zoomed fotorama disappear (fixed in [magento/magento2#18595](https://github.com/magento/magento2/pull/18595))
+    * [#12969](https://github.com/magento/magento2/issues/12969) -- processor.php getHostUrl() does not detect the server port correctly (fixed in [magento/magento2#18659](https://github.com/magento/magento2/pull/18659))
+    * [#14510](https://github.com/magento/magento2/issues/14510) -- Creating custom customer attribute with default value 0 will cause not saving value for customer entity (fixed in [magento/magento2#16915](https://github.com/magento/magento2/pull/16915))
+    * [#18234](https://github.com/magento/magento2/issues/18234) -- Product Import -> Upsert Category: Url Rewrites are just created for default website (fixed in [magento/magento2#18563](https://github.com/magento/magento2/pull/18563))
+    * [#5929](https://github.com/magento/magento2/issues/5929) -- Saving Product does not update URL rewrite in Magento 2.1.0 (fixed in [magento/magento2#18566](https://github.com/magento/magento2/pull/18566))
+    * [#18532](https://github.com/magento/magento2/issues/18532) -- Module Catalog: product "Save and Duplicate" causes getting infinite loop (fixed in [magento/magento2#18566](https://github.com/magento/magento2/pull/18566))
+    * [#18131](https://github.com/magento/magento2/issues/18131) -- Entity Type ID at Join (fixed in [magento/magento2#18658](https://github.com/magento/magento2/pull/18658))
+    * [#15259](https://github.com/magento/magento2/issues/15259) -- Advanced Reporting > Unable to disable without providing Industry value (fixed in [magento/magento2#15366](https://github.com/magento/magento2/pull/15366))
+    * [#18094](https://github.com/magento/magento2/issues/18094) -- Should getQty() return int/float or string? (fixed in [magento/magento2#18424](https://github.com/magento/magento2/pull/18424))
+    * [#18534](https://github.com/magento/magento2/issues/18534) -- Bug when 2 wysiwyg editors are on category edit page or product edit page (fixed in [magento/magento2#18535](https://github.com/magento/magento2/pull/18535))
+    * [#18589](https://github.com/magento/magento2/issues/18589) -- Empty cart button does not work (fixed in [magento/magento2#18597](https://github.com/magento/magento2/pull/18597))
+    * [#18268](https://github.com/magento/magento2/issues/18268) -- M2.2.6 : Special price of 0.0000 is not shown on frontend, but is calculated in cart (fixed in [magento/magento2#18604](https://github.com/magento/magento2/pull/18604))
+    * [#17954](https://github.com/magento/magento2/issues/17954) -- Customer get unsubscribe to newsletter on password reset email request with Newsletter Need to Confirm Set to Yes on admin settings (fixed in [magento/magento2#18643](https://github.com/magento/magento2/pull/18643))
+    * [#16939](https://github.com/magento/magento2/issues/16939) -- Incorrect configuration scope is occasionally returned when attempting to resolve a null scope id (fixed in [magento/magento2#16940](https://github.com/magento/magento2/pull/16940))
+    * [#18264](https://github.com/magento/magento2/issues/18264) -- M2.2.6 : "Order by price" not working in product listing (fixed in [magento/magento2#18737](https://github.com/magento/magento2/pull/18737))
+    * [#17638](https://github.com/magento/magento2/issues/17638) -- Bundle Special Prices not correctly rounded (fixed in [magento/magento2#17971](https://github.com/magento/magento2/pull/17971))
+    * [#17865](https://github.com/magento/magento2/issues/17865) -- import new products via csv: products are created with empty value when strings are too long (fixed in [magento/magento2#18591](https://github.com/magento/magento2/pull/18591))
+    * [#12300](https://github.com/magento/magento2/issues/12300) -- SKU values are not trimmed with the space. (fixed in [magento/magento2#18862](https://github.com/magento/magento2/pull/18862))
+    * [#16572](https://github.com/magento/magento2/issues/16572) -- Trim whitespace on SKU when saving product (fixed in [magento/magento2#18862](https://github.com/magento/magento2/pull/18862))
+    * [#18458](https://github.com/magento/magento2/issues/18458) -- Magento version 2.2.6 Alert widget gets close when click anywhere on screen (fixed in [magento/magento2#18865](https://github.com/magento/magento2/pull/18865))
+    * [#18779](https://github.com/magento/magento2/issues/18779) -- Translation issue send-friend in sendphtml (fixed in [magento/magento2#18886](https://github.com/magento/magento2/pull/18886))
+    * [#18913](https://github.com/magento/magento2/issues/18913) -- Global-search icon misaligned  (fixed in [magento/magento2#18917](https://github.com/magento/magento2/pull/18917))
+    * [#17488](https://github.com/magento/magento2/issues/17488) -- Authenticating a customer via REST API does not update the last logged in data (fixed in [magento/magento2#17978](https://github.com/magento/magento2/pull/17978))
+    * [#4468](https://github.com/magento/magento2/issues/4468) -- Unable to insert multiple catalog product list widgets in CMS page (fixed in [magento/magento2#18874](https://github.com/magento/magento2/pull/18874))
+    * [#18355](https://github.com/magento/magento2/issues/18355) -- Typo in dispatched event name (fixed in [magento/magento2#18372](https://github.com/magento/magento2/pull/18372))
+    * [#17744](https://github.com/magento/magento2/issues/17744) -- Virtual-only quotes use default shipping address for estimation instead of default billing address (fixed in [magento/magento2#18863](https://github.com/magento/magento2/pull/18863))
+    * [#5021](https://github.com/magento/magento2/issues/5021) -- "Please specify a shipping method" Exception (fixed in [magento/magento2#18870](https://github.com/magento/magento2/pull/18870))
+    * [#17485](https://github.com/magento/magento2/issues/17485) -- Adding billing information via mine API expects costumer id (fixed in [magento/magento2#18872](https://github.com/magento/magento2/pull/18872))
+    * [#13083](https://github.com/magento/magento2/issues/13083) -- OptionManagement.validateOption throws NoSuchEntityException for "0" option label (fixed in [magento/magento2#18873](https://github.com/magento/magento2/pull/18873))
+    * [#18729](https://github.com/magento/magento2/issues/18729) -- Bug in "_sections.less" mixins: missing rules and incorrect default variables (fixed in [magento/magento2#18875](https://github.com/magento/magento2/pull/18875))
+    * [#18555](https://github.com/magento/magento2/issues/18555) -- Magento 2.2.6 Default values are not rendering on Wishlist product edit page. (fixed in [magento/magento2#18967](https://github.com/magento/magento2/pull/18967))
+    * [#18907](https://github.com/magento/magento2/issues/18907) -- Unable to select payment method according to country of the address at checkout time (fixed in [magento/magento2#18908](https://github.com/magento/magento2/pull/18908))
+    * [#16684](https://github.com/magento/magento2/issues/16684) -- Default tax region/state appears in customer & order data (fixed in [magento/magento2#18857](https://github.com/magento/magento2/pull/18857))
+    * [#8348](https://github.com/magento/magento2/issues/8348) -- 1 exception(s): Exception #0 (Exception): Warning: Invalid argument supplied for foreach() in NotProtectedExtension.php on line 89 (fixed in [magento/magento2#19012](https://github.com/magento/magento2/pull/19012))
+    * [#18323](https://github.com/magento/magento2/issues/18323) -- Order confirmation email for guest checkout does not include download links (fixed in [magento/magento2#19036](https://github.com/magento/magento2/pull/19036))
+    * [#19003](https://github.com/magento/magento2/issues/19003) -- salesInvoiceOrder REST API does not make downloadable products available (fixed in [magento/magento2#19036](https://github.com/magento/magento2/pull/19036))
+    * [#19034](https://github.com/magento/magento2/issues/19034) -- sales_order_item_save_commit_after and sales_order_save_commit_after events will never fire for guest checkout (fixed in [magento/magento2#19036](https://github.com/magento/magento2/pull/19036))
+    * [#2618](https://github.com/magento/magento2/issues/2618) -- Class \Magento\Framework\Data\Form\Element\Fieldset breaks specification of the parent class \Magento\Framework\Data\Form\Element\AbstractElement by not calling the method getBeforeElementHtml (getAfterElementHtml is called) (fixed in [magento/magento2#18985](https://github.com/magento/magento2/pull/18985))
+    * [#14007](https://github.com/magento/magento2/issues/14007) -- "Use in Layered Navigation: Filterable (no results)" not working for Price attribute. (fixed in [magento/magento2#19044](https://github.com/magento/magento2/pull/19044))
+    * [#12399](https://github.com/magento/magento2/issues/12399) -- Exception Error in Catalog Price Rule while Backend language is not English (fixed in [magento/magento2#19074](https://github.com/magento/magento2/pull/19074))
+    * [#18082](https://github.com/magento/magento2/issues/18082) -- Fatal Error when save configurable product in Magento 2.2.5 (fixed in [magento/magento2#18461](https://github.com/magento/magento2/pull/18461))
+    * [#18617](https://github.com/magento/magento2/issues/18617) -- Missing Fixed Product Tax total on PDF (fixed in [magento/magento2#18649](https://github.com/magento/magento2/pull/18649))
+    * [#18150](https://github.com/magento/magento2/issues/18150) -- Backups error from User Roles Permission 2.2.6 (fixed in [magento/magento2#18815](https://github.com/magento/magento2/pull/18815))
+    * [#18901](https://github.com/magento/magento2/issues/18901) -- Forgot password form should not available while customer is logged in. (fixed in [magento/magento2#19089](https://github.com/magento/magento2/pull/19089))
+    * [#18840](https://github.com/magento/magento2/issues/18840) -- Invalid Unit Test Annotations (fixed in [magento/magento2#19105](https://github.com/magento/magento2/pull/19105))
+    * [#19060](https://github.com/magento/magento2/issues/19060) -- User created by admin cannot login (fixed in [magento/magento2#19110](https://github.com/magento/magento2/pull/19110))
+    * [#14849](https://github.com/magento/magento2/issues/14849) -- In Sales Emails no translation using order.getStatusLabel()  (fixed in [magento/magento2#14914](https://github.com/magento/magento2/pull/14914))
+    * [#17625](https://github.com/magento/magento2/issues/17625) -- Translations done within a theme that's enabled through a category Design change aren't used (fixed in [magento/magento2#17854](https://github.com/magento/magento2/pull/17854))
+    * [#17635](https://github.com/magento/magento2/issues/17635) -- addExpressionFieldToSelect has to be called after all addFieldToSelect (fixed in [magento/magento2#17915](https://github.com/magento/magento2/pull/17915))
+    * [#18652](https://github.com/magento/magento2/issues/18652) -- Tierprice discount not calculated correctly if has specialprice. (fixed in [magento/magento2#18743](https://github.com/magento/magento2/pull/18743))
+    * [#18939](https://github.com/magento/magento2/issues/18939) -- "Not yet calculated" for the tax in the summary section in the checkout is not translatable (fixed in [magento/magento2#18959](https://github.com/magento/magento2/pull/18959))
+    * [#16434](https://github.com/magento/magento2/issues/16434) -- Bundle Product Options not showing in Customer Account - Items Ordered  (fixed in [magento/magento2#17889](https://github.com/magento/magento2/pull/17889))
+    * [#14020](https://github.com/magento/magento2/issues/14020) -- Cart Sales Rule with negated condition over special_price does not work for configurable products (fixed in [magento/magento2#16342](https://github.com/magento/magento2/pull/16342))
+    * [#18685](https://github.com/magento/magento2/issues/18685) -- Quote Item Prices are NULL in cart related events. (fixed in [magento/magento2#18808](https://github.com/magento/magento2/pull/18808))
+    * [#18956](https://github.com/magento/magento2/issues/18956) -- Import of RootCategoryId should be possbile (Magento/Store/Model/Config/Importer/Processor/Create.php) (fixed in [magento/magento2#19237](https://github.com/magento/magento2/pull/19237))
+    * [#19205](https://github.com/magento/magento2/issues/19205) -- Bundle Product Option with input type is checkbox and add to cart with 3 values only 2 values added to cart (fixed in [magento/magento2#19260](https://github.com/magento/magento2/pull/19260))
+    * [#6803](https://github.com/magento/magento2/issues/6803) -- Product::addImageToMediaGallery throws Exception (fixed in [magento/magento2#18951](https://github.com/magento/magento2/pull/18951))
+    * [#18949](https://github.com/magento/magento2/issues/18949) -- dev/tools/grunt/configs/themes.js gets replaced after update magento (fixed in [magento/magento2#18960](https://github.com/magento/magento2/pull/18960))
+    * [#19054](https://github.com/magento/magento2/issues/19054) -- Using Media Image custom attribute type  could not display on frontend.  (fixed in [magento/magento2#19068](https://github.com/magento/magento2/pull/19068))
+    * [#19082](https://github.com/magento/magento2/issues/19082) -- Fatal error: Uncaught Error: Cannot call abstract method Magento\Framework\App\ActionInterface::execute() (fixed in [magento/magento2#19337](https://github.com/magento/magento2/pull/19337))
+    * [#19263](https://github.com/magento/magento2/issues/19263) -- Broken backend popup view (fixed in [magento/magento2#19340](https://github.com/magento/magento2/pull/19340))
+    * [#4136](https://github.com/magento/magento2/issues/4136) -- Widget condition with unexpected character not preventing from saving (fixed in [magento/magento2#14485](https://github.com/magento/magento2/pull/14485))
+    * [#18615](https://github.com/magento/magento2/issues/18615) -- Field restriction incompatibilities between klarna_core_order and sales_order_payment last_trans_id (fixed in [magento/magento2#18621](https://github.com/magento/magento2/pull/18621))
+    * [#18904](https://github.com/magento/magento2/issues/18904) -- Missing asterisk for admin required fields (fixed in [magento/magento2#18905](https://github.com/magento/magento2/pull/18905))
+    * [#19286](https://github.com/magento/magento2/issues/19286) -- Wrong pager style (fixed in [magento/magento2#19296](https://github.com/magento/magento2/pull/19296))
+    * [#13157](https://github.com/magento/magento2/issues/13157) -- Last Ordered Items block - bad js code  (fixed in [magento/magento2#19357](https://github.com/magento/magento2/pull/19357))
+    * [#17833](https://github.com/magento/magento2/issues/17833) -- Child theme does not inherit translations from parent theme (fixed in [magento/magento2#19023](https://github.com/magento/magento2/pull/19023))
+    * [#18839](https://github.com/magento/magento2/issues/18839) -- can't import external http to https redirecting images by default csv import (fixed in [magento/magento2#18899](https://github.com/magento/magento2/pull/18899))
+    * [#18887](https://github.com/magento/magento2/issues/18887) -- Magento backend  Notifications counter round icon small cut from right side (fixed in [magento/magento2#19356](https://github.com/magento/magento2/pull/19356))
+    * [#17813](https://github.com/magento/magento2/issues/17813) -- Huge "product_data_storage" in localStorage hangs the shop (fixed in [magento/magento2#19014](https://github.com/magento/magento2/pull/19014))
+    * [#15505](https://github.com/magento/magento2/issues/15505) -- Interceptor class methods do not support nullable return types (fixed in [magento/magento2#19398](https://github.com/magento/magento2/pull/19398))
+    * [#19172](https://github.com/magento/magento2/issues/19172) -- Newsletter subscription does not set the correct store_id if already subscribed.  Not Fixed in 2.3-dev (fixed in [magento/magento2#19426](https://github.com/magento/magento2/pull/19426))
+    * [#18918](https://github.com/magento/magento2/issues/18918) -- Asterisk sign display twice (fixed in [magento/magento2#18922](https://github.com/magento/magento2/pull/18922))
+    * [#19127](https://github.com/magento/magento2/issues/19127) -- Cannot connect to Magento 2 market place (fixed in [magento/magento2#19239](https://github.com/magento/magento2/pull/19239))
+    * [#19344](https://github.com/magento/magento2/issues/19344) -- Sample Link Issue in Downloadable product. (fixed in [magento/magento2#19431](https://github.com/magento/magento2/pull/19431))
+    * [#15931](https://github.com/magento/magento2/issues/15931) -- events.xml cant have no childrens, others can [Magento 2.2.4] (fixed in [magento/magento2#19145](https://github.com/magento/magento2/pull/19145))
+    * [#19418](https://github.com/magento/magento2/issues/19418) -- Cannot add additional field to Newsletter system configuration at desired position (fixed in [magento/magento2#19568](https://github.com/magento/magento2/pull/19568))
+    * [#19424](https://github.com/magento/magento2/issues/19424) -- \Magento\Checkout\Observer\SalesQuoteSaveAfterObserver fails to update the checkout session quote id when applicable (fixed in [magento/magento2#19678](https://github.com/magento/magento2/pull/19678))
+    * [#19796](https://github.com/magento/magento2/issues/19796) -- Sales Order invoice Update Qty's Button is misaligned (fixed in [magento/magento2#19804](https://github.com/magento/magento2/pull/19804))
+    * [#19917](https://github.com/magento/magento2/issues/19917) -- allowDrug? ;-) (fixed in [magento/magento2#19949](https://github.com/magento/magento2/pull/19949))
+    * [#19721](https://github.com/magento/magento2/issues/19721) -- Typo in SalesRule/Model/ResourceModel/Coupon/Usage.php (fixed in [magento/magento2#19968](https://github.com/magento/magento2/pull/19968))
+    * [#8952](https://github.com/magento/magento2/issues/8952) -- You can't subscribe to newsletter if you already have an account (fixed in [magento/magento2#18912](https://github.com/magento/magento2/pull/18912))
+    * [#19142](https://github.com/magento/magento2/issues/19142) -- Home page store loge should be clickable to reload page (fixed in [magento/magento2#19199](https://github.com/magento/magento2/pull/19199))
+    * [#18374](https://github.com/magento/magento2/issues/18374) -- Unable to get product  attribute value for store-view scope type in product collection loaded for a specific store. (fixed in [magento/magento2#19911](https://github.com/magento/magento2/pull/19911))
+    * [#18941](https://github.com/magento/magento2/issues/18941) -- Calling getCurrentUrl on Store will wrongly add "___store" parameter (fixed in [magento/magento2#19945](https://github.com/magento/magento2/pull/19945))
+    * [#19052](https://github.com/magento/magento2/issues/19052) -- Position order showing before the text box (fixed in [magento/magento2#19056](https://github.com/magento/magento2/pull/19056))
+    * [#19285](https://github.com/magento/magento2/issues/19285) -- On Notification page Select All and Select Visible both works same (fixed in [magento/magento2#19910](https://github.com/magento/magento2/pull/19910))
+    * [#19507](https://github.com/magento/magento2/issues/19507) -- Frontend Minicart dropdown alignment issue (fixed in [magento/magento2#19889](https://github.com/magento/magento2/pull/19889))
+    * [#19605](https://github.com/magento/magento2/issues/19605) -- Don't static compile disabled modules (fixed in [magento/magento2#19989](https://github.com/magento/magento2/pull/19989))
+    * [#19346](https://github.com/magento/magento2/issues/19346) -- Import data 2.2.6 Value for 'product_type' attribute contains incorrect value (fixed in [magento/magento2#20081](https://github.com/magento/magento2/pull/20081))
+    * [#19780](https://github.com/magento/magento2/issues/19780) -- Incorrect class name on Orders and returns page. (fixed in [magento/magento2#20080](https://github.com/magento/magento2/pull/20080))
+    * [#19230](https://github.com/magento/magento2/issues/19230) -- Can't Cancel Order (fixed in [magento/magento2#19423](https://github.com/magento/magento2/pull/19423))
+    * [#19099](https://github.com/magento/magento2/issues/19099) -- New Link is not correctly shown as Current if contains default parts (fixed in [magento/magento2#19927](https://github.com/magento/magento2/pull/19927))
+    * [#19940](https://github.com/magento/magento2/issues/19940) -- Exception undefined variable itemsOrderItemId while creating shipment through MSI (fixed in [magento/magento2#20082](https://github.com/magento/magento2/pull/20082))
+    * [#19101](https://github.com/magento/magento2/issues/19101) -- API REST and Reserved Order Id (fixed in [magento/magento2#20208](https://github.com/magento/magento2/pull/20208))
+    * [#20210](https://github.com/magento/magento2/issues/20210) -- Hamburger Icon was available on a page where menu was not present. Issue in responsive view (fixed in [magento/magento2#20219](https://github.com/magento/magento2/pull/20219))
+    * [#16198](https://github.com/magento/magento2/issues/16198) -- Category image remain after deleted (fixed in [magento/magento2#20178](https://github.com/magento/magento2/pull/20178))
+    * [#18192](https://github.com/magento/magento2/issues/18192) -- Backend issue : "ratings isn't  available" website wise (fixed in [magento/magento2#20183](https://github.com/magento/magento2/pull/20183))
+    * [#14937](https://github.com/magento/magento2/issues/14937) -- Javascript error thrown from uiComponent 'notification_area' if messages are malformed (fixed in [magento/magento2#20271](https://github.com/magento/magento2/pull/20271))
+    * [#17819](https://github.com/magento/magento2/issues/17819) -- Wrong product url from getProductUrl when current category has not product object (fixed in [magento/magento2#20286](https://github.com/magento/magento2/pull/20286))
+    * [#20296](https://github.com/magento/magento2/issues/20296) -- "@magentoDataIsolation" is used instead of "@magentoDbIsolation" in some integration tests. (fixed in [magento/magento2#20298](https://github.com/magento/magento2/pull/20298))
+    * [#20158](https://github.com/magento/magento2/issues/20158) -- Store switcher not aligned proper in tab view (fixed in [magento/magento2#20325](https://github.com/magento/magento2/pull/20325))
+    * [#20232](https://github.com/magento/magento2/issues/20232) -- Backend order credit card detail check box misaligned (fixed in [magento/magento2#20328](https://github.com/magento/magento2/pull/20328))
+    * [#20098](https://github.com/magento/magento2/issues/20098) -- Product image failure when importing through CSV (fixed in [magento/magento2#20329](https://github.com/magento/magento2/pull/20329))
+    * [#20352](https://github.com/magento/magento2/issues/20352) -- File type option value shows html content in admin order view. (fixed in [magento/magento2#20353](https://github.com/magento/magento2/pull/20353))
+    * [#18170](https://github.com/magento/magento2/issues/18170) -- Unable to reset password if customer has address from not allowed country (fixed in [magento/magento2#19964](https://github.com/magento/magento2/pull/19964))
+    * [#19982](https://github.com/magento/magento2/issues/19982) -- Catalogsearch Reindex (fixed in [magento/magento2#19984](https://github.com/magento/magento2/pull/19984))
+    * [#9130](https://github.com/magento/magento2/issues/9130) -- If stock is bellow OutOfStock Threshold, a negative qty is displayed in Product List Page (fixed in [magento/magento2#20206](https://github.com/magento/magento2/pull/20206))
+    * [#19609](https://github.com/magento/magento2/issues/19609) -- config:set --lock-config does not act on other scopes (fixed in [magento/magento2#20322](https://github.com/magento/magento2/pull/20322))
+    * [#19399](https://github.com/magento/magento2/issues/19399) -- Add product customization option collapsible design issue (fixed in [magento/magento2#19400](https://github.com/magento/magento2/pull/19400))
+    * [#20120](https://github.com/magento/magento2/issues/20120) -- Review Details Detailed Rating misaligned (fixed in [magento/magento2#20272](https://github.com/magento/magento2/pull/20272))
+    * [#20172](https://github.com/magento/magento2/issues/20172) -- On customer login page input field are short width on tablet view (fixed in [magento/magento2#20369](https://github.com/magento/magento2/pull/20369))
+    * [#19085](https://github.com/magento/magento2/issues/19085) -- Translation in tier_price.phtml not working (fixed in [magento/magento2#19377](https://github.com/magento/magento2/pull/19377))
+    * [#18361](https://github.com/magento/magento2/issues/18361) -- Customer last name is encoded twice in the XML interface (fixed in [magento/magento2#18362](https://github.com/magento/magento2/pull/18362))
+    * [#19887](https://github.com/magento/magento2/issues/19887) -- creating new shipment: gettting all trackers. after this commit  2307e16 (fixed in [magento/magento2#20184](https://github.com/magento/magento2/pull/20184))
+    * [#19985](https://github.com/magento/magento2/issues/19985) -- Send email confirmation popup close button area overlapping to content  (fixed in [magento/magento2#20541](https://github.com/magento/magento2/pull/20541))
+    * [#17759](https://github.com/magento/magento2/issues/17759) -- M2.2.5 : CustomerRepository::getList() does not load custom attribute if the name is "company" (fixed in [magento/magento2#20284](https://github.com/magento/magento2/pull/20284))
+    * [#19800](https://github.com/magento/magento2/issues/19800) -- Contact us : design improvement (fixed in [magento/magento2#20455](https://github.com/magento/magento2/pull/20455))
+    * [#19645](https://github.com/magento/magento2/issues/19645) -- Area Frontend: Account information page checkbox alignment issue. (fixed in [magento/magento2#20457](https://github.com/magento/magento2/pull/20457))
+    * [#19791](https://github.com/magento/magento2/issues/19791) -- Logo vertical misalignment. (fixed in [magento/magento2#20456](https://github.com/magento/magento2/pull/20456))
+    * [#15950](https://github.com/magento/magento2/issues/15950) -- Magento2 CSV product import qty and is_in_stock not working correct (fixed in [magento/magento2#20177](https://github.com/magento/magento2/pull/20177))
+    * [#19899](https://github.com/magento/magento2/issues/19899) -- Credit memo for $0 order without refunded shipping produces negative credit memo (fixed in [magento/magento2#20508](https://github.com/magento/magento2/pull/20508))
+    * [#20121](https://github.com/magento/magento2/issues/20121) -- Cancel order increases stock although "Set Items' Status to be In Stock When Order is Cancelled" is set to No (fixed in [magento/magento2#20547](https://github.com/magento/magento2/pull/20547))
+    * [#18027](https://github.com/magento/magento2/issues/18027) -- Cart Total is NaN in some circumstances (fixed in [magento/magento2#20638](https://github.com/magento/magento2/pull/20638))
+    * [#20376](https://github.com/magento/magento2/issues/20376) --  Image gets uploaded if field is disable in Category (fixed in [magento/magento2#20636](https://github.com/magento/magento2/pull/20636))
+    * [#20169](https://github.com/magento/magento2/issues/20169) -- Admin user with restricted "order create" access can "view", "cancel", etc via API (fixed in [magento/magento2#20542](https://github.com/magento/magento2/pull/20542))
+    * [#20399](https://github.com/magento/magento2/issues/20399) -- On wish list page edit, remove item misalign in 640 X 767 resolution (fixed in [magento/magento2#20544](https://github.com/magento/magento2/pull/20544))
+    * [#20373](https://github.com/magento/magento2/issues/20373) -- Order view invoices template not display proper on ipad  (fixed in [magento/magento2#20546](https://github.com/magento/magento2/pull/20546))
+    * [#18387](https://github.com/magento/magento2/issues/18387) -- catalog:images:resize fails to process all images -> Possible underlying Magento/Framework/DB/Query/Generator issue (fixed in [magento/magento2#18809](https://github.com/magento/magento2/pull/18809))
+    * [#18931](https://github.com/magento/magento2/issues/18931) -- Product added to shopping cart / comparison list message not translated by default (fixed in [magento/magento2#19461](https://github.com/magento/magento2/pull/19461))
+    * [#14712](https://github.com/magento/magento2/issues/14712) -- Shipping issue on PayPal Express (fixed in [magento/magento2#19655](https://github.com/magento/magento2/pull/19655))
+    * [#20113](https://github.com/magento/magento2/issues/20113) -- Widget option labels are misalinged (fixed in [magento/magento2#20270](https://github.com/magento/magento2/pull/20270))
+    * [#20304](https://github.com/magento/magento2/issues/20304) -- No space between step title and saved address in checkout  (fixed in [magento/magento2#20418](https://github.com/magento/magento2/pull/20418))
+    * [#20609](https://github.com/magento/magento2/issues/20609) -- Currency rate value not align proper in order information tab  when we create creditmemo from admin (fixed in [magento/magento2#20613](https://github.com/magento/magento2/pull/20613))
+    * [#20500](https://github.com/magento/magento2/issues/20500) -- Recent Order Product Title Misaligned in Sidebar (fixed in [magento/magento2#20744](https://github.com/magento/magento2/pull/20744))
+    * [#20563](https://github.com/magento/magento2/issues/20563) -- Go to shipping information, Update qty & Addresses and Enter a new address button Not aligned from left and right in 767px screen size (fixed in [magento/magento2#20739](https://github.com/magento/magento2/pull/20739))
+    * [#19436](https://github.com/magento/magento2/issues/19436) -- Attribute Option with zero at the bigining does not work if there is already option with the same number without the zero (REST API)) (fixed in [magento/magento2#19612](https://github.com/magento/magento2/pull/19612))
+    * [#20604](https://github.com/magento/magento2/issues/20604) -- Gift option message overlap edit and remove button (fixed in [magento/magento2#20784](https://github.com/magento/magento2/pull/20784))
+    * [#20137](https://github.com/magento/magento2/issues/20137) -- On checkout page apply discount button is not align with input box (fixed in [magento/magento2#20837](https://github.com/magento/magento2/pull/20837))
+    * [#20624](https://github.com/magento/magento2/issues/20624) -- `\Magento\ImportExport\Block\Adminhtml\Export\Filter::_getSelectHtmlWithValue()` method overwrites self $value argument (fixed in [magento/magento2#20863](https://github.com/magento/magento2/pull/20863))
+    * [#20409](https://github.com/magento/magento2/issues/20409) -- Magento\Catalog\Api\ProductRenderListInterface returns products regardless of visibility (fixed in [magento/magento2#20886](https://github.com/magento/magento2/pull/20886))
+    * [#20259](https://github.com/magento/magento2/issues/20259) -- Store switcher not sliding up and down, only dropdown arrow working  (fixed in [magento/magento2#20540](https://github.com/magento/magento2/pull/20540))
+* GitHub pull requests:
+    * [magento/magento2#16361](https://github.com/magento/magento2/pull/16361) -- Allow usage of config-global.php when running Integration Tests (by @jissereitsma)
+    * [magento/magento2#16422](https://github.com/magento/magento2/pull/16422) -- Replace intval() function by using direct type casting to (int) where no default value is needed (by @mhauri)
+    * [magento/magento2#17708](https://github.com/magento/magento2/pull/17708) -- Prevent rendering of "Ship here" button if it is not needed (by @marvinhuebner)
+    * [magento/magento2#17783](https://github.com/magento/magento2/pull/17783) -- Current password autocomplete for admin login (by @flancer64)
+    * [magento/magento2#17885](https://github.com/magento/magento2/pull/17885) -- Make sure all linked products (related, upsells, crosssells) show up … (by @hostep)
+    * [magento/magento2#17891](https://github.com/magento/magento2/pull/17891) -- #17890: show correct text swatch values per store view (by @magicaner)
+    * [magento/magento2#17919](https://github.com/magento/magento2/pull/17919) -- [remove] rich snippet declaration on grouped product (by @AurelienLavorel)
+    * [magento/magento2#17945](https://github.com/magento/magento2/pull/17945) -- [2.2] return $this from setters in Analytics/ReportXml/DB/SelectBuilder.php (by @TBlindaruk)
+    * [magento/magento2#17966](https://github.com/magento/magento2/pull/17966) -- Fix currency symbol setting back to default #17567 (by @magently)
+    * [magento/magento2#17970](https://github.com/magento/magento2/pull/17970) -- Integration test for swatches types in attribute configuration added (by @rogyar)
+    * [magento/magento2#17990](https://github.com/magento/magento2/pull/17990) -- Menu does not work when you change from Mobile to Desktop mode #5402 (by @emanuelarcos)
+    * [magento/magento2#18001](https://github.com/magento/magento2/pull/18001) -- Fixes saving product in single-store mode if website_id <> 1 (by @eduard13)
+    * [magento/magento2#18002](https://github.com/magento/magento2/pull/18002) -- Fix module uninstall shell command and composer removal w/out regression (by @Thundar)
+    * [magento/magento2#18004](https://github.com/magento/magento2/pull/18004) -- [CatalogUrlRewrite] Covering the CategoryProcessUrlRewriteMovingObserver by Unit Test (by @eduard13)
+    * [magento/magento2#18018](https://github.com/magento/magento2/pull/18018) -- [Backport] Use route ID when creating secret keys in backend menus instead of route name #17650 (by @lfolco)
+    * [magento/magento2#18034](https://github.com/magento/magento2/pull/18034) -- [Backport] fix notice undefined shipment: revert locale inside loop (by @dmytro-ch)
+    * [magento/magento2#18127](https://github.com/magento/magento2/pull/18127) -- [Backport] typofix: ImportCollection -> ItemCollection (by @dmytro-ch)
+    * [magento/magento2#18137](https://github.com/magento/magento2/pull/18137) -- [2.2] Update labels section in README.md (by @sidolov)
+    * [magento/magento2#14065](https://github.com/magento/magento2/pull/14065) -- Correctly convert config integration api resources (by @therool)
+    * [magento/magento2#17679](https://github.com/magento/magento2/pull/17679) -- Update shipment collection to unserialize packages attribute after load (by @dnsv)
+    * [magento/magento2#17993](https://github.com/magento/magento2/pull/17993) -- fix #17582 ./bin/magento config:show fails with a fatal error (by @keyurshah070)
+    * [magento/magento2#18000](https://github.com/magento/magento2/pull/18000) -- Fix sitemap grid render incorrect base urls for multiple stores (by @nntoan)
+    * [magento/magento2#18055](https://github.com/magento/magento2/pull/18055) -- fix: reset search mini-form when we have no data / an empty response (by @DanielRuf)
+    * [magento/magento2#18097](https://github.com/magento/magento2/pull/18097) -- [Backport] Fix import grouped products #12853 (by @insanityinside)
+    * [magento/magento2#18113](https://github.com/magento/magento2/pull/18113) -- [Backport] Fixes from #15947 (by @ihor-sviziev)
+    * [magento/magento2#18098](https://github.com/magento/magento2/pull/18098) -- Fix shipping discount failed to apply during place order (by @torreytsui)
+    * [magento/magento2#18126](https://github.com/magento/magento2/pull/18126) -- [Backport] [2.2] Changed intval($val) to (int) $val, since it is faster: (by @dmytro-ch)
+    * [magento/magento2#17511](https://github.com/magento/magento2/pull/17511) -- Use cast types instead of xyzval() (by @sreichel)
+    * [magento/magento2#17998](https://github.com/magento/magento2/pull/17998) -- 9830 - Null order in Magento\Sales\Block\Order\PrintShipment.php (by @MateuszChrapek)
+    * [magento/magento2#17984](https://github.com/magento/magento2/pull/17984) -- Implemeted MAGETWO-81170: Missing $debugHintsPath when sending email … (by @passtet)
+    * [magento/magento2#18225](https://github.com/magento/magento2/pull/18225) -- Module Catalog: fix issue with custom option price conversion for different base currency on website level (by @oleksii-lisovyi)
+    * [magento/magento2#16885](https://github.com/magento/magento2/pull/16885) -- [Fix] Do not modify current list of countries with require states during setup upgrade (by @jalogut)
+    * [magento/magento2#18086](https://github.com/magento/magento2/pull/18086) -- Cast products "getStoreId()" to int, closes #18079 (by @sreichel)
+    * [magento/magento2#18215](https://github.com/magento/magento2/pull/18215) -- fix wysiwyg editor not decoding base64 filenames special chars (by @adammada)
+    * [magento/magento2#18280](https://github.com/magento/magento2/pull/18280) -- [Backport] Change sort order for customer group options (by @dmytro-ch)
+    * [magento/magento2#18168](https://github.com/magento/magento2/pull/18168) -- Fixed issue with lib-line-height mixin failing when value of 'normal'… (by @CNanninga)
+    * [magento/magento2#18310](https://github.com/magento/magento2/pull/18310) -- [Backport] Sales: add missing unit tests for model classes (by @dmytro-ch)
+    * [magento/magento2#18311](https://github.com/magento/magento2/pull/18311) -- [Backport] Added integration test for gift message quote merge (by @dmytro-ch)
+    * [magento/magento2#17695](https://github.com/magento/magento2/pull/17695) -- ConfigurableProduct show prices in select options (by @alexeya-ven)
+    * [magento/magento2#17982](https://github.com/magento/magento2/pull/17982) -- add error message in else condition (by @vaibhavahalpara)
+    * [magento/magento2#18354](https://github.com/magento/magento2/pull/18354) -- Fix for parsing attribute options labels, when & used. (by @bartoszkubicki)
+    * [magento/magento2#17882](https://github.com/magento/magento2/pull/17882) -- Do not overwrite URL Key with blank value (by @josephmcdermott)
+    * [magento/magento2#17986](https://github.com/magento/magento2/pull/17986) -- Implemented 17964: Backend Order creation Authorizenet: If invalid cr… (by @passtet)
+    * [magento/magento2#18283](https://github.com/magento/magento2/pull/18283) -- [Backport] Fix for removing the dirs while creating a TAR archive (by @haroldclaus)
+    * [magento/magento2#18369](https://github.com/magento/magento2/pull/18369) -- [Backport] Fix throwing error by checkout error processor model (by @ihor-sviziev)
+    * [magento/magento2#18375](https://github.com/magento/magento2/pull/18375) -- Backport 2.2 - Fix wrong reference in google analytics module layout xml (by @sambolek)
+    * [magento/magento2#18377](https://github.com/magento/magento2/pull/18377) -- [Backport 2.2-develop] Refactor Mass Order Cancel code to use Interface (by @JeroenVanLeusden)
+    * [magento/magento2#18376](https://github.com/magento/magento2/pull/18376) -- Backport 2.2 - Fix issue 17152 - prevent email being marked as not se… (by @sambolek)
+    * [magento/magento2#18391](https://github.com/magento/magento2/pull/18391) -- Backport 2.2 - Allow keyboard navigation in browser on product detail… (by @hostep)
+    * [magento/magento2#18400](https://github.com/magento/magento2/pull/18400) -- Admin Login Form > Aliging Label (by @rafaelstz)
+    * [magento/magento2#18414](https://github.com/magento/magento2/pull/18414) -- [Backport] Fix the issue with customer inline edit when password is expired (by @dmytro-ch)
+    * [magento/magento2#18415](https://github.com/magento/magento2/pull/18415) -- [Backport] Added unit test for CRON converter plugin (by @dmytro-ch)
+    * [magento/magento2#18426](https://github.com/magento/magento2/pull/18426) -- [Backport] Removed unnecessary characters from comments (by @lewisvoncken)
+    * [magento/magento2#18428](https://github.com/magento/magento2/pull/18428) -- [Backport] small misspelling fixed (by @lewisvoncken)
+    * [magento/magento2#18429](https://github.com/magento/magento2/pull/18429) -- [Backport] Fix documentation grammar errors and typos in actions.js (by @lewisvoncken)
+    * [magento/magento2#18430](https://github.com/magento/magento2/pull/18430) -- [Backport] Fix documentation typos in registry.js (by @lewisvoncken)
+    * [magento/magento2#18433](https://github.com/magento/magento2/pull/18433) -- [Backport] Improve code quality subscriber new action (by @lewisvoncken)
+    * [magento/magento2#18432](https://github.com/magento/magento2/pull/18432) -- [Backport] Removed commented code (by @lewisvoncken)
+    * [magento/magento2#17823](https://github.com/magento/magento2/pull/17823) -- [FEATURE] [issue-3283] Added Filter Support for Yes/No (boolean) attr… (by @lewisvoncken)
+    * [magento/magento2#18175](https://github.com/magento/magento2/pull/18175) -- Fix category tree in cart price rule #17493 (by @magently)
+    * [magento/magento2#18166](https://github.com/magento/magento2/pull/18166) -- Fix table rate failing for zip+4 address #17770 (by @magently)
+    * [magento/magento2#18389](https://github.com/magento/magento2/pull/18389) -- Backport 2.2 - Introducing a dedicated cron.log file for logging cron… (by @hostep)
+    * [magento/magento2#18390](https://github.com/magento/magento2/pull/18390) -- Backport 2.2 - Don't set a source model on the attribute when it's no… (by @hostep)
+    * [magento/magento2#18422](https://github.com/magento/magento2/pull/18422) -- [BACKPORT] Replace sort callbacks to spaceship operator (by @lewisvoncken)
+    * [magento/magento2#18403](https://github.com/magento/magento2/pull/18403) -- Fix setup wizard page logo (by @rafaelstz)
+    * [magento/magento2#18425](https://github.com/magento/magento2/pull/18425) -- [Backport] Fixing Snake Case To Camel Case (by @lewisvoncken)
+    * [magento/magento2#18427](https://github.com/magento/magento2/pull/18427) -- [Backport] Fix wrong return type in StockRegistryInterface API (by @lewisvoncken)
+    * [magento/magento2#15683](https://github.com/magento/magento2/pull/15683) -- Added checks to see if the payment is available (by @michielgerritsen)
+    * [magento/magento2#15905](https://github.com/magento/magento2/pull/15905) -- #4942 and bundle checkbox bug (by @JosephMaxwell)
+    * [magento/magento2#16115](https://github.com/magento/magento2/pull/16115) -- Fix type hint of customer-data updateSectionId parameters (by @Vinai)
+    * [magento/magento2#17516](https://github.com/magento/magento2/pull/17516) -- Feature australian regions (by @maximbaibakov)
+    * [magento/magento2#18155](https://github.com/magento/magento2/pull/18155) -- Fix type hint of @message declaration as the "setWidgetParameters" method allows arrays too (by @avstudnitz)
+    * [magento/magento2#18401](https://github.com/magento/magento2/pull/18401) -- Admin > Footer > Aligning Proportionally (by @rafaelstz)
+    * [magento/magento2#17968](https://github.com/magento/magento2/pull/17968) -- Fix Customer custom attributes lost after save (by @Thundar)
+    * [magento/magento2#18196](https://github.com/magento/magento2/pull/18196) -- Fix for custom product attribute changing 'backend_type' when 'is_user_defined = 1' and get updated/saved in Admin Backend (by @bartoszkubicki)
+    * [magento/magento2#18495](https://github.com/magento/magento2/pull/18495) -- [Backport] Checkout - Fix "Cannot read property 'code' on undefined" issue (by @ihor-sviziev)
+    * [magento/magento2#18552](https://github.com/magento/magento2/pull/18552) -- [Backport] Added validation on maximum quantity allowed in shopping cart (by @gelanivishal)
+    * [magento/magento2#18554](https://github.com/magento/magento2/pull/18554) -- [Backport] throw exception InvalidArgumentException during validate scheme (by @gelanivishal)
+    * [magento/magento2#18556](https://github.com/magento/magento2/pull/18556) -- [Backport] Fixed typo from filed to field (by @gelanivishal)
+    * [magento/magento2#18559](https://github.com/magento/magento2/pull/18559) -- [Backport] Covering the AssignOrderToCustomerObserver by Unit Test (by @gelanivishal)
+    * [magento/magento2#18564](https://github.com/magento/magento2/pull/18564) -- [Backport] Empty option Label should always be blank even if attribute is required (by @gelanivishal)
+    * [magento/magento2#18561](https://github.com/magento/magento2/pull/18561) -- [2.2] added component status based filtering (by @gelanivishal)
+    * [magento/magento2#18569](https://github.com/magento/magento2/pull/18569) -- [Backport] Make it possible to disable report bugs link (by @gelanivishal)
+    * [magento/magento2#18587](https://github.com/magento/magento2/pull/18587) -- [Backport] Prevent XSS on checkout (by @dmytro-ch)
+    * [magento/magento2#18586](https://github.com/magento/magento2/pull/18586) -- [Backport] Added missing throw tag for exception to docblock of construct (by @dmytro-ch)
+    * [magento/magento2#18593](https://github.com/magento/magento2/pull/18593) -- Calendar icon in advance pricing alignment solved (by @speedy008)
+    * [magento/magento2#18595](https://github.com/magento/magento2/pull/18595) -- [Backport] Fix disappearing navigation arrows in fotorama zoom (by @luukschakenraad)
+    * [magento/magento2#18599](https://github.com/magento/magento2/pull/18599) -- [Backport] Do not use new Phrase in Link Current class (by @dmytro-ch)
+    * [magento/magento2#18619](https://github.com/magento/magento2/pull/18619) -- [Backport] Add required fields to templates (by @miguelbalparda)
+    * [magento/magento2#18656](https://github.com/magento/magento2/pull/18656) -- [Backport] Fix product details causing Validation error (by @gelanivishal)
+    * [magento/magento2#18657](https://github.com/magento/magento2/pull/18657) -- [Backport] Create empty modelData array to avoid undefined var error (by @gelanivishal)
+    * [magento/magento2#18659](https://github.com/magento/magento2/pull/18659) -- [Backport] Fix for #12969 - server port detection for errors (by @gelanivishal)
+    * [magento/magento2#18662](https://github.com/magento/magento2/pull/18662) -- [Backport] move hardcoded MIME types from class private to DI configuration (by @gelanivishal)
+    * [magento/magento2#16915](https://github.com/magento/magento2/pull/16915) -- magento/magento2#14510: Creating custom customer attribute with default value 0 will cause not saving value for customer entity. (by @swnsma)
+    * [magento/magento2#18563](https://github.com/magento/magento2/pull/18563) -- [Backport] Update CategoryProcessor.php (by @gelanivishal)
+    * [magento/magento2#18566](https://github.com/magento/magento2/pull/18566) -- Module Catalog URL Rewrite: fix issue with product URL Rewrites re-generation after changing product URL Key for product with existing url_path attribute value (by @oleksii-lisovyi)
+    * [magento/magento2#18670](https://github.com/magento/magento2/pull/18670) -- Remove unnecessary class import, see #18280 (by @sreichel)
+    * [magento/magento2#18658](https://github.com/magento/magento2/pull/18658) -- [Backport] MAGENTO-18131: Fixed EAV attributes values query (by @gelanivishal)
+    * [magento/magento2#15366](https://github.com/magento/magento2/pull/15366) -- 15259 : Unable to disable without providing Industry value (by @sunilit42)
+    * [magento/magento2#18424](https://github.com/magento/magento2/pull/18424) -- [BACKPORT] type casted $qty to float in \Magento\Catalog\Model\Produc… (by @lewisvoncken)
+    * [magento/magento2#18660](https://github.com/magento/magento2/pull/18660) -- [Backport] Fix of saving "clone_field" fields (by @gelanivishal)
+    * [magento/magento2#18758](https://github.com/magento/magento2/pull/18758) -- [Backport] Fix the typo in PHPDoc comment (by @dmytro-ch)
+    * [magento/magento2#18535](https://github.com/magento/magento2/pull/18535) -- Fixed issues-18534: 2 wysiwyg on catalog category edit page (by @k1las)
+    * [magento/magento2#18597](https://github.com/magento/magento2/pull/18597) -- [Backport] Fix empty cart button (by @luukschakenraad)
+    * [magento/magento2#18604](https://github.com/magento/magento2/pull/18604) -- Fixed Issue: Special price of 0.0000 is not shown on frontend, but is calculated in cart (by @maheshWebkul721)
+    * [magento/magento2#18643](https://github.com/magento/magento2/pull/18643) -- Fix customer unsubscribed issue (by @janakbhimani)
+    * [magento/magento2#18759](https://github.com/magento/magento2/pull/18759) -- [Backport] Backend: add missing unit test for ModuleService class (by @dmytro-ch)
+    * [magento/magento2#16940](https://github.com/magento/magento2/pull/16940) -- Resolve incorrect scope code selection when the requested scopeCode is null (by @matthew-muscat)
+    * [magento/magento2#18737](https://github.com/magento/magento2/pull/18737) -- [BUGFIX] GITHUB-18264 Backport of #17799 for the 2.2 branch (by @kanduvisla)
+    * [magento/magento2#17971](https://github.com/magento/magento2/pull/17971) -- Don't format Special Price value for Bundle Product (by @magently)
+    * [magento/magento2#18681](https://github.com/magento/magento2/pull/18681) -- [Backport] Set fallback values for email and _website columns to avoid 'undefined index' error in CustomerComposite.php (by @TomashKhamlai)
+    * [magento/magento2#18833](https://github.com/magento/magento2/pull/18833) -- [Backport] Cover \Magento\GiftMessage\Observer\SalesEventQuoteMerge with Unit test (by @vasilii-b)
+    * [magento/magento2#18834](https://github.com/magento/magento2/pull/18834) -- [Backport] Cover \Magento\Email\Model\Template\SenderResolver class with Unit test (by @vasilii-b)
+    * [magento/magento2#18835](https://github.com/magento/magento2/pull/18835) -- [Backport] Added Unit Test for WindowsSmtpConfig Plugin (by @vasilii-b)
+    * [magento/magento2#18876](https://github.com/magento/magento2/pull/18876) -- [Backport] Fix Useless use of Cat (by @gelanivishal)
+    * [magento/magento2#18591](https://github.com/magento/magento2/pull/18591) -- [Backport] Fix SKU limit in import new products (by @ravi-chandra3197)
+    * [magento/magento2#18862](https://github.com/magento/magento2/pull/18862) -- [Backport] Adding trimming sku value function to sku backend model. (by @gelanivishal)
+    * [magento/magento2#18865](https://github.com/magento/magento2/pull/18865) -- fixed issue #18458 : Alert widget gets close when click anywhere on screen #18576 (by @Shubham-Webkul)
+    * [magento/magento2#18886](https://github.com/magento/magento2/pull/18886) -- [Backport] fixed Translation issue send-friend in send.phtml (by @rahulwebkul)
+    * [magento/magento2#18917](https://github.com/magento/magento2/pull/18917) -- Fixed-Global-search icon misaligned (by @speedy008)
+    * [magento/magento2#17978](https://github.com/magento/magento2/pull/17978) -- #17488 Fix Authenticating a customer via REST API does not update the last logged in data (by @prakashpatel07)
+    * [magento/magento2#18287](https://github.com/magento/magento2/pull/18287) -- Ensure integer values are not quoted as strings (by @udovicic)
+    * [magento/magento2#18874](https://github.com/magento/magento2/pull/18874) -- [Backport] Fixed issue #4468 "Unable to insert multiple catalog product list wid… (by @gelanivishal)
+    * [magento/magento2#18372](https://github.com/magento/magento2/pull/18372) -- Resolve typo despatch event (by @neeta-wagento)
+    * [magento/magento2#18863](https://github.com/magento/magento2/pull/18863) -- [Backport] #17744 Adding logic to get default billing address used on Cart and Checkout (by @gelanivishal)
+    * [magento/magento2#18872](https://github.com/magento/magento2/pull/18872) -- [Backport] Allow set billing information via API with existing address (by @gelanivishal)
+    * [magento/magento2#18870](https://github.com/magento/magento2/pull/18870) -- [Backport] ISSUE-5021 - fixed place order for custom shipping methods with under… (by @gelanivishal)
+    * [magento/magento2#18875](https://github.com/magento/magento2/pull/18875) -- [Backport] Sections LESS mixins: fix the issue with missing rules and incorrect default variables (by @gelanivishal)
+    * [magento/magento2#18873](https://github.com/magento/magento2/pull/18873) -- [Backport] Prevent exception when option text converts to false (by @gelanivishal)
+    * [magento/magento2#18967](https://github.com/magento/magento2/pull/18967) -- fixed - Magento 2.2.6 Default values are not rendering on Wishlist product edit page (by @webkul-ratnesh)
+    * [magento/magento2#18908](https://github.com/magento/magento2/pull/18908) -- [Backport] fixed - Unable to select payment method according to country of the address at checkout time (by @rahulwebkul)
+    * [magento/magento2#18984](https://github.com/magento/magento2/pull/18984) -- [Backport] Reload cart totals when cart data changes (by @tdgroot)
+    * [magento/magento2#16887](https://github.com/magento/magento2/pull/16887) -- Fix blocked a frame with origin (by @iGerchak)
+    * [magento/magento2#18857](https://github.com/magento/magento2/pull/18857) -- Fixed - Default tax region/state appears in customer & order data #16684 (by @ssp58bleuciel)
+    * [magento/magento2#18964](https://github.com/magento/magento2/pull/18964) --  Backport [PR 18772] Remove unnecesary "header" block redeclaration (by @samuel27m)
+    * [magento/magento2#19012](https://github.com/magento/magento2/pull/19012) -- #18348 - In admin, last swatch option set to default upon save (by @RostislavS)
+    * [magento/magento2#19036](https://github.com/magento/magento2/pull/19036) -- magento/magento2#18323: Order confirmation email for guest checkout d… (by @swnsma)
+    * [magento/magento2#18985](https://github.com/magento/magento2/pull/18985) -- [Backport] Added form fieldset before html data to \Magento\Framework\Data\Form\Element\Fieldset in getElementHtml() method (by @vasilii-b)
+    * [magento/magento2#19002](https://github.com/magento/magento2/pull/19002) -- [Backport] Remove duplicated CSS selector (by @dmytro-ch)
+    * [magento/magento2#19044](https://github.com/magento/magento2/pull/19044) -- [2.2-develop] magento/magento2#14007: "Use in Layered Navigation: Filterable (no results)" property confuse for Price filter (by @vpodorozh)
+    * [magento/magento2#19074](https://github.com/magento/magento2/pull/19074) -- [Backport] Fix for #12399: Exception Error in Catalog Price Rule while Backend language is not English (by @Mardl)
+    * [magento/magento2#18461](https://github.com/magento/magento2/pull/18461) -- fix  Fatal Error when save configurable product in Magento 2.2.5 #18082 (by @thiagolima-bm)
+    * [magento/magento2#18649](https://github.com/magento/magento2/pull/18649) -- [Backport] Issue Fixed: Missing Fixed Product Tax total on PDF (by @maheshWebkul721)
+    * [magento/magento2#18815](https://github.com/magento/magento2/pull/18815) -- [Backoport] Issue Fixed: Backups error from User Roles Permission 2.2.6 (by @maheshWebkul721)
+    * [magento/magento2#19073](https://github.com/magento/magento2/pull/19073) -- magento/magento2#19071: Password strength indicator shows No Password… (by @dimasalamatov)
+    * [magento/magento2#19089](https://github.com/magento/magento2/pull/19089) -- magento/magento#18901: Forgot password form should not available while customer is logged in. (by @swnsma)
+    * [magento/magento2#19105](https://github.com/magento/magento2/pull/19105) -- magento/magento2#18840: Invalid Unit Test Annotations. (by @swnsma)
+    * [magento/magento2#19110](https://github.com/magento/magento2/pull/19110) -- [Backport] Add additional check if password hash is empty in auth process (by @agorbulin)
+    * [magento/magento2#14914](https://github.com/magento/magento2/pull/14914) -- FIX for issue #14849 - In Sales Emails no translation using order.getStatusLabel() (by @phoenix128)
+    * [magento/magento2#17854](https://github.com/magento/magento2/pull/17854) -- Fix translations of category design theme not being applied (by @cezary-zeglen)
+    * [magento/magento2#17915](https://github.com/magento/magento2/pull/17915) -- Fix/add expresion (by @magently)
+    * [magento/magento2#18743](https://github.com/magento/magento2/pull/18743) -- Fixed tierprice discount not calculated correctly if has specialprice (by @gelanivishal)
+    * [magento/magento2#18959](https://github.com/magento/magento2/pull/18959) -- fixed js translation (by @torhoehn)
+    * [magento/magento2#19118](https://github.com/magento/magento2/pull/19118) -- [Backport] Add/update newsletter messages in translation file (by @arnoudhgz)
+    * [magento/magento2#17889](https://github.com/magento/magento2/pull/17889) -- Fixed child items showing on My Account order view (by @rogyar)
+    * [magento/magento2#19113](https://github.com/magento/magento2/pull/19113) -- [2.2 backport] fix cipherMethod detection for openssl 1.1.1 (by @BlackIkeEagle)
+    * [magento/magento2#16342](https://github.com/magento/magento2/pull/16342) -- #14020-Cart-Sales-Rule-with-negated-condition-over-special-price-does… (by @novikor)
+    * [magento/magento2#18808](https://github.com/magento/magento2/pull/18808) -- fixed Quote Item Prices are NULL in cart related events. #18685 (by @ashutoshwebkul)
+    * [magento/magento2#19216](https://github.com/magento/magento2/pull/19216) -- [Backport] Covering the \Magento\Weee observers by Unit Tests (by @eduard13)
+    * [magento/magento2#19217](https://github.com/magento/magento2/pull/19217) -- [Backport] Covering the CheckUserLoginBackendObserver by Unit Test (by @eduard13)
+    * [magento/magento2#19237](https://github.com/magento/magento2/pull/19237) -- [Backport] #18956 Fixes for set root_category_id (by @gelanivishal)
+    * [magento/magento2#19240](https://github.com/magento/magento2/pull/19240) -- [Backport] Add missing unit test for WishlistSettings plugin (by @gelanivishal)
+    * [magento/magento2#19260](https://github.com/magento/magento2/pull/19260) -- Issue #19205 Fixed: Bundle Product Option with input type is checkbox and add to cart with 3 values only 2 values added to cart. (by @maheshWebkul721)
+    * [magento/magento2#18642](https://github.com/magento/magento2/pull/18642) -- [Backport] Fix issue with unexpected changing of subscription status after customer saving (by @alexeya-ven)
+    * [magento/magento2#18951](https://github.com/magento/magento2/pull/18951) -- Magento 2.2 Fix Product::addImageToMediaGallery throws Exception (by @progreg)
+    * [magento/magento2#18960](https://github.com/magento/magento2/pull/18960) -- local themes should be added to git repo (by @torhoehn)
+    * [magento/magento2#19068](https://github.com/magento/magento2/pull/19068) -- Using Media Image custom attribute type could not display on frontend. #19054 (by @Nazar65)
+    * [magento/magento2#19337](https://github.com/magento/magento2/pull/19337) -- [Backport] 19082-Fatal-error-Uncaught-Error-Cannot-call-abstract-method-Magento-… (by @agorbulin)
+    * [magento/magento2#19336](https://github.com/magento/magento2/pull/19336) -- [Backport] small performance improvement on product listing (by @gelanivishal)
+    * [magento/magento2#19338](https://github.com/magento/magento2/pull/19338) -- [Backport] missing use statement in layout generator (by @gelanivishal)
+    * [magento/magento2#19340](https://github.com/magento/magento2/pull/19340) -- [Backport] Fix the issue: Content overlaps the close button #19263 (by @gelanivishal)
+    * [magento/magento2#14485](https://github.com/magento/magento2/pull/14485) -- Fix for Issue #4136, MAGETWO-53440 (by @vasilii-b)
+    * [magento/magento2#18621](https://github.com/magento/magento2/pull/18621) -- 18615 updates structure for last_trans_id to be varchar 255 which is … (by @iancassidyweb)
+    * [magento/magento2#18905](https://github.com/magento/magento2/pull/18905) -- Fix the issue with missing asterisk for admin required fields (by @dmytro-ch)
+    * [magento/magento2#19296](https://github.com/magento/magento2/pull/19296) -- Fix issue 19286 - Wrong pager style (by @speedy008)
+    * [magento/magento2#19355](https://github.com/magento/magento2/pull/19355) -- [Backport] Changed get product way in blocks with related products (by @gelanivishal)
+    * [magento/magento2#19357](https://github.com/magento/magento2/pull/19357) -- [Backport] #13157 - Last Ordered Items block - bad js code (by @gelanivishal)
+    * [magento/magento2#19023](https://github.com/magento/magento2/pull/19023) -- [2.2 develop] [backport #19018] [issue #17833] child theme does not inherit translations from parent theme (by @vpodorozh)
+    * [magento/magento2#19358](https://github.com/magento/magento2/pull/19358) -- [Backport] Fix the issue with repetitive "tbody" tag for order items table (by @gelanivishal)
+    * [magento/magento2#19365](https://github.com/magento/magento2/pull/19365) -- Fixing a test for Magento Newsletter. (by @tiagosampaio)
+    * [magento/magento2#18899](https://github.com/magento/magento2/pull/18899) -- [Backport] fixed - can't import external http to https redirecting images by default csv import (by @rahulwebkul)
+    * [magento/magento2#19356](https://github.com/magento/magento2/pull/19356) -- [Backport] Magento backend Notifications counter round icon small cut from right side (by @gelanivishal)
+    * [magento/magento2#19364](https://github.com/magento/magento2/pull/19364) -- [Backport] fix: remove old code in tabs, always set tabindex to 0 when tabs are … (by @DanielRuf)
+    * [magento/magento2#19374](https://github.com/magento/magento2/pull/19374) -- back-port-pull-19024 (by @agorbulin)
+    * [magento/magento2#19014](https://github.com/magento/magento2/pull/19014) -- [Backport] #17813 - Huge "product_data_storage" in localStorage hangs the shop (by @omiroshnichenko)
+    * [magento/magento2#19398](https://github.com/magento/magento2/pull/19398) -- [Backport-2.2] Code generation improvement for php 7.1 (by @swnsma)
+    * [magento/magento2#19422](https://github.com/magento/magento2/pull/19422) -- Fix for incorrectly escapeHtml'd JSON in commit b8f78cc6 (by @insanityinside)
+    * [magento/magento2#19426](https://github.com/magento/magento2/pull/19426) -- [Backport] Fixing the customer subscribing from different stores (by @eduard13)
+    * [magento/magento2#19427](https://github.com/magento/magento2/pull/19427) -- [Backport] Adding integration tests for wrong captcha (by @eduard13)
+    * [magento/magento2#18922](https://github.com/magento/magento2/pull/18922) -- Fixed 18918 Asterisk sign display twice (by @suryakant-krish)
+    * [magento/magento2#19239](https://github.com/magento/magento2/pull/19239) -- [Backport] Allow to read HTTP/2 response header. (by @gelanivishal)
+    * [magento/magento2#19430](https://github.com/magento/magento2/pull/19430) -- Fixed issue with Base Currency for website is CND when PayPal Payflow Pro is charging in USD (by @Rykh)
+    * [magento/magento2#19431](https://github.com/magento/magento2/pull/19431) -- [Backport] Sample Link Issue in Downloadable product in magento-2.2.6  #19344 (by @ansari-krish)
+    * [magento/magento2#19447](https://github.com/magento/magento2/pull/19447) -- [Backport] chore: remove unused code in admin view of catalog (by @DanielRuf)
+    * [magento/magento2#19145](https://github.com/magento/magento2/pull/19145) -- Add availability to leave empty config for events.xml (by @lisovyievhenii)
+    * [magento/magento2#19568](https://github.com/magento/magento2/pull/19568) -- [Backport] [Newsletter] #19418 Cannot add additional field to system configuration at desired position (by @vasilii-b)
+    * [magento/magento2#19678](https://github.com/magento/magento2/pull/19678) -- [Backport] Fix: SalesQuoteSaveAfterObserver fails to update the checkout session quote id when applicable (by @dmytro-ch)
+    * [magento/magento2#19668](https://github.com/magento/magento2/pull/19668) -- [Backport] style: change b to strong (a11y) (by @DanielRuf)
+    * [magento/magento2#19669](https://github.com/magento/magento2/pull/19669) -- [Backport] fix: remove unused params in categorySubmit invocation (by @DanielRuf)
+    * [magento/magento2#19804](https://github.com/magento/magento2/pull/19804) -- [Backport]Fix issue 19796 - Sales Order invoice Update Qty's Button is misaligned (by @speedy008)
+    * [magento/magento2#19949](https://github.com/magento/magento2/pull/19949) -- [Backport] Fixed Issue #19917 Changed allowDrug to allowDrag (by @maheshWebkul721)
+    * [magento/magento2#19967](https://github.com/magento/magento2/pull/19967) -- [Backport] Minor typos corrected. (by @milindsingh)
+    * [magento/magento2#19970](https://github.com/magento/magento2/pull/19970) -- [Backport] Typo taax -> tax (by @milindsingh)
+    * [magento/magento2#19968](https://github.com/magento/magento2/pull/19968) -- [Backport] Typo "customet_id" to  "customer_id" fixed. (by @milindsingh)
+    * [magento/magento2#19972](https://github.com/magento/magento2/pull/19972) -- [Backport] Update bootstrap.js (by @milindsingh)
+    * [magento/magento2#19971](https://github.com/magento/magento2/pull/19971) -- [Backport] Typo corrected Update bound-nodes.js (by @milindsingh)
+    * [magento/magento2#18912](https://github.com/magento/magento2/pull/18912) --  [Backport] Fixed subscribe to newsletter if you already have an account issue (by @ravi-chandra3197)
+    * [magento/magento2#19199](https://github.com/magento/magento2/pull/19199) -- [Backport][2.2] Made logo clickable on home page (by @gwharton)
+    * [magento/magento2#19280](https://github.com/magento/magento2/pull/19280) -- [BackPort] resolve typos and correct variable names (by @viral-wagento)
+    * [magento/magento2#19690](https://github.com/magento/magento2/pull/19690) -- [Backport] Additional Cache Management title (by @thomas-blackbird)
+    * [magento/magento2#19693](https://github.com/magento/magento2/pull/19693) -- [Backport] Cancel expired orders using OrderManagementInterface (by @JeroenVanLeusden)
+    * [magento/magento2#19911](https://github.com/magento/magento2/pull/19911) -- [Backport] fixed store wise product filter issue (by @shikhamis11)
+    * [magento/magento2#19945](https://github.com/magento/magento2/pull/19945) -- [Backport] issue 18941 (by @Nazar65)
+    * [magento/magento2#19056](https://github.com/magento/magento2/pull/19056) -- Fix issue 19052- Position order showing before the text box (by @speedy008)
+    * [magento/magento2#19910](https://github.com/magento/magento2/pull/19910) -- [Backport] fixed Notification page Select Visible items issue  (by @shikhamis11)
+    * [magento/magento2#19889](https://github.com/magento/magento2/pull/19889) -- [Backport]Fix issue 19507 - Frontend Minicart dropdown alignment issue  (by @speedy008)
+    * [magento/magento2#19928](https://github.com/magento/magento2/pull/19928) -- [Backport] [Review] Integration tests for not allowed review submission (by @eduard13)
+    * [magento/magento2#19989](https://github.com/magento/magento2/pull/19989) -- [Backport] Fixed #19605 Don't static compile disabled modules (by @shikhamis11)
+    * [magento/magento2#20081](https://github.com/magento/magento2/pull/20081) -- [Backport] Fixed issue - #19346 Import data 2.2.6 Value for 'product_type' attribute contains incorrect value (by @GovindaSharma)
+    * [magento/magento2#20080](https://github.com/magento/magento2/pull/20080) -- [Backport] Fixed  Incorrect class name on Orders and returns page. (by @shikhamis11)
+    * [magento/magento2#20083](https://github.com/magento/magento2/pull/20083) -- [Backport] fixed issue #19925 Close button overlapping in shipping address label whenever any user adding new shipping address in mobile view in checkout (by @GovindaSharma)
+    * [magento/magento2#19423](https://github.com/magento/magento2/pull/19423) -- Fixed bug, when exception occurred on order with coupons cancel, made by guest after creating of customer account. (by @Winfle)
+    * [magento/magento2#19927](https://github.com/magento/magento2/pull/19927) -- [Backport] [Framework] New Link is not correctly shown as Current if contains default parts (by @eduard13)
+    * [magento/magento2#20082](https://github.com/magento/magento2/pull/20082) -- [Backport] issue resolved:Undefined Variable $itemsOrderItemId (by @milindsingh)
+    * [magento/magento2#20208](https://github.com/magento/magento2/pull/20208) -- magento/magento2:#19101 - API REST and Reserved Order Id (by @saphaljha)
+    * [magento/magento2#20219](https://github.com/magento/magento2/pull/20219) -- Changes-Hamburger-Icon-was-available-on-a-page (by @amol2jcommerce)
+    * [magento/magento2#20178](https://github.com/magento/magento2/pull/20178) -- magento/magento2#16198: Category image remain after deleted. (by @p-bystritsky)
+    * [magento/magento2#20183](https://github.com/magento/magento2/pull/20183) -- 2.2 develop pr port 18888 (by @saphaljha)
+    * [magento/magento2#20185](https://github.com/magento/magento2/pull/20185) -- [Backport] Move website_name column into columnSet (by @mage2pratik)
+    * [magento/magento2#20271](https://github.com/magento/magento2/pull/20271) -- [Backport] Use the new json serializer which throws an error when failing (by @quisse)
+    * [magento/magento2#20286](https://github.com/magento/magento2/pull/20286) -- [Backport] Don't return categoryId from registry if the product doesn't belong in the current category (by @GovindaSharma)
+    * [magento/magento2#20298](https://github.com/magento/magento2/pull/20298) -- ISSUE-20296: "@magentoDataIsolation" is used instead of "@magentoDbIsolation" in some integration tests. (by @p-bystritsky)
+    * [magento/magento2#20325](https://github.com/magento/magento2/pull/20325) -- [Backport] issus fixed #20158 Store switcher not aligned proper in tab view (by @shikhamis11)
+    * [magento/magento2#20328](https://github.com/magento/magento2/pull/20328) -- [Backport] Fix issue 20232 : Backend order credit card detail check box misaligned (by @GovindaSharma)
+    * [magento/magento2#20329](https://github.com/magento/magento2/pull/20329) -- [Backport]  Product image failure when importing through CSV #20098 (by @irajneeshgupta)
+    * [magento/magento2#20353](https://github.com/magento/magento2/pull/20353) -- Fixed#20352: displaying html content for file type option on order view admin area (by @maheshWebkul721)
+    * [magento/magento2#19964](https://github.com/magento/magento2/pull/19964) -- [Backport] Fix the issue with reset password when customer has address from not allowed country (by @dmytro-ch)
+    * [magento/magento2#19984](https://github.com/magento/magento2/pull/19984) -- [Backport] Remove unneeded, also mistyped, saveHandler from CatalogSearch indexer declaration (by @dmytro-ch)
+    * [magento/magento2#20206](https://github.com/magento/magento2/pull/20206) -- 9130 remove the negative qty block. (by @saphaljha)
+    * [magento/magento2#20322](https://github.com/magento/magento2/pull/20322) -- issue #19609 Fixed for 2.2-develop (by @maheshWebkul721)
+    * [magento/magento2#19400](https://github.com/magento/magento2/pull/19400) -- [Backport]Fix-issue-19399-Add product customization option collapsible design issue (by @speedy008)
+    * [magento/magento2#20272](https://github.com/magento/magento2/pull/20272) -- Fixed-Review-Details-Detailed-Rating-misaligned (by @amol2jcommerce)
+    * [magento/magento2#20369](https://github.com/magento/magento2/pull/20369) -- 'Fixes-for-customer-login-page-input-field' :: On customer login page… (by @nainesh2jcommerce)
+    * [magento/magento2#20375](https://github.com/magento/magento2/pull/20375) -- [Backport] [Forwardport]Fix issue 19902 - Store View label and Dropdown misaligned  (by @speedy008)
+    * [magento/magento2#20433](https://github.com/magento/magento2/pull/20433) -- [Backport] Missing echo of php vars in widget template file - tabshoriz.phtml (by @irajneeshgupta)
+    * [magento/magento2#20439](https://github.com/magento/magento2/pull/20439) -- [Backport]  Meassage icon is not proper aligned (by @saphaljha)
+    * [magento/magento2#19377](https://github.com/magento/magento2/pull/19377) -- Back port pull #19094 (by @agorbulin)
+    * [magento/magento2#18362](https://github.com/magento/magento2/pull/18362) -- [Backport] fix(Webapi Xml Renderer - 18361): removed the not needed ampersand re… (by @nickshatilo)
+    * [magento/magento2#20184](https://github.com/magento/magento2/pull/20184) -- [Backport] Fix issue 19887 creating new shipment: getting all trackers. (by @mage2pratik)
+    * [magento/magento2#20505](https://github.com/magento/magento2/pull/20505) -- [Backport] Added constants to unit codes to make it easier to reuse it if necessary (by @mageprince)
+    * [magento/magento2#20509](https://github.com/magento/magento2/pull/20509) -- [Backport] Added required error message. (by @mageprince)
+    * [magento/magento2#20522](https://github.com/magento/magento2/pull/20522) -- [Backport] Add useful debug info for which website has not been found (by @mageprince)
+    * [magento/magento2#20541](https://github.com/magento/magento2/pull/20541) -- [Backport] Issue fixed #19985 Send email confirmation popup close button area ov… (by @irajneeshgupta)
+    * [magento/magento2#20284](https://github.com/magento/magento2/pull/20284) -- [Backport] Fix issue causing attribute not loading when using getList (by @GovindaSharma)
+    * [magento/magento2#20455](https://github.com/magento/magento2/pull/20455) -- [Backport] Fixed 19800 Contact us : design improvement (by @suryakant-krish)
+    * [magento/magento2#20456](https://github.com/magento/magento2/pull/20456) -- [Backport] Fixed 19791: Logo vertical misalignment.  (by @suryakant-krish)
+    * [magento/magento2#20457](https://github.com/magento/magento2/pull/20457) -- [Backport] Area Frontend: Fixed checkbox alignment account information page. (by @suryakant-krish)
+    * [magento/magento2#20177](https://github.com/magento/magento2/pull/20177) -- magento/magento2#15950: Magento2 CSV product import qty and is_in_stock not working correct. (by @p-bystritsky)
+    * [magento/magento2#20508](https://github.com/magento/magento2/pull/20508) -- [Backport] Fix negative credit memo #19899 (by @mageprince)
+    * [magento/magento2#20547](https://github.com/magento/magento2/pull/20547) -- [Backport] Fixed Issue #20121 Cancel order increases stock although "Set Items' Status to be In Stock When Order is Cancelled" is set to No (by @irajneeshgupta)
+    * [magento/magento2#20636](https://github.com/magento/magento2/pull/20636) -- [Backport] Fix issue with file uploading if an upload field is disabled  (by @serhiyzhovnir)
+    * [magento/magento2#20638](https://github.com/magento/magento2/pull/20638) -- [Backport] Floating point overflows in checkout totals fixed (by @shikhamis11)
+    * [magento/magento2#20647](https://github.com/magento/magento2/pull/20647) -- [Backport] fixed Negative order amount in dashboard (by @amol2jcommerce)
+    * [magento/magento2#20542](https://github.com/magento/magento2/pull/20542) -- [Backport] Order API resources updated. #20169 (by @irajneeshgupta)
+    * [magento/magento2#20544](https://github.com/magento/magento2/pull/20544) -- [Backport] 'wishlist-page-edit-remove-item-misalign' :: On wish list page edit, … (by @irajneeshgupta)
+    * [magento/magento2#20546](https://github.com/magento/magento2/pull/20546) -- [Backport] Order-view-invoices :: Order view invoices template not display prope… (by @irajneeshgupta)
+    * [magento/magento2#20685](https://github.com/magento/magento2/pull/20685) -- [Backport] update-button-issue-while-updating-billing-and-shipping-address (by @cmtickle)
+    * [magento/magento2#18809](https://github.com/magento/magento2/pull/18809) -- [Backport] catalog:images:resize total images count calculates incorrectly #18387 (by @vpodorozh)
+    * [magento/magento2#19461](https://github.com/magento/magento2/pull/19461) -- [Backport 2.2] issue #18931 fixed. (by @JeroenVanLeusden)
+    * [magento/magento2#19655](https://github.com/magento/magento2/pull/19655) -- Fixed - Shipping issue on PayPal Express #14712 (by @ssp58bleuciel)
+    * [magento/magento2#20285](https://github.com/magento/magento2/pull/20285) -- [Backport]#20222 Canary islands in ups carrier 2.2 (by @duckchip)
+    * [magento/magento2#20270](https://github.com/magento/magento2/pull/20270) -- [Backport] Fixed-Widget-option-labels-are-misalinged (by @amol2jcommerce)
+    * [magento/magento2#20418](https://github.com/magento/magento2/pull/20418) -- [Backport] issue fixed #20304 No space between step title and saved address in c… (by @shikhamis11)
+    * [magento/magento2#20613](https://github.com/magento/magento2/pull/20613) -- [Backport] admin-order-info-issue2.2 (by @dipti2jcommerce)
+    * [magento/magento2#20744](https://github.com/magento/magento2/pull/20744) -- [Backport] recent-order-product-title-misaligned (by @amol2jcommerce)
+    * [magento/magento2#20739](https://github.com/magento/magento2/pull/20739) -- [Backport] issue fixed #20563 Go to shipping information, Update qty & Addresses… (by @amol2jcommerce)
+    * [magento/magento2#19612](https://github.com/magento/magento2/pull/19612) -- [Backport] Fix: Attribute Option with zero at the beginning does not work if there is already option with the same number without the zero [REST API] (by @SikailoISM)
+    * [magento/magento2#19667](https://github.com/magento/magento2/pull/19667) -- [Backport] chore: remove old code for IE9 (by @DanielRuf)
+    * [magento/magento2#20642](https://github.com/magento/magento2/pull/20642) -- [Backport] magento/magento2#12194: Tier price on configurable product sorting so… (by @amol2jcommerce)
+    * [magento/magento2#20784](https://github.com/magento/magento2/pull/20784) -- [Backport] Gift-option-message-overlap-edit-and-remove-button-2.2 (by @ajay2jcommerce)
+    * [magento/magento2#20837](https://github.com/magento/magento2/pull/20837) -- [Backport] Fixed apply discount button alignment on checkout page (by @amol2jcommerce)
+    * [magento/magento2#20863](https://github.com/magento/magento2/pull/20863) -- [Backport] Update Filter.php fix issue #20624 (by @irajneeshgupta)
+    * [magento/magento2#20886](https://github.com/magento/magento2/pull/20886) -- [Backport] #20409 Fixed Unnecessary slash in namespace (by @milindsingh)
+    * [magento/magento2#20929](https://github.com/magento/magento2/pull/20929) -- resolve typo errors for js record.js (by @neeta-wagento)
+    * [magento/magento2#20540](https://github.com/magento/magento2/pull/20540) -- [Backport] issue fixed #20259 Store switcher not sliding up and down, only dropd… (by @irajneeshgupta)
+
+2.2.7
+=============
+* GitHub issues:
+    * [#15009](https://github.com/magento/magento2/issues/15009) -- [2.2.4] Gallery theme variables being ignored (fixed in [magento/magento2#16594](https://github.com/magento/magento2/pull/16594))
+    * [#16580](https://github.com/magento/magento2/issues/16580) -- Product gallery caption issue (fixed in [magento/magento2#16594](https://github.com/magento/magento2/pull/16594))
+    * [#16243](https://github.com/magento/magento2/issues/16243) -- Integration test ProcessCronQueueObserverTest.php succeeds regardless of magento config fixture (fixed in [magento/magento2#17191](https://github.com/magento/magento2/pull/17191))
+    * [#17193](https://github.com/magento/magento2/issues/17193) -- Error with translation of confirmation modal buttons (fixed in [magento/magento2#17275](https://github.com/magento/magento2/pull/17275))
+    * [#13445](https://github.com/magento/magento2/issues/13445) -- "Shop By" button disabling broken on the search page (fixed in [magento/magento2#15650](https://github.com/magento/magento2/pull/15650))
+    * [#16302](https://github.com/magento/magento2/issues/16302) -- JS files located outside the web/js directory (fixed in [magento/magento2#16582](https://github.com/magento/magento2/pull/16582))
+    * [#16653](https://github.com/magento/magento2/issues/16653) -- Not possible to create an invoice in Magento 2.3 (fixed in [magento/magento2#16656](https://github.com/magento/magento2/pull/16656))
+    * [#16655](https://github.com/magento/magento2/issues/16655) -- Block totalbar not used in invoice create and credit memo create screens (fixed in [magento/magento2#16656](https://github.com/magento/magento2/pull/16656))
+    * [#12250](https://github.com/magento/magento2/issues/12250) -- View.xml is inheriting image sizes from parent (so an optional field is replaced by the value of parent) (fixed in [magento/magento2#14537](https://github.com/magento/magento2/pull/14537))
+    * [#13480](https://github.com/magento/magento2/issues/13480) -- Unable to activate logs after switching from production mode to developer  (fixed in [magento/magento2#15335](https://github.com/magento/magento2/pull/15335))
+    * [#10687](https://github.com/magento/magento2/issues/10687) -- Product image roles randomly disappear (fixed in [magento/magento2#15606](https://github.com/magento/magento2/pull/15606))
+    * [#4803](https://github.com/magento/magento2/issues/4803) -- Incorrect return value from Product Attribute Repository (fixed in [magento/magento2#15691](https://github.com/magento/magento2/pull/15691))
+    * [#15028](https://github.com/magento/magento2/issues/15028) -- Configurable product addtocart with restAPI not working as expected (fixed in [magento/magento2#15720](https://github.com/magento/magento2/pull/15720))
+    * [#7372](https://github.com/magento/magento2/issues/7372) -- Product images gets removed from "Images And Videos" after validation alert. (fixed in [magento/magento2#16597](https://github.com/magento/magento2/pull/16597))
+    * [#13177](https://github.com/magento/magento2/issues/13177) -- Can't save attributes on a configurable product (fixed in [magento/magento2#16597](https://github.com/magento/magento2/pull/16597))
+    * [#16544](https://github.com/magento/magento2/issues/16544) -- Some of JS validation rules making fields required (fixed in [magento/magento2#16724](https://github.com/magento/magento2/pull/16724))
+    * [#16479](https://github.com/magento/magento2/issues/16479) -- Issue in adding the wishlist of "zero price" product.  (fixed in [magento/magento2#17395](https://github.com/magento/magento2/pull/17395))
+    * [#15457](https://github.com/magento/magento2/issues/15457) -- Bundle Products price range is showing expired special price from bundle options (fixed in [magento/magento2#15535](https://github.com/magento/magento2/pull/15535))
+    * [#16555](https://github.com/magento/magento2/issues/16555) -- "Shipping address is not set" exception in Multishipping Checkout. (fixed in [magento/magento2#16753](https://github.com/magento/magento2/pull/16753))
+    * [#17289](https://github.com/magento/magento2/issues/17289) -- Magento 2.2.5: Year-to-date dropdown in Stores>Configuration>General>Reports>Dashboard (fixed in [magento/magento2#17383](https://github.com/magento/magento2/pull/17383))
+    * [#16499](https://github.com/magento/magento2/issues/16499) -- User role issue with customer group (fixed in [magento/magento2#17515](https://github.com/magento/magento2/pull/17515))
+    * [#12362](https://github.com/magento/magento2/issues/12362) -- Concurrent (quick reload) requests on checkout cause cart to empty - related to session_regenerate_id (fixed in [magento/magento2#14973](https://github.com/magento/magento2/pull/14973))
+    * [#6305](https://github.com/magento/magento2/issues/6305) -- Can't save Customizable options (fixed in [magento/magento2#15357](https://github.com/magento/magento2/pull/15357))
+    * [#13102](https://github.com/magento/magento2/issues/13102) -- review/product/listAjax/id/{{non existent id}/ (fixed in [magento/magento2#15369](https://github.com/magento/magento2/pull/15369))
+    * [#17416](https://github.com/magento/magento2/issues/17416) -- Product image zoom (magnifier) is broken in Safari (fixed in [magento/magento2#17491](https://github.com/magento/magento2/pull/17491))
+    * [#17492](https://github.com/magento/magento2/issues/17492) -- "- undefined" displayed in checkout summary when shipping method name is not set (fixed in [magento/magento2#17526](https://github.com/magento/magento2/pull/17526))
+    * [#15041](https://github.com/magento/magento2/issues/15041) -- Adding a new fieldset to the admin category editor changes the position of the 'General' fieldset. (fixed in [magento/magento2#17540](https://github.com/magento/magento2/pull/17540))
+    * [#13948](https://github.com/magento/magento2/issues/13948) -- Sidebar shortcut to admin dashboard (Magento logo on top left) has no link in web setup wizard (fixed in [magento/magento2#17543](https://github.com/magento/magento2/pull/17543))
+    * [#16929](https://github.com/magento/magento2/issues/16929) -- Incorrect displaying Product Image Watermarks on Magento 2.2.5 (fixed in [magento/magento2#17013](https://github.com/magento/magento2/pull/17013))
+    * [#14819](https://github.com/magento/magento2/issues/14819) -- Custom Payment Method doesn't uncheck 'My billing and shipping address are the same' (fixed in [magento/magento2#17593](https://github.com/magento/magento2/pull/17593))
+    * [#13747](https://github.com/magento/magento2/issues/13747) -- Wysiwyg > Image Uploader >Max width/height (fixed in [magento/magento2#15942](https://github.com/magento/magento2/pull/15942))
+    * [#6585](https://github.com/magento/magento2/issues/6585) -- Optional PO number (fixed in [magento/magento2#14393](https://github.com/magento/magento2/pull/14393))
+    * [#17648](https://github.com/magento/magento2/issues/17648) -- UI validation rule for valid time am/pm doesn't work when js is minified (fixed in [magento/magento2#17652](https://github.com/magento/magento2/pull/17652))
+    * [#17700](https://github.com/magento/magento2/issues/17700) -- Message list component: the message type is always error when parameters specified (fixed in [magento/magento2#17701](https://github.com/magento/magento2/pull/17701))
+    * [#16927](https://github.com/magento/magento2/issues/16927) -- 2.2.5 Swagger: With JS minification enabled, the swagger-ui-bundle.js becomes corrupted (fixed in [magento/magento2#17626](https://github.com/magento/magento2/pull/17626))
+    * [#14248](https://github.com/magento/magento2/issues/14248) -- Transparent background becomes black for thumbnails of PNG into Wysiwyg editor... (fixed in [magento/magento2#16733](https://github.com/magento/magento2/pull/16733))
+    * [#17715](https://github.com/magento/magento2/issues/17715) -- duplicate event in Delete operation transaction "entity_manager_delete_before" (fixed in [magento/magento2#17718](https://github.com/magento/magento2/pull/17718))
+    * [#17587](https://github.com/magento/magento2/issues/17587) -- Typo in Magento\Cms\Model\Wysiwyg\Images\Storage function resizeFile($source, $keepRation = true) (fixed in [magento/magento2#17776](https://github.com/magento/magento2/pull/17776))
+    * [#17851](https://github.com/magento/magento2/issues/17851) -- Wishlist icon cut on Shopping cart page in mobile view (fixed in [magento/magento2#17877](https://github.com/magento/magento2/pull/17877))
+    * [#17789](https://github.com/magento/magento2/issues/17789) -- Next Page button triggered when filtering Customer grid (fixed in [magento/magento2#17870](https://github.com/magento/magento2/pull/17870))
+    * [#7903](https://github.com/magento/magento2/issues/7903) -- Datepicker does not scroll (fixed in [magento/magento2#16775](https://github.com/magento/magento2/pull/16775))
+* GitHub pull requests:
+    * [magento/magento2#16000](https://github.com/magento/magento2/pull/16000) -- Don't force enable "Use system value" checkboxes (by @likemusic)
+    * [magento/magento2#16505](https://github.com/magento/magento2/pull/16505) -- admin checkout agreement controllers refactor (by @AnshuMishra17)
+    * [magento/magento2#16594](https://github.com/magento/magento2/pull/16594) -- Fix broken commit in #15040 that accidentally reverted previous changes. (by @gwharton)
+    * [magento/magento2#17127](https://github.com/magento/magento2/pull/17127) -- Allow 3rd party modules to perform actions after totals calculation (by @navarr)
+    * [magento/magento2#17122](https://github.com/magento/magento2/pull/17122) -- Added missing exception cause for better error handling (by @woutersamaey)
+    * [magento/magento2#17153](https://github.com/magento/magento2/pull/17153) -- Set proper text-aligh for the <th> element of the Subtotal column in the Creditmemo email (by @TomashKhamlai)
+    * [magento/magento2#17203](https://github.com/magento/magento2/pull/17203) -- [Backport] Refactored multiples conditions which could be grouped in a single on (by @mage2pratik)
+    * [magento/magento2#17236](https://github.com/magento/magento2/pull/17236) -- [Backport] Fixed invalid knockoutjs data binding for Braintree PayPal (by @tiagosampaio)
+    * [magento/magento2#17217](https://github.com/magento/magento2/pull/17217) -- [Backport] Broken Responsive Layout on Top page (by @mage2pratik)
+    * [magento/magento2#17246](https://github.com/magento/magento2/pull/17246) -- [Backport] FIXED: FTP user and password strings urldecoded (by @mage2pratik)
+    * [magento/magento2#16788](https://github.com/magento/magento2/pull/16788) -- Replace sort callbacks to spaceship operator (by @lbajsarowicz)
+    * [magento/magento2#17103](https://github.com/magento/magento2/pull/17103) -- Code cleanup of lib files (by @mage2pratik)
+    * [magento/magento2#17191](https://github.com/magento/magento2/pull/17191) -- [Backport 2.2]Filter test result collection with the cron job code defined in the c (by @gelanivishal)
+    * [magento/magento2#17275](https://github.com/magento/magento2/pull/17275) -- fix #17193 Error with translation of confirmation modal buttons (by @Karlasa)
+    * [magento/magento2#17291](https://github.com/magento/magento2/pull/17291) -- fix: remove unused ID (by @DanielRuf)
+    * [magento/magento2#15650](https://github.com/magento/magento2/pull/15650) -- Fixed "Shop By" button disabling broken on the search page #13445 (by @AndreaRivadossi)
+    * [magento/magento2#16354](https://github.com/magento/magento2/pull/16354) -- Remove unnecessary translation of HTML tags (by @Yogeshks)
+    * [magento/magento2#16510](https://github.com/magento/magento2/pull/16510) -- Fix the special price expression. (by @DmitryChukhnov)
+    * [magento/magento2#16582](https://github.com/magento/magento2/pull/16582) -- Resolved : JS files located outside the web/js directory (by @hitesh-wagento)
+    * [magento/magento2#16656](https://github.com/magento/magento2/pull/16656) -- [Fix #16655] Block totalbar not used in invoice create and credit memo create screens (by @dverkade)
+    * [magento/magento2#16848](https://github.com/magento/magento2/pull/16848) -- Replace floatval() function by using direct type casting to (float)  (by @mhauri)
+    * [magento/magento2#16849](https://github.com/magento/magento2/pull/16849) -- Replace strval() function by using direct type casting to (string) (by @mhauri)
+    * [magento/magento2#17070](https://github.com/magento/magento2/pull/17070) -- Resolved special character issue for sidebar (by @deepjoshi94)
+    * [magento/magento2#17066](https://github.com/magento/magento2/pull/17066) -- Update CMS Page Index (by @hryvinskyi)
+    * [magento/magento2#17189](https://github.com/magento/magento2/pull/17189) -- Don't add empty method to the cart summary (by @arnoudhgz)
+    * [magento/magento2#17250](https://github.com/magento/magento2/pull/17250) -- Maintenance: Compare products. Add unit test coverage & missed class property declaration. (by @swnsma)
+    * [magento/magento2#17327](https://github.com/magento/magento2/pull/17327) -- fix: add missing data-th selector for tables (by @DanielRuf)
+    * [magento/magento2#17365](https://github.com/magento/magento2/pull/17365) -- [Backport] Fixed some minor css issue (by @arnoudhgz)
+    * [magento/magento2#17368](https://github.com/magento/magento2/pull/17368) -- [Braintree] Unit tests for TransactionRefund and TransactionVoid classes (by @rogyar)
+    * [magento/magento2#14537](https://github.com/magento/magento2/pull/14537) -- magento/magento2#12250: View.xml is inheriting image sizes from paren (by @quisse)
+    * [magento/magento2#15335](https://github.com/magento/magento2/pull/15335) -- Fixed issue #13480 - Unable to activate logs after switching from production mode to developer (by @jayankaghosh)
+    * [magento/magento2#15606](https://github.com/magento/magento2/pull/15606) -- Fix #10687 - Product image roles disappearing (by @Scarraban)
+    * [magento/magento2#15691](https://github.com/magento/magento2/pull/15691) -- Fix #4803: Incorrect return value from Product Attribute Repository (by @cream-julian)
+    * [magento/magento2#15720](https://github.com/magento/magento2/pull/15720) -- Convert to string $option->getValue, in order to be compared with oth (by @zamboten)
+    * [magento/magento2#16597](https://github.com/magento/magento2/pull/16597) -- Save configurable product options after validation error (by @swnsma)
+    * [magento/magento2#16724](https://github.com/magento/magento2/pull/16724) -- 16544: fixed behaviour when some of JS validation rules making fields (by @VitaliyBoyko)
+    * [magento/magento2#16955](https://github.com/magento/magento2/pull/16955) -- fix: remove disabled attribute on region list (by @DanielRuf)
+    * [magento/magento2#17078](https://github.com/magento/magento2/pull/17078) -- MAGETWO-84608: Cannot perform setup:install if Redis needs a password (by @guillaumegiordana)
+    * [magento/magento2#17405](https://github.com/magento/magento2/pull/17405) -- [Braintree] Added unit test for instant purchase PayPal token formatter (by @rogyar)
+    * [magento/magento2#14397](https://github.com/magento/magento2/pull/14397) -- Allows modules with underscores in name to set custom a frontend_model in system.xml (by @bentideswell)
+    * [magento/magento2#16570](https://github.com/magento/magento2/pull/16570) -- [update] enhance performance on large catalog (by @AurelienLavorel)
+    * [magento/magento2#17101](https://github.com/magento/magento2/pull/17101) -- Refactory to Magento_Backend module class. (by @tiagosampaio)
+    * [magento/magento2#17395](https://github.com/magento/magento2/pull/17395) -- [Backport] Fixed add to wishlist issue on product price 0 (by @sreichel)
+    * [magento/magento2#17437](https://github.com/magento/magento2/pull/17437) -- Improvements in UI component MassActions  (by @alexeya-ven)
+    * [magento/magento2#15535](https://github.com/magento/magento2/pull/15535) -- FIX for issue #15457 - Bundle Products price range is showing expired (by @phoenix128)
+    * [magento/magento2#15507](https://github.com/magento/magento2/pull/15507) -- fix: cache count() results for loops (by @DanielRuf)
+    * [magento/magento2#16753](https://github.com/magento/magento2/pull/16753) -- Fix the issue with "Shipping address is not set" exception (by @dmytro-ch)
+    * [magento/magento2#17454](https://github.com/magento/magento2/pull/17454) -- Braintree: test coverage (by @dmytro-ch)
+    * [magento/magento2#17383](https://github.com/magento/magento2/pull/17383) -- Magento 2.2.5: Year-to-date dropdown in Stores>Configuration>General>Reports>Dashboard #17289 (by @teddysie)
+    * [magento/magento2#15171](https://github.com/magento/magento2/pull/15171) -- AD-HOC feat (Profiler): Allow supplying complex profiler configuration (by @andrewhowdencom)
+    * [magento/magento2#16855](https://github.com/magento/magento2/pull/16855) -- Doesn't work if use date as condition for Catalog Price Rules (by @GlennCheng)
+    * [magento/magento2#13649](https://github.com/magento/magento2/pull/13649) -- Fix possible undefined index when caching config data (by @mimarcel)
+    * [magento/magento2#17479](https://github.com/magento/magento2/pull/17479) -- updating lib LESS docs (by @Karlasa)
+    * [magento/magento2#17505](https://github.com/magento/magento2/pull/17505) -- Refactor: remove some code duplication (by @arnoudhgz)
+    * [magento/magento2#17515](https://github.com/magento/magento2/pull/17515) -- Solution for User role issue with customer group (by @emiprotech)
+    * [magento/magento2#17561](https://github.com/magento/magento2/pull/17561) -- Catalog: Add unit tests for Cron classes (by @dmytro-ch)
+    * [magento/magento2#13133](https://github.com/magento/magento2/pull/13133) -- Magento PayPal checkout fails if email sending fails / other payment does not (by @driskell)
+    * [magento/magento2#14973](https://github.com/magento/magento2/pull/14973) -- Fix unstable session manager (by @elioermini)
+    * [magento/magento2#15357](https://github.com/magento/magento2/pull/15357) -- 6305 - Resolved product custom option title save issue (by @Madhumalak)
+    * [magento/magento2#15369](https://github.com/magento/magento2/pull/15369) -- Fixed review list ajax if product not exist redirect to 404 page #13102 (by @ananth747)
+    * [magento/magento2#16021](https://github.com/magento/magento2/pull/16021) -- Introduce Block Config Source (by @thomas-blackbird)
+    * [magento/magento2#17491](https://github.com/magento/magento2/pull/17491) -- [Backport] Fix incorrect image magnifier size bug in Safari (by @dannynimmo)
+    * [magento/magento2#17526](https://github.com/magento/magento2/pull/17526) -- Fixed undefinded shipping method name issue #17492 (by @gelanivishal)
+    * [magento/magento2#17540](https://github.com/magento/magento2/pull/17540) -- Fix for #15041 Adding a new fieldset to the admin category editor changes the position of the 'General' fieldset (by @vasilii-b)
+    * [magento/magento2#17552](https://github.com/magento/magento2/pull/17552) -- Fix proxy generation return type (by @adrian-martinez-interactiv4)
+    * [magento/magento2#17590](https://github.com/magento/magento2/pull/17590) -- Braintree: Add unit test for CreditCard/TokenFormatter (by @eduard13)
+    * [magento/magento2#16777](https://github.com/magento/magento2/pull/16777) -- Fix Translation of error message on cart for deleted bundle option. (by @swnsma)
+    * [magento/magento2#17527](https://github.com/magento/magento2/pull/17527) -- Refactor JS code and added JS component file (by @Yogeshks)
+    * [magento/magento2#17543](https://github.com/magento/magento2/pull/17543) -- Link logo in web setup wizard to back-end base URL (by @arnoudhgz)
+    * [magento/magento2#17575](https://github.com/magento/magento2/pull/17575) -- Translated validation error messages (by @Yogeshks)
+    * [magento/magento2#17013](https://github.com/magento/magento2/pull/17013) -- Fixed #16929 - Incorrect displaying Product Image Watermarks on Magento 2.2.5 (by @ronak2ram)
+    * [magento/magento2#17484](https://github.com/magento/magento2/pull/17484) -- Fix sending duplicate emails (by @iGerchak)
+    * [magento/magento2#17593](https://github.com/magento/magento2/pull/17593) -- Fixing the address checkbox being unchecked on payment step. (by @eduard13)
+    * [magento/magento2#15942](https://github.com/magento/magento2/pull/15942) -- Making configurable settings for MAX_IMAGE_WIDTH and MAX_IMAGE_HEIGHT (by @eduard13)
+    * [magento/magento2#17602](https://github.com/magento/magento2/pull/17602) -- Fix Custom Attribute Group can not translate in catalog/product page (by @GraysonChiang)
+    * [magento/magento2#14393](https://github.com/magento/magento2/pull/14393) -- Validate that the PO Number is set on the payment instance. (by @centerax)
+    * [magento/magento2#17633](https://github.com/magento/magento2/pull/17633) -- Added unit test for newsletter problem model (by @rogyar)
+    * [magento/magento2#17652](https://github.com/magento/magento2/pull/17652) -- Update time12h javascript validation rule to be compatible with js minify (by @markoshust)
+    * [magento/magento2#17678](https://github.com/magento/magento2/pull/17678) -- CMS: Add missing unit tests for model classes (by @dmytro-ch)
+    * [magento/magento2#17521](https://github.com/magento/magento2/pull/17521) -- Translated admin menu titles (by @Yogeshks)
+    * [magento/magento2#17690](https://github.com/magento/magento2/pull/17690) -- Integration test for reviews delete observer (by @rogyar)
+    * [magento/magento2#17693](https://github.com/magento/magento2/pull/17693) -- Review: Adding missing unit test for Observer (by @eduard13)
+    * [magento/magento2#17701](https://github.com/magento/magento2/pull/17701) -- Message list component fix: the message type is always error when parameters specified (by @dmytro-ch)
+    * [magento/magento2#17710](https://github.com/magento/magento2/pull/17710) -- Sales Rule: Add unit tests for model classes (by @dmytro-ch)
+    * [magento/magento2#17626](https://github.com/magento/magento2/pull/17626) -- Use '.min' in filenames of already minified js files in the Swagger module so they aren't getting minified again in production, fixes #16927 - for Magento 2.2 (by @hostep)
+    * [magento/magento2#16733](https://github.com/magento/magento2/pull/16733) -- Fixes black background for png images in wysiwyg editors (by @eduard13)
+    * [magento/magento2#17718](https://github.com/magento/magento2/pull/17718) -- ISSUE-17715: Duplicate event in Delete operation transaction "entity_manager_delete_before". (by @p-bystritsky)
+    * [magento/magento2#17735](https://github.com/magento/magento2/pull/17735) -- Fix translation issue (by @jignesh-baldha)
+    * [magento/magento2#17776](https://github.com/magento/magento2/pull/17776) -- [Backport] Changed storage.php (by @MartinAarts)
+    * [magento/magento2#17801](https://github.com/magento/magento2/pull/17801) -- [Search] Unit test for SynonymAnalyzer model (by @furseyev)
+    * [magento/magento2#17817](https://github.com/magento/magento2/pull/17817) -- Update issue templates for Magento 2 GitHub project (by @ishakhsuvarov)
+    * [magento/magento2#17385](https://github.com/magento/magento2/pull/17385) -- Remove leading Countrycode from EU-VAT-Numbers (by @Drischie)
+    * [magento/magento2#17739](https://github.com/magento/magento2/pull/17739) -- Search: Add unit test for PopularSearchTerms model (by @dmytro-ch)
+    * [magento/magento2#17773](https://github.com/magento/magento2/pull/17773) -- Fix for ProductLink - setterName was incorrectly being set (by @insanityinside)
+    * [magento/magento2#17877](https://github.com/magento/magento2/pull/17877) -- Resolved : Wishlist icon cut on Shopping cart page in mobile view #17851 (by @hitesh-wagento)
+    * [magento/magento2#17876](https://github.com/magento/magento2/pull/17876) -- Sales: Add unit test for validator model class (by @dmytro-ch)
+    * [magento/magento2#17840](https://github.com/magento/magento2/pull/17840) -- API-functional test for Search (by @rogyar)
+    * [magento/magento2#17870](https://github.com/magento/magento2/pull/17870) -- Fix - Next Page button triggered when filtering Customer grid (by @ronak2ram)
+    * [magento/magento2#16800](https://github.com/magento/magento2/pull/16800) -- [2.2-dev] Move functions.php into Framework (by @fooman)
+    * [magento/magento2#17872](https://github.com/magento/magento2/pull/17872) -- [Backport] Replacing deprecated methods for tests. (by @tiagosampaio)
+    * [magento/magento2#16775](https://github.com/magento/magento2/pull/16775) -- [Forwardport] #7903 correct the position of the datepicker when you scroll (by @hitesh-wagento)
+
 2.2.6
 =============
 * GitHub issues:
diff --git a/README.md b/README.md
index d64ac8061528f..5a200505ec576 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=2.2-develop)](https://travis-ci.org/magento/magento2)
 [![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
diff --git a/app/bootstrap.php b/app/bootstrap.php
index 8e901cac9bfb8..4a923cd0c910b 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -8,6 +8,7 @@
  * Environment initialization
  */
 error_reporting(E_ALL);
+stream_wrapper_unregister('phar');
 #ini_set('display_errors', 1);
 
 /* PHP version validation */
diff --git a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
index 6f0e42bdcbef1..e515fb3ccae6c 100644
--- a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
+++ b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
@@ -8,6 +8,9 @@
 
 namespace Magento\AdminNotification\Block\Grid\Renderer;
 
+/**
+ * Renderer class for action in the admin notifications grid.
+ */
 class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
@@ -37,19 +40,23 @@ public function __construct(
      */
     public function render(\Magento\Framework\DataObject $row)
     {
-        $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' .
+        $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' .
+            $this->escapeUrl($row->getUrl())
+            . '">' .
             __('Read Details') . '</a>' : '';
 
-        $markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(
-            '*/*/markAsRead/',
-            ['_current' => true, 'id' => $row->getId()]
-        ) . '">' . __(
-            'Mark as Read'
-        ) . '</a>' : '';
+        $markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' .
+            $this->getUrl(
+                '*/*/markAsRead/',
+                ['_current' => true, 'id' => $row->getId()]
+            ) . '">' . __(
+                'Mark as Read'
+            ) . '</a>' : '';
 
         $encodedUrl = $this->_urlHelper->getEncodedUrl();
         return sprintf(
-            '%s%s<a class="action-delete" href="%s" onClick="deleteConfirm(\'%s\', this.href); return false;">%s</a>',
+            '%s%s<a class="action-delete" href="%s" onclick="deleteConfirm(\'%s\', this.href, {data: {}});' .
+            ' return false;">%s</a>',
             $readDetailsHtml,
             $markAsReadHtml,
             $this->getUrl(
diff --git a/app/code/Magento/AdminNotification/Model/Feed.php b/app/code/Magento/AdminNotification/Model/Feed.php
index 1766425fb19b1..5a4f7d5ddd390 100644
--- a/app/code/Magento/AdminNotification/Model/Feed.php
+++ b/app/code/Magento/AdminNotification/Model/Feed.php
@@ -25,6 +25,11 @@ class Feed extends \Magento\Framework\Model\AbstractModel
 
     const XML_LAST_UPDATE_PATH = 'system/adminnotification/last_update';
 
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
     /**
      * Feed url
      *
@@ -77,6 +82,7 @@ class Feed extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param \Magento\Framework\Escaper|null $escaper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -90,7 +96,8 @@ public function __construct(
         \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Escaper $escaper = null
     ) {
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
         $this->_backendConfig    = $backendConfig;
@@ -99,12 +106,16 @@ public function __construct(
         $this->_deploymentConfig = $deploymentConfig;
         $this->productMetadata   = $productMetadata;
         $this->urlBuilder        = $urlBuilder;
+        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\Escaper::class
+        );
     }
 
     /**
      * Init model
      *
      * @return void
+     * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
      */
     protected function _construct()
     {
@@ -255,6 +266,6 @@ public function getFeedXml()
      */
     private function escapeString(\SimpleXMLElement $data)
     {
-        return htmlspecialchars((string)$data);
+        return $this->escaper->escapeHtml((string)$data);
     }
 }
diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
index ae1b8dc7d14ff..618191a84d6b8 100644
--- a/app/code/Magento/AdminNotification/composer.json
+++ b/app/code/Magento/AdminNotification/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-admin-notification",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-backend": "100.2.*",
         "magento/module-media-storage": "100.2.*",
@@ -11,7 +11,7 @@
         "lib-libxml": "*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
index 3f79e803ccca2..6f403d8fbd36b 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
@@ -4,10 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
-?>
-<?php
 /**
  * @see \Magento\AdminNotification\Block\Window
  */
@@ -19,11 +15,11 @@
             "autoOpen": true,
             "buttons": false,
             "modalClass": "modal-system-messages",
-            "title": "<?= /* @escapeNotVerified */ $block->getHeaderText() ?>"
+            "title": "<?= $block->escapeHtmlAttr($block->getHeaderText()) ?>"
         }
     }'>
     <li class="message message-warning warning">
-        <?= /* @escapeNotVerified */ $block->getNoticeMessageText() ?><br/>
-        <a href="<?= /* @escapeNotVerified */ $block->getNoticeMessageUrl() ?>"><?= /* @escapeNotVerified */ $block->getReadDetailsText() ?></a>
+        <?= $block->escapeHtml($block->getNoticeMessageText()) ?><br/>
+        <a href="<?= $block->escapeUrl($block->getNoticeMessageUrl()) ?>"><?= $block->escapeHtml($block->getReadDetailsText()) ?></a>
     </li>
 </ul>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml
index 01d6fdcb29571..60e3d63473596 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml
@@ -4,41 +4,39 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var $block \Magento\AdminNotification\Block\System\Messages */
 ?>
-<?php /** @var $block \Magento\AdminNotification\Block\System\Messages */ ?>
 
 <?php $lastCritical = $block->getLastCritical();?>
-<div id="system_messages" class="message-system<?php if ($lastCritical): ?> message-system-unread<?php endif; ?>">
+<div id="system_messages" class="message-system<?php if ($lastCritical) : ?> message-system-unread<?php endif; ?>">
     <div class="message-system-inner">
-        <?php if ($lastCritical): ?>
+        <?php if ($lastCritical) : ?>
             <ul class="message-system-list">
                 <li class="message message-warning error">
-                    <?= /* @escapeNotVerified */ $lastCritical->getText() ?>
+                    <?= $block->escapeHtml($lastCritical->getText()) ?>
                 </li>
             </ul>
         <?php endif; ?>
         <div class="message-system-short">
             <span class="message-system-short-label">
-                <?= /* @escapeNotVerified */ __('System Messages:') ?>
+                <?= $block->escapeHtml(__('System Messages:')) ?>
             </span>
 
-            <?php if ($block->getCriticalCount()): ?>
+            <?php if ($block->getCriticalCount()) : ?>
                 <div class="message message-warning error">
                     <a class="message-link" href="#" title="<?= $block->escapeHtml(__('Critical System Messages')) ?>">
-                        <?= /* @escapeNotVerified */ $block->getCriticalCount() ?>
+                        <?= $block->escapeHtml($block->getCriticalCount()) ?>
                     </a>
                 </div>
-            <?php endif;?>
+            <?php endif; ?>
 
-            <?php if ($block->getMajorCount()): ?>
-               <div class="message message-warning warning">
-                   <a class="message-link" href="#" title="<?= $block->escapeHtml(__('Major System Messages')) ?>">
-                       <?= /* @escapeNotVerified */ $block->getMajorCount() ?>
-                   </a>
-               </div>
-            <?php endif;?>
+            <?php if ($block->getMajorCount()) : ?>
+                <div class="message message-warning warning">
+                    <a class="message-link" href="#" title="<?= $block->escapeHtml(__('Major System Messages')) ?>">
+                        <?= $block->escapeHtml($block->getMajorCount()) ?>
+                    </a>
+                </div>
+            <?php endif; ?>
         </div>
         <div id="message-system-all" title="<?= $block->escapeHtml(__('System messages')) ?>" data-mage-init='<?= $block->escapeHtml($block->getSystemMessageDialogJson()) ?>'></div>
     </div>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
index 0448daaf17644..6673ad7a18b38 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
@@ -4,16 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */
 ?>
-<?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
 
-<div style="display:none" id="system_messages_list" data-role="system_messages_list" title="<?= $block->escapeHtml($block->getPopupTitle()) ?>">
+<div style="display:none" id="system_messages_list" data-role="system_messages_list" title="<?= $block->escapeHtmlAttr($block->getPopupTitle()) ?>">
     <ul class="message-system-list messages">
-        <?php foreach ($block->getUnreadMessages() as $message): ?>
-            <li class="message message-warning <?= /* @escapeNotVerified */ $block->getItemClass($message) ?>">
-                <?= /* @escapeNotVerified */ $message->getText() ?>
+        <?php foreach ($block->getUnreadMessages() as $message) : ?>
+            <li class="message message-warning <?= $block->escapeHtmlAttr($block->getItemClass($message)) ?>">
+                <?= $block->escapeHtml($message->getText()) ?>
             </li>
         <?php endforeach;?>
     </ul>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
index 777448cdd82b4..38398727e0f90 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
@@ -4,81 +4,78 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/** @var $this \Magento\AdminNotification\Block\ToolbarEntry */
 
-?>
-<?php /** @var $this \Magento\AdminNotification\Block\ToolbarEntry */ ?>
-<?php
     $notificationCount = $block->getUnreadNotificationCount();
     $notificationCounterMax = $block->getNotificationCounterMax();
 ?>
 <div
     data-mage-init='{"toolbarEntry": {}}'
     class="notifications-wrapper admin__action-dropdown-wrap"
-    data-notification-count="<?= /* @escapeNotVerified */ $notificationCount ?>">
+    data-notification-count="<?= (int)$notificationCount ?>">
     <?php if ($notificationCount > 0) : ?>
         <a
-            href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/index') ?>"
+            href="<?= $block->escapeUrl($block->getUrl('adminhtml/notification/index')) ?>"
             class="notifications-action admin__action-dropdown"
             data-mage-init='{"dropdown":{}}'
-            title="<?= /* @escapeNotVerified */ __('Notifications') ?>"
+            title="<?= $block->escapeHtmlAttr(__('Notifications')) ?>"
             data-toggle="dropdown">
             <span class="notifications-counter">
-                <?= /* @escapeNotVerified */ ($notificationCount > $notificationCounterMax) ? $notificationCounterMax . '+' : $notificationCount ?>
+                <?= /* @noEscape */ ($notificationCount > $notificationCounterMax) ? (int)$notificationCounterMax . '+' : (int)$notificationCount ?>
             </span>
         </a>
         <ul
             class="admin__action-dropdown-menu"
-            data-mark-as-read-url="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/ajaxMarkAsRead') ?>">
+            data-mark-as-read-url="<?= $block->escapeUrl($block->getUrl('adminhtml/notification/ajaxMarkAsRead')) ?>">
             <?php foreach ($block->getLatestUnreadNotifications() as $notification) : ?>
-            <?php /** @var $notification \Magento\AdminNotification\Model\Inbox*/ ?>
-            <li class="notifications-entry<?php if ($notification->getSeverity() == 1): ?> notifications-critical<?php endif; ?>"
-                data-notification-id="<?= /* @escapeNotVerified */ $notification->getId() ?>"
-                data-notification-severity="<?php if ($notification->getSeverity() == 1): ?>1<?php endif; ?>">
-                <?php
-                    $notificationDescription = $block->escapeHtml($notification->getDescription());
-                    $notificationDescriptionLength = $block->getNotificationDescriptionLength();
-                ?>
-                <strong class="notifications-entry-title">
-                    <?= $block->escapeHtml($notification->getTitle()) ?>
-                </strong>
-                <?php if (strlen($notificationDescription) > $notificationDescriptionLength) : ?>
-                    <p class="notifications-entry-description _cutted">
-                        <span class="notifications-entry-description-start">
-                            <?= /* @escapeNotVerified */ substr($notificationDescription, 0, $notificationDescriptionLength) ?>
-                        </span>
-                        <span class="notifications-entry-description-end">
-                            <?= /* @escapeNotVerified */ substr($notificationDescription, $notificationDescriptionLength) ?>
-                        </span>
-                    </p>
-                <?php else : ?>
-                    <p class="notifications-entry-description">
-                        <?= /* @escapeNotVerified */ $notificationDescription ?>
-                    </p>
-                <?php endif; ?>
-                <time class="notifications-entry-time">
-                    <?= /* @escapeNotVerified */ $block->formatNotificationDate($notification->getDateAdded()) ?>
-                </time>
-                <button
-                    type="button"
-                    class="notifications-close"
-                    title="<?= /* @escapeNotVerified */ __('Close') ?>"
-                    ></button>
-            </li>
+                <?php /** @var $notification \Magento\AdminNotification\Model\Inbox */ ?>
+                <li class="notifications-entry<?php if ($notification->getSeverity() == 1) : ?> notifications-critical<?php endif; ?>"
+                    data-notification-id="<?= $block->escapeHtmlAttr($notification->getId()) ?>"
+                    data-notification-severity="<?php if ($notification->getSeverity() == 1) : ?>1<?php endif; ?>">
+                    <?php
+                        $notificationDescription = $notification->getDescription();
+                        $notificationDescriptionLength = $block->getNotificationDescriptionLength();
+                    ?>
+                    <strong class="notifications-entry-title">
+                        <?= $block->escapeHtml($notification->getTitle()) ?>
+                    </strong>
+                    <?php if (strlen($notificationDescription) > $notificationDescriptionLength) : ?>
+                        <p class="notifications-entry-description _cutted">
+                            <span class="notifications-entry-description-start">
+                                <?= $block->escapeHtml(substr($notificationDescription, 0, $notificationDescriptionLength)) ?>
+                            </span>
+                            <span class="notifications-entry-description-end">
+                                <?= $block->escapeHtml(substr($notificationDescription, $notificationDescriptionLength)) ?>
+                            </span>
+                        </p>
+                    <?php else : ?>
+                        <p class="notifications-entry-description">
+                            <?= $block->escapeHtml($notificationDescription) ?>
+                        </p>
+                    <?php endif; ?>
+                    <time class="notifications-entry-time">
+                        <?= $block->escapeHtml($block->formatNotificationDate($notification->getDateAdded())) ?>
+                    </time>
+                    <button
+                        type="button"
+                        class="notifications-close"
+                        title="<?= $block->escapeHtmlAttr(__('Close')) ?>"
+                        ></button>
+                </li>
             <?php endforeach; ?>
             <li class="notifications-entry notifications-entry-last">
                 <a
-                    href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/index') ?>"
+                    href="<?= $block->escapeUrl($block->getUrl('adminhtml/notification/index')) ?>"
                     class="action-tertiary action-more">
-                    <?= /* @escapeNotVerified */ __('See All (') ?><span class="notifications-counter"><?= /* @escapeNotVerified */ $notificationCount ?></span><?= /* @escapeNotVerified */ __(' unread)') ?>
+                    <?= $block->escapeHtml(__('See All (')) ?><span class="notifications-counter"><?= (int)$notificationCount ?></span><?= $block->escapeHtml(__(' unread)')) ?>
                 </a>
             </li>
         </ul>
     <?php else : ?>
         <a
             class="notifications-action admin__action-dropdown"
-            href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/index') ?>"
-            title="<?= /* @escapeNotVerified */ __('Notifications') ?>">
+            href="<?= $block->escapeUrl($block->getUrl('adminhtml/notification/index')) ?>"
+            title="<?= $block->escapeHtmlAttr(__('Notifications')) ?>">
         </a>
     <?php endif; ?>
 </div>
diff --git a/app/code/Magento/AdvancedPricingImportExport/composer.json b/app/code/Magento/AdvancedPricingImportExport/composer.json
index 458827b9ab18a..c1424efe6033a 100644
--- a/app/code/Magento/AdvancedPricingImportExport/composer.json
+++ b/app/code/Magento/AdvancedPricingImportExport/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-advanced-pricing-import-export",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-catalog": "102.0.*",
         "magento/module-catalog-inventory": "100.2.*",
         "magento/module-eav": "101.0.*",
@@ -13,7 +13,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php
index 407e323aeaae6..e30f1434dd23a 100644
--- a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php
@@ -36,7 +36,7 @@ class AdditionalCommentTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
-            ->setMethods(['getComment', 'getLabel'])
+            ->setMethods(['getComment', 'getLabel', 'getHtmlId', 'getName'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->contextMock = $this->getMockBuilder(Context::class)
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
index 54612076a757f..1a06b309beb5e 100644
--- a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
@@ -37,9 +37,18 @@ class CollectionTimeLabelTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
-            ->setMethods(['getComment'])
+            ->setMethods(['getComment', 'getHtmlId', 'getName'])
             ->disableOriginalConstructor()
             ->getMock();
+
+        $objectManager = new ObjectManager($this);
+        $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
+        $objectManager->setBackwardCompatibleProperty(
+            $this->abstractElementMock,
+            '_escaper',
+            $escaper
+        );
+
         $this->contextMock = $this->getMockBuilder(Context::class)
             ->setMethods(['getLocaleDate'])
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
index 0806187ebac01..48b2d4ee33e7f 100644
--- a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
@@ -51,9 +51,18 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
-            ->setMethods(['getComment'])
+            ->setMethods(['getComment', 'getHtmlId', 'getName'])
             ->disableOriginalConstructor()
             ->getMock();
+
+        $objectManager = new ObjectManager($this);
+        $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
+        $objectManager->setBackwardCompatibleProperty(
+            $this->abstractElementMock,
+            '_escaper',
+            $escaper
+        );
+
         $this->formMock = $this->getMockBuilder(Form::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php
index 6a0cecc781062..06a12414a8126 100644
--- a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php
@@ -36,9 +36,18 @@ class VerticalTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
-            ->setMethods(['getComment', 'getLabel', 'getHint'])
+            ->setMethods(['getComment', 'getLabel', 'getHint', 'getHtmlId', 'getName'])
             ->disableOriginalConstructor()
             ->getMock();
+
+        $objectManager = new ObjectManager($this);
+        $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
+        $objectManager->setBackwardCompatibleProperty(
+            $this->abstractElementMock,
+            '_escaper',
+            $escaper
+        );
+
         $this->contextMock = $this->getMockBuilder(Context::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/app/code/Magento/Analytics/composer.json b/app/code/Magento/Analytics/composer.json
index 7edb72db45e52..a268c3de09d7f 100644
--- a/app/code/Magento/Analytics/composer.json
+++ b/app/code/Magento/Analytics/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-analytics",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-backend": "100.2.*",
         "magento/module-config": "101.0.*",
         "magento/module-integration": "100.2.*",
@@ -10,7 +10,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
index 35063d1516784..f982088934010 100644
--- a/app/code/Magento/Authorization/composer.json
+++ b/app/code/Magento/Authorization/composer.json
@@ -2,12 +2,12 @@
     "name": "magento/module-authorization",
     "description": "Authorization module provides access to Magento ACL functionality.",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-backend": "100.2.*",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/PaymentDetails.php b/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/PaymentDetails.php
new file mode 100644
index 0000000000000..396df76d882e4
--- /dev/null
+++ b/app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/PaymentDetails.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Authorizenet\Block\Adminhtml\Order\View\Info;
+
+use Magento\Framework\Phrase;
+use Magento\Payment\Block\ConfigurableInfo;
+
+/**
+ * Payment information block for Authorize.net payment method.
+ */
+class PaymentDetails extends ConfigurableInfo
+{
+    /**
+     * Returns localized label for payment info block.
+     *
+     * @param string $field
+     * @return string | Phrase
+     */
+    protected function getLabel($field)
+    {
+        return __($field);
+    }
+}
diff --git a/app/code/Magento/Authorizenet/Model/Directpost.php b/app/code/Magento/Authorizenet/Model/Directpost.php
index 9186acce83b4c..6c5eeb1710170 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost.php
@@ -27,7 +27,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
     /**
      * @var string
      */
-    protected $_infoBlockType = \Magento\Payment\Block\Info::class;
+    protected $_infoBlockType = \Magento\Authorizenet\Block\Adminhtml\Order\View\Info\PaymentDetails::class;
 
     /**
      * Payment Method feature
@@ -371,8 +371,7 @@ public function void(\Magento\Payment\Model\InfoInterface $payment)
     }
 
     /**
-     * Refund the amount
-     * Need to decode last 4 digits for request.
+     * Refund the amount need to decode last 4 digits for request.
      *
      * @param \Magento\Framework\DataObject|\Magento\Payment\Model\InfoInterface $payment
      * @param float $amount
@@ -544,15 +543,16 @@ public function setResponseData(array $postData)
     public function validateResponse()
     {
         $response = $this->getResponse();
-        //md5 check
-        if (!$this->getConfigData('trans_md5')
-            || !$this->getConfigData('login')
-            || !$response->isValidHash($this->getConfigData('trans_md5'), $this->getConfigData('login'))
+        $hashConfigKey = !empty($response->getData('x_SHA2_Hash')) ? 'signature_key' : 'trans_md5';
+
+        //hash check
+        if (!$response->isValidHash($this->getConfigData($hashConfigKey), $this->getConfigData('login'))
         ) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('The transaction was declined because the response hash validation failed.')
             );
         }
+
         return true;
     }
 
@@ -626,6 +626,14 @@ protected function fillPaymentByResponse(\Magento\Framework\DataObject $payment)
             $payment->setIsTransactionPending(true)
                 ->setIsFraudDetected(true);
         }
+
+        $additionalInformationKeys = explode(',', $this->getValue('paymentInfoKeys'));
+        foreach ($additionalInformationKeys as $paymentInfoKey) {
+            $paymentInfoValue = $response->getDataByKey($paymentInfoKey);
+            if ($paymentInfoValue !== null) {
+                $payment->setAdditionalInformation($paymentInfoKey, $paymentInfoValue);
+            }
+        }
     }
 
     /**
@@ -682,6 +690,7 @@ protected function matchAmount($amount)
 
     /**
      * Operate with order using information from Authorize.net.
+     *
      * Authorize order or authorize and capture it.
      *
      * @param \Magento\Sales\Model\Order $order
@@ -824,6 +833,7 @@ protected function declineOrder(\Magento\Sales\Model\Order $order, $message = ''
                       ->void($response);
             }
             $order->registerCancellation($message)->save();
+            $this->_eventManager->dispatch('order_cancel_after', ['order' => $order ]);
         } catch (\Exception $e) {
             //quiet decline
             $this->getPsrLogger()->critical($e);
@@ -858,7 +868,7 @@ public function getConfigInterface()
      * Getter for specified value according to set payment method code
      *
      * @param mixed $key
-     * @param null $storeId
+     * @param int|string|null|\Magento\Store\Model\Store $storeId
      * @return mixed
      */
     public function getValue($key, $storeId = null)
@@ -918,10 +928,13 @@ public function fetchTransactionInfo(\Magento\Payment\Model\InfoInterface $payme
             $payment->setIsTransactionDenied(true);
         }
         $this->addStatusCommentOnUpdate($payment, $response, $transactionId);
-        return [];
+
+        return $response->getData();
     }
 
     /**
+     * Add statuc comment on update.
+     *
      * @param \Magento\Sales\Model\Order\Payment $payment
      * @param \Magento\Framework\DataObject $response
      * @param string $transactionId
@@ -996,8 +1009,9 @@ protected function getTransactionResponse($transactionId)
     }
 
     /**
-     * @return \Psr\Log\LoggerInterface
+     * Get psr logger.
      *
+     * @return \Psr\Log\LoggerInterface
      * @deprecated 100.1.0
      */
     private function getPsrLogger()
@@ -1038,7 +1052,9 @@ private function getOrderIncrementId(): string
     }
 
     /**
-     * Checks if filter action is Report Only. Transactions that trigger this filter are processed as normal,
+     * Checks if filter action is Report Only.
+     *
+     * Transactions that trigger this filter are processed as normal,
      * but are also reported in the Merchant Interface as triggering this filter.
      *
      * @param string $fdsFilterAction
diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Request.php b/app/code/Magento/Authorizenet/Model/Directpost/Request.php
index fc78d836b6080..dd35fd71c5a6d 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost/Request.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost/Request.php
@@ -7,6 +7,7 @@
 namespace Magento\Authorizenet\Model\Directpost;
 
 use Magento\Authorizenet\Model\Request as AuthorizenetRequest;
+use Magento\Framework\Intl\DateTimeFactory;
 
 /**
  * Authorize.net request model for DirectPost model
@@ -18,9 +19,33 @@ class Request extends AuthorizenetRequest
      */
     protected $_transKey = null;
 
+    /**
+     * Hexadecimal signature key.
+     *
+     * @var string
+     */
+    private $signatureKey = '';
+
+    /**
+     * @var DateTimeFactory
+     */
+    private $dateTimeFactory;
+
+    /**
+     * @param DateTimeFactory $dateTimeFactory
+     * @param array $data
+     */
+    public function __construct(
+        DateTimeFactory $dateTimeFactory,
+        array $data = []
+    ) {
+        $this->dateTimeFactory = $dateTimeFactory;
+        parent::__construct($data);
+    }
+
     /**
      * Return merchant transaction key.
-     * Needed to generate sign.
+     * Needed to generate MD5 sign.
      *
      * @return string
      */
@@ -31,7 +56,7 @@ protected function _getTransactionKey()
 
     /**
      * Set merchant transaction key.
-     * Needed to generate sign.
+     * Needed to generate MD5 sign.
      *
      * @param string $transKey
      * @return $this
@@ -43,7 +68,7 @@ protected function _setTransactionKey($transKey)
     }
 
     /**
-     * Generates the fingerprint for request.
+     * Generates the MD5 fingerprint for request.
      *
      * @param string $merchantApiLoginId
      * @param string $merchantTransactionKey
@@ -63,7 +88,7 @@ public function generateRequestSign(
     ) {
         return hash_hmac(
             "md5",
-            $merchantApiLoginId . "^" . $fpSequence . "^" . $fpTimestamp . "^" . $amount . "^" . $currencyCode,
+            $merchantApiLoginId . '^' . $fpSequence . '^' . $fpTimestamp . '^' . $amount . '^' . $currencyCode,
             $merchantTransactionKey
         );
     }
@@ -85,6 +110,7 @@ public function setConstantData(\Magento\Authorizenet\Model\Directpost $paymentM
             ->setXRelayUrl($paymentMethod->getRelayUrl());
 
         $this->_setTransactionKey($paymentMethod->getConfigData('trans_key'));
+        $this->setSignatureKey($paymentMethod->getConfigData('signature_key'));
         return $this;
     }
 
@@ -168,17 +194,81 @@ public function setDataFromOrder(
      */
     public function signRequestData()
     {
-        $fpTimestamp = time();
-        $hash = $this->generateRequestSign(
-            $this->getXLogin(),
-            $this->_getTransactionKey(),
-            $this->getXAmount(),
-            $this->getXCurrencyCode(),
-            $this->getXFpSequence(),
-            $fpTimestamp
-        );
+        $fpDate = $this->dateTimeFactory->create('now', new \DateTimeZone('UTC'));
+        $fpTimestamp = $fpDate->getTimestamp();
+
+        if (!empty($this->getSignatureKey())) {
+            $hash = $this->generateSha2RequestSign(
+                $this->getXLogin(),
+                $this->getSignatureKey(),
+                $this->getXAmount(),
+                $this->getXCurrencyCode(),
+                $this->getXFpSequence(),
+                $fpTimestamp
+            );
+        } else {
+            $hash = $this->generateRequestSign(
+                $this->getXLogin(),
+                $this->_getTransactionKey(),
+                $this->getXAmount(),
+                $this->getXCurrencyCode(),
+                $this->getXFpSequence(),
+                $fpTimestamp
+            );
+        }
+
         $this->setXFpTimestamp($fpTimestamp);
         $this->setXFpHash($hash);
+
         return $this;
     }
+
+    /**
+     * Generates the SHA2 fingerprint for request.
+     *
+     * @param string $merchantApiLoginId
+     * @param string $merchantSignatureKey
+     * @param string $amount
+     * @param string $currencyCode
+     * @param string $fpSequence An invoice number or random number.
+     * @param string $fpTimestamp
+     * @return string The fingerprint.
+     */
+    private function generateSha2RequestSign(
+        $merchantApiLoginId,
+        $merchantSignatureKey,
+        $amount,
+        $currencyCode,
+        $fpSequence,
+        $fpTimestamp
+    ): string {
+        $message = $merchantApiLoginId . '^' . $fpSequence . '^' . $fpTimestamp . '^' . $amount . '^' . $currencyCode;
+
+        return strtoupper(hash_hmac('sha512', $message, pack('H*', $merchantSignatureKey)));
+    }
+
+    /**
+     * Return merchant hexadecimal signature key.
+     *
+     * Needed to generate SHA2 sign.
+     *
+     * @return string
+     */
+    private function getSignatureKey(): string
+    {
+        return $this->signatureKey;
+    }
+
+    /**
+     * Set merchant hexadecimal signature key.
+     *
+     * Needed to generate SHA2 sign.
+     *
+     * @param string $signatureKey
+     * @return void
+     */
+    private function setSignatureKey(string $signatureKey)
+    {
+        $this->signatureKey = $signatureKey;
+    }
 }
diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Response.php b/app/code/Magento/Authorizenet/Model/Directpost/Response.php
index dc62c1e990dc3..55e31f1526610 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost/Response.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost/Response.php
@@ -24,25 +24,31 @@ class Response extends AuthorizenetResponse
      */
     public function generateHash($merchantMd5, $merchantApiLogin, $amount, $transactionId)
     {
-        if (!$amount) {
-            $amount = '0.00';
-        }
-
         return strtoupper(md5($merchantMd5 . $merchantApiLogin . $transactionId . $amount));
     }
 
     /**
      * Return if is valid order id.
      *
-     * @param string $merchantMd5
+     * @param string $storedHash
      * @param string $merchantApiLogin
      * @return bool
      */
-    public function isValidHash($merchantMd5, $merchantApiLogin)
+    public function isValidHash($storedHash, $merchantApiLogin)
     {
-        $hash = $this->generateHash($merchantMd5, $merchantApiLogin, $this->getXAmount(), $this->getXTransId());
+        if (empty($this->getData('x_amount'))) {
+            $this->setData('x_amount', '0.00');
+        }
 
-        return Security::compareStrings($hash, $this->getData('x_MD5_Hash'));
+        if (!empty($this->getData('x_SHA2_Hash'))) {
+            $hash = $this->generateSha2Hash($storedHash);
+            return Security::compareStrings($hash, $this->getData('x_SHA2_Hash'));
+        } elseif (!empty($this->getData('x_MD5_Hash'))) {
+            $hash = $this->generateHash($storedHash, $merchantApiLogin, $this->getXAmount(), $this->getXTransId());
+            return Security::compareStrings($hash, $this->getData('x_MD5_Hash'));
+        }
+
+        return false;
     }
 
     /**
@@ -54,4 +60,54 @@ public function isApproved()
     {
         return $this->getXResponseCode() == \Magento\Authorizenet\Model\Directpost::RESPONSE_CODE_APPROVED;
     }
+
+    /**
+     * Generates an SHA2 hash to compare against AuthNet's.
+     *
+     * @param string $signatureKey
+     * @return string
+     * @see https://support.authorize.net/s/article/MD5-Hash-End-of-Life-Signature-Key-Replacement
+     */
+    private function generateSha2Hash(string $signatureKey): string
+    {
+        $hashFields = [
+            'x_trans_id',
+            'x_test_request',
+            'x_response_code',
+            'x_auth_code',
+            'x_cvv2_resp_code',
+            'x_cavv_response',
+            'x_avs_code',
+            'x_method',
+            'x_account_number',
+            'x_amount',
+            'x_company',
+            'x_first_name',
+            'x_last_name',
+            'x_address',
+            'x_city',
+            'x_state',
+            'x_zip',
+            'x_country',
+            'x_phone',
+            'x_fax',
+            'x_email',
+            'x_ship_to_company',
+            'x_ship_to_first_name',
+            'x_ship_to_last_name',
+            'x_ship_to_address',
+            'x_ship_to_city',
+            'x_ship_to_state',
+            'x_ship_to_zip',
+            'x_ship_to_country',
+            'x_invoice_num',
+        ];
+
+        $message = '^';
+        foreach ($hashFields as $field) {
+            $message .= ($this->getData($field) ?? '') . '^';
+        }
+
+        return strtoupper(hash_hmac('sha512', $message, pack('H*', $signatureKey)));
+    }
 }
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/RequestTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/RequestTest.php
new file mode 100644
index 0000000000000..d3caa1597e64b
--- /dev/null
+++ b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/RequestTest.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Authorizenet\Test\Unit\Model\Directpost;
+
+use Magento\Authorizenet\Model\Directpost\Request;
+use Magento\Framework\Intl\DateTimeFactory;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class RequestTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DateTimeFactory|MockObject
+     */
+    private $dateTimeFactory;
+
+    /**
+     * @var Request
+     */
+    private $requestModel;
+
+    protected function setUp()
+    {
+        $this->dateTimeFactory = $this->getMockBuilder(DateTimeFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dateTime = new \DateTime('2016-07-05 00:00:00', new \DateTimeZone('UTC'));
+        $this->dateTimeFactory->method('create')
+            ->willReturn($dateTime);
+
+        $this->requestModel = new Request($this->dateTimeFactory);
+    }
+
+    /**
+     * @param string $signatureKey
+     * @param string $expectedHash
+     * @dataProvider signRequestDataProvider
+     */
+    public function testSignRequestData(string $signatureKey, string $expectedHash)
+    {
+        /** @var \Magento\Authorizenet\Model\Directpost $paymentMethod */
+        $paymentMethod = $this->createMock(\Magento\Authorizenet\Model\Directpost::class);
+        $paymentMethod->method('getConfigData')
+            ->willReturnMap(
+                [
+                    ['test', null, true],
+                    ['login', null, 'login'],
+                    ['trans_key', null, 'trans_key'],
+                    ['signature_key', null, $signatureKey],
+                ]
+            );
+
+        $this->requestModel->setConstantData($paymentMethod);
+        $this->requestModel->signRequestData();
+        $signHash = $this->requestModel->getXFpHash();
+
+        $this->assertEquals($expectedHash, $signHash);
+    }
+
+    /**
+     * @return array
+     */
+    public function signRequestDataProvider()
+    {
+        return [
+            [
+                'signatureKey' => '3EAFCE5697C1B4B9748385C1FCD29D86F3B9B41C7EED85A3A01DFF65' .
+                    '70C8C29373C2A153355C3313CDF4AF723C0036DBF244A0821713A910024EE85547CEF37F',
+                'expectedHash' => '719ED94DF5CF3510CB5531E8115462C8F12CBCC8E917BD809E8D40B4FF06' .
+                    '1E14953554403DD9813CCCE0F31B184EB4DEF558E9C0747505A0C25420372DB00BE1'
+            ],
+            [
+                'signatureKey' => '',
+                'expectedHash' => '3656211f2c41d1e4c083606f326c0460'
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php
index b4274e87401ca..0b616f32f9fe5 100644
--- a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php
+++ b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php
@@ -13,53 +13,16 @@ class ResponseTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Authorizenet\Model\Directpost\Response
      */
-    protected $responseModel;
+    private $responseModel;
 
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
-        $this->responseModel = $objectManager->getObject(\Magento\Authorizenet\Model\Directpost\Response::class);
-    }
-
-    /**
-     * @param string $merchantMd5
-     * @param string $merchantApiLogin
-     * @param float|null $amount
-     * @param float|string $amountTestFunc
-     * @param string $transactionId
-     * @dataProvider generateHashDataProvider
-     */
-    public function testGenerateHash($merchantMd5, $merchantApiLogin, $amount, $amountTestFunc, $transactionId)
-    {
-        $this->assertEquals(
-            $this->generateHash($merchantMd5, $merchantApiLogin, $amountTestFunc, $transactionId),
-            $this->responseModel->generateHash($merchantMd5, $merchantApiLogin, $amount, $transactionId)
+        $this->responseModel = $objectManager->getObject(
+            \Magento\Authorizenet\Model\Directpost\Response::class
         );
     }
 
-    /**
-     * @return array
-     */
-    public function generateHashDataProvider()
-    {
-        return [
-            [
-                'merchantMd5' => 'FCD7F001E9274FDEFB14BFF91C799306',
-                'merchantApiLogin' => 'Magento',
-                'amount' => null,
-                'amountTestFunc' => '0.00',
-                'transactionId' => '1'
-            ],
-            [
-                'merchantMd5' => '8AEF4E508261A287C3E2F544720FCA3A',
-                'merchantApiLogin' => 'Magento2',
-                'amount' => 100.50,
-                'amountTestFunc' => 100.50,
-                'transactionId' => '2'
-            ]
-        ];
-    }
-
     /**
      * @param $merchantMd5
      * @param $merchantApiLogin
@@ -74,7 +37,8 @@ protected function generateHash($merchantMd5, $merchantApiLogin, $amount, $trans
     }
 
     /**
-     * @param string $merchantMd5
+     * @param string $storedHash
+     * @param string $hashKey
      * @param string $merchantApiLogin
      * @param float|null $amount
      * @param string $transactionId
@@ -82,12 +46,21 @@ protected function generateHash($merchantMd5, $merchantApiLogin, $amount, $trans
      * @param bool $expectedValue
      * @dataProvider isValidHashDataProvider
      */
-    public function testIsValidHash($merchantMd5, $merchantApiLogin, $amount, $transactionId, $hash, $expectedValue)
-    {
+    public function testIsValidHash(
+        string $storedHash,
+        string $hashKey,
+        string $merchantApiLogin,
+        $amount,
+        string $transactionId,
+        string $hash,
+        bool $expectedValue
+    ) {
         $this->responseModel->setXAmount($amount);
         $this->responseModel->setXTransId($transactionId);
-        $this->responseModel->setData('x_MD5_Hash', $hash);
-        $this->assertEquals($expectedValue, $this->responseModel->isValidHash($merchantMd5, $merchantApiLogin));
+        $this->responseModel->setData($hashKey, $hash);
+        $result = $this->responseModel->isValidHash($storedHash, $merchantApiLogin);
+
+        $this->assertEquals($expectedValue, $result);
     }
 
     /**
@@ -95,9 +68,14 @@ public function testIsValidHash($merchantMd5, $merchantApiLogin, $amount, $trans
      */
     public function isValidHashDataProvider()
     {
+        $signatureKey = '3EAFCE5697C1B4B9748385C1FCD29D86F3B9B41C7EED85A3A01DFF6570C8C' .
+            '29373C2A153355C3313CDF4AF723C0036DBF244A0821713A910024EE85547CEF37F';
+        $expectedSha2Hash = '368D48E0CD1274BF41C059138DA69985594021A4AD5B4C5526AE88C8F' .
+            '7C5769B13C5E1E4358900F3E51076FB69D14B0A797904C22E8A11A52AA49CDE5FBB703C';
         return [
             [
                 'merchantMd5' => 'FCD7F001E9274FDEFB14BFF91C799306',
+                'hashKey' => 'x_MD5_Hash',
                 'merchantApiLogin' => 'Magento',
                 'amount' => null,
                 'transactionId' => '1',
@@ -106,11 +84,21 @@ public function isValidHashDataProvider()
             ],
             [
                 'merchantMd5' => '8AEF4E508261A287C3E2F544720FCA3A',
+                'hashKey' => 'x_MD5_Hash',
                 'merchantApiLogin' => 'Magento2',
                 'amount' => 100.50,
                 'transactionId' => '2',
                 'hash' => '1F24A4EC9A169B2B2A072A5F168E16DC',
                 'expectedValue' => false
+            ],
+            [
+                'signatureKey' => $signatureKey,
+                'hashKey' => 'x_SHA2_Hash',
+                'merchantApiLogin' => 'Magento2',
+                'amount' => 100.50,
+                'transactionId' => '2',
+                'hash' => $expectedSha2Hash,
+                'expectedValue' => true
             ]
         ];
     }
diff --git a/app/code/Magento/Authorizenet/composer.json b/app/code/Magento/Authorizenet/composer.json
index 90f19e36777b2..ca9dfdb9a6e1f 100644
--- a/app/code/Magento/Authorizenet/composer.json
+++ b/app/code/Magento/Authorizenet/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-authorizenet",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-sales": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-quote": "101.0.*",
@@ -16,7 +16,7 @@
         "magento/module-config": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.4",
     "license": [
         "proprietary"
     ],
diff --git a/app/code/Magento/Authorizenet/etc/adminhtml/system.xml b/app/code/Magento/Authorizenet/etc/adminhtml/system.xml
index 1319fa102d0d8..d6a935020a6dc 100644
--- a/app/code/Magento/Authorizenet/etc/adminhtml/system.xml
+++ b/app/code/Magento/Authorizenet/etc/adminhtml/system.xml
@@ -29,6 +29,10 @@
                     <label>Transaction Key</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                 </field>
+                <field id="signature_key" translate="label" type="obscure" sortOrder="55" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Signature Key</label>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                </field>
                 <field id="trans_md5" translate="label" type="obscure" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Merchant MD5</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
diff --git a/app/code/Magento/Authorizenet/etc/config.xml b/app/code/Magento/Authorizenet/etc/config.xml
index eacf77cda1e77..a8c747f208377 100644
--- a/app/code/Magento/Authorizenet/etc/config.xml
+++ b/app/code/Magento/Authorizenet/etc/config.xml
@@ -22,6 +22,7 @@
                 <title>Credit Card Direct Post (Authorize.net)</title>
                 <trans_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <trans_md5 backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
+                <signature_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <allowspecific>0</allowspecific>
                 <currency>USD</currency>
                 <create_order_before>1</create_order_before>
@@ -32,6 +33,7 @@
                 <cgi_url>https://secure.authorize.net/gateway/transact.dll</cgi_url>
                 <cgi_url_td_test_mode>https://apitest.authorize.net/xml/v1/request.api</cgi_url_td_test_mode>
                 <cgi_url_td>https://api2.authorize.net/xml/v1/request.api</cgi_url_td>
+                <paymentInfoKeys>x_card_type,x_account_number,x_avs_code,x_auth_code,x_response_reason_text,x_cvv2_resp_code</paymentInfoKeys>
             </authorizenet_directpost>
         </payment>
     </default>
diff --git a/app/code/Magento/Authorizenet/etc/di.xml b/app/code/Magento/Authorizenet/etc/di.xml
index 4beb2456be110..69d24019f2fb7 100644
--- a/app/code/Magento/Authorizenet/etc/di.xml
+++ b/app/code/Magento/Authorizenet/etc/di.xml
@@ -35,4 +35,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Authorizenet\Block\Adminhtml\Order\View\Info\PaymentDetails">
+        <arguments>
+            <argument name="config" xsi:type="object">Magento\Authorizenet\Model\Directpost</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Authorizenet/i18n/en_US.csv b/app/code/Magento/Authorizenet/i18n/en_US.csv
index bb59afffff2c6..6228d5102b13c 100644
--- a/app/code/Magento/Authorizenet/i18n/en_US.csv
+++ b/app/code/Magento/Authorizenet/i18n/en_US.csv
@@ -67,3 +67,9 @@ Debug,Debug
 "Minimum Order Total","Minimum Order Total"
 "Maximum Order Total","Maximum Order Total"
 "Sort Order","Sort Order"
+"x_card_type","Credit Card Type"
+"x_account_number", "Credit Card Number"
+"x_avs_code","AVS Response Code"
+"x_auth_code","Processor Authentication Code"
+"x_response_reason_text","Processor Response Text"
+"x_cvv2_resp_code","CVV2 Response Code"
diff --git a/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml b/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml
index 60fec263352fe..ac91fa30bfbe0 100644
--- a/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml
+++ b/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml
@@ -44,8 +44,8 @@ $fraudDetails = $payment->getAdditionalInformation('fraud_details');
             <?php endif; ?>
 
             <?php if(!empty($fraudDetails['fraud_filters'])): ?>
-                <b><?= $block->escapeHtml(__('Fraud Filters')) ?>:
-                </b></br>
+                <strong><?= $block->escapeHtml(__('Fraud Filters')) ?>:
+                </strong></br>
                 <?php foreach($fraudDetails['fraud_filters'] as $filter): ?>
                     <?= $block->escapeHtml($filter['name']) ?>:
                     <?= $block->escapeHtml($filter['action']) ?>
diff --git a/app/code/Magento/Backend/Block/Dashboard/Bar.php b/app/code/Magento/Backend/Block/Dashboard/Bar.php
index 7ccb2d51ccd1b..e6bbdc116e3bc 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Bar.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Bar.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Backend\Block\Dashboard;
 
+use Magento\Store\Model\Store;
+
 /**
  * Adminhtml dashboard bar block
  *
@@ -73,6 +75,7 @@ public function setCurrency($currency)
      * Retrieve currency model if not set then return currency model for current store
      *
      * @return \Magento\Directory\Model\Currency
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getCurrency()
     {
@@ -90,7 +93,8 @@ public function getCurrency()
                     $this->getRequest()->getParam('group')
                 )->getWebsite()->getBaseCurrency();
             } else {
-                $this->_currentCurrencyCode = $this->_storeManager->getStore()->getBaseCurrency();
+                $this->_currentCurrencyCode = $this->_storeManager->getStore(Store::DEFAULT_STORE_ID)
+                    ->getBaseCurrency();
             }
         }
 
diff --git a/app/code/Magento/Backend/Block/Dashboard/Graph.php b/app/code/Magento/Backend/Block/Dashboard/Graph.php
index 8e238ccab44cb..6c48eea66a951 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Graph.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Graph.php
@@ -15,7 +15,7 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
     /**
      * Api URL
      */
-    const API_URL = 'http://chart.apis.google.com/chart';
+    const API_URL = 'https://image-charts.com/chart';
 
     /**
      * All series
@@ -76,6 +76,7 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
     /**
      * Google chart api data encoding
      *
+     * @deprecated since the Google Image Charts API not accessible from March 14, 2019
      * @var string
      */
     protected $_encoding = 'e';
@@ -111,8 +112,8 @@ public function __construct(
         \Magento\Backend\Helper\Dashboard\Data $dashboardData,
         array $data = []
     ) {
-        $this->_dashboardData = $dashboardData;
         parent::__construct($context, $collectionFactory, $data);
+        $this->_dashboardData = $dashboardData;
     }
 
     /**
@@ -126,9 +127,9 @@ protected function _getTabTemplate()
     }
 
     /**
-     * Set data rows
+     * Set data rows.
      *
-     * @param array $rows
+     * @param string $rows
      * @return void
      */
     public function setDataRows($rows)
@@ -149,18 +150,18 @@ public function addSeries($seriesId, array $options)
     }
 
     /**
-     * Get series
+     * Get series.
      *
      * @param string $seriesId
-     * @return array|false
+     * @return array|bool
      */
     public function getSeries($seriesId)
     {
         if (isset($this->_allSeries[$seriesId])) {
             return $this->_allSeries[$seriesId];
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /**
@@ -187,11 +188,12 @@ public function getChartUrl($directUrl = true)
     {
         $params = [
             'cht' => 'lc',
-            'chf' => 'bg,s,ffffff',
-            'chco' => 'ef672f',
             'chls' => '7',
-            'chxs' => '0,676056,15,0,l,676056|1,676056,15,0,l,676056',
-            'chm' => 'h,f2ebde,0,0:1:.1,1,-1',
+            'chf' => 'bg,s,f4f4f4|c,lg,90,ffffff,0.1,ededed,0',
+            'chm' => 'B,f4d4b2,0,0,0',
+            'chco' => 'db4814',
+            'chxs' => '0,0,11|1,0,11',
+            'chma' => '15,15,15,15',
         ];
 
         $this->_allSeries = $this->getRowsData($this->_dataRows);
@@ -279,20 +281,11 @@ public function getChartUrl($directUrl = true)
         $this->_axisLabels['x'] = $dates;
         $this->_allSeries = $datas;
 
-        //Google encoding values
-        if ($this->_encoding == "s") {
-            // simple encoding
-            $params['chd'] = "s:";
-            $dataDelimiter = "";
-            $dataSetdelimiter = ",";
-            $dataMissing = "_";
-        } else {
-            // extended encoding
-            $params['chd'] = "e:";
-            $dataDelimiter = "";
-            $dataSetdelimiter = ",";
-            $dataMissing = "__";
-        }
+        // Image-Charts Awesome data format values
+        $params['chd'] = "a:";
+        $dataDelimiter = ",";
+        $dataSetdelimiter = "|";
+        $dataMissing = "_";
 
         // process each string in the array, and find the max length
         $localmaxvalue = [0];
@@ -306,7 +299,6 @@ public function getChartUrl($directUrl = true)
         $minvalue = min($localminvalue);
 
         // default values
-        $yrange = 0;
         $yLabels = [];
         $miny = 0;
         $maxy = 0;
@@ -314,14 +306,13 @@ public function getChartUrl($directUrl = true)
 
         if ($minvalue >= 0 && $maxvalue >= 0) {
             if ($maxvalue > 10) {
-                $p = pow(10, $this->_getPow($maxvalue));
+                $p = pow(10, $this->_getPow((int)$maxvalue));
                 $maxy = ceil($maxvalue / $p) * $p;
                 $yLabels = range($miny, $maxy, $p);
             } else {
                 $maxy = ceil($maxvalue + 1);
                 $yLabels = range($miny, $maxy, 1);
             }
-            $yrange = $maxy;
             $yorigin = 0;
         }
 
@@ -329,44 +320,14 @@ public function getChartUrl($directUrl = true)
 
         foreach ($this->getAllSeries() as $index => $serie) {
             $thisdataarray = $serie;
-            if ($this->_encoding == "s") {
-                // SIMPLE ENCODING
-                for ($j = 0; $j < sizeof($thisdataarray); $j++) {
-                    $currentvalue = $thisdataarray[$j];
-                    if (is_numeric($currentvalue)) {
-                        $ylocation = round(
-                            (strlen($this->_simpleEncoding) - 1) * ($yorigin + $currentvalue) / $yrange
-                        );
-                        $chartdata[] = substr($this->_simpleEncoding, $ylocation, 1) . $dataDelimiter;
-                    } else {
-                        $chartdata[] = $dataMissing . $dataDelimiter;
-                    }
-                }
-            } else {
-                // EXTENDED ENCODING
-                for ($j = 0; $j < sizeof($thisdataarray); $j++) {
-                    $currentvalue = $thisdataarray[$j];
-                    if (is_numeric($currentvalue)) {
-                        if ($yrange) {
-                            $ylocation = 4095 * ($yorigin + $currentvalue) / $yrange;
-                        } else {
-                            $ylocation = 0;
-                        }
-                        $firstchar = floor($ylocation / 64);
-                        $secondchar = $ylocation % 64;
-                        $mappedchar = substr(
-                            $this->_extendedEncoding,
-                            $firstchar,
-                            1
-                        ) . substr(
-                            $this->_extendedEncoding,
-                            $secondchar,
-                            1
-                        );
-                        $chartdata[] = $mappedchar . $dataDelimiter;
-                    } else {
-                        $chartdata[] = $dataMissing . $dataDelimiter;
-                    }
+            $count = count($thisdataarray);
+            for ($j = 0; $j < $count; $j++) {
+                $currentvalue = $thisdataarray[$j];
+                if (is_numeric($currentvalue)) {
+                    $ylocation = $yorigin + $currentvalue;
+                    $chartdata[] = $ylocation . $dataDelimiter;
+                } else {
+                    $chartdata[] = $dataMissing . $dataDelimiter;
                 }
             }
             $chartdata[] = $dataSetdelimiter;
@@ -381,45 +342,13 @@ public function getChartUrl($directUrl = true)
 
         $valueBuffer = [];
 
-        if (sizeof($this->_axisLabels) > 0) {
+        if (count($this->_axisLabels) > 0) {
             $params['chxt'] = implode(',', array_keys($this->_axisLabels));
             $indexid = 0;
             foreach ($this->_axisLabels as $idx => $labels) {
                 if ($idx == 'x') {
-                    /**
-                     * Format date
-                     */
-                    foreach ($this->_axisLabels[$idx] as $_index => $_label) {
-                        if ($_label != '') {
-                            $period = new \DateTime($_label, new \DateTimeZone($timezoneLocal));
-                            switch ($this->getDataHelper()->getParam('period')) {
-                                case '24h':
-                                    $this->_axisLabels[$idx][$_index] = $this->_localeDate->formatDateTime(
-                                        $period->setTime($period->format('H'), 0, 0),
-                                        \IntlDateFormatter::NONE,
-                                        \IntlDateFormatter::SHORT
-                                    );
-                                    break;
-                                case '7d':
-                                case '1m':
-                                    $this->_axisLabels[$idx][$_index] = $this->_localeDate->formatDateTime(
-                                        $period,
-                                        \IntlDateFormatter::SHORT,
-                                        \IntlDateFormatter::NONE
-                                    );
-                                    break;
-                                case '1y':
-                                case '2y':
-                                    $this->_axisLabels[$idx][$_index] = date('m/Y', strtotime($_label));
-                                    break;
-                            }
-                        } else {
-                            $this->_axisLabels[$idx][$_index] = '';
-                        }
-                    }
-
+                    $this->formatAxisLabelDate($idx, $timezoneLocal);
                     $tmpstring = implode('|', $this->_axisLabels[$idx]);
-
                     $valueBuffer[] = $indexid . ":|" . $tmpstring;
                 } elseif ($idx == 'y') {
                     $valueBuffer[] = $indexid . ":|" . implode('|', $yLabels);
@@ -438,12 +367,52 @@ public function getChartUrl($directUrl = true)
             foreach ($params as $name => $value) {
                 $p[] = $name . '=' . urlencode($value);
             }
+
             return self::API_URL . '?' . implode('&', $p);
-        } else {
-            $gaData = urlencode(base64_encode(json_encode($params)));
-            $gaHash = $this->_dashboardData->getChartDataHash($gaData);
-            $params = ['ga' => $gaData, 'h' => $gaHash];
-            return $this->getUrl('adminhtml/*/tunnel', ['_query' => $params]);
+        }
+        $gaData = urlencode(base64_encode(json_encode($params)));
+        $gaHash = $this->_dashboardData->getChartDataHash($gaData);
+        $params = ['ga' => $gaData, 'h' => $gaHash];
+
+        return $this->getUrl('adminhtml/*/tunnel', ['_query' => $params]);
+    }
+
+    /**
+     * Format dates for axis labels.
+     *
+     * @param string $idx
+     * @param string $timezoneLocal
+     * @return void
+     */
+    private function formatAxisLabelDate(string $idx, string $timezoneLocal)
+    {
+        foreach ($this->_axisLabels[$idx] as $_index => $_label) {
+            if ($_label != '') {
+                $period = new \DateTime($_label, new \DateTimeZone($timezoneLocal));
+                switch ($this->getDataHelper()->getParam('period')) {
+                    case '24h':
+                        $this->_axisLabels[$idx][$_index] = $this->_localeDate->formatDateTime(
+                            $period->setTime((int)$period->format('H'), 0, 0),
+                            \IntlDateFormatter::NONE,
+                            \IntlDateFormatter::SHORT
+                        );
+                        break;
+                    case '7d':
+                    case '1m':
+                        $this->_axisLabels[$idx][$_index] = $this->_localeDate->formatDateTime(
+                            $period,
+                            \IntlDateFormatter::SHORT,
+                            \IntlDateFormatter::NONE
+                        );
+                        break;
+                    case '1y':
+                    case '2y':
+                        $this->_axisLabels[$idx][$_index] = date('m/Y', strtotime($_label));
+                        break;
+                }
+            } else {
+                $this->_axisLabels[$idx][$_index] = '';
+            }
         }
     }
 
@@ -540,6 +509,8 @@ protected function getHeight()
     }
 
     /**
+     * Sets data helper.
+     *
      * @param \Magento\Backend\Helper\Dashboard\AbstractDashboard $dataHelper
      * @return void
      */
diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php
index eae066b07ac38..46a6d7acd4bce 100644
--- a/app/code/Magento/Backend/Block/Menu.php
+++ b/app/code/Magento/Backend/Block/Menu.php
@@ -143,12 +143,15 @@ protected function _getAnchorLabel($menuItem)
 
     /**
      * Render menu item mouse events
+     *
      * @param \Magento\Backend\Model\Menu\Item $menuItem
      * @return string
      */
     protected function _renderMouseEvent($menuItem)
     {
-        return $menuItem->hasChildren() ? 'onmouseover="Element.addClassName(this,\'over\')" onmouseout="Element.removeClassName(this,\'over\')"' : '';
+        return $menuItem->hasChildren()
+            ? 'onmouseover="Element.addClassName(this,\'over\')" onmouseout="Element.removeClassName(this,\'over\')"'
+            : '';
     }
 
     /**
@@ -216,7 +219,7 @@ protected function _callbackSecretKey($match)
     {
         $routeId = $this->routeConfig->getRouteByFrontName($match[1]);
         return \Magento\Backend\Model\UrlInterface::SECRET_KEY_PARAM_NAME . '/' . $this->_url->getSecretKey(
-            $routeId,
+            $routeId ?: $match[1],
             $match[2],
             $match[3]
         );
@@ -399,7 +402,11 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
             $itemName = substr($menuId, strrpos($menuId, '::') + 2);
             $itemClass = str_replace('_', '-', strtolower($itemName));
 
-            if (count($colBrakes) && $colBrakes[$itemPosition]['colbrake'] && $itemPosition != 1) {
+            if (is_array($colBrakes)
+                && count($colBrakes)
+                && $colBrakes[$itemPosition]['colbrake']
+                && $itemPosition != 1
+            ) {
                 $output .= '</ul></li><li class="column"><ul role="menu">';
             }
 
@@ -413,7 +420,7 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
             $itemPosition++;
         }
 
-        if (count($colBrakes) && $limit) {
+        if (is_array($colBrakes) && count($colBrakes) && $limit) {
             $output = '<li class="column"><ul role="menu">' . $output . '</ul></li>';
         }
 
diff --git a/app/code/Magento/Backend/Block/System/Design/Edit.php b/app/code/Magento/Backend/Block/System/Design/Edit.php
index 4d6c26e4cfe4b..d2d3035f62e3d 100644
--- a/app/code/Magento/Backend/Block/System/Design/Edit.php
+++ b/app/code/Magento/Backend/Block/System/Design/Edit.php
@@ -66,7 +66,7 @@ protected function _prepareLayout()
                     'label' => __('Delete'),
                     'onclick' => 'deleteConfirm(\'' . __(
                         'Are you sure?'
-                    ) . '\', \'' . $this->getDeleteUrl() . '\')',
+                    ) . '\', \'' . $this->getDeleteUrl() . '\', {data: {}})',
                     'class' => 'delete'
                 ]
             );
diff --git a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
index 5a09e1f17f617..6004d08b4b738 100644
--- a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
+++ b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
@@ -6,6 +6,9 @@
 
 namespace Magento\Backend\Block\System\Design\Edit\Tab;
 
+/**
+ * General system tab block.
+ */
 class General extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
@@ -90,7 +93,7 @@ protected function _prepareForm()
             ]
         );
 
-        $dateFormat = $this->_localeDate->getDateFormat(\IntlDateFormatter::SHORT);
+        $dateFormat = $this->_localeDate->getDateFormatWithLongYear();
         $fieldset->addField(
             'date_from',
             'date',
diff --git a/app/code/Magento/Backend/Block/System/Store/Delete/Form.php b/app/code/Magento/Backend/Block/System/Store/Delete/Form.php
index e479e8f560dae..90b11ac84e470 100644
--- a/app/code/Magento/Backend/Block/System/Store/Delete/Form.php
+++ b/app/code/Magento/Backend/Block/System/Store/Delete/Form.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Backend\Block\System\Store\Delete;
 
+use Magento\Backup\Helper\Data as BackupHelper;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Adminhtml cms block edit form
  *
@@ -12,6 +15,29 @@
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
+    /**
+     * @var BackupHelper
+     */
+    private $backup;
+
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Framework\Data\FormFactory $formFactory
+     * @param array $data
+     * @param BackupHelper|null $backup
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Framework\Registry $registry,
+        \Magento\Framework\Data\FormFactory $formFactory,
+        array $data = [],
+        BackupHelper $backup = null
+    ) {
+        parent::__construct($context, $registry, $formFactory, $data);
+        $this->backup = $backup ?? ObjectManager::getInstance()->get(BackupHelper::class);
+    }
+
     /**
      * Init form
      *
@@ -25,7 +51,7 @@ protected function _construct()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     protected function _prepareForm()
     {
@@ -45,6 +71,12 @@ protected function _prepareForm()
 
         $fieldset->addField('item_id', 'hidden', ['name' => 'item_id', 'value' => $dataObject->getId()]);
 
+        $backupOptions = ['0' => __('No')];
+        $backupSelected = '0';
+        if ($this->backup->isEnabled()) {
+            $backupOptions['1'] = __('Yes');
+            $backupSelected = '1';
+        }
         $fieldset->addField(
             'create_backup',
             'select',
@@ -52,8 +84,8 @@ protected function _prepareForm()
                 'label' => __('Create DB Backup'),
                 'title' => __('Create DB Backup'),
                 'name' => 'create_backup',
-                'options' => ['1' => __('Yes'), '0' => __('No')],
-                'value' => '1'
+                'options' => $backupOptions,
+                'value' => $backupSelected
             ]
         );
 
diff --git a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php
index 3d7154eb20f92..37f11754529e5 100644
--- a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php
+++ b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php
@@ -9,11 +9,12 @@
  * Store render group
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @deprecated since Store Grid is refactored with UI Components
  */
 class Group extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php
index 9cfc8bfc52691..9be630277d4e5 100644
--- a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php
+++ b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php
@@ -9,11 +9,12 @@
  * Store render store
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @deprecated since Store Grid is refactored with UI Components
  */
 class Store extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php
index 487eb4f8acfda..d4bb213dce14e 100644
--- a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php
+++ b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php
@@ -9,11 +9,12 @@
  * Store render website
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @deprecated since Store Grid is refactored with UI Components
  */
 class Website extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function render(\Magento\Framework\DataObject $row)
     {
diff --git a/app/code/Magento/Backend/Block/System/Store/Store.php b/app/code/Magento/Backend/Block/System/Store/Store.php
index cdbf55426de39..2145dc524259e 100644
--- a/app/code/Magento/Backend/Block/System/Store/Store.php
+++ b/app/code/Magento/Backend/Block/System/Store/Store.php
@@ -12,6 +12,7 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
  * @since 100.0.2
+ * @deprecated since Store Grid is refactored with UI Components
  */
 class Store extends \Magento\Backend\Block\Widget\Grid\Container
 {
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Container.php b/app/code/Magento/Backend/Block/Widget/Form/Container.php
index 8b7babc1bb9b6..d7bd785367347 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Container.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Container.php
@@ -57,6 +57,7 @@ class Container extends \Magento\Backend\Block\Widget\Container
 
     /**
      * @return void
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     protected function _construct()
     {
@@ -83,7 +84,7 @@ protected function _construct()
             -1
         );
 
-        $objId = $this->getRequest()->getParam($this->_objectId);
+        $objId = (int)$this->getRequest()->getParam($this->_objectId);
 
         if (!empty($objId)) {
             $this->addButton(
@@ -93,7 +94,7 @@ protected function _construct()
                     'class' => 'delete',
                     'onclick' => 'deleteConfirm(\'' . __(
                         'Are you sure you want to do this?'
-                    ) . '\', \'' . $this->getDeleteUrl() . '\')'
+                    ) . '\', \'' . $this->getDeleteUrl() . '\', {data: {}})'
                 ]
             );
         }
@@ -155,7 +156,7 @@ public function getBackUrl()
      */
     public function getDeleteUrl()
     {
-        return $this->getUrl('*/*/delete', [$this->_objectId => $this->getRequest()->getParam($this->_objectId)]);
+        return $this->getUrl('*/*/delete', [$this->_objectId => (int)$this->getRequest()->getParam($this->_objectId)]);
     }
 
     /**
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
index eff49c3b75ab2..b6efe6edcf211 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
@@ -139,7 +139,7 @@ protected function _toHtml()
     }
 
     /**
-     * Field dependences JSON map generator
+     * Field dependencies JSON map generator
      * @return string
      */
     protected function _getDependsJson()
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php b/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
index 1a6f937f1171d..9443ffefbc0df 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
@@ -258,7 +258,8 @@ public function getRowUrl($item)
      */
     public function getMultipleRows($item)
     {
-        return $item->getChildren();
+        $children = $item->getChildren();
+        return $children ?: [];
     }
 
     /**
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
index 99b9bb41ba1a1..968e34d211cfd 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
@@ -6,6 +6,7 @@
 namespace Magento\Backend\Block\Widget\Grid\Massaction;
 
 use Magento\Backend\Block\Widget\Grid\Massaction\VisibilityCheckerInterface as VisibilityChecker;
+use Magento\Framework\Data\Collection\AbstractDb;
 use Magento\Framework\DataObject;
 
 /**
@@ -51,7 +52,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -216,6 +217,7 @@ public function getGridJsObjectName()
      * Retrieve JSON string of selected checkboxes
      *
      * @return string
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getSelectedJson()
     {
@@ -230,6 +232,7 @@ public function getSelectedJson()
      * Retrieve array of selected checkboxes
      *
      * @return string[]
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getSelected()
     {
@@ -251,6 +254,8 @@ public function getApplyButtonHtml()
     }
 
     /**
+     * Get mass action javascript code.
+     *
      * @return string
      */
     public function getJavaScript()
@@ -267,6 +272,8 @@ public function getJavaScript()
     }
 
     /**
+     * Get grid ids in JSON format.
+     *
      * @return string
      */
     public function getGridIdsJson()
@@ -274,23 +281,28 @@ public function getGridIdsJson()
         if (!$this->getUseSelectAll()) {
             return '';
         }
-        /** @var \Magento\Framework\Data\Collection $allIdsCollection */
-        $allIdsCollection = clone $this->getParentBlock()->getCollection();
 
-        if ($this->getMassactionIdField()) {
-            $massActionIdField = $this->getMassactionIdField();
+        /** @var \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection $collection */
+        $collection = clone $this->getParentBlock()->getCollection();
+
+        if ($collection instanceof AbstractDb) {
+            $idsSelect = clone $collection->getSelect();
+            $idsSelect->reset(\Magento\Framework\DB\Select::ORDER);
+            $idsSelect->reset(\Magento\Framework\DB\Select::LIMIT_COUNT);
+            $idsSelect->reset(\Magento\Framework\DB\Select::LIMIT_OFFSET);
+            $idsSelect->reset(\Magento\Framework\DB\Select::COLUMNS);
+            $idsSelect->columns($this->getMassactionIdField(), 'main_table');
+            $idList = $collection->getConnection()->fetchCol($idsSelect);
         } else {
-            $massActionIdField = $this->getParentBlock()->getMassactionIdField();
+            $idList = $collection->setPageSize(0)->getColumnValues($this->getMassactionIdField());
         }
 
-        $gridIds = $allIdsCollection->setPageSize(0)->getColumnValues($massActionIdField);
-        if (!empty($gridIds)) {
-            return join(",", $gridIds);
-        }
-        return '';
+        return implode(',', $idList);
     }
 
     /**
+     * Get Html id.
+     *
      * @return string
      */
     public function getHtmlId()
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php
index 21f28188cf874..6ccd7efff4d36 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php
@@ -10,9 +10,14 @@ class Delete extends \Magento\Backend\Controller\Adminhtml\System\Design
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         $id = $this->getRequest()->getParam('id');
         if ($id) {
             $design = $this->_objectManager->create(\Magento\Framework\App\DesignInterface::class)->load($id);
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php
index 0228b48f7f11e..a2a53f3f787e3 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php
@@ -6,6 +6,9 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Design;
 
+/**
+ * Save design action.
+ */
 class Save extends \Magento\Backend\Controller\Adminhtml\System\Design
 {
     /**
@@ -26,6 +29,8 @@ protected function _filterPostData($data)
     }
 
     /**
+     * Save design action.
+     *
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
@@ -54,10 +59,10 @@ public function execute()
             } catch (\Exception $e) {
                 $this->messageManager->addErrorMessage($e->getMessage());
                 $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setDesignData($data);
-                return $resultRedirect->setPath('adminhtml/*/', ['id' => $design->getId()]);
+                return $resultRedirect->setPath('*/*/edit', ['id' => $design->getId()]);
             }
         }
 
-        return $resultRedirect->setPath('adminhtml/*/');
+        return $resultRedirect->setPath('*/*/');
     }
 }
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
index 0beeb5168b6d1..a9be14b77b29c 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
@@ -14,6 +14,7 @@
  * Store controller
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
 abstract class Store extends Action
 {
@@ -86,6 +87,8 @@ protected function createPage()
      * Backup database
      *
      * @return bool
+     *
+     * @deprecated Backup module is to be removed.
      */
     protected function _backupDatabase()
     {
diff --git a/app/code/Magento/Backend/Model/AdminPathConfig.php b/app/code/Magento/Backend/Model/AdminPathConfig.php
index e7338adca4a2a..9d32514db48d1 100644
--- a/app/code/Magento/Backend/Model/AdminPathConfig.php
+++ b/app/code/Magento/Backend/Model/AdminPathConfig.php
@@ -48,10 +48,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
-     *
-     * @param \Magento\Framework\App\RequestInterface $request
-     * @return string
+     * @inheritdoc
      */
     public function getCurrentSecureUrl(\Magento\Framework\App\RequestInterface $request)
     {
@@ -59,28 +56,30 @@ public function getCurrentSecureUrl(\Magento\Framework\App\RequestInterface $req
     }
 
     /**
-     * {@inheritdoc}
-     *
-     * @param string $path
-     * @return bool
+     * @inheritdoc
      */
     public function shouldBeSecure($path)
     {
-        return parse_url(
-            (string)$this->coreConfig->getValue(Store::XML_PATH_UNSECURE_BASE_URL, 'default'),
-            PHP_URL_SCHEME
-        ) === 'https'
-        || $this->backendConfig->isSetFlag(Store::XML_PATH_SECURE_IN_ADMINHTML)
-        && parse_url(
-            (string)$this->coreConfig->getValue(Store::XML_PATH_SECURE_BASE_URL, 'default'),
-            PHP_URL_SCHEME
-        ) === 'https';
+        $baseUrl = (string)$this->coreConfig->getValue(Store::XML_PATH_UNSECURE_BASE_URL, 'default');
+        if (parse_url($baseUrl, PHP_URL_SCHEME) === 'https') {
+            return true;
+        }
+
+        if ($this->backendConfig->isSetFlag(Store::XML_PATH_SECURE_IN_ADMINHTML)) {
+            if ($this->backendConfig->isSetFlag('admin/url/use_custom')) {
+                $adminBaseUrl = (string)$this->coreConfig->getValue('admin/url/custom', 'default');
+            } else {
+                $adminBaseUrl = (string)$this->coreConfig->getValue(Store::XML_PATH_SECURE_BASE_URL, 'default');
+            }
+
+            return parse_url($adminBaseUrl, PHP_URL_SCHEME) === 'https';
+        }
+
+        return false;
     }
 
     /**
-     * {@inheritdoc}
-     *
-     * @return string
+     * @inheritdoc
      */
     public function getDefaultPath()
     {
diff --git a/app/code/Magento/Backend/Model/Search/Customer.php b/app/code/Magento/Backend/Model/Search/Customer.php
index 35a7359ce9980..e76a1b77ab2d6 100644
--- a/app/code/Magento/Backend/Model/Search/Customer.php
+++ b/app/code/Magento/Backend/Model/Search/Customer.php
@@ -89,7 +89,7 @@ public function load()
 
         $this->searchCriteriaBuilder->setCurrentPage($this->getStart());
         $this->searchCriteriaBuilder->setPageSize($this->getLimit());
-        $searchFields = ['firstname', 'lastname', 'company'];
+        $searchFields = ['firstname', 'lastname', 'billing_company'];
         $filters = [];
         foreach ($searchFields as $field) {
             $filters[] = $this->filterBuilder
diff --git a/app/code/Magento/Backend/Model/Session/Quote.php b/app/code/Magento/Backend/Model/Session/Quote.php
index 11edaa26f443f..e32f1bc57596e 100644
--- a/app/code/Magento/Backend/Model/Session/Quote.php
+++ b/app/code/Magento/Backend/Model/Session/Quote.php
@@ -149,7 +149,8 @@ public function getQuote()
             $this->_quote = $this->quoteFactory->create();
             if ($this->getStoreId()) {
                 if (!$this->getQuoteId()) {
-                    $this->_quote->setCustomerGroupId($this->groupManagement->getDefaultGroup()->getId());
+                    $customerGroupId = $this->groupManagement->getDefaultGroup($this->getStoreId())->getId();
+                    $this->_quote->setCustomerGroupId($customerGroupId);
                     $this->_quote->setIsActive(false);
                     $this->_quote->setStoreId($this->getStoreId());
                     
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminAccountActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminAccountActionGroup.xml
new file mode 100644
index 0000000000000..01e3450b78c85
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminAccountActionGroup.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="AdminAccountSetInterfaceLocaleActionGroup">
+        <arguments>
+            <argument name="localeName" type="string"/>
+        </arguments>
+        <!-- Navigate to admin System Account Page-->
+        <amOnPage url="{{AdminSystemAccountPage.url}}" stepKey="openAdminSystemAccountPage"/>
+        <!-- Change Admin locale to {{localeName}} -->
+        <selectOption selector="{{AdminSystemAccountSection.interfaceLocale}}" userInput="{{localeName}}" stepKey="setInterfaceLocale"/>
+        <fillField selector="{{AdminSystemAccountSection.currentPassword}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillCurrentPassword"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the account." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/ConfigurationActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/ConfigurationActionGroup.xml
index 1f6b992df61e6..96eac98765d9d 100644
--- a/app/code/Magento/Backend/Test/Mftf/ActionGroup/ConfigurationActionGroup.xml
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/ConfigurationActionGroup.xml
@@ -6,12 +6,7 @@
   */
 -->
 
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="NavigateToConfigurationGeneralPage">
-        <amOnPage url="{{AdminConfigGeneralPage.url}}" stepKey="navigateToConfigGeneralPage"/>
-        <waitForPageLoad stepKey="waitForConfigPageLoad"/>
-    </actionGroup>
-
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="SelectTopDestinationsCountry">
         <arguments>
             <argument name="countries"/>
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml
index 7a8b1244c1512..8b39810e17546 100644
--- a/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml
@@ -10,11 +10,11 @@
               xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="LoginAsAdmin">
         <arguments>
-            <argument name="adminUser" defaultValue="_ENV"/>
+            <argument name="adminUser" defaultValue="DefaultAdminUser"/>
         </arguments>
         <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
-        <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{adminUser.MAGENTO_ADMIN_USERNAME}}" stepKey="fillUsername"/>
-        <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{adminUser.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
+        <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{adminUser.username}}" stepKey="fillUsername"/>
+        <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{adminUser.password}}" stepKey="fillPassword"/>
         <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
         <closeAdminNotification stepKey="closeAdminNotification"/>
     </actionGroup>
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAnyUserActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAnyUserActionGroup.xml
new file mode 100644
index 0000000000000..b762f5095db7e
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAnyUserActionGroup.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">
+        <!--Login as any user-->
+    <actionGroup name="AdminLoginAsAnyUser">
+        <arguments>
+            <argument name="login" type="string" defaultValue="{{_ENV.MAGENTO_ADMIN_USERNAME}}"/>
+            <argument name="password" type="string" defaultValue="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+        </arguments>
+        <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
+        <fillField userInput="{{login}}" selector="{{AdminLoginFormSection.username}}" stepKey="fillUsername"/>
+        <fillField userInput="{{password}}" selector="{{AdminLoginFormSection.password}}" stepKey="fillPassword"/>
+        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
+        <closeAdminNotification stepKey="closeAdminNotification"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/Data/CountryOptionsConfigData.xml b/app/code/Magento/Backend/Test/Mftf/Data/CountryOptionsConfigData.xml
new file mode 100644
index 0000000000000..593d3831b643f
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Data/CountryOptionsConfigData.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="DefaultAllowCountriesConfig" type="allow_countries_config">
+        <requiredEntity type="allow_countries_config_default">DefaultAllowCountries</requiredEntity>
+    </entity>
+    <entity name="DefaultAllowCountries" type="allow_countries_config_default">
+        <data key="value">0</data>
+    </entity>
+
+    <entity name="SetAllowCountriesConfigUS" type="allow_countries_config">
+        <data key="value">US</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Backend/Test/Mftf/Metadata/country_options_config-meta.xml b/app/code/Magento/Backend/Test/Mftf/Metadata/country_options_config-meta.xml
new file mode 100644
index 0000000000000..c54e99ff65d06
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Metadata/country_options_config-meta.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="AllowCountriesConfig" dataType="allow_countries_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/general/" method="POST" successRegex="/messages-message-success/">
+        <object key="groups" dataType="allow_countries_config">
+            <object key="country" dataType="allow_countries_config">
+                <object key="fields" dataType="allow_countries_config">
+                    <object key="allow" dataType="allow_countries_config">
+                        <field key="value">string</field>
+                        <object key="inherit" dataType="allow_countries_config_default">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationGeneralSectionPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationGeneralSectionPage.xml
index c0c4f4bd9d3a5..c92c025b6272b 100644
--- a/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationGeneralSectionPage.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationGeneralSectionPage.xml
@@ -7,5 +7,6 @@
 <pages xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <page name="AdminConfigurationGeneralSectionPage" url="admin/system_config/edit/section/general/{{group_anchor}}" parameterized="true" area="admin" module="Magento_Config">
         <section name="AdminConfigurationGeneralSectionCountryOptionsGroupSection"/>
+        <section name="LocaleOptionsSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml
index 05073acff3ca9..d1bf3c2cb2ed6 100644
--- a/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="ConfigurationStoresPage" url="admin/system_config/edit/section/cms/" area="admin" module="Catalog">
         <section name="WYSIWYGOptionsSection"/>
     </page>
diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminSystemAccountPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminSystemAccountPage.xml
new file mode 100644
index 0000000000000..2f04c2c11d288
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminSystemAccountPage.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="AdminSystemAccountPage" url="admin/system_account/index/" area="admin" module="Magento_Backend">
+        <section name="AdminSystemAccountSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminConfirmationModalSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminConfirmationModalSection.xml
index dc512e66528ac..2ec25da461908 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminConfirmationModalSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminConfirmationModalSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminConfirmationModalSection">
         <element name="title" type="text" selector="aside.confirm .modal-title"/>
         <element name="message" type="text" selector="aside.confirm .modal-content"/>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
index bba375c2d6bfd..3a0737bcae4a1 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
@@ -10,7 +10,9 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminMainActionsSection">
         <element name="save" type="button" selector="#save" timeout="30"/>
-        <element name="delete" type="button" selector="#delete"/>
+        <element name="delete" type="button" selector="#delete" timeout="30"/>
         <element name="add" type="button" selector="#add" timeout="30"/>
+        <element name="back" type="button" selector="#back" timeout="30"/>
+        <element name="saveAndContinue" type="button" selector="button[id*=save_and_]" timeout="30"/>
     </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 72a00ed6db9b6..5040a08967fa3 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
@@ -6,10 +6,13 @@
   */
 -->
 
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminMessagesSection">
         <element name="test" type="input" selector=".test"/>
         <element name="success" type="text" selector="#messages div.message-success"/>
         <element name="successMessageByIndex" type="text" selector=".message.message-success.success:nth-of-type({{n}})>div" parameterized="true"/>
+        <element name="error" type="text" selector="#messages div.message-error"/>
+        <element name="notice" type="text" selector=".message.message-notice.notice"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminPopupModalSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminPopupModalSection.xml
new file mode 100644
index 0000000000000..4cd6dbe5d8584
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminPopupModalSection.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="AdminPopupModalSection">
+        <element name="message" type="text" selector="aside.modal-popup .modal-content .popup-window-content"/>
+        <element name="ok" type="button" selector="//span[contains(text(),'Ok')]/ancestor::button"/>
+        <element name="confirm" type="button" selector="//aside[contains(@class, 'modal-popup')]//footer/button[normalize-space(.)='Confirm']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminSlideOutDialogSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminSlideOutDialogSection.xml
new file mode 100644
index 0000000000000..a4270ae9ce6c9
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminSlideOutDialogSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminSlideOutDialogSection">
+        <element name="closeButton" type="button" selector=".modal-slide._show [data-role=&quot;closeBtn&quot;]" timeout="30"/>
+        <element name="cancelButton" type="button" selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Cancel']" timeout="30"/>
+        <element name="doneButton" type="button" selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Done']" timeout="30"/>
+        <element name="saveButton" type="button" selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Save']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminSystemAccountSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminSystemAccountSection.xml
new file mode 100644
index 0000000000000..b9570ce945943
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminSystemAccountSection.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="AdminSystemAccountSection">
+        <element name="interfaceLocale" type="text" selector="#interface_locale"/>
+        <element name="currentPassword" type="text" selector="#current_password"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml
new file mode 100644
index 0000000000000..f9cfe7105d9a1
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="LocaleOptionsSection">
+        <element name="timezone" type="select" selector="#general_locale_timezone"/>
+        <element name="useDefault" type="checkbox" selector="#general_locale_timezone_inherit"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/TextTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/TextTest.php
index 1bf23649e2ea8..5aa8cf7a0c579 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/TextTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/TextTest.php
@@ -8,6 +8,9 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
+/**
+ * Unit test for \Magento\Backend\Block\Widget\Grid\Column\Filter\Text
+ */
 class TextTest extends \PHPUnit\Framework\TestCase
 {
     /** @var \Magento\Backend\Block\Widget\Grid\Column\Filter\Text*/
@@ -31,7 +34,10 @@ protected function setUp()
             ->setMethods(['getEscaper'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->escaper = $this->createPartialMock(\Magento\Framework\Escaper::class, ['escapeHtml']);
+        $this->escaper = $this->createPartialMock(
+            \Magento\Framework\Escaper::class,
+            ['escapeHtml', 'escapeHtmlAttr']
+        );
         $this->helper = $this->createMock(\Magento\Framework\DB\Helper::class);
 
         $this->context->expects($this->once())->method('getEscaper')->willReturn($this->escaper);
@@ -60,6 +66,13 @@ public function testGetHtml()
         $this->block->setColumn($column);
 
         $this->escaper->expects($this->any())->method('escapeHtml')->willReturn('escapedHtml');
+        $this->escaper->expects($this->once())
+            ->method('escapeHtmlAttr')
+            ->willReturnCallback(
+                function ($string) {
+                    return $string;
+                }
+            );
         $column->expects($this->any())->method('getId')->willReturn('id');
         $column->expects($this->once())->method('getHtmlId')->willReturn('htmlId');
 
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
index e8143b5f6b43a..e62b73f39241d 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
@@ -269,62 +269,6 @@ public function testGetGridIdsJsonWithoutUseSelectAll()
         $this->assertEmpty($this->_block->getGridIdsJson());
     }
 
-    /**
-     * @param array $items
-     * @param string $result
-     *
-     * @dataProvider dataProviderGetGridIdsJsonWithUseSelectAll
-     */
-    public function testGetGridIdsJsonWithUseSelectAll(array $items, $result)
-    {
-        $this->_block->setUseSelectAll(true);
-
-        if ($this->_block->getMassactionIdField()) {
-            $massActionIdField = $this->_block->getMassactionIdField();
-        } else {
-            $massActionIdField = $this->_block->getParentBlock()->getMassactionIdField();
-        }
-
-        $collectionMock = $this->getMockBuilder(\Magento\Framework\Data\Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->_gridMock->expects($this->once())
-            ->method('getCollection')
-            ->willReturn($collectionMock);
-        $collectionMock->expects($this->once())
-            ->method('setPageSize')
-            ->with(0)
-            ->willReturnSelf();
-        $collectionMock->expects($this->once())
-            ->method('getColumnValues')
-            ->with($massActionIdField)
-            ->willReturn($items);
-
-        $this->assertEquals($result, $this->_block->getGridIdsJson());
-    }
-
-    /**
-     * @return array
-     */
-    public function dataProviderGetGridIdsJsonWithUseSelectAll()
-    {
-        return [
-            [
-                [],
-                '',
-            ],
-            [
-                [1],
-                '1',
-            ],
-            [
-                [1, 2, 3],
-                '1,2,3',
-            ],
-        ];
-    }
-
     /**
      * @param string $itemId
      * @param array|\Magento\Framework\DataObject $item
diff --git a/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php b/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php
index 4911dc1e9968e..b373459b7864d 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php
@@ -76,17 +76,35 @@ public function testGetCurrentSecureUrl()
      * @param $unsecureBaseUrl
      * @param $useSecureInAdmin
      * @param $secureBaseUrl
+     * @param $useCustomUrl
+     * @param $customUrl
      * @param $expected
      * @dataProvider shouldBeSecureDataProvider
      */
-    public function testShouldBeSecure($unsecureBaseUrl, $useSecureInAdmin, $secureBaseUrl, $expected)
-    {
-        $coreConfigValueMap = [
+    public function testShouldBeSecure(
+        $unsecureBaseUrl,
+        $useSecureInAdmin,
+        $secureBaseUrl,
+        $useCustomUrl,
+        $customUrl,
+        $expected
+    ) {
+        $coreConfigValueMap = $this->returnValueMap([
             [\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default', null, $unsecureBaseUrl],
             [\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL, 'default', null, $secureBaseUrl],
-        ];
-        $this->coreConfig->expects($this->any())->method('getValue')->will($this->returnValueMap($coreConfigValueMap));
-        $this->backendConfig->expects($this->any())->method('isSetFlag')->willReturn($useSecureInAdmin);
+            ['admin/url/custom', 'default', null, $customUrl],
+        ]);
+        $backendConfigFlagsMap = $this->returnValueMap([
+            [\Magento\Store\Model\Store::XML_PATH_SECURE_IN_ADMINHTML, $useSecureInAdmin],
+            ['admin/url/use_custom', $useCustomUrl],
+        ]);
+        $this->coreConfig->expects($this->atLeast(1))->method('getValue')
+            ->will($coreConfigValueMap);
+        $this->coreConfig->expects($this->atMost(2))->method('getValue')
+            ->will($coreConfigValueMap);
+
+        $this->backendConfig->expects($this->atMost(2))->method('isSetFlag')
+            ->will($backendConfigFlagsMap);
         $this->assertEquals($expected, $this->adminPathConfig->shouldBeSecure(''));
     }
 
@@ -96,13 +114,13 @@ public function testShouldBeSecure($unsecureBaseUrl, $useSecureInAdmin, $secureB
     public function shouldBeSecureDataProvider()
     {
         return [
-            ['http://localhost/', false, 'default', false],
-            ['http://localhost/', true, 'default', false],
-            ['https://localhost/', false, 'default', true],
-            ['https://localhost/', true, 'default', true],
-            ['http://localhost/', false, 'https://localhost/', false],
-            ['http://localhost/', true, 'https://localhost/', true],
-            ['https://localhost/', true, 'https://localhost/', true],
+            ['http://localhost/', false, 'default', false, '', false],
+            ['http://localhost/', true, 'default', false, '', false],
+            ['https://localhost/', false, 'default', false, '', true],
+            ['https://localhost/', true, 'default', false, '', true],
+            ['http://localhost/', false, 'https://localhost/', false, '', false],
+            ['http://localhost/', true, 'https://localhost/', false, '', true],
+            ['https://localhost/', true, 'https://localhost/', false, '', true],
         ];
     }
 
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php b/app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php
index 869d4ba3f45b1..d159225089afc 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php
@@ -267,7 +267,10 @@ public function testGetQuoteWithoutQuoteId()
         $cartInterfaceMock->expects($this->atLeastOnce())->method('getId')->willReturn($quoteId);
         $defaultGroup = $this->getMockBuilder(\Magento\Customer\Api\Data\GroupInterface::class)->getMock();
         $defaultGroup->expects($this->any())->method('getId')->will($this->returnValue($customerGroupId));
-        $this->groupManagementMock->expects($this->any())->method('getDefaultGroup')->willReturn($defaultGroup);
+        $this->groupManagementMock
+            ->method('getDefaultGroup')
+            ->with($storeId)
+            ->willReturn($defaultGroup);
 
         $dataCustomerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
index 845bc4ec87402..e0b9e02edf099 100644
--- a/app/code/Magento/Backend/composer.json
+++ b/app/code/Magento/Backend/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-backend",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-directory": "100.2.*",
         "magento/module-developer": "100.2.*",
@@ -24,7 +24,7 @@
         "magento/module-theme": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.6",
+    "version": "100.2.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index e3411166ee4a4..44ab1dcc00176 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -153,15 +153,15 @@
             </group>
             <group id="js" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>JavaScript Settings</label>
-                <field id="merge_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="merge_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Merge JavaScript Files</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="enable_js_bundling" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="enable_js_bundling" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Enable JavaScript Bundling</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Minify JavaScript Files</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Minification is not applied in developer mode.</comment>
@@ -169,11 +169,11 @@
             </group>
             <group id="css" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>CSS Settings</label>
-                <field id="merge_css_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="merge_css_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Merge CSS Files</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Minify CSS Files</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Minification is not applied in developer mode.</comment>
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_index.xml
index 7fdfe4044a3da..de2f7080a0db8 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_index.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_index.xml
@@ -6,11 +6,10 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <update handle="formkey"/>
-    <update handle="adminhtml_system_store_grid_block"/>
+    <update handle="styles"/>
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Backend\Block\System\Store\Store" name="adminhtml.system.store.container"/>
+            <uiComponent name="store_listing"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
index 8e30afdf51f7f..b4bc42b95d0aa 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
@@ -11,10 +11,10 @@ $permissions = $block->getData('permissions');
 ?>
 <?php if ($permissions && $permissions->hasAccessToAdditionalActions()): ?>
     <div class="additional-cache-management">
+        <h2>
+            <span><?= $block->escapeHtml(__('Additional Cache Management')); ?></span>
+        </h2>
         <?php if ($permissions->hasAccessToFlushCatalogImages()): ?>
-            <h2>
-                <span><?= $block->escapeHtml(__('Additional Cache Management')); ?></span>
-            </h2>
             <p>
                 <button onclick="setLocation('<?= $block->escapeJs($block->getCleanImagesUrl()); ?>')" type="button">
                     <?= $block->escapeHtml(__('Flush Catalog Images Cache')); ?>
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 07b4ba0af0a3e..fad8f5968009f 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -19,7 +19,7 @@
  *
  */
 /* @var $block \Magento\Backend\Block\Widget\Grid */
-$numColumns = sizeof($block->getColumns());
+$numColumns = !is_null($block->getColumns()) ? sizeof($block->getColumns()) : 0;
 ?>
 <?php if ($block->getCollection()): ?>
 
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
index 062528e742201..c76f10da0f927 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
@@ -18,7 +18,7 @@
     <?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
     <?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
     <li>
-        <a href="<?= /* @escapeNotVerified */ $_tabHref ?>" id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>" title="<?= /* @escapeNotVerified */ $block->getTabTitle($_tab) ?>" class="<?php $_tabClass ?>" data-tab-type="<?php $_tabType ?>">
+        <a href="<?= $block->escapeHtmlAttr($_tabHref) ?>" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>" title="<?= $block->escapeHtmlAttr($block->getTabTitle($_tab)) ?>" class="<?= $block->escapeHtmlAttr($_tabClass) ?>" data-tab-type="<?= $block->escapeHtmlAttr($_tabType) ?>">
             <span>
                 <span class="changed" title="<?= /* @escapeNotVerified */ __('The information in this tab has been changed.') ?>"></span>
                 <span class="error" title="<?= /* @escapeNotVerified */ __('This tab contains invalid data. Please resolve this before saving.') ?>"></span>
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index.php b/app/code/Magento/Backup/Controller/Adminhtml/Index.php
index 142211fe90a44..716a95facf8ab 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index.php
@@ -5,12 +5,16 @@
  */
 namespace Magento\Backup\Controller\Adminhtml;
 
+use Magento\Backup\Helper\Data as Helper;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Backup admin controller
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
 abstract class Index extends \Magento\Backend\App\Action
 {
@@ -48,6 +52,11 @@ abstract class Index extends \Magento\Backend\App\Action
      */
     protected $maintenanceMode;
 
+    /**
+     * @var Helper
+     */
+    private $helper;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
@@ -55,6 +64,7 @@ abstract class Index extends \Magento\Backend\App\Action
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      * @param \Magento\Backup\Model\BackupFactory $backupModelFactory
      * @param \Magento\Framework\App\MaintenanceMode $maintenanceMode
+     * @param Helper|null $helper
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -62,13 +72,27 @@ public function __construct(
         \Magento\Framework\Backup\Factory $backupFactory,
         \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
         \Magento\Backup\Model\BackupFactory $backupModelFactory,
-        \Magento\Framework\App\MaintenanceMode $maintenanceMode
+        \Magento\Framework\App\MaintenanceMode $maintenanceMode,
+        Helper $helper = null
     ) {
         $this->_coreRegistry = $coreRegistry;
         $this->_backupFactory = $backupFactory;
         $this->_fileFactory = $fileFactory;
         $this->_backupModelFactory = $backupModelFactory;
         $this->maintenanceMode = $maintenanceMode;
+        $this->helper = $helper ?? ObjectManager::getInstance()->get(Helper::class);
         parent::__construct($context);
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function dispatch(\Magento\Framework\App\RequestInterface $request)
+    {
+        if (!$this->helper->isEnabled()) {
+            return $this->_redirect('*/*/disabled');
+        }
+
+        return parent::dispatch($request);
+    }
 }
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index/Disabled.php b/app/code/Magento/Backup/Controller/Adminhtml/Index/Disabled.php
new file mode 100644
index 0000000000000..978614be5b042
--- /dev/null
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index/Disabled.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Backup\Controller\Adminhtml\Index;
+
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\View\Result\PageFactory;
+
+/**
+ * Inform that backup is disabled.
+ */
+class Disabled extends Action
+{
+    /**
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Backend::backup';
+
+    /**
+     * @var PageFactory
+     */
+    private $pageFactory;
+
+    /**
+     * @param Context $context
+     * @param PageFactory $pageFactory
+     */
+    public function __construct(Context $context, PageFactory $pageFactory)
+    {
+        parent::__construct($context);
+        $this->pageFactory = $pageFactory;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute()
+    {
+        return $this->pageFactory->create();
+    }
+}
diff --git a/app/code/Magento/Backup/Cron/SystemBackup.php b/app/code/Magento/Backup/Cron/SystemBackup.php
index 750262ab1c14a..9502377a39d06 100644
--- a/app/code/Magento/Backup/Cron/SystemBackup.php
+++ b/app/code/Magento/Backup/Cron/SystemBackup.php
@@ -8,6 +8,9 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Store\Model\ScopeInterface;
 
+/**
+ * Performs scheduled backup.
+ */
 class SystemBackup
 {
     const XML_PATH_BACKUP_ENABLED = 'system/backup/enabled';
@@ -101,6 +104,10 @@ public function __construct(
      */
     public function execute()
     {
+        if (!$this->_backupData->isEnabled()) {
+            return $this;
+        }
+
         if (!$this->_scopeConfig->isSetFlag(self::XML_PATH_BACKUP_ENABLED, ScopeInterface::SCOPE_STORE)) {
             return $this;
         }
diff --git a/app/code/Magento/Backup/Helper/Data.php b/app/code/Magento/Backup/Helper/Data.php
index b0bc292ffe926..c6df6a7366852 100644
--- a/app/code/Magento/Backup/Helper/Data.php
+++ b/app/code/Magento/Backup/Helper/Data.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Backup\Helper;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -285,4 +288,14 @@ public function extractDataFromFilename($filename)
 
         return $result;
     }
+
+    /**
+     * Is backup functionality enabled.
+     *
+     * @return bool
+     */
+    public function isEnabled(): bool
+    {
+        return $this->scopeConfig->isSetFlag('system/backup/functionality_enabled');
+    }
 }
diff --git a/app/code/Magento/Backup/Model/Db.php b/app/code/Magento/Backup/Model/Db.php
index 8fbd5da1c9842..b01ecfa5c88d0 100644
--- a/app/code/Magento/Backup/Model/Db.php
+++ b/app/code/Magento/Backup/Model/Db.php
@@ -5,11 +5,16 @@
  */
 namespace Magento\Backup\Model;
 
+use Magento\Backup\Helper\Data as Helper;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\RuntimeException;
+
 /**
  * Database backup model
  *
  * @api
  * @since 100.0.2
+ * @deprecated Backup module is to be removed.
  */
 class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
 {
@@ -33,16 +38,24 @@ class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
      */
     protected $_resource = null;
 
+    /**
+     * @var Helper
+     */
+    private $helper;
+
     /**
      * @param \Magento\Backup\Model\ResourceModel\Db $resourceDb
      * @param \Magento\Framework\App\ResourceConnection $resource
+     * @param Helper|null $helper
      */
     public function __construct(
         \Magento\Backup\Model\ResourceModel\Db $resourceDb,
-        \Magento\Framework\App\ResourceConnection $resource
+        \Magento\Framework\App\ResourceConnection $resource,
+        Helper $helper = null
     ) {
         $this->_resourceDb = $resourceDb;
         $this->_resource = $resource;
+        $this->helper = $helper ?? ObjectManager::getInstance()->get(Helper::class);
     }
 
     /**
@@ -63,6 +76,8 @@ public function getResource()
     }
 
     /**
+     * Tables list.
+     *
      * @return array
      */
     public function getTables()
@@ -71,6 +86,8 @@ public function getTables()
     }
 
     /**
+     * Command to recreate given table.
+     *
      * @param string $tableName
      * @param bool $addDropIfExists
      * @return string
@@ -81,6 +98,8 @@ public function getTableCreateScript($tableName, $addDropIfExists = false)
     }
 
     /**
+     * Generate table's data dump.
+     *
      * @param string $tableName
      * @return string
      */
@@ -90,6 +109,8 @@ public function getTableDataDump($tableName)
     }
 
     /**
+     * Header for dumps.
+     *
      * @return string
      */
     public function getHeader()
@@ -98,6 +119,8 @@ public function getHeader()
     }
 
     /**
+     * Footer for dumps.
+     *
      * @return string
      */
     public function getFooter()
@@ -106,6 +129,8 @@ public function getFooter()
     }
 
     /**
+     * Get backup SQL.
+     *
      * @return string
      */
     public function renderSql()
@@ -124,13 +149,15 @@ public function renderSql()
     }
 
     /**
-     * Create backup and stream write to adapter
-     *
-     * @param \Magento\Framework\Backup\Db\BackupInterface $backup
-     * @return $this
+     * @inheritDoc
+     * @throws RuntimeException
      */
     public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backup)
     {
+        if (!$this->helper->isEnabled()) {
+            throw new RuntimeException(__('Backup functionality is disabled'));
+        }
+
         $backup->open(true);
 
         $this->getResource()->beginTransaction();
@@ -179,8 +206,6 @@ public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backu
         $this->getResource()->commitTransaction();
 
         $backup->close();
-
-        return $this;
     }
 
     /**
diff --git a/app/code/Magento/Backup/Test/Unit/Cron/SystemBackupTest.php b/app/code/Magento/Backup/Test/Unit/Cron/SystemBackupTest.php
index b7dfb30c0a1b3..56a7ef42a0bc2 100644
--- a/app/code/Magento/Backup/Test/Unit/Cron/SystemBackupTest.php
+++ b/app/code/Magento/Backup/Test/Unit/Cron/SystemBackupTest.php
@@ -3,134 +3,44 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Backup\Test\Unit\Cron;
 
+use Magento\Backup\Cron\SystemBackup;
+use PHPUnit\Framework\TestCase;
+use Magento\Backup\Helper\Data as Helper;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
-class SystemBackupTest extends \PHPUnit\Framework\TestCase
+class SystemBackupTest extends TestCase
 {
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-     */
-    private $objectManager;
-
-    /**
-     * @var \Magento\Backup\Cron\SystemBackup
-     */
-    private $systemBackup;
-
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $scopeConfigMock;
-
-    /**
-     * @var \Magento\Backup\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $backupDataMock;
-
-    /**
-     * @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $registryMock;
-
-    /**
-     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var Helper|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $loggerMock;
+    private $helperMock;
 
     /**
-     * Filesystem facade
-     *
-     * @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject
+     * @var SystemBackup
      */
-    private $filesystemMock;
+    private $cron;
 
     /**
-     * @var \Magento\Framework\Backup\Factory|\PHPUnit_Framework_MockObject_MockObject
+     * @inheritDoc
      */
-    private $backupFactoryMock;
-
-    /**
-     * @var \Magento\Framework\App\MaintenanceMode|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $maintenanceModeMock;
-
-    /**
-     * @var \Magento\Framework\Backup\Db|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $backupDbMock;
-
-    /**
-     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $objectManagerMock;
-
     protected function setUp()
     {
-        $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
-            ->getMock();
-        $this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
-            ->getMock();
-        $this->backupDataMock = $this->getMockBuilder(\Magento\Backup\Helper\Data::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->registryMock = $this->getMockBuilder(\Magento\Framework\Registry::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->loggerMock = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
-            ->getMock();
-        $this->filesystemMock = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->backupFactoryMock = $this->getMockBuilder(\Magento\Framework\Backup\Factory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->maintenanceModeMock = $this->getMockBuilder(\Magento\Framework\App\MaintenanceMode::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->backupDbMock = $this->getMockBuilder(\Magento\Framework\Backup\Db::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->backupDbMock->expects($this->any())->method('setBackupExtension')->willReturnSelf();
-        $this->backupDbMock->expects($this->any())->method('setTime')->willReturnSelf();
-        $this->backupDbMock->expects($this->any())->method('setBackupsDir')->willReturnSelf();
-
-        $this->objectManager = new ObjectManager($this);
-        $this->systemBackup = $this->objectManager->getObject(
-            \Magento\Backup\Cron\SystemBackup::class,
-            [
-                'backupData' => $this->backupDataMock,
-                'coreRegistry' => $this->registryMock,
-                'logger' => $this->loggerMock,
-                'scopeConfig' => $this->scopeConfigMock,
-                'filesystem' => $this->filesystemMock,
-                'backupFactory' => $this->backupFactoryMock,
-                'maintenanceMode' => $this->maintenanceModeMock,
-            ]
-        );
+        $objectManager = new ObjectManager($this);
+        $this->helperMock = $this->getMockBuilder(Helper::class)->disableOriginalConstructor()->getMock();
+        $this->cron = $objectManager->getObject(SystemBackup::class, ['backupData' => $this->helperMock]);
     }
 
     /**
-     * @expectedException \Exception
+     * Test that cron doesn't do anything if backups are disabled.
      */
-    public function testExecuteThrowsException()
+    public function testDisabled()
     {
-        $type = 'db';
-        $this->scopeConfigMock->expects($this->any())->method('isSetFlag')->willReturn(true);
-
-        $this->scopeConfigMock->expects($this->once())->method('getValue')
-            ->with('system/backup/type', 'store')
-            ->willReturn($type);
-
-        $this->backupFactoryMock->expects($this->once())->method('create')->willReturn($this->backupDbMock);
-
-        $this->backupDbMock->expects($this->once())->method('create')->willThrowException(new \Exception);
-
-        $this->backupDataMock->expects($this->never())->method('getCreateSuccessMessageByType')->with($type);
-        $this->loggerMock->expects($this->never())->method('info');
-
-        $this->systemBackup->execute();
+        $this->helperMock->expects($this->any())->method('isEnabled')->willReturn(false);
+        $this->cron->execute();
     }
 }
diff --git a/app/code/Magento/Backup/Test/Unit/Model/DbTest.php b/app/code/Magento/Backup/Test/Unit/Model/DbTest.php
deleted file mode 100644
index 0cab5f0ad1e99..0000000000000
--- a/app/code/Magento/Backup/Test/Unit/Model/DbTest.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Backup\Test\Unit\Model;
-
-use Magento\Backup\Model\Db;
-use Magento\Backup\Model\ResourceModel\Db as DbResource;
-use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Backup\Db\BackupInterface;
-use Magento\Framework\DataObject;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-
-class DbTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var ObjectManager
-     */
-    private $objectManager;
-
-    /**
-     * @var Db
-     */
-    private $dbModel;
-
-    /**
-     * @var DbResource|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $dbResourceMock;
-
-    /**
-     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $connectionResourceMock;
-
-    protected function setUp()
-    {
-        $this->dbResourceMock = $this->getMockBuilder(DbResource::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->connectionResourceMock = $this->getMockBuilder(ResourceConnection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->objectManager = new ObjectManager($this);
-        $this->dbModel = $this->objectManager->getObject(
-            Db::class,
-            [
-                'resourceDb' => $this->dbResourceMock,
-                'resource' => $this->connectionResourceMock
-            ]
-        );
-    }
-
-    public function testGetResource()
-    {
-        self::assertEquals($this->dbResourceMock, $this->dbModel->getResource());
-    }
-
-    public function testGetTables()
-    {
-        $tables = [];
-        $this->dbResourceMock->expects($this->once())
-            ->method('getTables')
-            ->willReturn($tables);
-
-        self::assertEquals($tables, $this->dbModel->getTables());
-    }
-
-    public function testGetTableCreateScript()
-    {
-        $tableName = 'some_table';
-        $script = 'script';
-        $this->dbResourceMock->expects($this->once())
-            ->method('getTableCreateScript')
-            ->with($tableName, false)
-            ->willReturn($script);
-
-        self::assertEquals($script, $this->dbModel->getTableCreateScript($tableName, false));
-    }
-
-    public function testGetTableDataDump()
-    {
-        $tableName = 'some_table';
-        $dump = 'dump';
-        $this->dbResourceMock->expects($this->once())
-            ->method('getTableDataDump')
-            ->with($tableName)
-            ->willReturn($dump);
-
-        self::assertEquals($dump, $this->dbModel->getTableDataDump($tableName));
-    }
-
-    public function testGetHeader()
-    {
-        $header = 'header';
-        $this->dbResourceMock->expects($this->once())
-            ->method('getHeader')
-            ->willReturn($header);
-
-        self::assertEquals($header, $this->dbModel->getHeader());
-    }
-
-    public function testGetFooter()
-    {
-        $footer = 'footer';
-        $this->dbResourceMock->expects($this->once())
-            ->method('getFooter')
-            ->willReturn($footer);
-
-        self::assertEquals($footer, $this->dbModel->getFooter());
-    }
-
-    public function testRenderSql()
-    {
-        $header = 'header';
-        $script = 'script';
-        $tableName = 'some_table';
-        $tables = [$tableName, $tableName];
-        $dump = 'dump';
-        $footer = 'footer';
-
-        $this->dbResourceMock->expects($this->once())
-            ->method('getTables')
-            ->willReturn($tables);
-        $this->dbResourceMock->expects($this->once())
-            ->method('getHeader')
-            ->willReturn($header);
-        $this->dbResourceMock->expects($this->exactly(2))
-            ->method('getTableCreateScript')
-            ->with($tableName, true)
-            ->willReturn($script);
-        $this->dbResourceMock->expects($this->exactly(2))
-            ->method('getTableDataDump')
-            ->with($tableName)
-            ->willReturn($dump);
-        $this->dbResourceMock->expects($this->once())
-            ->method('getFooter')
-            ->willReturn($footer);
-
-        self::assertEquals(
-            $header . $script . $dump . $script . $dump . $footer,
-            $this->dbModel->renderSql()
-        );
-    }
-
-    public function testCreateBackup()
-    {
-        /** @var BackupInterface|\PHPUnit_Framework_MockObject_MockObject $backupMock */
-        $backupMock = $this->getMockBuilder(BackupInterface::class)->getMock();
-        /** @var DataObject $tableStatus */
-        $tableStatus = new DataObject();
-
-        $tableName = 'some_table';
-        $tables = [$tableName];
-        $header = 'header';
-        $footer = 'footer';
-        $dropSql = 'drop_sql';
-        $createSql = 'create_sql';
-        $beforeSql = 'before_sql';
-        $afterSql = 'after_sql';
-        $dataSql = 'data_sql';
-        $foreignKeysSql = 'foreign_keys';
-        $triggersSql = 'triggers_sql';
-        $rowsCount = 2;
-        $dataLength = 1;
-
-        $this->dbResourceMock->expects($this->once())
-            ->method('beginTransaction');
-        $this->dbResourceMock->expects($this->once())
-            ->method('commitTransaction');
-        $this->dbResourceMock->expects($this->once())
-            ->method('getTables')
-            ->willReturn($tables);
-        $this->dbResourceMock->expects($this->once())
-            ->method('getTableDropSql')
-            ->willReturn($dropSql);
-        $this->dbResourceMock->expects($this->once())
-            ->method('getTableCreateSql')
-            ->with($tableName, false)
-            ->willReturn($createSql);
-        $this->dbResourceMock->expects($this->once())
-            ->method('getTableDataBeforeSql')
-            ->with($tableName)
-            ->willReturn($beforeSql);
-        $this->dbResourceMock->expects($this->once())
-            ->method('getTableDataAfterSql')
-            ->with($tableName)
-            ->willReturn($afterSql);
-        $this->dbResourceMock->expects($this->once())
-            ->method('getTableDataSql')
-            ->with($tableName, $rowsCount, 0)
-            ->willReturn($dataSql);
-         $this->dbResourceMock->expects($this->once())
-             ->method('getTableStatus')
-             ->with($tableName)
-             ->willReturn($tableStatus);
-        $this->dbResourceMock->expects($this->once())
-            ->method('getTables')
-            ->willReturn($createSql);
-        $this->dbResourceMock->expects($this->once())
-            ->method('getHeader')
-            ->willReturn($header);
-        $this->dbResourceMock->expects($this->once())
-            ->method('getTableHeader')
-            ->willReturn($header);
-        $this->dbResourceMock->expects($this->once())
-            ->method('getFooter')
-            ->willReturn($footer);
-        $this->dbResourceMock->expects($this->once())
-            ->method('getTableForeignKeysSql')
-            ->willReturn($foreignKeysSql);
-        $this->dbResourceMock->expects($this->once())
-            ->method('getTableTriggersSql')
-            ->willReturn($triggersSql);
-        $backupMock->expects($this->once())
-            ->method('open');
-        $backupMock->expects($this->once())
-            ->method('close');
-
-        $tableStatus->setRows($rowsCount);
-        $tableStatus->setDataLength($dataLength);
-
-        $backupMock->expects($this->any())
-            ->method('write')
-            ->withConsecutive(
-                [$this->equalTo($header)],
-                [$this->equalTo($header . $dropSql . "\n")],
-                [$this->equalTo($createSql . "\n")],
-                [$this->equalTo($beforeSql)],
-                [$this->equalTo($dataSql)],
-                [$this->equalTo($afterSql)],
-                [$this->equalTo($foreignKeysSql)],
-                [$this->equalTo($triggersSql)],
-                [$this->equalTo($footer)]
-            );
-
-        $this->dbModel->createBackup($backupMock);
-    }
-}
diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
index f0cbb27bd8ab2..d9a950ab13eb7 100644
--- a/app/code/Magento/Backup/composer.json
+++ b/app/code/Magento/Backup/composer.json
@@ -2,14 +2,14 @@
     "name": "magento/module-backup",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-backend": "100.2.*",
         "magento/module-cron": "100.2.*",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.5",
+    "version": "100.2.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Backup/etc/adminhtml/system.xml b/app/code/Magento/Backup/etc/adminhtml/system.xml
index 4028452d04439..aa6635b4dde4a 100644
--- a/app/code/Magento/Backup/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backup/etc/adminhtml/system.xml
@@ -9,15 +9,24 @@
     <system>
         <section id="system">
             <group id="backup" translate="label" type="text" sortOrder="500" showInDefault="1" showInWebsite="0" showInStore="0">
-                <label>Scheduled Backup Settings</label>
+                <label>Backup Settings</label>
+                <field id="functionality_enabled" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Enable Backup</label>
+                    <comment>Disabled by default for security reasons</comment>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
                 <field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Enable Scheduled Backup</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <depends>
+                        <field id="functionality_enabled">1</field>
+                    </depends>
                 </field>
                 <field id="type" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
-                    <label>Backup Type</label>
+                    <label>Scheduled Backup Type</label>
                     <depends>
                         <field id="enabled">1</field>
+                        <field id="functionality_enabled">1</field>
                     </depends>
                     <source_model>Magento\Backup\Model\Config\Source\Type</source_model>
                 </field>
@@ -25,12 +34,14 @@
                     <label>Start Time</label>
                     <depends>
                         <field id="enabled">1</field>
+                        <field id="functionality_enabled">1</field>
                     </depends>
                 </field>
                 <field id="frequency" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Frequency</label>
                     <depends>
                         <field id="enabled">1</field>
+                        <field id="functionality_enabled">1</field>
                     </depends>
                     <source_model>Magento\Cron\Model\Config\Source\Frequency</source_model>
                     <backend_model>Magento\Backup\Model\Config\Backend\Cron</backend_model>
@@ -40,6 +51,7 @@
                     <comment>Please put your store into maintenance mode during backup.</comment>
                     <depends>
                         <field id="enabled">1</field>
+                        <field id="functionality_enabled">1</field>
                     </depends>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
diff --git a/app/code/Magento/Backup/etc/config.xml b/app/code/Magento/Backup/etc/config.xml
new file mode 100644
index 0000000000000..fb0808983b9c8
--- /dev/null
+++ b/app/code/Magento/Backup/etc/config.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <system>
+            <backup>
+                <functionality_enabled>0</functionality_enabled>
+            </backup>
+        </system>
+    </default>
+</config>
diff --git a/app/code/Magento/Backup/view/adminhtml/layout/backup_index_disabled.xml b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_disabled.xml
new file mode 100644
index 0000000000000..3470f528e5ceb
--- /dev/null
+++ b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_disabled.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <title>Backup functionality is disabled</title>
+    </head>
+    <body>
+        <referenceContainer name="content">
+            <block class="Magento\Backend\Block\Template" name="adminhtml.system.backup.disabled" template="Magento_Backup::backup/disabled.phtml"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml b/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
index 304a60c60cad7..067667292e961 100644
--- a/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
+++ b/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
@@ -3,14 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <!-- TODO: refactor form styles and js -->
 <script type="text/x-magento-template" id="rollback-warning-template">
-<p><?= /* @escapeNotVerified */ __('You will lose any data created since the backup was made, including admin users, customers and orders.') ?></p>
-<p><?= /* @escapeNotVerified */ __('Are you sure you want to continue?') ?></p>
+<p><?= $block->escapeHtml(__('You will lose any data created since the backup was made, including admin users, customers and orders.')) ?></p>
+<p><?= $block->escapeHtml(__('Are you sure you want to continue?')) ?></p>
 </script>
 <script type="text/x-magento-template" id="backup-options-template">
     <div class="backup-messages" style="display: none;">
@@ -18,39 +15,39 @@
     </div>
     <div class="messages">
         <div class="message message-warning">
-            <?= /* @escapeNotVerified */ __('This may take a few moments.') ?>
-            <?= /* @escapeNotVerified */ __('Be sure your store is in maintenance mode during backup.') ?></div>
+            <?= $block->escapeHtml(__('This may take a few moments.')) ?>
+            <?= $block->escapeHtml(__('Be sure your store is in maintenance mode during backup.')) ?></div>
     </div>
     <form action="" method="post" id="backup-form" class="form-inline">
         <fieldset class="admin__fieldset form-list question">
             <div class="admin__field field _required">
-                <label for="backup_name" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Backup Name') ?></span></label>
+                <label for="backup_name" class="admin__field-label"><span><?= $block->escapeHtml(__('Backup Name')) ?></span></label>
                 <div class="admin__field-control">
                     <input type="text" name="backup_name" id="backup_name"
                            class="admin__control-text required-entry validate-alphanum-with-spaces validate-length maximum-length-50"
                            maxlength="50" />
                     <div class="admin__field-note">
-                        <?= /* @escapeNotVerified */ __('Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.') ?>
+                        <?= $block->escapeHtml(__('Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.')) ?>
                     </div>
                 </div>
             </div>
 
             <div class="admin__field field maintenance-checkbox-container">
-                <label for="backup_maintenance_mode" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Maintenance mode') ?></span></label>
+                <label for="backup_maintenance_mode" class="admin__field-label"><span><?= $block->escapeHtml(__('Maintenance mode')) ?></span></label>
                 <div class="admin__field-control">
                     <div class="admin__field-option">
                         <input class="admin__control-checkbox" type="checkbox" name="maintenance_mode" value="1" id="backup_maintenance_mode"/>
-                        <label class="admin__field-label" for="backup_maintenance_mode"><?= /* @escapeNotVerified */ __('Please put your store into maintenance mode during backup.') ?></label>
+                        <label class="admin__field-label" for="backup_maintenance_mode"><?= $block->escapeHtml(__('Please put your store into maintenance mode during backup.')) ?></label>
                     </div>
                 </div>
             </div>
 
             <div class="admin__field field maintenance-checkbox-container" id="exclude-media-checkbox-container" style="display: none;">
-                <label for="exclude_media" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Exclude') ?></span></label>
+                <label for="exclude_media" class="admin__field-label"><span><?= $block->escapeHtml(__('Exclude')) ?></span></label>
                 <div class="admin__field-control">
                     <div class="admin__field-option">
                         <input class="admin__control-checkbox" type="checkbox" name="exclude_media" value="1" id="exclude_media"/>
-                        <label class="admin__field-label" for="exclude_media"><?= /* @escapeNotVerified */ __('Exclude media folder from backup') ?></label>
+                        <label class="admin__field-label" for="exclude_media"><?= $block->escapeHtml(__('Exclude media folder from backup')) ?></label>
                     </div>
                 </div>
             </div>
@@ -64,59 +61,59 @@
     </div>
     <div class="messages">
         <div class="message message-warning">
-            <?= /* @escapeNotVerified */ __('Please enter the password to confirm rollback.') ?><br>
-            <?= /* @escapeNotVerified */ __('This action cannot be undone.') ?>
-            <p><?= /* @escapeNotVerified */ __('Are you sure you want to continue?') ?></p>
+            <?= $block->escapeHtml(__('Please enter the password to confirm rollback.')) ?><br>
+            <?= $block->escapeHtml(__('This action cannot be undone.')) ?>
+            <p><?= $block->escapeHtml(__('Are you sure you want to continue?')) ?></p>
         </div>
     </div>
     <form action="" method="post" id="rollback-form" class="form-inline">
         <fieldset class="admin__fieldset password-box-container">
             <div class="admin__field field _required">
-                <label for="password" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('User Password') ?></span></label>
+                <label for="password" class="admin__field-label"><span><?= $block->escapeHtml(__('User Password')) ?></span></label>
                 <div class="admin__field-control"><input type="password" name="password" id="password" class="admin__control-text required-entry" autocomplete="new-password"></div>
             </div>
 
             <div class="admin__field field maintenance-checkbox-container">
-                <label for="rollback_maintenance_mode" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Maintenance mode') ?></span></label>
+                <label for="rollback_maintenance_mode" class="admin__field-label"><span><?= $block->escapeHtml(__('Maintenance mode')) ?></span></label>
                 <div class="admin__field-control">
                     <div class="admin__field-option">
                         <input class="admin__control-checkbox" type="checkbox" name="maintenance_mode" value="1" id="rollback_maintenance_mode"/>  
-                        <label class="admin__field-label" for="rollback_maintenance_mode"><?= /* @escapeNotVerified */ __('Please put your store into maintenance mode during rollback processing.') ?></label>  
+                        <label class="admin__field-label" for="rollback_maintenance_mode"><?= $block->escapeHtml(__('Please put your store into maintenance mode during rollback processing.')) ?></label>
                     </div>  
                 </div>
             </div>
 
             <div class="admin__field field maintenance-checkbox-container" id="use-ftp-checkbox-row" style="display: none;">
                 <label for="use_ftp" class="admin__field-label">
-                    <span><?= /* @escapeNotVerified */ __('FTP') ?></span>
+                    <span><?= $block->escapeHtml(__('FTP')) ?></span>
                 </label>
                 <div class="admin__field-control">
                     <div class="admin__field-option">
                         <input class="admin__control-checkbox" type="checkbox" name="use_ftp" value="1" id="use_ftp" onclick="backup.toggleFtpCredentialsForm(event)"/>
-                        <label class="admin__field-label" for="use_ftp"><?= /* @escapeNotVerified */ __('Use FTP Connection') ?></label>
+                        <label class="admin__field-label" for="use_ftp"><?= $block->escapeHtml(__('Use FTP Connection')) ?></label>
                     </div>
                 </div>
             </div>
         </fieldset>
         <div class="entry-edit" id="ftp-credentials-container" style="display: none;">
             <fieldset class="admin__fieldset">
-                <legend class="admin__legend legend"><span><?= /* @escapeNotVerified */ __('FTP credentials') ?></span></legend><br />
+                <legend class="admin__legend legend"><span><?= $block->escapeHtml(__('FTP credentials')) ?></span></legend><br />
                 <div class="admin__field field _required">
-                    <label class="admin__field-label" for="ftp_host"><span><?= /* @escapeNotVerified */ __('FTP Host') ?></span></label>
+                    <label class="admin__field-label" for="ftp_host"><span><?= $block->escapeHtml(__('FTP Host')) ?></span></label>
                     <div class="admin__field-control">
                         <input type="text" class="admin__control-text" name="ftp_host" id="ftp_host">
                     </div>
                 </div>
 
                 <div class="admin__field field _required">
-                    <label class="admin__field-label" for="ftp_user"><span><?= /* @escapeNotVerified */ __('FTP Login') ?></span></label>
+                    <label class="admin__field-label" for="ftp_user"><span><?= $block->escapeHtml(__('FTP Login')) ?></span></label>
                     <div class="admin__field-control">
                         <input type="text" class="admin__control-text" name="ftp_user" id="ftp_user">
                     </div>
                 </div>
                 <div class="admin__field field _required">
                     <label class="admin__field-label" for="ftp_pass">
-                        <span><?= /* @escapeNotVerified */ __('FTP Password') ?></span>
+                        <span><?= $block->escapeHtml(__('FTP Password')) ?></span>
                     </label>
                     <div class="admin__field-control">
                         <input type="password" class="admin__control-text" name="ftp_pass" id="ftp_pass" autocomplete="new-password">
@@ -124,7 +121,7 @@
                 </div>
                 <div class="admin__field field">
                     <label class="admin__field-label" for="ftp_path">
-                        <span><?= /* @escapeNotVerified */ __('Magento root directory') ?></span>
+                        <span><?= $block->escapeHtml(__('Magento root directory')) ?></span>
                     </label>
                     <div class="admin__field-control">
                         <input type="text" class="admin__control-text" name="ftp_path" id="ftp_path">
diff --git a/app/code/Magento/Backup/view/adminhtml/templates/backup/disabled.phtml b/app/code/Magento/Backup/view/adminhtml/templates/backup/disabled.phtml
new file mode 100644
index 0000000000000..a5308dce5cc52
--- /dev/null
+++ b/app/code/Magento/Backup/view/adminhtml/templates/backup/disabled.phtml
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<h2>Backup functionality is currently disabled. Please use other means for backups</h2>
diff --git a/app/code/Magento/Backup/view/adminhtml/templates/backup/left.phtml b/app/code/Magento/Backup/view/adminhtml/templates/backup/left.phtml
index 1196f7e443820..cecff38611bfd 100644
--- a/app/code/Magento/Backup/view/adminhtml/templates/backup/left.phtml
+++ b/app/code/Magento/Backup/view/adminhtml/templates/backup/left.phtml
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 ?>
-<h3><?= /* @escapeNotVerified */ __('Create Backup') ?></h3>
+<h3><?= $block->escapeHtml(__('Create Backup')) ?></h3>
diff --git a/app/code/Magento/Braintree/Block/Paypal/Button.php b/app/code/Magento/Braintree/Block/Paypal/Button.php
index efd9e473699c3..fe829cf9f1fdd 100644
--- a/app/code/Magento/Braintree/Block/Paypal/Button.php
+++ b/app/code/Magento/Braintree/Block/Paypal/Button.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Braintree\Block\Paypal;
 
 use Magento\Braintree\Gateway\Config\PayPal\Config;
@@ -49,8 +51,6 @@ class Button extends Template implements ShortcutInterface
     private $payment;
 
     /**
-     * Constructor
-     *
      * @param Context $context
      * @param ResolverInterface $localeResolver
      * @param Session $checkoutSession
@@ -98,6 +98,8 @@ public function getAlias()
     }
 
     /**
+     * Returns container id.
+     *
      * @return string
      */
     public function getContainerId()
@@ -106,6 +108,8 @@ public function getContainerId()
     }
 
     /**
+     * Returns locale.
+     *
      * @return string
      */
     public function getLocale()
@@ -114,6 +118,8 @@ public function getLocale()
     }
 
     /**
+     * Returns currency.
+     *
      * @return string
      */
     public function getCurrency()
@@ -122,6 +128,8 @@ public function getCurrency()
     }
 
     /**
+     * Returns amount.
+     *
      * @return float
      */
     public function getAmount()
@@ -130,6 +138,8 @@ public function getAmount()
     }
 
     /**
+     * Returns if is active.
+     *
      * @return bool
      */
     public function isActive()
@@ -139,6 +149,8 @@ public function isActive()
     }
 
     /**
+     * Returns merchant name.
+     *
      * @return string
      */
     public function getMerchantName()
@@ -147,6 +159,8 @@ public function getMerchantName()
     }
 
     /**
+     * Returns client token.
+     *
      * @return string|null
      */
     public function getClientToken()
@@ -155,10 +169,22 @@ public function getClientToken()
     }
 
     /**
+     * Returns action success.
+     *
      * @return string
      */
     public function getActionSuccess()
     {
         return $this->getUrl(ConfigProvider::CODE . '/paypal/review', ['_secure' => true]);
     }
+
+    /**
+     * Gets environment value.
+     *
+     * @return string
+     */
+    public function getEnvironment(): string
+    {
+        return $this->configProvider->getConfig()['payment'][ConfigProvider::CODE]['environment'];
+    }
 }
diff --git a/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php b/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php
index 1acd16708ff42..09be3723e4518 100644
--- a/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php
+++ b/app/code/Magento/Braintree/Controller/Paypal/PlaceOrder.php
@@ -54,6 +54,7 @@ public function __construct(
 
     /**
      * @inheritdoc
+     *
      * @throws LocalizedException
      */
     public function execute()
@@ -71,7 +72,10 @@ public function execute()
             return $resultRedirect->setPath('checkout/onepage/success', ['_secure' => true]);
         } catch (\Exception $e) {
             $this->logger->critical($e);
-            $this->messageManager->addExceptionMessage($e, $e->getMessage());
+            $this->messageManager->addExceptionMessage(
+                $e,
+                __('The order #%1 cannot be processed.', $quote->getReservedOrderId())
+            );
         }
 
         return $resultRedirect->setPath('checkout/cart', ['_secure' => true]);
diff --git a/app/code/Magento/Braintree/Controller/Paypal/Review.php b/app/code/Magento/Braintree/Controller/Paypal/Review.php
index 4576e3b033df8..15acb1859ec87 100644
--- a/app/code/Magento/Braintree/Controller/Paypal/Review.php
+++ b/app/code/Magento/Braintree/Controller/Paypal/Review.php
@@ -11,6 +11,7 @@
 use Magento\Braintree\Gateway\Config\PayPal\Config;
 use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Payment\Model\Method\Logger;
 
 /**
  * Class Review
@@ -22,6 +23,11 @@ class Review extends AbstractAction
      */
     private $quoteUpdater;
 
+    /**
+     * @var Logger
+     */
+    private $logger;
+
     /**
      * @var string
      */
@@ -34,15 +40,18 @@ class Review extends AbstractAction
      * @param Config $config
      * @param Session $checkoutSession
      * @param QuoteUpdater $quoteUpdater
+     * @param Logger $logger
      */
     public function __construct(
         Context $context,
         Config $config,
         Session $checkoutSession,
-        QuoteUpdater $quoteUpdater
+        QuoteUpdater $quoteUpdater,
+        Logger $logger
     ) {
         parent::__construct($context, $config, $checkoutSession);
         $this->quoteUpdater = $quoteUpdater;
+        $this->logger = $logger;
     }
 
     /**
@@ -54,6 +63,7 @@ public function execute()
             $this->getRequest()->getPostValue('result', '{}'),
             true
         );
+        $this->logger->debug($requestData);
         $quote = $this->checkoutSession->getQuote();
 
         try {
diff --git a/app/code/Magento/Braintree/Gateway/Config/Config.php b/app/code/Magento/Braintree/Gateway/Config/Config.php
index b56021c402263..d0a8f55b9044a 100644
--- a/app/code/Magento/Braintree/Gateway/Config/Config.php
+++ b/app/code/Magento/Braintree/Gateway/Config/Config.php
@@ -30,7 +30,6 @@ class Config extends \Magento\Payment\Gateway\Config\Config
     const KEY_VERIFY_SPECIFIC = 'verify_specific_countries';
     const VALUE_3DSECURE_ALL = 0;
     const CODE_3DSECURE = 'three_d_secure';
-    const KEY_KOUNT_MERCHANT_ID = 'kount_id';
     const FRAUD_PROTECTION = 'fraudprotection';
 
     /**
@@ -173,6 +172,7 @@ public function get3DSecureSpecificCountries($storeId = null)
 
     /**
      * Gets value of configured environment.
+     *
      * Possible values: production or sandbox.
      *
      * @param int|null $storeId
@@ -218,6 +218,8 @@ public function getMerchantAccountId($storeId = null)
     }
 
     /**
+     * Returns SDK url.
+     *
      * @return string
      */
     public function getSdkUrl()
@@ -225,6 +227,16 @@ public function getSdkUrl()
         return $this->getValue(Config::KEY_SDK_URL);
     }
 
+    /**
+     * Gets Hosted Fields SDK Url
+     *
+     * @return string
+     */
+    public function getHostedFieldsSdkUrl(): string
+    {
+        return $this->getValue('hosted_fields_sdk_url');
+    }
+
     /**
      * Checks if fraud protection is enabled.
      *
diff --git a/app/code/Magento/Braintree/Gateway/Request/VaultThreeDSecureDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/VaultThreeDSecureDataBuilder.php
new file mode 100644
index 0000000000000..5441067b9d813
--- /dev/null
+++ b/app/code/Magento/Braintree/Gateway/Request/VaultThreeDSecureDataBuilder.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Gateway\Request;
+
+use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Payment\Gateway\Request\BuilderInterface;
+
+/**
+ * Since we can't validate 3Dsecure for sequence multishipping orders based on vault tokens,
+ * we skip 3D secure verification for vault transactions.
+ * For common vault transaction original 3d secure verification builder is called.
+ */
+class VaultThreeDSecureDataBuilder implements BuilderInterface
+{
+    /**
+     * @var ThreeDSecureDataBuilder
+     */
+    private $threeDSecureDataBuilder;
+
+    /**
+     * @var SubjectReader
+     */
+    private $subjectReader;
+
+    /**
+     * Constructor
+     *
+     * @param ThreeDSecureDataBuilder $threeDSecureDataBuilder
+     * @param SubjectReader $subjectReader
+     */
+    public function __construct(
+        ThreeDSecureDataBuilder $threeDSecureDataBuilder,
+        SubjectReader $subjectReader
+    ) {
+        $this->threeDSecureDataBuilder = $threeDSecureDataBuilder;
+        $this->subjectReader = $subjectReader;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function build(array $buildSubject)
+    {
+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
+        $payment = $paymentDO->getPayment();
+        if ($payment->getAdditionalInformation('is_multishipping')) {
+            return [];
+        }
+
+        return $this->threeDSecureDataBuilder->build($buildSubject);
+    }
+}
diff --git a/app/code/Magento/Braintree/Model/Multishipping/PlaceOrder.php b/app/code/Magento/Braintree/Model/Multishipping/PlaceOrder.php
new file mode 100644
index 0000000000000..cb3d5e4c3ac37
--- /dev/null
+++ b/app/code/Magento/Braintree/Model/Multishipping/PlaceOrder.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Model\Multishipping;
+
+use Magento\Braintree\Gateway\Command\GetPaymentNonceCommand;
+use Magento\Braintree\Gateway\Config\Config;
+use Magento\Braintree\Model\Ui\ConfigProvider;
+use Magento\Braintree\Observer\DataAssignObserver;
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider as PaypalConfigProvider;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\OrderPaymentExtensionInterface;
+use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+use Magento\Sales\Api\OrderManagementInterface;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+
+/**
+ * Order payments processing for multishipping checkout flow.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class PlaceOrder implements PlaceOrderInterface
+{
+    /**
+     * @var OrderManagementInterface
+     */
+    private $orderManagement;
+
+    /**
+     * @var OrderPaymentExtensionInterfaceFactory
+     */
+    private $paymentExtensionFactory;
+
+    /**
+     * @var GetPaymentNonceCommand
+     */
+    private $getPaymentNonceCommand;
+
+    /**
+     * @param OrderManagementInterface $orderManagement
+     * @param OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory
+     * @param GetPaymentNonceCommand $getPaymentNonceCommand
+     */
+    public function __construct(
+        OrderManagementInterface $orderManagement,
+        OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory,
+        GetPaymentNonceCommand $getPaymentNonceCommand
+    ) {
+        $this->orderManagement = $orderManagement;
+        $this->paymentExtensionFactory = $paymentExtensionFactory;
+        $this->getPaymentNonceCommand = $getPaymentNonceCommand;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function place(array $orderList): array
+    {
+        if (empty($orderList)) {
+            return [];
+        }
+
+        $errorList = [];
+        $firstOrder = $this->orderManagement->place(array_shift($orderList));
+        // get payment token from first placed order
+        $paymentToken = $this->getPaymentToken($firstOrder);
+
+        foreach ($orderList as $order) {
+            try {
+                /** @var OrderInterface $order */
+                $orderPayment = $order->getPayment();
+                $this->setVaultPayment($orderPayment, $paymentToken);
+                $this->orderManagement->place($order);
+            } catch (\Exception $e) {
+                $incrementId = $order->getIncrementId();
+                $errorList[$incrementId] = $e;
+            }
+        }
+
+        return $errorList;
+    }
+
+    /**
+     * Sets vault payment method.
+     *
+     * @param OrderPaymentInterface $orderPayment
+     * @param PaymentTokenInterface $paymentToken
+     * @return void
+     */
+    private function setVaultPayment(OrderPaymentInterface $orderPayment, PaymentTokenInterface $paymentToken)
+    {
+        $vaultMethod = $this->getVaultPaymentMethod(
+            $orderPayment->getMethod()
+        );
+        $orderPayment->setMethod($vaultMethod);
+
+        $publicHash = $paymentToken->getPublicHash();
+        $customerId = $paymentToken->getCustomerId();
+        $result = $this->getPaymentNonceCommand->execute(
+            ['public_hash' => $publicHash, 'customer_id' => $customerId]
+        )
+            ->get();
+
+        $orderPayment->setAdditionalInformation(
+            DataAssignObserver::PAYMENT_METHOD_NONCE,
+            $result['paymentMethodNonce']
+        );
+        $orderPayment->setAdditionalInformation(
+            PaymentTokenInterface::PUBLIC_HASH,
+            $publicHash
+        );
+        $orderPayment->setAdditionalInformation(
+            PaymentTokenInterface::CUSTOMER_ID,
+            $customerId
+        );
+        $orderPayment->setAdditionalInformation(
+            'is_multishipping',
+            1
+        );
+    }
+
+    /**
+     * Returns vault payment method.
+     *
+     * For placing sequence of orders, we need to replace the original method on the vault method.
+     *
+     * @param string $method
+     * @return string
+     */
+    private function getVaultPaymentMethod(string $method): string
+    {
+        $vaultPaymentMap = [
+            ConfigProvider::CODE => ConfigProvider::CC_VAULT_CODE,
+            PaypalConfigProvider::PAYPAL_CODE => PaypalConfigProvider::PAYPAL_VAULT_CODE
+        ];
+
+        return $vaultPaymentMap[$method] ?? $method;
+    }
+
+    /**
+     * Returns payment token.
+     *
+     * @param OrderInterface $order
+     * @return PaymentTokenInterface
+     * @throws \BadMethodCallException
+     */
+    private function getPaymentToken(OrderInterface $order): PaymentTokenInterface
+    {
+        $orderPayment = $order->getPayment();
+        $extensionAttributes = $this->getExtensionAttributes($orderPayment);
+        $paymentToken = $extensionAttributes->getVaultPaymentToken();
+
+        if ($paymentToken === null) {
+            throw new \BadMethodCallException('Vault Payment Token should be defined for placed order payment.');
+        }
+
+        return $paymentToken;
+    }
+
+    /**
+     * Gets payment extension attributes.
+     *
+     * @param OrderPaymentInterface $payment
+     * @return OrderPaymentExtensionInterface
+     */
+    private function getExtensionAttributes(OrderPaymentInterface $payment): OrderPaymentExtensionInterface
+    {
+        $extensionAttributes = $payment->getExtensionAttributes();
+        if (null === $extensionAttributes) {
+            $extensionAttributes = $this->paymentExtensionFactory->create();
+            $payment->setExtensionAttributes($extensionAttributes);
+        }
+
+        return $extensionAttributes;
+    }
+}
diff --git a/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php b/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php
index b833798eabf90..453ec439e8c27 100644
--- a/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php
+++ b/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php
@@ -5,14 +5,15 @@
  */
 namespace Magento\Braintree\Model\Paypal\Helper;
 
-use Magento\Quote\Model\Quote;
+use Magento\Braintree\Model\Paypal\OrderCancellationService;
+use Magento\Checkout\Api\AgreementsValidatorInterface;
 use Magento\Checkout\Helper\Data;
+use Magento\Checkout\Model\Type\Onepage;
 use Magento\Customer\Model\Group;
 use Magento\Customer\Model\Session;
-use Magento\Checkout\Model\Type\Onepage;
-use Magento\Quote\Api\CartManagementInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Checkout\Api\AgreementsValidatorInterface;
+use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Model\Quote;
 
 /**
  * Class OrderPlace
@@ -41,23 +42,29 @@ class OrderPlace extends AbstractHelper
     private $checkoutHelper;
 
     /**
-     * Constructor
-     *
+     * @var OrderCancellationService
+     */
+    private $orderCancellationService;
+
+    /**
      * @param CartManagementInterface $cartManagement
      * @param AgreementsValidatorInterface $agreementsValidator
      * @param Session $customerSession
      * @param Data $checkoutHelper
+     * @param OrderCancellationService $orderCancellationService
      */
     public function __construct(
         CartManagementInterface $cartManagement,
         AgreementsValidatorInterface $agreementsValidator,
         Session $customerSession,
-        Data $checkoutHelper
+        Data $checkoutHelper,
+        OrderCancellationService $orderCancellationService
     ) {
         $this->cartManagement = $cartManagement;
         $this->agreementsValidator = $agreementsValidator;
         $this->customerSession = $customerSession;
         $this->checkoutHelper = $checkoutHelper;
+        $this->orderCancellationService = $orderCancellationService;
     }
 
     /**
@@ -66,7 +73,7 @@ public function __construct(
      * @param Quote $quote
      * @param array $agreement
      * @return void
-     * @throws LocalizedException
+     * @throws \Exception
      */
     public function execute(Quote $quote, array $agreement)
     {
@@ -81,7 +88,12 @@ public function execute(Quote $quote, array $agreement)
         $this->disabledQuoteAddressValidation($quote);
 
         $quote->collectTotals();
-        $this->cartManagement->placeOrder($quote->getId());
+        try {
+            $this->cartManagement->placeOrder($quote->getId());
+        } catch (\Exception $e) {
+            $this->orderCancellationService->execute($quote->getReservedOrderId());
+            throw $e;
+        }
     }
 
     /**
diff --git a/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php b/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php
index aa23fa767d1ed..197b398380f74 100644
--- a/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php
+++ b/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php
@@ -123,8 +123,8 @@ private function updateShippingAddress(Quote $quote, array $details)
     {
         $shippingAddress = $quote->getShippingAddress();
 
-        $shippingAddress->setLastname($details['lastName']);
-        $shippingAddress->setFirstname($details['firstName']);
+        $shippingAddress->setLastname($this->getShippingRecipientLastName($details));
+        $shippingAddress->setFirstname($this->getShippingRecipientFirstName($details));
         $shippingAddress->setEmail($details['email']);
 
         $shippingAddress->setCollectShippingRates(true);
@@ -173,14 +173,14 @@ private function updateBillingAddress(Quote $quote, array $details)
      */
     private function updateAddressData(Address $address, array $addressData)
     {
-        $extendedAddress = isset($addressData['extendedAddress'])
-            ? $addressData['extendedAddress']
+        $extendedAddress = isset($addressData['line2'])
+            ? $addressData['line2']
             : null;
 
-        $address->setStreet([$addressData['streetAddress'], $extendedAddress]);
-        $address->setCity($addressData['locality']);
-        $address->setRegionCode($addressData['region']);
-        $address->setCountryId($addressData['countryCodeAlpha2']);
+        $address->setStreet([$addressData['line1'], $extendedAddress]);
+        $address->setCity($addressData['city']);
+        $address->setRegionCode($addressData['state']);
+        $address->setCountryId($addressData['countryCode']);
         $address->setPostcode($addressData['postalCode']);
 
         // PayPal's address supposes not saving against customer account
@@ -188,4 +188,30 @@ private function updateAddressData(Address $address, array $addressData)
         $address->setSameAsBilling(false);
         $address->setCustomerAddressId(null);
     }
+
+    /**
+     * Returns shipping recipient first name.
+     *
+     * @param array $details
+     * @return string
+     */
+    private function getShippingRecipientFirstName(array $details)
+    {
+        return isset($details['shippingAddress']['recipientName'])
+            ? explode(' ', $details['shippingAddress']['recipientName'], 2)[0]
+            : $details['firstName'];
+    }
+
+    /**
+     * Returns shipping recipient last name.
+     *
+     * @param array $details
+     * @return string
+     */
+    private function getShippingRecipientLastName(array $details)
+    {
+        return isset($details['shippingAddress']['recipientName'])
+            ? explode(' ', $details['shippingAddress']['recipientName'], 2)[1]
+            : $details['lastName'];
+    }
 }
diff --git a/app/code/Magento/Braintree/Model/Paypal/OrderCancellationService.php b/app/code/Magento/Braintree/Model/Paypal/OrderCancellationService.php
new file mode 100644
index 0000000000000..ce39a5f875b47
--- /dev/null
+++ b/app/code/Magento/Braintree/Model/Paypal/OrderCancellationService.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Braintree\Model\Paypal;
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+
+/**
+ * The service to cancel an order and void authorization transaction.
+ */
+class OrderCancellationService
+{
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param OrderRepositoryInterface $orderRepository
+     */
+    public function __construct(
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        OrderRepositoryInterface $orderRepository
+    ) {
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->orderRepository = $orderRepository;
+    }
+
+    /**
+     * Cancels an order and authorization transaction.
+     *
+     * @param string $incrementId
+     * @return bool
+     */
+    public function execute($incrementId): bool
+    {
+        $order = $this->getOrder($incrementId);
+        if ($order === null) {
+            return false;
+        }
+
+        // `\Magento\Sales\Model\Service\OrderService::cancel` cannot be used for cancellation as the service uses
+        // the order repository with outdated payment method instance (ex. contains Vault instead of Braintree)
+        $order->cancel();
+        $this->orderRepository->save($order);
+        return true;
+    }
+
+    /**
+     * Gets order by increment ID.
+     *
+     * @param string $incrementId
+     * @return OrderInterface|null
+     */
+    private function getOrder(string $incrementId)
+    {
+        $searchCriteria = $this->searchCriteriaBuilder->addFilter(OrderInterface::INCREMENT_ID, $incrementId)
+            ->create();
+
+        $items = $this->orderRepository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+}
diff --git a/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php b/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php
index 5c4a1c9598d1d..ec91bd0f2ce46 100644
--- a/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php
+++ b/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php
@@ -13,6 +13,8 @@
 
 /**
  * Class ConfigProvider
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class ConfigProvider implements ConfigProviderInterface
 {
@@ -72,11 +74,11 @@ public function getConfig()
                     'clientToken' => $this->getClientToken(),
                     'ccTypesMapper' => $this->config->getCcTypesMapper(),
                     'sdkUrl' => $this->config->getSdkUrl(),
+                    'hostedFieldsSdkUrl' => $this->config->getHostedFieldsSdkUrl(),
                     'countrySpecificCardTypes' => $this->config->getCountrySpecificCardTypeConfig($storeId),
                     'availableCardTypes' => $this->config->getAvailableCardTypes($storeId),
                     'useCvv' => $this->config->isCvvEnabled($storeId),
                     'environment' => $this->config->getEnvironment($storeId),
-                    'kountMerchantId' => $this->config->getKountMerchantId($storeId),
                     'hasFraudProtection' => $this->config->hasFraudProtection($storeId),
                     'merchantId' => $this->config->getMerchantId($storeId),
                     'ccVaultCode' => self::CC_VAULT_CODE
@@ -92,6 +94,7 @@ public function getConfig()
 
     /**
      * Generate a new client token if necessary
+     *
      * @return string
      */
     public function getClientToken()
diff --git a/app/code/Magento/Braintree/Plugin/OrderCancellation.php b/app/code/Magento/Braintree/Plugin/OrderCancellation.php
new file mode 100644
index 0000000000000..eb126bce78dc8
--- /dev/null
+++ b/app/code/Magento/Braintree/Plugin/OrderCancellation.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Braintree\Plugin;
+
+use Magento\Braintree\Model\Paypal\OrderCancellationService;
+use Magento\Braintree\Model\Ui\ConfigProvider;
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider as PayPalConfigProvider;
+use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\PaymentInterface;
+
+/**
+ * Cancels an order and an authorization transaction.
+ */
+class OrderCancellation
+{
+    /**
+     * @var OrderCancellationService
+     */
+    private $orderCancellationService;
+
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $quoteRepository;
+
+    /**
+     * @param OrderCancellationService $orderCancellationService
+     * @param CartRepositoryInterface $quoteRepository
+     */
+    public function __construct(
+        OrderCancellationService $orderCancellationService,
+        CartRepositoryInterface $quoteRepository
+    ) {
+        $this->orderCancellationService = $orderCancellationService;
+        $this->quoteRepository = $quoteRepository;
+    }
+
+    /**
+     * Cancels an order if an exception occurs during the order creation.
+     *
+     * @param CartManagementInterface $subject
+     * @param \Closure $proceed
+     * @param int $cartId
+     * @param PaymentInterface $payment
+     * @return int
+     * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundPlaceOrder(
+        CartManagementInterface $subject,
+        \Closure $proceed,
+        $cartId,
+        PaymentInterface $payment = null
+    ) {
+        try {
+            return $proceed($cartId, $payment);
+        } catch (\Exception $e) {
+            $quote = $this->quoteRepository->get((int) $cartId);
+            $payment = $quote->getPayment();
+            $paymentCodes = [
+                ConfigProvider::CODE,
+                ConfigProvider::CC_VAULT_CODE,
+                PayPalConfigProvider::PAYPAL_CODE,
+                PayPalConfigProvider::PAYPAL_VAULT_CODE
+            ];
+            if (in_array($payment->getMethod(), $paymentCodes)) {
+                $incrementId = $quote->getReservedOrderId();
+                $this->orderCancellationService->execute($incrementId);
+            }
+
+            throw $e;
+        }
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderFillBraintreeCreditCardActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderFillBraintreeCreditCardActionGroup.xml
index 7174e107aee40..ce05e3c88305a 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderFillBraintreeCreditCardActionGroup.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderFillBraintreeCreditCardActionGroup.xml
@@ -18,22 +18,18 @@
         <!--Fill card number-->
         <switchToIFrame selector="{{AdminOrderFormPaymentSection.braintreeCcFrame}}" stepKey="switchToCcIFrame"/>
         <fillField selector="{{AdminOrderFormPaymentSection.braintreeCardNumber}}" userInput="{{cardData.card_number}}" stepKey="fillCardNumber"/>
-        <waitForPageLoad stepKey="waitForFillCardNumber" time="1"/>
         <switchToIFrame stepKey="switchToDefaultContext1"/>
         <!--Fill card expiration month-->
         <switchToIFrame selector="{{AdminOrderFormPaymentSection.braintreeCcExpMonthFrame}}" stepKey="switchToCcExpMonthIFrame"/>
         <fillField selector="{{AdminOrderFormPaymentSection.braintreeExpMonth}}" userInput="{{cardData.exp_month}}" stepKey="fillExpMonth"/>
-        <waitForPageLoad stepKey="waitForFillCardExpMonth" time="1"/>
         <switchToIFrame stepKey="switchToDefaultContext2"/>
         <!--Fill card expiration year-->
         <switchToIFrame selector="{{AdminOrderFormPaymentSection.braintreeCcExpYear}}" stepKey="switchToCcExpYearIFrame"/>
         <fillField selector="{{AdminOrderFormPaymentSection.braintreeExpYear}}" userInput="{{cardData.exp_year}}" stepKey="fillExpYear"/>
-        <waitForPageLoad stepKey="waitForFillCardExpYear" time="1"/>
         <switchToIFrame stepKey="switchToDefaultContext3"/>
         <!--Fill card CVV-->
         <switchToIFrame selector="{{AdminOrderFormPaymentSection.braintreeCvvFrame}}" stepKey="switchToCvvIFrame"/>
         <fillField selector="{{AdminOrderFormPaymentSection.braintreeCvv}}" userInput="{{cardData.cvv}}" stepKey="fillCvv"/>
-        <waitForPageLoad stepKey="waitForFillCardCvv" time="1"/>
         <switchToIFrame stepKey="switchToDefaultContext4"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontBraintreeFillCardDataActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontBraintreeFillCardDataActionGroup.xml
new file mode 100644
index 0000000000000..93f239b5c38a1
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontBraintreeFillCardDataActionGroup.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontBraintreeSelectPaymentMethodActionGroup">
+        <click selector="{{StorefrontBraintreePaymentConfigurationSection.creditCardBraintreePaymentMethod}}" stepKey="selectBraintreePaymentMethod"/>
+    </actionGroup>
+
+    <actionGroup name="StorefrontBraintreeFillCardDataActionGroup">
+        <arguments>
+            <argument name="cardData" defaultValue="BraintreeCard"/>
+        </arguments>
+        <scrollTo selector="{{StorefrontBraintreePaymentConfigurationSection.creditCardBraintreePaymentMethod}}" stepKey="scrollToCreditCardSection"/>
+        <switchToIFrame selector="{{StorefrontBraintreePaymentConfigurationSection.cardFrame}}" stepKey="switchToIframe"/>
+        <waitForElementVisible selector="{{StorefrontBraintreePaymentConfigurationSection.cardNumber}}" stepKey="waitCardNumberElement"/>
+        <fillField selector="{{StorefrontBraintreePaymentConfigurationSection.cardNumber}}" userInput="{{cardData.card_number}}" stepKey="setCardNumber"/>
+        <switchToIFrame stepKey="switchBack"/>
+        <switchToIFrame selector="{{StorefrontBraintreePaymentConfigurationSection.monthFrame}}" stepKey="switchToIframe1"/>
+        <waitForElementVisible selector="{{StorefrontBraintreePaymentConfigurationSection.month}}" stepKey="waitMonthElement"/>
+        <fillField selector="{{StorefrontBraintreePaymentConfigurationSection.month}}" userInput="{{cardData.exp_month}}" stepKey="setMonth"/>
+        <switchToIFrame stepKey="switchBack1"/>
+        <switchToIFrame selector="{{StorefrontBraintreePaymentConfigurationSection.yearFrame}}" stepKey="switchToIframe2"/>
+        <waitForElementVisible selector="{{StorefrontBraintreePaymentConfigurationSection.year}}" stepKey="waitYearElement"/>
+        <fillField selector="{{StorefrontBraintreePaymentConfigurationSection.year}}" userInput="{{cardData.exp_year}}" stepKey="setYear"/>
+        <switchToIFrame stepKey="switchBack2"/>
+        <switchToIFrame selector="{{StorefrontBraintreePaymentConfigurationSection.codeFrame}}" stepKey="switchToIframe3"/>
+        <waitForElementVisible selector="{{StorefrontBraintreePaymentConfigurationSection.verificationNumber}}" stepKey="waitVerificationNumber"/>
+        <fillField selector="{{StorefrontBraintreePaymentConfigurationSection.verificationNumber}}" userInput="{{cardData.cvv}}" stepKey="setVerificationNumber"/>
+        <switchToIFrame stepKey="SwitchBackToWindow"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontPayWithPaypalFromMiniCartActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontPayWithPaypalFromMiniCartActionGroup.xml
new file mode 100644
index 0000000000000..8ad866b77e7ff
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontPayWithPaypalFromMiniCartActionGroup.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="StorefrontPayWithPaypalFromMiniCartActionGroup" extends="StorefrontViewAndEditCartFromMiniCartActionGroup">
+        <remove keyForRemoval="viewAndEditCart"/>
+        <remove keyForRemoval="seeInCurrentUrl"/>
+        <waitForElementVisible selector="{{StorefrontMiniCartSection.payWithPayPal}}" stepKey="waitForPaypalButtonIsVisible"/>
+        <click selector="{{StorefrontMiniCartSection.payWithPayPal}}" stepKey="clickPayWithPaypalButton"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml b/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
index 0c57147ca950e..aa0f5a936fd7e 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="SampleBraintreeConfig" type="braintree_config_state">
         <requiredEntity type="title">SampleTitle</requiredEntity>
         <requiredEntity type="payment_action">SamplePaymentAction</requiredEntity>
@@ -71,6 +71,13 @@
         <data key="value"/>
     </entity>
 
+    <entity name="DefaultBraintreeWithPaypalConfig" extends="DefaultBraintreeConfig">
+        <requiredEntity type="active_braintree_paypal">DefaultActiveBraintreePaypal</requiredEntity>
+    </entity>
+    <entity name="DefaultActiveBraintreePaypal" type="active_braintree_paypal">
+        <data key="value">0</data>
+    </entity>
+
     <entity name="SandboxBraintreeConfig" type="braintree_config_state">
         <requiredEntity type="title">EnabledTitle</requiredEntity>
         <requiredEntity type="payment_action">AuthorizePaymentAction</requiredEntity>
@@ -106,6 +113,13 @@
         <data key="value">Magneto</data>
     </entity>
 
+    <entity name="SandboxBraintreeWithPaypalConfig" extends="SandboxBraintreeConfig">
+        <requiredEntity type="active_braintree_paypal">EnableActiveBraintreePaypal</requiredEntity>
+    </entity>
+    <entity name="EnableActiveBraintreePaypal" type="active_braintree_paypal">
+        <data key="value">1</data>
+    </entity>
+
     <entity name="BraintreeCard" type="creditCard">
         <data key="cc_type">MasterCard</data>
         <data key="card_number">5105105105105100</data>
@@ -113,5 +127,4 @@
         <data key="exp_year">20</data>
         <data key="cvv">113</data>
     </entity>
-
 </entities>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml b/app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml
index 0f734e5c02d56..04b3cf38d27a7 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml
@@ -49,6 +49,9 @@
                             <object key="active" dataType="active">
                                 <field key="value">integer</field>
                             </object>
+                            <object key="active_braintree_paypal" dataType="active_braintree_paypal">
+                                <field key="value">integer</field>
+                            </object>
                         </object>
                     </object>
                 </object>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Page/CheckoutPage.xml b/app/code/Magento/Braintree/Test/Mftf/Page/CheckoutPage.xml
new file mode 100644
index 0000000000000..bc23a1e1fe3f7
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Page/CheckoutPage.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="CheckoutPage" url="/checkout" area="storefront" module="Magento_Checkout">
+        <section name="StorefrontBraintreePaymentConfigurationSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Page/StorefrontPaypalReviewOrderPage.xml b/app/code/Magento/Braintree/Test/Mftf/Page/StorefrontPaypalReviewOrderPage.xml
new file mode 100644
index 0000000000000..82c0fa2a075d4
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Page/StorefrontPaypalReviewOrderPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontPaypalReviewOrderPage" url="/braintree/paypal/review" area="storefront" module="Magento_Braintree">
+        <section name="StorefrontPaypalReviewOrderShippingSection"/>
+        <section name="StorefrontPaypalReviewOrderItemsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/StorefrontBraintreePaymentConfigurationSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/StorefrontBraintreePaymentConfigurationSection.xml
new file mode 100644
index 0000000000000..f72eed9179764
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/StorefrontBraintreePaymentConfigurationSection.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontBraintreePaymentConfigurationSection">
+        <element name="creditCardBraintreePaymentMethod" type="radio" selector="#braintree" timeout="30"/>
+        <element name="cardFrame" type="iframe" selector="braintree-hosted-field-number"/>
+        <element name="monthFrame" type="iframe" selector="braintree-hosted-field-expirationMonth"/>
+        <element name="yearFrame" type="iframe" selector="braintree-hosted-field-expirationYear"/>
+        <element name="codeFrame" type="iframe" selector="braintree-hosted-field-cvv"/>
+        <element name="cardNumber" type="input" selector="#credit-card-number"/>
+        <element name="month" type="input" selector="#expiration-month"/>
+        <element name="year" type="input" selector="#expiration-year"/>
+        <element name="verificationNumber" type="input" selector="#cvv"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/StorefrontMiniCartSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/StorefrontMiniCartSection.xml
new file mode 100644
index 0000000000000..bd4a5b72daa8a
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/StorefrontMiniCartSection.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="StorefrontMiniCartSection">
+        <element name="payWithPayPal" type="button" selector=".braintree-paypal-button-hidden" timeout="30"/>
+        <element name="proceedWithSandboxPurchase" type="text" selector="#return_url"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/StorefrontPaypalReviewOrderItemsSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/StorefrontPaypalReviewOrderItemsSection.xml
new file mode 100644
index 0000000000000..8c834f7003eb5
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/StorefrontPaypalReviewOrderItemsSection.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="StorefrontPaypalReviewOrderItemsSection">
+        <element name="placeOrder" type="button" selector="#review-button" timeout="30"/>
+        <element name="orderSummaryTotal" type="text" selector="tr.grand.totals span.price"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/StorefrontPaypalReviewOrderShippingSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/StorefrontPaypalReviewOrderShippingSection.xml
new file mode 100644
index 0000000000000..2e4e6047f57bb
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/StorefrontPaypalReviewOrderShippingSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontPaypalReviewOrderShippingSection">
+        <element name="selectShippingMethodByName" type="select" selector="//select[@id='shipping-method']//option[contains(text(),'{{shippingMethod}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/AdminCreateOrderUsingBraintreePaymentTest.xml b/app/code/Magento/Braintree/Test/Mftf/Test/AdminCreateOrderUsingBraintreePaymentTest.xml
index aa5b6c8be7925..15e8af6c3136a 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Test/AdminCreateOrderUsingBraintreePaymentTest.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/AdminCreateOrderUsingBraintreePaymentTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminCreateOrderUsingBraintreePaymentTest">
         <annotations>
             <features value="Backend"/>
@@ -84,7 +84,8 @@
         <actionGroup ref="AdminOrderFillBraintreeCreditCardActionGroup" stepKey="selectBraintreeCreditCard"/>
         <!--Submit Order and verify information-->
         <click selector="{{AdminOrderFormActionSection.submitOrder}}" stepKey="clickSubmitOrder"/>
-        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage"/>
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url('$grabOrderId')}}" stepKey="seeViewOrderPage"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You created the order." stepKey="seeOrderSuccessMessage"/>
         <actionGroup ref="logout" stepKey="logoutRestrictedAdminFromBackend"/>
     </test>
diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/PlaceOrderTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/PlaceOrderTest.php
index 5a10b4abb3fbc..6f69e3b748e97 100644
--- a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/PlaceOrderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/PlaceOrderTest.php
@@ -15,6 +15,8 @@
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Message\ManagerInterface;
 use Magento\Quote\Model\Quote;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class PlaceOrderTest
@@ -26,34 +28,34 @@
 class PlaceOrderTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var OrderPlace|\PHPUnit_Framework_MockObject_MockObject
+     * @var OrderPlace|MockObject
      */
-    private $orderPlaceMock;
+    private $orderPlace;
 
     /**
-     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var Config|MockObject
      */
-    private $configMock;
+    private $config;
 
     /**
-     * @var Session|\PHPUnit_Framework_MockObject_MockObject
+     * @var Session|MockObject
      */
-    private $checkoutSessionMock;
+    private $checkoutSession;
 
     /**
-     * @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var RequestInterface|MockObject
      */
-    private $requestMock;
+    private $request;
 
     /**
-     * @var ResultFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResultFactory|MockObject
      */
-    private $resultFactoryMock;
+    private $resultFactory;
 
     /**
-     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ManagerInterface|MockObject
      */
-    protected $messageManagerMock;
+    private $messageManager;
 
     /**
      * @var PlaceOrder
@@ -61,139 +63,143 @@ class PlaceOrderTest extends \PHPUnit\Framework\TestCase
     private $placeOrder;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
-    private $loggerMock;
+    private $logger;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        /** @var Context|\PHPUnit_Framework_MockObject_MockObject $contextMock */
-        $contextMock = $this->getMockBuilder(Context::class)
+        /** @var Context|MockObject $context */
+        $context = $this->getMockBuilder(Context::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->requestMock = $this->getMockBuilder(RequestInterface::class)
+        $this->request = $this->getMockBuilder(RequestInterface::class)
             ->setMethods(['getPostValue'])
             ->getMockForAbstractClass();
-        $this->resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
+        $this->resultFactory = $this->getMockBuilder(ResultFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->checkoutSessionMock = $this->getMockBuilder(Session::class)
+        $this->checkoutSession = $this->getMockBuilder(Session::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->configMock = $this->getMockBuilder(Config::class)
+        $this->config = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->orderPlaceMock = $this->getMockBuilder(OrderPlace::class)
+        $this->orderPlace = $this->getMockBuilder(OrderPlace::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->messageManagerMock = $this->getMockBuilder(ManagerInterface::class)
+        $this->messageManager = $this->getMockBuilder(ManagerInterface::class)
             ->getMockForAbstractClass();
 
-        $contextMock->expects(self::once())
-            ->method('getRequest')
-            ->willReturn($this->requestMock);
-        $contextMock->expects(self::once())
-            ->method('getResultFactory')
-            ->willReturn($this->resultFactoryMock);
-        $contextMock->expects(self::once())
-            ->method('getMessageManager')
-            ->willReturn($this->messageManagerMock);
-
-        $this->loggerMock = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
+        $context->method('getRequest')
+            ->willReturn($this->request);
+        $context->method('getResultFactory')
+            ->willReturn($this->resultFactory);
+        $context->method('getMessageManager')
+            ->willReturn($this->messageManager);
+
+        $this->logger = $this->getMockBuilder(LoggerInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->placeOrder = new PlaceOrder(
-            $contextMock,
-            $this->configMock,
-            $this->checkoutSessionMock,
-            $this->orderPlaceMock,
-            $this->loggerMock
+            $context,
+            $this->config,
+            $this->checkoutSession,
+            $this->orderPlace,
+            $this->logger
         );
     }
 
+    /**
+     * Checks if an order is placed successfully.
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NotFoundException
+     */
     public function testExecute()
     {
         $agreement = ['test-data'];
 
         $quoteMock = $this->getQuoteMock();
-        $quoteMock->expects(self::once())
-            ->method('getItemsCount')
+        $quoteMock->method('getItemsCount')
             ->willReturn(1);
 
         $resultMock = $this->getResultMock();
-        $resultMock->expects(self::once())
-            ->method('setPath')
+        $resultMock->method('setPath')
             ->with('checkout/onepage/success')
             ->willReturnSelf();
 
-        $this->resultFactoryMock->expects(self::once())
-            ->method('create')
+        $this->resultFactory->method('create')
             ->with(ResultFactory::TYPE_REDIRECT)
             ->willReturn($resultMock);
 
-        $this->requestMock->expects(self::once())
-            ->method('getPostValue')
+        $this->request->method('getPostValue')
             ->with('agreement', [])
             ->willReturn($agreement);
 
-        $this->checkoutSessionMock->expects(self::once())
-            ->method('getQuote')
+        $this->checkoutSession->method('getQuote')
             ->willReturn($quoteMock);
 
-        $this->orderPlaceMock->expects(self::once())
-            ->method('execute')
+        $this->orderPlace->method('execute')
             ->with($quoteMock, [0]);
 
-        $this->messageManagerMock->expects(self::never())
+        $this->messageManager->expects(self::never())
             ->method('addExceptionMessage');
 
         self::assertEquals($this->placeOrder->execute(), $resultMock);
     }
 
+    /**
+     * Checks a negative scenario during place order action.
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NotFoundException
+     */
     public function testExecuteException()
     {
         $agreement = ['test-data'];
 
         $quote = $this->getQuoteMock();
-        $quote->expects(self::once())
-            ->method('getItemsCount')
+        $quote->method('getItemsCount')
             ->willReturn(0);
+        $quote->method('getReservedOrderId')
+            ->willReturn('000000111');
 
         $resultMock = $this->getResultMock();
-        $resultMock->expects(self::once())
-            ->method('setPath')
+        $resultMock->method('setPath')
             ->with('checkout/cart')
             ->willReturnSelf();
 
-        $this->resultFactoryMock->expects(self::once())
-            ->method('create')
+        $this->resultFactory->method('create')
             ->with(ResultFactory::TYPE_REDIRECT)
             ->willReturn($resultMock);
 
-        $this->requestMock->expects(self::once())
-            ->method('getPostValue')
+        $this->request->method('getPostValue')
             ->with('agreement', [])
             ->willReturn($agreement);
 
-        $this->checkoutSessionMock->expects(self::once())
-            ->method('getQuote')
+        $this->checkoutSession->method('getQuote')
             ->willReturn($quote);
 
-        $this->orderPlaceMock->expects(self::never())
+        $this->orderPlace->expects(self::never())
             ->method('execute');
 
-        $this->messageManagerMock->expects(self::once())
-            ->method('addExceptionMessage')
+        $this->messageManager->method('addExceptionMessage')
             ->with(
                 self::isInstanceOf('\InvalidArgumentException'),
-                'We can\'t initialize checkout.'
+                'The order #000000111 cannot be processed.'
             );
 
         self::assertEquals($this->placeOrder->execute(), $resultMock);
     }
 
     /**
-     * @return ResultInterface|\PHPUnit_Framework_MockObject_MockObject
+     * Gets mock object for a result.
+     *
+     * @return ResultInterface|MockObject
      */
     private function getResultMock()
     {
@@ -203,7 +209,9 @@ private function getResultMock()
     }
 
     /**
-     * @return Quote|\PHPUnit_Framework_MockObject_MockObject
+     * Gets mock object for a quote.
+     *
+     * @return Quote|MockObject
      */
     private function getQuoteMock()
     {
diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/ReviewTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/ReviewTest.php
index cb911a8396b36..cc79b5b008e6e 100644
--- a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/ReviewTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/ReviewTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Braintree\Test\Unit\Controller\Paypal;
 
+use Magento\Payment\Model\Method\Logger;
 use Magento\Quote\Model\Quote;
 use Magento\Framework\View\Layout;
 use Magento\Checkout\Model\Session;
@@ -63,6 +64,14 @@ class ReviewTest extends \PHPUnit\Framework\TestCase
      * @var Review
      */
     private $review;
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+
+    /**
+     * @var Logger|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
 
     protected function setUp()
     {
@@ -87,6 +96,9 @@ protected function setUp()
             ->getMock();
         $this->messageManagerMock = $this->getMockBuilder(ManagerInterface::class)
             ->getMockForAbstractClass();
+        $this->loggerMock = $this->getMockBuilder(Logger::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $contextMock->expects(self::once())
             ->method('getRequest')
@@ -102,7 +114,8 @@ protected function setUp()
             $contextMock,
             $this->configMock,
             $this->checkoutSessionMock,
-            $this->quoteUpdaterMock
+            $this->quoteUpdaterMock,
+            $this->loggerMock
         );
     }
 
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php
index 80d333db80f0a..6925e37b580ac 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php
@@ -111,7 +111,7 @@ public function testBuild()
      * @expectedException \Magento\Payment\Gateway\Command\CommandException
      * @expectedExceptionMessage The Payment Token is not available to perform the request.
      */
-    public function testBuildWithoutPaymentToken(): void
+    public function testBuildWithoutPaymentToken()
     {
         $amount = 30.00;
         $buildSubject = [
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/OrderPlaceTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/OrderPlaceTest.php
index 1aecba91b9afc..ac6351e0b8f1f 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/OrderPlaceTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/OrderPlaceTest.php
@@ -3,9 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Braintree\Test\Unit\Model\Paypal\Helper;
 
 use Magento\Braintree\Model\Paypal\Helper\OrderPlace;
+use Magento\Braintree\Model\Paypal\OrderCancellationService;
 use Magento\Checkout\Api\AgreementsValidatorInterface;
 use Magento\Checkout\Helper\Data;
 use Magento\Checkout\Model\Type\Onepage;
@@ -14,6 +16,7 @@
 use Magento\Quote\Api\CartManagementInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Address;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class OrderPlaceTest
@@ -27,62 +30,80 @@ class OrderPlaceTest extends \PHPUnit\Framework\TestCase
     const TEST_EMAIL = 'test@test.loc';
 
     /**
-     * @var CartManagementInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CartManagementInterface|MockObject
      */
-    private $cartManagementMock;
+    private $cartManagement;
 
     /**
-     * @var AgreementsValidatorInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var AgreementsValidatorInterface|MockObject
      */
-    private $agreementsValidatorMock;
+    private $agreementsValidator;
 
     /**
-     * @var Session|\PHPUnit_Framework_MockObject_MockObject
+     * @var Session|MockObject
      */
-    private $customerSessionMock;
+    private $customerSession;
 
     /**
-     * @var Data|\PHPUnit_Framework_MockObject_MockObject
+     * @var Data|MockObject
      */
-    private $checkoutHelperMock;
+    private $checkoutHelper;
 
     /**
-     * @var Address|\PHPUnit_Framework_MockObject_MockObject
+     * @var Address|MockObject
      */
-    private $billingAddressMock;
+    private $billingAddress;
 
     /**
      * @var OrderPlace
      */
     private $orderPlace;
 
+    /**
+     * @var OrderCancellationService|MockObject
+     */
+    private $orderCancellation;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->cartManagementMock = $this->getMockBuilder(CartManagementInterface::class)
+        $this->cartManagement = $this->getMockBuilder(CartManagementInterface::class)
             ->getMockForAbstractClass();
-        $this->agreementsValidatorMock = $this->getMockBuilder(AgreementsValidatorInterface::class)
+        $this->agreementsValidator = $this->getMockBuilder(AgreementsValidatorInterface::class)
             ->getMockForAbstractClass();
-        $this->customerSessionMock = $this->getMockBuilder(Session::class)
+        $this->customerSession = $this->getMockBuilder(Session::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->checkoutHelper = $this->getMockBuilder(Data::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->checkoutHelperMock = $this->getMockBuilder(Data::class)
+
+        $this->orderCancellation = $this->getMockBuilder(OrderCancellationService::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->orderPlace = new OrderPlace(
-            $this->cartManagementMock,
-            $this->agreementsValidatorMock,
-            $this->customerSessionMock,
-            $this->checkoutHelperMock
+            $this->cartManagement,
+            $this->agreementsValidator,
+            $this->customerSession,
+            $this->checkoutHelper,
+            $this->orderCancellation
         );
     }
 
+    /**
+     * Checks a scenario for a guest customer.
+     *
+     * @throws \Exception
+     */
     public function testExecuteGuest()
     {
         $agreement = ['test', 'test'];
         $quoteMock = $this->getQuoteMock();
 
-        $this->agreementsValidatorMock->expects(self::once())
+        $this->agreementsValidator->expects(self::once())
             ->method('isValid')
             ->willReturn(true);
 
@@ -97,7 +118,7 @@ public function testExecuteGuest()
             ->method('getId')
             ->willReturn(10);
 
-        $this->cartManagementMock->expects(self::once())
+        $this->cartManagement->expects(self::once())
             ->method('placeOrder')
             ->with(10);
 
@@ -105,9 +126,11 @@ public function testExecuteGuest()
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
+     * Disables address validation.
+     *
+     * @param MockObject $quoteMock
      */
-    private function disabledQuoteAddressValidationStep(\PHPUnit_Framework_MockObject_MockObject $quoteMock)
+    private function disabledQuoteAddressValidationStep($quoteMock)
     {
         $billingAddressMock = $this->getBillingAddressMock($quoteMock);
         $shippingAddressMock = $this->getMockBuilder(Address::class)
@@ -115,26 +138,21 @@ private function disabledQuoteAddressValidationStep(\PHPUnit_Framework_MockObjec
             ->disableOriginalConstructor()
             ->getMock();
 
-        $quoteMock->expects(self::once())
-            ->method('getShippingAddress')
+        $quoteMock->method('getShippingAddress')
             ->willReturn($shippingAddressMock);
 
-        $billingAddressMock->expects(self::once())
-            ->method('setShouldIgnoreValidation')
+        $billingAddressMock->method('setShouldIgnoreValidation')
             ->with(true)
             ->willReturnSelf();
 
-        $quoteMock->expects(self::once())
-            ->method('getIsVirtual')
+        $quoteMock->method('getIsVirtual')
             ->willReturn(false);
 
-        $shippingAddressMock->expects(self::once())
-            ->method('setShouldIgnoreValidation')
+        $shippingAddressMock->method('setShouldIgnoreValidation')
             ->with(true)
             ->willReturnSelf();
 
-        $billingAddressMock->expects(self::any())
-            ->method('getEmail')
+        $billingAddressMock->method('getEmail')
             ->willReturn(self::TEST_EMAIL);
 
         $billingAddressMock->expects(self::never())
@@ -142,25 +160,24 @@ private function disabledQuoteAddressValidationStep(\PHPUnit_Framework_MockObjec
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
+     * Prepares checkout step.
+     *
+     * @param MockObject $quoteMock
      */
-    private function getCheckoutMethodStep(\PHPUnit_Framework_MockObject_MockObject $quoteMock)
+    private function getCheckoutMethodStep($quoteMock)
     {
-        $this->customerSessionMock->expects(self::once())
-            ->method('isLoggedIn')
+        $this->customerSession->method('isLoggedIn')
             ->willReturn(false);
 
         $quoteMock->expects(self::at(1))
             ->method('getCheckoutMethod')
             ->willReturn(null);
 
-        $this->checkoutHelperMock->expects(self::once())
-            ->method('isAllowedGuestCheckout')
+        $this->checkoutHelper->method('isAllowedGuestCheckout')
             ->with($quoteMock)
             ->willReturn(true);
 
-        $quoteMock->expects(self::once())
-            ->method('setCheckoutMethod')
+        $quoteMock->method('setCheckoutMethod')
             ->with(Onepage::METHOD_GUEST);
 
         $quoteMock->expects(self::at(2))
@@ -169,9 +186,11 @@ private function getCheckoutMethodStep(\PHPUnit_Framework_MockObject_MockObject
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
+     * Prepares quote.
+     *
+     * @param MockObject $quoteMock
      */
-    private function prepareGuestQuoteStep(\PHPUnit_Framework_MockObject_MockObject $quoteMock)
+    private function prepareGuestQuoteStep($quoteMock)
     {
         $billingAddressMock = $this->getBillingAddressMock($quoteMock);
 
@@ -184,44 +203,44 @@ private function prepareGuestQuoteStep(\PHPUnit_Framework_MockObject_MockObject
             ->method('getEmail')
             ->willReturn(self::TEST_EMAIL);
 
-        $quoteMock->expects(self::once())
-            ->method('setCustomerEmail')
+        $quoteMock->method('setCustomerEmail')
             ->with(self::TEST_EMAIL)
             ->willReturnSelf();
 
-        $quoteMock->expects(self::once())
-            ->method('setCustomerIsGuest')
+        $quoteMock->method('setCustomerIsGuest')
             ->with(true)
             ->willReturnSelf();
 
-        $quoteMock->expects(self::once())
-            ->method('setCustomerGroupId')
+        $quoteMock->method('setCustomerGroupId')
             ->with(Group::NOT_LOGGED_IN_ID)
             ->willReturnSelf();
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_MockObject $quoteMock
-     * @return Address|\PHPUnit_Framework_MockObject_MockObject
+     * Gets a mock object for a billing address entity.
+     *
+     * @param MockObject $quoteMock
+     * @return Address|MockObject
      */
-    private function getBillingAddressMock(\PHPUnit_Framework_MockObject_MockObject $quoteMock)
+    private function getBillingAddressMock($quoteMock)
     {
-        if (!isset($this->billingAddressMock)) {
-            $this->billingAddressMock = $this->getMockBuilder(Address::class)
+        if (!isset($this->billingAddress)) {
+            $this->billingAddress = $this->getMockBuilder(Address::class)
                 ->setMethods(['setShouldIgnoreValidation', 'getEmail', 'setSameAsBilling'])
                 ->disableOriginalConstructor()
                 ->getMock();
         }
 
-        $quoteMock->expects(self::any())
-            ->method('getBillingAddress')
-            ->willReturn($this->billingAddressMock);
+        $quoteMock->method('getBillingAddress')
+            ->willReturn($this->billingAddress);
 
-        return $this->billingAddressMock;
+        return $this->billingAddress;
     }
 
     /**
-     * @return Quote|\PHPUnit_Framework_MockObject_MockObject
+     * Gets a mock object for a quote.
+     *
+     * @return Quote|MockObject
      */
     private function getQuoteMock()
     {
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php
index 7475d81a56142..5ca117444e5a9 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php
@@ -159,21 +159,21 @@ private function getDetails(): array
             'phone' => '312-123-4567',
             'countryCode' => 'US',
             'shippingAddress' => [
-                'streetAddress' => '123 Division Street',
-                'extendedAddress' => 'Apt. #1',
-                'locality' => 'Chicago',
-                'region' => 'IL',
+                'line1' => '123 Division Street',
+                'line2' => 'Apt. #1',
+                'city' => 'Chicago',
+                'state' => 'IL',
                 'postalCode' => '60618',
-                'countryCodeAlpha2' => 'US',
-                'recipientName' => 'John Doe',
+                'countryCode' => 'US',
+                'recipientName' => 'Jane Smith',
             ],
             'billingAddress' => [
-                'streetAddress' => '123 Billing Street',
-                'extendedAddress' => 'Apt. #1',
-                'locality' => 'Chicago',
-                'region' => 'IL',
+                'line1' => '123 Billing Street',
+                'line2' => 'Apt. #1',
+                'city' => 'Chicago',
+                'state' => 'IL',
                 'postalCode' => '60618',
-                'countryCodeAlpha2' => 'US',
+                'countryCode' => 'US',
             ],
         ];
     }
@@ -186,9 +186,9 @@ private function getDetails(): array
     private function updateShippingAddressStep(array $details)
     {
         $this->shippingAddress->method('setLastname')
-            ->with($details['lastName']);
+            ->with('Smith');
         $this->shippingAddress->method('setFirstname')
-            ->with($details['firstName']);
+            ->with('Jane');
         $this->shippingAddress->method('setEmail')
             ->with($details['email']);
         $this->shippingAddress->method('setCollectShippingRates')
@@ -206,13 +206,13 @@ private function updateShippingAddressStep(array $details)
     private function updateAddressDataStep(MockObject $address, array $addressData)
     {
         $address->method('setStreet')
-            ->with([$addressData['streetAddress'], $addressData['extendedAddress']]);
+            ->with([$addressData['line1'], $addressData['line2']]);
         $address->method('setCity')
-            ->with($addressData['locality']);
+            ->with($addressData['city']);
         $address->method('setRegionCode')
-            ->with($addressData['region']);
+            ->with($addressData['state']);
         $address->method('setCountryId')
-            ->with($addressData['countryCodeAlpha2']);
+            ->with($addressData['countryCode']);
         $address->method('setPostcode')
             ->with($addressData['postalCode']);
     }
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 dca22c26c11da..d4ccbad331447 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Braintree\Test\Unit\Model\Ui;
 
 use Magento\Braintree\Gateway\Config\Config;
@@ -119,6 +121,7 @@ public function getConfigDataProvider()
                     'isActive' => true,
                     'getCcTypesMapper' => ['visa' => 'VI', 'american-express'=> 'AE'],
                     'getSdkUrl' => self::SDK_URL,
+                    'getHostedFieldsSdkUrl' => 'https://sdk.com/test.js',
                     'getCountrySpecificCardTypeConfig' => [
                         'GB' => ['VI', 'AE'],
                         'US' => ['DI', 'JCB']
@@ -129,7 +132,6 @@ public function getConfigDataProvider()
                     'getThresholdAmount' => 20,
                     'get3DSecureSpecificCountries' => ['GB', 'US', 'CA'],
                     'getEnvironment' => 'test-environment',
-                    'getKountMerchantId' => 'test-kount-merchant-id',
                     'getMerchantId' => 'test-merchant-id',
                     'hasFraudProtection' => true,
                 ],
@@ -140,6 +142,7 @@ public function getConfigDataProvider()
                             'clientToken' => self::CLIENT_TOKEN,
                             'ccTypesMapper' => ['visa' => 'VI', 'american-express' => 'AE'],
                             'sdkUrl' => self::SDK_URL,
+                            'hostedFieldsSdkUrl' => 'https://sdk.com/test.js',
                             'countrySpecificCardTypes' =>[
                                 'GB' => ['VI', 'AE'],
                                 'US' => ['DI', 'JCB']
@@ -147,7 +150,6 @@ public function getConfigDataProvider()
                             'availableCardTypes' => ['AE', 'VI', 'MC', 'DI', 'JCB'],
                             'useCvv' => true,
                             'environment' => 'test-environment',
-                            'kountMerchantId' => 'test-kount-merchant-id',
                             'merchantId' => 'test-merchant-id',
                             'hasFraudProtection' => true,
                             'ccVaultCode' => ConfigProvider::CC_VAULT_CODE
diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json
index bf85cdd94a474..630ecc0544983 100644
--- a/app/code/Magento/Braintree/composer.json
+++ b/app/code/Magento/Braintree/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-braintree",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*",
         "magento/magento-composer-installer": "*",
         "magento/module-config": "101.0.*",
@@ -18,6 +18,7 @@
         "magento/module-quote": "101.0.*",
         "magento/module-paypal": "100.2.*",
         "magento/module-ui": "101.0.*",
+        "magento/module-multishipping": "100.2.*",
         "braintree/braintree_php": "3.28.0"
     },
     "suggest": {
@@ -25,7 +26,7 @@
         "magento/module-theme": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.6",
+    "version": "100.2.8",
     "license": [
         "proprietary"
     ],
diff --git a/app/code/Magento/Braintree/etc/adminhtml/system.xml b/app/code/Magento/Braintree/etc/adminhtml/system.xml
index 5215dbc00b7ef..a6bf69d52c219 100644
--- a/app/code/Magento/Braintree/etc/adminhtml/system.xml
+++ b/app/code/Magento/Braintree/etc/adminhtml/system.xml
@@ -95,14 +95,6 @@
                             <comment>Be sure to Enable Advanced Fraud Protection in Your Braintree Account in Settings/Processing Section</comment>
                             <config_path>payment/braintree/fraudprotection</config_path>
                         </field>
-                        <field id="kount_id" translate="label comment" sortOrder="35" showInDefault="1" showInWebsite="1" showInStore="0">
-                            <label>Kount Merchant ID</label>
-                            <comment><![CDATA[Used for direct fraud tool integration. Make sure you also contact <a href="mailto:accounts@braintreepayments.com">accounts@braintreepayments.com</a> to setup your Kount account.]]></comment>
-                            <depends>
-                                <field id="fraudprotection">1</field>
-                            </depends>
-                            <config_path>payment/braintree/kount_id</config_path>
-                        </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>
diff --git a/app/code/Magento/Braintree/etc/config.xml b/app/code/Magento/Braintree/etc/config.xml
index a830c29368755..522d32302168e 100644
--- a/app/code/Magento/Braintree/etc/config.xml
+++ b/app/code/Magento/Braintree/etc/config.xml
@@ -34,7 +34,8 @@
                 <order_status>processing</order_status>
                 <environment>sandbox</environment>
                 <allowspecific>0</allowspecific>
-                <sdk_url><![CDATA[https://js.braintreegateway.com/js/braintree-2.32.0.min.js]]></sdk_url>
+                <sdk_url><![CDATA[https://js.braintreegateway.com/web/3.44.1/js/client.min.js]]></sdk_url>
+                <hosted_fields_sdk_url><![CDATA[https://js.braintreegateway.com/web/3.44.1/js/hosted-fields.min.js]]></hosted_fields_sdk_url>
                 <public_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <private_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <masked_fields>cvv,number</masked_fields>
@@ -42,6 +43,7 @@
                 <paymentInfoKeys>cc_type,cc_number,avsPostalCodeResponseCode,avsStreetAddressResponseCode,cvvResponseCode,processorAuthorizationCode,processorResponseCode,processorResponseText,liabilityShifted,liabilityShiftPossible,riskDataId,riskDataDecision</paymentInfoKeys>
                 <avs_ems_adapter>Magento\Braintree\Model\AvsEmsCodeMapper</avs_ems_adapter>
                 <cvv_ems_adapter>Magento\Braintree\Model\CvvEmsCodeMapper</cvv_ems_adapter>
+                <group>braintree_group</group>
             </braintree>
             <braintree_paypal>
                 <model>BraintreePayPalFacade</model>
@@ -67,6 +69,7 @@
                 <privateInfoKeys>processorResponseCode,processorResponseText,paymentId</privateInfoKeys>
                 <paymentInfoKeys>processorResponseCode,processorResponseText,paymentId,payerEmail</paymentInfoKeys>
                 <supported_locales>en_US,en_GB,en_AU,da_DK,fr_FR,fr_CA,de_DE,zh_HK,it_IT,nl_NL,no_NO,pl_PL,es_ES,sv_SE,tr_TR,pt_BR,ja_JP,id_ID,ko_KR,pt_PT,ru_RU,th_TH,zh_CN,zh_TW</supported_locales>
+                <group>braintree_group</group>
             </braintree_paypal>
             <braintree_cc_vault>
                 <model>BraintreeCreditCardVaultFacade</model>
@@ -76,6 +79,7 @@
                     <tokenFormat>Magento\Braintree\Model\InstantPurchase\CreditCard\TokenFormatter</tokenFormat>
                     <additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
                 </instant_purchase>
+                <group>braintree_group</group>
             </braintree_cc_vault>
             <braintree_paypal_vault>
                 <model>BraintreePayPalVaultFacade</model>
@@ -85,6 +89,7 @@
                     <tokenFormat>Magento\Braintree\Model\InstantPurchase\PayPal\TokenFormatter</tokenFormat>
                     <additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
                 </instant_purchase>
+                <group>braintree_group</group>
             </braintree_paypal_vault>
         </payment>
     </default>
diff --git a/app/code/Magento/Braintree/etc/di.xml b/app/code/Magento/Braintree/etc/di.xml
index c5440db1889f4..f5e32170a6f17 100644
--- a/app/code/Magento/Braintree/etc/di.xml
+++ b/app/code/Magento/Braintree/etc/di.xml
@@ -288,7 +288,7 @@
                 <item name="payment" xsi:type="string">Magento\Braintree\Gateway\Request\PaymentDataBuilder</item>
                 <item name="channel" xsi:type="string">Magento\Braintree\Gateway\Request\ChannelDataBuilder</item>
                 <item name="address" xsi:type="string">Magento\Braintree\Gateway\Request\AddressDataBuilder</item>
-                <item name="3dsecure" xsi:type="string">Magento\Braintree\Gateway\Request\ThreeDSecureDataBuilder</item>
+                <item name="3dsecure" xsi:type="string">Magento\Braintree\Gateway\Request\VaultThreeDSecureDataBuilder</item>
                 <item name="device_data" xsi:type="string">Magento\Braintree\Gateway\Request\KountPaymentDataBuilder</item>
                 <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
                 <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
@@ -614,7 +614,6 @@
                 <item name="payment/braintree/merchant_id" xsi:type="string">1</item>
                 <item name="payment/braintree/private_key" xsi:type="string">1</item>
                 <item name="payment/braintree/merchant_account_id" xsi:type="string">1</item>
-                <item name="payment/braintree/kount_id" xsi:type="string">1</item>
                 <item name="payment/braintree_paypal/merchant_name_override" xsi:type="string">1</item>
                 <item name="payment/braintree/descriptor_phone" xsi:type="string">1</item>
                 <item name="payment/braintree/descriptor_url" xsi:type="string">1</item>
@@ -624,4 +623,8 @@
             </argument>
         </arguments>
     </type>
+
+    <type name="Magento\Quote\Api\CartManagementInterface">
+        <plugin name="order_cancellation" type="Magento\Braintree\Plugin\OrderCancellation"/>
+    </type>
 </config>
diff --git a/app/code/Magento/Braintree/etc/frontend/di.xml b/app/code/Magento/Braintree/etc/frontend/di.xml
index ea417c407dffd..d8d3a93b71dc3 100644
--- a/app/code/Magento/Braintree/etc/frontend/di.xml
+++ b/app/code/Magento/Braintree/etc/frontend/di.xml
@@ -61,4 +61,12 @@
             <argument name="resolver" xsi:type="object">Magento\Braintree\Model\LocaleResolver</argument>
         </arguments>
     </type>
+    <type name="Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderPool">
+        <arguments>
+            <argument name="services" xsi:type="array">
+                <item name="braintree" xsi:type="string">Magento\Braintree\Model\Multishipping\PlaceOrder</item>
+                <item name="braintree_paypal" xsi:type="string">Magento\Braintree\Model\Multishipping\PlaceOrder</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Braintree/etc/payment.xml b/app/code/Magento/Braintree/etc/payment.xml
new file mode 100644
index 0000000000000..4cae049aaf5a9
--- /dev/null
+++ b/app/code/Magento/Braintree/etc/payment.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/payment.xsd">
+    <groups>
+        <group id="braintree_group">
+            <label>Braintree</label>
+        </group>
+    </groups>
+    <methods>
+        <method name="braintree">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
+        <method name="braintree_paypal">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
+    </methods>
+</payment>
diff --git a/app/code/Magento/Braintree/i18n/en_US.csv b/app/code/Magento/Braintree/i18n/en_US.csv
index 7bd305f546dc6..e9145b35b56ef 100644
--- a/app/code/Magento/Braintree/i18n/en_US.csv
+++ b/app/code/Magento/Braintree/i18n/en_US.csv
@@ -193,3 +193,4 @@ Currency,Currency
 "Too many concurrent attempts to void this transaction. Try again later.","Too many concurrent attempts to void this transaction. Try again later."
 "Braintree Settlement","Braintree Settlement"
 "The Payment Token is not available to perform the request.","The Payment Token is not available to perform the request."
+"The order #%1 cannot be processed.","The order #%1 cannot be processed."
diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
index 535a5a852fe70..4c15fffa8189f 100644
--- a/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
+++ b/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
@@ -83,7 +83,7 @@ $ccType = $block->getInfoData('cc_type');
                    id="<?= /* @noEscape */ $code ?>_vault"
                    name="payment[is_active_payment_token_enabler]"
                    class="admin__control-checkbox"/>
-            <label class="label" for="<?= /* @noEscape */ $code ?>_vault">
+            <label class="label admin__field-label" for="<?= /* @noEscape */ $code ?>_vault">
                 <span><?= $block->escapeHtml(__('Save for later use.')) ?></span>
             </label>
         </div>
diff --git a/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js b/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
index ab01565d7f1e5..0359c16283d50 100644
--- a/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
+++ b/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
@@ -22,9 +22,16 @@ define([
             container: 'payment_form_braintree',
             active: false,
             scriptLoaded: false,
-            braintree: null,
+            braintreeClient: null,
+            braintreeHostedFields: null,
+            hostedFieldsInstance: null,
             selectedCardType: null,
-            checkout: null,
+            selectorsMapper: {
+                'expirationMonth': 'expirationMonth',
+                'expirationYear': 'expirationYear',
+                'number': 'cc_number',
+                'cvv': 'cc_cid'
+            },
             imports: {
                 onActiveChange: 'active'
             }
@@ -108,9 +115,10 @@ define([
                 state = self.scriptLoaded;
 
             $('body').trigger('processStart');
-            require([this.sdkUrl], function (braintree) {
+            require([this.sdkUrl, this.hostedFieldsSdkUrl], function (client, hostedFields) {
                 state(true);
-                self.braintree = braintree;
+                self.braintreeClient = client;
+                self.braintreeHostedFields = hostedFields;
                 self.initBraintree();
                 $('body').trigger('processStop');
             });
@@ -146,46 +154,26 @@ define([
         _initBraintree: function () {
             var self = this;
 
-            this.disableEventListeners();
-
-            if (self.checkout) {
-                self.checkout.teardown(function () {
-                    self.checkout = null;
-                });
-            }
-
-            self.braintree.setup(self.clientToken, 'custom', {
-                id: self.selector,
-                hostedFields: self.getHostedFields(),
-
-                /**
-                 * Triggered when sdk was loaded
-                 */
-                onReady: function (checkout) {
-                    self.checkout = checkout;
-                    $('body').trigger('processStop');
+            self.disableEventListeners();
+
+            self.braintreeClient.create({
+                authorization: self.clientToken
+            })
+                .then(function (clientInstance) {
+                    return self.braintreeHostedFields.create({
+                        client: clientInstance,
+                        fields: self.getHostedFields()
+                    });
+                })
+                .then(function (hostedFieldsInstance) {
+                    self.hostedFieldsInstance = hostedFieldsInstance;
                     self.enableEventListeners();
-                },
-
-                /**
-                 * Callback for success response
-                 * @param {Object} response
-                 */
-                onPaymentMethodReceived: function (response) {
-                    if (self.validateCardType()) {
-                        self.setPaymentDetails(response.nonce);
-                        self.placeOrder();
-                    }
-                },
-
-                /**
-                 * Error callback
-                 * @param {Object} response
-                 */
-                onError: function (response) {
-                    self.error(response.message);
-                }
-            });
+                    self.fieldEventHandler(hostedFieldsInstance);
+                    $('body').trigger('processStop');
+                })
+                .catch(function () {
+                    self.error($t('Braintree can\'t be initialized.'));
+                });
         },
 
         /**
@@ -205,14 +193,6 @@ define([
                     expirationYear: {
                         selector: self.getSelector('cc_exp_year'),
                         placeholder: $t('YY')
-                    },
-
-                    /**
-                     * Triggered when hosted field is changed
-                     * @param {Object} event
-                     */
-                    onFieldEvent: function (event) {
-                        return self.fieldEventHandler(event);
                     }
                 };
 
@@ -227,36 +207,49 @@ define([
 
         /**
          * Function to handle hosted fields events
-         * @param {Object} event
-         * @returns {Boolean}
+         * @param {Object} hostedFieldsInstance
          */
-        fieldEventHandler: function (event) {
+        fieldEventHandler: function (hostedFieldsInstance) {
             var self = this,
                 $cardType = $('#' + self.container).find('.icon-type');
 
-            if (event.isEmpty === false) {
-                self.validateCardType();
-            }
+            hostedFieldsInstance.on('empty', function (event) {
+                if (event.emittedBy === 'number') {
+                    $cardType.attr('class', 'icon-type');
+                    self.selectedCardType(null);
+                }
 
-            if (event.type !== 'fieldStateChange') {
+            });
 
-                return false;
-            }
+            hostedFieldsInstance.on('validityChange', function (event) {
+                var field = event.fields[event.emittedBy],
+                    fieldKey = event.emittedBy;
 
-            // Handle a change in validation or card type
-            if (event.target.fieldKey === 'number') {
-                self.selectedCardType(null);
-            }
+                if (fieldKey === 'number') {
+                    $cardType.addClass('icon-type-' + event.cards[0].type);
+                }
+
+                if (fieldKey in self.selectorsMapper && field.isValid === false) {
+                    self.addInvalidClass(self.selectorsMapper[fieldKey]);
+                }
+            });
 
-            // remove previously set classes
-            $cardType.attr('class', 'icon-type');
+            hostedFieldsInstance.on('blur', function (event) {
+                if (event.emittedBy === 'number') {
+                    self.validateCardType();
+                }
+            });
+
+            hostedFieldsInstance.on('cardTypeChange', function (event) {
+                if (event.cards.length !== 1) {
+                    return;
+                }
 
-            if (event.card) {
-                $cardType.addClass('icon-type-' + event.card.type);
+                $cardType.addClass('icon-type-' + event.cards[0].type);
                 self.selectedCardType(
-                    validator.getMageCardType(event.card.type, self.getCcAvailableTypes())
+                    validator.getMageCardType(event.cards[0].type, self.getCcAvailableTypes())
                 );
-            }
+            });
         },
 
         /**
@@ -298,16 +291,31 @@ define([
          * Trigger order submit
          */
         submitOrder: function () {
-            this.$selector.validate().form();
-            this.$selector.trigger('afterValidate.beforeSubmit');
+            var self = this;
+
+            self.$selector.validate().form();
+            self.$selector.trigger('afterValidate.beforeSubmit');
             $('body').trigger('processStop');
 
             // validate parent form
-            if (this.$selector.validate().errorList.length) {
+            if (self.$selector.validate().errorList.length) {
+                return false;
+            }
+
+            if (!self.validateCardType()) {
                 return false;
             }
 
-            $('#' + this.container).find('[type="submit"]').trigger('click');
+            self.hostedFieldsInstance.tokenize(function (err, payload) {
+                if (err) {
+                    self.error($t('Some payment input fields are invalid.'));
+
+                    return false;
+                }
+
+                self.setPaymentDetails(payload.nonce);
+                $('#' + self.container).find('[type="submit"]').trigger('click');
+            });
         },
 
         /**
@@ -337,12 +345,10 @@ define([
          * @returns {Boolean}
          */
         validateCardType: function () {
-            var $input = $(this.getSelector('cc_number'));
-
-            $input.removeClass('braintree-hosted-fields-invalid');
+            this.removeInvalidClass('cc_number');
 
             if (!this.selectedCardType()) {
-                $input.addClass('braintree-hosted-fields-invalid');
+                this.addInvalidClass('cc_number');
 
                 return false;
             }
@@ -358,6 +364,28 @@ define([
          */
         getSelector: function (field) {
             return '#' + this.code + '_' + field;
+        },
+
+        /**
+         * Add invalid class to field.
+         *
+         * @param {String} field
+         * @returns void
+         * @private
+         */
+        addInvalidClass: function (field) {
+            $(this.getSelector(field)).addClass('braintree-hosted-fields-invalid');
+        },
+
+        /**
+         * Remove invalid class from field.
+         *
+         * @param {String} field
+         * @returns void
+         * @private
+         */
+        removeInvalidClass: function (field) {
+            $(this.getSelector(field)).removeClass('braintree-hosted-fields-invalid');
         }
     });
 });
diff --git a/app/code/Magento/Braintree/view/frontend/layout/multishipping_checkout_billing.xml b/app/code/Magento/Braintree/view/frontend/layout/multishipping_checkout_billing.xml
new file mode 100644
index 0000000000000..06390d403e63d
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/layout/multishipping_checkout_billing.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="checkout_billing">
+            <arguments>
+                <argument name="form_templates" xsi:type="array">
+                    <item name="braintree" xsi:type="string">Magento_Braintree::multishipping/form.phtml</item>
+                    <item name="braintree_paypal" xsi:type="string">Magento_Braintree::multishipping/form_paypal.phtml</item>
+                </argument>
+            </arguments>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/app/code/Magento/Braintree/view/frontend/requirejs-config.js b/app/code/Magento/Braintree/view/frontend/requirejs-config.js
index 9fc38064677ef..e2f5fb03e58bf 100644
--- a/app/code/Magento/Braintree/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Braintree/view/frontend/requirejs-config.js
@@ -6,7 +6,19 @@
 var config = {
     map: {
         '*': {
-            braintree: 'https://js.braintreegateway.com/js/braintree-2.32.0.min.js'
+            braintreeClient: 'https://js.braintreegateway.com/web/3.44.1/js/client.min.js',
+            braintreeHostedFields: 'https://js.braintreegateway.com/web/3.44.1/js/hosted-fields.min.js',
+            braintreePayPal: 'https://js.braintreegateway.com/web/3.44.1/js/paypal-checkout.min.js',
+            braintree3DSecure: 'https://js.braintreegateway.com/web/3.44.1/js/three-d-secure.min.js',
+            braintreeDataCollector: 'https://js.braintreegateway.com/web/3.44.1/js/data-collector.min.js'
+        }
+    },
+    paths: {
+        braintreePayPalCheckout: 'https://www.paypalobjects.com/api/checkout.min'
+    },
+    shim: {
+        braintreePayPalCheckout: {
+            exports: 'paypal'
         }
     }
 };
diff --git a/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml
new file mode 100644
index 0000000000000..fc3030b6a4b36
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<script>
+    require([
+        'uiLayout',
+        'jquery'
+    ], function (layout, $) {
+        $(function () {
+            var paymentMethodData = {
+                method: 'braintree'
+            };
+            layout([
+                {
+                    component: 'Magento_Braintree/js/view/payment/method-renderer/multishipping/cc-form',
+                    name: 'payment_method_braintree',
+                    method: paymentMethodData.method,
+                    item: paymentMethodData
+                }
+            ]);
+
+            $('body').trigger('contentUpdated');
+        })
+    })
+</script>
+<!-- ko template: getTemplate() --><!-- /ko -->
diff --git a/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml
new file mode 100644
index 0000000000000..ea3eb2214c2d8
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<script>
+    require([
+        'uiLayout',
+        'jquery'
+    ], function (layout, $) {
+        $(function () {
+            var paymentMethodData = {
+                method: 'braintree_paypal'
+            };
+            layout([
+                {
+                    component: 'Magento_Braintree/js/view/payment/method-renderer/multishipping/paypal',
+                    name: 'payment_method_braintree_paypal',
+                    method: paymentMethodData.method,
+                    item: paymentMethodData
+                }
+            ]);
+
+            $('body').trigger('contentUpdated');
+        })
+    })
+</script>
+<!-- ko template: getTemplate() --><!-- /ko -->
diff --git a/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml b/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml
index c1ef461ecae7c..e0a9e46bd7c5c 100644
--- a/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml
+++ b/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml
@@ -15,21 +15,18 @@ $config = [
         'id' => $id,
         'clientToken' => $block->getClientToken(),
         'displayName' => $block->getMerchantName(),
-        'actionSuccess' => $block->getActionSuccess()
+        'actionSuccess' => $block->getActionSuccess(),
+        'environment' => $block->getEnvironment()
     ]
 ];
 
 ?>
-<div data-mage-init='<?= /* @noEscape */ json_encode($config) ?>'
-    class="paypal checkout paypal-logo braintree-paypal-logo<?= /* @noEscape */ $block->getContainerId() ?>-container">
-    <button data-currency="<?= /* @noEscape */ $block->getCurrency() ?>"
-       data-locale="<?= /* @noEscape */ $block->getLocale() ?>"
-       data-amount="<?= /* @noEscape */ $block->getAmount() ?>"
-       id="<?= /* @noEscape */ $id ?>"
-       class="action-braintree-paypal-logo" disabled>
-        <img class="braintree-paypal-button-hidden"
-             src="https://checkout.paypal.com/pwpp/2.17.6/images/pay-with-paypal.png"
-             alt="<?= $block->escapeHtml(__('Pay with PayPal')) ?>"
-             title="<?= $block->escapeHtml(__('Pay with PayPal')) ?>"/>
-    </button>
+<div data-mage-init='<?= /* @noEscape */ json_encode($config); ?>'
+    class="paypal checkout paypal-logo braintree-paypal-logo<?= /* @noEscape */ $block->getContainerId(); ?>-container">
+    <div data-currency="<?= /* @noEscape */ $block->getCurrency(); ?>"
+       data-locale="<?= /* @noEscape */ $block->getLocale(); ?>"
+       data-amount="<?= /* @noEscape */ $block->getAmount(); ?>"
+       id="<?= /* @noEscape */ $id; ?>"
+       class="action-braintree-paypal-logo">
+    </div>
 </div>
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/paypal/button.js b/app/code/Magento/Braintree/view/frontend/web/js/paypal/button.js
index 3ac50fbcb47cc..aacd3016d7367 100644
--- a/app/code/Magento/Braintree/view/frontend/web/js/paypal/button.js
+++ b/app/code/Magento/Braintree/view/frontend/web/js/paypal/button.js
@@ -9,7 +9,9 @@ define(
         'uiComponent',
         'underscore',
         'jquery',
-        'braintree',
+        'braintreeClient',
+        'braintreePayPal',
+        'braintreePayPalCheckout',
         'Magento_Braintree/js/paypal/form-builder',
         'domReady!'
     ],
@@ -19,7 +21,9 @@ define(
         Component,
         _,
         $,
-        braintree,
+        braintreeClient,
+        braintreePayPal,
+        braintreePayPalCheckout,
         formBuilder
     ) {
         'use strict';
@@ -27,58 +31,34 @@ define(
         return Component.extend({
 
             defaults: {
-
-                integrationName: 'braintreePaypal.currentIntegration',
-
-                /**
-                 * {String}
-                 */
                 displayName: null,
-
-                /**
-                 * {String}
-                 */
                 clientToken: null,
-
-                /**
-                 * {Object}
-                 */
-                clientConfig: {
-
-                    /**
-                     * @param {Object} integration
-                     */
-                    onReady: function (integration) {
-                        resolver(function () {
-                            registry.set(this.integrationName, integration);
-                            $('#' + this.id).removeAttr('disabled');
-                        }, this);
-                    },
-
-                    /**
-                     * @param {Object} payload
-                     */
-                    onPaymentMethodReceived: function (payload) {
-                        $('body').trigger('processStart');
-
-                        formBuilder.build(
-                            {
-                                action: this.actionSuccess,
-                                fields: {
-                                    result: JSON.stringify(payload)
-                                }
-                            }
-                        ).submit();
-                    }
-                }
+                paypalCheckoutInstance: null
             },
 
             /**
              * @returns {Object}
              */
             initialize: function () {
-                this._super()
-                    .initComponent();
+                var self = this;
+
+                self._super();
+
+                braintreeClient.create({
+                    authorization: self.clientToken
+                })
+                    .then(function (clientInstance) {
+                        return braintreePayPal.create({
+                            client: clientInstance
+                        });
+                    })
+                    .then(function (paypalCheckoutInstance) {
+                        self.paypalCheckoutInstance = paypalCheckoutInstance;
+
+                        return self.paypalCheckoutInstance;
+                    });
+
+                self.initComponent();
 
                 return this;
             },
@@ -87,64 +67,76 @@ define(
              * @returns {Object}
              */
             initComponent: function () {
-                var currentIntegration = registry.get(this.integrationName),
-                    $this = $('#' + this.id),
-                    self = this,
+                var self = this,
+                    selector = '#' + self.id,
+                    $this = $(selector),
                     data = {
                         amount: $this.data('amount'),
                         locale: $this.data('locale'),
                         currency: $this.data('currency')
+                    };
+
+                $this.html('');
+                braintreePayPalCheckout.Button.render({
+                    env: self.environment,
+                    style: {
+                        color: 'blue',
+                        shape: 'rect',
+                        size: 'medium',
+                        label: 'pay',
+                        tagline: false
+                    },
+
+                    /**
+                     * Payment setup
+                     */
+                    payment: function () {
+                        return self.paypalCheckoutInstance.createPayment(self.getClientConfig(data));
                     },
-                    initCallback = function () {
-                        $this.attr('disabled', 'disabled');
-                        registry.remove(this.integrationName);
-                        braintree.setup(this.clientToken, 'custom', this.getClientConfig(data));
-
-                        $this.off('click')
-                            .on('click', function (event) {
-                                event.preventDefault();
-
-                                registry.get(self.integrationName, function (integration) {
-                                    try {
-                                        integration.paypal.initAuthFlow();
-                                    } catch (e) {
-                                        $this.attr('disabled', 'disabled');
+
+                    /**
+                     * Triggers on `onAuthorize` event
+                     *
+                     * @param {Object} response
+                     */
+                    onAuthorize: function (response) {
+                        return self.paypalCheckoutInstance.tokenizePayment(response)
+                            .then(function (payload) {
+                                $('body').trigger('processStart');
+
+                                formBuilder.build(
+                                    {
+                                        action: self.actionSuccess,
+                                        fields: {
+                                            result: JSON.stringify(payload)
+                                        }
                                     }
-                                });
+                                ).submit();
                             });
-                    }.bind(this);
-
-                currentIntegration ?
-                    currentIntegration.teardown(initCallback) :
-                    initCallback();
+                    }
+                }, selector);
 
                 return this;
             },
 
             /**
              * @returns {Object}
+             * @private
              */
             getClientConfig: function (data) {
-                this.clientConfig.paypal = {
-                    singleUse: true,
+                var config = {
+                    flow: 'checkout',
                     amount: data.amount,
                     currency: data.currency,
                     locale: data.locale,
-                    enableShippingAddress: true,
-                    headless: true
+                    enableShippingAddress: true
                 };
 
                 if (this.displayName) {
-                    this.clientConfig.paypal.displayName = this.displayName;
+                    config.displayName = this.displayName;
                 }
 
-                _.each(this.clientConfig, function (fn, name) {
-                    if (typeof fn === 'function') {
-                        this.clientConfig[name] = fn.bind(this);
-                    }
-                }, this);
-
-                return this.clientConfig;
+                return config;
             }
         });
     }
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/3d-secure.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/3d-secure.js
index e3b806bf21384..84fa8cf62720f 100644
--- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/3d-secure.js
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/3d-secure.js
@@ -7,17 +7,57 @@
 
 define([
     'jquery',
+    'braintree3DSecure',
     'Magento_Braintree/js/view/payment/adapter',
     'Magento_Checkout/js/model/quote',
-    'mage/translate'
-], function ($, braintree, quote, $t) {
+    'mage/translate',
+    'Magento_Ui/js/modal/modal',
+    'Magento_Checkout/js/model/full-screen-loader'
+], function (
+    $,
+    braintree3DSecure,
+    braintreeAdapter,
+    quote,
+    $t,
+    Modal,
+    fullScreenLoader
+) {
     'use strict';
 
     return {
         config: null,
+        modal: null,
+        threeDSecureInstance: null,
+        state: null,
 
         /**
-         * Set 3d secure config
+         * Initializes component
+         */
+        initialize: function () {
+            var self = this,
+                promise = $.Deferred();
+
+            self.state = $.Deferred();
+            braintreeAdapter.getApiClient()
+                .then(function (clientInstance) {
+                    return braintree3DSecure.create({
+                        client: clientInstance
+                    });
+                })
+                .then(function (threeDSecureInstance) {
+                    self.threeDSecureInstance = threeDSecureInstance;
+                    promise.resolve(self.threeDSecureInstance);
+                })
+                .catch(function (err) {
+                    promise.reject(err);
+                });
+
+            return promise.promise();
+        },
+
+        /**
+         * Sets 3D Secure config
+         *
          * @param {Object} config
          */
         setConfig: function (config) {
@@ -26,7 +66,8 @@ define([
         },
 
         /**
-         * Get code
+         * Gets code
+         *
          * @returns {String}
          */
         getCode: function () {
@@ -34,54 +75,114 @@ define([
         },
 
         /**
-         * Validate Braintree payment nonce
+         * Validates 3D Secure
+         *
          * @param {Object} context
          * @returns {Object}
          */
         validate: function (context) {
-            var client = braintree.getApiClient(),
-                state = $.Deferred(),
+            var self = this,
                 totalAmount = quote.totals()['base_grand_total'],
-                billingAddress = quote.billingAddress();
+                billingAddress = quote.billingAddress(),
+                options = {
+                    amount: totalAmount,
+                    nonce: context.paymentPayload.nonce,
+
+                    /**
+                     * Adds iframe to page
+                     * @param {Object} err
+                     * @param {Object} iframe
+                     */
+                    addFrame: function (err, iframe) {
+                        self.createModal($(iframe));
+                        fullScreenLoader.stopLoader();
+                        self.modal.openModal();
+                    },
+
+                    /**
+                     * Removes iframe from page
+                     */
+                    removeFrame: function () {
+                        self.modal.closeModal();
+                    }
+                };
 
             if (!this.isAmountAvailable(totalAmount) || !this.isCountryAvailable(billingAddress.countryId)) {
-                state.resolve();
+                self.state.resolve();
 
-                return state.promise();
+                return self.state.promise();
             }
 
-            client.verify3DS({
-                amount: totalAmount,
-                creditCard: context.paymentMethodNonce
-            }, function (error, response) {
-                var liability;
+            fullScreenLoader.startLoader();
+            this.initialize()
+                .then(function () {
+                    self.threeDSecureInstance.verifyCard(options, function (err, payload) {
+                        if (err) {
+                            self.state.reject(err.message);
+
+                            return;
+                        }
+
+                        // `liabilityShifted` indicates that 3DS worked and authentication succeeded
+                        // if `liabilityShifted` and `liabilityShiftPossible` are false - card is ineligible for 3DS
+                        if (payload.liabilityShifted || !payload.liabilityShifted && !payload.liabilityShiftPossible) {
+                            context.paymentPayload.nonce = payload.nonce;
+                            self.state.resolve();
+                        } else {
+                            self.state.reject($t('Please try again with another form of payment.'));
+                        }
+                    });
+                })
+                .fail(function () {
+                    fullScreenLoader.stopLoader();
+                    self.state.reject($t('Please try again with another form of payment.'));
+                });
+
+            return self.state.promise();
+        },
 
-                if (error) {
-                    state.reject(error.message);
+        /**
+         * Creates modal window
+         *
+         * @param {Object} $context
+         * @private
+         */
+        createModal: function ($context) {
+            var self = this,
+                options = {
+                    clickableOverlay: false,
+                    buttons: [],
+                    modalCloseBtnHandler: self.cancelFlow.bind(self),
+                    keyEventHandlers: {
+                        escapeKey: self.cancelFlow.bind(self)
+                    }
+                };
 
-                    return;
-                }
+            // adjust iframe styles
+            $context.attr('width', '100%');
+            self.modal = Modal(options, $context);
+        },
 
-                liability = {
-                    shifted: response.verificationDetails.liabilityShifted,
-                    shiftPossible: response.verificationDetails.liabilityShiftPossible
-                };
+        /**
+         * Cancels 3D Secure flow
+         *
+         * @private
+         */
+        cancelFlow: function () {
+            var self = this;
 
-                if (liability.shifted || !liability.shifted && !liability.shiftPossible) {
-                    context.paymentMethodNonce = response.nonce;
-                    state.resolve();
-                } else {
-                    state.reject($t('Please try again with another form of payment.'));
-                }
+            self.threeDSecureInstance.cancelVerifyCard(function () {
+                self.modal.closeModal();
+                self.state.reject();
             });
-
-            return state.promise();
         },
 
         /**
-         * Check minimal amount for 3d secure activation
+         * Checks minimal amount for 3D Secure activation
+         *
          * @param {Number} amount
          * @returns {Boolean}
+         * @private
          */
         isAmountAvailable: function (amount) {
             amount = parseFloat(amount);
@@ -90,9 +191,11 @@ define([
         },
 
         /**
-         * Check if current country is available for 3d secure
+         * Checks if current country is available for 3D Secure
+         *
          * @param {String} countryId
          * @returns {Boolean}
+         * @private
          */
         isCountryAvailable: function (countryId) {
             var key,
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/adapter.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/adapter.js
index 185e347bc9fd1..9cd6aa688674e 100644
--- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/adapter.js
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/adapter.js
@@ -6,81 +6,42 @@
 /*global define*/
 define([
     'jquery',
-    'braintree',
-    'Magento_Ui/js/model/messageList',
-    'mage/translate'
-], function ($, braintree, globalMessageList, $t) {
+    'braintreeClient'
+], function ($, braintreeClient) {
     'use strict';
 
     return {
         apiClient: null,
-        config: {},
         checkout: null,
+        code: 'braintree',
 
         /**
-         * Get Braintree api client
+         * Returns Braintree API client
          * @returns {Object}
          */
         getApiClient: function () {
-            if (!this.apiClient) {
-                this.apiClient = new braintree.api.Client({
-                    clientToken: this.getClientToken()
-                });
-            }
-
-            return this.apiClient;
-        },
-
-        /**
-         * Set configuration
-         * @param {Object} config
-         */
-        setConfig: function (config) {
-            this.config = config;
-        },
-
-        /**
-         * Setup Braintree SDK
-         */
-        setup: function () {
-            if (!this.getClientToken()) {
-                this.showError($t('Sorry, but something went wrong.'));
-            }
-
-            braintree.setup(this.getClientToken(), 'custom', this.config);
+            return braintreeClient.create({
+                authorization: this.getClientToken()
+            });
         },
 
         /**
-         * Get payment name
+         * Returns payment code
+         *
          * @returns {String}
          */
         getCode: function () {
-            return 'braintree';
+            return this.code;
         },
 
         /**
-         * Get client token
-         * @returns {String|*}
-         */
-        getClientToken: function () {
-
-            return window.checkoutConfig.payment[this.getCode()].clientToken;
-        },
-
-        /**
-         * Show error message
+         * Returns client token
          *
-         * @param {String} errorMessage
-         */
-        showError: function (errorMessage) {
-            globalMessageList.addErrorMessage({
-                message: errorMessage
-            });
-        },
-
-        /**
-         * May be triggered on Braintree SDK setup
+         * @returns {String}
+         * @private
          */
-        onReady: function () {}
+        getClientToken: function () {
+            return window.checkoutConfig.payment[this.code].clientToken;
+        }
     };
 });
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/braintree.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/braintree.js
index 2e1c65632e85f..132fcd6b3b06c 100644
--- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/braintree.js
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/braintree.js
@@ -23,7 +23,7 @@ define(
             rendererList.push(
                 {
                     type: braintreeType,
-                    component: 'Magento_Braintree/js/view/payment/method-renderer/hosted-fields'
+                    component: 'Magento_Braintree/js/view/payment/method-renderer/cc-form'
                 }
             );
         }
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/kount.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/kount.js
new file mode 100644
index 0000000000000..cd0d024387b8c
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/kount.js
@@ -0,0 +1,61 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/*browser:true*/
+/*global define*/
+
+define([
+    'jquery',
+    'braintreeDataCollector',
+    'Magento_Braintree/js/view/payment/adapter'
+], function (
+    $,
+    braintreeDataCollector,
+    braintreeAdapter
+) {
+    'use strict';
+
+    return {
+        paymentCode: 'braintree',
+
+        /**
+         * Returns information about a customer's device on checkout page for passing to Kount for review.
+         *
+         * @returns {Object}
+         */
+        getDeviceData: function () {
+            var state = $.Deferred();
+
+            if (this.hasFraudProtection()) {
+                braintreeAdapter.getApiClient()
+                    .then(function (clientInstance) {
+                        return braintreeDataCollector.create({
+                            client: clientInstance,
+                            kount: true
+                        });
+                    })
+                    .then(function (dataCollectorInstance) {
+                        var deviceData = dataCollectorInstance.deviceData;
+
+                        state.resolve(deviceData);
+                    })
+                    .catch(function (err) {
+                        state.reject(err);
+                    });
+            }
+
+            return state.promise();
+        },
+
+        /**
+         * Returns setting value.
+         *
+         * @returns {Boolean}
+         * @private
+         */
+        hasFraudProtection: function () {
+            return window.checkoutConfig.payment[this.paymentCode].hasFraudProtection;
+        }
+    };
+});
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 d078cacb96c2d..53e7c29f10782 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
@@ -9,90 +9,96 @@ define(
         'underscore',
         'jquery',
         'Magento_Payment/js/view/payment/cc-form',
-        'Magento_Checkout/js/model/quote',
         'Magento_Braintree/js/view/payment/adapter',
-        'mage/translate',
+        'braintreeHostedFields',
+        'Magento_Checkout/js/model/quote',
         'Magento_Braintree/js/validator',
+        'Magento_Ui/js/model/messageList',
         'Magento_Braintree/js/view/payment/validator-handler',
-        'Magento_Checkout/js/model/full-screen-loader'
+        'Magento_Vault/js/view/payment/vault-enabler',
+        'Magento_Braintree/js/view/payment/kount',
+        'mage/translate',
+        'prototype',
+        'domReady!'
     ],
     function (
         _,
         $,
         Component,
+        braintreeAdapter,
+        hostedFields,
         quote,
-        braintree,
-        $t,
         validator,
+        globalMessageList,
         validatorManager,
-        fullScreenLoader
+        VaultEnabler,
+        kount,
+        $t
     ) {
         'use strict';
 
         return Component.extend({
             defaults: {
+                template: 'Magento_Braintree/payment/form',
                 active: false,
-                braintreeClient: null,
-                braintreeDeviceData: null,
-                paymentMethodNonce: null,
-                lastBillingAddress: null,
-                ccCode: null,
-                ccMessageContainer: null,
-                validatorManager: validatorManager,
                 code: 'braintree',
-
-                /**
-                 * Additional payment data
-                 *
-                 * {Object}
-                 */
-                additionalData: {},
-
-                /**
-                 * Braintree client configuration
-                 *
-                 * {Object}
-                 */
-                clientConfig: {
-
-                    /**
-                     * Triggers on payment nonce receive
-                     * @param {Object} response
-                     */
-                    onPaymentMethodReceived: function (response) {
-                        this.beforePlaceOrder(response);
-                    },
-
-                    /**
-                     * Device data initialization
-                     *
-                     * @param {Object} checkout
-                     */
-                    onReady: function (checkout) {
-                        braintree.checkout = checkout;
-                        braintree.onReady();
-                    },
-
-                    /**
-                     * Triggers on any Braintree error
-                     * @param {Object} response
-                     */
-                    onError: function (response) {
-                        braintree.showError($t('Payment ' + this.getTitle() + ' can\'t be initialized'));
-                        this.isPlaceOrderActionAllowed(true);
-                        throw response.message;
-                    },
-
-                    /**
-                     * Triggers when customer click "Cancel"
-                     */
-                    onCancelled: function () {
-                        this.paymentMethodNonce = null;
-                    }
+                lastBillingAddress: null,
+                hostedFieldsInstance: null,
+                selectorsMapper: {
+                    'expirationMonth': 'expirationMonth',
+                    'expirationYear': 'expirationYear',
+                    'number': 'cc_number',
+                    'cvv': 'cc_cid'
                 },
-                imports: {
-                    onActiveChange: 'active'
-                }
+                paymentPayload: {
+                    nonce: null
+                },
+                additionalData: {}
+            },
+
+            /**
+             * @returns {exports.initialize}
+             */
+            initialize: function () {
+                var self = this;
+
+                self._super();
+                self.vaultEnabler = new VaultEnabler();
+                self.vaultEnabler.setPaymentCode(self.getVaultCode());
+
+                kount.getDeviceData()
+                    .then(function (deviceData) {
+                        self.additionalData['device_data'] = deviceData;
+                    });
+
+                return self;
+            },
+
+            /**
+             * Init hosted fields.
+             *
+             * Is called after knockout finishes input fields bindings.
+             */
+            initHostedFields: function () {
+                var self = this;
+
+                braintreeAdapter.getApiClient()
+                    .then(function (clientInstance) {
+                        return hostedFields.create({
+                            client: clientInstance,
+                            fields: self.getFieldsConfiguration()
+                        });
+                    })
+                    .then(function (hostedFieldsInstance) {
+                        self.hostedFieldsInstance = hostedFieldsInstance;
+                        self.isPlaceOrderActionAllowed(true);
+                        self.initFormValidationEvents(hostedFieldsInstance);
+
+                        return self.hostedFieldsInstance;
+                    })
+                    .catch(function () {
+                        self.showError($t('Payment ' + self.getTitle() + ' can\'t be initialized'));
+                    });
             },
 
             /**
@@ -104,8 +110,6 @@ define(
                 validator.setConfig(window.checkoutConfig.payment[this.getCode()]);
                 this._super()
                     .observe(['active']);
-                this.validatorManager.initialize();
-                this.initClientConfig();
 
                 return this;
             },
@@ -133,226 +137,289 @@ define(
             },
 
             /**
-             * Triggers when payment method change
-             * @param {Boolean} isActive
+             * Get data
+             *
+             * @returns {Object}
              */
-            onActiveChange: function (isActive) {
-                if (!isActive) {
-                    return;
-                }
+            getData: function () {
+                var data = {
+                    'method': this.getCode(),
+                    'additional_data': {
+                        'payment_method_nonce': this.paymentPayload.nonce
+                    }
+                };
 
-                this.restoreMessageContainer();
-                this.restoreCode();
+                data['additional_data'] = _.extend(data['additional_data'], this.additionalData);
+                this.vaultEnabler.visitAdditionalData(data);
 
-                /**
-                 * Define onReady callback
-                 */
-                braintree.onReady = function () {};
-                this.initBraintree();
+                return data;
             },
 
             /**
-             * Restore original message container for cc-form component
+             * Get list of available CC types
+             *
+             * @returns {Object}
              */
-            restoreMessageContainer: function () {
-                this.messageContainer = this.ccMessageContainer;
+            getCcAvailableTypes: function () {
+                var availableTypes = validator.getAvailableCardTypes(),
+                    billingAddress = quote.billingAddress(),
+                    billingCountryId;
+
+                this.lastBillingAddress = quote.shippingAddress();
+
+                if (!billingAddress) {
+                    billingAddress = this.lastBillingAddress;
+                }
+
+                billingCountryId = billingAddress.countryId;
+
+                if (billingCountryId && validator.getCountrySpecificCardTypes(billingCountryId)) {
+
+                    return validator.collectTypes(
+                        availableTypes,
+                        validator.getCountrySpecificCardTypes(billingCountryId)
+                    );
+                }
+
+                return availableTypes;
             },
 
             /**
-             * Restore original code for cc-form component
+             * @returns {Boolean}
              */
-            restoreCode: function () {
-                this.code = this.ccCode;
+            isVaultEnabled: function () {
+                return this.vaultEnabler.isVaultEnabled();
             },
 
-            /** @inheritdoc */
-            initChildren: function () {
-                this._super();
-                this.ccMessageContainer = this.messageContainer;
-                this.ccCode = this.code;
-
-                return this;
+            /**
+             * Returns vault code.
+             *
+             * @returns {String}
+             */
+            getVaultCode: function () {
+                return window.checkoutConfig.payment[this.getCode()].ccVaultCode;
             },
 
             /**
-             * Init config
+             * Action to place order
+             * @param {String} key
              */
-            initClientConfig: function () {
-                // Advanced fraud tools settings
-                if (this.hasFraudProtection()) {
-                    this.clientConfig = _.extend(this.clientConfig, this.kountConfig());
+            placeOrder: function (key) {
+                var self = this;
+
+                if (key) {
+                    return self._super();
                 }
+                // place order on success validation
+                validatorManager.validate(self, function () {
+                    return self.placeOrder('parent');
+                }, function (err) {
 
-                _.each(this.clientConfig, function (fn, name) {
-                    if (typeof fn === 'function') {
-                        this.clientConfig[name] = fn.bind(this);
+                    if (err) {
+                        self.showError(err);
                     }
-                }, this);
+                });
+
+                return false;
             },
 
             /**
-             * Init Braintree configuration
+             * Returns state of place order button
+             *
+             * @returns {Boolean}
              */
-            initBraintree: function () {
-                var intervalId = setInterval(function () {
-                    // stop loader when frame will be loaded
-                    if ($('#braintree-hosted-field-number').length) {
-                        clearInterval(intervalId);
-                        fullScreenLoader.stopLoader();
-                    }
-                }, 500);
-
-                if (braintree.checkout) {
-                    braintree.checkout.teardown(function () {
-                        braintree.checkout = null;
-                    });
-                }
-
-                fullScreenLoader.startLoader();
-                braintree.setConfig(this.clientConfig);
-                braintree.setup();
+            isButtonActive: function () {
+                return this.isActive() && this.isPlaceOrderActionAllowed();
             },
 
             /**
-             * @returns {Object}
+             * Trigger order placing
              */
-            kountConfig: function () {
-                var config = {
-                    dataCollector: {
-                        kount: {
-                            environment: this.getEnvironment()
+            placeOrderClick: function () {
+                var self = this;
+
+                if (this.isFormValid(this.hostedFieldsInstance)) {
+                    self.hostedFieldsInstance.tokenize(function (err, payload) {
+                        if (err) {
+                            self.showError($t('Some payment input fields are invalid.'));
+
+                            return;
                         }
-                    },
-
-                    /**
-                     * Device data initialization
-                     *
-                     * @param {Object} checkout
-                     */
-                    onReady: function (checkout) {
-                        braintree.checkout = checkout;
-                        this.additionalData['device_data'] = checkout.deviceData;
-                        braintree.onReady();
-                    }
-                };
 
-                if (this.getKountMerchantId()) {
-                    config.dataCollector.kount.merchantId = this.getKountMerchantId();
+                        self.setPaymentPayload(payload);
+                        self.placeOrder();
+                    });
                 }
-
-                return config;
             },
 
             /**
-             * Get full selector name
+             * Validates credit card form.
              *
-             * @param {String} field
-             * @returns {String}
+             * @param {Object} hostedFieldsInstance
+             * @returns {Boolean}
+             * @private
              */
-            getSelector: function (field) {
-                return '#' + this.getCode() + '_' + field;
+            isFormValid: function (hostedFieldsInstance) {
+                var self = this,
+                    state = hostedFieldsInstance.getState();
+
+                return Object.keys(state.fields).every(function (fieldKey) {
+                    if (fieldKey in self.selectorsMapper && state.fields[fieldKey].isValid === false) {
+                        self.addInvalidClass(self.selectorsMapper[fieldKey]);
+                    }
+
+                    return state.fields[fieldKey].isValid;
+                });
             },
 
             /**
-             * Get list of available CC types
+             * Init form validation events.
              *
-             * @returns {Object}
+             * @param {Object} hostedFieldsInstance
+             * @private
              */
-            getCcAvailableTypes: function () {
-                var availableTypes = validator.getAvailableCardTypes(),
-                    billingAddress = quote.billingAddress(),
-                    billingCountryId;
+            initFormValidationEvents: function (hostedFieldsInstance) {
+                var self = this;
 
-                this.lastBillingAddress = quote.shippingAddress();
+                hostedFieldsInstance.on('empty', function (event) {
+                    if (event.emittedBy === 'number') {
+                        self.selectedCardType(null);
+                    }
 
-                if (!billingAddress) {
-                    billingAddress = this.lastBillingAddress;
-                }
+                });
 
-                billingCountryId = billingAddress.countryId;
+                hostedFieldsInstance.on('blur', function (event) {
+                    if (event.emittedBy === 'number') {
+                        self.validateCardType();
+                    }
+                });
 
-                if (billingCountryId && validator.getCountrySpecificCardTypes(billingCountryId)) {
+                hostedFieldsInstance.on('validityChange', function (event) {
+                    var field = event.fields[event.emittedBy],
+                        fieldKey = event.emittedBy;
 
-                    return validator.collectTypes(
-                        availableTypes, validator.getCountrySpecificCardTypes(billingCountryId)
-                    );
-                }
+                    if (fieldKey === 'number') {
+                        self.isValidCardNumber = field.isValid;
+                    }
 
-                return availableTypes;
+                    if (fieldKey in self.selectorsMapper && field.isValid === false) {
+                        self.addInvalidClass(self.selectorsMapper[fieldKey]);
+                    }
+                });
+
+                hostedFieldsInstance.on('cardTypeChange', function (event) {
+                    if (event.cards.length === 1) {
+                        self.selectedCardType(
+                            validator.getMageCardType(event.cards[0].type, self.getCcAvailableTypes())
+                        );
+                    }
+                });
             },
 
             /**
-             * @returns {Boolean}
+             * Get full selector name
+             *
+             * @param {String} field
+             * @returns {String}
+             * @private
              */
-            hasFraudProtection: function () {
-                return window.checkoutConfig.payment[this.getCode()].hasFraudProtection;
+            getSelector: function (field) {
+                return '#' + this.getCode() + '_' + field;
             },
 
             /**
-             * @returns {String}
+             * Add invalid class to field.
+             *
+             * @param {String} field
+             * @returns void
+             * @private
              */
-            getEnvironment: function () {
-                return window.checkoutConfig.payment[this.getCode()].environment;
+            addInvalidClass: function (field) {
+                $(this.getSelector(field)).addClass('braintree-hosted-fields-invalid');
             },
 
             /**
-             * @returns {String}
+             * Remove invalid class from field.
+             *
+             * @param {String} field
+             * @returns void
+             * @private
              */
-            getKountMerchantId: function () {
-                return window.checkoutConfig.payment[this.getCode()].kountMerchantId;
+            removeInvalidClass: function (field) {
+                $(this.getSelector(field)).removeClass('braintree-hosted-fields-invalid');
             },
 
             /**
-             * Get data
+             * Get Braintree Hosted Fields
              *
              * @returns {Object}
+             * @private
              */
-            getData: function () {
-                var data = {
-                    'method': this.getCode(),
-                    'additional_data': {
-                        'payment_method_nonce': this.paymentMethodNonce
-                    }
-                };
+            getFieldsConfiguration: function () {
+                var self = this,
+                    fields = {
+                        number: {
+                            selector: self.getSelector('cc_number')
+                        },
+                        expirationMonth: {
+                            selector: self.getSelector('expirationMonth'),
+                            placeholder: $t('MM')
+                        },
+                        expirationYear: {
+                            selector: self.getSelector('expirationYear'),
+                            placeholder: $t('YY')
+                        }
+                    };
 
-                data['additional_data'] = _.extend(data['additional_data'], this.additionalData);
+                if (self.hasVerification()) {
+                    fields.cvv = {
+                        selector: self.getSelector('cc_cid')
+                    };
+                }
 
-                return data;
+                return fields;
             },
 
             /**
-             * Set payment nonce
-             * @param {String} paymentMethodNonce
+             * Validate current credit card type.
+             *
+             * @returns {Boolean}
+             * @private
              */
-            setPaymentMethodNonce: function (paymentMethodNonce) {
-                this.paymentMethodNonce = paymentMethodNonce;
+            validateCardType: function () {
+                var cardFieldName = 'cc_number';
+
+                this.removeInvalidClass(cardFieldName);
+
+                if (this.selectedCardType() === null || !this.isValidCardNumber) {
+                    this.addInvalidClass(cardFieldName);
+
+                    return false;
+                }
+
+                return true;
             },
 
             /**
-             * Prepare data to place order
-             * @param {Object} data
+             * Sets payment payload
+             *
+             * @param {Object} paymentPayload
+             * @private
              */
-            beforePlaceOrder: function (data) {
-                this.setPaymentMethodNonce(data.nonce);
-                this.placeOrder();
+            setPaymentPayload: function (paymentPayload) {
+                this.paymentPayload = paymentPayload;
             },
 
             /**
-             * Action to place order
-             * @param {String} key
+             * Show error message
+             *
+             * @param {String} errorMessage
+             * @private
              */
-            placeOrder: function (key) {
-                var self = this;
-
-                if (key) {
-                    return self._super();
-                }
-                // place order on success validation
-                self.validatorManager.validate(self, function () {
-                    return self.placeOrder('parent');
+            showError: function (errorMessage) {
+                globalMessageList.addErrorMessage({
+                    message: errorMessage
                 });
-
-                return false;
             }
         });
     }
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js
deleted file mode 100644
index bfdc2974dd4b0..0000000000000
--- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-/*browser:true*/
-/*global define*/
-
-define([
-    'jquery',
-    'Magento_Braintree/js/view/payment/method-renderer/cc-form',
-    'Magento_Braintree/js/validator',
-    'Magento_Vault/js/view/payment/vault-enabler',
-    'mage/translate'
-], function ($, Component, validator, VaultEnabler, $t) {
-    'use strict';
-
-    return Component.extend({
-
-        defaults: {
-            template: 'Magento_Braintree/payment/form',
-            clientConfig: {
-
-                /**
-                 * {String}
-                 */
-                id: 'co-transparent-form-braintree'
-            },
-            isValidCardNumber: false
-        },
-
-        /**
-         * @returns {exports.initialize}
-         */
-        initialize: function () {
-            this._super();
-            this.vaultEnabler = new VaultEnabler();
-            this.vaultEnabler.setPaymentCode(this.getVaultCode());
-
-            return this;
-        },
-
-        /**
-         * Init config
-         */
-        initClientConfig: function () {
-            this._super();
-
-            // Hosted fields settings
-            this.clientConfig.hostedFields = this.getHostedFields();
-        },
-
-        /**
-         * @returns {Object}
-         */
-        getData: function () {
-            var data = this._super();
-
-            this.vaultEnabler.visitAdditionalData(data);
-
-            return data;
-        },
-
-        /**
-         * @returns {Boolean}
-         */
-        isVaultEnabled: function () {
-            return this.vaultEnabler.isVaultEnabled();
-        },
-
-        /**
-         * Get Braintree Hosted Fields
-         * @returns {Object}
-         */
-        getHostedFields: function () {
-            var self = this,
-                fields = {
-                    number: {
-                        selector: self.getSelector('cc_number')
-                    },
-                    expirationMonth: {
-                        selector: self.getSelector('expirationMonth'),
-                        placeholder: $t('MM')
-                    },
-                    expirationYear: {
-                        selector: self.getSelector('expirationYear'),
-                        placeholder: $t('YY')
-                    }
-                };
-
-            if (self.hasVerification()) {
-                fields.cvv = {
-                    selector: self.getSelector('cc_cid')
-                };
-            }
-
-            /**
-             * Triggers on Hosted Field changes
-             * @param {Object} event
-             * @returns {Boolean}
-             */
-            fields.onFieldEvent = function (event) {
-                if (event.isEmpty === false) {
-                    self.validateCardType();
-                }
-
-                if (event.type !== 'fieldStateChange') {
-
-                    return false;
-                }
-
-                // Handle a change in validation or card type
-                if (event.target.fieldKey === 'number') {
-                    self.selectedCardType(null);
-                }
-
-                if (event.target.fieldKey === 'number' && event.card) {
-                    self.isValidCardNumber = event.isValid;
-                    self.selectedCardType(
-                        validator.getMageCardType(event.card.type, self.getCcAvailableTypes())
-                    );
-                }
-            };
-
-            return fields;
-        },
-
-        /**
-         * Validate current credit card type
-         * @returns {Boolean}
-         */
-        validateCardType: function () {
-            var $selector = $(this.getSelector('cc_number')),
-                invalidClass = 'braintree-hosted-fields-invalid';
-
-            $selector.removeClass(invalidClass);
-
-            if (this.selectedCardType() === null || !this.isValidCardNumber) {
-                $(this.getSelector('cc_number')).addClass(invalidClass);
-
-                return false;
-            }
-
-            return true;
-        },
-
-        /**
-         * Returns state of place order button
-         * @returns {Boolean}
-         */
-        isButtonActive: function () {
-            return this.isActive() && this.isPlaceOrderActionAllowed();
-        },
-
-        /**
-         * Triggers order placing
-         */
-        placeOrderClick: function () {
-            if (this.validateCardType()) {
-                this.isPlaceOrderActionAllowed(false);
-                $(this.getSelector('submit')).trigger('click');
-            }
-        },
-
-        /**
-         * @returns {String}
-         */
-        getVaultCode: function () {
-            return window.checkoutConfig.payment[this.getCode()].ccVaultCode;
-        }
-    });
-});
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/cc-form.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/cc-form.js
new file mode 100644
index 0000000000000..868fe174ae482
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/cc-form.js
@@ -0,0 +1,83 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/*browser:true*/
+/*global define*/
+
+define([
+    'jquery',
+    'Magento_Braintree/js/view/payment/method-renderer/cc-form',
+    'Magento_Braintree/js/validator',
+    'Magento_Ui/js/model/messageList',
+    'mage/translate',
+    'Magento_Checkout/js/model/full-screen-loader',
+    'Magento_Checkout/js/action/set-payment-information-extended',
+    'Magento_Checkout/js/model/payment/additional-validators',
+    'Magento_Braintree/js/view/payment/validator-handler'
+], function (
+    $,
+    Component,
+    validator,
+    messageList,
+    $t,
+    fullScreenLoader,
+    setPaymentInformationExtended,
+    additionalValidators,
+    validatorManager
+) {
+    'use strict';
+
+    return Component.extend({
+        defaults: {
+            template: 'Magento_Braintree/payment/multishipping/form'
+        },
+
+        /**
+         * @override
+         */
+        placeOrder: function () {
+            var self = this;
+
+            validatorManager.validate(self, function () {
+                return self.setPaymentInformation();
+            });
+        },
+
+        /**
+         * @override
+         */
+        setPaymentInformation: function () {
+            if (additionalValidators.validate()) {
+                fullScreenLoader.startLoader();
+                $.when(
+                    setPaymentInformationExtended(
+                        this.messageContainer,
+                        this.getData(),
+                        true
+                    )
+                ).done(this.done.bind(this))
+                    .fail(this.fail.bind(this));
+            }
+        },
+
+        /**
+         * {Function}
+         */
+        fail: function () {
+            fullScreenLoader.stopLoader();
+
+            return this;
+        },
+
+        /**
+         * {Function}
+         */
+        done: function () {
+            fullScreenLoader.stopLoader();
+            $('#multishipping-billing-form').submit();
+
+            return this;
+        }
+    });
+});
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/paypal.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/paypal.js
new file mode 100644
index 0000000000000..b3837103148cc
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/paypal.js
@@ -0,0 +1,162 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/*browser:true*/
+/*global define*/
+define([
+    'jquery',
+    'underscore',
+    'Magento_Braintree/js/view/payment/method-renderer/paypal',
+    'Magento_Checkout/js/action/set-payment-information-extended',
+    'Magento_Checkout/js/model/payment/additional-validators',
+    'Magento_Checkout/js/model/full-screen-loader'
+], function (
+    $,
+    _,
+    Component,
+    setPaymentInformationExtended,
+    additionalValidators,
+    fullScreenLoader
+) {
+    'use strict';
+
+    return Component.extend({
+        defaults: {
+            template: 'Magento_Braintree/payment/multishipping/paypal',
+            submitButtonSelector: '#payment-continue span',
+            paypalButtonSelector: '[id="parent-payment-continue"]',
+            reviewButtonHtml: ''
+        },
+
+        /**
+         * @override
+         */
+        initObservable: function () {
+            this.reviewButtonHtml = $(this.paypalButtonSelector).html();
+
+            return this._super();
+        },
+
+        /**
+         * Get configuration for PayPal.
+         *
+         * @returns {Object}
+         */
+        getPayPalConfig: function () {
+            var config;
+
+            config = this._super();
+            config.flow = 'vault';
+            config.enableShippingAddress = false;
+            config.shippingAddressEditable = false;
+
+            return config;
+        },
+
+        /**
+         * @override
+         */
+        onActiveChange: function (isActive) {
+            this._super(isActive);
+            this.updateSubmitButton(isActive);
+        },
+
+        /**
+         * @override
+         */
+        beforePlaceOrder: function (data) {
+            this._super(data);
+
+            this.updateSubmitButton(true);
+        },
+
+        /**
+         * @override
+         */
+        getShippingAddress: function () {
+            return {};
+        },
+
+        /**
+         * @override
+         */
+        getData: function () {
+            var data = this._super();
+
+            data['additional_data']['is_active_payment_token_enabler'] = true;
+
+            return data;
+        },
+
+        /**
+         * @override
+         */
+        isActiveVault: function () {
+            return true;
+        },
+
+        /**
+         * Skipping order review step on checkout with multiple addresses is not allowed.
+         *
+         * @returns {Boolean}
+         */
+        isSkipOrderReview: function () {
+            return false;
+        },
+
+        /**
+         * Checks if payment method nonce is already received.
+         *
+         * @returns {Boolean}
+         */
+        isPaymentMethodNonceReceived: function () {
+            return this.paymentPayload.nonce !== null;
+        },
+
+        /**
+         * Updates submit button on multi-addresses checkout billing form.
+         *
+         * @param {Boolean} isActive
+         */
+        updateSubmitButton: function (isActive) {
+            if (this.isPaymentMethodNonceReceived() || !isActive) {
+                $(this.paypalButtonSelector).html(this.reviewButtonHtml);
+            }
+        },
+
+        /**
+         * @override
+         */
+        placeOrder: function () {
+            fullScreenLoader.startLoader();
+            $.when(
+                setPaymentInformationExtended(
+                    this.messageContainer,
+                    this.getData(),
+                    true
+                )
+            ).done(this.done.bind(this))
+                .fail(this.fail.bind(this));
+        },
+
+        /**
+         * {Function}
+         */
+        fail: function () {
+            fullScreenLoader.stopLoader();
+
+            return this;
+        },
+
+        /**
+         * {Function}
+         */
+        done: function () {
+            fullScreenLoader.stopLoader();
+            $('#multishipping-billing-form').submit();
+
+            return this;
+        }
+    });
+});
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
index fd096f7a372b6..f201a38e62f6d 100644
--- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
@@ -9,22 +9,28 @@ define([
     'underscore',
     'Magento_Checkout/js/view/payment/default',
     'Magento_Braintree/js/view/payment/adapter',
+    'braintreePayPal',
+    'braintreePayPalCheckout',
     'Magento_Checkout/js/model/quote',
     'Magento_Checkout/js/model/full-screen-loader',
     'Magento_Checkout/js/model/payment/additional-validators',
     'Magento_Vault/js/view/payment/vault-enabler',
     'Magento_Checkout/js/action/create-billing-address',
+    'Magento_Braintree/js/view/payment/kount',
     'mage/translate'
 ], function (
     $,
     _,
     Component,
-    Braintree,
+    BraintreeAdapter,
+    BraintreePayPal,
+    BraintreePayPalCheckout,
     quote,
     fullScreenLoader,
     additionalValidators,
     VaultEnabler,
     createBillingAddress,
+    kount,
     $t
 ) {
     'use strict';
@@ -34,10 +40,15 @@ define([
             template: 'Magento_Braintree/payment/paypal',
             code: 'braintree_paypal',
             active: false,
-            paymentMethodNonce: null,
             grandTotalAmount: null,
             isReviewRequired: false,
+            paypalCheckoutInstance: null,
             customerEmail: null,
+            vaultEnabler: null,
+            paymentPayload: {
+                nonce: null
+            },
+            paypalButtonSelector: '[data-container="paypal-button"]',
 
             /**
              * Additional payment data
@@ -46,39 +57,42 @@ define([
              */
             additionalData: {},
 
-            /**
-             * PayPal client configuration
-             * {Object}
-             */
-            clientConfig: {
-                dataCollector: {
-                    paypal: true
-                },
-
-                /**
-                 * Triggers when widget is loaded
-                 * @param {Object} checkout
-                 */
-                onReady: function (checkout) {
-                    Braintree.checkout = checkout;
-                    this.additionalData['device_data'] = checkout.deviceData;
-                    this.enableButton();
-                    Braintree.onReady();
-                },
-
-                /**
-                 * Triggers on payment nonce receive
-                 * @param {Object} response
-                 */
-                onPaymentMethodReceived: function (response) {
-                    this.beforePlaceOrder(response);
-                }
-            },
             imports: {
                 onActiveChange: 'active'
             }
         },
 
+        /**
+         * Initialize view.
+         *
+         * @return {exports}
+         */
+        initialize: function () {
+            var self = this;
+
+            self._super();
+
+            BraintreeAdapter.getApiClient().then(function (clientInstance) {
+                return BraintreePayPal.create({
+                    client: clientInstance
+                });
+            }).then(function (paypalCheckoutInstance) {
+                self.paypalCheckoutInstance = paypalCheckoutInstance;
+
+                return self.paypalCheckoutInstance;
+            });
+
+            kount.getDeviceData()
+                .then(function (deviceData) {
+                    self.additionalData['device_data'] = deviceData;
+                });
+
+            // for each component initialization need update property
+            this.isReviewRequired(false);
+
+            return self;
+        },
+
         /**
          * Set list of observable attributes
          * @returns {exports.initObservable}
@@ -109,10 +123,6 @@ define([
                 }
             });
 
-            // for each component initialization need update property
-            this.isReviewRequired(false);
-            this.initClientConfig();
-
             return this;
         },
 
@@ -161,24 +171,13 @@ define([
         },
 
         /**
-         * Init config
-         */
-        initClientConfig: function () {
-            this.clientConfig = _.extend(this.clientConfig, this.getPayPalConfig());
-
-            _.each(this.clientConfig, function (fn, name) {
-                if (typeof fn === 'function') {
-                    this.clientConfig[name] = fn.bind(this);
-                }
-            }, this);
-        },
-
-        /**
-         * Set payment nonce
-         * @param {String} paymentMethodNonce
+         * Sets payment payload
+         *
+         * @param {Object} paymentPayload
+         * @private
          */
-        setPaymentMethodNonce: function (paymentMethodNonce) {
-            this.paymentMethodNonce = paymentMethodNonce;
+        setPaymentPayload: function (paymentPayload) {
+            this.paymentPayload = paymentPayload;
         },
 
         /**
@@ -205,21 +204,21 @@ define([
 
         /**
          * Prepare data to place order
-         * @param {Object} data
+         * @param {Object} payload
          */
-        beforePlaceOrder: function (data) {
-            this.setPaymentMethodNonce(data.nonce);
+        beforePlaceOrder: function (payload) {
+            this.setPaymentPayload(payload);
 
             if ((this.isRequiredBillingAddress() || quote.billingAddress() === null) &&
-                typeof data.details.billingAddress !== 'undefined'
+                typeof payload.details.billingAddress !== 'undefined'
             ) {
-                this.setBillingAddress(data.details, data.details.billingAddress);
+                this.setBillingAddress(payload.details, payload.details.billingAddress);
             }
 
             if (this.isSkipOrderReview()) {
                 this.placeOrder();
             } else {
-                this.customerEmail(data.details.email);
+                this.customerEmail(payload.details.email);
                 this.isReviewRequired(true);
             }
         },
@@ -228,18 +227,46 @@ define([
          * Re-init PayPal Auth Flow
          */
         reInitPayPal: function () {
-            if (Braintree.checkout) {
-                Braintree.checkout.teardown(function () {
-                    Braintree.checkout = null;
-                });
-            }
+            var self = this;
 
-            this.disableButton();
-            this.clientConfig.paypal.amount = this.grandTotalAmount;
-            this.clientConfig.paypal.shippingAddressOverride = this.getShippingAddress();
+            $(self.paypalButtonSelector).html('');
+
+            return BraintreePayPalCheckout.Button.render({
+                env: this.getEnvironment(),
+                style: {
+                    color: 'blue',
+                    shape: 'rect',
+                    size: 'medium',
+                    label: 'pay',
+                    tagline: false
+                },
+
+                /**
+                 * Creates a PayPal payment
+                 */
+                payment: function () {
+                    return self.paypalCheckoutInstance.createPayment(
+                        self.getPayPalConfig()
+                    );
+                },
 
-            Braintree.setConfig(this.clientConfig);
-            Braintree.setup();
+                /**
+                 * Tokenizes the authorize data
+                 */
+                onAuthorize: function (data) {
+                    return self.paypalCheckoutInstance.tokenizePayment(data)
+                        .then(function (payload) {
+                            self.beforePlaceOrder(payload);
+                        });
+                },
+
+                /**
+                 * Triggers on error
+                 */
+                onError: function () {
+                    self.showError($t('Payment ' + self.getTitle() + ' can\'t be initialized'));
+                }
+            }, self.paypalButtonSelector);
         },
 
         /**
@@ -272,37 +299,22 @@ define([
          */
         getPayPalConfig: function () {
             var totals = quote.totals(),
-                config = {},
+                config,
                 isActiveVaultEnabler = this.isActiveVault();
 
-            config.paypal = {
-                container: 'paypal-container',
-                singleUse: !isActiveVaultEnabler,
-                headless: true,
+            config = {
+                flow: !isActiveVaultEnabler ? 'checkout' : 'vault',
                 amount: this.grandTotalAmount,
                 currency: totals['base_currency_code'],
                 locale: this.getLocale(),
                 enableShippingAddress: true,
-
-                /**
-                 * Triggers on any Braintree error
-                 */
-                onError: function () {
-                    this.paymentMethodNonce = null;
-                },
-
-                /**
-                 * Triggers if browser doesn't support PayPal Checkout
-                 */
-                onUnsupported: function () {
-                    this.paymentMethodNonce = null;
-                }
+                shippingAddressEditable: this.isAllowOverrideShippingAddress()
             };
 
-            config.paypal.shippingAddressOverride = this.getShippingAddress();
+            config.shippingAddressOverride = this.getShippingAddress();
 
             if (this.getMerchantName()) {
-                config.paypal.displayName = this.getMerchantName();
+                config.displayName = this.getMerchantName();
             }
 
             return config;
@@ -321,14 +333,13 @@ define([
             }
 
             return {
-                recipientName: address.firstname + ' ' + address.lastname,
-                streetAddress: address.street[0],
-                locality: address.city,
-                countryCodeAlpha2: address.countryId,
+                line1: address.street[0],
+                city: address.city,
+                state: address.regionCode,
                 postalCode: address.postcode,
-                region: address.regionCode,
+                countryCode: address.countryId,
                 phone: address.telephone,
-                editable: this.isAllowOverrideShippingAddress()
+                recipientName: address.firstname + ' ' + address.lastname
             };
         },
 
@@ -348,7 +359,7 @@ define([
             var data = {
                 'method': this.getCode(),
                 'additional_data': {
-                    'payment_method_nonce': this.paymentMethodNonce
+                    'payment_method_nonce': this.paymentPayload.nonce
                 }
             };
 
@@ -375,6 +386,13 @@ define([
             return window.checkoutConfig.payment[this.getCode()].vaultCode;
         },
 
+        /**
+         * @returns {String}
+         */
+        getEnvironment: function () {
+            return window.checkoutConfig.payment[BraintreeAdapter.getCode()].environment;
+        },
+
         /**
          * Check if need to skip order review
          * @returns {Boolean}
@@ -395,59 +413,7 @@ define([
          * Re-init PayPal Auth flow to use Vault
          */
         onVaultPaymentTokenEnablerChange: function () {
-            this.clientConfig.paypal.singleUse = !this.isActiveVault();
             this.reInitPayPal();
-        },
-
-        /**
-         * Disable submit button
-         */
-        disableButton: function () {
-            // stop any previous shown loaders
-            fullScreenLoader.stopLoader(true);
-            fullScreenLoader.startLoader();
-            $('[data-button="place"]').attr('disabled', 'disabled');
-        },
-
-        /**
-         * Enable submit button
-         */
-        enableButton: function () {
-            $('[data-button="place"]').removeAttr('disabled');
-            fullScreenLoader.stopLoader();
-        },
-
-        /**
-         * Triggers when customer click "Continue to PayPal" button
-         */
-        payWithPayPal: function () {
-            if (!additionalValidators.validate()) {
-                return;
-            }
-
-            try {
-                Braintree.checkout.paypal.initAuthFlow();
-            } catch (e) {
-                this.messageContainer.addErrorMessage({
-                    message: $t('Payment ' + this.getTitle() + ' can\'t be initialized.')
-                });
-            }
-        },
-
-        /**
-         * Get button title
-         * @returns {String}
-         */
-        getButtonTitle: function () {
-            return this.isSkipOrderReview() ? 'Pay with PayPal' : 'Continue to PayPal';
-        },
-
-        /**
-         * Get button id
-         * @returns {String}
-         */
-        getButtonId: function () {
-            return this.getCode() + (this.isSkipOrderReview() ? '_pay_with' : '_continue_to');
         }
     });
 });
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/vault.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/vault.js
index 85e531706d62e..ad8ac02bfb8c6 100644
--- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/vault.js
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/vault.js
@@ -51,15 +51,7 @@ define([
         placeOrder: function () {
             var self = this;
 
-            /**
-             * Define onReady callback
-             */
-            Braintree.onReady = function () {
-                self.getPaymentMethodNonce();
-            };
-            self.hostedFields(function (formComponent) {
-                formComponent.initBraintree();
-            });
+            self.getPaymentMethodNonce();
         },
 
         /**
@@ -75,7 +67,7 @@ define([
                 .done(function (response) {
                     fullScreenLoader.stopLoader();
                     self.hostedFields(function (formComponent) {
-                        formComponent.setPaymentMethodNonce(response.paymentMethodNonce);
+                        formComponent.paymentPayload.nonce = response.paymentMethodNonce;
                         formComponent.additionalData['public_hash'] = self.publicHash;
                         formComponent.code = self.code;
                         formComponent.messageContainer = self.messageContainer;
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/validator-handler.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/validator-handler.js
index fbe85c3b46027..992c241fad665 100644
--- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/validator-handler.js
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/validator-handler.js
@@ -7,28 +7,26 @@
 
 define([
     'jquery',
-    'Magento_Ui/js/model/messageList',
     'Magento_Braintree/js/view/payment/3d-secure'
-], function ($, globalMessageList, verify3DSecure) {
+], function ($, verify3DSecure) {
     'use strict';
 
     return {
+        initialized: false,
         validators: [],
 
         /**
-         * Get payment config
-         * @returns {Object}
-         */
-        getConfig: function () {
-            return window.checkoutConfig.payment;
-        },
-
-        /**
-         * Init list of validators
+         * Inits list of validators
          */
         initialize: function () {
             var config = this.getConfig();
 
+            if (this.initialized) {
+                return;
+            }
+
+            this.initialized = true;
+
             if (config[verify3DSecure.getCode()].enabled) {
                 verify3DSecure.setConfig(config[verify3DSecure.getCode()]);
                 this.add(verify3DSecure);
@@ -36,7 +34,17 @@ define([
         },
 
         /**
-         * Add new validator
+         * Gets payment config
+         *
+         * @returns {Object}
+         */
+        getConfig: function () {
+            return window.checkoutConfig.payment;
+        },
+
+        /**
+         * Adds new validator
+         *
          * @param {Object} validator
          */
         add: function (validator) {
@@ -44,17 +52,21 @@ define([
         },
 
         /**
-         * Run pull of validators
+         * Runs pull of validators
+         *
          * @param {Object} context
-         * @param {Function} callback
+         * @param {Function} successCallback
+         * @param {Function} errorCallback
          */
-        validate: function (context, callback) {
+        validate: function (context, successCallback, errorCallback) {
             var self = this,
                 deferred;
 
+            self.initialize();
+
             // no available validators
             if (!self.validators.length) {
-                callback();
+                successCallback();
 
                 return;
             }
@@ -66,20 +78,10 @@ define([
 
             $.when.apply($, deferred)
                 .done(function () {
-                    callback();
+                    successCallback();
                 }).fail(function (error) {
-                    self.showError(error);
+                    errorCallback(error);
                 });
-        },
-
-        /**
-         * Show error message
-         * @param {String} errorMessage
-         */
-        showError: function (errorMessage) {
-            globalMessageList.addErrorMessage({
-                message: errorMessage
-            });
         }
     };
 });
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 819b06ca75788..9bcb5dad8b636 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
@@ -87,7 +87,7 @@
                         <span><!-- ko i18n: 'Card Verification Number'--><!-- /ko --></span>
                     </label>
                     <div class="control _with-tooltip">
-                        <div data-bind="attr: {id: getCode() + '_cc_cid'}" class="hosted-control hosted-cid"></div>
+                        <div data-bind="afterRender: initHostedFields, 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/Braintree/view/frontend/web/template/payment/multishipping/form.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/form.html
new file mode 100644
index 0000000000000..b72ef24b81b63
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/form.html
@@ -0,0 +1,106 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<div data-bind="attr: {class: 'payment-method payment-method-' + getCode()}, css: {'_active': isActive()}">
+    <div>
+        <form id="co-transparent-form-braintree" class="form" data-bind="" 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>
+                </legend>
+                <br>
+                <div class="field type">
+                    <div class="control">
+                        <ul class="credit-card-types">
+                            <!-- ko foreach: {data: getCcAvailableTypes(), as: 'item'} -->
+                            <li class="item" data-bind="css: {
+                                _active: $parent.selectedCardType() == item,
+                                _inactive: $parent.selectedCardType() != null && $parent.selectedCardType() != item
+                            } ">
+                                <!--ko if: $parent.getIcons(item) -->
+                                <img data-bind="attr: {
+                                    'src': $parent.getIcons(item).url,
+                                    'width': $parent.getIcons(item).width,
+                                    'height': $parent.getIcons(item).height
+                                }">
+                                <!--/ko-->
+                            </li>
+                            <!--/ko-->
+                        </ul>
+                        <input type="hidden"
+                               name="payment[cc_type]"
+                               class="input-text"
+                               value=""
+                               data-bind="attr: {id: getCode() + '_cc_type', 'data-container': getCode() + '-cc-type'},
+                                    value: creditCardType
+                        ">
+                    </div>
+                </div>
+                <div class="field number required">
+                    <label data-bind="afterRender: initHostedFields, attr: {for: getCode() + '_cc_number'}" class="label">
+                        <span><!-- ko i18n: 'Credit Card Number'--><!-- /ko --></span>
+                    </label>
+                    <div class="control">
+                        <div data-bind="attr: {id: getCode() + '_cc_number'}" class="hosted-control"></div>
+                        <div class="hosted-error"><!-- ko i18n: 'Please, enter valid Credit Card Number'--><!-- /ko --></div>
+                    </div>
+                </div>
+                <div class="field number required">
+                    <label data-bind="attr: {for: getCode() + '_expiration'}" class="label">
+                        <span><!-- ko i18n: 'Expiration Date'--><!-- /ko --></span>
+                    </label>
+                    <div class="control">
+                        <div class="hosted-date-wrap">
+                            <div data-bind="attr: {id: getCode() + '_expirationMonth'}"
+                                 class="hosted-control hosted-date"></div>
+
+                            <div data-bind="attr: {id: getCode() + '_expirationYear'}"
+                                 class="hosted-control hosted-date"></div>
+
+                            <div class="hosted-error"><!-- ko i18n: 'Please, enter valid Expiration Date'--><!-- /ko --></div>
+                        </div>
+                    </div>
+                </div>
+                <!-- ko if: (hasVerification())-->
+                <div class="field cvv required" data-bind="attr: {id: getCode() + '_cc_type_cvv_div'}">
+                    <label data-bind="attr: {for: getCode() + '_cc_cid'}" class="label">
+                        <span><!-- ko i18n: 'Card Verification Number'--><!-- /ko --></span>
+                    </label>
+                    <div class="control _with-tooltip">
+                        <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">
+                            <span class="field-tooltip-action action-cvv"
+                                  tabindex="0"
+                                  data-toggle="dropdown"
+                                  data-bind="attr: {title: $t('What is this?')}, mageInit: {'dropdown':{'activeClass': '_active'}}">
+                                <span><!-- ko i18n: 'What is this?'--><!-- /ko --></span>
+                            </span>
+                            <div class="field-tooltip-content"
+                                 data-target="dropdown"
+                                 data-bind="html: getCvvImageHtml()"></div>
+                        </div>
+                    </div>
+                </div>
+                <!-- /ko -->
+            </fieldset>
+            <input type="submit" id="braintree_submit"  style="display:none" />
+        </form>
+
+        <div class="actions-toolbar no-display">
+            <div class="primary">
+                <button data-role="review-save"
+                        type="submit"
+                        data-bind="{click: placeOrderClick}"
+                        class="action primary checkout">
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/paypal.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/paypal.html
new file mode 100644
index 0000000000000..fcd5320351938
--- /dev/null
+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/multishipping/paypal.html
@@ -0,0 +1,41 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': isActive()}">
+    <div class="payment-method-title field choice">
+        <label class="label" data-bind="attr: {'for': getCode()}">
+            <!-- PayPal Logo -->
+            <img data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark'), title: $t('Acceptance Mark')}"
+                 class="payment-icon"/>
+            <!-- PayPal Logo -->
+            <span text="getTitle()"></span>
+        </label>
+    </div>
+
+    <div class="payment-method-content">
+        <each args="getRegion('messages')" render=""></each>
+        <fieldset class="braintree-paypal-fieldset" data-bind='attr: {id: "payment_form_" + getCode()}'>
+            <div id="paypal-container"></div>
+        </fieldset>
+        <div data-container="paypal-button"></div>
+        <div class="actions-toolbar braintree-paypal-actions" data-bind="visible: isReviewRequired()">
+            <div class="payment-method-item braintree-paypal-account">
+                <span class="payment-method-type">PayPal</span>
+                <span class="payment-method-description" text="customerEmail()"></span>
+            </div>
+            <div class="actions-toolbar no-display">
+                <div class="primary">
+                    <button data-button="paypal-place" data-role="review-save"
+                            type="submit"
+                            data-bind="{click: placeOrder}"
+                            class="action primary checkout">
+                        <span data-bind="i18n: 'Place Order'"></span>
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
index e1f6a1b4c25ce..0abf3483ac76c 100644
--- a/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html
@@ -65,15 +65,7 @@
             </div>
         </div>
         <div class="actions-toolbar" data-bind="visible: !isReviewRequired()">
-            <div class="primary">
-                <button data-button="place" data-role="review-save"
-                        type="submit"
-                        data-bind="attr: {id: getButtonId(), title: $t(getButtonTitle())}, enable: (isActive()), click: payWithPayPal"
-                        class="action primary checkout"
-                        disabled>
-                    <span translate="getButtonTitle()"></span>
-                </button>
-            </div>
+            <div data-container="paypal-button" class="primary"></div>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
index b220e2c98d77c..46db8a9907341 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
@@ -20,9 +20,7 @@ class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Op
     protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/checkbox.phtml';
 
     /**
-     * @param  string $elementId
-     * @param  string $containerId
-     * @return string
+     * @inheritdoc
      */
     public function setValidationContainer($elementId, $containerId)
     {
@@ -34,4 +32,15 @@ public function setValidationContainer($elementId, $containerId)
             '\';
             </script>';
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSelectionPrice($selection)
+    {
+        $price = parent::getSelectionPrice($selection);
+        $qty = $selection->getSelectionQty();
+
+        return $price * $qty;
+    }
 }
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
index a4b8c6bde73aa..629f08dc75106 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
@@ -20,9 +20,7 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
     protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/multi.phtml';
 
     /**
-     * @param  string $elementId
-     * @param  string $containerId
-     * @return string
+     * @inheritdoc
      */
     public function setValidationContainer($elementId, $containerId)
     {
@@ -34,4 +32,15 @@ public function setValidationContainer($elementId, $containerId)
             '\';
             </script>';
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSelectionPrice($selection)
+    {
+        $price = parent::getSelectionPrice($selection);
+        $qty = $selection->getSelectionQty();
+
+        return $price * $qty;
+    }
 }
diff --git a/app/code/Magento/Bundle/Block/DataProviders/OptionPriceRenderer.php b/app/code/Magento/Bundle/Block/DataProviders/OptionPriceRenderer.php
new file mode 100644
index 0000000000000..058b3a981b52f
--- /dev/null
+++ b/app/code/Magento/Bundle/Block/DataProviders/OptionPriceRenderer.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Block\DataProviders;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Pricing\Price\TierPrice;
+use Magento\Framework\Pricing\Render;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Framework\View\LayoutInterface;
+
+/**
+ * Provides additional data for bundle options
+ */
+class OptionPriceRenderer implements ArgumentInterface
+{
+    /**
+     * Parent layout of the block
+     *
+     * @var LayoutInterface
+     */
+    private $layout;
+
+    /**
+     * @param LayoutInterface $layout
+     */
+    public function __construct(LayoutInterface $layout)
+    {
+        $this->layout = $layout;
+    }
+
+    /**
+     * Format tier price string
+     *
+     * @param Product $selection
+     * @param array $arguments
+     * @return string
+     */
+    public function renderTierPrice(Product $selection, array $arguments = []): string
+    {
+        if (!array_key_exists('zone', $arguments)) {
+            $arguments['zone'] = Render::ZONE_ITEM_OPTION;
+        }
+
+        $priceHtml = '';
+
+        /** @var Render $priceRender */
+        $priceRender = $this->layout->getBlock('product.price.render.default');
+        if ($priceRender !== false) {
+            $priceHtml = $priceRender->render(
+                TierPrice::PRICE_CODE,
+                $selection,
+                $arguments
+            );
+        }
+
+        return $priceHtml;
+    }
+}
diff --git a/app/code/Magento/Bundle/Model/Plugin/UpdatePriceInQuoteItemOptions.php b/app/code/Magento/Bundle/Model/Plugin/UpdatePriceInQuoteItemOptions.php
new file mode 100644
index 0000000000000..ab56874786500
--- /dev/null
+++ b/app/code/Magento/Bundle/Model/Plugin/UpdatePriceInQuoteItemOptions.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Model\Plugin;
+
+use Magento\Quote\Model\Quote\Item as OrigQuoteItem;
+use Magento\Quote\Model\Quote\Item\AbstractItem;
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * Update prices stored in quote item options after calculating quote item's totals.
+ */
+class UpdatePriceInQuoteItemOptions
+{
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @param SerializerInterface $serializer
+     */
+    public function __construct(SerializerInterface $serializer)
+    {
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Update price on quote item options level
+     *
+     * @param OrigQuoteItem $subject
+     * @param AbstractItem $result
+     * @return AbstractItem
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterCalcRowTotal(OrigQuoteItem $subject, AbstractItem $result): AbstractItem
+    {
+        $bundleAttributes = $result->getProduct()->getCustomOption('bundle_selection_attributes');
+        if ($bundleAttributes !== null) {
+            $actualAmount = $result->getPrice() * $result->getQty();
+            $parsedValue = $this->serializer->unserialize($bundleAttributes->getValue());
+            if (is_array($parsedValue) && array_key_exists('price', $parsedValue)) {
+                $parsedValue['price'] = $actualAmount;
+            }
+            $bundleAttributes->setValue($this->serializer->serialize($parsedValue));
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Bundle/Model/Product/Price.php b/app/code/Magento/Bundle/Model/Product/Price.php
index 00b6b2d7a3f5a..c9ed97fada966 100644
--- a/app/code/Magento/Bundle/Model/Product/Price.php
+++ b/app/code/Magento/Bundle/Model/Product/Price.php
@@ -11,8 +11,11 @@
 use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
 
 /**
+ * Bundle product type price model
+ *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @since 100.0.2
  */
 class Price extends \Magento\Catalog\Model\Product\Type\Price
@@ -180,9 +183,9 @@ protected function getBundleSelectionIds(\Magento\Catalog\Model\Product $product
     /**
      * Get product final price
      *
-     * @param   float                     $qty
-     * @param   \Magento\Catalog\Model\Product $product
-     * @return  float
+     * @param float $qty
+     * @param \Magento\Catalog\Model\Product $product
+     * @return float
      */
     public function getFinalPrice($qty, $product)
     {
@@ -207,9 +210,9 @@ public function getFinalPrice($qty, $product)
      * Returns final price of a child product
      *
      * @param \Magento\Catalog\Model\Product $product
-     * @param float                      $productQty
+     * @param float $productQty
      * @param \Magento\Catalog\Model\Product $childProduct
-     * @param float                      $childProductQty
+     * @param float $childProductQty
      * @return float
      */
     public function getChildFinalPrice($product, $productQty, $childProduct, $childProductQty)
@@ -220,10 +223,10 @@ public function getChildFinalPrice($product, $productQty, $childProduct, $childP
     /**
      * Retrieve Price considering tier price
      *
-     * @param  \Magento\Catalog\Model\Product $product
-     * @param  string|null                $which
-     * @param  bool|null                  $includeTax
-     * @param  bool                       $takeTierPrice
+     * @param \Magento\Catalog\Model\Product $product
+     * @param string|null $which
+     * @param bool|null $includeTax
+     * @param bool $takeTierPrice
      * @return float|array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -402,8 +405,8 @@ public function getOptions($product)
      *
      * @param \Magento\Catalog\Model\Product $bundleProduct
      * @param \Magento\Catalog\Model\Product $selectionProduct
-     * @param float|null                 $selectionQty
-     * @param null|bool                  $multiplyQty      Whether to multiply selection's price by its quantity
+     * @param float|null $selectionQty
+     * @param null|bool $multiplyQty Whether to multiply selection's price by its quantity
      * @return float
      *
      * @see \Magento\Bundle\Model\Product\Price::getSelectionFinalTotalPrice()
@@ -418,7 +421,7 @@ public function getSelectionPrice($bundleProduct, $selectionProduct, $selectionQ
      *
      * @param \Magento\Catalog\Model\Product $bundleProduct
      * @param \Magento\Catalog\Model\Product $selectionProduct
-     * @param float                    $qty
+     * @param float $qty
      * @return float
      */
     public function getSelectionPreFinalPrice($bundleProduct, $selectionProduct, $qty = null)
@@ -427,15 +430,14 @@ public function getSelectionPreFinalPrice($bundleProduct, $selectionProduct, $qt
     }
 
     /**
-     * Calculate final price of selection
-     * with take into account tier price
+     * Calculate final price of selection with take into account tier price
      *
-     * @param  \Magento\Catalog\Model\Product $bundleProduct
-     * @param  \Magento\Catalog\Model\Product $selectionProduct
-     * @param  float                    $bundleQty
-     * @param  float                    $selectionQty
-     * @param  bool                       $multiplyQty
-     * @param  bool                       $takeTierPrice
+     * @param \Magento\Catalog\Model\Product $bundleProduct
+     * @param \Magento\Catalog\Model\Product $selectionProduct
+     * @param float $bundleQty
+     * @param float $selectionQty
+     * @param bool $multiplyQty
+     * @param bool $takeTierPrice
      * @return float
      */
     public function getSelectionFinalTotalPrice(
@@ -454,7 +456,11 @@ public function getSelectionFinalTotalPrice(
         }
 
         if ($bundleProduct->getPriceType() == self::PRICE_TYPE_DYNAMIC) {
-            $price = $selectionProduct->getFinalPrice($takeTierPrice ? $selectionQty : 1);
+            $totalQty = $bundleQty * $selectionQty;
+            if (!$takeTierPrice || $totalQty === 0) {
+                $totalQty = 1;
+            }
+            $price = $selectionProduct->getFinalPrice($totalQty);
         } else {
             if ($selectionProduct->getSelectionPriceType()) {
                 // percent
@@ -485,10 +491,10 @@ public function getSelectionFinalTotalPrice(
     /**
      * Apply tier price for bundle
      *
-     * @param   \Magento\Catalog\Model\Product $product
-     * @param   float                    $qty
-     * @param   float                    $finalPrice
-     * @return  float
+     * @param \Magento\Catalog\Model\Product $product
+     * @param float $qty
+     * @param float $finalPrice
+     * @return float
      */
     protected function _applyTierPrice($product, $qty, $finalPrice)
     {
@@ -509,9 +515,9 @@ protected function _applyTierPrice($product, $qty, $finalPrice)
     /**
      * Get product tier price by qty
      *
-     * @param   float                    $qty
-     * @param   \Magento\Catalog\Model\Product $product
-     * @return  float|array
+     * @param float $qty
+     * @param \Magento\Catalog\Model\Product $product
+     * @return float|array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -605,11 +611,11 @@ public function getTierPrice($qty, $product)
     /**
      * Calculate and apply special price
      *
-     * @param float  $finalPrice
-     * @param float  $specialPrice
+     * @param float $finalPrice
+     * @param float $specialPrice
      * @param string $specialPriceFrom
      * @param string $specialPriceTo
-     * @param mixed  $store
+     * @param mixed $store
      * @return float
      */
     public function calculateSpecialPrice(
@@ -634,7 +640,7 @@ public function calculateSpecialPrice(
      *
      * @param /Magento/Catalog/Model/Product $bundleProduct
      * @param float|string $price
-     * @param int          $bundleQty
+     * @param int $bundleQty
      * @return float
      */
     public function getLowestPrice($bundleProduct, $price, $bundleQty = 1)
diff --git a/app/code/Magento/Bundle/Model/Product/SaveHandler.php b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
index 09fce9222e63d..dbd07f188f90b 100644
--- a/app/code/Magento/Bundle/Model/Product/SaveHandler.php
+++ b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
@@ -7,6 +7,7 @@
 
 use Magento\Bundle\Api\ProductOptionRepositoryInterface as OptionRepository;
 use Magento\Bundle\Api\ProductLinkManagementInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
@@ -49,12 +50,11 @@ public function __construct(
     }
 
     /**
+     * Perform action on Bundle product relation/extension attribute.
+     *
      * @param object $entity
      * @param array $arguments
-     * @return \Magento\Catalog\Api\Data\ProductInterface|object
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @throws \Magento\Framework\Exception\InputException
-     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @return ProductInterface|object
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entity, $arguments = [])
@@ -78,7 +78,7 @@ public function execute($entity, $arguments = [])
         $options = $bundleProductOptions ?: [];
 
         if (!$entity->getCopyFromView()) {
-            $this->processRemovedOptions($entity->getSku(), $existingOptionsIds, $optionIds);
+            $this->processRemovedOptions($entity, $existingOptionsIds, $optionIds);
 
             $newOptionsIds = array_diff($optionIds, $existingOptionsIds);
             $this->saveOptions($entity, $options, $newOptionsIds);
@@ -92,10 +92,10 @@ public function execute($entity, $arguments = [])
     }
 
     /**
+     * Remove option product links.
+     *
      * @param string $entitySku
      * @param \Magento\Bundle\Api\Data\OptionInterface $option
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @throws \Magento\Framework\Exception\InputException
      * @return void
      */
     protected function removeOptionLinks($entitySku, $option)
@@ -152,21 +152,21 @@ private function getOptionIds(array $options)
     }
 
     /**
-     * Removes old options that no longer exists
+     * Removes old options that no longer exists.
      *
-     * @param string $entitySku
+     * @param ProductInterface $entity
      * @param array $existingOptionsIds
      * @param array $optionIds
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @throws \Magento\Framework\Exception\InputException
-     * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @return void
      */
-    private function processRemovedOptions($entitySku, array $existingOptionsIds, array $optionIds)
+    private function processRemovedOptions(ProductInterface $entity, array $existingOptionsIds, array $optionIds)
     {
+        $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
+        $parentId = $entity->getData($metadata->getLinkField());
         foreach (array_diff($existingOptionsIds, $optionIds) as $optionId) {
-            $option = $this->optionRepository->get($entitySku, $optionId);
-            $this->removeOptionLinks($entitySku, $option);
+            $option = $this->optionRepository->get($entity->getSku(), $optionId);
+            $option->setParentId($parentId);
+            $this->removeOptionLinks($entity->getSku(), $option);
             $this->optionRepository->delete($option);
         }
     }
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index 79a615f542c43..b5306e6b92f57 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -715,7 +715,7 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
 
                 $selections = $this->mergeSelectionsWithOptions($options, $selections);
             }
-            if (count($selections) > 0 || !$isStrictProcessMode) {
+            if ((is_array($selections) && count($selections) > 0) || !$isStrictProcessMode) {
                 $uniqueKey = [$product->getId()];
                 $selectionIds = [];
                 $qtys = $buyRequest->getBundleOptionQty();
@@ -741,7 +741,7 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
                     $price = $product->getPriceModel()
                         ->getSelectionFinalTotalPrice($product, $selection, 0, $qty);
                     $attributes = [
-                        'price' => $this->priceCurrency->convert($price),
+                        'price' => $price,
                         'qty' => $qty,
                         'option_label' => $selection->getOption()
                             ->getTitle(),
@@ -1328,8 +1328,9 @@ protected function checkIsResult($_result)
     protected function mergeSelectionsWithOptions($options, $selections)
     {
         foreach ($options as $option) {
-            if ($option->getRequired() && count($option->getSelections()) == 1) {
-                $selections = array_merge($selections, $option->getSelections());
+            $optionSelections = $option->getSelections();
+            if ($option->getRequired() && is_array($optionSelections) && count($optionSelections) == 1) {
+                $selections = array_merge($selections, $optionSelections);
             } else {
                 $selections = [];
                 break;
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
index adb0777151b9e..2f0a99072594b 100644
--- a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
+++ b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
@@ -281,7 +281,7 @@ public function calculateBundleAmount($basePriceValue, $bundleProduct, $selectio
      * @param float $basePriceValue
      * @param Product $bundleProduct
      * @param \Magento\Bundle\Pricing\Price\BundleSelectionPrice[] $selectionPriceList
-     * @param null|bool|string|arrayy $exclude
+     * @param null|bool|string|array $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      */
     protected function calculateFixedBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude)
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiBundleProductActionGroup.xml
index 72140cf6d5848..2444776065f7e 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiBundleProductActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiBundleProductActionGroup.xml
@@ -106,4 +106,67 @@
             <requiredEntity createDataKey="simpleProduct4"/>
         </createData>
     </actionGroup>
+    <actionGroup name="AdminCreateApiDynamicBundleProductAllOptionTypesActionGroup">
+        <arguments>
+            <argument name="productName" defaultValue="Api Dynamic Bundle Product" type="string"/>
+        </arguments>
+        <!-- Create sub ctegory -->
+        <createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
+        <!-- Create simple products -->
+        <createData entity="SimpleProduct2" stepKey="simpleProduct1">
+            <field key="price">10</field>
+            <requiredEntity createDataKey="createSubCategory"/>
+        </createData>
+        <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+            <field key="price">20</field>
+            <requiredEntity createDataKey="createSubCategory"/>
+        </createData>
+        <!-- Create Bundle product -->
+        <createData entity="ApiBundleProduct" stepKey="createBundleProduct">
+            <field key="name">{{productName}}</field>
+            <requiredEntity createDataKey="createSubCategory"/>
+        </createData>
+        <createData entity="DropDownBundleOption" stepKey="createDropDownBundleOption">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <field key="title">Drop-down Option</field>
+        </createData>
+        <createData entity="RadioButtonsOption" stepKey="createBundleRadioButtonsOption">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <field key="title">Radio Buttons Option</field>
+        </createData>
+        <createData entity="CheckboxOption" stepKey="createBundleCheckboxOption">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <field key="title">Checkbox Option</field>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkCheckboxOptionToProduct1">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createBundleCheckboxOption"/>
+            <requiredEntity createDataKey="simpleProduct1"/>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkCheckboxOptionToProduct2">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createBundleCheckboxOption"/>
+            <requiredEntity createDataKey="simpleProduct2"/>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkDropDownOptionToProduct1">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createDropDownBundleOption"/>
+            <requiredEntity createDataKey="simpleProduct1"/>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkDropDownOptionToProduct2">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createDropDownBundleOption"/>
+            <requiredEntity createDataKey="simpleProduct2"/>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkRadioButtonsOptionToProduct1">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createBundleRadioButtonsOption"/>
+            <requiredEntity createDataKey="simpleProduct1"/>
+        </createData>
+        <createData entity="ApiBundleLink" stepKey="linkRadioButtonsOptionToProduct2">
+            <requiredEntity createDataKey="createBundleProduct"/>
+            <requiredEntity createDataKey="createBundleRadioButtonsOption"/>
+            <requiredEntity createDataKey="simpleProduct2"/>
+        </createData>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/BundleProductsOnAdminActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/BundleProductsOnAdminActionGroup.xml
index 84e56e82410ff..c600e80f7265f 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/BundleProductsOnAdminActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/BundleProductsOnAdminActionGroup.xml
@@ -47,4 +47,18 @@
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
         <click selector="{{AdminProductGridActionSection.addBundleProduct}}" stepKey="goToNewBundleProductPage"/>
     </actionGroup>
+
+    <actionGroup name="CreateBundleProductForTwoSimpleProductsWithRadioTypeOptions" extends="CreateBundleProductForTwoSimpleProducts">
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="Radio Buttons" after="fillOptionTitle" stepKey="selectInputType"/>
+    </actionGroup>
+
+    <actionGroup name="CreateBundleProductForOneSimpleProductsWithRadioTypeOption" extends="CreateBundleProductForTwoSimpleProducts">
+        <remove keyForRemoval="clickOnFiltersButton2"/>
+        <remove keyForRemoval="clearFilters2"/>
+        <remove keyForRemoval="fillNameFilter2"/>
+        <remove keyForRemoval="applyFilters2"/>
+        <remove keyForRemoval="selectSecondSimple"/>
+        <remove keyForRemoval="fillDefaultQuantityForSecondProduct"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="Radio Buttons" after="fillOptionTitle" stepKey="selectInputType"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
index fda5d10295676..06d7cccb3623f 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
@@ -23,4 +23,20 @@
         <waitForText userInput="{{quantity}}" selector="{{StorefrontMinicartSection.productCount}}" time="30" stepKey="assertProductCount"/>
         <see userInput="You added {{product.name}} to your shopping cart." selector="{{StorefrontMessagesSection.success}}" stepKey="seeSuccessMessage"/>
     </actionGroup>
+    <!-- Add Bundle Product to Cart with specified currency -->
+    <actionGroup name="StoreFrontAddProductToCartFromBundleWithCurrencyActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="currency" type="string" defaultValue="US Dollar"/>
+        </arguments>
+        <click selector="{{StorefrontHeaderCurrencySwitcherSection.currencyTrigger}}" stepKey="openCurrencyTrigger"/>
+        <click selector="{{StorefrontHeaderCurrencySwitcherSection.currency(currency)}}" stepKey="chooseCurrency"/>
+        <waitForPageLoad stepKey="waitForCurrencyChange"/>
+        <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomize"/>
+        <waitForPageLoad stepKey="waitForBundleOpen"/>
+        <checkOption selector="{{StorefrontBundledSection.bundleOptionByName(product.name)}}" stepKey="chooseProduct"/>
+        <click selector="{{StorefrontBundledSection.addToCartConfigured}}" stepKey="addToCartProduct"/>
+        <waitForAjaxLoad stepKey="waitForLoad"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/BundleProductData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/BundleProductData.xml
index 2977f423d7e67..5a4f9827cd57c 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Data/BundleProductData.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/BundleProductData.xml
@@ -17,6 +17,8 @@
         <data key="name" unique="suffix">BundleProduct</data>
         <data key="sku" unique="suffix">BundleProduct</data>
         <data key="status">1</data>
+        <data key="set">4</data>
+        <data key="type">bundle</data>
         <data key="urlKey" unique="suffix">bundleproduct</data>
         <data key="visibility">4</data>
         <data key="option_title" unique="suffix">TestOption</data>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Page/StorefrontProductPage.xml b/app/code/Magento/Bundle/Test/Mftf/Page/StorefrontProductPage.xml
index a495b6be183ba..89cc6a6d5d2fe 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Page/StorefrontProductPage.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Page/StorefrontProductPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="StorefrontProductPage" url="/{{var1}}.html" area="storefront" module="Magento_Catalog" parameterized="true">
         <section name="StorefrontBundledSection"/>
     </page>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
index a843b942174d5..8f60227926099 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
@@ -16,5 +16,8 @@
         <element name="addProductsToOption" type="button" selector="[data-index='modal_set']" timeout="30"/>
         <element name="bundleOptionXProductYQuantity" type="input" selector="[name='bundle_options[bundle_options][{{x}}][bundle_selections][{{y}}][selection_qty]']" parameterized="true"/>
         <element name="bundledItems" type="block" selector="[data-index=bundle-items]"/>
+        <element name="priceTypeSwitcher" type="button" selector="div[data-index='price_type'] div[data-role='switcher']" timeout="30"/>
+        <element name="bundleSelectionPriceType" type="select" selector="bundle_options[bundle_options][0][bundle_selections][0][selection_price_type]"/>
+        <element name="bundleSelectionPriceValue" type="input" selector="bundle_options[bundle_options][0][bundle_selections][0][selection_price_value]"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
index 568cd5e2bba99..a5c70c24e3d9b 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
@@ -10,9 +10,14 @@
           xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontBundledSection">
         <element name="bundleOption" type="input" selector=".option:nth-of-type({{numOption}}) .choice:nth-of-type({{numOptionSelect}}) input" parameterized="true"/>
+        <element name="bundleOptionByName" type="input" selector="//div[@class='field choice']//span[@class='product-name'][contains(text(),'{{name}}')]/../../../input" parameterized="true"/>
         <element name="addToCart" type="button" selector="#bundle-slide" timeout="30"/>
         <element name="addToCartConfigured" type="button" selector="#product-addtocart-button" timeout="30"/>
         <element name="updateCart" type="button" selector="#product-updatecart-button" timeout="30"/>
         <element name="configuredPrice" type="block" selector=".price-configured_price .price"/>
+        <element name="dropDownOptionInput" type="select" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//select" parameterized="true"/>
+        <element name="dropDownOptionTierPrices" type="text" selector="//label//span[contains(text(), '{{optionName}}')]/../..//div[@class='control']//div[@class='option-tier-prices']" parameterized="true"/>
+        <element name="radioButtonOptionLabel" type="text" selector="//label//span[contains(text(), '{{optionName}}')]/../..//div[@class='control']//div[@class='field choice']//label[contains(.,'{{productName}}')]" parameterized="true"/>
+        <element name="checkboxOptionLabel" type="text" selector="//label//span[contains(text(), '{{optionName}}')]/../..//div[@class='control']//div[@class='field choice']//label[contains(.,'{{productName}}')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index 41c00b5eda184..b1acc97cc0261 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -7,11 +7,12 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontProductInfoMainSection">
         <element name="priceFrom" type="text" selector=".product-info-price .price-from"/>
         <element name="priceTo" type="text" selector=".product-info-price .price-to"/>
         <element name="minPrice" type="text" selector="span[data-price-type='minPrice']"/>
         <element name="maxPrice" type="text" selector="span[data-price-type='minPrice']"/>
+        <element name="productBundleOptionsCheckbox" type="checkbox" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{childName}}')]/../input" parameterized="true" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml
new file mode 100644
index 0000000000000..f0c370bc2d515
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.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="CurrencyChangingBundleProductInCartTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="MAGETWO-90381: Bundle product price doubled when switching currency"/>
+            <title value="Work of currency changing with a bundle product added to the cart"/>
+            <description value="User should be able change the currency and add one more product in cart and get right price in previous currency"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-96305"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login" />
+            <createData entity="CurrencySettingWithEuroAndUSD" stepKey="configureCurrencyOptions"/>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="SimpleProduct" stepKey="createPreReqSimpleProduct1">
+                <requiredEntity createDataKey="createPreReqCategory"/>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="createPreReqSimpleProduct2">
+                <requiredEntity createDataKey="createPreReqCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <deleteData createDataKey="createPreReqSimpleProduct1" stepKey="deletePreReqSimpleProduct1"/>
+            <deleteData createDataKey="createPreReqSimpleProduct2" stepKey="deletePreReqSimpleProduct2"/>
+            <createData entity="DefaultCurrencySetting" stepKey="restoreCurrencyOptions"/>
+            <!-- Delete the bundled product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProductOnProductsGridPageByName">
+                <argument name="product" value="BundleProduct"/>
+            </actionGroup>
+            <!--Clear Configs-->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Navigate to the Products>Inventory>Catalog -->
+        <!-- Click on "+" dropdown and select Bundle Product type -->
+        <actionGroup ref="OpenNewBundleProductPage" stepKey="openNewBundleProductPage"/>
+        <!-- Add Option, a "Radio Buttons" type option -->
+        <actionGroup ref="CreateBundleProductForTwoSimpleProductsWithRadioTypeOptions" stepKey="addBundleOptionWithTwoProducts2">
+            <argument name="bundleProduct" value="BundleProduct"/>
+            <argument name="simpleProductFirst" value="$$createPreReqSimpleProduct1$$"/>
+            <argument name="simpleProductSecond" value="$$createPreReqSimpleProduct2$$"/>
+        </actionGroup>
+        <!-- Save product -->
+        <actionGroup ref="SaveProductOnProductPageOnAdmin" stepKey="saveProductOnProductPageOnAdmin"/>
+        <!-- Go to storefront BundleProduct -->
+        <amOnPage url="{{StorefrontProductPage.url(BundleProduct.name)}}" stepKey="goToStorefrontProductPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontProductPage"/>
+        <actionGroup ref="StoreFrontAddProductToCartFromBundleWithCurrencyActionGroup" stepKey="addProduct1ToCartAndChangeCurrencyToEuro">
+            <argument name="product" value="$$createPreReqSimpleProduct1$$"/>
+            <argument name="currency" value="EUR - Euro"/>
+        </actionGroup>
+        <actionGroup ref="StoreFrontAddProductToCartFromBundleWithCurrencyActionGroup" stepKey="addProduct2ToCartAndChangeCurrencyToUSD">
+            <argument name="product" value="$$createPreReqSimpleProduct1$$"/>
+            <argument name="currency" value="USD - US Dollar"/>
+        </actionGroup>
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="openMiniCart"/>
+        <waitForPageLoad stepKey="waitForMiniCart"/>
+        <see selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" userInput="$4,000.00" stepKey="seeCartSubtotal"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml
new file mode 100644
index 0000000000000..89423c2c63658
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.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="StorefrontCheckBundleProductOptionTierPrices">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="View bundle products"/>
+            <title value="Check tier prices for bundle options"/>
+            <testCaseId value="MAGETWO-99047"/>
+            <useCaseId value="MAGETWO-96898"/>
+            <group value="catalog"/>
+            <group value="bundle"/>
+        </annotations>
+        <before>
+            <!-- Create Dynamic Bundle product -->
+            <actionGroup ref="AdminCreateApiDynamicBundleProductAllOptionTypesActionGroup" stepKey="createBundleProduct"/>
+
+            <!-- Add tier prices to simple products -->
+            <!-- Simple product 1 -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <amOnPage url="{{AdminProductEditPage.url($$simpleProduct1CreateBundleProduct.id$$)}}" stepKey="openAdminEditPageProduct1"/>
+            <actionGroup ref="ProductSetAdvancedPricing" stepKey="addTierPriceProduct1">
+                <argument name="website" value="All Websites [USD]"/>
+                <argument name="group" value="ALL GROUPS"/>
+                <argument name="quantity" value="5"/>
+                <argument name="price" value="Discount"/>
+                <argument name="amount" value="50"/>
+            </actionGroup>
+            <!-- Simple product 2 -->
+            <amOnPage url="{{AdminProductEditPage.url($$simpleProduct2CreateBundleProduct.id$$)}}" stepKey="openAdminEditPageProduct2"/>
+            <actionGroup ref="ProductSetAdvancedPricing" stepKey="addTierPriceProduct2">
+                <argument name="website" value="All Websites [USD]"/>
+                <argument name="group" value="ALL GROUPS"/>
+                <argument name="quantity" value="7"/>
+                <argument name="price" value="Discount"/>
+                <argument name="amount" value="25"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logoutAsAdmin"/>
+
+            <!-- Run reindex -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createBundleProductCreateBundleProduct" stepKey="deleteDynamicBundleProduct"/>
+            <deleteData createDataKey="simpleProduct1CreateBundleProduct" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2CreateBundleProduct" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="createSubCategoryCreateBundleProduct" stepKey="deleteSubCategory"/>
+        </after>
+
+        <!-- Go to storefront product page -->
+        <amOnPage url="{{StorefrontProductPage.url($$createBundleProductCreateBundleProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToBundleProductPage"/>
+        <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomize"/>
+
+        <!--"Drop-down" type option-->
+        <!-- Check Tier Prices for product 1 -->
+        <selectOption selector="{{StorefrontBundledSection.dropDownOptionInput('Drop-down Option')}}" userInput="$$simpleProduct1CreateBundleProduct.sku$$ +$$$simpleProduct1CreateBundleProduct.price$$.00" stepKey="selectDropDownOptionProduct1"/>
+        <seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionInput('Drop-down Option')}}" userInput="$$simpleProduct1CreateBundleProduct.sku$$ +$$$simpleProduct1CreateBundleProduct.price$$.00" stepKey="checkDropDownOptionProduct1"/>
+        <grabTextFrom selector="{{StorefrontBundledSection.dropDownOptionTierPrices('Drop-down Option')}}" stepKey="DropDownTierPriceTextProduct1"/>
+        <assertContains stepKey="assertDropDownTierPriceTextProduct1">
+            <expectedResult type="string">Buy 5 for $5.00 each and save 50%</expectedResult>
+            <actualResult type="variable">DropDownTierPriceTextProduct1</actualResult>
+        </assertContains>
+        <!-- Check Tier Prices for product 2 -->
+        <selectOption selector="{{StorefrontBundledSection.dropDownOptionInput('Drop-down Option')}}" userInput="$$simpleProduct2CreateBundleProduct.sku$$ +$$$simpleProduct2CreateBundleProduct.price$$.00" stepKey="selectDropDownOptionProduct2"/>
+        <seeOptionIsSelected selector="{{StorefrontBundledSection.dropDownOptionInput('Drop-down Option')}}" userInput="$$simpleProduct2CreateBundleProduct.sku$$ +$$$simpleProduct2CreateBundleProduct.price$$.00" stepKey="checkDropDownOptionProduct2"/>
+        <grabTextFrom selector="{{StorefrontBundledSection.dropDownOptionTierPrices('Drop-down Option')}}" stepKey="dropDownTierPriceTextProduct2"/>
+        <assertContains stepKey="assertDropDownTierPriceTextProduct2">
+            <expectedResult type="string">Buy 7 for $15.00 each and save 25%</expectedResult>
+            <actualResult type="variable">dropDownTierPriceTextProduct2</actualResult>
+        </assertContains>
+
+        <!--"Radio Buttons" type option-->
+        <!-- Check Tier Prices for product 1 -->
+        <grabTextFrom selector="{{StorefrontBundledSection.radioButtonOptionLabel('Radio Buttons Option', '$$simpleProduct1CreateBundleProduct.sku$$')}}" stepKey="radioButtonsOptionTierPriceTextProduct1"/>
+        <assertContains stepKey="assertRadioButtonsOptionTierPriceTextProduct1">
+            <expectedResult type="string">Buy 5 for $5.00 each and save 50%</expectedResult>
+            <actualResult type="variable">radioButtonsOptionTierPriceTextProduct1</actualResult>
+        </assertContains>
+        <!-- Check Tier Prices for product 2 -->
+        <grabTextFrom selector="{{StorefrontBundledSection.radioButtonOptionLabel('Radio Buttons Option', '$$simpleProduct2CreateBundleProduct.sku$$')}}" stepKey="radioButtonsOptionTierPriceTextProduct2"/>
+        <assertContains stepKey="assertRadioButtonsOptionTierPriceTextProduct2">
+            <expectedResult type="string">Buy 7 for $15.00 each and save 25%</expectedResult>
+            <actualResult type="variable">radioButtonsOptionTierPriceTextProduct2</actualResult>
+        </assertContains>
+
+        <!--"Checkbox" type option-->
+        <!-- Check Tier Prices for product 1 -->
+        <grabTextFrom selector="{{StorefrontBundledSection.checkboxOptionLabel('Checkbox Option', '$$simpleProduct1CreateBundleProduct.sku$$')}}" stepKey="checkBoxOptionTierPriceTextProduct1"/>
+        <assertContains stepKey="assertCheckBoxOptionTierPriceTextProduct1">
+            <expectedResult type="string">Buy 5 for $5.00 each and save 50%</expectedResult>
+            <actualResult type="variable">checkBoxOptionTierPriceTextProduct1</actualResult>
+        </assertContains>
+        <!-- Check Tier Prices for product 2 -->
+        <grabTextFrom selector="{{StorefrontBundledSection.checkboxOptionLabel('Checkbox Option', '$$simpleProduct2CreateBundleProduct.sku$$')}}" stepKey="checkBoxOptionTierPriceTextProduct2"/>
+        <assertContains stepKey="assertCheckBoxOptionTierPriceTextProduct2">
+            <expectedResult type="string">Buy 7 for $15.00 each and save 25%</expectedResult>
+            <actualResult type="variable">checkBoxOptionTierPriceTextProduct2</actualResult>
+        </assertContains>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php b/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php
new file mode 100644
index 0000000000000..d335554ef373c
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Test\Unit\Block\DataProviders;
+
+use Magento\Bundle\Block\DataProviders\OptionPriceRenderer;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Pricing\Render;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Element\BlockInterface;
+use Magento\Framework\View\LayoutInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class to test additional data for bundle options
+ */
+class OptionPriceRendererTest extends TestCase
+{
+    /**
+     * @var LayoutInterface|MockObject
+     */
+    private $layoutMock;
+
+    /**
+     * @var OptionPriceRenderer
+     */
+    private $renderer;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->layoutMock = $this->createMock(
+            LayoutInterface::class
+        );
+
+        $this->renderer = $objectManager->getObject(
+            OptionPriceRenderer::class,
+            ['layout' => $this->layoutMock]
+        );
+    }
+
+    /**
+     * Test to render Tier price html
+     */
+    public function testRenderTierPrice()
+    {
+        $expectedHtml = 'tier price html';
+        $expectedArguments = ['zone' => Render::ZONE_ITEM_OPTION];
+
+        $productMock = $this->createMock(Product::class);
+
+        $priceRenderer = $this->createPartialMock(BlockInterface::class, ['toHtml', 'render']);
+        $priceRenderer->expects($this->once())
+            ->method('render')
+            ->with('tier_price', $productMock, $expectedArguments)
+            ->willReturn($expectedHtml);
+
+        $this->layoutMock->method('getBlock')
+            ->with('product.price.render.default')
+            ->willReturn($priceRenderer);
+
+        $this->assertEquals(
+            $expectedHtml,
+            $this->renderer->renderTierPrice($productMock),
+            'Render Tier price is wrong'
+        );
+    }
+
+    /**
+     * Test to render Tier price html when render block is not exists
+     */
+    public function testRenderTierPriceNotExist()
+    {
+        $productMock = $this->createMock(Product::class);
+
+        $this->layoutMock->method('getBlock')
+            ->with('product.price.render.default')
+            ->willReturn(false);
+
+        $this->assertEquals(
+            '',
+            $this->renderer->renderTierPrice($productMock),
+            'Render Tier price is wrong'
+        );
+    }
+}
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Plugin/UpdatePriceInQuoteItemOptionsTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Plugin/UpdatePriceInQuoteItemOptionsTest.php
new file mode 100644
index 0000000000000..0405a22773c37
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Plugin/UpdatePriceInQuoteItemOptionsTest.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Bundle\Test\Unit\Model\Plugin;
+
+use Magento\Bundle\Model\Plugin\UpdatePriceInQuoteItemOptions;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Quote\Model\Quote\Item\AbstractItem;
+use Magento\Quote\Model\Quote\Item as QuoteItem;
+use Magento\Quote\Model\Quote\Item\Option;
+
+/**
+ * Test for Magento\Bundle\Model\Plugin\UpdatePriceInQuoteItemOptions class.
+ */
+class UpdatePriceInQuoteItemOptionsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializerMock;
+
+    /**
+     * @var QuoteItem|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subjectMock;
+
+    /**
+     * @var AbstractItem|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultMock;
+
+    /**
+     * @var Product|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productMock;
+
+    /**
+     * @var Option|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $quoteItemOptionMock;
+
+    /**
+     * @var UpdatePriceInQuoteItemOptions
+     */
+    private $model;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->serializerMock = $this->createMock(SerializerInterface::class);
+        $this->subjectMock = $this->createMock(QuoteItem::class);
+        $this->resultMock = $this->createMock(AbstractItem::class);
+        $this->productMock = $this->createMock(Product::class);
+        $this->quoteItemOptionMock = $this->createMock(Option::class);
+
+        $this->model = new UpdatePriceInQuoteItemOptions($this->serializerMock);
+    }
+
+    /**
+     * @return void
+     */
+    public function testAfterCalcRowTotalWithBundleOption()
+    {
+        $bundleAttributeValue = '{"price":100,"qty":1,"option_label":"option1","option_id":"1"}';
+        $parsedValue = [
+            'price' => 100,
+            'qty' => 1,
+            'option_label' => 'option1',
+            'option_id' => "1",
+        ];
+
+        $this->resultMock->expects($this->once())
+            ->method('getProduct')
+            ->willReturn($this->productMock);
+        $this->productMock->expects($this->once())
+            ->method('getCustomOption')
+            ->with('bundle_selection_attributes')
+            ->willReturn($this->quoteItemOptionMock);
+        $this->resultMock->expects($this->once())
+            ->method('getPrice')
+            ->willReturn(100);
+        $this->resultMock->expects($this->once())
+            ->method('getQty')
+            ->willReturn(1);
+        $this->quoteItemOptionMock->expects($this->once())
+            ->method('getValue')
+            ->willReturn($bundleAttributeValue);
+        $this->serializerMock->expects($this->once())
+            ->method('unserialize')
+            ->with($bundleAttributeValue)
+            ->willReturn($parsedValue);
+        $this->serializerMock->expects($this->once())
+            ->method('serialize')
+            ->with($parsedValue)
+            ->willReturn($bundleAttributeValue);
+
+        $this->model->afterCalcRowTotal($this->subjectMock, $this->resultMock);
+    }
+
+    /**
+     * @return void
+     */
+    public function testAfterCalcRowTotalWithoutBundleOption()
+    {
+        $this->resultMock->expects($this->once())
+            ->method('getProduct')
+            ->willReturn($this->productMock);
+        $this->productMock->expects($this->once())
+            ->method('getCustomOption')
+            ->with('bundle_selection_attributes')
+            ->willReturn(null);
+        $this->resultMock->expects($this->never())
+            ->method('getPrice');
+        $this->resultMock->expects($this->never())
+            ->method('getQty');
+        $this->quoteItemOptionMock->expects($this->never())
+            ->method('getValue');
+        $this->serializerMock->expects($this->never())
+            ->method('unserialize');
+        $this->serializerMock->expects($this->never())
+            ->method('serialize');
+
+        $this->model->afterCalcRowTotal($this->subjectMock, $this->resultMock);
+    }
+}
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/SaveHandlerTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/SaveHandlerTest.php
new file mode 100644
index 0000000000000..41e6c2c160e0a
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Product/SaveHandlerTest.php
@@ -0,0 +1,279 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Test\Unit\Model\Product;
+
+use Magento\Bundle\Api\Data\LinkInterface;
+use Magento\Bundle\Api\Data\OptionInterface;
+use Magento\Bundle\Api\ProductLinkManagementInterface;
+use Magento\Bundle\Api\ProductOptionRepositoryInterface;
+use Magento\Bundle\Model\Product\SaveHandler;
+use Magento\Catalog\Api\Data\ProductExtensionInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Unit tests for \Magento\Bundle\Model\Product\SaveHandler class.
+ */
+class SaveHandlerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ProductInterface|MockObject
+     */
+    private $productMock;
+
+    /**
+     * @var ProductExtensionInterface|MockObject
+     */
+    private $productExtensionMock;
+
+    /**
+     * @var OptionInterface|MockObject
+     */
+    private $optionMock;
+
+    /**
+     * @var ProductOptionRepositoryInterface|MockObject
+     */
+    private $optionRepositoryMock;
+
+    /**
+     * @var ProductLinkManagementInterface|MockObject
+     */
+    private $productLinkManagementMock;
+
+    /**
+     * @var LinkInterface|MockObject
+     */
+    private $linkMock;
+
+    /**
+     * @var MetadataPool|MockObject
+     */
+    private $metadataPoolMock;
+
+    /**
+     * @var EntityMetadataInterface|MockObject
+     */
+    private $metadataMock;
+
+    /**
+     * @var SaveHandler
+     */
+    private $saveHandler;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $this->productMock = $this->getMockBuilder(ProductInterface::class)
+            ->setMethods(
+                [
+                    'getExtensionAttributes',
+                    'getCopyFromView',
+                    'getData',
+                    'getTypeId',
+                    'getSku',
+                ]
+            )
+            ->getMockForAbstractClass();
+        $this->productExtensionMock = $this->getMockBuilder(ProductExtensionInterface::class)
+            ->setMethods(['getBundleProductOptions'])
+            ->getMockForAbstractClass();
+        $this->optionMock = $this->getMockBuilder(OptionInterface::class)
+            ->setMethods(
+                [
+                    'setParentId',
+                    'getId',
+                    'getOptionId',
+                ]
+            )
+            ->getMockForAbstractClass();
+        $this->optionRepositoryMock = $this->createMock(ProductOptionRepositoryInterface::class);
+        $this->productLinkManagementMock = $this->createMock(ProductLinkManagementInterface::class);
+        $this->linkMock = $this->createMock(LinkInterface::class);
+        $this->metadataPoolMock = $this->createMock(MetadataPool::class);
+        $this->metadataMock = $this->createMock(EntityMetadataInterface::class);
+        $this->metadataPoolMock->expects($this->any())
+            ->method('getMetadata')
+            ->willReturn($this->metadataMock);
+
+        $this->saveHandler = $this->objectManager->getObject(
+            SaveHandler::class,
+            [
+                'optionRepository' => $this->optionRepositoryMock,
+                'productLinkManagement' => $this->productLinkManagementMock,
+                'metadataPool' => $this->metadataPoolMock,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithInvalidProductType()
+    {
+        $productType = 'simple';
+
+        $this->productMock->expects($this->once())
+            ->method('getExtensionAttributes')
+            ->willReturn($this->productExtensionMock);
+        $this->productExtensionMock->expects($this->once())
+            ->method('getBundleProductOptions')
+            ->willReturn([]);
+        $this->productMock->expects($this->once())
+            ->method('getTypeId')
+            ->willReturn($productType);
+
+        $entity = $this->saveHandler->execute($this->productMock);
+        $this->assertSame($this->productMock, $entity);
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithoutExistingOption()
+    {
+        $productType = 'bundle';
+        $productSku = 'product-sku';
+        $optionId = null;
+
+        $this->productMock->expects($this->once())
+            ->method('getExtensionAttributes')
+            ->willReturn($this->productExtensionMock);
+        $this->productExtensionMock->expects($this->once())
+            ->method('getBundleProductOptions')
+            ->willReturn([$this->optionMock]);
+
+        $this->productMock->expects($this->once())
+            ->method('getTypeId')
+            ->willReturn($productType);
+
+        $this->productMock->expects($this->once())
+            ->method('getSku')
+            ->willReturn($productSku);
+        $this->optionRepositoryMock->expects($this->once())
+            ->method('getList')
+            ->with($productSku)
+            ->willReturn([]);
+
+        $this->optionMock->expects($this->any())
+            ->method('getOptionId')
+            ->willReturn($optionId);
+
+        $this->productMock->expects($this->once())
+            ->method('getCopyFromView')
+            ->willReturn(false);
+
+        $this->optionMock->expects($this->never())->method('setOptionId');
+        $this->optionRepositoryMock->expects($this->once())
+            ->method('save')
+            ->with($this->productMock, $this->optionMock)
+            ->willReturn($optionId);
+
+        $this->saveHandler->execute($this->productMock);
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithExistingOption()
+    {
+        $productType = 'bundle';
+        $productSku = 'product-sku';
+        $productLinkSku = 'product-link-sku';
+        $linkField = 'entity_id';
+        $parentId = 1;
+        $existingOptionId = 1;
+        $optionId = 2;
+
+        /** @var OptionInterface|MockObject $existingOptionMock */
+        $existingOptionMock = $this->getMockBuilder(OptionInterface::class)
+            ->setMethods(['getOptionId'])
+            ->getMockForAbstractClass();
+
+        $this->productMock->expects($this->once())
+            ->method('getExtensionAttributes')
+            ->willReturn($this->productExtensionMock);
+        $this->productExtensionMock->expects($this->once())
+            ->method('getBundleProductOptions')
+            ->willReturn([$this->optionMock]);
+        $this->productMock->expects($this->once())
+            ->method('getTypeId')
+            ->willReturn($productType);
+
+        $this->productMock->expects($this->exactly(3))
+            ->method('getSku')
+            ->willReturn($productSku);
+        $this->optionRepositoryMock->expects($this->once())
+            ->method('getList')
+            ->with($productSku)
+            ->willReturn([$existingOptionMock]);
+
+        $existingOptionMock->expects($this->any())
+            ->method('getOptionId')
+            ->willReturn($existingOptionId);
+        $this->optionMock->expects($this->any())
+            ->method('getOptionId')
+            ->willReturn($optionId);
+
+        $this->productMock->expects($this->once())
+            ->method('getCopyFromView')
+            ->willReturn(false);
+        $this->metadataMock->expects($this->once())
+            ->method('getLinkField')
+            ->willReturn($linkField);
+        $this->productMock->expects($this->once())
+            ->method('getData')
+            ->with($linkField)
+            ->willReturn($parentId);
+
+        $this->optionRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($productSku, $existingOptionId)
+            ->willReturn($this->optionMock);
+        $this->optionMock->expects($this->once())
+            ->method('setParentId')
+            ->with($parentId)
+            ->willReturnSelf();
+        $this->optionMock->expects($this->once())
+            ->method('getProductLinks')
+            ->willReturn([$this->linkMock]);
+        $this->linkMock->expects($this->once())
+            ->method('getSku')
+            ->willReturn($productLinkSku);
+
+        $this->optionMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($existingOptionId);
+        $this->productLinkManagementMock->expects($this->once())
+            ->method('removeChild')
+            ->with($productSku, $existingOptionId, $productLinkSku)
+            ->willReturn(true);
+        $this->optionRepositoryMock->expects($this->once())
+            ->method('delete')
+            ->with($this->optionMock)
+            ->willReturn(true);
+
+        $this->optionRepositoryMock->expects($this->once())
+            ->method('save')
+            ->with($this->productMock, $this->optionMock)
+            ->willReturn($optionId);
+
+        $this->saveHandler->execute($this->productMock);
+    }
+}
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
index a413be0bed5ba..2b4f81337da52 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
@@ -513,10 +513,6 @@ function ($key) use ($optionCollection, $selectionCollection) {
             ->method('getSelectionId')
             ->willReturn(314);
 
-        $this->priceCurrency->expects($this->once())
-            ->method('convert')
-            ->willReturn(3.14);
-
         $result = $this->model->prepareForCartAdvanced($buyRequest, $product);
         $this->assertEquals([$product, $productType], $result);
     }
@@ -737,10 +733,6 @@ function ($key) use ($optionCollection, $selectionCollection) {
             ->method('prepareForCart')
             ->willReturn([]);
 
-        $this->priceCurrency->expects($this->once())
-            ->method('convert')
-            ->willReturn(3.14);
-
         $result = $this->model->prepareForCartAdvanced($buyRequest, $product);
         $this->assertEquals('We can\'t add this item to your shopping cart right now.', $result);
     }
@@ -961,10 +953,6 @@ function ($key) use ($optionCollection, $selectionCollection) {
             ->method('prepareForCart')
             ->willReturn('string');
 
-        $this->priceCurrency->expects($this->once())
-            ->method('convert')
-            ->willReturn(3.14);
-
         $result = $this->model->prepareForCartAdvanced($buyRequest, $product);
         $this->assertEquals('string', $result);
     }
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/SpecialPriceTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/SpecialPriceTest.php
index f38dfc5538cf3..3e60e057fe62b 100644
--- a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/SpecialPriceTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/SpecialPriceTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Bundle\Test\Unit\Pricing\Price;
 
 use \Magento\Bundle\Pricing\Price\SpecialPrice;
+use Magento\Store\Api\Data\WebsiteInterface;
 
 class SpecialPriceTest extends \PHPUnit\Framework\TestCase
 {
@@ -77,12 +78,6 @@ public function testGetValue($regularPrice, $specialPrice, $isScopeDateInInterva
             ->method('getSpecialPrice')
             ->will($this->returnValue($specialPrice));
 
-        $store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->saleable->expects($this->once())
-            ->method('getStore')
-            ->will($this->returnValue($store));
         $this->saleable->expects($this->once())
             ->method('getSpecialFromDate')
             ->will($this->returnValue($specialFromDate));
@@ -92,7 +87,7 @@ public function testGetValue($regularPrice, $specialPrice, $isScopeDateInInterva
 
         $this->localeDate->expects($this->once())
             ->method('isScopeDateInInterval')
-            ->with($store, $specialFromDate, $specialToDate)
+            ->with(WebsiteInterface::ADMIN_CODE, $specialFromDate, $specialToDate)
             ->will($this->returnValue($isScopeDateInInterval));
 
         $this->priceCurrencyMock->expects($this->never())
diff --git a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
index b265f6cb4c2b9..150247729f125 100644
--- a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
+++ b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
@@ -14,6 +14,7 @@
 use Magento\Framework\UrlInterface;
 use Magento\Ui\Component\Container;
 use Magento\Ui\Component\Form;
+use Magento\Ui\Component\Form\Fieldset;
 use Magento\Ui\Component\Modal;
 
 /**
@@ -69,13 +70,26 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function modifyMeta(array $meta)
     {
         $meta = $this->removeFixedTierPrice($meta);
-        $path = $this->arrayManager->findPath(static::CODE_BUNDLE_DATA, $meta, null, 'children');
+
+        $groupCode = static::CODE_BUNDLE_DATA;
+        $path = $this->arrayManager->findPath($groupCode, $meta, null, 'children');
+        if (empty($path)) {
+            $meta[$groupCode]['children'] = [];
+            $meta[$groupCode]['arguments']['data']['config'] = [
+                'componentType' => Fieldset::NAME,
+                'label' => __('Bundle Items'),
+                'collapsible' => true,
+            ];
+
+            $path = $this->arrayManager->findPath($groupCode, $meta, null, 'children');
+        }
 
         $meta = $this->arrayManager->merge(
             $path,
@@ -220,7 +234,7 @@ private function removeFixedTierPrice(array $meta)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyData(array $data)
     {
diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
index fe883e783d6ff..62c5ce5fea3a8 100644
--- a/app/code/Magento/Bundle/composer.json
+++ b/app/code/Magento/Bundle/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-bundle",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-catalog": "102.0.*",
         "magento/module-tax": "100.2.*",
@@ -26,7 +26,7 @@
         "magento/module-sales-rule": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.5",
+    "version": "100.2.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Bundle/etc/di.xml b/app/code/Magento/Bundle/etc/di.xml
index d0e956efee694..6fe4935100720 100644
--- a/app/code/Magento/Bundle/etc/di.xml
+++ b/app/code/Magento/Bundle/etc/di.xml
@@ -123,6 +123,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Quote\Model\Quote\Item">
+        <plugin name="update_price_for_bundle_in_quote_item_option" type="Magento\Bundle\Model\Plugin\UpdatePriceInQuoteItemOptions"/>
+    </type>
     <type name="Magento\Quote\Model\Quote\Item\ToOrderItem">
         <plugin name="append_bundle_data_to_order" type="Magento\Bundle\Model\Plugin\QuoteItem"/>
     </type>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
index 224cd71538b7b..2f13fa8cf01bd 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
@@ -4,13 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes\Extend */
 $elementHtml = $block->getParentElementHtml();
 
-$attributeCode = $block->getAttribute()
-    ->getAttributeCode();
+$attributeCode = $block->getAttribute()->getAttributeCode();
 
 $switchAttributeCode = "{$attributeCode}_type";
 $switchAttributeValue = $block->getProduct()
@@ -21,7 +18,7 @@ $isElementReadonly = $block->getElement()
 ?>
 
 <?php if (!($attributeCode === 'price' && $block->getCanReadPrice() === false)) { ?>
-    <div class="<?= /* @escapeNotVerified */  $attributeCode ?> "><?= /* @escapeNotVerified */  $elementHtml ?></div>
+    <div class="<?= $block->escapeHtmlAttr($attributeCode) ?> "><?= /* @noEscape */ $elementHtml ?></div>
 <?php } ?>
 
 <?= $block->getExtendedElement($switchAttributeCode)->toHtml() ?>
@@ -29,9 +26,9 @@ $isElementReadonly = $block->getElement()
 <?php if (!$isElementReadonly && $block->getDisableChild()) { ?>
     <script>
         require(['prototype'], function () {
-            function <?= /* @escapeNotVerified */ $switchAttributeCode ?>_change() {
-                var $attribute = $('<?= /* @escapeNotVerified */ $attributeCode ?>');
-                if ($('<?= /* @escapeNotVerified */ $switchAttributeCode ?>').value == '<?= /* @escapeNotVerified */ $block::DYNAMIC ?>') {
+            function <?= $block->escapeJs($switchAttributeCode) ?>_change() {
+                var $attribute = $('<?= /* @noEscape */ $attributeCode ?>');
+                if ($('<?= $block->escapeJs($switchAttributeCode) ?>').value == '<?= $block->escapeJs($block::DYNAMIC) ?>') {
                     if ($attribute) {
                         $attribute.disabled = true;
                         $attribute.value = '';
@@ -44,8 +41,8 @@ $isElementReadonly = $block->getElement()
                     if ($attribute) {
                         <?php if ($attributeCode === 'price' && !$block->getCanEditPrice() && $block->getCanReadPrice()
                                 && $block->getProduct()->isObjectNew()) { ?>
-                            <?php $defaultProductPrice = $block->getDefaultProductPrice() ?: "''"; ?>
-                            $attribute.value = <?= /* @escapeNotVerified */ $defaultProductPrice ?>;
+                                        <?php $defaultProductPrice = $block->escapeJs($block->getDefaultProductPrice() ?: "''") ?>
+                            $attribute.value = <?= $block->escapeJs($defaultProductPrice) ?>;
                         <?php } else { ?>
                             $attribute.disabled = false;
                             $attribute.addClassName('required-entry');
@@ -59,10 +56,10 @@ $isElementReadonly = $block->getElement()
 
             <?php if (!($attributeCode === 'price' && !$block->getCanEditPrice()
                     && !$block->getProduct()->isObjectNew())) { ?>
-                $('<?= /* @escapeNotVerified */ $switchAttributeCode ?>').observe('change', <?= /* @escapeNotVerified */ $switchAttributeCode ?>_change);
+                $('<?= $block->escapeJs($switchAttributeCode) ?>').observe('change', <?= $block->escapeJs($switchAttributeCode) ?>_change);
             <?php } ?>
             Event.observe(window, 'load', function(){
-                <?= /* @escapeNotVerified */ $switchAttributeCode ?>_change();
+                <?= $block->escapeJs($switchAttributeCode) ?>_change();
             });
         });
     </script>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
index 87798a6ba622f..8c70deb5785a6 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
@@ -3,17 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php /* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Bundle */ ?>
 <?php $options = $block->decorateArray($block->getOptions(true)); ?>
-<?php if (count($options)): ?>
+<?php if (count($options)) : ?>
 <fieldset id="catalog_product_composite_configure_fields_bundle"
           class="fieldset admin__fieldset composite-bundle<?= $block->getIsLastFieldset() ? ' last-fieldset' : '' ?>">
-    <legend class="legend admin__legend"><span><?= /* @escapeNotVerified */ __('Bundle Items') ?></span></legend><br />
+    <legend class="legend admin__legend"><span><?= $block->escapeHtml(__('Bundle Items')) ?></span></legend><br />
     <?php foreach ($options as $option) : ?>
         <?php if ($option->getSelections()) : ?>
             <?= $block->getOptionHtml($option) ?>
@@ -71,7 +68,7 @@ require([
             }
         }
     };
-    ProductConfigure.bundleControl = new BundleControl(<?= /* @escapeNotVerified */ $block->getJsonConfig() ?>);
+    ProductConfigure.bundleControl = new BundleControl(<?= /* @noEscape */ $block->getJsonConfig() ?>);
 });
 </script>
 
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 44ed02f2758d0..b043b58888378 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
@@ -3,60 +3,57 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php /* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Checkbox */ ?>
 <?php $_option = $block->getOption(); ?>
 <?php $_selections = $_option->getSelections(); ?>
-<?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
+<?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 _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;?>">
+        <div class="nested <?php if ($_option->getDecoratedIsLast()) :?> last<?php endif;?>">
 
-            <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
-                <?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
+            <?php if (count($_selections) == 1 && $_option->getRequired()) : ?>
+                <?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
                 <input type="hidden"
-                       name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                       value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"
-                       price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selections[0]) ?>" />
-            <?php else:?>
-
-                <?php foreach ($_selections as $_selection): ?>
+                       name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                       value="<?= $block->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>"
+                       price="<?= $block->escapeHtmlAttr($block->getSelectionPrice($_selections[0])) ?>" />
+            <?php else :?>
+                <?php foreach ($_selections as $_selection) : ?>
                     <div class="field choice admin__field admin__field-option">
                         <input
-                            class="change-container-classname admin__control-checkbox checkbox bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?> <?php if ($_option->getRequired()) echo 'validate-one-required-by-name' ?>"
-                            id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
+                            class="change-container-classname admin__control-checkbox checkbox bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?> <?php if ($_option->getRequired()) { echo 'validate-one-required-by-name'; } ?>"
+                            id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
                             type="checkbox"
-                            name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][<?= /* @escapeNotVerified */ $_selection->getId() ?>]"
-                            <?php if ($block->isSelected($_selection)):?>
+                            name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>][<?= $block->escapeHtmlAttr($_selection->getId()) ?>]"
+                            <?php if ($block->isSelected($_selection)) :?>
                                 <?= ' checked="checked"' ?>
                             <?php endif;?>
-                            <?php if (!$_selection->isSaleable() && !$_skipSaleableCheck):?>
+                            <?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) :?>
                                 <?= ' disabled="disabled"' ?>
                             <?php endif;?>
-                            value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
+                            value="<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
                             onclick="ProductConfigure.bundleControl.changeSelection(this)"
-                            price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selection) ?>" />
+                            price="<?= $block->escapeHtmlAttr($block->getSelectionPrice($_selection)) ?>" />
 
                         <label class="admin__field-label"
-                               for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
-                            <span><?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selection) ?></span>
+                               for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>">
+                            <span><?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selection) ?></span>
                         </label>
 
-                        <?php if ($_option->getRequired()): ?>
-                            <?= /* @escapeNotVerified */ $block->setValidationContainer('bundle-option-' . $_option->getId() . '-' . $_selection->getSelectionId(), 'bundle-option-' . $_option->getId() . '-container') ?>
+                        <?php if ($_option->getRequired()) : ?>
+                            <?=  /* @noEscape */ $block->setValidationContainer('bundle-option-' . $_option->getId() . '-' . $_selection->getSelectionId(), 'bundle-option-' . $_option->getId() . '-container') ?>
                         <?php endif;?>
                     </div>
                 <?php endforeach; ?>
 
-                <div id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-container"></div>
+                <div id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-container"></div>
             <?php endif; ?>
         </div>
     </div>
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 8c13dd6479d4d..f4c4e3e51ae09 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
@@ -3,32 +3,34 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php /* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Multi */ ?>
 <?php $_option = $block->getOption(); ?>
 <?php $_selections = $_option->getSelections(); ?>
-<?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
-<div class="field admin__field <?php if ($_option->getRequired()) echo ' required' ?><?php if ($_option->getDecoratedIsLast()):?> last<?php endif; ?>">
+<?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; ?>">
     <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()): ?>
-            <?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
-            <input type="hidden" name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                   value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"
-                   price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selections[0]) ?>" />
-        <?php else: ?>
-            <select multiple="multiple" size="5" id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
-                    name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][]"
-                    class="admin__control-multiselect bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> multiselect change-container-classname"
+        <?php if (count($_selections) == 1 && $_option->getRequired()) : ?>
+            <?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
+            <input type="hidden" name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                   value="<?= $block->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>"
+                   price="<?= $block->escapeHtmlAttr($block->getSelectionPrice($_selections[0])) ?>" />
+        <?php else : ?>
+            <select multiple="multiple" size="5" id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>"
+                    name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>][]"
+                    class="admin__control-multiselect bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?><?php if ($_option->getRequired()) { echo ' required-entry'; } ?> multiselect change-container-classname"
                     onchange="ProductConfigure.bundleControl.changeSelection(this)">
-            <?php if(!$_option->getRequired()): ?>
-                <option value=""><?= /* @escapeNotVerified */ __('None') ?></option>
+            <?php if (!$_option->getRequired()) : ?>
+                <option value=""><?= $block->escapeHtml(__('None')) ?></option>
             <?php endif; ?>
-            <?php foreach ($_selections as $_selection): ?>
-                <option value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"<?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?> price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selection) ?>"><?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selection, false) ?></option>
+            <?php foreach ($_selections as $_selection) : ?>
+                <option value="<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
+                    <?php if ($block->isSelected($_selection)) { echo ' selected="selected"'; } ?>
+                    <?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) { echo ' disabled="disabled"'; } ?>
+                    price="<?= $block->escapeHtmlAttr($block->getSelectionPrice($_selection)) ?>">
+                    <?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selection, false) ?></option>
             <?php endforeach; ?>
             </select>
         <?php endif; ?>
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 f0912979a9248..7878376d3418a 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
@@ -3,69 +3,69 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php /* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Radio */ ?>
 <?php $_option = $block->getOption(); ?>
 <?php $_selections  = $_option->getSelections(); ?>
 <?php $_default = $_option->getDefaultSelection(); ?>
-<?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
+<?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; ?>">
-        <?php if ($block->showSingle()): ?>
-            <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selections[0]) ?>
+        <div class="nested<?php if ($_option->getDecoratedIsLast()) :?> last<?php endif; ?>">
+        <?php if ($block->showSingle()) : ?>
+            <?= /* @noEscape */ $block->getSelectionTitlePrice($_selections[0]) ?>
             <input type="hidden"
-                   name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                   value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"
-                   price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selections[0]) ?>" />
-        <?php else:?>
-            <?php if (!$_option->getRequired()): ?>
+                   name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                   value="<?= $block->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>"
+                   price="<?= $block->escapeHtmlAttr($block->getSelectionPrice($_selections[0])) ?>" />
+        <?php else :?>
+            <?php if (!$_option->getRequired()) : ?>
                 <div class="field choice admin__field admin__field-option">
                     <input type="radio"
                            class="radio admin__control-radio"
-                           id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
-                           name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"<?= ($_default && $_default->isSalable()) ? '' : ' checked="checked" ' ?>
+                           id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>"
+                           name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"<?= ($_default && $_default->isSalable()) ? '' : ' checked="checked" ' ?>
                            value=""
                            onclick="ProductConfigure.bundleControl.changeSelection(this)" />
                     <label class="admin__field-label"
-                           for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"><span><?= /* @escapeNotVerified */ __('None') ?></span></label>
+                           for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>"><span><?= $block->escapeHtml(__('None')) ?></span></label>
                 </div>
             <?php endif; ?>
 
-            <?php foreach ($_selections as $_selection): ?>
+            <?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"
-                           id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
-                           name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                           <?php if ($block->isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?>
-                           value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
+                           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"'; } ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) { echo ' disabled="disabled"'; } ?>
+                           value="<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
                            onclick="ProductConfigure.bundleControl.changeSelection(this)"
-                           price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selection) ?>"
-                           qtyId="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input" />
+                           price="<?= $block->escapeHtmlAttr($block->getSelectionPrice($_selection)) ?>"
+                           qtyId="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input" />
                     <label class="admin__field-label"
-                           for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"><span><?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selection) ?></span></label>
-                <?php if ($_option->getRequired()): ?>
-                    <?= /* @escapeNotVerified */ $block->setValidationContainer('bundle-option-'.$_option->getId().'-'.$_selection->getSelectionId(), 'bundle-option-'.$_option->getId().'-container') ?>
+                           for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>">
+                        <span><?= /* @noEscape */ $block->getSelectionTitlePrice($_selection) ?></span>
+                    </label>
+                <?php if ($_option->getRequired()) : ?>
+                    <?= /* @noEscape */ $block->setValidationContainer('bundle-option-'.$_option->getId().'-'.$_selection->getSelectionId(), 'bundle-option-'.$_option->getId().'-container') ?>
                 <?php endif; ?>
                 </div>
             <?php endforeach; ?>
-            <div id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-container"></div>
+            <div id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-container"></div>
         <?php endif; ?>
             <div class="field admin__field qty">
                 <label class="label admin__field-label"
-                       for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"><span><?= /* @escapeNotVerified */ __('Quantity:') ?></span></label>
-                <div class="control admin__field-control"><input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
-                        id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"
-                        class="input-text admin__control-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
+                       for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input"><span><?= $block->escapeHtml(__('Quantity:')) ?></span></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'; } ?>"
                         type="text"
-                        name="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]" value="<?= /* @escapeNotVerified */ $_defaultQty ?>" />
+                        name="bundle_option_qty[<?= $block->escapeHtmlAttr($_option->getId()) ?>]" value="<?= $block->escapeHtmlAttr($_defaultQty) ?>" />
                 </div>
             </div>
         </div>
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 32766f62163ed..0e202c87fd875 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
@@ -3,36 +3,34 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php /* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Select */ ?>
 <?php $_option      = $block->getOption(); ?>
 <?php $_selections  = $_option->getSelections(); ?>
 <?php $_default     = $_option->getDefaultSelection(); ?>
-<?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
+<?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 _required'; } ?>">
     <label class="label admin__field-label"><span><?= $block->escapeHtml($_option->getTitle()) ?></span></label>
     <div class="control admin__field-control">
-        <?php if ($block->showSingle()): ?>
-            <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selections[0]) ?>
-            <input type="hidden" name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                   value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"
-                   price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selections[0]) ?>" />
-        <?php else:?>
-            <select id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
-                    name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                    class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> select admin__control-select change-container-classname"
+        <?php if ($block->showSingle()) : ?>
+            <?= /* @noEscape */ $block->getSelectionTitlePrice($_selections[0]) ?>
+            <input type="hidden" name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                   value="<?= $block->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>"
+                   price="<?= $block->escapeHtmlAttr($block->getSelectionPrice($_selections[0])) ?>" />
+        <?php else :?>
+            <select id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>"
+                    name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                    class="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?><?php if ($_option->getRequired()) { echo ' required-entry'; } ?> select admin__control-select change-container-classname"
                     onchange="ProductConfigure.bundleControl.changeSelection(this)">
-                <option value=""><?= /* @escapeNotVerified */ __('Choose a selection...') ?></option>
-                <?php foreach ($_selections as $_selection): ?>
+                <option value=""><?= $block->escapeHtml(__('Choose a selection...')) ?></option>
+                <?php foreach ($_selections as $_selection) : ?>
                     <option
-                        value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"<?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?>
-                        price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selection) ?>"
-                        qtyId="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"><?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selection, false) ?></option>
+                        value="<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"<?php if ($block->isSelected($_selection)) { echo ' selected="selected"'; } ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) { echo ' disabled="disabled"'; } ?>
+                        price="<?= $block->escapeHtmlAttr($block->getSelectionPrice($_selection)) ?>"
+                        qtyId="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input"><?= /* @noEscape */ $block->getSelectionTitlePrice($_selection, false) ?></option>
                 <?php endforeach; ?>
             </select>
         <?php endif; ?>
@@ -40,12 +38,12 @@
         <div class="nested">
             <div class="field admin__field qty">
                 <label class="label admin__field-label"
-                       for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"><span><?= /* @escapeNotVerified */ __('Quantity:') ?></span></label>
+                       for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input"><span><?= $block->escapeHtml(__('Quantity:')) ?></span></label>
                 <div class="control admin__field-control">
-                    <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
-                        id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"
-                        class="input-text admin__control-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text"
-                        name="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]" value="<?= /* @escapeNotVerified */ $_defaultQty ?>" />
+                    <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'; } ?>" type="text"
+                        name="bundle_option_qty[<?= $block->escapeHtmlAttr($_option->getId()) ?>]" value="<?= $block->escapeHtmlAttr($_defaultQty) ?>" />
                 </div>
             </div>
         </div>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
index 5b27412dd885b..cb7cc9522f6c6 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle */
 ?>
 <script>
@@ -19,14 +17,20 @@ if(typeof Bundle=='undefined') {
 <div id="bundle_product_container" class="entry-edit form-inline">
     <fieldset class="fieldset">
         <div class="field field-ship-bundle-items">
-            <label for="shipment_type" class="label"><?= /* @escapeNotVerified */ __('Ship Bundle Items') ?></label>
+            <label for="shipment_type" class="label"><?= $block->escapeHtml(__('Ship Bundle Items')) ?></label>
             <div class="control">
-                <select <?php if ($block->isReadonly()): ?>disabled="disabled" <?php endif;?>
+                <select <?php if ($block->isReadonly()) : ?>disabled="disabled" <?php endif;?>
                         id="shipment_type"
-                        name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[shipment_type]"
+                        name="<?= $block->escapeHtmlAttr($block->getFieldSuffix()) ?>[shipment_type]"
                         class="select">
-                    <option value="1"><?= /* @escapeNotVerified */ __('Separately') ?></option>
-                    <option value="0"<?php if ($block->getProduct()->getShipmentType() == 0): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('Together') ?></option>
+                    <option value="1">
+                        <?= $block->escapeHtml(__('Separately')) ?>
+                    </option>
+                    <option value="0"
+                        <?php if ($block->getProduct()->getShipmentType() == 0) : ?> selected="selected"
+                        <?php endif; ?>>
+                        <?= $block->escapeHtml(__('Together')) ?>
+                    </option>
                 </select>
             </div>
         </div>
@@ -48,7 +52,7 @@ require(["prototype", "mage/adminhtml/form"], function(){
     // re-bind form elements onchange
     varienWindowOnload(true);
 
-    <?php if ($block->isReadonly()):?>
+    <?php if ($block->isReadonly()) :?>
     $('product_bundle_container').select('input', 'select', 'textarea', 'button').each(function(input){
         input.disabled = true;
         if (input.tagName.toLowerCase() == 'button') {
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
index 62f61a725097e..9e38b96b04307 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
@@ -3,16 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option */
 ?>
 <script id="bundle-option-template" type="text/x-magento-template">
-    <div id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>" class="option-box">
-        <div class="fieldset-wrapper admin__collapsible-block-wrapper opened" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>-wrapper">
+    <div id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>" class="option-box">
+        <div class="fieldset-wrapper admin__collapsible-block-wrapper opened" id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-wrapper">
             <div class="fieldset-wrapper-title">
-                <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>-content">
+                <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-content">
                     <span><%- data.default_title %></span>
                 </strong>
                 <div class="actions">
@@ -20,55 +18,55 @@
                 </div>
                 <div data-role="draggable-handle" class="draggable-handle"></div>
             </div>
-            <div class="fieldset-wrapper-content in collapse" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>-content">
+            <div class="fieldset-wrapper-content in collapse" id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-content">
                 <fieldset class="fieldset">
                     <fieldset class="fieldset-alt">
                         <div class="field field-option-title required">
-                            <label class="label" for="id_<?= /* @escapeNotVerified */ $block->getFieldName() ?>_<%- data.index %>_title">
-                                <?= /* @escapeNotVerified */ __('Option Title') ?>
+                            <label class="label" for="id_<?= $block->escapeHtmlAttr($block->getFieldName()) ?>_<%- data.index %>_title">
+                                <?= $block->escapeHtml(__('Option Title')) ?>
                             </label>
                             <div class="control">
-                                <?php if ($block->isDefaultStore()): ?>
+                                <?php if ($block->isDefaultStore()) : ?>
                                 <input class="input-text required-entry"
                                        type="text"
-                                       name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.index %>][title]"
-                                       id="id_<?= /* @escapeNotVerified */ $block->getFieldName() ?>_<%- data.index %>_title"
+                                       name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.index %>][title]"
+                                       id="id_<?= $block->escapeHtmlAttr($block->getFieldName()) ?>_<%- data.index %>_title"
                                        value="<%- data.title %>"
                                        data-original-value="<%- data.title %>" />
-                                <?php else: ?>
+                                <?php else : ?>
                                 <input class="input-text required-entry"
                                        type="text"
-                                       name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.index %>][default_title]"
-                                       id="id_<?= /* @escapeNotVerified */ $block->getFieldName() ?>_<%- data.index %>_default_title"
+                                       name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.index %>][default_title]"
+                                       id="id_<?= $block->escapeHtmlAttr($block->getFieldName()) ?>_<%- data.index %>_default_title"
                                        value="<%- data.default_title %>"
                                        data-original-value="<%- data.default_title %>" />
                                 <?php endif; ?>
                                 <input type="hidden"
-                                       id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_id_<%- data.index %>"
-                                       name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.index %>][option_id]"
+                                       id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_id_<%- data.index %>"
+                                       name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.index %>][option_id]"
                                        value="<%- data.option_id %>" />
                                 <input type="hidden"
-                                       name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.index %>][delete]"
+                                       name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.index %>][delete]"
                                        value=""
                                        data-state="deleted" />
                             </div>
                         </div>
-                        <?php if (!$block->isDefaultStore()): ?>
+                        <?php if (!$block->isDefaultStore()) : ?>
                         <div class="field field-option-store-view required">
-                            <label class="label" for="id_<?= /* @escapeNotVerified */ $block->getFieldName() ?>_<%- data.index %>_title_store">
-                                <?= /* @escapeNotVerified */ __('Store View Title') ?>
+                            <label class="label" for="id_<?= $block->escapeHtmlAttr($block->getFieldName()) ?>_<%- data.index %>_title_store">
+                                <?= $block->escapeHtml(__('Store View Title')) ?>
                             </label>
                             <div class="control">
                                 <input class="input-text required-entry" type="text"
-                                       name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.index %>][title]"
-                                       id="id_<?= /* @escapeNotVerified */ $block->getFieldName() ?>_<%- data.index %>_title_store"
+                                       name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.index %>][title]"
+                                       id="id_<?= $block->escapeHtmlAttr($block->getFieldName()) ?>_<%- data.index %>_title_store"
                                        value="<%- data.title %>" />
                             </div>
                         </div>
                         <?php endif; ?>
                         <div class="field field-option-input-type required">
-                            <label class="label" for="<?= /* @escapeNotVerified */ $block->getFieldId() . '_<%- data.index %>_type' ?>">
-                                <?= /* @escapeNotVerified */ __('Input Type') ?>
+                            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId() . '_<%- data.index %>_type') ?>">
+                                <?= $block->escapeHtml(__('Input Type')) ?>
                             </label>
                             <div class="control">
                                 <?= $block->getTypeSelectHtml() ?>
@@ -81,19 +79,19 @@
                                        checked="checked"
                                        id="field-option-req" />
                                 <label for="field-option-req">
-                                    <?= /* @escapeNotVerified */ __('Required') ?>
+                                    <?= $block->escapeHtml(__('Required')) ?>
                                 </label>
                                 <span style="display:none"><?= $block->getRequireSelectHtml() ?></span>
                             </div>
                         </div>
                         <div class="field field-option-position no-display">
                             <label class="label" for="field-option-position">
-                                <?= /* @escapeNotVerified */ __('Position') ?>
+                                <?= $block->escapeHtml(__('Position')) ?>
                             </label>
                             <div class="control">
                                 <input class="input-text validate-zero-or-greater"
                                        type="text"
-                                       name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.index %>][position]"
+                                       name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.index %>][position]"
                                        value="<%- data.position %>"
                                        id="field-option-position" />
                             </div>
@@ -101,13 +99,13 @@
                     </fieldset>
 
                     <div class="no-products-message">
-                        <?= /* @escapeNotVerified */ __('There are no products in this option.') ?>
+                        <?= $block->escapeHtml(__('There are no products in this option.')) ?>
                     </div>
                     <?= $block->getAddSelectionButtonHtml() ?>
                 </fieldset>
             </div>
         </div>
-        <div id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_search_<%- data.index %>" class="selection-search"></div>
+        <div id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_search_<%- data.index %>" class="selection-search"></div>
     </div>
 </script>
 
@@ -141,7 +139,7 @@ function changeInputType(oldObject, oType) {
 
 Bundle.Option = Class.create();
 Bundle.Option.prototype = {
-    idLabel : '<?= /* @escapeNotVerified */ $block->getFieldId() ?>',
+    idLabel : '<?= $block->escapeJs($block->getFieldId()) ?>',
     templateText : '',
     itemsCount : 0,
     initialize : function(template) {
@@ -150,7 +148,7 @@ Bundle.Option.prototype = {
 
     add : function(data) {
         if (!data) {
-            data = <?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(['default_title' => __('New Option')]) ?>;
+            data = <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode(['default_title' => __('New Option')]) ?>;
         } else {
             data.title = data.title.replace(/</g, "&lt;");
             data.title = data.title.replace(/"/g, "&quot;");
@@ -280,17 +278,17 @@ Bundle.Option.prototype = {
 var optionIndex = 0;
 bOption = new Bundle.Option(optionTemplate);
 <?php
-    foreach ($block->getOptions() as $_option) {
-        /** @var $_option \Magento\Bundle\Model\Option */
-        /* @escapeNotVerified */ echo 'optionIndex = bOption.add(', $_option->toJson(), ');', PHP_EOL;
-        if ($_option->getSelections()) {
-            foreach ($_option->getSelections() as $_selection) {
-                /** @var $_selection \Magento\Catalog\Model\Product */
-                $_selection->setName($block->escapeHtml($_selection->getName()));
-                /* @escapeNotVerified */ echo 'bSelection.addRow(optionIndex,', $_selection->toJson(), ');', PHP_EOL;
-            }
+foreach ($block->getOptions() as $_option) {
+    /** @var $_option \Magento\Bundle\Model\Option */
+    /* @noEscape */ echo 'optionIndex = bOption.add(', $_option->toJson(), ');', PHP_EOL;
+    if ($_option->getSelections()) {
+        foreach ($_option->getSelections() as $_selection) {
+            /** @var $_selection \Magento\Catalog\Model\Product */
+            $_selection->setName($block->escapeHtml($_selection->getName()));
+            /* @noEscape */ echo 'bSelection.addRow(optionIndex,', $_selection->toJson(), ');', PHP_EOL;
         }
     }
+}
 ?>
 function togglePriceType() {
     bOption['priceType' + ($('price_type').value == '1' ? 'Fixed' : 'Dynamic')]();
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
index 91c245afe5717..7b51e6da57809 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Selection */
 ?>
 <script id="bundle-option-selection-box-template" type="text/x-magento-template">
@@ -13,16 +11,16 @@
         <thead>
             <tr class="headings">
                 <th class="col-draggable"></th>
-                <th class="col-default"><?= /* @escapeNotVerified */ __('Default') ?></th>
-                <th class="col-name"><?= /* @escapeNotVerified */ __('Name') ?></th>
-                <th class="col-sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
-            <?php if ($block->getCanReadPrice() !== false): ?>
-                <th class="col-price price-type-box"><?= /* @escapeNotVerified */ __('Price') ?></th>
-                <th class="col-price price-type-box"><?= /* @escapeNotVerified */ __('Price Type') ?></th>
+                <th class="col-default"><?= $block->escapeHtml(__('Default')) ?></th>
+                <th class="col-name"><?= $block->escapeHtml(__('Name')) ?></th>
+                <th class="col-sku"><?= $block->escapeHtml(__('SKU')) ?></th>
+            <?php if ($block->getCanReadPrice() !== false) : ?>
+                <th class="col-price price-type-box"><?= $block->escapeHtml(__('Price')) ?></th>
+                <th class="col-price price-type-box"><?= $block->escapeHtml(__('Price Type')) ?></th>
             <?php endif; ?>
-                <th class="col-qty"><?= /* @escapeNotVerified */ __('Default Quantity') ?></th>
-                <th class="col-uqty qty-box"><?= /* @escapeNotVerified */ __('User Defined') ?></th>
-                <th class="col-order type-order" style="display:none"><?= /* @escapeNotVerified */ __('Position') ?></th>
+                <th class="col-qty"><?= $block->escapeHtml(__('Default Quantity')) ?></th>
+                <th class="col-uqty qty-box"><?= $block->escapeHtml(__('User Defined')) ?></th>
+                <th class="col-order type-order" style="display:none"><?= $block->escapeHtml(__('Position')) ?></th>
                 <th class="col-actions"></th>
             </tr>
         </thead>
@@ -33,31 +31,31 @@
 <script id="bundle-option-selection-row-template" type="text/x-magento-template">
     <td class="col-draggable">
         <span data-role="draggable-handle" class="draggable-handle"></span>
-        <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_id<%- data.index %>"
-               name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_id]"
+        <input type="hidden" id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_id<%- data.index %>"
+               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][selection_id]"
                value="<%- data.selection_id %>"/>
-        <input type="hidden" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][option_id]"
+        <input type="hidden" name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][option_id]"
                value="<%- data.option_id %>"/>
         <input type="hidden" class="product"
-               name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][product_id]"
+               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][product_id]"
                value="<%- data.product_id %>"/>
-        <input type="hidden" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][delete]"
+        <input type="hidden" name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][delete]"
                value="" class="delete"/>
     </td>
     <td class="col-default">
         <input onclick="bSelection.checkGroup(event)" type="<%- data.option_type %>" class="default"
-               name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][is_default]"
+               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][is_default]"
                value="1" <%- data.checked %> />
     </td>
     <td class="col-name"><%- data.name %></td>
     <td class="col-sku"><%- data.sku %></td>
-<?php if ($block->getCanReadPrice() !== false): ?>
+<?php if ($block->getCanReadPrice() !== false) : ?>
     <td class="col-price price-type-box">
-        <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>_price_value"
+        <input id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>_price_value"
                class="input-text required-entry validate-zero-or-greater" type="text"
-               name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_value]"
+               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_value]"
                value="<%- data.selection_price_value %>"
-            <?php if ($block->getCanEditPrice() === false): ?>
+            <?php if ($block->getCanEditPrice() === false) : ?>
                disabled="disabled"
             <?php endif; ?>/>
     </td>
@@ -65,19 +63,19 @@
         <?= $block->getPriceTypeSelectHtml() ?>
         <div><?= $block->getCheckboxScopeHtml() ?></div>
     </td>
-<?php else: ?>
-    <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>_price_value"
-           name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_value]" value="0" />
-    <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>_price_type"
-           name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_type]" value="0" />
-    <?php if ($block->isUsedWebsitePrice()): ?>
-    <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>_price_scope"
-           name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][default_price_scope]" value="1" />
+<?php else : ?>
+    <input type="hidden" id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>_price_value"
+           name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_value]" value="0" />
+    <input type="hidden" id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>_price_type"
+           name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_type]" value="0" />
+    <?php if ($block->isUsedWebsitePrice()) : ?>
+    <input type="hidden" id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>_price_scope"
+           name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][default_price_scope]" value="1" />
     <?php endif; ?>
 <?php endif; ?>
     <td class="col-qty">
         <input class="input-text required-entry validate-greater-zero-based-on-option validate-zero-or-greater" type="text"
-               name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_qty]"
+               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][selection_qty]"
                value="<%- data.selection_qty %>" />
     </td>
     <td class="col-uqty qty-box">
@@ -86,7 +84,7 @@
     </td>
     <td class="col-order type-order" style="display:none">
         <input class="input-text required-entry validate-zero-or-greater" type="text"
-               name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][position]"
+               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][position]"
                value="<%- data.position %>" />
     </td>
     <td class="col-actions">
@@ -106,7 +104,7 @@ var bundleTemplateBox = jQuery('#bundle-option-selection-box-template').html(),
 
 Bundle.Selection = Class.create();
 Bundle.Selection.prototype = {
-    idLabel : '<?= /* @escapeNotVerified */ $block->getFieldId() ?>',
+    idLabel : '<?= $block->escapeJs($block->getFieldId()) ?>',
     scopePrice : <?= (int)$block->isUsedWebsitePrice() ?>,
     templateBox : '',
     templateRow : '',
@@ -115,7 +113,7 @@ Bundle.Selection.prototype = {
     gridSelection: new Hash(),
     gridRemoval: new Hash(),
     gridSelectedProductSkus: [],
-    selectionSearchUrl: '<?= /* @escapeNotVerified */ $block->getSelectionSearchUrl() ?>',
+    selectionSearchUrl: '<?= $block->escapeUrl($block->getSelectionSearchUrl()) ?>',
 
     initialize : function() {
         this.templateBox = '<div class="tier form-list" id="' + this.idLabel + '_box_<%- data.parentIndex %>">' + bundleTemplateBox + '</div>';
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
index 3aba02fadffbb..c480d9b126da6 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php
 /**
@@ -21,19 +19,19 @@
 
 <?php $_prevOptionId = '' ?>
 
-<?php if ($block->getOrderOptions() || $_item->getDescription()): ?>
+<?php if ($block->getOrderOptions() || $_item->getDescription()) : ?>
     <?php $_showlastRow = true ?>
-<?php else: ?>
+<?php else : ?>
     <?php $_showlastRow = false ?>
 <?php endif; ?>
 
-<?php foreach ($items as $_item): ?>
+<?php foreach ($items as $_item) : ?>
     <?php $block->setPriceDataObject($_item) ?>
     <?php $attributes = $block->getSelectionAttributes($_item) ?>
-    <?php if ($_item->getOrderItem()->getParentItem()): ?>
-        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -43,165 +41,164 @@
             <td>&nbsp;</td>
             <td class="last">&nbsp;</td>
         </tr>
-        <?php $_prevOptionId = $attributes['option_id'] ?>
+            <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
     <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
-        <?php if (!$_item->getOrderItem()->getParentItem()): ?>
+        <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
         <td class="col-product">
             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
-                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
-                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
+                <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
+                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
             </div>
         </td>
-        <?php else: ?>
+        <?php else : ?>
         <td class="col-product"><div class="option-value"><?= $block->getValueHtml($_item) ?></div></td>
         <?php endif; ?>
         <td class="col-price">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <?= $block->getColumnHtml($_item, 'price') ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-ordered-qty">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <table class="qty-table">
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Ordered')) ?></th>
+                        <td><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></td>
                     </tr>
-                    <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()): ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()) : ?>
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Invoiced') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyInvoiced()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Invoiced')) ?></th>
+                        <td><?= (float)$_item->getOrderItem()->getQtyInvoiced() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
-                    <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)) : ?>
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyShipped()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Shipped')) ?></th>
+                        <td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
-                    <?php if ((float) $_item->getOrderItem()->getQtyRefunded()): ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyRefunded()) : ?>
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Refunded') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyRefunded()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Refunded')) ?></th>
+                        <td><?= (float)$_item->getOrderItem()->getQtyRefunded() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
-                    <?php if ((float) $_item->getOrderItem()->getQtyCanceled()): ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyCanceled()) : ?>
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Canceled') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyCanceled()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Canceled')) ?></th>
+                        <td><?= (float)$_item->getOrderItem()->getQtyCanceled() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
-            <?php elseif ($block->isShipmentSeparately($_item)): ?>
+            <?php elseif ($block->isShipmentSeparately($_item)) : ?>
                 <table class="qty-table">
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Ordered')) ?></th>
+                        <td><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></td>
                     </tr>
-                    <?php if ((float) $_item->getOrderItem()->getQtyShipped()): ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyShipped()) : ?>
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyShipped()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Shipped')) ?></th>
+                        <td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <?php if ($block->canParentReturnToStock($_item)) : ?>
         <td class="col-return-to-stock">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <?php if ($block->canReturnItemToStock($_item)) : ?>
                     <input type="checkbox"
                            class="admin__control-checkbox"
-                           name="creditmemo[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>][back_to_stock]"
-                           value="1"<?php if ($_item->getBackToStock()):?> checked="checked"<?php endif;?> />
+                           name="creditmemo[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>][back_to_stock]"
+                           value="1"<?php if ($_item->getBackToStock()) :?> checked="checked"<?php endif;?> />
                     <label class="admin__field-label"></label>
                 <?php endif; ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <?php endif; ?>
         <td class="col-refund col-qty">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <?php if ($block->canEditQty()) : ?>
                     <input type="text"
                            class="input-text admin__control-text qty-input"
-                           name="creditmemo[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>][qty]"
-                           value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>" />
-                <?php else: ?>
-                    <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
+                           name="creditmemo[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>][qty]"
+                           value="<?= (float)$_item->getQty() * 1 ?>" />
+                <?php else : ?>
+                    <?= (float)$_item->getQty() * 1 ?>
                 <?php endif; ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-subtotal">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <?= $block->getColumnHtml($_item, 'subtotal') ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-tax-amount">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?>
-            <?php else: ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
+                <?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discont">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?>
-            <?php else: ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
+                <?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-total last">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <?= $block->getColumnHtml($_item, 'total') ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
     </tr>
 <?php endforeach; ?>
-<?php if ($_showlastRow): ?>
+<?php if ($_showlastRow) : ?>
     <tr class="border">
         <td class="col-product">
-            <?php if ($block->getOrderOptions($_item->getOrderItem())): ?>
+            <?php if ($block->getOrderOptions($_item->getOrderItem())) : ?>
                 <dl class="item-options">
-                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option): ?>
-                    <dt><?= /* @escapeNotVerified */ $option['label'] ?></dt>
+                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option) : ?>
+                    <dt><?= $block->escapeHtml($option['label']) ?></dt>
                     <dd>
-                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?= /* @escapeNotVerified */ $option['value'] ?>
-                    <?php else: ?>
-                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
-                        <?php if ($_remainder):?>
-                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
+                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
+                        <?= $block->escapeHtml($option['value']) ?>
+                    <?php else : ?>
+                        <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
+                        <?php if ($_remainder) :?>
+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
                             <script>
-require(['prototype'], function(){
-
-    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
-    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
-    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
-
-});
-</script>
+                                require(['prototype'], function(){
+                                    <?php $escapedId = $block->escapeJs($_id) ?>
+                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
+                                });
+                            </script>
                         <?php endif;?>
                     <?php endif;?>
                     </dd>
                 <?php endforeach; ?>
                 </dl>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
             <?= $block->escapeHtml($_item->getDescription()) ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
index a9e71a79f8977..0d54e1528dfe9 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php
 /**
@@ -21,19 +19,19 @@
 
 <?php $_prevOptionId = '' ?>
 
-<?php if ($block->getOrderOptions() || $_item->getDescription()): ?>
+<?php if ($block->getOrderOptions() || $_item->getDescription()) : ?>
     <?php $_showlastRow = true ?>
-<?php else: ?>
+<?php else : ?>
     <?php $_showlastRow = false ?>
 <?php endif; ?>
 
-<?php foreach ($items as $_item): ?>
+<?php foreach ($items as $_item) : ?>
     <?php $block->setPriceDataObject($_item) ?>
     <?php $attributes = $block->getSelectionAttributes($_item) ?>
-    <?php if ($_item->getOrderItem()->getParentItem()): ?>
-        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -41,88 +39,87 @@
             <td>&nbsp;</td>
             <td class="last">&nbsp;</td>
         </tr>
-        <?php $_prevOptionId = $attributes['option_id'] ?>
+            <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
     <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
-        <?php if (!$_item->getOrderItem()->getParentItem()): ?>
+        <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
         <td class="col-product">
             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
-                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
-                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
+                <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
+                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
             </div>
         </td>
-        <?php else: ?>
+        <?php else : ?>
         <td class="col-product"><div class="option-value"><?= $block->getValueHtml($_item) ?></div></td>
         <?php endif; ?>
         <td class="col-price">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <?= $block->getColumnHtml($_item, 'price') ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-qty">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
-            <?php else: ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
+                <?= (float)$_item->getQty() * 1 ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-subtotal">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <?= $block->getColumnHtml($_item, 'subtotal') ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-tax">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?>
-            <?php else: ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
+                <?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discount">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?>
-            <?php else: ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
+                <?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-total last">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <?= $block->getColumnHtml($_item, 'total') ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
     </tr>
 <?php endforeach; ?>
-<?php if ($_showlastRow): ?>
+<?php if ($_showlastRow) : ?>
     <tr class="border">
         <td class="col-product">
-            <?php if ($block->getOrderOptions()): ?>
+            <?php if ($block->getOrderOptions()) : ?>
                 <dl class="item-options">
-                <?php foreach ($block->getOrderOptions() as $option): ?>
-                    <dt><?= /* @escapeNotVerified */ $option['label'] ?></dt>
+                <?php foreach ($block->getOrderOptions() as $option) : ?>
+                    <dt><?= $block->escapeHtml($option['label']) ?></dt>
                     <dd>
-                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?= /* @escapeNotVerified */ $option['value'] ?>
-                    <?php else: ?>
-                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
-                        <?php if ($_remainder):?>
-                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
+                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
+                        <?= $block->escapeHtml($option['value']) ?>
+                    <?php else : ?>
+                        <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
+                        <?php if ($_remainder) :?>
+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
                             <script>
-require(['prototype'], function(){
-
-    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
-    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
-    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
-
-});
-</script>
+                                require(['prototype'], function(){
+                                    <?php $escapedId = $block->escapeJs($_id) ?>
+                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
+                                });
+                            </script>
                         <?php endif;?>
                     <?php endif;?>
                     </dd>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
index ff26d67bd8378..b3c4b0b1d999c 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php
 /**
@@ -21,19 +19,19 @@
 
 <?php $_prevOptionId = '' ?>
 
-<?php if ($block->getOrderOptions() || $_item->getDescription()): ?>
+<?php if ($block->getOrderOptions() || $_item->getDescription()) : ?>
     <?php $_showlastRow = true ?>
-<?php else: ?>
+<?php else : ?>
     <?php $_showlastRow = false ?>
 <?php endif; ?>
 
-<?php foreach ($items as $_item): ?>
+<?php foreach ($items as $_item) : ?>
     <?php $block->setPriceDataObject($_item) ?>
-    <?php if ($_item->getOrderItem()->getParentItem()): ?>
+    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
-        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -42,152 +40,152 @@
             <td>&nbsp;</td>
             <td class="last">&nbsp;</td>
         </tr>
-        <?php $_prevOptionId = $attributes['option_id'] ?>
+            <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
     <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
-        <?php if (!$_item->getOrderItem()->getParentItem()): ?>
+        <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
         <td class="col-product">
             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
-                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
-                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
+                <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
+                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
             </div>
         </td>
-        <?php else: ?>
+        <?php else : ?>
         <td class="col-product">
             <div class="option-value"><?= $block->getValueHtml($_item) ?></div>
         </td>
         <?php endif; ?>
         <td class="col-price">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <?= $block->getColumnHtml($_item, 'price') ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-qty">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <table class="qty-table">
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
-                        <td><span><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyOrdered()*1 ?></span></td>
+                        <th><?= $block->escapeHtml(__('Ordered')) ?></th>
+                        <td><span><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></span></td>
                     </tr>
-                    <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()): ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()) : ?>
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Invoiced') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyInvoiced()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Invoiced')) ?></th>
+                        <td><?= (float)$_item->getOrderItem()->getQtyInvoiced() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
-                    <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)) : ?>
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyShipped()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Shipped')) ?></th>
+                        <td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
-                    <?php if ((float) $_item->getOrderItem()->getQtyRefunded()): ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyRefunded()) : ?>
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Refunded') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyRefunded()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Refunded')) ?></th>
+                        <td><?= (float)$_item->getOrderItem()->getQtyRefunded() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
-                    <?php if ((float) $_item->getOrderItem()->getQtyCanceled()): ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyCanceled()) : ?>
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Canceled') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyCanceled()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Canceled')) ?></th>
+                        <td><?= (float)$_item->getOrderItem()->getQtyCanceled() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
-            <?php elseif ($block->isShipmentSeparately($_item)): ?>
+            <?php elseif ($block->isShipmentSeparately($_item)) : ?>
                 <table class="qty-table">
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Ordered')) ?></th>
+                        <td><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></td>
                     </tr>
-                    <?php if ((float) $_item->getOrderItem()->getQtyShipped()): ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyShipped()) : ?>
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyShipped()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Shipped')) ?></th>
+                        <td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
                         <?php endif; ?>
         </td>
         <td class="col-qty-invoice">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <?php if ($block->canEditQty()) : ?>
                     <input type="text"
                            class="input-text admin__control-text qty-input"
-                           name="invoice[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>]"
-                           value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>" />
+                           name="invoice[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>]"
+                           value="<?= (float)$_item->getQty() * 1 ?>" />
                 <?php else : ?>
-                    <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
+                    <?= (float)$_item->getQty() * 1 ?>
                 <?php endif; ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-subtotal">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <?= $block->getColumnHtml($_item, 'subtotal') ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-tax">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?>
-            <?php else: ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
+                <?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discount">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?>
-            <?php else: ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
+                <?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-total last">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <?= $block->getColumnHtml($_item, 'total') ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
     </tr>
 <?php endforeach; ?>
-<?php if ($_showlastRow): ?>
+<?php if ($_showlastRow) : ?>
     <tr class="border">
         <td class="col-product">
-            <?php if ($block->getOrderOptions($_item->getOrderItem())): ?>
+            <?php if ($block->getOrderOptions($_item->getOrderItem())) : ?>
                 <dl class="item-options">
-                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option): ?>
-                    <dt><?= /* @escapeNotVerified */ $option['label'] ?></dt>
+                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option) : ?>
+                    <dt><?= $block->escapeHtml($option['label']) ?></dt>
                     <dd>
-                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?= /* @escapeNotVerified */ $option['value'] ?>
-                    <?php else: ?>
-                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
-                        <?php if ($_remainder):?>
-                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
+                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
+                        <?= $block->escapeHtml($option['value']) ?>
+                    <?php else : ?>
+                        <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
+                        <?php if ($_remainder) :?>
+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
                             <script>
-require(['prototype'], function(){
-
-    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
-    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
-    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
+                                require(['prototype'], function(){
+                                    <?php $escapedId = $block->escapeJs($_id) ?>
+                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
 
-});
-</script>
+                                });
+                            </script>
                         <?php endif;?>
                     <?php endif;?>
                     </dd>
                 <?php endforeach; ?>
                 </dl>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
             <?= $block->escapeHtml($_item->getDescription()) ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
index 5f344409b6a4c..e29bb5dbc9479 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php
 /**
@@ -21,19 +19,19 @@
 
 <?php $_prevOptionId = '' ?>
 
-<?php if ($block->getOrderOptions() || $_item->getDescription()): ?>
+<?php if ($block->getOrderOptions() || $_item->getDescription()) : ?>
     <?php $_showlastRow = true ?>
-<?php else: ?>
+<?php else : ?>
     <?php $_showlastRow = false ?>
 <?php endif; ?>
 
-<?php foreach ($items as $_item): ?>
+<?php foreach ($items as $_item) : ?>
     <?php $block->setPriceDataObject($_item) ?>
-    <?php if ($_item->getOrderItem()->getParentItem()): ?>
+    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
-        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -41,89 +39,88 @@
             <td>&nbsp;</td>
             <td class="last">&nbsp;</td>
         </tr>
-        <?php $_prevOptionId = $attributes['option_id'] ?>
+            <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
     <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
-        <?php if (!$_item->getOrderItem()->getParentItem()): ?>
+        <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
         <td class="col-product">
             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
-                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
-                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
+                <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
+                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
             </div>
-        <?php else: ?>
+        <?php else : ?>
         <td class="col-product">
             <div class="option-value"><?= $block->getValueHtml($_item) ?></div>
         </td>
         <?php endif; ?>
         <td class="col-price">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <?= $block->getColumnHtml($_item, 'price') ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-qty">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
-            <?php else: ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
+                <?= (float)$_item->getQty() * 1 ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-subtotal">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <?= $block->getColumnHtml($_item, 'subtotal') ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-tax">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?>
-            <?php else: ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
+                <?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discount">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?>
-            <?php else: ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
+                <?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-total last">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <?= $block->getColumnHtml($_item, 'total') ?>
-             <?php else: ?>
+                <?php else : ?>
                  &nbsp;
             <?php endif; ?>
         </td>
     </tr>
 <?php endforeach; ?>
-<?php if ($_showlastRow): ?>
+<?php if ($_showlastRow) : ?>
     <tr class="border">
         <td class="col-product">
-            <?php if ($block->getOrderOptions()): ?>
+            <?php if ($block->getOrderOptions()) : ?>
                 <dl class="item-options">
-                <?php foreach ($block->getOrderOptions() as $option): ?>
-                    <dt><?= /* @escapeNotVerified */ $option['label'] ?></dt>
+                <?php foreach ($block->getOrderOptions() as $option) : ?>
+                    <dt><?= $block->escapeHtml($option['label']) ?></dt>
                     <dd>
-                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?= /* @escapeNotVerified */ $option['value'] ?>
-                    <?php else: ?>
-                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
-                        <?php if ($_remainder):?>
-                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
+                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
+                        <?= $block->escapeHtml($option['value']) ?>
+                    <?php else : ?>
+                        <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
+                        <?php if ($_remainder) :?>
+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
                             <script>
-require(['protoype'], function(){
-
-    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
-    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
-    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
-
-});
-</script>
+                                require(['prototype'], function(){
+                                    <?php $escapedId = $block->escapeJs($_id) ?>
+                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
+                                });
+                            </script>
                         <?php endif;?>
                     <?php endif;?>
                     </dd>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
index bb0857a80d689..356a510888d8e 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php
 /**
@@ -16,24 +14,24 @@
 
 <?php $_item = $block->getItem() ?>
 <?php $items = array_merge([$_item], $_item->getChildrenItems()); ?>
-<?php $_count = count ($items) ?>
+<?php $_count = count($items) ?>
 <?php $_index = 0 ?>
 
 <?php $_prevOptionId = '' ?>
 
-<?php if($block->getOrderOptions() || $_item->getDescription() || $block->canDisplayGiftmessage()): ?>
+<?php if ($block->getOrderOptions() || $_item->getDescription() || $block->canDisplayGiftmessage()) : ?>
     <?php $_showlastRow = true ?>
-<?php else: ?>
+<?php else : ?>
     <?php $_showlastRow = false ?>
 <?php endif; ?>
 
-<?php foreach ($items as $_item): ?>
+<?php foreach ($items as $_item) : ?>
     <?php $block->setPriceDataObject($_item) ?>
     <?php $attributes = $block->getSelectionAttributes($_item) ?>
-    <?php if ($_item->getParentItem()): ?>
-        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+    <?php if ($_item->getParentItem()) : ?>
+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -44,161 +42,160 @@
             <td>&nbsp;</td>
             <td class="last">&nbsp;</td>
         </tr>
-        <?php $_prevOptionId = $attributes['option_id'] ?>
+            <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
     <tr<?= (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
-        <?php if (!$_item->getParentItem()): ?>
+        <?php if (!$_item->getParentItem()) : ?>
         <td class="col-product">
-            <div class="product-title" id="order_item_<?= /* @escapeNotVerified */ $_item->getId() ?>_title">
+            <div class="product-title" id="order_item_<?= $block->escapeHtmlAttr($_item->getId()) ?>_title">
                 <?= $block->escapeHtml($_item->getName()) ?>
             </div>
             <div class="product-sku-block">
-                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
-                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
+                <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
+                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
             </div>
         </td>
-        <?php else: ?>
+        <?php else : ?>
         <td class="col-product">
             <div class="option-value"><?= $block->getValueHtml($_item) ?></div>
         </td>
         <?php endif; ?>
         <td class="col-status">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?= /* @escapeNotVerified */ $_item->getStatus() ?>
-            <?php else: ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
+                <?= $block->escapeHtml($_item->getStatus()) ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-price-original">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('original_price') ?>
-            <?php else: ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
+                <?= /* @noEscape */ $block->displayPriceAttribute('original_price') ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-price">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <?= $block->getColumnHtml($_item, 'price') ?>
-            <?php else: ?>
+            <?php else : ?>
                     &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-ordered-qty">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <table class="qty-table">
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getQtyOrdered()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Ordered')) ?></th>
+                        <td><?= (float)$_item->getQtyOrdered() * 1 ?></td>
                     </tr>
-                    <?php if ((float) $_item->getQtyInvoiced()): ?>
+                    <?php if ((float) $_item->getQtyInvoiced()) : ?>
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Invoiced') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getQtyInvoiced()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Invoiced')) ?></th>
+                        <td><?= (float)$_item->getQtyInvoiced() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
-                    <?php if ((float) $_item->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
+                    <?php if ((float) $_item->getQtyShipped() && $block->isShipmentSeparately($_item)) : ?>
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getQtyShipped()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Shipped')) ?></th>
+                        <td><?= (float)$_item->getQtyShipped() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
-                    <?php if ((float) $_item->getQtyRefunded()): ?>
+                    <?php if ((float) $_item->getQtyRefunded()) : ?>
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Refunded') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getQtyRefunded()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Refunded')) ?></th>
+                        <td><?= (float)$_item->getQtyRefunded() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
-                    <?php if ((float) $_item->getQtyCanceled()): ?>
+                    <?php if ((float) $_item->getQtyCanceled()) : ?>
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Canceled') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getQtyCanceled()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Canceled')) ?></th>
+                        <td><?= (float)$_item->getQtyCanceled() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
-            <?php elseif ($block->isShipmentSeparately($_item)): ?>
+            <?php elseif ($block->isShipmentSeparately($_item)) : ?>
                 <table class="qty-table">
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getQtyOrdered()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Ordered')) ?></th>
+                        <td><?= (float)$_item->getQtyOrdered() * 1 ?></td>
                     </tr>
-                    <?php if ((float) $_item->getQtyShipped()): ?>
+                    <?php if ((float) $_item->getQtyShipped()) : ?>
                     <tr>
-                        <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
-                        <td><?= /* @escapeNotVerified */ $_item->getQtyShipped()*1 ?></td>
+                        <th><?= $block->escapeHtml(__('Shipped')) ?></th>
+                        <td><?= (float)$_item->getQtyShipped() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-subtotal">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <?= $block->getColumnHtml($_item, 'subtotal') ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-tax-amount">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?>
-            <?php else: ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
+                <?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-tax-percent">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?= /* @escapeNotVerified */ $block->displayTaxPercent($_item) ?>
-            <?php else: ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
+                <?= $block->escapeHtml($block->displayTaxPercent($_item)) ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discont">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?>
-            <?php else: ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
+                <?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-total last">
-            <?php if ($block->canShowPriceInfo($_item)): ?>
+            <?php if ($block->canShowPriceInfo($_item)) : ?>
                 <?= $block->getColumnHtml($_item, 'total') ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
     </tr>
 <?php endforeach; ?>
-<?php if($_showlastRow): ?>
-    <tr<?php if (!$block->canDisplayGiftmessage()) echo ' class="border"' ?>>
+<?php if ($_showlastRow) : ?>
+    <tr<?php if (!$block->canDisplayGiftmessage()) { echo ' class="border"'; } ?>>
         <td class="col-product">
-            <?php if ($block->getOrderOptions()): ?>
+            <?php if ($block->getOrderOptions()) : ?>
                 <dl class="item-options">
-                <?php foreach ($block->getOrderOptions() as $option): ?>
-                    <dt><?= /* @escapeNotVerified */ $option['label'] ?>:</dt>
+                <?php foreach ($block->getOrderOptions() as $option) : ?>
+                    <dt><?= $block->escapeHtml($option['label']) ?>:</dt>
                     <dd>
-                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?= /* @escapeNotVerified */ $option['value'] ?>
-                    <?php else: ?>
-                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
-                        <?php if ($_remainder):?>
-                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
+                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
+                        <?= $block->escapeHtml($option['value']) ?>
+                    <?php else : ?>
+                        <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
+                        <?php if ($_remainder) :?>
+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
                             <script>
-require(['prototype'], function(){
-
-    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
-    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
-    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
-                            
-});
-</script>
+                                require(['prototype'], function(){
+                                    <?php $escapedId = $block->escapeJs($_id) ?>
+                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
+                                });
+                            </script>
                         <?php endif;?>
                     <?php endif;?>
                     </dd>
                 <?php endforeach; ?>
                 </dl>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
             <?= $block->escapeHtml($_item->getDescription()) ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
index 2ede8277bcfc9..2e52ed906626b 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 
 <?php /** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */ ?>
@@ -17,85 +15,84 @@
 
 <?php $_prevOptionId = '' ?>
 
-<?php if ($block->getOrderOptions() || $_item->getDescription()): ?>
+<?php if ($block->getOrderOptions() || $_item->getDescription()) : ?>
     <?php $_showlastRow = true ?>
-<?php else: ?>
+<?php else : ?>
     <?php $_showlastRow = false ?>
 <?php endif; ?>
 
-<?php foreach ($items as $_item): ?>
+<?php foreach ($items as $_item) : ?>
     <?php $block->setPriceDataObject($_item) ?>
-    <?php if ($_item->getOrderItem()->getParentItem()): ?>
+    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
-        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
             <td class="col-product">&nbsp;</td>
             <td class="col-qty last">&nbsp;</td>
         </tr>
-        <?php $_prevOptionId = $attributes['option_id'] ?>
+            <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
     <tr class="<?= (++$_index == $_count && !$_showlastRow) ? 'border' : '' ?>">
-        <?php if (!$_item->getOrderItem()->getParentItem()): ?>
+        <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
         <td class="col-product">
             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
-                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
-                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
+                <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
+                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
             </div>
         </td>
-        <?php else: ?>
+        <?php else : ?>
         <td class="col-product"><div class="option-value"><?= $block->getValueHtml($_item) ?></div></td>
         <?php endif; ?>
         <td class="col-ordered-qty">
-            <?php if ($block->isShipmentSeparately($_item)): ?>
+            <?php if ($block->isShipmentSeparately($_item)) : ?>
                 <?= $block->getColumnHtml($_item, 'qty') ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-qty last">
-            <?php if ($block->isShipmentSeparately($_item)): ?>
+            <?php if ($block->isShipmentSeparately($_item)) : ?>
                 <input type="text"
                        class="input-text admin__control-text"
-                       name="shipment[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>]"
-                       value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>" />
-            <?php else: ?>
+                       name="shipment[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>]"
+                       value="<?= (float)$_item->getQty() * 1 ?>" />
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
     </tr>
 <?php endforeach; ?>
-<?php if ($_showlastRow): ?>
+<?php if ($_showlastRow) : ?>
     <tr class="border">
         <td class="col-product">
-            <?php if ($block->getOrderOptions($_item->getOrderItem())): ?>
+            <?php if ($block->getOrderOptions($_item->getOrderItem())) : ?>
                 <dl class="item-options">
-                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option): ?>
-                    <dt><?= /* @escapeNotVerified */ $option['label'] ?></dt>
+                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option) : ?>
+                    <dt><?= $block->escapeHtml($option['label']) ?></dt>
                     <dd>
-                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?= /* @escapeNotVerified */ $option['value'] ?>
-                    <?php else: ?>
-                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
-                        <?php if ($_remainder):?>
-                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
+                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
+                        <?= $block->escapeHtml($option['value']) ?>
+                    <?php else : ?>
+                        <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
+                        <?php if ($_remainder) :?>
+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
                             <script>
-require(['prototype'], function(){
-
-                            $('<?= /* @escapeNotVerified */ $_id ?>').hide();
-                            $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
-                            $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
-
-});
-</script>
+                                require(['prototype'], function(){
+                                    <?php $escapedId = $block->escapeJs($_id) ?>
+                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
+                                });
+                            </script>
                         <?php endif;?>
                     <?php endif;?>
                     </dd>
                 <?php endforeach; ?>
                 </dl>
-                        <?php else: ?>
+                        <?php else : ?>
                 &nbsp;
                         <?php endif; ?>
             <?= $block->escapeHtml($_item->getDescription()) ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
index 71eabd45cbb57..521669700e10a 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php /** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */ ?>
 
@@ -17,74 +15,73 @@
 
 <?php $_prevOptionId = '' ?>
 
-<?php if ($block->getOrderOptions() || $_item->getDescription()): ?>
+<?php if ($block->getOrderOptions() || $_item->getDescription()) : ?>
     <?php $_showlastRow = true ?>
-<?php else: ?>
+<?php else : ?>
     <?php $_showlastRow = false ?>
 <?php endif; ?>
 
-<?php foreach ($items as $_item): ?>
+<?php foreach ($items as $_item) : ?>
     <?php $block->setPriceDataObject($_item) ?>
-    <?php if ($_item->getParentItem()): ?>
+    <?php if ($_item->getParentItem()) : ?>
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
-        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
             <td class="col-qty last">&nbsp;</td>
         </tr>
-        <?php $_prevOptionId = $attributes['option_id'] ?>
+            <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
     <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
-        <?php if (!$_item->getParentItem()): ?>
+        <?php if (!$_item->getParentItem()) : ?>
         <td class="col-product">
             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
-                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
-                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
+                <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
+                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
             </div>
         </td>
-        <?php else: ?>
+        <?php else : ?>
         <td class="col-product"><div class="option-value"><?= $block->getValueHtml($_item) ?></div></td>
         <?php endif; ?>
         <td class="col-qty last">
-            <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())): ?>
-                <?php if (isset($shipItems[$_item->getId()])): ?>
-                    <?= /* @escapeNotVerified */ $shipItems[$_item->getId()]->getQty()*1 ?>
-                <?php elseif ($_item->getIsVirtual()): ?>
-                    <?= /* @escapeNotVerified */ __('N/A') ?>
-                <?php else: ?>
+            <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())) : ?>
+                <?php if (isset($shipItems[$_item->getId()])) : ?>
+                    <?= (float)$shipItems[$_item->getId()]->getQty() * 1 ?>
+                <?php elseif ($_item->getIsVirtual()) : ?>
+                    <?= $block->escapeHtml(__('N/A')) ?>
+                <?php else : ?>
                     0
                 <?php endif; ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
     </tr>
 <?php endforeach; ?>
-<?php if ($_showlastRow): ?>
+<?php if ($_showlastRow) : ?>
     <tr class="border">
         <td class="col-product">
-            <?php if ($block->getOrderOptions($_item->getOrderItem())): ?>
+            <?php if ($block->getOrderOptions($_item->getOrderItem())) : ?>
                 <dl class="item-options">
-                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option): ?>
-                    <dt><?= /* @escapeNotVerified */ $option['label'] ?></dt>
+                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option) : ?>
+                    <dt><?= $block->escapeHtml($option['label']) ?></dt>
                     <dd>
-                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?= /* @escapeNotVerified */ $option['value'] ?>
-                    <?php else: ?>
-                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
-                        <?php if ($_remainder):?>
-                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
+                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
+                        <?= $block->escapeHtml($option['value']) ?>
+                    <?php else : ?>
+                        <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
+                        <?php if ($_remainder) :?>
+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
                             <script>
-require(['prototype'], function(){
-
-                            $('<?= /* @escapeNotVerified */ $_id ?>').hide();
-                            $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
-                            $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
-
-});
-</script>
+                                require(['prototype'], function(){
+                                    <?php $escapedId = $block->escapeJs($_id) ?>
+                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
+                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
+                                });
+                            </script>
                         <?php endif;?>
                     <?php endif;?>
                     </dd>
diff --git a/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml b/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml
index 5955d0337bb6e..819a73b262ca8 100644
--- a/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml
+++ b/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php
@@ -22,16 +19,16 @@ $regularPriceModel = $block->getPriceType('regular_price');
 $maximalRegularPrice = $regularPriceModel->getMaximalPrice();
 $minimalRegularPrice = $regularPriceModel->getMinimalPrice();
 ?>
-<?php if ($block->getSaleableItem()->getPriceView()): ?>
+<?php if ($block->getSaleableItem()->getPriceView()) : ?>
     <p class="minimal-price">
-        <?php /* @escapeNotVerified */ echo $block->renderAmount($minimalPrice, [
+        <?= /* @noEscape */ $block->renderAmount($minimalPrice, [
             'display_label'     => __('As low as'),
             'price_id'          => $block->getPriceId('from-'),
             'include_container' => true
         ]); ?>
-        <?php if ($minimalPrice < $minimalRegularPrice): ?>
+        <?php if ($minimalPrice < $minimalRegularPrice) : ?>
             <span class="old-price">
-                <?php /* @escapeNotVerified */ echo $block->renderAmount($minimalRegularPrice, [
+                <?= /* @noEscape */ $block->renderAmount($minimalRegularPrice, [
                     'display_label'     => __('Regular Price'),
                     'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
                     'include_container' => true,
@@ -40,18 +37,18 @@ $minimalRegularPrice = $regularPriceModel->getMinimalPrice();
             </span>
         <?php endif ?>
     </p>
-<?php else: ?>
-    <?php if ($block->showRangePrice()): ?>
+<?php else : ?>
+    <?php if ($block->showRangePrice()) : ?>
         <p class="price-from">
-            <?php /* @escapeNotVerified */ echo $block->renderAmount($minimalPrice, [
+            <?= /* @noEscape */ $block->renderAmount($minimalPrice, [
                 'display_label'     => __('From'),
                 'price_id'          => $block->getPriceId('from-'),
                 'price_type'        => 'minPrice',
                 'include_container' => true
             ]); ?>
-            <?php if ($minimalPrice < $minimalRegularPrice): ?>
+            <?php if ($minimalPrice < $minimalRegularPrice) : ?>
                 <span class="old-price">
-                    <?php /* @escapeNotVerified */ echo $block->renderAmount($minimalRegularPrice, [
+                    <?= /* @noEscape */ $block->renderAmount($minimalRegularPrice, [
                         'display_label'     => __('Regular Price'),
                         'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
                         'include_container' => true,
@@ -61,15 +58,15 @@ $minimalRegularPrice = $regularPriceModel->getMinimalPrice();
             <?php endif ?>
         </p>
         <p class="price-to">
-            <?php /* @escapeNotVerified */ echo $block->renderAmount($maximalPrice, [
+            <?= /* @noEscape */ $block->renderAmount($maximalPrice, [
                 'display_label'     => __('To'),
                 'price_id'          => $block->getPriceId('to-'),
                 'price_type'        => 'maxPrice',
                 'include_container' => true
             ]); ?>
-            <?php if ($maximalPrice < $maximalRegularPrice): ?>
+            <?php if ($maximalPrice < $maximalRegularPrice) : ?>
                 <span class="old-price">
-                    <?php /* @escapeNotVerified */ echo $block->renderAmount($maximalRegularPrice, [
+                    <?= /* @noEscape */ $block->renderAmount($maximalRegularPrice, [
                         'display_label'     => __('Regular Price'),
                         'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
                         'include_container' => true,
@@ -78,14 +75,14 @@ $minimalRegularPrice = $regularPriceModel->getMinimalPrice();
                 </span>
             <?php endif ?>
         </p>
-    <?php else: ?>
-        <?php /* @escapeNotVerified */ echo $block->renderAmount($minimalPrice, [
+    <?php else : ?>
+        <?= /* @noEscape */ $block->renderAmount($minimalPrice, [
             'price_id'          => $block->getPriceId('product-price-'),
             'include_container' => true
         ]); ?>
-        <?php if ($minimalPrice < $minimalRegularPrice): ?>
+        <?php if ($minimalPrice < $minimalRegularPrice) : ?>
             <span class="old-price">
-                <?php /* @escapeNotVerified */ echo $block->renderAmount($minimalRegularPrice, [
+                <?= /* @noEscape */ $block->renderAmount($minimalRegularPrice, [
                     'display_label'     => __('Regular Price'),
                     'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
                     'include_container' => true,
diff --git a/app/code/Magento/Bundle/view/base/templates/product/price/selection/amount.phtml b/app/code/Magento/Bundle/view/base/templates/product/price/selection/amount.phtml
index 53d24dd7c2c07..c1aa6fabc136b 100644
--- a/app/code/Magento/Bundle/view/base/templates/product/price/selection/amount.phtml
+++ b/app/code/Magento/Bundle/view/base/templates/product/price/selection/amount.phtml
@@ -3,11 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php /** @var \Magento\Framework\Pricing\Render\Amount $block */ ?>
 
-<?= /* @escapeNotVerified */ $block->formatCurrency($block->getDisplayValue(), (bool) $block->getIncludeContainer()) ?>
+<?= /* @noEscape */ $block->formatCurrency($block->getDisplayValue(), (bool) $block->getIncludeContainer());
diff --git a/app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml b/app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml
index 5f152c4bbefbc..f5f67588a1c49 100644
--- a/app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml
+++ b/app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php
@@ -16,10 +13,10 @@ $tierPriceModel = $block->getPrice();
 $tierPrices = $tierPriceModel->getTierPriceList();
 ?>
 <?php if (count($tierPrices)) : ?>
-    <ul class="<?= /* @escapeNotVerified */ ($block->hasListClass() ? $block->getListClass() : 'prices-tier items') ?>">
+    <ul class="<?= $block->escapeHtmlAttr(($block->hasListClass() ? $block->getListClass() : 'prices-tier items')) ?>">
         <?php foreach ($tierPrices as $index => $price) : ?>
             <li class="item">
-                <?php /* @escapeNotVerified */ echo __(
+                <?= /* @noEscape */ __(
                     'Buy %1 with %2 discount each',
                     $price['price_qty'],
                     '<strong class="benefit">' . round($price['percentage_value']) . '%</strong>'
diff --git a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
index e56cc6f32d804..49ee253ad1e88 100644
--- a/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
+++ b/app/code/Magento/Bundle/view/base/web/js/price-bundle.js
@@ -27,7 +27,8 @@ define([
         '<% } %>',
         controlContainer: 'dd', // should be eliminated
         priceFormat: {},
-        isFixedPrice: false
+        isFixedPrice: false,
+        optionTierPricesBlocksSelector: '#option-tier-prices-{1} [data-role="selection-tier-prices"]'
     };
 
     $.widget('mage.priceBundle', {
@@ -91,6 +92,8 @@ define([
             if (changes) {
                 priceBox.trigger('updatePrice', changes);
             }
+
+            this._displayTierPriceBlock(bundleOption);
             this.updateProductSummary();
         },
 
@@ -207,6 +210,35 @@ define([
             return this;
         },
 
+        /**
+         * Show or hide option tier prices block
+         *
+         * @param {Object} optionElement
+         * @private
+         */
+        _displayTierPriceBlock: function (optionElement) {
+            var optionType = optionElement.prop('type'),
+                optionId,
+                optionValue,
+                optionTierPricesElements;
+
+            if (optionType === 'select-one') {
+                optionId = utils.findOptionId(optionElement[0]);
+                optionValue = optionElement.val() || null;
+                optionTierPricesElements = $(this.options.optionTierPricesBlocksSelector.replace('{1}', optionId));
+
+                _.each(optionTierPricesElements, function (tierPriceElement) {
+                    var selectionId = $(tierPriceElement).data('selection-id') + '';
+
+                    if (selectionId === optionValue) {
+                        $(tierPriceElement).show();
+                    } else {
+                        $(tierPriceElement).hide();
+                    }
+                });
+            }
+        },
+
         /**
          * Handler to update productSummary box
          */
@@ -374,8 +406,17 @@ define([
     function applyTierPrice(oneItemPrice, qty, optionConfig) {
         var tiers = optionConfig.tierPrice,
             magicKey = _.keys(oneItemPrice)[0],
+            tiersFirstKey = _.keys(optionConfig)[0],
             lowest = false;
 
+        if (!tiers) {//tiers is undefined when options has only one option
+            tiers = optionConfig[tiersFirstKey].tierPrice;
+        }
+
+        tiers.sort(function (a, b) {//sorting based on "price_qty"
+            return a['price_qty'] - b['price_qty'];
+        });
+
         _.each(tiers, function (tier, index) {
             if (tier['price_qty'] > qty) {
                 return;
diff --git a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml
index 5b8c050e5af54..d12f2e8f6a952 100644
--- a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml
+++ b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml
@@ -29,10 +29,22 @@
                 <container name="product.info.bundle.options.top" as="product_info_bundle_options_top">
                     <block class="Magento\Catalog\Block\Product\View" name="bundle.back.button" as="backButton" before="-" template="Magento_Bundle::catalog/product/view/backbutton.phtml"/>
                 </container>
-                <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select"/>
+                <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select">
+                    <arguments>
+                        <argument name="tier_price_renderer" xsi:type="object">\Magento\Bundle\Block\DataProviders\OptionPriceRenderer</argument>
+                    </arguments>
+                </block>
                 <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi" name="product.info.bundle.options.multi" as="multi"/>
-                <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio" name="product.info.bundle.options.radio" as="radio"/>
-                <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox" name="product.info.bundle.options.checkbox" as="checkbox"/>
+                <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio" name="product.info.bundle.options.radio" as="radio">
+                    <arguments>
+                        <argument name="tier_price_renderer" xsi:type="object">\Magento\Bundle\Block\DataProviders\OptionPriceRenderer</argument>
+                    </arguments>
+                </block>
+                <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox" name="product.info.bundle.options.checkbox" as="checkbox">
+                    <arguments>
+                        <argument name="tier_price_renderer" xsi:type="object">\Magento\Bundle\Block\DataProviders\OptionPriceRenderer</argument>
+                    </arguments>
+                </block>
             </block>
         </referenceBlock>
         <referenceBlock name="product.info.form.options">
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/backbutton.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/backbutton.phtml
index 31a39c1cd162c..ba58544c26af5 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/backbutton.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/backbutton.phtml
@@ -6,5 +6,5 @@
 ?>
 <button type="button"
         class="action back customization">
-    <span><?= /* @escapeNotVerified */ __('Go back to product details') ?></span>
+    <span><?= $block->escapeHtml(__('Go back to product details')) ?></span>
 </button>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml
index d7aea4237b100..480ffea5bc8b3 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml
@@ -3,18 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php $_product = $block->getProduct() ?>
-<?php if ($_product->isSaleable() && $block->hasOptions()):?>
+<?php if ($_product->isSaleable() && $block->hasOptions()) :?>
     <div class="bundle-actions">
         <button id="bundle-slide"
                 class="action primary customize"
                 type="button">
-            <span><?= /* @escapeNotVerified */ __('Customize and Add to Cart') ?></span>
+            <span><?= $block->escapeHtml(__('Customize and Add to Cart')) ?></span>
         </button>
     </div>
 <?php endif;?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/options/notice.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/options/notice.phtml
index 2dbea0fd21395..5fe55be1db68f 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/options/notice.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/options/notice.phtml
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 ?>
-<p class="required"><?= /* @escapeNotVerified */ __('* Required Fields') ?></p>
+<p class="required"><?=$block->escapeHtml(__('* Required Fields')) ?></p>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml
index bc4337fa7ae24..9bf179e622f17 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml
@@ -3,40 +3,37 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php
     $_product = $block->getProduct();
 ?>
-<?php if ($_product->isSaleable() && $block->hasOptions()): ?>
+<?php if ($_product->isSaleable() && $block->hasOptions()) : ?>
 <div id="bundleSummary"
      class="block-bundle-summary"
      data-mage-init='{"sticky":{"container": ".product-add-form"}}'>
     <div class="title">
-        <strong><?= /* @escapeNotVerified */ __('Your Customization') ?></strong>
+        <strong><?= $block->escapeHtml(__('Your Customization')) ?></strong>
     </div>
     <div class="content">
         <div class="bundle-info">
             <?= $block->getImage($_product, 'bundled_product_customization_page')->toHtml() ?>
             <div class="product-details">
                 <strong class="product name"><?= $block->escapeHtml($_product->getName()) ?></strong>
-                <?php if ($_product->getIsSalable()): ?>
-                    <p class="available stock" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
-                        <span><?= /* @escapeNotVerified */ __('In stock') ?></span>
+                <?php if ($_product->getIsSalable()) : ?>
+                    <p class="available stock" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
+                        <span><?= $block->escapeHtml(__('In stock')) ?></span>
                     </p>
-                <?php else: ?>
-                    <p class="unavailable stock" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
-                        <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
+                <?php else : ?>
+                    <p class="unavailable stock" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
+                        <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
                     </p>
                 <?php endif; ?>
                 <?= $block->getChildHtml('', true) ?>
             </div>
         </div>
         <div class="bundle-summary">
-            <strong class="subtitle"><?= /* @escapeNotVerified */ __('Summary') ?></strong>
+            <strong class="subtitle"><?= $block->escapeHtml(__('Summary')) ?></strong>
             <div id="bundle-summary" data-container="product-summary">
                 <ul data-mage-init='{"productSummary": []}' class="bundle items"></ul>
                 <script data-template="bundle-summary" type="text/x-magento-template">
@@ -46,7 +43,7 @@
                     </li>
                 </script>
                 <script data-template="bundle-option" type="text/x-magento-template">
-                    <div><?= /* @escapeNotVerified */ __('%1 x %2', '<%- data._quantity_ %>', '<%- data._label_ %>') ?></div>
+                    <div><?= /* @noEscape */ __('%1 x %2', '<%- data._quantity_ %>', '<%- data._label_ %>') ?></div>
                 </script>
             </div>
         </div>
@@ -61,7 +58,7 @@
                 "slideBackSelector": ".action.customization.back",
                 "bundleProductSelector": "#bundleProduct",
                 "bundleOptionsContainer": ".product-add-form"
-                <?php if ($block->isStartCustomization()): ?>
+                <?php if ($block->isStartCustomization()) : ?>
                 ,"autostart": true
                 <?php endif;?>
             }
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml
index ce9ef89a82bd1..ee29fc61d0145 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml
@@ -4,19 +4,17 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle */
 ?>
 <?php $_product = $block->getProduct() ?>
-<?php if ($block->displayProductStockStatus()): ?>
-    <?php if ($_product->isAvailable()): ?>
-        <p class="stock available" title="<?= /* @escapeNotVerified */ __('Availability:') ?>">
-            <span><?= /* @escapeNotVerified */ __('In stock') ?></span>
+<?php if ($block->displayProductStockStatus()) : ?>
+    <?php if ($_product->isAvailable()) : ?>
+        <p class="stock available" title="<?= $block->escapeHtmlAttr(__('Availability:')) ?>">
+            <span><?= $block->escapeHtml(__('In stock')) ?></span>
         </p>
-    <?php else: ?>
-        <p class="stock unavailable" title="<?= /* @escapeNotVerified */ __('Availability:') ?>">
-            <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
+    <?php else : ?>
+        <p class="stock unavailable" title="<?= $block->escapeHtmlAttr(__('Availability:')) ?>">
+            <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
         </p>
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
index bda649eb603e6..1d990000ac3ef 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox */ ?>
@@ -17,31 +14,34 @@
     </label>
     <div class="control">
         <div class="nested options-list">
-            <?php if ($block->showSingle()): ?>
-                <?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
+            <?php if ($block->showSingle()) : ?>
+                <?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
+                <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selections[0]) ?>
                 <input type="hidden"
-                       class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>  product bundle option"
-                       name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                       value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"/>
-            <?php else:?>
-                <?php foreach($_selections as $_selection): ?>
+                       class="bundle-option-<?=$block->escapeHtmlAttr($_option->getId()) ?>  product bundle option"
+                       name="bundle_option[<?=$block->escapeHtmlAttr($_option->getId()) ?>]"
+                       value="<?=$block->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>"/>
+            <?php else :?>
+                <?php foreach ($_selections as $_selection) : ?>
                     <div class="field choice">
-                        <input class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?> checkbox product bundle option change-container-classname"
-                               id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
+                        <input class="bundle-option-<?=$block->escapeHtmlAttr($_option->getId()) ?> checkbox product bundle option change-container-classname"
+                               id="bundle-option-<?=$block->escapeHtmlAttr($_option->getId()) ?>-<?=$block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
                                type="checkbox"
-                               <?php if ($_option->getRequired()) /* @escapeNotVerified */ echo 'data-validate="{\'validate-one-required-by-name\':\'input[name^=&quot;bundle_option[' . $_option->getId() . ']&quot;]:checked\'}"'?>
-                               name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][<?= /* @escapeNotVerified */ $_selection->getId() ?>]"
-                               data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][<?= /* @escapeNotVerified */ $_selection->getId() ?>]"
-                               <?php if ($block->isSelected($_selection)) echo ' checked="checked"' ?>
-                               <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>
-                               value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"/>
+                                <?php if ($_option->getRequired()) { echo 'data-validate="{\'validate-one-required-by-name\':\'input[name^=&quot;bundle_option[' . $block->escapeHtmlAttr($_option->getId()) . ']&quot;]:checked\'}"'; }?>
+                               name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>][<?= $block->escapeHtmlAttr($_selection->getId()) ?>]"
+                               data-selector="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>][<?= $block->escapeHtmlAttr($_selection->getId()) ?>]"
+                                <?php if ($block->isSelected($_selection)) { echo ' checked="checked"'; } ?>
+                                <?php if (!$_selection->isSaleable()) { echo ' disabled="disabled"'; } ?>
+                               value="<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"/>
                         <label class="label"
-                               for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
-                            <span><?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selection) ?></span>
+                               for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>">
+                            <span><?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selection) ?></span>
+                            <br/>
+                            <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selection) ?>
                         </label>
                     </div>
                 <?php endforeach; ?>
-                <div id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-container"></div>
+                <div id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-container"></div>
             <?php endif; ?>
         </div>
     </div>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml
index 718d43070a5fd..d6f9fdb74ef62 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml
@@ -3,39 +3,36 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi */ ?>
 <?php $_option = $block->getOption() ?>
 <?php $_selections = $_option->getSelections() ?>
 <div class="field option <?= ($_option->getRequired()) ? ' required': '' ?>">
-    <label class="label" for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>">
+    <label class="label" for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>">
         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
     <div class="control">
-        <?php if ($block->showSingle()): ?>
-            <?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
+        <?php if ($block->showSingle()) : ?>
+            <?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
             <input type="hidden"
-                   name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                   value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"/>
-        <?php else: ?>
+                   name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                   value="<?= $block->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>"/>
+        <?php else : ?>
             <select multiple="multiple"
                     size="5"
-                    id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
-                    name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][]"
-                    data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][]"
-                    class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?> multiselect product bundle option change-container-classname"
-                    <?php if ($_option->getRequired()) echo 'data-validate={required:true}' ?>>
-                <?php if(!$_option->getRequired()): ?>
-                    <option value=""><?= /* @escapeNotVerified */ __('None') ?></option>
+                    id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>"
+                    name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>][]"
+                    data-selector="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>][]"
+                    class="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?> multiselect product bundle option change-container-classname"
+                    <?php if ($_option->getRequired()) { echo 'data-validate={required:true}'; } ?>>
+                <?php if (!$_option->getRequired()) : ?>
+                    <option value=""><?= $block->escapeHtml(__('None')) ?></option>
                 <?php endif; ?>
-                <?php foreach ($_selections as $_selection): ?>
-                    <option value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
-                            <?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?>
-                            <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>>
-                        <?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selection, false) ?>
+                <?php foreach ($_selections as $_selection) : ?>
+                    <option value="<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
+                            <?php if ($block->isSelected($_selection)) { echo ' selected="selected"'; } ?>
+                            <?php if (!$_selection->isSaleable()) { echo ' disabled="disabled"'; } ?>>
+                        <?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selection, false) ?>
                     </option>
                 <?php endforeach; ?>
             </select>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
index 7ea89e8609818..538e341894f90 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio */ ?>
 <?php $_option = $block->getOption(); ?>
@@ -19,8 +16,9 @@
     </label>
     <div class="control">
         <div class="nested options-list">
-            <?php if ($block->showSingle()): ?>
-                <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selections[0]) ?>
+            <?php if ($block->showSingle()) : ?>
+                <?= /* @noEscape */ $block->getSelectionTitlePrice($_selections[0]) ?>
+                <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selections[0]) ?>
                 <input type="hidden"
                     class="bundle-option-<?= (int)$_option->getId() ?>  product bundle option"
                     name="bundle_option[<?= (int)$_option->getId() ?>]"
@@ -28,52 +26,54 @@
                     id="bundle-option-<?= (int)$_option->getId() ?>-<?= (int)$_selections[0]->getSelectionId() ?>"
                     checked="checked"
                 />
-            <?php else:?>
-                <?php if (!$_option->getRequired()): ?>
+            <?php else :?>
+                <?php if (!$_option->getRequired()) : ?>
                     <div class="field choice">
                         <input type="radio"
                                class="radio product bundle option"
-                               id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
-                               name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                               data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                               <?= ($_default && $_default->isSalable())?'':' checked="checked" ' ?>
+                               id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>"
+                               name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                               data-selector="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                                <?= ($_default && $_default->isSalable())?'':' checked="checked" ' ?>
                                value=""/>
-                        <label class="label" for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>">
-                            <span><?= /* @escapeNotVerified */ __('None') ?></span>
+                        <label class="label" for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>">
+                            <span><?= $block->escapeHtml(__('None')) ?></span>
                         </label>
                     </div>
                 <?php endif; ?>
-                <?php foreach ($_selections as $_selection): ?>
+                <?php foreach ($_selections as $_selection) : ?>
                     <div class="field choice">
                         <input type="radio"
                                class="radio product bundle option change-container-classname"
-                               id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
-                               <?php if ($_option->getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':true}"'?>
-                               name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                               data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                               <?php if ($block->isSelected($_selection)) echo ' checked="checked"' ?>
-                               <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>
-                               value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"/>
+                               id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
+                                <?php if ($_option->getRequired()) { echo 'data-validate="{\'validate-one-required-by-name\':true}"'; }?>
+                               name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                               data-selector="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                                <?php if ($block->isSelected($_selection)) { echo ' checked="checked"'; } ?>
+                                <?php if (!$_selection->isSaleable()) { echo ' disabled="disabled"'; } ?>
+                               value="<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"/>
                         <label class="label"
-                               for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
-                            <span><?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selection) ?></span>
+                               for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>">
+                            <span><?= /* @noEscape */ $block->getSelectionTitlePrice($_selection) ?></span>
+                            <br/>
+                            <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selection) ?>
                         </label>
                     </div>
                 <?php endforeach; ?>
-                <div id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-container"></div>
+                <div id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-container"></div>
             <?php endif; ?>
             <div class="field qty qty-holder">
-                <label class="label" for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input">
-                    <span><?= /* @escapeNotVerified */ __('Quantity') ?></span>
+                <label class="label" for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input">
+                    <span><?= $block->escapeHtml(__('Quantity')) ?></span>
                 </label>
                 <div class="control">
-                    <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
-                           id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"
-                           class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
+                    <input <?php if (!$_canChangeQty) { echo ' disabled="disabled"'; } ?>
+                           id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input"
+                           class="input-text qty<?php if (!$_canChangeQty) { echo ' qty-disabled'; } ?>"
                            type="number"
-                           name="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                           data-selector="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                           value="<?= /* @escapeNotVerified */ $_defaultQty ?>"/>
+                           name="bundle_option_qty[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                           data-selector="bundle_option_qty[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                           value="<?= $block->escapeHtmlAttr($_defaultQty) ?>"/>
                 </div>
             </div>
         </div>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
index 977daa2b2a446..654d4d885801c 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select */ ?>
@@ -14,45 +11,55 @@
 <?php $_default     = $_option->getDefaultSelection(); ?>
 <?php list($_defaultQty, $_canChangeQty) = $block->getDefaultValues(); ?>
 <div class="field option <?= ($_option->getRequired()) ? ' required': '' ?>">
-    <label class="label" for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>">
+    <label class="label" for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>">
         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
     <div class="control">
-        <?php if ($block->showSingle()): ?>
-            <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selections[0]) ?>
+        <?php if ($block->showSingle()) : ?>
+            <?= /* @noEscape */ $block->getSelectionTitlePrice($_selections[0]) ?>
+            <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selections[0]) ?>
             <input type="hidden"
-                   class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>  product bundle option"
-                   name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                   value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"/>
-        <?php else:?>
-            <select id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
-                    name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                    data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                    class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?> product bundle option bundle-option-select change-container-classname"
-                <?php if ($_option->getRequired()) echo 'data-validate = {required:true}' ?>>
-                <option value=""><?= /* @escapeNotVerified */ __('Choose a selection...') ?></option>
-                <?php foreach ($_selections as $_selection): ?>
-                    <option value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
-                        <?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?>
-                        <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>>
-                        <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selection, false) ?>
+                   class="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>  product bundle option"
+                   name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                   value="<?= $block->escapeHtmlAttr($_selections[0]->getSelectionId()) ?>"/>
+        <?php else :?>
+            <select id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>"
+                    name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                    data-selector="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                    class="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?> product bundle option bundle-option-select change-container-classname"
+                <?php if ($_option->getRequired()) { echo 'data-validate = {required:true}'; } ?>>
+                <option value=""><?= $block->escapeHtml(__('Choose a selection...')) ?></option>
+                <?php foreach ($_selections as $_selection) : ?>
+                    <option value="<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
+                        <?php if ($block->isSelected($_selection)) { echo ' selected="selected"'; } ?>
+                        <?php if (!$_selection->isSaleable()) { echo ' disabled="disabled"'; } ?>>
+                        <?= /* @noEscape */ $block->getSelectionTitlePrice($_selection, false) ?>
                     </option>
                 <?php endforeach; ?>
             </select>
+            <div id="option-tier-prices-<?= $block->escapeHtml($_option->getId()) ?>" class="option-tier-prices">
+                <?php foreach ($_selections as $_selection) : ?>
+                    <div data-role="selection-tier-prices"
+                         data-selection-id="<?= $block->escapeHtml($_selection->getSelectionId()) ?>"
+                         class="selection-tier-prices">
+                        <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selection) ?>
+                    </div>
+                <?php endforeach; ?>
+            </div>
         <?php endif; ?>
         <div class="nested">
             <div class="field qty qty-holder">
-                <label class="label" for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input">
-                    <span><?= /* @escapeNotVerified */ __('Quantity') ?></span>
+                <label class="label" for="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input">
+                    <span><?= $block->escapeHtml(__('Quantity')) ?></span>
                 </label>
                 <div class="control">
-                    <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
-                           id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"
-                           class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
+                    <input <?php if (!$_canChangeQty) { echo ' disabled="disabled"'; } ?>
+                           id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input"
+                           class="input-text qty<?php if (!$_canChangeQty) { echo ' qty-disabled'; } ?>"
                            type="number"
-                           name="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                           data-selector="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                           value="<?= /* @escapeNotVerified */ $_defaultQty ?>"/>
+                           name="bundle_option_qty[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                           data-selector="bundle_option_qty[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                           value="<?= $block->escapeHtmlAttr($_defaultQty) ?>"/>
                 </div>
             </div>
         </div>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
index 157e2d959720b..a286663b27fb8 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
@@ -3,24 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php /** @var $block Magento\Bundle\Block\Catalog\Product\View\Type\Bundle */ ?>
 <?php
 $product = $block->getProduct();
-$helper = $this->helper('Magento\Catalog\Helper\Output');
+$helper = $this->helper(Magento\Catalog\Helper\Output::class);
 $stripSelection = $product->getConfigureMode() ? true : false;
 $options = $block->decorateArray($block->getOptions($stripSelection));
 ?>
-<?php if ($product->isSaleable()):?>
-    <?php if (count($options)): ?>
+<?php if ($product->isSaleable()) :?>
+    <?php if (count($options)) : ?>
 <script type="text/x-magento-init">
     {
         "#product_addtocart_form": {
             "priceBundle": {
-                "optionConfig": <?= /* @escapeNotVerified */ $block->getJsonConfig() ?>,
+                "optionConfig": <?= /* @noEscape */ $block->getJsonConfig() ?>,
                 "controlContainer": ".field.option"
             }
         }
@@ -28,17 +26,20 @@ $options = $block->decorateArray($block->getOptions($stripSelection));
 </script>
         <fieldset class="fieldset fieldset-bundle-options">
             <legend id="customizeTitle" class="legend title">
-                <span><?= /* @escapeNotVerified */ __('Customize %1', $helper->productAttribute($product, $product->getName(), 'name')) ?></span>
+                <span><?=/* @noEscape */ __('Customize %1', $helper->productAttribute($product, $product->getName(), 'name')) ?></span>
             </legend><br />
             <?= $block->getChildHtml('product_info_bundle_options_top') ?>
-            <?php foreach ($options as $option): ?>
-                <?php if (!$option->getSelections()): ?>
-                    <?php continue; ?>
-                <?php endif; ?>
-                <?= $block->getOptionHtml($option) ?>
+            <?php foreach ($options as $option) : ?>
+                <?php
+                if (!$option->getSelections()) {
+                    continue;
+                } else {
+                    echo $block->getOptionHtml($option);
+                }
+                ?>
             <?php endforeach; ?>
         </fieldset>
-    <?php else: ?>
-        <p class="empty"><?= /* @escapeNotVerified */ __('No options of this product are available.') ?></p>
+    <?php else : ?>
+        <p class="empty"><?= $block->escapeHtml(__('No options of this product are available.')) ?></p>
     <?php endif; ?>
 <?php endif;?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml
index a87c2167e66d4..6230b7e8580fa 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
 <?php $parentItem = $block->getItem() ?>
@@ -13,16 +11,15 @@
 
 <?php $items = $block->getChildren($parentItem) ?>
 
-<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper(Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()) : ?>
     <?php $_showlastRow = true ?>
-<?php else: ?>
+<?php else : ?>
     <?php $_showlastRow = false ?>
 <?php endif; ?>
 
 <?php $_prevOptionId = '' ?>
 
-<?php foreach ($items as $_item): ?>
-
+<?php foreach ($items as $_item) : ?>
     <?php
         // As part of invoice item renderer logic, the order is set on each invoice item.
         // In the case of a bundle product, this template takes over rendering its children,
@@ -30,40 +27,40 @@
         $_item->setOrder($_order);
     ?>
 
-    <?php if ($_item->getOrderItem()->getParentItem()): ?>
+    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
-        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
             <tr class="bundle-option-label">
                 <td colspan="3">
-                    <strong><?= /* @escapeNotVerified */  $attributes['option_label'] ?></strong>
+                    <strong><?= $block->escapeHtml($attributes['option_label']) ?></strong>
                 </td>
             </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-    <?php if (!$_item->getOrderItem()->getParentItem()): ?>
+    <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
         <tr class="bundle-item bundle-parent">
             <td class="item-info">
                 <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-                <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+                <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
             </td>
-    <?php else: ?>
+    <?php else : ?>
         <tr class="bundle-item bundle-option-value">
             <td class="item-info">
                 <p><?= $block->getValueHtml($_item) ?></p>
             </td>
     <?php endif; ?>
             <td class="item-qty">
-                <?php if ($block->canShowPriceInfo($_item)): ?>
-                    <?= /* @escapeNotVerified */  $_item->getQty() * 1 ?>
-                <?php else: ?>
+                <?php if ($block->canShowPriceInfo($_item)) : ?>
+                    <?= (float)$_item->getQty() * 1 ?>
+                <?php else : ?>
                     &nbsp;
                 <?php endif; ?>
             </td>
             <td class="item-price">
-                <?php if ($block->canShowPriceInfo($_item)): ?>
-                    <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
-                <?php else: ?>
+                <?php if ($block->canShowPriceInfo($_item)) : ?>
+                    <?= /* @noEscape */ $block->getItemPrice($_item) ?>
+                <?php else : ?>
                     &nbsp;
                 <?php endif; ?>
             </td>
@@ -71,14 +68,14 @@
 
 <?php endforeach; ?>
 
-<?php if ($_showlastRow): ?>
+<?php if ($_showlastRow) : ?>
     <tr>
         <td colspan="3" class="item-extra">
-            <?php if ($block->getItemOptions()): ?>
+            <?php if ($block->getItemOptions()) : ?>
                 <dl>
-                    <?php foreach ($block->getItemOptions() as $option): ?>
-                        <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
-                                    <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
+                    <?php foreach ($block->getItemOptions() as $option) : ?>
+                        <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
+                                    <dd><?= $block->escapeHtml($option['value']) ?></dd>
                     <?php endforeach; ?>
                 </dl>
             <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml
index ee79ca3b0a7a5..25702ef480cbb 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
 
@@ -14,16 +12,15 @@
 <?php $_index = 0 ?>
 <?php $_order = $block->getItem()->getOrder(); ?>
 
-<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper(Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()) : ?>
     <?php $_showlastRow = true ?>
-<?php else: ?>
+<?php else : ?>
     <?php $_showlastRow = false ?>
 <?php endif; ?>
 
 <?php $_prevOptionId = '' ?>
 
-<?php foreach ($items as $_item): ?>
-
+<?php foreach ($items as $_item) : ?>
     <?php
         // As part of invoice item renderer logic, the order is set on each invoice item.
         // In the case of a bundle product, this template takes over rendering its children,
@@ -31,40 +28,40 @@
         $_item->setOrder($_order);
     ?>
 
-    <?php if ($_item->getOrderItem()->getParentItem()): ?>
+    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
-        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
             <tr class="bundle-option-label">
                 <td colspan="3">
-                    <strong><em><?= /* @escapeNotVerified */  $attributes['option_label'] ?></em></strong>
+                    <strong><em><?= $block->escapeHtml($attributes['option_label']) ?></em></strong>
                 </td>
             </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-    <?php if (!$_item->getOrderItem()->getParentItem()): ?>
+    <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
         <tr class="bundle-item bundle-parent">
             <td class="item-info">
                 <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-                <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+                <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
             </td>
-    <?php else: ?>
+    <?php else : ?>
         <tr class="bundle-item bundle-option-value">
             <td class="item-info">
                 <p><?= $block->getValueHtml($_item) ?></p>
             </td>
     <?php endif; ?>
             <td class="item-qty">
-                <?php if ($block->canShowPriceInfo($_item)): ?>
-                    <?= /* @escapeNotVerified */  $_item->getQty() * 1 ?>
-                <?php else: ?>
+                <?php if ($block->canShowPriceInfo($_item)) : ?>
+                    <?= (float)$_item->getQty() * 1 ?>
+                <?php else : ?>
                     &nbsp;
                 <?php endif; ?>
             </td>
             <td class="item-price">
-                <?php if ($block->canShowPriceInfo($_item)): ?>
-                    <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
-                <?php else: ?>
+                <?php if ($block->canShowPriceInfo($_item)) : ?>
+                    <?= /* @noEscape */ $block->getItemPrice($_item) ?>
+                <?php else : ?>
                     &nbsp;
                 <?php endif; ?>
             </td>
@@ -72,14 +69,14 @@
 
 <?php endforeach; ?>
 
-<?php if ($_showlastRow): ?>
+<?php if ($_showlastRow) : ?>
     <tr>
         <td colspan="3" class="item-extra">
-            <?php if ($block->getItemOptions()): ?>
+            <?php if ($block->getItemOptions()) : ?>
                 <dl>
-                    <?php foreach ($block->getItemOptions() as $option): ?>
-                        <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
-                                    <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
+                    <?php foreach ($block->getItemOptions() as $option) : ?>
+                        <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
+                                    <dd><?= $block->escapeHtml($option['value']) ?></dd>
                     <?php endforeach; ?>
                 </dl>
             <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml
index c9c3103c448e4..b50b455b59a08 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
 <?php $_item = $block->getItem() ?>
@@ -14,41 +12,40 @@
 <?php $parentItem = $block->getItem() ?>
 <?php $items = array_merge([$parentItem], $parentItem->getChildrenItems()); ?>
 
-<?php if ($block->getItemOptions() || $_item->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $_item) && $_item->getGiftMessageId()): ?>
+<?php if ($block->getItemOptions() || $_item->getDescription() || $this->helper(Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order_item', $_item) && $_item->getGiftMessageId()) : ?>
     <?php $_showlastRow = true ?>
-<?php else: ?>
+<?php else : ?>
     <?php $_showlastRow = false ?>
 <?php endif; ?>
 
 <?php $_prevOptionId = '' ?>
 
-<?php foreach ($items as $_item): ?>
-
-    <?php if ($_item->getParentItem()): ?>
+<?php foreach ($items as $_item) : ?>
+    <?php if ($_item->getParentItem()) : ?>
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
-        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
             <tr class="bundle-option-label">
                 <td colspan="3">
-                    <strong><em><?= /* @escapeNotVerified */  $attributes['option_label'] ?></em></strong>
+                    <strong><em><?= $block->escapeHtml($attributes['option_label']) ?></em></strong>
                 </td>
             </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-    <?php if (!$_item->getParentItem()): ?>
+    <?php if (!$_item->getParentItem()) : ?>
         <tr class="bundle-item bundle-parent">
             <td class="item-info">
                 <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-                <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+                <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
             </td>
             <td class="item-qty">
-                <?= /* @escapeNotVerified */  $_item->getQtyOrdered() * 1 ?>
+                <?= (float)$_item->getQtyOrdered() * 1 ?>
             </td>
             <td class="item-price">
-                <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
+                <?= /* @noEscape */ $block->getItemPrice($_item) ?>
             </td>
         </tr>
-    <?php else: ?>
+    <?php else : ?>
         <tr class="bundle-item bundle-option-value">
             <td class="item-info" colspan="3">
                 <p><?= $block->getValueHtml($_item) ?></p>
@@ -58,25 +55,25 @@
 
 <?php endforeach; ?>
 
-<?php if ($_showlastRow): ?>
+<?php if ($_showlastRow) : ?>
     <tr>
         <td colspan="3" class="item-extra">
-            <?php if ($block->getItemOptions()): ?>
+            <?php if ($block->getItemOptions()) : ?>
             <dl>
-                <?php foreach ($block->getItemOptions() as $option): ?>
-                <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
-                            <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
+                <?php foreach ($block->getItemOptions() as $option) : ?>
+                <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
+                            <dd><?= $block->escapeHtml($option['value']) ?></dd>
                 <?php endforeach; ?>
             </dl>
             <?php endif; ?>
-            <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_item->getGiftMessageId())): ?>
+            <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper(Magento\GiftMessage\Helper\Message::class)->getGiftMessage($_item->getGiftMessageId())) : ?>
                 <table class="message-gift">
                     <tr>
                         <td>
-                            <h3><?= /* @escapeNotVerified */  __('Gift Message') ?></h3>
-                            <strong><?= /* @escapeNotVerified */  __('From:') ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-                            <br /><strong><?= /* @escapeNotVerified */  __('To:') ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-                            <br /><strong><?= /* @escapeNotVerified */  __('Message:') ?></strong>
+                            <h3><?= $block->escapeHtml(__('Gift Message')) ?></h3>
+                            <strong><?= $block->escapeHtml(__('From:')) ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
+                            <br /><strong><?= $block->escapeHtml(__('To:')) ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
+                            <br /><strong><?= $block->escapeHtml(__('Message:')) ?></strong>
                             <br /><?= $block->escapeHtml($_giftMessage->getMessage()) ?>
                         </td>
                     </tr>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml
index 61582087d1fcc..e63660802929e 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
 
@@ -14,49 +12,48 @@
 <?php $items = array_merge([$parentItem->getOrderItem()], $parentItem->getOrderItem()->getChildrenItems()) ?>
 <?php $shipItems = $block->getChildren($parentItem) ?>
 
-<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper(Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()) : ?>
     <?php $_showlastRow = true ?>
-<?php else: ?>
+<?php else : ?>
     <?php $_showlastRow = false ?>
 <?php endif; ?>
 
 <?php $_prevOptionId = '' ?>
 
-<?php foreach ($items as $_item): ?>
-
-    <?php if ($_item->getParentItem()): ?>
+<?php foreach ($items as $_item) : ?>
+    <?php if ($_item->getParentItem()) : ?>
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
-        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
             <tr class="bundle-option-label">
                 <td colspan="2">
-                    <strong><em><?= /* @escapeNotVerified */  $attributes['option_label'] ?></em></strong>
+                    <strong><em><?= $block->escapeHtml($attributes['option_label']) ?></em></strong>
                 </td>
             </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-    <?php if (!$_item->getParentItem()): ?>
+    <?php if (!$_item->getParentItem()) : ?>
         <tr class="bundle-item bundle-parent">
             <td class="item-info">
                 <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-                <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+                <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
             </td>
-    <?php else: ?>
+    <?php else : ?>
         <tr class="bundle-item bundle-option-value">
             <td class="item-info">
                 <p><?= $block->getValueHtml($_item) ?></p>
             </td>
     <?php endif; ?>
             <td class="item-qty">
-                <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())): ?>
-                    <?php if (isset($shipItems[$_item->getId()])): ?>
-                        <?= /* @escapeNotVerified */  $shipItems[$_item->getId()]->getQty() * 1 ?>
-                    <?php elseif ($_item->getIsVirtual()): ?>
-                        <?= /* @escapeNotVerified */  __('N/A') ?>
-                    <?php else: ?>
+                <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())) : ?>
+                    <?php if (isset($shipItems[$_item->getId()])) : ?>
+                        <?= (float)$shipItems[$_item->getId()]->getQty() * 1 ?>
+                    <?php elseif ($_item->getIsVirtual()) : ?>
+                        <?= $block->escapeHtml(__('N/A')) ?>
+                    <?php else : ?>
                         0
                     <?php endif; ?>
-                <?php else: ?>
+                <?php else : ?>
                     &nbsp;
                 <?php endif; ?>
             </td>
@@ -64,14 +61,14 @@
 
 <?php endforeach; ?>
 
-<?php if ($_showlastRow): ?>
+<?php if ($_showlastRow) : ?>
     <tr>
         <td colspan="2" class="item-extra">
-            <?php if ($block->getItemOptions()): ?>
+            <?php if ($block->getItemOptions()) : ?>
             <dl>
-                <?php foreach ($block->getItemOptions() as $option): ?>
-                <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
-                            <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
+                <?php foreach ($block->getItemOptions() as $option) : ?>
+                <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
+                            <dd><?= $block->escapeHtml($option['value']) ?></dd>
                 <?php endforeach; ?>
             </dl>
             <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/js/components.phtml b/app/code/Magento/Bundle/view/frontend/templates/js/components.phtml
index bad5acc209b5f..4ca5983081a6f 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/js/components.phtml
@@ -3,8 +3,5 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<?= $block->getChildHtml() ?>
+<?= $block->getChildHtml();
diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml
index b9d075966c5d1..87efa31a06a91 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
 <?php $parentItem = $block->getItem() ?>
@@ -16,91 +14,93 @@
 
 <?php $_prevOptionId = '' ?>
 
-<?php foreach ($items as $_item): ?>
-
-    <?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+<?php foreach ($items as $_item) : ?>
+    <?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper(Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()) : ?>
         <?php $_showlastRow = true ?>
-    <?php else: ?>
+    <?php else : ?>
         <?php $_showlastRow = false ?>
     <?php endif; ?>
 
-    <?php if ($_item->getOrderItem()->getParentItem()): ?>
+    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
-        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
             <tr class="options-label">
-                <td class="col label" colspan="7"><div class="option label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
+                <td class="col label" colspan="7"><div class="option label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
             </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>" class="<?php if ($_item->getOrderItem()->getParentItem()): ?>item-options-container<?php else: ?>item-parent<?php endif; ?>"<?php if ($_item->getParentItem()): ?> data-th="<?= /* @escapeNotVerified */ $attributes['option_label'] ?>"<?php endif; ?>>
-    <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-        <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+<tr id="order-item-row-<?= $block->escapeHtmlAttr($_item->getId()) ?>"
+    class="<?php if ($_item->getOrderItem()->getParentItem()) : ?>item-options-container<?php else : ?>item-parent<?php endif; ?>"
+    <?php if ($_item->getParentItem()) : ?>
+    data-th="<?= $block->escapeHtmlAttr($attributes['option_label']) ?>"<?php endif; ?>>
+    <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
+        <td class="col name" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>">
             <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
         </td>
-    <?php else: ?>
-        <td class="col value" data-th="<?= $block->escapeHtml(__('Product Name')) ?>"><?= $block->getValueHtml($_item) ?></td>
+    <?php else : ?>
+        <td class="col value" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>"><?= $block->getValueHtml($_item) ?></td>
     <?php endif; ?>
-    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= $block->escapeHtml($_item->getSku()) ?></td>
-    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
-        <?php if ($block->canShowPriceInfo($_item)): ?>
+    <td class="col sku" data-th="<?= $block->escapeHtmlAttr(__('SKU')) ?>"><?= $block->escapeHtml($_item->getSku()) ?></td>
+    <td class="col price" data-th="<?= $block->escapeHtmlAttr(__('Price')) ?>">
+        <?php if ($block->canShowPriceInfo($_item)) : ?>
             <?= $block->getItemPriceHtml($_item) ?>
-        <?php else: ?>
+        <?php else : ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col qty" data-th="<?= $block->escapeHtml(__('Quantity')) ?>">
-        <?php if ($block->canShowPriceInfo($_item)): ?>
-            <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
-        <?php else: ?>
+    <td class="col qty" data-th="<?= $block->escapeHtmlAttr(__('Quantity')) ?>">
+        <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?= (float)$_item->getQty() * 1 ?>
+        <?php else : ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
-        <?php if ($block->canShowPriceInfo($_item)): ?>
+    <td class="col subtotal" data-th="<?= $block->escapeHtmlAttr(__('Subtotal')) ?>">
+        <?php if ($block->canShowPriceInfo($_item)) : ?>
             <?= $block->getItemRowTotalHtml($_item) ?>
-        <?php else: ?>
+        <?php else : ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col discount" data-th="<?= $block->escapeHtml(__('Discount Amount')) ?>">
-        <?php if ($block->canShowPriceInfo($_item)): ?>
-            <?= /* @escapeNotVerified */ $block->getOrder()->formatPrice(-$_item->getDiscountAmount()) ?>
-        <?php else: ?>
+    <td class="col discount" data-th="<?= $block->escapeHtmlAttr(__('Discount Amount')) ?>">
+        <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?= $block->escapeHtml($block->getOrder()->formatPrice(-$_item->getDiscountAmount()), ['span']) ?>
+        <?php else : ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col rowtotal" data-th="<?= $block->escapeHtml(__('Row Total')) ?>">
-        <?php if ($block->canShowPriceInfo($_item)): ?>
+    <td class="col rowtotal" data-th="<?= $block->escapeHtmlAttr(__('Row Total')) ?>">
+        <?php if ($block->canShowPriceInfo($_item)) : ?>
             <?= $block->getItemRowTotalAfterDiscountHtml($_item) ?>
-        <?php else: ?>
+        <?php else : ?>
             &nbsp;
         <?php endif; ?>
     </td>
 </tr>
 <?php endforeach; ?>
 
-<?php if ($_showlastRow && (($_options = $block->getItemOptions()) || $block->escapeHtml($_item->getDescription()))): ?>
+<?php if ($_showlastRow && (($_options = $block->getItemOptions()) || $block->escapeHtml($_item->getDescription()))) : ?>
     <tr>
         <td class="col options" colspan="7">
-            <?php if ($_options = $block->getItemOptions()): ?>
+            <?php if ($_options = $block->getItemOptions()) : ?>
                 <dl class="item-options">
                     <?php foreach ($_options as $_option) : ?>
                         <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                        <?php if (!$block->getPrintStatus()): ?>
+                        <?php if (!$block->getPrintStatus()) : ?>
                             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                            <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                                <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
-                                <?php if (isset($_formatedOptionValue['full_view'])): ?>
+                            <dd<?php if (isset($_formatedOptionValue['full_view'])) : ?> class="tooltip wrapper"<?php endif; ?>>
+                                <?= /* @noEscape */ $_formatedOptionValue['value'] ?>
+                                <?php if (isset($_formatedOptionValue['full_view'])) : ?>
                                     <div class="tooltip content">
                                         <dl class="item options">
                                             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
+                                            <dd><?= /* @noEscape */ $_formatedOptionValue['full_view'] ?></dd>
                                         </dl>
                                     </div>
                                 <?php endif; ?>
                             </dd>
-                        <?php else: ?>
+                        <?php else : ?>
                             <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
                         <?php endif; ?>
                     <?php endforeach; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
index e18d75ce77b9c..590ca301c29ff 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
 <?php $parentItem = $block->getItem() ?>
@@ -15,77 +13,79 @@
 <?php $_index = 0 ?>
 
 <?php $_prevOptionId = '' ?>
-<?php foreach ($items as $_item): ?>
-
-    <?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+<?php foreach ($items as $_item) : ?>
+    <?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper(Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()) : ?>
         <?php $_showlastRow = true ?>
-    <?php else: ?>
+    <?php else : ?>
         <?php $_showlastRow = false ?>
     <?php endif; ?>
 
-    <?php if ($_item->getOrderItem()->getParentItem()): ?>
+    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
-        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
             <tr class="options-label">
-                <td class="col label" colspan="5"><div class="option label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
+                <td class="col label" colspan="5"><div class="option label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
             </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-    <tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>" class="<?php if ($_item->getOrderItem()->getParentItem()): ?>item-options-container<?php else: ?>item-parent<?php endif; ?>"<?php if ($_item->getOrderItem()->getParentItem()): ?> data-th="<?= /* @escapeNotVerified */ $attributes['option_label'] ?>"<?php endif; ?>>
-    <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-        <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+    <tr id="order-item-row-<?= $block->escapeHtmlAttr($_item->getId()) ?>"
+        class="<?php if ($_item->getOrderItem()->getParentItem()) : ?>item-options-container<?php else : ?>item-parent<?php endif; ?>"
+        <?php if ($_item->getOrderItem()->getParentItem()) : ?>
+            data-th="<?= $block->escapeHtmlAttr($attributes['option_label']) ?>"<?php endif; ?>>
+    <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
+        <td class="col name" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>">
             <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
         </td>
-    <?php else: ?>
-        <td class="col value" data-th="<?= $block->escapeHtml(__('Product Name')) ?>"><?= $block->getValueHtml($_item) ?></td>
+    <?php else : ?>
+        <td class="col value" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>"><?= $block->getValueHtml($_item) ?></td>
     <?php endif; ?>
-    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= $block->escapeHtml($_item->getSku()) ?></td>
-    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
-        <?php if ($block->canShowPriceInfo($_item)): ?>
+    <td class="col sku" data-th="<?= $block->escapeHtmlAttr(__('SKU')) ?>"><?= $block->escapeHtml($_item->getSku()) ?></td>
+    <td class="col price" data-th="<?= $block->escapeHtmlAttr(__('Price')) ?>">
+        <?php if ($block->canShowPriceInfo($_item)) : ?>
             <?= $block->getItemPriceHtml($_item) ?>
-        <?php else: ?>
+        <?php else : ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Invoiced')) ?>">
-        <?php if ($block->canShowPriceInfo($_item)): ?>
-            <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
-        <?php else: ?>
+    <td class="col qty" data-th="<?= $block->escapeHtmlAttr(__('Qty Invoiced')) ?>">
+        <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?= (float)$_item->getQty() * 1 ?>
+        <?php else : ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
-        <?php if ($block->canShowPriceInfo($_item)): ?>
+    <td class="col subtotal" data-th="<?= $block->escapeHtmlAttr(__('Subtotal')) ?>">
+        <?php if ($block->canShowPriceInfo($_item)) : ?>
             <?= $block->getItemRowTotalHtml($_item) ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
     </tr>
 <?php endforeach; ?>
 
-<?php if ($_showlastRow && (($_options = $block->getItemOptions()) || $block->escapeHtml($_item->getDescription()))): ?>
+<?php if ($_showlastRow && (($_options = $block->getItemOptions()) || $block->escapeHtml($_item->getDescription()))) : ?>
     <tr>
         <td class="col options" colspan="5">
-            <?php if ($_options = $block->getItemOptions()): ?>
+            <?php if ($_options = $block->getItemOptions()) : ?>
                 <dl class="item-options">
                     <?php foreach ($_options as $_option) : ?>
                         <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                        <?php if (!$block->getPrintStatus()): ?>
+                        <?php if (!$block->getPrintStatus()) : ?>
                             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                            <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                                <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
-                                <?php if (isset($_formatedOptionValue['full_view'])): ?>
+                            <dd<?php if (isset($_formatedOptionValue['full_view'])) : ?> class="tooltip wrapper"<?php endif; ?>>
+                                <?= /* @noEscape */ $_formatedOptionValue['value'] ?>
+                                <?php if (isset($_formatedOptionValue['full_view'])) : ?>
                                     <div class="tooltip content">
                                         <dl class="item options">
                                             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
+                                            <dd><?= /* @noEscape */ $_formatedOptionValue['full_view'] ?></dd>
                                         </dl>
                                     </div>
                                 <?php endif; ?>
                             </dd>
-                        <?php else: ?>
+                        <?php else : ?>
                             <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
                         <?php endif; ?>
                     <?php endforeach; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
index 063d66edb9e70..0a946a2522ed9 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
@@ -3,133 +3,149 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */
+$parentItem = $block->getItem();
+$items = array_merge([$parentItem], $parentItem->getChildrenItems());
+$index = 0;
+$prevOptionId = '';
 ?>
-<?php $parentItem = $block->getItem() ?>
-<?php $items = array_merge([$parentItem], $parentItem->getChildrenItems()); ?>
-<?php $_index = 0 ?>
-
-<?php $_prevOptionId = '' ?>
-
-<?php foreach ($items as $_item): ?>
 
-    <?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-        <?php $_showlastRow = true ?>
-    <?php else: ?>
-        <?php $_showlastRow = false ?>
+<?php foreach ($items as $item) : ?>
+    <?php if ($block->getItemOptions()
+        || $parentItem->getDescription()
+        || $this->helper(Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order_item', $parentItem)
+        && $parentItem->getGiftMessageId()) : ?>
+        <?php $showLastRow = true; ?>
+    <?php else : ?>
+        <?php $showLastRow = false; ?>
     <?php endif; ?>
 
-    <?php if ($_item->getParentItem()): ?>
-        <?php $attributes = $block->getSelectionAttributes($_item) ?>
-        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+    <?php if ($item->getParentItem()) : ?>
+        <?php $attributes = $block->getSelectionAttributes($item) ?>
+        <?php if ($prevOptionId != $attributes['option_id']) : ?>
             <tr class="options-label">
-                <td class="col label" colspan="5"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></td>
+                <td class="col label" colspan="5"><?= $block->escapeHtml($attributes['option_label']); ?></td>
             </tr>
-            <?php $_prevOptionId = $attributes['option_id'] ?>
+            <?php $prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>" class="<?php if ($_item->getParentItem()): ?>item-options-container<?php else: ?>item-parent<?php endif; ?>"<?php if ($_item->getParentItem()): ?> data-th="<?= /* @escapeNotVerified */ $attributes['option_label'] ?>"<?php endif; ?>>
-    <?php if (!$_item->getParentItem()): ?>
-        <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
-            <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
+<tr id="order-item-row-<?= /* @noEscape */ $item->getId() ?>"
+    class="<?php if ($item->getParentItem()) : ?>
+        item-options-container
+    <?php else : ?>
+        item-parent
+    <?php endif; ?>"
+    <?php if ($item->getParentItem()) : ?>
+        data-th="<?= $block->escapeHtmlAttr($attributes['option_label']); ?>"
+    <?php endif; ?>>
+    <?php if (!$item->getParentItem()) : ?>
+        <td class="col name" data-th="<?= $block->escapeHtmlAttr(__('Product Name')); ?>">
+            <strong class="product name product-item-name"><?= $block->escapeHtml($item->getName()); ?></strong>
+        </td>
+    <?php else : ?>
+        <td class="col value" data-th="<?= $block->escapeHtmlAttr(__('Product Name')); ?>">
+            <?= $block->getValueHtml($item); ?>
         </td>
-    <?php else: ?>
-        <td class="col value" data-th="<?= $block->escapeHtml(__('Product Name')) ?>"><?= $block->getValueHtml($_item) ?></td>
     <?php endif; ?>
-    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($_item->getSku()) ?></td>
-    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
-        <?php if (!$_item->getParentItem()): ?>
-            <?= $block->getItemPriceHtml() ?>
-        <?php else: ?>
+    <td class="col sku" data-th="<?= $block->escapeHtmlAttr(__('SKU')); ?>">
+        <?= /* @noEscape */ $block->prepareSku($item->getSku()); ?>
+    </td>
+    <td class="col price" data-th="<?= $block->escapeHtmlAttr(__('Price')); ?>">
+        <?php if (!$item->getParentItem()) : ?>
+            <?= /* @noEscape */ $block->getItemPriceHtml(); ?>
+        <?php else : ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col qty" data-th="<?= $block->escapeHtml(__('Quantity')) ?>">
-        <?php if (
-        ($_item->getParentItem() && $block->isChildCalculated()) ||
-        (!$_item->getParentItem() && !$block->isChildCalculated()) || ($_item->getQtyShipped() > 0 && $_item->getParentItem() && $block->isShipmentSeparately())):?>
+    <td class="col qty" data-th="<?= $block->escapeHtmlAttr(__('Quantity')); ?>">
+        <?php if (($item->getParentItem() && $block->isChildCalculated()) ||
+        (!$item->getParentItem() && !$block->isChildCalculated()) ||
+        ($item->getQtyShipped() > 0 && $item->getParentItem() && $block->isShipmentSeparately())) : ?>
             <ul class="items-qty">
         <?php endif; ?>
-        <?php if (($_item->getParentItem() && $block->isChildCalculated()) ||
-            (!$_item->getParentItem() && !$block->isChildCalculated())): ?>
-            <?php if ($_item->getQtyOrdered() > 0): ?>
+        <?php if (($item->getParentItem() && $block->isChildCalculated()) ||
+            (!$item->getParentItem() && !$block->isChildCalculated())) : ?>
+            <?php if ($item->getQtyOrdered() > 0) : ?>
                 <li class="item">
-                    <span class="title"><?= /* @escapeNotVerified */ __('Ordered') ?></span>
-                    <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyOrdered()*1 ?></span>
+                    <span class="title"><?= $block->escapeHtml(__('Ordered')); ?></span>
+                    <span class="content"><?= /* @noEscape */ $item->getQtyOrdered() * 1; ?></span>
                 </li>
             <?php endif; ?>
-            <?php if ($_item->getQtyShipped() > 0 && !$block->isShipmentSeparately()): ?>
+            <?php if ($item->getQtyShipped() > 0 && !$block->isShipmentSeparately()) : ?>
                 <li class="item">
-                    <span class="title"><?= /* @escapeNotVerified */ __('Shipped') ?></span>
-                    <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyShipped()*1 ?></span>
+                    <span class="title"><?= $block->escapeHtml(__('Shipped')); ?></span>
+                    <span class="content"><?= /* @noEscape */ $item->getQtyShipped() * 1; ?></span>
                 </li>
             <?php endif; ?>
-            <?php if ($_item->getQtyCanceled() > 0): ?>
+            <?php if ($item->getQtyCanceled() > 0) : ?>
                 <li class="item">
-                    <span class="title"><?= /* @escapeNotVerified */ __('Canceled') ?></span>
-                    <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyCanceled()*1 ?></span>
+                    <span class="title"><?= $block->escapeHtml(__('Canceled')); ?></span>
+                    <span class="content"><?= /* @noEscape */ $item->getQtyCanceled() * 1; ?></span>
                 </li>
             <?php endif; ?>
-            <?php if ($_item->getQtyRefunded() > 0): ?>
+            <?php if ($item->getQtyRefunded() > 0) : ?>
                 <li class="item">
-                    <span class="title"><?= /* @escapeNotVerified */ __('Refunded') ?></span>
-                    <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyRefunded()*1 ?></span>
+                    <span class="title"><?= $block->escapeHtml(__('Refunded')); ?></span>
+                    <span class="content"><?= /* @noEscape */ $item->getQtyRefunded() * 1; ?></span>
                 </li>
             <?php endif; ?>
-        <?php elseif ($_item->getQtyShipped() > 0 && $_item->getParentItem() && $block->isShipmentSeparately()): ?>
+        <?php elseif ($item->getQtyShipped() > 0 && $item->getParentItem() && $block->isShipmentSeparately()) : ?>
             <li class="item">
-                <span class="title"><?= /* @escapeNotVerified */ __('Shipped') ?></span>
-                <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyShipped()*1 ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Shipped')); ?></span>
+                <span class="content"><?= /* @noEscape */ $item->getQtyShipped() * 1; ?></span>
             </li>
-        <?php else: ?>
-            &nbsp;
+        <?php else : ?>
+            <span class="content"><?= /* @noEscape */ $parentItem->getQtyOrdered() * 1; ?></span>
         <?php endif; ?>
-        <?php if (
-        ($_item->getParentItem() && $block->isChildCalculated()) ||
-        (!$_item->getParentItem() && !$block->isChildCalculated()) || ($_item->getQtyShipped() > 0 && $_item->getParentItem() && $block->isShipmentSeparately())):?>
+        <?php if (($item->getParentItem() && $block->isChildCalculated()) ||
+        (!$item->getParentItem() && !$block->isChildCalculated()) ||
+        ($item->getQtyShipped() > 0 && $item->getParentItem() && $block->isShipmentSeparately())) :?>
             </ul>
         <?php endif; ?>
     </td>
-    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
-        <?php if (!$_item->getParentItem()): ?>
-            <?= $block->getItemRowTotalHtml() ?>
-        <?php else: ?>
+    <td class="col subtotal" data-th="<?= $block->escapeHtmlAttr(__('Subtotal')) ?>">
+        <?php if (!$item->getParentItem()) : ?>
+            <?= /* @noEscape */ $block->getItemRowTotalHtml(); ?>
+        <?php else : ?>
             &nbsp;
         <?php endif; ?>
     </td>
 </tr>
 <?php endforeach; ?>
 
-<?php if ($_showlastRow && (($_options = $block->getItemOptions()) || $block->escapeHtml($_item->getDescription()))): ?>
+<?php if ($showLastRow && (($options = $block->getItemOptions()) || $block->escapeHtml($item->getDescription()))) : ?>
 <tr>
     <td class="col options" colspan="5">
-        <?php if ($_options = $block->getItemOptions()): ?>
+        <?php if ($options = $block->getItemOptions()) : ?>
             <dl class="item-options">
-                <?php foreach ($_options as $_option) : ?>
-                    <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                    <?php if (!$block->getPrintStatus()): ?>
-                        <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                        <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                            <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
-                            <?php if (isset($_formatedOptionValue['full_view'])): ?>
+                <?php foreach ($options as $option) : ?>
+                    <dt><?= $block->escapeHtml($option['label']) ?></dt>
+                    <?php if (!$block->getPrintStatus()) : ?>
+                        <?php $formattedOptionValue = $block->getFormatedOptionValue($option) ?>
+                        <dd<?php if (isset($formattedOptionValue['full_view'])) : ?>
+                            class="tooltip wrapper"
+                        <?php endif; ?>>
+                            <?= /* @noEscape */ $formattedOptionValue['value'] ?>
+                            <?php if (isset($formattedOptionValue['full_view'])) : ?>
                                 <div class="tooltip content">
                                     <dl class="item options">
-                                        <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                                        <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
+                                        <dt><?= $block->escapeHtml($option['label']); ?></dt>
+                                        <dd><?= /* @noEscape */ $formattedOptionValue['full_view']; ?></dd>
                                     </dl>
                                 </div>
                             <?php endif; ?>
                         </dd>
-                    <?php else: ?>
-                        <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
+                    <?php else : ?>
+                        <dd><?= $block->escapeHtml((isset($option['print_value']) ?
+                                $option['print_value'] :
+                                $option['value'])); ?>
+                        </dd>
                     <?php endif; ?>
                 <?php endforeach; ?>
             </dl>
         <?php endif; ?>
-        <?= $block->escapeHtml($_item->getDescription()) ?>
+        <?= $block->escapeHtml($item->getDescription()); ?>
     </td>
 </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml
index 0cd39156b2513..ae6e12b80d54e 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */ ?>
 
@@ -16,69 +14,71 @@
 
 <?php $_prevOptionId = '' ?>
 
-<?php foreach ($items as $_item): ?>
-
-    <?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+<?php foreach ($items as $_item) : ?>
+    <?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper(Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()) : ?>
         <?php $_showlastRow = true ?>
-    <?php else: ?>
+    <?php else : ?>
         <?php $_showlastRow = false ?>
     <?php endif; ?>
 
-    <?php if ($_item->getParentItem()): ?>
+    <?php if ($_item->getParentItem()) : ?>
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
-        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
             <tr class="options-label">
-                <td colspan="3" class="col label"><div class="option label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
+                <td colspan="3" class="col label"><div class="option label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
             </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-    <tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>" class="<?php if ($_item->getParentItem()): ?>item-options-container<?php else: ?>item-parent<?php endif; ?>"<?php if ($_item->getParentItem()): ?> data-th="<?= /* @escapeNotVerified */ $attributes['option_label'] ?>"<?php endif; ?>>
-        <?php if (!$_item->getParentItem()): ?>
-            <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+    <tr id="order-item-row-<?= $block->escapeHtmlAttr($_item->getId()) ?>"
+        class="<?php if ($_item->getParentItem()) : ?>item-options-container<?php else : ?>item-parent<?php endif; ?>"
+        <?php if ($_item->getParentItem()) : ?>
+            data-th="<?= $block->escapeHtmlAttr($attributes['option_label']) ?>"<?php endif; ?>>
+        <?php if (!$_item->getParentItem()) : ?>
+            <td class="col name" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>">
                 <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
             </td>
-        <?php else: ?>
-            <td class="col value" data-th="<?= $block->escapeHtml(__('Product Name')) ?>"><?= $block->getValueHtml($_item) ?></td>
+        <?php else : ?>
+            <td class="col value" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>"><?= $block->getValueHtml($_item) ?></td>
         <?php endif; ?>
-        <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= $block->escapeHtml($_item->getSku()) ?></td>
-        <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Shipped')) ?>">
-            <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())): ?>
-                <?php if (isset($shipItems[$_item->getId()])): ?>
-                    <?= /* @escapeNotVerified */ $shipItems[$_item->getId()]->getQty()*1 ?>
-                <?php elseif ($_item->getIsVirtual()): ?>
-                    <?= /* @escapeNotVerified */ __('N/A') ?>
-                <?php else: ?>
+        <td class="col sku" data-th="<?= $block->escapeHtmlAttr(__('SKU')) ?>"><?= $block->escapeHtml($_item->getSku()) ?></td>
+        <td class="col qty" data-th="<?= $block->escapeHtmlAttr(__('Qty Shipped')) ?>">
+            <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())) : ?>
+                <?php if (isset($shipItems[$_item->getId()])) : ?>
+                    <?= (float)$shipItems[$_item->getId()]->getQty() * 1 ?>
+                <?php elseif ($_item->getIsVirtual()) : ?>
+                    <?= $block->escapeHtml(__('N/A')) ?>
+                <?php else : ?>
                     0
                 <?php endif; ?>
-            <?php else: ?>
+            <?php else : ?>
                 &nbsp;
             <?php endif; ?>
         </td>
     </tr>
 <?php endforeach; ?>
 
-<?php if ($_showlastRow && (($_options = $block->getItemOptions()) || $block->escapeHtml($_item->getDescription()))): ?>
+<?php if ($_showlastRow && (($_options = $block->getItemOptions()) || $block->escapeHtml($_item->getDescription()))) : ?>
     <tr>
         <td class="col options" colspan="3">
-            <?php if ($_options = $block->getItemOptions()): ?>
+            <?php if ($_options = $block->getItemOptions()) : ?>
                 <dl class="item-options">
                     <?php foreach ($_options as $_option) : ?>
                         <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                        <?php if (!$block->getPrintStatus()): ?>
+                        <?php if (!$block->getPrintStatus()) : ?>
                             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                            <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                                <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
-                                <?php if (isset($_formatedOptionValue['full_view'])): ?>
+                            <dd<?php if (isset($_formatedOptionValue['full_view'])) : ?> class="tooltip wrapper"<?php endif; ?>>
+                                <?= /* @noEscape */ $_formatedOptionValue['value'] ?>
+                                <?php if (isset($_formatedOptionValue['full_view'])) : ?>
                                     <div class="tooltip content">
                                         <dl class="item options">
                                             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
+                                            <dd><?= /* @noEscape */ $_formatedOptionValue['full_view'] ?></dd>
                                         </dl>
                                     </div>
                                 <?php endif; ?>
                             </dd>
-                        <?php else: ?>
+                        <?php else : ?>
                             <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
                         <?php endif; ?>
                     <?php endforeach; ?>
diff --git a/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php b/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php
index 773fa6a5349a5..59a704d5305e4 100644
--- a/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php
+++ b/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php
@@ -242,7 +242,7 @@ public function testSaveData($skus, $bunch, $allowImport)
                         'price_type' => 'fixed',
                         'shipment_type' => '1',
                         'default_qty' => '1',
-                        'is_defaul' => '1',
+                        'is_default' => '1',
                         'position' => '1',
                         'option_id' => '1']
                 ]
@@ -264,7 +264,7 @@ public function testSaveData($skus, $bunch, $allowImport)
                         'price_type' => 'percent',
                         'shipment_type' => 0,
                         'default_qty' => '2',
-                        'is_defaul' => '1',
+                        'is_default' => '1',
                         'position' => '6',
                         'option_id' => '6']
                 ]
@@ -324,7 +324,7 @@ public function saveDataProvider()
                          . 'price_type=fixed,'
                          . 'shipment_type=separately,'
                          . 'default_qty=1,'
-                         . 'is_defaul=1,'
+                         . 'is_default=1,'
                          . 'position=1,'
                          . 'option_id=1 | name=Bundle2,'
                          . 'type=dropdown,'
@@ -333,7 +333,7 @@ public function saveDataProvider()
                          . 'price=10,'
                          . 'price_type=fixed,'
                          . 'default_qty=1,'
-                         . 'is_defaul=1,'
+                         . 'is_default=1,'
                          . 'position=2,'
                          . 'option_id=2'
                 ],
diff --git a/app/code/Magento/BundleImportExport/composer.json b/app/code/Magento/BundleImportExport/composer.json
index b21da5c7ae5b9..ac28ca62e3563 100644
--- a/app/code/Magento/BundleImportExport/composer.json
+++ b/app/code/Magento/BundleImportExport/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-bundle-import-export",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-catalog": "102.0.*",
         "magento/module-import-export": "100.2.*",
         "magento/module-catalog-import-export": "100.2.*",
@@ -12,7 +12,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
index 8acf170d43cfb..8e0c00b587460 100644
--- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
+++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
@@ -7,6 +7,9 @@
 
 use Magento\Framework\Cache\InvalidateLogger;
 
+/**
+ * Purge cache action.
+ */
 class PurgeCache
 {
     const HEADER_X_MAGENTO_TAGS_PATTERN = 'X-Magento-Tags-Pattern';
@@ -26,6 +29,18 @@ class PurgeCache
      */
     private $logger;
 
+    /**
+     * Batch size of the purge request.
+     *
+     * Based on default Varnish 4 http_req_hdr_len size minus a 512 bytes margin for method,
+     * header name, line feeds etc.
+     *
+     * @see https://varnish-cache.org/docs/4.1/reference/varnishd.html
+     *
+     * @var int
+     */
+    private $requestSize = 7680;
+
     /**
      * Constructor
      *
@@ -44,18 +59,68 @@ public function __construct(
     }
 
     /**
-     * Send curl purge request
-     * to invalidate cache by tags pattern
+     * Send curl purge request to invalidate cache by tags pattern.
      *
      * @param string $tagsPattern
      * @return bool Return true if successful; otherwise return false
      */
     public function sendPurgeRequest($tagsPattern)
     {
+        $successful = true;
         $socketAdapter = $this->socketAdapterFactory->create();
         $servers = $this->cacheServer->getUris();
-        $headers = [self::HEADER_X_MAGENTO_TAGS_PATTERN => $tagsPattern];
         $socketAdapter->setOptions(['timeout' => 10]);
+
+        $formattedTagsChunks = $this->splitTags($tagsPattern);
+        foreach ($formattedTagsChunks as $formattedTagsChunk) {
+            if (!$this->sendPurgeRequestToServers($socketAdapter, $servers, $formattedTagsChunk)) {
+                $successful = false;
+            }
+        }
+
+        return $successful;
+    }
+
+    /**
+     * Split tags by batches
+     *
+     * @param string $tagsPattern
+     * @return \Generator
+     */
+    private function splitTags(string $tagsPattern) : \Generator
+    {
+        $tagsBatchSize = 0;
+        $formattedTagsChunk = [];
+        $formattedTags = explode('|', $tagsPattern);
+        foreach ($formattedTags as $formattedTag) {
+            if ($tagsBatchSize + strlen($formattedTag) > $this->requestSize - count($formattedTagsChunk) - 1) {
+                yield implode('|', $formattedTagsChunk);
+                $formattedTagsChunk = [];
+                $tagsBatchSize = 0;
+            }
+
+            $tagsBatchSize += strlen($formattedTag);
+            $formattedTagsChunk[] = $formattedTag;
+        }
+        if (!empty($formattedTagsChunk)) {
+            yield implode('|', $formattedTagsChunk);
+        }
+    }
+
+    /**
+     * Send curl purge request to servers to invalidate cache by tags pattern.
+     *
+     * @param \Zend\Http\Client\Adapter\Socket $socketAdapter
+     * @param \Zend\Uri\Uri[] $servers
+     * @param string $formattedTagsChunk
+     * @return bool Return true if successful; otherwise return false
+     */
+    private function sendPurgeRequestToServers(
+        \Zend\Http\Client\Adapter\Socket $socketAdapter,
+        array $servers,
+        string $formattedTagsChunk
+    ): bool {
+        $headers = [self::HEADER_X_MAGENTO_TAGS_PATTERN => $formattedTagsChunk];
         foreach ($servers as $server) {
             $headers['Host'] = $server->getHost();
             try {
@@ -69,12 +134,13 @@ public function sendPurgeRequest($tagsPattern)
                 $socketAdapter->read();
                 $socketAdapter->close();
             } catch (\Exception $e) {
-                $this->logger->critical($e->getMessage(), compact('server', 'tagsPattern'));
+                $this->logger->critical($e->getMessage(), compact('server', 'formattedTagsChunk'));
+
                 return false;
             }
         }
+        $this->logger->execute(compact('servers', 'formattedTagsChunk'));
 
-        $this->logger->execute(compact('servers', 'tagsPattern'));
         return true;
     }
 }
diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json
index 825c9937c16d1..c03443310d594 100644
--- a/app/code/Magento/CacheInvalidate/composer.json
+++ b/app/code/Magento/CacheInvalidate/composer.json
@@ -2,12 +2,12 @@
     "name": "magento/module-cache-invalidate",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-page-cache": "100.2.*",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Captcha/Controller/Refresh/Index.php b/app/code/Magento/Captcha/Controller/Refresh/Index.php
index e89a80646ed8e..3f831606570ca 100644
--- a/app/code/Magento/Captcha/Controller/Refresh/Index.php
+++ b/app/code/Magento/Captcha/Controller/Refresh/Index.php
@@ -40,10 +40,15 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         $formId = $this->_request->getPost('formId');
         if (null === $formId) {
             $params = [];
@@ -51,7 +56,7 @@ public function execute()
             if ($content) {
                 $params = $this->serializer->unserialize($content);
             }
-            $formId = isset($params['formId']) ? $params['formId'] : null;
+            $formId = $params['formId'] ?? null;
         }
         $captchaModel = $this->captchaHelper->getCaptcha($formId);
         $captchaModel->generate();
diff --git a/app/code/Magento/Captcha/Test/Unit/Controller/Refresh/IndexTest.php b/app/code/Magento/Captcha/Test/Unit/Controller/Refresh/IndexTest.php
index 99ac2e2d8fccc..ee97c11a58315 100644
--- a/app/code/Magento/Captcha/Test/Unit/Controller/Refresh/IndexTest.php
+++ b/app/code/Magento/Captcha/Test/Unit/Controller/Refresh/IndexTest.php
@@ -95,6 +95,7 @@ public function testExecute($formId, $callsNumber)
         $blockMethods = ['setFormId', 'setIsAjax', 'toHtml'];
         $blockMock = $this->createPartialMock(\Magento\Captcha\Block\Captcha::class, $blockMethods);
 
+        $this->requestMock->expects($this->once())->method('isPost')->willReturn(true);
         $this->requestMock->expects($this->any())->method('getPost')->with('formId')->will($this->returnValue($formId));
         $this->requestMock->expects($this->exactly($callsNumber))->method('getContent')
             ->will($this->returnValue(json_encode($content)));
diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
index a8a63e19e67df..398088624cfaa 100644
--- a/app/code/Magento/Captcha/composer.json
+++ b/app/code/Magento/Captcha/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-captcha",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-customer": "101.0.*",
         "magento/module-checkout": "100.2.*",
@@ -13,7 +13,7 @@
         "zendframework/zend-session": "^2.7.3"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Catalog/Api/Data/CategoryInterface.php b/app/code/Magento/Catalog/Api/Data/CategoryInterface.php
index b65cdafbe26f4..cf5e49c954b43 100644
--- a/app/code/Magento/Catalog/Api/Data/CategoryInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/CategoryInterface.php
@@ -43,7 +43,7 @@ public function setParentId($parentId);
     /**
      * Get category name
      *
-     * @return string
+     * @return string|null
      */
     public function getName();
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
index 331679874629b..bfeab3f71ebc1 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
@@ -7,6 +7,11 @@
 
 use Magento\Framework\Data\Tree\Node;
 use Magento\Store\Model\Store;
+use Magento\Framework\Registry;
+use Magento\Catalog\Model\ResourceModel\Category\Tree;
+use Magento\Catalog\Model\CategoryFactory;
+use Magento\Backend\Block\Template\Context;
+use Magento\Catalog\Model\Category;
 
 /**
  * Class AbstractCategory
@@ -16,17 +21,17 @@ class AbstractCategory extends \Magento\Backend\Block\Template
     /**
      * Core registry
      *
-     * @var \Magento\Framework\Registry
+     * @var Registry
      */
     protected $_coreRegistry = null;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Category\Tree
+     * @var Tree
      */
     protected $_categoryTree;
 
     /**
-     * @var \Magento\Catalog\Model\CategoryFactory
+     * @var CategoryFactory
      */
     protected $_categoryFactory;
 
@@ -36,17 +41,17 @@ class AbstractCategory extends \Magento\Backend\Block\Template
     protected $_withProductCount;
 
     /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Catalog\Model\ResourceModel\Category\Tree $categoryTree
-     * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
+     * @param Context $context
+     * @param Tree $categoryTree
+     * @param Registry $registry
+     * @param CategoryFactory $categoryFactory
      * @param array $data
      */
     public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Catalog\Model\ResourceModel\Category\Tree $categoryTree,
-        \Magento\Framework\Registry $registry,
-        \Magento\Catalog\Model\CategoryFactory $categoryFactory,
+        Context $context,
+        Tree $categoryTree,
+        Registry $registry,
+        CategoryFactory $categoryFactory,
         array $data = []
     ) {
         $this->_categoryTree = $categoryTree;
@@ -67,36 +72,47 @@ public function getCategory()
     }
 
     /**
+     * Get category id
+     *
      * @return int|string|null
      */
     public function getCategoryId()
     {
         if ($this->getCategory()) {
-            return $this->getCategory()->getId();
+            return $this->getCategory()
+                ->getId();
         }
-        return \Magento\Catalog\Model\Category::TREE_ROOT_ID;
+        return Category::TREE_ROOT_ID;
     }
 
     /**
+     * Get category name
+     *
      * @return string
      */
     public function getCategoryName()
     {
-        return $this->getCategory()->getName();
+        return $this->getCategory()
+            ->getName();
     }
 
     /**
+     * Get category path
+     *
      * @return mixed
      */
     public function getCategoryPath()
     {
         if ($this->getCategory()) {
-            return $this->getCategory()->getPath();
+            return $this->getCategory()
+                ->getPath();
         }
-        return \Magento\Catalog\Model\Category::TREE_ROOT_ID;
+        return Category::TREE_ROOT_ID;
     }
 
     /**
+     * Check store root category
+     *
      * @return bool
      */
     public function hasStoreRootCategory()
@@ -109,15 +125,20 @@ public function hasStoreRootCategory()
     }
 
     /**
+     * Get store from request
+     *
      * @return Store
      */
     public function getStore()
     {
-        $storeId = (int)$this->getRequest()->getParam('store');
+        $storeId = (int)$this->getRequest()
+            ->getParam('store');
         return $this->_storeManager->getStore($storeId);
     }
 
     /**
+     * Get root category for tree
+     *
      * @param mixed|null $parentNodeCategory
      * @param int $recursionLevel
      * @return Node|array|null
@@ -130,13 +151,14 @@ public function getRoot($parentNodeCategory = null, $recursionLevel = 3)
         }
         $root = $this->_coreRegistry->registry('root');
         if ($root === null) {
-            $storeId = (int)$this->getRequest()->getParam('store');
+            $storeId = (int)$this->getRequest()
+                ->getParam('store');
 
             if ($storeId) {
                 $store = $this->_storeManager->getStore($storeId);
                 $rootId = $store->getRootCategoryId();
             } else {
-                $rootId = \Magento\Catalog\Model\Category::TREE_ROOT_ID;
+                $rootId = Category::TREE_ROOT_ID;
             }
 
             $tree = $this->_categoryTree->load(null, $recursionLevel);
@@ -149,10 +171,11 @@ public function getRoot($parentNodeCategory = null, $recursionLevel = 3)
 
             $root = $tree->getNodeById($rootId);
 
-            if ($root && $rootId != \Magento\Catalog\Model\Category::TREE_ROOT_ID) {
+            if ($root) {
                 $root->setIsVisible(true);
-            } elseif ($root && $root->getId() == \Magento\Catalog\Model\Category::TREE_ROOT_ID) {
-                $root->setName(__('Root'));
+                if ($root->getId() == Category::TREE_ROOT_ID) {
+                    $root->setName(__('Root'));
+                }
             }
 
             $this->_coreRegistry->register('root', $root);
@@ -162,22 +185,28 @@ public function getRoot($parentNodeCategory = null, $recursionLevel = 3)
     }
 
     /**
+     * Get Default Store Id
+     *
      * @return int
      */
     protected function _getDefaultStoreId()
     {
-        return \Magento\Store\Model\Store::DEFAULT_STORE_ID;
+        return Store::DEFAULT_STORE_ID;
     }
 
     /**
+     * Get category collection
+     *
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
      */
     public function getCategoryCollection()
     {
-        $storeId = $this->getRequest()->getParam('store', $this->_getDefaultStoreId());
+        $storeId = $this->getRequest()
+            ->getParam('store', $this->_getDefaultStoreId());
         $collection = $this->getData('category_collection');
         if ($collection === null) {
-            $collection = $this->_categoryFactory->create()->getCollection();
+            $collection = $this->_categoryFactory->create()
+                ->getCollection();
 
             $collection->addAttributeToSelect(
                 'name'
@@ -212,11 +241,11 @@ public function getRootByIds($ids)
         if (null === $root) {
             $ids = $this->_categoryTree->getExistingCategoryIdsBySpecifiedIds($ids);
             $tree = $this->_categoryTree->loadByIds($ids);
-            $rootId = \Magento\Catalog\Model\Category::TREE_ROOT_ID;
+            $rootId = Category::TREE_ROOT_ID;
             $root = $tree->getNodeById($rootId);
-            if ($root && $rootId != \Magento\Catalog\Model\Category::TREE_ROOT_ID) {
+            if ($root && $rootId != Category::TREE_ROOT_ID) {
                 $root->setIsVisible(true);
-            } elseif ($root && $root->getId() == \Magento\Catalog\Model\Category::TREE_ROOT_ID) {
+            } elseif ($root && $root->getId() == Category::TREE_ROOT_ID) {
                 $root->setName(__('Root'));
             }
 
@@ -227,6 +256,8 @@ public function getRootByIds($ids)
     }
 
     /**
+     * Get category node for tree
+     *
      * @param mixed $parentNodeCategory
      * @param int $recursionLevel
      * @return Node
@@ -237,9 +268,9 @@ public function getNode($parentNodeCategory, $recursionLevel = 2)
         $node = $this->_categoryTree->loadNode($nodeId);
         $node->loadChildren($recursionLevel);
 
-        if ($node && $nodeId != \Magento\Catalog\Model\Category::TREE_ROOT_ID) {
+        if ($node && $nodeId != Category::TREE_ROOT_ID) {
             $node->setIsVisible(true);
-        } elseif ($node && $node->getId() == \Magento\Catalog\Model\Category::TREE_ROOT_ID) {
+        } elseif ($node && $node->getId() == Category::TREE_ROOT_ID) {
             $node->setName(__('Root'));
         }
 
@@ -249,17 +280,26 @@ public function getNode($parentNodeCategory, $recursionLevel = 2)
     }
 
     /**
+     * Get category save url
+     *
      * @param array $args
      * @return string
      */
     public function getSaveUrl(array $args = [])
     {
-        $params = ['_current' => false, '_query' => false, 'store' => $this->getStore()->getId()];
+        $params = [
+            '_current' => false,
+            '_query' => false,
+            'store' => $this->getStore()
+                ->getId()
+        ];
         $params = array_merge($params, $args);
         return $this->getUrl('catalog/*/save', $params);
     }
 
     /**
+     * Get category edit url
+     *
      * @return string
      */
     public function getEditUrl()
@@ -279,7 +319,7 @@ public function getRootIds()
     {
         $ids = $this->getData('root_ids');
         if ($ids === null) {
-            $ids = [\Magento\Catalog\Model\Category::TREE_ROOT_ID];
+            $ids = [Category::TREE_ROOT_ID];
             foreach ($this->_storeManager->getGroups() as $store) {
                 $ids[] = $store->getRootCategoryId();
             }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php
index 20411a4c4d767..2eef1188e3910 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php
@@ -27,7 +27,8 @@ public function getButtonData()
             return [
                 'id' => 'delete',
                 'label' => __('Delete'),
-                'on_click' => "categoryDelete('" . $this->getDeleteUrl() . "')",
+                'on_click' => "deleteConfirm('" .__('Are you sure you want to delete this category?') ."', '"
+                    . $this->getDeleteUrl() . "', {data: {}})",
                 'class' => 'delete',
                 'sort_order' => 10
             ];
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
index ed615b41644e2..a7bb242daf86f 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -73,7 +73,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -82,7 +82,7 @@ protected function _construct()
     }
 
     /**
-     * @return $this
+     * @inheritdoc
      */
     protected function _prepareLayout()
     {
@@ -182,6 +182,8 @@ public function getSuggestedCategoriesJson($namePart)
     }
 
     /**
+     * Get add root button html
+     *
      * @return string
      */
     public function getAddRootButtonHtml()
@@ -190,6 +192,8 @@ public function getAddRootButtonHtml()
     }
 
     /**
+     * Get add sub button html
+     *
      * @return string
      */
     public function getAddSubButtonHtml()
@@ -198,6 +202,8 @@ public function getAddSubButtonHtml()
     }
 
     /**
+     * Get expand button html
+     *
      * @return string
      */
     public function getExpandButtonHtml()
@@ -206,6 +212,8 @@ public function getExpandButtonHtml()
     }
 
     /**
+     * Get collapse button html
+     *
      * @return string
      */
     public function getCollapseButtonHtml()
@@ -214,6 +222,8 @@ public function getCollapseButtonHtml()
     }
 
     /**
+     * Get store switcher
+     *
      * @return string
      */
     public function getStoreSwitcherHtml()
@@ -222,6 +232,8 @@ public function getStoreSwitcherHtml()
     }
 
     /**
+     * Get loader tree url
+     *
      * @param bool|null $expanded
      * @return string
      */
@@ -235,6 +247,8 @@ public function getLoadTreeUrl($expanded = null)
     }
 
     /**
+     * Get nodes url
+     *
      * @return string
      */
     public function getNodesUrl()
@@ -243,6 +257,8 @@ public function getNodesUrl()
     }
 
     /**
+     * Get switcher tree url
+     *
      * @return string
      */
     public function getSwitchTreeUrl()
@@ -254,6 +270,8 @@ public function getSwitchTreeUrl()
     }
 
     /**
+     * Get is was expanded
+     *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
@@ -263,7 +281,10 @@ public function getIsWasExpanded()
     }
 
     /**
+     * Get move url
+     *
      * @return string
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getMoveUrl()
     {
@@ -271,6 +292,8 @@ public function getMoveUrl()
     }
 
     /**
+     * Get tree
+     *
      * @param mixed|null $parenNodeCategory
      * @return array
      */
@@ -282,6 +305,8 @@ public function getTree($parenNodeCategory = null)
     }
 
     /**
+     * Get tree json
+     *
      * @param mixed|null $parenNodeCategory
      * @return string
      */
@@ -367,7 +392,7 @@ protected function _getNodeJson($node, $level = 0)
             }
         }
 
-        if ($isParent || $node->getLevel() < 2) {
+        if ($isParent || $node->getLevel() < 1) {
             $item['expanded'] = true;
         }
 
@@ -390,6 +415,8 @@ public function buildNodeName($node)
     }
 
     /**
+     * Is category movable
+     *
      * @param Node|array $node
      * @return bool
      */
@@ -403,6 +430,8 @@ protected function _isCategoryMoveable($node)
     }
 
     /**
+     * Is parent selected category
+     *
      * @param Node|array $node
      * @return bool
      */
@@ -422,6 +451,7 @@ protected function _isParentSelectedCategory($node)
      * Check if page loaded by outside link to category edit
      *
      * @return boolean
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function isClearEdit()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
index 6ab039aa27849..695ea6a7288e3 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
@@ -91,7 +91,23 @@ protected function _construct()
         if (!$entityAttribute || !$entityAttribute->getIsUserDefined()) {
             $this->buttonList->remove('delete');
         } else {
-            $this->buttonList->update('delete', 'label', __('Delete Attribute'));
+            $this->buttonList->update(
+                'delete',
+                'onclick',
+                sprintf(
+                    "deleteConfirm('%s','%s', %s)",
+                    __('Are you sure you want to do this?'),
+                    $this->getDeleteUrl(),
+                    json_encode(
+                        [
+                            'action' => '',
+                            'data' => [
+                                'form_key' => $this->getFormKey()
+                            ]
+                        ]
+                    )
+                )
+            );
         }
     }
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
index 1b188de40710f..2cd27f2785af2 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
@@ -140,7 +140,7 @@ protected function _prepareLayout()
                     ) . '\', \'' . $this->getUrl(
                         'catalog/*/delete',
                         ['id' => $setId]
-                    ) . '\')',
+                    ) . '\', {data: {}})',
                     'class' => 'delete'
                 ]
             );
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
index 285caa974fd17..95ccd2ed3e726 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
@@ -3,17 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+namespace Magento\Catalog\Block\Adminhtml\Product;
 
 /**
  * Customer edit block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
  */
-namespace Magento\Catalog\Block\Adminhtml\Product;
-
 class Edit extends \Magento\Backend\Block\Widget
 {
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
     /**
      * @var string
      */
@@ -47,6 +52,7 @@ class Edit extends \Magento\Backend\Block\Widget
      * @param \Magento\Eav\Model\Entity\Attribute\SetFactory $attributeSetFactory
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Catalog\Helper\Product $productHelper
+     * @param \Magento\Framework\Escaper $escaper
      * @param array $data
      */
     public function __construct(
@@ -55,16 +61,20 @@ public function __construct(
         \Magento\Eav\Model\Entity\Attribute\SetFactory $attributeSetFactory,
         \Magento\Framework\Registry $registry,
         \Magento\Catalog\Helper\Product $productHelper,
+        \Magento\Framework\Escaper $escaper,
         array $data = []
     ) {
         $this->_productHelper = $productHelper;
         $this->_attributeSetFactory = $attributeSetFactory;
         $this->_coreRegistry = $registry;
         $this->jsonEncoder = $jsonEncoder;
+        $this->escaper = $escaper;
         parent::__construct($context, $data);
     }
 
     /**
+     * Edit Product constructor
+     *
      * @return void
      */
     protected function _construct()
@@ -144,6 +154,8 @@ protected function _prepareLayout()
     }
 
     /**
+     * Retrieve back button html
+     *
      * @return string
      */
     public function getBackButtonHtml()
@@ -152,6 +164,8 @@ public function getBackButtonHtml()
     }
 
     /**
+     * Retrieve cancel button html
+     *
      * @return string
      */
     public function getCancelButtonHtml()
@@ -160,6 +174,8 @@ public function getCancelButtonHtml()
     }
 
     /**
+     * Retrieve save button html
+     *
      * @return string
      */
     public function getSaveButtonHtml()
@@ -168,6 +184,8 @@ public function getSaveButtonHtml()
     }
 
     /**
+     * Retrieve save and edit button html
+     *
      * @return string
      */
     public function getSaveAndEditButtonHtml()
@@ -176,6 +194,8 @@ public function getSaveAndEditButtonHtml()
     }
 
     /**
+     * Retrieve delete button html
+     *
      * @return string
      */
     public function getDeleteButtonHtml()
@@ -194,6 +214,8 @@ public function getSaveSplitButtonHtml()
     }
 
     /**
+     * Retrieve validation url
+     *
      * @return string
      */
     public function getValidationUrl()
@@ -202,6 +224,8 @@ public function getValidationUrl()
     }
 
     /**
+     * Retrieve save url
+     *
      * @return string
      */
     public function getSaveUrl()
@@ -210,6 +234,8 @@ public function getSaveUrl()
     }
 
     /**
+     * Retrieve save and continue url
+     *
      * @return string
      */
     public function getSaveAndContinueUrl()
@@ -221,6 +247,8 @@ public function getSaveAndContinueUrl()
     }
 
     /**
+     * Retrieve product id
+     *
      * @return mixed
      */
     public function getProductId()
@@ -229,6 +257,8 @@ public function getProductId()
     }
 
     /**
+     * Retrieve product set id
+     *
      * @return mixed
      */
     public function getProductSetId()
@@ -241,6 +271,8 @@ public function getProductSetId()
     }
 
     /**
+     * Retrieve duplicate url
+     *
      * @return string
      */
     public function getDuplicateUrl()
@@ -249,6 +281,8 @@ public function getDuplicateUrl()
     }
 
     /**
+     * Retrieve product header
+     *
      * @deprecated 101.1.0
      * @return string
      */
@@ -263,6 +297,8 @@ public function getHeader()
     }
 
     /**
+     * Get product attribute set name
+     *
      * @return string
      */
     public function getAttributeSetName()
@@ -275,11 +311,14 @@ public function getAttributeSetName()
     }
 
     /**
+     * Retrieve id of selected tab
+     *
      * @return string
      */
     public function getSelectedTabId()
     {
-        return addslashes(htmlspecialchars($this->getRequest()->getParam('tab')));
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        return addslashes($this->escaper->escapeHtml($this->getRequest()->getParam('tab')));
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
index 4aebd521fe60d..964872b6e51bd 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
@@ -70,11 +70,11 @@ public function getFieldSuffix()
      * Retrieve current store id
      *
      * @return int
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getStoreId()
     {
-        $storeId = $this->getRequest()->getParam('store');
-        return (int)$storeId;
+        return (int)$this->getRequest()->getParam('store');
     }
 
     /**
@@ -99,6 +99,8 @@ public function getTabLabel()
     }
 
     /**
+     * Return Tab title.
+     *
      * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
@@ -107,7 +109,7 @@ public function getTabTitle()
     }
 
     /**
-     * @return bool
+     * @inheritdoc
      */
     public function canShowTab()
     {
@@ -115,7 +117,7 @@ public function canShowTab()
     }
 
     /**
-     * @return bool
+     * @inheritdoc
      */
     public function isHidden()
     {
@@ -123,6 +125,8 @@ public function isHidden()
     }
 
     /**
+     * Get availability status.
+     *
      * @param string $fieldName
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
index 3467c7aac289b..d95ee7f8f2cf9 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
@@ -11,6 +11,9 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit;
 
+/**
+ * Admin AttributeSet block
+ */
 class AttributeSet extends \Magento\Backend\Block\Widget\Form
 {
     /**
@@ -42,12 +45,14 @@ public function __construct(
     public function getSelectorOptions()
     {
         return [
-            'source' => $this->getUrl('catalog/product/suggestAttributeSets'),
+            'source' => $this->escapeUrl($this->getUrl('catalog/product/suggestAttributeSets')),
             'className' => 'category-select',
             'showRecent' => true,
             'storageKey' => 'product-template-key',
             'minLength' => 0,
-            'currentlySelected' => $this->_coreRegistry->registry('product')->getAttributeSetId()
+            'currentlySelected' => $this->escapeHtml(
+                $this->_coreRegistry->registry('product')->getAttributeSetId()
+            )
         ];
     }
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
index e1b97f996c769..78b519c4b0c3d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
@@ -11,6 +11,9 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes;
 
+/**
+ * Admin product attribute search block
+ */
 class Search extends \Magento\Backend\Block\Widget
 {
     /**
@@ -62,13 +65,15 @@ protected function _construct()
     }
 
     /**
+     * Get selector options
+     *
      * @return array
      */
     public function getSelectorOptions()
     {
         $templateId = $this->_coreRegistry->registry('product')->getAttributeSetId();
         return [
-            'source' => $this->getUrl('catalog/product/suggestAttributes'),
+            'source' => $this->escapeUrl($this->getUrl('catalog/product/suggestAttributes')),
             'minLength' => 0,
             'ajaxOptions' => ['data' => ['template_id' => $templateId]],
             'template' => '[data-template-for="product-attribute-search-' . $this->getGroupId() . '"]',
@@ -82,6 +87,7 @@ public function getSelectorOptions()
      * @param string $labelPart
      * @param int $templateId
      * @return array
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getSuggestedAttributes($labelPart, $templateId = null)
     {
@@ -95,7 +101,9 @@ public function getSuggestedAttributes($labelPart, $templateId = null)
             ['like' => $escapedLabelPart]
         );
 
-        $collection->setExcludeSetFilter($templateId ?: $this->getRequest()->getParam('template_id'))->setPageSize(20);
+        $paramTemplateId = $this->getRequest()->getParam('template_id');
+        $paramTemplateId = is_int($paramTemplateId) ? $paramTemplateId : null;
+        $collection->setExcludeSetFilter($templateId ?: $paramTemplateId)->setPageSize(20);
 
         $result = [];
         foreach ($collection->getItems() as $attribute) {
@@ -110,6 +118,8 @@ public function getSuggestedAttributes($labelPart, $templateId = null)
     }
 
     /**
+     * Get add attribute url
+     *
      * @return string
      */
     public function getAddAttributeUrl()
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
index dd7554a9b7b19..42eb5341721e6 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
@@ -19,6 +19,7 @@
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\App\ObjectManager;
 use Magento\Backend\Block\DataProviders\UploadConfig as ImageUploadConfigDataProvider;
+use Magento\MediaStorage\Helper\File\Storage\Database;
 
 class Content extends \Magento\Backend\Block\Widget
 {
@@ -47,25 +48,34 @@ class Content extends \Magento\Backend\Block\Widget
      */
     private $imageHelper;
 
+    /**
+     * @var Database
+     */
+    private $fileStorageDatabase;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Catalog\Model\Product\Media\Config $mediaConfig
      * @param array $data
      * @param ImageUploadConfigDataProvider $imageUploadConfigDataProvider
+     * @param Database $fileStorageDatabase
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
         \Magento\Catalog\Model\Product\Media\Config $mediaConfig,
         array $data = [],
-        ImageUploadConfigDataProvider $imageUploadConfigDataProvider = null
+        ImageUploadConfigDataProvider $imageUploadConfigDataProvider = null,
+        Database $fileStorageDatabase = null
     ) {
         $this->_jsonEncoder = $jsonEncoder;
         $this->_mediaConfig = $mediaConfig;
         parent::__construct($context, $data);
         $this->imageUploadConfigDataProvider = $imageUploadConfigDataProvider
             ?: ObjectManager::getInstance()->get(ImageUploadConfigDataProvider::class);
+        $this->fileStorageDatabase = $fileStorageDatabase
+            ?: ObjectManager::getInstance()->get(Database::class);
     }
 
     /**
@@ -153,6 +163,13 @@ public function getImagesJson()
             $images = $this->sortImagesByPosition($value['images']);
             foreach ($images as &$image) {
                 $image['url'] = $this->_mediaConfig->getMediaUrl($image['file']);
+                if ($this->fileStorageDatabase->checkDbUsage() &&
+                    !$mediaDir->isFile($this->_mediaConfig->getMediaPath($image['file']))
+                ) {
+                    $this->fileStorageDatabase->saveFileToFilesystem(
+                        $this->_mediaConfig->getMediaPath($image['file'])
+                    );
+                }
                 try {
                     $fileHandler = $mediaDir->stat($this->_mediaConfig->getMediaPath($image['file']));
                     $image['size'] = $fileHandler['size'];
diff --git a/app/code/Magento/Catalog/Block/Product/Gallery.php b/app/code/Magento/Catalog/Block/Product/Gallery.php
index e7c7b81ec29c9..e25a042d8ff4b 100644
--- a/app/code/Magento/Catalog/Block/Product/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/Gallery.php
@@ -16,6 +16,8 @@
 use Magento\Framework\Data\Collection;
 
 /**
+ * Product gallery block
+ *
  * @api
  * @since 100.0.2
  */
@@ -43,6 +45,8 @@ public function __construct(
     }
 
     /**
+     * Prepare layout
+     *
      * @return $this
      */
     protected function _prepareLayout()
@@ -52,6 +56,8 @@ protected function _prepareLayout()
     }
 
     /**
+     * Get product
+     *
      * @return Product
      */
     public function getProduct()
@@ -60,6 +66,8 @@ public function getProduct()
     }
 
     /**
+     * Get gallery collection
+     *
      * @return Collection
      */
     public function getGalleryCollection()
@@ -68,13 +76,16 @@ public function getGalleryCollection()
     }
 
     /**
+     * Get current image
+     *
      * @return Image|null
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getCurrentImage()
     {
         $imageId = $this->getRequest()->getParam('image');
         $image = null;
-        if ($imageId) {
+        if (is_int($imageId)) {
             $image = $this->getGalleryCollection()->getItemById($imageId);
         }
 
@@ -85,6 +96,8 @@ public function getCurrentImage()
     }
 
     /**
+     * Get image url
+     *
      * @return string
      */
     public function getImageUrl()
@@ -93,6 +106,8 @@ public function getImageUrl()
     }
 
     /**
+     * Get image file
+     *
      * @return mixed
      */
     public function getImageFile()
@@ -115,7 +130,7 @@ public function getImageWidth()
                 if ($size[0] > 600) {
                     return 600;
                 } else {
-                    return $size[0];
+                    return (int) $size[0];
                 }
             }
         }
@@ -124,6 +139,8 @@ public function getImageWidth()
     }
 
     /**
+     * Get previous image
+     *
      * @return Image|false
      */
     public function getPreviousImage()
@@ -143,6 +160,8 @@ public function getPreviousImage()
     }
 
     /**
+     * Get next image
+     *
      * @return Image|false
      */
     public function getNextImage()
@@ -166,6 +185,8 @@ public function getNextImage()
     }
 
     /**
+     * Get previous image url
+     *
      * @return false|string
      */
     public function getPreviousImageUrl()
@@ -178,6 +199,8 @@ public function getPreviousImageUrl()
     }
 
     /**
+     * Get next image url
+     *
      * @return false|string
      */
     public function getNextImageUrl()
diff --git a/app/code/Magento/Catalog/Block/Product/ListProduct.php b/app/code/Magento/Catalog/Block/Product/ListProduct.php
index 0b9de2183786a..c70d2e7c5ec30 100644
--- a/app/code/Magento/Catalog/Block/Product/ListProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/ListProduct.php
@@ -364,7 +364,7 @@ public function getAddToCartPostParams(Product $product)
         return [
             'action' => $url,
             'data' => [
-                'product' => $product->getEntityId(),
+                'product' => (int) $product->getEntityId(),
                 ActionInterface::PARAM_NAME_URL_ENCODED => $this->urlHelper->getEncodedUrl($url),
             ]
         ];
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index 674b20a49c837..30811150af143 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -7,6 +7,10 @@
 
 use Magento\Catalog\Helper\Product\ProductList;
 use Magento\Catalog\Model\Product\ProductList\Toolbar as ToolbarModel;
+use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Http\Context;
+use Magento\Framework\Data\Form\FormKey;
 
 /**
  * Product list toolbar
@@ -77,6 +81,7 @@ class Toolbar extends \Magento\Framework\View\Element\Template
 
     /**
      * @var bool $_paramsMemorizeAllowed
+     * @deprecated
      */
     protected $_paramsMemorizeAllowed = true;
 
@@ -96,6 +101,7 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * Catalog session
      *
      * @var \Magento\Catalog\Model\Session
+     * @deprecated
      */
     protected $_catalogSession;
 
@@ -104,6 +110,11 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      */
     protected $_toolbarModel;
 
+    /**
+     * @var ToolbarMemorizer
+     */
+    private $toolbarMemorizer;
+
     /**
      * @var ProductList
      */
@@ -119,6 +130,16 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      */
     protected $_postDataHelper;
 
+    /**
+     * @var Context
+     */
+    private $httpContext;
+
+    /**
+     * @var FormKey
+     */
+    private $formKey;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Catalog\Model\Session $catalogSession
@@ -128,6 +149,11 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * @param ProductList $productListHelper
      * @param \Magento\Framework\Data\Helper\PostHelper $postDataHelper
      * @param array $data
+     * @param ToolbarMemorizer|null $toolbarMemorizer
+     * @param Context|null $httpContext
+     * @param FormKey|null $formKey
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -137,7 +163,10 @@ public function __construct(
         \Magento\Framework\Url\EncoderInterface $urlEncoder,
         ProductList $productListHelper,
         \Magento\Framework\Data\Helper\PostHelper $postDataHelper,
-        array $data = []
+        array $data = [],
+        ToolbarMemorizer $toolbarMemorizer = null,
+        Context $httpContext = null,
+        FormKey $formKey = null
     ) {
         $this->_catalogSession = $catalogSession;
         $this->_catalogConfig = $catalogConfig;
@@ -145,6 +174,15 @@ public function __construct(
         $this->urlEncoder = $urlEncoder;
         $this->_productListHelper = $productListHelper;
         $this->_postDataHelper = $postDataHelper;
+        $this->toolbarMemorizer = $toolbarMemorizer ?: ObjectManager::getInstance()->get(
+            ToolbarMemorizer::class
+        );
+        $this->httpContext = $httpContext ?: ObjectManager::getInstance()->get(
+            Context::class
+        );
+        $this->formKey = $formKey ?: ObjectManager::getInstance()->get(
+            FormKey::class
+        );
         parent::__construct($context, $data);
     }
 
@@ -152,6 +190,7 @@ public function __construct(
      * Disable list state params memorizing
      *
      * @return $this
+     * @deprecated
      */
     public function disableParamsMemorizing()
     {
@@ -165,6 +204,7 @@ public function disableParamsMemorizing()
      * @param string $param parameter name
      * @param mixed $value parameter value
      * @return $this
+     * @deprecated
      */
     protected function _memorizeParam($param, $value)
     {
@@ -244,13 +284,13 @@ public function getCurrentOrder()
             $defaultOrder = $keys[0];
         }
 
-        $order = $this->_toolbarModel->getOrder();
+        $order = $this->toolbarMemorizer->getOrder();
         if (!$order || !isset($orders[$order])) {
             $order = $defaultOrder;
         }
 
-        if ($order != $defaultOrder) {
-            $this->_memorizeParam('sort_order', $order);
+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
+            $this->httpContext->setValue(ToolbarModel::ORDER_PARAM_NAME, $order, $defaultOrder);
         }
 
         $this->setData('_current_grid_order', $order);
@@ -270,13 +310,13 @@ public function getCurrentDirection()
         }
 
         $directions = ['asc', 'desc'];
-        $dir = strtolower($this->_toolbarModel->getDirection());
+        $dir = strtolower($this->toolbarMemorizer->getDirection());
         if (!$dir || !in_array($dir, $directions)) {
             $dir = $this->_direction;
         }
 
-        if ($dir != $this->_direction) {
-            $this->_memorizeParam('sort_direction', $dir);
+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
+            $this->httpContext->setValue(ToolbarModel::DIRECTION_PARAM_NAME, $dir, $this->_direction);
         }
 
         $this->setData('_current_grid_direction', $dir);
@@ -392,6 +432,8 @@ public function getPagerUrl($params = [])
     }
 
     /**
+     * Get pager encoded url.
+     *
      * @param array $params
      * @return string
      */
@@ -412,11 +454,15 @@ public function getCurrentMode()
             return $mode;
         }
         $defaultMode = $this->_productListHelper->getDefaultViewMode($this->getModes());
-        $mode = $this->_toolbarModel->getMode();
+        $mode = $this->toolbarMemorizer->getMode();
         if (!$mode || !isset($this->_availableMode[$mode])) {
             $mode = $defaultMode;
         }
 
+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
+            $this->httpContext->setValue(ToolbarModel::MODE_PARAM_NAME, $mode, $defaultMode);
+        }
+
         $this->setData('_current_grid_mode', $mode);
         return $mode;
     }
@@ -568,13 +614,13 @@ public function getLimit()
             $defaultLimit = $keys[0];
         }
 
-        $limit = $this->_toolbarModel->getLimit();
+        $limit = $this->toolbarMemorizer->getLimit();
         if (!$limit || !isset($limits[$limit])) {
             $limit = $defaultLimit;
         }
 
-        if ($limit != $defaultLimit) {
-            $this->_memorizeParam('limit_page', $limit);
+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
+            $this->httpContext->setValue(ToolbarModel::LIMIT_PARAM_NAME, $limit, $defaultLimit);
         }
 
         $this->setData('_current_limit', $limit);
@@ -582,6 +628,8 @@ public function getLimit()
     }
 
     /**
+     * Check if limit is current used in toolbar.
+     *
      * @param int $limit
      * @return bool
      */
@@ -591,6 +639,8 @@ public function isLimitCurrent($limit)
     }
 
     /**
+     * Pager number of items from which products started on current page.
+     *
      * @return int
      */
     public function getFirstNum()
@@ -600,6 +650,8 @@ public function getFirstNum()
     }
 
     /**
+     * Pager number of items products finished on current page.
+     *
      * @return int
      */
     public function getLastNum()
@@ -609,6 +661,8 @@ public function getLastNum()
     }
 
     /**
+     * Total number of products in current category.
+     *
      * @return int
      */
     public function getTotalNum()
@@ -617,6 +671,8 @@ public function getTotalNum()
     }
 
     /**
+     * Check if current page is the first.
+     *
      * @return bool
      */
     public function isFirstPage()
@@ -625,6 +681,8 @@ public function isFirstPage()
     }
 
     /**
+     * Return last page number.
+     *
      * @return int
      */
     public function getLastPageNum()
@@ -692,6 +750,8 @@ public function getWidgetOptionsJson(array $customOptions = [])
             'orderDefault' => $this->getOrderField(),
             'limitDefault' => $this->_productListHelper->getDefaultLimitPerPageValue($defaultMode),
             'url' => $this->getPagerUrl(),
+            'formKey' => $this->formKey->getFormKey(),
+            'post' => $this->toolbarMemorizer->isMemorizingAllowed() ? true : false,
         ];
         $options = array_replace_recursive($options, $customOptions);
         return json_encode(['productListToolbarForm' => $options]);
diff --git a/app/code/Magento/Catalog/Block/Product/View.php b/app/code/Magento/Catalog/Block/Product/View.php
index 8055d17a64a84..2a364bcadf6ef 100644
--- a/app/code/Magento/Catalog/Block/Product/View.php
+++ b/app/code/Magento/Catalog/Block/Product/View.php
@@ -169,8 +169,7 @@ public function getAddToCartUrl($product, $additional = [])
     }
 
     /**
-     * Get JSON encoded configuration array which can be used for JS dynamic
-     * price calculation depending on product options
+     * Get JSON encoded configuration which can be used for JS dynamic price calculation depending on product options
      *
      * @return string
      */
@@ -188,24 +187,25 @@ public function getJsonConfig()
         }
 
         $tierPrices = [];
-        $tierPricesList = $product->getPriceInfo()->getPrice('tier_price')->getTierPriceList();
+        $priceInfo = $product->getPriceInfo();
+        $tierPricesList = $priceInfo->getPrice('tier_price')->getTierPriceList();
         foreach ($tierPricesList as $tierPrice) {
-            $tierPrices[] = $tierPrice['price']->getValue();
+            $tierPrices[] = $tierPrice['price']->getValue() * 1;
         }
         $config = [
-            'productId'   => $product->getId(),
+            'productId'   => (int)$product->getId(),
             'priceFormat' => $this->_localeFormat->getPriceFormat(),
             'prices'      => [
                 'oldPrice'   => [
-                    'amount'      => $product->getPriceInfo()->getPrice('regular_price')->getAmount()->getValue(),
+                    'amount'      => $priceInfo->getPrice('regular_price')->getAmount()->getValue() * 1,
                     'adjustments' => []
                 ],
                 'basePrice'  => [
-                    'amount'      => $product->getPriceInfo()->getPrice('final_price')->getAmount()->getBaseAmount(),
+                    'amount'      => $priceInfo->getPrice('final_price')->getAmount()->getBaseAmount() * 1,
                     'adjustments' => []
                 ],
                 'finalPrice' => [
-                    'amount'      => $product->getPriceInfo()->getPrice('final_price')->getAmount()->getValue(),
+                    'amount'      => $priceInfo->getPrice('final_price')->getAmount()->getValue() * 1,
                     'adjustments' => []
                 ]
             ],
@@ -254,6 +254,7 @@ public function hasRequiredOptions()
      * instantly.
      *
      * @return bool
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function isStartCustomization()
     {
@@ -262,6 +263,7 @@ public function isStartCustomization()
 
     /**
      * Get default qty - either as preconfigured, or as 1.
+     *
      * Also restricts it by minimal qty.
      *
      * @param null|\Magento\Catalog\Model\Product $product
@@ -323,10 +325,7 @@ public function getQuantityValidators()
     public function getIdentities()
     {
         $identities = $this->getProduct()->getIdentities();
-        $category = $this->_coreRegistry->registry('current_category');
-        if ($category) {
-            $identities[] = Category::CACHE_TAG . '_' . $category->getId();
-        }
+
         return $identities;
     }
 
diff --git a/app/code/Magento/Catalog/Block/Product/View/Attributes.php b/app/code/Magento/Catalog/Block/Product/View/Attributes.php
index b353e477a056c..69c8b78b017d2 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Attributes.php
@@ -16,6 +16,8 @@
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 /**
+ * Attributes attributes block
+ *
  * @api
  * @since 100.0.2
  */
@@ -56,6 +58,8 @@ public function __construct(
     }
 
     /**
+     * Returns a Product.
+     *
      * @return Product
      */
     public function getProduct()
@@ -67,6 +71,8 @@ public function getProduct()
     }
 
     /**
+     * Additional data.
+     *
      * $excludeAttr is optional array of attribute codes to
      * exclude them from additional data array
      *
@@ -89,9 +95,9 @@ public function getAdditionalData(array $excludeAttr = [])
                     $value = $this->priceCurrency->convertAndFormat($value);
                 }
 
-                if (is_string($value) && strlen($value)) {
+                if (is_string($value) && strlen(trim($value))) {
                     $data[$attribute->getAttributeCode()] = [
-                        'label' => __($attribute->getStoreLabel()),
+                        'label' => $attribute->getStoreLabel(),
                         'value' => $value,
                         'code' => $attribute->getAttributeCode(),
                     ];
diff --git a/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php b/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php
new file mode 100644
index 0000000000000..7790785133ddf
--- /dev/null
+++ b/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Block\Product\View;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Catalog\Block\Product\Context;
+use Magento\Framework\Stdlib\ArrayUtils;
+
+class GalleryOptions extends AbstractView implements ArgumentInterface
+{
+    /**
+     * @var Json
+     */
+    private $jsonSerializer;
+
+    /**
+     * @var Gallery
+     */
+    private $gallery;
+
+    /**
+     * @param Context $context
+     * @param ArrayUtils $arrayUtils
+     * @param Json $jsonSerializer
+     * @param Gallery $gallery
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        ArrayUtils $arrayUtils,
+        Json $jsonSerializer,
+        Gallery $gallery,
+        array $data = []
+    ) {
+        $this->gallery = $gallery;
+        $this->jsonSerializer = $jsonSerializer;
+        parent::__construct($context, $arrayUtils, $data);
+    }
+
+    /**
+     * Retrieve gallery options in JSON format
+     *
+     * @return string
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.ElseExpression)
+     */
+    public function getOptionsJson()
+    {
+        $optionItems = null;
+
+        //Special case for gallery/nav which can be the string "thumbs/false/dots"
+        if (is_bool($this->getVar("gallery/nav"))) {
+            $optionItems['nav'] = $this->getVar("gallery/nav") ? 'true' : 'false';
+        } else {
+            $optionItems['nav'] = $this->escapeHtml($this->getVar("gallery/nav"));
+        }
+
+        $optionItems['loop'] = $this->getVar("gallery/loop");
+        $optionItems['keyboard'] = $this->getVar("gallery/keyboard");
+        $optionItems['arrows'] = $this->getVar("gallery/arrows");
+        $optionItems['allowfullscreen'] = $this->getVar("gallery/allowfullscreen");
+        $optionItems['showCaption'] = $this->getVar("gallery/caption");
+        $optionItems['width'] = (int)$this->escapeHtml(
+            $this->gallery->getImageAttribute('product_page_image_medium', 'width')
+        );
+        $optionItems['thumbwidth'] = (int)$this->escapeHtml(
+            $this->gallery->getImageAttribute('product_page_image_small', 'width')
+        );
+
+        if ($this->gallery->getImageAttribute('product_page_image_small', 'height') ||
+            $this->gallery->getImageAttribute('product_page_image_small', 'width')) {
+            $optionItems['thumbheight'] = (int)$this->escapeHtml(
+                $this->gallery->getImageAttribute('product_page_image_small', 'height') ?:
+                $this->gallery->getImageAttribute('product_page_image_small', 'width')
+            );
+        }
+
+        if ($this->gallery->getImageAttribute('product_page_image_medium', 'height') ||
+            $this->gallery->getImageAttribute('product_page_image_medium', 'width')) {
+            $optionItems['height'] = (int)$this->escapeHtml(
+                $this->gallery->getImageAttribute('product_page_image_medium', 'height') ?:
+                $this->gallery->getImageAttribute('product_page_image_medium', 'width')
+            );
+        }
+
+        if ($this->getVar("gallery/transition/duration")) {
+            $optionItems['transitionduration'] =
+                (int)$this->escapeHtml($this->getVar("gallery/transition/duration"));
+        }
+
+        $optionItems['transition'] = $this->escapeHtml($this->getVar("gallery/transition/effect"));
+        $optionItems['navarrows'] = $this->getVar("gallery/navarrows");
+        $optionItems['navtype'] = $this->escapeHtml($this->getVar("gallery/navtype"));
+        $optionItems['navdir'] = $this->escapeHtml($this->getVar("gallery/navdir"));
+
+        if ($this->getVar("gallery/thumbmargin")) {
+            $optionItems['thumbmargin'] = (int)$this->escapeHtml($this->getVar("gallery/thumbmargin"));
+        }
+
+        return $this->jsonSerializer->serialize($optionItems);
+    }
+
+    /**
+     * Retrieve gallery fullscreen options in JSON format
+     *
+     * @return string
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.ElseExpression)
+     */
+    public function getFSOptionsJson()
+    {
+        $fsOptionItems = null;
+
+        //Special case for gallery/nav which can be the string "thumbs/false/dots"
+        if (is_bool($this->getVar("gallery/fullscreen/nav"))) {
+            $fsOptionItems['nav'] = $this->getVar("gallery/fullscreen/nav") ? 'true' : 'false';
+        } else {
+            $fsOptionItems['nav'] = $this->escapeHtml($this->getVar("gallery/fullscreen/nav"));
+        }
+
+        $fsOptionItems['loop'] = $this->getVar("gallery/fullscreen/loop");
+        $fsOptionItems['navdir'] = $this->escapeHtml($this->getVar("gallery/fullscreen/navdir"));
+        $fsOptionItems['navarrows'] = $this->getVar("gallery/fullscreen/navarrows");
+        $fsOptionItems['navtype'] = $this->escapeHtml($this->getVar("gallery/fullscreen/navtype"));
+        $fsOptionItems['arrows'] = $this->getVar("gallery/fullscreen/arrows");
+        $fsOptionItems['showCaption'] = $this->getVar("gallery/fullscreen/caption");
+
+        if ($this->getVar("gallery/fullscreen/transition/duration")) {
+            $fsOptionItems['transitionduration'] = (int)$this->escapeHtml(
+                $this->getVar("gallery/fullscreen/transition/duration")
+            );
+        }
+
+        $fsOptionItems['transition'] = $this->escapeHtml($this->getVar("gallery/fullscreen/transition/effect"));
+
+        if ($this->getVar("gallery/fullscreen/keyboard")) {
+            $fsOptionItems['keyboard'] = $this->getVar("gallery/fullscreen/keyboard");
+        }
+
+        if ($this->getVar("gallery/fullscreen/thumbmargin")) {
+            $fsOptionItems['thumbmargin'] =
+                (int)$this->escapeHtml($this->getVar("gallery/fullscreen/thumbmargin"));
+        }
+
+        return $this->jsonSerializer->serialize($fsOptionItems);
+    }
+}
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options.php b/app/code/Magento/Catalog/Block/Product/View/Options.php
index 0720c018f6a9b..c457b20cd0904 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options.php
@@ -4,16 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Product options block
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Catalog\Block\Product\View;
 
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Option\Value;
 
 /**
+ * Product options block
+ *
+ * @author Magento Core Team <core@magentocommerce.com>
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
@@ -121,6 +120,8 @@ public function setProduct(Product $product = null)
     }
 
     /**
+     * Get group of option.
+     *
      * @param string $type
      * @return string
      */
@@ -142,6 +143,8 @@ public function getOptions()
     }
 
     /**
+     * Check if block has options.
+     *
      * @return bool
      */
     public function hasOptions()
@@ -160,7 +163,10 @@ public function hasOptions()
      */
     protected function _getPriceConfiguration($option)
     {
-        $optionPrice = $this->pricingHelper->currency($option->getPrice(true), false, false);
+        $optionPrice = $option->getPrice(true);
+        if ($option->getPriceType() !== Value::TYPE_PERCENT) {
+            $optionPrice = $this->pricingHelper->currency($optionPrice, false, false);
+        }
         $data = [
             'prices' => [
                 'oldPrice' => [
@@ -195,7 +201,7 @@ protected function _getPriceConfiguration($option)
                 ],
             ],
             'type' => $option->getPriceType(),
-            'name' => $option->getTitle()
+            'name' => $option->getTitle(),
         ];
         return $data;
     }
@@ -231,7 +237,7 @@ public function getJsonConfig()
         //pass the return array encapsulated in an object for the other modules to be able to alter it eg: weee
         $this->_eventManager->dispatch('catalog_product_option_price_configuration_after', ['configObj' => $configObj]);
 
-        $config=$configObj->getConfig();
+        $config = $configObj->getConfig();
 
         return $this->_jsonEncoder->encode($config);
     }
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
index 7df9b972e1501..52de7939d7eb2 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
@@ -3,8 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Block\Product\View\Options\Type;
 
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\Catalog\Block\Product\View\Options\Type\Select\CheckableFactory;
+use Magento\Catalog\Block\Product\View\Options\Type\Select\MultipleFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Framework\Pricing\Helper\Data;
+use Magento\Catalog\Helper\Data as CatalogHelper;
+
 /**
  * Product options text type block
  *
@@ -13,169 +22,64 @@
  */
 class Select extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
 {
+    /**
+     * @var CheckableFactory
+     */
+    private $checkableFactory;
+
+    /**
+     * @var MultipleFactory
+     */
+    private $multipleFactory;
+
+    /**
+     * Select constructor.
+     * @param Context $context
+     * @param Data $pricingHelper
+     * @param CatalogHelper $catalogData
+     * @param array $data
+     * @param CheckableFactory|null $checkableFactory
+     * @param MultipleFactory|null $multipleFactory
+     */
+    public function __construct(
+        Context $context,
+        Data $pricingHelper,
+        CatalogHelper $catalogData,
+        array $data = [],
+        CheckableFactory $checkableFactory = null,
+        MultipleFactory $multipleFactory = null
+    ) {
+        parent::__construct($context, $pricingHelper, $catalogData, $data);
+        $this->checkableFactory = $checkableFactory ?: ObjectManager::getInstance()->get(CheckableFactory::class);
+        $this->multipleFactory = $multipleFactory ?: ObjectManager::getInstance()->get(MultipleFactory::class);
+    }
+
     /**
      * Return html for control element
      *
      * @return string
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function getValuesHtml()
     {
-        $_option = $this->getOption();
-        $configValue = $this->getProduct()->getPreconfiguredValues()->getData('options/' . $_option->getId());
-        $store = $this->getProduct()->getStore();
-
-        $this->setSkipJsReloadPrice(1);
-        // Remove inline prototype onclick and onchange events
+        $option = $this->getOption();
+        $optionType = $option->getType();
 
-        if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN ||
-            $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_MULTIPLE
+        if ($optionType === ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN ||
+            $optionType === ProductCustomOptionInterface::OPTION_TYPE_MULTIPLE
         ) {
-            $require = $_option->getIsRequire() ? ' required' : '';
-            $extraParams = '';
-            $select = $this->getLayout()->createBlock(
-                \Magento\Framework\View\Element\Html\Select::class
-            )->setData(
-                [
-                    'id' => 'select_' . $_option->getId(),
-                    'class' => $require . ' product-custom-option admin__control-select'
-                ]
-            );
-            if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN) {
-                $select->setName('options[' . $_option->getId() . ']')->addOption('', __('-- Please Select --'));
-            } else {
-                $select->setName('options[' . $_option->getId() . '][]');
-                $select->setClass('multiselect admin__control-multiselect' . $require . ' product-custom-option');
-            }
-            foreach ($_option->getValues() as $_value) {
-                $priceStr = $this->_formatPrice(
-                    [
-                        'is_percent' => $_value->getPriceType() == 'percent',
-                        'pricing_value' => $_value->getPrice($_value->getPriceType() == 'percent'),
-                    ],
-                    false
-                );
-                $select->addOption(
-                    $_value->getOptionTypeId(),
-                    $_value->getTitle() . ' ' . strip_tags($priceStr) . '',
-                    ['price' => $this->pricingHelper->currencyByStore($_value->getPrice(true), $store, false)]
-                );
-            }
-            if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_MULTIPLE) {
-                $extraParams = ' multiple="multiple"';
-            }
-            if (!$this->getSkipJsReloadPrice()) {
-                $extraParams .= ' onchange="opConfig.reloadPrice()"';
-            }
-            $extraParams .= ' data-selector="' . $select->getName() . '"';
-            $select->setExtraParams($extraParams);
-
-            if ($configValue) {
-                $select->setValue($configValue);
-            }
-
-            return $select->getHtml();
+            $optionBlock = $this->multipleFactory->create();
         }
 
-        if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO ||
-            $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX
+        if ($optionType === ProductCustomOptionInterface::OPTION_TYPE_RADIO ||
+            $optionType === ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX
         ) {
-            $selectHtml = '<div class="options-list nested" id="options-' . $_option->getId() . '-list">';
-            $require = $_option->getIsRequire() ? ' required' : '';
-            $arraySign = '';
-            switch ($_option->getType()) {
-                case \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO:
-                    $type = 'radio';
-                    $class = 'radio admin__control-radio';
-                    if (!$_option->getIsRequire()) {
-                        $selectHtml .= '<div class="field choice admin__field admin__field-option">' .
-                            '<input type="radio" id="options_' .
-                            $_option->getId() .
-                            '" class="' .
-                            $class .
-                            ' product-custom-option" name="options[' .
-                            $_option->getId() .
-                            ']"' .
-                            ' data-selector="options[' . $_option->getId() . ']"' .
-                            ($this->getSkipJsReloadPrice() ? '' : ' onclick="opConfig.reloadPrice()"') .
-                            ' value="" checked="checked" /><label class="label admin__field-label" for="options_' .
-                            $_option->getId() .
-                            '"><span>' .
-                            __('None') . '</span></label></div>';
-                    }
-                    break;
-                case \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX:
-                    $type = 'checkbox';
-                    $class = 'checkbox admin__control-checkbox';
-                    $arraySign = '[]';
-                    break;
-            }
-            $count = 1;
-            foreach ($_option->getValues() as $_value) {
-                $count++;
-
-                $priceStr = $this->_formatPrice(
-                    [
-                        'is_percent' => $_value->getPriceType() == 'percent',
-                        'pricing_value' => $_value->getPrice($_value->getPriceType() == 'percent'),
-                    ]
-                );
-
-                $htmlValue = $_value->getOptionTypeId();
-                if ($arraySign) {
-                    $checked = is_array($configValue) && in_array($htmlValue, $configValue) ? 'checked' : '';
-                } else {
-                    $checked = $configValue == $htmlValue ? 'checked' : '';
-                }
-
-                $dataSelector = 'options[' . $_option->getId() . ']';
-                if ($arraySign) {
-                    $dataSelector .= '[' . $htmlValue . ']';
-                }
-
-                $selectHtml .= '<div class="field choice admin__field admin__field-option' .
-                    $require .
-                    '">' .
-                    '<input type="' .
-                    $type .
-                    '" class="' .
-                    $class .
-                    ' ' .
-                    $require .
-                    ' product-custom-option"' .
-                    ($this->getSkipJsReloadPrice() ? '' : ' onclick="opConfig.reloadPrice()"') .
-                    ' name="options[' .
-                    $_option->getId() .
-                    ']' .
-                    $arraySign .
-                    '" id="options_' .
-                    $_option->getId() .
-                    '_' .
-                    $count .
-                    '" value="' .
-                    $htmlValue .
-                    '" ' .
-                    $checked .
-                    ' data-selector="' . $dataSelector . '"' .
-                    ' price="' .
-                    $this->pricingHelper->currencyByStore($_value->getPrice(true), $store, false) .
-                    '" />' .
-                    '<label class="label admin__field-label" for="options_' .
-                    $_option->getId() .
-                    '_' .
-                    $count .
-                    '"><span>' .
-                    $_value->getTitle() .
-                    '</span> ' .
-                    $priceStr .
-                    '</label>';
-                $selectHtml .= '</div>';
-            }
-            $selectHtml .= '</div>';
-
-            return $selectHtml;
+            $optionBlock = $this->checkableFactory->create();
         }
+
+        return $optionBlock
+            ->setOption($option)
+            ->setProduct($this->getProduct())
+            ->setSkipJsReloadPrice(1)
+            ->_toHtml();
     }
 }
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Checkable.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Checkable.php
new file mode 100644
index 0000000000000..2b000b1e5105d
--- /dev/null
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Checkable.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Block\Product\View\Options\Type\Select;
+
+use Magento\Catalog\Api\Data\ProductCustomOptionValuesInterface;
+use Magento\Catalog\Block\Product\View\Options\AbstractOptions;
+
+/**
+ * Represent necessary logic for checkbox and radio button option type
+ */
+class Checkable extends AbstractOptions
+{
+    protected $_template = 'Magento_Catalog::product/composite/fieldset/options/view/checkable.phtml';
+
+    /**
+     * @param $value
+     * @return string
+     */
+    public function formatPrice(ProductCustomOptionValuesInterface $value) : string
+    {
+
+        return parent::_formatPrice(
+            [
+                'is_percent' => $value->getPriceType() === 'percent',
+                'pricing_value' => $value->getPrice($value->getPriceType() === 'percent')
+            ]
+        );
+    }
+
+    /**
+     * @param $value
+     * @return float
+     */
+    public function getCurrencyByStore(ProductCustomOptionValuesInterface $value) : float
+    {
+        return $this->pricingHelper->currencyByStore(
+            $value->getPrice(true),
+            $this->getProduct()->getStore(),
+            false
+        );
+    }
+
+    /**
+     * @param $option
+     * @return string|array|null
+     */
+    public function getPreconfiguredValue($option)
+    {
+        return $this->getProduct()->getPreconfiguredValues()->getData('options/' . $option->getId());
+    }
+}
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Multiple.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Multiple.php
new file mode 100644
index 0000000000000..20164b0622a6d
--- /dev/null
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select/Multiple.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Block\Product\View\Options\Type\Select;
+
+use Magento\Catalog\Block\Product\View\Options\AbstractOptions;
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\Catalog\Model\Product\Option;
+use Magento\Framework\View\Element\Html\Select;
+
+/**
+ * Class represents necessary logic for dropdown and multiselect option types
+ */
+class Multiple extends AbstractOptions
+{
+    /**
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    protected function _toHtml()
+    {
+        $option = $this->getOption();
+        $optionType = $option->getType();
+        $configValue = $this->getProduct()->getPreconfiguredValues()->getData('options/' . $option->getId());
+        $require = $option->getIsRequire() ? ' required' : '';
+        $extraParams = '';
+        /** @var Select $select */
+        $select = $this->getLayout()->createBlock(
+            Select::class
+        )->setData(
+            [
+                'id' => 'select_' . $option->getId(),
+                'class' => $require . ' product-custom-option admin__control-select'
+            ]
+        );
+
+        $select = $this->insertSelectOption($select, $option);
+        $select = $this->processSelectOption($select, $option);
+
+        if ($optionType === ProductCustomOptionInterface::OPTION_TYPE_MULTIPLE) {
+            $extraParams = ' multiple="multiple"';
+        }
+
+        if (!$this->getSkipJsReloadPrice()) {
+            $extraParams .= ' onchange="opConfig.reloadPrice()"';
+        }
+
+        $extraParams .= ' data-selector="' . $select->getName() . '"';
+        $select->setExtraParams($extraParams);
+
+        if ($configValue) {
+            $select->setValue($configValue);
+        }
+
+        return $select->getHtml();
+    }
+
+    /**
+     * @param Select $select
+     * @param Option $option
+     * @return Select
+     */
+    private function insertSelectOption(Select $select, Option $option) : Select
+    {
+        $require = $option->getIsRequire() ? ' required' : '';
+
+        if ($option->getType() === ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN) {
+            $select->setName('options[' . $option->getId() . ']')->addOption('', __('-- Please Select --'));
+        } else {
+            $select->setName('options[' . $option->getId() . '][]');
+            $select->setClass('multiselect admin__control-multiselect' . $require . ' product-custom-option');
+        }
+
+        return $select;
+    }
+
+    /**
+     * @param Select $select
+     * @param Option $option
+     * @return Select
+     */
+    private function processSelectOption(Select $select, Option $option) : Select
+    {
+        $store = $this->getProduct()->getStore();
+
+        foreach ($option->getValues() as $_value) {
+            $isPercentPriceType =  $_value->getPriceType() === 'percent';
+            $priceStr = $this->_formatPrice(
+                [
+                    'is_percent' => $isPercentPriceType,
+                    'pricing_value' => $_value->getPrice($isPercentPriceType)
+                ],
+                false
+            );
+
+            $select->addOption(
+                $_value->getOptionTypeId(),
+                $_value->getTitle() . ' ' . strip_tags($priceStr) . '',
+                [
+                    'price' => $this->pricingHelper->currencyByStore(
+                        $_value->getPrice(true),
+                        $store,
+                        false
+                    )
+                ]
+            );
+        }
+
+        return $select;
+    }
+}
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php
index b8865f2de8d1e..3969d8193817b 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php
@@ -37,9 +37,14 @@ public function __construct(
      * Get tree node (Ajax version)
      *
      * @return \Magento\Framework\Controller\ResultInterface
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         if ($this->getRequest()->getParam('expand_all')) {
             $this->_objectManager->get(\Magento\Backend\Model\Auth\Session::class)->setIsTreeWasExpanded(true);
         } else {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php
index 0a54475b15f9c..4f14fb58487c1 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Delete.php
@@ -29,9 +29,14 @@ public function __construct(
      * Delete category action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
 
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
index df2c80eda141c..02ddb162aff3a 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
@@ -26,7 +26,7 @@ class Move extends \Magento\Catalog\Controller\Adminhtml\Category
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-     * @param \Magento\Framework\View\LayoutFactory $layoutFactory,
+     * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Psr\Log\LoggerInterface $logger
      */
     public function __construct(
@@ -45,16 +45,17 @@ public function __construct(
      * Move category action
      *
      * @return \Magento\Framework\Controller\Result\Raw
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
-        /**
-         * New parent category identifier
-         */
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
+        /** New parent category identifier */
         $parentNodeId = $this->getRequest()->getPost('pid', false);
-        /**
-         * Category id after which we have put our category
-         */
+        /** Category id after which we have put our category */
         $prevNodeId = $this->getRequest()->getPost('aid', false);
 
         /** @var $block \Magento\Framework\View\Element\Messages */
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 0fbf9054ef1bd..492288308a95c 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,6 +7,7 @@
 namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute;
 
 use Magento\Backend\App\Action;
+use Magento\Framework\Exception\NotFoundException;
 
 /**
  * Class Save
@@ -81,12 +82,17 @@ public function __construct(
      * Update product attributes
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws NotFoundException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         if (!$this->_validateProducts()) {
             return $this->resultRedirectFactory->create()->setPath('catalog/product/', ['_current' => true]);
         }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php
index bef6aee0e2afd..f4b55f081afc4 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Delete.php
@@ -6,13 +6,20 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
 
+use Magento\Framework\Exception\NotFoundException;
+
 class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         $id = $this->getRequest()->getParam('attribute_id');
         $resultRedirect = $this->resultRedirectFactory->create();
         if ($id) {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
index 91a98424c9ae1..5b15024f21ce8 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -18,6 +18,8 @@
 use Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\Validator;
 use Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\ValidatorFactory;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\FormData;
 use Magento\Framework\Cache\FrontendInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\Result\Json;
@@ -27,6 +29,7 @@
 use Magento\Framework\Registry;
 use Magento\Framework\View\LayoutFactory;
 use Magento\Framework\View\Result\PageFactory;
+use Magento\Framework\Exception\NotFoundException;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -68,6 +71,11 @@ class Save extends Attribute
      */
     private $layoutFactory;
 
+    /**
+     * @var FormData
+     */
+    private $formDataSerializer;
+
     /**
      * @param Context $context
      * @param FrontendInterface $attributeLabelCache
@@ -80,6 +88,7 @@ class Save extends Attribute
      * @param FilterManager $filterManager
      * @param Product $productHelper
      * @param LayoutFactory $layoutFactory
+     * @param FormData|null $formDataSerializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -93,7 +102,8 @@ public function __construct(
         CollectionFactory $groupCollectionFactory,
         FilterManager $filterManager,
         Product $productHelper,
-        LayoutFactory $layoutFactory
+        LayoutFactory $layoutFactory,
+        FormData $formDataSerializer = null
     ) {
         parent::__construct($context, $attributeLabelCache, $coreRegistry, $resultPageFactory);
         $this->buildFactory = $buildFactory;
@@ -103,19 +113,42 @@ public function __construct(
         $this->validatorFactory = $validatorFactory;
         $this->groupCollectionFactory = $groupCollectionFactory;
         $this->layoutFactory = $layoutFactory;
+        $this->formDataSerializer = $formDataSerializer ?? ObjectManager::getInstance()->get(FormData::class);
     }
 
     /**
-     * @return Redirect
+     * @inheritdoc
+     * @throws NotFoundException
+     *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
+        try {
+            $optionData = $this->formDataSerializer->unserialize(
+                $this->getRequest()->getParam('serialized_options', '[]')
+            );
+        } catch (\InvalidArgumentException $e) {
+            $message = __("The attribute couldn't be saved due to an error. Verify your information and try again. "
+                . "If the error persists, please try again later.");
+            $this->messageManager->addErrorMessage($message);
+
+            return $this->returnResult('catalog/*/edit', ['_current' => true], ['error' => true]);
+        }
+
         $data = $this->getRequest()->getPostValue();
+        $data = array_replace_recursive(
+            $data,
+            $optionData
+        );
+
         if ($data) {
-            $this->preprocessOptionsData($data);
             $setId = $this->getRequest()->getParam('set');
 
             $attributeSet = null;
@@ -124,7 +157,7 @@ public function execute()
                 $name = trim($name);
 
                 try {
-                    /** @var $attributeSet Set */
+                    /** @var Set $attributeSet */
                     $attributeSet = $this->buildFactory->create()
                         ->setEntityTypeId($this->_entityTypeId)
                         ->setSkeletonId($setId)
@@ -147,7 +180,7 @@ public function execute()
 
             $attributeId = $this->getRequest()->getParam('attribute_id');
 
-            /** @var $model ProductAttributeInterface */
+            /** @var ProductAttributeInterface $model */
             $model = $this->attributeFactory->create();
             if ($attributeId) {
                 $model->load($attributeId);
@@ -156,31 +189,11 @@ public function execute()
                 ? $model->getAttributeCode()
                 : $this->getRequest()->getParam('attribute_code');
             $attributeCode = $attributeCode ?: $this->generateCode($this->getRequest()->getParam('frontend_label')[0]);
-            if (strlen($attributeCode) > 0) {
-                $validatorAttrCode = new \Zend_Validate_Regex(
-                    ['pattern' => '/^[a-z\x{600}-\x{6FF}][a-z\x{600}-\x{6FF}_0-9]{0,30}$/u']
-                );
-                if (!$validatorAttrCode->isValid($attributeCode)) {
-                    $this->messageManager->addErrorMessage(
-                        __(
-                            'Attribute code "%1" is invalid. Please use only letters (a-z), ' .
-                            'numbers (0-9) or underscore(_) in this field, first character should be a letter.',
-                            $attributeCode
-                        )
-                    );
-
-                    return $this->returnResult(
-                        'catalog/*/edit',
-                        ['attribute_id' => $attributeId, '_current' => true],
-                        ['error' => true]
-                    );
-                }
-            }
             $data['attribute_code'] = $attributeCode;
 
             //validate frontend_input
             if (isset($data['frontend_input'])) {
-                /** @var $inputType Validator */
+                /** @var Validator $inputType */
                 $inputType = $this->validatorFactory->create();
                 if (!$inputType->isValid($data['frontend_input'])) {
                     foreach ($inputType->getMessages() as $message) {
@@ -313,29 +326,8 @@ public function execute()
     }
 
     /**
-     * Extract options data from serialized options field and append to data array.
-     *
-     * This logic is required to overcome max_input_vars php limit
-     * that may vary and/or be inaccessible to change on different instances.
+     * Provides an initialized Result object.
      *
-     * @param array $data
-     * @return void
-     */
-    private function preprocessOptionsData(&$data)
-    {
-        if (isset($data['serialized_options'])) {
-            $serializedOptions = json_decode($data['serialized_options'], JSON_OBJECT_AS_ARRAY);
-            foreach ($serializedOptions as $serializedOption) {
-                $option = [];
-                $serializedOptionWithParsedAmpersand = str_replace('&', '%26', $serializedOption);
-                parse_str($serializedOptionWithParsedAmpersand, $option);
-                $data = array_replace_recursive($data, $option);
-            }
-        }
-        unset($data['serialized_options']);
-    }
-
-    /**
      * @param string $path
      * @param array $params
      * @param array $response
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
index 7fe012a87d929..03d143fff036f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
@@ -6,8 +6,15 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
 
+use Magento\Framework\Serialize\Serializer\FormData;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
 
+/**
+ * Product attribute validate controller.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
 {
     const DEFAULT_MESSAGE_KEY = 'message';
@@ -27,6 +34,11 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
      */
     private $multipleAttributeList;
 
+    /**
+     * @var FormData
+     */
+    private $formDataSerializer;
+
     /**
      * Constructor
      *
@@ -37,6 +49,7 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product\Attribute
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param array $multipleAttributeList
+     * @param FormData|null $formDataSerializer
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -45,16 +58,19 @@ public function __construct(
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
         \Magento\Framework\View\LayoutFactory $layoutFactory,
-        array $multipleAttributeList = []
+        array $multipleAttributeList = [],
+        FormData $formDataSerializer = null
     ) {
         parent::__construct($context, $attributeLabelCache, $coreRegistry, $resultPageFactory);
         $this->resultJsonFactory = $resultJsonFactory;
         $this->layoutFactory = $layoutFactory;
         $this->multipleAttributeList = $multipleAttributeList;
+        $this->formDataSerializer = $formDataSerializer ?? ObjectManager::getInstance()->get(FormData::class);
     }
 
     /**
-     * @return \Magento\Framework\Controller\ResultInterface
+     * @inheritdoc
+     *
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
@@ -62,6 +78,16 @@ public function execute()
     {
         $response = new DataObject();
         $response->setError(false);
+        try {
+            $optionsData = $this->formDataSerializer->unserialize(
+                $this->getRequest()->getParam('serialized_options', '[]')
+            );
+        } catch (\InvalidArgumentException $e) {
+            $message = __("The attribute couldn't be validated due to an error. Verify your information and try again. "
+                . "If the error persists, please try again later.");
+            $this->setMessageToResponse($response, [$message]);
+            $response->setError(true);
+        }
 
         $attributeCode = $this->getRequest()->getParam('attribute_code');
         $frontendLabel = $this->getRequest()->getParam('frontend_label');
@@ -74,7 +100,7 @@ public function execute()
             $attributeCode
         );
 
-        if ($attribute->getId() && !$attributeId) {
+        if ($attribute->getId() && !$attributeId || $attributeCode === 'product_type' || $attributeCode === 'type_id') {
             $message = strlen($this->getRequest()->getParam('attribute_code'))
                 ? __('An attribute with this code already exists.')
                 : __('An attribute with the same code (%1) already exists.', $attributeCode);
@@ -101,10 +127,10 @@ public function execute()
         }
 
         $multipleOption = $this->getRequest()->getParam("frontend_input");
-        $multipleOption = null == $multipleOption ? 'select' : $multipleOption;
+        $multipleOption = (null === $multipleOption) ? 'select' : $multipleOption;
 
         if (isset($this->multipleAttributeList[$multipleOption]) && !(null == ($multipleOption))) {
-            $options = $this->getRequest()->getParam($this->multipleAttributeList[$multipleOption]);
+            $options = $optionsData[$this->multipleAttributeList[$multipleOption]] ?? null;
             $this->checkUniqueOption(
                 $response,
                 $options
@@ -122,7 +148,8 @@ public function execute()
     }
 
     /**
-     * Throws Exception if not unique values into options
+     * Throws Exception if not unique values into options.
+     *
      * @param array $optionsValues
      * @param array $deletedOptions
      * @return bool
@@ -131,7 +158,7 @@ private function isUniqueAdminValues(array $optionsValues, array $deletedOptions
     {
         $adminValues = [];
         foreach ($optionsValues as $optionKey => $values) {
-            if (!(isset($deletedOptions[$optionKey]) and $deletedOptions[$optionKey] === '1')) {
+            if (!(isset($deletedOptions[$optionKey]) && $deletedOptions[$optionKey] === '1')) {
                 $adminValues[] = reset($values);
             }
         }
@@ -156,6 +183,8 @@ private function setMessageToResponse($response, $messages)
     }
 
     /**
+     * Performs checking the uniqueness of the attribute options.
+     *
      * @param DataObject $response
      * @param array|null $options
      * @return $this
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
index 125406061aed7..448de260f2eed 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
@@ -15,6 +15,9 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Type as ProductTypes;
 
+/**
+ * Build a product based on a request.
+ */
 class Builder
 {
     /**
@@ -92,6 +95,9 @@ public function build(RequestInterface $request)
         if ($productId) {
             try {
                 $product = $this->productRepository->getById($productId, true, $storeId);
+                if ($attributeSetId) {
+                    $product->setAttributeSetId($attributeSetId);
+                }
             } catch (\Exception $e) {
                 $product = $this->createEmptyProduct(ProductTypes::DEFAULT_TYPE, $attributeSetId, $storeId);
                 $this->logger->critical($e);
@@ -113,6 +119,8 @@ public function build(RequestInterface $request)
     }
 
     /**
+     * Create a product with the given properties
+     *
      * @param int $typeId
      * @param int $attributeSetId
      * @param int $storeId
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 7153f9fd0f3f9..f11d16755ef0d 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
@@ -19,6 +19,8 @@
 use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeFilter;
 
 /**
+ * Product helper
+ *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
@@ -104,7 +106,7 @@ class Helper
      * @param \Magento\Backend\Helper\Js $jsHelper
      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
      * @param CustomOptionFactory|null $customOptionFactory
-     * @param ProductLinkFactory |null $productLinkFactory
+     * @param ProductLinkFactory|null $productLinkFactory
      * @param ProductRepositoryInterface|null $productRepository
      * @param LinkTypeProvider|null $linkTypeProvider
      * @param AttributeFilter|null $attributeFilter
@@ -365,6 +367,8 @@ private function overwriteValue($optionId, $option, $overwriteOptions)
     }
 
     /**
+     * Get link resolver instance
+     *
      * @return LinkResolver
      * @deprecated 101.0.0
      */
@@ -377,6 +381,8 @@ private function getLinkResolver()
     }
 
     /**
+     * Get DateTimeFilter instance
+     *
      * @return \Magento\Framework\Stdlib\DateTime\Filter\DateTime
      * @deprecated 101.0.0
      */
@@ -391,6 +397,7 @@ private function getDateTimeFilter()
 
     /**
      * Remove ids of non selected websites from $websiteIds array and return filtered data
+     *
      * $websiteIds parameter expects array with website ids as keys and 1 (selected) or 0 (non selected) as values
      * Only one id (default website ID) will be set to $websiteIds array when the single store mode is turned on
      *
@@ -463,6 +470,7 @@ private function fillProductOptions(Product $product, array $productOptions)
     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']);
         }
 
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
index b6e7e31fb9efd..02b0025a7922a 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
@@ -9,6 +9,7 @@
 use Magento\Backend\App\Action;
 use Magento\Catalog\Controller\Adminhtml\Product;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Ui\Component\MassAction\Filter;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 
@@ -77,9 +78,14 @@ public function _validateMassStatus(array $productIds, $status)
      * Update product(s) status action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         $collection = $this->filter->getCollection($this->collectionFactory->create());
         $productIds = $collection->getAllIds();
         $storeId = (int) $this->getRequest()->getParam('store', 0);
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
index bf0d740fc98fb..7a382d1cb31bc 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
@@ -79,11 +79,12 @@ public function __construct(
     }
 
     /**
-     * Save product action
+     * Save product action.
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function execute()
     {
@@ -143,6 +144,7 @@ public function execute()
                 if ($redirectBack === 'duplicate') {
                     $product->unsetData('quantity_and_stock_status');
                     $newProduct = $this->productCopier->copy($product);
+                    $this->checkUniqueAttributes($product);
                     $this->messageManager->addSuccessMessage(__('You duplicated the product.'));
                 }
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
@@ -321,4 +323,25 @@ private function persistMediaData(ProductInterface $product, array $data)
 
         return $data;
     }
+
+    /**
+     * Check unique attributes and add error to message manager.
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     */
+    private function checkUniqueAttributes(\Magento\Catalog\Model\Product $product)
+    {
+        $uniqueLabels = [];
+        foreach ($product->getAttributes() as $attribute) {
+            if ($attribute->getIsUnique() && $attribute->getIsUserDefined()
+                && !empty($product->getData($attribute->getAttributeCode()))
+            ) {
+                $uniqueLabels[] = $attribute->getDefaultFrontendLabel();
+            }
+        }
+        if ($uniqueLabels) {
+            $uniqueLabels = implode('", "', $uniqueLabels);
+            $this->messageManager->addErrorMessage(__('The value of attribute(s) "%1" must be unique', $uniqueLabels));
+        }
+    }
 }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php
index f2695311732f0..09d35c4f72de6 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Delete.php
@@ -6,6 +6,8 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Set;
 
+use Magento\Framework\Exception\NotFoundException;
+
 class Delete extends \Magento\Catalog\Controller\Adminhtml\Product\Set
 {
     /**
@@ -29,10 +31,15 @@ public function __construct(
 
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws NotFoundException
      */
     public function execute()
     {
-        $setId = $this->getRequest()->getParam('id');
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
+        $setId = (int)$this->getRequest()->getParam('id');
         $resultRedirect = $this->resultRedirectFactory->create();
         try {
             $this->attributeSetRepository->deleteById($setId);
@@ -42,6 +49,7 @@ public function execute()
             $this->messageManager->addErrorMessage(__('We can\'t delete this set right now.'));
             $resultRedirect->setUrl($this->_redirect->getRedirectUrl($this->getUrl('*')));
         }
+
         return $resultRedirect;
     }
 }
diff --git a/app/code/Magento/Catalog/Controller/Category/View.php b/app/code/Magento/Catalog/Controller/Category/View.php
index e31b1a17ecdc3..c7d237da2c4b8 100644
--- a/app/code/Magento/Catalog/Controller/Category/View.php
+++ b/app/code/Magento/Catalog/Controller/Category/View.php
@@ -8,13 +8,17 @@
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Model\Layer\Resolver;
+use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\View\Result\PageFactory;
+use Magento\Framework\App\Action\Action;
 
 /**
+ * View a category on storefront. Needs to be accessible by POST because of the store switching.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class View extends \Magento\Framework\App\Action\Action
+class View extends Action
 {
     /**
      * Core registry
@@ -69,6 +73,11 @@ class View extends \Magento\Framework\App\Action\Action
      */
     protected $categoryRepository;
 
+    /**
+     * @var ToolbarMemorizer
+     */
+    private $toolbarMemorizer;
+
     /**
      * Constructor
      *
@@ -82,6 +91,7 @@ class View extends \Magento\Framework\App\Action\Action
      * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
      * @param Resolver $layerResolver
      * @param CategoryRepositoryInterface $categoryRepository
+     * @param ToolbarMemorizer|null $toolbarMemorizer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -94,7 +104,8 @@ public function __construct(
         PageFactory $resultPageFactory,
         \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory,
         Resolver $layerResolver,
-        CategoryRepositoryInterface $categoryRepository
+        CategoryRepositoryInterface $categoryRepository,
+        ToolbarMemorizer $toolbarMemorizer = null
     ) {
         parent::__construct($context);
         $this->_storeManager = $storeManager;
@@ -106,6 +117,7 @@ public function __construct(
         $this->resultForwardFactory = $resultForwardFactory;
         $this->layerResolver = $layerResolver;
         $this->categoryRepository = $categoryRepository;
+        $this->toolbarMemorizer = $toolbarMemorizer ?: $context->getObjectManager()->get(ToolbarMemorizer::class);
     }
 
     /**
@@ -130,6 +142,7 @@ protected function _initCategory()
         }
         $this->_catalogSession->setLastVisitedCategoryId($category->getId());
         $this->_coreRegistry->register('current_category', $category);
+        $this->toolbarMemorizer->memorizeParams();
         try {
             $this->_eventManager->dispatch(
                 'catalog_controller_category_init_after',
@@ -195,7 +208,7 @@ public function execute()
             if ($layoutUpdates && is_array($layoutUpdates)) {
                 foreach ($layoutUpdates as $layoutUpdate) {
                     $page->addUpdate($layoutUpdate);
-                    $page->addPageLayoutHandles(['layout_update' => md5($layoutUpdate)], null, false);
+                    $page->addPageLayoutHandles(['layout_update' => sha1($layoutUpdate)], null, false);
                 }
             }
 
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Add.php b/app/code/Magento/Catalog/Controller/Product/Compare/Add.php
index eb9cc83125541..24dec0e709122 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Add.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Add.php
@@ -18,7 +18,7 @@ class Add extends \Magento\Catalog\Controller\Product\Compare
     public function execute()
     {
         $resultRedirect = $this->resultRedirectFactory->create();
-        if (!$this->_formKeyValidator->validate($this->getRequest())) {
+        if (!$this->isActionAllowed()) {
             return $resultRedirect->setRefererUrl();
         }
 
@@ -51,4 +51,12 @@ public function execute()
         }
         return $resultRedirect->setRefererOrBaseUrl();
     }
+
+    /**
+     * @return bool
+     */
+    private function isActionAllowed(): bool
+    {
+        return $this->getRequest()->isPost() && $this->_formKeyValidator->validate($this->getRequest());
+    }
 }
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php b/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php
index 568fbf1d05677..ebbf90e0701ae 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Clear.php
@@ -17,29 +17,42 @@ class Clear extends \Magento\Catalog\Controller\Product\Compare
      */
     public function execute()
     {
-        /** @var \Magento\Catalog\Model\ResourceModel\Product\Compare\Item\Collection $items */
-        $items = $this->_itemCollectionFactory->create();
+        if ($this->isActionAllowed()) {
+            /** @var \Magento\Catalog\Model\ResourceModel\Product\Compare\Item\Collection $items */
+            $items = $this->_itemCollectionFactory->create();
 
-        if ($this->_customerSession->isLoggedIn()) {
-            $items->setCustomerId($this->_customerSession->getCustomerId());
-        } elseif ($this->_customerId) {
-            $items->setCustomerId($this->_customerId);
-        } else {
-            $items->setVisitorId($this->_customerVisitor->getId());
-        }
+            if ($this->_customerSession->isLoggedIn()) {
+                $items->setCustomerId($this->_customerSession->getCustomerId());
+            } elseif ($this->_customerId) {
+                $items->setCustomerId($this->_customerId);
+            } else {
+                $items->setVisitorId($this->_customerVisitor->getId());
+            }
 
-        try {
-            $items->clear();
-            $this->messageManager->addSuccessMessage(__('You cleared the comparison list.'));
-            $this->_objectManager->get(\Magento\Catalog\Helper\Product\Compare::class)->calculate();
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addErrorMessage($e->getMessage());
-        } catch (\Exception $e) {
-            $this->messageManager->addExceptionMessage($e, __('Something went wrong  clearing the comparison list.'));
+            try {
+                $items->clear();
+                $this->messageManager->addSuccessMessage(__('You cleared the comparison list.'));
+                $this->_objectManager->get(\Magento\Catalog\Helper\Product\Compare::class)->calculate();
+            } catch (\Magento\Framework\Exception\LocalizedException $e) {
+                $this->messageManager->addErrorMessage($e->getMessage());
+            } catch (\Exception $e) {
+                $this->messageManager->addExceptionMessage(
+                    $e,
+                    __('Something went wrong  clearing the comparison list.')
+                );
+            }
         }
 
         /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         return $resultRedirect->setRefererOrBaseUrl();
     }
+
+    /**
+     * @return bool
+     */
+    private function isActionAllowed(): bool
+    {
+        return $this->getRequest()->isPost() && $this->_formKeyValidator->validate($this->getRequest());
+    }
 }
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php b/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
index 2acbe5ce4d582..36aa0ea1caf9d 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
@@ -18,7 +18,7 @@ class Remove extends \Magento\Catalog\Controller\Product\Compare
     public function execute()
     {
         $productId = (int)$this->getRequest()->getParam('product');
-        if ($productId) {
+        if ($this->isActionAllowed() && $productId) {
             $storeId = $this->_storeManager->getStore()->getId();
             try {
                 $product = $this->productRepository->getById($productId, false, $storeId);
@@ -61,4 +61,12 @@ public function execute()
             return $resultRedirect->setRefererOrBaseUrl();
         }
     }
+
+    /**
+     * @return bool
+     */
+    private function isActionAllowed(): bool
+    {
+        return $this->getRequest()->isPost() && $this->_formKeyValidator->validate($this->getRequest());
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php
index 00b093b2918f1..aa99918753e81 100644
--- a/app/code/Magento/Catalog/Model/Category.php
+++ b/app/code/Magento/Catalog/Model/Category.php
@@ -1130,10 +1130,15 @@ public function reindex()
             }
         }
         $productIndexer = $this->indexerRegistry->get(Indexer\Category\Product::INDEXER_ID);
-        if (!$productIndexer->isScheduled()
-            && (!empty($this->getAffectedProductIds()) || $this->dataHasChangedFor('is_anchor'))
-        ) {
-            $productIndexer->reindexList($this->getPathIds());
+
+        if (!empty($this->getAffectedProductIds())
+            || $this->dataHasChangedFor('is_anchor')
+            || $this->dataHasChangedFor('is_active')) {
+            if (!$productIndexer->isScheduled()) {
+                $productIndexer->reindexList($this->getPathIds());
+            } else {
+                $productIndexer->invalidate();
+            }
         }
     }
 
@@ -1165,16 +1170,14 @@ public function getIdentities()
                 $identities[] = self::CACHE_TAG . '_' . $this->getId();
             }
 
-            if ($this->hasDataChanges() || $this->isDeleted() || $this->dataHasChangedFor(self::KEY_INCLUDE_IN_MENU)) {
-                $identities[] = Product::CACHE_PRODUCT_CATEGORY_TAG . '_' . $this->getId();
-            }
-            
+            $identities = $this->getCategoryRelationIdentities($identities);
+
             if ($this->isObjectNew()) {
                 $identities[] = self::CACHE_TAG;
             }
         }
 
-        return $identities;
+        return array_unique($identities);
     }
 
     /**
@@ -1460,5 +1463,25 @@ public function setExtensionAttributes(\Magento\Catalog\Api\Data\CategoryExtensi
         return $this->_setExtensionAttributes($extensionAttributes);
     }
 
+    /**
+     * Return category relation identities.
+     *
+     * @param array $identities
+     * @return array
+     */
+    private function getCategoryRelationIdentities(array $identities): array
+    {
+        if ($this->hasDataChanges() || $this->isDeleted() || $this->dataHasChangedFor(self::KEY_INCLUDE_IN_MENU)) {
+            $identities[] = Product::CACHE_PRODUCT_CATEGORY_TAG . '_' . $this->getId();
+            if ($this->dataHasChangedFor('is_anchor') || $this->dataHasChangedFor('is_active')) {
+                foreach ($this->getPathIds() as $id) {
+                    $identities[] = Product::CACHE_PRODUCT_CATEGORY_TAG . '_' . $id;
+                }
+            }
+        }
+
+        return $identities;
+    }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
index 1890ea0f7d99e..20ea899a3d0d7 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
@@ -17,6 +17,12 @@ class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
      */
     protected $pageLayoutBuilder;
 
+    /**
+     * @inheritdoc
+     * @deprecated since the cache is now handled by \Magento\Theme\Model\PageLayout\Config\Builder::$configFiles
+     */
+    protected $_options = null;
+
     /**
      * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
      */
@@ -26,14 +32,14 @@ public function __construct(\Magento\Framework\View\Model\PageLayout\Config\Buil
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAllOptions()
     {
-        if (!$this->_options) {
-            $this->_options = $this->pageLayoutBuilder->getPageLayoutsConfig()->toOptionArray();
-            array_unshift($this->_options, ['value' => '', 'label' => __('No layout updates')]);
-        }
-        return $this->_options;
+        $options = $this->pageLayoutBuilder->getPageLayoutsConfig()->toOptionArray();
+        array_unshift($options, ['value' => '', 'label' => __('No layout updates')]);
+        $this->_options = $options;
+
+        return $options;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Category/Product/PositionResolver.php b/app/code/Magento/Catalog/Model/Category/Product/PositionResolver.php
index 97941f2d23b9f..edaac39864c5a 100644
--- a/app/code/Magento/Catalog/Model/Category/Product/PositionResolver.php
+++ b/app/code/Magento/Catalog/Model/Category/Product/PositionResolver.php
@@ -52,6 +52,8 @@ public function getPositions(int $categoryId)
             $categoryId
         )->order(
             'ccp.position ' . \Magento\Framework\DB\Select::SQL_ASC
+        )->order(
+            'ccp.product_id ' . \Magento\Framework\DB\Select::SQL_DESC
         );
 
         return array_flip($connection->fetchCol($select));
diff --git a/app/code/Magento/Catalog/Model/Category/StoreCategories.php b/app/code/Magento/Catalog/Model/Category/StoreCategories.php
new file mode 100644
index 0000000000000..c92f8d44c6887
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Category/StoreCategories.php
@@ -0,0 +1,59 @@
+<?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\CategoryRepositoryInterface;
+use Magento\Catalog\Model\Category;
+use Magento\Store\Api\GroupRepositoryInterface;
+
+/**
+ * Fetcher for associated with store group categories.
+ */
+class StoreCategories
+{
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
+    /**
+     * @var GroupRepositoryInterface
+     */
+    private $groupRepository;
+
+    /**
+     * @param CategoryRepositoryInterface $categoryRepository
+     * @param GroupRepositoryInterface $groupRepository
+     */
+    public function __construct(
+        CategoryRepositoryInterface $categoryRepository,
+        GroupRepositoryInterface $groupRepository
+    ) {
+        $this->categoryRepository = $categoryRepository;
+        $this->groupRepository = $groupRepository;
+    }
+
+    /**
+     * Get all category ids for store.
+     *
+     * @param int|null $storeGroupId
+     * @return array
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function getCategoryIds($storeGroupId = null): array
+    {
+        $rootCategoryId = $storeGroupId
+            ? $this->groupRepository->get($storeGroupId)->getRootCategoryId()
+            : Category::TREE_ROOT_ID;
+        /** @var Category $rootCategory */
+        $rootCategory = $this->categoryRepository->get($rootCategoryId);
+        $categoriesIds = $rootCategory->getAllChildren(true);
+
+        return (array) $categoriesIds;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/CategoryList.php b/app/code/Magento/Catalog/Model/CategoryList.php
index 790ea6b921fbe..cab8e013d9ba1 100644
--- a/app/code/Magento/Catalog/Model/CategoryList.php
+++ b/app/code/Magento/Catalog/Model/CategoryList.php
@@ -15,6 +15,9 @@
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 
+/**
+ * Class for getting category list.
+ */
 class CategoryList implements CategoryListInterface
 {
     /**
@@ -64,7 +67,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getList(SearchCriteriaInterface $searchCriteria)
     {
diff --git a/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php b/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php
index e2b0a91574021..d7d342f357519 100644
--- a/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php
+++ b/app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php
@@ -5,10 +5,14 @@
  */
 namespace Magento\Catalog\Model\Config\CatalogClone\Media;
 
+use Magento\Framework\Escaper;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Clone model for media images related config fields
  *
  * @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Image extends \Magento\Framework\App\Config\Value
 {
@@ -26,6 +30,11 @@ class Image extends \Magento\Framework\App\Config\Value
      */
     protected $_attributeCollectionFactory;
 
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -36,6 +45,9 @@ class Image extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param Escaper|null $escaper
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -46,8 +58,10 @@ public function __construct(
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        Escaper $escaper = null
     ) {
+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(Escaper::class);
         $this->_attributeCollectionFactory = $attributeCollectionFactory;
         $this->_eavConfig = $eavConfig;
         parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
@@ -74,7 +88,7 @@ public function getPrefixes()
             /* @var $attribute \Magento\Eav\Model\Entity\Attribute */
             $prefixes[] = [
                 'field' => $attribute->getAttributeCode() . '_',
-                'label' => $attribute->getFrontend()->getLabel(),
+                'label' => $this->escaper->escapeHtml($attribute->getFrontend()->getLabel()),
             ];
         }
 
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
index f8121b55dbf99..b12ffe1ac1f87 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
@@ -5,31 +5,41 @@
  */
 namespace Magento\Catalog\Model\Indexer\Category\Product\Action;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Config;
+use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Query\Generator as QueryGenerator;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Select;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Indexer\BatchProviderInterface;
+use Magento\Framework\Indexer\BatchSizeManagementInterface;
 use Magento\Indexer\Model\ProcessManager;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class Full reindex action
  *
- * @package Magento\Catalog\Model\Indexer\Category\Product\Action
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction
+class Full extends AbstractAction
 {
     /**
-     * @var \Magento\Framework\Indexer\BatchSizeManagementInterface
+     * @var BatchSizeManagementInterface
      */
     private $batchSizeManagement;
 
     /**
-     * @var \Magento\Framework\Indexer\BatchProviderInterface
+     * @var BatchProviderInterface
      */
     private $batchProvider;
 
     /**
-     * @var \Magento\Framework\EntityManager\MetadataPool
+     * @var MetadataPool
      */
     protected $metadataPool;
 
@@ -52,25 +62,25 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
 
     /**
      * @param ResourceConnection $resource
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Catalog\Model\Config $config
+     * @param StoreManagerInterface $storeManager
+     * @param Config $config
      * @param QueryGenerator|null $queryGenerator
-     * @param \Magento\Framework\Indexer\BatchSizeManagementInterface|null $batchSizeManagement
-     * @param \Magento\Framework\Indexer\BatchProviderInterface|null $batchProvider
-     * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
+     * @param BatchSizeManagementInterface|null $batchSizeManagement
+     * @param BatchProviderInterface|null $batchProvider
+     * @param MetadataPool|null $metadataPool
      * @param int|null $batchRowsCount
      * @param ActiveTableSwitcher|null $activeTableSwitcher
      * @param ProcessManager $processManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Framework\App\ResourceConnection $resource,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Catalog\Model\Config $config,
+        ResourceConnection $resource,
+        StoreManagerInterface $storeManager,
+        Config $config,
         QueryGenerator $queryGenerator = null,
-        \Magento\Framework\Indexer\BatchSizeManagementInterface $batchSizeManagement = null,
-        \Magento\Framework\Indexer\BatchProviderInterface $batchProvider = null,
-        \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
+        BatchSizeManagementInterface $batchSizeManagement = null,
+        BatchProviderInterface $batchProvider = null,
+        MetadataPool $metadataPool = null,
         $batchRowsCount = null,
         ActiveTableSwitcher $activeTableSwitcher = null,
         ProcessManager $processManager = null
@@ -81,15 +91,15 @@ public function __construct(
             $config,
             $queryGenerator
         );
-        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $objectManager = ObjectManager::getInstance();
         $this->batchSizeManagement = $batchSizeManagement ?: $objectManager->get(
-            \Magento\Framework\Indexer\BatchSizeManagementInterface::class
+            BatchSizeManagementInterface::class
         );
         $this->batchProvider = $batchProvider ?: $objectManager->get(
-            \Magento\Framework\Indexer\BatchProviderInterface::class
+            BatchProviderInterface::class
         );
         $this->metadataPool = $metadataPool ?: $objectManager->get(
-            \Magento\Framework\EntityManager\MetadataPool::class
+            MetadataPool::class
         );
         $this->batchRowsCount = $batchRowsCount;
         $this->activeTableSwitcher = $activeTableSwitcher ?: $objectManager->get(ActiveTableSwitcher::class);
@@ -97,41 +107,45 @@ public function __construct(
     }
 
     /**
+     * Create the store tables
+     *
      * @return void
      */
     private function createTables()
     {
         foreach ($this->storeManager->getStores() as $store) {
-            $this->tableMaintainer->createTablesForStore($store->getId());
+            $this->tableMaintainer->createTablesForStore((int)$store->getId());
         }
     }
 
     /**
+     * Truncates the replica tables
+     *
      * @return void
      */
     private function clearReplicaTables()
     {
         foreach ($this->storeManager->getStores() as $store) {
-            $this->connection->truncateTable($this->tableMaintainer->getMainReplicaTable($store->getId()));
+            $this->connection->truncateTable($this->tableMaintainer->getMainReplicaTable((int)$store->getId()));
         }
     }
 
     /**
+     * Switches the active table
+     *
      * @return void
      */
     private function switchTables()
     {
         $tablesToSwitch = [];
         foreach ($this->storeManager->getStores() as $store) {
-            $tablesToSwitch[] = $this->tableMaintainer->getMainTable($store->getId());
+            $tablesToSwitch[] = $this->tableMaintainer->getMainTable((int)$store->getId());
         }
         $this->activeTableSwitcher->switchTable($this->connection, $tablesToSwitch);
     }
 
     /**
-     * Refresh entities index
-     *
-     * @return $this
+     * @inheritdoc
      */
     public function execute()
     {
@@ -139,6 +153,7 @@ public function execute()
         $this->clearReplicaTables();
         $this->reindex();
         $this->switchTables();
+
         return $this;
     }
 
@@ -165,7 +180,7 @@ protected function reindex()
     /**
      * Execute indexation by store
      *
-     * @param \Magento\Store\Model\Store $store
+     * @param Store $store
      */
     private function reindexStore($store)
     {
@@ -177,31 +192,31 @@ private function reindexStore($store)
     /**
      * Publish data from tmp to replica table
      *
-     * @param \Magento\Store\Model\Store $store
+     * @param Store $store
      * @return void
      */
     private function publishData($store)
     {
-        $select = $this->connection->select()->from($this->tableMaintainer->getMainTmpTable($store->getId()));
+        $select = $this->connection->select()->from($this->tableMaintainer->getMainTmpTable((int)$store->getId()));
         $columns = array_keys(
-            $this->connection->describeTable($this->tableMaintainer->getMainReplicaTable($store->getId()))
+            $this->connection->describeTable($this->tableMaintainer->getMainReplicaTable((int)$store->getId()))
         );
-        $tableName = $this->tableMaintainer->getMainReplicaTable($store->getId());
+        $tableName = $this->tableMaintainer->getMainReplicaTable((int)$store->getId());
 
         $this->connection->query(
             $this->connection->insertFromSelect(
                 $select,
                 $tableName,
                 $columns,
-                \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
+                AdapterInterface::INSERT_ON_DUPLICATE
             )
         );
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
-    protected function reindexRootCategory(\Magento\Store\Model\Store $store)
+    protected function reindexRootCategory(Store $store)
     {
         if ($this->isIndexRootCategoryNeeded()) {
             $this->reindexCategoriesBySelect($this->getAllProducts($store), 'cp.entity_id IN (?)', $store);
@@ -211,10 +226,10 @@ protected function reindexRootCategory(\Magento\Store\Model\Store $store)
     /**
      * Reindex products of anchor categories
      *
-     * @param \Magento\Store\Model\Store $store
+     * @param Store $store
      * @return void
      */
-    protected function reindexAnchorCategories(\Magento\Store\Model\Store $store)
+    protected function reindexAnchorCategories(Store $store)
     {
         $this->reindexCategoriesBySelect($this->getAnchorCategoriesSelect($store), 'ccp.product_id IN (?)', $store);
     }
@@ -222,10 +237,10 @@ protected function reindexAnchorCategories(\Magento\Store\Model\Store $store)
     /**
      * Reindex products of non anchor categories
      *
-     * @param \Magento\Store\Model\Store $store
+     * @param Store $store
      * @return void
      */
-    protected function reindexNonAnchorCategories(\Magento\Store\Model\Store $store)
+    protected function reindexNonAnchorCategories(Store $store)
     {
         $this->reindexCategoriesBySelect($this->getNonAnchorCategoriesSelect($store), 'ccp.product_id IN (?)', $store);
     }
@@ -233,40 +248,42 @@ protected function reindexNonAnchorCategories(\Magento\Store\Model\Store $store)
     /**
      * Reindex categories using given SQL select and condition.
      *
-     * @param \Magento\Framework\DB\Select $basicSelect
+     * @param Select $basicSelect
      * @param string $whereCondition
-     * @param \Magento\Store\Model\Store $store
+     * @param Store $store
      * @return void
      */
-    private function reindexCategoriesBySelect(\Magento\Framework\DB\Select $basicSelect, $whereCondition, $store)
+    private function reindexCategoriesBySelect(Select $basicSelect, $whereCondition, $store)
     {
-        $this->tableMaintainer->createMainTmpTable($store->getId());
+        $this->tableMaintainer->createMainTmpTable((int)$store->getId());
 
-        $entityMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+        $entityMetadata = $this->metadataPool->getMetadata(ProductInterface::class);
         $columns = array_keys(
-            $this->connection->describeTable($this->tableMaintainer->getMainTmpTable($store->getId()))
+            $this->connection->describeTable($this->tableMaintainer->getMainTmpTable((int)$store->getId()))
         );
         $this->batchSizeManagement->ensureBatchSize($this->connection, $this->batchRowsCount);
-        $batches = $this->batchProvider->getBatches(
-            $this->connection,
-            $entityMetadata->getEntityTable(),
+
+        $select = $this->connection->select();
+        $select->distinct(true);
+        $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
+
+        $batchQueries = $this->prepareSelectsByRange(
+            $select,
             $entityMetadata->getIdentifierField(),
-            $this->batchRowsCount
+            (int)$this->batchRowsCount
         );
-        foreach ($batches as $batch) {
-            $this->connection->delete($this->tableMaintainer->getMainTmpTable($store->getId()));
+
+        foreach ($batchQueries as $query) {
+            $this->connection->delete($this->tableMaintainer->getMainTmpTable((int)$store->getId()));
+            $entityIds = $this->connection->fetchCol($query);
             $resultSelect = clone $basicSelect;
-            $select = $this->connection->select();
-            $select->distinct(true);
-            $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
-            $entityIds = $this->batchProvider->getBatchIds($this->connection, $select, $batch);
             $resultSelect->where($whereCondition, $entityIds);
             $this->connection->query(
                 $this->connection->insertFromSelect(
                     $resultSelect,
-                    $this->tableMaintainer->getMainTmpTable($store->getId()),
+                    $this->tableMaintainer->getMainTmpTable((int)$store->getId()),
                     $columns,
-                    \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
+                    AdapterInterface::INSERT_ON_DUPLICATE
                 )
             );
             $this->publishData($store);
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php
index 802176092d147..b9ca4f342b45b 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php
@@ -7,26 +7,41 @@
 
 namespace Magento\Catalog\Model\Indexer\Product\Eav\Action;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction;
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Query\BatchIteratorInterface;
+use Magento\Framework\DB\Query\Generator as QueryGenerator;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Indexer\BatchProviderInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Class Full reindex action
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Full extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
+class Full extends AbstractAction
 {
     /**
-     * @var \Magento\Framework\EntityManager\MetadataPool
+     * @var MetadataPool
      */
     private $metadataPool;
 
     /**
-     * @var \Magento\Framework\Indexer\BatchProviderInterface
+     * @var BatchProviderInterface
      */
     private $batchProvider;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator
+     * @var BatchSizeCalculator
      */
     private $batchSizeCalculator;
 
@@ -36,44 +51,54 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
     private $activeTableSwitcher;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @var ScopeConfigInterface
      */
     private $scopeConfig;
 
     /**
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory $eavDecimalFactory
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory $eavSourceFactory
-     * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
-     * @param \Magento\Framework\Indexer\BatchProviderInterface|null $batchProvider
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator $batchSizeCalculator
+     * @var QueryGenerator|null
+     */
+    private $batchQueryGenerator;
+
+    /**
+     * @param DecimalFactory $eavDecimalFactory
+     * @param SourceFactory $eavSourceFactory
+     * @param MetadataPool|null $metadataPool
+     * @param BatchProviderInterface|null $batchProvider
+     * @param BatchSizeCalculator $batchSizeCalculator
      * @param ActiveTableSwitcher|null $activeTableSwitcher
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface|null $scopeConfig
+     * @param ScopeConfigInterface|null $scopeConfig
+     * @param QueryGenerator|null $batchQueryGenerator
      */
     public function __construct(
-        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory $eavDecimalFactory,
-        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory $eavSourceFactory,
-        \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
-        \Magento\Framework\Indexer\BatchProviderInterface $batchProvider = null,
-        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator $batchSizeCalculator = null,
+        DecimalFactory $eavDecimalFactory,
+        SourceFactory $eavSourceFactory,
+        MetadataPool $metadataPool = null,
+        BatchProviderInterface $batchProvider = null,
+        BatchSizeCalculator $batchSizeCalculator = null,
         ActiveTableSwitcher $activeTableSwitcher = null,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig = null
+        ScopeConfigInterface $scopeConfig = null,
+        QueryGenerator $batchQueryGenerator = null
     ) {
-        $this->scopeConfig = $scopeConfig ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
-            \Magento\Framework\App\Config\ScopeConfigInterface::class
+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(
+            ScopeConfigInterface::class
         );
         parent::__construct($eavDecimalFactory, $eavSourceFactory, $scopeConfig);
-        $this->metadataPool = $metadataPool ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
-            \Magento\Framework\EntityManager\MetadataPool::class
+        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(
+            MetadataPool::class
         );
-        $this->batchProvider = $batchProvider ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
-            \Magento\Framework\Indexer\BatchProviderInterface::class
+        $this->batchProvider = $batchProvider ?: ObjectManager::getInstance()->get(
+            BatchProviderInterface::class
         );
-        $this->batchSizeCalculator = $batchSizeCalculator ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
-            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator::class
+        $this->batchSizeCalculator = $batchSizeCalculator ?: ObjectManager::getInstance()->get(
+            BatchSizeCalculator::class
         );
-        $this->activeTableSwitcher = $activeTableSwitcher ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+        $this->activeTableSwitcher = $activeTableSwitcher ?: ObjectManager::getInstance()->get(
             ActiveTableSwitcher::class
         );
+        $this->batchQueryGenerator = $batchQueryGenerator ?: ObjectManager::getInstance()->get(
+            QueryGenerator::class
+        );
     }
 
     /**
@@ -81,7 +106,7 @@ public function __construct(
      *
      * @param array|int|null $ids
      * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($ids = null)
@@ -94,20 +119,21 @@ public function execute($ids = null)
                 $connection = $indexer->getConnection();
                 $mainTable = $this->activeTableSwitcher->getAdditionalTableName($indexer->getMainTable());
                 $connection->truncateTable($mainTable);
-                $entityMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
-                $batches = $this->batchProvider->getBatches(
-                    $connection,
-                    $entityMetadata->getEntityTable(),
+                $entityMetadata = $this->metadataPool->getMetadata(ProductInterface::class);
+
+                $select = $connection->select();
+                $select->distinct(true);
+                $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
+
+                $batchQueries = $this->batchQueryGenerator->generate(
                     $entityMetadata->getIdentifierField(),
-                    $this->batchSizeCalculator->estimateBatchSize($connection, $indexerName)
+                    $select,
+                    $this->batchSizeCalculator->estimateBatchSize($connection, $indexerName),
+                    BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
                 );
 
-                foreach ($batches as $batch) {
-                    /** @var \Magento\Framework\DB\Select $select */
-                    $select = $connection->select();
-                    $select->distinct(true);
-                    $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
-                    $entityIds = $this->batchProvider->getBatchIds($connection, $select, $batch);
+                foreach ($batchQueries as $query) {
+                    $entityIds = $connection->fetchCol($query);
                     if (!empty($entityIds)) {
                         $indexer->reindexEntities($this->processRelations($indexer, $entityIds, true));
                         $this->syncData($indexer, $mainTable);
@@ -116,7 +142,7 @@ public function execute($ids = null)
                 $this->activeTableSwitcher->switchTable($indexer->getConnection(), [$indexer->getMainTable()]);
             }
         } catch (\Exception $e) {
-            throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);
+            throw new LocalizedException(__($e->getMessage()), $e);
         }
     }
 
@@ -136,7 +162,7 @@ protected function syncData($indexer, $destinationTable, $ids = null)
                 $select,
                 $destinationTable,
                 $targetColumns,
-                \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
+                AdapterInterface::INSERT_ON_DUPLICATE
             );
             $connection->query($query);
             $connection->commit();
@@ -155,7 +181,7 @@ private function isEavIndexerEnabled(): bool
     {
         $eavIndexerStatus = $this->scopeConfig->getValue(
             self::ENABLE_EAV_INDEXER,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
 
         return (bool)$eavIndexerStatus;
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
index f95807f615390..25a9eebb5a0a9 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
@@ -9,6 +9,7 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Store\Model\Store;
 
 /**
  * Class Indexer
@@ -84,7 +85,7 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
                         [
                             'entity_id' => 'e.entity_id',
                             'attribute_id' => 't.attribute_id',
-                            'value' => $this->_connection->getIfNullSql('`t2`.`value`', '`t`.`value`'),
+                            'value' => 't.value'
                         ]
                     );
 
@@ -99,32 +100,30 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
                         sprintf('e.%s = t.%s ', $linkField, $linkField) . $this->_connection->quoteInto(
                             ' AND t.attribute_id IN (?)',
                             array_keys($ids)
-                        ) . ' AND t.store_id = 0',
-                        []
-                    )->joinLeft(
-                        ['t2' => $tableName],
-                        sprintf('t.%s = t2.%s ', $linkField, $linkField) .
-                        ' AND t.attribute_id = t2.attribute_id  ' .
-                        $this->_connection->quoteInto(
-                            ' AND t2.store_id = ?',
-                            $storeId
-                        ),
+                        ) . ' AND ' . $this->_connection->quoteInto('t.store_id IN(?)', [
+                                Store::DEFAULT_STORE_ID,
+                                $storeId
+                            ]),
                         []
                     )->where(
                         'e.entity_id = ' . $productId
-                    );
+                    )->order('t.store_id ASC');
                     $cursor = $this->_connection->query($select);
                     while ($row = $cursor->fetch(\Zend_Db::FETCH_ASSOC)) {
                         $updateData[$ids[$row['attribute_id']]] = $row['value'];
                         $valueColumnName = $ids[$row['attribute_id']] . $valueFieldSuffix;
                         if (isset($describe[$valueColumnName])) {
-                            $valueColumns[$row['value']] = $valueColumnName;
+                            $valueColumns[$row['attribute_id']] = [
+                                'value' => $row['value'],
+                                'column_name' => $valueColumnName
+                            ];
                         }
                     }
 
                     //Update not simple attributes (eg. dropdown)
                     if (!empty($valueColumns)) {
-                        $valueIds = array_keys($valueColumns);
+                        $valueIds = array_column($valueColumns, 'value');
+                        $optionIdToAttributeName = array_column($valueColumns, 'column_name', 'value');
 
                         $select = $this->_connection->select()->from(
                             ['t' => $this->_productIndexerHelper->getTable('eav_attribute_option_value')],
@@ -133,14 +132,14 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
                             $this->_connection->quoteInto('t.option_id IN (?)', $valueIds)
                         )->where(
                             $this->_connection->quoteInto('t.store_id IN(?)', [
-                                \Magento\Store\Model\Store::DEFAULT_STORE_ID,
+                                Store::DEFAULT_STORE_ID,
                                 $storeId
                             ])
                         )
                         ->order('t.store_id ASC');
                         $cursor = $this->_connection->query($select);
                         while ($row = $cursor->fetch(\Zend_Db::FETCH_ASSOC)) {
-                            $valueColumnName = $valueColumns[$row['option_id']];
+                            $valueColumnName = $optionIdToAttributeName[$row['option_id']];
                             if (isset($describe[$valueColumnName])) {
                                 $updateData[$valueColumnName] = $row['value'];
                             }
@@ -150,6 +149,7 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
                     $columnNames = array_keys($columns);
                     $columnNames[] = 'attribute_set_id';
                     $columnNames[] = 'type_id';
+                    $columnNames[] = $linkField;
                     $select->from(
                         ['e' => $entityTableName],
                         $columnNames
@@ -159,6 +159,7 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
                     $cursor = $this->_connection->query($select);
                     $row = $cursor->fetch(\Zend_Db::FETCH_ASSOC);
                     if (!empty($row)) {
+                        $linkFieldId = $linkField;
                         foreach ($row as $columnName => $value) {
                             $updateData[$columnName] = $value;
                         }
@@ -170,7 +171,7 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
         if (!empty($updateData)) {
             $updateData += ['entity_id' => $productId];
             if ($linkField !== $metadata->getIdentifierField()) {
-                $updateData += [$linkField => $productId];
+                $updateData += [$linkField => $linkFieldId];
             }
             $updateFields = [];
             foreach ($updateData as $key => $value) {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
index 6d0727259d9db..8ccd48f1360c0 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
@@ -95,15 +95,17 @@ public function execute($id = null)
             /* @var $status \Magento\Eav\Model\Entity\Attribute */
             $status = $this->_productIndexerHelper->getAttribute(ProductInterface::STATUS);
             $statusTable = $status->getBackend()->getTable();
+            $catalogProductEntityTable = $this->_productIndexerHelper->getTable('catalog_product_entity');
             $statusConditions = [
-                'store_id IN(0,' . (int)$store->getId() . ')',
-                'attribute_id = ' . (int)$status->getId(),
-                $linkField . ' = ' . (int)$id,
+                's.store_id IN(0,' . (int)$store->getId() . ')',
+                's.attribute_id = ' . (int)$status->getId(),
+                'e.entity_id = ' . (int)$id,
             ];
             $select = $this->_connection->select();
-            $select->from($statusTable, ['value'])
+            $select->from(['e' => $catalogProductEntityTable], ['s.value'])
                 ->where(implode(' AND ', $statusConditions))
-                ->order('store_id DESC')
+                ->joinLeft(['s' => $statusTable], "e.{$linkField} = s.{$linkField}", [])
+                ->order('s.store_id DESC')
                 ->limit(1);
             $result = $this->_connection->query($select);
             $status = $result->fetchColumn(0);
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
index abe1b3eedbc84..a7273ff37860b 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
@@ -11,6 +11,7 @@
 
 /**
  * Class FlatTableBuilder
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class FlatTableBuilder
@@ -352,12 +353,21 @@ protected function _updateTemporaryTableByStoreValues(
                 }
 
                 //Update not simple attributes (eg. dropdown)
-                if (isset($flatColumns[$attributeCode . $valueFieldSuffix])) {
-                    $select = $this->_connection->select()->joinInner(
-                        ['t' => $this->_productIndexerHelper->getTable('eav_attribute_option_value')],
-                        't.option_id = et.' . $attributeCode . ' AND t.store_id=' . $storeId,
-                        [$attributeCode . $valueFieldSuffix => 't.value']
-                    );
+                $columnName = $attributeCode . $valueFieldSuffix;
+                if (isset($flatColumns[$columnName])) {
+                    $columnValue = $this->_connection->getIfNullSql('ts.value', 't0.value');
+                    $select = $this->_connection->select();
+                    $select->joinLeft(
+                        ['t0' => $this->_productIndexerHelper->getTable('eav_attribute_option_value')],
+                        't0.option_id = et.' . $attributeCode . ' AND t0.store_id = 0',
+                        []
+                    )->joinLeft(
+                        ['ts' => $this->_productIndexerHelper->getTable('eav_attribute_option_value')],
+                        'ts.option_id = et.' . $attributeCode . ' AND ts.store_id = ' . $storeId,
+                        []
+                    )->columns(
+                        [$columnName => $columnValue]
+                    )->where($columnValue . ' IS NOT NULL');
                     if (!empty($changedIds)) {
                         $select->where($this->_connection->quoteInto('et.entity_id IN (?)', $changedIds));
                     }
@@ -381,6 +391,8 @@ protected function _getTemporaryTableName($tableName)
     }
 
     /**
+     * Get metadata pool
+     *
      * @return \Magento\Framework\EntityManager\MetadataPool
      */
     private function getMetadataPool()
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
index 5f8be83872021..0388e11f44f16 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
@@ -34,13 +34,6 @@ class TableBuilder
      */
     private $tableBuilderFactory;
 
-    /**
-     * Check whether builder was executed
-     *
-     * @var bool
-     */
-    protected $_isExecuted = false;
-
     /**
      * Constructor
      *
@@ -70,9 +63,6 @@ public function __construct(
      */
     public function build($storeId, $changedIds, $valueFieldSuffix)
     {
-        if ($this->_isExecuted) {
-            return;
-        }
         $entityTableName = $this->_productIndexerHelper->getTable('catalog_product_entity');
         $attributes = $this->_productIndexerHelper->getAttributes();
         $eavAttributes = $this->_productIndexerHelper->getTablesStructure($attributes);
@@ -117,7 +107,6 @@ public function build($storeId, $changedIds, $valueFieldSuffix)
             //Fill temporary tables with attributes grouped by it type
             $this->_fillTemporaryTable($tableName, $columns, $changedIds, $valueFieldSuffix, $storeId);
         }
-        $this->_isExecuted = true;
     }
 
     /**
@@ -300,12 +289,16 @@ protected function _fillTemporaryTable(
 
                 /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
                 foreach ($columnsList as $columnName => $attribute) {
-                    $countTableName = 't' . $iterationNum++;
+                    $countTableName = 't' . ($iterationNum++);
                     $joinCondition = sprintf(
-                        'e.%3$s = %1$s.%3$s AND %1$s.attribute_id = %2$d AND %1$s.store_id = 0',
+                        'e.%3$s = %1$s.%3$s' .
+                        ' AND %1$s.attribute_id = %2$d' .
+                        ' AND (%1$s.store_id = %4$d' .
+                        ' OR %1$s.store_id = 0)',
                         $countTableName,
                         $attribute->getId(),
-                        $metadata->getLinkField()
+                        $metadata->getLinkField(),
+                        $storeId
                     );
 
                     $select->joinLeft(
@@ -319,9 +312,10 @@ protected function _fillTemporaryTable(
                         $columnValueName = $attributeCode . $valueFieldSuffix;
                         if (isset($flatColumns[$columnValueName])) {
                             $valueJoinCondition = sprintf(
-                                'e.%1$s = %2$s.option_id AND %2$s.store_id = 0',
+                                'e.%1$s = %2$s.option_id AND (%2$s.store_id = %3$d OR %2$s.store_id = 0)',
                                 $attributeCode,
-                                $countTableName
+                                $countTableName,
+                                $storeId
                             );
                             $selectValue->joinLeft(
                                 [
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
index 1a75751570658..79eeb3cc3225d 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
@@ -3,41 +3,64 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model\Indexer\Product\Price\Action;
 
+use Magento\Catalog\Model\Indexer\Product\Price\AbstractAction;
+use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
+use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory;
+use Magento\Directory\Model\CurrencyFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\PriceInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Query\BatchIterator;
+use Magento\Framework\DB\Query\Generator as QueryGenerator;
+use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\EntityMetadataInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Indexer\BatchProviderInterface;
 use Magento\Framework\Indexer\DimensionalIndexerInterface;
 use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Indexer\Model\ProcessManager;
 use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class Full reindex action
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
+class Full extends AbstractAction
 {
     /**
-     * @var \Magento\Framework\EntityManager\MetadataPool
+     * @var MetadataPool
      */
     private $metadataPool;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator
+     * @var BatchSizeCalculator
      */
     private $batchSizeCalculator;
 
     /**
-     * @var \Magento\Framework\Indexer\BatchProviderInterface
+     * @var BatchProviderInterface
      */
     private $batchProvider;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher
+     * @var ActiveTableSwitcher
      */
     private $activeTableSwitcher;
 
@@ -47,54 +70,61 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
     private $productMetaDataCached;
 
     /**
-     * @var \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory
+     * @var DimensionCollectionFactory
      */
     private $dimensionCollectionFactory;
 
     /**
-     * @var \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer
+     * @var TableMaintainer
      */
     private $dimensionTableMaintainer;
 
     /**
-     * @var \Magento\Indexer\Model\ProcessManager
+     * @var ProcessManager
      */
     private $processManager;
 
     /**
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
-     * @param \Magento\Framework\Stdlib\DateTime $dateTime
-     * @param \Magento\Catalog\Model\Product\Type $catalogProductType
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory $indexerPriceFactory
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice $defaultIndexerResource
-     * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator|null $batchSizeCalculator
-     * @param \Magento\Framework\Indexer\BatchProviderInterface|null $batchProvider
-     * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|null $activeTableSwitcher
-     * @param \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory|null $dimensionCollectionFactory
-     * @param \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer|null $dimensionTableMaintainer
-     * @param \Magento\Indexer\Model\ProcessManager $processManager
+     * @var QueryGenerator|null
+     */
+    private $batchQueryGenerator;
+
+    /**
+     * @param ScopeConfigInterface $config
+     * @param StoreManagerInterface $storeManager
+     * @param CurrencyFactory $currencyFactory
+     * @param TimezoneInterface $localeDate
+     * @param DateTime $dateTime
+     * @param Type $catalogProductType
+     * @param Factory $indexerPriceFactory
+     * @param DefaultPrice $defaultIndexerResource
+     * @param MetadataPool|null $metadataPool
+     * @param BatchSizeCalculator|null $batchSizeCalculator
+     * @param BatchProviderInterface|null $batchProvider
+     * @param ActiveTableSwitcher|null $activeTableSwitcher
+     * @param DimensionCollectionFactory|null $dimensionCollectionFactory
+     * @param TableMaintainer|null $dimensionTableMaintainer
+     * @param ProcessManager $processManager
+     * @param QueryGenerator|null $batchQueryGenerator
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Directory\Model\CurrencyFactory $currencyFactory,
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
-        \Magento\Framework\Stdlib\DateTime $dateTime,
-        \Magento\Catalog\Model\Product\Type $catalogProductType,
-        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory $indexerPriceFactory,
-        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice $defaultIndexerResource,
-        \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
-        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator $batchSizeCalculator = null,
-        \Magento\Framework\Indexer\BatchProviderInterface $batchProvider = null,
-        \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher = null,
-        \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory $dimensionCollectionFactory = null,
-        \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer $dimensionTableMaintainer = null,
-        \Magento\Indexer\Model\ProcessManager $processManager = null
+        ScopeConfigInterface $config,
+        StoreManagerInterface $storeManager,
+        CurrencyFactory $currencyFactory,
+        TimezoneInterface $localeDate,
+        DateTime $dateTime,
+        Type $catalogProductType,
+        Factory $indexerPriceFactory,
+        DefaultPrice $defaultIndexerResource,
+        MetadataPool $metadataPool = null,
+        BatchSizeCalculator $batchSizeCalculator = null,
+        BatchProviderInterface $batchProvider = null,
+        ActiveTableSwitcher $activeTableSwitcher = null,
+        DimensionCollectionFactory $dimensionCollectionFactory = null,
+        TableMaintainer $dimensionTableMaintainer = null,
+        ProcessManager $processManager = null,
+        QueryGenerator $batchQueryGenerator = null
     ) {
         parent::__construct(
             $config,
@@ -107,26 +137,27 @@ public function __construct(
             $defaultIndexerResource
         );
         $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(
-            \Magento\Framework\EntityManager\MetadataPool::class
+            MetadataPool::class
         );
         $this->batchSizeCalculator = $batchSizeCalculator ?: ObjectManager::getInstance()->get(
-            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator::class
+            BatchSizeCalculator::class
         );
         $this->batchProvider = $batchProvider ?: ObjectManager::getInstance()->get(
-            \Magento\Framework\Indexer\BatchProviderInterface::class
+            BatchProviderInterface::class
         );
         $this->activeTableSwitcher = $activeTableSwitcher ?: ObjectManager::getInstance()->get(
-            \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher::class
+            ActiveTableSwitcher::class
         );
         $this->dimensionCollectionFactory = $dimensionCollectionFactory ?: ObjectManager::getInstance()->get(
-            \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory::class
+            DimensionCollectionFactory::class
         );
         $this->dimensionTableMaintainer = $dimensionTableMaintainer ?: ObjectManager::getInstance()->get(
-            \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer::class
+            TableMaintainer::class
         );
         $this->processManager = $processManager ?: ObjectManager::getInstance()->get(
-            \Magento\Indexer\Model\ProcessManager::class
+            ProcessManager::class
         );
+        $this->batchQueryGenerator = $batchQueryGenerator ?? ObjectManager::getInstance()->get(QueryGenerator::class);
     }
 
     /**
@@ -143,7 +174,7 @@ public function execute($ids = null)
             //Prepare indexer tables before full reindex
             $this->prepareTables();
 
-            /** @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice $indexer */
+            /** @var DefaultPrice $indexer */
             foreach ($this->getTypeIndexers(true) as $typeId => $priceIndexer) {
                 if ($priceIndexer instanceof DimensionalIndexerInterface) {
                     //New price reindex mechanism
@@ -207,7 +238,7 @@ private function reindexProductTypeWithDimensions(DimensionalIndexerInterface $p
         $userFunctions = [];
         foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
             $userFunctions[] = function () use ($priceIndexer, $dimensions, $typeId) {
-                return $this->reindexByBatches($priceIndexer, $dimensions, $typeId);
+                $this->reindexByBatches($priceIndexer, $dimensions, $typeId);
             };
         }
         $this->processManager->execute($userFunctions);
@@ -226,7 +257,7 @@ private function reindexProductTypeWithDimensions(DimensionalIndexerInterface $p
     private function reindexByBatches(DimensionalIndexerInterface $priceIndexer, array $dimensions, string $typeId)
     {
         foreach ($this->getBatchesForIndexer($typeId) as $batch) {
-            $this->reindexByBatchWithDimensions($priceIndexer, $batch, $dimensions, $typeId);
+            $this->reindexByBatchWithDimensions($priceIndexer, $batch, $dimensions);
         }
     }
 
@@ -235,16 +266,19 @@ private function reindexByBatches(DimensionalIndexerInterface $priceIndexer, arr
      *
      * @param string $typeId
      *
-     * @return \Generator
-     * @throws \Exception
+     * @return BatchIterator
      */
-    private function getBatchesForIndexer(string $typeId)
+    private function getBatchesForIndexer(string $typeId): BatchIterator
     {
         $connection = $this->_defaultIndexerResource->getConnection();
-        return $this->batchProvider->getBatches(
-            $connection,
-            $this->getProductMetaData()->getEntityTable(),
-            $this->getProductMetaData()->getIdentifierField(),
+        $entityMetadata = $this->getProductMetaData();
+        $select = $connection->select();
+        $select->distinct(true);
+        $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
+
+        return $this->batchQueryGenerator->generate(
+            $entityMetadata->getIdentifierField(),
+            $select,
             $this->batchSizeCalculator->estimateBatchSize(
                 $connection,
                 $typeId
@@ -256,20 +290,18 @@ private function getBatchesForIndexer(string $typeId)
      * Reindex by batch for new 'Dimensional' price indexer
      *
      * @param DimensionalIndexerInterface $priceIndexer
-     * @param array $batch
+     * @param Select $batchQuery
      * @param array $dimensions
-     * @param string $typeId
      *
      * @return void
      * @throws \Exception
      */
     private function reindexByBatchWithDimensions(
         DimensionalIndexerInterface $priceIndexer,
-        array $batch,
-        array $dimensions,
-        string $typeId
+        Select $batchQuery,
+        array $dimensions
     ) {
-        $entityIds = $this->getEntityIdsFromBatch($typeId, $batch);
+        $entityIds = $this->getEntityIdsFromBatch($batchQuery);
 
         if (!empty($entityIds)) {
             $this->dimensionTableMaintainer->createMainTmpTable($dimensions);
@@ -298,7 +330,7 @@ private function reindexByBatchWithDimensions(
     private function reindexProductType(PriceInterface $priceIndexer, string $typeId)
     {
         foreach ($this->getBatchesForIndexer($typeId) as $batch) {
-            $this->reindexBatch($priceIndexer, $batch, $typeId);
+            $this->reindexBatch($priceIndexer, $batch);
         }
     }
 
@@ -306,15 +338,13 @@ private function reindexProductType(PriceInterface $priceIndexer, string $typeId
      * Reindex by batch for old price indexer
      *
      * @param PriceInterface $priceIndexer
-     * @param array $batch
-     * @param string $typeId
-     *
+     * @param Select $batch
      * @return void
      * @throws \Exception
      */
-    private function reindexBatch(PriceInterface $priceIndexer, array $batch, string $typeId)
+    private function reindexBatch(PriceInterface $priceIndexer, Select $batch)
     {
-        $entityIds = $this->getEntityIdsFromBatch($typeId, $batch);
+        $entityIds = $this->getEntityIdsFromBatch($batch);
 
         if (!empty($entityIds)) {
             // Temporary table will created if not exists
@@ -339,36 +369,22 @@ private function reindexBatch(PriceInterface $priceIndexer, array $batch, string
     /**
      * Get Entity Ids from batch
      *
-     * @param string $typeId
-     * @param array $batch
-     *
+     * @param Select $batch
      * @return array
-     * @throws \Exception
      */
-    private function getEntityIdsFromBatch(string $typeId, array $batch)
+    private function getEntityIdsFromBatch(Select $batch): array
     {
         $connection = $this->_defaultIndexerResource->getConnection();
 
-        // Get entity ids from batch
-        $select = $connection
-            ->select()
-            ->distinct(true)
-            ->from(
-                ['e' => $this->getProductMetaData()->getEntityTable()],
-                $this->getProductMetaData()->getIdentifierField()
-            )
-            ->where('type_id = ?', $typeId);
-
-        return $this->batchProvider->getBatchIds($connection, $select, $batch);
+        return $connection->fetchCol($batch);
     }
 
     /**
      * Get product meta data
      *
      * @return EntityMetadataInterface
-     * @throws \Exception
      */
-    private function getProductMetaData()
+    private function getProductMetaData(): EntityMetadataInterface
     {
         if ($this->productMetaDataCached === null) {
             $this->productMetaDataCached = $this->metadataPool->getMetadata(ProductInterface::class);
@@ -381,9 +397,8 @@ private function getProductMetaData()
      * Get replica table
      *
      * @return string
-     * @throws \Exception
      */
-    private function getReplicaTable()
+    private function getReplicaTable(): string
     {
         return $this->activeTableSwitcher->getAdditionalTableName(
             $this->_defaultIndexerResource->getMainTable()
@@ -417,10 +432,10 @@ private function switchTables()
 
     /**
      * Move data from old price indexer mechanism to new indexer mechanism by dimensions.
+     *
      * Used only for backward compatibility
      *
      * @param array $dimensions
-     *
      * @return void
      */
     private function moveDataFromReplicaTableToReplicaTables(array $dimensions)
@@ -455,17 +470,17 @@ private function moveDataFromReplicaTableToReplicaTables(array $dimensions)
                 $select,
                 $replicaTablesByDimension,
                 [],
-                \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
+                AdapterInterface::INSERT_ON_DUPLICATE
             )
         );
     }
 
     /**
-     * @deprecated
+     * Retrieves the index table that should be used
      *
-     * @inheritdoc
+     * @deprecated
      */
-    protected function getIndexTargetTable()
+    protected function getIndexTargetTable(): string
     {
         return $this->activeTableSwitcher->getAdditionalTableName($this->_defaultIndexerResource->getMainTable());
     }
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Decimal.php b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Decimal.php
index 36caa148b2e4e..1389d2789a158 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Decimal.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Decimal.php
@@ -56,7 +56,7 @@ public function getRange(FilterInterface $filter)
             $index = 1;
             do {
                 $range = pow(10, strlen(floor($maxValue)) - $index);
-                $items = $this->getRangeItemCounts($range, $filter);
+                $items = $this->getRangeItemCounts($range, $filter) ?: [];
                 $index++;
             } while ($range > self::MIN_RANGE_POWER && count($items) < 2);
             $this->range = $range;
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index 8a9233f176c61..831644a553b4b 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -714,7 +714,7 @@ public function getIdBySku($sku)
     public function getCategoryId()
     {
         $category = $this->_registry->registry('current_category');
-        if ($category) {
+        if ($category && in_array($category->getId(), $this->getCategoryIds())) {
             return $category->getId();
         }
         return false;
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 500e59f26a2c3..bda92fbeab9ed 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
@@ -5,8 +5,9 @@
  */
 namespace Magento\Catalog\Model\Product\Attribute\Backend\TierPrice;
 
-use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Locale\FormatInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Customer\Api\GroupManagementInterface;
@@ -38,19 +39,26 @@ class UpdateHandler extends AbstractHandler
      */
     private $tierPriceResource;
 
+    /**
+     * @var FormatInterface
+     */
+    private $localeFormat;
+
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository
      * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice $tierPriceResource
+     * @param FormatInterface|null $localeFormat
      */
     public function __construct(
         StoreManagerInterface $storeManager,
         ProductAttributeRepositoryInterface $attributeRepository,
         GroupManagementInterface $groupManagement,
         MetadataPool $metadataPool,
-        Tierprice $tierPriceResource
+        Tierprice $tierPriceResource,
+        FormatInterface $localeFormat = null
     ) {
         parent::__construct($groupManagement);
 
@@ -58,6 +66,7 @@ public function __construct(
         $this->attributeRepository = $attributeRepository;
         $this->metadataPoll = $metadataPool;
         $this->tierPriceResource = $tierPriceResource;
+        $this->localeFormat = $localeFormat ?: ObjectManager::getInstance()->get(FormatInterface::class);
     }
 
     /**
@@ -116,8 +125,9 @@ private function updateValues(array $valuesToUpdate, array $oldValues): bool
     {
         $isChanged = false;
         foreach ($valuesToUpdate as $key => $value) {
-            if ((!empty($value['value']) && (float)$oldValues[$key]['price'] !== (float)$value['value'])
-                || $this->getPercentage($oldValues[$key]) !== $this->getPercentage($value)
+            if ((!empty($value['value'])
+                    && (float)$oldValues[$key]['price'] !== $this->localeFormat->getNumber($value['value'])
+                ) || $this->getPercentage($oldValues[$key]) !== $this->getPercentage($value)
             ) {
                 $price = new \Magento\Framework\DataObject(
                     [
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
index f2039a5002dcc..6cca2c07e2dd8 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
@@ -47,7 +47,7 @@ public function add($attributeCode, $option)
                 /** @var \Magento\Eav\Api\Data\AttributeOptionInterface $attributeOption */
                     $attributeOption = $attributeOption->getLabel();
             });
-            if (in_array($option->getLabel(), $currentOptions)) {
+            if (in_array($option->getLabel(), $currentOptions, true)) {
                 return false;
             }
         }
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
index 63b1444d1db07..dbc7535dccfa9 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
@@ -17,6 +17,12 @@ class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
      */
     protected $pageLayoutBuilder;
 
+    /**
+     * @inheritdoc
+     * @deprecated since the cache is now handled by \Magento\Theme\Model\PageLayout\Config\Builder::$configFiles
+     */
+    protected $_options = null;
+
     /**
      * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
      */
@@ -26,14 +32,14 @@ public function __construct(\Magento\Framework\View\Model\PageLayout\Config\Buil
     }
 
     /**
-     * @return array
+     * @inheritdoc
      */
     public function getAllOptions()
     {
-        if (!$this->_options) {
-            $this->_options = $this->pageLayoutBuilder->getPageLayoutsConfig()->toOptionArray();
-            array_unshift($this->_options, ['value' => '', 'label' => __('No layout updates')]);
-        }
-        return $this->_options;
+        $options = $this->pageLayoutBuilder->getPageLayoutsConfig()->toOptionArray();
+        array_unshift($options, ['value' => '', 'label' => __('No layout updates')]);
+        $this->_options = $options;
+
+        return $options;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
index 1a3d03bf2c353..8b9703b6623ad 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
@@ -308,7 +308,7 @@ protected function duplicate($product)
 
         $this->resourceModel->duplicate(
             $this->getAttribute()->getAttributeId(),
-            isset($mediaGalleryData['duplicate']) ? $mediaGalleryData['duplicate'] : [],
+            $mediaGalleryData['duplicate'] ?? [],
             $product->getOriginalLinkId(),
             $product->getData($this->metadata->getLinkField())
         );
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
index 1b5f96baeaf9f..33813d5079215 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
@@ -68,8 +68,10 @@ public function create($sku, ProductAttributeMediaGalleryEntryInterface $entry)
         $product->setMediaGalleryEntries($existingMediaGalleryEntries);
         try {
             $product = $this->productRepository->save($product);
+            // phpcs:ignore Magento2.Exceptions.ThrowCatch
         } catch (InputException $inputException) {
             throw $inputException;
+            // phpcs:ignore Magento2.Exceptions.ThrowCatch
         } catch (\Exception $e) {
             throw new StateException(__('Cannot save product.'));
         }
@@ -100,7 +102,10 @@ public function update($sku, ProductAttributeMediaGalleryEntryInterface $entry)
 
             if ($existingEntry->getId() == $entry->getId()) {
                 $found = true;
-                if ($entry->getFile()) {
+
+                $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 bf7bfbe681929..830c1926cc483 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
@@ -191,7 +191,7 @@ public function addImage(
         $mediaGalleryData = $product->getData($attrCode);
         $position = 0;
 
-        $absoluteFilePath = $this->mediaDirectory->getAbsolutePath($file);
+        $absoluteFilePath = $this->mediaDirectory->getAbsolutePath($destinationFile);
         $imageMimeType = $this->mime->getMimeType($absoluteFilePath);
         $imageContent = $this->mediaDirectory->readFile($absoluteFilePath);
         $imageBase64 = base64_encode($imageContent);
@@ -489,7 +489,7 @@ protected function getNotDuplicatedFilename($fileName, $dispretionPath)
     /**
      * Retrieve data for update attribute
      *
-     * @param  \Magento\Catalog\Model\Product $object
+     * @param \Magento\Catalog\Model\Product $object
      * @return array
      * @since 101.0.0
      */
diff --git a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
index c4a2d60414a7b..6eec110e76c10 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/SaveHandler.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model\Product\Option;
 
 use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface as OptionRepository;
@@ -28,6 +30,8 @@ public function __construct(
     }
 
     /**
+     * Perform action on relation/extension attribute.
+     *
      * @param object $entity
      * @param array $arguments
      * @return \Magento\Catalog\Api\Data\ProductInterface|object
@@ -35,6 +39,10 @@ public function __construct(
      */
     public function execute($entity, $arguments = [])
     {
+        if ($entity->getOptionsSaved()) {
+            return $entity;
+        }
+
         $options = $entity->getOptions();
         $optionIds = [];
 
@@ -52,11 +60,28 @@ public function execute($entity, $arguments = [])
             }
         }
         if ($options) {
-            foreach ($options as $option) {
-                $this->optionRepository->save($option);
-            }
+            $this->processOptionsSaving($options, $entity->dataHasChangedFor('sku'), $entity->getSku());
         }
 
         return $entity;
     }
+
+    /**
+     * Save custom options
+     *
+     * @param array $options
+     * @param bool $hasChangedSku
+     * @param string $newSku
+     *
+     * @return void
+     */
+    private function processOptionsSaving(array $options, bool $hasChangedSku, string $newSku)
+    {
+        foreach ($options as $option) {
+            if ($hasChangedSku && $option->hasData('product_sku')) {
+                $option->setProductSku($newSku);
+            }
+            $this->optionRepository->save($option);
+        }
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
index d14f56718d159..5fda0f6f7c05c 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
@@ -29,23 +29,35 @@ class Select extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
      */
     protected $string;
 
+    /**
+     * @var array
+     */
+    private $singleSelectionTypes;
+
     /**
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param \Magento\Framework\Escaper $escaper
      * @param array $data
+     * @param array $singleSelectionTypes
      */
     public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Stdlib\StringUtils $string,
         \Magento\Framework\Escaper $escaper,
-        array $data = []
+        array $data = [],
+        array $singleSelectionTypes = []
     ) {
         $this->string = $string;
         $this->_escaper = $escaper;
         parent::__construct($checkoutSession, $scopeConfig, $data);
+
+        $this->singleSelectionTypes = $singleSelectionTypes ?: [
+            \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN,
+            \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO,
+        ];
     }
 
     /**
@@ -68,7 +80,8 @@ public function validateUserValue($values)
         }
         if (!$this->_isSingleSelection()) {
             $valuesCollection = $option->getOptionValuesByOptionId($value, $this->getProduct()->getStoreId())->load();
-            if ($valuesCollection->count() != count($value)) {
+            $valueCount = is_array($value) ? count($value) : 0;
+            if ($valuesCollection->count() != $valueCount) {
                 $this->setIsValid(false);
                 throw new LocalizedException(__('Please specify product\'s required option(s).'));
             }
@@ -301,10 +314,6 @@ public function getOptionSku($optionValue, $skuDelimiter)
      */
     protected function _isSingleSelection()
     {
-        $single = [
-            \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN,
-            \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO,
-        ];
-        return in_array($this->getOption()->getType(), $single);
+        return in_array($this->getOption()->getType(), $this->singleSelectionTypes, true);
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php b/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
index 7a1926cf642ec..5d2490e01dc3a 100644
--- a/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
+++ b/app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php
@@ -138,7 +138,9 @@ private function getProductIdsByActions(array $actions)
         $productIds = [];
 
         foreach ($actions as $action) {
-            $productIds[] = $action['product_id'];
+            if (isset($action['product_id']) && (int)$action['product_id']) {
+                $productIds[] = (int)$action['product_id'];
+            }
         }
 
         return $productIds;
@@ -159,33 +161,37 @@ public function syncActions(array $productsData, $typeId)
         $customerId = $this->session->getCustomerId();
         $visitorId = $this->visitor->getId();
         $collection = $this->getActionsByType($typeId);
-        $collection->addFieldToFilter('product_id', $this->getProductIdsByActions($productsData));
-
-        /**
-         * Note that collection is also filtered by visitor id and customer id
-         * This collection shouldnt be flushed when visitor has products and then login
-         * It can remove only products for visitor, or only products for customer
-         *
-         * ['product_id' => 'added_at']
-         * @var ProductFrontendActionInterface $item
-         */
-        foreach ($collection as $item) {
-            $this->entityManager->delete($item);
-        }
-
-        foreach ($productsData as $productId => $productData) {
-            /** @var ProductFrontendActionInterface $action */
-            $action = $this->productFrontendActionFactory->create([
-                'data' => [
-                    'visitor_id' => $customerId ? null : $visitorId,
-                    'customer_id' => $this->session->getCustomerId(),
-                    'added_at' => $productData['added_at'],
-                    'product_id' => $productId,
-                    'type_id' => $typeId
-                ]
-            ]);
-
-            $this->entityManager->save($action);
+        $productIds = $this->getProductIdsByActions($productsData);
+
+        if ($productIds) {
+            $collection->addFieldToFilter('product_id', $productIds);
+
+            /**
+             * Note that collection is also filtered by visitor id and customer id
+             * This collection shouldnt be flushed when visitor has products and then login
+             * It can remove only products for visitor, or only products for customer
+             *
+             * ['product_id' => 'added_at']
+             * @var ProductFrontendActionInterface $item
+             */
+            foreach ($collection as $item) {
+                $this->entityManager->delete($item);
+            }
+
+            foreach ($productsData as $productId => $productData) {
+                /** @var ProductFrontendActionInterface $action */
+                $action = $this->productFrontendActionFactory->create([
+                    'data' => [
+                        'visitor_id' => $customerId ? null : $visitorId,
+                        'customer_id' => $this->session->getCustomerId(),
+                        'added_at' => $productData['added_at'],
+                        'product_id' => $productId,
+                        'type_id' => $typeId
+                    ]
+                ]);
+
+                $this->entityManager->save($action);
+            }
         }
     }
 
diff --git a/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php b/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php
new file mode 100644
index 0000000000000..46a73e104b87f
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\ProductList;
+
+use Magento\Catalog\Model\Session as CatalogSession;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+/**
+ * Responds for saving toolbar settings to catalog session.
+ */
+class ToolbarMemorizer
+{
+    /**
+     * XML PATH to enable/disable saving toolbar parameters to session
+     */
+    const XML_PATH_CATALOG_REMEMBER_PAGINATION = 'catalog/frontend/remember_pagination';
+
+    /**
+     * @var CatalogSession
+     */
+    private $catalogSession;
+
+    /**
+     * @var Toolbar
+     */
+    private $toolbarModel;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var string|bool
+     */
+    private $order;
+
+    /**
+     * @var string|bool
+     */
+    private $direction;
+
+    /**
+     * @var string|bool
+     */
+    private $mode;
+
+    /**
+     * @var string|bool
+     */
+    private $limit;
+
+    /**
+     * @var bool
+     */
+    private $isMemorizingAllowed;
+
+    /**
+     * @param Toolbar $toolbarModel
+     * @param CatalogSession $catalogSession
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        Toolbar $toolbarModel,
+        CatalogSession $catalogSession,
+        ScopeConfigInterface $scopeConfig
+    ) {
+        $this->toolbarModel = $toolbarModel;
+        $this->catalogSession = $catalogSession;
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Get sort order.
+     *
+     * @return string|bool|null
+     */
+    public function getOrder()
+    {
+        if ($this->order === null) {
+            $this->order = $this->toolbarModel->getOrder() ??
+                ($this->isMemorizingAllowed() ? $this->catalogSession->getData(Toolbar::ORDER_PARAM_NAME) : null);
+        }
+
+        return $this->order;
+    }
+
+    /**
+     * Get sort direction.
+     *
+     * @return string|bool|null
+     */
+    public function getDirection()
+    {
+        if ($this->direction === null) {
+            $this->direction = $this->toolbarModel->getDirection() ??
+                ($this->isMemorizingAllowed() ? $this->catalogSession->getData(Toolbar::DIRECTION_PARAM_NAME) : null);
+        }
+
+        return $this->direction;
+    }
+
+    /**
+     * Get sort mode.
+     *
+     * @return string|bool|null
+     */
+    public function getMode()
+    {
+        if ($this->mode === null) {
+            $this->mode = $this->toolbarModel->getMode() ??
+                ($this->isMemorizingAllowed() ? $this->catalogSession->getData(Toolbar::MODE_PARAM_NAME) : null);
+        }
+
+        return $this->mode;
+    }
+
+    /**
+     * Get products per page limit.
+     *
+     * @return string|bool|null
+     */
+    public function getLimit()
+    {
+        if ($this->limit === null) {
+            $this->limit = $this->toolbarModel->getLimit() ??
+                ($this->isMemorizingAllowed() ? $this->catalogSession->getData(Toolbar::LIMIT_PARAM_NAME) : null);
+        }
+
+        return $this->limit;
+    }
+
+    /**
+     * Method to save all catalog parameters in catalog session.
+     *
+     * @return void
+     */
+    public function memorizeParams()
+    {
+        if (!$this->catalogSession->getParamsMemorizeDisabled() && $this->isMemorizingAllowed()) {
+            $this->memorizeParam(Toolbar::ORDER_PARAM_NAME, $this->getOrder())
+                ->memorizeParam(Toolbar::DIRECTION_PARAM_NAME, $this->getDirection())
+                ->memorizeParam(Toolbar::MODE_PARAM_NAME, $this->getMode())
+                ->memorizeParam(Toolbar::LIMIT_PARAM_NAME, $this->getLimit());
+        }
+    }
+
+    /**
+     * Check configuration for enabled/disabled toolbar memorizing.
+     *
+     * @return bool
+     */
+    public function isMemorizingAllowed(): bool
+    {
+        if ($this->isMemorizingAllowed === null) {
+            $this->isMemorizingAllowed = $this->scopeConfig->isSetFlag(self::XML_PATH_CATALOG_REMEMBER_PAGINATION);
+        }
+
+        return $this->isMemorizingAllowed;
+    }
+
+    /**
+     * Memorize parameter value for session.
+     *
+     * @param string $param parameter name
+     * @param mixed $value parameter value
+     * @return ToolbarMemorizer
+     */
+    private function memorizeParam(string $param, $value): ToolbarMemorizer
+    {
+        if ($value && $this->catalogSession->getData($param) != $value) {
+            $this->catalogSession->setData($param, $value);
+        }
+
+        return $this;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php b/app/code/Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php
new file mode 100644
index 0000000000000..f6893a41113e6
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Type;
+
+use Magento\Store\Model\Store;
+use Magento\Catalog\Model\ResourceModel\Product\Price\SpecialPrice;
+use Magento\Catalog\Api\Data\SpecialPriceInterface;
+use Magento\Store\Api\Data\WebsiteInterface;
+
+/**
+ * Product special price model.
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class FrontSpecialPrice extends Price
+{
+    /**
+     * @var SpecialPrice
+     */
+    private $specialPrice;
+
+    /**
+     * @param \Magento\CatalogRule\Model\ResourceModel\RuleFactory $ruleFactory
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
+     * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
+     * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
+     * @param \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
+     * @param SpecialPrice $specialPrice
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        \Magento\CatalogRule\Model\ResourceModel\RuleFactory $ruleFactory,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
+        \Magento\Customer\Model\Session $customerSession,
+        \Magento\Framework\Event\ManagerInterface $eventManager,
+        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
+        \Magento\Customer\Api\GroupManagementInterface $groupManagement,
+        \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory,
+        \Magento\Framework\App\Config\ScopeConfigInterface $config,
+        SpecialPrice $specialPrice
+    ) {
+        $this->specialPrice = $specialPrice;
+        parent::__construct(
+            $ruleFactory,
+            $storeManager,
+            $localeDate,
+            $customerSession,
+            $eventManager,
+            $priceCurrency,
+            $groupManagement,
+            $tierPriceFactory,
+            $config
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _applySpecialPrice($product, $finalPrice)
+    {
+        if (!$product->getSpecialPrice()) {
+            return $finalPrice;
+        }
+
+        $specialPrices = $this->getSpecialPrices($product);
+        $specialPrice = !(empty($specialPrices)) ? min($specialPrices) : $product->getSpecialPrice();
+
+        $specialPrice =  $this->calculateSpecialPrice(
+            $finalPrice,
+            $specialPrice,
+            $product->getSpecialFromDate(),
+            $product->getSpecialToDate(),
+            WebsiteInterface::ADMIN_CODE
+        );
+        $product->setData('special_price', $specialPrice);
+
+        return $specialPrice;
+    }
+
+    /**
+     * Get special prices.
+     *
+     * @param mixed $product
+     * @return array
+     */
+    private function getSpecialPrices($product): array
+    {
+        $allSpecialPrices = $this->specialPrice->get([$product->getSku()]);
+        $specialPrices = [];
+        foreach ($allSpecialPrices as $price) {
+            if ($this->isSuitableSpecialPrice($product, $price)) {
+                $specialPrices[] = $price['value'];
+            }
+        }
+
+        return $specialPrices;
+    }
+
+    /**
+     * Price is suitable from default and current store + start and end date are equal.
+     *
+     * @param mixed $product
+     * @param array $price
+     * @return bool
+     */
+    private function isSuitableSpecialPrice($product, array $price): bool
+    {
+        $priceStoreId = $price[Store::STORE_ID];
+        if (($priceStoreId == Store::DEFAULT_STORE_ID || $product->getStoreId() == $priceStoreId)
+            && $price[SpecialPriceInterface::PRICE_FROM] == $product->getSpecialFromDate()
+            && $price[SpecialPriceInterface::PRICE_TO] == $product->getSpecialToDate()) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
index f6caa299d66d7..a4ee944a9bff2 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -11,6 +11,7 @@
 use Magento\Store\Model\Store;
 use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
 use Magento\Framework\App\ObjectManager;
+use Magento\Store\Api\Data\WebsiteInterface;
 
 /**
  * Product type price model
@@ -184,6 +185,8 @@ public function getFinalPrice($qty, $product)
     }
 
     /**
+     * Retrieve final price for child product.
+     *
      * @param Product $product
      * @param float $productQty
      * @param Product $childProduct
@@ -428,6 +431,8 @@ public function setTierPrices($product, array $tierPrices = null)
     }
 
     /**
+     * Retrieve customer group id from product.
+     *
      * @param Product $product
      * @return int
      */
@@ -453,7 +458,7 @@ protected function _applySpecialPrice($product, $finalPrice)
             $product->getSpecialPrice(),
             $product->getSpecialFromDate(),
             $product->getSpecialToDate(),
-            $product->getStore()
+            WebsiteInterface::ADMIN_CODE
         );
     }
 
@@ -601,7 +606,7 @@ public function calculatePrice(
             $specialPrice,
             $specialPriceFrom,
             $specialPriceTo,
-            $sId
+            WebsiteInterface::ADMIN_CODE
         );
 
         if ($rulePrice === false) {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
index 12009e62fd27e..45071e9b081fa 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
@@ -80,7 +80,7 @@ public function getDefaultStoreId()
      */
     protected function _isApplicableAttribute($object, $attribute)
     {
-        $applyTo = $attribute->getApplyTo();
+        $applyTo = $attribute->getApplyTo() ?: [];
         return (count($applyTo) == 0 || in_array($object->getTypeId(), $applyTo))
             && $attribute->isInSet($object->getAttributeSetId());
     }
@@ -95,7 +95,7 @@ protected function _isApplicableAttribute($object, $attribute)
      */
     protected function _isCallableAttributeInstance($instance, $method, $args)
     {
-        if ($instance instanceof \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
+        if ($instance instanceof AbstractBackend
             && ($method == 'beforeSave' || $method == 'afterSave')
         ) {
             $attributeCode = $instance->getAttribute()->getAttributeCode();
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
index 56b8a19d14255..7efcaed43cab2 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
@@ -484,8 +484,20 @@ public function getProductsPosition($category)
             $this->getCategoryProductTable(),
             ['product_id', 'position']
         )->where(
-            'category_id = :category_id'
+            "{$this->getTable('catalog_category_product')}.category_id = ?",
+            $category->getId()
         );
+        $websiteId = $category->getStore()->getWebsiteId();
+        if ($websiteId) {
+            $select->join(
+                ['product_website' => $this->getTable('catalog_product_website')],
+                "product_website.product_id = {$this->getTable('catalog_category_product')}.product_id",
+                []
+            )->where(
+                'product_website.website_id = ?',
+                $websiteId
+            );
+        }
         $bind = ['category_id' => (int)$category->getId()];
 
         return $this->getConnection()->fetchPairs($select, $bind);
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
index 9db2c8248ce52..05950531e2178 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
@@ -699,8 +699,20 @@ public function getProductsPosition($category)
             $this->getTable('catalog_category_product'),
             ['product_id', 'position']
         )->where(
-            'category_id = :category_id'
+            "{$this->getTable('catalog_category_product')}.category_id = ?",
+            $category->getId()
         );
+        $websiteId = $category->getStore()->getWebsiteId();
+        if ($websiteId) {
+            $select->join(
+                ['product_website' => $this->getTable('catalog_product_website')],
+                "product_website.product_id = {$this->getTable('catalog_category_product')}.product_id",
+                []
+            )->where(
+                'product_website.website_id = ?',
+                $websiteId
+            );
+        }
         $bind = ['category_id' => (int)$category->getId()];
 
         return $this->getConnection()->fetchPairs($select, $bind);
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/RedundantCategoryImageChecker.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/RedundantCategoryImageChecker.php
new file mode 100644
index 0000000000000..b683bcd803bd3
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/RedundantCategoryImageChecker.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ResourceModel\Category;
+
+use Magento\Catalog\Api\CategoryListInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+
+/**
+ * Check if Image is currently used in any category as Category Image.
+ */
+class RedundantCategoryImageChecker
+{
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var CategoryListInterface
+     */
+    private $categoryList;
+
+    public function __construct(
+        CategoryListInterface $categoryList,
+        SearchCriteriaBuilder $searchCriteriaBuilder
+    ) {
+        $this->categoryList = $categoryList;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+    }
+
+    /**
+     * Checks if Image is currently used in any category as Category Image.
+     *
+     * Returns true if not.
+     *
+     * @param string $imageName
+     * @return bool
+     */
+    public function execute(string $imageName): bool
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteria = $this->searchCriteriaBuilder->addFilter('image', $imageName)->create();
+        $categories = $this->categoryList->getList($searchCriteria)->getItems();
+
+        return empty($categories);
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product.php b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
index b4b78996f762f..95f09c7ee80be 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
@@ -289,7 +289,7 @@ protected function _afterSave(\Magento\Framework\DataObject $product)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete($object)
     {
@@ -575,7 +575,7 @@ public function countAll()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function validate($object)
     {
@@ -615,7 +615,7 @@ public function load($object, $entityId, $attributes = [])
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      * @since 101.0.0
      */
@@ -657,6 +657,8 @@ public function save(\Magento\Framework\Model\AbstractModel $object)
     }
 
     /**
+     * Retrieve entity manager object
+     *
      * @return \Magento\Framework\EntityManager\EntityManager
      */
     private function getEntityManager()
@@ -669,6 +671,8 @@ private function getEntityManager()
     }
 
     /**
+     * Retrieve ProductWebsiteLink object
+     *
      * @deprecated 101.1.0
      * @return ProductWebsiteLink
      */
@@ -678,6 +682,8 @@ private function getProductWebsiteLink()
     }
 
     /**
+     * Retrieve CategoryLink object
+     *
      * @deprecated 101.1.0
      * @return \Magento\Catalog\Model\ResourceModel\Product\CategoryLink
      */
@@ -694,7 +700,7 @@ private function getProductCategoryLink()
      * Extends parent method to be appropriate for product.
      * Store id is required to correctly identify attribute value we are working with.
      *
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.1.0
      */
     protected function getAttributeRow($entity, $object, $attribute)
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
index 749a3d754570f..a6394ce293a6c 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -1570,26 +1570,9 @@ public function addAttributeToFilter($attribute, $condition = null, $joinType =
         $this->_allIdsCache = null;
 
         if (is_string($attribute) && $attribute == 'is_saleable') {
-            $columns = $this->getSelect()->getPart(\Magento\Framework\DB\Select::COLUMNS);
-            foreach ($columns as $columnEntry) {
-                list($correlationName, $column, $alias) = $columnEntry;
-                if ($alias == 'is_saleable') {
-                    if ($column instanceof \Zend_Db_Expr) {
-                        $field = $column;
-                    } else {
-                        $connection = $this->getSelect()->getConnection();
-                        if (empty($correlationName)) {
-                            $field = $connection->quoteColumnAs($column, $alias, true);
-                        } else {
-                            $field = $connection->quoteColumnAs([$correlationName, $column], $alias, true);
-                        }
-                    }
-                    $this->getSelect()->where("{$field} = ?", $condition);
-                    break;
-                }
-            }
-
-            return $this;
+            $this->addIsSaleableAttributeToFilter($condition);
+        } elseif (is_string($attribute) && $attribute == 'tier_price') {
+            $this->addTierPriceAttributeToFilter($attribute, $condition);
         } else {
             return parent::addAttributeToFilter($attribute, $condition, $joinType);
         }
@@ -2205,7 +2188,7 @@ private function getTierPriceSelect(array $productIds)
             $this->getLinkField() . ' IN(?)',
             $productIds
         )->order(
-            $this->getLinkField()
+            'qty'
         );
         return $select;
     }
@@ -2469,4 +2452,71 @@ public function getPricesCount()
 
         return $this->_pricesCount;
     }
+
+    /**
+     * Add is_saleable attribute to filter
+     *
+     * @param array|null $condition
+     * @return $this
+     */
+    private function addIsSaleableAttributeToFilter($condition)
+    {
+        $columns = $this->getSelect()->getPart(Select::COLUMNS);
+        foreach ($columns as $columnEntry) {
+            list($correlationName, $column, $alias) = $columnEntry;
+            if ($alias == 'is_saleable') {
+                if ($column instanceof \Zend_Db_Expr) {
+                    $field = $column;
+                } else {
+                    $connection = $this->getSelect()->getConnection();
+                    if (empty($correlationName)) {
+                        $field = $connection->quoteColumnAs($column, $alias, true);
+                    } else {
+                        $field = $connection->quoteColumnAs([$correlationName, $column], $alias, true);
+                    }
+                }
+                $this->getSelect()->where("{$field} = ?", $condition);
+                break;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add tier price attribute to filter
+     *
+     * @param string $attribute
+     * @param array|null $condition
+     * @return $this
+     */
+    private function addTierPriceAttributeToFilter($attribute, $condition)
+    {
+        $attrCode = $attribute;
+        $connection = $this->getConnection();
+        $attrTable = $this->_getAttributeTableAlias($attrCode);
+        $entity = $this->getEntity();
+        $fKey = 'e.' . $this->getEntityPkName($entity);
+        $pKey = $attrTable . '.' . $this->getEntityPkName($entity);
+        $attribute = $entity->getAttribute($attrCode);
+        $attrFieldName = $attrTable . '.value';
+        $fKey = $connection->quoteColumnAs($fKey, null);
+        $pKey = $connection->quoteColumnAs($pKey, null);
+
+        $condArr = ["{$pKey} = {$fKey}"];
+        $this->getSelect()->join(
+            [$attrTable => $this->getTable('catalog_product_entity_tier_price')],
+            '(' . implode(') AND (', $condArr) . ')',
+            [$attrCode => $attrFieldName]
+        );
+        $this->removeAttributeToSelect($attrCode);
+        $this->_filterAttributes[$attrCode] = $attribute->getId();
+        $this->_joinFields[$attrCode] = ['table' => '', 'field' => $attrFieldName];
+        $field = $this->_getAttributeTableAlias($attrCode) . '.value';
+        $conditionSql = $this->_getConditionSql($field, $condition);
+        $this->getSelect()->where($conditionSql, null, Select::TYPE_CONDITION);
+        $this->_totalRecords = null;
+
+        return $this;
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
index b68c43e40ff2f..9a7af68948a21 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\ResourceModel\Product;
 
 use Magento\Store\Model\Store;
@@ -141,7 +142,7 @@ public function loadProductGalleryByAttributeId($product, $attributeId)
      */
     protected function createBaseLoadSelect($entityId, $storeId, $attributeId)
     {
-        $select =  $this->createBatchBaseSelect($storeId, $attributeId);
+        $select = $this->createBatchBaseSelect($storeId, $attributeId);
 
         $select = $select->where(
             'entity.' . $this->metadata->getLinkField() . ' = ?',
@@ -362,9 +363,9 @@ public function deleteGalleryValueInStore($valueId, $entityId, $storeId)
         $conditions = implode(
             ' AND ',
             [
-                $this->getConnection()->quoteInto('value_id = ?', (int) $valueId),
-                $this->getConnection()->quoteInto($this->metadata->getLinkField() . ' = ?', (int) $entityId),
-                $this->getConnection()->quoteInto('store_id = ?', (int) $storeId)
+                $this->getConnection()->quoteInto('value_id = ?', (int)$valueId),
+                $this->getConnection()->quoteInto($this->metadata->getLinkField() . ' = ?', (int)$entityId),
+                $this->getConnection()->quoteInto('store_id = ?', (int)$storeId)
             ]
         );
 
@@ -392,7 +393,7 @@ public function duplicate($attributeId, $newFiles, $originalProductId, $newProdu
 
         $select = $this->getConnection()->select()->from(
             [$this->getMainTableAlias() => $this->getMainTable()],
-            ['value_id', 'value']
+            ['value_id', 'value', 'media_type', 'disabled']
         )->joinInner(
             ['entity' => $this->getTable(self::GALLERY_VALUE_TO_ENTITY_TABLE)],
             $this->getMainTableAlias() . '.value_id = entity.value_id',
@@ -409,16 +410,16 @@ public function duplicate($attributeId, $newFiles, $originalProductId, $newProdu
 
         // Duplicate main entries of gallery
         foreach ($this->getConnection()->fetchAll($select) as $row) {
-            $data = [
-                'attribute_id' => $attributeId,
-                'value' => isset($newFiles[$row['value_id']]) ? $newFiles[$row['value_id']] : $row['value'],
-            ];
+            $data = $row;
+            $data['attribute_id'] = $attributeId;
+            $data['value'] = $newFiles[$row['value_id']] ?? $row['value'];
+            unset($data['value_id']);
 
             $valueIdMap[$row['value_id']] = $this->insertGallery($data);
             $this->bindValueToEntity($valueIdMap[$row['value_id']], $newProductId);
         }
 
-        if (count($valueIdMap) == 0) {
+        if (count($valueIdMap) === 0) {
             return [];
         }
 
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php
index 5f83f9826abb5..77f67480619e0 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php
@@ -13,7 +13,7 @@
 use Magento\Framework\App\ResourceConnection;
 
 /**
- * Class for fast retrieval of all product images
+ * Class for retrieval of all product images
  */
 class Image
 {
@@ -76,15 +76,24 @@ public function getAllProductImages(): \Generator
 
     /**
      * Get the number of unique pictures of products
+     *
      * @return int
      */
     public function getCountAllProductImages(): int
     {
-        $select = $this->getVisibleImagesSelect()->reset('columns')->columns('count(*)');
+        $select = $this->getVisibleImagesSelect()
+            ->reset('columns')
+            ->reset('distinct')
+            ->columns(
+                new \Zend_Db_Expr('count(distinct value)')
+            );
+
         return (int) $this->connection->fetchOne($select);
     }
 
     /**
+     * Return Select to fetch all products images
+     *
      * @return Select
      */
     private function getVisibleImagesSelect(): Select
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CustomOptionPriceModifier.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CustomOptionPriceModifier.php
index 646cd0d4c1a4c..f7222bd41f42f 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CustomOptionPriceModifier.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CustomOptionPriceModifier.php
@@ -127,6 +127,8 @@ public function modifyPrice(IndexTableStructure $priceTable, array $entityIds =
     }
 
     /**
+     * Check if custom options exist.
+     *
      * @param IndexTableStructure $priceTable
      * @return bool
      * @throws \Exception
@@ -154,6 +156,8 @@ private function checkIfCustomOptionsExist(IndexTableStructure $priceTable): boo
     }
 
     /**
+     * Get connection.
+     *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
      */
     private function getConnection()
@@ -211,7 +215,7 @@ private function getSelectForOptionsWithMultipleValues(string $sourceTable): Sel
         } else {
             $select->joinLeft(
                 ['otps' => $this->getTable('catalog_product_option_type_price')],
-                'otps.option_type_id = otpd.option_type_id AND otpd.store_id = cwd.default_store_id',
+                'otps.option_type_id = otpd.option_type_id AND otps.store_id = cwd.default_store_id',
                 []
             );
 
@@ -373,6 +377,8 @@ private function getSelectAggregated(string $sourceTable): Select
     }
 
     /**
+     * Get select for update.
+     *
      * @param string $sourceTable
      * @return \Magento\Framework\DB\Select
      */
@@ -402,6 +408,8 @@ private function getSelectForUpdate(string $sourceTable): Select
     }
 
     /**
+     * Get table name.
+     *
      * @param string $tableName
      * @return string
      */
@@ -411,6 +419,8 @@ private function getTable(string $tableName): string
     }
 
     /**
+     * Is price scope global.
+     *
      * @return bool
      */
     private function isPriceGlobal(): bool
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 7ea85cd3f6f10..aab4577de3770 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
@@ -10,6 +10,7 @@
 
 /**
  * Default Product Type Price Indexer Resource model
+ *
  * For correctly work need define product type id
  *
  * @api
@@ -208,6 +209,8 @@ public function reindexEntity($entityIds)
     }
 
     /**
+     * Reindex prices.
+     *
      * @param null|int|array $entityIds
      * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
      */
@@ -604,7 +607,7 @@ protected function _applyCustomOption()
             []
         )->joinLeft(
             ['otps' => $this->getTable('catalog_product_option_type_price')],
-            'otps.option_type_id = otpd.option_type_id AND otpd.store_id = cs.store_id',
+            'otps.option_type_id = otpd.option_type_id AND otps.store_id = cs.store_id',
             []
         )->group(
             ['i.entity_id', 'i.customer_group_id', 'i.website_id', 'o.option_id']
@@ -802,6 +805,8 @@ public function getIdxTable($table = null)
     }
 
     /**
+     * Check if product exists.
+     *
      * @return bool
      */
     protected function hasEntity()
@@ -823,6 +828,8 @@ protected function hasEntity()
     }
 
     /**
+     * Get total tier price expression.
+     *
      * @param \Zend_Db_Expr $priceExpression
      * @return \Zend_Db_Expr
      */
@@ -862,6 +869,13 @@ private function getTotalTierPriceExpression(\Zend_Db_Expr $priceExpression)
         );
     }
 
+    /**
+     * Get tier price expression for table.
+     *
+     * @param string $tableAlias
+     * @param \Zend_Db_Expr $priceExpression
+     * @return \Zend_Db_Expr
+     */
     private function getTierPriceExpressionForTable($tableAlias, \Zend_Db_Expr $priceExpression)
     {
         return $this->getConnection()->getCheckSql(
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 0005ac8dea58a..b5aa1fc9e7904 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
@@ -217,11 +217,8 @@ public function getQuery(array $dimensions, string $productType, array $entityId
         $select->where("e.type_id = ?", $productType);
 
         if ($entityIds !== null) {
-            if (count($entityIds) > 1) {
-                $select->where(sprintf('e.entity_id BETWEEN %s AND %s', min($entityIds), max($entityIds)));
-            } else {
-                $select->where('e.entity_id = ?', $entityIds);
-            }
+            $select->where(sprintf('e.entity_id BETWEEN %s AND %s', min($entityIds), max($entityIds)));
+            $select->where('e.entity_id IN(?)', $entityIds);
         }
 
         /**
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
index 179da06b59990..d592eb8866d3b 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
@@ -6,6 +6,9 @@
 namespace Magento\Catalog\Model\ResourceModel\Product;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Store\Model\Store;
 
 /**
  * Catalog product custom option resource model
@@ -76,10 +79,10 @@ protected function _construct()
     /**
      * Save options store data
      *
-     * @param \Magento\Framework\Model\AbstractModel $object
+     * @param AbstractModel $object
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      */
-    protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
+    protected function _afterSave(AbstractModel $object)
     {
         $this->_saveValuePrices($object);
         $this->_saveValueTitles($object);
@@ -90,136 +93,38 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     /**
      * Save value prices
      *
-     * @param \Magento\Framework\Model\AbstractModel $object
+     * @param AbstractModel $object
      * @return $this
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    protected function _saveValuePrices(\Magento\Framework\Model\AbstractModel $object)
+    protected function _saveValuePrices(AbstractModel $object)
     {
-        $priceTable = $this->getTable('catalog_product_option_price');
-        $connection = $this->getConnection();
-
         /*
          * Better to check param 'price' and 'price_type' for saving.
          * If there is not price skip saving price
          */
-
         if (in_array($object->getType(), $this->getPriceTypes())) {
-            //save for store_id = 0
+            // save for store_id = 0
             if (!$object->getData('scope', 'price')) {
-                $statement = $connection->select()->from(
-                    $priceTable,
-                    'option_id'
-                )->where(
-                    'option_id = ?',
-                    $object->getId()
-                )->where(
-                    'store_id = ?',
-                    \Magento\Store\Model\Store::DEFAULT_STORE_ID
-                );
-                $optionId = $connection->fetchOne($statement);
-
-                if ($optionId) {
-                    $data = $this->_prepareDataForTable(
-                        new \Magento\Framework\DataObject(
-                            ['price' => $object->getPrice(), 'price_type' => $object->getPriceType()]
-                        ),
-                        $priceTable
-                    );
-
-                    $connection->update(
-                        $priceTable,
-                        $data,
-                        [
-                            'option_id = ?' => $object->getId(),
-                            'store_id  = ?' => \Magento\Store\Model\Store::DEFAULT_STORE_ID
-                        ]
-                    );
-                } else {
-                    $data = $this->_prepareDataForTable(
-                        new \Magento\Framework\DataObject(
-                            [
-                                'option_id' => $object->getId(),
-                                'store_id' => \Magento\Store\Model\Store::DEFAULT_STORE_ID,
-                                'price' => $object->getPrice(),
-                                'price_type' => $object->getPriceType(),
-                            ]
-                        ),
-                        $priceTable
-                    );
-                    $connection->insert($priceTable, $data);
-                }
+                $this->savePriceByStore($object, Store::DEFAULT_STORE_ID);
             }
 
             $scope = (int)$this->_config->getValue(
-                \Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
+                Store::XML_PATH_PRICE_SCOPE,
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
 
-            if ($object->getStoreId() != '0' && $scope == \Magento\Store\Model\Store::PRICE_SCOPE_WEBSITE) {
-                $baseCurrency = $this->_config->getValue(
-                    \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
-                    'default'
-                );
-
+            if ((int)$object->getStoreId() !== Store::DEFAULT_STORE_ID && $scope === Store::PRICE_SCOPE_WEBSITE) {
                 $storeIds = $this->_storeManager->getStore($object->getStoreId())->getWebsite()->getStoreIds();
-                if (is_array($storeIds)) {
-                    foreach ($storeIds as $storeId) {
-                        if ($object->getPriceType() == 'fixed') {
-                            $storeCurrency = $this->_storeManager->getStore($storeId)->getBaseCurrencyCode();
-                            $rate = $this->_currencyFactory->create()->load($baseCurrency)->getRate($storeCurrency);
-                            if (!$rate) {
-                                $rate = 1;
-                            }
-                            $newPrice = $object->getPrice() * $rate;
-                        } else {
-                            $newPrice = $object->getPrice();
-                        }
-
-                        $statement = $connection->select()->from(
-                            $priceTable
-                        )->where(
-                            'option_id = ?',
-                            $object->getId()
-                        )->where(
-                            'store_id  = ?',
-                            $storeId
-                        );
-
-                        if ($connection->fetchOne($statement)) {
-                            $data = $this->_prepareDataForTable(
-                                new \Magento\Framework\DataObject(
-                                    ['price' => $newPrice, 'price_type' => $object->getPriceType()]
-                                ),
-                                $priceTable
-                            );
-
-                            $connection->update(
-                                $priceTable,
-                                $data,
-                                ['option_id = ?' => $object->getId(), 'store_id  = ?' => $storeId]
-                            );
-                        } else {
-                            $data = $this->_prepareDataForTable(
-                                new \Magento\Framework\DataObject(
-                                    [
-                                        'option_id' => $object->getId(),
-                                        'store_id' => $storeId,
-                                        'price' => $newPrice,
-                                        'price_type' => $object->getPriceType(),
-                                    ]
-                                ),
-                                $priceTable
-                            );
-                            $connection->insert($priceTable, $data);
-                        }
-                    }
+                if (empty($storeIds)) {
+                    return $this;
                 }
-            } elseif ($scope == \Magento\Store\Model\Store::PRICE_SCOPE_WEBSITE && $object->getData('scope', 'price')
-            ) {
-                $connection->delete(
-                    $priceTable,
+                foreach ($storeIds as $storeId) {
+                    $newPrice = $this->calculateStorePrice($object, $storeId);
+                    $this->savePriceByStore($object, (int)$storeId, $newPrice);
+                }
+            } elseif ($scope === Store::PRICE_SCOPE_WEBSITE && $object->getData('scope', 'price')) {
+                $this->getConnection()->delete(
+                    $this->getTable('catalog_product_option_price'),
                     ['option_id = ?' => $object->getId(), 'store_id  = ?' => $object->getStoreId()]
                 );
             }
@@ -228,31 +133,112 @@ protected function _saveValuePrices(\Magento\Framework\Model\AbstractModel $obje
         return $this;
     }
 
+    /**
+     * Save option price by store
+     *
+     * @param AbstractModel $object
+     * @param int $storeId
+     * @param float|null $newPrice
+     */
+    private function savePriceByStore(AbstractModel $object, int $storeId, float $newPrice = null)
+    {
+        $priceTable = $this->getTable('catalog_product_option_price');
+        $connection = $this->getConnection();
+        $price = $newPrice ?? $object->getPrice();
+
+        $statement = $connection->select()->from($priceTable, 'option_id')
+            ->where('option_id = ?', $object->getId())
+            ->where('store_id = ?', $storeId);
+        $optionId = $connection->fetchOne($statement);
+
+        if (!$optionId) {
+            $data = $this->_prepareDataForTable(
+                new DataObject(
+                    [
+                        'option_id' => $object->getId(),
+                        'store_id' => $storeId,
+                        'price' => $price,
+                        'price_type' => $object->getPriceType(),
+                    ]
+                ),
+                $priceTable
+            );
+            $connection->insert($priceTable, $data);
+        } else {
+            // skip to update the default price when the price is saving on other store
+            if ($storeId === Store::DEFAULT_STORE_ID && (int)$object->getStoreId() !== $storeId) {
+                return;
+            }
+
+            $data = $this->_prepareDataForTable(
+                new DataObject(
+                    [
+                        'price' => $price,
+                        'price_type' => $object->getPriceType()
+                    ]
+                ),
+                $priceTable
+            );
+
+            $connection->update(
+                $priceTable,
+                $data,
+                [
+                    'option_id = ?' => $object->getId(),
+                    'store_id  = ?' => $storeId
+                ]
+            );
+        }
+    }
+
+    /**
+     * Calculate price by store
+     *
+     * @param AbstractModel $object
+     * @param int $storeId
+     * @return float
+     */
+    private function calculateStorePrice(AbstractModel $object, int $storeId): float
+    {
+        $price = $object->getPrice();
+        if ($object->getPriceType() === 'fixed') {
+            $baseCurrency = $this->_config->getValue(
+                \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
+                'default'
+            );
+            $storeCurrency = $this->_storeManager->getStore($storeId)->getBaseCurrencyCode();
+            $rate = $this->_currencyFactory->create()->load($baseCurrency)->getRate($storeCurrency);
+            $price = $object->getPrice() * ($rate ?: 1);
+        }
+
+        return (float)$price;
+    }
+
     /**
      * Save titles
      *
-     * @param \Magento\Framework\Model\AbstractModel $object
+     * @param AbstractModel $object
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    protected function _saveValueTitles(\Magento\Framework\Model\AbstractModel $object)
+    protected function _saveValueTitles(AbstractModel $object)
     {
         $connection = $this->getConnection();
         $titleTableName = $this->getTable('catalog_product_option_title');
-        foreach ([\Magento\Store\Model\Store::DEFAULT_STORE_ID, $object->getStoreId()] as $storeId) {
+        foreach ([Store::DEFAULT_STORE_ID, $object->getStoreId()] as $storeId) {
             $existInCurrentStore = $this->getColFromOptionTable($titleTableName, (int)$object->getId(), (int)$storeId);
-            $existInDefaultStore = (int)$storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID ?
+            $existInDefaultStore = (int)$storeId === Store::DEFAULT_STORE_ID ?
                 $existInCurrentStore :
                 $this->getColFromOptionTable(
                     $titleTableName,
                     (int)$object->getId(),
-                    \Magento\Store\Model\Store::DEFAULT_STORE_ID
+                    Store::DEFAULT_STORE_ID
                 );
 
             if ($object->getTitle()) {
                 $isDeleteStoreTitle = (bool)$object->getData('is_delete_store_title');
                 if ($existInCurrentStore) {
-                    if ($isDeleteStoreTitle && (int)$storeId != \Magento\Store\Model\Store::DEFAULT_STORE_ID) {
+                    if ($isDeleteStoreTitle && (int)$storeId !== Store::DEFAULT_STORE_ID) {
                         $connection->delete($titleTableName, ['option_title_id = ?' => $existInCurrentStore]);
                     } elseif ($object->getStoreId() == $storeId) {
                         $data = $this->_prepareDataForTable(
@@ -270,9 +256,9 @@ protected function _saveValueTitles(\Magento\Framework\Model\AbstractModel $obje
                     }
                 } else {
                     // we should insert record into not default store only of if it does not exist in default store
-                    if (($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID && !$existInDefaultStore) ||
+                    if (($storeId == Store::DEFAULT_STORE_ID && !$existInDefaultStore) ||
                         (
-                            $storeId != \Magento\Store\Model\Store::DEFAULT_STORE_ID &&
+                            $storeId != Store::DEFAULT_STORE_ID &&
                             !$existInCurrentStore &&
                             !$isDeleteStoreTitle
                         )
@@ -291,7 +277,7 @@ protected function _saveValueTitles(\Magento\Framework\Model\AbstractModel $obje
                     }
                 }
             } else {
-                if ($object->getId() && $object->getStoreId() > \Magento\Store\Model\Store::DEFAULT_STORE_ID
+                if ($object->getId() && $object->getStoreId() > Store::DEFAULT_STORE_ID
                     && $storeId
                 ) {
                     $connection->delete(
@@ -470,7 +456,7 @@ public function getSearchableData($productId, $storeId)
                 'option_title_default.option_id=product_option.option_id',
                 $connection->quoteInto(
                     'option_title_default.store_id = ?',
-                    \Magento\Store\Model\Store::DEFAULT_STORE_ID
+                    Store::DEFAULT_STORE_ID
                 )
             ]
         );
@@ -517,7 +503,7 @@ public function getSearchableData($productId, $storeId)
                 'option_title_default.option_type_id=option_type.option_type_id',
                 $connection->quoteInto(
                     'option_title_default.store_id = ?',
-                    \Magento\Store\Model\Store::DEFAULT_STORE_ID
+                    Store::DEFAULT_STORE_ID
                 )
             ]
         );
@@ -582,6 +568,8 @@ public function getPriceTypes()
     }
 
     /**
+     * Get Metadata Pool
+     *
      * @return \Magento\Framework\EntityManager\MetadataPool
      */
     private function getMetadataPool()
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
index 5ffc9fbd575b6..3927b37016c1e 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php
@@ -17,11 +17,12 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Helper\Data;
 
 /**
  * Catalog product custom option resource model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Value extends AbstractDb
 {
@@ -51,6 +52,11 @@ class Value extends AbstractDb
      */
     private $localeFormat;
 
+    /**
+     * @var Data
+     */
+    private $dataHelper;
+
     /**
      * Class constructor
      *
@@ -59,17 +65,20 @@ class Value extends AbstractDb
      * @param StoreManagerInterface $storeManager
      * @param ScopeConfigInterface $config
      * @param string $connectionName
+     * @param Data $dataHelper
      */
     public function __construct(
         Context $context,
         CurrencyFactory $currencyFactory,
         StoreManagerInterface $storeManager,
         ScopeConfigInterface $config,
-        $connectionName = null
+        $connectionName = null,
+        Data $dataHelper = null
     ) {
         $this->_currencyFactory = $currencyFactory;
         $this->_storeManager = $storeManager;
         $this->_config = $config;
+        $this->dataHelper = $dataHelper ?: ObjectManager::getInstance()->get(Data::class);
         parent::__construct($context, $connectionName);
     }
 
@@ -130,7 +139,7 @@ protected function _saveValuePrices(AbstractModel $object)
             $optionTypeId = $this->getConnection()->fetchOne($select);
 
             if ($optionTypeId) {
-                if ($object->getStoreId() == '0') {
+                if ($object->getStoreId() == '0' || $this->dataHelper->isPriceGlobal()) {
                     $bind = ['price' => $price, 'price_type' => $priceType];
                     $where = [
                         'option_type_id = ?' => $optionTypeId,
diff --git a/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php b/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php
index a597b8fddda9f..ed9f89efc6891 100644
--- a/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php
+++ b/app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php
@@ -3,9 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 /**
  *  Set value for Special Price start date
@@ -13,21 +16,20 @@
 class SetSpecialPriceStartDate implements ObserverInterface
 {
     /**
-     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
+     * @var TimezoneInterface
      */
     private $localeDate;
 
     /**
-     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
-     * @codeCoverageIgnore
+     * @param TimezoneInterface $localeDate
      */
-    public function __construct(\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate)
+    public function __construct(TimezoneInterface $localeDate)
     {
         $this->localeDate = $localeDate;
     }
 
     /**
-     * Set the current date to Special Price From attribute if it empty
+     * Set the current date to Special Price From attribute if it's empty.
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
@@ -36,8 +38,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
     {
         /** @var  $product \Magento\Catalog\Model\Product */
         $product = $observer->getEvent()->getProduct();
-        if ($product->getSpecialPrice() && !$product->getSpecialFromDate()) {
-            $product->setData('special_from_date', $this->localeDate->date());
+        if ($product->getSpecialPrice() && ! $product->getSpecialFromDate()) {
+            $product->setData('special_from_date', $this->localeDate->date()->setTime(0, 0));
         }
 
         return $this;
diff --git a/app/code/Magento/Catalog/Plugin/Framework/App/Action/ContextPlugin.php b/app/code/Magento/Catalog/Plugin/Framework/App/Action/ContextPlugin.php
new file mode 100644
index 0000000000000..544319e739de5
--- /dev/null
+++ b/app/code/Magento/Catalog/Plugin/Framework/App/Action/ContextPlugin.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Plugin\Framework\App\Action;
+
+use Magento\Catalog\Model\Product\ProductList\Toolbar as ToolbarModel;
+use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
+use Magento\Catalog\Model\Session as CatalogSession;
+use Magento\Framework\App\Http\Context as HttpContext;
+
+/**
+ * Before dispatch plugin for all frontend controllers to update http context.
+ */
+class ContextPlugin
+{
+    /**
+     * @var ToolbarMemorizer
+     */
+    private $toolbarMemorizer;
+
+    /**
+     * @var CatalogSession
+     */
+    private $catalogSession;
+
+    /**
+     * @var HttpContext
+     */
+    private $httpContext;
+
+    /**
+     * @param ToolbarMemorizer $toolbarMemorizer
+     * @param CatalogSession $catalogSession
+     * @param HttpContext $httpContext
+     */
+    public function __construct(
+        ToolbarMemorizer $toolbarMemorizer,
+        CatalogSession $catalogSession,
+        HttpContext $httpContext
+    ) {
+        $this->toolbarMemorizer = $toolbarMemorizer;
+        $this->catalogSession = $catalogSession;
+        $this->httpContext = $httpContext;
+    }
+
+    /**
+     * Update http context with catalog sensitive information.
+     *
+     * @return void
+     */
+    public function beforeDispatch()
+    {
+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
+            $params = [
+                ToolbarModel::ORDER_PARAM_NAME,
+                ToolbarModel::DIRECTION_PARAM_NAME,
+                ToolbarModel::MODE_PARAM_NAME,
+                ToolbarModel::LIMIT_PARAM_NAME,
+            ];
+
+            foreach ($params as $param) {
+                $paramValue = $this->catalogSession->getData($param);
+                if ($paramValue) {
+                    $this->httpContext->setValue($param, $paramValue, false);
+                }
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/Catalog/Plugin/Model/Product/Option/UpdateProductCustomOptionsAttributes.php b/app/code/Magento/Catalog/Plugin/Model/Product/Option/UpdateProductCustomOptionsAttributes.php
new file mode 100644
index 0000000000000..ada96d4fd48f4
--- /dev/null
+++ b/app/code/Magento/Catalog/Plugin/Model/Product/Option/UpdateProductCustomOptionsAttributes.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Plugin\Model\Product\Option;
+
+/**
+ * Plugin for updating product 'has_options' and 'required_options' attributes.
+ */
+class UpdateProductCustomOptionsAttributes
+{
+    /**
+     * @var \Magento\Catalog\Api\ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+     */
+    public function __construct(\Magento\Catalog\Api\ProductRepositoryInterface $productRepository)
+    {
+        $this->productRepository = $productRepository;
+    }
+
+    /**
+     * Update product 'has_options' and 'required_options' attributes after option save.
+     *
+     * @param \Magento\Catalog\Api\ProductCustomOptionRepositoryInterface $subject
+     * @param \Magento\Catalog\Api\Data\ProductCustomOptionInterface $option
+     *
+     * @return \Magento\Catalog\Api\Data\ProductCustomOptionInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterSave(
+        \Magento\Catalog\Api\ProductCustomOptionRepositoryInterface $subject,
+        \Magento\Catalog\Api\Data\ProductCustomOptionInterface $option
+    ) {
+        $product = $this->productRepository->get($option->getProductSku());
+        if (!$product->getHasOptions()
+            || ($option->getIsRequire()
+                && !$product->getRequiredOptions())
+        ) {
+            $product->setCanSaveCustomOptions(true);
+            $product->setOptionsSaved(true);
+            $optionId = $option->getOptionId();
+            $currentOptions = array_filter($product->getOptions(), function ($optionItem) use ($optionId) {
+                return $optionId != $optionItem->getOptionId();
+            });
+            $currentOptions[] = $option;
+            $product->setOptions($currentOptions);
+            $product->save();
+        }
+
+        return $option;
+    }
+}
diff --git a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Category/RemoveRedundantImagePlugin.php b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Category/RemoveRedundantImagePlugin.php
new file mode 100644
index 0000000000000..59f1051b8ed56
--- /dev/null
+++ b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Category/RemoveRedundantImagePlugin.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\Plugin\Model\ResourceModel\Category;
+
+use Magento\Catalog\Model\ImageUploader;
+use Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
+use Magento\Catalog\Model\ResourceModel\Category\RedundantCategoryImageChecker;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Model\AbstractModel;
+
+/**
+ * Remove old Category Image file from pub/media/catalog/category directory if such Image is not used anymore.
+ */
+class RemoveRedundantImagePlugin
+{
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var ImageUploader
+     */
+    private $imageUploader;
+
+    /**
+     * @var RedundantCategoryImageChecker
+     */
+    private $redundantCategoryImageChecker;
+
+    public function __construct(
+        Filesystem $filesystem,
+        ImageUploader $imageUploader,
+        RedundantCategoryImageChecker $redundantCategoryImageChecker
+    ) {
+        $this->filesystem = $filesystem;
+        $this->imageUploader = $imageUploader;
+        $this->redundantCategoryImageChecker = $redundantCategoryImageChecker;
+    }
+
+    /**
+     * Removes Image file if it is not used anymore.
+     *
+     * @param CategoryResource $subject
+     * @param CategoryResource $result
+     * @param AbstractModel $category
+     * @return CategoryResource
+     *
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterSave(
+        CategoryResource $subject,
+        CategoryResource $result,
+        AbstractModel $category
+    ): CategoryResource {
+        $originalImage = $category->getOrigData('image');
+        if (null !== $originalImage
+            && $originalImage !== $category->getImage()
+            && $this->redundantCategoryImageChecker->execute($originalImage)
+        ) {
+            $basePath = $this->imageUploader->getBasePath();
+            $baseImagePath = $this->imageUploader->getFilePath($basePath, $originalImage);
+            /** @var \Magento\Framework\Filesystem\Directory\WriteInterface $mediaDirectory */
+            $mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+            $mediaDirectory->delete($baseImagePath);
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Catalog/Pricing/Price/MinimalTierPriceCalculator.php b/app/code/Magento/Catalog/Pricing/Price/MinimalTierPriceCalculator.php
index 387ef9416ef68..a5e573caa381e 100644
--- a/app/code/Magento/Catalog/Pricing/Price/MinimalTierPriceCalculator.php
+++ b/app/code/Magento/Catalog/Pricing/Price/MinimalTierPriceCalculator.php
@@ -29,8 +29,10 @@ public function __construct(CalculatorInterface $calculator)
     }
 
     /**
-     * Get raw value of "as low as" as a minimal among tier prices
-     * {@inheritdoc}
+     * Get raw value of "as low as" as a minimal among tier prices{@inheritdoc}
+     *
+     * @param SaleableInterface $saleableItem
+     * @return float|null
      */
     public function getValue(SaleableInterface $saleableItem)
     {
@@ -49,8 +51,10 @@ public function getValue(SaleableInterface $saleableItem)
     }
 
     /**
-     * Return calculated amount object that keeps "as low as" value
-     * {@inheritdoc}
+     * Return calculated amount object that keeps "as low as" value{@inheritdoc}
+     *
+     * @param SaleableInterface $saleableItem
+     * @return AmountInterface|null
      */
     public function getAmount(SaleableInterface $saleableItem)
     {
@@ -58,6 +62,6 @@ public function getAmount(SaleableInterface $saleableItem)
 
         return $value === null
             ? null
-            : $this->calculator->getAmount($value, $saleableItem);
+            : $this->calculator->getAmount($value, $saleableItem, 'tax');
     }
 }
diff --git a/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php b/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php
index b1bfc6ff4ad6f..77c48fdb1667e 100644
--- a/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php
@@ -11,6 +11,7 @@
 use Magento\Framework\Pricing\Price\AbstractPrice;
 use Magento\Framework\Pricing\Price\BasePriceProviderInterface;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Store\Api\Data\WebsiteInterface;
 
 /**
  * Special price model
@@ -46,6 +47,8 @@ public function __construct(
     }
 
     /**
+     * Retrieve special price.
+     *
      * @return bool|float
      */
     public function getValue()
@@ -96,19 +99,19 @@ public function getSpecialToDate()
     }
 
     /**
-     * @return bool
+     * @inheritdoc
      */
     public function isScopeDateInInterval()
     {
         return $this->localeDate->isScopeDateInInterval(
-            $this->product->getStore(),
+            WebsiteInterface::ADMIN_CODE,
             $this->getSpecialFromDate(),
             $this->getSpecialToDate()
         );
     }
 
     /**
-     * @return bool
+     * @inheritdoc
      */
     public function isPercentageDiscount()
     {
diff --git a/app/code/Magento/Catalog/Pricing/Render/PriceBox.php b/app/code/Magento/Catalog/Pricing/Render/PriceBox.php
index 190168ed583fc..678b45ce97e7b 100644
--- a/app/code/Magento/Catalog/Pricing/Render/PriceBox.php
+++ b/app/code/Magento/Catalog/Pricing/Render/PriceBox.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Pricing\Render;
 
 use Magento\Catalog\Model\Product;
@@ -71,7 +73,9 @@ public function jsonEncode($valueToEncode)
      *
      * @param int $length
      * @param string|null $chars
+     *
      * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getRandomString($length, $chars = null)
     {
@@ -93,4 +97,21 @@ public function getCanDisplayQty(Product $product)
         }
         return true;
     }
+
+    /**
+     * Format percent
+     *
+     * @param float $percent
+     *
+     * @return string
+     */
+    public function formatPercent(float $percent): string
+    {
+        /*First rtrim - trim zeros. So, 10.00 -> 10.*/
+        /*Second rtrim - trim dot. So, 10. -> 10*/
+        return rtrim(
+            rtrim(number_format($percent, 2), '0'),
+            '.'
+        );
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
index 7dafeff34a2ea..02dadf0d00337 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AddSimpleProductToCart">
         <arguments>
             <argument name="product" defaultValue="product"/>
@@ -15,7 +15,8 @@
         <amOnPage stepKey="navigateProductPage" url="/{{product.name}}.html"/>
         <click stepKey="addToCart" selector="{{StorefrontProductPageSection.addToCartBtn}}"/>
         <waitForElementVisible selector="{{StorefrontProductPageSection.successMsg}}" time="30" stepKey="waitForProductAdded"/>
-    </actionGroup>.
+    </actionGroup>
+
     <!--Click Add to Cart button in storefront product page-->
     <actionGroup name="addToCartFromStorefrontProductPage">
         <arguments>
@@ -26,6 +27,15 @@
         <waitForElementNotVisible selector="{{StorefrontProductPageSection.addToCartButtonTitleIsAdded}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdded"/>
         <waitForElementVisible selector="{{StorefrontProductPageSection.addToCartButtonTitleIsAddToCart}}" stepKey="waitForElementVisibleAddToCartButtonTitleIsAddToCart"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" time="30" stepKey="waitForProductAddedMessage"/>
         <see selector="{{StorefrontMessagesSection.success}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
     </actionGroup>
+
+    <actionGroup name="StorefrontAddProductToCartQuantityActionGroup" extends="addToCartFromStorefrontProductPage">
+        <arguments>
+            <argument name="quantity" type="string" defaultValue="1"/>
+        </arguments>
+        <waitForElementVisible selector="{{StorefrontProductPageSection.qtyInput}}" time="30" before="addToCart" stepKey="waitQuantityFieldVisible"/>
+        <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="{{quantity}}" after="waitQuantityFieldVisible" stepKey="fillQuantityField"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAnchorCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAnchorCategoryActionGroup.xml
new file mode 100644
index 0000000000000..45fe419ad14fe
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAnchorCategoryActionGroup.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="AdminAnchorCategoryActionGroup">
+        <arguments>
+            <argument name="categoryName" type="string"/>
+        </arguments>
+        <!--Open Category page-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryName)}}" stepKey="selectCategory"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+
+        <!--Enable Anchor for category -->
+        <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
+        <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
+        <checkOption selector="{{CategoryDisplaySettingsSection.anchor}}" stepKey="enableAnchor"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignCategoryToProductAndSaveActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignCategoryToProductAndSaveActionGroup.xml
new file mode 100644
index 0000000000000..2594a963767f1
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignCategoryToProductAndSaveActionGroup.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="AdminAssignCategoryToProductAndSaveActionGroup">
+        <arguments>
+            <argument name="categoryName" type="string"/>
+        </arguments>
+        <!-- on edit Product page catalog/product/edit/id/{{product_id}}/ -->
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="openDropDown"/>
+        <checkOption selector="{{AdminProductFormSection.selectCategory(categoryName)}}" stepKey="selectCategory"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickDone"/>
+        <waitForPageLoad stepKey="waitForApplyCategory"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
+        <waitForPageLoad stepKey="waitForSavingProduct"/>
+        <see userInput="You saved the product." selector="{{AdminMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
+    </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 127b69e5c3dc4..6d43031e2f8aa 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
@@ -87,4 +87,39 @@
         <see selector="{{AdminCategoryProductsGridSection.skuColumn}}" userInput="{{product.sku}}" stepKey="seeProductSkuInGrid"/>
         <see selector="{{AdminCategoryProductsGridSection.priceColumn}}" userInput="{{product.price}}" stepKey="seeProductPriceInGrid"/>
     </actionGroup>
+
+    <actionGroup name="AdminNavigateToCategoryInTree">
+        <arguments>
+            <argument name="category"/>
+        </arguments>
+        <amOnPage url="{{AdminCategoryPage.page}}" stepKey="amOnCategoryPage"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandAll"/>
+        <waitForPageLoad stepKey="waitForTreeToExpand"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(category.name)}}" stepKey="navigateToCreatedCategory" />
+        <waitForPageLoad stepKey="waitForCategoryPageLoaded"/>
+    </actionGroup>
+
+    <actionGroup name="ChangeSeoUrlKey">
+        <arguments>
+            <argument name="value" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{AdminCategorySEOSection.SectionHeader}}" dependentSelector="{{AdminCategorySEOSection.UrlKeyInput}}" visible="false" stepKey="openSeoSection"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{value}}" stepKey="enterURLKey"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveCategory"/>
+        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="assertSuccessMessage"/>
+    </actionGroup>
+
+    <actionGroup name="ChangeSeoUrlKeyForSubCategory" extends="ChangeSeoUrlKey">
+        <arguments>
+            <argument name="value" type="string"/>
+        </arguments>
+        <uncheckOption selector="{{AdminCategorySEOSection.urlKeyDefaultValueCheckbox}}" before="enterURLKey" stepKey="uncheckDefaultValue"/>
+    </actionGroup>
+
+    <!-- Save category form -->
+    <actionGroup name="saveCategoryForm">
+        <seeInCurrentUrl url="{{AdminCategoryPage.url}}" stepKey="seeOnCategoryPage"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveCategory"/>
+        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="assertSuccess"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryProductAttributeActionGroup.xml
index 5c71342264212..11b5aabf0cee9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryProductAttributeActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryProductAttributeActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!--Action to delete product attribute-->
     <actionGroup name="DeleteProductAttribute">
         <arguments>
@@ -15,15 +15,16 @@
         </arguments>
         <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributesGridPage"/>
         <waitForPageLoad time="30" stepKey="waitForProductAttributesGridPageLoad"/>
-        <click selector="{{AdminProductAttributeGridSection.resetFilter}}" stepKey="resetFilter"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFiltersBeforeDelete"/>
         <fillField selector="{{AdminProductAttributeGridSection.gridFilterFrontEndLabel}}"
                    userInput="{{productAttribute.default_label}}" stepKey="fillAttributeDefaultLabelInput"/>
-        <click selector="{{AdminProductAttributeGridSection.search}}" stepKey="searchForAttribute"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="applyFilters"/>
         <click selector="{{AdminProductAttributeGridSection.firstRow}}" stepKey="clickFirstRow"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad"/>
-        <click selector="{{AdminProductAttributeEditSection.deleteAttribute}}" stepKey="deleteProductAttribute"/>
+        <click selector="{{AdminMainActionsSection.delete}}" stepKey="deleteProductAttribute"/>
         <waitForElementVisible selector="{{AdminConfirmationModalSection.message}}" stepKey="waitingForWarningModal"/>
-        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreDelete"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the product attribute." stepKey="seeSuccessMessage"/>
     </actionGroup>
 
     <actionGroup name="navigateToProductAttribute">
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
new file mode 100644
index 0000000000000..041b65109d01c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.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="AdminCreateRecentlyProductsWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
+        <fillField selector="{{AdminCatalogProductWidgetSection.productsToDisplay}}" userInput="{{widget.products_to_display}}" stepKey="fillNumberOfProductsToDisplay"/>
+        <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"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteProductBySkuActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteProductBySkuActionGroup.xml
new file mode 100644
index 0000000000000..9b9b269c2601e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteProductBySkuActionGroup.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">
+    <!-- Delete a product by filtering grid and using delete action-->
+    <actionGroup name="AdminDeleteProductBySkuActionGroup">
+        <arguments>
+            <argument name="sku" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{sku}}" stepKey="fillProductSkuFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'SKU')}}" userInput="{{sku}}"  stepKey="seeProductSkuInGrid"/>
+        <click selector="{{AdminProductGridSection.multicheckDropdown}}" stepKey="openMulticheckDropdown"/>
+        <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGrid"/>
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForConfirmModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmProductDelete"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="record(s) have been deleted." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminGenerateProductConfigurationsByAttributeCodeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminGenerateProductConfigurationsByAttributeCodeActionGroup.xml
new file mode 100644
index 0000000000000..73b55ce3dd8eb
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminGenerateProductConfigurationsByAttributeCodeActionGroup.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="AdminGenerateProductConfigurationsByAttributeCodeActionGroup">
+        <arguments>
+            <argument name="attributeCode" type="string" defaultValue="SomeString"/>
+        </arguments>
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickFilters"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" userInput="{{attributeCode}}" stepKey="fillFilterAttributeCodeField"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="99" stepKey="enterAttributeQuantity"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAttributeSetByNameActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAttributeSetByNameActionGroup.xml
new file mode 100644
index 0000000000000..e9b244d4cf223
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAttributeSetByNameActionGroup.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="AdminOpenAttributeSetByNameActionGroup">
+        <arguments>
+            <argument name="attributeSetName" type="string" defaultValue="Default"/>
+        </arguments>
+        <click selector="{{AdminProductAttributeSetGridSection.attributeSetName(attributeSetName)}}" stepKey="chooseAttributeSet"/>
+        <waitForPageLoad stepKey="waitForAttributeSetPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAttributeSetGridPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAttributeSetGridPageActionGroup.xml
new file mode 100644
index 0000000000000..c6f0c3332b1d5
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAttributeSetGridPageActionGroup.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="AdminOpenAttributeSetGridPageActionGroup">
+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSetPage"/>
+        <waitForPageLoad stepKey="waitForAttributeSetPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenProductIndexPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenProductIndexPageActionGroup.xml
new file mode 100644
index 0000000000000..ca1303f180ca4
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenProductIndexPageActionGroup.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="AdminOpenProductIndexPageActionGroup">
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndexPage"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+    </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 1c4e7a8df2436..c00a91f030bf6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!--Navigate to create product page from product grid page-->
     <actionGroup name="goToCreateProductPage">
         <arguments>
@@ -16,7 +16,7 @@
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
         <waitForElementVisible selector="{{AdminProductGridActionSection.addTypeProduct(product.type_id)}}" stepKey="waitForAddProductDropdown" time="30"/>
         <click selector="{{AdminProductGridActionSection.addTypeProduct(product.type_id)}}" stepKey="clickAddProductType"/>
-        <waitForPageLoad stepKey="waitForCreateProductPageLoad"/>
+        <waitForPageLoad time="30" stepKey="waitForCreateProductPageLoad"/>
         <seeInCurrentUrl url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, product.type_id)}}" stepKey="seeNewProductUrl"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Product" stepKey="seeNewProductTitle"/>
     </actionGroup>
@@ -86,6 +86,7 @@
         <scrollToTopOfPage stepKey="initScrollToTopOfThePage"/>
         <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
         <waitForElementVisible selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" stepKey="waitSpecialPrice"/>
+        <conditionalClick selector="{{AdminProductFormAdvancedPricingSection.useDefaultPrice}}" dependentSelector="{{AdminProductFormAdvancedPricingSection.useDefaultPrice}}" visible="true" stepKey="checkUseDefault"/>
         <fillField userInput="{{price}}" selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" stepKey="fillSpecialPrice"/>
         <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDone"/>
         <waitForElementNotVisible selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" stepKey="waitForCloseModalWindow"/>
@@ -97,16 +98,15 @@
             <argument name="website"/>
         </arguments>
         <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsites"/>
-        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="clickToOpenProductInWebsite"/>
+        <conditionalClick selector="{{ProductInWebsitesSection.sectionHeader}}" dependentSelector="{{ProductInWebsitesSection.website(website.name)}}" visible="false" stepKey="clickToOpenProductInWebsite"/>
         <waitForPageLoad stepKey="waitForPageOpened"/>
         <click selector="{{ProductInWebsitesSection.website(website.name)}}" stepKey="selectWebsite"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
-        <waitForPageLoad time='60' stepKey="waitForPageOpened1"/>
     </actionGroup>
 
     <actionGroup name="ProductSetAdvancedPricing">
         <arguments>
-            <argument name="website"/>
+            <argument name="website" type="string" defaultValue="All Websites [USD]"/>
             <argument name="group" type="string" defaultValue="Retailer"/>
             <argument name="quantity" type="string" defaultValue="1"/>
             <argument name="price" type="string" defaultValue="Discount"/>
@@ -117,7 +117,7 @@
         <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForCustomerGroupPriceAddButton"/>
         <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="addCustomerGroupAllGroupsQty1PriceDiscountAnd10percent"/>
         <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" stepKey="waitForSelectCustomerGroupNameAttribute"/>
-        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{website.name}}" stepKey="selectProductWebsiteValue"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{website}}" stepKey="selectProductWebsiteValue"/>
         <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{group}}" stepKey="selectProductCustomGroupValue"/>
         <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{quantity}}" stepKey="fillProductTierPriceQtyInput"/>
         <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceValueTypeSelect('0')}}" userInput="{{price}}" stepKey="selectProductTierPriceValueType"/>
@@ -149,7 +149,6 @@
         </arguments>
         <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsites"/>
         <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="clickToOpenProductInWebsite"/>
-        <waitForPageLoad stepKey="waitForPageOpened"/>
         <checkOption selector="{{ProductInWebsitesSection.website(website)}}" stepKey="selectWebsite"/>
     </actionGroup>
 
@@ -169,4 +168,119 @@
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <dontSeeElement selector="{{AdminProductImagesSection.imageFile(image.filename)}}" stepKey="seeImage"/>
     </actionGroup>
+
+    <!--Check tier price with a discount percentage on product-->
+    <actionGroup name="AssertDiscountsPercentageOfProduct">
+        <arguments>
+            <argument name="amount" type="string" defaultValue="45"/>
+        </arguments>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton"/>
+        <waitForElementVisible selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForCustomerGroupPriceAddButton"/>
+        <grabValueFrom selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('0')}}" stepKey="grabProductTierPriceInput"/>
+        <assertEquals stepKey="assertProductTierPriceInput">
+            <expectedResult type="string">{{amount}}</expectedResult>
+            <actualResult type="string">$grabProductTierPriceInput</actualResult>
+        </assertEquals>
+    </actionGroup>
+
+    <actionGroup name="CreatedProductConnectToWebsite">
+        <arguments>
+            <argument name="website"/>
+            <argument name="product"/>
+        </arguments>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductGridPage"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/>
+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="openProduct"/>
+        <waitForPageLoad stepKey="waitForProductPage"/>
+        <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsites"/>
+        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openWebsitesList"/>
+        <click selector="{{ProductInWebsitesSection.website(website.name)}}" stepKey="selectWebsite"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the product." stepKey="seeSaveConfirmation"/>
+    </actionGroup>
+
+    <!--Create simple product and assign to category in Admin-->
+    <actionGroup name="AdminCreateSimpleProductAndAssignToCategory">
+        <arguments>
+            <argument name="category"/>
+            <argument name="simpleProduct"/>
+        </arguments>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
+        <fillField userInput="{{simpleProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
+        <fillField userInput="{{simpleProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
+        <fillField userInput="{{simpleProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
+        <fillField userInput="{{simpleProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{category.name}}]" stepKey="searchAndSelectCategory"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+        <fillField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="assertSaveMessageSuccess"/>
+        <seeInField userInput="{{simpleProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="assertFieldName"/>
+        <seeInField userInput="{{simpleProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="assertFieldSku"/>
+        <seeInField userInput="{{simpleProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="assertFieldPrice"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSectionAssert"/>
+        <seeInField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="assertFieldUrlKey"/>
+    </actionGroup>
+
+    <!--Create a Simple Product-->
+    <actionGroup name="CreateSimpleProductAndAddToWebsite">
+        <arguments>
+            <argument name="product"/>
+            <argument name="website" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
+        <fillField userInput="{{product.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillProductName"/>
+        <fillField userInput="{{product.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillProductSKU"/>
+        <fillField userInput="{{product.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillProductPrice"/>
+        <fillField userInput="{{product.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillProductQuantity"/>
+        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsites"/>
+        <click selector="{{ProductInWebsitesSection.website(website)}}" stepKey="selectWebsite"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
+        <waitForPageLoad stepKey="waitForProductPageSave"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the product." stepKey="seeSaveConfirmation"/>
+    </actionGroup>
+
+    <actionGroup name="AdminAssignProductToCategory" extends="AdminProductAssignCategory">
+        <arguments>
+            <argument name="productId" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminProductEditPage.url(productId)}}" before="searchAndSelectCategory" stepKey="amOnPage"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" after="searchAndSelectCategory" stepKey="clickOnSaveButton"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" after="clickOnSaveButton" stepKey="waitForSaveProductMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the product." after="waitForSaveProductMessage" stepKey="seeSaveProductMessage"/>
+    </actionGroup>
+
+    <actionGroup name="AdminChangeProductAttributeSet">
+        <arguments>
+            <argument name="attributeSet"/>
+        </arguments>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click selector="{{AdminProductFormSection.attributeSet}}" stepKey="startEditAttributeSet"/>
+        <fillField selector="{{AdminProductFormSection.attributeSetFilter}}" userInput="{{attributeSet.attribute_set_name}}" stepKey="searchForAttributeSet"/>
+        <waitForElementVisible selector="{{AdminProductFormSection.attributeSetFilterResultByName(attributeSet.attribute_set_name)}}" stepKey="waitForNewAttributeSetIsShown"/>
+        <click selector="{{AdminProductFormSection.attributeSetFilterResultByName(attributeSet.attribute_set_name)}}" stepKey="selectAttributeSet"/>
+    </actionGroup>
+
+    <actionGroup name="AdminProductAssignCategory">
+        <arguments>
+            <argument name="categoryName" type="string"/>
+        </arguments>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{categoryName}}]" stepKey="searchAndSelectCategory"/>
+    </actionGroup>
+
+    <!--Navigate to created product page directly via ID-->
+    <actionGroup name="goToProductPageViaID">
+        <arguments>
+            <argument name="productId" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminProductEditPage.url(productId)}}" stepKey="goToProduct"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
index dcc97fedbb8bf..ef6970b9d8368 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
@@ -36,4 +36,80 @@
         <click selector="{{AdminProductAttributeGridSection.attributeCode(attributeCode)}}" stepKey="clickRowToEdit"/>
         <waitForPageLoad stepKey="waitForColorAttributePageLoad"/>
     </actionGroup>
+    <!--Save product attribute and see success message-->
+    <actionGroup name="SaveProductAttribute">
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveAttribute"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the product attribute." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+    <actionGroup name="deleteProductAttribute">
+        <arguments>
+            <argument name="ProductAttribute"/>
+        </arguments>
+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
+        <waitForPageLoad stepKey="waitForAttributeGridPageLoad"/>
+        <fillField selector="{{AdminProductAttributeGridSection.gridFilterAttributeCode}}"
+                   userInput="{{ProductAttribute.attribute_code}}" stepKey="setAttributeCode"/>
+        <click selector="{{AdminProductAttributeGridSection.search}}" stepKey="searchForAttributeFromTheGrid"/>
+        <click selector="{{AdminProductAttributeGridSection.firstRow}}" stepKey="clickOnAttributeRow"/>
+        <waitForPageLoad stepKey="waitForAttributeEditPageLoad" />
+        <click selector="{{AttributePropertiesSection.deleteAttribute}}" stepKey="deleteAttribute"/>
+        <waitForElement selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForDeleteConfirmation"/>
+        <see selector="{{AdminConfirmationModalSection.message}}" userInput="Are you sure you want to do this?" stepKey="seeConfirmationMessage"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDeleteAttribute"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterDeleteAttribute"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the product attribute." stepKey="seeDeleteSuccessMessage"/>
+    </actionGroup>
+    <actionGroup name="navigateToCreatedProductAttribute">
+        <arguments>
+            <argument name="productAttribute"/>
+        </arguments>
+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
+        <waitForPageLoad stepKey="waitForAttributesGridPageLoad"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
+        <waitForPageLoad stepKey="waitForAttributesGridPageLoad1"/>
+        <fillField selector="{{AdminProductAttributeGridSection.gridFilterAttributeCode}}"
+                   userInput="{{productAttribute.attribute_code}}" stepKey="setAttributeCode"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="searchForAttributeFromTheGrid"/>
+        <click selector="{{AdminDataGridTableSection.row('1')}}" stepKey="clickOnAttributeRow"/>
+        <waitForPageLoad stepKey="waitForAttributePageLoad" />
+    </actionGroup>
+    <actionGroup name="StartCreateProductAttribute">
+        <arguments>
+            <argument name="attributeCode" type="string"/>
+            <argument name="attributeType" type="string" defaultValue="select"/>
+        </arguments>
+        <amOnPage url="{{AdminProductAttributeNewPage.url}}" stepKey="goToNewProductAttributePage"/>
+        <waitForPageLoad stepKey="waitForProductAttributeNewPageLoad"/>
+        <fillField selector="{{AttributePropertiesSection.defaultLabel}}" userInput="{{attributeCode}}" stepKey="fillDefaultLabel"/>
+        <selectOption selector="{{AttributePropertiesSection.inputType}}" userInput="{{attributeType}}" stepKey="selectInputType"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanelSection.addOption}}" stepKey="waitForElementVisible"/>
+    </actionGroup>
+    <actionGroup name="AdminFillProductAttributePropertiesActionGroup" extends="StartCreateProductAttribute">
+        <remove keyForRemoval="waitForElementVisible"/>
+    </actionGroup>
+    <actionGroup name="AddOptionToProductAttribute">
+        <arguments>
+            <argument name="optionName" type="string"/>
+            <argument name="optionNumber" type="string"/>
+        </arguments>
+        <click selector="{{AdminNewAttributePanelSection.addOption}}" stepKey="clickAddOption"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanelSection.optionAdminValue('optionNumber')}}" time="30" stepKey="waitForOptionRow"/>
+        <fillField selector="{{AdminNewAttributePanelSection.optionAdminValue('optionNumber')}}" userInput="{{optionName}}" stepKey="fillAdminLabel"/>
+    </actionGroup>
+    <actionGroup name="SetScopeToProductAttribute">
+        <arguments>
+            <argument name="scope" type="string" defaultValue="1"/>
+        </arguments>
+        <click selector="{{AttributePropertiesSection.AdvancedProperties}}" stepKey="expandAdvancedProperties"/>
+        <selectOption selector="{{AttributePropertiesSection.scope}}" userInput="{{scope}}" stepKey="selectGlobalScope"/>
+    </actionGroup>
+    <actionGroup name="SetUseInLayeredNavigationToProductAttribute">
+        <arguments>
+            <argument name="useInLayeredNavigation" type="string" defaultValue="1"/>
+        </arguments>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click selector="{{StorefrontPropertiesSection.storefrontPropertiesTab}}" stepKey="goToStorefrontProperties"/>
+        <selectOption selector="{{AttributePropertiesSection.useInLayeredNavigation}}" userInput="{{useInLayeredNavigation}}" stepKey="selectUseInLayeredNavigation"/>
+    </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 17f27056c555e..9817e24bed963 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
@@ -49,6 +49,7 @@
         <arguments>
             <argument name="attributeSetName" type="string"/>
         </arguments>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
         <click selector="{{AdminProductFormSection.attributeSet}}" stepKey="startEditAttrSet"/>
         <fillField selector="{{AdminProductFormSection.attributeSetFilter}}" userInput="{{attributeSetName}}" stepKey="searchForAttrSet"/>
         <waitForAjaxLoad stepKey="waitForLoad"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
index 3c4e83aabd047..d10c10827f4cd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!--Filter the product grid by new from date filter-->
     <actionGroup name="filterProductGridBySetNewFromDate">
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
@@ -29,10 +29,22 @@
         <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/>
     </actionGroup>
 
+    <!--Filter the product grid by the Name field-->
+    <actionGroup name="filterProductGridByName">
+        <arguments>
+            <argument name="product" defaultValue="_defaultProduct"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{product.name}}" stepKey="fillProductNameFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+    </actionGroup>
+
     <!--Delete a product by filtering grid and using delete action-->
     <actionGroup name="deleteProductUsingProductGrid">
         <arguments>
             <argument name="product"/>
+            <argument name="productCount" type="string" defaultValue="1"/>
         </arguments>
         <!--TODO use other action group for filtering grid when MQE-539 is implemented -->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
@@ -48,10 +60,20 @@
         <click selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/>
         <waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
         <click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
-        <see selector="{{AdminMessagesSection.success}}" userInput="A total of 1 record(s) have been deleted." stepKey="seeSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="A total of {{productCount}} record(s) have been deleted." stepKey="seeSuccessMessage"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial2"/>
     </actionGroup>
 
+    <actionGroup name="DeleteProductByName" extends="deleteProductUsingProductGrid">
+        <arguments>
+            <argument name="product" type="string"/>
+        </arguments>
+        <remove keyForRemoval="fillProductSkuFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{product}}" stepKey="fillProductSkuFilter" after="openProductFilters"/>
+        <remove keyForRemoval="seeProductSkuInGrid"/>
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="{{product}}"  stepKey="seeProductNameInGrid" after="clickApplyFilters"/>
+    </actionGroup>
+
     <!--Disabled a product by filtering grid and using change status action-->
     <actionGroup name="ChangeStatusProductUsingProductGridActionGroup">
         <arguments>
@@ -70,8 +92,49 @@
 
         <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
         <click selector="{{AdminProductGridSection.bulkActionOption('Change status')}}" stepKey="clickChangeStatusAction"/>
-        <click selector="{{AdminProductGridSection.changeStatus('status')}}" stepKey="clickChangeStatusDisabled" parameterized="true"/>
+        <click selector="{{AdminProductGridSection.changeStatus('status')}}" stepKey="clickChangeStatusDisabled"/>
+        <waitForPageLoad stepKey="waitForStatusToBeChanged"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="A total of 1 record(s) have been updated." stepKey="seeSuccessMessage"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial2"/>
     </actionGroup>
+
+    <!-- Sort products by ID descending -->
+    <actionGroup name="sortProductsByIdDescending">
+        <conditionalClick selector="{{AdminProductGridTableHeaderSection.id('ascend')}}" dependentSelector="{{AdminProductGridTableHeaderSection.id('descend')}}" visible="false" stepKey="sortById"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+
+    <!--Filter and select the the product  -->
+    <actionGroup name="filterAndSelectProduct">
+        <arguments>
+            <argument name="productSku" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{productSku}}" stepKey="fillProductSkuFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/>
+        <click stepKey="openSelectedProduct" selector="{{AdminProductGridSection.productRowBySku(productSku)}}"/>
+        <waitForPageLoad stepKey="waitForProductToLoad"/>
+        <waitForElementVisible selector="{{AdminHeaderSection.pageTitle}}" stepKey="waitForProductTitle"/>
+    </actionGroup>
+
+    <actionGroup name="DeleteAllProducts">
+        <conditionalClick selector="{{AdminProductGridSection.multicheckDropdown}}" dependentSelector="{{AdminDataGridTableSection.firstRow}}" visible="true" stepKey="openMulticheckDropdown"/>
+        <conditionalClick selector="{{AdminProductGridSection.multicheckOption('Select All')}}" dependentSelector="{{AdminDataGridTableSection.firstRow}}" visible="true" stepKey="selectAllProductInFilteredGrid"/>
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModalPopUp"/>
+        <grabTextFrom selector="{{AdminConfirmationModalSection.message}}" stepKey="grabConfirmationMessage"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmProductDelete"/>
+        <executeInSelenium function="function () use ($I, $grabConfirmationMessage) {
+            if ($grabConfirmationMessage !== 'You haven\'t selected any items!') {
+                $I->waitForElementVisible('#messages div.message-success');
+                $I->see('record(s) have been deleted.', '#messages div.message-success');
+            }
+            }" stepKey="waitSuccessMessage"/>
+    </actionGroup>
+
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminUnassignCategoryOnProductAndSaveActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminUnassignCategoryOnProductAndSaveActionGroup.xml
new file mode 100644
index 0000000000000..8da2b2226735a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminUnassignCategoryOnProductAndSaveActionGroup.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="AdminUnassignCategoryOnProductAndSaveActionGroup">
+        <arguments>
+            <argument name="categoryName" type="string"/>
+        </arguments>
+        <!-- on edit Product page catalog/product/edit/id/{{product_id}}/ -->
+        <click selector="{{AdminProductFormSection.unselectCategories(categoryName)}}" stepKey="clearCategory"/>
+        <waitForPageLoad stepKey="waitForDelete"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
+        <waitForPageLoad stepKey="waitForSavingProduct"/>
+        <see userInput="You saved the product." selector="{{AdminMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
index c095faa73d9b1..e679d59fde791 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
@@ -6,22 +6,51 @@
   */
 -->
 
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-    <!--Add a custom option of type "file" to a product-->
-    <actionGroup name="AddProductCustomOptionFile">
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AddProductCustomOption">
         <arguments>
-            <argument name="option" defaultValue="ProductOptionFile"/>
+            <argument name="option"/>
         </arguments>
         <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" visible="false" stepKey="openCustomOptionSection"/>
         <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOption"/>
         <waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.lastOptionTitle}}" stepKey="waitForOption"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.lastOptionTitle}}" userInput="{{option.title}}" stepKey="fillTitle"/>
         <click selector="{{AdminProductCustomizableOptionsSection.lastOptionTypeParent}}" stepKey="openTypeSelect"/>
-        <click selector="{{AdminProductCustomizableOptionsSection.optionType('File')}}" stepKey="selectTypeFile"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionType(option.type_label)}}" stepKey="selectTypeFile"/>
         <waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.optionPrice}}" stepKey="waitForElements"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.optionPrice}}" userInput="{{option.price}}" stepKey="fillPrice"/>
         <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType}}" userInput="{{option.price_type}}" stepKey="selectPriceType"/>
-        <fillField selector="{{AdminProductCustomizableOptionsSection.optionFileExtensions}}" userInput="{{option.file_extension}}" stepKey="fillCompatibleExtensions"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionSku}}" userInput="{{option.title}}" stepKey="fillSku"/>
+    </actionGroup>
+    <!--Add a custom option of type "file" to a product-->
+    <actionGroup name="AddProductCustomOptionFile" extends="AddProductCustomOption">
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionFileExtensions}}" userInput="{{option.file_extension}}" after="fillSku" stepKey="fillCompatibleExtensions"/>
+    </actionGroup>
+    <actionGroup name="ImportProductCustomizableOptions">
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <click selector="{{AdminProductCustomizableOptionsSection.importOptions}}" stepKey="clickImportOptions"/>
+        <waitForElementVisible selector="{{AdminProductCustomizableOptionsImportModalSection.selectProductTitle}}" stepKey="waitForTitleVisible"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickResetFilters"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="clickFilterButton"/>
+        <waitForElementVisible selector="{{AdminProductCustomizableOptionsImportModalSection.nameFilter}}" stepKey="waitForNameField"/>
+        <fillField selector="{{AdminProductCustomizableOptionsImportModalSection.nameFilter}}" userInput="{{productName}}" stepKey="fillProductName"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <checkOption selector="{{AdminDataGridTableSection.rowCheckbox('1')}}"  stepKey="checkProductCheckbox"/>
+        <click selector="{{AdminProductCustomizableOptionsImportModalSection.importButton}}" stepKey="clickImport"/>
+    </actionGroup>
+    <actionGroup name="CheckCustomizableOptionImport">
+        <arguments>
+            <argument name="option"/>
+            <argument name="optionIndex" type="string"/>
+        </arguments>
+        <grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionTitleInputByIndex(optionIndex)}}" stepKey="grabOptionTitle"/>
+        <grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionPriceByIndex(optionIndex)}}" stepKey="grabOptionPrice"/>
+        <grabValueFrom selector="{{AdminProductCustomizableOptionsSection.optionSkuByIndex(optionIndex)}}" stepKey="grabOptionSku"/>
+        <assertEquals expected="{{option.title}}" expectedType="string" actual="$grabOptionTitle" stepKey="assertOptionTitle"/>
+        <assertEquals expected="{{option.price}}" expectedType="string" actual="$grabOptionPrice" stepKey="assertOptionPrice"/>
+        <assertEquals expected="{{option.title}}" expectedType="string" actual="$grabOptionSku" stepKey="assertOptionSku"/>
     </actionGroup>
 </actionGroups>
+
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenStoreFrontProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenStoreFrontProductPageActionGroup.xml
new file mode 100644
index 0000000000000..4bfd5673e4a8b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenStoreFrontProductPageActionGroup.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="OpenStoreFrontProductPageActionGroup">
+        <arguments>
+            <argument name="productUrlKey" type="string"/>
+        </arguments>
+        <amOnPage url="{{StorefrontProductPage.url(productUrlKey)}}" stepKey="amOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenStorefrontProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenStorefrontProductPageActionGroup.xml
new file mode 100644
index 0000000000000..4bfd5673e4a8b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenStorefrontProductPageActionGroup.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="OpenStoreFrontProductPageActionGroup">
+        <arguments>
+            <argument name="productUrlKey" type="string"/>
+        </arguments>
+        <amOnPage url="{{StorefrontProductPage.url(productUrlKey)}}" stepKey="amOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml
index ebeee87b1c89e..6cb939a7af410 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="SearchForProductOnBackendActionGroup">
         <arguments>
             <argument name="product" defaultValue="product"/>
@@ -19,4 +19,11 @@
         <fillField stepKey="fillSkuFieldOnFiltersSection"  userInput="{{product.sku}}" selector="{{AdminProductFiltersSection.SkuInput}}"/>
         <click stepKey="clickApplyFiltersButton" selector="{{AdminProductFiltersSection.Apply}}"/>
     </actionGroup>
+    <actionGroup name="SearchForProductOnBackendByNameActionGroup" extends="SearchForProductOnBackendActionGroup">
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <remove keyForRemoval="fillSkuFieldOnFiltersSection"/>
+        <fillField userInput="{{productName}}" selector="{{AdminProductFiltersSection.NameInput}}" after="cleanFiltersIfTheySet" stepKey="fillNameFieldOnFiltersSection"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml
index 4938b6a9592f1..91afd2eb5d4c7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml
@@ -13,7 +13,6 @@
             <argument name="productName"/>
         </arguments>
         <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCart"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
         <see selector="{{StorefrontProductPageSection.successMsg}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductInWidgetActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductInWidgetActionGroup.xml
new file mode 100644
index 0000000000000..c25b73bab21ae
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductInWidgetActionGroup.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Check the product in recently viewed widget -->
+    <actionGroup name="StorefrontAssertProductInRecentlyViewedWidgetActionGroup">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <waitForElementVisible selector="{{StorefrontWidgetsSection.widgetRecentlyViewedProductsGrid}}" stepKey="waitWidgetRecentlyViewedProductsGrid"/>
+        <see selector="{{StorefrontWidgetsSection.widgetRecentlyViewedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyViewedWidget"/>
+    </actionGroup>
+
+    <!-- Check the product in recently compared widget -->
+    <actionGroup name="StorefrontAssertProductInRecentlyComparedWidgetActionGroup">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <waitForElementVisible selector="{{StorefrontWidgetsSection.widgetRecentlyComparedProductsGrid}}" stepKey="waitWidgetRecentlyComparedProductsGrid"/>
+        <see selector="{{StorefrontWidgetsSection.widgetRecentlyComparedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyComparedWidget"/>
+    </actionGroup>
+
+    <!-- Check the product in recently ordered widget -->
+    <actionGroup name="StorefrontAssertProductInRecentlyOrderedWidgetActionGroup">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <waitForElementVisible selector="{{StorefrontWidgetsSection.widgetRecentlyOrderedProductsGrid}}" stepKey="waitWidgetRecentlyOrderedProductsGrid"/>
+        <see selector="{{StorefrontWidgetsSection.widgetRecentlyOrderedProductsGrid}}" userInput="{{product.name}}" stepKey="seeProductInRecentlyOrderedWidget"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertShippingMethodOptionPresentInCartActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertShippingMethodOptionPresentInCartActionGroup.xml
new file mode 100644
index 0000000000000..399a26abb8c86
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertShippingMethodOptionPresentInCartActionGroup.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">
+    <!-- Assert shipping method name and price are present in cart -->
+    <actionGroup name="StorefrontAssertShippingMethodOptionPresentInCartActionGroup">
+        <arguments>
+            <argument name="methodName" type="string"/>
+            <argument name="price" type="string"/>
+        </arguments>
+        <see selector="{{StorefrontCheckoutCartSummarySection.methodName}}" userInput="{{methodName}}" stepKey="seeShippingName"/>
+        <see selector="{{StorefrontCheckoutCartSummarySection.shippingPrice}}" userInput="{{price}}" stepKey="seeShippingPrice"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
index 8f0df2fc899a9..00b2788af2d70 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
@@ -19,6 +19,12 @@
         <see userInput="{{category.name}}" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="assertCategoryName"/>
         <see userInput="{{productCount}}" selector="{{StorefrontCategoryMainSection.productCount}} span" stepKey="assertProductCount"/>
     </actionGroup>
+    <!--Check category is empty-->
+    <actionGroup name="StorefrontCheckEmptyCategoryActionGroup" extends="StorefrontCheckCategoryActionGroup">
+        <remove keyForRemoval="assertProductCount"/>
+        <amOnPage url="{{StorefrontCategoryPage.url(category.name)}}" before="checkUrl" stepKey="goToCategoryStorefront"/>
+        <see selector="{{StorefrontCategoryMainSection.categoryEmptyMessage}}" userInput="We can't find products matching the selection." stepKey="seeCategoryEmpty"/>
+    </actionGroup>
 
     <!-- Check simple product on the category page -->
     <actionGroup name="StorefrontCheckCategorySimpleProduct">
@@ -28,7 +34,15 @@
         <seeElement selector="{{StorefrontCategoryProductSection.productTitleByName(product.name)}}" stepKey="assertProductName"/>
         <see userInput="${{product.price}}.00" selector="{{StorefrontCategoryProductSection.ProductPriceByName(product.name)}}" stepKey="AssertProductPrice"/>
         <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="moveMouseOverProduct" />
-        <seeElement selector="{{StorefrontCategoryProductSection.productAddToCartByName(product.name)}}" stepKey="AssertAddToCart" />
+        <executeInSelenium function="function($webdriver) use ($I) {
+            $productName = '//main//li[.//a[contains(text(), \'' . {{product.name}} . '\' )]]//div[@data-container=\'product-grid\']';
+            $I->assertEquals('2', $webdriver->findElement(\Facebook\WebDriver\WebDriverBy::xpath($productName))->getCSSValue('z-index'));
+        }" stepKey="assertProductContainerIsOpened"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productAddToCartByName(product.name)}}" stepKey="assertAddToCart" />
+    </actionGroup>
+
+    <actionGroup name="StorefrontCheckAddToCartButtonAbsence" extends="StorefrontCheckCategorySimpleProduct">
+        <dontSeeElement selector="{{StorefrontCategoryProductSection.productAddToCartByName(product.name)}}" stepKey="assertAddToCart"/>
     </actionGroup>
 
     <actionGroup name="StorefrontSwitchCategoryViewToListMode">
@@ -47,4 +61,34 @@
         <!-- Go to storefront category page -->
         <amOnPage url="{{StorefrontCategoryPage.url(category)}}?product_list_mode={{mode}}&amp;product_list_order={{sortBy}}&amp;product_list_dir={{sort}}" stepKey="onCategoryPage"/>
     </actionGroup>
+
+    <actionGroup name="VerifyCategoryPageParameters">
+        <arguments>
+            <argument name="categoryName" type="string"/>
+            <argument name="mode" type="string"/>
+            <argument name="numOfProductsPerPage" type="string"/>
+            <argument name="sortBy" type="string" defaultValue="position"/>
+        </arguments>
+        <amOnPage url="{{StorefrontCategoryPage.url(categoryName)}}" stepKey="navigateToCategoryPage"/>
+        <seeInTitle userInput="{{categoryName}}" stepKey="assertCategoryNameInTitle"/>
+        <see userInput="{{categoryName}}" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="assertCategoryName"/>
+        <see userInput="{{mode}}" selector="{{StorefrontCategoryPagerSection.modeGridIsActive}}" stepKey="assertViewMode"/>
+        <see userInput="{{numOfProductsPerPage}}" selector="{{StorefrontCategoryPagerSection.perPageSelected}}" stepKey="assertNumberOfProductsPerPage"/>
+        <see userInput="{{sortBy}}" selector="{{StorefrontCategoryPagerSection.sortedBy}}" stepKey="assertSortedBy"/>
+    </actionGroup>
+
+    <actionGroup name="StorefrontGoToSubCategoryPage">
+        <arguments>
+            <argument name="parentCategory"/>
+            <argument name="subCategory"/>
+            <argument name="urlPath" type="string"/>
+        </arguments>
+        <moveMouseOver selector="{{StorefrontHeaderSection.NavigationCategoryByName(parentCategory.name)}}" stepKey="moveMouseOnMainCategory"/>
+        <waitForElementVisible selector="{{StorefrontHeaderSection.NavigationCategoryByName(subCategory.name)}}" stepKey="waitForSubCategoryVisible"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(subCategory.name)}}" stepKey="goToCategory"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeInCurrentUrl url="{{urlPath}}.html" stepKey="checkUrl"/>
+        <seeInTitle userInput="{{subCategory.name}}" stepKey="assertCategoryNameInTitle"/>
+        <see userInput="{{subCategory.name}}" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="assertCategoryName"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
index 9d37f2442628e..9bf91e6c31926 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!-- Add Product to Compare from the category page and check message -->
     <actionGroup name="StorefrontAddCategoryProductToCompareActionGroup">
         <arguments>
@@ -59,12 +59,12 @@
 
     <!-- Clear the compare list -->
     <actionGroup name="StorefrontClearCompareActionGroup">
-        <waitForElementVisible selector="{{StorefrontComparisonSidebarSection.ClearAll}}" time="30" stepKey="waitForClearAll"/>
-        <click selector="{{StorefrontComparisonSidebarSection.ClearAll}}" stepKey="clickClearAll"/>
-        <waitForElementVisible selector="{{ModalConfirmationSection.OkButton}}" time="30" stepKey="waitForClearOk"/>
-        <scrollTo selector="{{ModalConfirmationSection.OkButton}}" stepKey="scrollToClearOk"/>
-        <click selector="{{ModalConfirmationSection.OkButton}}" stepKey="clickClearOk"/>
-        <waitForElement selector="{{StorefrontMessagesSection.message('You cleared the comparison list.')}}" time="30" stepKey="AssertMessageCleared"/>
-        <waitForElement selector="{{StorefrontComparisonSidebarSection.NoItemsMessage}}" time="30" stepKey="assertNoItems"/>
+        <waitForElementVisible selector="{{StorefrontComparisonSidebarSection.clearAll}}" time="30" stepKey="waitForClearAll"/>
+        <click selector="{{StorefrontComparisonSidebarSection.clearAll}}" stepKey="clickClearAll"/>
+        <waitForElementVisible selector="{{StorefrontModalConfirmationSection.okButton}}" stepKey="waitForClearOk"/>
+        <click selector="{{StorefrontModalConfirmationSection.okButton}}" stepKey="clickClearOk"/>
+        <waitForElementVisible selector="{{StorefrontMessagesSection.successMessage}}"  stepKey="waitAssertMessageCleared"/>
+        <see selector="{{StorefrontMessagesSection.successMessage}}" userInput="You cleared the comparison list." stepKey="assertMessageCleared"/>
+        <waitForElementVisible selector="{{StorefrontComparisonSidebarSection.noItemsMessage}}" stepKey="assertNoItems"/>
     </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontGoToCategoryPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontGoToCategoryPageActionGroup.xml
new file mode 100644
index 0000000000000..1a8da822855ea
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontGoToCategoryPageActionGroup.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="StorefrontGoToCategoryPageActionGroup">
+        <arguments>
+            <argument name="categoryName" type="string"/>
+        </arguments>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="onFrontend"/>
+        <waitForPageLoad stepKey="waitForStorefrontPageLoad"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(categoryName)}}" stepKey="toCategory"/>
+        <waitForPageLoad stepKey="waitForCategoryPage"/>
+    </actionGroup>
+    <actionGroup name="StorefrontGoToSubCategoryPageActionGroup" extends="StorefrontGoToCategoryPageActionGroup">
+        <arguments>
+            <argument name="subCategoryName" type="string"/>
+        </arguments>
+        <moveMouseOver selector="{{StorefrontHeaderSection.NavigationCategoryByName(categoryName)}}" stepKey="toCategory"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(subCategoryName)}}" stepKey="openSubCategory" after="toCategory"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
index d3773a2b58b8e..10f580b68e0ec 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!-- Check the simple product on the product page -->
     <actionGroup name="StorefrontCheckSimpleProduct">
         <arguments>
@@ -22,4 +22,16 @@
         <see userInput="{{product.custom_attributes[description]}}" selector="{{StorefrontProductInfoMainSection.productDescription}}" stepKey="assertProductDescription"/>
         <see userInput="{{product.custom_attributes[short_description]}}" selector="{{StorefrontProductInfoMainSection.productShortDescription}}" stepKey="assertProductShortDescription"/>
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+
+    <!-- Assert option image and price in storefront product page -->
+    <actionGroup name="AssertOptionImageAndPriceInStorefrontProductActionGroup">
+        <arguments>
+            <argument name="label" type="string"/>
+            <argument name="image" type="string"/>
+            <argument name="price" type="string"/>
+        </arguments>
+        <selectOption userInput="{{label}}" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption"/>
+        <seeElement selector="{{StorefrontProductMediaSection.imageFile(image)}}" stepKey="seeImage"/>
+        <see userInput="{{price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="seeProductPrice"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogRecentlyProductsConfigData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogRecentlyProductsConfigData.xml
new file mode 100644
index 0000000000000..52ade613e5e03
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogRecentlyProductsConfigData.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="EnableSynchronizeWidgetProductsWithBackendStorage" type="catalog_recently_products">
+        <requiredEntity type="synchronize_with_backend">EnableCatalogRecentlyProductsSynchronize</requiredEntity>
+    </entity>
+
+    <entity name="EnableCatalogRecentlyProductsSynchronize" type="synchronize_with_backend">
+        <data key="value">1</data>
+    </entity>
+
+    <entity name="DisableSynchronizeWidgetProductsWithBackendStorage" type="catalog_recently_products">
+        <requiredEntity type="synchronize_with_backend">DefaultCatalogRecentlyProductsSynchronize</requiredEntity>
+    </entity>
+
+    <entity name="DefaultCatalogRecentlyProductsSynchronize" type="synchronize_with_backend">
+        <data key="value">0</data>
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogStorefrontConfigData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogStorefrontConfigData.xml
new file mode 100644
index 0000000000000..d36877025e970
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogStorefrontConfigData.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="RememberPaginationCatalogStorefrontConfig" type="catalog_storefront_config">
+        <requiredEntity type="grid_per_page_values">GridPerPageValues</requiredEntity>
+        <requiredEntity type="remember_pagination">RememberCategoryPagination</requiredEntity>
+    </entity>
+
+    <entity name="GridPerPageValues" type="grid_per_page_values">
+        <data key="value">9,12,20,24</data>
+    </entity>
+
+    <entity name="RememberCategoryPagination" type="remember_pagination">
+        <data key="value">1</data>
+    </entity>
+
+    <entity name="DefaultGridPerPageValues" type="grid_per_page_values">
+        <data key="value">9,15,30</data>
+    </entity>
+
+    <entity name="DefaultRememberCategoryPagination" type="remember_pagination">
+        <data key="value">1</data>
+    </entity>
+
+    <entity name="DefaultCatalogStorefrontConfiguration" type="default_catalog_storefront_config">
+        <requiredEntity type="catalogStorefrontFlagZero">DefaultCatalogStorefrontFlagZero</requiredEntity>
+        <data key="grid_per_page_values">DefaultGridPerPageValues</data>
+        <data key="remember_pagination">DefaultRememberCategoryPagination</data>
+    </entity>
+
+    <entity name="DefaultCatalogStorefrontFlagZero" type="catalogStorefrontFlagZero">
+        <data key="value">0</data>
+    </entity>
+
+    <entity name="DefaultListAllowAll" type="list_allow_all">
+        <data key="value">0</data>
+    </entity>
+
+    <entity name="DefaultFlatCatalogProduct" type="flat_catalog_product">
+        <data key="value">0</data>
+    </entity>
+
+    <entity name="UseFlatCatalogCategoryAndProduct" type="catalog_storefront_config">
+        <requiredEntity type="flat_catalog_product">UseFlatCatalogProduct</requiredEntity>
+        <requiredEntity type="flat_catalog_category">UseFlatCatalogCategory</requiredEntity>
+    </entity>
+
+    <entity name="UseFlatCatalogProduct" type="flat_catalog_product">
+        <data key="value">1</data>
+    </entity>
+
+    <entity name="UseFlatCatalogCategory" type="flat_catalog_category">
+        <data key="value">1</data>
+    </entity>
+
+    <entity name="DefaultFlatCatalogCategoryAndProduct" type="catalog_storefront_config">
+        <requiredEntity type="flat_catalog_product">DefaultFlatCatalogProduct</requiredEntity>
+        <requiredEntity type="flat_catalog_category">DefaultFlatCatalogCategory</requiredEntity>
+    </entity>
+
+    <entity name="DefaultFlatCatalogCategory" type="flat_catalog_category">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
index 8d7c182d648c2..e798cda2daa5a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
@@ -39,4 +39,12 @@
     <entity name="DefaultRootCategoryGetter" type="category">
         <var key="category" entityKey="category" entityType="category"/>
     </entity>
+    <entity name="GearCategory" type="category">
+        <data key="name" unique="suffix">Gear</data>
+        <data key="url_key" unique="suffix">gear</data>
+    </entity>
+    <entity name="BagsCategory" type="category">
+        <data key="name" unique="suffix">Bags</data>
+        <data key="url_key" unique="suffix">bags</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/FrontendLabelData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/FrontendLabelData.xml
index 7b01b6b4e5189..ec8a355523d63 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/FrontendLabelData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/FrontendLabelData.xml
@@ -16,6 +16,7 @@
     <entity name="ProductAttributeFrontendLabelThree" type="FrontendLabel">
         <data key="store_id">0</data>
         <data key="label" unique="suffix">attributeThree</data>
+        <data key="default_label" unique="suffix">attributeThree</data>
     </entity>
     <entity name="ColorAttributeFrontandLabel" type="FrontendLabel">
         <data key="store_id">0</data>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
index d5f29230f0308..dfe6bfdf681e1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="productAttributeWithTwoOptions" type="ProductAttribute">
         <data key="name" unique="suffix">ProductAttributeWithTwoOptions</data>
         <data key="attribute_code" unique="suffix">attribute</data>
@@ -74,4 +74,28 @@
         <data key="used_for_sort_by">true</data>
         <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
     </entity>
+    <entity name="ProductAttributeText" extends="productAttributeWithTwoOptions">
+        <data key="frontend_input">text</data>
+    </entity>
+    <entity name="productVisualSwatchAttribute" type="ProductAttribute">
+        <data key="attribute_code" unique="suffix">attribute</data>
+        <data key="frontend_input">swatch_visual</data>
+        <data key="scope">global</data>
+        <data key="is_required">false</data>
+        <data key="is_unique">false</data>
+        <data key="is_searchable">true</data>
+        <data key="is_visible">true</data>
+        <data key="is_visible_in_advanced_search">true</data>
+        <data key="is_visible_on_front">true</data>
+        <data key="is_filterable">true</data>
+        <data key="is_filterable_in_search">true</data>
+        <data key="used_in_product_listing">true</data>
+        <data key="is_used_for_promo_rules">true</data>
+        <data key="is_comparable">true</data>
+        <data key="is_used_in_grid">true</data>
+        <data key="is_visible_in_grid">true</data>
+        <data key="is_filterable_in_grid">true</data>
+        <data key="used_for_sort_by">true</data>
+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
index 25512c0f266e9..8ecae212b7c2d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="productAttributeOption1" type="ProductAttributeOption">
         <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
         <data key="label" unique="suffix">option1</data>
@@ -59,4 +59,28 @@
         <requiredEntity type="StoreLabel">Option6Store0</requiredEntity>
         <requiredEntity type="StoreLabel">Option6Store1</requiredEntity>
     </entity>
+    <entity name="ProductAttributeOption7" type="ProductAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label" unique="suffix">Green</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">3</data>
+        <requiredEntity type="StoreLabel">Option7Store0</requiredEntity>
+        <requiredEntity type="StoreLabel">Option8Store1</requiredEntity>
+    </entity>
+    <entity name="ProductAttributeOption8" type="ProductAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label" unique="suffix">Red</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">3</data>
+        <requiredEntity type="StoreLabel">Option9Store0</requiredEntity>
+        <requiredEntity type="StoreLabel">Option10Store1</requiredEntity>
+    </entity>
+    <entity name="ProductAttributeAdminOption1" extends="productAttributeOption1">
+        <requiredEntity type="StoreLabel">AdminOption1Store0</requiredEntity>
+        <requiredEntity type="StoreLabel">Option1Store1</requiredEntity>
+    </entity>
+    <entity name="ProductAttributeAdminOption2" extends="productAttributeOption2">
+        <requiredEntity type="StoreLabel">AdminOption2Store0</requiredEntity>
+        <requiredEntity type="StoreLabel">Option2Store1</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
index 68c0a54ff88fc..1ee1d08e192d6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
@@ -13,5 +13,6 @@
         <data key="attributeSetId">4</data>
         <data key="attributeGroupId">7</data>
         <data key="sortOrder">0</data>
+        <data key="label">Default</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductConfigurableAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductConfigurableAttributeData.xml
index 4deebbe09af34..8d588a192ed90 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductConfigurableAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductConfigurableAttributeData.xml
@@ -7,10 +7,11 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="colorProductAttribute" type="product_attribute">
         <data key="default_label" unique="suffix">Color</data>
         <data key="attribute_quantity">1</data>
+        <data key="input_type">Dropdown</data>
     </entity>
     <entity name="colorProductAttribute1" type="product_attribute">
         <data key="name" unique="suffix">White</data>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index a6f2e60e843be..9d02fbd848345 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="_defaultProduct" type="product">
         <data key="sku" unique="suffix">testSku</data>
         <data key="type_id">simple</data>
@@ -113,6 +113,17 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attributes">CustomAttributeProductAttribute</requiredEntity>
     </entity>
+    <entity name="SimpleTwo" type="product2">
+        <data key="sku" unique="suffix">SimpleTwo</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name" unique="suffix">SimpleProduct</data>
+        <data key="price">1.23</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeProductUrlKey</requiredEntity>
+    </entity>
     <entity name="SimpleOption" type="product2">
         <data key="sku" unique="suffix">SimpleOne</data>
         <data key="type_id">simple</data>
@@ -124,6 +135,9 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
+    <entity name="SetProductVisibilityHidden" type="product2">
+        <data key="visibility">1</data>
+    </entity>
     <entity name="ProductImage" type="uploadImage">
         <data key="title" unique="suffix">Image1</data>
         <data key="price">1.00</data>
@@ -246,10 +260,27 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
+    <entity name="ApiSimpleTwoHidden" type="product2">
+        <data key="sku" unique="suffix">api-simple-product-two</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">1</data>
+        <data key="name" unique="suffix">Api Simple Product Two</data>
+        <data key="price">234.00</data>
+        <data key="urlKey" unique="suffix">api-simple-product-two</data>
+        <data key="status">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
+    </entity>
     <entity name="ProductWithOptions2" type="product">
         <var key="sku" entityType="product" entityKey="sku" />
         <requiredEntity type="product_option">ProductOptionDropDownWithLongValuesTitle</requiredEntity>
     </entity>
+    <entity name="ProductWithFileOption" type="product">
+        <var key="sku" entityType="product" entityKey="sku" />
+        <requiredEntity type="product_option">ProductOptionFile</requiredEntity>
+    </entity>
     <entity name="SimpleProductWithCustomAttributeSet" type="product">
         <data key="sku" unique="suffix">testSku</data>
         <data key="type_id">simple</data>
@@ -268,4 +299,29 @@
         <data key="quantity">1</data>
         <requiredEntity type="product_extension_attribute">EavStock1</requiredEntity>
     </entity>
+    <entity name="GetProduct2" type="product2">
+        <var key="sku" entityKey="sku" entityType="product2"/>
+    </entity>
+    <entity name="ApiSimpleWithQty100" extends="ApiSimpleOne">
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
+    </entity>
+    <entity name="ProductWithFieldOptions" type="product">
+        <var key="sku" entityType="product" entityKey="sku" />
+        <requiredEntity type="product_option">ProductOptionField</requiredEntity>
+        <requiredEntity type="product_option">ProductOptionField2</requiredEntity>
+    </entity>
+    <entity name="defaultSimpleProduct" type="product">
+        <data key="name" unique="suffix">Testp</data>
+        <data key="sku" unique="suffix">testsku</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="price">560.00</data>
+        <data key="urlKey" unique="suffix">testurl-</data>
+        <data key="status">1</data>
+        <data key="quantity">25</data>
+        <data key="weight">1</data>
+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml
index 5424e48261085..5b2dc5e691a2b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml
@@ -14,4 +14,7 @@
     <entity name="EavStock1" type="product_extension_attribute">
         <requiredEntity type="stock_item">Qty_1</requiredEntity>
     </entity>
+    <entity name="EavStock100" type="product_extension_attribute">
+        <requiredEntity type="stock_item">Qty_100</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml
new file mode 100644
index 0000000000000..9f74a86802e0f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.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="ProductGridPagerData">
+        <data key="pageSize">1</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductLinkData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductLinkData.xml
new file mode 100644
index 0000000000000..000bb2095002c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductLinkData.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="RelatedProductLink" type="product_link">
+        <var key="sku" entityKey="sku" entityType="product2"/>
+        <var key="linked_product_sku" entityKey="sku" entityType="product"/>
+        <data key="link_type">related</data>
+        <data key="linked_product_type">simple</data>
+        <data key="position">1</data>
+        <requiredEntity type="product_link_extension_attribute">Qty1000</requiredEntity>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductLinksData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductLinksData.xml
new file mode 100644
index 0000000000000..bd4f807880ab8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductLinksData.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="OneRelatedProductLink" type="product_links">
+        <requiredEntity type="product_link">RelatedProductLink</requiredEntity>
+    </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 ae8bcf0893ed0..82ce0d076f115 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml
@@ -6,17 +6,24 @@
   */
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="ProductOptionField" type="product_option">
         <var key="product_sku" entityType="product" entityKey="sku" />
         <data key="title">OptionField</data>
+        <data key="sku">OptionField</data>
         <data key="type">field</data>
+        <data key="type_label">Field</data>
         <data key="is_require">true</data>
         <data key="sort_order">1</data>
         <data key="price">10</data>
         <data key="price_type">fixed</data>
         <data key="max_characters">0</data>
     </entity>
+    <entity name="ProductOptionField2" type="product_option" extends="ProductOptionField">
+        <data key="title">OptionField2</data>
+        <data key="sku">OptionField2</data>
+        <data key="price">20</data>
+    </entity>
     <entity name="ProductOptionArea" type="product_option">
         <var key="product_sku" entityType="product" entityKey="sku" />
         <data key="title">OptionArea</data>
@@ -31,6 +38,7 @@
         <var key="product_sku" entityType="product" entityKey="sku" />
         <data key="title">OptionFile</data>
         <data key="type">file</data>
+        <data key="type_label">File</data>
         <data key="is_require">true</data>
         <data key="sort_order">3</data>
         <data key="price">9.99</data>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml
index 99e072b91c3a9..a071c068b575d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml
@@ -16,4 +16,8 @@
         <data key="qty">1</data>
         <data key="is_in_stock">true</data>
     </entity>
+    <entity name="Qty_100" type="stock_item">
+        <data key="qty">100</data>
+        <data key="is_in_stock">true</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
index a703e56beda01..3af9b2c54a4f0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="Option1Store0" type="StoreLabel">
         <data key="store_id">0</data>
         <data key="label">option1</data>
@@ -56,4 +56,28 @@
         <data key="store_id">1</data>
         <data key="label">option6</data>
     </entity>
+    <entity name="Option7Store0" type="StoreLabel">
+        <data key="store_id">0</data>
+        <data key="label">Green</data>
+    </entity>
+    <entity name="Option8Store1" type="StoreLabel">
+        <data key="store_id">1</data>
+        <data key="label">Green</data>
+    </entity>
+    <entity name="Option9Store0" type="StoreLabel">
+        <data key="store_id">0</data>
+        <data key="label">Red</data>
+    </entity>
+    <entity name="Option10Store1" type="StoreLabel">
+        <data key="store_id">1</data>
+        <data key="label">Red</data>
+    </entity>
+    <entity name="AdminOption1Store0" type="StoreLabel">
+        <data key="store_id">0</data>
+        <data key="label">admin_option_1</data>
+    </entity>
+    <entity name="AdminOption2Store0" type="StoreLabel">
+        <data key="store_id">0</data>
+        <data key="label">admin_option_2</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
new file mode 100644
index 0000000000000..316bb5313a29d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/WidgetsData.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ProductLinkWidget" extends="ProductsListWidget">
+        <data key="type">Catalog Product Link</data>
+        <data key="template">Product Link Block Template</data>
+    </entity>
+    <entity name="RecentlyComparedProductsWidget" type="widget">
+        <data key="type">Recently Compared Products</data>
+        <data key="design_theme">Magento Luma</data>
+        <data key="name" unique="suffix">Recently Compared Products</data>
+        <array key="store_ids">
+            <item>All Store Views</item>
+        </array>
+        <data key="display_on">All Pages</data>
+        <data key="container">Sidebar Additional</data>
+        <data key="products_to_display">5</data>
+    </entity>
+    <entity name="RecentlyViewedProductsWidget" type="widget">
+        <data key="type">Recently Viewed Products</data>
+        <data key="design_theme">Magento Luma</data>
+        <data key="name" unique="suffix">Recently Viewed Products</data>
+        <array key="store_ids">
+            <item>All Store Views</item>
+        </array>
+        <data key="display_on">All Pages</data>
+        <data key="container">Sidebar Additional</data>
+        <data key="products_to_display">5</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_configuration-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_configuration-meta.xml
new file mode 100644
index 0000000000000..4de036565eee3
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_configuration-meta.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CatalogStorefrontConfiguration" dataType="catalog_storefront_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST" successRegex="/messages-message-success/">
+        <object key="groups" dataType="catalog_storefront_config">
+            <object key="frontend" dataType="catalog_storefront_config">
+                <object key="fields" dataType="catalog_storefront_config">
+                    <object key="list_mode" dataType="list_mode">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="grid_per_page_values" dataType="grid_per_page_values">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="grid_per_page" dataType="grid_per_page">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="list_per_page_values" dataType="list_per_page_values">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="list_per_page" dataType="list_per_page">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="default_sort_by" dataType="default_sort_by">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="list_allow_all" dataType="list_allow_all">
+                        <field key="value">integer</field>
+                    </object>
+                    <object key="remember_pagination" dataType="remember_pagination">
+                        <field key="value">integer</field>
+                    </object>
+                    <object key="flat_catalog_category" dataType="flat_catalog_category">
+                        <field key="value">integer</field>
+                    </object>
+                    <object key="flat_catalog_product" dataType="flat_catalog_product">
+                        <field key="value">integer</field>
+                    </object>
+                    <object key="swatches_per_product" dataType="swatches_per_product">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="show_swatches_in_product_list" dataType="show_swatches_in_product_list">
+                        <field key="value">integer</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+
+    <operation name="DefaultCatalogStorefrontConfiguration" dataType="default_catalog_storefront_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST">
+        <object key="groups" dataType="default_catalog_storefront_config">
+            <object key="frontend" dataType="default_catalog_storefront_config">
+                <object key="fields" dataType="default_catalog_storefront_config">
+                    <object key="list_mode" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="grid_per_page_values" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="grid_per_page" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="list_per_page_values" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="list_per_page" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="default_sort_by" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="remember_pagination" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="flat_catalog_category" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="swatches_per_product" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="show_swatches_in_product_list" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="list_allow_all" dataType="list_allow_all">
+                        <field key="value">integer</field>
+                    </object>
+                    <object key="flat_catalog_product" dataType="flat_catalog_product">
+                        <field key="value">integer</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_recently_products-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_recently_products-meta.xml
new file mode 100644
index 0000000000000..c51eee83c8369
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_recently_products-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CatalogRecentlyProductsConfiguration" dataType="catalog_recently_products" type="create"
+               auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST" successRegex="/messages-message-success/">
+        <object key="groups" dataType="catalog_recently_products">
+            <object key="recently_products" dataType="catalog_recently_products">
+                <object key="fields" dataType="catalog_recently_products">
+                    <object key="synchronize_with_backend" dataType="synchronize_with_backend">
+                        <field key="value">integer</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml
index 1bf7d0b0d988f..23be8408d4a1e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml
@@ -121,4 +121,7 @@
     <operation name="deleteProduct2" dataType="product2" type="delete" auth="adminOauth" url="/V1/products/{sku}" method="DELETE">
         <contentType>application/json</contentType>
     </operation>
+    <operation name="GetProduct2" dataType="product2" type="get" auth="adminOauth" url="/V1/products/{sku}" method="GET">
+        <contentType>application/json</contentType>
+    </operation>
 </operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml
index 68c432a136ac9..c031578e2a208 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml
@@ -16,5 +16,7 @@
         <section name="AdminCategoryBasicFieldSection"/>
         <section name="AdminCategorySEOSection"/>
         <section name="AdminCategoryModalSection"/>
+        <section name="AdminCategoryContentSection"/>
+        <section name="AdminCategoryDisplaySettingsSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryPage.xml
index 45485509f5e3e..54e9194ca450d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryPage.xml
@@ -7,8 +7,8 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="AdminCategoryPage" url="catalog/category/" area="admin" module="Catalog">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCategoryPage" url="catalog/category/" area="admin" module="Magento_Catalog">
         <section name="AdminCategorySidebarActionSection"/>
         <section name="AdminCategorySidebarTreeSection"/>
         <section name="AdminCategoryBasicFieldSection"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminNewWidgetPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminNewWidgetPage.xml
new file mode 100644
index 0000000000000..dd5d5aef08a7c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminNewWidgetPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminNewWidgetPage" url="admin/widget_instance/new/" area="admin" module="Magento_Widget">
+        <section name="AdminNewWidgetSelectProductPopupSection"/>
+        <section name="AdminCatalogProductWidgetSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeEditPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeEditPage.xml
index e7de264dc2b75..04070ba17356d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeEditPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeEditPage.xml
@@ -12,5 +12,7 @@
         <section name="AdminProductAttributeEditSection"/>
         <section name="AdminConfirmationModalSection"/>
         <section name="AdminEditAttributeStorefrontPropertiesSection"/>
+        <section name="AdminMainActionsSection"/>
+        <section name="AdminMessagesSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml
index 8213ec6ab5fbe..685781dabab85 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml
@@ -10,5 +10,8 @@
     <page name="ProductAttributePage" url="catalog/product_attribute/new/" area="admin" module="Magento_Catalog">
         <section name="AttributePropertiesSection"/>
         <section name="StorefrontPropertiesSection"/>
+        <section name="AdvancedAttributePropertiesSection"/>
+        <section name="AdminAttributeOptionsSection"/>
+        <section name="AttributeManageSwatchSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeNewPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeNewPage.xml
new file mode 100644
index 0000000000000..9116e9ae7446f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeNewPage.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminProductAttributeNewPage" url="catalog/product_attribute/new/" area="admin" module="Magento_Catalog">
+        <section name="AttributePropertiesSection"/>
+        <section name="StorefrontPropertiesSection"/>
+        <section name="AdvancedAttributePropertiesSection"/>
+        <section name="AdminAttributeOptionsSection"/>
+        <section name="AttributeManageSwatchSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml
index 8c8ae0ede2eb8..164ec8cb28a22 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
         <section name="AdminProductFormSection"/>
         <section name="AdminProductFormActionSection"/>
@@ -18,5 +18,6 @@
         <section name="AdminProductCustomizableOptionsSection" />
         <section name="AdminAddProductsToOptionPanelSection" />
         <section name="AdminProductFormAdvancedPricingSection"/>
+        <section name="AdminProductCustomizableOptionsImportModalSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductIndexPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductIndexPage.xml
index d77a041baf662..03915ba68b642 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductIndexPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductIndexPage.xml
@@ -12,6 +12,7 @@
         <section name="AdminProductGridActionSection" />
         <section name="AdminProductGridFilterSection" />
         <section name="AdminProductGridSection" />
+        <section name="AdminProductGridTableHeaderSection" />
         <section name="AdminMessagesSection" />
         <section name="AdminProductFiltersSection" />
     </page>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductUpdateAttributesPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductUpdateAttributesPage.xml
new file mode 100644
index 0000000000000..5d74ec979ce14
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductUpdateAttributesPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminProductUpdateAttributesPage" url="catalog/product_action_attribute/edit/" area="admin" module="Magento_Catalog">
+        <section name="AdminUpdateAttributesHeaderSection"/>
+        <section name="AdminUpdateAttributesWebsiteSection"/>
+        <section name="AdminUpdateAttributesAttributesSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontCategoryPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontCategoryPage.xml
index b32c3ded033f9..0ada59c623451 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontCategoryPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontCategoryPage.xml
@@ -11,5 +11,6 @@
     <page name="StorefrontCategoryPage" url="/{{var1}}.html" area="storefront" module="Magento_Catalog" parameterized="true">
         <section name="StorefrontCategoryMainSection"/>
         <section name="WYSIWYGToolbarSection"/>
+        <section name="StorefrontCategoryPagerSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductPage.xml
index 9fcbcc199176b..fdfee62f6dc0b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductPage.xml
@@ -7,11 +7,12 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="StorefrontProductPage" url="/{{var1}}.html" area="storefront" module="Magento_Catalog" parameterized="true">
         <section name="StorefrontProductPageSection"/>
         <section name="StorefrontProductAdditionalInformationSection"/>
         <section name="StorefrontProductMediaSection"/>
         <section name="StorefrontProductInfoMainSection"/>
+        <section name="StorefrontProductRelatedProductsSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCatalogProductWidgetSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCatalogProductWidgetSection.xml
new file mode 100644
index 0000000000000..5ec0aec009508
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCatalogProductWidgetSection.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="AdminCatalogProductWidgetSection">
+        <element name="productsToDisplay" type="input" selector="input[name='parameters[page_size]']"/>
+        <element name="productAttributesToShow" type="multiselect" selector="select[name='parameters[show_attributes][]']"/>
+        <element name="productButtonsToShow" type="multiselect" selector="select[name='parameters[show_buttons][]']"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml
index 555b3c2a6e00e..a32ed228c8570 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCategoryBasicFieldSection">
         <element name="IncludeInMenu" type="checkbox" selector="input[name='include_in_menu']"/>
         <element name="includeInMenuLabel" type="text" selector="input[name='include_in_menu']+label"/>
@@ -17,6 +17,9 @@
         <element name="enableUseDefault" type="checkbox" selector="input[name='use_default[is_active]']"/>
         <element name="CategoryNameInput" type="input" selector="input[name='name']"/>
         <element name="categoryNameUseDefault" type="checkbox" selector="input[name='use_default[name]']"/>
+        <element name="requiredFieldIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=name]&gt;.admin__field-label span'), ':after').getPropertyValue('content');"/>
+        <element name="requiredFieldIndicatorColor" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=name]&gt;.admin__field-label span'), ':after').getPropertyValue('color');"/>
+        <element name="panelFieldControl" type="input" selector='//aside//div[@data-index="{{arg1}}"]/descendant::*[@name="{{arg2}}"]' parameterized="true"/>
     </section>
     <section name="CatalogWYSIWYGSection">
         <element name="ShowHideBtn" type="button" selector="#togglecategory_form_description"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml
new file mode 100644
index 0000000000000..faa320cd114de
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.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="AdminCategoryContentSection">
+        <element name="sectionHeader" type="button" selector="div[data-index='content']" timeout="30"/>
+        <element name="addCMSBlock" type="select" selector="[name='landing_page']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryDisplaySettingsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryDisplaySettingsSection.xml
new file mode 100644
index 0000000000000..d545feca3e711
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryDisplaySettingsSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCategoryDisplaySettingsSection">
+        <element name="settingsHeader" type="button" selector="[data-index='display_settings'] strong.admin__collapsible-title" timeout="30"/>
+        <element name="displayMode" type="button" selector="[name='display_mode']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml
index bf6f3c692b6c3..ef339668b2c98 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="tabProductClosed" type="block" selector="div[data-index='assign_products'] [data-state-collapsible='closed']"/>
+        <element name="addProducts" type="button" selector="#catalog_category_add_product_tabs" 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 e241370220921..8f7425b5a19e0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
@@ -11,9 +11,36 @@
     <section name="AttributePropertiesSection">
         <element name="AdvancedProperties" type="button" selector="#advanced_fieldset-wrapper"/>
         <element name="Save" type="button" selector="#save"/>
+        <element name="defaultLabel" type="input" selector="#attribute_label"/>
+        <element name="inputType" type="select" selector="#frontend_input"/>
+        <element name="deleteAttribute" type="button" selector="#delete" timeout="30"/>
+    </section>
+    <section name="StorefrontPropertiesSection">
+        <element name="pageTitle" type="text" selector="//span[text()='Storefront Properties']" />
+        <element name="storeFrontPropertiesTab" selector="#product_attribute_tabs_front" type="button"/>
+        <element name="enableWYSIWYG" type="select" selector="#enabled"/>
+        <element name="useForPromoRuleConditions" type="select" selector="#is_used_for_promo_rules"/>
+    </section>
+    <section name="AdvancedAttributePropertiesSection">
+        <element name="advancedAttributePropertiesSectionToggle"
+                 type="button" selector="#advanced_fieldset-wrapper"/>
+        <element name="attributeCode" type="text" selector="#attribute_code"/>
+        <element name="scope" type="select" selector="#is_global"/>
+        <element name="addToColumnOptions" type="select" selector="#is_used_in_grid"/>
+        <element name="useInFilterOptions" type="select" selector="#is_filterable_in_grid"/>
+        <element name="addSwatch" type="button" selector="#add_new_swatch_text_option_button"/>
+    </section>
+    <section name="AdminAttributeOptionsSection">
+        <element name="addOption" type="button" selector="#add_new_option_button"/>
+        <element name="nthOptionAdminLabel" type="input"
+                 selector="(//*[@id='manage-options-panel']//tr[{{var}}]//input[contains(@name, 'option[value]')])[1]" parameterized="true"/>
     </section>
     <section name="StorefrontPropertiesSection">
         <element name="storefrontPropertiesTab" selector="#product_attribute_tabs_front" type="button" timeout="30"/>
         <element name="useForPromoRuleConditions" type="select" selector="#is_used_for_promo_rules"/>
     </section>
+    <section name="AttributeManageSwatchSection">
+        <element name="swatchField" type="input" selector="input[name='swatchtext[value][option_{{option_index}}][{{index}}]'][placeholder='Swatch']" parameterized="true"/>
+        <element name="descriptionField" type="input" selector="input[name='optiontext[value][option_{{option_index}}][{{index}}]'][placeholder='Description']" parameterized="true"/>
+    </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminNewWidgetSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminNewWidgetSection.xml
new file mode 100644
index 0000000000000..5329ad48c8f43
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminNewWidgetSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminNewWidgetSection">
+        <element name="selectProduct" type="button" selector=".btn-chooser" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminNewWidgetSelectProductPopupSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminNewWidgetSelectProductPopupSection.xml
new file mode 100644
index 0000000000000..0da67849f85c6
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminNewWidgetSelectProductPopupSection.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="AdminNewWidgetSelectProductPopupSection">
+        <element name="filterBySku" type="input" selector=".data-grid-filters input[name='chooser_sku']"/>
+        <element name="firstRow" type="select" selector=".even>td" timeout="20"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml
index 020ae95b11c2b..f27c27fbd20f4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml
@@ -12,6 +12,7 @@
         <element name="attributeCode" type="text" selector="//td[contains(text(),'{{var1}}')]" parameterized="true"/>
         <element name="createNewAttributeBtn" type="button" selector="#add"/>
         <element name="gridFilterFrontEndLabel" type="input" selector="#attributeGrid_filter_frontend_label"/>
+        <element name="gridFilterAttributeCode" type="input" selector="#attributeGrid_filter_attribute_code"/>
         <element name="search" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
         <element name="resetFilter" type="button" selector="button[data-action='grid-filter-reset']" timeout="30"/>
         <element name="firstRow" type="button" selector="//*[@id='attributeGrid_table']/tbody/tr[1]" timeout="30"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsImportModalSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsImportModalSection.xml
new file mode 100644
index 0000000000000..0b1b5c966422a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsImportModalSection.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="AdminProductCustomizableOptionsImportModalSection">
+        <element name="selectProductTitle" type="text" selector="//aside[contains(@class, '_show')]//h1[normalize-space(text())='Select Product']"/>
+        <element name="nameFilter" type="input" selector="//aside[contains(@class, '_show')]//input[@name='name']"/>
+        <element name="importButton" type="button" selector="//aside[contains(@class, '_show')]//button[contains(@class, 'action-primary') and normalize-space(.)='Import']" 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 fec0a9f672990..ca4e17fe92d6b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
@@ -7,10 +7,10 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminProductCustomizableOptionsSection">
         <element name="checkIfCustomizableOptionsTabOpen" type="text" selector="//span[text()='Customizable Options']/parent::strong/parent::*[@data-state-collapsible='closed']"/>
-        <element name="customizableOptions" type="text" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Customizable Options']"/>
+        <element name="customizableOptions" type="text" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Customizable Options']" timeout="30"/>
         <element name="useDefaultOptionTitle" type="text" selector="[data-index='options'] tr.data-row [data-index='title'] [name^='options_use_default']"/>
         <element name="useDefaultOptionValueTitleByIndex" type="text" selector="[data-index='options'] [data-index='values'] tr[data-repeat-index='{{var1}}'] [name^='options_use_default']" parameterized="true"/>
         <element name="addOptionBtn" type="button" selector="button[data-index='button_add']"/>
@@ -26,8 +26,13 @@
         <element name="lastOptionTypeParent" type="block" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@class, 'admin__action-multiselect-text')]" />
         <!-- var 1 represents the option type that you want to select, i.e "radio buttons" -->
         <element name="optionType" type="block" selector="//*[@data-index='custom_options']//label[text()='{{var1}}'][ancestor::*[contains(@class, '_active')]]" parameterized="true" />
-        <element name="optionPrice" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][0][price]']"/>
-        <element name="optionPriceType" type="select" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][0][price_type]']"/>
-        <element name="optionFileExtensions" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][0][file_extension]']"/>
+        <element name="optionPrice" type="input" selector="[data-index='custom_options'] [data-index='options'] tbody tr:nth-last-of-type(1) input[name*='price']"/>
+        <element name="optionPriceType" type="select" selector="[data-index='custom_options'] [data-index='options'] tbody tr:nth-last-of-type(1) select[name*='price_type']"/>
+        <element name="optionFileExtensions" type="input" selector="[data-index='custom_options'] [data-index='options'] tbody tr:nth-last-of-type(1) input[name*='file_extension']"/>
+        <element name="optionSku" type="input" selector="[data-index='custom_options'] [data-index='options'] tbody tr:nth-last-of-type(1) input[name*='sku']"/>
+        <element name="optionTitleInputByIndex" type="input" selector="input[name='product[options][{{index}}][title]']" parameterized="true"/>
+        <element name="importOptions" type="button" selector="[data-index='custom_options'] [data-index='button_import']" timeout="30"/>
+        <element name="optionPriceByIndex" type="input" selector="input[name='product[options][{{index}}][price]']" parameterized="true"/>
+        <element name="optionSkuByIndex" type="input" selector="input[name='product[options][{{index}}][sku]']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFiltersSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFiltersSection.xml
index 6844006e4e399..8e13f9c38f805 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFiltersSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFiltersSection.xml
@@ -7,12 +7,13 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminProductFiltersSection">
         <element name="FiltersButton" type="button" selector="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button"/>
         <element name="clearFiltersButton" type="button" selector="//div[@class='admin__data-grid-header']//button[@class='action-tertiary action-clear']" timeout="10"/>
         <element name="NameInput" type="input" selector="input[name=name]"/>
         <element name="SkuInput" type="input" selector="input[name=sku]"/>
         <element name="Apply" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
+        <element name="allCheckbox" type="checkbox" selector="div[data-role='grid-wrapper'] label[data-bind='attr: {for: ko.uid}']" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
index 0f1fe8abeb3b5..9714c1f6eb483 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
@@ -18,7 +18,9 @@
         <element name="productTierPriceValueTypeSelect" type="select" selector="[name='product[tier_price][{{var1}}][value_type]']" parameterized="true"/>
         <element name="productTierPriceFixedPriceInput" type="input" selector="[name='product[tier_price][{{var1}}][price]']" parameterized="true"/>
         <element name="productTierPricePercentageValuePriceInput" type="input" selector="[name='product[tier_price][{{var1}}][percentage_value]']" parameterized="true"/>
+        <element name="productTierPricePercentageError" type="text" selector="div[data-index='percentage_value'] label.admin__field-error" />
         <element name="specialPrice" type="input" selector="input[name='product[special_price]']"/>
         <element name="doneButton" type="button" selector=".product_form_product_form_advanced_pricing_modal button.action-primary" timeout="5"/>
+        <element name="useDefaultPrice" type="checkbox" selector="input[name='use_default[special_price]']"/>
     </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 6e86420ff9de5..b458b05da43c6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminProductFormSection">
         <element name="attributeSet" type="select" selector="div[data-index='attribute_set_id'] .admin__field-control"/>
         <element name="attributeSetFilter" type="input" selector="div[data-index='attribute_set_id'] .admin__field-control input"/>
@@ -21,6 +21,7 @@
         <element name="productStatusUseDefault" type="checkbox" selector="input[name='use_default[status]']"/>
         <element name="productPrice" type="input" selector=".admin__field[data-index=price] input"/>
         <element name="advancedPricingLink" type="button" selector="button[data-index='advanced_pricing_button']"/>
+        <element name="productTaxClass" type="select" selector="select[name='product[tax_class_id]']"/>
         <element name="productTaxClassUseDefault" type="checkbox" selector="input[name='use_default[tax_class_id]']"/>
         <element name="categoriesDropdown" type="multiselect" selector="div[data-index='category_ids']"/>
         <element name="productQuantity" type="input" selector=".admin__field[data-index=qty] input"/>
@@ -37,6 +38,18 @@
         <element name="addAttributeBtn" type="button" selector="#addAttribute"/>
         <element name="attributeSetFilterResultByName" type="text" selector="//label/span[text() = '{{var}}']" timeout="30" parameterized="true"/>
         <element name="attributeSetDropDown" type="select" selector="div[data-index='attribute_set_id'] .action-select.admin__action-multiselect"/>
+        <element name="requiredNameIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=name]&gt;.admin__field-label span'), ':after').getPropertyValue('content');"/>
+        <element name="requiredSkuIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=sku]&gt;.admin__field-label span'), ':after').getPropertyValue('content');"/>
+        <element name="customAttributeDropdownField" type="select" selector="select[name='product[{{attributeCode}}]']" parameterized="true"/>
+        <element name="customAttributeInputField" type="select" selector="input[name='product[{{attributeCode}}]']" parameterized="true"/>
+        <element name="customAttributeSelectOptions" type="select" selector="select[name='product[{{attributeCode}}]'] option" parameterized="true"/>
+        <element name="currentCategory" type="text" selector=".admin__action-multiselect-crumb > span"/>
+        <element name="searchCategory" type="input" selector=".action-menu._active input.admin__action-multiselect-search"/>
+        <element name="selectCategory" type="input" selector="//label[contains(., '{{categoryName}}')]" parameterized="true"/>
+        <element name="done" type="button" selector=".admin__action-multiselect-actions-wrap button" timeout="30"/>
+        <element name="save" type="button" selector="#save-button"/>
+        <element name="unselectCategories" type="button" selector="//span[@class='admin__action-multiselect-crumb']/span[contains(.,'{{category}}')]/../button" parameterized="true" timeout="30"/>
+        <element name="enableProductLabel" type="checkbox" selector=".admin__actions-switch > input[name='product[status]']+label"/>
     </section>
     <section name="ProductInWebsitesSection">
         <element name="sectionHeader" type="button" selector="div[data-index='websites']" timeout="30"/>
@@ -177,6 +190,7 @@
         <element name="applySinglePriceToAllSkus" type="radio" selector=".admin__field-label[for='apply-single-price-radio']"/>
         <element name="singlePrice" type="input" selector="#apply-single-price-input"/>
         <element name="attributeByName" type="input" selector="//label[text()='{{var}}']/preceding-sibling::input" parameterized="true"/>
+        <element name="checkboxByName" type="input" selector="//div[text()='{{var}}']//ancestor::tr//input" parameterized="true"/>
     </section>
     <section name="AdminNewAttributePanel">
         <element name="saveAttribute" type="button" selector="#save" timeout="30"/>
@@ -185,5 +199,6 @@
     </section>
     <section name="AdminChooseAffectedAttributeSetPopup">
         <element name="confirm" type="button" selector="button[data-index='confirm_button']" timeout="30"/>
+        <element name="closePopUp" type="button" selector=".modal-popup._show [data-role='closeBtn']" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
index 6ffecc341123d..e6d9cae3e9442 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
@@ -7,8 +7,9 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminProductGridSection">
+        <element name="productRowBySku" type="block" selector="//div[@id='container']//tr//td[count(../../..//th[./*[.='SKU']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]" parameterized="true" />
         <element name="loadingMask" type="text" selector=".admin__data-grid-loading-mask[data-component*='product_listing']"/>
         <element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
         <element name="productGridElement1" type="input" selector="#addselector" />
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridTableHeaderSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridTableHeaderSection.xml
new file mode 100644
index 0000000000000..7341a6ded7a09
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridTableHeaderSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductGridTableHeaderSection">
+        <element name="id" type="button" selector=".//*[@class='sticky-header']/following-sibling::*//th[@class='data-grid-th _sortable _draggable _{{order}}']/span[text()='ID']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml
index 1d49d05363612..90c3856933be9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml
@@ -11,5 +11,6 @@
     <section name="AdminProductSEOSection">
         <element name="sectionHeader" type="button" selector="div[data-index='search-engine-optimization']" timeout="30"/>
         <element name="urlKeyInput" type="input" selector="input[name='product[url_key]']"/>
+        <element name="useDefaultUrl" type="checkbox" selector="input[name='use_default[url_key]']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection.xml
new file mode 100644
index 0000000000000..681d3bd91e817
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection.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="AdminUpdateAttributesHeaderSection">
+        <element name="saveButton" type="button" selector="button[data-ui-id='page-actions-toolbar-save-button']" timeout="30"/>
+    </section>
+    <section name="AdminUpdateAttributesWebsiteSection">
+        <element name="website" type="button" selector="#attributes_update_tabs_websites"/>
+        <element name="addProductToWebsite" type="checkbox" selector="#add-products-to-website-content .website-checkbox"/>
+    </section>
+    <section name="AdminUpdateAttributesAttributesSection">
+        <element name="formByStoreId" type="block" selector="//form[contains(@action,'store/{{store_id}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/CategoryDisplaySettingsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/CategoryDisplaySettingsSection.xml
new file mode 100644
index 0000000000000..ea47c41816239
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/CategoryDisplaySettingsSection.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="CategoryDisplaySettingsSection">
+        <element name="DisplaySettingTab" type="button" selector="//strong[@class='admin__collapsible-title']//span[text()='Display Settings']"/>
+        <element name="anchor" type="checkbox" selector="input[name='is_anchor']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
index 1f1a4ce9133e7..42b03cd14701b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
@@ -22,5 +22,8 @@
         <element name="categoryPageProductImagePlaceholderSmall" type="text" selector=".products-grid img[src*='placeholder/small_image.jpg']"/>
         <element name="categoryPageProductImage" type="text" selector=".products-grid img[src*='/{{var1}}']" parameterized="true"/>
         <element name="categoryPageProductName" type="text" selector=".products.list.items.product-items li:nth-of-type({{line}}) .product-item-link" timeout="30" parameterized="true"/>
+        <element name="categoryEmptyMessage" type="text" selector=".column.main .message.info.empty"/>
+        <element name="productName" type="text" selector=".product-item-name"/>
+        <element name="productLinkByHref" type="text" selector="a.product-item-link[href$='{{var1}}.html']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryPagerSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryPagerSection.xml
new file mode 100644
index 0000000000000..64470ec1f40e4
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryPagerSection.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="StorefrontCategoryPagerSection">
+        <element name="perPage" type="select" selector="//*[@id='authenticationPopup']/following-sibling::div[3]//*[@id='limiter']"/>
+        <element name="perPageSelected" type="select" selector="//*[@id='authenticationPopup']/following-sibling::div[3]//*[@id='limiter']/option[@selected='selected']"/>
+        <element name="sortedBy" type="select" selector="//*[@id='authenticationPopup']/following-sibling::div[1]//*[@id='sorter']"/>
+        <element name="modeGridIsActive" type="text" selector="//*[@id='authenticationPopup']/following-sibling::div[1]//*[@class='modes']/strong[@class='modes-mode active mode-grid']/span"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
index ccb5ae60db59b..166c2b3f7311a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
@@ -24,5 +24,7 @@
         <element name="productPriceOld" type="text" selector="//span[@data-price-type='oldPrice']//span[@class='price'][contains(., '{{var1}}')]" parameterized="true"/>
         <element name="productPriceLabel" type="text" selector="//span[@class='price-label'][contains(text(),'{{var1}}')]" parameterized="true"/>
         <element name="productPriceLinkAfterLabel" type="text" selector="//span[@class='price-label'][contains(text(),'{{var1}}')]/following::span[contains(text(), '{{var2}}')]" parameterized="true"/>
+        <element name="productNameInGrid" type="text" selector="//div[contains(@class,'products-grid')]//strong[contains(@class,'product-item-name')]//a[normalize-space(text())='{{productName}}']" parameterized="true"/>
+        <element name="productStockUnavailableByName" type="text" selector="//a[contains(@class, 'product-item-link') and normalize-space(text())='{{productName}}']/ancestor::div[contains(@class, 'product-item-details')]//span[contains(text(),'Out of stock')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
index f1456ac8ee387..1b97d0c0795a4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
@@ -7,10 +7,11 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontMessagesSection">
         <element name="test" type="input" selector=".test"/>
         <element name="success" type="text" selector="div.message-success.success.message"/>
         <element name="error" type="text" selector="div.message-error.error.message"/>
+        <element name="notice" type="text" selector="div.message-notice"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
index bf411a9cc48b2..7a8fa7bfc3c6a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
@@ -12,5 +12,6 @@
         <element name="topCategory" type="button" selector="//a[contains(@class,'level-top')]/span[contains(text(),'{{var1}}')]" parameterized="true"/>
         <element name="subCategory" type="button" selector="//ul[contains(@class,'submenu')]//span[contains(text(),'{{var1}}')]" parameterized="true"/>
         <element name="breadcrumbs" type="textarea" selector=".items"/>
+        <element name="categoryBreadcrumbs" type="textarea" selector=".breadcrumbs li"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProducRelatedProductsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProducRelatedProductsSection.xml
new file mode 100644
index 0000000000000..a7b72bbaa78aa
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProducRelatedProductsSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductRelatedProductsSection">
+        <element name="relatedProductName" type="button" selector="//*[@class='block related']//a[contains(text(), '{{productName}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index 65fe9b06be66c..ae0cb3f970108 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -7,12 +7,14 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontProductInfoMainSection">
         <element name="stock" type="input" selector=".stock.available"/>
         <element name="productName" type="text" selector=".base"/>
         <element name="productSku" type="text" selector=".product.attribute.sku>.value"/>
         <element name="productPrice" type="text" selector=".price"/>
+        <element name="specialPrice" type="text" selector=".special-price"/>
+        <element name="specialPriceValue" type="text" selector=".special-price .price"/>
         <element name="qty" type="input" selector="#qty"/>
         <element name="productStockStatus" type="text" selector=".stock[title=Availability]>span"/>
         <element name="productDescription" type="text" selector="#description .value"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
index c960f8432e64d..61eabb6cb34fd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
@@ -7,10 +7,10 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontProductPageSection">
-        <element name="QtyInput" type="button" selector="input.input-text.qty"/>
-        <element name="addToCartBtn" type="button" selector="button.action.tocart.primary"/>
+        <element name="qtyInput" type="button" selector="input.input-text.qty"/>
+        <element name="addToCartBtn" type="button" selector="button.action.tocart.primary" timeout="30"/>
         <element name="successMsg" type="button" selector="div.message-success"/>
         <element name="addToWishlist" type="button" selector="a.action.towishlist" timeout="30"/>
         <element name="addToCartButtonTitleIsAdding" type="text" selector="//button/span[text()='Adding...']"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontWidgetsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontWidgetsSection.xml
new file mode 100644
index 0000000000000..87aab45bd8cb7
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontWidgetsSection.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="StorefrontWidgetsSection">
+        <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"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSetTest.xml
new file mode 100644
index 0000000000000..01967fa1e0851
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeSetTest.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="AdminChangeProductAttributeSetTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Update product"/>
+            <title value="Attributes from the selected attribute set should be shown"/>
+            <description value="Attributes from the selected attribute set should be shown"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-15414"/>
+            <useCaseId value="MAGETWO-98380"/>
+            <group value="catalog"/>
+        </annotations>
+        <before>
+            <!--Create category product, attribute, attribute set-->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ProductAttributeText" stepKey="createProductAttribute"/>
+            <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <!--Assign attribute to attribute set-->
+            <amOnPage url="{{AdminProductAttributeSetEditPage.url($$createAttributeSet.attribute_set_id$$)}}" stepKey="openAttributeSetEdit"/>
+            <actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToGroup">
+                <argument name="group" value="Product Details"/>
+                <argument name="attribute" value="$$createProductAttribute.attribute_code$$"/>
+            </actionGroup>
+            <actionGroup ref="SaveAttributeSet" stepKey="saveAttributeSet"/>
+        </before>
+        <after>
+            <!--Delete created entities-->
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
+            <deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
+
+            <actionGroup ref="logout" stepKey="logoutAdminUserAfterTest"/>
+        </after>
+        <!--Open created product-->
+        <amOnPage url="{{AdminProductEditPage.url($$createSimpleProduct.id$$)}}" stepKey="openProductEditPage"/>
+        <waitForPageLoad time="30" stepKey="waitForProductPageIsLoaded"/>
+        <dontSeeElement selector="{{AdminProductFormSection.customAttributeInputField($$createProductAttribute.attribute_code$$)}}" stepKey="dontSeeCreatedAttribute"/>
+        <!--Change product attribute set-->
+        <actionGroup ref="AdminChangeProductAttributeSet" stepKey="changeProductAttributeSet">
+            <argument name="attributeSet" value="$$createAttributeSet$$"/>
+        </actionGroup>
+        <!--Check new attribute is visible on product edit page-->
+        <seeElement selector="{{AdminProductFormSection.customAttributeInputField($$createProductAttribute.attribute_code$$)}}" stepKey="seeAttributeInForm"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckingAttributeValueOnProductEditPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckingAttributeValueOnProductEditPageTest.xml
new file mode 100644
index 0000000000000..1ba30ae80818a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckingAttributeValueOnProductEditPageTest.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="AdminCheckingAttributeValueOnProductEditPageTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create/configure Dropdown product attribute"/>
+            <title value="Checking attribute values on a product edit page"/>
+            <description value="Checking attribute values on a product edit page"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-15746"/>
+            <useCaseId value="MAGETWO-74037"/>
+            <group value="catalog"/>
+        </annotations>
+        <before>
+            <!--Create Dropdown product attribute-->
+            <createData entity="productAttributeWithDropdownTwoOptions" stepKey="createDropdownProductAttribute"/>
+            <!--Add options to attribute-->
+            <createData entity="ProductAttributeAdminOption1" stepKey="createFirstOption">
+                <requiredEntity createDataKey="createDropdownProductAttribute"/>
+            </createData>
+            <createData entity="ProductAttributeAdminOption2" stepKey="createSecondOption">
+                <requiredEntity createDataKey="createDropdownProductAttribute"/>
+            </createData>
+            <!--Add attribute to Default Attribute Set-->
+            <createData entity="AddToDefaultSet" stepKey="attributeSet">
+                <requiredEntity createDataKey="createDropdownProductAttribute"/>
+            </createData>
+            <!--Create category-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <!--Create Simple product-->
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!--Login as admin-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!--Delete product attribute-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createDropdownProductAttribute" stepKey="deleteDropdownProductAttribute"/>
+            <!--Logout-->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Go to Product edit page-->
+        <amOnPage url="{{AdminProductEditPage.url($$createSimpleProduct.id$$)}}" stepKey="goToProductEditPage"/>
+        <scrollToTopOfPage stepKey="scrollToShowAttribute"/>
+
+        <!-- Grab attribute dropdown options -->
+        <grabMultiple selector="{{AdminProductFormSection.customAttributeSelectOptions($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" stepKey="clickOnAttributeDropdown" />
+
+        <!--Check attribute dropdown options-->
+        <assertContains stepKey="seeFirstAdminOption">
+            <actualResult type="variable">clickOnAttributeDropdown</actualResult>
+            <expectedResult type="string">admin_option_1</expectedResult>
+        </assertContains>
+        <assertContains stepKey="seeSecondAdminOption">
+            <actualResult type="variable">clickOnAttributeDropdown</actualResult>
+            <expectedResult type="string">admin_option_2</expectedResult>
+        </assertContains>
+
+        <assertNotContains stepKey="dontSeeFirstStoreOption">
+            <actualResult type="variable">clickOnAttributeDropdown</actualResult>
+            <expectedResult type="string">option1</expectedResult>
+        </assertNotContains>
+        <assertNotContains stepKey="dontSeeSecondStoreOption">
+            <actualResult type="variable">clickOnAttributeDropdown</actualResult>
+            <expectedResult type="string">option2</expectedResult>
+        </assertNotContains>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDropdownAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDropdownAttributeTest.xml
new file mode 100644
index 0000000000000..9bc17d19c4285
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDropdownAttributeTest.xml
@@ -0,0 +1,71 @@
+<?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="AdminCreateProductDropdownAttributeTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create/configure Dropdown product attribute"/>
+            <title value="Admin should be able to create dropdown product attribute"/>
+            <description value="Admin should be able to create dropdown product attribute"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-95868"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <!-- Remove attribute -->
+            <actionGroup ref="deleteProductAttribute" stepKey="deleteAttribute">
+                <argument name="ProductAttribute" value="productAttributeWithDropdownTwoOptions"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <amOnPage url="{{ProductAttributePage.url}}" stepKey="navigateToNewProductAttributePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+
+        <!-- Set attribute properties -->
+        <fillField selector="{{AttributePropertiesSection.defaultLabel}}"
+                   userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
+        <selectOption selector="{{AttributePropertiesSection.inputType}}"
+                      userInput="{{productAttributeWithDropdownTwoOptions.frontend_input}}" stepKey="fillInputType"/>
+
+        <!-- Set advanced attribute properties -->
+        <click selector="{{AdvancedAttributePropertiesSection.advancedAttributePropertiesSectionToggle}}"
+               stepKey="showAdvancedAttributePropertiesSection"/>
+        <waitForElementVisible selector="{{AdvancedAttributePropertiesSection.attributeCode}}"
+                               stepKey="waitForSlideOut"/>
+        <fillField selector="{{AdvancedAttributePropertiesSection.attributeCode}}"
+                   userInput="{{productAttributeWithDropdownTwoOptions.attribute_code}}"
+                   stepKey="fillAttributeCode"/>
+
+        <!-- Add new attribute options -->
+        <click selector="{{AdminAttributeOptionsSection.addOption}}" stepKey="clickAddOption1"/>
+        <fillField selector="{{AdminAttributeOptionsSection.nthOptionAdminLabel('1')}}"
+                   userInput="Fish and Chips" stepKey="fillAdminValue1"/>
+
+        <click selector="{{AdminAttributeOptionsSection.addOption}}" stepKey="clickAddOption2"/>
+        <fillField selector="{{AdminAttributeOptionsSection.nthOptionAdminLabel('2')}}"
+                   userInput="Fish &amp; Chips" stepKey="fillAdminValue2"/>
+
+        <!-- Save the new product attribute -->
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave1"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}"
+                               stepKey="waitForSuccessMessage"/>
+
+        <actionGroup ref="navigateToCreatedProductAttribute" stepKey="navigateToAttribute">
+            <argument name="productAttribute" value="productAttributeWithDropdownTwoOptions"/>
+        </actionGroup>
+        <!-- Check attribute data -->
+        <grabValueFrom selector="{{AdminAttributeOptionsSection.nthOptionAdminLabel('2')}}"
+                       stepKey="secondOptionAdminLabel"/>
+        <assertEquals actual="$secondOptionAdminLabel" expected="'Fish &amp; Chips'"
+                      stepKey="assertSecondOption"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml
index 0fb4f2fd784e3..35b663da4f5ad 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml
@@ -22,12 +22,10 @@
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin2"/>
             <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnPageAdminSystemStore"/>
             <waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
-            <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
-            <waitForPageLoad  time="10" stepKey="waitForPageAdminStoresGridLoadAfterResetButton"/>
-            <fillField selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="Main Website Store"  stepKey="fillFieldOnWebsiteStore"/>
-            <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickOnSearchButton"/>
-            <waitForPageLoad stepKey="waitForPageAdminStoresGridLoadAfterSearchButton"/>
-            <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickOnstoreGrpNameInFirstRow"/>
+            <actionGroup ref="filterStoresGridByStore" stepKey="enterStoreGroup1Name">
+                <argument name="store" value="Main Website Store"/>
+            </actionGroup>
+            <click selector="{{AdminStoresGridSection.storeInFirstRow}}" stepKey="clickOnstoreInFirstRow"/>
             <waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad1" />
             <selectOption userInput="Default Category" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectOptionDefaultCategory"/>
             <click selector="{{AdminStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
@@ -59,12 +57,11 @@
         <!--Assign new created root category to store-->
         <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnPageAdminSystemStore"/>
         <waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
-        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
-        <waitForPageLoad  time="10" stepKey="waitForPageAdminStoresGridLoadAfterResetButton"/>
-        <fillField selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="Main Website Store"  stepKey="fillFieldOnWebsiteStore"/>
-        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickOnSearchButton"/>
+        <actionGroup ref="filterStoresGridByStore" stepKey="enterStoreGroup1Name">
+            <argument name="store" value="Main Website Store"/>
+        </actionGroup>
         <waitForPageLoad stepKey="waitForPageAdminStoresGridLoadAfterSearchButton"/>
-        <click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickOnstoreGrpNameInFirstRow"/>
+        <click selector="{{AdminStoresGridSection.storeInFirstRow}}" stepKey="clickOnstoreInFirstRow"/>
         <waitForPageLoad stepKey="waitForPageAdminStoresGroupEditLoad" />
         <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectOptionCreatedNewRootCategory"/>
         <click selector="{{AdminStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
@@ -80,4 +77,4 @@
             <argument name="categoryEntity" value="SubCategoryWithParent"/>
         </actionGroup>
     </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterProductGridByNameByStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterProductGridByNameByStoreViewTest.xml
new file mode 100644
index 0000000000000..539d87b4a1064
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterProductGridByNameByStoreViewTest.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminFilterProductGridByNameByStoreViewTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Filter products"/>
+            <title value="Product grid filtering by store view level attribute"/>
+            <description value="Verify that products grid can be filtered on all store view level by attribute"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-98755"/>
+            <useCaseId value="MAGETWO-97405"/>
+            <group value="catalog"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleProduct3" stepKey="createSimpleProduct"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{AdminProductEditPage.url($$createSimpleProduct.id$$)}}" stepKey="goToEditPage"/>
+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchToDefaultStoreView">
+            <argument name="scopeName" value="_defaultStore.name"/>
+        </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
+        <click selector="{{AdminProductFormSection.productNameUseDefault}}" stepKey="uncheckUseDefault"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="fillNewName"/>
+        <actionGroup ref="saveProductForm" stepKey="saveSimpleProduct"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <actionGroup ref="filterProductGridByName" stepKey="filterGridByName">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <see selector="{{AdminProductGridSection.firstRow}}" userInput="{{SimpleProduct3.name}}" stepKey="seeProductNameInGrid"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
index ba0eb20ce7733..96403d5dc887a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminFilteringCategoryProductsUsingScopeSelectorTest">
         <annotations>
             <features value="Catalog"/>
@@ -19,19 +19,19 @@
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <!--Create website, Sore adn Store View-->
-            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="adminCreateWebsite">
-                <argument name="newWebsiteName" value="secondWebsite"/>
-                <argument name="websiteCode" value="second_website"/>
+            <!--Create website, Sore and Store View-->
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createSecondWebsite">
+                <argument name="newWebsiteName" value="{{SecondWebsite.name}}"/>
+                <argument name="websiteCode" value="{{SecondWebsite.code}}"/>
             </actionGroup>
-            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="adminCreateStore">
-                <argument name="website" value="secondWebsite"/>
-                <argument name="storeGroupName" value="Second Store"/>
-                <argument name="storeGroupCode" value="second_store"/>
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createSecondStoreGroup">
+                <argument name="website" value="{{SecondWebsite.name}}"/>
+                <argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
+                <argument name="storeGroupCode" value="{{SecondStoreGroupUnique.code}}"/>
             </actionGroup>
-            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="adminCreateStoreView">
-                <argument name="storeGroup" value="secondStoreGroup"/>
-                <argument name="customStore" value="secondStore"/>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createSecondStoreView">
+                <argument name="storeGroup" value="SecondStoreGroupUnique"/>
+                <argument name="customStore" value="SecondStoreUnique"/>
             </actionGroup>
 
             <!--Create Simple Product and Category -->
@@ -74,7 +74,7 @@
             <waitForPageLoad time="30" stepKey="waitForProductEditOpen1"/>
 
             <actionGroup ref="SelectProductInWebsitesActionGroup" stepKey="selectProductInWebsites">
-                <argument name="website" value="secondWebsite"/>
+                <argument name="website" value="{{SecondWebsite.name}}"/>
             </actionGroup>
             <uncheckOption selector="{{ProductInWebsitesSection.website('Main Website')}}" stepKey="uncheckWebsite1"/>
             <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct1"/>
@@ -89,22 +89,26 @@
             <waitForPageLoad time="30" stepKey="waitForProductEditOpen2"/>
 
             <actionGroup ref="SelectProductInWebsitesActionGroup" stepKey="selectProductInWebsites1">
-                <argument name="website" value="secondWebsite"/>
+                <argument name="website" value="{{SecondWebsite.name}}"/>
             </actionGroup>
             <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct2"/>
             <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."
                  stepKey="seeSuccessMessage2"/>
         </before>
         <after>
-            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
-                <argument name="websiteName" value="secondWebsite"/>
-            </actionGroup>
-            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductFilters"/>
             <deleteData createDataKey="createProduct0" stepKey="deleteProduct"/>
             <deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
             <deleteData createDataKey="createProduct2" stepKey="deleteProduct2"/>
             <deleteData createDataKey="createProduct12" stepKey="deleteProduct3"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <!--Delete website-->
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
+                <argument name="websiteName" value="{{SecondWebsite.name}}"/>
+            </actionGroup>
+            <!--Clear products filter-->
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductsFilters"/>
+
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!-- Step 1-2: Open Category page and Set scope selector to All Store Views-->
@@ -156,7 +160,7 @@
         <click selector="{{AdminCategoryMainActionsSection.categoryStoreViewDropdownToggle}}"
                stepKey="clickStoresList1"/>
         <waitForPageLoad stepKey="waitForCategoryPageLoad3"/>
-        <click selector="{{AdminCategoryMainActionsSection.categoryStoreViewOption(secondStore.name)}}"
+        <click selector="{{AdminCategoryMainActionsSection.categoryStoreViewOption(SecondStoreUnique.name)}}"
                stepKey="clickStoreView1"/>
         <waitForElementVisible selector="{{AdminCategoryMainActionsSection.categoryStoreViewModalAccept}}"
                stepKey="waitForPopup2"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
new file mode 100644
index 0000000000000..128429e3344ba
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.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="AdminGridPageNumberAfterSaveAndCloseActionTest">
+        <annotations>
+            <features value="Catalog"/>
+            <title value="Checking Catalog grid page number after Save and Close action"/>
+            <description value="Checking Catalog grid page number after Save and Close action"/>
+            <stories value="Verify Catalog Grid"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-17278"/>
+            <useCaseId value="MAGETWO-93755"/>
+            <group value="catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Clear product grid-->
+            <comment userInput="Clear product grid" stepKey="commentClearProductsGrid"/>
+            <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="goToProductsGridPage"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductsFilters"/>
+            <actionGroup ref="DeleteAllProducts" stepKey="deleteProductsIfTheyExist"/>
+            <!--Create products-->
+            <createData entity="SimpleProduct3" stepKey="createProduct1"/>
+            <createData entity="SimpleProduct3" stepKey="createProduct2"/>
+            <!--Update product count per page-->
+            <actionGroup ref="AdminDataGridSelectCustomPageSize" stepKey="selectCustomPageSize">
+                <argument name="pageSize" value="{{ProductGridPagerData.pageSize}}"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!--Delete created data-->
+            <deleteData stepKey="deleteProduct1" createDataKey="createProduct1"/>
+            <deleteData stepKey="deleteProduct2" createDataKey="createProduct2"/>
+            <!--Revert products count per page            -->
+            <conditionalClick selector="{{AdminDataGridPaginationSection.previousPage}}" dependentSelector="{{AdminDataGridPaginationSection.previousPage}}" visible="true" stepKey="clickPrevPageOrderGrid"/>
+            <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="goToProductsGridPage"/>
+            <actionGroup ref="AdminDataGridDeleteCustomPageSize" stepKey="deleteCustomAddedPageSize">
+                <argument name="pageSize" value="{{ProductGridPagerData.pageSize}}"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="goToProductsGridPage"/>
+        <!--Go to the next page and edit the product-->
+        <comment userInput="Go to the next page and edit the product" stepKey="commentEdiProduct"/>
+        <click selector="{{AdminDataGridPaginationSection.nextPage}}" stepKey="clickNextPageOrderGrid"/>
+        <waitForElementVisible selector="{{AdminDataGridPaginationSection.currentPage}}" stepKey="waitCurrentPageNumberAppeares"/>
+        <seeInField selector="{{AdminDataGridPaginationSection.currentPage}}" userInput="2" stepKey="seeOnSecondPageOrderGrid"/>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct2">
+            <argument name="product" value="$$createProduct2$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminFormSaveAndClose" stepKey="saveAndCloseProduct"/>
+        <waitForElementVisible selector="{{AdminDataGridPaginationSection.currentPage}}" stepKey="waitCurrentPageNumberAppearesAfterProductEdit"/>
+        <seeInField selector="{{AdminDataGridPaginationSection.currentPage}}" userInput="2" stepKey="seeOnSecondPageOrderGridAfterProductSaved"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml
new file mode 100644
index 0000000000000..e03f5f71dbdcc
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminImportCustomizableOptionToProductWithSKUTest">
+        <annotations>
+            <features value="Catalog"/>
+            <title value="Import customizable options to a product with existing SKU"/>
+            <description value="Import customizable options to a product with existing SKU"/>
+            <stories value="Import customizable options"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-15740"/>
+            <useCaseId value="MAGETWO-73157"/>
+            <skip>
+                <issueId value="MC-16313"/>
+            </skip>
+            <group value="catalog"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createFirstProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="createSecondProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <updateData createDataKey="createFirstProduct" entity="ProductWithFieldOptions" stepKey="updateProductCustomOptions" />
+            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
+            <magentoCLI stepKey="flushCache" command="cache:flush"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createFirstProduct" stepKey="deleteFirstProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="DeleteProductByName" stepKey="deleteSecondProduct">
+                <argument name="product" value="$$createSecondProduct.name$$"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+
+        <!--Change second product sku to first product sku-->
+        <amOnPage url="{{AdminProductEditPage.url($$createSecondProduct.id$$)}}" stepKey="goToSecondProductEditPage"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="$$createFirstProduct.sku$$" stepKey="fillProductSku"/>
+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" visible="false" stepKey="openCustomOptionSection"/>
+
+        <!--Import customizable options and check-->
+        <actionGroup ref="ImportProductCustomizableOptions" stepKey="importProductCustomOptions">
+            <argument name="productName" value="$$createFirstProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="CheckCustomizableOptionImport" stepKey="checkFirstOptionImport">
+            <argument name="option" value="ProductOptionField"/>
+            <argument name="optionIndex" value="0"/>
+        </actionGroup>
+        <actionGroup ref="CheckCustomizableOptionImport" stepKey="checkSecondOptionImport">
+            <argument name="option" value="ProductOptionField2"/>
+            <argument name="optionIndex" value="1"/>
+        </actionGroup>
+
+        <!--Save product and check sku changed message-->
+        <actionGroup ref="saveProductForm" stepKey="saveSecondProduct"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.noticeMessage}}" stepKey="waitForSkuChangedMessage"/>
+        <see selector="{{AdminMessagesSection.noticeMessage}}" userInput="SKU for product $$createSecondProduct.name$$ has been changed to $$createFirstProduct.sku$$-1." stepKey="seeSkuChangedMessage"/>
+
+        <!-- Check that custom options are present on Admin product page in Customizable Option section after Product save -->
+        <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" visible="false" stepKey="openCustomOptionSectionAfterProductSave"/>
+        <actionGroup ref="CheckCustomizableOptionImport" stepKey="checkFirstCustomOptionAfterProductSave">
+            <argument name="option" value="ProductOptionField"/>
+            <argument name="optionIndex" value="0"/>
+        </actionGroup>
+        <actionGroup ref="CheckCustomizableOptionImport" stepKey="checkSecondCustomOptionAfterProductSave">
+            <argument name="option" value="ProductOptionField2"/>
+            <argument name="optionIndex" value="1"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
new file mode 100644
index 0000000000000..39fa355eea6ed
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMoveProductBetweenCategoriesTest">
+        <annotations>
+            <stories value="Move Product"/>
+            <title value="Move Product between Categories (Cron is ON, 'Update by Schedule' Mode)"/>
+            <description value="Verifies correctness of showing data (products, categories) on Storefront after moving an anchored category in terms of products/categories association"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-10141"/>
+            <group value="catalog"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct"/>
+            <createData entity="_defaultCategory" stepKey="createAnchoredCategory1"/>
+            <createData entity="_defaultCategory" stepKey="createSecondCategory"/>
+
+            <!-- Switch "Category Product" and "Product Category" indexers to "Update by Schedule" mode -->
+            <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="onIndexManagement"/>
+            <waitForPageLoad stepKey="waitForManagementPage"/>
+
+            <actionGroup ref="AdminSwitchIndexerToActionModeActionGroup" stepKey="switchCategoryProduct">
+                <argument name="indexerValue" value="catalog_category_product"/>
+            </actionGroup>
+            <actionGroup ref="AdminSwitchIndexerToActionModeActionGroup" stepKey="switchProductCategory">
+                <argument name="indexerValue" value="catalog_product_category"/>
+            </actionGroup>
+        </before>
+
+        <after>
+            <!-- Switch "Category Product" and "Product Category" indexers to "Update by Save" mode -->
+            <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="onIndexManagement"/>
+            <waitForPageLoad stepKey="waitForManagementPage"/>
+
+            <actionGroup ref="AdminSwitchIndexerToActionModeActionGroup" stepKey="switchCategoryProduct">
+                <argument name="indexerValue" value="catalog_category_product"/>
+                <argument name="action" value="Update on Save"/>
+            </actionGroup>
+            <actionGroup ref="AdminSwitchIndexerToActionModeActionGroup" stepKey="switchProductCategory">
+                <argument name="indexerValue" value="catalog_product_category"/>
+                <argument name="action" value="Update on Save"/>
+            </actionGroup>
+
+            <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createSecondCategory" stepKey="deleteSecondCategory"/>
+            <deleteData createDataKey="createAnchoredCategory1" stepKey="deleteAnchoredCategory1"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Create the anchored category <Cat1_anchored> -->
+        <actionGroup ref="AdminAnchorCategoryActionGroup" stepKey="anchorCategory">
+            <argument name="categoryName" value="$$createAnchoredCategory1.name$$"/>
+        </actionGroup>
+
+        <!-- Create subcategory <Sub1> of the anchored category -->
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory1"/>
+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSaveSuccessMessage"/>
+
+        <!-- Assign <product1> to the <Sub1> -->
+        <amOnPage url="{{AdminProductEditPage.url($$simpleProduct.id$$)}}" stepKey="goToProduct"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="activateDropDownCategory"/>
+        <fillField userInput="{{SimpleSubCategory.name}}" selector="{{AdminProductFormSection.searchCategory}}" stepKey="fillSearch"/>
+        <waitForPageLoad stepKey="waitForSubCategory"/>
+        <click selector="{{AdminProductFormSection.selectCategory(SimpleSubCategory.name)}}" stepKey="selectSub1Category"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickDone"/>
+        <waitForPageLoad stepKey="waitForApplyCategory"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSave"/>
+        <waitForPageLoad stepKey="waitForSavingChanges"/>
+
+        <!-- Enable `Use Categories Path for Product URLs` on Stores -> Configuration -> Catalog -> Catalog -> Search Engine Optimization -->
+        <amOnPage url="{{AdminCatalogSearchConfigurationPage.url('#catalog_seo-link')}}" stepKey="onConfigPage"/>
+        <uncheckOption selector="{{AdminCatalogSearchEngineConfigurationSection.systemValueUseCategoriesPath}}" stepKey="uncheckDefault"/>
+        <selectOption userInput="Yes" selector="{{AdminCatalogSearchEngineConfigurationSection.selectUseCategoriesPatForProductUrls}}" stepKey="selectYes"/>
+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
+        <waitForPageLoad stepKey="waitForSaving"/>
+        <see selector="{{AdminMessagesSection.successMessage}}"  userInput="You saved the configuration." stepKey="seeMessage"/>
+
+        <!-- Navigate to the Catalog > Products -->
+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="onCatalogProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPage"/>
+
+        <!-- Click on <product1>: Product page opens-->
+        <actionGroup ref="filterProductGridByName" stepKey="filterProduct">
+            <argument name="product" value="$$simpleProduct$$"/>
+        </actionGroup>
+        <click selector="{{AdminProductGridSection.productGridNameProduct($$simpleProduct.name$$)}}" stepKey="clickProduct1"/>
+        <waitForPageLoad stepKey="waitForProductLoad"/>
+
+        <!-- Clear "Categories" field and assign the product to <Cat2> and save the product -->
+        <grabTextFrom selector="{{AdminProductFormSection.currentCategory}}" stepKey="grabNameSubCategory"/>
+        <click selector="{{AdminProductFormSection.unselectCategories(SimpleSubCategory.name)}}" stepKey="removeCategory"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="openDropDown"/>
+        <checkOption selector="{{AdminProductFormSection.selectCategory($$createSecondCategory.name$$)}}" stepKey="selectCategory"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="pressButtonDone"/>
+        <waitForPageLoad stepKey="waitForApplyCategory2"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="pushButtonSave"/>
+        <waitForPageLoad stepKey="waitForSavingProduct"/>
+
+        <!--Product is saved -->
+        <see userInput="You saved the product." selector="{{AdminMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
+
+        <!-- Run cron -->
+        <magentoCLI command="cron:run" stepKey="runCron"/>
+
+        <!-- Clear invalidated cache on System>Tools>Cache Management page  -->
+        <amOnPage url="{{AdminCacheManagementPage.url}}" stepKey="onCachePage"/>
+        <waitForPageLoad stepKey="waitForCacheManagementPage"/>
+
+        <checkOption selector="{{AdminCacheManagementSection.configurationCheckbox}}" stepKey="checkConfigCache"/>
+        <checkOption selector="{{AdminCacheManagementSection.pageCacheCheckbox}}" stepKey="checkPageCache"/>
+
+        <selectOption userInput="Refresh" selector="{{AdminCacheManagementSection.massActionSelect}}" stepKey="selectRefresh"/>
+        <waitForElementVisible selector="{{AdminCacheManagementSection.massActionSubmit}}" stepKey="waitSubmitButton"/>
+        <click selector="{{AdminCacheManagementSection.massActionSubmit}}" stepKey="clickSubmit"/>
+        <waitForPageLoad stepKey="waitForRefresh"/>
+
+        <see userInput="2 cache type(s) refreshed." stepKey="seeCacheRefreshedMessage"/>
+        <actionGroup ref="logout" stepKey="logout"/>
+
+        <!-- Open frontend -->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="onFrontend"/>
+        <waitForPageLoad stepKey="waitForStorefrontPageLoad"/>
+
+        <!-- Open <Cat2> from navigation menu -->
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createSecondCategory.name$$)}}" stepKey="openCat2"/>
+        <waitForPageLoad stepKey="waitForCategory2Page"/>
+
+        <!-- # <Cat 2> should open # <product1> should be present on the page -->
+        <see userInput="$$createSecondCategory.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="seeCategoryName"/>
+        <see userInput="$$simpleProduct.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProduct"/>
+
+        <!-- Open <product1>  -->
+        <click selector="{{StorefrontCategoryMainSection.productLinkByHref($$simpleProduct.urlKey$$)}}" stepKey="openProduct"/>
+        <waitForPageLoad stepKey="waitForProductPageLoading"/>
+
+        <!-- # Product page should open successfully # Breadcrumb for product should be like <Cat 2> -->
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$simpleProduct.name$$" stepKey="seeProductName"/>
+        <see userInput="$$createSecondCategory.name$$" selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}" stepKey="seeCategoryInBreadcrumbs"/>
+
+        <!-- Open <Cat1_anchored> category -->
+        <click selector="{{StorefrontNavigationSection.topCategory($$createAnchoredCategory1.name$$)}}" stepKey="clickCat1"/>
+        <waitForPageLoad stepKey="waitForCategory1PageLoad"/>
+
+        <!-- # Category should open successfully # <product1> should be absent on the page -->
+        <see userInput="$$createAnchoredCategory1.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="seeCategory1Name"/>
+        <see userInput="We can't find products matching the selection." stepKey="seeEmptyNotice"/>
+        <dontSee userInput="$$simpleProduct.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontseeProduct"/>
+
+        <!-- Log in to the backend: Admin user is logged in-->
+        <actionGroup ref="LoginAsAdmin" stepKey="LoginAdmin"/>
+
+        <!-- Navigate to the Catalog > Products: Navigate to the Catalog>Products -->
+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="amOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductsPage"/>
+
+        <!-- Click on <product1> -->
+        <actionGroup ref="filterAndSelectProduct" stepKey="openSimpleProduct">
+            <argument name="productSku" value="$$simpleProduct.sku$$"/>
+        </actionGroup>
+
+        <!-- Clear "Categories" field and assign the product to <Sub1> and save the product -->
+        <click selector="{{AdminProductFormSection.unselectCategories($$createSecondCategory.name$$)}}" stepKey="clearCategory"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="activateDropDown"/>
+        <fillField userInput="{$grabNameSubCategory}" selector="{{AdminProductFormSection.searchCategory}}" stepKey="fillSearchField"/>
+        <waitForPageLoad stepKey="waitForSearchSubCategory"/>
+        <click selector="{{AdminProductFormSection.selectCategory({$grabNameSubCategory})}}" stepKey="selectSubCategory"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickButtonDone"/>
+        <waitForPageLoad stepKey="waitForCategoryApply"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickButtonSave"/>
+        <waitForPageLoad stepKey="waitForSaveChanges"/>
+
+        <!-- Product is saved successfully -->
+        <see userInput="You saved the product." selector="{{AdminMessagesSection.successMessage}}" stepKey="seeSaveMessage"/>
+
+        <!-- Run cron -->
+        <magentoCLI command="cron:run" stepKey="runCron2"/>
+
+        <!-- Open frontend -->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="onFrontendPage"/>
+        <waitForPageLoad stepKey="waitForFrontPageLoad"/>
+
+        <!-- Open <Cat2> from navigation menu -->
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createSecondCategory.name$$)}}" stepKey="openSecondCategory"/>
+        <waitForPageLoad stepKey="waitForSecondCategoryPage"/>
+
+        <!-- # <Cat 2> should open # <product1> should be absent on the page -->
+        <see userInput="$$createSecondCategory.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="seeSecondCategory1Name"/>
+        <dontSee userInput="$$simpleProduct.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontseeSimpleProduct"/>
+
+        <!-- Click on <Cat1_anchored> category -->
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createAnchoredCategory1.name$$)}}" stepKey="clickAnchoredCategory"/>
+        <waitForPageLoad stepKey="waitForAnchoredCategoryPage"/>
+
+        <!-- # Category should open successfully # <product1> should be present on the page -->
+        <see userInput="$$createAnchoredCategory1.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="see1CategoryName"/>
+        <see selector="{{StorefrontCategoryMainSection.productName}}" userInput="$$simpleProduct.name$$" stepKey="seeProductNameOnCategory1Page"/>
+
+        <!-- Breadcrumb for product should be like <Cat1_anchored>/<product> (if you clicks from anchor category) -->
+        <see userInput="$$createAnchoredCategory1.name$$" selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}" stepKey="seeCat1inBreadcrumbs"/>
+        <dontSee userInput="{$grabNameSubCategory}" selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}" stepKey="dontSeeSubCategoryInBreadCrumbs"/>
+
+        <!-- <Cat1_anchored>/<Sub1>/<product> (if you clicks from Sub1 category) -->
+        <moveMouseOver selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createAnchoredCategory1.name$$)}}" stepKey="hoverCategory1"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName({$grabNameSubCategory})}}" stepKey="clickSubCat"/>
+        <waitForPageLoad stepKey="waitForSubCategoryPageLoad"/>
+
+        <see userInput="{$grabNameSubCategory}" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="seeSubCategoryName"/>
+        <see selector="{{StorefrontCategoryMainSection.productName}}" userInput="$$simpleProduct.name$$" stepKey="seeProductNameOnSubCategoryPage"/>
+
+        <see userInput="{$grabNameSubCategory}" selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}" stepKey="seeSubCategoryInBreadcrumbs"/>
+        <see userInput="$$createAnchoredCategory1.name$$" selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}" stepKey="seeCat1InBreadcrumbs"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCategoryIndexerInUpdateOnScheduleModeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCategoryIndexerInUpdateOnScheduleModeTest.xml
new file mode 100644
index 0000000000000..d920ed90c80c5
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCategoryIndexerInUpdateOnScheduleModeTest.xml
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminProductCategoryIndexerInUpdateOnScheduleModeTest">
+        <annotations>
+            <stories value="Product Categories Indexer"/>
+            <title value="Product Categories Indexer in Update on Schedule mode"/>
+            <description value="Verifies that in Update on Schedule mode if displaying of category products on Storefront changes due to product properties change,
+            the changes are NOT applied immediately, but applied only after cron runs (twice)."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-10023"/>
+            <group value="catalog"/>
+            <group value="indexer"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+            <!-- Create category A without products -->
+            <createData entity="_defaultCategory" stepKey="createCategoryA"/>
+
+            <!-- Create product A1 not assigned to any category -->
+            <createData entity="SimpleProduct3" stepKey="createProductA1"/>
+
+            <!-- Create anchor category B with subcategory C-->
+            <createData entity="_defaultCategory" stepKey="createCategoryB"/>
+            <createData entity="SubCategoryWithParent" stepKey="createCategoryC">
+                <requiredEntity createDataKey="createCategoryB"/>
+            </createData>
+
+            <!--  Assign product B1 to category B -->
+            <createData entity="ApiSimpleProduct" stepKey="createProductB1">
+                <requiredEntity createDataKey="createCategoryB"/>
+            </createData>
+
+            <!-- Assign product C1 to category C -->
+            <createData entity="ApiSimpleProduct" stepKey="createProductC1">
+                <requiredEntity createDataKey="createCategoryC"/>
+            </createData>
+
+            <!-- Assign product C2 to category C -->
+            <createData entity="ApiSimpleProduct" stepKey="createProductC2">
+                <requiredEntity createDataKey="createCategoryC"/>
+            </createData>
+
+            <!-- Switch indexers to "Update by Schedule" mode -->
+            <actionGroup ref="AdminSwitchAllIndexerToActionModeActionGroup" stepKey="onUpdateBySchedule">
+                <argument name="action" value="Update by Schedule"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!-- Switch indexers to "Update on Save" mode -->
+            <actionGroup ref="AdminSwitchAllIndexerToActionModeActionGroup" stepKey="onUpdateOnSave">
+                <argument name="action" value="Update on Save"/>
+            </actionGroup>
+            <!-- Delete data -->
+            <deleteData createDataKey="createProductA1" stepKey="deleteProductA1"/>
+            <deleteData createDataKey="createProductB1" stepKey="deleteProductB1"/>
+            <deleteData createDataKey="createProductC1" stepKey="deleteProductC1"/>
+            <deleteData createDataKey="createProductC2" stepKey="deleteProductC2"/>
+            <deleteData createDataKey="createCategoryA" stepKey="deleteCategoryA"/>
+            <deleteData createDataKey="createCategoryC" stepKey="deleteCategoryC"/>
+            <deleteData createDataKey="createCategoryB" stepKey="deleteCategoryB"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Case: change product category from product page -->
+        <!-- 1. Open Admin > Catalog > Products > Product A1 -->
+        <amOnPage url="{{AdminProductEditPage.url($$createProductA1.id$$)}}" stepKey="goToProductA1"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+
+        <!-- 2. Assign category A to product A1. Save product -->
+        <actionGroup ref="AdminAssignCategoryToProductAndSaveActionGroup" stepKey="assignProduct">
+            <argument name="categoryName" value="$$createCategoryA.name$$"/>
+        </actionGroup>
+
+        <!-- 3. Open category A on Storefront -->
+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="goToCategoryA">
+            <argument name="categoryName" value="$$createCategoryA.name$$"/>
+        </actionGroup>
+
+        <!-- The category is still empty -->
+        <see userInput="$$createCategoryA.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="seeCategoryA1Name"/>
+        <see userInput="We can't find products matching the selection." stepKey="seeEmptyNotice"/>
+        <dontSee userInput="$$createProductA1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontseeProductA1"/>
+
+        <!-- 4. Run cron to reindex -->
+        <wait time="60" stepKey="waitForChanges"/>
+        <magentoCLI command="cron:run" stepKey="runCron"/>
+        <magentoCLI command="cron:run" stepKey="runTwiceCron"/>
+
+        <!-- 5. Open category A on Storefront again -->
+        <reloadPage stepKey="reloadCategoryA"/>
+
+        <!-- Category A displays product A1 now -->
+        <see userInput="$$createCategoryA.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="seeTitleCategoryA1"/>
+        <see userInput="$$createProductA1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductA1"/>
+
+        <!--6.  Open Admin > Catalog > Products > Product A1. Unassign category A from product A1 -->
+        <amOnPage url="{{AdminProductEditPage.url($$createProductA1.id$$)}}" stepKey="OnPageProductA1"/>
+        <waitForPageLoad stepKey="waitForProductA1PageLoad"/>
+        <actionGroup ref="AdminUnassignCategoryOnProductAndSaveActionGroup" stepKey="unassignCategoryA">
+            <argument name="categoryName" value="$$createCategoryA.name$$"/>
+        </actionGroup>
+
+        <!-- 7. Open category A on Storefront -->
+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="toCategoryA">
+            <argument name="categoryName" value="$$createCategoryA.name$$"/>
+        </actionGroup>
+
+        <!-- Category A still contains product A1 -->
+        <see userInput="$$createCategoryA.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="seeCategoryAOnPage"/>
+        <see userInput="$$createProductA1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeNameProductA1"/>
+
+        <!-- 8. Run cron reindex -->
+        <wait time="60" stepKey="waitOneMinute"/>
+        <magentoCLI command="cron:run" stepKey="runCron1"/>
+        <magentoCLI command="cron:run" stepKey="runTwiceCron1"/>
+
+        <!-- 9. Open category A on Storefront again -->
+        <reloadPage stepKey="refreshCategoryAPage"/>
+
+        <!-- Category A is empty now -->
+        <see userInput="$$createCategoryA.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="seeOnPageCategoryAName"/>
+        <see userInput="We can't find products matching the selection." stepKey="seeOnPageEmptyNotice"/>
+        <dontSee userInput="$$createProductA1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontseeProductA1OnPage"/>
+
+        <!-- Case: change product status -->
+        <!-- 10. Open category B on Storefront  -->
+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="toCategoryB">
+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
+        </actionGroup>
+
+        <!-- Category B displays product B1, C1 and C2 -->
+        <see userInput="$$createCategoryB.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="seeCategoryBOnPage"/>
+        <see userInput="$$createProductB1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeNameProductB1"/>
+        <see userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeNameProductC1"/>
+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeNameProductC2"/>
+
+        <!-- 11. Open product C1 in Admin. Make it disabled (Enable Product = No)-->
+        <amOnPage url="{{AdminProductEditPage.url($$createProductC1.id$$)}}" stepKey="goToProductC1"/>
+        <waitForPageLoad stepKey="waitForProductC1PageLoad"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="clickOffEnableToggleAgain"/>
+        <!-- Saved successfully -->
+        <actionGroup ref="saveProductForm" stepKey="saveProductC1"/>
+
+        <!-- 12. Open category B on Storefront -->
+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="toCategoryBStorefront">
+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
+        </actionGroup>
+
+        <!-- Category B displays product B1, C1 and C2 -->
+        <see userInput="$$createCategoryB.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="categoryBOnPage"/>
+        <see userInput="$$createProductB1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductB1"/>
+        <see userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductC1"/>
+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductC2"/>
+
+        <!-- 13. Open category C on Storefront -->
+        <actionGroup ref="StorefrontGoToSubCategoryPageActionGroup" stepKey="goToCategoryC">
+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
+            <argument name="subCategoryName" value="$$createCategoryC.name$$"/>
+        </actionGroup>
+
+        <!-- Category C still displays products C1 and C2 -->
+        <see userInput="$$createCategoryC.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="categoryCOnPage"/>
+        <see userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductC1inCategoryC1"/>
+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductC2InCategoryC2"/>
+
+        <!-- 14. Run cron to reindex -->
+        <wait time="60" stepKey="waitMinute"/>
+        <magentoCLI command="cron:run" stepKey="runCron2"/>
+        <magentoCLI command="cron:run" stepKey="runTwiceCron2"/>
+
+        <!--  15. Open category B on Storefront  -->
+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="onPageCategoryB">
+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
+        </actionGroup>
+
+        <!-- Category B displays product B1 and C2 only-->
+        <see userInput="$$createCategoryB.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="seeTitleCategoryBOnPage"/>
+        <see userInput="$$createProductB1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeOnCategoryBPageProductB1"/>
+        <dontSee userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeOnCategoryBPageProductC1"/>
+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeOnCategoryBPageProductC2"/>
+
+        <!-- 16. Open category C on Storefront -->
+        <actionGroup ref="StorefrontGoToSubCategoryPageActionGroup" stepKey="openCategoryC">
+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
+            <argument name="subCategoryName" value="$$createCategoryC.name$$"/>
+        </actionGroup>
+
+        <!-- Category C displays only product C2 now -->
+        <see userInput="$$createCategoryC.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="seeTitleOnCategoryCPage"/>
+        <dontSee userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeOnCategoryCPageProductC1"/>
+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeOnCategoryCPageProductC2"/>
+
+        <!-- 17. Repeat steps 10-16, but enable products instead. -->
+        <!-- 17.11 Open product C1 in Admin. Make it enabled -->
+        <amOnPage url="{{AdminProductEditPage.url($$createProductC1.id$$)}}" stepKey="goToEditProductC1"/>
+        <waitForPageLoad stepKey="waitForProductC1Page"/>
+        <scrollToTopOfPage stepKey="scrollTopOfProductPage"/>
+        <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="clickOnEnableToggleAgain"/>
+
+        <!-- Saved successfully -->
+        <actionGroup ref="saveProductForm" stepKey="saveChangedProductC1"/>
+
+        <!-- 17.12. Open category B on Storefront -->
+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryB">
+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
+        </actionGroup>
+
+        <!-- Category B displays product B1 and C2 -->
+        <see userInput="$$createCategoryB.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="titleCategoryBOnPage"/>
+        <see userInput="$$createProductB1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeCategoryBPageProductB1"/>
+        <dontSee userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeCategoryBPageProductC1"/>
+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeCategoryBPageProductC2"/>
+
+        <!-- 17.13. Open category C on Storefront -->
+        <actionGroup ref="StorefrontGoToSubCategoryPageActionGroup" stepKey="openToCategoryC">
+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
+            <argument name="subCategoryName" value="$$createCategoryC.name$$"/>
+        </actionGroup>
+
+        <!-- Category C displays product C2 -->
+        <see userInput="$$createCategoryC.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="titleOnCategoryCPage"/>
+        <dontSee userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeCategoryCPageProductC1"/>
+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeCategoryCPageProductC2"/>
+
+        <!-- 17.14. Run cron to reindex -->
+        <wait time="60" stepKey="waitForOneMinute"/>
+        <magentoCLI command="cron:run" stepKey="runCron3"/>
+        <magentoCLI command="cron:run" stepKey="runTwiceCron3"/>
+
+        <!--  17.15. Open category B on Storefront  -->
+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openPageCategoryB">
+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
+        </actionGroup>
+
+        <!--  Category B displays products B1, C1, C2 again, but only after reindex. -->
+        <see userInput="$$createCategoryB.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="onPageSeeCategoryBTitle"/>
+        <see userInput="$$createProductB1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="onPageSeeCategoryBProductB1"/>
+        <see userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="onPageSeeCategoryBProductC1"/>
+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="onPageSeeCategoryBProductC2"/>
+
+        <!-- 17.16. Open category C on Storefront -->
+        <actionGroup ref="StorefrontGoToSubCategoryPageActionGroup" stepKey="openOnStorefrontCategoryC">
+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
+            <argument name="subCategoryName" value="$$createCategoryC.name$$"/>
+        </actionGroup>
+
+        <!-- Category C displays products C1, C2 again, but only after reindex.-->
+        <see userInput="$$createCategoryC.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="onPageSeeCategoryCTitle"/>
+        <see userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="onPageSeeCategoryCProductC1"/>
+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="onPageSeeCategoryCProductC2"/>
+
+        <!-- Case: change product visibility -->
+        <!-- 18. Repeat steps 10-17 but change product Visibility instead of product status -->
+        <!-- 18.11 Open product C1 in Admin. Make it enabled -->
+        <amOnPage url="{{AdminProductEditPage.url($$createProductC1.id$$)}}" stepKey="editProductC1"/>
+        <waitForPageLoad stepKey="waitProductC1Page"/>
+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="Search"
+                      stepKey="changeVisibility"/>
+
+        <!-- Saved successfully -->
+        <actionGroup ref="saveProductForm" stepKey="productC1Saved"/>
+
+        <!-- 18.12. Open category B on Storefront -->
+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="goPageCategoryB">
+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
+        </actionGroup>
+
+        <!--  Category B displays products B1, C1, C2 again, but only after reindex. -->
+        <see userInput="$$createCategoryB.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="seeCategoryBTitle"/>
+        <see userInput="$$createProductB1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeCategoryBProductB1"/>
+        <see userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeCategoryBProductC1"/>
+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeCategoryBProductC2"/>
+
+        <!-- 18.13. Open category C on Storefront -->
+        <actionGroup ref="StorefrontGoToSubCategoryPageActionGroup" stepKey="goPageCategoryC">
+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
+            <argument name="subCategoryName" value="$$createCategoryC.name$$"/>
+        </actionGroup>
+
+        <!-- Category C displays products C1, C2 again, but only after reindex.-->
+        <see userInput="$$createCategoryC.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="seeCategoryCTitle"/>
+        <see userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeOnCategoryCProductC1"/>
+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeOnCategoryCProductC2"/>
+
+        <!-- 18.14. Run cron to reindex -->
+        <wait time="60" stepKey="waitExtraMinute"/>
+        <magentoCLI command="cron:run" stepKey="runCron4"/>
+        <magentoCLI command="cron:run" stepKey="runTwiceCron4"/>
+
+        <!--  18.15. Open category B on Storefront  -->
+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="navigateToPageCategoryB">
+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
+        </actionGroup>
+
+        <!-- Category B displays product B1 and C2 only-->
+        <see userInput="$$createCategoryB.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="seeTitleCategoryB"/>
+        <see userInput="$$createProductB1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeTitleProductB1"/>
+        <dontSee userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontseeCategoryBProductC1"/>
+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeTitleProductC2"/>
+
+        <!-- 18.18. Open category C on Storefront -->
+        <actionGroup ref="StorefrontGoToSubCategoryPageActionGroup" stepKey="navigateToPageCategoryC">
+            <argument name="categoryName" value="$$createCategoryB.name$$"/>
+            <argument name="subCategoryName" value="$$createCategoryC.name$$"/>
+        </actionGroup>
+
+        <!-- Category C displays product C2 again, but only after reindex.-->
+        <see userInput="$$createCategoryC.name$$" selector="{{StorefrontCategoryMainSection.categoryTitle}}" stepKey="seeTitleCategoryC"/>
+        <dontSee userInput="$$createProductC1.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeOnCategoryCProductC1"/>
+        <see userInput="$$createProductC2.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeOnPageTitleProductC2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
index 9ec47e5a36464..2ae817c732434 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
@@ -28,7 +28,7 @@
             <click selector="{{AdminProductAttributeGridSection.firstRow}}" stepKey="clickOnAttributeRow1"/>
             <waitForPageLoad stepKey="wait2"/>
             <click selector="{{AdminNewAttributePanelSection.isDefault('1')}}" stepKey="resetOptionForStatusAttribute"/>
-            <click selector="{{AttributePropertiesSection.save}}" stepKey="saveAttribute1"/>
+            <click selector="{{AttributePropertiesSection.Save}}" stepKey="saveAttribute1"/>
             <waitForPageLoad stepKey="waitForSaveAttribute1"/>
             <actionGroup ref="ClearCacheActionGroup" stepKey="clearCache1"/>
             <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
@@ -42,7 +42,7 @@
         <click selector="{{AdminProductAttributeGridSection.firstRow}}" stepKey="clickOnAttributeRow"/>
         <waitForPageLoad stepKey="wait2"/>
         <click selector="{{AdminNewAttributePanelSection.isDefault('2')}}" stepKey="chooseDisabledOptionForStatus"/>
-        <click selector="{{AttributePropertiesSection.save}}" stepKey="saveAttribute"/>
+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="saveAttribute"/>
         <waitForPageLoad stepKey="waitForAttributeToSave"/>
         <actionGroup ref="ClearCacheActionGroup" stepKey="clearCache"/>
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRequiredFieldsHaveRequiredFieldIndicatorTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRequiredFieldsHaveRequiredFieldIndicatorTest.xml
new file mode 100644
index 0000000000000..532ef76121857
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRequiredFieldsHaveRequiredFieldIndicatorTest.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="AdminRequiredFieldsHaveRequiredFieldIndicatorTest">
+        <annotations>
+            <stories value="MAGETWO-73342: Clicking on area around the label of a toggle element results in the element's state being changed"/>
+            <title value="Required fields should have the required asterisk indicator "/>
+            <description value="Verify that Required fields should have the required indicator icon next to the field name"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-97037"/>
+            <group value="catalog"/>
+            <group value="cms"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage"/>
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
+
+        <!-- Verify that the Category Name field has the required field name indicator -->
+        <executeJS function="{{AdminCategoryBasicFieldSection.requiredFieldIndicator}}" stepKey="getRequiredFieldIndicator"/>
+        <assertEquals expected='"*"' expectedType="string" actualType="variable" actual="getRequiredFieldIndicator" stepKey="assertRequiredFieldIndicator"/>
+
+        <executeJS function="{{AdminCategoryBasicFieldSection.requiredFieldIndicatorColor}}" stepKey="getRequiredFieldIndicatorColor"/>
+        <assertEquals expected="rgb(226, 38, 38)" expectedType="string" actualType="variable" actual="getRequiredFieldIndicatorColor" stepKey="assertRequiredFieldIndicator1"/>
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndexPage"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="addProductDropdown"/>
+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="addSimpleProduct"/>
+
+        <!-- Verify that the Product Name and Sku fields have the required field name indicator -->
+        <executeJS function="{{AdminProductFormSection.requiredNameIndicator}}" stepKey="productNameRequiredFieldIndicator"/>
+        <assertEquals expected='"*"' expectedType="string" actualType="variable" actual="productNameRequiredFieldIndicator" stepKey="assertRequiredFieldIndicator2"/>
+        <executeJS function="{{AdminProductFormSection.requiredSkuIndicator}}" stepKey="productSkuRequiredFieldIndicator"/>
+        <assertEquals expected='"*"' expectedType="string" actualType="variable" actual="productSkuRequiredFieldIndicator" stepKey="assertRequiredFieldIndicator3"/>
+
+        <!-- Verify that the CMS page have the required field name indicator next to Page Title -->
+        <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnPagePagesGrid"/>
+        <click selector="{{CmsPagesPageActionsSection.addNewPage}}" stepKey="clickAddNewPage"/>
+        <executeJS function="{{CmsNewPagePageBasicFieldsSection.requiredFieldIndicator}}" stepKey="pageTitleRequiredFieldIndicator"/>
+        <assertEquals expected='"*"' expectedType="string" actualType="variable" actual="pageTitleRequiredFieldIndicator" stepKey="assertRequiredFieldIndicator4"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSaveConfigurableProductWithAttributesImagesAndSwatchesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSaveConfigurableProductWithAttributesImagesAndSwatchesTest.xml
new file mode 100644
index 0000000000000..6a82df0a27385
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSaveConfigurableProductWithAttributesImagesAndSwatchesTest.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminSaveConfigurableProductWithAttributesImagesAndSwatchesTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Product attributes"/>
+            <title value="Saving configurable product with custom product attribute (images as swatches)"/>
+            <description value="Saving configurable product with custom product attribute (images as swatches)"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-17552"/>
+            <group value="catalog"/>
+        </annotations>
+        <before>
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Admin logout -->
+            <actionGroup ref="logout" stepKey="adminLogout"/>
+        </after>
+
+        <!-- Create a new product attribute: set Catalog Input Type for Store Owner: Visual Swatch -->
+        <actionGroup ref="AdminFillProductAttributePropertiesActionGroup" stepKey="fillAttributeProperties">
+            <argument name="attributeCode" value="{{productVisualSwatchAttribute.attribute_code}}"/>
+            <argument name="attributeType" value="{{productVisualSwatchAttribute.frontend_input}}"/>
+        </actionGroup>
+
+        <!-- Add a few Swatches and add images to Manage Swatch (Values of Your Attribute)
+             1. Set swatch #1 using the color picker -->
+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddFirstSwatch"/>
+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickFirstSwatch">
+            <argument name="index" value="0"/>
+        </actionGroup>
+        <click selector="{{AdminManageSwatchSection.chooseColorRow('1')}}" stepKey="clickChooseFirstColor"/>
+        <actionGroup ref="setColorPickerValueByHex" stepKey="fillFirstHex">
+            <argument name="nthColorPicker" value="1"/>
+            <argument name="hexColor" value="e74c3c"/>
+        </actionGroup>
+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('0')}}" userInput="red" stepKey="fillFirstAdminField"/>
+
+        <!-- 2. Set swatch #2 using the color picker -->
+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSecondSwatch"/>
+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSecondSwatch">
+            <argument name="index" value="1"/>
+        </actionGroup>
+        <click selector="{{AdminManageSwatchSection.chooseColorRow('2')}}" stepKey="clickChooseSecondColor"/>
+        <actionGroup ref="setColorPickerValueByHex" stepKey="fillSecondHex">
+            <argument name="nthColorPicker" value="2"/>
+            <argument name="hexColor" value="3498db"/>
+        </actionGroup>
+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('1')}}" userInput="blue" stepKey="fillSecondAdminField"/>
+
+        <!-- Set Scope: Global in Advanced Attribute Properties -->
+        <click selector="{{AttributePropertiesSection.AdvancedProperties}}" stepKey="expandAdvancedProperties"/>
+        <selectOption selector="{{AttributePropertiesSection.scope}}" userInput="1" stepKey="selectGlobalScope"/>
+
+        <!-- Click "Save Attribute" button -->
+        <click selector="{{AttributePropertiesSection.saveAndEdit}}" stepKey="clickSaveAndEdit"/>
+        <waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
+
+        <!-- Add created product 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="productVisualSwatchAttribute.attribute_code"/>
+        </actionGroup>
+        <actionGroup ref="SaveAttributeSet" stepKey="saveAttributeSet"/>
+
+        <!-- Create configurable product -->
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="openOpenProductIndexPage"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateConfigurableProduct">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+
+        <!-- Select Attribute Set -->
+        <actionGroup ref="AssignProductToAttributeSet" stepKey="selectAttributeSet">
+            <argument name="attributeSetName" value="Default"/>
+        </actionGroup>
+
+        <!-- Fill all the necessary information such as weight, name, SKU etc -->
+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+
+        <!-- Click "Create Configurations" button, select created product attribute using the same Quantity for all products. Click "Generate products" button -->
+        <actionGroup ref="AdminGenerateProductConfigurationsByAttributeCodeActionGroup" stepKey="addAttributeToProduct">
+            <argument name="attributeCode" value="{{productVisualSwatchAttribute.attribute_code}}"/>
+        </actionGroup>
+
+        <!-- Using this action to concatenate 2 strings to have unique identifier for grid -->
+        <executeJS function="return '{{productVisualSwatchAttribute.attribute_code}}: red'" stepKey="attributeCodeRed"/>
+        <executeJS function="return '{{productVisualSwatchAttribute.attribute_code}}: blue'" stepKey="attributeCodeBlue"/>
+
+        <!-- Add images for the products -->
+        <attachFile selector="{{AdminDataGridTableSection.rowTemplate({$attributeCodeRed})}}{{AdminProductFormConfigurationsSection.fileUploaderInput}}" userInput="{{MagentoLogo.file}}" stepKey="uploadImageForFirstProduct"/>
+        <attachFile selector="{{AdminDataGridTableSection.rowTemplate({$attributeCodeBlue})}}{{AdminProductFormConfigurationsSection.fileUploaderInput}}" userInput="{{ProductImage.file}}" stepKey="uploadImageForSecondProduct"/>
+
+        <!-- Click "Save" button -->
+        <actionGroup ref="saveProductForm" stepKey="clickSaveButton"/>
+
+        <!-- Delete all created product -->
+        <actionGroup ref="AdminDeleteProductBySkuActionGroup" stepKey="deleteCreatedProducts">
+            <argument name="sku" value="{{BaseConfigurableProduct.sku}}"/>
+        </actionGroup>
+
+        <!-- Delete product attribute -->
+        <actionGroup ref="deleteProductAttribute" stepKey="deleteProductAttribute">
+            <argument name="ProductAttribute" value="productVisualSwatchAttribute"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminValidateApplyingTierPriceWithEmptyDiscountValueTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminValidateApplyingTierPriceWithEmptyDiscountValueTest.xml
new file mode 100644
index 0000000000000..8555615cc8781
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminValidateApplyingTierPriceWithEmptyDiscountValueTest.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="AdminValidateApplyingTierPriceWithEmptyDiscountValueTest">
+        <annotations>
+            <features value="Apply tier price"/>
+            <title value="Apply Tier Price with empty discount value"/>
+            <description value="Validate applying tier price to product"/>
+            <stories value="Apply Tier Price with empty discount value" />
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-96484"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <actionGroup ref="AdminResetProductGridToDefaultViewActionGroup" stepKey="resetGridToDefaultKeywordSearch"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProductPage">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForCustomerGroupPriceAddButton"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="addCustomerGroupPrice"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="1" stepKey="fillProductTierPriceQtyInput"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceValueTypeSelect('0')}}" userInput="Discount" stepKey="selectProductTierPriceValueType"/>
+        <clearField selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('0')}}" stepKey="clearPercentageValueField"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
+        <see selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageError}}" userInput="This is a required field." stepKey="assertPercentageError"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('0')}}" userInput="10" stepKey="setPercentageValue"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton1"/>
+        <dontSee selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageError}}" userInput="This is a required field." stepKey="assertNoPercentageError"/>
+        <actionGroup ref="SaveProductOnProductPageOnAdmin" stepKey="saveProduct"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
index 4058112a2d76c..fd364682011c6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
@@ -71,7 +71,7 @@
             <argument name="website" value="SecondWebsite"/>
         </actionGroup>
         <actionGroup ref="ProductSetAdvancedPricing" stepKey="setAdvancedPricingForProduct1">
-            <argument name="website" value="SecondWebsite"/>
+            <argument name="website" value="{{SecondWebsite.name}}"/>
         </actionGroup>
 
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProduct2">
@@ -84,7 +84,7 @@
             <argument name="website" value="SecondWebsite"/>
         </actionGroup>
         <actionGroup ref="ProductSetAdvancedPricing" stepKey="setAdvancedPricingForProduct2">
-            <argument name="website" value="SecondWebsite"/>
+            <argument name="website" value="{{SecondWebsite.name}}"/>
         </actionGroup>
 
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProduct3">
@@ -97,7 +97,7 @@
             <argument name="website" value="SecondWebsite"/>
         </actionGroup>
         <actionGroup ref="ProductSetAdvancedPricing" stepKey="setAdvancedPricingForProduct3">
-            <argument name="website" value="SecondWebsite"/>
+            <argument name="website" value="{{SecondWebsite.name}}"/>
         </actionGroup>
 
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProduct4">
@@ -110,9 +110,12 @@
             <argument name="website" value="SecondWebsite"/>
         </actionGroup>
         <actionGroup ref="ProductSetAdvancedPricing" stepKey="setAdvancedPricingForProduct4">
-            <argument name="website" value="SecondWebsite"/>
+            <argument name="website" value="{{SecondWebsite.name}}"/>
         </actionGroup>
 
+        <!--Flush cache-->
+        <magentoCLI command="cache:flush" stepKey="cleanCache"/>
+
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
         <waitForPageLoad stepKey="waitForProductsIndexPageToLoad"/>
         <actionGroup ref="resetAdminDataGridToDefaultView" stepKey="resetProductsGrid"/>
@@ -155,10 +158,9 @@
         <!--Create new order-->
         <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="startToCreateNewOrder">
             <argument name="customer" value="$$createCustomer$$"/>
+            <argument name="storeView" value="SecondStoreUnique"/>
         </actionGroup>
-        <click selector="{{AdminOrderFormSelectWebsiteSection.website(SecondStoreUnique.name)}}" stepKey="selectStore"/>
-        <waitForPageLoad stepKey="waitForPageOpened"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+
         <click  selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickToAddProduct"/>
         <waitForPageLoad stepKey="waitForProductsOpened"/>
         <!--TEST CASE #1-->
@@ -328,13 +330,12 @@
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
 
             <createData entity="DefaultConfigCatalogPrice" stepKey="resetPriceScopeConfiguration"/>
-
-            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
-                <argument name="websiteName" value="{{SecondWebsite.name}}"/>
-            </actionGroup>
             <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteCartPriceRule">
                 <argument name="ruleName" value="ship"/>
             </actionGroup>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
+                <argument name="websiteName" value="{{SecondWebsite.name}}"/>
+            </actionGroup>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
     </test>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
index e4ea511efe46c..f333db0e65aa8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
@@ -58,19 +58,17 @@
         <!-- Change root category for Main Website Store. -->
         <amOnPage stepKey="s1" url="{{AdminSystemStorePage.url}}"/>
         <waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
-        <click stepKey="s2" selector="{{AdminStoresGridSection.resetButton}}"/>
-        <waitForPageLoad stepKey="waitForPageAdminStoresGridLoadAfterResetButton" time="10"/>
-        <fillField stepKey="s4" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="Main Website Store"/>
-        <click stepKey="s5" selector="{{AdminStoresGridSection.searchButton}}"/>
-        <waitForPageLoad stepKey="waitForPageAdminStoresGridLoadAfterSearchButton"/>
-        <click stepKey="s7" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" />
+        <actionGroup ref="filterStoresGridByStore" stepKey="filterStoresGridByStore">
+            <argument name="store" value="Main Website Store"/>
+        </actionGroup>
+        <click stepKey="s7" selector="{{AdminStoresGridSection.storeInFirstRow}}" />
         <waitForPageLoad stepKey="waitForPageAdminStoresGroupEditLoad" />
         <selectOption selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="{{NewRootCategory.name}}" stepKey="setNewCategoryForStoreGroup"/>
         <click selector="{{AdminNewStoreViewActionsSection.saveButton}}" stepKey="clickSaveStoreGroup"/>
         <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModalSaveStoreGroup"/>
         <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptModal" />
-        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageAdminStoresGridReload"/>
+        <waitForElementVisible selector="{{AdminStoresGridFilterSection.filters}}" stepKey="waitForPageAdminStoresGridReload"/>
         <see userInput="You saved the store." stepKey="seeSavedMessage"/>
 
         <!-- @TODO: Uncomment commented below code after MQE-903 is fixed -->
@@ -160,4 +158,4 @@
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryDefaultCategory"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessageAfterSaveDefaultCategory"/>
     </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductAvailableAfterEnablingSubCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductAvailableAfterEnablingSubCategoriesTest.xml
new file mode 100644
index 0000000000000..fe7858313c848
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductAvailableAfterEnablingSubCategoriesTest.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="StorefrontProductAvailableAfterEnablingSubCategoriesTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Show category products on storefront"/>
+            <title value="Check that parent categories are showing products after enabling subcategories"/>
+            <description value="Check that parent categories are showing products after enabling subcategories"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-13914"/>
+            <useCaseId value="MAGETWO-96489"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SubCategoryWithParent" stepKey="createSubCategory">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="is_active">false</field>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createSubCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Check anchor category is empty-->
+        <actionGroup ref="StorefrontCheckEmptyCategoryActionGroup" stepKey="checkEmptyAnchorCategory">
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="productCount" value="0"/>
+        </actionGroup>
+        <!--Enable subcategory-->
+        <actionGroup ref="AdminNavigateToCategoryInTree" stepKey="openCreatedSubCategory">
+            <argument name="category" value="$$createSubCategory$$"/>
+        </actionGroup>
+        <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="enableCategory"/>
+        <actionGroup ref="saveCategoryForm" stepKey="saveCategory"/>
+        <!--Check created product in anchor category on storefront-->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="goToCategoryStorefront"/>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="seeCreatedProduct">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
index d60130c545f10..e7054839ef4d0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest">
         <annotations>
             <features value="Purchase a product with Custom Options on different Store Views"/>
@@ -62,18 +62,23 @@
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView2">
                 <argument name="customStore" value="customStoreFR"/>
             </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearWebsitesGridFilters"/>
+
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilter"/>
+
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductsGridFilters"/>
         </after>
 
         <!-- Open Product Grid, Filter product and open -->
 
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
-
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="filterGroupedProductOptions">
             <argument name="product" value="_defaultProduct"/>
         </actionGroup>
-        <click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProductPage">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
 
         <!-- Update Product with Option Value DropDown 1-->
 
@@ -97,15 +102,12 @@
 
         <!-- Switcher to Store FR-->
 
-        <scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
-
-        <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreSwitcher"/>
-        <click selector="{{AdminProductFormActionSection.selectStoreView(customStoreFR.name)}}" stepKey="clickStoreView"/>
-        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptMessage"/>
+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchToStoreFR">
+            <argument name="scopeName" value="customStoreFR.name"/>
+        </actionGroup>
 
         <!-- Open tab Customizable Options -->
 
-        <waitForPageLoad time="10" stepKey="waitForPageLoad4"/>
         <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" visible="true" stepKey="clickIfContentTabCloses3"/>
 
         <!-- Update Option Customizable Options and Option Value 1-->
@@ -125,16 +127,13 @@
 
         <!-- Login Customer Storefront -->
 
-        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad6"/>
-        <fillField  userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
-        <fillField  userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
-        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
+        <actionGroup ref="CustomerLoginOnStorefront" stepKey="customerLogin">
+            <argument name="customer" value="$$createCustomer$$" />
+        </actionGroup>
 
         <!-- Go to Product Page -->
 
         <amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct1Page"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad7"/>
 
         <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('Custom Options 1')}}" stepKey="seeProductOptionDropDownTitle"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option1')}}" stepKey="seeproductOptionDropDownOptionTitle1"/>
@@ -153,10 +152,7 @@
         </actionGroup>
 
         <!-- Checking the correctness of displayed custom options for user parameters on checkout -->
-
-        <click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickCart"/>
-        <click selector="{{StorefrontMiniCartSection.goToCheckout}}" stepKey="goToCheckout"/>
-        <waitForPageLoad stepKey="s33"/>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
 
         <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsArea}}" visible="true" stepKey="exposeMiniCart"/>
 
@@ -174,23 +170,29 @@
 
         <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('150')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" visible="false" stepKey="exposeProductOptions1"/>
         <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" userInput="option2" stepKey="seeProductOptionValueDropdown1Input2"/>
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad8"/>
 
         <!-- Place Order -->
 
-        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder1"/>
-        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <!--Select shipping method-->
+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
+        <waitForElementVisible selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
+        <!--Select payment method-->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
+        <!-- Place Order -->
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="customerPlaceOrder">
+            <argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
+        </actionGroup>
 
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
 
         <!-- Open Order -->
 
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad9"/>
-        <fillField selector="{{OrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
-        <click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
+        <actionGroup ref="filterOrderGridById" stepKey="openOrdersGrid">
+            <argument name="orderId" value="{$grabOrderNumber}"/>
+        </actionGroup>
         <click selector="{{OrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad10"/>
 
@@ -202,14 +204,12 @@
         <!-- Switch to FR Store View Storefront -->
 
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnProduct4Page"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad11"/>
-        <click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher1"/>
-        <waitForElementVisible selector="{{StorefrontHeaderSection.storeViewDropdown}}" stepKey="waitForStoreViewDropdown1"/>
-        <click selector="{{StorefrontHeaderSection.storeViewOption(customStoreFR.code)}}" stepKey="selectStoreView1"/>
-        <waitForPageLoad stepKey="waitForPageLoad12"/>
 
-        <amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct2Page"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad13"/>
+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchStore">
+            <argument name="storeView" value="customStoreFR"/>
+        </actionGroup>
+
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="amOnProduct2Page"/>
 
         <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('FR Custom Options 1')}}" stepKey="seeProductFrOptionDropDownTitle"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('FR Custom Options 1', 'FR option1')}}" stepKey="productFrOptionDropDownOptionTitle1"/>
@@ -229,9 +229,7 @@
 
         <!-- Checking the correctness of displayed custom options for user parameters on checkout -->
 
-        <click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickCart1"/>
-        <click selector="{{StorefrontMiniCartSection.goToCheckout}}" stepKey="goToCheckout1"/>
-        <waitForPageLoad stepKey="s34"/>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart2" />
 
         <conditionalClick selector="{{CheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{CheckoutPaymentSection.cartItemsArea}}" visible="true" stepKey="exposeMiniCart1"/>
 
@@ -249,18 +247,26 @@
 
         <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemPrice('150')}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" visible="false" stepKey="exposeProductOptions3"/>
         <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemPrice('150')}}" userInput="FR option2" stepKey="seeProductFrOptionValueDropdown1Input3"/>
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext1"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad14"/>
 
         <!-- Place Order -->
 
-        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder2"/>
-        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder1"/>
+        <!--Select shipping method-->
+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod2"/>
+        <waitForElementVisible selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton2"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext2"/>
+
+        <!--Select payment method-->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod2"/>
+        <!-- Place Order -->
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="customerPlaceOrder2">
+            <argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
+        </actionGroup>
 
         <!-- Open Product Grid, Filter product and open -->
 
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage1"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad15"/>
 
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="filterGroupedProductOptions1">
             <argument name="product" value="_defaultProduct"/>
@@ -293,8 +299,7 @@
 
         <!--Go to Product Page-->
 
-        <amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct2Page2"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad20"/>
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="amOnProduct2Page2"/>
 
         <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownTitle('Custom Options 1')}}" stepKey="seeProductOptionDropDownTitle1"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productOptionDropDownOptionTitle('Custom Options 1', 'option1')}}" stepKey="seeProductOptionDropDownOptionTitle3"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
index 31ed251a34795..823e000bb9c27 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontPurchaseProductWithCustomOptionsTest">
         <annotations>
             <features value="Purchase a product with Custom Options of different types"/>
@@ -20,30 +20,36 @@
         </annotations>
         <before>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <!--Create Simple Product with Custom Options-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="price">17</field>
+            </createData>
+            <updateData createDataKey="createProduct" entity="productWithOptions" stepKey="updateProductWithOption"/>
+            <!-- Logout customer before in case of it logged in from previous test -->
+            <actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="logoutCustomer"/>
         </before>
         <after>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <!-- Delete product and category -->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderListingFilters"/>
+            <actionGroup ref="logout" stepKey="logoutAdmin"/>
+            <!-- Logout customer -->
+            <actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="logoutCustomer"/>
         </after>
 
-        <!--Create Simple Product with Custom Options-->
+        <!-- Login Customer Storefront -->
 
-        <createData entity="_defaultCategory" stepKey="createCategory"/>
-        <createData entity="_defaultProduct" stepKey="createProduct">
-            <requiredEntity createDataKey="createCategory"/>
-            <field key="price">17</field>
-        </createData>
-        <updateData createDataKey="createProduct" entity="productWithOptions" stepKey="updateProductWithOption"/>
-
-        <!-- Login Customer Storeront -->
-
-        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
-        <fillField  userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
-        <fillField userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
-        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
+        <actionGroup ref="CustomerLoginOnStorefront" stepKey="loginCustomerOnStorefront">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
 
         <!-- Checking the correctness of displayed prices for user parameters -->
 
-        <amOnPage url="{{StorefrontHomePage.url}}$createProduct.custom_attributes[url_key]$.html" stepKey="amOnProduct3Page"/>
+        <amOnPage url="{{StorefrontHomePage.url}}$$createProduct.custom_attributes[url_key]$$.html" stepKey="amOnProduct3Page"/>
 
         <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsPrice(ProductOptionField.title, ProductOptionField.price)}}" stepKey="checkFieldProductOption"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsPrice(ProductOptionArea.title, '1.7')}}" stepKey="checkAreaProductOption"/>
@@ -53,8 +59,12 @@
         <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsMultiselect(ProductOptionMultiSelect.title, ProductOptionValueMultiSelect1.price)}}" stepKey="checkMultiSelectProductOption"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsData(ProductOptionDate.title, ProductOptionDate.price)}}" stepKey="checkDataProductOption"/>
 
-        <!-- Adding items to the checkout -->
+        <!--Generate year-->
+        <generateDate date="Now" format="Y" stepKey="year"/>
+        <generateDate date="Now" format="y" stepKey="shortYear"/>
 
+        <!-- Adding items to the checkout -->
+        
         <fillField userInput="OptionField" selector="{{StorefrontProductInfoMainSection.productOptionFieldInput(ProductOptionField.title)}}" stepKey="fillProductOptionInputField"/>
         <fillField userInput="OptionArea" selector="{{StorefrontProductInfoMainSection.productOptionAreaInput(ProductOptionArea.title)}}" stepKey="fillProductOptionInputArea"/>
         <attachFile userInput="{{productWithOptions.file}}" selector="{{StorefrontProductInfoMainSection.addLinkFileUploadFile(ProductOptionFile.title)}}" stepKey="fillUploadFile"/>
@@ -64,10 +74,10 @@
         <selectOption userInput="{{ProductOptionValueMultiSelect1.price}}" selector="{{StorefrontProductInfoMainSection.productOptionSelect(ProductOptionMultiSelect.title)}}" stepKey="selectProductOptionMultiSelect"/>
         <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDataMonth(ProductOptionDate.title)}}" stepKey="selectProductOptionDate"/>
         <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDataDay(ProductOptionDate.title)}}" stepKey="selectProductOptionDate1"/>
-        <selectOption userInput="2018" selector="{{StorefrontProductInfoMainSection.productOptionDataYear(ProductOptionDate.title)}}" stepKey="selectProductOptionDate2"/>
+        <selectOption userInput="$year" selector="{{StorefrontProductInfoMainSection.productOptionDataYear(ProductOptionDate.title)}}" stepKey="selectProductOptionDate2"/>
         <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeMonth(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeMonth"/>
         <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeDay(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeDay"/>
-        <selectOption userInput="2018" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeYear(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeYear"/>
+        <selectOption userInput="$year" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeYear(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeYear"/>
         <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeHour(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeHour"/>
         <selectOption userInput="00" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeMinute(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeMinute"/>
         <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionTimeHour(ProductOptionTime.title)}}" stepKey="selectProductOptionTimeHour"/>
@@ -76,7 +86,7 @@
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="finalProductPrice"/>
 
         <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
-            <argument name="productName" value="$createProduct.name$"/>
+            <argument name="productName" value="$$createProduct.name$$"/>
         </actionGroup>
 
         <!-- Checking the correctness of displayed custom options for user parameters on checkout -->
@@ -90,26 +100,29 @@
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForCartItem"/>
         <waitForElement selector="{{CheckoutPaymentSection.cartItemsAreaActive}}" time="30" stepKey="waitForCartItemsAreaActive"/>
 
-        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$createProduct.name$" stepKey="seeProductInCart"/>
-
-        <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemName($createProduct.name$)}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($createProduct.name$)}}" visible="false" stepKey="exposeProductOptions"/>
-
-        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionField.title}}" stepKey="seeProductOptionFieldInput1"/>
-        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeProductOptionAreaInput1"/>
-        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{productWithOptions.file}}" stepKey="seeProductOptionFileInput1"/>
-        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeProductOptionValueDropdown1Input1"/>
-        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeProductOptionValueRadioButtons1Input1"/>
-        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeProductOptionValueCheckboxInput1" />
-        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeproductAttributeOptionsMultiselect1Input1" />
-        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($createProduct.name$)}}" userInput="Jan 1, 2018" stepKey="seeProductOptionDateAndTimeInput" />
-        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($createProduct.name$)}}" userInput="1/1/18, 1:00 AM" stepKey="seeProductOptionDataInput" />
-        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($createProduct.name$)}}" userInput="1:00 AM" stepKey="seeProductOptionTimeInput" />
-
+        <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$$createProduct.name$$" stepKey="seeProductInCart"/>
+
+        <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemName($$createProduct.name$$)}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($$createProduct.name$$)}}" visible="false" stepKey="exposeProductOptions"/>
+
+        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionField.title}}" stepKey="seeProductOptionFieldInput1"/>
+        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeProductOptionAreaInput1"/>
+        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{productWithOptions.file}}" stepKey="seeProductOptionFileInput1"/>
+        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeProductOptionValueDropdown1Input1"/>
+        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeProductOptionValueRadioButtons1Input1"/>
+        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeProductOptionValueCheckboxInput1" />
+        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeproductAttributeOptionsMultiselect1Input1" />
+        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="Jan 1, $year" stepKey="seeProductOptionDateAndTimeInput" />
+        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="1/1/$shortYear, 1:00 AM" stepKey="seeProductOptionDataInput" />
+        <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="1:00 AM" stepKey="seeProductOptionTimeInput" />
+        <!--Select shipping method-->
+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
         <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
+        <!--Select payment method-->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
         <!-- Place Order -->
-
-        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+        <waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
 
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
@@ -118,13 +131,11 @@
 
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
 
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
-        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
-        <fillField selector="{{OrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
-        <click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
-        <click selector="{{OrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <actionGroup ref="filterOrderGridById" stepKey="filterByOrderId">
+            <argument name="orderId" value="$grabOrderNumber"/>
+        </actionGroup>
+        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickOrderRow"/>
+        <waitForPageLoad stepKey="waitForOrderPageOpened"/>
 
         <!-- Checking the correctness of displayed custom options for user parameters on Order -->
 
@@ -135,13 +146,14 @@
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeAdminOrderProductOptionValueRadioButton1"/>
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeAdminOrderProductOptionValueCheckbox" />
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeAdminOrderproductAttributeOptionsMultiselect1" />
-        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Jan 1, 2018" stepKey="seeAdminOrderProductOptionDateAndTime" />
-        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1/1/18, 1:00 AM" stepKey="seeAdminOrderProductOptionData" />
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Jan 1, $year" stepKey="seeAdminOrderProductOptionDateAndTime" />
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1/1/$shortYear, 1:00 AM" stepKey="seeAdminOrderProductOptionData" />
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1:00 AM" stepKey="seeAdminOrderProductOptionTime" />
 
         <!-- Reorder and Checking the correctness of displayed custom options for user parameters on Order and correctness of displayed price Subtotal-->
 
         <click selector="{{OrderDetailsMainActionsSection.reorder}}" stepKey="clickReorder"/>
+        <actionGroup ref="AdminCheckoutSelectCheckMoneyOrderBillingMethodActionGroup" stepKey="selectBillingMethod"/>
         <click selector="{{AdminOrderFormActionSection.submitOrder}}" stepKey="trySubmitOrder"/>
 
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionField.title}}" stepKey="seeAdminOrderProductOptionField1" />
@@ -151,30 +163,25 @@
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeAdminOrderProductOptionValueRadioButton11"/>
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeAdminOrderProductOptionValueCheckbox1" />
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeAdminOrderproductAttributeOptionsMultiselect11" />
-        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Jan 1, 2018" stepKey="seeAdminOrderProductOptionDateAndTime1" />
-        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1/1/18, 1:00 AM" stepKey="seeAdminOrderProductOptionData1" />
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Jan 1, $year" stepKey="seeAdminOrderProductOptionDateAndTime1" />
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1/1/$shortYear, 1:00 AM" stepKey="seeAdminOrderProductOptionData1" />
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1:00 AM" stepKey="seeAdminOrderProductOptionTime1" />
 
         <see selector="{{AdminOrderTotalSection.subTotal}}" userInput="{$finalProductPrice}" stepKey="seeOrderSubTotal"/>
 
         <!-- Go to Customer Order Page and Checking the correctness of displayed custom options for user parameters on Order -->
 
-        <amOnPage url="{{StorefrontCustomerOrderViewPage.url({$grabOrderNumber})}}" stepKey="amOnProduct4Page"/>
-
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionField.title, ProductOptionField.title)}}" userInput="{{ProductOptionField.title}}" stepKey="seeStorefontOrderProductOptionField1" />
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionArea.title, ProductOptionArea.title)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeStorefontOrderProductOptionArea1"/>
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptionsFile($createProduct.name$, ProductOptionFile.title, productWithOptions.file)}}" userInput="{{productWithOptions.file}}" stepKey="seeStorefontOrderProductOptionFile1"/>
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionDropDown.title, ProductOptionValueDropdown1.title)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeStorefontOrderProductOptionValueDropdown11"/>
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionRadiobutton.title, ProductOptionValueRadioButtons1.title)}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeStorefontOrderProductOptionValueRadioButtons11"/>
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionCheckbox.title, ProductOptionValueCheckbox.title)}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeStorefontOrderProductOptionValueCheckbox1" />
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionMultiSelect.title, ProductOptionValueMultiSelect1.title)}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeStorefontOrderproductAttributeOptionsMultiselect11" />
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionDate.title, 'Jan 1, 2018')}}" userInput="Jan 1, 2018" stepKey="seeStorefontOrderProductOptionDateAndTime1" />
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionDateTime.title, '1/1/18, 1:00 AM')}}" userInput="1/1/18, 1:00 AM" stepKey="seeStorefontOrderProductOptionData1" />
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionTime.title, '1:00 AM')}}" userInput="1:00 AM" stepKey="seeStorefontOrderProductOptionTime1" />
-
-        <!-- Delete product and category -->
-
-        <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-        <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        <amOnPage url="{{StorefrontCustomerOrderViewPage.url({$grabOrderNumber})}}" stepKey="amOnOrderPage"/>
+
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionField.title, ProductOptionField.title)}}" userInput="{{ProductOptionField.title}}" stepKey="seeStorefontOrderProductOptionField1" />
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionArea.title, ProductOptionArea.title)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeStorefontOrderProductOptionArea1"/>
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptionsFile($$createProduct.name$$, ProductOptionFile.title, productWithOptions.file)}}" userInput="{{productWithOptions.file}}" stepKey="seeStorefontOrderProductOptionFile1"/>
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionDropDown.title, ProductOptionValueDropdown1.title)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeStorefontOrderProductOptionValueDropdown11"/>
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionRadiobutton.title, ProductOptionValueRadioButtons1.title)}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeStorefontOrderProductOptionValueRadioButtons11"/>
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionCheckbox.title, ProductOptionValueCheckbox.title)}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeStorefontOrderProductOptionValueCheckbox1" />
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionMultiSelect.title, ProductOptionValueMultiSelect1.title)}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeStorefontOrderproductAttributeOptionsMultiselect11" />
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionDate.title, 'Jan 1, $year')}}" userInput="Jan 1, $year" stepKey="seeStorefontOrderProductOptionDateAndTime1" />
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionDateTime.title, '1/1/$shortYear, 1:00 AM')}}" userInput="1/1/$shortYear, 1:00 AM" stepKey="seeStorefontOrderProductOptionData1" />
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($$createProduct.name$$, ProductOptionTime.title, '1:00 AM')}}" userInput="1:00 AM" stepKey="seeStorefontOrderProductOptionTime1" />
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml
index b5f7ddd8f00cf..df237e65440a8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml
@@ -55,10 +55,14 @@
         <see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$$createProduct.name$$" stepKey="seeProductInCart"/>
         <conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemName($$createProduct.name$$)}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($$createProduct.name$$)}}" visible="false" stepKey="exposeProductOptions"/>
         <see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueDropdownLongTitle1.title}}" stepKey="seeProductOptionValueDropdown1Input1"/>
+        <!--Select shipping method-->
+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
         <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
         <!-- Place Order -->
-        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPayment"/>
-        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
+        <waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
         <!-- Login to Admin and open Order -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontRememberCategoryPaginationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontRememberCategoryPaginationTest.xml
new file mode 100644
index 0000000000000..9ded627056600
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontRememberCategoryPaginationTest.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontRememberCategoryPaginationTest">
+        <annotations>
+            <title value="Verify that Number of Products per page retained when visiting a different category"/>
+            <stories value="MAGETWO-73687: Number of Products displayed per page not retained when visiting a different category"/>
+            <description value="Verify that Number of Products per page retained when visiting a different category"/>
+            <features value="Catalog"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-96307"/>
+            <group value="catalog"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <createData entity="_defaultCategory" stepKey="createCategory1"/>
+            <createData entity="SimpleProduct" stepKey="createProduct1">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+
+            <createData entity="RememberPaginationCatalogStorefrontConfig" stepKey="setRememberPaginationCatalogStorefrontConfig"/>
+            <magentoCLI command="cache:flush" stepKey="clearCache"/>
+        </before>
+
+        <after>
+            <createData entity="DefaultCatalogStorefrontConfiguration" stepKey="setDefaultCatalogStorefrontConfiguration"/>
+
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="createCategory1" stepKey="deleteCategory1"/>
+
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </after>
+
+        <actionGroup ref="GoToStorefrontCategoryPageByParameters" stepKey="goToStorefrontCategory1Page">
+            <argument name="category" value="$$createCategory.name$$"/>
+            <argument name="mode" value="grid"/>
+        </actionGroup>
+
+        <selectOption selector="{{StorefrontCategoryPagerSection.perPage}}" userInput="12" stepKey="setPerPage" />
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+
+        <actionGroup ref="VerifyCategoryPageParameters" stepKey="verifyCategoryPageParameters">
+            <argument name="categoryName" value="$$createCategory.name$$"/>
+            <argument name="mode" value="grid"/>
+            <argument name="numOfProductsPerPage" value="12"/>
+        </actionGroup>
+
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory1.name$$)}}" stepKey="navigateToCategory1Page"/>
+        <waitForPageLoad stepKey="waitForCategory1PageToLoad"/>
+
+        <actionGroup ref="VerifyCategoryPageParameters" stepKey="verifyCategory1PageParameters">
+            <argument name="categoryName" value="$$createCategory1.name$$"/>
+            <argument name="mode" value="grid"/>
+            <argument name="numOfProductsPerPage" value="12"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml
new file mode 100644
index 0000000000000..b9308edbb387f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.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="StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest">
+        <annotations>
+            <features value="Catalog"/>
+            <title value="Check that special price displayed when 'default config' scope timezone does not match 'website' scope timezone"/>
+            <description value="Check that special price displayed when 'default config' scope timezone does not match 'website' scope timezone"/>
+            <stories value="Verify product special price"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-13788"/>
+            <useCaseId value="MAGETWO-95452"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <createData entity="SimpleProduct3" stepKey="createProduct"/>
+
+            <!--Create customer-->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+
+            <!--Set timezone for default config-->
+            <amOnPage url="{{AdminConfigurationGeneralSectionPage.url('#general_locale-link')}}" stepKey="openLocaleSection"/>
+            <selectOption selector="{{LocaleOptionsSection.timezone}}" userInput="Central European Standard Time (Europe/Paris)" stepKey="setTimezone"/>
+            <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfig"/>
+            <!--Set timezone for Main Website-->
+            <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="adminSwitchStoreViewActionGroup">
+                <argument name="scopeName" value="_defaultWebsite.name"/>
+            </actionGroup>
+            <uncheckOption selector="{{LocaleOptionsSection.useDefault}}"  stepKey="uncheckUseDefault"/>
+            <selectOption selector="{{LocaleOptionsSection.timezone}}" userInput="Greenwich Mean Time (Africa/Abidjan)" stepKey="setTimezone1"/>
+            <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfig1"/>
+        </before>
+        <after>
+            <!--Delete create data-->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+
+            <!--Reset timezone-->
+            <amOnPage url="{{AdminConfigurationGeneralSectionPage.url('#general_locale-link')}}" stepKey="openLocaleSectionReset"/>
+            <selectOption selector="{{LocaleOptionsSection.timezone}}" userInput="{{_ENV.DEFAULT_TIMEZONE}}" stepKey="resetTimezone"/>
+            <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfigReset"/>
+
+            <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="AdminSwitchStoreViewActionGroup">
+                <argument name="scopeName" value="_defaultWebsite.name"/>
+            </actionGroup>
+            <checkOption selector="{{LocaleOptionsSection.useDefault}}"  stepKey="checkUseDefault"/>
+            <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfigReset1"/>
+
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Set special price to created product-->
+        <amOnPage url="{{AdminProductEditPage.url($$createProduct.id$$)}}" stepKey="openAdminEditPage"/>
+        <actionGroup ref="AddSpecialPriceToProductActionGroup" stepKey="setSpecialPriceToCreatedProduct">
+            <argument name="price" value="15"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
+
+        <!--Login to storefront from customer and check price-->
+        <actionGroup ref="CustomerLoginOnStorefront" stepKey="logInFromCustomer">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <!--Go to the product page and check special price-->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.specialPriceValue}}" userInput='$15.00' stepKey="assertSpecialPrice"/>
+     </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
index 249c32ff276c3..4a20dfd98ab3c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
@@ -9,6 +9,7 @@
 use Magento\Catalog\Model\Entity\Attribute;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Phrase;
+use Magento\MediaStorage\Helper\File\Storage\Database;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -50,6 +51,11 @@ class ContentTest extends \PHPUnit\Framework\TestCase
      */
     protected $imageHelper;
 
+    /**
+     * @var \Magento\MediaStorage\Helper\File\Storage\Database|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $databaseMock;
+
     /**
      * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
      */
@@ -71,13 +77,18 @@ public function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->databaseMock = $this->getMockBuilder(Database::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->content = $this->objectManager->getObject(
             \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content::class,
             [
                 'mediaConfig' => $this->mediaConfigMock,
                 'jsonEncoder' => $this->jsonEncoderMock,
-                'filesystem' => $this->fileSystemMock
+                'filesystem' => $this->fileSystemMock,
+                'fileStorageDatabase' => $this->databaseMock
             ]
         );
     }
@@ -143,6 +154,13 @@ public function testGetImagesJson()
         $this->readMock->expects($this->any())->method('stat')->willReturnMap($sizeMap);
         $this->jsonEncoderMock->expects($this->once())->method('encode')->willReturnCallback('json_encode');
 
+        $this->readMock->expects($this->any())
+            ->method('isFile')
+            ->will($this->returnValue(true));
+        $this->databaseMock->expects($this->any())
+            ->method('checkDbUsage')
+            ->will($this->returnValue(false));
+
         $this->assertSame(json_encode($imagesResult), $this->content->getImagesJson());
     }
 
@@ -221,6 +239,13 @@ public function testGetImagesJsonWithException()
         $this->imageHelper->expects($this->any())->method('getDefaultPlaceholderUrl')->willReturn($placeholderUrl);
         $this->jsonEncoderMock->expects($this->once())->method('encode')->willReturnCallback('json_encode');
 
+        $this->readMock->expects($this->any())
+            ->method('isFile')
+            ->will($this->returnValue(true));
+        $this->databaseMock->expects($this->any())
+            ->method('checkDbUsage')
+            ->will($this->returnValue(false));
+
         $this->assertSame(json_encode($imagesResult), $this->content->getImagesJson());
     }
 
@@ -365,4 +390,52 @@ private function getMediaAttribute(string $label, string $attributeCode)
 
         return $mediaAttribute;
     }
+
+    /**
+     * Test GetImagesJson() calls MediaStorage functions to obtain image from DB prior to stat call
+     *
+     * @return void
+     */
+    public function testGetImagesJsonMediaStorageMode()
+    {
+        $images = [
+            'images' => [
+                [
+                    'value_id' => '0',
+                    'file' => 'file_1.jpg',
+                    'media_type' => 'image',
+                    'position' => '0'
+                ]
+            ]
+        ];
+
+        $mediaPath = [
+            ['file_1.jpg', 'catalog/product/image_1.jpg']
+        ];
+
+        $this->content->setElement($this->galleryMock);
+
+        $this->galleryMock->expects($this->once())
+            ->method('getImages')
+            ->willReturn($images);
+        $this->fileSystemMock->expects($this->once())
+            ->method('getDirectoryRead')
+            ->willReturn($this->readMock);
+        $this->mediaConfigMock->expects($this->any())
+            ->method('getMediaPath')
+            ->willReturnMap($mediaPath);
+
+        $this->readMock->expects($this->any())
+            ->method('isFile')
+            ->will($this->returnValue(false));
+        $this->databaseMock->expects($this->any())
+            ->method('checkDbUsage')
+            ->will($this->returnValue(true));
+
+        $this->databaseMock->expects($this->once())
+            ->method('saveFileToFilesystem')
+            ->with('catalog/product/image_1.jpg');
+
+        $this->content->getImagesJson();
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php
index ac963326dbfa1..1a6c25bbce2d0 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php
@@ -18,6 +18,11 @@ class ToolbarTest extends \PHPUnit\Framework\TestCase
      */
     protected $model;
 
+    /**
+     * @var \Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $memorizer;
+
     /**
      * @var \Magento\Framework\Url | \PHPUnit_Framework_MockObject_MockObject
      */
@@ -62,6 +67,16 @@ protected function setUp()
                 'getLimit',
                 'getCurrentPage'
             ]);
+        $this->memorizer = $this->createPartialMock(
+            \Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer::class,
+            [
+                'getDirection',
+                'getOrder',
+                'getMode',
+                'getLimit',
+                'isMemorizingAllowed',
+            ]
+        );
         $this->layout = $this->createPartialMock(\Magento\Framework\View\Layout::class, ['getChildName', 'getBlock']);
         $this->pagerBlock = $this->createPartialMock(\Magento\Theme\Block\Html\Pager::class, [
                 'setUseContainer',
@@ -116,6 +131,7 @@ protected function setUp()
                 'context' => $context,
                 'catalogConfig' => $this->catalogConfig,
                 'toolbarModel' => $this->model,
+                'toolbarMemorizer' => $this->memorizer,
                 'urlEncoder' => $this->urlEncoder,
                 'productListHelper' => $this->productListHelper
             ]
@@ -155,7 +171,7 @@ public function testGetPagerEncodedUrl()
     public function testGetCurrentOrder()
     {
         $order = 'price';
-        $this->model->expects($this->once())
+        $this->memorizer->expects($this->once())
             ->method('getOrder')
             ->will($this->returnValue($order));
         $this->catalogConfig->expects($this->once())
@@ -169,7 +185,7 @@ public function testGetCurrentDirection()
     {
         $direction = 'desc';
 
-        $this->model->expects($this->once())
+        $this->memorizer->expects($this->once())
             ->method('getDirection')
             ->will($this->returnValue($direction));
 
@@ -183,7 +199,7 @@ public function testGetCurrentMode()
         $this->productListHelper->expects($this->once())
             ->method('getAvailableViewMode')
             ->will($this->returnValue(['list' => 'List']));
-        $this->model->expects($this->once())
+        $this->memorizer->expects($this->once())
             ->method('getMode')
             ->will($this->returnValue($mode));
 
@@ -232,11 +248,11 @@ public function testGetLimit()
         $mode = 'list';
         $limit = 10;
 
-        $this->model->expects($this->once())
+        $this->memorizer->expects($this->once())
             ->method('getMode')
             ->will($this->returnValue($mode));
 
-        $this->model->expects($this->once())
+        $this->memorizer->expects($this->once())
             ->method('getLimit')
             ->will($this->returnValue($limit));
         $this->productListHelper->expects($this->once())
@@ -266,7 +282,7 @@ public function testGetPagerHtml()
         $this->productListHelper->expects($this->exactly(2))
             ->method('getAvailableLimit')
             ->will($this->returnValue([10 => 10, 20 => 20]));
-        $this->model->expects($this->once())
+        $this->memorizer->expects($this->once())
             ->method('getLimit')
             ->will($this->returnValue($limit));
         $this->pagerBlock->expects($this->once())
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/AttributesTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/AttributesTest.php
index 4602a0d99f6f1..2310b1f8b871c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/AttributesTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/AttributesTest.php
@@ -125,17 +125,28 @@ protected function setUp()
     }
 
     /**
+     * Get attribute with no value phrase
+     *
+     * @param string $phrase
      * @return void
+     * @dataProvider noValueProvider
      */
-    public function testGetAttributeNoValue()
+    public function testGetAttributeNoValue(string $phrase)
     {
-        $this->phrase = '';
-        $this->frontendAttribute
-            ->expects($this->any())
-            ->method('getValue')
-            ->willReturn($this->phrase);
+        $this->frontendAttribute->method('getValue')
+            ->willReturn($phrase);
         $attributes = $this->attributesBlock->getAdditionalData();
-        $this->assertTrue(empty($attributes['phrase']));
+        $this->assertArrayNotHasKey('phrase', $attributes);
+    }
+
+    /**
+     * No value data provider
+     *
+     * @return array
+     */
+    public function noValueProvider(): array
+    {
+        return [[' '], ['']];
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryOptionsTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryOptionsTest.php
new file mode 100644
index 0000000000000..102b810b0e0a8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryOptionsTest.php
@@ -0,0 +1,223 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Test\Unit\Block\Product\View;
+
+use Magento\Catalog\Block\Product\Context;
+use Magento\Catalog\Block\Product\View\Gallery;
+use Magento\Catalog\Block\Product\View\GalleryOptions;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Config;
+use Magento\Framework\Config\View;
+use Magento\Framework\Serialize\Serializer\Json;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class GalleryOptionsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var GalleryOptions
+     */
+    private $model;
+
+    /**
+     * @var Gallery|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $gallery;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
+    /**
+     * @var Json
+     */
+    private $jsonSerializer;
+
+    /**
+     * @var View|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configView;
+
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $viewConfig;
+
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->escaper =  $objectManager->getObject(Escaper::class);
+        $this->configView = $this->createMock(View::class);
+
+        $this->viewConfig = $this->createConfiguredMock(
+            Config::class,
+            [
+              'getViewConfig' => $this->configView
+            ]
+        );
+
+        $this->context = $this->createConfiguredMock(
+            Context::class,
+            [
+              'getEscaper' => $this->escaper,
+              'getViewConfig' => $this->viewConfig
+            ]
+        );
+
+        $this->gallery = $this->createMock(Gallery::class);
+
+        $this->jsonSerializer = $objectManager->getObject(
+            Json::class
+        );
+
+        $this->model =  $objectManager->getObject(GalleryOptions::class, [
+            'context' => $this->context,
+            'jsonSerializer' => $this->jsonSerializer,
+            'gallery' => $this->gallery
+        ]);
+    }
+
+    public function testGetOptionsJson()
+    {
+        $configMap = [
+            ['Magento_Catalog', 'gallery/nav', 'thumbs'],
+            ['Magento_Catalog', 'gallery/loop', false],
+            ['Magento_Catalog', 'gallery/keyboard', true],
+            ['Magento_Catalog', 'gallery/arrows', true],
+            ['Magento_Catalog', 'gallery/caption', false],
+            ['Magento_Catalog', 'gallery/allowfullscreen', true],
+            ['Magento_Catalog', 'gallery/navdir', 'horizontal'],
+            ['Magento_Catalog', 'gallery/navarrows', true],
+            ['Magento_Catalog', 'gallery/navtype', 'slides'],
+            ['Magento_Catalog', 'gallery/thumbmargin', '5'],
+            ['Magento_Catalog', 'gallery/transition/effect', 'slide'],
+            ['Magento_Catalog', 'gallery/transition/duration', '500'],
+        ];
+
+        $imageAttributesMap = [
+            ['product_page_image_medium','height',null, 100],
+            ['product_page_image_medium','width',null, 200],
+            ['product_page_image_small','height',null, 300],
+            ['product_page_image_small','width',null, 400]
+        ];
+
+        $this->configView->expects($this->any())
+            ->method('getVarValue')
+            ->will($this->returnValueMap($configMap));
+        $this->gallery->expects($this->any())
+            ->method('getImageAttribute')
+            ->will($this->returnValueMap($imageAttributesMap));
+
+        $json = $this->model->getOptionsJson();
+
+        $decodedJson = $this->jsonSerializer->unserialize($json);
+
+        $this->assertSame('thumbs', $decodedJson['nav']);
+        $this->assertSame(false, $decodedJson['loop']);
+        $this->assertSame(true, $decodedJson['keyboard']);
+        $this->assertSame(true, $decodedJson['arrows']);
+        $this->assertSame(false, $decodedJson['showCaption']);
+        $this->assertSame(true, $decodedJson['allowfullscreen']);
+        $this->assertSame('horizontal', $decodedJson['navdir']);
+        $this->assertSame(true, $decodedJson['navarrows']);
+        $this->assertSame('slides', $decodedJson['navtype']);
+        $this->assertSame(5, $decodedJson['thumbmargin']);
+        $this->assertSame('slide', $decodedJson['transition']);
+        $this->assertSame(500, $decodedJson['transitionduration']);
+        $this->assertSame(100, $decodedJson['height']);
+        $this->assertSame(200, $decodedJson['width']);
+        $this->assertSame(300, $decodedJson['thumbheight']);
+        $this->assertSame(400, $decodedJson['thumbwidth']);
+    }
+
+    public function testGetFSOptionsJson()
+    {
+        $configMap = [
+            ['Magento_Catalog', 'gallery/fullscreen/nav', false],
+            ['Magento_Catalog', 'gallery/fullscreen/loop', true],
+            ['Magento_Catalog', 'gallery/fullscreen/keyboard', true],
+            ['Magento_Catalog', 'gallery/fullscreen/arrows', false],
+            ['Magento_Catalog', 'gallery/fullscreen/caption', true],
+            ['Magento_Catalog', 'gallery/fullscreen/navdir', 'vertical'],
+            ['Magento_Catalog', 'gallery/fullscreen/navarrows', false],
+            ['Magento_Catalog', 'gallery/fullscreen/navtype', 'thumbs'],
+            ['Magento_Catalog', 'gallery/fullscreen/thumbmargin', '10'],
+            ['Magento_Catalog', 'gallery/fullscreen/transition/effect', 'dissolve'],
+            ['Magento_Catalog', 'gallery/fullscreen/transition/duration', '300']
+        ];
+
+        $this->configView->expects($this->any())
+            ->method('getVarValue')
+            ->will($this->returnValueMap($configMap));
+
+        $json = $this->model->getFSOptionsJson();
+
+        $decodedJson = $this->jsonSerializer->unserialize($json);
+
+        //Note, this tests the special case for nav variable set to false. It
+        //Should not be converted to boolean.
+        $this->assertSame('false', $decodedJson['nav']);
+        $this->assertSame(true, $decodedJson['loop']);
+        $this->assertSame(false, $decodedJson['arrows']);
+        $this->assertSame(true, $decodedJson['keyboard']);
+        $this->assertSame(true, $decodedJson['showCaption']);
+        $this->assertSame('vertical', $decodedJson['navdir']);
+        $this->assertSame(false, $decodedJson['navarrows']);
+        $this->assertSame(10, $decodedJson['thumbmargin']);
+        $this->assertSame('thumbs', $decodedJson['navtype']);
+        $this->assertSame('dissolve', $decodedJson['transition']);
+        $this->assertSame(300, $decodedJson['transitionduration']);
+    }
+
+    public function testGetOptionsJsonOptionals()
+    {
+        $configMap = [
+            ['Magento_Catalog', 'gallery/fullscreen/thumbmargin', false],
+            ['Magento_Catalog', 'gallery/fullscreen/transition/duration', false]
+        ];
+
+        $this->configView->expects($this->any())
+            ->method('getVarValue')
+            ->will($this->returnValueMap($configMap));
+
+        $json = $this->model->getOptionsJson();
+
+        $decodedJson = $this->jsonSerializer->unserialize($json);
+
+        $this->assertArrayNotHasKey('thumbmargin', $decodedJson);
+        $this->assertArrayNotHasKey('transitionduration', $decodedJson);
+    }
+
+    public function testGetFSOptionsJsonOptionals()
+    {
+        $configMap = [
+            ['Magento_Catalog', 'gallery/fullscreen/keyboard', false],
+            ['Magento_Catalog', 'gallery/fullscreen/thumbmargin', false],
+            ['Magento_Catalog', 'gallery/fullscreen/transition/duration', false]
+        ];
+
+        $this->configView->expects($this->any())
+            ->method('getVarValue')
+            ->will($this->returnValueMap($configMap));
+
+        $json = $this->model->getFSOptionsJson();
+
+        $decodedJson = $this->jsonSerializer->unserialize($json);
+
+        $this->assertArrayNotHasKey('thumbmargin', $decodedJson);
+        $this->assertArrayNotHasKey('keyboard', $decodedJson);
+        $this->assertArrayNotHasKey('transitionduration', $decodedJson);
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ViewTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ViewTest.php
index 51bda60b419d0..bb5641fd277ff 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/ViewTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/ViewTest.php
@@ -67,23 +67,18 @@ public function testGetIdentities()
     {
         $productTags = ['cat_p_1'];
         $product = $this->createMock(\Magento\Catalog\Model\Product::class);
-        $category = $this->createMock(\Magento\Catalog\Model\Category::class);
 
         $product->expects($this->once())
             ->method('getIdentities')
             ->will($this->returnValue($productTags));
-        $category->expects($this->once())
-            ->method('getId')
-            ->will($this->returnValue(1));
         $this->registryMock->expects($this->any())
             ->method('registry')
             ->will($this->returnValueMap(
                 [
                     ['product', $product],
-                    ['current_category', $category],
                 ]
             )
         );
-        $this->assertEquals(['cat_p_1', 'cat_c_1'], $this->view->getIdentities());
+        $this->assertEquals($productTags, $this->view->getIdentities());
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/DeleteTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/DeleteTest.php
index 196b4df5b47c0..2cae2c07cc85a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/DeleteTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/DeleteTest.php
@@ -42,8 +42,9 @@ protected function setUp()
             false,
             true,
             true,
-            ['getParam', 'getPost']
+            ['getParam', 'getPost', 'isPost']
         );
+        $this->request->expects($this->any())->method('isPost')->willReturn(true);
         $auth = $this->createPartialMock(\Magento\Backend\Model\Auth::class, ['getAuthStorage']);
         $this->authStorage = $this->createPartialMock(
             \Magento\Backend\Model\Auth\StorageInterface::class,
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/MoveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/MoveTest.php
index d729d0ffbdccc..3d5150fcc9f7e 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
@@ -83,9 +83,10 @@ private function fillContext()
     {
         $this->request = $this
             ->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
-            ->setMethods(['getPost'])
+            ->setMethods(['getPost', 'isPost'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
+        $this->request->expects($this->any())->method('isPost')->willReturn(true);
         $this->context->expects($this->once())->method('getRequest')->will($this->returnValue($this->request));
         $this->messageManager = $this->createMock(ManagerInterface::class);
         $this->context->expects($this->once())->method('getMessageManager')->willReturn($this->messageManager);
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php
index de44af7f58afc..9dd0f6ef3ff71 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php
@@ -229,6 +229,8 @@ protected function prepareContext()
         $this->objectManager->expects($this->any())->method('get')->will($this->returnValueMap([
             [\Magento\CatalogInventory\Api\StockConfigurationInterface::class, $this->stockConfig],
         ]));
+
+        $this->request->expects($this->any())->method('isPost')->willReturn(true);
     }
 
     public function testExecuteThatProductIdsAreObtainedFromAttributeHelper()
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php
deleted file mode 100644
index f493cbc88f18e..0000000000000
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\Attribute;
-
-use Magento\Catalog\Controller\Adminhtml\Product\Attribute\Save;
-use Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\AttributeTest;
-use Magento\Catalog\Model\Product\AttributeSet\BuildFactory;
-use Magento\Catalog\Model\Product\AttributeSet\Build;
-use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
-use Magento\Eav\Api\Data\AttributeSetInterface;
-use Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\ValidatorFactory;
-use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
-use Magento\Framework\Filter\FilterManager;
-use Magento\Catalog\Helper\Product as ProductHelper;
-use Magento\Framework\View\LayoutFactory;
-use Magento\Backend\Model\View\Result\Redirect as ResultRedirect;
-use Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\Validator as InputTypeValidator;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class SaveTest extends AttributeTest
-{
-    /**
-     * @var BuildFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $buildFactoryMock;
-
-    /**
-     * @var FilterManager|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $filterManagerMock;
-
-    /**
-     * @var ProductHelper|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $productHelperMock;
-
-    /**
-     * @var AttributeFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $attributeFactoryMock;
-
-    /**
-     * @var ValidatorFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $validatorFactoryMock;
-
-    /**
-     * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $groupCollectionFactoryMock;
-
-    /**
-     * @var LayoutFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $layoutFactoryMock;
-
-    /**
-     * @var ResultRedirect|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $redirectMock;
-
-    /**
-     * @var AttributeSet|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $attributeSetMock;
-
-    /**
-     * @var Build|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $builderMock;
-
-    /**
-     * @var InputTypeValidator|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $inputTypeValidatorMock;
-
-    protected function setUp()
-    {
-        parent::setUp();
-        $this->buildFactoryMock = $this->getMockBuilder(BuildFactory::class)
-            ->setMethods(['create'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->filterManagerMock = $this->getMockBuilder(FilterManager::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->productHelperMock = $this->getMockBuilder(ProductHelper::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->attributeFactoryMock = $this->getMockBuilder(AttributeFactory::class)
-            ->setMethods(['create'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->validatorFactoryMock = $this->getMockBuilder(ValidatorFactory::class)
-            ->setMethods(['create'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->groupCollectionFactoryMock = $this->getMockBuilder(CollectionFactory::class)
-            ->setMethods(['create'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->layoutFactoryMock = $this->getMockBuilder(LayoutFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->redirectMock = $this->getMockBuilder(ResultRedirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->attributeSetMock = $this->getMockBuilder(AttributeSetInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->builderMock = $this->getMockBuilder(Build::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->inputTypeValidatorMock = $this->getMockBuilder(InputTypeValidator::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->buildFactoryMock->expects($this->any())
-            ->method('create')
-            ->willReturn($this->builderMock);
-        $this->validatorFactoryMock->expects($this->any())
-            ->method('create')
-            ->willReturn($this->inputTypeValidatorMock);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getModel()
-    {
-        return $this->objectManager->getObject(Save::class, [
-            'context' => $this->contextMock,
-            'attributeLabelCache' => $this->attributeLabelCacheMock,
-            'coreRegistry' => $this->coreRegistryMock,
-            'resultPageFactory' => $this->resultPageFactoryMock,
-            'buildFactory' => $this->buildFactoryMock,
-            'filterManager' => $this->filterManagerMock,
-            'productHelper' => $this->productHelperMock,
-            'attributeFactory' => $this->attributeFactoryMock,
-            'validatorFactory' => $this->validatorFactoryMock,
-            'groupCollectionFactory' => $this->groupCollectionFactoryMock,
-            'layoutFactory' => $this->layoutFactoryMock,
-        ]);
-    }
-
-    public function testExecuteWithEmptyData()
-    {
-        $this->requestMock->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn([]);
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($this->redirectMock);
-        $this->redirectMock->expects($this->any())
-            ->method('setPath')
-            ->willReturnSelf();
-
-        $this->assertInstanceOf(ResultRedirect::class, $this->getModel()->execute());
-    }
-
-    public function testExecute()
-    {
-        $data = [
-            'new_attribute_set_name' => 'Test attribute set name',
-            'frontend_input' => 'test_frontend_input',
-        ];
-
-        $this->requestMock->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn($data);
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($this->redirectMock);
-        $this->redirectMock->expects($this->any())
-            ->method('setPath')
-            ->willReturnSelf();
-        $this->builderMock->expects($this->once())
-            ->method('setEntityTypeId')
-            ->willReturnSelf();
-        $this->builderMock->expects($this->once())
-            ->method('setSkeletonId')
-            ->willReturnSelf();
-        $this->builderMock->expects($this->once())
-            ->method('setName')
-            ->willReturnSelf();
-        $this->builderMock->expects($this->once())
-            ->method('getAttributeSet')
-            ->willReturn($this->attributeSetMock);
-        $this->requestMock->expects($this->any())
-            ->method('getParam')
-            ->willReturnMap([
-                ['set', null, 1],
-                ['attribute_code', null, 'test_attribute_code']
-            ]);
-        $this->inputTypeValidatorMock->expects($this->once())
-            ->method('getMessages')
-            ->willReturn([]);
-
-        $this->assertInstanceOf(ResultRedirect::class, $this->getModel()->execute());
-    }
-}
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 9c747393cc72a..750d38f60e13d 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
@@ -9,6 +9,7 @@
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\AttributeTest;
 use Magento\Eav\Model\Entity\Attribute\Set as AttributeSet;
+use Magento\Framework\Serialize\Serializer\FormData;
 use Magento\Framework\Controller\Result\Json as ResultJson;
 use Magento\Framework\Controller\Result\JsonFactory as ResultJsonFactory;
 use Magento\Framework\Escaper;
@@ -61,6 +62,11 @@ class ValidateTest extends AttributeTest
      */
     protected $layoutMock;
 
+    /**
+     * @var FormData|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $formDataSerializer;
+
     protected function setUp()
     {
         parent::setUp();
@@ -86,6 +92,9 @@ protected function setUp()
             ->getMock();
         $this->layoutMock = $this->getMockBuilder(LayoutInterface::class)
             ->getMockForAbstractClass();
+        $this->formDataSerializer = $this->getMockBuilder(FormData::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->contextMock->expects($this->any())
             ->method('getObjectManager')
@@ -100,25 +109,28 @@ protected function getModel()
         return $this->objectManager->getObject(
             Validate::class,
             [
-            'context' => $this->contextMock,
-            'attributeLabelCache' => $this->attributeLabelCacheMock,
-            'coreRegistry' => $this->coreRegistryMock,
-            'resultPageFactory' => $this->resultPageFactoryMock,
-            'resultJsonFactory' => $this->resultJsonFactoryMock,
-            'layoutFactory' => $this->layoutFactoryMock,
-            'multipleAttributeList' => ['select' => 'option']
+                'context' => $this->contextMock,
+                'attributeLabelCache' => $this->attributeLabelCacheMock,
+                'coreRegistry' => $this->coreRegistryMock,
+                'resultPageFactory' => $this->resultPageFactoryMock,
+                'resultJsonFactory' => $this->resultJsonFactoryMock,
+                'layoutFactory' => $this->layoutFactoryMock,
+                'multipleAttributeList' => ['select' => 'option'],
+                'formDataSerializer' => $this->formDataSerializer,
             ]
         );
     }
 
     public function testExecute()
     {
+        $serializedOptions = '{"key":"value"}';
         $this->requestMock->expects($this->any())
             ->method('getParam')
             ->willReturnMap([
                 ['frontend_label', null, 'test_frontend_label'],
                 ['attribute_code', null, 'test_attribute_code'],
                 ['new_attribute_set_name', null, 'test_attribute_set_name'],
+                ['serialized_options', '[]', $serializedOptions],
             ]);
         $this->objectManagerMock->expects($this->exactly(2))
             ->method('create')
@@ -160,6 +172,7 @@ public function testExecute()
      */
     public function testUniqueValidation(array $options, $isError)
     {
+        $serializedOptions = '{"key":"value"}';
         $countFunctionCalls = ($isError) ? 6 : 5;
         $this->requestMock->expects($this->exactly($countFunctionCalls))
             ->method('getParam')
@@ -167,10 +180,15 @@ public function testUniqueValidation(array $options, $isError)
                 ['frontend_label', null, null],
                 ['attribute_code', null, "test_attribute_code"],
                 ['new_attribute_set_name', null, 'test_attribute_set_name'],
-                ['option', null, $options],
-                ['message_key', null, Validate::DEFAULT_MESSAGE_KEY]
+                ['message_key', null, Validate::DEFAULT_MESSAGE_KEY],
+                ['serialized_options', '[]', $serializedOptions],
             ]);
 
+        $this->formDataSerializer->expects($this->once())
+            ->method('unserialize')
+            ->with($serializedOptions)
+            ->willReturn($options);
+
         $this->objectManagerMock->expects($this->once())
             ->method('create')
             ->willReturn($this->attributeMock);
@@ -203,68 +221,84 @@ public function provideUniqueData()
         return [
             'no values' => [
                 [
-                    'delete' => [
-                        "option_0" => "",
-                        "option_1" => "",
-                        "option_2" => "",
-                    ]
-                ], false
+                    'option' => [
+                        'delete' => [
+                            "option_0" => "",
+                            "option_1" => "",
+                            "option_2" => "",
+                        ],
+                    ],
+
+                ],
+                false,
             ],
             'valid options' => [
                 [
-                    'value' => [
-                        "option_0" => [1, 0],
-                        "option_1" => [2, 0],
-                        "option_2" => [3, 0],
+                    'option' => [
+                        'value' => [
+                            "option_0" => [1, 0],
+                            "option_1" => [2, 0],
+                            "option_2" => [3, 0],
+                        ],
+                        'delete' => [
+                            "option_0" => "",
+                            "option_1" => "",
+                            "option_2" => "",
+                        ],
                     ],
-                    'delete' => [
-                        "option_0" => "",
-                        "option_1" => "",
-                        "option_2" => "",
-                    ]
-                ], false
+                ],
+                false,
             ],
             'duplicate options' => [
                 [
-                    'value' => [
-                        "option_0" => [1, 0],
-                        "option_1" => [1, 0],
-                        "option_2" => [3, 0],
+                    'option' => [
+                        'value' => [
+                            "option_0" => [1, 0],
+                            "option_1" => [1, 0],
+                            "option_2" => [3, 0],
+                        ],
+                        'delete' => [
+                            "option_0" => "",
+                            "option_1" => "",
+                            "option_2" => "",
+                        ],
                     ],
-                    'delete' => [
-                        "option_0" => "",
-                        "option_1" => "",
-                        "option_2" => "",
-                    ]
-                ], true
+                ],
+                true,
             ],
             'duplicate and deleted' => [
                 [
-                    'value' => [
-                        "option_0" => [1, 0],
-                        "option_1" => [1, 0],
-                        "option_2" => [3, 0],
+                    'option' => [
+                        'value' => [
+                            "option_0" => [1, 0],
+                            "option_1" => [1, 0],
+                            "option_2" => [3, 0],
+                        ],
+                        'delete' => [
+                            "option_0" => "",
+                            "option_1" => "1",
+                            "option_2" => "",
+                        ],
                     ],
-                    'delete' => [
-                        "option_0" => "",
-                        "option_1" => "1",
-                        "option_2" => "",
-                    ]
-                ], false
+                ],
+                false,
             ],
             'empty and deleted' => [
                 [
-                    'value' => [
-                        "option_0" => [1, 0],
-                        "option_1" => [2, 0],
-                        "option_2" => ["", ""],
+                    'option' => [
+                        'value' => [
+                            "option_0" => [1, 0],
+                            "option_1" => [2, 0],
+                            "option_2" => ["", ""],
+                        ],
+                        'delete' => [
+                            "option_0" => "",
+                            "option_1" => "",
+                            "option_2" => "1",
+                        ],
                     ],
-                    'delete' => [
-                        "option_0" => "",
-                        "option_1" => "",
-                        "option_2" => "1",
-                    ]
-                ], false
+                ],
+                false,
             ],
         ];
     }
@@ -278,6 +312,7 @@ public function provideUniqueData()
      */
     public function testEmptyOption(array $options, $result)
     {
+        $serializedOptions = '{"key":"value"}';
         $this->requestMock->expects($this->any())
             ->method('getParam')
             ->willReturnMap([
@@ -285,10 +320,15 @@ public function testEmptyOption(array $options, $result)
                 ['frontend_input', 'select', 'multipleselect'],
                 ['attribute_code', null, "test_attribute_code"],
                 ['new_attribute_set_name', null, 'test_attribute_set_name'],
-                ['option', null, $options],
                 ['message_key', Validate::DEFAULT_MESSAGE_KEY, 'message'],
+                ['serialized_options', '[]', $serializedOptions],
             ]);
 
+        $this->formDataSerializer->expects($this->once())
+            ->method('unserialize')
+            ->with($serializedOptions)
+            ->willReturn($options);
+
         $this->objectManagerMock->expects($this->once())
             ->method('create')
             ->willReturn($this->attributeMock);
@@ -320,32 +360,38 @@ public function provideEmptyOption()
         return [
             'empty admin scope options' => [
                 [
-                    'value' => [
-                        "option_0" => [''],
+                    'option' => [
+                        'value' => [
+                            "option_0" => [''],
+                        ],
                     ],
                 ],
                 (object) [
                     'error' => true,
                     'message' => 'The value of Admin scope can\'t be empty.',
-                ]
+                ],
             ],
             'not empty admin scope options' => [
                 [
-                    'value' => [
-                        "option_0" => ['asdads'],
+                    'option' => [
+                        'value' => [
+                            "option_0" => ['asdads'],
+                        ],
                     ],
                 ],
                 (object) [
                     'error' => false,
-                ]
+                ],
             ],
             'empty admin scope options and deleted' => [
                 [
-                    'value' => [
-                        "option_0" => [''],
-                    ],
-                    'delete' => [
-                        'option_0' => '1',
+                    'option' => [
+                        'value' => [
+                            "option_0" => [''],
+                        ],
+                        'delete' => [
+                            'option_0' => '1',
+                        ],
                     ],
                 ],
                 (object) [
@@ -354,11 +400,13 @@ public function provideEmptyOption()
             ],
             'empty admin scope options and not deleted' => [
                 [
-                    'value' => [
-                        "option_0" => [''],
-                    ],
-                    'delete' => [
-                        'option_0' => '0',
+                    'option' => [
+                        'value' => [
+                            "option_0" => [''],
+                        ],
+                        'delete' => [
+                            'option_0' => '0',
+                        ],
                     ],
                 ],
                 (object) [
@@ -368,4 +416,55 @@ public function provideEmptyOption()
             ],
         ];
     }
+
+    /**
+     * @return void
+     * @throws \Magento\Framework\Exception\NotFoundException
+     */
+    public function testExecuteWithOptionsDataError()
+    {
+        $serializedOptions = '{"key":"value"}';
+        $message = "The attribute couldn't be validated due to an error. Verify your information and try again. "
+            . "If the error persists, please try again later.";
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->willReturnMap([
+                ['frontend_label', null, 'test_frontend_label'],
+                ['attribute_code', null, 'test_attribute_code'],
+                ['new_attribute_set_name', null, 'test_attribute_set_name'],
+                ['message_key', Validate::DEFAULT_MESSAGE_KEY, 'message'],
+                ['serialized_options', '[]', $serializedOptions],
+            ]);
+
+        $this->formDataSerializer->expects($this->once())
+            ->method('unserialize')
+            ->with($serializedOptions)
+            ->willThrowException(new \InvalidArgumentException('Some exception'));
+
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->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();
+        $this->attributeSetMock->expects($this->never())
+            ->method('setEntityTypeId')
+            ->willReturnSelf();
+        $this->resultJsonFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->resultJson);
+        $this->resultJson->expects($this->once())
+            ->method('setJsonData')
+            ->with(json_encode([
+                'error' => true,
+                'message' => $message,
+            ]))
+            ->willReturnSelf();
+
+        $this->getModel()->execute();
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AttributeTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AttributeTest.php
index b85b03852b621..3a0b2b4bf7229 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AttributeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AttributeTest.php
@@ -9,8 +9,9 @@
 use Magento\Catalog\Controller\Adminhtml\Product\Attribute;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Cache\FrontendInterface;
+use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\Registry;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\Controller\ResultFactory;
 
@@ -20,7 +21,7 @@
 class AttributeTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var ObjectManager
+     * @var ObjectManagerHelper
      */
     protected $objectManager;
 
@@ -54,9 +55,14 @@ class AttributeTest extends \PHPUnit\Framework\TestCase
      */
     protected $resultFactoryMock;
 
+    /**
+     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageManager;
+
     protected function setUp()
     {
-        $this->objectManager = new ObjectManager($this);
+        $this->objectManager = new ObjectManagerHelper($this);
         $this->contextMock = $this->getMockBuilder(Context::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -74,6 +80,9 @@ protected function setUp()
         $this->resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->messageManager = $this->getMockBuilder(ManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->contextMock->expects($this->any())
             ->method('getRequest')
@@ -81,6 +90,9 @@ protected function setUp()
         $this->contextMock->expects($this->any())
             ->method('getResultFactory')
             ->willReturn($this->resultFactoryMock);
+        $this->contextMock->expects($this->once())
+            ->method('getMessageManager')
+            ->willReturn($this->messageManager);
     }
 
     /**
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 aed87f918ebb8..c889c58e3df3a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php
@@ -95,6 +95,14 @@ class HelperTest extends \PHPUnit\Framework\TestCase
      */
     protected $attributeFilterMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dateTimeFilterMock;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = new ObjectManager($this);
@@ -167,6 +175,11 @@ protected function setUp()
         $resolverProperty = $helperReflection->getProperty('linkResolver');
         $resolverProperty->setAccessible(true);
         $resolverProperty->setValue($this->helper, $this->linkResolverMock);
+
+        $this->dateTimeFilterMock = $this->createMock(\Magento\Framework\Stdlib\DateTime\Filter\DateTime::class);
+        $dateTimeFilterProperty = $helperReflection->getProperty('dateTimeFilter');
+        $dateTimeFilterProperty->setAccessible(true);
+        $dateTimeFilterProperty->setValue($this->helper, $this->dateTimeFilterMock);
     }
 
     /**
@@ -208,6 +221,12 @@ public function testInitialize(
         if (!empty($tierPrice)) {
             $productData = array_merge($productData, ['tier_price' => $tierPrice]);
         }
+
+        $this->dateTimeFilterMock->expects($this->once())
+            ->method('filter')
+            ->with($specialFromDate)
+            ->willReturn($specialFromDate);
+
         $attributeNonDate = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
             ->disableOriginalConstructor()
             ->getMock();
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 d41de5f67503c..e2b9b06175b13 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
@@ -50,6 +50,9 @@ class MassStatusTest extends \Magento\Catalog\Test\Unit\Controller\Adminhtml\Pro
      */
     private $actionMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->priceProcessorMock = $this->getMockBuilder(Processor::class)
@@ -111,6 +114,7 @@ protected function setUp()
         ];
         /** @var \Magento\Backend\App\Action\Context $context */
         $context = $this->initContext($additionalParams, [[Action::class, $this->actionMock]]);
+        $this->request->expects($this->any())->method('isPost')->willReturn(true);
 
         $this->action = new \Magento\Catalog\Controller\Adminhtml\Product\MassStatus(
             $context,
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/SaveTest.php
index a10814371577e..22dbc32c2c3ab 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/SaveTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/SaveTest.php
@@ -5,10 +5,15 @@
  */
 namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product;
 
+use Magento\Catalog\Api\CategoryLinkManagementInterface;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper;
+use Magento\Catalog\Model\Product\Copier;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
+ * Unit tests for \Magento\Catalog\Controller\Adminhtml\Product\Save class.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SaveTest extends \Magento\Catalog\Test\Unit\Controller\Adminhtml\ProductTest
@@ -28,6 +33,21 @@ class SaveTest extends \Magento\Catalog\Test\Unit\Controller\Adminhtml\ProductTe
     /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject */
     private $product;
 
+    /**
+     * @var Copier|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productCopierMock;
+
+    /**
+     * @var ProductAttributeInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productAttributeMock;
+
+    /**
+     * @var CategoryLinkManagementInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $categoryLinkManagementMock;
+
     /** @var \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject */
     private $resultRedirectFactory;
 
@@ -42,6 +62,7 @@ class SaveTest extends \Magento\Catalog\Test\Unit\Controller\Adminhtml\ProductTe
 
     /**
      * @return void
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     protected function setUp()
     {
@@ -49,11 +70,33 @@ protected function setUp()
             \Magento\Catalog\Controller\Adminhtml\Product\Builder::class,
             ['build']
         );
-        $this->product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)->disableOriginalConstructor()
-            ->setMethods(['addData', 'getSku', 'getTypeId', 'getStoreId', '__sleep', '__wakeup'])->getMock();
+        $this->product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'addData',
+                'unsetData',
+                'getData',
+                'getSku',
+                'getCategoryIds',
+                'getAttributes',
+                'getTypeId',
+                'getStoreId',
+                'save',
+                '__sleep',
+                '__wakeup',
+            ])
+            ->getMock();
         $this->product->expects($this->any())->method('getTypeId')->will($this->returnValue('simple'));
         $this->product->expects($this->any())->method('getStoreId')->will($this->returnValue('1'));
         $this->productBuilder->expects($this->any())->method('build')->will($this->returnValue($this->product));
+        $this->productCopierMock = $this->getMockBuilder(Copier::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->productAttributeMock = $this->getMockBuilder(ProductAttributeInterface::class)
+            ->setMethods(['getIsUnique', 'getIsUserDefined', 'getAttributeCode', 'getDefaultFrontendLabel'])
+            ->getMockForAbstractClass();
+        $this->categoryLinkManagementMock = $this->getMockBuilder(CategoryLinkManagementInterface::class)
+            ->getMockForAbstractClass();
 
         $this->messageManagerMock = $this->getMockForAbstractClass(
             \Magento\Framework\Message\ManagerInterface::class
@@ -155,4 +198,86 @@ public function exceptionTypeDataProvider()
             ['Exception', 'addErrorMessage']
         ];
     }
+
+    /**
+     * @return void
+     */
+    public function testExecuteCheckUniqueAttributesOnDuplicate()
+    {
+        $productSku = 'test_sku';
+        $attributeCode = 'test_attribute_code';
+
+        $productData = [
+            'product' => [
+                'name' => 'test-name',
+                'sku' => $productSku,
+                $attributeCode => 'test_attribute',
+            ]
+        ];
+
+        $this->request->expects($this->at(1))
+            ->method('getParam')
+            ->with('back', false)
+            ->willReturn('duplicate');
+
+        $this->request->expects($this->any())->method('getPostValue')->willReturn($productData);
+        $this->initializationHelper->expects($this->any())->method('initialize')
+            ->willReturn($this->product);
+
+        $this->product->expects($this->once())
+            ->method('save')
+            ->willReturnSelf();
+        $this->product->expects($this->any())
+            ->method('getSku')
+            ->willReturn($productSku);
+        $this->product->expects($this->any())
+            ->method('getCategoryIds')
+            ->willReturn([]);
+
+        $this->categoryLinkManagementMock->expects($this->any())
+            ->method('assignProductToCategories')
+            ->with($productSku, [])
+            ->willReturn(true);
+
+        $this->product->expects($this->once())
+            ->method('unsetData')
+            ->with('quantity_and_stock_status')
+            ->willReturnSelf();
+
+        $this->productCopierMock->expects($this->any())
+            ->method('copy')
+            ->with($this->product)
+            ->willReturn($this->product);
+
+        $this->product->expects($this->once())
+            ->method('getAttributes')
+            ->willReturn([$this->productAttributeMock]);
+
+        $this->productAttributeMock->expects($this->atLeastOnce())
+            ->method('getIsUnique')
+            ->willReturn('1');
+        $this->productAttributeMock->expects($this->atLeastOnce())
+            ->method('getIsUserDefined')
+            ->willReturn('1');
+        $this->productAttributeMock->expects($this->atLeastOnce())
+            ->method('getAttributeCode')
+            ->willReturn($attributeCode);
+
+        $this->product->expects($this->any())
+            ->method('getData')
+            ->willReturnMap([
+                [$attributeCode, null, $productData['product'][$attributeCode]]
+            ]);
+
+        $this->productAttributeMock->expects($this->atLeastOnce())
+            ->method('getDefaultFrontendLabel')
+            ->willReturn('Test Attribute Label');
+
+        $this->messageManagerMock->expects($this->once())
+            ->method('addErrorMessage');
+        $this->messageManagerMock->expects($this->atLeastOnce())
+            ->method('addSuccessMessage');
+
+        $this->action->execute();
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/ProductTest.php
index 5d08f80847da2..7c3b78d5cf05a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/ProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/ProductTest.php
@@ -67,7 +67,7 @@ protected function initContext(array $additionalParams = [], array $objectManage
             ->setMethods(['add', 'prepend'])->disableOriginalConstructor()->getMock();
         $title->expects($this->any())->method('prepend')->withAnyParameters()->will($this->returnSelf());
         $requestInterfaceMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)->setMethods(
-            ['getParam', 'getPost', 'getFullActionName', 'getPostValue']
+            ['getParam', 'getPost', 'getFullActionName', 'getPostValue', 'isPost']
         )->disableOriginalConstructor()->getMock();
 
         $responseInterfaceMock = $this->getMockBuilder(\Magento\Framework\App\ResponseInterface::class)->setMethods(
diff --git a/app/code/Magento/Catalog/Test/Unit/Cron/FrontendActionsFlushTest.php b/app/code/Magento/Catalog/Test/Unit/Cron/FrontendActionsFlushTest.php
index 29d9736e02442..46eac31af986e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Cron/FrontendActionsFlushTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Cron/FrontendActionsFlushTest.php
@@ -87,13 +87,14 @@ public function testExecute()
                 'recently_viewed_product'
             ]);
 
+        $time = time() - 1500;
         $connectionMock->expects($this->once())
             ->method('quoteInto')
-            ->with('added_at < ?', time() - 1500)
-            ->willReturn(['added_at < ?', time() - 1500]);
+            ->with('added_at < ?', $time)
+            ->willReturn(['added_at < ?', $time]);
         $connectionMock->expects($this->once())
             ->method('delete')
-            ->with('catalog_product_frontend_action', [['added_at < ?', time() - 1500]]);
+            ->with('catalog_product_frontend_action', [['added_at < ?', $time]]);
 
         $this->model->execute();
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/Product/PositionResolverTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/Product/PositionResolverTest.php
index 9545e5eb4b37d..a2424c7521e18 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/Product/PositionResolverTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/Product/PositionResolverTest.php
@@ -105,7 +105,7 @@ public function testGetPositions()
         $this->select->expects($this->once())
             ->method('where')
             ->willReturnSelf();
-        $this->select->expects($this->once())
+        $this->select->expects($this->exactly(2))
             ->method('order')
             ->willReturnSelf();
         $this->select->expects($this->once())
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
index a53b87dcf1567..c84753ad4adcb 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
@@ -348,13 +348,15 @@ public function testReindexFlatEnabled($flatScheduled, $productScheduled, $expec
     public function reindexFlatDisabledTestDataProvider()
     {
         return [
-            [false, null, null, null, 0],
-            [true, null, null, null, 0],
-            [false, [], null, null, 0],
-            [false, ["1", "2"], null, null, 1],
-            [false, null, 1, null, 1],
-            [false, ["1", "2"], 0, 1, 1],
-            [false, null, 1, 1, 0],
+            [false, null, null, null, null, null, 0],
+            [true, null, null, null, null, null,  0],
+            [false, [], null, null, null, null, 0],
+            [false, ["1", "2"], null, null, null, null, 1],
+            [false, null, 1, null, null, null, 1],
+            [false, ["1", "2"], 0, 1, null, null,  1],
+            [false, null, 1, 1, null, null, 0],
+            [false, ["1", "2"], null, null, 0, 1,  1],
+            [false, ["1", "2"], null, null, 1, 0,  1],
         ];
     }
 
@@ -363,6 +365,8 @@ public function reindexFlatDisabledTestDataProvider()
      * @param array $affectedIds
      * @param int|string $isAnchorOrig
      * @param int|string $isAnchor
+     * @param mixed $isActiveOrig
+     * @param mixed $isActive,
      * @param int $expectedProductReindexCall
      *
      * @dataProvider reindexFlatDisabledTestDataProvider
@@ -372,12 +376,16 @@ public function testReindexFlatDisabled(
         $affectedIds,
         $isAnchorOrig,
         $isAnchor,
+        $isActiveOrig,
+        $isActive,
         $expectedProductReindexCall
     ) {
         $this->category->setAffectedProductIds($affectedIds);
         $this->category->setData('is_anchor', $isAnchor);
         $this->category->setOrigData('is_anchor', $isAnchorOrig);
         $this->category->setAffectedProductIds($affectedIds);
+        $this->category->setData('is_active', $isActive);
+        $this->category->setOrigData('is_active', $isActiveOrig);
 
         $pathIds = ['path/1/2', 'path/2/3'];
         $this->category->setData('path_ids', $pathIds);
@@ -387,7 +395,7 @@ public function testReindexFlatDisabled(
             ->method('isFlatEnabled')
             ->will($this->returnValue(false));
 
-        $this->productIndexer->expects($this->exactly(1))
+        $this->productIndexer->expects($this->any())
             ->method('isScheduled')
             ->willReturn($productScheduled);
         $this->productIndexer->expects($this->exactly($expectedProductReindexCall))
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Config/CatalogClone/Media/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Config/CatalogClone/Media/ImageTest.php
index 5b1d3bf7943fc..0688ad5bde19d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Config/CatalogClone/Media/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Config/CatalogClone/Media/ImageTest.php
@@ -36,6 +36,14 @@ class ImageTest extends \PHPUnit\Framework\TestCase
      */
     private $attribute;
 
+    /**
+     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $escaperMock;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->eavConfig = $this->getMockBuilder(\Magento\Eav\Model\Config::class)
@@ -62,54 +70,78 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->escaperMock = $this->getMockBuilder(
+            \Magento\Framework\Escaper::class
+        )
+            ->disableOriginalConstructor()
+            ->setMethods(['escapeHtml'])
+            ->getMock();
+
         $helper = new ObjectManager($this);
         $this->model = $helper->getObject(
             \Magento\Catalog\Model\Config\CatalogClone\Media\Image::class,
             [
                 'eavConfig' => $this->eavConfig,
-                'attributeCollectionFactory' => $this->attributeCollectionFactory
+                'attributeCollectionFactory' => $this->attributeCollectionFactory,
+                'escaper' => $this->escaperMock,
             ]
         );
     }
 
-    public function testGetPrefixes()
+    /**
+     * @param string $actualLabel
+     * @param string $expectedLabel
+     * @return void
+     * @dataProvider getPrefixesDataProvider
+     */
+    public function testGetPrefixes(string $actualLabel, string $expectedLabel)
     {
         $entityTypeId = 3;
         /** @var \Magento\Eav\Model\Entity\Type|\PHPUnit_Framework_MockObject_MockObject $entityType */
         $entityType = $this->getMockBuilder(\Magento\Eav\Model\Entity\Type::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $entityType->expects($this->once())->method('getId')->will($this->returnValue($entityTypeId));
+        $entityType->expects($this->once())->method('getId')->willReturn($entityTypeId);
 
         /** @var AbstractFrontend|\PHPUnit_Framework_MockObject_MockObject $frontend */
         $frontend = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend::class)
             ->setMethods(['getLabel'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $frontend->expects($this->once())->method('getLabel')->will($this->returnValue('testLabel'));
+        $frontend->expects($this->once())->method('getLabel')->willReturn($actualLabel);
 
-        $this->attributeCollection->expects($this->once())->method('setEntityTypeFilter')->with(
-            $this->equalTo($entityTypeId)
-        );
-        $this->attributeCollection->expects($this->once())->method('setFrontendInputTypeFilter')->with(
-            $this->equalTo('media_image')
-        );
+        $this->attributeCollection->expects($this->once())->method('setEntityTypeFilter')->with($entityTypeId);
+        $this->attributeCollection->expects($this->once())->method('setFrontendInputTypeFilter')->with('media_image');
 
-        $this->attribute->expects($this->once())->method('getAttributeCode')->will(
-            $this->returnValue('attributeCode')
-        );
-        $this->attribute->expects($this->once())->method('getFrontend')->will(
-            $this->returnValue($frontend)
-        );
+        $this->attribute->expects($this->once())->method('getAttributeCode')->willReturn('attributeCode');
+        $this->attribute->expects($this->once())->method('getFrontend')->willReturn($frontend);
 
-        $this->attributeCollection->expects($this->any())->method('getIterator')->will(
-            $this->returnValue(new \ArrayIterator([$this->attribute]))
-        );
+        $this->attributeCollection->expects($this->any())->method('getIterator')
+            ->willReturn(new \ArrayIterator([$this->attribute]));
+
+        $this->eavConfig->expects($this->any())->method('getEntityType')->with(Product::ENTITY)
+            ->willReturn($entityType);
+
+        $this->escaperMock->expects($this->once())->method('escapeHtml')->with($actualLabel)
+            ->willReturn($expectedLabel);
 
-        $this->eavConfig->expects($this->any())->method('getEntityType')->with(
-            $this->equalTo(Product::ENTITY)
-        )->will($this->returnValue($entityType));
+        $this->assertEquals([['field' => 'attributeCode_', 'label' => $expectedLabel]], $this->model->getPrefixes());
+    }
 
-        $this->assertEquals([['field' => 'attributeCode_', 'label' => 'testLabel']], $this->model->getPrefixes());
+    /**
+     * @return array
+     */
+    public function getPrefixesDataProvider(): array
+    {
+        return [
+            [
+                'actual_label' => 'testLabel',
+                'expected_label' => 'testLabel',
+            ],
+            [
+                'actual_label' => '<media-image-attributelabel',
+                'expected_label' => '&lt;media-image-attributelabel',
+            ],
+        ];
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php
index cf9e83ed39650..967a2167c688a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php
@@ -5,13 +5,23 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Indexer\Product\Eav\Action;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Indexer\Product\Eav\Action\Full;
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\Decimal;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\Source;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Query\Generator;
+use Magento\Framework\DB\Select;
+use Magento\Framework\EntityManager\EntityMetadataInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Indexer\BatchProviderInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator;
+use PHPUnit\Framework\MockObject\MockObject as MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -19,60 +29,69 @@
 class FullTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Catalog\Model\Indexer\Product\Eav\Action\Full|\PHPUnit_Framework_MockObject_MockObject
+     * @var Full|MockObject
      */
     private $model;
 
     /**
-     * @var DecimalFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var DecimalFactory|MockObject
      */
     private $eavDecimalFactory;
 
     /**
-     * @var SourceFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var SourceFactory|MockObject
      */
     private $eavSourceFactory;
 
     /**
-     * @var MetadataPool|\PHPUnit_Framework_MockObject_MockObject
+     * @var MetadataPool|MockObject
      */
     private $metadataPool;
 
     /**
-     * @var BatchProviderInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var BatchProviderInterface|MockObject
      */
     private $batchProvider;
 
     /**
-     * @var BatchSizeCalculator|\PHPUnit_Framework_MockObject_MockObject
+     * @var BatchSizeCalculator|MockObject
      */
     private $batchSizeCalculator;
 
     /**
-     * @var ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
+     * @var ActiveTableSwitcher|MockObject
      */
     private $activeTableSwitcher;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ScopeConfigInterface|MockObject
      */
     private $scopeConfig;
 
+    /**
+     * @var Generator
+     */
+    private $batchQueryGenerator;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->eavDecimalFactory = $this->createPartialMock(DecimalFactory::class, ['create']);
         $this->eavSourceFactory = $this->createPartialMock(SourceFactory::class, ['create']);
         $this->metadataPool = $this->createMock(MetadataPool::class);
         $this->batchProvider = $this->getMockForAbstractClass(BatchProviderInterface::class);
+        $this->batchQueryGenerator = $this->createMock(Generator::class);
         $this->batchSizeCalculator = $this->createMock(BatchSizeCalculator::class);
         $this->activeTableSwitcher = $this->createMock(ActiveTableSwitcher::class);
-        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
         $objectManager = new ObjectManager($this);
         $this->model = $objectManager->getObject(
-            \Magento\Catalog\Model\Indexer\Product\Eav\Action\Full::class,
+            Full::class,
             [
                 'eavDecimalFactory' => $this->eavDecimalFactory,
                 'eavSourceFactory' => $this->eavSourceFactory,
@@ -80,7 +99,8 @@ protected function setUp()
                 'batchProvider' => $this->batchProvider,
                 'batchSizeCalculator' => $this->batchSizeCalculator,
                 'activeTableSwitcher' => $this->activeTableSwitcher,
-                'scopeConfig' => $this->scopeConfig
+                'scopeConfig' => $this->scopeConfig,
+                'batchQueryGenerator' => $this->batchQueryGenerator,
             ]
         );
     }
@@ -93,15 +113,15 @@ public function testExecute()
         $this->scopeConfig->expects($this->once())->method('getValue')->willReturn(1);
 
         $ids = [1, 2, 3];
-        $connectionMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+        $connectionMock = $this->getMockBuilder(AdapterInterface::class)
             ->getMockForAbstractClass();
 
         $connectionMock->expects($this->atLeastOnce())->method('describeTable')->willReturn(['id' => []]);
-        $eavSource = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\Source::class)
+        $eavSource = $this->getMockBuilder(Source::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $eavDecimal = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\Decimal::class)
+        $eavDecimal = $this->getMockBuilder(Decimal::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -122,22 +142,28 @@ public function testExecute()
 
         $this->eavSourceFactory->expects($this->once())->method('create')->will($this->returnValue($eavDecimal));
 
-        $entityMetadataMock = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
+        $entityMetadataMock = $this->getMockBuilder(EntityMetadataInterface::class)
             ->getMockForAbstractClass();
 
         $this->metadataPool->expects($this->atLeastOnce())
             ->method('getMetadata')
-            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->with(ProductInterface::class)
             ->willReturn($entityMetadataMock);
 
-        $this->batchProvider->expects($this->atLeastOnce())
-            ->method('getBatches')
-            ->willReturn([['from' => 10, 'to' => 100]]);
-        $this->batchProvider->expects($this->atLeastOnce())
-            ->method('getBatchIds')
+        // Super inefficient algorithm in some cases
+        $this->batchProvider->expects($this->never())
+            ->method('getBatches');
+
+        $batchQuery = $this->createMock(Select::class);
+
+        $connectionMock->method('fetchCol')
+            ->with($batchQuery)
             ->willReturn($ids);
 
-        $selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+        $this->batchQueryGenerator->method('generate')
+            ->willReturn([$batchQuery]);
+
+        $selectMock = $this->getMockBuilder(Select::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -148,6 +174,9 @@ public function testExecute()
         $this->model->execute();
     }
 
+    /**
+     * @return void
+     */
     public function testExecuteWithDisabledEavIndexer()
     {
         $this->scopeConfig->expects($this->once())->method('getValue')->willReturn(0);
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php
index f095867ed5c39..2de3b4ddf3f50 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php
@@ -100,10 +100,10 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->connection->expects($this->any())->method('select')->willReturn($selectMock);
-        $selectMock->expects($this->any())->method('from')->with(
-            $attributeTable,
-            ['value']
-        )->willReturnSelf();
+        $selectMock->method('from')
+            ->willReturnSelf();
+        $selectMock->method('joinLeft')
+            ->willReturnSelf();
         $selectMock->expects($this->any())->method('where')->willReturnSelf();
         $selectMock->expects($this->any())->method('order')->willReturnSelf();
         $selectMock->expects($this->any())->method('limit')->willReturnSelf();
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/SaveHandlerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/SaveHandlerTest.php
index 6fe0594be08f2..7b830124a365b 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/SaveHandlerTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/SaveHandlerTest.php
@@ -48,7 +48,12 @@ public function setUp()
         $this->model = new SaveHandler($this->optionRepository);
     }
 
-    public function testExecute()
+    /**
+     * @dataProvider testExecuteDataProvider
+     * @param bool $dataHasChangedFor
+     * @return void
+     */
+    public function testExecute(bool $dataHasChangedFor)
     {
         $this->optionMock->expects($this->any())->method('getOptionId')->willReturn(5);
         $this->entity->expects($this->once())->method('getOptions')->willReturn([$this->optionMock]);
@@ -63,10 +68,27 @@ public function testExecute()
             ->method('getProductOptions')
             ->with($this->entity)
             ->willReturn([$this->optionMock, $secondOptionMock]);
-
+        $this->entity->expects($this->once())
+            ->method('dataHasChangedFor')
+            ->with('sku')
+            ->willReturn($dataHasChangedFor);
+        $this->entity->expects($this->once())
+            ->method('getSku')
+            ->willReturn('product_sku');
         $this->optionRepository->expects($this->once())->method('delete');
         $this->optionRepository->expects($this->once())->method('save')->with($this->optionMock);
 
         $this->assertEquals($this->entity, $this->model->execute($this->entity));
     }
+
+    /**
+     * @return array
+     */
+    public function testExecuteDataProvider(): array
+    {
+        return [
+            [true],
+            [false],
+        ];
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php
index fce4a02622d9e..2fd787e216118 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php
@@ -78,27 +78,20 @@ protected function setUp()
         );
     }
 
-    public function testFilterProductActions()
+    /**
+     * @dataProvider filterProductActionsDataProvider
+     *
+     * @param array $productsData
+     * @param bool $correct
+     * @return void
+     */
+    public function testFilterProductActions(array $productsData, bool $correct)
     {
-        $productsData = [
-            1 => [
-                'added_at' => 12,
-                'product_id' => 1,
-            ],
-            2 => [
-                'added_at' => 13,
-                'product_id' => 2,
-            ],
-            3 => [
-                'added_at' => 14,
-                'product_id' => 3,
-            ]
-        ];
         $frontendConfiguration = $this->createMock(\Magento\Catalog\Model\FrontendStorageConfigurationInterface::class);
         $frontendConfiguration->expects($this->once())
             ->method('get')
             ->willReturn([
-                'lifetime' => 2
+                'lifetime' => 2,
             ]);
         $this->frontendStorageConfigurationPoolMock->expects($this->once())
             ->method('get')
@@ -110,7 +103,6 @@ public function testFilterProductActions()
         $action2 = $this->getMockBuilder(ProductFrontendActionInterface::class)
             ->getMockForAbstractClass();
 
-        $frontendAction = $this->createMock(ProductFrontendActionInterface::class);
         $collection = $this->getMockBuilder(Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -126,47 +118,91 @@ public function testFilterProductActions()
         $collection->expects($this->once())
             ->method('addFilterByUserIdentities')
             ->with(1, 34);
-        $collection->expects($this->any())
-            ->method('addFieldToFilter')
-            ->withConsecutive(['type_id'], ['product_id']);
 
-        $iterator = new \IteratorIterator(new \ArrayIterator([$frontendAction]));
-        $collection->expects($this->once())
-            ->method('getIterator')
-            ->willReturn($iterator);
-        $this->entityManagerMock->expects($this->once())
-            ->method('delete')
-            ->with($frontendAction);
-        $this->productFrontendActionFactoryMock->expects($this->exactly(2))
-            ->method('create')
-            ->withConsecutive(
-                [
+        if ($correct) {
+            $frontendAction = $this->createMock(ProductFrontendActionInterface::class);
+            $iterator = new \IteratorIterator(new \ArrayIterator([$frontendAction]));
+            $collection->expects($this->any())
+                ->method('addFieldToFilter')
+                ->withConsecutive(['type_id'], ['product_id']);
+            $collection->expects($this->once())
+                ->method('getIterator')
+                ->willReturn($iterator);
+            $this->entityManagerMock->expects($this->once())
+                ->method('delete')
+                ->with($frontendAction);
+            $this->entityManagerMock->expects($this->exactly(2))
+                ->method('save')
+                ->withConsecutive([$action1], [$action2]);
+            $this->productFrontendActionFactoryMock->expects($this->exactly(2))
+                ->method('create')
+                ->withConsecutive(
                     [
-                        'data' => [
-                            'visitor_id' => null,
-                            'customer_id' => 1,
-                            'added_at' => 12,
-                            'product_id' => 1,
-                            'type_id' => 'recently_compared_product'
-                        ]
-                    ]
-                ],
-                [
+                        [
+                            'data' => [
+                                'visitor_id' => null,
+                                'customer_id' => 1,
+                                'added_at' => 12,
+                                'product_id' => 1,
+                                'type_id' => 'recently_compared_product',
+                            ],
+                        ],
+                    ],
                     [
-                        'data' => [
-                            'visitor_id' => null,
-                            'customer_id' => 1,
-                            'added_at' => 13,
-                            'product_id' => 2,
-                            'type_id' => 'recently_compared_product'
-                        ]
+                        [
+                            'data' => [
+                                'visitor_id' => null,
+                                'customer_id' => 1,
+                                'added_at' => 13,
+                                'product_id' => 2,
+                                'type_id' => 'recently_compared_product',
+                            ],
+                        ],
                     ]
-                ]
-            )
-            ->willReturnOnConsecutiveCalls($action1, $action2);
-        $this->entityManagerMock->expects($this->exactly(2))
-            ->method('save')
-            ->withConsecutive([$action1], [$action2]);
+                )
+                ->willReturnOnConsecutiveCalls($action1, $action2);
+        } else {
+            $this->entityManagerMock->expects($this->never())
+                ->method('delete');
+            $this->entityManagerMock->expects($this->never())
+                ->method('save');
+        }
+
         $this->model->syncActions($productsData, 'recently_compared_product');
     }
+
+    /**
+     * @return array
+     */
+    public function filterProductActionsDataProvider(): array
+    {
+        return [
+            [
+                'productsData' => [
+                    1 => [
+                        'added_at' => 12,
+                        'product_id' => 1,
+                    ],
+                    2 => [
+                        'added_at' => 13,
+                        'product_id' => 2,
+                    ],
+                    3 => [
+                        'added_at' => 14,
+                        'product_id' => 3,
+                    ],
+                ],
+                'correct' => true,
+            ],
+            [
+                'productsData' => [
+                    1 => [
+                        'added_at' => 12,
+                        'product_id' => 'test',
+                    ],
+                ],
+                'correct' => false,
+            ],
+        ];
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductList/ToolbarMemorizerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductList/ToolbarMemorizerTest.php
new file mode 100644
index 0000000000000..699931b5fe89d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductList/ToolbarMemorizerTest.php
@@ -0,0 +1,213 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Unit\Model\Product\ProductList;
+
+use Magento\Catalog\Model\Product\ProductList\Toolbar;
+use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Catalog\Model\Session as CatalogSession;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+/**
+ * Class for testing toolbal memorizer.
+ */
+class ToolbarMemorizerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ToolbarMemorizer
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Toolbar
+     */
+    private $toolbarMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|CatalogSession
+     */
+    private $catalogSessionMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|ScopeConfigInterface
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @var ObjectManager $objectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->toolbarMock = $this->getMockBuilder(Toolbar::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getOrder', 'getDirection', 'getLimit', 'getMode'])
+            ->getMock();
+        $this->catalogSessionMock = $this->getMockBuilder(CatalogSession::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getParamsMemorizeDisabled', 'getData'])
+            ->getMock();
+        $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManager = new ObjectManager($this);
+        $this->model = $this->objectManager->getObject(
+            ToolbarMemorizer::class,
+            [
+                'toolbarModel' => $this->toolbarMock,
+                'catalogSession' => $this->catalogSessionMock,
+                'scopeConfig' => $this->scopeConfigMock,
+            ]
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getMainDataProvider(): array
+    {
+        return [
+            ['any_value',null,null,null,'any_value'],
+            [null, 'any_value', false, null, 'any_value'],
+            [null, null, false, null, null],
+            [null, null, true, 'data', 'data'],
+        ];
+    }
+
+    /**
+     * Test get order.
+     *
+     * @param string|null $variable
+     * @param string|null $variableValue
+     * @param bool|null $flag
+     * @param string|null $data
+     * @param string|null $expected
+     * @return void
+     *
+     * @dataProvider getMainDataProvider
+     */
+    public function testGetOrder($variable, $variableValue, $flag, $data, $expected)
+    {
+        $this->objectManager->setBackwardCompatibleProperty($this->model, 'order', $variable);
+        $this->toolbarMock->method('getOrder')->willReturn($variableValue);
+        $this->scopeConfigMock->method('isSetFlag')->willReturn($flag);
+        $this->catalogSessionMock->method('getData')->willReturn($data);
+        $this->assertEquals($expected, $this->model->getOrder());
+    }
+
+    /**
+     * Test get direction.
+     *
+     * @param string|null $variable
+     * @param string|null $variableValue
+     * @param bool|null $flag
+     * @param string|null $data
+     * @param string|null $expected
+     * @return void
+     *
+     * @dataProvider getMainDataProvider
+     */
+    public function testGetDirection($variable, $variableValue, $flag, $data, $expected)
+    {
+        $this->objectManager->setBackwardCompatibleProperty($this->model, 'direction', $variable);
+        $this->toolbarMock->method('getDirection')->willReturn($variableValue);
+        $this->scopeConfigMock->method('isSetFlag')->willReturn($flag);
+        $this->catalogSessionMock->method('getData')->willReturn($data);
+        $this->assertEquals($expected, $this->model->getDirection());
+    }
+
+    /**
+     * Test get mode.
+     *
+     * @param string|null $variable
+     * @param string|null $variableValue
+     * @param bool|null $flag
+     * @param string|null $data
+     * @param string|null $expected
+     * @return void
+     *
+     * @dataProvider getMainDataProvider
+     */
+    public function testGetMode($variable, $variableValue, $flag, $data, $expected)
+    {
+        $this->objectManager->setBackwardCompatibleProperty($this->model, 'mode', $variable);
+        $this->toolbarMock->method('getMode')->willReturn($variableValue);
+        $this->scopeConfigMock->method('isSetFlag')->willReturn($flag);
+        $this->catalogSessionMock->method('getData')->willReturn($data);
+        $this->assertEquals($expected, $this->model->getMode());
+    }
+
+    /**
+     * Test getting limit.
+     *
+     * @param string|null $variable
+     * @param string|null $variableValue
+     * @param bool|null $flag
+     * @param string|null $data
+     * @param string|null $expected
+     * @return void
+     *
+     * @dataProvider getMainDataProvider
+     */
+    public function testGetLimit($variable, $variableValue, $flag, $data, $expected)
+    {
+        $this->objectManager->setBackwardCompatibleProperty($this->model, 'limit', $variable);
+        $this->toolbarMock->method('getLimit')->willReturn($variableValue);
+        $this->scopeConfigMock->method('isSetFlag')->willReturn($flag);
+        $this->catalogSessionMock->method('getData')->willReturn($data);
+        $this->assertEquals($expected, $this->model->getLimit());
+    }
+
+    /**
+     * Test memorizing parameters.
+     *
+     * @return void
+     */
+    public function testMemorizeParams()
+    {
+        $this->catalogSessionMock->method('getParamsMemorizeDisabled')->willReturn(false);
+        $this->objectManager->setBackwardCompatibleProperty($this->model, 'isMemorizingAllowed', true);
+        $this->model->memorizeParams();
+    }
+
+    /**
+     * @return array
+     */
+    public function getMemorizedDataProvider(): array
+    {
+        return [
+            [null, false, false],
+            [null, true, true],
+            [false, false, false],
+            [false, true, false],
+            [true, false, true],
+            [true, true, true],
+        ];
+    }
+
+    /**
+     * Test method isMemorizingAllowed.
+     *
+     * @param bool|null $variableValue
+     * @param bool $flag
+     * @param bool $expected
+     * @return void
+     *
+     * @dataProvider getMemorizedDataProvider
+     */
+    public function testIsMemorizingAllowed($variableValue, bool $flag, bool $expected)
+    {
+        $this->objectManager->setBackwardCompatibleProperty($this->model, 'isMemorizingAllowed', $variableValue);
+        $this->scopeConfigMock->method('isSetFlag')->willReturn($flag);
+        $this->assertEquals($expected, $this->model->isMemorizingAllowed());
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductOptions/Config/_files/invalidProductOptionsXmlArray.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductOptions/Config/_files/invalidProductOptionsXmlArray.php
index 034b04b6a757d..cfb54c3aefd0f 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductOptions/Config/_files/invalidProductOptionsXmlArray.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductOptions/Config/_files/invalidProductOptionsXmlArray.php
@@ -29,12 +29,12 @@
         ],
     ],
     'renderer_attribute_with_invalid_value' => [
-        '<?xml version="1.0"?><config><option name="name_one" renderer="true12"><inputType name="name_one"/>' .
+        '<?xml version="1.0"?><config><option name="name_one" renderer="123true"><inputType name="name_one"/>' .
         '</option></config>',
         [
-            "Element 'option', attribute 'renderer': [facet 'pattern'] The value 'true12' is not accepted by the " .
-            "pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
-            "Element 'option', attribute 'renderer': 'true12' is not a valid value of the atomic" .
+            "Element 'option', attribute 'renderer': [facet 'pattern'] The value '123true' is not accepted by the " .
+            "pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
+            "Element 'option', attribute 'renderer': '123true' is not a valid value of the atomic" .
             " type 'modelName'.\nLine: 1\n"
         ],
     ],
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
index 483283e777118..677a45c41f846 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
@@ -543,6 +543,7 @@ public function testSetCategoryCollection()
 
     public function testGetCategory()
     {
+        $this->model->setData('category_ids', [10]);
         $this->category->expects($this->any())->method('getId')->will($this->returnValue(10));
         $this->registry->expects($this->any())->method('registry')->will($this->returnValue($this->category));
         $this->categoryRepository->expects($this->any())->method('get')->will($this->returnValue($this->category));
@@ -551,7 +552,8 @@ public function testGetCategory()
 
     public function testGetCategoryId()
     {
-        $this->category->expects($this->once())->method('getId')->will($this->returnValue(10));
+        $this->model->setData('category_ids', [10]);
+        $this->category->expects($this->any())->method('getId')->will($this->returnValue(10));
 
         $this->registry->expects($this->at(0))->method('registry');
         $this->registry->expects($this->at(1))->method('registry')->will($this->returnValue($this->category));
@@ -559,6 +561,14 @@ public function testGetCategoryId()
         $this->assertEquals(10, $this->model->getCategoryId());
     }
 
+    public function testGetCategoryIdWhenProductNotInCurrentCategory()
+    {
+        $this->model->setData('category_ids', [12]);
+        $this->category->expects($this->once())->method('getId')->will($this->returnValue(10));
+        $this->registry->expects($this->any())->method('registry')->will($this->returnValue($this->category));
+        $this->assertFalse($this->model->getCategoryId());
+    }
+
     public function testGetIdBySku()
     {
         $this->resource->expects($this->once())->method('getIdBySku')->will($this->returnValue(5));
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/invalidProductTypesXmlArray.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/invalidProductTypesXmlArray.php
index e1847bea53fcb..868252da8190c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/invalidProductTypesXmlArray.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/invalidProductTypesXmlArray.php
@@ -23,7 +23,7 @@
         '<?xml version="1.0"?><config><type name="some_name" modelInstance="123" /></config>',
         [
             "Element 'type', attribute 'modelInstance': [facet 'pattern'] The value '123' is not accepted by the" .
-            " pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
+            " pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
             "Element 'type', attribute 'modelInstance': '123' is not a valid value of the atomic type" .
             " 'modelName'.\nLine: 1\n"
         ],
@@ -57,7 +57,7 @@
         '<?xml version="1.0"?><config><type name="some_name"><priceModel instance="123123" /></type></config>',
         [
             "Element 'priceModel', attribute 'instance': [facet 'pattern'] The value '123123' is not accepted " .
-            "by the pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
+            "by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
             "Element 'priceModel', attribute 'instance': '123123' is not a valid value of the atomic type" .
             " 'modelName'.\nLine: 1\n"
         ],
@@ -66,7 +66,7 @@
         '<?xml version="1.0"?><config><type name="some_name"><indexerModel instance="123" /></type></config>',
         [
             "Element 'indexerModel', attribute 'instance': [facet 'pattern'] The value '123' is not accepted by " .
-            "the pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
+            "the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
             "Element 'indexerModel', attribute 'instance': '123' is not a valid value of the atomic type" .
             " 'modelName'.\nLine: 1\n"
         ],
@@ -83,7 +83,7 @@
         '<?xml version="1.0"?><config><type name="some_name"><stockIndexerModel instance="1234"/></type></config>',
         [
             "Element 'stockIndexerModel', attribute 'instance': [facet 'pattern'] The value '1234' is not " .
-            "accepted by the pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
+            "accepted by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
             "Element 'stockIndexerModel', attribute 'instance': '1234' is not a valid value of the atomic " .
             "type 'modelName'.\nLine: 1\n"
         ],
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/valid_product_types_merged.xml b/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/valid_product_types_merged.xml
index 7edbc399a9476..701338774baa5 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/valid_product_types_merged.xml
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/valid_product_types_merged.xml
@@ -15,6 +15,14 @@
         <stockIndexerModel instance="instance_name"/>
     </type>
     <type label="some_label" name="some_name2" modelInstance="model_name">
+        <allowedSelectionTypes>
+            <type name="some_name" />
+        </allowedSelectionTypes>
+        <priceModel instance="instance_name_with_digits_123" />
+        <indexerModel instance="instance_name_with_digits_123" />
+        <stockIndexerModel instance="instance_name_with_digits_123"/>
+    </type>
+    <type label="some_label" name="some_name3" modelInstance="model_name">
         <allowedSelectionTypes>
             <type name="some_name" />
         </allowedSelectionTypes>
@@ -25,5 +33,6 @@
     <composableTypes>
         <type name="some_name"/>
         <type name="some_name2"/>
+        <type name="some_name3"/>
     </composableTypes>
 </config>
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 dbbb3fb29513b..6d3316a0610cd 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
@@ -318,7 +318,7 @@ public function testAddTierPriceDataByGroupId()
                 [ '(customer_group_id=? AND all_groups=0) OR all_groups=1', $customerGroupId]
             )
             ->willReturnSelf();
-        $select->expects($this->once())->method('order')->with('entity_id')->willReturnSelf();
+        $select->expects($this->once())->method('order')->with('qty')->willReturnSelf();
         $this->connectionMock->expects($this->once())
             ->method('fetchAll')
             ->with($select)
@@ -370,7 +370,7 @@ public function testAddTierPriceData()
         $select->expects($this->exactly(1))->method('where')
             ->with('entity_id IN(?)', [1])
             ->willReturnSelf();
-        $select->expects($this->once())->method('order')->with('entity_id')->willReturnSelf();
+        $select->expects($this->once())->method('order')->with('qty')->willReturnSelf();
         $this->connectionMock->expects($this->once())
             ->method('fetchAll')
             ->with($select)
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
new file mode 100644
index 0000000000000..44f66b6cbf66e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
@@ -0,0 +1,237 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\Image;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Query\Generator;
+use Magento\Framework\DB\Select;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Catalog\Model\ResourceModel\Product\Gallery;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Framework\DB\Query\BatchIteratorInterface;
+
+class ImageTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    protected $objectManager;
+
+    /**
+     * @var AdapterInterface | MockObject
+     */
+    protected $connectionMock;
+
+    /**
+     * @var Generator | MockObject
+     */
+    protected $generatorMock;
+
+    /**
+     * @var ResourceConnection | MockObject
+     */
+    protected $resourceMock;
+
+    protected function setUp()
+    {
+        $this->objectManager =
+            new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->connectionMock = $this->createMock(AdapterInterface::class);
+        $this->resourceMock = $this->createMock(ResourceConnection::class);
+        $this->resourceMock->method('getConnection')
+            ->willReturn($this->connectionMock);
+        $this->resourceMock->method('getTableName')
+            ->willReturnArgument(0);
+        $this->generatorMock = $this->createMock(Generator::class);
+    }
+
+    /**
+     * @return MockObject
+     */
+    protected function getVisibleImagesSelectMock(): MockObject
+    {
+        $selectMock = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $selectMock->expects($this->once())
+            ->method('distinct')
+            ->willReturnSelf();
+        $selectMock->expects($this->once())
+            ->method('from')
+            ->with(
+                ['images' => Gallery::GALLERY_TABLE],
+                'value as filepath'
+            )->willReturnSelf();
+        $selectMock->expects($this->once())
+            ->method('where')
+            ->with('disabled = 0')
+            ->willReturnSelf();
+
+        return $selectMock;
+    }
+
+    /**
+     * @param int $imagesCount
+     * @dataProvider dataProvider
+     */
+    public function testGetCountAllProductImages(int $imagesCount)
+    {
+        $selectMock = $this->getVisibleImagesSelectMock();
+        $selectMock->expects($this->exactly(2))
+            ->method('reset')
+            ->withConsecutive(
+                ['columns'],
+                ['distinct']
+            )->willReturnSelf();
+        $selectMock->expects($this->once())
+            ->method('columns')
+            ->with(new \Zend_Db_Expr('count(distinct value)'))
+            ->willReturnSelf();
+
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($selectMock);
+        $this->connectionMock->expects($this->once())
+            ->method('fetchOne')
+            ->with($selectMock)
+            ->willReturn($imagesCount);
+
+        $imageModel = $this->objectManager->getObject(
+            Image::class,
+            [
+                'generator' => $this->generatorMock,
+                'resourceConnection' => $this->resourceMock
+            ]
+        );
+
+        $this->assertSame(
+            $imagesCount,
+            $imageModel->getCountAllProductImages()
+        );
+    }
+
+    /**
+     * @param int $imagesCount
+     * @param int $batchSize
+     * @dataProvider dataProvider
+     */
+    public function testGetAllProductImages(
+        int $imagesCount,
+        int $batchSize
+    ) {
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($this->getVisibleImagesSelectMock());
+
+        $batchCount = (int)ceil($imagesCount / $batchSize);
+        $fetchResultsCallback = $this->getFetchResultCallbackForBatches($imagesCount, $batchSize);
+        $this->connectionMock->expects($this->exactly($batchCount))
+            ->method('fetchAll')
+            ->will($this->returnCallback($fetchResultsCallback));
+
+        /** @var Select | MockObject $selectMock */
+        $selectMock = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->generatorMock->expects($this->once())
+            ->method('generate')
+            ->with(
+                'value_id',
+                $selectMock,
+                $batchSize,
+                BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
+            )->will(
+                $this->returnCallback(
+                    $this->getBatchIteratorCallback($selectMock, $batchCount)
+                )
+            );
+
+        $imageModel = $this->objectManager->getObject(
+            Image::class,
+            [
+                'generator' => $this->generatorMock,
+                'resourceConnection' => $this->resourceMock,
+                'batchSize' => $batchSize
+            ]
+        );
+
+        $this->assertCount($imagesCount, $imageModel->getAllProductImages());
+    }
+
+    /**
+     * @param int $imagesCount
+     * @param int $batchSize
+     * @return \Closure
+     */
+    protected function getFetchResultCallbackForBatches(
+        int $imagesCount,
+        int $batchSize
+    ): \Closure {
+        $fetchResultsCallback = function () use (&$imagesCount, $batchSize) {
+            $batchSize =
+                ($imagesCount >= $batchSize) ? $batchSize : $imagesCount;
+            $imagesCount -= $batchSize;
+
+            $getFetchResults = function ($batchSize): array {
+                $result = [];
+                $count = $batchSize;
+                while ($count) {
+                    $count--;
+                    $result[$count] = $count;
+                }
+
+                return $result;
+            };
+
+            return $getFetchResults($batchSize);
+        };
+
+        return $fetchResultsCallback;
+    }
+
+    /**
+     * @param Select | MockObject $selectMock
+     * @param int $batchCount
+     * @return \Closure
+     */
+    protected function getBatchIteratorCallback(
+        MockObject $selectMock,
+        int $batchCount
+    ): \Closure {
+        $iteratorCallback = function () use ($batchCount, $selectMock): array {
+            $result = [];
+            $count = $batchCount;
+            while ($count) {
+                $count--;
+                $result[$count] = $selectMock;
+            }
+
+            return $result;
+        };
+
+        return $iteratorCallback;
+    }
+
+    /**
+     * Data Provider
+     * @return array
+     */
+    public function dataProvider(): array
+    {
+        return [
+            [300, 300],
+            [300, 100],
+            [139, 100],
+            [67, 10],
+            [154, 47],
+            [0, 100]
+        ];
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Plugin/Framework/App/Action/ContextPluginTest.php b/app/code/Magento/Catalog/Test/Unit/Plugin/Framework/App/Action/ContextPluginTest.php
new file mode 100644
index 0000000000000..efd78cac6e512
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Plugin/Framework/App/Action/ContextPluginTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Unit\Plugin\Framework\App\Action;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Catalog\Plugin\Framework\App\Action\ContextPlugin;
+use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
+use Magento\Catalog\Model\Session as CatalogSession;
+use Magento\Framework\App\Http\Context as HttpContext;
+
+/**
+ * Class for testing ContextPlugin class.
+ */
+class ContextPluginTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ContextPlugin
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|ToolbarMemorizer
+     */
+    private $toolbarMemorizerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|CatalogSession
+     */
+    private $catalogSessionMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|HttpContext
+     */
+    private $httpContextMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->toolbarMemorizerMock = $this->getMockBuilder(ToolbarMemorizer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->catalogSessionMock = $this->getMockBuilder(CatalogSession::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->httpContextMock = $this->getMockBuilder(HttpContext::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            ContextPlugin::class,
+            [
+                'toolbarMemorizer' => $this->toolbarMemorizerMock,
+                'catalogSession' => $this->catalogSessionMock,
+                'httpContext' => $this->httpContextMock,
+            ]
+        );
+    }
+
+    /**
+     * Test beforeDispatch method.
+     *
+     * @return void
+     */
+    public function testBeforeDispatch()
+    {
+        $this->toolbarMemorizerMock->method('isMemorizingAllowed')->willReturn(true);
+        $this->catalogSessionMock->method('getData')->willReturn('any_value');
+
+        $this->model->beforeDispatch();
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/Component/ColumnFactoryTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/Component/ColumnFactoryTest.php
new file mode 100644
index 0000000000000..c4a7aa4037bec
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/Component/ColumnFactoryTest.php
@@ -0,0 +1,156 @@
+<?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 PHPUnit\Framework\TestCase;
+use Magento\Catalog\Ui\Component\ColumnFactory;
+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;
+
+/**
+ * ColumnFactory test.
+ */
+class ColumnFactoryTest extends TestCase
+{
+    /**
+     * @var ColumnFactory
+     */
+    private $columnFactory;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ProductAttributeInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attribute;
+
+    /**
+     * @var ContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
+    /**
+     * @var UiComponentFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $uiComponentFactory;
+
+    /**
+     * @var ColumnInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $column;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $this->attribute = $this->getMockBuilder(ProductAttributeInterface::class)
+            ->setMethods(['usesSource'])
+            ->getMockForAbstractClass();
+        $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->columnFactory = $this->objectManager->getObject(ColumnFactory::class, [
+            'componentFactory' => $this->uiComponentFactory
+        ]);
+    }
+
+    /**
+     * Tests the create method will return correct object.
+     *
+     * @return void
+     */
+    public function testCreatedObject()
+    {
+        $this->context->method('getRequestParam')
+            ->with(FilterModifier::FILTER_MODIFIER, [])
+            ->willReturn([]);
+
+        $object = $this->columnFactory->create($this->attribute, $this->context);
+        $this->assertEquals(
+            $this->column,
+            $object,
+            'Object must be the same which the ui component factory creates.'
+        );
+    }
+
+    /**
+     * Tests create method with not filterable in grid attribute.
+     *
+     * @param array $filterModifiers
+     * @param null|string $filter
+     *
+     * @return void
+     * @dataProvider filterModifiersProvider
+     */
+    public function testCreateWithNotFilterableInGridAttribute(array $filterModifiers, $filter)
+    {
+        $componentFactoryArgument = [
+            'data' => [
+                'config' => [
+                    'label' => __(null),
+                    'dataType' => 'text',
+                    'add_field' => true,
+                    'visible' => null,
+                    'filter' => $filter,
+                    'component' => 'Magento_Ui/js/grid/columns/column',
+                ],
+            ],
+            'context' => $this->context,
+        ];
+
+        $this->context->method('getRequestParam')
+            ->with(FilterModifier::FILTER_MODIFIER, [])
+            ->willReturn($filterModifiers);
+        $this->attribute->method('getIsFilterableInGrid')
+            ->willReturn(false);
+        $this->attribute->method('getAttributeCode')
+            ->willReturn('color');
+
+        $this->uiComponentFactory->expects($this->once())
+            ->method('create')
+            ->with($this->anything(), $this->anything(), $componentFactoryArgument);
+
+        $this->columnFactory->create($this->attribute, $this->context);
+    }
+
+    /**
+     * Filter modifiers data provider.
+     *
+     * @return array
+     */
+    public function filterModifiersProvider(): array
+    {
+        return [
+            'without' => [
+                'filter_modifiers' => [],
+                'filter' => null,
+            ],
+            'with' => [
+                'filter_modifiers' => [
+                    'color' => [
+                        'condition_type' => 'notnull',
+                    ],
+                ],
+                'filter' => 'text',
+            ],
+        ];
+    }
+}
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 cc3dda6e2d7b1..e741070547163 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
@@ -155,38 +155,4 @@ public function modifyMetaLockedDataProvider()
     {
         return [[true], [false]];
     }
-
-    public function testModifyMetaWithCaching()
-    {
-        $this->arrayManagerMock->expects($this->exactly(2))
-            ->method('findPath')
-            ->willReturn(true);
-        $cacheManager = $this->getMockBuilder(CacheInterface::class)
-            ->getMockForAbstractClass();
-        $cacheManager->expects($this->once())
-            ->method('load')
-            ->with(Categories::CATEGORY_TREE_ID . '_');
-        $cacheManager->expects($this->once())
-            ->method('save');
-        
-        $modifier = $this->createModel();
-        $cacheContextProperty = new \ReflectionProperty(
-            Categories::class,
-            'cacheManager'
-        );
-        $cacheContextProperty->setAccessible(true);
-        $cacheContextProperty->setValue($modifier, $cacheManager);
-
-        $groupCode = 'test_group_code';
-        $meta = [
-            $groupCode => [
-                'children' => [
-                    'category_ids' => [
-                        'sortOrder' => 10,
-                    ],
-                ],
-            ],
-        ];
-        $modifier->modifyMeta($meta);
-    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/ImageTest.php
index 12bc9acfa4c51..2d6b082e35b17 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/ImageTest.php
@@ -6,15 +6,16 @@
 
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Listing\Collector;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductRender\ImageInterface;
 use Magento\Catalog\Api\Data\ProductRenderInterface;
+use Magento\Catalog\Helper\Image as ImageHelper;
+use Magento\Catalog\Helper\ImageFactory;
 use Magento\Catalog\Model\Product;
-use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Ui\DataProvider\Product\Listing\Collector\Image;
 use Magento\Framework\View\DesignInterface;
+use Magento\Framework\View\DesignLoader;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Catalog\Helper\ImageFactory;
-use Magento\Catalog\Api\Data\ProductRender\ImageInterface;
-use Magento\Catalog\Helper\Image as ImageHelper;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -42,8 +43,21 @@ class ImageTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Catalog\Api\Data\ProductRender\ImageInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject */
     private $imageInterfaceFactory;
 
+    /** @var DesignLoader|\PHPUnit_Framework_MockObject_MockObject */
+    private $designLoader;
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    protected $objectManager;
+
+    /**
+     * @inheritdoc
+     */
     public function setUp()
     {
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
         $this->imageFactory = $this->getMockBuilder(ImageFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -60,14 +74,21 @@ public function setUp()
             ->getMock();
         $this->storeManager = $this->createMock(StoreManagerInterface::class);
         $this->design = $this->createMock(DesignInterface::class);
-        $this->model = new Image(
-            $this->imageFactory,
-            $this->state,
-            $this->storeManager,
-            $this->design,
-            $this->imageInterfaceFactory,
-            $this->imageCodes
-        );
+        $this->designLoader = $this->createMock(DesignLoader::class);
+
+        $this->model = $this->objectManager
+            ->getObject(
+                Image::class,
+                [
+                    'imageFactory' => $this->imageFactory,
+                    'state' => $this->state,
+                    'storeManager' => $this->storeManager,
+                    'design' => $this->design,
+                    'imageRenderInfoFactory' => $this->imageInterfaceFactory,
+                    'imageCodes' => $this->imageCodes,
+                    'designLoader' => $this->designLoader,
+                ]
+            );
     }
 
     public function testGet()
@@ -165,6 +186,7 @@ public function testEmulateImageCreating()
         $imageMock->expects($this->once())
             ->method('setUrl')
             ->with('url');
+        $this->designLoader->expects($this->once())->method('load');
 
         $this->assertEquals(
             $imageHelperMock,
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php
index 6d7c8814bd474..35daac491d583 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php
@@ -54,7 +54,16 @@ protected function setUp()
             ->getMockForAbstractClass();
         $this->collectionMock = $this->getMockBuilder(AbstractCollection::class)
             ->disableOriginalConstructor()
-            ->setMethods(['load', 'getSelect', 'getTable', 'getIterator', 'isLoaded', 'toArray', 'getSize'])
+            ->setMethods([
+                'load',
+                'getSelect',
+                'getTable',
+                'getIterator',
+                'isLoaded',
+                'toArray',
+                'getSize',
+                'setStoreId',
+            ])
             ->getMockForAbstractClass();
         $this->dbSelectMock = $this->getMockBuilder(DbSelect::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php b/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
index cbc67fee8a5a3..40687e37e1538 100644
--- a/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
+++ b/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Ui\Component;
 
+use Magento\Ui\Component\Filters\FilterModifier;
+
 /**
  * @api
  * @since 100.0.2
@@ -54,13 +56,15 @@ public function __construct(\Magento\Framework\View\Element\UiComponentFactory $
      */
     public function create($attribute, $context, array $config = [])
     {
+        $filterModifiers = $context->getRequestParam(FilterModifier::FILTER_MODIFIER, []);
+
         $columnName = $attribute->getAttributeCode();
         $config = array_merge([
             'label' => __($attribute->getDefaultFrontendLabel()),
             'dataType' => $this->getDataType($attribute),
             'add_field' => true,
             'visible' => $attribute->getIsVisibleInGrid(),
-            'filter' => ($attribute->getIsFilterableInGrid())
+            'filter' => ($attribute->getIsFilterableInGrid() || array_key_exists($columnName, $filterModifiers))
                 ? $this->getFilterType($attribute->getFrontendInput())
                 : null,
         ], $config);
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 37b0b328a522b..e3da613cb1634 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
@@ -139,7 +139,8 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @since 101.0.0
      */
     public function modifyMeta(array $meta)
@@ -158,7 +159,8 @@ public function modifyMeta(array $meta)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @since 101.0.0
      */
     public function modifyData(array $data)
@@ -381,6 +383,7 @@ private function addAdvancedPriceLink()
             );
 
             $advancedPricingButton['arguments']['data']['config'] = [
+                'dataScope' => 'advanced_pricing_button',
                 'displayAsLink' => true,
                 'formElement' => Container::NAME,
                 'componentType' => Container::NAME,
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php
index 683a96133ad30..a6b9856a4a0ed 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php
@@ -67,7 +67,8 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @since 101.0.0
      */
     public function modifyData(array $data)
@@ -76,6 +77,8 @@ public function modifyData(array $data)
     }
 
     /**
+     * Check if can add attributes on product form.
+     *
      * @return boolean
      */
     private function canAddAttributes()
@@ -89,7 +92,8 @@ private function canAddAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @since 101.0.0
      */
     public function modifyMeta(array $meta)
@@ -111,6 +115,8 @@ public function modifyMeta(array $meta)
     }
 
     /**
+     * Modify meta customize attribute modal.
+     *
      * @param array $meta
      * @return array
      */
@@ -207,6 +213,8 @@ private function customizeAddAttributeModal(array $meta)
     }
 
     /**
+     * Modify meta to customize create attribute modal.
+     *
      * @param array $meta
      * @return array
      */
@@ -289,6 +297,8 @@ private function customizeCreateAttributeModal(array $meta)
     }
 
     /**
+     * Modify meta to customize attribute grid.
+     *
      * @param array $meta
      * @return array
      */
@@ -309,7 +319,7 @@ private function customizeAttributesGrid(array $meta)
                         'immediateUpdateBySelection' => true,
                         'behaviourType' => 'edit',
                         'externalFilterMode' => true,
-                        'dataLinks' => ['imports' => false, 'exports' => true],
+                        'dataLinks' => ['imports' => false, 'exports' => false],
                         'formProvider' => 'ns = ${ $.namespace }, index = product_form',
                         'groupCode' => static::GROUP_CODE,
                         'groupName' => static::GROUP_NAME,
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 2dad7e8495b11..a3baf7b14a229 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
@@ -3,6 +3,8 @@
  * 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\Model\Locator\LocatorInterface;
@@ -11,6 +13,7 @@
 use Magento\Framework\App\CacheInterface;
 use Magento\Framework\DB\Helper as DbHelper;
 use Magento\Catalog\Model\Category as CategoryModel;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\Stdlib\ArrayManager;
@@ -202,6 +205,7 @@ protected function createNewCategoryModal(array $meta)
      *
      * @param array $meta
      * @return array
+     * @throws LocalizedException
      * @since 101.0.0
      */
     protected function customizeCategoriesField(array $meta)
@@ -306,20 +310,64 @@ protected function customizeCategoriesField(array $meta)
      *
      * @param string|null $filter
      * @return array
+     * @throws LocalizedException
      * @since 101.0.0
      */
     protected function getCategoriesTree($filter = null)
     {
-        $categoryTree = $this->getCacheManager()->load(self::CATEGORY_TREE_ID . '_' . $filter);
-        if ($categoryTree) {
-            return $this->serializer->unserialize($categoryTree);
+        $storeId = (int) $this->locator->getStore()->getId();
+
+        $cachedCategoriesTree = $this->getCacheManager()
+            ->load($this->getCategoriesTreeCacheId($storeId, (string) $filter));
+        if (!empty($cachedCategoriesTree)) {
+            return $this->serializer->unserialize($cachedCategoriesTree);
         }
 
-        $storeId = $this->locator->getStore()->getId();
+        $categoriesTree = $this->retrieveCategoriesTree(
+            $storeId,
+            $this->retrieveShownCategoriesIds($storeId, (string) $filter)
+        );
+
+        $this->getCacheManager()->save(
+            $this->serializer->serialize($categoriesTree),
+            $this->getCategoriesTreeCacheId($storeId, (string) $filter),
+            [
+                \Magento\Catalog\Model\Category::CACHE_TAG,
+                \Magento\Framework\App\Cache\Type\Block::CACHE_TAG
+            ]
+        );
+
+        return $categoriesTree;
+    }
+
+    /**
+     * Get cache id for categories tree.
+     *
+     * @param int $storeId
+     * @param string $filter
+     * @return string
+     */
+    private function getCategoriesTreeCacheId(int $storeId, string $filter = '') : string
+    {
+        return self::CATEGORY_TREE_ID
+            . '_' . (string) $storeId
+            . '_' . $filter;
+    }
+
+    /**
+     * Retrieve filtered list of categories id.
+     *
+     * @param int $storeId
+     * @param string $filter
+     * @return array
+     * @throws LocalizedException
+     */
+    private function retrieveShownCategoriesIds(int $storeId, string $filter = '') : array
+    {
         /* @var $matchingNamesCollection \Magento\Catalog\Model\ResourceModel\Category\Collection */
         $matchingNamesCollection = $this->categoryCollectionFactory->create();
 
-        if ($filter !== null) {
+        if (!empty($filter)) {
             $matchingNamesCollection->addAttributeToFilter(
                 'name',
                 ['like' => $this->dbHelper->addLikeEscape($filter, ['position' => 'any'])]
@@ -339,6 +387,19 @@ protected function getCategoriesTree($filter = null)
             }
         }
 
+        return $shownCategoriesIds;
+    }
+
+    /**
+     * Retrieve tree of categories with attributes.
+     *
+     * @param int $storeId
+     * @param array $shownCategoriesIds
+     * @return array|null
+     * @throws LocalizedException
+     */
+    private function retrieveCategoriesTree(int $storeId, array $shownCategoriesIds)
+    {
         /* @var $collection \Magento\Catalog\Model\ResourceModel\Category\Collection */
         $collection = $this->categoryCollectionFactory->create();
 
@@ -365,15 +426,6 @@ protected function getCategoriesTree($filter = null)
             $categoryById[$category->getParentId()]['optgroup'][] = &$categoryById[$category->getId()];
         }
 
-        $this->getCacheManager()->save(
-            $this->serializer->serialize($categoryById[CategoryModel::TREE_ROOT_ID]['optgroup']),
-            self::CATEGORY_TREE_ID . '_' . $filter,
-            [
-                \Magento\Catalog\Model\Category::CACHE_TAG,
-                \Magento\Framework\App\Cache\Type\Block::CACHE_TAG
-            ]
-        );
-
         return $categoryById[CategoryModel::TREE_ROOT_ID]['optgroup'];
     }
 }
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
index e557c8a377681..cf65c2ff2b206 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
@@ -11,6 +11,7 @@
 use Magento\Catalog\Model\Config\Source\Product\Options\Price as ProductOptionsPrice;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Ui\Component\Form\Element\Hidden;
 use Magento\Ui\Component\Modal;
 use Magento\Ui\Component\Container;
 use Magento\Ui\Component\DynamicRows;
@@ -867,10 +868,9 @@ protected function getPositionFieldConfig($sortOrder)
                 'data' => [
                     'config' => [
                         'componentType' => Field::NAME,
-                        'formElement' => Input::NAME,
+                        'formElement' => Hidden::NAME,
                         'dataScope' => static::FIELD_SORT_ORDER_NAME,
                         'dataType' => Number::NAME,
-                        'visible' => false,
                         'sortOrder' => $sortOrder,
                     ],
                 ],
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 6a6d74c6cb9b3..af898bf3117c6 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -655,7 +655,7 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
         // TODO: Refactor to $attribute->getOptions() when MAGETWO-48289 is done
         $attributeModel = $this->getAttributeModel($attribute);
         if ($attributeModel->usesSource()) {
-            $options = $attributeModel->getSource()->getAllOptions();
+            $options = $attributeModel->getSource()->getAllOptions(true, true);
             $meta = $this->arrayManager->merge($configPath, $meta, [
                 'options' => $this->convertOptionsValueToString($options),
             ]);
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 e598773ac368d..71cfc3ef1853f 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php
@@ -361,8 +361,10 @@ protected function customizeNameListeners(array $meta)
                 'allowImport' => !$this->locator->getProduct()->getId(),
             ];
 
-            if (!in_array($listener, $textListeners)) {
-                $importsConfig['elementTmpl'] = 'ui/form/element/input';
+            if (in_array($listener, $textListeners)) {
+                $importsConfig['cols'] = 15;
+                $importsConfig['rows'] = 2;
+                $importsConfig['elementTmpl'] = 'ui/form/element/textarea';
             }
 
             $meta = $this->arrayManager->merge($listenerPath . static::META_CONFIG_PATH, $meta, $importsConfig);
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php
index 0eddca3322205..9111bf544d52a 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php
@@ -45,7 +45,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.1.0
      */
     public function modifyData(array $data)
@@ -54,8 +54,11 @@ public function modifyData(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * Add tier price info to meta array.
+     *
      * @since 101.1.0
+     * @param array $meta
+     * @return array
      */
     public function modifyMeta(array $meta)
     {
@@ -112,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'])
@@ -150,8 +153,8 @@ private function getUpdatedTierPriceStructure(array $priceMeta)
                                     'dataType' => Price::NAME,
                                     'addbefore' => '%',
                                     'validation' => [
-                                        'validate-number' => true,
-                                        'less-than-equals-to' => 100
+                                        'required-entry' => true,
+                                        'validate-positive-percent-decimal' => true,
                                     ],
                                     'visible' => $firstOption
                                         && $firstOption['value'] == ProductPriceOptionsInterface::VALUE_PERCENT,
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php
index 216bc16968fcb..34879ab29c185 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
@@ -17,12 +17,14 @@
 use Magento\Framework\View\DesignInterface;
 use Magento\Store\Model\StoreManager;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\View\DesignLoader;
 
 /**
  * Collect enough information about image rendering on front
  * If you want to add new image, that should render on front you need
  * to configure this class in di.xml
  *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Image implements ProductRenderCollectorInterface
 {
@@ -59,6 +61,11 @@ class Image implements ProductRenderCollectorInterface
      */
     private $imageRenderInfoFactory;
 
+    /**
+     * @var DesignLoader
+     */
+    private $designLoader;
+
     /**
      * Image constructor.
      * @param ImageFactory $imageFactory
@@ -67,6 +74,7 @@ class Image implements ProductRenderCollectorInterface
      * @param DesignInterface $design
      * @param ImageInterfaceFactory $imageRenderInfoFactory
      * @param array $imageCodes
+     * @param DesignLoader|null $designLoader
      */
     public function __construct(
         ImageFactory $imageFactory,
@@ -74,7 +82,8 @@ public function __construct(
         StoreManagerInterface $storeManager,
         DesignInterface $design,
         ImageInterfaceFactory $imageRenderInfoFactory,
-        array $imageCodes = []
+        array $imageCodes = [],
+        DesignLoader $designLoader = null
     ) {
         $this->imageFactory = $imageFactory;
         $this->imageCodes = $imageCodes;
@@ -82,6 +91,8 @@ public function __construct(
         $this->storeManager = $storeManager;
         $this->design = $design;
         $this->imageRenderInfoFactory = $imageRenderInfoFactory;
+        $this->designLoader = $designLoader ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(DesignLoader::class);
     }
 
     /**
@@ -124,6 +135,8 @@ public function collect(ProductInterface $product, ProductRenderInterface $produ
     }
 
     /**
+     * Callback for emulating image creation.
+     *
      * Callback in which we emulate initialize default design theme, depends on current store, be settings store id
      * from render info
      *
@@ -136,7 +149,7 @@ public function collect(ProductInterface $product, ProductRenderInterface $produ
     public function emulateImageCreating(ProductInterface $product, $imageCode, $storeId, ImageInterface $image)
     {
         $this->storeManager->setCurrentStore($storeId);
-        $this->design->setDefaultDesignTheme();
+        $this->designLoader->load();
 
         $imageHelper = $this->imageFactory->create();
         $imageHelper->init($product, $imageCode);
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
index f4334bc25efd8..29a19036f3bf3 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Catalog\Ui\DataProvider\Product;
 
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Eav\Model\Entity\Attribute\AttributeInterface;
+
 /**
  * Collection which is used for rendering product list in the backend.
  *
@@ -25,4 +29,63 @@ protected function _productLimitationJoinPrice()
         $this->_productLimitationFilters->setUsePriceIndex(false);
         return $this->_productLimitationPrice(true);
     }
+
+    /**
+     * Add attribute filter to collection
+     *
+     * @param AttributeInterface|integer|string|array $attribute
+     * @param null|string|array $condition
+     * @param string $joinType
+     * @return $this
+     * @throws LocalizedException
+     */
+    public function addAttributeToFilter($attribute, $condition = null, $joinType = 'inner')
+    {
+        $storeId = (int)$this->getStoreId();
+        if ($attribute === 'is_saleable'
+            || is_array($attribute)
+            || $storeId !== $this->getDefaultStoreId()
+        ) {
+            return parent::addAttributeToFilter($attribute, $condition, $joinType);
+        }
+
+        if ($attribute instanceof AttributeInterface) {
+            $attributeModel = $attribute;
+        } else {
+            $attributeModel = $this->getEntity()->getAttribute($attribute);
+            if ($attributeModel === false) {
+                throw new LocalizedException(
+                    __('Invalid attribute identifier for filter (%1)', get_class($attribute))
+                );
+            }
+        }
+
+        if ($attributeModel->isScopeGlobal() || $attributeModel->getBackend()->isStatic()) {
+            return parent::addAttributeToFilter($attribute, $condition, $joinType);
+        }
+
+        $this->addAttributeToFilterAllStores($attributeModel, $condition);
+
+        return $this;
+    }
+
+    /**
+     * Add attribute to filter by all stores
+     *
+     * @param Attribute $attributeModel
+     * @param array $condition
+     * @return void
+     */
+    private function addAttributeToFilterAllStores(Attribute $attributeModel, array $condition)
+    {
+        $tableName = $this->getTable($attributeModel->getBackendTable());
+        $entity = $this->getEntity();
+        $fKey = 'e.' . $this->getEntityPkName($entity);
+        $pKey = $tableName . '.' . $this->getEntityPkName($entity);
+        $condition = "({$pKey} = {$fKey}) AND ("
+            . $this->_getConditionSql("{$tableName}.value", $condition)
+            . ')';
+        $selectExistsInAllStores = $this->getConnection()->select()->from($tableName);
+        $this->getSelect()->exists($selectExistsInAllStores, $condition);
+    }
 }
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php
index e31eca89f63c2..44aa33367c6be 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php
@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Ui\DataProvider\Product;
 
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Store\Model\Store;
 
 /**
  * Class ProductDataProvider
@@ -58,6 +59,7 @@ public function __construct(
         $this->collection = $collectionFactory->create();
         $this->addFieldStrategies = $addFieldStrategies;
         $this->addFilterStrategies = $addFilterStrategies;
+        $this->collection->setStoreId(Store::DEFAULT_STORE_ID);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
index e897c330b7e0f..5188391a6d32d 100644
--- a/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
+++ b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
@@ -107,7 +107,7 @@ public function getJsonConfiguration()
         return $this->escaper->escapeHtml($this->json->serialize([
             'breadcrumbs' => [
                 'categoryUrlSuffix' => $this->escaper->escapeHtml($this->getCategoryUrlSuffix()),
-                'userCategoryPathInUrl' => (int)$this->isCategoryUsedInProductUrl(),
+                'useCategoryPathInUrl' => (int)$this->isCategoryUsedInProductUrl(),
                 'product' => $this->getProductName()
             ]
         ]));
diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
index 4535e527d2dec..f78860dfd3ca7 100644
--- a/app/code/Magento/Catalog/composer.json
+++ b/app/code/Magento/Catalog/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-eav": "101.0.*",
         "magento/module-cms": "102.0.*",
@@ -34,7 +34,7 @@
         "magento/module-catalog-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "102.0.6",
+    "version": "102.0.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Catalog/etc/acl.xml b/app/code/Magento/Catalog/etc/acl.xml
index 358a798fc7579..4d4b7bdc672d1 100644
--- a/app/code/Magento/Catalog/etc/acl.xml
+++ b/app/code/Magento/Catalog/etc/acl.xml
@@ -11,7 +11,9 @@
             <resource id="Magento_Backend::admin">
                 <resource id="Magento_Catalog::catalog" title="Catalog" translate="title" sortOrder="30">
                     <resource id="Magento_Catalog::catalog_inventory" title="Inventory" translate="title" sortOrder="10">
-                        <resource id="Magento_Catalog::products" title="Products" translate="title" sortOrder="10" />
+                        <resource id="Magento_Catalog::products" title="Products" translate="title" sortOrder="10">
+                            <resource id="Magento_Catalog::update_attributes" title="Update Attributes" translate="title" />
+                        </resource>
                         <resource id="Magento_Catalog::categories" title="Categories" translate="title" sortOrder="20" />
                     </resource>
                 </resource>
@@ -23,7 +25,6 @@
                     </resource>
                     <resource id="Magento_Backend::stores_attributes">
                         <resource id="Magento_Catalog::attributes_attributes" title="Product" translate="title" sortOrder="30" />
-                        <resource id="Magento_Catalog::update_attributes" title="Update Attributes" translate="title" sortOrder="35" />
                         <resource id="Magento_Catalog::sets" title="Attribute Set" translate="title" sortOrder="40"/>
                     </resource>
                 </resource>
diff --git a/app/code/Magento/Catalog/etc/adminhtml/system.xml b/app/code/Magento/Catalog/etc/adminhtml/system.xml
index 7d62d46210ea2..6a432c1809ba5 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/system.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/system.xml
@@ -56,7 +56,7 @@
                 <field id="grid_per_page_values" translate="label comment" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Products per Page on Grid Allowed Values</label>
                     <comment>Comma-separated.</comment>
-                    <validate>validate-per-page-value-list</validate>
+                    <validate>validate-per-page-value-list required-entry</validate>
                 </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>
@@ -66,7 +66,7 @@
                 <field id="list_per_page_values" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Products per Page on List Allowed Values</label>
                     <comment>Comma-separated.</comment>
-                    <validate>validate-per-page-value-list</validate>
+                    <validate>validate-per-page-value-list required-entry</validate>
                 </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>
@@ -98,6 +98,11 @@
                     <comment>E.g. {{media url="path/to/image.jpg"}} {{skin url="path/to/picture.gif"}}. Dynamic directives parsing impacts catalog performance.</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">
+                    <label>Remember Category Pagination</label>
+                    <comment>Changing may affect SEO and cache storage consumption.</comment>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
             </group>
             <group id="placeholder" translate="label" sortOrder="300" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Product Image Placeholders</label>
diff --git a/app/code/Magento/Catalog/etc/config.xml b/app/code/Magento/Catalog/etc/config.xml
index b7733a1ab0239..fe1c8e7b87a7a 100644
--- a/app/code/Magento/Catalog/etc/config.xml
+++ b/app/code/Magento/Catalog/etc/config.xml
@@ -30,6 +30,7 @@
                 <flat_catalog_category>0</flat_catalog_category>
                 <default_sort_by>position</default_sort_by>
                 <parse_url_directives>1</parse_url_directives>
+                <remember_pagination>0</remember_pagination>
             </frontend>
             <product>
                 <flat>
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
index 5b87c7d6ac030..185e3017ec447 100644
--- a/app/code/Magento/Catalog/etc/di.xml
+++ b/app/code/Magento/Catalog/etc/di.xml
@@ -907,6 +907,14 @@
     <type name="Magento\Quote\Model\Quote\Item\ToOrderItem">
         <plugin name="copy_quote_files_to_order" type="Magento\Catalog\Model\Plugin\QuoteItemProductOption"/>
     </type>
+    <type name="Magento\Catalog\Model\ResourceModel\Category">
+        <plugin name="remove_redundant_image" type="Magento\Catalog\Plugin\Model\ResourceModel\Category\RemoveRedundantImagePlugin"/>
+    </type>
+    <type name="Magento\Catalog\Plugin\Model\ResourceModel\Category\RemoveRedundantImagePlugin">
+        <arguments>
+            <argument name="imageUploader" xsi:type="object">Magento\Catalog\CategoryImageUpload</argument>
+        </arguments>
+    </type>
     <preference for="Magento\Catalog\Model\ResourceModel\Product\BaseSelectProcessorInterface" type="Magento\Catalog\Model\ResourceModel\Product\CompositeWithWebsiteProcessor" />
     <type name="Magento\Catalog\Model\ResourceModel\Product\CompositeBaseSelectProcessor">
         <arguments>
@@ -1156,4 +1164,12 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\Product\Option\Type\Select">
+        <arguments>
+            <argument name="singleSelectionTypes" xsi:type="array">
+                <item name="drop_down" xsi:type="const">Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN</item>
+                <item name="radio" xsi:type="const">Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Catalog/etc/frontend/di.xml b/app/code/Magento/Catalog/etc/frontend/di.xml
index 2e98c980f5686..4203af383b366 100644
--- a/app/code/Magento/Catalog/etc/frontend/di.xml
+++ b/app/code/Magento/Catalog/etc/frontend/di.xml
@@ -95,4 +95,8 @@
         <plugin name="get_catalog_category_product_index_table_name" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver"/>
         <plugin name="get_catalog_product_price_index_table_name" type="Magento\Catalog\Model\Indexer\Product\Price\Plugin\TableResolver"/>
     </type>
+    <type name="Magento\Framework\App\Action\AbstractAction">
+        <plugin name="catalog_app_action_dispatch_controller_context_plugin" type="Magento\Catalog\Plugin\Framework\App\Action\ContextPlugin" />
+    </type>
+    <preference for="Magento\Catalog\Model\Product\Type\Price" type="Magento\Catalog\Model\Product\Type\FrontSpecialPrice" />
 </config>
diff --git a/app/code/Magento/Catalog/etc/product_options.xsd b/app/code/Magento/Catalog/etc/product_options.xsd
index 3bc24a9099262..734c8f378d5d7 100644
--- a/app/code/Magento/Catalog/etc/product_options.xsd
+++ b/app/code/Magento/Catalog/etc/product_options.xsd
@@ -61,11 +61,11 @@
     <xs:simpleType name="modelName">
         <xs:annotation>
             <xs:documentation>
-                Model name can contain only [a-zA-Z_\\].
+                Model name can contain only ([\\]?[a-zA-Z_][a-zA-Z0-9_]*)+.
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[a-zA-Z_\\]+" />
+            <xs:pattern value="([\\]?[a-zA-Z_][a-zA-Z0-9_]*)+" />
         </xs:restriction>
     </xs:simpleType>
 </xs:schema>
diff --git a/app/code/Magento/Catalog/etc/product_types_base.xsd b/app/code/Magento/Catalog/etc/product_types_base.xsd
index 6cc35fd7bee37..dec952bcf492e 100644
--- a/app/code/Magento/Catalog/etc/product_types_base.xsd
+++ b/app/code/Magento/Catalog/etc/product_types_base.xsd
@@ -92,11 +92,11 @@
     <xs:simpleType name="modelName">
         <xs:annotation>
             <xs:documentation>
-                Model name can contain only [a-zA-Z_\\].
+                Model name can contain only ([\\]?[a-zA-Z_][a-zA-Z0-9_]*)+.
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[a-zA-Z_\\]+" />
+            <xs:pattern value="([\\]?[a-zA-Z_][a-zA-Z0-9_]*)+" />
         </xs:restriction>
     </xs:simpleType>
 </xs:schema>
diff --git a/app/code/Magento/Catalog/etc/webapi_rest/di.xml b/app/code/Magento/Catalog/etc/webapi_rest/di.xml
index 49c5eff91ee49..7c86c1f2e3929 100644
--- a/app/code/Magento/Catalog/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Catalog/etc/webapi_rest/di.xml
@@ -20,4 +20,7 @@
         <plugin name="get_catalog_category_product_index_table_name" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver"/>
         <plugin name="get_catalog_product_price_index_table_name" type="Magento\Catalog\Model\Indexer\Product\Price\Plugin\TableResolver"/>
     </type>
+    <type name="Magento\Catalog\Api\ProductCustomOptionRepositoryInterface">
+        <plugin name="updateProductCustomOptionsAttributes" type="Magento\Catalog\Plugin\Model\Product\Option\UpdateProductCustomOptionsAttributes"/>
+    </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 2a5d60222e9f8..44cdd473bf74e 100644
--- a/app/code/Magento/Catalog/etc/webapi_soap/di.xml
+++ b/app/code/Magento/Catalog/etc/webapi_soap/di.xml
@@ -19,4 +19,7 @@
         <plugin name="get_catalog_category_product_index_table_name" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver"/>
         <plugin name="get_catalog_product_price_index_table_name" type="Magento\Catalog\Model\Indexer\Product\Price\Plugin\TableResolver"/>
     </type>
+    <type name="Magento\Catalog\Api\ProductCustomOptionRepositoryInterface">
+        <plugin name="updateProductCustomOptionsAttributes" type="Magento\Catalog\Plugin\Model\Product\Option\UpdateProductCustomOptionsAttributes"/>
+    </type>
 </config>
diff --git a/app/code/Magento/Catalog/i18n/en_US.csv b/app/code/Magento/Catalog/i18n/en_US.csv
index 35a2c224c4ed2..1e0dcfa0232a7 100644
--- a/app/code/Magento/Catalog/i18n/en_US.csv
+++ b/app/code/Magento/Catalog/i18n/en_US.csv
@@ -798,3 +798,4 @@ Details,Details
 "Add To Compare","Add To Compare"
 "Learn more","Learn more"
 "Recently Viewed","Recently Viewed"
+"You added product %1 to the <a href=""%2"">comparison list</a>.","You added product %1 to the <a href=""%2"">comparison list</a>."
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml
index 00a1580923a7b..cea54e883d2aa 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
 /**
  * @var $block \Magento\Catalog\Block\Adminhtml\Category\Tree
  */
@@ -20,7 +19,7 @@
             "categoryCheckboxTree": {
                 "dataUrl":       "<?= $block->escapeUrl($block->getLoadTreeUrl()) ?>",
                 "divId":         "<?= /* @noEscape */ $divId ?>",
-                "rootVisible":   <?= /* @noEscape */ $block->getRoot()->getIsVisible() ? 'true' : 'false' ?>,
+                "rootVisible":   false,
                 "useAjax":       <?= $block->escapeHtml($block->getUseAjax()) ?>,
                 "currentNodeId": <?= (int)$block->getCategoryId() ?>,
                 "jsFormObject":  "<?= /* @noEscape */ $block->getJsFormObject() ?>",
@@ -28,7 +27,7 @@
                 "checked":       "<?= $block->escapeHtml($block->getRoot()->getChecked()) ?>",
                 "allowdDrop":    <?= /* @noEscape */ $block->getRoot()->getIsVisible() ? 'true' : 'false' ?>,
                 "rootId":        <?= (int)$block->getRoot()->getId() ?>,
-                "expanded":      <?= (int)$block->getIsWasExpanded() ?>,
+                "expanded":      true,
                 "categoryId":    <?= (int)$block->getCategoryId() ?>,
                 "treeJson":      <?= /* @noEscape */ $block->getTreeJson() ?>
             }
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml
index f58b39a819a0c..c77b66733afc4 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml
@@ -5,18 +5,18 @@
  */
 
 /**
- * Template for \Magento\Catalog\Block\Adminhtml\Category\Edit
+ * @var $block \Magento\Catalog\Block\Adminhtml\Category\Edit
  */
 ?>
 <div data-id="information-dialog-category" class="messages" style="display: none;">
     <div class="message message-notice">
-        <div><?= /* @escapeNotVerified */ __('This operation can take a long time') ?></div>
+        <div><?= $block->escapeHtml(__('This operation can take a long time')) ?></div>
     </div>
 </div>
 <script type="text/x-magento-init">
     {
         "*": {
-            "categoryForm": {"refreshUrl": "<?= /* @escapeNotVerified */ $block->getRefreshPathUrl() ?>"}
+            "categoryForm": {"refreshUrl": "<?= $block->escapeJs($block->escapeUrl($block->getRefreshPathUrl())) ?>"}
         }
     }
 </script>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/assign_products.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/assign_products.phtml
index 4691a709cadeb..af7aec12a57ed 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/assign_products.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/assign_products.phtml
@@ -16,8 +16,8 @@ $gridJsObjectName = $blockGrid->getJsObjectName();
     {
         "*": {
             "Magento_Catalog/catalog/category/assign-products": {
-                "selectedProducts": <?= /* @escapeNotVerified */ $block->getProductsJson() ?>,
-                "gridJsObjectName": <?= /* @escapeNotVerified */ '"' . $gridJsObjectName . '"' ?: '{}' ?>
+                "selectedProducts": <?= /* @noEscape */ $block->getProductsJson() ?>,
+                "gridJsObjectName": <?= /* @noEscape */ '"' . $gridJsObjectName . '"' ?: '{}' ?>
             }
         }
     }
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
index 9865589556e7b..53025ba3dfb71 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
@@ -4,27 +4,26 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var $block \Magento\Catalog\Block\Adminhtml\Category\Tree */
 ?>
 <div class="categories-side-col">
     <div class="sidebar-actions">
-        <?php if ($block->getRoot()): ?>
+        <?php if ($block->getRoot()) :?>
             <?= $block->getAddRootButtonHtml() ?><br/>
             <?= $block->getAddSubButtonHtml() ?>
         <?php endif; ?>
     </div>
     <div class="tree-actions">
-        <?php if ($block->getRoot()): ?>
+        <?php if ($block->getRoot()) :?>
             <?php //echo $block->getCollapseButtonHtml() ?>
             <?php //echo $block->getExpandButtonHtml() ?>
             <a href="#"
-               onclick="tree.collapseTree(); return false;"><?= /* @escapeNotVerified */ __('Collapse All') ?></a>
+               onclick="tree.collapseTree(); return false;"><?= $block->escapeHtml(__('Collapse All')) ?></a>
             <span class="separator">|</span> <a href="#"
-                                                onclick="tree.expandTree(); return false;"><?= /* @escapeNotVerified */ __('Expand All') ?></a>
+                                                onclick="tree.expandTree(); return false;"><?= $block->escapeHtml(__('Expand All')) ?></a>
         <?php endif; ?>
     </div>
-    <?php if ($block->getRoot()): ?>
+    <?php if ($block->getRoot()) :?>
     <div class="tree-holder">
         <div id="tree-div" class="tree-wrapper"></div>
     </div>
@@ -32,7 +31,7 @@
 
     <div data-id="information-dialog-tree" class="messages" style="display: none;">
         <div class="message message-notice">
-            <div><?= /* @escapeNotVerified */ __('This operation can take a long time') ?></div>
+            <div><?= $block->escapeHtml(__('This operation can take a long time')) ?></div>
         </div>
     </div>
     <script>
@@ -172,7 +171,7 @@
 
                     if (!this.collapsed) {
                         this.collapsed = true;
-                        this.loader.dataUrl = '<?= /* @escapeNotVerified */ $block->getLoadTreeUrl(false) ?>';
+                        this.loader.dataUrl = '<?= $block->escapeJs($block->escapeUrl($block->getLoadTreeUrl(false))) ?>';
                         this.request(this.loader.dataUrl, false);
                     }
                 },
@@ -181,7 +180,7 @@
                     this.expandAll();
                     if (this.collapsed) {
                         this.collapsed = false;
-                        this.loader.dataUrl = '<?= /* @escapeNotVerified */ $block->getLoadTreeUrl(true) ?>';
+                        this.loader.dataUrl = '<?= $block->escapeJs($block->escapeUrl($block->getLoadTreeUrl(true))) ?>';
                         this.request(this.loader.dataUrl, false);
                     }
                 },
@@ -216,7 +215,7 @@
                 if (tree && switcherParams) {
                     var url;
                     if (switcherParams.useConfirm) {
-                        if (!confirm("<?= /* @escapeNotVerified */ __('Please confirm site switching. All data that hasn\'t been saved will be lost.') ?>")) {
+                        if (!confirm("<?= $block->escapeJs(__('Please confirm site switching. All data that hasn\'t been saved will be lost.')) ?>")) {
                             return false;
                         }
                     }
@@ -259,7 +258,7 @@
                             }
                         });
                     } else {
-                        var baseUrl = '<?= /* @escapeNotVerified */ $block->getEditUrl() ?>';
+                        var baseUrl = '<?= $block->escapeJs($block->escapeUrl($block->getEditUrl())) ?>';
                         var urlExt = switcherParams.scopeParams + 'id/' + tree.currentNodeId + '/';
                         url = parseSidUrl(baseUrl, urlExt);
                         setLocation(url);
@@ -296,17 +295,18 @@
                 if (scopeParams) {
                     url = url + scopeParams;
                 }
-                <?php if ($block->isClearEdit()): ?>
+                <?php if ($block->isClearEdit()) :?>
                 if (selectedNode) {
                     url = url + 'id/' + config.parameters.category_id;
                 }
                 <?php endif;?>
                 //updateContent(url); //commented since ajax requests replaced with http ones to load a category
+                jQuery('#tree-div').find('.x-tree-node-el').first().remove();
             }
 
             jQuery(function () {
                 categoryLoader = new Ext.tree.TreeLoader({
-                    dataUrl: '<?= /* @escapeNotVerified */ $block->getLoadTreeUrl() ?>'
+                    dataUrl: '<?= $block->escapeJs($block->escapeUrl($block->getLoadTreeUrl())) ?>'
                 });
 
                 categoryLoader.processResponse = function (response, parent, callback) {
@@ -388,26 +388,26 @@
                     enableDD: true,
                     containerScroll: true,
                     selModel: new Ext.tree.CheckNodeMultiSelectionModel(),
-                    rootVisible: '<?= /* @escapeNotVerified */ $block->getRoot()->getIsVisible() ?>',
-                    useAjax: <?= /* @escapeNotVerified */ $block->getUseAjax() ?>,
-                    switchTreeUrl: '<?= /* @escapeNotVerified */ $block->getSwitchTreeUrl() ?>',
-                    editUrl: '<?= /* @escapeNotVerified */ $block->getEditUrl() ?>',
-                    currentNodeId: <?= /* @escapeNotVerified */ (int)$block->getCategoryId() ?>,
-                    baseUrl: '<?= /* @escapeNotVerified */ $block->getEditUrl() ?>'
+                    rootVisible: '<?= (bool)$block->getRoot()->getIsVisible() ?>',
+                    useAjax: <?= $block->escapeJs($block->getUseAjax()) ?>,
+                    switchTreeUrl: '<?= $block->escapeJs($block->escapeUrl($block->getSwitchTreeUrl())) ?>',
+                    editUrl: '<?= $block->escapeJs($block->escapeUrl($block->getEditUrl())) ?>',
+                    currentNodeId: <?= (int)$block->getCategoryId() ?>,
+                    baseUrl: '<?= $block->escapeJs($block->escapeUrl($block->getEditUrl())) ?>'
                 };
 
                 defaultLoadTreeParams = {
                     parameters: {
-                        text: <?= /* @escapeNotVerified */ json_encode(htmlentities($block->getRoot()->getName())) ?>,
+                        text: <?= /* @noEscape */ json_encode(htmlentities($block->getRoot()->getName())) ?>,
                         draggable: false,
-                        allowDrop: <?php if ($block->getRoot()->getIsVisible()): ?>true<?php else : ?>false<?php endif; ?>,
+                        allowDrop: <?php if ($block->getRoot()->getIsVisible()) :?>true<?php else :?>false<?php endif; ?>,
                         id: <?= (int)$block->getRoot()->getId() ?>,
                         expanded: <?= (int)$block->getIsWasExpanded() ?>,
                         store_id: <?= (int)$block->getStore()->getId() ?>,
                         category_id: <?= (int)$block->getCategoryId() ?>,
                         parent: <?= (int)$block->getRequest()->getParam('parent') ?>
                     },
-                    data: <?= /* @escapeNotVerified */ $block->getTreeJson() ?>
+                    data: <?= /* @noEscape */ $block->getTreeJson() ?>
                 };
 
                 reRenderTree();
@@ -485,7 +485,7 @@
                         click: function () {
                             (function ($) {
                                 $.ajax({
-                                    url: '<?= /* @escapeNotVerified */ $block->getMoveUrl() ?>',
+                                    url: '<?= $block->escapeJs($block->escapeUrl($block->getMoveUrl())) ?>',
                                     method: 'POST',
                                     data: registry.get('pd'),
                                     showLoader: true
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml
index dbe66ef1aecd3..a556b87e037ef 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml
@@ -3,24 +3,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php $_divId = 'tree' . $block->getId() ?>
-<div id="<?= /* @escapeNotVerified */ $_divId ?>" class="tree"></div>
+<div id="<?= $block->escapeHtmlAttr($_divId) ?>" class="tree"></div>
 <!--[if IE]>
 <script id="ie-deferred-loader" defer="defer" src="//:"></script>
 <![endif]-->
 <script>
 require(['jquery', "prototype", "extjs/ext-tree-checkbox"], function(jQuery){
 
-var tree<?= /* @escapeNotVerified */ $block->getId() ?>;
+var tree<?= $block->escapeJs($block->getId()) ?>;
 
-var useMassaction = <?= /* @escapeNotVerified */ $block->getUseMassaction() ? 1 : 0 ?>;
+var useMassaction = <?= /* @noEscape */ $block->getUseMassaction() ? 1 : 0 ?>;
 
-var isAnchorOnly = <?= /* @escapeNotVerified */ $block->getIsAnchorOnly() ? 1 : 0 ?>;
+var isAnchorOnly = <?= /* @noEscape */ $block->getIsAnchorOnly() ? 1 : 0 ?>;
 
 Ext.tree.TreePanel.Enhanced = function(el, config)
 {
@@ -44,8 +41,8 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
         this.setRootNode(root);
 
         if (firstLoad) {
-            <?php if ($block->getNodeClickListener()): ?>
-                this.addListener('click', <?= /* @escapeNotVerified */ $block->getNodeClickListener() ?>.createDelegate(this));
+            <?php if ($block->getNodeClickListener()) :?>
+                this.addListener('click', <?= /* @noEscape */ $block->getNodeClickListener() ?>.createDelegate(this));
             <?php endif; ?>
         }
 
@@ -58,10 +55,10 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
 
 jQuery(function()
 {
-    var emptyNodeAdded = <?= /* @escapeNotVerified */ ($block->getWithEmptyNode() ? 'false' : 'true') ?>;
+    var emptyNodeAdded = <?= /* @noEscape */ ($block->getWithEmptyNode() ? 'false' : 'true') ?>;
 
     var categoryLoader = new Ext.tree.TreeLoader({
-       dataUrl: '<?= /* @escapeNotVerified */ $block->getLoadTreeUrl() ?>'
+       dataUrl: '<?= $block->escapeJs($block->escapeUrl($block->getLoadTreeUrl())) ?>'
     });
 
     categoryLoader.buildCategoryTree = function(parent, config)
@@ -80,7 +77,7 @@ jQuery(function()
                 // Add empty node to reset category filter
                 if(!emptyNodeAdded) {
                     var empty = Object.clone(_node);
-                    empty.text = '<?= /* @escapeNotVerified */ __('None') ?>';
+                    empty.text = '<?= $block->escapeJs(__('None')) ?>';
                     empty.children = [];
                     empty.id = 'none';
                     empty.path = '1/none';
@@ -151,25 +148,25 @@ jQuery(function()
     };
 
     categoryLoader.on("beforeload", function(treeLoader, node) {
-        $('<?= /* @escapeNotVerified */ $_divId ?>').fire('category:beforeLoad', {treeLoader:treeLoader});
+        $('<?= $block->escapeJs($_divId) ?>').fire('category:beforeLoad', {treeLoader:treeLoader});
         treeLoader.baseParams.id = node.attributes.id;
     });
 
-    tree<?= /* @escapeNotVerified */ $block->getId() ?> = new Ext.tree.TreePanel.Enhanced('<?= /* @escapeNotVerified */ $_divId ?>', {
+    tree<?= $block->escapeJs($block->getId()) ?> = new Ext.tree.TreePanel.Enhanced('<?= $block->escapeJs($_divId) ?>', {
         animate:          false,
         loader:           categoryLoader,
         enableDD:         false,
         containerScroll:  true,
-        rootVisible:      '<?= /* @escapeNotVerified */ $block->getRoot()->getIsVisible() ?>',
+        rootVisible:      false,
         useAjax:          true,
         currentNodeId:    <?= (int) $block->getCategoryId() ?>,
         addNodeTo:        false
     });
 
     if (useMassaction) {
-        tree<?= /* @escapeNotVerified */ $block->getId() ?>.on('check', function(node) {
-            $('<?= /* @escapeNotVerified */ $_divId ?>').fire('node:changed', {node:node});
-        }, tree<?= /* @escapeNotVerified */ $block->getId() ?>);
+        tree<?= $block->escapeJs($block->getId()) ?>.on('check', function(node) {
+            $('<?= $block->escapeJs($_divId) ?>').fire('node:changed', {node:node});
+        }, tree<?= $block->escapeJs($block->getId()) ?>);
     }
 
     // set the root node
@@ -177,11 +174,11 @@ jQuery(function()
         text:        'Psw',
         draggable:   false,
         id:          <?= (int) $block->getRoot()->getId() ?>,
-        expanded:    <?= (int) $block->getIsWasExpanded() ?>,
+        expanded:    true,
         category_id: <?= (int) $block->getCategoryId() ?>
     };
 
-    tree<?= /* @escapeNotVerified */ $block->getId() ?>.loadTree({parameters:parameters, data:<?= /* @escapeNotVerified */ $block->getTreeJson() ?>},true);
+    tree<?= $block->escapeJs($block->getId()) ?>.loadTree({parameters:parameters, data:<?= /* @noEscape */ $block->getTreeJson() ?>},true);
 
 });
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
index 680361eae448e..ea086c3a9e371 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
@@ -3,19 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
-/**
- * @see \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element
- */
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
+/** @var $block \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element */
 ?>
 <?php
 /* @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element */
 $element = $block->getElement();
-$note = $element->getNote() ? '<div class="note admin__field-note">' . $element->getNote() . '</div>' : '';
+$note = $element->getNote() ? '<div class="note admin__field-note">' . $block->escapeHtml($element->getNote()) . '</div>' : '';
 $elementBeforeLabel = $element->getExtType() == 'checkbox' || $element->getExtType() == 'radio';
 $addOn = $element->getBeforeElementHtml() || $element->getAfterElementHtml();
 $fieldId = ($element->getHtmlId()) ? ' id="attribute-' . $element->getHtmlId() . '-container"' : '';
@@ -27,8 +24,8 @@ $fieldClass .= ($element->getRequired()) ? ' required' : '';
 $fieldClass .= ($note) ? ' with-note' : '';
 $fieldClass .= ($entity && $entity->getIsUserDefined()) ? ' user-defined type-' . $entity->getFrontendInput() : '';
 
-$fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
-    . $block->getUiId('form-field', $element->getId());
+$fieldAttributes = $fieldId . ' class="' . $block->escapeHtmlAttr($fieldClass) . '" '
+    . $block->getUiId('form-field', $block->escapeHtmlAttr($element->getId()));
 ?>
 
 <?php $block->checkFieldDisable() ?>
@@ -36,38 +33,38 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
     $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode()
         : 'toggleValueElements(this, this.parentNode.parentNode.parentNode)';
 ?>
-<?php if (!$element->getNoDisplay()): ?>
-    <?php if ($element->getType() == 'hidden'): ?>
+<?php if (!$element->getNoDisplay()) :?>
+    <?php if ($element->getType() == 'hidden') :?>
         <?= $element->getElementHtml() ?>
-    <?php else: ?>
-    <div<?= /* @escapeNotVerified */ $fieldAttributes ?> data-attribute-code="<?= $element->getHtmlId() ?>"
-        data-apply-to="<?= $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(
+    <?php else :?>
+    <div<?= /* @noEscape */ $fieldAttributes ?> data-attribute-code="<?= $element->getHtmlId() ?>"
+        data-apply-to="<?= $block->escapeHtmlAttr($this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode(
             $element->hasEntityAttribute() ? $element->getEntityAttribute()->getApplyTo() : []
         ))?>"
         >
-        <?php if ($elementBeforeLabel): ?>
+        <?php if ($elementBeforeLabel) :?>
             <?= $block->getElementHtml() ?>
             <?= $element->getLabelHtml('', $block->getScopeLabel()) ?>
-            <?= /* @escapeNotVerified */ $note ?>
-        <?php else: ?>
+            <?= /* @noEscape */ $note ?>
+        <?php else :?>
             <?= $element->getLabelHtml('', $block->getScopeLabel()) ?>
             <div class="admin__field-control control">
-                <?= /* @escapeNotVerified */ ($addOn) ? '<div class="addon">' . $block->getElementHtml() . '</div>' : $block->getElementHtml() ?>
-                <?= /* @escapeNotVerified */ $note ?>
+                <?= /* @noEscape */ ($addOn) ? '<div class="addon">' . $block->getElementHtml() . '</div>' : $block->getElementHtml() ?>
+                <?= /* @noEscape */ $note ?>
             </div>
         <?php endif; ?>
         <div class="field-service">
-            <?php if ($block->canDisplayUseDefault()): ?>
+            <?php if ($block->canDisplayUseDefault()) :?>
                 <label for="<?= $element->getHtmlId() ?>_default" class="choice use-default">
-                    <input <?php if ($element->getReadonly()):?> disabled="disabled"<?php endif; ?>
+                    <input <?php if ($element->getReadonly()) :?> disabled="disabled"<?php endif; ?>
                             type="checkbox"
                             name="use_default[]"
                             class="use-default-control"
                             id="<?= $element->getHtmlId() ?>_default"
-                            <?php if ($block->usedDefault()): ?> checked="checked"<?php endif; ?>
-                            onclick="<?= /* @escapeNotVerified */ $elementToggleCode ?>"
-                            value="<?= /* @escapeNotVerified */ $block->getAttributeCode() ?>"/>
-                    <span class="use-default-label"><?= /* @escapeNotVerified */ __('Use Default Value') ?></span>
+                            <?php if ($block->usedDefault()) :?> checked="checked"<?php endif; ?>
+                            onclick="<?= $block->escapeHtmlAttr($elementToggleCode) ?>"
+                            value="<?= $block->escapeHtmlAttr($block->getAttributeCode()) ?>"/>
+                    <span class="use-default-label"><?= $block->escapeHtml(__('Use Default Value')) ?></span>
                 </label>
             <?php endif; ?>
         </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product.phtml
index ce4d8450f5e63..57eacb8e84a93 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product.phtml
@@ -3,14 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
-/**
- * @see \Magento\Catalog\Block\Adminhtml\Product
- */
-?>
+// phpcs:disable PSR2.Files.ClosingTag
 
+/** @var $block \Magento\Catalog\Block\Adminhtml\Product */
+?>
 <?= $block->getGridHtml() ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml
index 124194519b978..e30b981ff36a6 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml
@@ -4,16 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /**
  * @var $block \Magento\Backend\Block\Widget\Form\Container
  */
 ?>
-<?= /* @escapeNotVerified */ $block->getFormInitScripts() ?>
-<div data-mage-init='{"floatingHeader": {}}' class="page-actions attribute-popup-actions" <?= /* @escapeNotVerified */ $block->getUiId('content-header') ?>>
+<?= /* @noEscape */ $block->getFormInitScripts() ?>
+<div data-mage-init='{"floatingHeader": {}}' class="page-actions attribute-popup-actions" <?= /* @noEscape */ $block->getUiId('content-header') ?>>
     <?= $block->getButtonsHtml('header') ?>
 </div>
 
@@ -25,9 +23,9 @@
     {
         "#edit_form": {
             "Magento_Catalog/catalog/product/edit/attribute": {
-                "validationUrl": "<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>"
+                "validationUrl": "<?= $block->escapeJs($block->escapeUrl($block->getValidationUrl())) ?>"
             }
         }
     }
 </script>
-<?= /* @escapeNotVerified */ $block->getFormScripts() ?>
+<?= /* @noEscape */ $block->getFormScripts() ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
index 3cbfa0f29d74f..263de5a16c4a0 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
@@ -4,8 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <script>
 require([
@@ -40,13 +39,16 @@ function getFrontTab() {
 
 function checkOptionsPanelVisibility(){
     if($('manage-options-panel')){
-        var panel = $('manage-options-panel').up('.fieldset');
+        var panel = $('manage-options-panel').up('.fieldset'),
+            activePanelClass = 'selected-type-options';
 
         if($('frontend_input') && ($('frontend_input').value=='select' || $('frontend_input').value=='multiselect')){
             panel.show();
+            panel.addClass(activePanelClass);
         }
         else {
             panel.hide();
+            panel.removeClass(activePanelClass);
         }
     }
 }
@@ -194,22 +196,22 @@ function switchDefaultValueField()
             setRowVisibility('frontend_class', false);
         break;
 
-        <?php foreach ($this->helper('Magento\Catalog\Helper\Data')->getAttributeHiddenFields() as $type => $fields): ?>
-            case '<?= /* @escapeNotVerified */ $type ?>':
+        <?php foreach ($this->helper(Magento\Catalog\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: ?>
-                        setRowVisibility('<?= /* @escapeNotVerified */ $one ?>', false);
+                    <?php else :?>
+                        setRowVisibility('<?= $block->escapeJs($one) ?>', false);
                     <?php endif; ?>
                 <?php endforeach; ?>
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
index f3d39257c266c..1d5d251f00de9 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml
@@ -4,15 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Labels  */
 ?>
 
 <div class="fieldset-wrapper admin__collapsible-block-wrapper opened" id="manage-titles-wrapper">
     <div class="fieldset-wrapper-title">
         <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#manage-titles-content">
-            <span><?= /* @escapeNotVerified */ __('Manage Titles (Size, Color, etc.)') ?></span>
+            <span><?= $block->escapeHtml(__('Manage Titles (Size, Color, etc.)')) ?></span>
         </strong>
     </div>
     <div class="fieldset-wrapper-content in collapse" id="manage-titles-content">
@@ -21,17 +19,23 @@
                 <table class="admin__control-table" id="attribute-labels-table">
                     <thead>
                     <tr>
-                        <?php foreach ($block->getStores() as $_store): ?>
-                            <th class="col-store-view"><?= /* @escapeNotVerified */ $_store->getName() ?></th>
+                        <?php foreach ($block->getStores() as $_store) :?>
+                            <th class="col-store-view"><?= $block->escapeHtml($_store->getName()) ?></th>
                         <?php endforeach; ?>
                     </tr>
                     </thead>
                     <tbody>
                     <tr>
                         <?php $_labels = $block->getLabelValues() ?>
-                        <?php foreach ($block->getStores() as $_store): ?>
+                        <?php foreach ($block->getStores() as $_store) :?>
                             <td class="col-store-view">
-                                <input class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>" type="text" name="frontend_label[<?= /* @escapeNotVerified */ $_store->getId() ?>]" value="<?= $block->escapeHtml($_labels[$_store->getId()]) ?>"<?php if ($block->getReadOnly()):?> disabled="disabled"<?php endif;?>/>
+                                <input class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID) :?> required-option<?php endif; ?>"
+                                       type="text"
+                                       name="frontend_label[<?= $block->escapeHtmlAttr($_store->getId()) ?>]"
+                                       value="<?= $block->escapeHtmlAttr($_labels[$_store->getId()]) ?>"
+                                    <?php if ($block->getReadOnly()) :?>
+                                        disabled="disabled"
+                                    <?php endif;?>/>
                             </td>
                         <?php endforeach; ?>
                     </tr>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
index f812a27f87ad9..e5f8a360c334c 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Options */
 
 $stores = $block->getStoresSortedBySortOrder();
@@ -23,8 +21,8 @@ $stores = $block->getStoresSortedBySortOrder();
                         <span><?= $block->escapeHtml(__('Is Default')) ?></span>
                     </th>
                     <?php
-                    foreach ($stores as $_store): ?>
-                        <th<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> class="_required"<?php endif; ?>>
+                    foreach ($stores as $_store) :?>
+                        <th<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID) :?> class="_required"<?php endif; ?>>
                             <span><?= $block->escapeHtml(__($_store->getName())) ?></span>
                         </th>
                     <?php endforeach;
@@ -43,7 +41,7 @@ $stores = $block->getStoresSortedBySortOrder();
             </tr>
             <tr>
                 <th colspan="<?= (int) $storetotal ?>" class="col-actions-add">
-                    <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
+                    <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) :?>
                         <button id="add_new_option_button" data-action="add_new_row"
                                 title="<?= $block->escapeHtml(__('Add Option')) ?>"
                                 type="button" class="action- scalable add">
@@ -59,22 +57,22 @@ $stores = $block->getStoresSortedBySortOrder();
     <script id="row-template" type="text/x-magento-template">
         <tr <% if (data.rowClasses) { %>class="<%- data.rowClasses %>"<% } %>>
             <td class="col-draggable">
-                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()): ?>
+                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) :?>
                     <div data-role="draggable-handle" class="draggable-handle"
                          title="<?= $block->escapeHtml(__('Sort Option')) ?>">
                     </div>
                 <?php endif; ?>
-                <input data-role="order" type="hidden" name="option[order][<%- data.id %>]"  value="<%- data.sort_order %>" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()): ?> disabled="disabled"<?php endif; ?>/>
+                <input data-role="order" type="hidden" name="option[order][<%- data.id %>]"  value="<%- data.sort_order %>" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()) :?> disabled="disabled"<?php endif; ?>/>
             </td>
             <td class="col-default control-table-actions-cell">
-                <input class="input-radio" type="<%- data.intype %>" name="default[]" value="<%- data.id %>" <%- data.checked %><?php if ($block->getReadOnly()):?>disabled="disabled"<?php endif;?>/>
+                <input class="input-radio" type="<%- data.intype %>" name="default[]" value="<%- data.id %>" <%- data.checked %><?php if ($block->getReadOnly()) :?>disabled="disabled"<?php endif;?>/>
             </td>
-            <?php foreach ($stores as $_store): ?>
-            <td class="col-<%- data.id %>"><input name="option[value][<%- data.id %>][<?= (int) $_store->getId() ?>]" value="<%- data.store<?= /* @noEscape */ (int) $_store->getId() ?> %>" class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option required-unique<?php endif; ?>" type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>/></td>
+            <?php foreach ($stores as $_store) :?>
+            <td class="col-<%- data.id %>"><input name="option[value][<%- data.id %>][<?= (int) $_store->getId() ?>]" value="<%- data.store<?= /* @noEscape */ (int) $_store->getId() ?> %>" class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID) :?> required-option required-unique<?php endif; ?>" type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()) :?> disabled="disabled"<?php endif;?>/></td>
             <?php endforeach; ?>
             <td id="delete_button_container_<%- data.id %>" class="col-delete">
                 <input type="hidden" class="delete-flag" name="option[delete][<%- data.id %>]" value="" />
-                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
+                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) :?>
                     <button id="delete_button_<%- data.id %>" title="<?= $block->escapeHtml(__('Delete')) ?>" type="button"
                         class="action- scalable delete delete-option"
                         >
@@ -86,9 +84,9 @@ $stores = $block->getStoresSortedBySortOrder();
     </script>
     <?php
     $values = [];
-    foreach($block->getOptionValues() as $value) {
+    foreach ($block->getOptionValues() as $value) {
         $value = $value->getData();
-        $values[] = is_array($value) ? array_map(function($str) {
+        $values[] = is_array($value) ? array_map(function ($str) {
             return htmlspecialchars_decode($str, ENT_QUOTES);
         }, $value) : $value;
     }
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
index fec7e61032ef0..ee713b53a9221 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
@@ -4,8 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var $block Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main */
 ?>
 <div class="attribute-set">
 
@@ -31,11 +30,11 @@
     </div>
     <div class="attribute-set-col fieldset-wrapper">
         <div class="fieldset-wrapper-title">
-            <span class="title"><?= /* @escapeNotVerified */ __('Groups') ?></span>
+            <span class="title"><?= $block->escapeHtml(__('Groups')) ?></span>
         </div>
-        <?php if (!$block->getIsReadOnly()): ?>
-            <?= /* @escapeNotVerified */ $block->getAddGroupButton() ?>&nbsp;<?= /* @escapeNotVerified */ $block->getDeleteGroupButton() ?>
-            <p class="note-block"><?= /* @escapeNotVerified */ __('Double click on a group to rename it.') ?></p>
+        <?php if (!$block->getIsReadOnly()) :?>
+            <?= /* @noEscape */ $block->getAddGroupButton() ?>&nbsp;<?= /* @noEscape */ $block->getDeleteGroupButton() ?>
+            <p class="note-block"><?= $block->escapeHtml(__('Double click on a group to rename it.')) ?></p>
         <?php endif; ?>
 
         <?= $block->getSetsFilterHtml() ?>
@@ -43,7 +42,7 @@
     </div>
     <div class="attribute-set-col fieldset-wrapper">
         <div class="fieldset-wrapper-title">
-            <span class="title"><?= /* @escapeNotVerified */ __('Unassigned Attributes') ?></span>
+            <span class="title"><?= $block->escapeHtml(__('Unassigned Attributes')) ?></span>
         </div>
         <div id="tree-div2" class="attribute-set-tree"></div>
         <script id="ie-deferred-loader" defer="defer" src="//:"></script>
@@ -58,8 +57,8 @@
                 ], function(jQuery, prompt, alert){
 
                 //<![CDATA[
-                var allowDragAndDrop = <?= /* @escapeNotVerified */ ($block->getIsReadOnly() ? 'false' : 'true') ?>;
-                var canEditGroups = <?= /* @escapeNotVerified */ ($block->getIsReadOnly() ? 'false' : 'true') ?>;
+                var allowDragAndDrop = <?= /* @noEscape */ ($block->getIsReadOnly() ? 'false' : 'true') ?>;
+                var canEditGroups = <?=  /* @noEscape */ ($block->getIsReadOnly() ? 'false' : 'true') ?>;
 
                 var TreePanels = function() {
                     // shorthand
@@ -80,13 +79,13 @@
                             // set the root node
                             this.root = new Ext.tree.TreeNode({
                                 text: 'ROOT',
-                                allowDrug:false,
+                                allowDrag:false,
                                 allowDrop:true,
                                 id:'1'
                             });
 
                             tree.setRootNode(this.root);
-                            buildCategoryTree(this.root, <?= /* @escapeNotVerified */ $block->getGroupTreeJson() ?>);
+                            buildCategoryTree(this.root, <?= /* @noEscape */ $block->getGroupTreeJson() ?>);
                             // render the tree
                             tree.render();
                             this.root.expand(false, false);
@@ -94,7 +93,7 @@
 
                             this.ge = new Ext.tree.TreeEditor(tree, {
                                 allowBlank:false,
-                                blankText:'<?= /* @escapeNotVerified */ __('A name is required.') ?>',
+                                blankText:'<?= $block->escapeJs(__('A name is required.')) ?>',
                                 selectOnFocus:true,
                                 cls:'folder'
                             });
@@ -125,7 +124,7 @@
                                 id:'free'
                             });
                             tree2.setRootNode(this.root2);
-                            buildCategoryTree(this.root2, <?= /* @escapeNotVerified */ $block->getAttributeTreeJson() ?>);
+                            buildCategoryTree(this.root2, <?= /* @noEscape */ $block->getAttributeTreeJson() ?>);
 
                             this.root2.addListener('beforeinsert', editSet.rightBeforeInsert);
                             this.root2.addListener('beforeappend', editSet.rightBeforeAppend);
@@ -188,20 +187,36 @@
                                 for( j in config[i].children ) {
                                     if(config[i].children[j].id) {
                                         newNode = new Ext.tree.TreeNode(config[i].children[j]);
-                                        node.appendChild(newNode);
-                                        newNode.addListener('click', editSet.unregister);
+
+                                        if (typeof newNode.ui.onTextChange === 'function') {
+                                            newNode.ui.onTextChange = function (_3, _4, _5) {
+                                                if (this.rendered) {
+                                                    this.textNode.innerText = _4;
+                                                }
+                                            }
+                                        }
                                     }
+                                    node.appendChild(newNode);
+                                    newNode.addListener('click', editSet.unregister);
                                 }
                             }
                         }
                     }
                 }
 
-                editSet = function() {
-                    return {
-                        register : function(node) {
-                            editSet.currentNode = node;
-                        },
+
+                    editSet = function () {
+                        return {
+                            register: function (node) {
+                                editSet.currentNode = node;
+                                if (typeof node.ui.onTextChange === 'function') {
+                                    node.ui.onTextChange = function (_3, _4, _5) {
+                                        if (this.rendered) {
+                                            this.textNode.innerText = _4;
+                                        }
+                                    }
+                                }
+                            },
 
                         unregister : function() {
                             editSet.currentNode = false;
@@ -264,8 +279,8 @@
 
                         addGroup : function() {
                             prompt({
-                                title: "<?= /* @escapeNotVerified */ __('Add New Group') ?>",
-                                content: "<?= /* @escapeNotVerified */ __('Please enter a new group name.') ?>",
+                                title: "<?= $block->escapeJs($block->escapeHtml(__('Add New Group'))) ?>",
+                                content: "<?= $block->escapeJs($block->escapeHtml(__('Please enter a new group name.'))) ?>",
                                 value: "",
                                 validation: true,
                                 validationRules: ['required-entry'],
@@ -293,6 +308,14 @@
                                             allowDrag : true
                                         });
 
+                                        if (typeof newNode.ui.onTextChange === 'function') {
+                                            newNode.ui.onTextChange = function (_3, _4, _5) {
+                                                if (this.rendered) {
+                                                    this.textNode.innerText = _4;
+                                                }
+                                            }
+                                        }
+
                                         TreePanels.root.appendChild(newNode);
                                         newNode.addListener('beforemove', editSet.groupBeforeMove);
                                         newNode.addListener('beforeinsert', editSet.groupBeforeInsert);
@@ -323,7 +346,7 @@
                             }
                             for (var i=0; i < TreePanels.root.childNodes.length; i++) {
                                 if (TreePanels.root.childNodes[i].text.toLowerCase() == name.toLowerCase() && TreePanels.root.childNodes[i].id != exceptNodeId) {
-                                    errorText = '<?= /* @escapeNotVerified */ __('An attribute group named "/name/" already exists.') ?>';
+                                    errorText = '<?= $block->escapeJs(__('An attribute group named "/name/" already exists.')) ?>';
                                     alert({
                                         content: errorText.replace("/name/",name)
                                     });
@@ -351,7 +374,7 @@
                                 editSet.req.form_key = FORM_KEY;
                             }
                             var req = {data : Ext.util.JSON.encode(editSet.req)};
-                            var con = new Ext.lib.Ajax.request('POST', '<?= /* @escapeNotVerified */ $block->getMoveUrl() ?>', {success:editSet.success,failure:editSet.failure}, req);
+                            var con = new Ext.lib.Ajax.request('POST', '<?= $block->escapeJs($block->escapeUrl($block->getMoveUrl())) ?>', {success:editSet.success,failure:editSet.failure}, req);
                         },
 
                         success : function(o) {
@@ -426,7 +449,7 @@
                         rightRemove : function(tree, nodeThis, node) {
                             if( nodeThis.firstChild == null && node.id != 'empty' ) {
                                 var newNode = new Ext.tree.TreeNode({
-                                    text : '<?= /* @escapeNotVerified */ __('Empty') ?>',
+                                    text : '<?= $block->escapeJs(__('Empty')) ?>',
                                     id : 'empty',
                                     cls : 'folder',
                                     is_user_defined : 1,
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/add.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/add.phtml
index c1af14389fe59..227ed4be81fae 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/add.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/add.phtml
@@ -8,7 +8,7 @@
 <script>
 require(['jquery', "mage/mage"], function(jQuery){
 
-    jQuery('#<?= /* @escapeNotVerified */ $block->getFormId() ?>').mage('form').mage('validation');
+    jQuery('#<?= $block->escapeJs($block->getFormId()) ?>').mage('form').mage('validation');
 
 });
 </script>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/main.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/main.phtml
index 902c6932f0ae1..754cb0fe576fd 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/main.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/main.phtml
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?= $block->getChildHtml('grid') ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
index 75027d5e043fb..32466a1dfa965 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
@@ -3,10 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
- ?>
+?>
 <div id="product_composite_configure" class="product-configure-popup" style="display:none;">
     <iframe name="product_composite_configure_iframe" id="product_composite_configure_iframe" style="width:0; height:0; border:0px solid #fff; position:absolute; top:-1000px; left:-1000px" onload="window.productConfigure && productConfigure.onLoadIFrame()"></iframe>
     <form action="" method="post" id="product_composite_configure_form" enctype="multipart/form-data" onsubmit="productConfigure.onConfirmBtn(); return false;" target="product_composite_configure_iframe">
@@ -19,7 +16,7 @@
             <div id="product_composite_configure_form_confirmed" style="display:none;"></div>
         </div>
         <input type="hidden" name="as_js_varname" value="iFrameResponse" />
-        <input type="hidden" name="form_key" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
+        <input type="hidden" name="form_key" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" />
     </form>
     <div id="product_composite_configure_confirmed" style="display:none;"></div>
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml
index acc80fa6ea6b0..c58cdd6b36a1b 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml
@@ -3,24 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-
 <?php /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options */ ?>
 <?php $options = $block->decorateArray($block->getOptions()); ?>
-<?php if (count($options)): ?>
-
-<?= $block->getChildHtml('options_js') ?>
-
-<fieldset id="product_composite_configure_fields_options" class="fieldset admin__fieldset <?= $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
-    <legend class="legend admin__legend">
-        <span><?= /* @escapeNotVerified */ __('Custom Options') ?></span>
-    </legend><br>
-    <?php foreach ($options as $option): ?>
-        <?= $block->getOptionHtml($option) ?>
-    <?php endforeach;?>
-</fieldset>
-
+<?php if (count($options)) :?>
+    <?= $block->getChildHtml('options_js') ?>
+    <fieldset id="product_composite_configure_fields_options"
+              class="fieldset admin__fieldset <?= $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
+        <legend class="legend admin__legend">
+            <span><?= $block->escapeHtml(__('Custom Options')) ?></span>
+        </legend><br>
+        <?php foreach ($options as $option) :?>
+            <?= $block->getOptionHtml($option) ?>
+        <?php endforeach;?>
+    </fieldset>
 <?php endif; ?>
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 30c05c2ec689b..bd8d8df8dcff0 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
@@ -3,82 +3,88 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+?>
+<?php
+// phpcs:disable Squiz.WhiteSpace.ControlStructureSpacing
 
-// @codingStandardsIgnoreFile
-
+/* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Date */
 ?>
-<?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Date */ ?>
 <?php $_option = $block->getOption(); ?>
-<?php $_optionId = $_option->getId(); ?>
-<div class="admin__field field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
-  <label class="label admin__field-label">
-      <?= $block->escapeHtml($_option->getTitle()) ?>
-      <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
-  </label>
+<?php $_optionId = (int) $_option->getId(); ?>
+<div class="admin__field field<?= $_option->getIsRequire() ? ' required _required' : '' ?>">
+    <label class="label admin__field-label">
+        <span>
+            <?= $block->escapeHtml($_option->getTitle()) ?>
+            <?= /* @noEscape */ $block->getFormattedPrice() ?>
+        </span>
+    </label>
   <div class="admin__field-control control">
 
-  <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME
-      || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE): ?>
+        <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME
+            || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE) :?>
 
-      <?= $block->getDateHtml() ?>
+            <?= $block->getDateHtml() ?>
 
-      <?php if (!$block->useCalendar()): ?>
-      <script>
-require([
-  "prototype",
-  "Magento_Catalog/catalog/product/composite/configure"
-], function(){
+            <?php if (!$block->useCalendar()) :?>
+                <script>
+                    require([
+                        "prototype",
+                        "Magento_Catalog/catalog/product/composite/configure"
+                    ], function(){
 
-      window.dateOption = productConfigure.opConfig.dateOption;
-      Event.observe('options_<?= /* @escapeNotVerified */ $_optionId ?>_month', 'change', dateOption.reloadMonth.bind(dateOption));
-      Event.observe('options_<?= /* @escapeNotVerified */ $_optionId ?>_year', 'change', dateOption.reloadMonth.bind(dateOption));      
-});
-</script>
-      <?php endif; ?>
+                        window.dateOption = productConfigure.opConfig.dateOption;
+                        Event.observe('options_<?= /* @noEscape */ $_optionId ?>_month', 'change', dateOption.reloadMonth.bind(dateOption));
+                        Event.observe('options_<?= /* @noEscape */ $_optionId ?>_year', 'change', dateOption.reloadMonth.bind(dateOption));
+                    });
+                </script>
+            <?php endif; ?>
 
-  <?php endif; ?>
+        <?php endif; ?>
 
-  <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME
-      || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_TIME): ?>
-      <span class="time-picker"><?= $block->getTimeHtml() ?></span>
-  <?php endif; ?>
+        <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME
+            || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_TIME) :?>
+            <span class="time-picker"><?= $block->getTimeHtml() ?></span>
+        <?php endif; ?>
 
-    <input type="hidden" name="validate_datetime_<?= /* @escapeNotVerified */ $_optionId ?>" class="validate-datetime-<?= /* @escapeNotVerified */ $_optionId ?>" value="" />
-    <script>
-require([
-  "jquery",
-  "mage/backend/validation"
-], function(jQuery){
+        <input type="hidden"
+               name="validate_datetime_<?= /* @noEscape */ $_optionId ?>"
+               class="validate-datetime-<?= /* @noEscape */ $_optionId ?>"
+               value="" />
+        <script>
+            require([
+                "jquery",
+                "mage/backend/validation"
+            ], function(jQuery){
 
-    //<![CDATA[
-<?php if ($_option->getIsRequire()): ?>
-        jQuery.validator.addMethod('validate-datetime-<?= /* @escapeNotVerified */ $_optionId ?>', function(v) {
-            var dateTimeParts = jQuery('.datetime-picker[id^="options_<?= /* @escapeNotVerified */ $_optionId ?>"]');
-            for (var i=0; i < dateTimeParts.length; i++) {
-                if (dateTimeParts[i].value == "") return false;
-            }
-            return true;
-        }, '<?= $block->escapeJs(__('This is a required option.')) ?>');
-<?php else: ?>
-        jQuery.validator.addMethod('validate-datetime-<?= /* @escapeNotVerified */ $_optionId ?>', function(v) {
-            var dateTimeParts = jQuery('.datetime-picker[id^="options_<?= /* @escapeNotVerified */ $_optionId ?>"]');
-            var hasWithValue = false, hasWithNoValue = false;
-            var pattern = /day_part$/i;
-            for (var i=0; i < dateTimeParts.length; i++) {
-                if (! pattern.test(dateTimeParts[i].id)) {
-                    if (dateTimeParts[i].value === "") {
-                        hasWithValue = true;
-                    } else {
-                        hasWithNoValue = true;
+                //<![CDATA[
+                <?php if ($_option->getIsRequire()) :?>
+                jQuery.validator.addMethod('validate-datetime-<?= /* @noEscape */ $_optionId ?>', function(v) {
+                    var dateTimeParts = jQuery('.datetime-picker[id^="options_<?= /* @noEscape */ $_optionId ?>"]');
+                    for (var i=0; i < dateTimeParts.length; i++) {
+                        if (dateTimeParts[i].value == "") return false;
                     }
-                }
-            }
-            return hasWithValue ^ hasWithNoValue;
-        }, '<?= $block->escapeJs(__('The field isn\'t complete.')) ?>');
-<?php endif; ?>
-    //]]>
-    
-});
-</script>
-  </div>
+                    return true;
+                }, '<?= $block->escapeJs(__('This is a required option.')) ?>');
+                <?php else :?>
+                jQuery.validator.addMethod('validate-datetime-<?= /* @noEscape */ $_optionId ?>', function(v) {
+                    var dateTimeParts = jQuery('.datetime-picker[id^="options_<?= /* @noEscape */ $_optionId ?>"]');
+                    var hasWithValue = false, hasWithNoValue = false;
+                    var pattern = /day_part$/i;
+                    for (var i=0; i < dateTimeParts.length; i++) {
+                        if (! pattern.test(dateTimeParts[i].id)) {
+                            if (dateTimeParts[i].value === "") {
+                                hasWithValue = true;
+                            } else {
+                                hasWithNoValue = true;
+                            }
+                        }
+                    }
+                    return hasWithValue ^ hasWithNoValue;
+                }, '<?= $block->escapeJs(__('The field isn\'t complete.')) ?>');
+                <?php endif; ?>
+                //]]>
+
+            });
+        </script>
+    </div>
 </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
index 4ad7a95c91980..29bf256bd4d87 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
@@ -3,15 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\File */ ?>
 <?php $_option = $block->getOption(); ?>
 <?php $_fileInfo = $block->getFileInfo(); ?>
 <?php $_fileExists = $_fileInfo->hasData() ? true : false; ?>
-<?php $_fileName = 'options_' . $_option->getId() . '_file'; ?>
+<?php $_fileName = 'options_' . (int)$_option->getId() . '_file'; ?>
 <?php $_fieldNameAction = $_fileName . '_action'; ?>
 <?php $_fieldValueAction = $_fileExists ? 'save_old' : 'save_new'; ?>
 <?php $_fileNamed = $_fileName . '_name'; ?>
@@ -21,11 +18,11 @@
 require(['prototype'], function(){
 
 //<![CDATA[
-    opFile<?= /* @escapeNotVerified */ $_rand ?> = {
+    opFile<?= /* @noEscape */ $_rand ?> = {
         initializeFile: function(inputBox) {
-            this.inputFile = inputBox.select('input[name="<?= /* @escapeNotVerified */ $_fileName ?>"]')[0];
-            this.inputFileAction = inputBox.select('input[name="<?= /* @escapeNotVerified */ $_fieldNameAction ?>"]')[0];
-            this.fileNameBox = inputBox.up('dd').select('.<?= /* @escapeNotVerified */ $_fileNamed ?>')[0];
+            this.inputFile = inputBox.select('input[name="<?= /* @noEscape */ $_fileName ?>"]')[0];
+            this.inputFileAction = inputBox.select('input[name="<?= /* @noEscape */ $_fieldNameAction ?>"]')[0];
+            this.fileNameBox = inputBox.up('dd').select('.<?= /* @noEscape */ $_fileNamed ?>')[0];
         },
 
         toggleFileChange: function(inputBox) {
@@ -62,42 +59,44 @@ require(['prototype'], function(){
 });
 </script>
 
-<div class="admin__field <?php if ($_option->getIsRequire()) echo ' required _required' ?>">
+<div class="admin__field <?= $_option->getIsRequire() ? ' required _required' : '' ?>">
     <label class="admin__field-label label">
-        <?= $block->escapeHtml($_option->getTitle()) ?>
-        <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
+        <span>
+            <?= $block->escapeHtml($_option->getTitle()) ?>
+            <?= /* @noEscape */ $block->getFormattedPrice() ?>
+        </span>
     </label>
     <div class="admin__field-control control">
-        <?php if ($_fileExists): ?>
+        <?php if ($_fileExists) :?>
             <span class="<?= /* @noEscape */ $_fileNamed ?>"><?= $block->escapeHtml($_fileInfo->getTitle()) ?></span>
-            <a href="javascript:void(0)" class="label" onclick="opFile<?= /* @escapeNotVerified */ $_rand ?>.toggleFileChange($(this).next('.input-box'))">
-                <?= /* @escapeNotVerified */ __('Change') ?>
+            <a href="javascript:void(0)" class="label" onclick="opFile<?= /* @noEscape */ $_rand ?>.toggleFileChange($(this).next('.input-box'))">
+                <?= $block->escapeHtml(__('Change')) ?>
             </a>&nbsp;
-            <?php if (!$_option->getIsRequire()): ?>
-                <input type="checkbox" onclick="opFile<?= /* @escapeNotVerified */ $_rand ?>.toggleFileDelete($(this), $(this).next('.input-box'))" price="<?= /* @escapeNotVerified */ $block->getCurrencyPrice($_option->getPrice(true)) ?>"/>
-                <span class="label"><?= /* @escapeNotVerified */ __('Delete') ?></span>
+            <?php if (!$_option->getIsRequire()) :?>
+                <input type="checkbox" onclick="opFile<?= /* @noEscape */ $_rand ?>.toggleFileDelete($(this), $(this).next('.input-box'))" price="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_option->getPrice(true))) ?>"/>
+                <span class="label"><?= $block->escapeHtml(__('Delete')) ?></span>
             <?php endif; ?>
         <?php endif; ?>
         <div class="input-box" <?= $_fileExists ? 'style="display:none"' : '' ?>>
             <!-- ToDo UI: add appropriate file class when z-index issue in ui dialog will be resolved  -->
-            <input type="file" name="<?= /* @noEscape */ $_fileName ?>" class="product-custom-option<?= $_option->getIsRequire() ? ' required-entry' : '' ?>" price="<?= /* @escapeNotVerified */ $block->getCurrencyPrice($_option->getPrice(true)) ?>" <?= $_fileExists ? 'disabled="disabled"' : '' ?>/>
-            <input type="hidden" name="<?= /* @escapeNotVerified */ $_fieldNameAction ?>" value="<?= /* @escapeNotVerified */ $_fieldValueAction ?>" />
+            <input type="file" name="<?= /* @noEscape */ $_fileName ?>" class="product-custom-option<?= $_option->getIsRequire() ? ' required-entry' : '' ?>" price="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_option->getPrice(true))) ?>" <?= $_fileExists ? 'disabled="disabled"' : '' ?>/>
+            <input type="hidden" name="<?= /* @noEscape */ $_fieldNameAction ?>" value="<?= /* @noEscape */ $_fieldValueAction ?>" />
 
-            <?php if ($_option->getFileExtension()): ?>
+            <?php if ($_option->getFileExtension()) :?>
                 <div class="admin__field-note">
-                    <span><?= /* @escapeNotVerified */ __('Compatible file extensions to upload') ?>: <strong><?= /* @escapeNotVerified */ $_option->getFileExtension() ?></strong></span>
+                    <span><?= $block->escapeHtml(__('Compatible file extensions to upload')) ?>: <strong><?= $block->escapeHtml($_option->getFileExtension()) ?></strong></span>
                 </div>
             <?php endif; ?>
 
-            <?php if ($_option->getImageSizeX() > 0): ?>
+            <?php if ($_option->getImageSizeX() > 0) :?>
                 <div class="admin__field-note">
-                    <span><?= /* @escapeNotVerified */ __('Maximum image width') ?>: <strong><?= /* @escapeNotVerified */ $_option->getImageSizeX() ?> <?= /* @escapeNotVerified */ __('px.') ?></strong></span>
+                    <span><?= $block->escapeHtml(__('Maximum image width')) ?>: <strong><?= (int)$_option->getImageSizeX() ?> <?= $block->escapeHtml(__('px.')) ?></strong></span>
                 </div>
             <?php endif; ?>
 
-            <?php if ($_option->getImageSizeY() > 0): ?>
+            <?php if ($_option->getImageSizeY() > 0) :?>
                 <div class="admin__field-note">
-                    <span><?= /* @escapeNotVerified */ __('Maximum image height') ?>: <strong><?= /* @escapeNotVerified */ $_option->getImageSizeY() ?> <?= /* @escapeNotVerified */ __('px.') ?></strong></span>
+                    <span><?= $block->escapeHtml(__('Maximum image height')) ?>: <strong><?= (int)$_option->getImageSizeY() ?> <?= $block->escapeHtml(__('px.')) ?></strong></span>
                 </div>
             <?php endif; ?>
         </div>
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 af09bbe0acd9d..2218ce5d29671 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
@@ -3,21 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Select */ ?>
 <?php $_option = $block->getOption(); ?>
-<div class="admin__field field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
+<div class="admin__field field<?= $_option->getIsRequire() ? ' required _required' : '' ?>">
     <label class="label admin__field-label">
         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
     <div class="control admin__field-control">
         <?= $block->getValuesHtml() ?>
-        <?php if ($_option->getIsRequire()): ?>
-            <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX): ?>
-                <span id="options-<?= /* @escapeNotVerified */ $_option->getId() ?>-container"></span>
+        <?php if ($_option->getIsRequire()) :?>
+            <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX) :?>
+                <span id="options-<?= $block->escapeHtmlAttr($_option->getId()) ?>-container"></span>
             <?php endif; ?>
         <?php endif;?>
     </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
index 11fba22ea8139..5b16c52f099dc 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
@@ -3,26 +3,35 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Text */ ?>
 <?php $_option = $block->getOption(); ?>
-<div class="field admin__field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
+<div class="field admin__field<?= $_option->getIsRequire() ? ' required _required' : '' ?>">
     <label class="admin__field-label label">
-        <?= $block->escapeHtml($_option->getTitle()) ?>
-        <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
+        <span>
+            <?= $block->escapeHtml($_option->getTitle()) ?>
+            <?= /* @noEscape */ $block->getFormattedPrice() ?>
+        </span>
     </label>
     <div class="control admin__field-control">
-        <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_FIELD): ?>
-            <input type="text" id="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text" class="input-text admin__control-text <?= $_option->getIsRequire() ? ' required-entry' : '' ?> <?= /* @escapeNotVerified */ $_option->getMaxCharacters() ? ' validate-length maximum-length-' . $_option->getMaxCharacters() : '' ?> product-custom-option" name="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]" value="<?= $block->escapeHtml($block->getDefaultValue()) ?>" price="<?= /* @escapeNotVerified */ $block->getCurrencyPrice($_option->getPrice(true)) ?>" />
-        <?php elseif ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_AREA): ?>
-            <textarea id="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text" class="admin__control-textarea <?= $_option->getIsRequire() ? ' required-entry' : '' ?> <?= /* @escapeNotVerified */ $_option->getMaxCharacters() ? ' validate-length maximum-length-' . $_option->getMaxCharacters() : '' ?> product-custom-option" name="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]" rows="5" cols="25" price="<?= /* @escapeNotVerified */ $block->getCurrencyPrice($_option->getPrice(true)) ?>"><?= $block->escapeHtml($block->getDefaultValue()) ?></textarea>
+        <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_FIELD) :?>
+            <input type="text"
+                   id="options_<?= $block->escapeHtmlAttr($_option->getId()) ?>_text"
+                   class="input-text admin__control-text <?= $_option->getIsRequire() ? ' required-entry' : '' ?> <?= $_option->getMaxCharacters() ? ' validate-length maximum-length-' . (int) $_option->getMaxCharacters() : '' ?> product-custom-option"
+                   name="options[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                   value="<?= $block->escapeHtmlAttr($block->getDefaultValue()) ?>"
+                   price="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_option->getPrice(true))) ?>" />
+        <?php elseif ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_AREA) :?>
+            <textarea id="options_<?= $block->escapeHtmlAttr($_option->getId()) ?>_text"
+                      class="admin__control-textarea <?= $_option->getIsRequire() ? ' required-entry' : '' ?> <?= $_option->getMaxCharacters() ? ' validate-length maximum-length-' . (int) $_option->getMaxCharacters() : '' ?> product-custom-option"
+                      name="options[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                      rows="5"
+                      cols="25"
+                      price="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_option->getPrice(true))) ?>"><?= $block->escapeHtml($block->getDefaultValue()) ?></textarea>
         <?php endif;?>
 
-        <?php if ($_option->getMaxCharacters()): ?>
-            <p class="note"><?= /* @escapeNotVerified */ __('Maximum number of characters:') ?> <strong><?= /* @escapeNotVerified */ $_option->getMaxCharacters() ?></strong></p>
+        <?php if ($_option->getMaxCharacters()) :?>
+            <p class="note"><?= $block->escapeHtml(__('Maximum number of characters:')) ?> <strong><?= (int) $_option->getMaxCharacters() ?></strong></p>
         <?php endif; ?>
     </div>
 </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml
index 487c9b8e8f2b7..4a31c5d9d1d2b 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Qty */ ?>
@@ -13,9 +10,9 @@
 <fieldset id="product_composite_configure_fields_qty"
           class="fieldset product-composite-qty-block admin__fieldset <?= $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
     <div class="field admin__field">
-        <label class="label admin__field-label"><span><?= /* @escapeNotVerified */ __('Quantity') ?></span></label>
+        <label class="label admin__field-label"><span><?= $block->escapeHtml(__('Quantity')) ?></span></label>
         <div class="control admin__field-control">
-            <input id="product_composite_configure_input_qty" class="input-text admin__control-text qty" type="text" name="qty" value="<?= /* @escapeNotVerified */ $block->getQtyValue() * 1 ?>">
+            <input id="product_composite_configure_input_qty" class="input-text admin__control-text qty" type="text" name="qty" value="<?= /* @noEscape */ $block->getQtyValue() * 1 ?>">
         </div>
     </div>
 </fieldset>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
index 7c25c3686eadc..66df098a194ae 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
@@ -3,11 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
 /**
  * @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit
  */
@@ -17,11 +16,11 @@
         <div id="product-template-suggest-container" class="suggest-expandable">
             <div class="action-dropdown">
                 <button type="button" class="action-toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown">
-                    <span><?= /* @escapeNotVerified */ $block->getAttributeSetName() ?></span>
+                    <span><?= $block->escapeHtml($block->getAttributeSetName()) ?></span>
                 </button>
                 <ul class="dropdown-menu">
                     <li><input type="text" id="product-template-suggest" class="search"
-                           placeholder="<?= /* @noEscape */ __('start typing to search template') ?>"/></li>
+                           placeholder="<?= $block->escapeHtmlAttr(__('start typing to search template')) ?>"/></li>
                 </ul>
             </div>
         </div>
@@ -30,32 +29,32 @@
             <input type="checkbox" id="product-online-switcher" name="product-online-switcher" />
             <label class="switcher-label"
                    for="product-online-switcher"
-                   data-text-on="<?= /* @escapeNotVerified */ __('Product online') ?>"
-                   data-text-off="<?= /* @escapeNotVerified */ __('Product offline') ?>"
-                   title="<?= /* @escapeNotVerified */ __('Product online status') ?>"></label>
+                   data-text-on="<?= $block->escapeHtmlAttr(__('Product online')) ?>"
+                   data-text-off="<?= $block->escapeHtmlAttr(__('Product offline')) ?>"
+                   title="<?= $block->escapeHtmlAttr(__('Product online status')) ?>"></label>
         </div>
 
-        <?php if ($block->getProductId()): ?>
+        <?php if ($block->getProductId()) :?>
             <?= $block->getDeleteButtonHtml() ?>
         <?php endif; ?>
-        <?php if ($block->getProductSetId()): ?>
+        <?php if ($block->getProductSetId()) :?>
             <?= $block->getChangeAttributeSetButtonHtml() ?>
             <?= $block->getSaveSplitButtonHtml() ?>
         <?php endif; ?>
         <?= $block->getBackButtonHtml() ?>
     </div>
 </div>
-<?php if ($block->getUseContainer()): ?>
-<form action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>" method="post" enctype="multipart/form-data"
-      data-form="edit-product" data-product-id="<?= /* @escapeNotVerified */ $block->getProduct()->getId() ?>">
+<?php if ($block->getUseContainer()) :?>
+<form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" enctype="multipart/form-data"
+      data-form="edit-product" data-product-id="<?= $block->escapeHtmlAttr($block->getProduct()->getId()) ?>">
 <?php endif; ?>
     <?= $block->getBlockHtml('formkey') ?>
     <div data-role="tabs" id="product-edit-form-tabs"></div> <?php /* @TODO: remove id after elimination of setDestElementId('product-edit-form-tabs') */?>
     <?= $block->getChildHtml('product-type-tabs') ?>
-    <input type="hidden" id="product_type_id" value="<?= /* @escapeNotVerified */ $block->getProduct()->getTypeId() ?>"/>
-    <input type="hidden" id="attribute_set_id" value="<?= /* @escapeNotVerified */ $block->getProduct()->getAttributeSetId() ?>"/>
+    <input type="hidden" id="product_type_id" value="<?= $block->escapeHtmlAttr($block->getProduct()->getTypeId()) ?>"/>
+    <input type="hidden" id="attribute_set_id" value="<?= $block->escapeHtmlAttr($block->getProduct()->getAttributeSetId()) ?>"/>
     <button type="submit" class="hidden"></button>
-<?php if ($block->getUseContainer()): ?>
+<?php if ($block->getUseContainer()) :?>
 </form>
 <?php endif; ?>
 <script>
@@ -130,10 +129,10 @@ require([
             }
         }
     });
-    $form.mage('validation', {validationUrl: '<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>'});
+    $form.mage('validation', {validationUrl: '<?= $block->escapeJs($block->escapeUrl($block->getValidationUrl())) ?>'});
 
-    var masks = <?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getFieldsAutogenerationMasks()) ?>;
-    var availablePlaceholders = <?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getAttributesAllowedForAutogeneration()) ?>;
+    var masks = <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getFieldsAutogenerationMasks()) ?>;
+    var availablePlaceholders = <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getAttributesAllowedForAutogeneration()) ?>;
     var Autogenerator = function(masks) {
         this._masks = masks || {};
         this._fieldReverseIndex = this._buildReverseIndex(this._masks);
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml
index a3b0b32e4c29a..056cf014f769a 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml
@@ -4,18 +4,21 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var $block Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute */
 ?>
 
-<form action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>" method="post" id="attributes-edit-form" class="attributes-edit-form" enctype="multipart/form-data">
+<form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>"
+      method="post"
+      id="attributes-edit-form"
+      class="attributes-edit-form"
+      enctype="multipart/form-data">
     <?= $block->getBlockHtml('formkey') ?>
 </form>
 <script type="text/x-magento-init">
     {
         "#attributes-edit-form": {
             "Magento_Catalog/catalog/product/edit/attribute": {
-                "validationUrl": "<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>"
+                "validationUrl": "<?= $block->escapeJs($block->escapeUrl($block->getValidationUrl())) ?>"
             }
         }
     }
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml
index efc06d675c369..aea5cb7d00333 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
 /** @var Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Inventory $block */
 ?>
 <script>
@@ -30,329 +29,373 @@
     });
 </script>
 
+<?php
+$defaultMinSaleQty = $block->getDefaultConfigValue('min_sale_qty');
+if (!is_numeric($defaultMinSaleQty)) {
+    $defaultMinSaleQty = json_decode($defaultMinSaleQty, true);
+    $defaultMinSaleQty = (float) $defaultMinSaleQty[\Magento\Customer\Api\Data\GroupInterface::CUST_GROUP_ALL] ?? 1;
+}
+?>
 <div class="fieldset-wrapper form-inline advanced-inventory-edit">
     <div class="fieldset-wrapper-title">
         <strong class="title">
-            <span><?= /* @escapeNotVerified */ __('Advanced Inventory') ?></span>
+            <span><?= $block->escapeHtml(__('Advanced Inventory')) ?></span>
         </strong>
     </div>
     <div class="fieldset-wrapper-content">
         <fieldset class="fieldset" id="table_cataloginventory">
         <div class="field">
             <label class="label" for="inventory_manage_stock">
-                <span><?= /* @escapeNotVerified */ __('Manage Stock') ?></span>
+                <span><?= $block->escapeHtml(__('Manage Stock')) ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
-                        <select id="inventory_manage_stock" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[manage_stock]"
+                        <select id="inventory_manage_stock" name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[manage_stock]"
                                 class="select" disabled="disabled">
-                            <option value="1"><?= /* @escapeNotVerified */ __('Yes') ?></option>
-                            <option
-                                value="0"<?php if ($block->getFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('No') ?></option>
+                            <option value="1"><?= $block->escapeHtml(__('Yes')) ?></option>
+                            <option value="0"
+                                <?php if ($block->getFieldValue('manage_stock') == 0) :?>
+                                    selected="selected"
+                                <?php endif; ?>><?= $block->escapeHtml(__('No')) ?></option>
                         </select>
                     </div>
                     <div class="field choice">
-                        <input name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_manage_stock]" type="checkbox"
+                        <input name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_manage_stock]" type="checkbox"
                                id="inventory_use_config_manage_stock" data-role="toggle-editability" value="1"
                                checked="checked" disabled="disabled"/>
                         <label for="inventory_use_config_manage_stock"
-                               class="label"><span><?= /* @escapeNotVerified */ __('Use Config Settings') ?></span></label>
+                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_manage_stock_checkbox" data-role="toggle-editability-all"/>
                         <label for="inventory_manage_stock_checkbox"
-                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field required">
             <label class="label" for="inventory_qty">
-                <span><?= /* @escapeNotVerified */ __('Qty') ?></span>
+                <span><?= $block->escapeHtml(__('Qty')) ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <input type="text" class="input-text required-entry validate-number" id="inventory_qty"
-                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[qty]"
-                               value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('qty') * 1 ?>" disabled="disabled"/>
+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[qty]"
+                               value="<?= /* @noEscape */ $block->getDefaultConfigValue('qty') * 1 ?>" disabled="disabled"/>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_qty_checkbox" data-role="toggle-editability-all"/>
                         <label for="inventory_qty_checkbox"
-                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field with-addon">
             <label class="label" for="inventory_min_qty">
-                <span><?= /* @escapeNotVerified */ __('Out-of-Stock Threshold') ?></span>
+                <span><?= $block->escapeHtml(__('Out-of-Stock Threshold')) ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <input type="text" class="input-text validate-number" id="inventory_min_qty"
-                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[min_qty]"
-                               value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('min_qty') * 1 ?>" disabled="disabled"/>
+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[min_qty]"
+                               value="<?= /* @noEscape */ $block->getDefaultConfigValue('min_qty') * 1 ?>" disabled="disabled"/>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_use_config_min_qty"
-                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_min_qty]" value="1"
+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_min_qty]" value="1"
                                data-role="toggle-editability" checked="checked" disabled="disabled"/>
                         <label for="inventory_use_config_min_qty" class="label">
-                            <span><?= /* @escapeNotVerified */ __('Use Config Settings') ?></span>
+                            <span><?= $block->escapeHtml(__('Use Config Settings')) ?></span>
                         </label>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_min_qty_checkbox" data-role="toggle-editability-all"/>
                         <label for="inventory_min_qty_checkbox"
-                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_min_sale_qty">
-                <span><?= /* @escapeNotVerified */ __('Minimum Qty Allowed in Shopping Cart') ?></span>
+                <span><?= $block->escapeHtml(__('Minimum Qty Allowed in Shopping Cart')) ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <input type="text" class="input-text validate-number" id="inventory_min_sale_qty"
-                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[min_sale_qty]"
-                               value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('min_sale_qty') * 1 ?>"
+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[min_sale_qty]"
+                               value="<?= /* @noEscape */ $defaultMinSaleQty * 1 ?>"
                                disabled="disabled"/>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_use_config_min_sale_qty"
-                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_min_sale_qty]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_min_sale_qty]"
+                               value="1"
+                               data-role="toggle-editability"
+                               checked="checked"
+                               disabled="disabled"/>
                         <label for="inventory_use_config_min_sale_qty"
-                               class="label"><span><?= /* @escapeNotVerified */ __('Use Config Settings') ?></span></label>
+                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_min_sale_qty_checkbox" data-role="toggle-editability-all"/>
                         <label for="inventory_min_sale_qty_checkbox"
-                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_max_sale_qty">
-                <span><?= /* @escapeNotVerified */ __('Maximum Qty Allowed in Shopping Cart') ?></span>
+                <span><?= $block->escapeHtml(__('Maximum Qty Allowed in Shopping Cart')) ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <input type="text" class="input-text validate-number" id="inventory_max_sale_qty"
-                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[max_sale_qty]"
-                               value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('max_sale_qty') * 1 ?>"
+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[max_sale_qty]"
+                               value="<?= /* @noEscape */ $block->getDefaultConfigValue('max_sale_qty') * 1 ?>"
                                disabled="disabled"/>
                     </div>
                     <div class="field choice">
-                        <input type="checkbox" id="inventory_use_config_max_sale_qty"
-                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_max_sale_qty]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
+                        <input type="checkbox"
+                               id="inventory_use_config_max_sale_qty"
+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_max_sale_qty]"
+                               value="1"
+                               data-role="toggle-editability"
+                               checked="checked"
+                               disabled="disabled"/>
                         <label for="inventory_use_config_max_sale_qty"
-                               class="label"><span><?= /* @escapeNotVerified */ __('Use Config Settings') ?></span></label>
+                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_max_sale_checkbox" data-role="toggle-editability-all"/>
                         <label for="inventory_max_sale_checkbox"
-                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_is_qty_decimal">
-                <span><?= /* @escapeNotVerified */ __('Qty Uses Decimals') ?></span>
+                <span><?= $block->escapeHtml(__('Qty Uses Decimals')) ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <select id="inventory_is_qty_decimal"
-                                name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[is_qty_decimal]" class="select"
+                                name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[is_qty_decimal]"
+                                class="select"
                                 disabled="disabled">
-                            <option value="0"><?= /* @escapeNotVerified */ __('No') ?></option>
-                            <option
-                                value="1"<?php if ($block->getDefaultConfigValue('is_qty_decimal') == 1): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('Yes') ?></option>
+                            <option value="0"><?= $block->escapeHtml(__('No')) ?></option>
+                            <option value="1"
+                                <?php if ($block->getDefaultConfigValue('is_qty_decimal') == 1) :?>
+                                    selected="selected"
+                                <?php endif; ?>><?= $block->escapeHtml(__('Yes')) ?></option>
                         </select>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_is_qty_decimal_checkbox" data-role="toggle-editability-all"/>
                         <label for="inventory_is_qty_decimal_checkbox"
-                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_backorders">
-                <span><?= /* @escapeNotVerified */ __('Backorders') ?></span>
+                <span><?= $block->escapeHtml(__('Backorders')) ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
-                        <select id="inventory_backorders" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[backorders]"
-                                class="select" disabled="disabled">
-                            <?php foreach ($block->getBackordersOption() as $option): ?>
+                        <select id="inventory_backorders"
+                                name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[backorders]"
+                                class="select"
+                                disabled="disabled">
+                            <?php foreach ($block->getBackordersOption() as $option) :?>
                                 <?php $_selected = ($option['value'] == $block->getDefaultConfigValue('backorders')) ? ' selected="selected"' : '' ?>
                                 <option
-                                    value="<?= /* @escapeNotVerified */ $option['value'] ?>"<?= /* @escapeNotVerified */ $_selected ?>><?= /* @escapeNotVerified */ $option['label'] ?></option>
+                                    value="<?= $block->escapeHtmlAttr($option['value']) ?>"<?= /* @noEscape */ $_selected ?>><?= $block->escapeHtml($option['label']) ?></option>
                             <?php endforeach; ?>
                         </select>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_use_config_backorders"
-                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_backorders]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_backorders]"
+                               value="1"
+                               data-role="toggle-editability"
+                               checked="checked"
+                               disabled="disabled"/>
                         <label for="inventory_use_config_backorders"
-                               class="label"><span><?= /* @escapeNotVerified */ __('Use Config Settings') ?></span></label>
+                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_backorders_checkbox" data-role="toggle-editability-all"/>
-                        <label for="inventory_backorders_checkbox" class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
+                        <label for="inventory_backorders_checkbox"
+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
 
             </div>
-            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_notify_stock_qty">
-                <span><?= /* @escapeNotVerified */ __('Notify for Quantity Below') ?></span>
+                <span><?= $block->escapeHtml(__('Notify for Quantity Below')) ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <input type="text" class="input-text validate-number" id="inventory_notify_stock_qty"
-                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[notify_stock_qty]"
-                               value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('notify_stock_qty') * 1 ?>"
+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[notify_stock_qty]"
+                               value="<?= /* @noEscape */ $block->getDefaultConfigValue('notify_stock_qty') * 1 ?>"
                                disabled="disabled"/>
                     </div>
                     <div class="field choice">
-                        <input type="checkbox" id="inventory_use_config_notify_stock_qty"
-                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_notify_stock_qty]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
+                        <input type="checkbox"
+                               id="inventory_use_config_notify_stock_qty"
+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_notify_stock_qty]"
+                               value="1"
+                               data-role="toggle-editability"
+                               checked="checked"
+                               disabled="disabled"/>
                         <label for="inventory_use_config_notify_stock_qty"
-                               class="label"><span><?= /* @escapeNotVerified */ __('Use Config Settings') ?></span></label>
+                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_notify_stock_qty_checkbox" data-role="toggle-editability-all"/>
                         <label for="inventory_notify_stock_qty_checkbox"
-                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_enable_qty_increments">
-                <span><?= /* @escapeNotVerified */ __('Enable Qty Increments') ?></span>
+                <span><?= $block->escapeHtml(__('Enable Qty Increments')) ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <select id="inventory_enable_qty_increments"
-                                name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[enable_qty_increments]" class="select"
+                                name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[enable_qty_increments]"
+                                class="select"
                                 disabled="disabled">
-                            <option value="1"><?= /* @escapeNotVerified */ __('Yes') ?></option>
-                            <option
-                                value="0"<?php if ($block->getDefaultConfigValue('enable_qty_increments') == 0): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('No') ?></option>
+                            <option value="1"><?= $block->escapeHtml(__('Yes')) ?></option>
+                            <option value="0"
+                                <?php if ($block->getDefaultConfigValue('enable_qty_increments') == 0) :?>
+                                    selected="selected"
+                                <?php endif; ?>><?= $block->escapeHtml(__('No')) ?></option>
                         </select>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_use_config_enable_qty_increments"
-                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_enable_qty_increments]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_enable_qty_increments]"
+                               value="1"
+                               data-role="toggle-editability"
+                               checked="checked"
+                               disabled="disabled"/>
                         <label for="inventory_use_config_enable_qty_increments"
-                               class="label"><span><?= /* @escapeNotVerified */ __('Use Config Settings') ?></span></label>
+                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_enable_qty_increments_checkbox" data-role="toggle-editability-all"/>
                         <label for="inventory_enable_qty_increments_checkbox"
-                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_qty_increments">
-                <span><?= /* @escapeNotVerified */ __('Qty Increments') ?></span>
+                <span><?= $block->escapeHtml(__('Qty Increments')) ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <input type="text" class="input-text validate-number" id="inventory_qty_increments"
-                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[qty_increments]"
-                               value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('qty_increments') * 1 ?>"
+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[qty_increments]"
+                               value="<?= /* @noEscape */ $block->getDefaultConfigValue('qty_increments') * 1 ?>"
                                disabled="disabled"/>
                     </div>
                     <div class="field choice">
-                        <input type="checkbox" id="inventory_use_config_qty_increments"
-                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_qty_increments]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
+                        <input type="checkbox"
+                               id="inventory_use_config_qty_increments"
+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_qty_increments]"
+                               value="1"
+                               data-role="toggle-editability"
+                               checked="checked"
+                               disabled="disabled"/>
                         <label for="inventory_use_config_qty_increments"
-                               class="label"><span><?= /* @escapeNotVerified */ __('Use Config Settings') ?></span></label>
+                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_qty_increments_checkbox" data-role="toggle-editability-all"/>
                         <label for="inventory_qty_increments_checkbox"
-                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_stock_availability">
-                <span><?= /* @escapeNotVerified */ __('Stock Availability') ?></span>
+                <span><?= $block->escapeHtml(__('Stock Availability')) ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <select id="inventory_stock_availability"
-                                name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[is_in_stock]" class="select"
+                                name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[is_in_stock]" class="select"
                                 disabled="disabled">
-                            <option value="1"><?= /* @escapeNotVerified */ __('In Stock') ?></option>
-                            <option
-                                value="0"<?php if ($block->getDefaultConfigValue('is_in_stock') == 0): ?> selected<?php endif; ?>><?= /* @escapeNotVerified */ __('Out of Stock') ?></option>
+                            <option value="1"><?= $block->escapeHtml(__('In Stock')) ?></option>
+                            <option value="0"<?php if ($block->getDefaultConfigValue('is_in_stock') == 0) :?> selected<?php endif; ?>><?= $block->escapeHtml(__('Out of Stock')) ?></option>
                         </select>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_stock_availability_checkbox" data-role="toggle-editability-all"/>
                         <label for="inventory_stock_availability_checkbox"
-                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
+                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
         </fieldset>
     </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml
index cd297a7bbf27b..98b06050e0d1d 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml
@@ -4,29 +4,35 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var $block Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab\Websites */
 ?>
 
 <div class="fieldset-wrapper" id="add-products-to-website-wrapper">
     <fieldset class="fieldset" id="grop_fields">
         <legend class="legend">
-            <span><?= /* @escapeNotVerified */ __('Add Product To Websites') ?></span>
+            <span><?= $block->escapeHtml(__('Add Product To Websites')) ?></span>
         </legend>
         <br>
         <div class="store-scope">
             <div class="store-tree" id="add-products-to-website-content">
-                <?php foreach ($block->getWebsiteCollection() as $_website): ?>
+                <?php foreach ($block->getWebsiteCollection() as $_website) :?>
                     <div class="website-name">
-                        <input name="add_website_ids[]" value="<?= /* @escapeNotVerified */ $_website->getId() ?>" <?php if ($block->getWebsitesReadonly()): ?>disabled="disabled"<?php endif;?> class="checkbox website-checkbox" id="add_product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>" type="checkbox" />
-                        <label for="add_product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>"><?= $block->escapeHtml($_website->getName()) ?></label>
+                        <input name="add_website_ids[]"
+                               value="<?= $block->escapeHtmlAttr($_website->getId()) ?>"
+                            <?php if ($block->getWebsitesReadonly()) :?>
+                                disabled="disabled"
+                            <?php endif;?>
+                               class="checkbox website-checkbox"
+                               id="add_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>"
+                               type="checkbox" />
+                        <label for="add_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>"><?= $block->escapeHtml($_website->getName()) ?></label>
                     </div>
-                    <dl class="webiste-groups" id="add_product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>_data">
-                        <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
+                    <dl class="webiste-groups" id="add_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>_data">
+                        <?php foreach ($block->getGroupCollection($_website) as $_group) :?>
                             <dt><?= $block->escapeHtml($_group->getName()) ?></dt>
                             <dd class="group-stores">
                                 <ul>
-                                <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
+                                <?php foreach ($block->getStoreCollection($_group) as $_store) :?>
                                     <li>
                                         <?= $block->escapeHtml($_store->getName()) ?>
                                     </li>
@@ -44,27 +50,35 @@
 <div class="fieldset-wrapper" id="remove-products-to-website-wrapper">
     <fieldset class="fieldset" id="grop_fields">
         <legend class="legend">
-            <span><?= /* @escapeNotVerified */ __('Remove Product From Websites') ?></span>
+            <span><?= $block->escapeHtml(__('Remove Product From Websites')) ?></span>
         </legend>
         <br>
         <div class="messages">
             <div class="message message-notice">
-                <div><?= /* @escapeNotVerified */ __('To hide an item in catalog or search results, set the status to "Disabled".') ?></div>
+                <div><?= $block->escapeHtml(__('To hide an item in catalog or search results, set the status to "Disabled".')) ?></div>
             </div>
         </div>
         <div class="store-scope">
             <div class="store-tree" id="remove-products-to-website-content">
-                <?php foreach ($block->getWebsiteCollection() as $_website): ?>
+                <?php foreach ($block->getWebsiteCollection() as $_website) :?>
                     <div class="website-name">
-                        <input name="remove_website_ids[]" value="<?= /* @escapeNotVerified */ $_website->getId() ?>" <?php if ($block->getWebsitesReadonly()): ?>disabled="disabled"<?php endif;?> class="checkbox website-checkbox" id="remove_product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>" type="checkbox" />
-                        <label for="remove_product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>"><?= $block->escapeHtml($_website->getName()) ?></label>
+                        <input name="remove_website_ids[]"
+                               value="<?= $block->escapeHtmlAttr($_website->getId()) ?>"
+                            <?php if ($block->getWebsitesReadonly()) :?>
+                                disabled="disabled"
+                            <?php endif;?>
+                               class="checkbox website-checkbox"
+                               id="remove_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>"
+                               type="checkbox" />
+                        <label for="remove_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>"><?= $block->escapeHtml($_website->getName()) ?></label>
                     </div>
-                    <dl class="webiste-groups" id="remove_product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>_data">
-                        <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
+                    <dl class="webiste-groups"
+                        id="remove_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>_data">
+                        <?php foreach ($block->getGroupCollection($_website) as $_group) :?>
                             <dt><?= $block->escapeHtml($_group->getName()) ?></dt>
                             <dd class="group-stores">
                                 <ul>
-                                <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
+                                <?php foreach ($block->getStoreCollection($_group) as $_store) :?>
                                     <li>
                                         <?= $block->escapeHtml($_store->getName()) ?>
                                     </li>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
index a7e8564e7a1d8..d073053e2f854 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
- /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\AttributeSet */
+/* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\AttributeSet */
 ?>
 <script id="product-template-selector-template" type="text/x-magento-template">
 <% if (!data.term && data.items.length && !data.allShown()) { %>
@@ -32,7 +32,7 @@
             }
         });
         $suggest
-            .mage('suggest',<?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getSelectorOptions()) ?>)
+            .mage('suggest',<?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getSelectorOptions()) ?>)
             .on('suggestselect', function (e, ui) {
                 if (ui.item.id) {
                     $('[data-form=edit-product]').trigger('changeAttributeSet', ui.item);
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml
index 84c3257840259..f12a99e6c7843 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml
@@ -5,7 +5,7 @@
  */
 /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\NewCategory */
 ?>
-<div id="<?= /* @escapeNotVerified */ $block->getNameInLayout() ?>" style="display:none">
+<div id="<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>" style="display:none">
     <?= $block->getFormHtml() ?>
     <?= $block->getAfterElementHtml() ?>
 </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
index 2570a5d712675..ad38d250a3345 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
@@ -3,16 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options */ ?>
 
 <div class="fieldset-wrapper" id="product-custom-options-wrapper" data-block="product-custom-options">
     <div class="fieldset-wrapper-title">
         <strong class="title">
-            <span><?= /* @escapeNotVerified */ __('Custom Options') ?></span>
+            <span><?= $block->escapeHtml(__('Custom Options')) ?></span>
         </strong>
     </div>
     <div class="fieldset-wrapper-content" id="product-custom-options-content" data-role="product-custom-options-content">
@@ -20,7 +17,7 @@
             <div class="messages">
                 <div class="message message-error" id="dynamic-price-warning" style="display: none;">
                     <div class="message-inner">
-                        <div class="message-content"><?= /* @escapeNotVerified */ __('We can\'t save custom-defined options for bundles with dynamic pricing.') ?></div>
+                        <div class="message-content"><?= $block->escapeHtml(__('We can\'t save custom-defined options for bundles with dynamic pricing.')) ?></div>
                     </div>
                 </div>
             </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
index d2bca5ce17321..713366e73aba5 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
@@ -4,8 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option */ ?>
 <?= $block->getTemplatesHtml() ?>
@@ -19,30 +18,52 @@
                 <span id="option_<%- data.id %>_header_title"><%- data.title %></span>
             </strong>
             <div class="actions">
-                <button type="button" title="<?= /* @escapeNotVerified */ __('Delete Custom Option') ?>" class="action-delete" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_delete">
-                    <span><?= /* @escapeNotVerified */ __('Delete Custom Option') ?></span>
+                <button type="button"
+                        title="<?= $block->escapeHtmlAttr(__('Delete Custom Option')) ?>"
+                        class="action-delete"
+                        id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_delete">
+                    <span><?= $block->escapeHtml(__('Delete Custom Option')) ?></span>
                 </button>
             </div>
-            <div id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_move" data-role="draggable-handle" class="draggable-handle"
-                 title="<?= /* @escapeNotVerified */ __('Sort Custom Options') ?>"></div>
+            <div id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_move"
+                 data-role="draggable-handle"
+                 class="draggable-handle"
+                 title="<?= $block->escapeHtmlAttr(__('Sort Custom Options')) ?>"></div>
         </div>
         <div class="fieldset-wrapper-content in collapse" id="<%- data.id %>-content">
             <fieldset class="fieldset">
-                <fieldset class="fieldset-alt" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>">
-                    <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_is_delete" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][is_delete]" type="hidden" value=""/>
-                    <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_previous_type" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][previous_type]" type="hidden" value="<%- data.type %>"/>
-                    <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_previous_group" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][previous_group]" type="hidden" value=""/>
-                    <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_id" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][id]" type="hidden" value="<%- data.id %>"/>
-                    <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_option_id" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][option_id]" type="hidden" value="<%- data.option_id %>"/>
-                    <input name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][sort_order]" type="hidden" value="<%- data.sort_order %>"/>
+                <fieldset class="fieldset-alt" id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>">
+                    <input id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_is_delete"
+                           name="<?= /* @noEscape */ $block->getFieldName() ?>[<%- data.id %>][is_delete]"
+                           type="hidden"
+                           value=""/>
+                    <input id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_previous_type"
+                           name="<?= /* @noEscape */ $block->getFieldName() ?>[<%- data.id %>][previous_type]"
+                           type="hidden"
+                           value="<%- data.type %>"/>
+                    <input id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_previous_group"
+                           name="<?= /* @noEscape */ $block->getFieldName() ?>[<%- data.id %>][previous_group]"
+                           type="hidden"
+                           value=""/>
+                    <input id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_id"
+                           name="<?= /* @noEscape */ $block->getFieldName() ?>[<%- data.id %>][id]"
+                           type="hidden"
+                           value="<%- data.id %>"/>
+                    <input id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_option_id"
+                           name="<?= /* @noEscape */ $block->getFieldName() ?>[<%- data.id %>][option_id]"
+                           type="hidden"
+                           value="<%- data.option_id %>"/>
+                    <input name="<?= /* @noEscape */ $block->getFieldName() ?>[<%- data.id %>][sort_order]"
+                           type="hidden"
+                           value="<%- data.sort_order %>"/>
 
                     <div class="field field-option-title required">
-                        <label class="label" for="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_title">
-                            <?= /* @escapeNotVerified */ __('Option Title') ?>
+                        <label class="label" for="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_title">
+                            <?= $block->escapeHtml(__('Option Title')) ?>
                         </label>
                         <div class="control">
-                            <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_title"
-                                   name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][title]"
+                            <input id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_title"
+                                   name="<?= /* @noEscape */ $block->getFieldName() ?>[<%- data.id %>][title]"
                                    class="required-entry input-text"
                                    type="text"
                                    value="<%- data.title %>"
@@ -54,8 +75,8 @@
                     </div>
 
                     <div class="field field-option-input-type required">
-                        <label class="label" for="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_title">
-                            <?= /* @escapeNotVerified */ __('Input Type') ?>
+                        <label class="label" for="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_title">
+                            <?= $block->escapeHtml(__('Input Type')) ?>
                         </label>
                         <div class="control opt-type">
                             <?= $block->getTypeSelectHtml() ?>
@@ -64,9 +85,12 @@
 
                     <div class="field field-option-req">
                         <div class="control">
-                            <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_required" class="is-required" type="checkbox" checked="checked"/>
+                            <input id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_required"
+                                   class="is-required"
+                                   type="checkbox"
+                                   checked="checked"/>
                             <label for="field-option-req">
-                                <?= /* @escapeNotVerified */ __('Required') ?>
+                                <?= $block->escapeHtml(__('Required')) ?>
                             </label>
                             <span style="display:none"><?= $block->getRequireSelectHtml() ?></span>
                         </div>
@@ -78,7 +102,7 @@
 </script>
 
 <div id="import-container" style="display: none;"></div>
-<?php if (!$block->isReadonly()): ?>
+<?php if (!$block->isReadonly()) :?>
 <div><input type="hidden" name="affect_product_custom_options" value="1"/></div>
 <?php endif; ?>
 <script>
@@ -89,21 +113,21 @@ require([
 
 jQuery(function ($) {
     var fieldSet = $('[data-block=product-custom-options]');
-    fieldSet.customOptions(<?php /* @escapeNotVerified */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(
+    fieldSet.customOptions(<?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode(
         [
             'fieldId' => $block->getFieldId(),
-            'productGridUrl' => $block->getProductGridUrl(),
+            'productGridUrl' => $block->escapeUrl($block->getProductGridUrl()),
             'formKey' => $block->getFormKey(),
-            'customOptionsUrl' => $block->getCustomOptionsUrl(),
-            'isReadonly' => $block->isReadonly(),
-            'itemCount' => $block->getItemCount(),
-            'currentProductId' => $block->getCurrentProductId(),
+            'customOptionsUrl' => $block->escapeUrl($block->getCustomOptionsUrl()),
+            'isReadonly' => (bool) $block->isReadonly(),
+            'itemCount' => (int) $block->getItemCount(),
+            'currentProductId' => (int) $block->getCurrentProductId(),
         ]
     )?>);
     //adding data to templates
     <?php /** @var $_value \Magento\Framework\DataObject */ ?>
-    <?php foreach ($block->getOptionValues() as $_value): ?>
-        fieldSet.customOptions('addOption', <?= /* @escapeNotVerified */ $_value->toJson() ?>);
+    <?php foreach ($block->getOptionValues() as $_value) :?>
+        fieldSet.customOptions('addOption', <?= /* @noEscape */ $_value->toJson() ?>);
     <?php endforeach; ?>
 });
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml
index 07ce6e5d86256..2063609bf0568 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Date */ ?>
 <script id="custom-option-date-type-template" type="text/x-magento-template">
@@ -14,10 +12,10 @@
             <thead>
             <tr class="headings">
                 <?php if ($block->getCanReadPrice() !== false) : ?>
-                <th><?= /* @escapeNotVerified */ __('Price') ?></th>
-                <th><?= /* @escapeNotVerified */ __('Price Type') ?></th>
+                <th><?= $block->escapeHtml(__('Price')) ?></th>
+                <th><?= $block->escapeHtml(__('Price Type')) ?></th>
                 <?php endif; ?>
-                <th><?= /* @escapeNotVerified */ __('SKU') ?></th>
+                <th><?= $block->escapeHtml(__('SKU')) ?></th>
             </tr>
             </thead>
             <tr>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml
index 9f0fc0c569d6c..c6682f565e85a 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\File */ ?>
 <script id="custom-option-file-type-template" type="text/x-magento-template">
@@ -14,39 +12,44 @@
             <thead>
             <tr>
                 <?php if ($block->getCanReadPrice() !== false) : ?>
-                <th><?= /* @escapeNotVerified */ __('Price') ?></th>
-                <th><?= /* @escapeNotVerified */ __('Price Type') ?></th>
+                    <th><?= $block->escapeHtml(__('Price')) ?></th>
+                    <th><?= $block->escapeHtml(__('Price Type')) ?></th>
                 <?php endif; ?>
-                <th><?= /* @escapeNotVerified */ __('SKU') ?></th>
-                <th><?= /* @escapeNotVerified */ __('Compatible File Extensions') ?></th>
-                <th><?= /* @escapeNotVerified */ __('Maximum Image Size') ?></th>
+                <th><?= $block->escapeHtml(__('SKU')) ?></th>
+                <th><?= $block->escapeHtml(__('Compatible File Extensions')) ?></th>
+                <th><?= $block->escapeHtml(__('Maximum Image Size')) ?></th>
             </tr>
             </thead>
             <tr>
                 <?php if ($block->getCanReadPrice() !== false) : ?>
-                <td class="opt-price">
-                    <input name="product[options][<%- data.option_id %>][price]" data-store-label="<%- data.price %>"
-                           class="input-text validate-zero-or-greater" type="text" value="<%- data.price %>"
-                        <?php if ($block->getCanEditPrice() === false) : ?>
-                           disabled="disabled"
-                        <?php endif; ?>>
-                </td>
-                <td class="opt-price-type"><?= $block->getPriceTypeSelectHtml('data-attr="price-type"') ?><%- data.checkboxScopePrice %></td>
+                    <td class="opt-price">
+                        <input name="product[options][<%- data.option_id %>][price]" data-store-label="<%- data.price %>"
+                               class="input-text validate-zero-or-greater" type="text" value="<%- data.price %>"
+                            <?php if ($block->getCanEditPrice() === false) : ?>
+                                disabled="disabled"
+                            <?php endif; ?>>
+                    </td>
+                    <td class="opt-price-type"><?= $block->getPriceTypeSelectHtml('data-attr="price-type"') ?><%- data.checkboxScopePrice %></td>
                 <?php else : ?>
-                <input name="product[options][<%- data.option_id %>][price]" type="hidden">
-                <input id="product_option_<%- data.option_id %>_price_type" name="product[options][<%- data.option_id %>][price_type]" type="hidden">
+                    <input name="product[options][<%- data.option_id %>][price]" type="hidden">
+                    <input id="product_option_<%- data.option_id %>_price_type" name="product[options][<%- data.option_id %>][price_type]" type="hidden">
                 <?php endif; ?>
                 <td>
                     <input name="product[options][<%- data.option_id %>][sku]" class="input-text" type="text" value="<%- data.sku %>">
                 </td>
                 <td>
                     <input name="product[options][<%- data.option_id %>][file_extension]" class="input-text" type="text" value="<%- data.file_extension %>">
-                    <div class="note"><?php /* @escapeNotVerified */ echo __('Enter separated extensions, like: png, jpg, gif.') ?></div>
+                    <div class="note"><?= $block->escapeHtml(__('Enter separated extensions, like: png, jpg, gif.')) ?></div>
                 </td>
-                <td class="col-file"><?php /* @escapeNotVerified */ echo __('%1 <span>x</span> %2 <span>px.</span>',
-                    '<input class="input-text" type="text" name="product[options][<%- data.option_id %>][image_size_x]" value="<%- data.image_size_x %>">',
-                    '<input class="input-text" type="text" name="product[options][<%- data.option_id %>][image_size_y]" value="<%- data.image_size_y %>">') ?>
-                    <div class="note"><?= /* @escapeNotVerified */ __('Please leave blank if it is not an image.') ?></div>
+                <td class="col-file"><?= $block->escapeHtml(
+                    __(
+                        '%1 <span>x</span> %2 <span>px.</span>',
+                        '<input class="input-text" type="text" name="product[options][<%- data.option_id %>][image_size_x]" value="<%- data.image_size_x %>">',
+                        '<input class="input-text" type="text" name="product[options][<%- data.option_id %>][image_size_y]" value="<%- data.image_size_y %>">'
+                    ),
+                    ['span', 'input']
+                ) ?>
+                    <div class="note"><?= $block->escapeHtml(__('Please leave blank if it is not an image.')) ?></div>
                 </td>
             </tr>
         </table>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/select.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/select.phtml
index e8c398228a469..c7ff03a08d954 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/select.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/select.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Select */ ?>
 <script id="custom-option-select-type-template" type="text/x-magento-template">
@@ -14,12 +12,12 @@
             <thead>
                 <tr>
                     <th class="col-draggable">&nbsp;</th>
-                    <th class="col-name required"><?= /* @escapeNotVerified */ __('Title') ?><span class="required">*</span></th>
+                    <th class="col-name required"><?= $block->escapeHtml(__('Title')) ?><span class="required">*</span></th>
                     <?php if ($block->getCanReadPrice() !== false) : ?>
-                    <th class="col-price"><?= /* @escapeNotVerified */ __('Price') ?></th>
-                    <th class="col-price-type"><?= /* @escapeNotVerified */ __('Price Type') ?></th>
+                    <th class="col-price"><?= $block->escapeHtml(__('Price')) ?></th>
+                    <th class="col-price-type"><?= $block->escapeHtml(__('Price Type')) ?></th>
                     <?php endif; ?>
-                    <th class="col-sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
+                    <th class="col-sku"><?= $block->escapeHtml(__('SKU')) ?></th>
                     <th class="col-actions">&nbsp;</th>
                 </tr>
             </thead>
@@ -38,7 +36,7 @@
     <tr id="product_option_<%- data.id %>_select_<%- data.select_id %>">
         <td class="col-draggable">
             <div data-role="draggable-handle" class="draggable-handle"
-                 title="<?= /* @escapeNotVerified */ __('Sort Custom Option') ?>"></div>
+                 title="<?= $block->escapeHtmlAttr(__('Sort Custom Option')) ?>"></div>
             <input name="product[options][<%- data.id %>][values][<%- data.select_id %>][sort_order]" type="hidden" value="<%- data.sort_order %>">
         </td>
         <td class="col-name select-opt-title">
@@ -58,7 +56,7 @@
                 <?php endif; ?>>
         </td>
         <td class="col-price-type select-opt-price-type">
-            <?= /* @escapeNotVerified */ $block->getPriceTypeSelectHtml('data-attr="price-type" <% if (typeof data.scopePriceDisabled != "undefined" && data.scopePriceDisabled != null) { %> disabled="disabled" <% } %>') ?><%- data.checkboxScopePrice %>
+            <?= /* @noEscape */ $block->getPriceTypeSelectHtml('data-attr="price-type" <% if (typeof data.scopePriceDisabled != "undefined" && data.scopePriceDisabled != null) { %> disabled="disabled" <% } %>') ?><%- data.checkboxScopePrice %>
         </td>
         <?php else : ?>
         <input id="product_option_<%- data.id %>_select_<%- data.select_id %>_price" name="product[options][<%- data.id %>][values][<%- data.select_id %>][price]" type="hidden">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml
index c9d7190589ff5..89da5d633ef4d 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Text */ ?>
 <script id="custom-option-text-type-template" type="text/x-magento-template">
@@ -14,11 +12,11 @@
             <thead>
             <tr>
                 <?php if ($block->getCanReadPrice() !== false) : ?>
-                <th class="type-price"><?= /* @escapeNotVerified */ __('Price') ?></th>
-                <th class="type-type"><?= /* @escapeNotVerified */ __('Price Type') ?></th>
+                <th class="type-price"><?= $block->escapeHtml(__('Price')) ?></th>
+                <th class="type-type"><?= $block->escapeHtml(__('Price Type')) ?></th>
                 <?php endif; ?>
-                <th class="type-sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
-                <th class="type-last last"><?= /* @escapeNotVerified */ __('Max Characters') ?></th>
+                <th class="type-sku"><?= $block->escapeHtml(__('SKU')) ?></th>
+                <th class="type-last last"><?= $block->escapeHtml(__('Max Characters')) ?></th>
             </tr>
             </thead>
             <tr>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
index 57715744823d6..30a1da9fdb71c 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
 /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Tier */
 $element = $block->getElement();
@@ -20,28 +20,27 @@ $element = $block->getElement();
 
 <?php $_showWebsite = $block->isShowWebsiteColumn(); ?>
 <?php $_showWebsite = $block->isMultiWebsites(); ?>
-<div class="field" id="attribute-<?= /* @escapeNotVerified */ $_htmlId ?>-container" data-attribute-code="<?= /* @escapeNotVerified */ $_htmlId ?>"
-     data-apply-to="<?= $block->escapeHtml(
-         $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(
-             $element->hasEntityAttribute() ? $element->getEntityAttribute()->getApplyTo() : []
-         )
-     )?>">
-    <label class="label"><span><?= /* @escapeNotVerified */ $block->getElement()->getLabel() ?></span></label>
+<div class="field" id="attribute-<?= /* @noEscape */ $_htmlId ?>-container" data-attribute-code="<?= /* @noEscape */ $_htmlId ?>" data-apply-to="<?= $block->escapeHtml(
+    $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode(
+        $element->hasEntityAttribute() ? $element->getEntityAttribute()->getApplyTo() : []
+    )
+)?>">
+    <label class="label"><span><?= $block->escapeHtml($block->getElement()->getLabel()) ?></span></label>
     <div class="control">
         <table class="admin__control-table tiers_table" id="tiers_table">
             <thead>
                 <tr>
-                    <th class="col-websites" <?php if (!$_showWebsite): ?>style="display:none"<?php endif; ?>><?= /* @escapeNotVerified */ __('Web Site') ?></th>
-                    <th class="col-customer-group"><?= /* @escapeNotVerified */ __('Customer Group') ?></th>
-                    <th class="col-qty required"><?= /* @escapeNotVerified */ __('Quantity') ?></th>
-                    <th class="col-price required"><?= /* @escapeNotVerified */ $block->getPriceColumnHeader(__('Item Price')) ?></th>
-                    <th class="col-delete"><?= /* @escapeNotVerified */ __('Action') ?></th>
+                    <th class="col-websites" <?php if (!$_showWebsite) :?>style="display:none"<?php endif; ?>><?= $block->escapeHtml(__('Web Site')) ?></th>
+                    <th class="col-customer-group"><?= $block->escapeHtml(__('Customer Group')) ?></th>
+                    <th class="col-qty required"><?= $block->escapeHtml(__('Quantity')) ?></th>
+                    <th class="col-price required"><?= $block->escapeHtml($block->getPriceColumnHeader(__('Item Price'))) ?></th>
+                    <th class="col-delete"><?= $block->escapeHtml(__('Action')) ?></th>
                 </tr>
             </thead>
-            <tbody id="<?= /* @escapeNotVerified */ $_htmlId ?>_container"></tbody>
+            <tbody id="<?= /* @noEscape */ $_htmlId ?>_container"></tbody>
             <tfoot>
                 <tr>
-                    <td colspan="<?php if (!$_showWebsite): ?>4<?php else: ?>5<?php endif; ?>" class="col-actions-add"><?= $block->getAddButtonHtml() ?></td>
+                    <td colspan="<?php if (!$_showWebsite) :?>4<?php else :?>5<?php endif; ?>" class="col-actions-add"><?= $block->getAddButtonHtml() ?></td>
                 </tr>
             </tfoot>
         </table>
@@ -55,39 +54,39 @@ require([
 
 //<![CDATA[
 var tierPriceRowTemplate = '<tr>'
-    + '<td class="col-websites"<?php if (!$_showWebsite): ?> style="display:none"<?php endif; ?>>'
-    + '<select class="<?= /* @escapeNotVerified */ $_htmlClass ?> required-entry" name="<?= /* @escapeNotVerified */ $_htmlName ?>[<%- data.index %>][website_id]" id="tier_price_row_<%- data.index %>_website">'
-    <?php foreach ($block->getWebsites() as $_websiteId => $_info): ?>
-    + '<option value="<?= /* @escapeNotVerified */ $_websiteId ?>"><?= $block->escapeJs($_info['name']) ?><?php if (!empty($_info['currency'])): ?> [<?= $block->escapeHtml($_info['currency']) ?>]<?php endif; ?></option>'
+    + '<td class="col-websites"<?php if (!$_showWebsite) :?> style="display:none"<?php endif; ?>>'
+    + '<select class="<?= $block->escapeHtmlAttr($_htmlClass) ?> required-entry" name="<?= /* @noEscape */ $_htmlName ?>[<%- data.index %>][website_id]" id="tier_price_row_<%- data.index %>_website">'
+    <?php foreach ($block->getWebsites() as $_websiteId => $_info) :?>
+    + '<option value="<?= $block->escapeHtmlAttr($_websiteId) ?>"><?= $block->escapeHtml($_info['name']) ?><?php if (!empty($_info['currency'])) :?> [<?= $block->escapeHtml($_info['currency']) ?>]<?php endif; ?></option>'
     <?php endforeach ?>
     + '</select></td>'
-    + '<td class="col-customer-group"><select class="<?= /* @escapeNotVerified */ $_htmlClass ?> custgroup required-entry" name="<?= /* @escapeNotVerified */ $_htmlName ?>[<%- data.index %>][cust_group]" id="tier_price_row_<%- data.index %>_cust_group">'
-    <?php foreach ($block->getCustomerGroups() as $_groupId => $_groupName): ?>
-    + '<option value="<?= /* @escapeNotVerified */ $_groupId ?>"><?= $block->escapeJs($_groupName) ?></option>'
+    + '<td class="col-customer-group"><select class="<?= $block->escapeHtmlAttr($_htmlClass) ?> custgroup required-entry" name="<?= /* @noEscape */ $_htmlName ?>[<%- data.index %>][cust_group]" id="tier_price_row_<%- data.index %>_cust_group">'
+    <?php foreach ($block->getCustomerGroups() as $_groupId => $_groupName) :?>
+    + '<option value="<?= $block->escapeHtmlAttr($_groupId) ?>"><?= $block->escapeHtml($_groupName) ?></option>'
     <?php endforeach ?>
     + '</select></td>'
     + '<td class="col-qty">'
-        + '<input class="<?= /* @escapeNotVerified */ $_htmlClass ?> qty required-entry validate-greater-than-zero" type="text" name="<?= /* @escapeNotVerified */ $_htmlName ?>[<%- data.index %>][price_qty]" value="<%- data.qty %>" id="tier_price_row_<%- data.index %>_qty" />'
-        + '<span><?= /* @escapeNotVerified */ __("and above") ?></span>'
+        + '<input class="<?= $block->escapeHtmlAttr($_htmlClass) ?> qty required-entry validate-greater-than-zero" type="text" name="<?= /* @noEscape */ $_htmlName ?>[<%- data.index %>][price_qty]" value="<%- data.qty %>" id="tier_price_row_<%- data.index %>_qty" />'
+        + '<span><?= $block->escapeHtml(__("and above")) ?></span>'
     + '</td>'
-    + '<td class="col-price"><input class="<?= /* @escapeNotVerified */ $_htmlClass ?> required-entry <?= /* @escapeNotVerified */ $_priceValueValidation ?>" type="text" name="<?= /* @escapeNotVerified */ $_htmlName ?>[<%- data.index %>][price]" value="<%- data.price %>" id="tier_price_row_<%- data.index %>_price" /></td>'
-    + '<td class="col-delete"><input type="hidden" name="<?= /* @escapeNotVerified */ $_htmlName ?>[<%- data.index %>][delete]" class="delete" value="" id="tier_price_row_<%- data.index %>_delete" />'
-    + '<button title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Delete Tier')) ?>" type="button" class="action- scalable delete icon-btn delete-product-option" id="tier_price_row_<%- data.index %>_delete_button" onclick="return tierPriceControl.deleteItem(event);">'
-    + '<span><?= /* @escapeNotVerified */ __("Delete") ?></span></button></td>'
+    + '<td class="col-price"><input class="<?= $block->escapeHtmlAttr($_htmlClass) ?> required-entry <?= $block->escapeHtmlAttr($_priceValueValidation) ?>" type="text" name="<?= /* @noEscape */ $_htmlName ?>[<%- data.index %>][price]" value="<%- data.price %>" id="tier_price_row_<%- data.index %>_price" /></td>'
+    + '<td class="col-delete"><input type="hidden" name="<?= /* @noEscape */ $_htmlName ?>[<%- data.index %>][delete]" class="delete" value="" id="tier_price_row_<%- data.index %>_delete" />'
+    + '<button title="<?= $block->escapeHtml(__('Delete Tier')) ?>" type="button" class="action- scalable delete icon-btn delete-product-option" id="tier_price_row_<%- data.index %>_delete_button" onclick="return tierPriceControl.deleteItem(event);">'
+    + '<span><?= $block->escapeHtml(__("Delete")) ?></span></button></td>'
     + '</tr>';
 
 var tierPriceControl = {
     template: mageTemplate(tierPriceRowTemplate),
     itemsCount: 0,
     addItem : function () {
-        <?php if ($_readonly): ?>
+        <?php if ($_readonly) :?>
         if (arguments.length < 4) {
             return;
         }
         <?php endif; ?>
         var data = {
-            website_id: '<?= /* @escapeNotVerified */ $block->getDefaultWebsite() ?>',
-            group: '<?= /* @escapeNotVerified */ $block->getDefaultCustomerGroup() ?>',
+            website_id: '<?= (int) $block->getDefaultWebsite() ?>',
+            group: '<?= (int) $block->getDefaultCustomerGroup() ?>',
             qty: '',
             price: '',
             readOnly: false,
@@ -104,7 +103,7 @@ var tierPriceControl = {
             data.readOnly = arguments[4];
         }
 
-        Element.insert($('<?= /* @escapeNotVerified */ $_htmlId ?>_container'), {
+        Element.insert($('<?= $block->escapeJs($_htmlId) ?>_container'), {
             bottom : this.template({
                 data: data
             })
@@ -113,7 +112,7 @@ var tierPriceControl = {
         $('tier_price_row_' + data.index + '_cust_group').value = data.group;
         $('tier_price_row_' + data.index + '_website').value    = data.website_id;
 
-        <?php if ($block->isShowWebsiteColumn() && !$block->isAllowChangeWebsite()):?>
+        <?php if ($block->isShowWebsiteColumn() && !$block->isAllowChangeWebsite()) :?>
         var wss = $('tier_price_row_' + data.index + '_website');
         var txt = wss.options[wss.selectedIndex].text;
 
@@ -128,11 +127,11 @@ var tierPriceControl = {
             $('tier_price_row_'+data.index+'_delete_button').hide();
         }
 
-        <?php if ($_readonly): ?>
-        $('<?= /* @escapeNotVerified */ $_htmlId ?>_container').select('input', 'select').each(this.disableElement);
-        $('<?= /* @escapeNotVerified */ $_htmlId ?>_container').up('table').select('button').each(this.disableElement);
-        <?php else: ?>
-        $('<?= /* @escapeNotVerified */ $_htmlId ?>_container').select('input', 'select').each(function(el){ Event.observe(el, 'change', el.setHasChanges.bind(el)); });
+        <?php if ($_readonly) :?>
+        $('<?= $block->escapeJs($_htmlId) ?>_container').select('input', 'select').each(this.disableElement);
+        $('<?= $block->escapeJs($_htmlId) ?>_container').up('table').select('button').each(this.disableElement);
+        <?php else :?>
+        $('<?= $block->escapeJs($_htmlId) ?>_container').select('input', 'select').each(function(el){ Event.observe(el, 'change', el.setHasChanges.bind(el)); });
         <?php endif; ?>
     },
     disableElement: function(el) {
@@ -150,11 +149,11 @@ var tierPriceControl = {
         return false;
     }
 };
-<?php foreach ($block->getValues() as $_item): ?>
-tierPriceControl.addItem('<?= /* @escapeNotVerified */ $_item['website_id'] ?>', '<?= /* @escapeNotVerified */ $_item['cust_group'] ?>', '<?= /* @escapeNotVerified */ $_item['price_qty']*1 ?>', '<?= /* @escapeNotVerified */ $_item['price'] ?>', <?= (int)!empty($_item['readonly']) ?>);
+<?php foreach ($block->getValues() as $_item) :?>
+tierPriceControl.addItem('<?= $block->escapeJs($_item['website_id']) ?>', '<?= $block->escapeJs($_item['cust_group']) ?>', '<?= /* @noEscape */ $_item['price_qty']*1 ?>', '<?= $block->escapeJs($_item['price']) ?>', <?= /* @noEscape */ (int)!empty($_item['readonly']) ?>);
 <?php endforeach; ?>
-<?php if ($_readonly): ?>
-$('<?= /* @escapeNotVerified */ $_htmlId ?>_container').up('table').select('button')
+<?php if ($_readonly) :?>
+$('<?= $block->escapeJs($_htmlId) ?>_container').up('table').select('button')
     .each(tierPriceControl.disableElement);
 <?php endif; ?>
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml
index 44fdb75cdac21..0c1da98c7d85a 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml
@@ -4,9 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Ajax\Serializer */
 ?>
 
+// phpcs:disable Magento2.Security.InsecureFunction.DiscouragedWithAlternative
 <?php $_id = 'id_' . md5(microtime()) ?>
-<input type="hidden" name="<?= /* @escapeNotVerified */ $block->getInputElementName() ?>"  value="" id="<?= /* @escapeNotVerified */ $_id ?>" />
+<input type="hidden"
+       name="<?= $block->escapeHtmlAttr($block->getInputElementName()) ?>"
+       value=""
+       id="<?= /* @noEscape */ $_id ?>" />
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml
index 8f7f20f32d982..0193d7764cbb5 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml
@@ -4,16 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Websites */
 ?>
 <fieldset id="grop_fields" class="fieldset">
-    <legend class="legend"><span><?= /* @escapeNotVerified */ __('Product In Websites') ?></span></legend>
+    <legend class="legend"><span><?= $block->escapeHtml(__('Product In Websites')) ?></span></legend>
     <br>
-    <?php if ($block->getProductId()): ?>
+    <?php if ($block->getProductId()) :?>
     <div class="messages">
         <div class="message message-notice">
-            <?= /* @escapeNotVerified */ __('To hide an item in catalog or search results, set the status to "Disabled".') ?>
+            <?= $block->escapeHtml(__('To hide an item in catalog or search results, set the status to "Disabled".')) ?>
         </div>
     </div>
     <?php endif; ?>
@@ -21,22 +20,36 @@
         <?= $block->getHintHtml() ?>
         <div class="store-tree">
             <?php $_websites = $block->getWebsiteCollection() ?>
-            <?php foreach ($_websites as $_website): ?>
+            <?php foreach ($_websites as $_website) :?>
             <div class="website-name">
-                <input name="product[website_ids][]" value="<?= /* @escapeNotVerified */ $_website->getId() ?>" <?php if ($block->isReadonly()): ?>  disabled="disabled"<?php endif;?> class="checkbox website-checkbox" id="product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>" type="checkbox"<?php if ($block->hasWebsite($_website->getId()) || !$block->getProductId() && count($_websites) === 1): ?> checked="checked"<?php endif; ?> />
-                <label for="product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>"><?= $block->escapeHtml($_website->getName()) ?></label>
+                <input name="product[website_ids][]"
+                       value="<?= (int) $_website->getId() ?>"
+                    <?php if ($block->isReadonly()) :?>
+                        disabled="disabled"
+                    <?php endif;?>
+                       class="checkbox website-checkbox"
+                       id="product_website_<?= (int) $_website->getId() ?>"
+                       type="checkbox"
+                    <?php if ($block->hasWebsite($_website->getId()) || !$block->getProductId() && count($_websites) === 1) :?>
+                        checked="checked"
+                    <?php endif; ?>
+                />
+                <label for="product_website_<?= (int) $_website->getId() ?>"><?= $block->escapeHtml($_website->getName()) ?></label>
             </div>
-            <dl class="webiste-groups" id="product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>_data">
-                <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
+            <dl class="webiste-groups" id="product_website_<?= (int) $_website->getId() ?>_data">
+                <?php foreach ($block->getGroupCollection($_website) as $_group) :?>
                 <dt><?= $block->escapeHtml($_group->getName()) ?></dt>
                 <dd>
                     <ul>
-                        <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
+                        <?php foreach ($block->getStoreCollection($_group) as $_store) :?>
                         <li>
                             <?= $block->escapeHtml($_store->getName()) ?>
-                            <?php if ($block->getWebsites() && !$block->hasWebsite($_website->getId())): ?>
-                            <span class="website-<?= /* @escapeNotVerified */ $_website->getId() ?>-select" style="display:none">
-                            <?= __('(Copy data from: %1)', $block->getChooseFromStoreHtml($_store)) ?>
+                            <?php if ($block->getWebsites() && !$block->hasWebsite($_website->getId())) :?>
+                                <span class="website-<?= (int) $_website->getId() ?>-select" style="display:none">
+                                <?= $block->escapeHtml(
+                                    __('(Copy data from: %1)', $block->getChooseFromStoreHtml($_store)),
+                                    ['select', 'option', 'optgroup']
+                                ) ?>
                             </span>
                             <?php endif; ?>
                         </li>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
index 574c9ee81af7d..60dad8f7bc67c 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
 /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content */
 $elementName = $block->getElement()->getName() . '[images]';
@@ -15,62 +15,59 @@ $formName = $block->getFormName();
      data-mage-init='{"productGallery":{"template":"#<?= $block->getHtmlId() ?>-template"}}'
      data-parent-component="<?= $block->escapeHtml($block->getData('config/parentComponent')) ?>"
      data-images="<?= $block->escapeHtml($block->getImagesJson()) ?>"
-     data-types="<?= $block->escapeHtml(
-         $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getImageTypes())
-     ) ?>"
-    >
+     data-types="<?= $block->escapeHtml($this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getImageTypes())) ?>"
+>
     <?php if (!$block->getElement()->getReadonly()) {?>
         <div class="image image-placeholder">
             <?= $block->getUploaderHtml() ?>
             <div class="product-image-wrapper">
                 <p class="image-placeholder-text">
-                    <?= /* @escapeNotVerified */ __('Browse to find or drag image here') ?>
+                    <?= $block->escapeHtml(__('Browse to find or drag image here')) ?>
                 </p>
             </div>
         </div>
     <?php } ?>
     <?php foreach ($block->getImageTypes() as $typeData) {
-    ?>
-        <input name="<?= $block->escapeHtml($typeData['name']) ?>"
-               data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
-               class="image-<?= $block->escapeHtml($typeData['code']) ?>"
+        ?>
+        <input name="<?= $block->escapeHtmlAttr($typeData['name']) ?>"
+               data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
+               class="image-<?= $block->escapeHtmlAttr($typeData['code']) ?>"
                type="hidden"
-               value="<?= $block->escapeHtml($typeData['value']) ?>"/>
-    <?php
-
+               value="<?= $block->escapeHtmlAttr($typeData['value']) ?>"/>
+        <?php
 } ?>
 
     <script id="<?= $block->getHtmlId() ?>-template" type="text/x-magento-template">
         <div class="image item<% if (data.disabled == 1) { %> hidden-for-front<% } %>"
              data-role="image">
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][position]"
+                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][position]"
                    value="<%- data.position %>"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
+                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
                    class="position"/>
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][file]"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
+                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][file]"
+                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
                    value="<%- data.file %>"/>
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][value_id]"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
+                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][value_id]"
+                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
                    value="<%- data.value_id %>"/>
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][label]"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
+                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][label]"
+                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
                    value="<%- data.label %>"/>
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][disabled]"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
+                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][disabled]"
+                   data-form-part="<?= $block->escapeHtmlAttr(formName) ?>"
                    value="<%- data.disabled %>"/>
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][media_type]"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
+                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][media_type]"
+                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
                    value="image"/>
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][removed]"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
+                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][removed]"
+                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
                    value=""
                    class="is-removed"/>
 
@@ -84,21 +81,21 @@ $formName = $block->getFormName();
                     <button type="button"
                             class="action-remove"
                             data-role="delete-button"
-                            title="<?= /* @escapeNotVerified */ __('Delete image') ?>">
+                            title="<?= $block->escapeHtmlAttr(__('Delete image')) ?>">
                     <span>
-                        <?= /* @escapeNotVerified */ __('Delete image') ?>
+                        <?= $block->escapeHtml(__('Delete image')) ?>
                     </span>
                     </button>
                     <div class="draggable-handle"></div>
                 </div>
-                <div class="image-fade"><span><?= /* @escapeNotVerified */ __('Hidden') ?></span></div>
+                <div class="image-fade"><span><?= $block->escapeHtml(__('Hidden')) ?></span></div>
             </div>
 
 
             <div class="item-description">
                 <div class="item-title" data-role="img-title"><%- data.label %></div>
                 <div class="item-size">
-                  <span data-role="image-dimens"></span>, <span data-role="image-size"><%- data.sizeLabel %></span>
+                    <span data-role="image-dimens"></span>, <span data-role="image-size"><%- data.sizeLabel %></span>
                 </div>
             </div>
 
@@ -106,12 +103,9 @@ $formName = $block->getFormName();
                 <?php
                 foreach ($block->getImageTypes() as $typeData) {
                     ?>
-                    <li data-role-code="<?php /* @escapeNotVerified */ echo $block->escapeHtml(
-                        $typeData['code']
-                    ) ?>" class="item-role item-role-<?php /* @escapeNotVerified */ echo $block->escapeHtml(
-                        $typeData['code']
-                    ) ?>">
-                        <?= /* @escapeNotVerified */ $block->escapeHtml($typeData['label']) ?>
+                    <li data-role-code="<?= $block->escapeHtmlAttr($typeData['code']) ?>"
+                        class="item-role item-role-<?= $block->escapeHtmlAttr($typeData['code']) ?>">
+                        <?= $block->escapeHtml($typeData['label']) ?>
                     </li>
                     <?php
                 }
@@ -121,98 +115,94 @@ $formName = $block->getFormName();
     </script>
 
     <script data-role="img-dialog-container-tmpl" type="text/x-magento-template">
-      <div class="image-panel" data-role="dialog">
-      </div>
+        <div class="image-panel" data-role="dialog">
+        </div>
     </script>
 
     <script data-role="img-dialog-tmpl" type="text/x-magento-template">
-            <div class="image-panel-preview">
-                <img src="<%- data.url %>" alt="<%- data.label %>" />
-            </div>
-            <div class="image-panel-controls">
-                <strong class="image-name"><%- data.label %></strong>
+        <div class="image-panel-preview">
+            <img src="<%- data.url %>" alt="<%- data.label %>" />
+        </div>
+        <div class="image-panel-controls">
+            <strong class="image-name"><%- data.label %></strong>
 
-                <fieldset class="admin__fieldset fieldset-image-panel">
-                    <div class="admin__field field-image-description">
-                        <label class="admin__field-label" for="image-description">
-                            <span><?= /* @escapeNotVerified */ __('Alt Text') ?></span>
-                        </label>
+            <fieldset class="admin__fieldset fieldset-image-panel">
+                <div class="admin__field field-image-description">
+                    <label class="admin__field-label" for="image-description">
+                        <span><?= $block->escapeHtml(__('Alt Text')) ?></span>
+                    </label>
 
-                        <div class="admin__field-control">
+                    <div class="admin__field-control">
                             <textarea data-role="image-description"
                                       rows="3"
                                       class="admin__control-textarea"
-                                      name="<?php /* @escapeNotVerified */
-                                      echo $elementName
-                                      ?>[<%- data.file_id %>][label]"><%- data.label %></textarea>
-                        </div>
-                    </div>
+                                      name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][label]"><%- data.label %></textarea>
+                      </div>
+                </div>
 
-                    <div class="admin__field field-image-role">
-                        <label class="admin__field-label">
-                            <span><?= /* @escapeNotVerified */ __('Role') ?></span>
-                        </label>
-                        <div class="admin__field-control">
-                            <ul class="multiselect-alt">
-                                <?php
-                                foreach ($block->getMediaAttributes() as $attribute) :
-                                    ?>
-                                    <li class="item">
-                                        <label>
-                                            <input class="image-type"
-                                                   data-role="type-selector"
-                                                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
-                                                   type="checkbox"
-                                                   value="<?php /* @escapeNotVerified */ echo $block->escapeHtml(
-                                                       $attribute->getAttributeCode()
-                                                   ) ?>"
-                                                />
-                                            <?php /* @escapeNotVerified */ echo $block->escapeHtml(
-                                                $attribute->getFrontendLabel()
-                                            ) ?>
-                                        </label>
-                                    </li>
+                <div class="admin__field field-image-role">
+                    <label class="admin__field-label">
+                        <span><?= $block->escapeHtml(__('Role')) ?></span>
+                    </label>
+                    <div class="admin__field-control">
+                        <ul class="multiselect-alt">
+                            <?php
+                            foreach ($block->getMediaAttributes() as $attribute) :
+                                ?>
+                                <li class="item">
+                                    <label>
+                                        <input class="image-type"
+                                               data-role="type-selector"
+                                               data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
+                                               type="checkbox"
+                                               value="<?= $block->escapeHtmlAttr($attribute->getAttributeCode()) ?>"
+                                               />
+                                        <?= $block->escapeHtml(
+                                            $attribute->getFrontendLabel()
+                                        ) ?>
+                                    </label>
+                                </li>
                                 <?php
                                 endforeach;
-                                ?>
-                            </ul>
-                        </div>
+                            ?>
+                        </ul>
                     </div>
+                </div>
 
-                    <div class="admin__field admin__field-inline field-image-size" data-role="size">
-                        <label class="admin__field-label">
-                            <span><?= /* @escapeNotVerified */ __('Image Size') ?></span>
-                        </label>
-                        <div class="admin__field-value" data-message="<?= /* @escapeNotVerified */ __('{size}') ?>"></div>
-                    </div>
+                <div class="admin__field admin__field-inline field-image-size" data-role="size">
+                    <label class="admin__field-label">
+                        <span><?= $block->escapeHtml(__('Image Size')) ?></span>
+                    </label>
+                    <div class="admin__field-value" data-message="<?= $block->escapeHtmlAttr(__('{size}')) ?>"></div>
+                </div>
 
-                    <div class="admin__field admin__field-inline field-image-resolution" data-role="resolution">
-                        <label class="admin__field-label">
-                            <span><?= /* @escapeNotVerified */ __('Image Resolution') ?></span>
-                        </label>
-                        <div class="admin__field-value" data-message="<?= /* @escapeNotVerified */ __('{width}^{height} px') ?>"></div>
-                    </div>
+                <div class="admin__field admin__field-inline field-image-resolution" data-role="resolution">
+                    <label class="admin__field-label">
+                        <span><?= $block->escapeHtml(__('Image Resolution')) ?></span>
+                    </label>
+                    <div class="admin__field-value" data-message="<?= $block->escapeHtmlAttr(__('{width}^{height} px')) ?>"></div>
+                </div>
 
-                    <div class="admin__field field-image-hide">
-                        <div class="admin__field-control">
-                            <div class="admin__field admin__field-option">
-                                <input type="checkbox"
-                                       id="hide-from-product-page"
-                                       data-role="visibility-trigger"
-                                       data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
-                                       value="1"
-                                       class="admin__control-checkbox"
-                                       name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][disabled]"
-                                <% if (data.disabled == 1) { %>checked="checked"<% } %> />
-
-                                <label for="hide-from-product-page" class="admin__field-label">
-                                    <?= /* @escapeNotVerified */ __('Hide from Product Page') ?>
-                                </label>
-                            </div>
+                <div class="admin__field field-image-hide">
+                    <div class="admin__field-control">
+                        <div class="admin__field admin__field-option">
+                            <input type="checkbox"
+                                   id="hide-from-product-page"
+                                   data-role="visibility-trigger"
+                                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
+                                   value="1"
+                                   class="admin__control-checkbox"
+                                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][disabled]"
+                            <% if (data.disabled == 1) { %>checked="checked"<% } %> />
+
+                            <label for="hide-from-product-page" class="admin__field-label">
+                                <?= $block->escapeHtml(__('Hide from Product Page')) ?>
+                            </label>
                         </div>
                     </div>
-                </fieldset>
-            </div>
+                </div>
+            </fieldset>
+        </div>
     </script>
     <?= $block->getChildHtml('new-video') ?>
 </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml
index 4134392c0f52b..0a13aee5930ad 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
 /** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Js $block */
 ?>
@@ -30,8 +30,8 @@ function registerTaxRecalcs() {
     Event.observe($('tax_class_id'), 'change', recalculateTax);
 }
 
-var priceFormat = <?= /* @escapeNotVerified */ $this->helper('Magento\Tax\Helper\Data')->getPriceFormat($block->getStore()) ?>;
-var taxRates = <?= /* @escapeNotVerified */ $block->getAllRatesByProductClassJson() ?>;
+var priceFormat = <?= /* @noEscape */ $this->helper(Magento\Tax\Helper\Data::class)->getPriceFormat($block->getStore()) ?>;
+var taxRates = <?= /* @noEscape */ $block->getAllRatesByProductClassJson() ?>;
 
 function recalculateTax() {
     if (typeof dynamicTaxes == 'undefined') {
@@ -75,10 +75,10 @@ function bindActiveProductTab(event, ui) {
 jQuery(document).on('tabsactivate', bindActiveProductTab);
 
 // bind active tab
-<?php if ($tabsBlock = $block->getLayout()->getBlock('product_tabs')): ?>
+<?php if ($tabsBlock = $block->getLayout()->getBlock('product_tabs')) :?>
 jQuery(function () {
-    if (jQuery('#<?= /* @escapeNotVerified */ $tabsBlock->getId() ?>').length && jQuery('#<?= /* @escapeNotVerified */ $tabsBlock->getId() ?>').is(':mage-tabs')) {
-        var activeAnchor = jQuery('#<?= /* @escapeNotVerified */ $tabsBlock->getId() ?>').tabs('activeAnchor');
+    if (jQuery('#<?= $block->escapeJs($tabsBlock->getId()) ?>').length && jQuery('#<?= $block->escapeJs($tabsBlock->getId()) ?>').is(':mage-tabs')) {
+        var activeAnchor = jQuery('#<?= $block->escapeJs($tabsBlock->getId()) ?>').tabs('activeAnchor');
         if (activeAnchor && $('store_switcher')) {
             $('store_switcher').switchParams = 'active_tab/' + activeAnchor.prop('name') + '/';
         }
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/alert.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/alert.phtml
index 5b07121de49dc..7c3bee3d4d2fc 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/alert.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/alert.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /**
@@ -14,7 +12,7 @@
 ?>
 <div id="alert_messages_block"><?= $block->getMessageHtml() ?></div>
 <div>
-    <h4 class="icon-head head-edit-form"><?= /* @escapeNotVerified */ __('Product Alerts') ?></h4>
+    <h4 class="icon-head head-edit-form"><?= $block->escapeHtml(__('Product Alerts')) ?></h4>
 </div>
 <div class="clear"></div>
 <?= $block->getAccordionHtml() ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
index 2c62bbf8db3e9..c66f31cc809ea 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
@@ -4,382 +4,448 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Inventory */
 ?>
-<?php if ($block->isReadonly()): ?>
-<?php $_readonly = ' disabled="disabled" '; ?>
-<?php else: ?>
-<?php $_readonly = ''; ?>
+<?php if ($block->isReadonly()) :?>
+    <?php $_readonly = ' disabled="disabled" '; ?>
+<?php else :?>
+    <?php $_readonly = ''; ?>
 <?php endif; ?>
 <fieldset class="fieldset form-inline">
-<legend class="legend"><span><?= /* @escapeNotVerified */ __('Advanced Inventory') ?></span></legend>
-<br>
-<div id="table_cataloginventory">
-<div class="field">
-    <label class="label" for="inventory_manage_stock">
-        <span><?= /* @escapeNotVerified */ __('Manage Stock') ?></span>
-    </label>
-    <div class="control">
-        <select id="inventory_manage_stock" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][manage_stock]" <?= /* @escapeNotVerified */ $_readonly ?>>
-            <option value="1"><?= /* @escapeNotVerified */ __('Yes') ?></option>
-            <option value="0"<?php if ($block->getFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('No') ?></option>
-        </select>
-        <input type="hidden" id="inventory_manage_stock_default" value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('manage_stock') ?>">
-        <?php $_checked = ($block->getFieldValue('use_config_manage_stock') || $block->isNew()) ? 'checked="checked"' : '' ?>
-        <input type="checkbox" id="inventory_use_config_manage_stock" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_manage_stock]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
-        <label for="inventory_use_config_manage_stock"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
-        <?php if (!$block->isReadonly()): ?>
-        <script>
-require(['prototype'], function(){
-toggleValueElements($('inventory_use_config_manage_stock'), $('inventory_use_config_manage_stock').parentNode);
-});
-</script>
-        <?php endif; ?>
-    </div>
-    <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
-    <?php endif; ?>
-</div>
+    <legend class="legend"><span><?= $block->escapeHtml(__('Advanced Inventory')) ?></span></legend>
+    <br>
+    <div id="table_cataloginventory">
+        <div class="field">
+            <label class="label" for="inventory_manage_stock">
+                <span><?= $block->escapeHtml(__('Manage Stock')) ?></span>
+            </label>
+            <div class="control">
+                <select id="inventory_manage_stock"
+                        name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][manage_stock]" <?= /* @noEscape */ $_readonly ?>>
+                    <option value="1"><?= $block->escapeHtml(__('Yes')) ?></option>
+                    <option value="0"<?php if ($block->getFieldValue('manage_stock') == 0) :?> selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('No')) ?></option>
+                </select>
+                <input type="hidden"
+                       id="inventory_manage_stock_default"
+                       value="<?= $block->escapeHtmlAttr($block->getDefaultConfigValue('manage_stock')) ?>">
+                <?php $_checked = ($block->getFieldValue('use_config_manage_stock') || $block->isNew()) ? 'checked="checked"' : '' ?>
+                <input type="checkbox"
+                       id="inventory_use_config_manage_stock"
+                       name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_manage_stock]"
+                       value="1" <?= /* @noEscape */ $_checked ?>
+                       onclick="toggleValueElements(this, this.parentNode);" <?= /* @noEscape */ $_readonly ?>>
+                <label for="inventory_use_config_manage_stock"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
+                <?php if (!$block->isReadonly()) :?>
+                    <script>
+                        require(['prototype'], function(){
+                            toggleValueElements($('inventory_use_config_manage_stock'), $('inventory_use_config_manage_stock').parentNode);
+                        });
+                    </script>
+                <?php endif; ?>
+            </div>
+            <?php if (!$block->isSingleStoreMode()) :?>
+                <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+            <?php endif; ?>
+        </div>
 
-<?php if (!$block->getProduct()->isComposite()): ?>
-<div class="field">
-    <label class="label" for="inventory_qty">
-        <span><?= /* @escapeNotVerified */ __('Qty') ?></span>
-    </label>
-    <div class="control">
-        <?php if (!$_readonly): ?>
-        <input type="hidden" id="original_inventory_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][original_inventory_qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('qty') * 1 ?>">
-        <?php endif;?>
-        <input type="text" class="input-text validate-number" id="inventory_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
-    </div>
-    <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
-    <?php endif; ?>
-</div>
+        <?php if (!$block->getProduct()->isComposite()) :?>
+            <div class="field">
+                <label class="label" for="inventory_qty">
+                    <span><?= $block->escapeHtml(__('Qty')) ?></span>
+                </label>
+                <div class="control">
+                    <?php if (!$_readonly) :?>
+                        <input type="hidden"
+                               id="original_inventory_qty"
+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][original_inventory_qty]"
+                               value="<?= /* @noEscape */ $block->getFieldValue('qty') * 1 ?>">
+                    <?php endif;?>
+                    <input type="text"
+                           class="input-text validate-number"
+                           id="inventory_qty"
+                           name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][qty]"
+                           value="<?= /* @noEscape */ $block->getFieldValue('qty') * 1 ?>" <?= /* @noEscape */ $_readonly ?>>
+                </div>
+                <?php if (!$block->isSingleStoreMode()) :?>
+                    <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                <?php endif; ?>
+            </div>
 
-<div class="field">
-    <label class="label" for="inventory_min_qty">
-        <span><?= /* @escapeNotVerified */ __('Out-of-Stock Threshold') ?></span>
-    </label>
-    <div class="control">
-        <input type="text" class="input-text validate-number" id="inventory_min_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][min_qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('min_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
+            <div class="field">
+                <label class="label" for="inventory_min_qty">
+                    <span><?= $block->escapeHtml(__('Out-of-Stock Threshold')) ?></span>
+                </label>
+                <div class="control">
+                    <input type="text"
+                           class="input-text validate-number"
+                           id="inventory_min_qty"
+                           name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][min_qty]"
+                           value="<?= /* @noEscape */ $block->getFieldValue('min_qty') * 1 ?>" <?= /* @noEscape */ $_readonly ?>>
 
-        <div class="control-inner-wrap">
-            <?php $_checked = ($block->getFieldValue('use_config_min_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
-            <input type="checkbox" id="inventory_use_config_min_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_min_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
-            <label for="inventory_use_config_min_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
-        </div>
+                    <div class="control-inner-wrap">
+                        <?php $_checked = ($block->getFieldValue('use_config_min_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
+                        <input type="checkbox"
+                               id="inventory_use_config_min_qty"
+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_min_qty]"
+                               value="1" <?= /* @noEscape */ $_checked ?>
+                               onclick="toggleValueElements(this, this.parentNode);" <?= /* @noEscape */ $_readonly ?>>
+                        <label for="inventory_use_config_min_qty"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
+                    </div>
 
-        <?php if (!$block->isReadonly()): ?>
-        <script>
-require(["prototype"], function(){
-toggleValueElements($('inventory_use_config_min_qty'), $('inventory_use_config_min_qty').parentNode);
-});
-</script>
-        <?php endif; ?>
-    </div>
-    <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
-    <?php endif; ?>
-</div>
+                    <?php if (!$block->isReadonly()) :?>
+                        <script>
+                            require(["prototype"], function(){
+                                toggleValueElements($('inventory_use_config_min_qty'), $('inventory_use_config_min_qty').parentNode);
+                            });
+                        </script>
+                    <?php endif; ?>
+                </div>
+                <?php if (!$block->isSingleStoreMode()) :?>
+                    <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                <?php endif; ?>
+            </div>
 
-<div class="field">
-    <label class="label" for="inventory_min_sale_qty">
-        <span><?= /* @escapeNotVerified */ __('Minimum Qty Allowed in Shopping Cart') ?></span>
-    </label>
-    <div class="control">
-        <input type="text" class="input-text validate-number" id="inventory_min_sale_qty"
-               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][min_sale_qty]"
-               value="<?= /* @escapeNotVerified */ $block->getFieldValue('min_sale_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
-        <div class="control-inner-wrap">
-        <?php $_checked = ($block->getFieldValue('use_config_min_sale_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
-            <input type="checkbox" id="inventory_use_config_min_sale_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_min_sale_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?= /* @escapeNotVerified */ $_readonly ?>>
-            <label for="inventory_use_config_min_sale_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
-        </div>
-        <?php if (!$block->isReadonly()): ?>
-        <script>
-require(['prototype'], function(){
-toggleValueElements($('inventory_use_config_min_sale_qty'), $('inventory_use_config_min_sale_qty').parentNode);
-});
-</script>
-        <?php endif; ?>
-    </div>
-    <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
-    <?php endif; ?>
-</div>
+            <div class="field">
+                <label class="label" for="inventory_min_sale_qty">
+                    <span><?= $block->escapeHtml(__('Minimum Qty Allowed in Shopping Cart')) ?></span>
+                </label>
+                <div class="control">
+                    <input type="text" class="input-text validate-number" id="inventory_min_sale_qty"
+                           name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][min_sale_qty]"
+                           value="<?= /* @noEscape */ $block->getFieldValue('min_sale_qty') * 1 ?>" <?= /* @noEscape */ $_readonly ?>>
+                    <div class="control-inner-wrap">
+                        <?php $_checked = ($block->getFieldValue('use_config_min_sale_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
+                        <input type="checkbox"
+                               id="inventory_use_config_min_sale_qty"
+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_min_sale_qty]"
+                               value="1" <?= /* @noEscape */ $_checked ?>
+                               onclick="toggleValueElements(this, this.parentNode);"
+                               class="checkbox" <?= /* @noEscape */ $_readonly ?>>
+                        <label for="inventory_use_config_min_sale_qty"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
+                    </div>
+                    <?php if (!$block->isReadonly()) :?>
+                        <script>
+                            require(['prototype'], function(){
+                                toggleValueElements($('inventory_use_config_min_sale_qty'), $('inventory_use_config_min_sale_qty').parentNode);
+                            });
+                        </script>
+                    <?php endif; ?>
+                </div>
+                <?php if (!$block->isSingleStoreMode()) :?>
+                    <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                <?php endif; ?>
+            </div>
 
-<div class="field">
-    <label class="label" for="inventory_max_sale_qty">
-        <span><?= /* @escapeNotVerified */ __('Maximum Qty Allowed in Shopping Cart') ?></span>
-    </label>
-    <div class="control">
-        <input type="text" class="input-text validate-number" id="inventory_max_sale_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][max_sale_qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('max_sale_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
-        <?php $_checked = ($block->getFieldValue('use_config_max_sale_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
-        <div class="control-inner-wrap">
-            <input type="checkbox" id="inventory_use_config_max_sale_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_max_sale_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?= /* @escapeNotVerified */ $_readonly ?>>
-            <label for="inventory_use_config_max_sale_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
-        </div>
-        <?php if (!$block->isReadonly()): ?>
-        <script>
-require(['prototype'], function(){
-toggleValueElements($('inventory_use_config_max_sale_qty'), $('inventory_use_config_max_sale_qty').parentNode);
-});
-</script>
-        <?php endif; ?>
-    </div>
-    <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
-    <?php endif; ?>
-</div>
+            <div class="field">
+                <label class="label" for="inventory_max_sale_qty">
+                    <span><?= $block->escapeHtml(__('Maximum Qty Allowed in Shopping Cart')) ?></span>
+                </label>
+                <div class="control">
+                    <input type="text"
+                           class="input-text validate-number"
+                           id="inventory_max_sale_qty"
+                           name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][max_sale_qty]"
+                           value="<?= /* @noEscape */ $block->getFieldValue('max_sale_qty') * 1 ?>" <?= /* @noEscape */ $_readonly ?>>
+                    <?php $_checked = ($block->getFieldValue('use_config_max_sale_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
+                    <div class="control-inner-wrap">
+                        <input type="checkbox"
+                               id="inventory_use_config_max_sale_qty"
+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_max_sale_qty]"
+                               value="1" <?= /* @noEscape */ $_checked ?>
+                               onclick="toggleValueElements(this, this.parentNode);"
+                               class="checkbox" <?= /* @noEscape */ $_readonly ?>>
+                        <label for="inventory_use_config_max_sale_qty"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
+                    </div>
+                    <?php if (!$block->isReadonly()) :?>
+                        <script>
+                            require(['prototype'], function(){
+                                toggleValueElements($('inventory_use_config_max_sale_qty'), $('inventory_use_config_max_sale_qty').parentNode);
+                            });
+                        </script>
+                    <?php endif; ?>
+                </div>
+                <?php if (!$block->isSingleStoreMode()) :?>
+                    <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                <?php endif; ?>
+            </div>
 
-    <?php if ($block->canUseQtyDecimals()): ?>
-    <div class="field">
-        <label class="label" for="inventory_is_qty_decimal">
-            <span><?= /* @escapeNotVerified */ __('Qty Uses Decimals') ?></span>
-        </label>
-        <div class="control">
-            <select id="inventory_is_qty_decimal" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][is_qty_decimal]" <?= /* @escapeNotVerified */ $_readonly ?>>
-                <option value="0"><?= /* @escapeNotVerified */ __('No') ?></option>
-                <option value="1"<?php if ($block->getFieldValue('is_qty_decimal') == 1): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('Yes') ?></option>
-            </select>
-        </div>
-        <?php if (!$block->isSingleStoreMode()): ?>
-        <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
-        <?php endif; ?>
-    </div>
+            <?php if ($block->canUseQtyDecimals()) :?>
+                <div class="field">
+                    <label class="label" for="inventory_is_qty_decimal">
+                        <span><?= $block->escapeHtml(__('Qty Uses Decimals')) ?></span>
+                    </label>
+                    <div class="control">
+                        <select id="inventory_is_qty_decimal"
+                                name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][is_qty_decimal]" <?= /* @noEscape */ $_readonly ?>>
+                            <option value="0"><?= $block->escapeHtml(__('No')) ?></option>
+                            <option value="1"<?php if ($block->getFieldValue('is_qty_decimal') == 1) :?> selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('Yes')) ?></option>
+                        </select>
+                    </div>
+                    <?php if (!$block->isSingleStoreMode()) :?>
+                        <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                    <?php endif; ?>
+                </div>
 
-        <?php if (!$block->isVirtual()) : ?>
-        <div class="field">
-            <label class="label" for="inventory_is_decimal_divided">
-                <span><?= /* @escapeNotVerified */ __('Allow Multiple Boxes for Shipping') ?></span>
-            </label>
-            <div class="control">
-                <select id="inventory_is_decimal_divided" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][is_decimal_divided]" <?= /* @escapeNotVerified */ $_readonly ?>>
-                    <option value="0"><?= /* @escapeNotVerified */ __('No') ?></option>
-                    <option value="1"<?php if ($block->getFieldValue('is_decimal_divided') == 1): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('Yes') ?></option>
-                </select>
-            </div>
-            <?php if (!$block->isSingleStoreMode()): ?>
-            <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
+                <?php if (!$block->isVirtual()) :?>
+                    <div class="field">
+                        <label class="label" for="inventory_is_decimal_divided">
+                            <span><?= $block->escapeHtml(__('Allow Multiple Boxes for Shipping')) ?></span>
+                        </label>
+                        <div class="control">
+                            <select id="inventory_is_decimal_divided"
+                                    name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][is_decimal_divided]" <?= /* @noEscape */ $_readonly ?>>
+                                <option value="0"><?= $block->escapeHtml(__('No')) ?></option>
+                                <option value="1"<?php if ($block->getFieldValue('is_decimal_divided') == 1) :?>
+                                    selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('Yes')) ?></option>
+                            </select>
+                        </div>
+                        <?php if (!$block->isSingleStoreMode()) :?>
+                            <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                        <?php endif; ?>
+                    </div>
+                <?php endif; ?>
             <?php endif; ?>
-        </div>
-            <?php endif; ?>
-        <?php endif; ?>
 
-<div class="field">
-    <label class="label" for="inventory_backorders">
-        <span><?= /* @escapeNotVerified */ __('Backorders') ?></span>
-    </label>
-    <div class="control">
-        <select id="inventory_backorders" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][backorders]" <?= /* @escapeNotVerified */ $_readonly ?>>
-            <?php foreach ($block->getBackordersOption() as $option): ?>
-            <?php $_selected = ($option['value'] == $block->getFieldValue('backorders')) ? 'selected="selected"' : '' ?>
-            <option value="<?= /* @escapeNotVerified */ $option['value'] ?>" <?= /* @escapeNotVerified */ $_selected ?>><?= /* @escapeNotVerified */ $option['label'] ?></option>
-            <?php endforeach; ?>
-        </select>
+            <div class="field">
+                <label class="label" for="inventory_backorders">
+                    <span><?= $block->escapeHtml(__('Backorders')) ?></span>
+                </label>
+                <div class="control">
+                    <select id="inventory_backorders"
+                            name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][backorders]" <?= /* @noEscape */ $_readonly ?>>
+                        <?php foreach ($block->getBackordersOption() as $option) :?>
+                            <?php $_selected = ($option['value'] == $block->getFieldValue('backorders')) ? 'selected="selected"' : '' ?>
+                            <option value="<?= $block->escapeHtmlAttr($option['value']) ?>" <?= /* @noEscape */ $_selected ?>><?= $block->escapeHtml($option['label']) ?></option>
+                        <?php endforeach; ?>
+                    </select>
 
-        <div class="control-inner-wrap">
-            <?php $_checked = ($block->getFieldValue('use_config_backorders') || $block->isNew()) ? 'checked="checked"' : '' ?>
-            <input type="checkbox" id="inventory_use_config_backorders" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_backorders]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
-            <label for="inventory_use_config_backorders"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
-        </div>
-        <?php if (!$block->isReadonly()): ?>
-        <script>
-require(['prototype'], function(){
-toggleValueElements($('inventory_use_config_backorders'), $('inventory_use_config_backorders').parentNode);
-});
-</script>
-        <?php endif; ?>
-    </div>
-    <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
-    <?php endif; ?>
-</div>
+                    <div class="control-inner-wrap">
+                        <?php $_checked = ($block->getFieldValue('use_config_backorders') || $block->isNew()) ? 'checked="checked"' : '' ?>
+                        <input type="checkbox"
+                               id="inventory_use_config_backorders"
+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_backorders]"
+                               value="1" <?= /* @noEscape */ $_checked ?>
+                               onclick="toggleValueElements(this, this.parentNode);" <?= /* @noEscape */ $_readonly ?>>
+                        <label for="inventory_use_config_backorders"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
+                    </div>
+                    <?php if (!$block->isReadonly()) :?>
+                        <script>
+                            require(['prototype'], function(){
+                                toggleValueElements($('inventory_use_config_backorders'), $('inventory_use_config_backorders').parentNode);
+                            });
+                        </script>
+                    <?php endif; ?>
+                </div>
+                <?php if (!$block->isSingleStoreMode()) :?>
+                    <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                <?php endif; ?>
+            </div>
 
-<div class="field">
-    <label class="label" for="inventory_notify_stock_qty">
-        <span><?= /* @escapeNotVerified */ __('Notify for Quantity Below') ?></span>
-    </label>
-    <div class="control">
-        <input type="text" class="input-text validate-number" id="inventory_notify_stock_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][notify_stock_qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('notify_stock_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
+            <div class="field">
+                <label class="label" for="inventory_notify_stock_qty">
+                    <span><?= $block->escapeHtml(__('Notify for Quantity Below')) ?></span>
+                </label>
+                <div class="control">
+                    <input type="text"
+                           class="input-text validate-number"
+                           id="inventory_notify_stock_qty"
+                           name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][notify_stock_qty]"
+                           value="<?= /* @noEscape */ $block->getFieldValue('notify_stock_qty') * 1 ?>" <?= /* @noEscape */ $_readonly ?>>
 
-        <div class="control-inner-wrap">
-            <?php $_checked = ($block->getFieldValue('use_config_notify_stock_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
-            <input type="checkbox" id="inventory_use_config_notify_stock_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_notify_stock_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
-            <label for="inventory_use_config_notify_stock_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
-        </div>
-        <?php if (!$block->isReadonly()): ?>
-        <script>
-require(['prototype'], function(){
-toggleValueElements($('inventory_use_config_notify_stock_qty'), $('inventory_use_config_notify_stock_qty').parentNode);
-});
-</script>
-        <?php endif; ?>
-    </div>
-    <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
-    <?php endif; ?>
-</div>
+                    <div class="control-inner-wrap">
+                        <?php $_checked = ($block->getFieldValue('use_config_notify_stock_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
+                        <input type="checkbox"
+                               id="inventory_use_config_notify_stock_qty"
+                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_notify_stock_qty]"
+                               value="1" <?= /* @noEscape */ $_checked ?>
+                               onclick="toggleValueElements(this, this.parentNode);" <?= /* @noEscape */ $_readonly ?>>
+                        <label for="inventory_use_config_notify_stock_qty"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
+                    </div>
+                    <?php if (!$block->isReadonly()) :?>
+                        <script>
+                            require(['prototype'], function(){
+                                toggleValueElements($('inventory_use_config_notify_stock_qty'), $('inventory_use_config_notify_stock_qty').parentNode);
+                            });
+                        </script>
+                    <?php endif; ?>
+                </div>
+                <?php if (!$block->isSingleStoreMode()) :?>
+                    <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                <?php endif; ?>
+            </div>
 
-    <?php endif; ?>
-<div class="field">
-    <label class="label" for="inventory_enable_qty_increments">
-        <span><?= /* @escapeNotVerified */ __('Enable Qty Increments') ?></span>
-    </label>
-    <div class="control">
-        <?php $qtyIncrementsEnabled = $block->getFieldValue('enable_qty_increments'); ?>
-        <select id="inventory_enable_qty_increments" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][enable_qty_increments]" <?= /* @escapeNotVerified */ $_readonly ?>>
-            <option value="1"<?php if ($qtyIncrementsEnabled): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('Yes') ?></option>
-            <option value="0"<?php if (!$qtyIncrementsEnabled): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('No') ?></option>
-        </select>
-        <input type="hidden" id="inventory_enable_qty_increments_default" value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('enable_qty_increments') ?>">
+        <?php endif; ?>
+        <div class="field">
+            <label class="label" for="inventory_enable_qty_increments">
+                <span><?= $block->escapeHtml(__('Enable Qty Increments')) ?></span>
+            </label>
+            <div class="control">
+                <?php $qtyIncrementsEnabled = $block->getFieldValue('enable_qty_increments'); ?>
+                <select id="inventory_enable_qty_increments"
+                        name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][enable_qty_increments]" <?= /* @noEscape */ $_readonly ?>>
+                    <option value="1"<?php if ($qtyIncrementsEnabled) :?> selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('Yes')) ?></option>
+                    <option value="0"<?php if (!$qtyIncrementsEnabled) :?> selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('No')) ?></option>
+                </select>
+                <input type="hidden"
+                       id="inventory_enable_qty_increments_default"
+                       value="<?= $block->escapeHtmlAttr($block->getDefaultConfigValue('enable_qty_increments')) ?>">
 
-        <div class="control-inner-wrap">
-            <?php $_checked = ($block->getFieldValue('use_config_enable_qty_inc') || $block->isNew()) ? 'checked="checked"' : '' ?>
-            <input type="checkbox" id="inventory_use_config_enable_qty_increments" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_enable_qty_increments]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
-            <label for="inventory_use_config_enable_qty_increments"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
+                <div class="control-inner-wrap">
+                    <?php $_checked = ($block->getFieldValue('use_config_enable_qty_inc') || $block->isNew()) ? 'checked="checked"' : '' ?>
+                    <input type="checkbox"
+                           id="inventory_use_config_enable_qty_increments"
+                           name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_enable_qty_increments]"
+                           value="1" <?= /* @noEscape */ $_checked ?>
+                           onclick="toggleValueElements(this, this.parentNode);" <?= /* @noEscape */ $_readonly ?>>
+                    <label for="inventory_use_config_enable_qty_increments"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
+                </div>
+                <?php if (!$block->isReadonly()) :?>
+                    <script>
+                        require(['prototype'], function(){
+                            toggleValueElements($('inventory_use_config_enable_qty_increments'), $('inventory_use_config_enable_qty_increments').parentNode);
+                        });
+                    </script>
+                <?php endif; ?>
+            </div>
+            <?php if (!$block->isSingleStoreMode()) :?>
+                <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+            <?php endif; ?>
         </div>
-        <?php if (!$block->isReadonly()): ?>
-        <script>
-require(['prototype'], function(){
-toggleValueElements($('inventory_use_config_enable_qty_increments'), $('inventory_use_config_enable_qty_increments').parentNode);
-});
-</script>
-        <?php endif; ?>
-    </div>
-    <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
-    <?php endif; ?>
-</div>
 
-<div class="field">
-    <label class="label" for="inventory_qty_increments">
-        <span><?= /* @escapeNotVerified */ __('Qty Increments') ?></span>
-    </label>
-    <div class="control">
-        <input type="text" class="input-text validate-digits" id="inventory_qty_increments" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][qty_increments]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('qty_increments') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
-        <div class="control-inner-wrap">
-            <?php $_checked = ($block->getFieldValue('use_config_qty_increments') || $block->isNew()) ? 'checked="checked"' : '' ?>
-            <input type="checkbox" id="inventory_use_config_qty_increments" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_qty_increments]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
-            <label for="inventory_use_config_qty_increments"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
+        <div class="field">
+            <label class="label" for="inventory_qty_increments">
+                <span><?= $block->escapeHtml(__('Qty Increments')) ?></span>
+            </label>
+            <div class="control">
+                <input type="text"
+                       class="input-text validate-digits"
+                       id="inventory_qty_increments"
+                       name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][qty_increments]"
+                       value="<?= /* @noEscape */ $block->getFieldValue('qty_increments') * 1 ?>" <?= /* @noEscape */ $_readonly ?>>
+                <div class="control-inner-wrap">
+                    <?php $_checked = ($block->getFieldValue('use_config_qty_increments') || $block->isNew()) ? 'checked="checked"' : '' ?>
+                    <input type="checkbox"
+                           id="inventory_use_config_qty_increments"
+                           name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_qty_increments]"
+                           value="1" <?= /* @noEscape */ $_checked ?>
+                           onclick="toggleValueElements(this, this.parentNode);" <?= /* @noEscape */ $_readonly ?>>
+                    <label for="inventory_use_config_qty_increments"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
+                </div>
+                <?php if (!$block->isReadonly()) :?>
+                    <script>
+                        require(['prototype'], function(){
+                            toggleValueElements($('inventory_use_config_qty_increments'), $('inventory_use_config_qty_increments').parentNode);
+                        });
+                    </script>
+                <?php endif; ?>
+            </div>
+            <?php if (!$block->isSingleStoreMode()) :?>
+                <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+            <?php endif; ?>
         </div>
-        <?php if (!$block->isReadonly()): ?>
-        <script>
-require(['prototype'], function(){
-toggleValueElements($('inventory_use_config_qty_increments'), $('inventory_use_config_qty_increments').parentNode);
-});
-</script>
-        <?php endif; ?>
-    </div>
-    <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
-    <?php endif; ?>
-</div>
 
-<div class="field">
-    <label class="label" for="inventory_stock_availability">
-        <span><?= /* @escapeNotVerified */ __('Stock Availability') ?></span>
-    </label>
-    <div class="control">
-        <select id="inventory_stock_availability" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][is_in_stock]" <?= /* @escapeNotVerified */ $_readonly ?>>
-            <?php foreach ($block->getStockOption() as $option): ?>
-            <?php $_selected = ($block->getFieldValue('is_in_stock') !== null && $option['value'] == $block->getFieldValue('is_in_stock')) ? 'selected="selected"' : '' ?>
-            <option value="<?= /* @escapeNotVerified */ $option['value'] ?>" <?= /* @escapeNotVerified */ $_selected ?>><?= /* @escapeNotVerified */ $option['label'] ?></option>
-            <?php endforeach; ?>
-        </select>
+        <div class="field">
+            <label class="label" for="inventory_stock_availability">
+                <span><?= $block->escapeHtml(__('Stock Availability')) ?></span>
+            </label>
+            <div class="control">
+                <select id="inventory_stock_availability"
+                        name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][is_in_stock]" <?= /* @noEscape */ $_readonly ?>>
+                    <?php foreach ($block->getStockOption() as $option) :?>
+                        <?php $_selected = ($block->getFieldValue('is_in_stock') !== null && $option['value'] == $block->getFieldValue('is_in_stock')) ? 'selected="selected"' : '' ?>
+                        <option value="<?= $block->escapeHtmlAttr($option['value']) ?>" <?= /* @noEscape */ $_selected ?>><?= $block->escapeHtml($option['label']) ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+            <?php if (!$block->isSingleStoreMode()) :?>
+                <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+            <?php endif; ?>
+        </div>
     </div>
-    <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
-    <?php endif; ?>
-</div>
-</div>
 </fieldset>
 
 <script>
-require(["jquery","prototype"], function(jQuery){
+    require(["jquery","prototype"], function(jQuery){
 
-    //<![CDATA[
-    function changeManageStockOption()
-    {
-        var manageStock = $('inventory_use_config_manage_stock').checked
+        //<![CDATA[
+        function changeManageStockOption()
+        {
+            var manageStock = $('inventory_use_config_manage_stock').checked
                 ? $('inventory_manage_stock_default').value
                 : $('inventory_manage_stock').value;
-        var catalogInventoryNotManageStockFields = {
-            inventory_min_sale_qty: true,
-            inventory_max_sale_qty: true,
-            inventory_enable_qty_increments : true,
-            inventory_qty_increments: true
-        };
-
-        $$('#table_cataloginventory > div').each(function(el) {
-            if (el == $('inventory_manage_stock').up(1)) {
-                return;
-            }
+            var catalogInventoryNotManageStockFields = {
+                inventory_min_sale_qty: true,
+                inventory_max_sale_qty: true,
+                inventory_enable_qty_increments : true,
+                inventory_qty_increments: true
+            };
 
-            for (field in catalogInventoryNotManageStockFields) {
-                if ($(field) && ($(field).up(1) == el)) {
+            $$('#table_cataloginventory > div').each(function(el) {
+                if (el == $('inventory_manage_stock').up(1)) {
                     return;
                 }
-            }
 
-            el[manageStock == 1 ? 'show' : 'hide']();
-        });
+                for (field in catalogInventoryNotManageStockFields) {
+                    if ($(field) && ($(field).up(1) == el)) {
+                        return;
+                    }
+                }
 
-        return true;
-    }
+                el[manageStock == 1 ? 'show' : 'hide']();
+            });
 
-    function applyEnableQtyIncrements() {
-        var enableQtyIncrements = $('inventory_use_config_enable_qty_increments').checked
-            ? $('inventory_enable_qty_increments_default').value
-            : $('inventory_enable_qty_increments').value;
+            return true;
+        }
 
-        $('inventory_qty_increments').up('.field')[enableQtyIncrements == 1 ? 'show' : 'hide']();
-    }
+        function applyEnableQtyIncrements() {
+            var enableQtyIncrements = $('inventory_use_config_enable_qty_increments').checked
+                ? $('inventory_enable_qty_increments_default').value
+                : $('inventory_enable_qty_increments').value;
 
-    function applyEnableDecimalDivided() {
-    <?php if (!$block->isVirtual()) : ?>
-        $('inventory_is_decimal_divided').up('.field').hide();
-        <?php endif; ?>
-        $('inventory_qty_increments').removeClassName('validate-digits').removeClassName('validate-number');
-        $('inventory_min_sale_qty').removeClassName('validate-digits').removeClassName('validate-number');
-        if ($('inventory_is_qty_decimal').value == 1) {
-        <?php if (!$block->isVirtual()) : ?>
-            $('inventory_is_decimal_divided').up('.field').show();
-            <?php endif; ?>
-            $('inventory_qty_increments').addClassName('validate-number');
-            $('inventory_min_sale_qty').addClassName('validate-number');
-        } else {
-            $('inventory_qty_increments').addClassName('validate-digits');
-            $('inventory_min_sale_qty').addClassName('validate-digits');
+            $('inventory_qty_increments').up('.field')[enableQtyIncrements == 1 ? 'show' : 'hide']();
         }
-    }
 
-    Event.observe(window, 'load', function() {
-        if ($('inventory_manage_stock') && $('inventory_use_config_manage_stock')) {
-            Event.observe($('inventory_manage_stock'), 'change', changeManageStockOption);
-            Event.observe($('inventory_use_config_manage_stock'), 'change', changeManageStockOption);
-            changeManageStockOption();
+        function applyEnableDecimalDivided() {
+            <?php if (!$block->isVirtual()) :?>
+            $('inventory_is_decimal_divided').up('.field').hide();
+            <?php endif; ?>
+            $('inventory_qty_increments').removeClassName('validate-digits').removeClassName('validate-number');
+            $('inventory_min_sale_qty').removeClassName('validate-digits').removeClassName('validate-number');
+            if ($('inventory_is_qty_decimal').value == 1) {
+                <?php if (!$block->isVirtual()) :?>
+                $('inventory_is_decimal_divided').up('.field').show();
+                <?php endif; ?>
+                $('inventory_qty_increments').addClassName('validate-number');
+                $('inventory_min_sale_qty').addClassName('validate-number');
+            } else {
+                $('inventory_qty_increments').addClassName('validate-digits');
+                $('inventory_min_sale_qty').addClassName('validate-digits');
+            }
         }
-        if ($('inventory_enable_qty_increments') && $('inventory_use_config_enable_qty_increments')) {
-            //Delegation is used because of events, which are not firing while the input is disabled
-            jQuery('#inventory_enable_qty_increments').parent()
+
+        Event.observe(window, 'load', function() {
+            if ($('inventory_manage_stock') && $('inventory_use_config_manage_stock')) {
+                Event.observe($('inventory_manage_stock'), 'change', changeManageStockOption);
+                Event.observe($('inventory_use_config_manage_stock'), 'change', changeManageStockOption);
+                changeManageStockOption();
+            }
+            if ($('inventory_enable_qty_increments') && $('inventory_use_config_enable_qty_increments')) {
+                //Delegation is used because of events, which are not firing while the input is disabled
+                jQuery('#inventory_enable_qty_increments').parent()
                 .on('change', '#inventory_enable_qty_increments', applyEnableQtyIncrements);
-            Event.observe($('inventory_use_config_enable_qty_increments'), 'change', applyEnableQtyIncrements);
-            applyEnableQtyIncrements();
-        }
-        if ($('inventory_is_qty_decimal') && $('inventory_qty_increments') && $('inventory_min_sale_qty')) {
-            Event.observe($('inventory_is_qty_decimal'), 'change', applyEnableDecimalDivided);
-            applyEnableDecimalDivided();
-        }
-    });
+                Event.observe($('inventory_use_config_enable_qty_increments'), 'change', applyEnableQtyIncrements);
+                applyEnableQtyIncrements();
+            }
+            if ($('inventory_is_qty_decimal') && $('inventory_qty_increments') && $('inventory_min_sale_qty')) {
+                Event.observe($('inventory_is_qty_decimal'), 'change', applyEnableDecimalDivided);
+                applyEnableDecimalDivided();
+            }
+        });
 
-    window.applyEnableDecimalDivided = applyEnableDecimalDivided;
-    window.applyEnableQtyIncrements = applyEnableQtyIncrements;
-    window.changeManageStockOption = changeManageStockOption;
-    //]]>
+        window.applyEnableDecimalDivided = applyEnableDecimalDivided;
+        window.applyEnableQtyIncrements = applyEnableQtyIncrements;
+        window.changeManageStockOption = changeManageStockOption;
+        //]]>
 
-});
+    });
 </script>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/wysiwyg/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/wysiwyg/js.phtml
index ed380722d8b43..d4a7687a0934b 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/wysiwyg/js.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/wysiwyg/js.phtml
@@ -3,8 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
 ?>
 <script>
 require([
@@ -28,7 +26,7 @@ var catalogWysiwygEditor = {
                 url: editorUrl,
                 data: {
                     element_id: elementId + '_editor',
-                    store_id: '<?= /* @escapeNotVerified */ $block->getStoreId() ?>'
+                    store_id: '<?= $block->escapeJs($block->getStoreId()) ?>'
                 },
                 showLoader: true,
                 dataType: 'html',
@@ -46,7 +44,7 @@ var catalogWysiwygEditor = {
             this.modal.modal('option', 'firedElementId', elementId);
         } else {
             this.modal = jQuery(data).modal({
-                title: '<?= /* @escapeNotVerified */ __('WYSIWYG Editor') ?>',
+                title: '<?= $block->escapeJs($block->escapeHtml(__('WYSIWYG Editor'))) ?>',
                 modalClass: 'magento',
                 type: 'slide',
                 firedElementId: elementId,
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
index 04ccfb5aee8d0..17fb517b32547 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
@@ -4,24 +4,24 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
 /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes\Search */
 ?>
 <div id="product-attribute-search-container" class="suggest-expandable attribute-selector">
     <div class="action-dropdown">
         <button type="button" class="action-toggle action-choose" data-mage-init='{"dropdown":{}}' data-toggle="dropdown">
-            <span><?= /* @escapeNotVerified */ __('Add Attribute') ?></span>
+            <span><?= $block->escapeHtml(__('Add Attribute')) ?></span>
         </button>
         <div class="dropdown-menu">
             <input data-role="product-attribute-search"
-                   data-group="<?= $block->escapeHtml($block->getGroupCode()) ?>"
+                   data-group="<?= $block->escapeHtmlAttr($block->getGroupCode()) ?>"
                    class="search" type="text"
-                   placeholder="<?= /* @noEscape */ __('start typing to search attribute') ?>" />
+                   placeholder="<?= $block->escapeHtmlAttr(__('start typing to search attribute')) ?>" />
         </div>
     </div>
 
-<script data-template-for="product-attribute-search-<?= /* @escapeNotVerified */ $block->getGroupId() ?>" type="text/x-magento-template">
+<script data-template-for="product-attribute-search-<?= $block->escapeHtmlAttr($block->getGroupId()) ?>" type="text/x-magento-template">
     <ul data-mage-init='{"menu":[]}'>
         <% if (data.items.length) { %>
         <% _.each(data.items, function(value){ %>
@@ -29,7 +29,7 @@
         <% }); %>
         <% } else { %><span class="mage-suggest-no-records"><%- data.noRecordsText %></span><% } %>
     </ul>
-    <div class="actions"><?= /* @escapeNotVerified */ $block->getAttributeCreate() ?></div>
+    <div class="actions"><?= $block->escapeHtml($block->getAttributeCreate()) ?></div>
 </script>
 
 <script>
@@ -51,13 +51,13 @@
             });
         });
 
-        $suggest.mage('suggest', <?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getSelectorOptions()) ?>)
+        $suggest.mage('suggest', <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getSelectorOptions()) ?>)
             .on('suggestselect', function (e, ui) {
                 $(this).val('');
                 var templateId = $('#attribute_set_id').val();
                 if (ui.item.id) {
                     $.ajax({
-                        url: '<?= /* @escapeNotVerified */ $block->getAddAttributeUrl() ?>',
+                        url: '<?= $block->escapeJs($block->escapeUrl($block->getAddAttributeUrl())) ?>',
                         type: 'POST',
                         dataType: 'json',
                         data: {attribute_id: ui.item.id, template_id: templateId, group: $(this).data('group')},
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs.phtml
index 6a62f01f97b65..6534f7a18cc3b 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs.phtml
@@ -4,40 +4,38 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs */
 ?>
-<?php if (!empty($tabs)): ?>
+<?php if (!empty($tabs)) :?>
     <?php $tabGroups = [
         \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs::BASIC_TAB_GROUP_CODE,
         \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs::ADVANCED_TAB_GROUP_CODE,
     ];?>
 
-    <div id="<?= /* @escapeNotVerified */ $block->getId() ?>"
+    <div id="<?= $block->escapeHtmlAttr($block->getId()) ?>"
          data-mage-init='{"tabs":{
-        "active": "<?= /* @escapeNotVerified */ $block->getActiveTabId() ?>",
-        "destination": "#<?= /* @escapeNotVerified */ $block->getDestElementId() ?>",
-        "shadowTabs": "<?= /* @escapeNotVerified */ $block->getAllShadowTabs() ?>",
-        "tabsBlockPrefix": "<?= /* @escapeNotVerified */ $block->getId() ?>_",
+        "active": "<?= $block->escapeHtmlAttr($block->getActiveTabId()) ?>",
+        "destination": "#<?= $block->escapeHtmlAttr($block->getDestElementId()) ?>",
+        "shadowTabs": "<?= /* @noEscape */ $block->getAllShadowTabs() ?>",
+        "tabsBlockPrefix": "<?= $block->escapeHtmlAttr($block->getId()) ?>_",
         "tabIdArgument": "active_tab",
-        "tabPanelClass": "<?= /* @escapeNotVerified */ $block->getPanelsClass() ?>",
-        "excludedPanel": "<?= /* @escapeNotVerified */ $block->getExcludedPanel() ?>",
+        "tabPanelClass": "<?= $block->escapeHtmlAttr($block->getPanelsClass()) ?>",
+        "excludedPanel": "<?= $block->escapeHtmlAttr($block->getExcludedPanel()) ?>",
         "groups": "ul.tabs"
     }}'>
-        <?php foreach ($tabGroups as $tabGroupCode): ?>
+        <?php foreach ($tabGroups as $tabGroupCode) :?>
             <?php
                 $tabGroupId = $block->getId() . '-' . $tabGroupCode;
                 $isBasic = $tabGroupCode == \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs::BASIC_TAB_GROUP_CODE;
                 $activeCollapsible = $block->isAdvancedTabGroupActive() ? true : false;
             ?>
 
-            <div class="admin__page-nav <?php if (!$isBasic): ?> <?= '_collapsed' ?> <?php endif;?>"
+            <div class="admin__page-nav <?php if (!$isBasic) :?> <?= '_collapsed' ?> <?php endif;?>"
                 data-role="container"
-                id="<?= /* @escapeNotVerified */ $tabGroupId ?>"
-                <?php if (!$isBasic): ?>
+                id="<?= $block->escapeHtmlAttr($tabGroupId) ?>"
+                <?php if (!$isBasic) :?>
                     data-mage-init='{"collapsible":{
-                    "active": "<?= /* @escapeNotVerified */ $activeCollapsible ?>",
+                    "active": "<?= /* @noEscape */ $activeCollapsible ?>",
                     "openedState": "_show",
                     "closedState": "_hide",
                     "animate": 200,
@@ -45,44 +43,45 @@
                     }}'
                 <?php endif;?>>
 
-                <div class="admin__page-nav-title-wrap" <?= /* @escapeNotVerified */ $block->getUiId('title') ?> data-role="title">
-                    <div class="admin__page-nav-title <?php if (!$isBasic): ?> <?= '_collapsible' ?><?php endif;?>"
+                <div class="admin__page-nav-title-wrap" <?= /* @noEscape */ $block->getUiId('title') ?> data-role="title">
+                    <div class="admin__page-nav-title <?php if (!$isBasic) :?> <?= '_collapsible' ?><?php endif;?>"
                         data-role="trigger">
                         <strong>
-                            <?= /* @escapeNotVerified */ $isBasic ? __('Basic Settings') : __('Advanced Settings') ?>
+                            <?= $block->escapeHtml($isBasic ? __('Basic Settings') : __('Advanced Settings')) ?>
                         </strong>
                         <span data-role="title-messages" class="admin__page-nav-title-messages"></span>
                     </div>
                 </div>
 
-                <ul <?= /* @escapeNotVerified */ $block->getUiId('tab', $tabGroupId) ?> class="tabs admin__page-nav-items" data-role="content">
-                    <?php foreach ($tabs as $_tab): ?>
+                <ul <?= /* @noEscape */ $block->getUiId('tab', $tabGroupId) ?> class="tabs admin__page-nav-items" data-role="content">
+                    <?php foreach ($tabs as $_tab) :?>
                         <?php /** @var $_tab \Magento\Backend\Block\Widget\Tab\TabInterface */ ?>
                         <?php if (!$block->canShowTab($_tab) || $_tab->getParentTab()
                             || ($_tab->getGroupCode() && $_tab->getGroupCode() != $tabGroupCode)
-                            || (!$_tab->getGroupCode() && $isBasic)): continue; endif;?>
+                            || (!$_tab->getGroupCode() && $isBasic)) : continue;
+                        endif;?>
                         <?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' . (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
                         <?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
                         <?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
-                        <li class="admin__page-nav-item <?php if ($block->getTabIsHidden($_tab)): ?> <?= "no-display" ?> <?php endif; ?> " <?= /* @escapeNotVerified */ $block->getUiId('tab', 'item', $_tab->getId()) ?>>
-                            <a href="<?= /* @escapeNotVerified */ $_tabHref ?>" id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>"
-                               name="<?= /* @escapeNotVerified */ $block->getTabId($_tab, false) ?>"
-                               title="<?= /* @escapeNotVerified */ $block->getTabTitle($_tab) ?>"
-                               class="admin__page-nav-link <?= /* @escapeNotVerified */ $_tabClass ?>"
-                               data-tab-type="<?= /* @escapeNotVerified */ $_tabType ?>" <?= /* @escapeNotVerified */ $block->getUiId('tab', 'link', $_tab->getId()) ?>
+                        <li class="admin__page-nav-item <?php if ($block->getTabIsHidden($_tab)) :?> <?= "no-display" ?> <?php endif; ?> " <?= /* @noEscape */ $block->getUiId('tab', 'item', $_tab->getId()) ?>>
+                            <a href="<?= $block->escapeUrl($_tabHref) ?>" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
+                               name="<?= $block->escapeHtmlAttr($block->getTabId($_tab, false)) ?>"
+                               title="<?= $block->escapeHtmlAttr($block->getTabTitle($_tab)) ?>"
+                               class="admin__page-nav-link <?= $block->escapeHtmlAttr($_tabClass) ?>"
+                               data-tab-type="<?= /* @noEscape */ $_tabType ?>" <?= /* @noEscape */ $block->getUiId('tab', 'link', $_tab->getId()) ?>
                             >
                                 <span><?= $block->escapeHtml($block->getTabLabel($_tab)) ?></span>
                                 <span class="admin__page-nav-item-messages" data-role="item-messages">
                                    <span class="admin__page-nav-item-message _changed">
                                        <span class="admin__page-nav-item-message-icon"></span>
                                        <span class="admin__page-nav-item-message-tooltip">
-                                           <?= /* @escapeNotVerified */ __('Changes have been made to this section that have not been saved.') ?>
+                                            <?= $block->escapeHtml(__('Changes have been made to this section that have not been saved.')) ?>
                                        </span>
                                    </span>
                                    <span class="admin__page-nav-item-message _error">
                                        <span class="admin__page-nav-item-message-icon"></span>
                                        <span class="admin__page-nav-item-message-tooltip">
-                                           <?= /* @escapeNotVerified */ __('This tab contains invalid data. Please resolve this before saving.') ?>
+                                            <?= $block->escapeHtml(__('This tab contains invalid data. Please resolve this before saving.')) ?>
                                        </span>
                                    </span>
                                     <span class="admin__page-nav-item-message-loader">
@@ -93,11 +92,11 @@
                                    </span>
                                 </span>
                             </a>
-                            <div id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>_content" class="no-display"
-                                 data-tab-panel="<?= /* @escapeNotVerified */ $_tab->getTabId() ?>"
-                                <?= /* @escapeNotVerified */ $block->getUiId('tab', 'content', $_tab->getId()) ?>
+                            <div id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>_content" class="no-display"
+                                 data-tab-panel="<?= $block->escapeHtmlAttr($_tab->getTabId()) ?>"
+                                <?= /* @noEscape */ $block->getUiId('tab', 'content', $_tab->getId()) ?>
                             >
-                                <?= /* @escapeNotVerified */ $block->getTabContent($_tab) ?>
+                                <?= /* @noEscape */ $block->getTabContent($_tab) ?>
                                 <?= /* @noEscape */ $block->getAccordion($_tab) ?>
                             </div>
                         </li>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs/child_tab.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs/child_tab.phtml
index 842ed17375f77..4d88042e18cc1 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs/child_tab.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs/child_tab.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\ChildTab */
 ?>
 <div class="fieldset-wrapper admin__collapsible-block-wrapper" data-tab="<?= /* @noEscape */ $block->getTabId() ?>"
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml
index 8df3e32b0a2c3..c814298d1dbc5 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml
@@ -4,11 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Grid */
 ?>
 <div id="<?= $block->getHtmlId() ?>" class="admin__grid-massaction">
-    <?php if ($block->getHideFormElement() !== true):?>
+    <?php if ($block->getHideFormElement() !== true) :?>
     <form action="" id="<?= $block->getHtmlId() ?>-form" method="post">
     <?php endif ?>
         <div class="admin__grid-massaction-form">
@@ -16,43 +15,43 @@
             <select
                 id="<?= $block->getHtmlId() ?>-select"
                 class="local-validation admin__control-select">
-                <option class="admin__control-select-placeholder" value="" selected><?= /* @escapeNotVerified */ __('Actions') ?></option>
-                <?php foreach ($block->getItems() as $_item): ?>
-                    <option value="<?= /* @escapeNotVerified */ $_item->getId() ?>"<?= ($_item->getSelected() ? ' selected="selected"' : '') ?>><?= /* @escapeNotVerified */ $_item->getLabel() ?></option>
+                <option class="admin__control-select-placeholder" value="" selected><?= $block->escapeHtml(__('Actions')) ?></option>
+                <?php foreach ($block->getItems() as $_item) :?>
+                    <option value="<?= $block->escapeHtmlAttr($_item->getId()) ?>"<?= ($_item->getSelected() ? ' selected="selected"' : '') ?>><?= $block->escapeHtml($_item->getLabel()) ?></option>
                 <?php endforeach; ?>
             </select>
             <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-hiddens"></span>
             <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-additional"></span>
             <?= $block->getApplyButtonHtml() ?>
         </div>
-    <?php if ($block->getHideFormElement() !== true):?>
+    <?php if ($block->getHideFormElement() !== true) :?>
     </form>
     <?php endif ?>
     <div class="no-display">
-    <?php foreach ($block->getItems() as $_item): ?>
-        <div id="<?= $block->getHtmlId() ?>-item-<?= /* @escapeNotVerified */ $_item->getId() ?>-block">
+    <?php foreach ($block->getItems() as $_item) :?>
+        <div id="<?= $block->getHtmlId() ?>-item-<?= $block->escapeHtmlAttr($_item->getId()) ?>-block">
             <?= $_item->getAdditionalActionBlockHtml() ?>
         </div>
     <?php endforeach; ?>
     </div>
 
     <div class="mass-select-wrap">
-        <select id="<?= $block->getHtmlId() ?>-mass-select" data-menu="grid-mass-select">
-            <optgroup label="<?= /* @escapeNotVerified */ __('Mass Actions') ?>">
+        <select id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>-mass-select" data-menu="grid-mass-select">
+            <optgroup label="<?= $block->escapeHtmlAttr(__('Mass Actions')) ?>">
                 <option disabled selected></option>
-                <?php if ($block->getUseSelectAll()):?>
+                <?php if ($block->getUseSelectAll()) :?>
                     <option value="selectAll">
-                        <?= /* @escapeNotVerified */ __('Select All') ?>
+                        <?= $block->escapeHtml(__('Select All')) ?>
                     </option>
                     <option value="unselectAll">
-                        <?= /* @escapeNotVerified */ __('Unselect All') ?>
+                        <?= $block->escapeHtml(__('Unselect All')) ?>
                     </option>
                 <?php endif; ?>
                 <option value="selectVisible">
-                    <?= /* @escapeNotVerified */ __('Select Visible') ?>
+                    <?= $block->escapeHtml(__('Select Visible')) ?>
                 </option>
                 <option value="unselectVisible">
-                    <?= /* @escapeNotVerified */ __('Unselect Visible') ?>
+                    <?= $block->escapeHtml(__('Unselect Visible')) ?>
                 </option>
             </optgroup>
         </select>
@@ -65,19 +64,19 @@
         $('#<?= $block->getHtmlId() ?>-mass-select').change(function () {
             var massAction = $('option:selected', this).val();
             switch (massAction) {
-                <?php if ($block->getUseSelectAll()):?>
+                <?php if ($block->getUseSelectAll()) :?>
                 case 'selectAll':
-                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.selectAll();
+                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.selectAll();
                     break
                 case 'unselectAll':
-                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.unselectAll();
+                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.unselectAll();
                     break
                 <?php endif; ?>
                 case 'selectVisible':
-                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.selectVisible();
+                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.selectVisible();
                     break
                 case 'unselectVisible':
-                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.unselectVisible();
+                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.unselectVisible();
                     break
             }
             this.blur();
@@ -85,8 +84,8 @@
 
     });
 
-    <?php if (!$block->getParentBlock()->canDisplayContainer()): ?>
-        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.setGridIds('<?= /* @escapeNotVerified */ $block->getGridIdsJson() ?>');
+    <?php if (!$block->getParentBlock()->canDisplayContainer()) :?>
+        <?= $block->escapeJs($block->getJsObjectName())  ?>.setGridIds('<?= /* @noEscape */ $block->getGridIdsJson() ?>');
     <?php endif; ?>
 </script>
 </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/rss/grid/link.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/rss/grid/link.phtml
index fb450d19312fa..668dc4a28a6d9 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/rss/grid/link.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/rss/grid/link.phtml
@@ -4,10 +4,8 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Catalog\Block\Adminhtml\Rss\Grid\Link */
 ?>
-<?php if ($block->isRssAllowed() && $block->getLink()): ?>
-<a href="<?= /* @escapeNotVerified */ $block->getLink() ?>" class="link-feed"><?= /* @escapeNotVerified */ $block->getLabel() ?></a>
+<?php if ($block->isRssAllowed() && $block->getLink()) :?>
+<a href="<?= $block->escapeUrl($block->getLink()) ?>" class="link-feed"><?= $block->escapeHtml($block->getLabel()) ?></a>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
index 65090fa3ac461..578281f44c4cf 100644
--- a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
@@ -190,6 +190,13 @@
                 <label translate="true">Websites</label>
             </settings>
         </column>
+        <column name="cost" class="Magento\Catalog\Ui\Component\Listing\Columns\Price" sortOrder="120">
+            <settings>
+                <addField>true</addField>
+                <filter>textRange</filter>
+                <label translate="true">Cost</label>
+            </settings>
+        </column>
         <actionsColumn name="actions" class="Magento\Catalog\Ui\Component\Listing\Columns\ProductActions" sortOrder="200">
             <settings>
                 <indexField>entity_id</indexField>
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js
index 75ee3019cf4b6..41f7a874c26f3 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js
@@ -82,7 +82,7 @@ define([
     return function (config, element) {
         config = config || {};
         jQuery(element).on('click', function () {
-            categorySubmit(config.url, config.ajax);
+            categorySubmit();
         });
     };
 });
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
index 6903a17bcdcca..a2804a8723ce0 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
@@ -469,26 +469,6 @@ define([
             }
         },
 
-        /**
-         * toggles Selects states (for IE) except those to be shown in popup
-         */
-        /*_toggleSelectsExceptBlock: function(flag) {
-         if(Prototype.Browser.IE){
-         if (this.blockForm) {
-         var states = new Array;
-         var selects = this.blockForm.getElementsByTagName("select");
-         for(var i=0; i<selects.length; i++){
-         states[i] = selects[i].style.visibility
-         }
-         }
-         if (this.blockForm) {
-         for(i=0; i<selects.length; i++){
-         selects[i].style.visibility = states[i]
-         }
-         }
-         }
-         },*/
-
         /**
          * Close configuration window
          */
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/edit/attribute.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/edit/attribute.js
index 407fd1fe28e39..e1923dc46d68e 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/edit/attribute.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/edit/attribute.js
@@ -5,13 +5,13 @@
 
 define([
     'jquery',
-    'mage/mage'
+    'mage/mage',
+    'validation'
 ], function ($) {
     'use strict';
 
     return function (config, element) {
-
-        $(element).mage('form').mage('validation', {
+        $(element).mage('form').validation({
             validationUrl: config.validationUrl
         });
     };
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js
index 561e23b974462..157879041cd66 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/category-tree.js
@@ -37,8 +37,8 @@ define([
                             ajax: {
                                 url: options.url,
                                 type: 'POST',
-                                success: $.proxy(function (node) {
-                                    return this._convertData(node[0]);
+                                success: $.proxy(function (nodes) {
+                                    return this._convertDataNodes(nodes);
                                 }, this),
 
                                 /**
@@ -77,6 +77,21 @@ define([
             }
         },
 
+        /**
+         * @param {Array} nodes
+         * @returns {Array}
+         * @private
+         */
+        _convertDataNodes: function (nodes) {
+            var nodesData = [];
+
+            nodes.forEach(function (node) {
+                nodesData.push(this._convertData(node));
+            }, this);
+
+            return nodesData;
+        },
+
         /**
          * @param {Object} node
          * @return {*}
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/options.js b/app/code/Magento/Catalog/view/adminhtml/web/js/options.js
index 6ea005915763c..7adc0dcfdf408 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/js/options.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/options.js
@@ -20,7 +20,6 @@ define([
 
     return function (config) {
         var optionPanel = jQuery('#manage-options-panel'),
-            optionsValues = [],
             editForm = jQuery('#edit_form'),
             attributeOption = {
                 table: $('attribute-options-table'),
@@ -145,7 +144,9 @@ define([
 
                     return optionDefaultInputType;
                 }
-            };
+            },
+            tableBody = jQuery(),
+            activePanelClass = 'selected-type-options';
 
         if ($('add_new_option_button')) {
             Event.observe('add_new_option_button', 'click', attributeOption.add.bind(attributeOption, {}, true));
@@ -180,30 +181,32 @@ define([
                 });
             });
         }
-        editForm.on('submit', function () {
-            optionPanel.find('input')
-                .each(function () {
-                    if (this.disabled) {
-                        return;
+        editForm.on('beforeSubmit', function () {
+            var optionContainer = optionPanel.find('table tbody'),
+                optionsValues;
+
+            if (optionPanel.hasClass(activePanelClass)) {
+                optionsValues = jQuery.map(
+                    optionContainer.find('tr'),
+                    function (row) {
+                        return jQuery(row).find('input, select, textarea').serialize();
                     }
-
-                    if (this.type === 'checkbox' || this.type === 'radio') {
-                        if (this.checked) {
-                            optionsValues.push(this.name + '=' + jQuery(this).val());
-                        }
-                    } else {
-                        optionsValues.push(this.name + '=' + jQuery(this).val());
-                    }
-                });
-            jQuery('<input>')
-                .attr({
-                    type: 'hidden',
-                    name: 'serialized_options'
-                })
-                .val(JSON.stringify(optionsValues))
-                .prependTo(editForm);
-            optionPanel.find('table')
-                .replaceWith(jQuery('<div>').text(jQuery.mage.__('Sending attribute values as package.')));
+                );
+                jQuery('<input>')
+                    .attr({
+                        type: 'hidden',
+                        name: 'serialized_options'
+                    })
+                    .val(JSON.stringify(optionsValues))
+                    .prependTo(editForm);
+            }
+            tableBody = optionContainer.detach();
+        });
+        editForm.on('afterValidate.error highlight.validate', function () {
+            if (optionPanel.hasClass(activePanelClass)) {
+                optionPanel.find('table').append(tableBody);
+                jQuery('input[name="serialized_options"]').remove();
+            }
         });
         window.attributeOption = attributeOption;
         window.optionDefaultInputType = attributeOption.getOptionInputType();
diff --git a/app/code/Magento/Catalog/view/base/templates/js/components.phtml b/app/code/Magento/Catalog/view/base/templates/js/components.phtml
index bad5acc209b5f..13f44b97fc789 100644
--- a/app/code/Magento/Catalog/view/base/templates/js/components.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/js/components.phtml
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?= $block->getChildHtml() ?>
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
new file mode 100644
index 0000000000000..55c8a8fcb4edd
--- /dev/null
+++ b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Model\Product\Option;
+
+/**
+ * @var $block \Magento\Catalog\Block\Product\View\Options\Type\Select\Checkable
+ */
+$option = $block->getOption();
+if ($option) : ?>
+    <?php
+    $configValue = $block->getPreconfiguredValue($option);
+    $optionType = $option->getType();
+    $arraySign = $optionType === Option::OPTION_TYPE_CHECKBOX ? '[]' : '';
+    $count = 1;
+    ?>
+
+<div class="options-list nested" id="options-<?= $block->escapeHtmlAttr($option->getId()) ?>-list">
+    <?php if ($optionType === Option::OPTION_TYPE_RADIO && !$option->getIsRequire()) :?>
+        <div class="field choice admin__field admin__field-option">
+            <input type="radio"
+                   id="options_<?= $block->escapeHtmlAttr($option->getId()) ?>"
+                   class="radio admin__control-radio product-custom-option"
+                   name="options[<?= $block->escapeHtmlAttr($option->getId()) ?>]"
+                   data-selector="options[<?= $block->escapeHtmlAttr($option->getId()) ?>]"
+                   onclick="<?= $block->getSkipJsReloadPrice() ? '' : 'opConfig.reloadPrice()' ?>"
+                   value=""
+                   checked="checked"
+            />
+            <label class="label admin__field-label" for="options_<?= $block->escapeHtmlAttr($option->getId()) ?>">
+                            <span>
+                                <?= $block->escapeHtml(__('None'))  ?>
+                            </span>
+            </label>
+        </div>
+    <?php endif; ?>
+
+    <?php foreach ($option->getValues() as $value) : ?>
+        <?php
+        $checked = '';
+        $count++;
+        if ($arraySign) {
+            $checked = is_array($configValue) && in_array($value->getOptionTypeId(), $configValue) ? 'checked' : '';
+        } else {
+            $checked = $configValue == $value->getOptionTypeId() ? 'checked' : '';
+        }
+        $dataSelector = 'options[' . $option->getId() . ']';
+        if ($arraySign) {
+            $dataSelector .= '[' . $value->getOptionTypeId() . ']';
+        }
+        ?>
+
+        <div class="field choice admin__field admin__field-option <?= /* @noEscape */ $option->getIsRequire() ? 'required': '' ?>">
+            <input type="<?= $block->escapeHtmlAttr($optionType) ?>"
+                   class="<?= /* @noEscape */ $optionType === Option::OPTION_TYPE_RADIO
+                       ? 'radio admin__control-radio'
+                       : 'checkbox admin__control-checkbox' ?> <?= $option->getIsRequire()
+                       ? 'required': '' ?>
+                       product-custom-option
+                        <?= $block->getSkipJsReloadPrice() ? '' : 'opConfig.reloadPrice()' ?>"
+                   name="options[<?= $block->escapeHtmlAttr($option->getId()) ?>]<?= /* @noEscape */ $arraySign ?>"
+                   id="options_<?= $block->escapeHtmlAttr($option->getId() . '_' . $count) ?>"
+                   value="<?= $block->escapeHtmlAttr($value->getOptionTypeId()) ?>"
+                <?= $block->escapeHtml($checked) ?>
+                   data-selector="<?= $block->escapeHtmlAttr($dataSelector) ?>"
+                   price="<?= $block->escapeHtmlAttr($block->getCurrencyByStore($value)) ?>"
+            />
+            <label class="label admin__field-label"
+                   for="options_<?= $block->escapeHtmlAttr($option->getId() . '_' . $count) ?>">
+                <span>
+                    <?= $block->escapeHtml($value->getTitle()) ?>
+                </span>
+                <?= /* @noEscape */ $block->formatPrice($value) ?>
+            </label>
+        </div>
+    <?php endforeach; ?>
+    </div>
+<?php endif; ?>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml
index ce1561e382eed..b2c2acb7419bd 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml
@@ -3,29 +3,26 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
-<?php /** @var \Magento\Framework\Pricing\Render\Amount $block */ ?>
+<?php /** @var $block \Magento\Framework\Pricing\Render\Amount */ ?>
 
-<span class="price-container <?= /* @escapeNotVerified */ $block->getAdjustmentCssClasses() ?>"
+<span class="price-container <?= $block->escapeHtmlAttr($block->getAdjustmentCssClasses()) ?>"
         <?= $block->getSchema() ? ' itemprop="offers" itemscope itemtype="http://schema.org/Offer"' : '' ?>>
-    <?php if ($block->getDisplayLabel()): ?>
-        <span class="price-label"><?= /* @escapeNotVerified */ $block->getDisplayLabel() ?></span>
+    <?php if ($block->getDisplayLabel()) :?>
+        <span class="price-label"><?= $block->escapeHtml($block->getDisplayLabel()) ?></span>
     <?php endif; ?>
-    <span <?php if ($block->getPriceId()): ?> id="<?= /* @escapeNotVerified */ $block->getPriceId() ?>"<?php endif;?>
-        <?= ($block->getPriceDisplayLabel()) ? 'data-label="' . $block->getPriceDisplayLabel() . $block->getPriceDisplayInclExclTaxes() . '"' : '' ?>
-        data-price-amount="<?= /* @escapeNotVerified */ $block->getDisplayValue() ?>"
-        data-price-type="<?= /* @escapeNotVerified */ $block->getPriceType() ?>"
-        class="price-wrapper <?= /* @escapeNotVerified */ $block->getPriceWrapperCss() ?>"
-    ><?= /* @escapeNotVerified */ $block->formatCurrency($block->getDisplayValue(), (bool)$block->getIncludeContainer()) ?></span>
-    <?php if ($block->hasAdjustmentsHtml()): ?>
+    <span <?php if ($block->getPriceId()) :?> id="<?= $block->escapeHtmlAttr($block->getPriceId()) ?>"<?php endif;?>
+        <?= ($block->getPriceDisplayLabel()) ? 'data-label="' . $block->escapeHtmlAttr($block->getPriceDisplayLabel() . $block->getPriceDisplayInclExclTaxes()) . '"' : '' ?>
+        data-price-amount="<?= $block->escapeHtmlAttr($block->getDisplayValue()) ?>"
+        data-price-type="<?= $block->escapeHtmlAttr($block->getPriceType()) ?>"
+        class="price-wrapper <?= $block->escapeHtmlAttr($block->getPriceWrapperCss()) ?>"
+    ><?= $block->escapeHtml($block->formatCurrency($block->getDisplayValue(), (bool)$block->getIncludeContainer()), ['span']) ?></span>
+    <?php if ($block->hasAdjustmentsHtml()) :?>
         <?= $block->getAdjustmentsHtml() ?>
     <?php endif; ?>
-    <?php if ($block->getSchema()): ?>
-        <meta itemprop="price" content="<?= /* @escapeNotVerified */ $block->getDisplayValue() ?>" />
-        <meta itemprop="priceCurrency" content="<?= /* @escapeNotVerified */ $block->getDisplayCurrencyCode() ?>" />
+    <?php if ($block->getSchema()) :?>
+        <meta itemprop="price" content="<?= $block->escapeHtmlAttr($block->getDisplayValue()) ?>" />
+        <meta itemprop="priceCurrency" content="<?= $block->escapeHtmlAttr($block->getDisplayCurrencyCode()) ?>" />
     <?php endif; ?>
 </span>
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml
index b414f02a3d6fb..84a1153bea67a 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml
@@ -3,19 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php
+// phpcs:disable PSR2.Files.ClosingTag
+
 /** @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block */
 
 /** ex: \Magento\Catalog\Pricing\Price\RegularPrice */
 /** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */
 $priceModel = $block->getPriceType('regular_price');
 
-/* @escapeNotVerified */ echo $block->renderAmount($priceModel->getAmount(), [
+/* @noEscape */ echo $block->renderAmount($priceModel->getAmount(), [
     'price_id'          => $block->getPriceId('product-price-'),
     'include_container' => true
 ]);
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml
index 6e281bdef7afb..e56804a06de22 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php
@@ -21,9 +18,9 @@ $finalPriceModel = $block->getPriceType('final_price');
 $idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : '';
 $schema = ($block->getZone() == 'item_view') ? true : false;
 ?>
-<?php if ($block->hasSpecialPrice()): ?>
+<?php if ($block->hasSpecialPrice()) :?>
     <span class="special-price">
-        <?php /* @escapeNotVerified */ echo $block->renderAmount($finalPriceModel->getAmount(), [
+        <?= /* @noEscape */ $block->renderAmount($finalPriceModel->getAmount(), [
             'display_label'     => __('Special Price'),
             'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
             'price_type'        => 'finalPrice',
@@ -32,7 +29,7 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
         ]); ?>
     </span>
     <span class="old-price">
-        <?php /* @escapeNotVerified */ echo $block->renderAmount($priceModel->getAmount(), [
+        <?= /* @noEscape */ $block->renderAmount($priceModel->getAmount(), [
             'display_label'     => __('Regular Price'),
             'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
             'price_type'        => 'oldPrice',
@@ -40,8 +37,8 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
             'skip_adjustments'  => true
         ]); ?>
     </span>
-<?php else: ?>
-    <?php /* @escapeNotVerified */ echo $block->renderAmount($finalPriceModel->getAmount(), [
+<?php else :?>
+    <?= /* @noEscape */ $block->renderAmount($finalPriceModel->getAmount(), [
         'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
         'price_type'        => 'finalPrice',
         'include_container' => true,
@@ -49,14 +46,14 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
     ]); ?>
 <?php endif; ?>
 
-<?php if ($block->showMinimalPrice()): ?>
-    <?php if ($block->getUseLinkForAsLowAs()):?>
-        <a href="<?= /* @escapeNotVerified */ $block->getSaleableItem()->getProductUrl() ?>" class="minimal-price-link">
-            <?= /* @escapeNotVerified */ $block->renderAmountMinimal() ?>
+<?php if ($block->showMinimalPrice()) :?>
+    <?php if ($block->getUseLinkForAsLowAs()) :?>
+        <a href="<?= $block->escapeUrl($block->getSaleableItem()->getProductUrl()) ?>" class="minimal-price-link">
+            <?= /* @noEscape */ $block->renderAmountMinimal() ?>
         </a>
-    <?php else:?>
+    <?php else :?>
         <span class="minimal-price-link">
-            <?= /* @escapeNotVerified */ $block->renderAmountMinimal() ?>
+            <?= /* @noEscape */ $block->renderAmountMinimal() ?>
         </span>
     <?php endif?>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml
index f5cffb99d75dd..5949b54268a62 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml
@@ -3,12 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php
+// phpcs:disable Magento2.Templates.ThisInTemplate
+// phpcs:disable Generic.WhiteSpace.ScopeIndent
+
 /** @var \Magento\Catalog\Pricing\Render\PriceBox $block */
 
 /** @var \Magento\Catalog\Pricing\Price\TierPrice $tierPriceModel */
@@ -18,17 +18,17 @@ $msrpShowOnGesture = $block->getPriceType('msrp_price')->isShowPriceOnGesture();
 $product = $block->getSaleableItem();
 ?>
 <?php if (count($tierPrices)) : ?>
-    <ul class="<?= /* @escapeNotVerified */ ($block->hasListClass() ? $block->getListClass() : 'prices-tier items') ?>">
-    <?php foreach ($tierPrices as $index => $price) : ?>
-        <li class="item">
-            <?php
+    <ul class="<?= $block->escapeHtmlAttr(($block->hasListClass() ? $block->getListClass() : 'prices-tier items')) ?>">
+        <?php foreach ($tierPrices as $index => $price) : ?>
+            <li class="item">
+                <?php
                 $productId = $product->getId();
                 $isSaleable = $product->isSaleable();
                 $popupId = 'msrp-popup-' . $productId . $block->getRandomString(20);
-                if ($msrpShowOnGesture && $price['price']->getValue() < $product->getMsrp()):
+                if ($msrpShowOnGesture && $price['price']->getValue() < $product->getMsrp()) :
                     $addToCartUrl = '';
                     if ($isSaleable) {
-                        $addToCartUrl = $this->helper('\Magento\Checkout\Helper\Cart')
+                        $addToCartUrl = $this->helper(\Magento\Checkout\Helper\Cart::class)
                             ->getAddUrl($product, ['qty' => $price['price_qty']]);
                     }
                     $tierPriceData = [
@@ -54,13 +54,13 @@ $product = $block->getSaleableItem();
                     if ($block->getCanDisplayQty($product)) {
                         $tierPriceData['qty'] = $price['price_qty'];
                     }
-                ?>
-                <?= /* @escapeNotVerified */ __('Buy %1 for: ', $price['price_qty']) ?>
-                <a href="javascript:void(0);"
-                   id="<?= /* @escapeNotVerified */ ($popupId) ?>"
-                   data-tier-price="<?= $block->escapeHtml($block->jsonEncode($tierPriceData)) ?>">
-                    <?= /* @escapeNotVerified */ __('Click for price') ?></a>
-                <?php else:
+                    ?>
+                    <?= $block->escapeHtml(__('Buy %1 for: ', $price['price_qty'])) ?>
+                    <a href="javascript:void(0);"
+                       id="<?= $block->escapeHtmlAttr($popupId) ?>"
+                       data-tier-price="<?= $block->escapeHtml($block->jsonEncode($tierPriceData)) ?>">
+                        <?= $block->escapeHtml(__('Click for price')) ?></a>
+                <?php else :
                     $priceAmountBlock = $block->renderAmount(
                         $price['price'],
                         [
@@ -70,22 +70,22 @@ $product = $block->getSaleableItem();
                             'zone' => \Magento\Framework\Pricing\Render::ZONE_ITEM_OPTION
                         ]
                     );
-                ?>
-                <?php /* @escapeNotVerified */ echo ($block->getShowDetailedPrice() !== false)
-                        ? __(
-                            'Buy %1 for %2 each and <strong class="benefit">save<span class="percent tier-%3">&nbsp;%4</span>%</strong>',
-                            $price['price_qty'],
-                            $priceAmountBlock,
-                            $index,
-                            $tierPriceModel->getSavePercent($price['price'])
-                        )
-                        : __('Buy %1 for %2 each', $price['price_qty'], $priceAmountBlock);
-                ?>
-            <?php endif; ?>
-        </li>
-    <?php endforeach; ?>
+                    ?>
+                    <?= /* @noEscape */ ($block->getShowDetailedPrice() !== false)
+                    ? __(
+                        'Buy %1 for %2 each and <strong class="benefit">save<span class="percent tier-%3">&nbsp;%4</span>%</strong>',
+                        $price['price_qty'],
+                        $priceAmountBlock,
+                        $index,
+                        $block->formatPercent($price['percentage_value'] ?? $tierPriceModel->getSavePercent($price['price']))
+                    )
+                    : __('Buy %1 for %2 each', $price['price_qty'], $priceAmountBlock);
+                    ?>
+                <?php endif; ?>
+            </li>
+        <?php endforeach; ?>
     </ul>
-    <?php if ($msrpShowOnGesture):?>
+    <?php if ($msrpShowOnGesture) :?>
         <script type="text/x-magento-init">
             {
                 ".product-info-main": {
@@ -95,9 +95,9 @@ $product = $block->getSaleableItem();
                         "inputQty": "#qty",
                         "attr": "[data-tier-price]",
                         "productForm": "#product_addtocart_form",
-                        "productId": "<?= /* @escapeNotVerified */ $productId ?>",
+                        "productId": "<?= (int) $productId ?>",
                         "productIdInput": "input[type=hidden][name=product]",
-                        "isSaleable": "<?= /* @escapeNotVerified */ $isSaleable ?>"
+                        "isSaleable": "<?= (bool) $isSaleable ?>"
                     }
                 }
             }
diff --git a/app/code/Magento/Catalog/view/base/web/js/price-box.js b/app/code/Magento/Catalog/view/base/web/js/price-box.js
index de68d769885fd..783d39cddbc76 100644
--- a/app/code/Magento/Catalog/view/base/web/js/price-box.js
+++ b/app/code/Magento/Catalog/view/base/web/js/price-box.js
@@ -78,11 +78,7 @@ define([
                 pricesCode = [],
                 priceValue, origin, finalPrice;
 
-            if (typeof newPrices !== 'undefined' && newPrices.hasOwnProperty('prices')) {
-                this.cache.additionalPriceObject = {};
-            } else {
-                this.cache.additionalPriceObject = this.cache.additionalPriceObject || {};
-            }
+            this.cache.additionalPriceObject = this.cache.additionalPriceObject || {};
 
             if (newPrices) {
                 $.extend(this.cache.additionalPriceObject, newPrices);
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
index 3630fddb326a7..aa6ffa1bd33c4 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
@@ -121,7 +121,11 @@
                         </arguments>
                     </block>
                 </container>
-                <block class="Magento\Catalog\Block\Product\View\Gallery" name="product.info.media.image" template="Magento_Catalog::product/view/gallery.phtml"/>
+                <block class="Magento\Catalog\Block\Product\View\Gallery" name="product.info.media.image" template="Magento_Catalog::product/view/gallery.phtml">
+                    <arguments>
+                        <argument name="gallery_options" xsi:type="object">Magento\Catalog\Block\Product\View\GalleryOptions</argument>
+                    </arguments>
+                </block>
                 <container name="skip_gallery_after.wrapper" htmlTag="div" htmlClass="action-skip-wrapper">
                     <block class="Magento\Framework\View\Element\Template" after="product.info.media.image" name="skip_gallery_after" template="Magento_Theme::html/skip.phtml">
                         <arguments>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml
index 3619ce94031c2..b50095e91d999 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /**
@@ -14,7 +11,7 @@
  * @var $block \Magento\Catalog\Block\Category\View
  */
 ?>
-<?php if ($block->isContentMode() || $block->isMixedMode()): ?>
+<?php if ($block->isContentMode() || $block->isMixedMode()) :?>
     <div class="category-cms">
         <?= $block->getCmsBlockHtml() ?>
     </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/description.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/description.phtml
index 0efce1014f9c2..2f5b852575c78 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/description.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/description.phtml
@@ -3,19 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
 /**
  * Category view template
  *
  * @var $block \Magento\Catalog\Block\Category\View
  */
 ?>
-<?php if ($_description = $block->getCurrentCategory()->getDescription()): ?>
+<?php if ($_description = $block->getCurrentCategory()->getDescription()) :?>
     <div class="category-description">
-        <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->categoryAttribute($block->getCurrentCategory(), $_description, 'description') ?>
+        <?= /* @noEscape */ $this->helper(Magento\Catalog\Helper\Output::class)->categoryAttribute(
+            $block->getCurrentCategory(),
+            $_description,
+            'description'
+        ) ?>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml
index edff2147ad14b..0711d085ae6af 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /**
@@ -13,14 +10,25 @@
  *
  * @var $block \Magento\Catalog\Block\Category\View
  */
+
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+// phpcs:disable Generic.WhiteSpace.ScopeIndent.IncorrectExact
+// phpcs:disable Magento2.Security.LanguageConstruct.DirectOutput
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?php
-    $_helper    = $this->helper('Magento\Catalog\Helper\Output');
+    $_helper    = $this->helper(Magento\Catalog\Helper\Output::class);
     $_category  = $block->getCurrentCategory();
     $_imgHtml   = '';
     if ($_imgUrl = $_category->getImageUrl()) {
-        $_imgHtml = '<div class="category-image"><img src="' . $_imgUrl . '" alt="' . $block->escapeHtml($_category->getName()) . '" title="' . $block->escapeHtml($_category->getName()) . '" class="image" /></div>';
+        $_imgHtml = '<div class="category-image"><img src="'
+            . $block->escapeUrl($_imgUrl)
+            . '" alt="'
+            . $block->escapeHtmlAttr($_category->getName())
+            . '" title="'
+            . $block->escapeHtmlAttr($_category->getName())
+            . '" class="image" /></div>';
         $_imgHtml = $_helper->categoryAttribute($_category, $_imgHtml, 'image');
-        /* @escapeNotVerified */ echo $_imgHtml;
+        /* @noEscape */ echo $_imgHtml;
     }
 ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/products.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/products.phtml
index c521cf03ad156..9454fdf5de2b8 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/products.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/products.phtml
@@ -3,17 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
+// phpcs:disable PSR2.Files.ClosingTag
+
 /**
  * Category view template
  *
  * @var $block \Magento\Catalog\Block\Category\View
  */
 ?>
-<?php if (!$block->isContentMode() || $block->isMixedMode()): ?>
+<?php if (!$block->isContentMode() || $block->isMixedMode()) :?>
     <?= $block->getProductListHtml() ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml
index 774aa8d839e87..65ee7ea789e46 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var $block \Magento\Catalog\Block\Category\Rss\Link */
 ?>
-<?php if ($block->isRssAllowed() && $block->getLink() && $block->isTopCategory()): ?>
-    <a href="<?= /* @escapeNotVerified */ $block->getLink() ?>" class="action link rss"><span><?= /* @escapeNotVerified */ $block->getLabel() ?></span></a>
+<?php if ($block->isRssAllowed() && $block->getLink() && $block->isTopCategory()) :?>
+    <a href="<?= $block->escapeUrl($block->getLink()) ?>"
+       class="action link rss"><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_block.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_block.phtml
index 2b0098be6545b..15fdd30c2d93f 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_block.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_block.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
 ?>
 <div class="widget block block-category-link">
-    <a <?= /* @escapeNotVerified */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
+    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
 </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_inline.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_inline.phtml
index f53c1c1ed90d7..8f3b2ae613731 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_inline.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_inline.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
 ?>
 <span class="widget block block-category-link-inline">
-    <a <?= /* @escapeNotVerified */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
+    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
 </span>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/frontend_storage_manager.phtml b/app/code/Magento/Catalog/view/frontend/templates/frontend_storage_manager.phtml
index 4c103b40ba28c..52bec7858a919 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/frontend_storage_manager.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/frontend_storage_manager.phtml
@@ -3,7 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// @codingStandardsIgnoreFile
+
+/** @var $block Magento\Catalog\Block\FrontendStorageManager */
 ?>
 <script type="text/x-magento-init">
         {
@@ -12,9 +13,8 @@
                     "components": {
                         "storage-manager": {
                             "component": "Magento_Catalog/js/storage-manager",
-                            "appendTo": "<?= /* @escapeNotVerified */ $block->getParentComponentName() ?>",
-                            "storagesConfiguration" :
-                                         <?= /* @escapeNotVerified */ $block->getConfigurationJson() ?>
+                            "appendTo": "<?= $block->escapeJs($block->getParentComponentName()) ?>",
+                            "storagesConfiguration" : <?= /* @noEscape */ $block->getConfigurationJson() ?>
                         }
                     }
                 }
diff --git a/app/code/Magento/Catalog/view/frontend/templates/messages/addCompareSuccessMessage.phtml b/app/code/Magento/Catalog/view/frontend/templates/messages/addCompareSuccessMessage.phtml
index 5f44c42e17c57..f5dca566abfed 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/messages/addCompareSuccessMessage.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/messages/addCompareSuccessMessage.phtml
@@ -3,12 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// @codingStandardsIgnoreFile
+
 /** @var \Magento\Framework\View\Element\Template $block */
 ?>
-<?= $block->escapeHtml(__(
-    'You added product %1 to the <a href="%2">comparison list</a>.',
-    $block->getData('product_name'),
-    $block->getData('compare_list_url')),
+<?= $block->escapeHtml(
+    __(
+        'You added product %1 to the <a href="%2">comparison list</a>.',
+        $block->getData('product_name'),
+        $block->getData('compare_list_url')
+    ),
     ['a']
 );
diff --git a/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml b/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml
index 01820361744e0..6d5ddb95ab178 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * Category left navigation
  *
@@ -15,25 +13,29 @@
 <?php if (!$block->getCategory()) {
     return;
 } ?>
-<?php $_categories = $block->getCurrentChildCategories(); ?>
+<?php $_categories = $block->getCurrentChildCategories() ;?>
 <?php $_count = is_array($_categories) ? count($_categories) : $_categories->count(); ?>
-<?php if ($_count): ?>
+<?php if ($_count) :?>
     <div class="block filter">
         <div class="title">
-            <strong><?= /* @escapeNotVerified */ __('Shop By') ?></strong>
+            <strong><?= $block->escapeHtml(__('Shop By')) ?></strong>
         </div>
         <div class="content">
-            <strong class="subtitle"><?= /* @escapeNotVerified */ __('Shopping Options') ?></strong>
+            <strong class="subtitle"><?= $block->escapeHtml(__('Shopping Options')) ?></strong>
             <dl class="options" id="narrow-by-list2">
-                <dt><?= /* @escapeNotVerified */ __('Category') ?></dt>
+                <dt><?= $block->escapeHtml(__('Category')) ?></dt>
                 <dd>
                     <ol class="items">
                         <?php /** @var \Magento\Catalog\Model\Category $_category */ ?>
-                        <?php foreach ($_categories as $_category): ?>
-                            <?php if ($_category->getIsActive()): ?>
+                        <?php foreach ($_categories as $_category) :?>
+                            <?php if ($_category->getIsActive()) :?>
                                 <li class="item">
-                                    <a href="<?= /* @escapeNotVerified */ $block->getCategoryUrl($_category) ?>"<?php if ($block->isCategoryActive($_category)): ?> class="current"<?php endif; ?>><?= $block->escapeHtml($_category->getName()) ?></a>
-                                    <span class="count"><?= /* @escapeNotVerified */ $_category->getProductCount() ?></span>
+                                    <a href="<?= $block->escapeUrl($block->getCategoryUrl($_category)) ?>"
+                                        <?php if ($block->isCategoryActive($_category)) :?>
+                                            class="current"
+                                        <?php endif; ?>
+                                    ><?= $block->escapeHtml($_category->getName()) ?></a>
+                                    <span class="count"><?= $block->escapeHtml($_category->getProductCount()) ?></span>
                                 </li>
                             <?php endif; ?>
                         <?php endforeach ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml
index c54ce5340851c..dd97b8bee2d16 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml
@@ -7,4 +7,4 @@
 /** @var \Magento\Catalog\ViewModel\Product\Breadcrumbs $viewModel */
 $viewModel = $block->getData('viewModel');
 ?>
-<div class="breadcrumbs" data-mage-init='<?= /* @escapeNotVerified */ $viewModel->getJsonConfiguration() ?>'></div>
+<div class="breadcrumbs" data-mage-init='<?= /* @noEscape */ $viewModel->getJsonConfiguration() ?>'></div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml
index b8595aae9d993..05a5649135ef5 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml
@@ -4,16 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/** @var $block Magento\Framework\View\Element\Template */
 ?>
 <li class="item link compare" data-bind="scope: 'compareProducts'" data-role="compare-products-link">
-    <a class="action compare no-display" title="<?= /* @escapeNotVerified */ __('Compare Products') ?>"
+    <a class="action compare no-display" title="<?= $block->escapeHtmlAttr(__('Compare Products')) ?>"
        data-bind="attr: {'href': compareProducts().listUrl}, css: {'no-display': !compareProducts().count}"
     >
-        <?= /* @escapeNotVerified */ __('Compare Products') ?>
+        <?= $block->escapeHtml(__('Compare Products')) ?>
         <span class="counter qty" data-bind="text: compareProducts().countCaption"></span>
     </a>
 </li>
 <script type="text/x-magento-init">
-{"[data-role=compare-products-link]": {"Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>}}
+{"[data-role=compare-products-link]": {"Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>}}
 </script>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
index a70ceadd12244..2cf2399e38af0 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
@@ -4,14 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+// phpcs:disable PSR2.ControlStructures.SwitchDeclaration
+// phpcs:disable Generic.WhiteSpace.ScopeIndent
 
 /* @var $block \Magento\Catalog\Block\Product\Compare\ListCompare */
 ?>
 <?php $total = $block->getItems()->getSize() ?>
-<?php if ($total): ?>
-    <a href="#" class="action print hidden-print" title="<?= /* @escapeNotVerified */ __('Print This Page') ?>">
-        <span><?= /* @escapeNotVerified */ __('Print This Page') ?></span>
+<?php if ($total) :?>
+    <a href="#" class="action print hidden-print" title="<?= $block->escapeHtmlAttr(__('Print This Page')) ?>">
+        <span><?= $block->escapeHtml(__('Print This Page')) ?></span>
     </a>
         <div class="table-wrapper comparison">
             <table class="data table table-comparison" id="product-comparison"
@@ -21,19 +23,19 @@
                     "selectors":{
                         "productAddToCartSelector":"button.action.tocart"}
                 }}'>
-                <caption class="table-caption"><?= /* @escapeNotVerified */ __('Compare Products') ?></caption>
+                <caption class="table-caption"><?= $block->escapeHtml(__('Compare Products')) ?></caption>
                 <thead>
                 <tr>
                     <?php $index = 0 ?>
-                    <?php foreach ($block->getItems() as $item): ?>
-                        <?php if ($index++ == 0): ?>
-                            <th scope="row" class="cell label remove"><span><?= /* @escapeNotVerified */ __('Remove Product') ?></span></th>
+                    <?php foreach ($block->getItems() as $item) :?>
+                        <?php if ($index++ == 0) :?>
+                            <th scope="row" class="cell label remove"><span><?= $block->escapeHtml(__('Remove Product')) ?></span></th>
                         <?php endif; ?>
                         <td class="cell remove product hidden-print">
-                            <?php $compareHelper = $this->helper(\Magento\Catalog\Helper\Product\Compare::class);?>
-                            <a href="#" data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataRemove($item) ?>'
-                               class="action delete" title="<?= /* @escapeNotVerified */ __('Remove Product') ?>">
-                                <span><?= /* @escapeNotVerified */ __('Remove Product') ?></span>
+                            <?php $compareHelper = $this->helper(Magento\Catalog\Helper\Product\Compare::class);?>
+                            <a href="#" data-post='<?= /* @noEscape */ $compareHelper->getPostDataRemove($item) ?>'
+                               class="action delete" title="<?= $block->escapeHtmlAttr(__('Remove Product')) ?>">
+                                <span><?= $block->escapeHtml(__('Remove Product')) ?></span>
                             </a>
                         </td>
                     <?php endforeach; ?>
@@ -42,44 +44,54 @@
                 <tbody>
                 <tr>
                     <?php $index = 0; ?>
-                    <?php $helper = $this->helper(\Magento\Catalog\Helper\Output::class); ?>
+                    <?php $helper = $this->helper(Magento\Catalog\Helper\Output::class); ?>
                     <?php /** @var $item \Magento\Catalog\Model\Product */ ?>
-                    <?php foreach ($block->getItems() as $item): ?>
-                        <?php if ($index++ == 0): ?>
-                            <th scope="row" class="cell label product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
+                    <?php foreach ($block->getItems() as $item) :?>
+                        <?php if ($index++ == 0) :?>
+                            <th scope="row" class="cell label product">
+                                <span><?= $block->escapeHtml(__('Product')) ?></span>
+                            </th>
                         <?php endif; ?>
-                        <td data-th="<?= $block->escapeHtml(__('Product')) ?>" class="cell product info">
-                            <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $block->getProductUrl($item) ?>" title="<?= /* @escapeNotVerified */ $block->stripTags($item->getName(), null, true) ?>">
+                        <td data-th="<?= $block->escapeHtmlAttr(__('Product')) ?>" class="cell product info">
+                            <a class="product-item-photo"
+                               href="<?= $block->escapeUrl($block->getProductUrl($item)) ?>"
+                               title="<?= /* @noEscape */ $block->stripTags($item->getName(), null, true) ?>">
                                 <?= $block->getImage($item, 'product_comparison_list')->toHtml() ?>
                             </a>
                             <strong class="product-item-name">
-                                <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($item) ?>" title="<?= /* @escapeNotVerified */ $block->stripTags($item->getName(), null, true) ?>">
-                                    <?= /* @escapeNotVerified */ $helper->productAttribute($item, $item->getName(), 'name') ?>
+                                <a href="<?= $block->escapeUrl($block->getProductUrl($item)) ?>"
+                                   title="<?= /* @noEscape */ $block->stripTags($item->getName(), null, true) ?>">
+                                    <?= /* @noEscape */ $helper->productAttribute($item, $item->getName(), 'name') ?>
                                 </a>
                             </strong>
                             <?= $block->getReviewsSummaryHtml($item, 'short') ?>
-                            <?= /* @escapeNotVerified */ $block->getProductPrice($item, '-compare-list-top') ?>
+                            <?= /* @noEscape */ $block->getProductPrice($item, '-compare-list-top') ?>
                             <div class="product-item-actions hidden-print">
                                 <div class="actions-primary">
-                                    <?php if ($item->isSaleable()): ?>
-                                        <form data-role="tocart-form" action="<?= /* @escapeNotVerified */ $this->helper(\Magento\Catalog\Helper\Product\Compare::class)->getAddToCartUrl($item) ?>" method="post">
+                                    <?php if ($item->isSaleable()) :?>
+                                        <form data-role="tocart-form"
+                                              action="<?= $block->escapeUrl($this->helper(Magento\Catalog\Helper\Product\Compare::class)->getAddToCartUrl($item)) ?>"
+                                              method="post">
                                             <?= $block->getBlockHtml('formkey') ?>
                                             <button type="submit" class="action tocart primary">
-                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
+                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                                             </button>
                                         </form>
-                                    <?php else: ?>
-                                        <?php if ($item->getIsSalable()): ?>
-                                            <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
-                                        <?php else: ?>
-                                            <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
+                                    <?php else :?>
+                                        <?php if ($item->getIsSalable()) :?>
+                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
+                                        <?php else :?>
+                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
                                         <?php endif; ?>
                                     <?php endif; ?>
                                 </div>
-                                <?php if ($this->helper(\Magento\Wishlist\Helper\Data::class)->isAllow()) : ?>
+                                <?php if ($this->helper(Magento\Wishlist\Helper\Data::class)->isAllow()) :?>
                                     <div class="secondary-addto-links actions-secondary" data-role="add-to-links">
-                                        <a href="#" data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($item) ?>' class="action towishlist" data-action="add-to-wishlist">
-                                            <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
+                                        <a href="#"
+                                           data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($item) ?>'
+                                           class="action towishlist"
+                                           data-action="add-to-wishlist">
+                                            <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
                                         </a>
                                     </div>
                                 <?php endif; ?>
@@ -89,12 +101,12 @@
                 </tr>
                 </tbody>
                 <tbody>
-                <?php foreach ($block->getAttributes() as $attribute): ?>
+                <?php foreach ($block->getAttributes() as $attribute) :?>
                     <?php $index = 0; ?>
-                    <?php if ($block->hasAttributeValueForProducts($attribute)): ?>
+                    <?php if ($block->hasAttributeValueForProducts($attribute)) :?>
                          <tr>
-                            <?php foreach ($block->getItems() as $item): ?>
-                                <?php if ($index++ == 0): ?>
+                            <?php foreach ($block->getItems() as $item) :?>
+                                <?php if ($index++ == 0) :?>
                                     <th scope="row" class="cell label">
                                         <span class="attribute label">
                                             <?= $block->escapeHtml($attribute->getStoreLabel() ? $attribute->getStoreLabel() : __($attribute->getFrontendLabel())) ?>
@@ -105,18 +117,18 @@
                                     <div class="attribute value">
                                         <?php switch ($attribute->getAttributeCode()) {
                                             case "price": ?>
-                                                <?php
-                                                    /* @escapeNotVerified */ echo $block->getProductPrice(
-                                                        $item,
-                                                        '-compare-list-' . $attribute->getCode()
-                                                    )
+                                                <?=
+                                                /* @noEscape */ $block->getProductPrice(
+                                                    $item,
+                                                    '-compare-list-' . $attribute->getCode()
+                                                )
                                                 ?>
                                                 <?php break;
                                             case "small_image": ?>
                                                 <?php $block->getImage($item, 'product_small_image')->toHtml(); ?>
                                                 <?php break;
                                             default: ?>
-                                            <?= /* @escapeNotVerified */ $helper->productAttribute($item, $block->getProductAttributeValue($item, $attribute), $attribute->getAttributeCode()) ?>
+                                            <?= /* @noEscape */ $helper->productAttribute($item, $block->getProductAttributeValue($item, $attribute), $attribute->getAttributeCode()) ?>
                                             <?php break;
                                         } ?>
                                     </div>
@@ -128,7 +140,7 @@
                 </tbody>
             </table>
         </div>
-        <?php if (!$block->isRedirectToCartEnabled()) : ?>
+        <?php if (!$block->isRedirectToCartEnabled()) :?>
             <script type="text/x-magento-init">
             {
                 "[data-role=tocart-form]": {
@@ -137,6 +149,6 @@
             }
             </script>
         <?php endif; ?>
-<?php else: ?>
-    <div class="message info empty"><div><?= /* @escapeNotVerified */ __('You have no items to compare.') ?></div></div>
+<?php else :?>
+    <div class="message info empty"><div><?= $block->escapeHtml(__('You have no items to compare.')) ?></div></div>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
index 8daa342454445..809ddc5c61701 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
@@ -4,12 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
 /* @var $block \Magento\Framework\View\Element\Template */
 ?>
 <div class="block block-compare" data-bind="scope: 'compareProducts'" data-role="compare-products-sidebar">
     <div class="block-title">
-        <strong id="block-compare-heading" role="heading" aria-level="2"><?= /* @escapeNotVerified */ __('Compare Products') ?></strong>
+        <strong id="block-compare-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Compare Products')) ?></strong>
         <span class="counter qty no-display" data-bind="text: compareProducts().countCaption, css: {'no-display': !compareProducts().count}"></span>
     </div>
     <!-- ko if: compareProducts().count -->
@@ -20,29 +21,32 @@
                     <strong class="product-item-name">
                         <a data-bind="attr: {href: product_url}, html: name" class="product-item-link"></a>
                     </strong>
-                    <a href="#" data-bind="attr: {'data-post': remove_url}" title="<?= /* @escapeNotVerified */ __('Remove This Item') ?>" class="action delete">
-                        <span><?= /* @escapeNotVerified */ __('Remove This Item') ?></span>
+                    <a href="#"
+                       data-bind="attr: {'data-post': remove_url}"
+                       title="<?= $block->escapeHtmlAttr(__('Remove This Item')) ?>"
+                       class="action delete">
+                        <span><?= $block->escapeHtml(__('Remove This Item')) ?></span>
                     </a>
                 </li>
         </ol>
         <div class="actions-toolbar">
             <div class="primary">
-                <a data-bind="attr: {'href': compareProducts().listUrl}" class="action compare primary"><span><?= /* @escapeNotVerified */ __('Compare') ?></span></a>
+                <a data-bind="attr: {'href': compareProducts().listUrl}" class="action compare primary"><span><?= $block->escapeHtml(__('Compare')) ?></span></a>
             </div>
             <div class="secondary">
                 <a id="compare-clear-all" href="#" class="action clear" data-post="<?=$block->escapeHtml(
-                    $this->helper('Magento\Catalog\Helper\Product\Compare')->getPostDataClearList()
+                    $this->helper(Magento\Catalog\Helper\Product\Compare::class)->getPostDataClearList()
                 ) ?>">
-                    <span><?= /* @escapeNotVerified */ __('Clear All') ?></span>
+                    <span><?= $block->escapeHtml(__('Clear All')) ?></span>
                 </a>
             </div>
         </div>
     </div>
     <!-- /ko -->
     <!-- ko ifnot: compareProducts().count -->
-    <div class="empty"><?= /* @escapeNotVerified */ __('You have no items to compare.') ?></div>
+    <div class="empty"><?= $block->escapeHtml(__('You have no items to compare.')) ?></div>
     <!-- /ko -->
 </div>
 <script type="text/x-magento-init">
-{"[data-role=compare-products-sidebar]": {"Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>}}
+{"[data-role=compare-products-sidebar]": {"Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>}}
 </script>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
index 6133d55d676c3..ded0b7601232f 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
@@ -4,42 +4,48 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var \Magento\Catalog\Block\Product\Gallery $block */
 ?>
 <?php $_width = $block->getImageWidth(); ?>
-<div class="product-image-popup" style="width:<?= /* @escapeNotVerified */ $_width ?>px;">
-    <div class="buttons-set"><a href="#" class="button" role="close-window"><span><?= /* @escapeNotVerified */ __('Close Window') ?></span></a></div>
-    <?php if ($block->getPreviousImageUrl() || $block->getNextImageUrl()): ?>
+<div class="product-image-popup" style="width:<?= /* @noEscape */ $_width ?>px;">
+    <div class="buttons-set"><a href="#" class="button" role="close-window"><span><?= $block->escapeHtml(__('Close Window')) ?></span></a></div>
+    <?php if ($block->getPreviousImageUrl() || $block->getNextImageUrl()) :?>
         <div class="nav">
-          <?php if ($_prevUrl = $block->getPreviousImageUrl()): ?>
-              <a href="<?= /* @escapeNotVerified */ $_prevUrl ?>" class="prev">&laquo; <?= /* @escapeNotVerified */ __('Prev') ?></a>
-          <?php endif; ?>
-          <?php if ($_nextUrl = $block->getNextImageUrl()): ?>
-              <a href="<?= /* @escapeNotVerified */ $_nextUrl ?>" class="next"><?= /* @escapeNotVerified */ __('Next') ?> &raquo;</a>
-          <?php endif; ?>
+            <?php if ($_prevUrl = $block->getPreviousImageUrl()) :?>
+                <a href="<?= $block->escapeUrl($_prevUrl) ?>" class="prev">&laquo; <?= $block->escapeHtml(__('Prev')) ?></a>
+            <?php endif; ?>
+            <?php if ($_nextUrl = $block->getNextImageUrl()) :?>
+                <a href="<?= $block->escapeUrl($_nextUrl) ?>" class="next"><?= $block->escapeHtml(__('Next')) ?> &raquo;</a>
+            <?php endif; ?>
         </div>
     <?php endif; ?>
-    <?php if ($_imageTitle = $block->escapeHtml($block->getCurrentImage()->getLabel())): ?>
-        <h1 class="image-label"><?= /* @escapeNotVerified */ $_imageTitle ?></h1>
+    <?php if ($_imageTitle = $block->escapeHtml($block->getCurrentImage()->getLabel())) :?>
+        <h1 class="image-label"><?= /* @noEscape */ $_imageTitle ?></h1>
     <?php endif; ?>
     <?php
-        $imageUrl = $this->helper('Magento\Catalog\Helper\Image')
+        $imageUrl = $this->helper(Magento\Catalog\Helper\Image::class)
             ->init($block->getProduct(), 'product_page_image_large')
             ->setImageFile($block->getImageFile())
             ->getUrl();
     ?>
-    <img src="<?= /* @escapeNotVerified */ $imageUrl ?>"<?php if ($_width): ?> width="<?= /* @escapeNotVerified */ $_width ?>"<?php endif; ?> alt="<?= $block->escapeHtml($block->getCurrentImage()->getLabel()) ?>" title="<?= $block->escapeHtml($block->getCurrentImage()->getLabel()) ?>" id="product-gallery-image" class="image" data-mage-init='{"catalogGallery":{}}'/>
-    <div class="buttons-set"><a href="#" class="button" role="close-window"><span><?= /* @escapeNotVerified */ __('Close Window') ?></span></a></div>
-    <?php if ($block->getPreviousImageUrl() || $block->getNextImageUrl()): ?>
+    <img src="<?= $block->escapeUrl($imageUrl) ?>"
+        <?php if ($_width) :?>
+            width="<?= /* @noEscape */ $_width ?>"
+        <?php endif; ?>
+         alt="<?= $block->escapeHtmlAttr($block->getCurrentImage()->getLabel()) ?>"
+         title="<?= $block->escapeHtmlAttr($block->getCurrentImage()->getLabel()) ?>"
+         id="product-gallery-image"
+         class="image"
+         data-mage-init='{"catalogGallery":{}}'/>
+    <div class="buttons-set"><a href="#" class="button" role="close-window"><span><?= /* @noEscape */ __('Close Window') ?></span></a></div>
+    <?php if ($block->getPreviousImageUrl() || $block->getNextImageUrl()) :?>
         <div class="nav">
-          <?php if ($_prevUrl = $block->getPreviousImageUrl()): ?>
-              <a href="<?= /* @escapeNotVerified */ $_prevUrl ?>" class="prev">&laquo; <?= /* @escapeNotVerified */ __('Prev') ?></a>
-          <?php endif; ?>
-          <?php if ($_nextUrl = $block->getNextImageUrl()): ?>
-              <a href="<?= /* @escapeNotVerified */ $_nextUrl ?>" class="next"><?= /* @escapeNotVerified */ __('Next') ?> &raquo;</a>
-          <?php endif; ?>
+            <?php if ($_prevUrl = $block->getPreviousImageUrl()) :?>
+                <a href="<?= $block->escapeUrl($_prevUrl) ?>" class="prev">&laquo; <?= $block->escapeHtml(__('Prev')) ?></a>
+            <?php endif; ?>
+            <?php if ($_nextUrl = $block->getNextImageUrl()) :?>
+                <a href="<?= $block->escapeUrl($_nextUrl) ?>" class="next"><?= $block->escapeHtml(__('Next')) ?> &raquo;</a>
+            <?php endif; ?>
         </div>
     <?php endif; ?>
 </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
index 94b829eb92137..5a1b102ff6362 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
@@ -7,8 +7,8 @@
 <?php /** @var $block \Magento\Catalog\Block\Product\Image */ ?>
 
 <img class="photo image"
-    <?= /* @escapeNotVerified */ $block->getCustomAttributes() ?>
-    src="<?= /* @escapeNotVerified */ $block->getImageUrl() ?>"
-    width="<?= /* @escapeNotVerified */ $block->getWidth() ?>"
-    height="<?= /* @escapeNotVerified */ $block->getHeight() ?>"
-    alt="<?= /* @escapeNotVerified */ $block->stripTags($block->getLabel(), null, true) ?>" />
+    <?= $block->escapeHtml($block->getCustomAttributes()) ?>
+    src="<?= $block->escapeUrl($block->getImageUrl()) ?>"
+    width="<?= $block->escapeHtmlAttr($block->getWidth()) ?>"
+    height="<?= $block->escapeHtmlAttr($block->getHeight()) ?>"
+    alt="<?= /* @noEscape */ $block->stripTags($block->getLabel(), null, true) ?>" />
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
index 0352f7f276630..917bea9fbcadb 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
@@ -7,13 +7,13 @@
 <?php /** @var $block \Magento\Catalog\Block\Product\Image */ ?>
 
 <span class="product-image-container"
-      style="width:<?= /* @escapeNotVerified */ $block->getWidth() ?>px;">
+      style="width:<?= $block->escapeHtmlAttr($block->getWidth()) ?>px;">
     <span class="product-image-wrapper"
-          style="padding-bottom: <?= /* @escapeNotVerified */ ($block->getRatio() * 100) ?>%;">
+          style="padding-bottom: <?= /* @noEscape */ ($block->getRatio() * 100) ?>%;">
         <img class="product-image-photo"
-            <?= /* @escapeNotVerified */ $block->getCustomAttributes() ?>
-            src="<?= /* @escapeNotVerified */ $block->getImageUrl() ?>"
-            width="<?= /* @escapeNotVerified */ $block->getResizedImageWidth() ?>"
-            height="<?= /* @escapeNotVerified */ $block->getResizedImageHeight() ?>"
-            alt="<?= /* @escapeNotVerified */ $block->stripTags($block->getLabel(), null, true) ?>"/></span>
+            <?= $block->escapeHtmlAttr($block->getCustomAttributes()) ?>
+            src="<?= $block->escapeUrl($block->getImageUrl()) ?>"
+            width="<?= $block->escapeHtmlAttr($block->getResizedImageWidth()) ?>"
+            height="<?= $block->escapeHtmlAttr($block->getResizedImageHeight()) ?>"
+            alt="<?= /* @noEscape */ $block->stripTags($block->getLabel(), null, true) ?>"/></span>
 </span>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
index 41dbdd86f75f9..fb52027d16986 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -5,10 +5,10 @@
  */
 use Magento\Framework\App\Action\Action;
 
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
 /**
  * Product list template
  *
@@ -17,11 +17,11 @@ use Magento\Framework\App\Action\Action;
 ?>
 <?php
 $_productCollection = $block->getLoadedProductCollection();
-$_helper = $this->helper('Magento\Catalog\Helper\Output');
+$_helper = $this->helper(Magento\Catalog\Helper\Output::class);
 ?>
-<?php if (!$_productCollection->count()): ?>
-    <div class="message info empty"><div><?= /* @escapeNotVerified */ __('We can\'t find products matching the selection.') ?></div></div>
-<?php else: ?>
+<?php if (!$_productCollection->count()) :?>
+    <div class="message info empty"><div><?= $block->escapeHtml(__('We can\'t find products matching the selection.')) ?></div></div>
+<?php else :?>
     <?= $block->getToolbarHtml() ?>
     <?= $block->getAdditionalHtml() ?>
     <?php
@@ -41,13 +41,13 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
      */
     $pos = $block->getPositioned();
     ?>
-    <div class="products wrapper <?= /* @escapeNotVerified */ $viewMode ?> products-<?= /* @escapeNotVerified */ $viewMode ?>">
+    <div class="products wrapper <?= /* @noEscape */ $viewMode ?> products-<?= /* @noEscape */ $viewMode ?>">
         <?php $iterator = 1; ?>
         <ol class="products list items product-items">
             <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
-            <?php foreach ($_productCollection as $_product): ?>
-                <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="item product product-item">' : '</li><li class="item product product-item">' ?>
-                <div class="product-item-info" data-container="product-<?= /* @escapeNotVerified */ $viewMode ?>">
+            <?php foreach ($_productCollection as $_product) :?>
+                <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="item product product-item">' : '</li><li class="item product product-item">' ?>
+                <div class="product-item-info" data-container="product-<?= /* @noEscape */ $viewMode ?>">
                     <?php
                     $productImage = $block->getImage($_product, $image);
                     if ($pos != null) {
@@ -56,7 +56,9 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                     }
                     ?>
                     <?php // Product Image ?>
-                    <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" class="product photo product-item-photo" tabindex="-1">
+                    <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
+                       class="product photo product-item-photo"
+                       tabindex="-1">
                         <?= $productImage->toHtml() ?>
                     </a>
                     <div class="product details product-item-details">
@@ -65,48 +67,55 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                         ?>
                         <strong class="product name product-item-name">
                             <a class="product-item-link"
-                               href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>">
-                                <?= /* @escapeNotVerified */ $_helper->productAttribute($_product, $_product->getName(), 'name') ?>
+                               href="<?= $block->escapeUrl($_product->getProductUrl()) ?>">
+                                <?= /* @noEscape */ $_helper->productAttribute($_product, $_product->getName(), 'name') ?>
                             </a>
                         </strong>
                         <?= $block->getReviewsSummaryHtml($_product, $templateType) ?>
-                        <?= /* @escapeNotVerified */ $block->getProductPrice($_product) ?>
+                        <?= /* @noEscape */ $block->getProductPrice($_product) ?>
                         <?= $block->getProductDetailsHtml($_product) ?>
 
                         <div class="product-item-inner">
-                            <div class="product actions product-item-actions"<?= strpos($pos, $viewMode . '-actions') ? $position : '' ?>>
-                                <div class="actions-primary"<?= strpos($pos, $viewMode . '-primary') ? $position : '' ?>>
-                                    <?php if ($_product->isSaleable()): ?>
+                            <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) : '' ?>>
+                                    <?php if ($_product->isSaleable()) :?>
                                         <?php $postParams = $block->getAddToCartPostParams($_product); ?>
-                                        <form data-role="tocart-form" data-product-sku="<?= $block->escapeHtml($_product->getSku()) ?>" action="<?= /* @NoEscape */ $postParams['action'] ?>" method="post">
-                                            <input type="hidden" name="product" value="<?= /* @escapeNotVerified */ $postParams['data']['product'] ?>">
-                                            <input type="hidden" name="<?= /* @escapeNotVerified */ Action::PARAM_NAME_URL_ENCODED ?>" value="<?= /* @escapeNotVerified */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] ?>">
+                                        <form data-role="tocart-form"
+                                              data-product-sku="<?= $block->escapeHtml($_product->getSku()) ?>"
+                                              action="<?= $block->escapeUrl($postParams['action']) ?>"
+                                              method="post">
+                                            <input type="hidden"
+                                                   name="product"
+                                                   value="<?= /* @noEscape */ $postParams['data']['product'] ?>">
+                                            <input type="hidden" name="<?= /* @noEscape */ Action::PARAM_NAME_URL_ENCODED ?>"
+                                                   value="<?= /* @noEscape */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] ?>">
                                             <?= $block->getBlockHtml('formkey') ?>
                                             <button type="submit"
-                                                    title="<?= $block->escapeHtml(__('Add to Cart')) ?>"
+                                                    title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>"
                                                     class="action tocart primary">
-                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
+                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                                             </button>
                                         </form>
-                                    <?php else: ?>
-                                        <?php if ($_product->isAvailable()): ?>
-                                            <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
-                                        <?php else: ?>
-                                            <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
+                                    <?php else :?>
+                                        <?php if ($_product->isAvailable()) :?>
+                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
+                                        <?php else :?>
+                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
                                         <?php endif; ?>
                                     <?php endif; ?>
                                 </div>
-                                <div data-role="add-to-links" class="actions-secondary"<?= strpos($pos, $viewMode . '-secondary') ? $position : '' ?>>
-                                    <?php if ($addToBlock = $block->getChildBlock('addto')): ?>
+                                <div data-role="add-to-links" class="actions-secondary"<?= strpos($pos, $viewMode . '-secondary') ? $block->escapeHtmlAttr($position) : '' ?>>
+                                    <?php if ($addToBlock = $block->getChildBlock('addto')) :?>
                                         <?= $addToBlock->setProduct($_product)->getChildHtml() ?>
                                     <?php endif; ?>
                                 </div>
                             </div>
-                            <?php if ($showDescription):?>
+                            <?php if ($showDescription) :?>
                                 <div class="product description product-item-description">
-                                    <?= /* @escapeNotVerified */ $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
-                                    <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" title="<?= /* @escapeNotVerified */ $_productNameStripped ?>"
-                                       class="action more"><?= /* @escapeNotVerified */ __('Learn More') ?></a>
+                                    <?= /* @noEscape */ $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
+                                    <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
+                                       title="<?= /* @noEscape */ $_productNameStripped ?>"
+                                       class="action more"><?= $block->escapeHtml(__('Learn More')) ?></a>
                                 </div>
                             <?php endif; ?>
                         </div>
@@ -117,12 +126,12 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
         </ol>
     </div>
     <?= $block->getToolbarHtml() ?>
-    <?php if (!$block->isRedirectToCartEnabled()) : ?>
+    <?php if (!$block->isRedirectToCartEnabled()) :?>
         <script type="text/x-magento-init">
         {
             "[data-role=tocart-form], .form.map.checkout": {
                 "catalogAddToCart": {
-                    "product_sku": "<?= /* @NoEscape */ $_product->getSku() ?>"
+                    "product_sku": "<?= $block->escapeJs($_product->getSku()) ?>"
                 }
             }
         }
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/addto/compare.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/addto/compare.phtml
index 8798170e8c0b0..c23ee021ca3a8 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/addto/compare.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/addto/compare.phtml
@@ -4,14 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
 /** @var $block Magento\Catalog\Block\Product\ProductList\Item\AddTo\Compare */
 ?>
 <a href="#"
    class="action tocompare"
    title="<?= $block->escapeHtml(__('Add to Compare')) ?>"
    aria-label="<?= $block->escapeHtml(__('Add to Compare')) ?>"
-   data-post='<?= /* @escapeNotVerified */ $block->getCompareHelper()->getPostDataParams($block->getProduct()) ?>'
+   data-post='<?= /* @noEscape */ $block->getCompareHelper()->getPostDataParams($block->getProduct()) ?>'
    role="button">
-    <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
+    <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
 </a>
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 862375503691c..f71494748c6c5 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
@@ -4,12 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+// phpcs:disable Generic.WhiteSpace.ScopeIndent.Incorrect
+// phpcs:disable Squiz.WhiteSpace.ControlStructureSpacing
 
 /* @var $block \Magento\Catalog\Block\Product\AbstractProduct */
 ?>
 
 <?php
+
 switch ($type = $block->getType()) {
 
     case 'related-rule':
@@ -29,7 +32,7 @@ switch ($type = $block->getType()) {
             $templateType = null;
             $description = false;
         }
-    break;
+        break;
 
     case 'related':
         /** @var \Magento\Catalog\Block\Product\ProductList\Related $block */
@@ -49,7 +52,7 @@ switch ($type = $block->getType()) {
             $templateType = null;
             $description = false;
         }
-    break;
+        break;
 
     case 'upsell-rule':
         if ($exist = $block->hasItems()) {
@@ -68,7 +71,7 @@ switch ($type = $block->getType()) {
             $description = false;
             $canItemsAddToCart = false;
         }
-    break;
+        break;
 
     case 'upsell':
         /** @var \Magento\Catalog\Block\Product\ProductList\Upsell $block */
@@ -88,7 +91,7 @@ switch ($type = $block->getType()) {
             $description = false;
             $canItemsAddToCart = false;
         }
-    break;
+        break;
 
     case 'crosssell-rule':
         /** @var \Magento\Catalog\Block\Product\ProductList\Crosssell $block */
@@ -106,7 +109,7 @@ switch ($type = $block->getType()) {
             $description = false;
             $canItemsAddToCart = false;
         }
-    break;
+        break;
 
     case 'crosssell':
         /** @var \Magento\Catalog\Block\Product\ProductList\Crosssell $block */
@@ -124,7 +127,7 @@ switch ($type = $block->getType()) {
             $description = false;
             $canItemsAddToCart = false;
         }
-    break;
+        break;
 
     case 'new':
         if ($exist = $block->getProductCollection()) {
@@ -144,106 +147,104 @@ switch ($type = $block->getType()) {
             $description = ($mode == 'list') ? true : false;
             $canItemsAddToCart = false;
         }
-    break;
+        break;
 
     default:
         $exist = null;
 }
 ?>
-
-<?php if ($exist):?>
-
-    <?php if ($type == 'related' || $type == 'upsell'): ?>
-        <?php if ($type == 'related'): ?>
-            <div class="block <?= /* @escapeNotVerified */ $class ?>" data-mage-init='{"relatedProducts":{"relatedCheckbox":".related.checkbox"}}' data-limit="<?= /* @escapeNotVerified */ $limit ?>" data-shuffle="<?= /* @escapeNotVerified */ $shuffle ?>">
-        <?php else: ?>
-            <div class="block <?= /* @escapeNotVerified */ $class ?>" data-mage-init='{"upsellProducts":{}}' data-limit="<?= /* @escapeNotVerified */ $limit ?>" data-shuffle="<?= /* @escapeNotVerified */ $shuffle ?>">
+<?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 endif; ?>
-    <?php else: ?>
-        <div class="block <?= /* @escapeNotVerified */ $class ?>">
+    <?php else :?>
+        <div class="block <?= $block->escapeHtmlAttr($class) ?>">
     <?php endif; ?>
     <div class="block-title title">
-        <strong id="block-<?= /* @escapeNotVerified */ $class ?>-heading" role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
+        <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-<?= /* @escapeNotVerified */ $class ?>-heading">
-        <?php if ($type == 'related' && $canItemsAddToCart): ?>
+    <div class="block-content content" aria-labelledby="block-<?= $block->escapeHtmlAttr($class) ?>-heading">
+        <?php if ($type == 'related' && $canItemsAddToCart) :?>
         <div class="block-actions">
-            <?= /* @escapeNotVerified */ __('Check items to add to the cart or') ?>
-            <button type="button" class="action select" role="select-all"><span><?= /* @escapeNotVerified */ __('select all') ?></span></button>
+            <?= $block->escapeHtml(__('Check items to add to the cart or')) ?>
+            <button type="button" class="action select" role="select-all"><span><?= $block->escapeHtml(__('select all')) ?></span></button>
         </div>
         <?php endif; ?>
-        <div class="products wrapper grid products-grid products-<?= /* @escapeNotVerified */ $type ?>">
+        <div class="products wrapper grid products-grid products-<?= $block->escapeHtmlAttr($type) ?>">
             <ol class="products list items product-items">
                 <?php $iterator = 1; ?>
-                <?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'): ?>
-                    <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="item product product-item" style="display: none;">' : '</li><li class="item product product-item" style="display: none;">' ?>
-                <?php else: ?>
-                    <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="item product product-item">' : '</li><li class="item product product-item">' ?>
+                <?php if ($type == 'related' || $type == 'upsell') :?>
+                    <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="item product product-item" style="display: none;">' : '</li><li class="item product product-item" style="display: none;">' ?>
+                <?php else :?>
+                    <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="item product product-item">' : '</li><li class="item product product-item">' ?>
                 <?php endif; ?>
-                <div class="product-item-info <?= /* @escapeNotVerified */ $available ?>">
-                    <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
-                    <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product photo product-item-photo">
+                <div class="product-item-info <?= /* @noEscape */ $available ?>">
+                    <?= /* @noEscape */ '<!-- ' . $image . '-->' ?>
+                    <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product photo product-item-photo">
                         <?= $block->getImage($_item, $image)->toHtml() ?>
                     </a>
                     <div class="product details product-item-details">
-                        <strong class="product name product-item-name"><a class="product-item-link" title="<?= $block->escapeHtml($_item->getName()) ?>" href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>">
+                        <strong class="product name product-item-name"><a class="product-item-link" title="<?= $block->escapeHtml($_item->getName()) ?>" href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>">
                             <?= $block->escapeHtml($_item->getName()) ?></a>
                         </strong>
 
-                        <?= /* @escapeNotVerified */ $block->getProductPrice($_item) ?>
+                                    <?= /* @noEscape */ $block->getProductPrice($_item) ?>
 
-                            <?php if ($templateType): ?>
-                                <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
-                            <?php endif; ?>
+                                    <?php if ($templateType) :?>
+                                        <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
+                                    <?php endif; ?>
 
-                            <?php if ($canItemsAddToCart && !$_item->isComposite() && $_item->isSaleable() && $type == 'related'): ?>
-                                <?php if (!$_item->getRequiredOptions()): ?>
-                                    <div class="field choice related">
-                                        <input type="checkbox" class="checkbox related" id="related-checkbox<?= /* @escapeNotVerified */ $_item->getId() ?>" name="related_products[]" value="<?= /* @escapeNotVerified */ $_item->getId() ?>" />
-                                        <label class="label" for="related-checkbox<?= /* @escapeNotVerified */ $_item->getId() ?>"><span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span></label>
-                                    </div>
-                                <?php endif; ?>
-                            <?php endif; ?>
+                                    <?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>
+                                            </div>
+                                        <?php endif; ?>
+                                    <?php endif; ?>
 
-                            <?php if ($showAddTo || $showCart): ?>
-                                <div class="product actions product-item-actions">
-                                    <?php if ($showCart): ?>
-                                        <div class="actions-primary">
-                                            <?php if ($_item->isSaleable()): ?>
-                                                <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                    <button class="action tocart primary" data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}' type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
-                                                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-                                                    </button>
-                                                <?php else: ?>
-                                                    <?php $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                                    $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-                                                    ?>
-                                                    <button class="action tocart primary"
-                                                            data-post='<?= /* @escapeNotVerified */ $postData ?>'
-                                                            type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
-                                                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-                                                    </button>
-                                                <?php endif; ?>
-                                            <?php else: ?>
-                                                <?php if ($_item->getIsSalable()): ?>
-                                                    <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
-                                                <?php else: ?>
-                                                    <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
-                                                <?php endif; ?>
+                                    <?php if ($showAddTo || $showCart) :?>
+                                        <div class="product actions product-item-actions">
+                                            <?php if ($showCart) :?>
+                                                <div class="actions-primary">
+                                                    <?php if ($_item->isSaleable()) :?>
+                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)) :?>
+                                                            <button class="action tocart primary" data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                            </button>
+                                                        <?php else :?>
+                                                            <?php $postDataHelper = $this->helper(Magento\Framework\Data\Helper\PostHelper::class);
+                                                            $postData = $postDataHelper->getPostData($block->escapeUrl($block->getAddToCartUrl($_item)), ['product' => $_item->getEntityId()])
+                                                            ?>
+                                                            <button class="action tocart primary"
+                                                                    data-post='<?= /* @noEscape */ $postData ?>'
+                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                            </button>
+                                                        <?php endif; ?>
+                                                    <?php else :?>
+                                                        <?php if ($_item->getIsSalable()) :?>
+                                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
+                                                        <?php else :?>
+                                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                                        <?php endif; ?>
+                                                    <?php endif; ?>
+                                                </div>
                                             <?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/list/toolbar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
index 02a6e999ad51f..b2ae8b9f7ab13 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /**
@@ -13,11 +10,13 @@
  *
  * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
  */
-use Magento\Catalog\Model\Product\ProductList\Toolbar;
+
+// phpcs:disable Magento2.Security.IncludeFile.FoundIncludeFile
+// phpcs:disable PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
 ?>
-<?php if ($block->getCollection()->getSize()): ?>
-    <div class="toolbar toolbar-products" data-mage-init='<?= /* @escapeNotVerified */ $block->getWidgetOptionsJson() ?>'>
-        <?php if ($block->isExpanded()): ?>
+<?php if ($block->getCollection()->getSize()) :?>
+    <div class="toolbar toolbar-products" data-mage-init='<?= /* @noEscape */ $block->getWidgetOptionsJson() ?>'>
+        <?php if ($block->isExpanded()) :?>
             <?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/viewmode.phtml')) ?>
         <?php endif; ?>
 
@@ -27,7 +26,7 @@ use Magento\Catalog\Model\Product\ProductList\Toolbar;
 
         <?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/limiter.phtml')) ?>
 
-        <?php if ($block->isExpanded()): ?>
+        <?php if ($block->isExpanded()) :?>
             <?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/sorter.phtml')) ?>
         <?php endif; ?>
     </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml
index b4ff1afa1c606..a8f504d6a4f17 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /**
@@ -13,19 +10,27 @@
  *
  * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
  */
-use Magento\Catalog\Model\Product\ProductList\Toolbar;
 ?>
 <p class="toolbar-amount" id="toolbar-amount">
-    <?php if ($block->getLastPageNum() > 1): ?>
-        <?php /* @escapeNotVerified */ echo __('Items %1-%2 of %3',
-            '<span class="toolbar-number">' . $block->getFirstNum() . '</span>',
-            '<span class="toolbar-number">' . $block->getLastNum() . '</span>',
-            '<span class="toolbar-number">' . $block->getTotalNum() . '</span>') ?>
-    <?php elseif ($block->getTotalNum() == 1): ?>
-        <?php /* @escapeNotVerified */ echo __('%1 Item',
-           '<span class="toolbar-number">' . $block->getTotalNum() . '</span>') ?>
-    <?php else: ?>
-        <?php /* @escapeNotVerified */ echo __('%1 Items',
-            '<span class="toolbar-number">' . $block->getTotalNum() . '</span>') ?>
+    <?php if ($block->getLastPageNum() > 1) :?>
+        <?= $block->escapeHtml(
+            __(
+                'Items %1-%2 of %3',
+                '<span class="toolbar-number">' . $block->getFirstNum() . '</span>',
+                '<span class="toolbar-number">' . $block->getLastNum() . '</span>',
+                '<span class="toolbar-number">' . $block->getTotalNum() . '</span>'
+            ),
+            ['span']
+        ) ?>
+    <?php elseif ($block->getTotalNum() == 1) :?>
+        <?= $block->escapeHtml(
+            __('%1 Item', '<span class="toolbar-number">' . $block->getTotalNum() . '</span>'),
+            ['span']
+        ) ?>
+    <?php else :?>
+        <?= $block->escapeHtml(
+            __('%1 Items', '<span class="toolbar-number">' . $block->getTotalNum() . '</span>'),
+            ['span']
+        ) ?>
     <?php endif; ?>
 </p>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml
index ec4541bde5ca6..4ded219748c64 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /**
@@ -13,21 +10,22 @@
  *
  * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
  */
-use Magento\Catalog\Model\Product\ProductList\Toolbar;
 ?>
 <div class="field limiter">
     <label class="label" for="limiter">
-        <span><?= /* @escapeNotVerified */ __('Show') ?></span>
+        <span><?= $block->escapeHtml(__('Show')) ?></span>
     </label>
     <div class="control">
         <select id="limiter" data-role="limiter" class="limiter-options">
-            <?php foreach ($block->getAvailableLimit() as $_key => $_limit): ?>
-                <option value="<?= /* @escapeNotVerified */ $_key ?>"<?php if ($block->isLimitCurrent($_key)): ?>
-                    selected="selected"<?php endif ?>>
-                    <?= /* @escapeNotVerified */ $_limit ?>
+            <?php foreach ($block->getAvailableLimit() as $_key => $_limit) :?>
+                <option value="<?= $block->escapeHtmlAttr($_key) ?>"
+                    <?php if ($block->isLimitCurrent($_key)) :?>
+                        selected="selected"
+                    <?php endif ?>>
+                    <?= $block->escapeHtml($_limit) ?>
                 </option>
             <?php endforeach; ?>
         </select>
     </div>
-    <span class="limiter-text"><?= /* @escapeNotVerified */ __('per page') ?></span>
+    <span class="limiter-text"><?= $block->escapeHtml(__('per page')) ?></span>
 </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml
index 92514c5b8ea50..58dde199998bc 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /**
@@ -13,14 +10,13 @@
  *
  * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
  */
-use Magento\Catalog\Model\Product\ProductList\Toolbar;
 ?>
 <div class="toolbar-sorter sorter">
-    <label class="sorter-label" for="sorter"><?= /* @escapeNotVerified */ __('Sort By') ?></label>
+    <label class="sorter-label" for="sorter"><?= $block->escapeHtml(__('Sort By')) ?></label>
     <select id="sorter" data-role="sorter" class="sorter-options">
-        <?php foreach ($block->getAvailableOrders() as $_key => $_order): ?>
-            <option value="<?= /* @escapeNotVerified */ $_key ?>"
-                <?php if ($block->isOrderCurrent($_key)): ?>
+        <?php foreach ($block->getAvailableOrders() as $_key => $_order) :?>
+            <option value="<?= $block->escapeHtmlAttr($_key) ?>"
+                <?php if ($block->isOrderCurrent($_key)) :?>
                     selected="selected"
                 <?php endif; ?>
                 >
@@ -28,13 +24,21 @@ use Magento\Catalog\Model\Product\ProductList\Toolbar;
             </option>
         <?php endforeach; ?>
     </select>
-    <?php if ($block->getCurrentDirection() == 'desc'): ?>
-        <a title="<?= /* @escapeNotVerified */ __('Set Ascending Direction') ?>" href="#" class="action sorter-action sort-desc" data-role="direction-switcher" data-value="asc">
-            <span><?= /* @escapeNotVerified */ __('Set Ascending Direction') ?></span>
+    <?php if ($block->getCurrentDirection() == 'desc') :?>
+        <a title="<?= $block->escapeHtmlAttr(__('Set Ascending Direction')) ?>"
+           href="#"
+           class="action sorter-action sort-desc"
+           data-role="direction-switcher"
+           data-value="asc">
+            <span><?= $block->escapeHtml(__('Set Ascending Direction')) ?></span>
         </a>
-    <?php else: ?>
-        <a title="<?= /* @escapeNotVerified */ __('Set Descending Direction') ?>" href="#" class="action sorter-action sort-asc" data-role="direction-switcher" data-value="desc">
-            <span><?= /* @escapeNotVerified */ __('Set Descending Direction') ?></span>
+    <?php else :?>
+        <a title="<?= $block->escapeHtmlAttr(__('Set Descending Direction')) ?>"
+           href="#"
+           class="action sorter-action sort-asc"
+           data-role="direction-switcher"
+           data-value="desc">
+            <span><?= $block->escapeHtml(__('Set Descending Direction')) ?></span>
         </a>
     <?php endif; ?>
 </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml
index 366dfba71b0d1..955897f315d6f 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /**
@@ -13,32 +10,31 @@
  *
  * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
  */
-use Magento\Catalog\Model\Product\ProductList\Toolbar;
 ?>
-<?php if ($block->isEnabledViewSwitcher()): ?>
-<div class="modes">
-    <?php $_modes = $block->getModes(); ?>
-    <?php if ($_modes && count($_modes) > 1): ?>
-    <strong class="modes-label" id="modes-label"><?= /* @escapeNotVerified */ __('View as') ?></strong>
-    <?php foreach ($block->getModes() as $_code => $_label): ?>
-        <?php if ($block->isModeActive($_code)): ?>
-            <strong title="<?= /* @escapeNotVerified */ $_label ?>"
-                class="modes-mode active mode-<?= /* @escapeNotVerified */ strtolower($_code) ?>"
-                data-value="<?= /* @escapeNotVerified */ strtolower($_code) ?>">
-                <span><?= /* @escapeNotVerified */ $_label ?></span>
-            </strong>
-        <?php else: ?>
-            <a class="modes-mode mode-<?= /* @escapeNotVerified */ strtolower($_code) ?>"
-               title="<?= /* @escapeNotVerified */ $_label ?>"
-               href="#"
-               data-role="mode-switcher"
-               data-value="<?= /* @escapeNotVerified */ strtolower($_code) ?>"
-               id="mode-<?= /* @escapeNotVerified */ strtolower($_code) ?>"
-               aria-labelledby="modes-label mode-<?= /* @escapeNotVerified */ strtolower($_code) ?>">
-                <span><?= /* @escapeNotVerified */ $_label ?></span>
-            </a>
-            <?php endif; ?>
-        <?php endforeach; ?>
-    <?php endif; ?>
-</div>
+<?php if ($block->isEnabledViewSwitcher()) :?>
+    <div class="modes">
+        <?php $_modes = $block->getModes(); ?>
+        <?php if ($_modes && count($_modes) > 1) :?>
+            <strong class="modes-label" id="modes-label"><?= $block->escapeHtml(__('View as')) ?></strong>
+            <?php foreach ($block->getModes() as $_code => $_label) :?>
+                <?php if ($block->isModeActive($_code)) :?>
+                    <strong title="<?= $block->escapeHtmlAttr($_label) ?>"
+                            class="modes-mode active mode-<?= $block->escapeHtmlAttr(strtolower($_code)) ?>"
+                            data-value="<?= $block->escapeHtmlAttr(strtolower($_code)) ?>">
+                        <span><?= $block->escapeHtml($_label) ?></span>
+                    </strong>
+                <?php else :?>
+                    <a class="modes-mode mode-<?= $block->escapeHtmlAttr(strtolower($_code)) ?>"
+                       title="<?= $block->escapeHtmlAttr($_label) ?>"
+                       href="#"
+                       data-role="mode-switcher"
+                       data-value="<?= $block->escapeHtmlAttr(strtolower($_code)) ?>"
+                       id="mode-<?= $block->escapeHtmlAttr(strtolower($_code)) ?>"
+                       aria-labelledby="modes-label mode-<?= $block->escapeHtmlAttr(strtolower($_code)) ?>">
+                        <span><?= $block->escapeHtml($_label) ?></span>
+                    </a>
+                <?php endif; ?>
+            <?php endforeach; ?>
+        <?php endif; ?>
+    </div>
 <?php endif; ?>
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 5f437cc484ed4..bddaa3f3d0b0b 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
@@ -3,28 +3,29 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+// phpcs:disable Magento2.Files.LineLength.MaxExceeded
+// phpcs:disable Magento2.Security.LanguageConstruct.DirectOutput
+
 /**
  * Product list template
  *
- * @see \Magento\Catalog\Block\Product\ListProduct
+ * @var $block \Magento\Catalog\Block\Product\ListProduct
  */
 ?>
 <?php
 $start = microtime(true);
 $_productCollection = $block->getLoadedProductCollection();
-$_helper = $this->helper('Magento\Catalog\Helper\Output');
+$_helper = $this->helper(Magento\Catalog\Helper\Output::class);
 ?>
-<?php if (!$_productCollection->count()): ?>
-<p class="message note"><?= /* @escapeNotVerified */ __('We can\'t find products matching the selection.') ?></p>
-<?php else: ?>
-<?= $block->getToolbarHtml() ?>
-<?= $block->getAdditionalHtml() ?>
-<?php
+<?php if (!$_productCollection->count()) :?>
+    <p class="message note"><?= $block->escapeHtml(__('We can\'t find products matching the selection.')) ?></p>
+<?php else :?>
+    <?= $block->getToolbarHtml() ?>
+    <?= $block->getAdditionalHtml() ?>
+    <?php
     if ($block->getMode() == 'grid') {
         $viewMode = 'grid';
         $image = 'category_page_grid';
@@ -37,56 +38,56 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
         $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::FULL_VIEW;
     }
 ?>
-<div class="products wrapper <?= /* @escapeNotVerified */ $viewMode ?>">
+<div class="products wrapper <?= /* @noEscape */ $viewMode ?>">
     <?php $iterator = 1; ?>
     <ol class="products list items">
-        <?php foreach ($_productCollection as $_product): ?>
-        <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+        <?php foreach ($_productCollection as $_product) :?>
+        <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="item product">' : '</li><li class="item product">' ?>
             <div class="product">
                 <?php // Product Image ?>
-                <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" class="product photo">
+                <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>" class="product photo">
                     <?= $block->getImage($_product, $image)->toHtml() ?>
                 </a>
                 <div class="product details">
-                <?php
+                    <?php
 
                     $info = [];
                     $info['name'] = '<strong class="product name">'
-                                    . ' <a href="' . $_product->getProductUrl() . '" title="'
-                                    . $block->stripTags($_product->getName(), null, true) . '">'
-                                    . $_helper->productAttribute($_product, $_product->getName(), 'name')
-                                    . '</a></strong>';
+                        . ' <a href="' . $block->escapeUrl($_product->getProductUrl()) . '" title="'
+                        . $block->stripTags($_product->getName(), null, true) . '">'
+                        . $_helper->productAttribute($_product, $_product->getName(), 'name')
+                        . '</a></strong>';
                     $info['price'] = $block->getProductPrice($_product);
                     $info['review'] = $block->getReviewsSummaryHtml($_product, $templateType);
 
                     if ($_product->isSaleable()) {
-                        $info['button'] = '<button type="button" title="' . __('Add to Cart') . '" class="action tocart"'
-                                        . ' data-mage-init=\'{ "redirectUrl": { "event": "click", url: "' . $block->getAddToCartUrl($_product) . '"} }\'>'
-                                        . '<span>' . __('Add to Cart') . '</span></button>';
+                        $info['button'] = '<button type="button" title="' . $block->escapeHtmlAttr(__('Add to Cart')) . '" class="action tocart"'
+                            . ' data-mage-init=\'{ "redirectUrl": { "event": "click", url: "' . $block->escapeUrl($block->getAddToCartUrl($_product)) . '"} }\'>'
+                            . '<span>' . $block->escapeHtml(__('Add to Cart')) . '</span></button>';
                     } else {
-                        $info['button'] = $_product->getIsSalable() ?   '<div class="stock available"><span>' . __('In stock') . '</span></div>' :
-                                                                        '<div class="stock unavailable"><span>' . __('Out of stock') . '</span></div>';
+                        $info['button'] = $_product->getIsSalable() ?   '<div class="stock available"><span>' . $block->escapeHtml(__('In stock')) . '</span></div>' :
+                            '<div class="stock unavailable"><span>' . $block->escapeHtml(__('Out of stock')) . '</span></div>';
                     }
 
                     $info['links'] = '<div class="product links" data-role="add-to-links">'
-                                    . '<a href="#" data-post=\'' . $this->helper('Magento\Wishlist\Helper\Data')->getAddParams($_product) . '\' class="action towishlist" data-action="add-to-wishlist">'
-                                    . '<span>' . __('Add to Wish List') . '</span></a>'
-                                    . '<a href="' . $block->getAddToCompareUrl($_product) . '" class="action tocompare">'
-                                    . '<span>' . __('Add to Compare') . '</span></a></div>';
+                        . '<a href="#" data-post=\'' . $this->helper(Magento\Wishlist\Helper\Data::class)->getAddParams($_product) . '\' class="action towishlist" data-action="add-to-wishlist">'
+                        . '<span>' . $block->escapeHtml(__('Add to Wish List')) . '</span></a>'
+                        . '<a href="' . $block->escapeUrl($block->getAddToCompareUrl($_product)) . '" class="action tocompare">'
+                        . '<span>' . $block->escapeHtml(__('Add to Compare')) . '</span></a></div>';
                     $info['actions'] = '<div class="product action">' . $info['button'] . $info['links'] . '</div>';
 
                     if ($showDescription) {
                         $info['description'] =  '<div class="product description">'
-                                                . $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description')
-                                                . ' <a href="' . $_product->getProductUrl() . '" class="action more">'
-                                                . __('Learn More') . '</a></div>';
+                            . $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description')
+                            . ' <a href="' . $block->escapeUrl($_product->getProductUrl()) . '" class="action more">'
+                            . $block->escapeHtml(__('Learn More')) . '</a></div>';
                     } else {
                         $info['description'] = '';
                     }
 
                     $details = $block->getInfoOrder() ?: ['name','price','review','description','actions'];
                     foreach ($details as $detail) {
-                        /* @escapeNotVerified */ echo $info[$detail];
+                        /* @noEscape */ echo $info[$detail];
                     }
                     ?>
 
@@ -98,4 +99,4 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
 </div>
 <?= $block->getToolbarHtml() ?>
 <?php endif; ?>
-<?= /* @escapeNotVerified */ $time_taken = microtime(true) - $start ?>
+<?= /* @noEscape */ $time_taken = microtime(true) - $start ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/additional.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/additional.phtml
index 2d89e24cc7aac..14e27124d51c6 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/additional.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/additional.phtml
@@ -4,9 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable PSR2.Files.ClosingTag
 
+/** @var $block \Magento\Catalog\Block\Product\View\Additional */
 ?>
-<?php foreach ($block->getChildHtmlList() as $_html): ?>
-    <?= /* @escapeNotVerified */ $_html ?>
+<?php foreach ($block->getChildHtmlList() as $_html) :?>
+    <?= /* @noEscape */ $_html ?>
 <?php endforeach; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml
index 0893cfab0bbf8..1924175764555 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Catalog\Block\Product\View*/
 ?>
 <div class="product-addto-links" data-role="add-to-links">
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml
index adf0f44d0c831..5190e4a9c22ce 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto/compare.phtml
@@ -4,11 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Catalog\Block\Product\View\Addto\Compare */
 ?>
 
-<a href="#" data-post='<?= /* @escapeNotVerified */ $block->getPostDataParams() ?>'
+<a href="#" data-post='<?= /* @noEscape */ $block->getPostDataParams() ?>'
         data-role="add-to-links"
-        class="action tocompare"><span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span></a>
+        class="action tocompare"><span><?= $block->escapeHtml(__('Add to Compare')) ?></span></a>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
index 9c18a18ff5837..c094ff3a70a8b 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
@@ -4,24 +4,23 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Catalog\Block\Product\View */
 ?>
 <?php $_product = $block->getProduct(); ?>
 <?php $buttonTitle = __('Add to Cart'); ?>
-<?php if ($_product->isSaleable()): ?>
+<?php if ($_product->isSaleable()) :?>
 <div class="box-tocart">
     <div class="fieldset">
-        <?php if ($block->shouldRenderQuantity()): ?>
+        <?php if ($block->shouldRenderQuantity()) :?>
         <div class="field qty">
-            <label class="label" for="qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></label>
+            <label class="label" for="qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></label>
             <div class="control">
                 <input type="number"
                        name="qty"
                        id="qty"
-                       value="<?= /* @escapeNotVerified */ $block->getProductDefaultQty() * 1 ?>"
-                       title="<?= /* @escapeNotVerified */ __('Qty') ?>"
+                       min="0"
+                       value="<?= /* @noEscape */ $block->getProductDefaultQty() * 1 ?>"
+                       title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
                        class="input-text qty"
                        data-validate="<?= $block->escapeHtml(json_encode($block->getQuantityValidators())) ?>"
                        />
@@ -30,10 +29,10 @@
         <?php endif; ?>
         <div class="actions">
             <button type="submit"
-                    title="<?= /* @escapeNotVerified */ $buttonTitle ?>"
+                    title="<?= $block->escapeHtmlAttr($buttonTitle) ?>"
                     class="action primary tocart"
-                    id="product-addtocart-button">
-                <span><?= /* @escapeNotVerified */ $buttonTitle ?></span>
+                    id="product-addtocart-button" disabled>
+                <span><?= $block->escapeHtml($buttonTitle) ?></span>
             </button>
             <?= $block->getChildHtml('', true) ?>
         </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml
index 4ea207dffae7f..4371fcbd1a161 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml
@@ -4,16 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
 /**
  * Product view template
  *
- * @see \Magento\Catalog\Block\Product\View\Description
+ * @var $block \Magento\Catalog\Block\Product\View\Description
  */
 ?>
 <?php
-$_helper = $this->helper('Magento\Catalog\Helper\Output');
+$_helper = $this->helper(Magento\Catalog\Helper\Output::class);
 $_product = $block->getProduct();
 $_call = $block->getAtCall();
 $_code = $block->getAtCode();
@@ -32,14 +32,18 @@ if ($_attributeLabel && $_attributeLabel == 'default') {
     $_attributeLabel = $_product->getResource()->getAttribute($_code)->getStoreLabel();
 }
 if ($_attributeType && $_attributeType == 'text') {
-    $_attributeValue = ($_helper->productAttribute($_product, $_product->$_call(), $_code)) ? $_product->getAttributeText($_code) : '';
+    $_attributeValue = ($_helper->productAttribute($_product, $_product->$_call(), $_code))
+        ? $_product->getAttributeText($_code)
+        : '';
 } else {
     $_attributeValue = $_helper->productAttribute($_product, $_product->$_call(), $_code);
 }
 ?>
-<?php if ($_attributeValue): ?>
-<div class="product attribute <?= /* @escapeNotVerified */ $_className ?>">
-    <?php if ($renderLabel): ?><strong class="type"><?= /* @escapeNotVerified */ $_attributeLabel ?></strong><?php endif; ?>
-    <div class="value" <?= /* @escapeNotVerified */ $_attributeAddAttribute ?>><?= /* @escapeNotVerified */ $_attributeValue ?></div>
+<?php if ($_attributeValue) :?>
+<div class="product attribute <?= $block->escapeHtmlAttr($_className) ?>">
+    <?php if ($renderLabel) :?>
+        <strong class="type"><?= $block->escapeHtml($_attributeLabel) ?></strong>
+    <?php endif; ?>
+    <div class="value" <?= /* @noEscape */ $_attributeAddAttribute ?>><?= /* @noEscape */ $_attributeValue ?></div>
 </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml
index c930d2195a01b..a4f0fb3efab9e 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
 /**
  * Product additional attributes template
@@ -13,18 +13,18 @@
  */
 ?>
 <?php
-    $_helper = $this->helper('Magento\Catalog\Helper\Output');
+    $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
     $_product = $block->getProduct();
 ?>
-<?php if ($_additional = $block->getAdditionalData()): ?>
+<?php if ($_additional = $block->getAdditionalData()) :?>
     <div class="additional-attributes-wrapper table-wrapper">
         <table class="data table additional-attributes" id="product-attribute-specs-table">
-            <caption class="table-caption"><?= /* @escapeNotVerified */ __('More Information') ?></caption>
+            <caption class="table-caption"><?= $block->escapeHtml(__('More Information')) ?></caption>
             <tbody>
-            <?php foreach ($_additional as $_data): ?>
+            <?php foreach ($_additional as $_data) :?>
                 <tr>
-                    <th class="col label" scope="row"><?= $block->escapeHtml(__($_data['label'])) ?></th>
-                    <td class="col data" data-th="<?= $block->escapeHtml(__($_data['label'])) ?>"><?= /* @escapeNotVerified */ $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
+                    <th class="col label" scope="row"><?= $block->escapeHtml($_data['label']) ?></th>
+                    <td class="col data" data-th="<?= $block->escapeHtmlAttr($_data['label']) ?>"><?= /* @noEscape */ $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
                 </tr>
             <?php endforeach; ?>
             </tbody>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/counter.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/counter.phtml
index 4414214f99a6e..a4aa675b2c346 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/counter.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/counter.phtml
@@ -13,7 +13,7 @@
     {
         "*": {
                 "Magento_Catalog/js/product/view/provider": {
-                    "data": <?= /* @escapeNotVerified */ $block->getCurrentProductData() ?>
+                    "data": <?= /* @noEscape */ $block->getCurrentProductData() ?>
             }
         }
     }
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/description.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/description.phtml
index b5cdd1a2a31ba..36dbe7fbc35fe 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/description.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/description.phtml
@@ -4,7 +4,8 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+// phpcs:disable PSR2.Files.ClosingTag
 
 /**
  * Product description template
@@ -12,4 +13,8 @@
  * @var $block \Magento\Catalog\Block\Product\View\Description
  */
 ?>
-<?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($block->getProduct(), $block->getProduct()->getDescription(), 'description') ?>
+<?= /* @noEscape */ $this->helper(Magento\Catalog\Helper\Output::class)->productAttribute(
+    $block->getProduct(),
+    $block->getProduct()->getDescription(),
+    'description'
+) ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml
index 038bea86e7d4e..8887d0074d52f 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml
@@ -4,35 +4,34 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var \Magento\Catalog\Block\Product\View\Details $block */
 ?>
-<?php if ($detailedInfoGroup = $block->getGroupChildNames('detailed_info', 'getChildHtml')):?>
+<?php if ($detailedInfoGroup = $block->getGroupChildNames('detailed_info', 'getChildHtml')) :?>
     <div class="product info detailed">
         <?php $layout = $block->getLayout(); ?>
         <div class="product data items" data-mage-init='{"tabs":{"openedState":"active"}}'>
-            <?php foreach ($detailedInfoGroup as $name):?>
+            <?php foreach ($detailedInfoGroup as $name) :?>
                 <?php
-                    $html = $layout->renderElement($name);
-                    if (!trim($html)) {
-                        continue;
-                    }
-                    $alias = $layout->getElementAlias($name);
-                    $label = $block->getChildData($alias, 'title');
+                $html = $layout->renderElement($name);
+                if (!trim($html)) {
+                    continue;
+                }
+                $alias = $layout->getElementAlias($name);
+                $label = $block->getChildData($alias, 'title');
                 ?>
                 <div class="data item title"
-                     aria-labelledby="tab-label-<?= /* @escapeNotVerified */ $alias ?>-title"
-                     data-role="collapsible" id="tab-label-<?= /* @escapeNotVerified */ $alias ?>">
+                     data-role="collapsible" id="tab-label-<?= $block->escapeHtmlAttr($alias) ?>">
                     <a class="data switch"
                        tabindex="-1"
-                       data-toggle="switch"
-                       href="#<?= /* @escapeNotVerified */ $alias ?>"
-                       id="tab-label-<?= /* @escapeNotVerified */ $alias ?>-title">
-                        <?= /* @escapeNotVerified */ $label ?>
+                       data-toggle="trigger"
+                       href="#<?= $block->escapeUrl($alias) ?>"
+                       id="tab-label-<?= $block->escapeHtmlAttr($alias) ?>-title">
+                        <?= /* @noEscape */ $label ?>
                     </a>
                 </div>
-                <div class="data item content" id="<?= /* @escapeNotVerified */ $alias ?>" data-role="content">
-                    <?= /* @escapeNotVerified */ $html ?>
+                <div class="data item content"
+                     aria-labelledby="tab-label-<?= $block->escapeHtmlAttr($alias) ?>-title" id="<?= $block->escapeHtmlAttr($alias) ?>" data-role="content">
+                    <?= /* @noEscape */ $html ?>
                 </div>
             <?php endforeach;?>
         </div>
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 9c5cce7865532..8d298aec9f1cb 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
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
 /**
  * Product view template
@@ -12,28 +12,28 @@
  * @var $block \Magento\Catalog\Block\Product\View
  */
 ?>
-<?php $_helper = $this->helper('Magento\Catalog\Helper\Output'); ?>
+<?php $_helper = $this->helper(Magento\Catalog\Helper\Output::class); ?>
 <?php $_product = $block->getProduct(); ?>
 
 <div class="product-add-form">
     <form data-product-sku="<?= $block->escapeHtml($_product->getSku()) ?>"
-          action="<?= /* @NoEscape */ $block->getSubmitUrl($_product) ?>" method="post"
-          id="product_addtocart_form"<?php if ($_product->getOptions()): ?> enctype="multipart/form-data"<?php endif; ?>>
-        <input type="hidden" name="product" value="<?= /* @escapeNotVerified */ $_product->getId() ?>" />
+          action="<?= $block->escapeUrl($block->getSubmitUrl($_product)) ?>" method="post"
+          id="product_addtocart_form"<?php if ($_product->getOptions()) :?> enctype="multipart/form-data"<?php endif; ?>>
+        <input type="hidden" name="product" value="<?= (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="<?= /* @noEscape */ $block->getRequest()->getParam('id') ?>" />
+        <input type="hidden" name="item"  value="<?= $block->escapeHtmlAttr($block->getRequest()->getParam('id')) ?>" />
         <?= $block->getBlockHtml('formkey') ?>
         <?= $block->getChildHtml('form_top') ?>
-        <?php if (!$block->hasOptions()):?>
+        <?php if (!$block->hasOptions()) :?>
             <?= $block->getChildHtml('product_info_form_content') ?>
-        <?php else:?>
-            <?php if ($_product->isSaleable() && $block->getOptionsContainer() == 'container1'):?>
+        <?php else :?>
+            <?php if ($_product->isSaleable() && $block->getOptionsContainer() == 'container1') :?>
                 <?= $block->getChildChildHtml('options_container') ?>
             <?php endif;?>
         <?php endif; ?>
 
-        <?php if ($_product->isSaleable() && $block->hasOptions() && $block->getOptionsContainer() == 'container2'):?>
+        <?php if ($_product->isSaleable() && $block->hasOptions() && $block->getOptionsContainer() == 'container2') :?>
             <?= $block->getChildChildHtml('options_container') ?>
         <?php endif;?>
         <?= $block->getChildHtml('form_bottom') ?>
@@ -52,6 +52,6 @@
             return !$(elem).find('.price-from').length;
         });
 
-        priceBoxes.priceBox({'priceConfig': <?= /* @escapeNotVerified */ $block->getJsonConfig() ?>});
+        priceBoxes.priceBox({'priceConfig': <?= /* @noEscape */ $block->getJsonConfig() ?>});
     });
 </script>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index b2fa8e9aaf80f..0f65e39284392 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -43,79 +43,8 @@
                 "mixins":["magnifier/magnify"],
                 "magnifierOpts": <?= /* @noEscape */ $block->getMagnifier() ?>,
                 "data": <?= /* @noEscape */ $block->getGalleryImagesJson() ?>,
-                "options": {
-                    "nav": "<?= $block->escapeHtml($block->getVar("gallery/nav")) ?>",
-                    <?php if (($block->getVar("gallery/loop"))) : ?>
-                        "loop": <?= $block->escapeHtml($block->getVar("gallery/loop")) ?>,
-                    <?php endif; ?>
-                    <?php if (($block->getVar("gallery/keyboard"))) : ?>
-                        "keyboard": <?= $block->escapeHtml($block->getVar("gallery/keyboard")) ?>,
-                    <?php endif; ?>
-                    <?php if (($block->getVar("gallery/arrows"))) : ?>
-                        "arrows": <?= $block->escapeHtml($block->getVar("gallery/arrows")) ?>,
-                    <?php endif; ?>
-                    <?php if (($block->getVar("gallery/allowfullscreen"))) : ?>
-                        "allowfullscreen": <?= $block->escapeHtml($block->getVar("gallery/allowfullscreen")) ?>,
-                    <?php endif; ?>
-                    <?php if (is_bool($block->getVar("gallery/caption"))) : ?>
-                        "showCaption": <?= /* @noEscape */ $block->getVar("gallery/caption") ? 'true' : 'false'; ?>,
-                    <?php endif; ?>
-                    <?php
-                        $imgWidth = $block->getImageAttribute('product_page_image_medium', 'width');
-                        $thumbWidth = $block->getImageAttribute('product_page_image_small', 'width');
-                    ?>
-                        "width": "<?= $block->escapeHtml($imgWidth) ?>",
-                        "thumbwidth": "<?= $block->escapeHtml($thumbWidth) ?>",
-                    <?php
-                        $thumbHeight = $block->getImageAttribute('product_page_image_small', 'height')
-                            ?: $block->getImageAttribute('product_page_image_small', 'width');
-                    ?>
-                    <?php if ($thumbHeight) : ?>
-                        "thumbheight": <?= $block->escapeHtml($thumbHeight); ?>,
-                    <?php endif; ?>
-                    <?php if (($block->getVar("gallery/thumbmargin"))) : ?>
-                        "thumbmargin": <?= (int)$block->getVar("gallery/thumbmargin"); ?>,
-                    <?php endif; ?>
-                    <?php
-                        $imgHeight = $block->getImageAttribute('product_page_image_medium', 'height')
-                            ?: $block->getImageAttribute('product_page_image_medium', 'width')
-                    ?>
-                    <?php if ($imgHeight) : ?>
-                        "height": <?= $block->escapeHtml($imgHeight); ?>,
-                    <?php endif; ?>
-                    <?php if ($block->getVar("gallery/transition/duration")) : ?>
-                        "transitionduration": <?= $block->escapeHtml($block->getVar("gallery/transition/duration")) ?>,
-                    <?php endif; ?>
-                    "transition": "<?= $block->escapeHtml($block->getVar("gallery/transition/effect")) ?>",
-                    <?php if (($block->getVar("gallery/navarrows"))) : ?>
-                        "navarrows": <?= $block->escapeHtml($block->getVar("gallery/navarrows")) ?>,
-                    <?php endif; ?>
-                    "navtype": "<?= $block->escapeHtml($block->getVar("gallery/navtype")) ?>",
-                    "navdir": "<?= $block->escapeHtml($block->getVar("gallery/navdir")) ?>"
-                },
-                "fullscreen": {
-                    "nav": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/nav")) ?>",
-                    <?php if ($block->getVar("gallery/fullscreen/loop")) : ?>
-                        "loop": <?= $block->escapeHtml($block->getVar("gallery/fullscreen/loop")) ?>,
-                    <?php endif; ?>
-                    "navdir": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/navdir")) ?>",
-                    <?php if ($block->getVar("gallery/transition/navarrows")) : ?>
-                        "navarrows": <?= $block->escapeHtml($block->getVar("gallery/fullscreen/navarrows")) ?>,
-                    <?php endif; ?>
-                    "navtype": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/navtype")) ?>",
-                    <?php if ($block->getVar("gallery/fullscreen/arrows")) : ?>
-                        "arrows": <?= $block->escapeHtml($block->getVar("gallery/fullscreen/arrows")) ?>,
-                    <?php endif; ?>
-                    <?php if (is_bool($block->getVar("gallery/fullscreen/caption"))) : ?>
-                        <?php $showCaption = $block->getVar("gallery/fullscreen/caption") ? 'true' : 'false'; ?>
-                        "showCaption": <?= /* @noEscape */ $showCaption ?>,
-                    <?php endif; ?>
-                    <?php if ($block->getVar("gallery/fullscreen/transition/duration")) : ?>
-                        "transitionduration": <?=
-                        $block->escapeHtml($block->getVar("gallery/fullscreen/transition/duration")) ?>,
-                    <?php endif; ?>
-                    "transition": "<?= $block->escapeHtml($block->getVar("gallery/fullscreen/transition/effect")) ?>"
-                },
+                "options": <?= /* @noEscape */ $block->getGalleryOptions()->getOptionsJson() ?>,
+                "fullscreen": <?= /* @noEscape */ $block->getGalleryOptions()->getFSOptionsJson() ?>,
                 "breakpoints": <?= /* @noEscape */ $block->getBreakpoints() ?>
             }
         }
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml
index d52b594ededdf..f57c9b68ddbd2 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml
@@ -4,11 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php $_product = $block->getProduct() ?>
-<?php if ($block->canEmailToFriend()): ?>
-    <a href="<?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Product')->getEmailToFriendUrl($_product) ?>"
-       class="action mailto friend"><span><?= /* @escapeNotVerified */ __('Email') ?></span></a>
+<?php if ($block->canEmailToFriend()) :?>
+    <a href="<?= $block->escapeUrl($this->helper(Magento\Catalog\Helper\Product::class)->getEmailToFriendUrl($_product)) ?>"
+       class="action mailto friend"><span><?= $block->escapeHtml(__('Email')) ?></span></a>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/currency.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/currency.phtml
index 87655797f40e5..7f14b71a60c7a 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/currency.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/currency.phtml
@@ -4,8 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Directory\Block\Currency */
 ?>
-<meta property="product:price:currency" content="<?= /* @escapeNotVerified */ $block->stripTags($block->getCurrentCurrencyCode()) ?>"/>
+<meta property="product:price:currency"
+      content="<?= /* @noEscape */ $block->stripTags($block->getCurrentCurrencyCode()) ?>"/>
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 a2b91a5eeb99f..eb2bde647f9b1 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
@@ -4,17 +4,18 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Catalog\Block\Product\View */
 ?>
 
 <meta property="og:type" content="product" />
-<meta property="og:title" content="<?= $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getName())) ?>" />
-<meta property="og:image" content="<?= $block->escapeUrl($block->getImage($block->getProduct(), 'product_base_image')->getImageUrl()) ?>" />
-<meta property="og:description" content="<?= $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getShortDescription())) ?>" />
+<meta property="og:title"
+      content="<?= /* @noEscape */ $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()) ?>" />
 <meta property="og:url" content="<?= $block->escapeUrl($block->getProduct()->getProductUrl()) ?>" />
-<?php if ($priceAmount = $block->getProduct()->getFinalPrice()):?>
-    <meta property="product:price:amount" content="<?= /* @escapeNotVerified */ $priceAmount ?>"/>
+<?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/templates/product/view/options.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
index 3ebfa76860950..d9a0c845b9f83 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
@@ -4,26 +4,24 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /* @var $block \Magento\Catalog\Block\Product\View\Options */
 ?>
 
 <?php $_options = $block->decorateArray($block->getOptions()) ?>
 <?php $_productId = $block->getProduct()->getId() ?>
-<?php if (count($_options)):?>
+<?php if (count($_options)) :?>
 <script type="text/x-magento-init">
     {
         "#product_addtocart_form": {
             "priceOptions": {
-                "optionConfig": <?= /* @escapeNotVerified */ $block->getJsonConfig() ?>,
+                "optionConfig": <?= /* @noEscape */ $block->getJsonConfig() ?>,
                 "controlContainer": ".field",
                 "priceHolderSelector": "[data-product-id='<?= $block->escapeHtml($_productId) ?>'][data-role=priceBox]"
             }
         }
     }
 </script>
-    <?php foreach ($_options as $_option): ?>
+    <?php foreach ($_options as $_option) :?>
         <?= $block->getOptionHtml($_option) ?>
     <?php endforeach; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml
index 66895fa1eabf9..d101700997d34 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml
@@ -3,46 +3,39 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Date */ ?>
 <?php $_option = $block->getOption() ?>
-<?php $_optionId = $_option->getId() ?>
+<?php $_optionId = $block->escapeHtmlAttr($_option->getId()) ?>
 <?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
-<div class="field date<?= /* @escapeNotVerified */ $class ?>"
+<div class="field date<?= /* @noEscape */ $class ?>"
     data-mage-init='{"priceOptionDate":{"fromSelector":"#product_addtocart_form"}}'>
-    <fieldset class="fieldset fieldset-product-options-inner<?= /* @escapeNotVerified */ $class ?>">
+    <fieldset class="fieldset fieldset-product-options-inner<?= /* @noEscape */ $class ?>">
         <legend class="legend">
             <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
-            <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
+            <?= /* @noEscape */ $block->getFormattedPrice() ?>
         </legend>
         <div class="control">
             <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME
-                || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE): ?>
-
+                || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE) :?>
                 <?= $block->getDateHtml() ?>
-
             <?php endif; ?>
-
             <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME
-                || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_TIME): ?>
+                || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_TIME) :?>
                 <?= $block->getTimeHtml() ?>
             <?php endif; ?>
-
-            <?php if ($_option->getIsRequire()): ?>
+            <?php if ($_option->getIsRequire()) :?>
                 <input type="hidden"
-                       name="validate_datetime_<?= /* @escapeNotVerified */ $_optionId ?>"
-                       class="validate-datetime-<?= /* @escapeNotVerified */ $_optionId ?>"
+                       name="validate_datetime_<?= /* @noEscape */ $_optionId ?>"
+                       class="validate-datetime-<?= /* @noEscape */ $_optionId ?>"
                        value=""
-                       data-validate="{'validate-required-datetime':<?= /* @escapeNotVerified */ $_optionId ?>}"/>
-            <?php else: ?>
+                       data-validate="{'validate-required-datetime':<?= /* @noEscape */ $_optionId ?>}"/>
+            <?php else :?>
                 <input type="hidden"
-                       name="validate_datetime_<?= /* @escapeNotVerified */ $_optionId ?>"
-                       class="validate-datetime-<?= /* @escapeNotVerified */ $_optionId ?>"
+                       name="validate_datetime_<?= /* @noEscape */ $_optionId ?>"
+                       class="validate-datetime-<?= /* @noEscape */ $_optionId ?>"
                        value=""
-                       data-validate="{'validate-optional-datetime':<?= /* @escapeNotVerified */ $_optionId ?>}"/>
+                       data-validate="{'validate-optional-datetime':<?= /* @noEscape */ $_optionId ?>}"/>
             <?php endif; ?>
             <script type="text/x-magento-init">
             {
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/default.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/default.phtml
index 2006bf6e9f414..c25dab8b70a5c 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/default.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/default.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php $_option = $block->getOption() ?>
 <div class="field">
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
index adb729c6d86ec..e83e55ad2a03c 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
@@ -3,65 +3,62 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\File */ ?>
 <?php $_option = $block->getOption(); ?>
 <?php $_fileInfo = $block->getFileInfo(); ?>
 <?php $_fileExists = $_fileInfo->hasData(); ?>
-<?php $_fileName = 'options_' . $_option->getId() . '_file'; ?>
+<?php $_fileName = 'options_' . $block->escapeHtmlAttr($_option->getId()) . '_file'; ?>
 <?php $_fieldNameAction = $_fileName . '_action'; ?>
 <?php $_fieldValueAction = $_fileExists ? 'save_old' : 'save_new'; ?>
 <?php $_fileNamed = $_fileName . '_name'; ?>
 <?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
 
-<div class="field file<?= /* @escapeNotVerified */ $class ?>">
+<div class="field file<?= /* @noEscape */ $class ?>">
     <label class="label" for="<?= /* @noEscape */ $_fileName ?>" id="<?= /* @noEscape */ $_fileName ?>-label">
         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
-        <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
+        <?= /* @noEscape */ $block->getFormattedPrice() ?>
     </label>
-    <?php if ($_fileExists): ?>
+    <?php if ($_fileExists) :?>
     <div class="control">
         <span class="<?= /* @noEscape */ $_fileNamed ?>"><?= $block->escapeHtml($_fileInfo->getTitle()) ?></span>
         <a href="javascript:void(0)" class="label" id="change-<?= /* @noEscape */ $_fileName ?>" >
-            <?= /* @escapeNotVerified */ __('Change') ?>
+            <?= $block->escapeHtml(__('Change')) ?>
         </a>
-        <?php if (!$_option->getIsRequire()): ?>
-            <input type="checkbox" id="delete-<?= /* @escapeNotVerified */ $_fileName ?>" />
-            <span class="label"><?= /* @escapeNotVerified */ __('Delete') ?></span>
+        <?php if (!$_option->getIsRequire()) :?>
+            <input type="checkbox" id="delete-<?= /* @noEscape */ $_fileName ?>" />
+            <span class="label"><?= $block->escapeHtml(__('Delete')) ?></span>
         <?php endif; ?>
     </div>
     <?php endif; ?>
-    <div class="control" id="input-box-<?= /* @escapeNotVerified */ $_fileName ?>"
+    <div class="control" id="input-box-<?= /* @noEscape */ $_fileName ?>"
              data-mage-init='{"priceOptionFile":{
                 "fileName":"<?= /* @noEscape */ $_fileName ?>",
                 "fileNamed":"<?= /* @noEscape */ $_fileNamed ?>",
-                "fieldNameAction":"<?= /* @escapeNotVerified */ $_fieldNameAction ?>",
-                "changeFileSelector":"#change-<?= /* @escapeNotVerified */ $_fileName ?>",
-                "deleteFileSelector":"#delete-<?= /* @escapeNotVerified */ $_fileName ?>"}
+                "fieldNameAction":"<?= /* @noEscape */ $_fieldNameAction ?>",
+                "changeFileSelector":"#change-<?= /* @noEscape */ $_fileName ?>",
+                "deleteFileSelector":"#delete-<?= /* @noEscape */ $_fileName ?>"}
              }'
             <?= $_fileExists ? 'style="display:none"' : '' ?>>
         <input type="file"
-               name="<?= /* @escapeNotVerified */ $_fileName ?>"
-               id="<?= /* @escapeNotVerified */ $_fileName ?>"
+               name="<?= /* @noEscape */ $_fileName ?>"
+               id="<?= /* @noEscape */ $_fileName ?>"
                class="product-custom-option<?= $_option->getIsRequire() ? ' required' : '' ?>"
-               <?= $_fileExists ? 'disabled="disabled"' : '' ?> />
-        <input type="hidden" name="<?= /* @escapeNotVerified */ $_fieldNameAction ?>" value="<?= /* @escapeNotVerified */ $_fieldValueAction ?>" />
-        <?php if ($_option->getFileExtension()): ?>
+            <?= $_fileExists ? 'disabled="disabled"' : '' ?> />
+        <input type="hidden" name="<?= /* @noEscape */ $_fieldNameAction ?>" value="<?= /* @noEscape */ $_fieldValueAction ?>" />
+        <?php if ($_option->getFileExtension()) :?>
             <p class="note">
-                <?= /* @escapeNotVerified */ __('Compatible file extensions to upload') ?>: <strong><?= /* @escapeNotVerified */ $_option->getFileExtension() ?></strong>
+                <?= $block->escapeHtml(__('Compatible file extensions to upload')) ?>: <strong><?= $block->escapeHtml($_option->getFileExtension()) ?></strong>
             </p>
         <?php endif; ?>
-        <?php if ($_option->getImageSizeX() > 0): ?>
+        <?php if ($_option->getImageSizeX() > 0) :?>
             <p class="note">
-                <?= /* @escapeNotVerified */ __('Maximum image width') ?>: <strong><?= /* @escapeNotVerified */ $_option->getImageSizeX() ?> <?= /* @escapeNotVerified */ __('px.') ?></strong>
+                <?= $block->escapeHtml(__('Maximum image width')) ?>: <strong><?= (int)$_option->getImageSizeX() ?> <?= $block->escapeHtml(__('px.')) ?></strong>
             </p>
         <?php endif; ?>
-        <?php if ($_option->getImageSizeY() > 0): ?>
+        <?php if ($_option->getImageSizeY() > 0) :?>
             <p class="note">
-                <?= /* @escapeNotVerified */ __('Maximum image height') ?>: <strong><?= /* @escapeNotVerified */ $_option->getImageSizeY() ?> <?= /* @escapeNotVerified */ __('px.') ?></strong>
+                <?= $block->escapeHtml(__('Maximum image height')) ?>: <strong><?= (int)$_option->getImageSizeY() ?> <?= $block->escapeHtml(__('px.')) ?></strong>
             </p>
         <?php endif; ?>
     </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/select.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/select.phtml
index 980b78f917cf2..c4c1d24423bb0 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/select.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/select.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Select */ ?>
@@ -13,15 +10,15 @@
 $_option = $block->getOption();
 $class = ($_option->getIsRequire()) ? ' required' : '';
 ?>
-<div class="field<?= /* @escapeNotVerified */ $class ?>">
-    <label class="label" for="select_<?= /* @escapeNotVerified */ $_option->getId() ?>">
+<div class="field<?= /* @noEscape */ $class ?>">
+    <label class="label" for="select_<?= $block->escapeHtmlAttr($_option->getId()) ?>">
         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
     <div class="control">
         <?= $block->getValuesHtml() ?>
-        <?php if ($_option->getIsRequire()): ?>
-            <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX): ?>
-                <span id="options-<?= /* @escapeNotVerified */ $_option->getId() ?>-container"></span>
+        <?php if ($_option->getIsRequire()) :?>
+            <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX) :?>
+                <span id="options-<?= $block->escapeHtmlAttr($_option->getId()) ?>-container"></span>
             <?php endif; ?>
         <?php endif;?>
     </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml
index a04e366a43a2d..dd4c000d1f338 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Text */ ?>
 <?php
@@ -15,14 +12,14 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
 
 <div class="field<?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_AREA) {
     echo ' textarea';
-} ?><?= /* @escapeNotVerified */ $class ?>">
-    <label class="label" for="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text">
+} ?><?= /* @noEscape */ $class ?>">
+    <label class="label" for="options_<?= $block->escapeHtmlAttr($_option->getId()) ?>_text">
         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
-        <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
+        <?= /* @noEscape */ $block->getFormattedPrice() ?>
     </label>
 
     <div class="control">
-        <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_FIELD): ?>
+        <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_FIELD) :?>
             <?php $_textValidate = null;
             if ($_option->getIsRequire()) {
                 $_textValidate['required'] = true;
@@ -33,15 +30,15 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
             $_textValidate['validate-no-utf8mb4-characters'] = true;
             ?>
             <input type="text"
-                   id="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text"
+                   id="options_<?= $block->escapeHtmlAttr($_option->getId()) ?>_text"
                    class="input-text product-custom-option"
-                   <?php if (!empty($_textValidate)) {?>
-                   data-validate="<?= $block->escapeHtml(json_encode($_textValidate)) ?>"
-                   <?php } ?>
-                   name="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                   data-selector="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                <?php if (!empty($_textValidate)) {?>
+                    data-validate="<?= $block->escapeHtml(json_encode($_textValidate)) ?>"
+                <?php } ?>
+                   name="options[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                   data-selector="options[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
                    value="<?= $block->escapeHtml($block->getDefaultValue()) ?>"/>
-        <?php elseif ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_AREA): ?>
+        <?php elseif ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_AREA) :?>
             <?php $_textAreaValidate = null;
             if ($_option->getIsRequire()) {
                 $_textAreaValidate['required'] = true;
@@ -51,31 +48,31 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
             }
             $_textAreaValidate['validate-no-utf8mb4-characters'] = true;
             ?>
-            <textarea id="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text"
+            <textarea id="options_<?= $block->escapeHtmlAttr($_option->getId()) ?>_text"
                       class="product-custom-option"
                     <?php if (!empty($_textAreaValidate)) {?>
                         data-validate="<?= $block->escapeHtml(json_encode($_textAreaValidate)) ?>"
                     <?php } ?>
-                      name="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                      data-selector="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                      name="options[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                      data-selector="options[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
                       rows="5"
                       cols="25"><?= $block->escapeHtml($block->getDefaultValue()) ?></textarea>
         <?php endif; ?>
-        <?php if ($_option->getMaxCharacters()): ?>
-            <p class="note note_<?= /* @escapeNotVerified */ $_option->getId() ?>">
-                <?= /* @escapeNotVerified */ __('Maximum %1 characters', $_option->getMaxCharacters()) ?>
+        <?php if ($_option->getMaxCharacters()) :?>
+            <p class="note note_<?= $block->escapeHtmlAttr($_option->getId()) ?>">
+                <?= $block->escapeHtml(__('Maximum %1 characters', $_option->getMaxCharacters())) ?>
                 <span class="character-counter no-display"></span>
             </p>
         <?php endif; ?>
     </div>
-    <?php if ($_option->getMaxCharacters()): ?>
+    <?php if ($_option->getMaxCharacters()) :?>
         <script type="text/x-magento-init">
         {
-            "[data-selector='options[<?= /* @escapeNotVerified */ $_option->getId() ?>]']": {
+            "[data-selector='options[<?= $block->escapeJs($_option->getId()) ?>]']": {
                 "Magento_Catalog/js/product/remaining-characters": {
-                    "maxLength":  "<?= /* @escapeNotVerified */ $_option->getMaxCharacters() ?>",
-                    "noteSelector": ".note_<?= /* @escapeNotVerified */ $_option->getId() ?>",
-                    "counterSelector": ".note_<?= /* @escapeNotVerified */ $_option->getId() ?> .character-counter"
+                    "maxLength":  "<?= (int)$_option->getMaxCharacters() ?>",
+                    "noteSelector": ".note_<?= $block->escapeJs($_option->getId()) ?>",
+                    "counterSelector": ".note_<?= $block->escapeJs($_option->getId()) ?> .character-counter"
                 }
             }
         }
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml
index ca6960a215a7a..88ee45bafe731 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper.phtml
@@ -3,14 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var $block Magento\Catalog\Block\Product\View */
 ?>
 <?php
 $required = '';
 if ($block->hasRequiredOptions()) {
-    $required = ' data-hasrequired="' . __('* Required Fields') . '"';
+    $required = ' data-hasrequired="' . $block->escapeHtmlAttr(__('* Required Fields')) . '"';
 }
 ?>
-<div class="product-options-wrapper" id="product-options-wrapper"<?= /* @escapeNotVerified */ $required ?>>
+<div class="product-options-wrapper" id="product-options-wrapper"<?= /* @noEscape */ $required ?>>
     <div class="fieldset" tabindex="0">
         <?= $block->getChildHtml('', true) ?>
     </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/price_clone.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/price_clone.phtml
index e8c0b32fd7692..bad67f98c81d3 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/price_clone.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/price_clone.phtml
@@ -3,11 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+?>
+<?php
+// phpcs:disable PSR2.Files.ClosingTag
 
-// @codingStandardsIgnoreFile
-
+/** @var \Magento\Catalog\Block\Product\AbstractProduct $block */
 ?>
-<?php /** @var \Magento\Catalog\Block\Product\AbstractProduct $block */ ?>
 <?php $_product = $block->getProduct() ?>
 <?= $block->getProductPriceHtml(
     $_product,
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/review.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/review.phtml
index 5575d00df7457..62d6cd202f644 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/review.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/review.phtml
@@ -3,9 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+?>
+<?php
+// phpcs:disable PSR2.Files.ClosingTag
 
-// @codingStandardsIgnoreFile
-
+/** @var $block \Magento\Catalog\Block\Product\AbstractProduct */
 ?>
-<?php /** @var $block \Magento\Catalog\Block\Product\AbstractProduct */ ?>
 <?= $block->getReviewsSummaryHtml($block->getProduct(), false, true) ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/type/default.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/type/default.phtml
index 7e522b4f88306..30edb2df03754 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/type/default.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/type/default.phtml
@@ -3,21 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /* @var $block \Magento\Catalog\Block\Product\View\AbstractView */?>
 <?php $_product = $block->getProduct() ?>
 
-<?php if ($block->displayProductStockStatus()): ?>
-    <?php if ($_product->isAvailable()): ?>
-        <div class="stock available" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
-            <span><?= /* @escapeNotVerified */ __('In stock') ?></span>
+<?php if ($block->displayProductStockStatus()) :?>
+    <?php if ($_product->isAvailable()) :?>
+        <div class="stock available" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
+            <span><?= $block->escapeHtml(__('In stock')) ?></span>
         </div>
-    <?php else: ?>
-        <div class="stock unavailable" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
-            <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
+    <?php else :?>
+        <div class="stock unavailable" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
+            <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
         </div>
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/grid.phtml
index e0550cc7d4414..210aa248a50f6 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/grid.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/grid.phtml
@@ -1,10 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
- //@codingStandardsIgnoreFile
 ?>
 <?php
 /**
@@ -12,7 +10,7 @@
  */
 ?>
 
-<?php /* @escapeNotVerified */ echo $block->renderApp(
+<?= /* @noEscape */ $block->renderApp(
     [
         'widget_columns' => [
             'displayMode' => 'grid'
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/list.phtml
index 3a4f81d946bfd..12ea7d2796e7f 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/list.phtml
@@ -3,8 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
- //@codingStandardsIgnoreFile
 ?>
 <?php
 /**
@@ -12,7 +10,7 @@
  */
 ?>
 
-<?php /* @escapeNotVerified */ echo $block->renderApp(
+<?= /* @noEscape */ $block->renderApp(
     [
         'widget_columns' => [
             'displayMode' => 'list'
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml
index 2d2c91aadd473..187b65a9620e2 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml
@@ -3,8 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
- //@codingStandardsIgnoreFile
 ?>
 <?php
 /**
@@ -12,7 +10,7 @@
  */
 ?>
 
-<?php /* @escapeNotVerified */ echo $block->renderApp(
+<?= /* @noEscape */ $block->renderApp(
     [
         'listing' => [
             'displayMode' => 'grid'
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_block.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_block.phtml
index 2ec671b8de3ab..69f0319134ea0 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_block.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_block.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
 ?>
 <div class="widget block block-product-link">
-    <a <?= /* @escapeNotVerified */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
+    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
 </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_inline.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_inline.phtml
index 373eda1117455..8d9f6500894b4 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_inline.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_inline.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
 ?>
 <span class="widget block block-product-link-inline">
-    <a <?= /* @escapeNotVerified */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
+    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
 </span>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
index 9f6576f61ee7f..9e5da250065cd 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
@@ -4,61 +4,61 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+// phpcs:disable Magento2.Files.LineLength.MaxExceeded
 ?>
-<?php if (($_products = $block->getProductCollection()) && $_products->getSize()): ?>
+<?php if (($_products = $block->getProductCollection()) && $_products->getSize()) :?>
     <div class="block widget block-new-products-list">
         <div class="block-title">
-            <strong><?= /* @escapeNotVerified */ __('New Products') ?></strong>
+            <strong><?= $block->escapeHtml(__('New Products')) ?></strong>
         </div>
         <div class="block-content">
             <?php $suffix = $block->getNameInLayout(); ?>
             <?php $iterator = 1; ?>
-            <ol class="product-items" id="widget-new-products-<?= /* @escapeNotVerified */ $suffix ?>">
-                <?php foreach ($_products->getItems() as $_product): ?>
-                    <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+            <ol class="product-items" id="widget-new-products-<?= $block->escapeHtmlAttr($suffix) ?>">
+                <?php foreach ($_products->getItems() as $_product) :?>
+                    <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                     <div class="product-item-info">
-                        <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
-                           title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
+                        <a class="product-item-photo" href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
+                           title="<?= /* @noEscape */ $block->stripTags($_product->getName(), null, true) ?>">
                             <?= $block->getImage($_product, 'side_column_widget_product_thumbnail')->toHtml() ?>
                         </a>
                         <div class="product-item-details">
                             <strong class="product-item-name">
-                                <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
-                                   title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>)" class="product-item-link">
-                                    <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                                <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
+                                   title="<?= /* @noEscape */ $block->stripTags($_product->getName(), null, true) ?>)" class="product-item-link">
+                                    <?= /* @noEscape */ $this->helper(Magento\Catalog\Helper\Output::class)->productAttribute($_product, $_product->getName(), 'name') ?>
                                 </a>
                             </strong>
-                            <?= /* @escapeNotVerified */ $block->getProductPriceHtml($_product, '-widget-new-' . $suffix) ?>
+                            <?= /* @noEscape */ $block->getProductPriceHtml($_product, '-widget-new-' . $suffix) ?>
                             <div class="product-item-actions">
                                 <div class="actions-primary">
-                                    <?php if ($_product->isSaleable()): ?>
-                                        <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
-                                            <button type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>"
+                                    <?php if ($_product->isSaleable()) :?>
+                                        <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)) :?>
+                                            <button type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>"
                                                     class="action tocart primary"
-                                                    data-mage-init='{"redirectUrl":{"url":"<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_product) ?>"}}'>
-                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
+                                                    data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_product)) ?>"}}'>
+                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                                             </button>
-                                        <?php else: ?>
+                                        <?php else :?>
                                             <?php
-                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                                $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()]);
+                                                $postDataHelper = $this->helper(Magento\Framework\Data\Helper\PostHelper::class);
+                                                $postData = $postDataHelper->getPostData($block->escapeUrl($block->getAddToCartUrl($_product)), ['product' => $_product->getEntityId()]);
                                         ?>
-                                            <button type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>"
+                                            <button type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>"
                                                     class="action tocart primary"
-                                                    data-post='<?= /* @escapeNotVerified */ $postData ?>'>
-                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
+                                                    data-post='<?= /* @noEscape */ $postData ?>'>
+                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                                             </button>
                                         <?php endif; ?>
-                                    <?php else: ?>
-                                        <?php if ($_product->getIsSalable()): ?>
-                                            <div class="stock available" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
-                                                <span><?= /* @escapeNotVerified */ __('In stock') ?></span>
+                                    <?php else :?>
+                                        <?php if ($_product->getIsSalable()) :?>
+                                            <div class="stock available" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
+                                                <span><?= $block->escapeHtml(__('In stock')) ?></span>
                                             </div>
-                                        <?php else: ?>
-                                            <div class="stock unavailable" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
-                                                <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
+                                        <?php else :?>
+                                            <div class="stock unavailable" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
+                                                <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
                                             </div>
                                         <?php endif; ?>
                                     <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_images_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_images_list.phtml
index 2c40f9f7d63dc..8a776adc95018 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_images_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_images_list.phtml
@@ -3,22 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<?php if (($_products = $block->getProductCollection()) && $_products->getSize()): ?>
+<?php if (($_products = $block->getProductCollection()) && $_products->getSize()) :?>
     <div class="block widget block-new-products-images">
         <div class="block-title">
-            <strong><?= /* @escapeNotVerified */ __('New Products') ?></strong>
+            <strong><?= $block->escapeHtml(__('New Products')) ?></strong>
         </div>
         <div class="block-content">
             <?php $suffix = $block->getNameInLayout(); ?>
-            <ol id="widget-new-products-<?= /* @escapeNotVerified */ $suffix ?>" class="product-items product-items-images">
-                <?php foreach ($_products->getItems() as $_product): ?>
+            <ol id="widget-new-products-<?= $block->escapeHtmlAttr($suffix) ?>"
+                class="product-items product-items-images">
+                <?php foreach ($_products->getItems() as $_product) :?>
                     <li class="product-item">
-                        <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
-                           title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
+                        <a class="product-item-photo" href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
+                           title="<?= /* @noEscape */ $block->stripTags($_product->getName(), null, true) ?>">
                             <?php /* new_products_images_only_widget */ ?>
                             <?= $block->getImage($_product, 'new_products_images_only_widget')->toHtml() ?>
                         </a>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_names_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_names_list.phtml
index c0fb12df91137..371d4df7c0206 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_names_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_names_list.phtml
@@ -4,24 +4,26 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
-<?php if (($_products = $block->getProductCollection()) && $_products->getSize()): ?>
+<?php if (($_products = $block->getProductCollection()) && $_products->getSize()) :?>
     <div class="block widget block-new-products-names">
         <div class="block-title">
-            <strong><?= /* @escapeNotVerified */ __('New Products') ?></strong>
+            <strong><?= $block->escapeHtml(__('New Products')) ?></strong>
         </div>
         <div class="block-content">
             <?php $suffix = $block->getNameInLayout(); ?>
-            <ol id="widget-new-products-<?= /* @escapeNotVerified */ $suffix ?>" class="product-items product-items-names">
-                <?php foreach ($_products->getItems() as $_product): ?>
+            <ol id="widget-new-products-<?= $block->escapeHtmlAttr($suffix) ?>"
+                class="product-items product-items-names">
+                <?php foreach ($_products->getItems() as $_product) :?>
                     <li class="product-item">
                         <strong class="product-item-name">
-                            <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
-                               title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>)"
+                            <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
+                               title="<?= /* @noEscape */ $block->stripTags($_product->getName(), null, true) ?>)"
                                class="product-item-link">
-                                <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                                <?= /* @noEscape */ $this->helper(
+                                    Magento\Catalog\Helper\Output::class
+                                )->productAttribute($_product, $_product->getName(), 'name') ?>
                             </a>
                         </strong>
                     </li>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
index e600a571b5b30..7d875d43c4ec6 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /**
@@ -13,6 +10,10 @@
  *
  * @var $block \Magento\Catalog\Block\Product\Widget\NewWidget
  */
+
+// phpcs:disable Magento2.Files.LineLength.MaxExceeded
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
 if ($exist = ($block->getProductCollection() && $block->getProductCollection()->getSize())) {
     $type = 'widget-new-grid';
 
@@ -30,85 +31,94 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
 }
 ?>
 
-<?php if ($exist):?>
-    <div class="block widget block-new-products <?= /* @escapeNotVerified */ $mode ?>">
+<?php if ($exist) :?>
+    <div class="block widget block-new-products <?= /* @noEscape */ $mode ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
+            <strong role="heading" aria-level="2"><?= $block->escapeHtml($title) ?></strong>
         </div>
         <div class="block-content">
-            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
-            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
-                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
+            <?= /* @noEscape */ '<!-- ' . $image . '-->' ?>
+            <div class="products-<?= /* @noEscape */ $mode ?> <?= /* @noEscape */ $mode ?>">
+                <ol class="product-items <?= /* @noEscape */ $type ?>">
                     <?php $iterator = 1; ?>
-                    <?php foreach ($items as $_item): ?>
-                        <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                    <?php foreach ($items as $_item) :?>
+                        <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                         <div class="product-item-info">
-                            <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
+                            <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
+                               class="product-item-photo">
                                 <?= $block->getImage($_item, $image)->toHtml() ?>
                             </a>
                             <div class="product-item-details">
                                 <strong class="product-item-name">
                                     <a title="<?= $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
+                                       href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
                                        class="product-item-link">
                                         <?= $block->escapeHtml($_item->getName()) ?>
                                     </a>
                                 </strong>
-                                <?php
-                                echo $block->getProductPriceHtml($_item, $type);
-                                ?>
+                                <?= $block->getProductPriceHtml($_item, $type); ?>
 
-                                <?php if ($templateType): ?>
+                                <?php if ($templateType) :?>
                                     <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
                                 <?php endif; ?>
 
-                                <?php if ($showWishlist || $showCompare || $showCart): ?>
+                                <?php if ($showWishlist || $showCompare || $showCart) :?>
                                     <div class="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":"<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
-                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
+                                                                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');
-                                                            $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
+                                                            $postDataHelper = $this->helper(Magento\Framework\Data\Helper\PostHelper::class);
+                                                            $postData = $postDataHelper->getPostData(
+                                                                $block->escapeUrl($block->getAddToCartUrl($_item)),
+                                                                ['product' => (int) $_item->getEntityId()]
+                                                            )
                                                         ?>
                                                         <button class="action tocart primary"
-                                                                data-post='<?= /* @escapeNotVerified */ $postData ?>'
-                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
-                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
+                                                                data-post='<?= /* @noEscape */ $postData ?>'
+                                                                type="button"
+                                                                title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                                                         </button>
                                                     <?php endif; ?>
-                                                <?php else: ?>
-                                                    <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
-                                                    <?php else: ?>
-                                                        <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
+                                                <?php else :?>
+                                                    <?php if ($_item->getIsSalable()) :?>
+                                                        <div class="stock available">
+                                                            <span><?= $block->escapeHtml(__('In stock')) ?></span>
+                                                        </div>
+                                                    <?php else :?>
+                                                        <div class="stock unavailable">
+                                                            <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
+                                                        </div>
                                                     <?php endif; ?>
                                                 <?php endif; ?>
                                             </div>
                                         <?php endif; ?>
-                                        <?php if ($showWishlist || $showCompare): ?>
+                                        <?php if ($showWishlist || $showCompare) :?>
                                             <div class="actions-secondary" data-role="add-to-links">
-                                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+                                                <?php if ($this->helper(Magento\Wishlist\Helper\Data::class)->isAllow() && $showWishlist) :?>
                                                     <a href="#"
-                                                       data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
-                                                       class="action towishlist" data-action="add-to-wishlist"
-                                                       title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
-                                                        <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
+                                                       data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>'
+                                                       class="action towishlist"
+                                                       data-action="add-to-wishlist"
+                                                       title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
+                                                        <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
                                                     </a>
                                                 <?php endif; ?>
-                                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
-                                                    <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
+                                                <?php if ($block->getAddToCompareUrl() && $showCompare) :?>
+                                                    <?php $compareHelper = $this->helper(Magento\Catalog\Helper\Product\Compare::class);?>
                                                     <a href="#" class="action tocompare"
-                                                       data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
-                                                       title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
-                                                        <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
+                                                       data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>'
+                                                       title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
+                                                        <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                             </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
index c83140d9342ce..b963a7594a763 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
@@ -3,11 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
+
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+// phpcs:disable Magento2.Files.LineLength.MaxExceeded
+
 /**
  * Template for displaying new products widget
  *
@@ -21,7 +22,8 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
     $image = 'new_products_content_widget_list';
     $title = __('New Products');
     $items = $block->getProductCollection()->getItems();
-    $_helper = $this->helper('Magento\Catalog\Helper\Output');
+    /** @var Magento\Catalog\Helper\Output $_helper */
+    $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
 
     $showWishlist = true;
     $showCompare = true;
@@ -31,95 +33,95 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
 }
 ?>
 
-<?php if ($exist):?>
-    <div class="block widget block-new-products <?= /* @escapeNotVerified */ $mode ?>">
+<?php if ($exist) :?>
+    <div class="block widget block-new-products <?= /* @noEscape */ $mode ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
+            <strong role="heading" aria-level="2"><?= $block->escapeHtml($title) ?></strong>
         </div>
         <div class="block-content">
-            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
-            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
-                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
+            <?= /* @noEscape */ '<!-- ' . $image . '-->' ?>
+            <div class="products-<?= /* @noEscape */ $mode ?> <?= /* @noEscape */ $mode ?>">
+                <ol class="product-items <?= /* @noEscape */ $type ?>">
                     <?php $iterator = 1; ?>
-                    <?php foreach ($items as $_item): ?>
-                        <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                    <?php foreach ($items as $_item) :?>
+                        <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                         <div class="product-item-info">
-                            <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
+                            <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
                                 <?= $block->getImage($_item, $image)->toHtml() ?>
                             </a>
                             <div class="product-item-details">
                                 <strong class="product-item-name">
-                                    <a title="<?= $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
+                                    <a title="<?= $block->escapeHtmlAttr($_item->getName()) ?>"
+                                       href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
                                        class="product-item-link">
                                         <?= $block->escapeHtml($_item->getName()) ?>
                                     </a>
                                 </strong>
                                 <?= $block->getProductPriceHtml($_item, $type) ?>
 
-                                <?php if ($templateType): ?>
+                                <?php if ($templateType) :?>
                                     <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
                                 <?php endif; ?>
 
-                                <?php if ($showWishlist || $showCompare || $showCart): ?>
+                                <?php if ($showWishlist || $showCompare || $showCart) :?>
                                     <div class="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":"<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
-                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
+                                                                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');
+                                                            $postDataHelper = $this->helper(Magento\Framework\Data\Helper\PostHelper::class);
                                                             $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
                                                         ?>
                                                         <button class="action tocart primary"
-                                                                data-post='<?= /* @escapeNotVerified */ $postData ?>'
-                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
-                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
+                                                                data-post='<?= /* @noEscape */ $postData ?>'
+                                                                type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                                                         </button>
                                                     <?php endif; ?>
-                                                <?php else: ?>
-                                                    <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
-                                                    <?php else: ?>
-                                                        <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
+                                                <?php else :?>
+                                                    <?php if ($_item->getIsSalable()) :?>
+                                                        <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
+                                                    <?php else :?>
+                                                        <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
                                                     <?php endif; ?>
                                                 <?php endif; ?>
                                             </div>
                                         <?php endif; ?>
-                                        <?php if ($showWishlist || $showCompare): ?>
+                                        <?php if ($showWishlist || $showCompare) :?>
                                             <div class="actions-secondary" data-role="add-to-links">
-                                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+                                                <?php if ($this->helper(Magento\Wishlist\Helper\Data::class)->isAllow() && $showWishlist) :?>
                                                     <a href="#"
-                                                       data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
+                                                       data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>'
                                                        class="action towishlist" data-action="add-to-wishlist"
-                                                       title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
-                                                        <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
+                                                       title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
+                                                        <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
                                                     </a>
                                                 <?php endif; ?>
-                                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
-                                                    <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare'); ?>
+                                                <?php if ($block->getAddToCompareUrl() && $showCompare) :?>
+                                                    <?php $compareHelper = $this->helper(Magento\Catalog\Helper\Product\Compare::class); ?>
                                                     <a href="#" class="action tocompare"
-                                                       title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>"
-                                                       data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'>
-                                                        <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
+                                                       title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>"
+                                                       data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>'>
+                                                        <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                             </div>
                                         <?php endif; ?>
                                     </div>
                                 <?php endif; ?>
-                                <?php if ($description):?>
+                                <?php if ($description) :?>
                                     <div class="product-item-description">
-                                        <?= /* @escapeNotVerified */ $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
-                                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
-                                           href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
-                                           class="action more"><?= /* @escapeNotVerified */ __('Learn More') ?></a>
+                                        <?= /* @noEscape */ $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
+                                        <a title="<?= $block->escapeHtmlAttr($_item->getName()) ?>"
+                                           href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
+                                           class="action more"><?= $block->escapeHtml(__('Learn More')) ?></a>
                                     </div>
                                 <?php endif; ?>
                             </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml
index 578630a11e930..b919b63c52ed1 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml
@@ -5,12 +5,13 @@
  */
 ?>
 <?php
-/**
- * @var $block \Magento\Ui\Block\Wrapper
- */
+// phpcs:disable Magento2.Security.LanguageConstruct.DirectOutput
+// phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
+
+/** @var $block \Magento\Ui\Block\Wrapper */
 ?>
 
-<?= /* @escapeNotVerified */ $block->renderApp([
+<?= /* @noEscape */ $block->renderApp([
     'widget_columns' => [
         'displayMode' => 'grid'
     ],
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml
index 3770c330ad73e..aad5baa420515 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml
@@ -5,12 +5,13 @@
  */
 ?>
 <?php
-/**
- * @var $block \Magento\Ui\Block\Wrapper
- */
+// phpcs:disable Magento2.Security.LanguageConstruct.DirectOutput
+// phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
+
+/** @var $block \Magento\Ui\Block\Wrapper */
 ?>
 
-<?= /* @escapeNotVerified */ $block->renderApp([
+<?= /* @noEscape */ $block->renderApp([
     'widget_columns' => [
         'displayMode' => 'list'
     ],
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/sidebar.phtml
index 1c4ad3105a2b5..a1748785fda0d 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/sidebar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/sidebar.phtml
@@ -3,8 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
- //@codingStandardsIgnoreFile
 ?>
 <?php
 /**
@@ -12,7 +10,7 @@
  */
 ?>
 
-<?php /* @escapeNotVerified */ echo $block->renderApp(
+<?= /* @noEscape */ $block->renderApp(
     [
         'listing' => [
             'displayMode' => 'grid'
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
index 88be03a04e71a..b8b6ff65be2b4 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
@@ -27,7 +27,9 @@ define([
             directionDefault: 'asc',
             orderDefault: 'position',
             limitDefault: '9',
-            url: ''
+            url: '',
+            formKey: '',
+            post: false
         },
 
         /** @inheritdoc */
@@ -89,7 +91,7 @@ define([
                 baseUrl = urlPaths[0],
                 urlParams = urlPaths[1] ? urlPaths[1].split('&') : [],
                 paramData = {},
-                parameters, i;
+                parameters, i, form, params, key, input, formKey;
 
             for (i = 0; i < urlParams.length; i++) {
                 parameters = urlParams[i].split('=');
@@ -99,12 +101,38 @@ define([
             }
             paramData[paramName] = paramValue;
 
-            if (paramValue == defaultValue) { //eslint-disable-line eqeqeq
-                delete paramData[paramName];
-            }
-            paramData = $.param(paramData);
+            if (this.options.post) {
+                form = document.createElement('form');
+                params = [this.options.mode, this.options.direction, this.options.order, this.options.limit];
+
+                for (key in paramData) {
+                    if (params.indexOf(key) !== -1) { //eslint-disable-line max-depth
+                        input = document.createElement('input');
+                        input.name = key;
+                        input.value = paramData[key];
+                        form.appendChild(input);
+                        delete paramData[key];
+                    }
+                }
+                formKey = document.createElement('input');
+                formKey.name = 'form_key';
+                formKey.value = this.options.formKey;
+                form.appendChild(formKey);
+
+                paramData = $.param(paramData);
+                baseUrl += paramData.length ? '?' + paramData : '';
 
-            location.href = baseUrl + (paramData.length ? '?' + paramData : '');
+                form.action = baseUrl;
+                form.method = 'POST';
+                document.body.appendChild(form);
+                form.submit();
+            } else {
+                if (paramValue == defaultValue) { //eslint-disable-line eqeqeq
+                    delete paramData[paramName];
+                }
+                paramData = $.param(paramData);
+                location.href = baseUrl + (paramData.length ? '?' + paramData : '');
+            }
         }
     });
 
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/validate-product.js b/app/code/Magento/Catalog/view/frontend/web/js/validate-product.js
index c0637cb672dc6..755e777a01f77 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/validate-product.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/validate-product.js
@@ -13,7 +13,8 @@ define([
     $.widget('mage.productValidate', {
         options: {
             bindSubmit: false,
-            radioCheckboxClosest: '.nested'
+            radioCheckboxClosest: '.nested',
+            addToCartButtonSelector: '.action.tocart'
         },
 
         /**
@@ -41,6 +42,7 @@ define([
                     return false;
                 }
             });
+            $(this.options.addToCartButtonSelector).attr('disabled', false);
         }
     });
 
diff --git a/app/code/Magento/CatalogAnalytics/composer.json b/app/code/Magento/CatalogAnalytics/composer.json
index ead59ef212600..09df8e3329403 100644
--- a/app/code/Magento/CatalogAnalytics/composer.json
+++ b/app/code/Magento/CatalogAnalytics/composer.json
@@ -2,12 +2,12 @@
     "name": "magento/module-catalog-analytics",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*",
         "magento/module-catalog": "102.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index bf46c0efb2a74..dc172bacb32f9 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\CatalogImportExport\Model\Export;
 
+use Magento\Catalog\Model\ResourceModel\Product\Option\Collection;
 use Magento\ImportExport\Model\Import;
 use \Magento\Store\Model\Store;
 use \Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
@@ -202,7 +203,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
     protected $_itemFactory;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product\Option\Collection
+     * @var Collection
      */
     protected $_optionColFactory;
 
@@ -1161,6 +1162,10 @@ protected function isValidAttributeValue($code, $value)
             $isValid = false;
         }
 
+        if (is_array($value)) {
+            $isValid = false;
+        }
+
         return $isValid;
     }
 
@@ -1273,11 +1278,23 @@ private function appendMultirowData(&$dataRow, $multiRawData)
         }
 
         if (!empty($multiRawData['customOptionsData'][$productLinkId][$storeId])) {
+            $shouldBeMerged = true;
             $customOptionsRows = $multiRawData['customOptionsData'][$productLinkId][$storeId];
-            $multiRawData['customOptionsData'][$productLinkId][$storeId] = [];
-            $customOptions = implode(ImportProduct::PSEUDO_MULTI_LINE_SEPARATOR, $customOptionsRows);
 
-            $dataRow = array_merge($dataRow, ['custom_options' => $customOptions]);
+            if ($storeId != Store::DEFAULT_STORE_ID
+                && !empty($multiRawData['customOptionsData'][$productLinkId][Store::DEFAULT_STORE_ID])
+            ) {
+                $defaultCustomOptions = $multiRawData['customOptionsData'][$productLinkId][Store::DEFAULT_STORE_ID];
+                if (!array_diff($defaultCustomOptions, $customOptionsRows)) {
+                    $shouldBeMerged = false;
+                }
+            }
+
+            if ($shouldBeMerged) {
+                $multiRawData['customOptionsData'][$productLinkId][$storeId] = [];
+                $customOptions = implode(ImportProduct::PSEUDO_MULTI_LINE_SEPARATOR, $customOptionsRows);
+                $dataRow = array_merge($dataRow, ['custom_options' => $customOptions]);
+            }
         }
 
         if (empty($dataRow)) {
@@ -1369,56 +1386,55 @@ protected function optionRowToCellString($option)
     protected function getCustomOptionsData($productIds)
     {
         $customOptionsData = [];
+        $defaultOptionsData = [];
 
         foreach (array_keys($this->_storeIdToCode) as $storeId) {
             $options = $this->_optionColFactory->create();
-            /* @var \Magento\Catalog\Model\ResourceModel\Product\Option\Collection $options*/
-            $options->reset()->addOrder(
-                'sort_order',
-                \Magento\Catalog\Model\ResourceModel\Product\Option\Collection::SORT_ORDER_ASC
-            )->addTitleToResult(
-                $storeId
-            )->addPriceToResult(
-                $storeId
-            )->addProductToFilter(
-                $productIds
-            )->addValuesToResult(
-                $storeId
-            );
+            /* @var Collection $options*/
+            $options->reset()
+                ->addOrder('sort_order', Collection::SORT_ORDER_ASC)
+                ->addTitleToResult($storeId)
+                ->addPriceToResult($storeId)
+                ->addProductToFilter($productIds)
+                ->addValuesToResult($storeId);
 
             foreach ($options as $option) {
+                $optionData = $option->toArray();
                 $row = [];
                 $productId = $option['product_id'];
                 $row['name'] = $option['title'];
                 $row['type'] = $option['type'];
-                if (Store::DEFAULT_STORE_ID === $storeId) {
-                    $row['required'] = $option['is_require'];
-                    $row['price'] = $option['price'];
-                    $row['price_type'] = ($option['price_type'] === 'percent') ? 'percent' : 'fixed';
-                    $row['sku'] = $option['sku'];
-                    if ($option['max_characters']) {
-                        $row['max_characters'] = $option['max_characters'];
-                    }
-
-                    foreach (['file_extension', 'image_size_x', 'image_size_y'] as $fileOptionKey) {
-                        if (!isset($option[$fileOptionKey])) {
-                            continue;
-                        }
 
-                        $row[$fileOptionKey] = $option[$fileOptionKey];
+                $row['required'] = $this->getOptionValue('is_require', $defaultOptionsData, $optionData);
+                $row['price'] = $this->getOptionValue('price', $defaultOptionsData, $optionData);
+                $row['sku'] = $this->getOptionValue('sku', $defaultOptionsData, $optionData);
+                if (array_key_exists('max_characters', $optionData)
+                    || array_key_exists('max_characters', $defaultOptionsData)
+                ) {
+                    $row['max_characters'] = $this->getOptionValue('max_characters', $defaultOptionsData, $optionData);
+                }
+                foreach (['file_extension', 'image_size_x', 'image_size_y'] as $fileOptionKey) {
+                    if (isset($option[$fileOptionKey]) || isset($defaultOptionsData[$fileOptionKey])) {
+                        $row[$fileOptionKey] = $this->getOptionValue($fileOptionKey, $defaultOptionsData, $optionData);
                     }
                 }
+                $percentType = $this->getOptionValue('price_type', $defaultOptionsData, $optionData);
+                $row['price_type'] = ($percentType === 'percent') ? 'percent' : 'fixed';
+
+                if (Store::DEFAULT_STORE_ID === $storeId) {
+                    $optionId = $option['option_id'];
+                    $defaultOptionsData[$optionId] = $option->toArray();
+                }
+
                 $values = $option->getValues();
 
                 if ($values) {
                     foreach ($values as $value) {
                         $row['option_title'] = $value['title'];
-                        if (Store::DEFAULT_STORE_ID === $storeId) {
-                            $row['option_title'] = $value['title'];
-                            $row['price'] = $value['price'];
-                            $row['price_type'] = ($value['price_type'] === 'percent') ? 'percent' : 'fixed';
-                            $row['sku'] = $value['sku'];
-                        }
+                        $row['option_title'] = $value['title'];
+                        $row['price'] = $value['price'];
+                        $row['price_type'] = ($value['price_type'] === 'percent') ? 'percent' : 'fixed';
+                        $row['sku'] = $value['sku'];
                         $customOptionsData[$productId][$storeId][] = $this->optionRowToCellString($row);
                     }
                 } else {
@@ -1432,6 +1448,29 @@ protected function getCustomOptionsData($productIds)
         return $customOptionsData;
     }
 
+    /**
+     * Get value for custom option according to store or default value
+     *
+     * @param string $optionName
+     * @param array $defaultOptionsData
+     * @param array $optionData
+     * @return mixed
+     */
+    private function getOptionValue(string $optionName, array $defaultOptionsData, array $optionData)
+    {
+        $optionId = $optionData['option_id'];
+
+        if (isset($optionData[$optionName])) {
+            return $optionData[$optionName];
+        }
+
+        if (isset($defaultOptionsData[$optionId][$optionName])) {
+            return $defaultOptionsData[$optionId][$optionName];
+        }
+
+        return null;
+    }
+
     /**
      * Clean up already loaded attribute collection.
      *
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 84fa13e6599d9..9f3f3d6ce5fb8 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -3,12 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CatalogImportExport\Model\Import;
 
 use Magento\Catalog\Model\Config as CatalogConfig;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\CatalogImportExport\Model\Import\Product\MediaGalleryProcessor;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as ValidatorInterface;
+use Magento\CatalogImportExport\Model\StockItemImporterInterface;
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\LocalizedException;
@@ -638,6 +640,13 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      */
     private $_logger;
 
+    /**
+     * "Duplicate multiselect values" error array key
+     *
+     * @var string
+     */
+    private static $errorDuplicateMultiselectValues = 'duplicatedMultiselectValues';
+
     /**
      * {@inheritdoc}
      */
@@ -767,7 +776,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * @param CatalogConfig $catalogConfig
      * @param MediaGalleryProcessor $mediaProcessor
      * @param ProductRepositoryInterface|null $productRepository
-     * @throws \Magento\Framework\Exception\LocalizedException
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -857,11 +865,8 @@ public function __construct(
             $string,
             $errorAggregator
         );
-        $this->_optionEntity = isset(
-            $data['option_entity']
-        ) ? $data['option_entity'] : $optionFactory->create(
-            ['data' => ['product_entity' => $this]]
-        );
+        $this->_optionEntity = $data['option_entity']
+            ?? $optionFactory->create(['data' => ['product_entity' => $this]]);
 
         $this->_initAttributeSets()
             ->_initTypeModels()
@@ -869,6 +874,9 @@ public function __construct(
         $this->validator->init($this);
         $this->productRepository = $productRepository ?? \Magento\Framework\App\ObjectManager::getInstance()
                 ->get(ProductRepositoryInterface::class);
+
+        $errorMessageText = __('Value for multiselect attribute %s contains duplicated values');
+        $this->_messageTemplates[self::$errorDuplicateMultiselectValues] = $errorMessageText;
     }
 
     /**
@@ -884,7 +892,7 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData, $
     {
         if (!$this->validator->isAttributeValid($attrCode, $attrParams, $rowData)) {
             foreach ($this->validator->getMessages() as $message) {
-                $this->addRowError($message, $rowNum, $attrCode);
+                $this->skipRow($rowNum, $message, ProcessingError::ERROR_LEVEL_NOT_CRITICAL, $attrCode);
             }
             return false;
         }
@@ -1372,7 +1380,7 @@ protected function _saveProductCategories(array $categoriesData)
                 $delProductId[] = $productId;
 
                 foreach (array_keys($categories) as $categoryId) {
-                    $categoriesIn[] = ['product_id' => $productId, 'category_id' => $categoryId, 'position' => 1];
+                    $categoriesIn[] = ['product_id' => $productId, 'category_id' => $categoryId, 'position' => 0];
                 }
             }
             if (Import::BEHAVIOR_APPEND != $this->getBehavior()) {
@@ -1579,8 +1587,12 @@ protected function _saveProducts()
                     continue;
                 }
                 if ($this->getErrorAggregator()->hasToBeTerminated()) {
-                    $this->getErrorAggregator()->addRowToSkip($rowNum);
-                    continue;
+                    if (ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_SKIP_ERRORS
+                        !== $this->_parameters[Import::FIELD_NAME_VALIDATION_STRATEGY]
+                    ) {
+                        $this->getErrorAggregator()->addRowToSkip($rowNum);
+                        continue;
+                    }
                 }
                 $rowScope = $this->getRowScope($rowData);
 
@@ -1588,7 +1600,7 @@ protected function _saveProducts()
                 if (!empty($rowData[self::URL_KEY])) {
                     // If url_key column and its value were in the CSV file
                     $rowData[self::URL_KEY] = $urlKey;
-                } else if ($this->isNeedToChangeUrlKey($rowData)) {
+                } elseif ($this->isNeedToChangeUrlKey($rowData)) {
                     // If url_key column was empty or even not declared in the CSV file but by the rules it is need to
                     // be setteed. In case when url_key is generating from name column we have to ensure that the bunch
                     // of products will pass for the event with url_key column.
@@ -1600,7 +1612,9 @@ protected function _saveProducts()
                 if (null === $rowSku) {
                     $this->getErrorAggregator()->addRowToSkip($rowNum);
                     continue;
-                } elseif (self::SCOPE_STORE == $rowScope) {
+                }
+
+                if (self::SCOPE_STORE == $rowScope) {
                     // set necessary data from SCOPE_DEFAULT row
                     $rowData[self::COL_TYPE] = $this->skuProcessor->getNewSku($rowSku)['type_id'];
                     $rowData['attribute_set_id'] = $this->skuProcessor->getNewSku($rowSku)['attr_set_id'];
@@ -1735,13 +1749,8 @@ protected function _saveProducts()
                             if ($uploadedFile) {
                                 $uploadedImages[$columnImage] = $uploadedFile;
                             } else {
-                                $this->addRowError(
-                                    ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE,
-                                    $rowNum,
-                                    null,
-                                    null,
-                                    ProcessingError::ERROR_LEVEL_NOT_CRITICAL
-                                );
+                                unset($rowData[$column]);
+                                $this->skipRow($rowNum, ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE);
                             }
                         } else {
                             $uploadedFile = $uploadedImages[$columnImage];
@@ -2375,32 +2384,35 @@ public function validateRow(array $rowData, $rowNum)
         // BEHAVIOR_DELETE and BEHAVIOR_REPLACE use specific validation logic
         if (Import::BEHAVIOR_REPLACE == $this->getBehavior()) {
             if (self::SCOPE_DEFAULT == $rowScope && !$this->isSkuExist($sku)) {
-                $this->addRowError(ValidatorInterface::ERROR_SKU_NOT_FOUND_FOR_DELETE, $rowNum);
+                $this->skipRow($rowNum, ValidatorInterface::ERROR_SKU_NOT_FOUND_FOR_DELETE);
                 return false;
             }
         }
         if (Import::BEHAVIOR_DELETE == $this->getBehavior()) {
             if (self::SCOPE_DEFAULT == $rowScope && !$this->isSkuExist($sku)) {
-                $this->addRowError(ValidatorInterface::ERROR_SKU_NOT_FOUND_FOR_DELETE, $rowNum);
+                $this->skipRow($rowNum, ValidatorInterface::ERROR_SKU_NOT_FOUND_FOR_DELETE);
                 return false;
             }
             return true;
         }
 
+        // if product doesn't exist, need to throw critical error else all errors should be not critical.
+        $errorLevel = $this->getValidationErrorLevel($sku);
+
         if (!$this->validator->isValid($rowData)) {
             foreach ($this->validator->getMessages() as $message) {
-                $this->addRowError($message, $rowNum, $this->validator->getInvalidAttribute());
+                $this->skipRow($rowNum, $message, $errorLevel, $this->validator->getInvalidAttribute());
             }
         }
 
         if (null === $sku) {
-            $this->addRowError(ValidatorInterface::ERROR_SKU_IS_EMPTY, $rowNum);
+            $this->skipRow($rowNum, ValidatorInterface::ERROR_SKU_IS_EMPTY, $errorLevel);
         } elseif (false === $sku) {
-            $this->addRowError(ValidatorInterface::ERROR_ROW_IS_ORPHAN, $rowNum);
+            $this->skipRow($rowNum, ValidatorInterface::ERROR_ROW_IS_ORPHAN, $errorLevel);
         } elseif (self::SCOPE_STORE == $rowScope
             && !$this->storeResolver->getStoreCodeToId($rowData[self::COL_STORE])
         ) {
-            $this->addRowError(ValidatorInterface::ERROR_INVALID_STORE, $rowNum);
+            $this->skipRow($rowNum, ValidatorInterface::ERROR_INVALID_STORE, $errorLevel);
         }
 
         // SKU is specified, row is SCOPE_DEFAULT, new product block begins
@@ -2415,19 +2427,15 @@ public function validateRow(array $rowData, $rowNum)
                     $this->prepareNewSkuData($sku)
                 );
             } else {
-                $this->addRowError(ValidatorInterface::ERROR_TYPE_UNSUPPORTED, $rowNum);
+                $this->skipRow($rowNum, ValidatorInterface::ERROR_TYPE_UNSUPPORTED, $errorLevel);
             }
         } else {
             // validate new product type and attribute set
-            if (!isset($rowData[self::COL_TYPE]) || !isset($this->_productTypeModels[$rowData[self::COL_TYPE]])) {
-                $this->addRowError(ValidatorInterface::ERROR_INVALID_TYPE, $rowNum);
-            } elseif (!isset(
-                    $rowData[self::COL_ATTR_SET]
-                ) || !isset(
-                    $this->_attrSetNameToId[$rowData[self::COL_ATTR_SET]]
-                )
+            if (!isset($rowData[self::COL_TYPE], $this->_productTypeModels[$rowData[self::COL_TYPE]])) {
+                $this->skipRow($rowNum, ValidatorInterface::ERROR_INVALID_TYPE, $errorLevel);
+            } elseif (!isset($rowData[self::COL_ATTR_SET], $this->_attrSetNameToId[$rowData[self::COL_ATTR_SET]])
             ) {
-                $this->addRowError(ValidatorInterface::ERROR_INVALID_ATTR_SET, $rowNum);
+                $this->skipRow($rowNum, ValidatorInterface::ERROR_INVALID_ATTR_SET, $errorLevel);
             } elseif (is_null($this->skuProcessor->getNewSku($sku))) {
                 $this->skuProcessor->addNewSku(
                     $sku,
@@ -2483,8 +2491,11 @@ public function validateRow(array $rowData, $rowNum)
                         ValidatorInterface::ERROR_DUPLICATE_URL_KEY,
                         $rowNum,
                         $rowData[self::COL_NAME],
-                        $message
-                    );
+                        $message,
+                        $errorLevel
+                    )
+                        ->getErrorAggregator()
+                        ->addRowToSkip($rowNum);
                 }
             }
         }
@@ -2494,9 +2505,10 @@ public function validateRow(array $rowData, $rowNum)
             $newFromTimestamp = strtotime($this->dateTime->formatDate($rowData[self::COL_NEW_FROM_DATE], false));
             $newToTimestamp = strtotime($this->dateTime->formatDate($rowData[self::COL_NEW_TO_DATE], false));
             if ($newFromTimestamp > $newToTimestamp) {
-                $this->addRowError(
-                    ValidatorInterface::ERROR_NEW_TO_DATE,
+                $this->skipRow(
                     $rowNum,
+                    ValidatorInterface::ERROR_NEW_TO_DATE,
+                    $errorLevel,
                     $rowData[self::COL_NEW_TO_DATE]
                 );
             }
@@ -2513,6 +2525,12 @@ public function validateRow(array $rowData, $rowNum)
      */
     private function isNeedToValidateUrlKey($rowData)
     {
+        if (!empty($rowData[self::COL_SKU]) && empty($rowData[self::URL_KEY])
+            && $this->getBehavior() === Import::BEHAVIOR_APPEND
+            && $this->isSkuExist($rowData[self::COL_SKU])) {
+            return false;
+        }
+
         return (!empty($rowData[self::URL_KEY]) || !empty($rowData[self::COL_NAME]))
             && (empty($rowData[self::COL_VISIBILITY])
                 || $rowData[self::COL_VISIBILITY]
@@ -2826,10 +2844,12 @@ protected function getProductUrlSuffix($storeId = null)
     protected function getUrlKey($rowData)
     {
         if (!empty($rowData[self::URL_KEY])) {
-            return $this->productUrl->formatUrlKey($rowData[self::URL_KEY]);
+            $urlKey = (string) $rowData[self::URL_KEY];
+            return trim(strtolower($urlKey));
         }
 
-        if (!empty($rowData[self::COL_NAME])) {
+        if (!empty($rowData[self::COL_NAME])
+            && (array_key_exists(self::URL_KEY, $rowData) || !$this->isSkuExist($rowData[self::COL_SKU]))) {
             return $this->productUrl->formatUrlKey($rowData[self::COL_NAME]);
         }
 
@@ -2992,9 +3012,7 @@ private function formatStockDataForRow(array $rowData)
         )
         ) {
             $stockItemDo->setData($row);
-            $row['is_in_stock'] = $stockItemDo->getBackorders() && isset($row['is_in_stock'])
-                ? $row['is_in_stock']
-                : $this->stockStateProvider->verifyStock($stockItemDo);
+            $row['is_in_stock'] = $row['is_in_stock'] ?? $this->stockStateProvider->verifyStock($stockItemDo);
             if ($this->stockStateProvider->verifyNotification($stockItemDo)) {
                 $row['low_stock_date'] = $this->dateTime->gmDate(
                     'Y-m-d H:i:s',
@@ -3026,4 +3044,39 @@ private function retrieveProductBySku(string $sku)
 
         return $product;
     }
+
+    /**
+     * Add row as skipped
+     *
+     * @param int $rowNum
+     * @param string $errorCode Error code or simply column name
+     * @param string $errorLevel error level
+     * @param string|null $colName optional column name
+     * @return $this
+     */
+    private function skipRow(
+        int $rowNum,
+        string $errorCode,
+        string $errorLevel = ProcessingError::ERROR_LEVEL_NOT_CRITICAL,
+        $colName = null
+    ): self {
+        $this->addRowError($errorCode, $rowNum, $colName, null, $errorLevel);
+        $this->getErrorAggregator()
+            ->addRowToSkip($rowNum);
+
+        return $this;
+    }
+
+    /**
+     * Returns errorLevel for validation
+     *
+     * @param string|bool|null $sku
+     * @return string
+     */
+    private function getValidationErrorLevel($sku): string
+    {
+        return (!$this->isSkuExist($sku) && Import::BEHAVIOR_REPLACE !== $this->getBehavior())
+            ? ProcessingError::ERROR_LEVEL_CRITICAL
+            : ProcessingError::ERROR_LEVEL_NOT_CRITICAL;
+    }
 }
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
index 99fe2e58c2405..fd6212bb636a5 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
@@ -195,6 +195,8 @@ public function __construct(
     }
 
     /**
+     * Initialize template for error message.
+     *
      * @param array $templateCollection
      * @return $this
      */
@@ -377,6 +379,8 @@ public function retrieveAttributeFromCache($attributeCode)
     }
 
     /**
+     * Adding attribute option.
+     *
      * In case we've dynamically added new attribute option during import we need to add it to our cache
      * in order to keep it up to date.
      *
@@ -508,8 +512,10 @@ public function isSuitable()
     }
 
     /**
-     * Prepare attributes values for save: exclude non-existent, static or with empty values attributes;
-     * set default values if needed
+     * Adding default attribute to product before save.
+     *
+     * Prepare attributes values for save: exclude non-existent, static or with empty values attributes,
+     * set default values if needed.
      *
      * @param array $rowData
      * @param bool $withDefaultValue
@@ -537,9 +543,9 @@ public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDe
                 } else {
                     $resultAttrs[$attrCode] = $rowData[$attrCode];
                 }
-            } elseif (array_key_exists($attrCode, $rowData)) {
+            } elseif (array_key_exists($attrCode, $rowData) && empty($rowData['_store'])) {
                 $resultAttrs[$attrCode] = $rowData[$attrCode];
-            } elseif ($withDefaultValue && null !== $attrParams['default_value']) {
+            } elseif ($withDefaultValue && null !== $attrParams['default_value'] && empty($rowData['_store'])) {
                 $resultAttrs[$attrCode] = $attrParams['default_value'];
             }
         }
@@ -605,7 +611,8 @@ protected function getProductEntityLinkField()
     }
 
     /**
-     * Clean cached values
+     * Clean cached values.
+     *
      * @since 100.2.0
      */
     public function __destruct()
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php b/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
index 2ac9f2e5a4992..081934dfdfb14 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
@@ -108,7 +108,7 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
      * @param \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $validator
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\Filesystem\File\ReadFactory $readFactory
-     * @param null $filePath
+     * @param string|null $filePath
      * @param \Magento\Framework\App\Filesystem\DirectoryResolver|null $directoryResolver
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -157,29 +157,48 @@ public function init()
      * @param string $fileName
      * @param bool $renameFileOff
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function move($fileName, $renameFileOff = false)
     {
         if ($renameFileOff) {
             $this->setAllowRenameFiles(false);
         }
+
+        if ($this->getTmpDir()) {
+            $filePath = $this->getTmpDir() . '/';
+        } else {
+            $filePath = '';
+        }
+
         if (preg_match('/\bhttps?:\/\//i', $fileName, $matches)) {
             $url = str_replace($matches[0], '', $fileName);
+            $driver = $matches[0] === $this->httpScheme ? DriverPool::HTTP : DriverPool::HTTPS;
+            $read = $this->_readFactory->create($url, $driver);
+
+            //only use filename (for URI with query parameters)
+            $parsedUrlPath = parse_url($url, PHP_URL_PATH);
+            if ($parsedUrlPath) {
+                $urlPathValues = explode('/', $parsedUrlPath);
+                if (!empty($urlPathValues)) {
+                    $fileName = end($urlPathValues);
+                }
+            }
 
-            if ($matches[0] === $this->httpScheme) {
-                $read = $this->_readFactory->create($url, DriverPool::HTTP);
-            } else {
-                $read = $this->_readFactory->create($url, DriverPool::HTTPS);
+            $fileExtension = pathinfo($fileName, PATHINFO_EXTENSION);
+            if ($fileExtension && !$this->checkAllowedExtension($fileExtension)) {
+                throw new \Magento\Framework\Exception\LocalizedException(__('Disallowed file type.'));
             }
 
             $fileName = preg_replace('/[^a-z0-9\._-]+/i', '', $fileName);
+            $relativePath = $this->_directory->getRelativePath($filePath . $fileName);
             $this->_directory->writeFile(
-                $this->_directory->getRelativePath($this->getTmpDir() . '/' . $fileName),
+                $relativePath,
                 $read->readAll()
             );
         }
 
-        $filePath = $this->_directory->getRelativePath($this->getTmpDir() . '/' . $fileName);
+        $filePath = $this->_directory->getRelativePath($filePath . $fileName);
         $this->_setUploadFile($filePath);
         $destDir = $this->_directory->getAbsolutePath($this->getDestDir());
         $result = $this->save($destDir);
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 1cd19852f393c..3f72fcc39f548 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
@@ -3,10 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CatalogImportExport\Test\Unit\Model\Import;
 
+use Magento\CatalogImportExport\Model\Import\Product;
+use Magento\CatalogImportExport\Model\Import\Product\ImageTypeProcessor;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\ImportExport\Model\Import;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Class ProductTest
@@ -25,126 +29,126 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
 
     const ENTITY_ID = 13;
 
-    /** @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\DB\Adapter\AdapterInterface| MockObject */
     protected $_connection;
 
-    /** @var \Magento\Framework\Json\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\Json\Helper\Data| MockObject */
     protected $jsonHelper;
 
-    /** @var \Magento\ImportExport\Model\ResourceModel\Import\Data|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\ImportExport\Model\ResourceModel\Import\Data| MockObject */
     protected $_dataSourceModel;
 
-    /** @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\App\ResourceConnection| MockObject */
     protected $resource;
 
-    /** @var \Magento\ImportExport\Model\ResourceModel\Helper|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\ImportExport\Model\ResourceModel\Helper| MockObject */
     protected $_resourceHelper;
 
-    /** @var \Magento\Framework\Stdlib\StringUtils|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\Stdlib\StringUtils|MockObject */
     protected $string;
 
-    /** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\Event\ManagerInterface|MockObject */
     protected $_eventManager;
 
-    /** @var \Magento\CatalogInventory\Api\StockRegistryInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\CatalogInventory\Api\StockRegistryInterface|MockObject */
     protected $stockRegistry;
 
-    /** @var \Magento\CatalogImportExport\Model\Import\Product\OptionFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\CatalogImportExport\Model\Import\Product\OptionFactory|MockObject */
     protected $optionFactory;
 
-    /** @var \Magento\CatalogInventory\Api\StockConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\CatalogInventory\Api\StockConfigurationInterface|MockObject */
     protected $stockConfiguration;
 
-    /** @var \Magento\CatalogInventory\Model\Spi\StockStateProviderInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\CatalogInventory\Model\Spi\StockStateProviderInterface|MockObject */
     protected $stockStateProvider;
 
-    /** @var \Magento\CatalogImportExport\Model\Import\Product\Option|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\CatalogImportExport\Model\Import\Product\Option|MockObject */
     protected $optionEntity;
 
-    /** @var \Magento\Framework\Stdlib\DateTime|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\Stdlib\DateTime|MockObject */
     protected $dateTime;
 
     /** @var array */
     protected $data;
 
-    /** @var \Magento\ImportExport\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\ImportExport\Helper\Data|MockObject */
     protected $importExportData;
 
-    /** @var \Magento\ImportExport\Model\ResourceModel\Import\Data|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\ImportExport\Model\ResourceModel\Import\Data|MockObject */
     protected $importData;
 
-    /** @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Eav\Model\Config|MockObject */
     protected $config;
 
-    /** @var \Magento\ImportExport\Model\ResourceModel\Helper|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\ImportExport\Model\ResourceModel\Helper|MockObject */
     protected $resourceHelper;
 
-    /** @var \Magento\Catalog\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Catalog\Helper\Data|MockObject */
     protected $_catalogData;
 
-    /** @var \Magento\ImportExport\Model\Import\Config|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\ImportExport\Model\Import\Config|MockObject */
     protected $_importConfig;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    /** @var MockObject */
     protected $_resourceFactory;
 
     // @codingStandardsIgnoreStart
-    /** @var  \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory|MockObject */
     protected $_setColFactory;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Product\Type\Factory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\CatalogImportExport\Model\Import\Product\Type\Factory|MockObject */
     protected $_productTypeFactory;
 
-    /** @var  \Magento\Catalog\Model\ResourceModel\Product\LinkFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\Catalog\Model\ResourceModel\Product\LinkFactory|MockObject */
     protected $_linkFactory;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Proxy\ProductFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\CatalogImportExport\Model\Import\Proxy\ProductFactory|MockObject */
     protected $_proxyProdFactory;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\UploaderFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\CatalogImportExport\Model\Import\UploaderFactory|MockObject */
     protected $_uploaderFactory;
 
-    /** @var  \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\Framework\Filesystem|MockObject */
     protected $_filesystem;
 
-    /** @var  \Magento\Framework\Filesystem\Directory\WriteInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\Framework\Filesystem\Directory\WriteInterface|MockObject */
     protected $_mediaDirectory;
 
-    /** @var  \Magento\CatalogInventory\Model\ResourceModel\Stock\ItemFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\CatalogInventory\Model\ResourceModel\Stock\ItemFactory|MockObject */
     protected $_stockResItemFac;
 
-    /** @var  \Magento\Framework\Stdlib\DateTime\TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\Framework\Stdlib\DateTime\TimezoneInterface|MockObject */
     protected $_localeDate;
 
-    /** @var \Magento\Framework\Indexer\IndexerRegistry|\PHPUnit_Framework_MockObject_MockObject  */
+    /** @var \Magento\Framework\Indexer\IndexerRegistry|MockObject */
     protected $indexerRegistry;
 
-    /** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject  */
+    /** @var \Psr\Log\LoggerInterface|MockObject */
     protected $_logger;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Product\StoreResolver|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\CatalogImportExport\Model\Import\Product\StoreResolver|MockObject */
     protected $storeResolver;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Product\SkuProcessor|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\CatalogImportExport\Model\Import\Product\SkuProcessor|MockObject */
     protected $skuProcessor;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Product\CategoryProcessor|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\CatalogImportExport\Model\Import\Product\CategoryProcessor|MockObject */
     protected $categoryProcessor;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Product\Validator|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\CatalogImportExport\Model\Import\Product\Validator|MockObject */
     protected $validator;
 
-    /** @var  \Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor|MockObject */
     protected $objectRelationProcessor;
 
-    /** @var  \Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface|MockObject */
     protected $transactionManager;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Product\TaxClassProcessor|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\CatalogImportExport\Model\Import\Product\TaxClassProcessor|MockObject */
     // @codingStandardsIgnoreEnd
     protected $taxClassProcessor;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Product */
+    /** @var  Product */
     protected $importProduct;
 
     /**
@@ -152,10 +156,10 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
      */
     protected $errorAggregator;
 
-    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject*/
+    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|MockObject */
     protected $scopeConfig;
 
-    /** @var \Magento\Catalog\Model\Product\Url|\PHPUnit_Framework_MockObject_MockObject*/
+    /** @var \Magento\Catalog\Model\Product\Url|MockObject */
     protected $productUrl;
 
     /**
@@ -334,7 +338,7 @@ protected function setUp()
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         $this->importProduct = $objectManager->getObject(
-            \Magento\CatalogImportExport\Model\Import\Product::class,
+            Product::class,
             [
                 'jsonHelper' => $this->jsonHelper,
                 'importExportData' => $this->importExportData,
@@ -375,7 +379,7 @@ protected function setUp()
                 'data' => $this->data
             ]
         );
-        $reflection = new \ReflectionClass(\Magento\CatalogImportExport\Model\Import\Product::class);
+        $reflection = new \ReflectionClass(Product::class);
         $reflectionProperty = $reflection->getProperty('metadataPool');
         $reflectionProperty->setAccessible(true);
         $reflectionProperty->setValue($this->importProduct, $metadataPoolMock);
@@ -584,7 +588,7 @@ public function testGetMultipleValueSeparatorFromParameters()
 
     public function testDeleteProductsForReplacement()
     {
-        $importProduct = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product::class)
+        $importProduct = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->setMethods([
                 'setParameters', '_deleteProducts'
@@ -650,7 +654,7 @@ public function testValidateRowIsAlreadyValidated()
      */
     public function testValidateRow($rowScope, $oldSku, $expectedResult, $behaviour = Import::BEHAVIOR_DELETE)
     {
-        $importProduct = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product::class)
+        $importProduct = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->setMethods(['getBehavior', 'getRowScope', 'getErrorAggregator'])
             ->getMock();
@@ -662,7 +666,7 @@ public function testValidateRow($rowScope, $oldSku, $expectedResult, $behaviour
             ->method('getErrorAggregator')
             ->willReturn($this->getErrorAggregatorObject());
         $importProduct->expects($this->once())->method('getRowScope')->willReturn($rowScope);
-        $skuKey = \Magento\CatalogImportExport\Model\Import\Product::COL_SKU;
+        $skuKey = Product::COL_SKU;
         $rowData = [
             $skuKey => 'sku',
         ];
@@ -674,18 +678,22 @@ public function testValidateRow($rowScope, $oldSku, $expectedResult, $behaviour
 
     public function testValidateRowDeleteBehaviourAddRowErrorCall()
     {
-        $importProduct = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product::class)
+        $importProduct = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getBehavior', 'getRowScope', 'addRowError'])
+            ->setMethods(['getBehavior', 'getRowScope', 'addRowError', 'getErrorAggregator'])
             ->getMock();
 
         $importProduct->expects($this->exactly(2))->method('getBehavior')
             ->willReturn(\Magento\ImportExport\Model\Import::BEHAVIOR_DELETE);
         $importProduct->expects($this->once())->method('getRowScope')
-            ->willReturn(\Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT);
+            ->willReturn(Product::SCOPE_DEFAULT);
         $importProduct->expects($this->once())->method('addRowError');
+        $importProduct->method('getErrorAggregator')
+            ->willReturn(
+                $this->getErrorAggregatorObject(['addRowToSkip'])
+            );
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => 'sku',
+            Product::COL_SKU => 'sku',
         ];
 
         $importProduct->validateRow($rowData, 0);
@@ -696,7 +704,7 @@ public function testValidateRowValidatorCheck()
         $messages = ['validator message'];
         $this->validator->expects($this->once())->method('getMessages')->willReturn($messages);
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => 'sku',
+            Product::COL_SKU => 'sku',
         ];
         $rowNum = 0;
         $this->importProduct->validateRow($rowData, $rowNum);
@@ -798,7 +806,7 @@ public function getStoreIdByCodeDataProvider()
         return [
             [
                 '$storeCode' => null,
-                '$expectedResult' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT,
+                '$expectedResult' => Product::SCOPE_DEFAULT,
             ],
             [
                 '$storeCode' => 'value',
@@ -813,17 +821,17 @@ public function getStoreIdByCodeDataProvider()
     public function testValidateRowCheckSpecifiedSku($sku, $expectedError)
     {
         $importProduct = $this->createModelMockWithErrorAggregator(
-            [ 'addRowError', 'getOptionEntity', 'getRowScope'],
+            ['addRowError', 'getOptionEntity', 'getRowScope'],
             ['isRowInvalid' => true]
         );
 
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_STORE => '',
+            Product::COL_SKU => $sku,
+            Product::COL_STORE => '',
         ];
 
-        $this->storeResolver->expects($this->any())->method('getStoreCodeToId')->willReturn(null);
+        $this->storeResolver->method('getStoreCodeToId')->willReturn(null);
         $this->setPropertyValue($importProduct, 'storeResolver', $this->storeResolver);
         $this->setPropertyValue($importProduct, 'skuProcessor', $this->skuProcessor);
 
@@ -832,7 +840,7 @@ public function testValidateRowCheckSpecifiedSku($sku, $expectedError)
         $importProduct
             ->expects($this->once())
             ->method('getRowScope')
-            ->willReturn(\Magento\CatalogImportExport\Model\Import\Product::SCOPE_STORE);
+            ->willReturn(Product::SCOPE_STORE);
         $importProduct->expects($this->at(1))->method('addRowError')->with($expectedError, $rowNum)->willReturn(null);
 
         $importProduct->validateRow($rowData, $rowNum);
@@ -846,7 +854,7 @@ public function testValidateRowProcessEntityIncrement()
         $errorAggregator->method('isRowInvalid')->willReturn(true);
         $this->setPropertyValue($this->importProduct, '_processedEntitiesCount', $count);
         $this->setPropertyValue($this->importProduct, 'errorAggregator', $errorAggregator);
-        $rowData = [\Magento\CatalogImportExport\Model\Import\Product::COL_SKU => false];
+        $rowData = [Product::COL_SKU => false];
         //suppress validator
         $this->_setValidatorMockInImportProduct($this->importProduct);
         $this->importProduct->validateRow($rowData, $rowNum);
@@ -856,14 +864,14 @@ public function testValidateRowProcessEntityIncrement()
     public function testValidateRowValidateExistingProductTypeAddNewSku()
     {
         $importProduct = $this->createModelMockWithErrorAggregator(
-            [ 'addRowError', 'getOptionEntity'],
+            ['addRowError', 'getOptionEntity'],
             ['isRowInvalid' => true]
         );
 
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
+            Product::COL_SKU => $sku,
         ];
         $oldSku = [
             $sku => [
@@ -886,7 +894,7 @@ public function testValidateRowValidateExistingProductTypeAddNewSku()
         $this->setPropertyValue($importProduct, '_oldSku', $oldSku);
 
         $expectedData = [
-            'entity_id' =>  $oldSku[$sku]['entity_id'], //entity_id_val
+            'entity_id' => $oldSku[$sku]['entity_id'], //entity_id_val
             'type_id' => $oldSku[$sku]['type_id'],// type_id_val
             'attr_set_id' => $oldSku[$sku]['attr_set_id'], //attr_set_id_val
             'attr_set_code' => $_attrSetIdToName[$oldSku[$sku]['attr_set_id']],//attr_set_id_val
@@ -904,7 +912,7 @@ public function testValidateRowValidateExistingProductTypeAddErrorRowCall()
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
+            Product::COL_SKU => $sku,
         ];
         $oldSku = [
             $sku => [
@@ -929,6 +937,11 @@ public function testValidateRowValidateExistingProductTypeAddErrorRowCall()
 
     /**
      * @dataProvider validateRowValidateNewProductTypeAddRowErrorCallDataProvider
+     * @param string $colType
+     * @param string $productTypeModelsColType
+     * @param string $colAttrSet
+     * @param string $attrSetNameToIdColAttrSet
+     * @param string $error
      */
     public function testValidateRowValidateNewProductTypeAddRowErrorCall(
         $colType,
@@ -940,15 +953,15 @@ public function testValidateRowValidateNewProductTypeAddRowErrorCall(
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_TYPE => $colType,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => $colAttrSet,
+            Product::COL_SKU => $sku,
+            Product::COL_TYPE => $colType,
+            Product::COL_ATTR_SET => $colAttrSet,
         ];
         $_attrSetNameToId = [
-            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => $attrSetNameToIdColAttrSet,
+            $rowData[Product::COL_ATTR_SET] => $attrSetNameToIdColAttrSet,
         ];
         $_productTypeModels = [
-            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_TYPE] => $productTypeModelsColType,
+            $rowData[Product::COL_TYPE] => $productTypeModelsColType,
         ];
         $oldSku = [
             $sku => null,
@@ -976,29 +989,25 @@ public function testValidateRowValidateNewProductTypeGetNewSkuCall()
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_TYPE => 'value',
-            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => 'value',
+            Product::COL_SKU => $sku,
+            Product::COL_TYPE => 'value',
+            Product::COL_ATTR_SET => 'value',
         ];
         $_productTypeModels = [
-            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_TYPE] => 'value',
+            $rowData[Product::COL_TYPE] => 'value',
         ];
         $oldSku = [
             $sku => null,
         ];
         $_attrSetNameToId = [
-            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => 'attr_set_code_val'
+            $rowData[Product::COL_ATTR_SET] => 'attr_set_code_val',
         ];
         $expectedData = [
             'entity_id' => null,
-            'type_id' => $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_TYPE],//value
+            'type_id' => $rowData[Product::COL_TYPE],
             //attr_set_id_val
-            'attr_set_id' => $_attrSetNameToId[
-                $rowData[
-                    \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET
-                ]
-            ],
-            'attr_set_code' => $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET],//value
+            'attr_set_id' => $_attrSetNameToId[$rowData[Product::COL_ATTR_SET]],
+            'attr_set_code' => $rowData[Product::COL_ATTR_SET],
             'row_id' => null
         ];
         $importProduct = $this->createModelMockWithErrorAggregator(
@@ -1034,8 +1043,8 @@ public function testValidateRowSetAttributeSetCodeIntoRowData()
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => 'col_attr_set_val',
+            Product::COL_SKU => $sku,
+            Product::COL_ATTR_SET => 'col_attr_set_val',
         ];
         $expectedAttrSetCode = 'new_attr_set_code';
         $newSku = [
@@ -1043,8 +1052,8 @@ public function testValidateRowSetAttributeSetCodeIntoRowData()
             'type_id' => 'new_type_id_val',
         ];
         $expectedRowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => $newSku['attr_set_code'],
+            Product::COL_SKU => $sku,
+            Product::COL_ATTR_SET => $newSku['attr_set_code'],
         ];
         $oldSku = [
             $sku => [
@@ -1078,8 +1087,8 @@ public function testValidateValidateOptionEntity()
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => 'col_attr_set_val',
+            Product::COL_SKU => $sku,
+            Product::COL_ATTR_SET => 'col_attr_set_val',
         ];
         $oldSku = [
             $sku => [
@@ -1336,7 +1345,7 @@ public function validateRowDataProvider()
     {
         return [
             [
-                '$rowScope' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT,
+                '$rowScope' => Product::SCOPE_DEFAULT,
                 '$oldSku' => null,
                 '$expectedResult' => false,
             ],
@@ -1351,12 +1360,12 @@ public function validateRowDataProvider()
                 '$expectedResult' => true,
             ],
             [
-                '$rowScope' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT,
+                '$rowScope' => Product::SCOPE_DEFAULT,
                 '$oldSku' => true,
                 '$expectedResult' => true,
             ],
             [
-                '$rowScope' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT,
+                '$rowScope' => Product::SCOPE_DEFAULT,
                 '$oldSku' => null,
                 '$expectedResult' => false,
                 '$behaviour' => Import::BEHAVIOR_REPLACE
@@ -1377,7 +1386,7 @@ public function isAttributeValidAssertAttrValidDataProvider()
                 '$rowData' => [
                     'code' => str_repeat(
                         'a',
-                        \Magento\CatalogImportExport\Model\Import\Product::DB_MAX_VARCHAR_LENGTH - 1
+                        Product::DB_MAX_VARCHAR_LENGTH - 1
                     ),
                 ],
             ],
@@ -1430,7 +1439,7 @@ public function isAttributeValidAssertAttrValidDataProvider()
                 '$rowData' => [
                     'code' => str_repeat(
                         'a',
-                        \Magento\CatalogImportExport\Model\Import\Product::DB_MAX_TEXT_LENGTH - 1
+                        Product::DB_MAX_TEXT_LENGTH - 1
                     ),
                 ],
             ],
@@ -1450,7 +1459,7 @@ public function isAttributeValidAssertAttrInvalidDataProvider()
                 '$rowData' => [
                     'code' => str_repeat(
                         'a',
-                        \Magento\CatalogImportExport\Model\Import\Product::DB_MAX_VARCHAR_LENGTH + 1
+                        Product::DB_MAX_VARCHAR_LENGTH + 1
                     ),
                 ],
             ],
@@ -1503,7 +1512,7 @@ public function isAttributeValidAssertAttrInvalidDataProvider()
                 '$rowData' => [
                     'code' => str_repeat(
                         'a',
-                        \Magento\CatalogImportExport\Model\Import\Product::DB_MAX_TEXT_LENGTH + 1
+                        Product::DB_MAX_TEXT_LENGTH + 1
                     ),
                 ],
             ],
@@ -1515,8 +1524,8 @@ public function isAttributeValidAssertAttrInvalidDataProvider()
      */
     public function getRowScopeDataProvider()
     {
-        $colSku = \Magento\CatalogImportExport\Model\Import\Product::COL_SKU;
-        $colStore = \Magento\CatalogImportExport\Model\Import\Product::COL_STORE;
+        $colSku = Product::COL_SKU;
+        $colStore = Product::COL_STORE;
 
         return [
             [
@@ -1524,21 +1533,21 @@ public function getRowScopeDataProvider()
                     $colSku => null,
                     $colStore => 'store',
                 ],
-                '$expectedResult' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_STORE
+                '$expectedResult' => Product::SCOPE_STORE,
             ],
             [
                 '$rowData' => [
                     $colSku => 'sku',
                     $colStore => null,
                 ],
-                '$expectedResult' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT
+                '$expectedResult' => Product::SCOPE_DEFAULT,
             ],
             [
                 '$rowData' => [
                     $colSku => 'sku',
                     $colStore => 'store',
                 ],
-                '$expectedResult' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_STORE
+                '$expectedResult' => Product::SCOPE_STORE,
             ],
         ];
     }
@@ -1615,9 +1624,9 @@ protected function overrideMethod(&$object, $methodName, array $parameters = [])
      *
      * @see _rewriteGetOptionEntityInImportProduct()
      * @see _setValidatorMockInImportProduct()
-     * @param \Magento\CatalogImportExport\Model\Import\Product
+     * @param Product
      *  Param should go with rewritten getOptionEntity method.
-     * @return \Magento\CatalogImportExport\Model\Import\Product\Option|\PHPUnit_Framework_MockObject_MockObject
+     * @return \Magento\CatalogImportExport\Model\Import\Product\Option|MockObject
      */
     private function _suppressValidateRowOptionValidatorInvalidRows($importProduct)
     {
@@ -1633,8 +1642,8 @@ private function _suppressValidateRowOptionValidatorInvalidRows($importProduct)
      * Used in group of validateRow method's tests.
      * Set validator mock in importProduct, return true for isValid method.
      *
-     * @param \Magento\CatalogImportExport\Model\Import\Product
-     * @return \Magento\CatalogImportExport\Model\Import\Product\Validator|\PHPUnit_Framework_MockObject_MockObject
+     * @param Product
+     * @return \Magento\CatalogImportExport\Model\Import\Product\Validator|MockObject
      */
     private function _setValidatorMockInImportProduct($importProduct)
     {
@@ -1648,9 +1657,9 @@ private function _setValidatorMockInImportProduct($importProduct)
      * Used in group of validateRow method's tests.
      * Make getOptionEntity return option mock.
      *
-     * @param \Magento\CatalogImportExport\Model\Import\Product
+     * @param Product
      *  Param should go with rewritten getOptionEntity method.
-     * @return \Magento\CatalogImportExport\Model\Import\Product\Option|\PHPUnit_Framework_MockObject_MockObject
+     * @return \Magento\CatalogImportExport\Model\Import\Product\Option|MockObject
      */
     private function _rewriteGetOptionEntityInImportProduct($importProduct)
     {
@@ -1665,12 +1674,12 @@ private function _rewriteGetOptionEntityInImportProduct($importProduct)
     /**
      * @param array $methods
      * @param array $errorAggregatorMethods
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return MockObject
      */
     protected function createModelMockWithErrorAggregator(array $methods = [], array $errorAggregatorMethods = [])
     {
         $methods[] = 'getErrorAggregator';
-        $importProduct = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product::class)
+        $importProduct = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->setMethods($methods)
             ->getMock();
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 eceea9947811c..aa21f6a392b47 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/UploaderTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/UploaderTest.php
@@ -56,6 +56,9 @@ class UploaderTest extends \PHPUnit\Framework\TestCase
      */
     protected $uploader;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->coreFileStorageDb = $this->getMockBuilder(\Magento\MediaStorage\Helper\File\Storage\Database::class)
@@ -79,7 +82,7 @@ protected function setUp()
             ->setMethods(['create'])
             ->getMock();
 
-        $this->directoryMock = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\Writer::class)
+        $this->directoryMock = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\Write::class)
             ->setMethods(['writeFile', 'getRelativePath', 'isWritable', 'isReadable', 'getAbsolutePath'])
             ->disableOriginalConstructor()
             ->getMock();
@@ -109,23 +112,32 @@ protected function setUp()
                 null,
                 $this->directoryResolver
             ])
-            ->setMethods(['_setUploadFile', 'save', 'getTmpDir'])
+            ->setMethods(['_setUploadFile', 'save', 'getTmpDir', 'checkAllowedExtension'])
             ->getMock();
     }
 
     /**
      * @dataProvider moveFileUrlDataProvider
+     * @param string $fileUrl
+     * @param string $expectedHost
+     * @param string $expectedFileName
+     * @param int $checkAllowedExtension
+     * @return void
      */
-    public function testMoveFileUrl($fileUrl, $expectedHost, $expectedFileName)
-    {
+    public function testMoveFileUrl(
+        string $fileUrl,
+        string $expectedHost,
+        string $expectedFileName,
+        int $checkAllowedExtension
+    ) {
         $destDir = 'var/dest/dir';
-        $expectedRelativeFilePath = $this->uploader->getTmpDir() . '/' . $expectedFileName;
+        $expectedRelativeFilePath = $expectedFileName;
         $this->directoryMock->expects($this->once())->method('isWritable')->with($destDir)->willReturn(true);
         $this->directoryMock->expects($this->any())->method('getRelativePath')->with($expectedRelativeFilePath);
         $this->directoryMock->expects($this->once())->method('getAbsolutePath')->with($destDir)
             ->willReturn($destDir . '/' . $expectedFileName);
         // Check writeFile() method invoking.
-        $this->directoryMock->expects($this->any())->method('writeFile')->will($this->returnValue($expectedFileName));
+        $this->directoryMock->expects($this->any())->method('writeFile')->willReturn($expectedFileName);
 
         // Create adjusted reader which does not validate path.
         $readMock = $this->getMockBuilder(\Magento\Framework\Filesystem\File\Read::class)
@@ -133,17 +145,20 @@ public function testMoveFileUrl($fileUrl, $expectedHost, $expectedFileName)
             ->setMethods(['readAll'])
             ->getMock();
         // Check readAll() method invoking.
-        $readMock->expects($this->once())->method('readAll')->will($this->returnValue(null));
+        $readMock->expects($this->once())->method('readAll')->willReturn(null);
 
         // Check create() method invoking with expected argument.
         $this->readFactory->expects($this->once())
                         ->method('create')
                         ->will($this->returnValue($readMock))->with($expectedHost);
         //Check invoking of getTmpDir(), _setUploadFile(), save() methods.
-        $this->uploader->expects($this->any())->method('getTmpDir')->will($this->returnValue(''));
-        $this->uploader->expects($this->once())->method('_setUploadFile')->will($this->returnSelf());
+        $this->uploader->expects($this->any())->method('getTmpDir')->willReturn('');
+        $this->uploader->expects($this->once())->method('_setUploadFile')->willReturnSelf();
         $this->uploader->expects($this->once())->method('save')->with($destDir . '/' . $expectedFileName)
             ->willReturn(['name' => $expectedFileName, 'path' => 'absPath']);
+        $this->uploader->expects($this->exactly($checkAllowedExtension))
+            ->method('checkAllowedExtension')
+            ->willReturn(true);
 
         $this->uploader->setDestDir($destDir);
         $result = $this->uploader->move($fileUrl);
@@ -155,14 +170,14 @@ public function testMoveFileName()
     {
         $destDir = 'var/dest/dir';
         $fileName = 'test_uploader_file';
-        $expectedRelativeFilePath = $this->uploader->getTmpDir() . '/' . $fileName;
+        $expectedRelativeFilePath = $fileName;
         $this->directoryMock->expects($this->once())->method('isWritable')->with($destDir)->willReturn(true);
         $this->directoryMock->expects($this->any())->method('getRelativePath')->with($expectedRelativeFilePath);
         $this->directoryMock->expects($this->once())->method('getAbsolutePath')->with($destDir)
             ->willReturn($destDir . '/' . $fileName);
         //Check invoking of getTmpDir(), _setUploadFile(), save() methods.
-        $this->uploader->expects($this->once())->method('getTmpDir')->will($this->returnValue(''));
-        $this->uploader->expects($this->once())->method('_setUploadFile')->will($this->returnSelf());
+        $this->uploader->expects($this->once())->method('getTmpDir')->willReturn('');
+        $this->uploader->expects($this->once())->method('_setUploadFile')->willReturnSelf();
         $this->uploader->expects($this->once())->method('save')->with($destDir . '/' . $fileName)
             ->willReturn(['name' => $fileName]);
 
@@ -239,12 +254,38 @@ public function moveFileUrlDataProvider()
             [
                 '$fileUrl' => 'http://test_uploader_file',
                 '$expectedHost' => 'test_uploader_file',
-                '$expectedFileName' => 'httptest_uploader_file',
+                '$expectedFileName' => 'test_uploader_file',
+                '$checkAllowedExtension' => 0,
             ],
             [
                 '$fileUrl' => 'https://!:^&`;file',
                 '$expectedHost' => '!:^&`;file',
-                '$expectedFileName' => 'httpsfile',
+                '$expectedFileName' => 'file',
+                '$checkAllowedExtension' => 0,
+            ],
+            [
+                '$fileUrl' => 'https://www.google.com/image.jpg',
+                '$expectedHost' => 'www.google.com/image.jpg',
+                '$expectedFileName' => 'image.jpg',
+                '$checkAllowedExtension' => 1,
+            ],
+            [
+                '$fileUrl' => 'https://www.google.com/image.jpg?param=1',
+                '$expectedHost' => 'www.google.com/image.jpg?param=1',
+                '$expectedFileName' => 'image.jpg',
+                '$checkAllowedExtension' => 1,
+            ],
+            [
+                '$fileUrl' => 'https://www.google.com/image.jpg?param=1&param=2',
+                '$expectedHost' => 'www.google.com/image.jpg?param=1&param=2',
+                '$expectedFileName' => 'image.jpg',
+                '$checkAllowedExtension' => 1,
+            ],
+            [
+                '$fileUrl' => 'http://www.google.com/image.jpg?param=1&param=2',
+                '$expectedHost' => 'www.google.com/image.jpg?param=1&param=2',
+                '$expectedFileName' => 'image.jpg',
+                '$checkAllowedExtension' => 1,
             ],
         ];
     }
@@ -253,8 +294,9 @@ public function moveFileUrlDataProvider()
      * @dataProvider validatePathDataProvider
      *
      * @param bool $pathIsValid
+     * @return void
      */
-    public function testSetTmpDir($pathIsValid)
+    public function testSetTmpDir(bool $pathIsValid)
     {
         $path = 'path';
         $absolutePath = 'absolute_path';
@@ -272,11 +314,11 @@ public function testSetTmpDir($pathIsValid)
      *
      * @return array
      */
-    public function validatePathDataProvider()
+    public function validatePathDataProvider(): array
     {
         return [
             [true],
-            [false]
+            [false],
         ];
     }
 }
diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json
index 39b05acc4e3b6..4e050dec829ef 100644
--- a/app/code/Magento/CatalogImportExport/composer.json
+++ b/app/code/Magento/CatalogImportExport/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-import-export",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-catalog": "102.0.*",
         "magento/module-catalog-url-rewrite": "100.2.*",
         "magento/module-eav": "101.0.*",
@@ -16,7 +16,7 @@
         "ext-ctype": "*"
     },
     "type": "magento2-module",
-    "version": "100.2.5",
+    "version": "100.2.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php b/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
index 568fa600ec52d..6614b418da920 100644
--- a/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
+++ b/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
@@ -131,7 +131,8 @@ public function getPlaceholderId()
      */
     public function isMsgVisible()
     {
-        return $this->getStockQty() > 0 && $this->getStockQtyLeft() <= $this->getThresholdQty();
+        return $this->getStockQty() > 0 && $this->getStockQtyLeft() > 0
+            && $this->getStockQtyLeft() <= $this->getThresholdQty();
     }
 
     /**
diff --git a/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php b/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php
index b4f5d8b670fb2..96bf5bd965355 100644
--- a/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php
+++ b/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php
@@ -95,7 +95,7 @@ protected function serializeValue($value)
             }
             return $this->serializer->serialize($data);
         } else {
-            return '';
+            return $value;
         }
     }
 
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
index bc10d38173b4d..f5c26d4294927 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
@@ -6,12 +6,19 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\CatalogInventory\Model\Indexer\Stock\Action;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
+use Magento\CatalogInventory\Model\Indexer\Stock\BatchSizeManagement;
+use Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock;
 use Magento\Framework\App\ResourceConnection;
 use Magento\CatalogInventory\Model\ResourceModel\Indexer\StockFactory;
 use Magento\Catalog\Model\Product\Type as ProductType;
+use Magento\Framework\DB\Query\BatchIteratorInterface;
+use Magento\Framework\DB\Query\Generator as QueryGenerator;
 use Magento\Framework\Indexer\CacheContext;
 use Magento\Framework\Event\ManagerInterface as EventManager;
 use Magento\Framework\EntityManager\MetadataPool;
@@ -25,7 +32,6 @@
 /**
  * Class Full reindex action
  *
- * @package Magento\CatalogInventory\Model\Indexer\Stock\Action
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Full extends AbstractAction
@@ -60,6 +66,11 @@ class Full extends AbstractAction
      */
     private $activeTableSwitcher;
 
+    /**
+     * @var QueryGenerator|null
+     */
+    private $batchQueryGenerator;
+
     /**
      * @param ResourceConnection $resource
      * @param StockFactory $indexerFactory
@@ -71,7 +82,7 @@ class Full extends AbstractAction
      * @param BatchProviderInterface|null $batchProvider
      * @param array $batchRowsCount
      * @param ActiveTableSwitcher|null $activeTableSwitcher
-     *
+     * @param QueryGenerator|null $batchQueryGenerator
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -84,7 +95,8 @@ public function __construct(
         BatchSizeManagementInterface $batchSizeManagement = null,
         BatchProviderInterface $batchProvider = null,
         array $batchRowsCount = [],
-        ActiveTableSwitcher $activeTableSwitcher = null
+        ActiveTableSwitcher $activeTableSwitcher = null,
+        QueryGenerator $batchQueryGenerator = null
     ) {
         parent::__construct(
             $resource,
@@ -97,11 +109,12 @@ public function __construct(
         $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
         $this->batchProvider = $batchProvider ?: ObjectManager::getInstance()->get(BatchProviderInterface::class);
         $this->batchSizeManagement = $batchSizeManagement ?: ObjectManager::getInstance()->get(
-            \Magento\CatalogInventory\Model\Indexer\Stock\BatchSizeManagement::class
+            BatchSizeManagement::class
         );
         $this->batchRowsCount = $batchRowsCount;
         $this->activeTableSwitcher = $activeTableSwitcher ?: ObjectManager::getInstance()
             ->get(ActiveTableSwitcher::class);
+        $this->batchQueryGenerator = $batchQueryGenerator ?: ObjectManager::getInstance()->get(QueryGenerator::class);
     }
 
     /**
@@ -109,9 +122,7 @@ public function __construct(
      *
      * @param null|array $ids
      * @throws LocalizedException
-     *
      * @return void
-     *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($ids = null)
@@ -120,11 +131,11 @@ public function execute($ids = null)
             $this->useIdxTable(false);
             $this->cleanIndexersTables($this->_getTypeIndexers());
 
-            $entityMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+            $entityMetadata = $this->metadataPool->getMetadata(ProductInterface::class);
 
             $columns = array_keys($this->_getConnection()->describeTable($this->_getIdxTable()));
 
-            /** @var \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock $indexer */
+            /** @var DefaultStock $indexer */
             foreach ($this->_getTypeIndexers() as $indexer) {
                 $indexer->setActionType(self::ACTION_TYPE);
                 $connection = $indexer->getConnection();
@@ -135,22 +146,21 @@ public function execute($ids = null)
                     : $this->batchRowsCount['default'];
 
                 $this->batchSizeManagement->ensureBatchSize($connection, $batchRowCount);
-                $batches = $this->batchProvider->getBatches(
-                    $connection,
-                    $entityMetadata->getEntityTable(),
+
+                $select = $connection->select();
+                $select->distinct(true);
+                $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
+
+                $batchQueries = $this->batchQueryGenerator->generate(
                     $entityMetadata->getIdentifierField(),
-                    $batchRowCount
+                    $select,
+                    $batchRowCount,
+                    BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
                 );
 
-                foreach ($batches as $batch) {
+                foreach ($batchQueries as $query) {
                     $this->clearTemporaryIndexTable();
-                    // Get entity ids from batch
-                    $select = $connection->select();
-                    $select->distinct(true);
-                    $select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
-                    $select->where('type_id = ?', $indexer->getTypeId());
-
-                    $entityIds = $this->batchProvider->getBatchIds($connection, $select, $batch);
+                    $entityIds = $connection->fetchCol($query);
                     if (!empty($entityIds)) {
                         $indexer->reindexEntity($entityIds);
                         $select = $connection->select()->from($this->_getIdxTable(), $columns);
@@ -167,6 +177,7 @@ public function execute($ids = null)
 
     /**
      * Delete all records from index table
+     *
      * Used to clean table before re-indexation
      *
      * @param array $indexers
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php b/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php
index 0d0d42009315e..ee613ac1db018 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php
@@ -161,7 +161,10 @@ public function save(StockItemInterface $stockItem)
             $typeId = $product->getTypeId() ?: $product->getTypeInstance()->getTypeId();
             $isQty = $this->stockConfiguration->isQty($typeId);
             if ($isQty) {
-                $this->changeIsInStockIfNecessary($stockItem);
+                $isInStock = $this->stockStateProvider->verifyStock($stockItem);
+                if ($stockItem->getManageStock() && !$isInStock) {
+                    $stockItem->setIsInStock(false)->setStockStatusChangedAutomaticallyFlag(true);
+                }
                 // if qty is below notify qty, update the low stock date to today date otherwise set null
                 $stockItem->setLowStockDate(null);
                 if ($this->stockStateProvider->verifyNotification($stockItem)) {
@@ -257,29 +260,4 @@ private function getStockRegistryStorage()
         }
         return $this->stockRegistryStorage;
     }
-
-    /**
-     * Change is_in_stock value if necessary.
-     *
-     * @param StockItemInterface $stockItem
-     *
-     * @return void
-     */
-    private function changeIsInStockIfNecessary(StockItemInterface $stockItem)
-    {
-        $isInStock = $this->stockStateProvider->verifyStock($stockItem);
-        if ($stockItem->getManageStock() && !$isInStock) {
-            $stockItem->setIsInStock(false)->setStockStatusChangedAutomaticallyFlag(true);
-        }
-
-        if ($stockItem->getManageStock()
-            && $isInStock
-            && !$stockItem->getIsInStock()
-            && $stockItem->getQty() > 0
-            && $stockItem->getOrigData(\Magento\CatalogInventory\Api\Data\StockItemInterface::QTY) <= 0
-            && $stockItem->getOrigData(\Magento\CatalogInventory\Api\Data\StockItemInterface::QTY) !== null
-        ) {
-            $stockItem->setIsInStock(true)->setStockStatusChangedAutomaticallyFlag(true);
-        }
-    }
 }
diff --git a/app/code/Magento/CatalogInventory/Model/StockManagement.php b/app/code/Magento/CatalogInventory/Model/StockManagement.php
index 107645a45a390..ed8fcef5dea03 100644
--- a/app/code/Magento/CatalogInventory/Model/StockManagement.php
+++ b/app/code/Magento/CatalogInventory/Model/StockManagement.php
@@ -83,6 +83,7 @@ public function __construct(
 
     /**
      * Subtract product qtys from stock.
+     *
      * Return array of items that require full save.
      *
      * @param string[] $items
@@ -139,17 +140,25 @@ public function registerProductsSale($items, $websiteId = null)
     }
 
     /**
-     * @param string[] $items
-     * @param int $websiteId
-     * @return bool
+     * @inheritdoc
      */
     public function revertProductsSale($items, $websiteId = null)
     {
         //if (!$websiteId) {
         $websiteId = $this->stockConfiguration->getDefaultScopeId();
         //}
-        $this->qtyCounter->correctItemsQty($items, $websiteId, '+');
-        return true;
+        $revertItems = [];
+        foreach ($items as $productId => $qty) {
+            $stockItem = $this->stockRegistryProvider->getStockItem($productId, $websiteId);
+            $canSubtractQty = $stockItem->getItemId() && $this->canSubtractQty($stockItem);
+            if (!$canSubtractQty || !$this->stockConfiguration->isQty($stockItem->getTypeId())) {
+                continue;
+            }
+            $revertItems[$productId] = $qty;
+        }
+        $this->qtyCounter->correctItemsQty($revertItems, $websiteId, '+');
+
+        return $revertItems;
     }
 
     /**
@@ -193,6 +202,8 @@ protected function getProductType($productId)
     }
 
     /**
+     * Get stock resource.
+     *
      * @return ResourceStock
      */
     protected function getResource()
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistry.php b/app/code/Magento/CatalogInventory/Model/StockRegistry.php
index d688132fdb916..30b08ee4b8e7f 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistry.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistry.php
@@ -171,6 +171,16 @@ public function updateStockItemBySku($productSku, \Magento\CatalogInventory\Api\
         $productId = $this->resolveProductId($productSku);
         $websiteId = $stockItem->getWebsiteId() ?: null;
         $origStockItem = $this->getStockItem($productId, $websiteId);
+
+        if ($stockItem->getManageStock()
+            && !$stockItem->getIsInStock()
+            && $stockItem->getQty() > 0
+            && $stockItem->getOrigData(\Magento\CatalogInventory\Api\Data\StockItemInterface::QTY) <= 0
+            && $stockItem->getOrigData(\Magento\CatalogInventory\Api\Data\StockItemInterface::QTY) !== null
+        ) {
+            $stockItem->setIsInStock(true)->setStockStatusChangedAutomaticallyFlag(true);
+        }
+
         $data = $stockItem->getData();
         if ($origStockItem->getItemId()) {
             unset($data['item_id']);
diff --git a/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php b/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
index 1e99794d68a40..098e254d785a5 100644
--- a/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
@@ -6,15 +6,21 @@
 
 namespace Magento\CatalogInventory\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\CatalogInventory\Api\StockManagementInterface;
+use Magento\CatalogInventory\Model\Configuration;
 use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
 
 /**
  * Catalog inventory module observer
  */
 class CancelOrderItemObserver implements ObserverInterface
 {
+    /**
+     * @var \Magento\CatalogInventory\Model\Configuration
+     */
+    protected $configuration;
+
     /**
      * @var StockManagementInterface
      */
@@ -26,13 +32,16 @@ class CancelOrderItemObserver implements ObserverInterface
     protected $priceIndexer;
 
     /**
+     * @param Configuration $configuration
      * @param StockManagementInterface $stockManagement
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
      */
     public function __construct(
+        Configuration $configuration,
         StockManagementInterface $stockManagement,
         \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
     ) {
+        $this->configuration = $configuration;
         $this->stockManagement = $stockManagement;
         $this->priceIndexer = $priceIndexer;
     }
@@ -49,7 +58,8 @@ public function execute(EventObserver $observer)
         $item = $observer->getEvent()->getItem();
         $children = $item->getChildrenItems();
         $qty = $item->getQtyOrdered() - max($item->getQtyShipped(), $item->getQtyInvoiced()) - $item->getQtyCanceled();
-        if ($item->getId() && $item->getProductId() && empty($children) && $qty) {
+        if ($item->getId() && $item->getProductId() && empty($children) && $qty && $this->configuration
+            ->getCanBackInStock()) {
             $this->stockManagement->backItemQty($item->getProductId(), $qty, $item->getStore()->getWebsiteId());
         }
         $this->priceIndexer->reindexRow($item->getProductId());
diff --git a/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php b/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php
index 93a50cc9a7a4d..ab21f32b3f62c 100644
--- a/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php
@@ -64,8 +64,8 @@ public function execute(EventObserver $observer)
     {
         $quote = $observer->getEvent()->getQuote();
         $items = $this->productQty->getProductQty($quote->getAllItems());
-        $this->stockManagement->revertProductsSale($items, $quote->getStore()->getWebsiteId());
-        $productIds = array_keys($items);
+        $revertedItems = $this->stockManagement->revertProductsSale($items, $quote->getStore()->getWebsiteId());
+        $productIds = array_keys($revertedItems);
         if (!empty($productIds)) {
             $this->stockIndexerProcessor->reindexList($productIds);
             $this->priceIndexer->reindexList($productIds);
diff --git a/app/code/Magento/CatalogInventory/Observer/SaveInventoryDataObserver.php b/app/code/Magento/CatalogInventory/Observer/SaveInventoryDataObserver.php
index 03ba58d3f4987..67171d6432e58 100644
--- a/app/code/Magento/CatalogInventory/Observer/SaveInventoryDataObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/SaveInventoryDataObserver.php
@@ -39,6 +39,11 @@ class SaveInventoryDataObserver implements ObserverInterface
      */
     private $stockItemValidator;
 
+    /**
+     * @var array
+     */
+    private $parentItemProcessorPool;
+
     /**
      * @var array
      */
@@ -77,15 +82,18 @@ class SaveInventoryDataObserver implements ObserverInterface
      * @param StockConfigurationInterface $stockConfiguration
      * @param StockRegistryInterface $stockRegistry
      * @param StockItemValidator $stockItemValidator
+     * @param array $parentItemProcessorPool
      */
     public function __construct(
         StockConfigurationInterface $stockConfiguration,
         StockRegistryInterface $stockRegistry,
-        StockItemValidator $stockItemValidator = null
+        StockItemValidator $stockItemValidator = null,
+        array $parentItemProcessorPool = []
     ) {
         $this->stockConfiguration = $stockConfiguration;
         $this->stockRegistry = $stockRegistry;
         $this->stockItemValidator = $stockItemValidator ?: ObjectManager::getInstance()->get(StockItemValidator::class);
+        $this->parentItemProcessorPool = $parentItemProcessorPool;
     }
 
     /**
@@ -99,7 +107,10 @@ public function __construct(
      */
     public function execute(EventObserver $observer)
     {
+        /** @var Product $product */
         $product = $observer->getEvent()->getProduct();
+
+        /** @var Item $stockItem */
         $stockItem = $this->getStockItemToBeUpdated($product);
 
         if ($product->getStockData() !== null) {
@@ -108,6 +119,7 @@ public function execute(EventObserver $observer)
         }
         $this->stockItemValidator->validate($product, $stockItem);
         $this->stockRegistry->updateStockItemBySku($product->getSku(), $stockItem);
+        $this->processParents($product);
     }
 
     /**
@@ -156,4 +168,17 @@ private function getStockData(Product $product)
         }
         return $stockData;
     }
+
+    /**
+     * Process stock data for parent products
+     *
+     * @param Product $product
+     * @return void
+     */
+    private function processParents(Product $product)
+    {
+        foreach ($this->parentItemProcessorPool as $processor) {
+            $processor->process($product);
+        }
+    }
 }
diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/Data/CatalogInventoryConfigData.xml b/app/code/Magento/CatalogInventory/Test/Mftf/Data/CatalogInventoryConfigData.xml
new file mode 100644
index 0000000000000..e14c36446fc2b
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Test/Mftf/Data/CatalogInventoryConfigData.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="StockOptionsDisplayOutOfStockProductsEnable">
+        <data key="path">cataloginventory/options/show_out_of_stock</data>
+        <data key="scope_id">0</data>
+        <data key="label">Yes</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="StockOptionsDisplayOutOfStockProductsDisable">
+        <data key="path">cataloginventory/options/show_out_of_stock</data>
+        <data key="scope_id">0</data>
+        <data key="label">No</data>
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Helper/MinsaleqtyTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Helper/MinsaleqtyTest.php
index f008ed7d9d694..051e002b80c3e 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Helper/MinsaleqtyTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Helper/MinsaleqtyTest.php
@@ -216,7 +216,7 @@ public function testMakeStorableArrayFieldValue($value, $result, $serializeCallC
     public function makeStorableArrayFieldValueDataProvider()
     {
         return [
-            'invalid bool' => [false, ''],
+            'invalid bool' => [false, false],
             'invalid empty string' => ['', ''],
             'valid numeric' => ['22', '22'],
             'valid empty array' => [[], '[]', 1],
@@ -240,7 +240,8 @@ public function makeStorableArrayFieldValueDataProvider()
                 '[1]',
                 1,
                 [0 => 1.0]
-            ]
+            ],
+            'json value' => ['{"32000":2,"0":1}', '{"32000":2,"0":1}'],
         ];
     }
 }
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockItemRepositoryTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockItemRepositoryTest.php
index 6b1770ff7d403..293874bb32b9f 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockItemRepositoryTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockItemRepositoryTest.php
@@ -276,7 +276,7 @@ public function testSave()
             ->method('verifyStock')
             ->with($this->stockItemMock)
             ->willReturn(false);
-        $this->stockItemMock->expects($this->exactly(2))->method('getManageStock')->willReturn(true);
+        $this->stockItemMock->expects($this->once())->method('getManageStock')->willReturn(true);
         $this->stockItemMock->expects($this->once())->method('setIsInStock')->with(false)->willReturnSelf();
         $this->stockItemMock->expects($this->once())
             ->method('setStockStatusChangedAutomaticallyFlag')
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/StockRegistryTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/StockRegistryTest.php
index c04bd1e9e4402..03e60a9d39d5e 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/StockRegistryTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/StockRegistryTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\CatalogInventory\Test\Unit\Model;
 
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
 /**
  * Class StockRegistryTest
  */
@@ -16,37 +18,188 @@ class StockRegistryTest extends \PHPUnit\Framework\TestCase
     protected $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\CatalogInventory\Api\StockItemCriteriaInterface|MockObject
      */
     protected $criteria;
 
+    /**
+     * @var \Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory|MockObject
+     */
+    private $criteriaFactory;
+
+    /**
+     * @var \Magento\CatalogInventory\Api\Data\StockItemInterface|MockObject
+     */
+    private $stockItemMock;
+
+    /**
+     * @var \Magento\CatalogInventory\Api\StockConfigurationInterface|MockObject
+     */
+    private $stockConfigurationMock;
+
+    /**
+     * @var \Magento\CatalogInventory\Api\StockItemRepositoryInterface|MockObject
+     */
+    private $stockItemRepositoryMock;
+
+    /**
+     * @var \Magento\CatalogInventory\Model\Spi\StockRegistryProviderInterface|MockObject
+     */
+    private $stockRegistryProviderMock;
+
+    /**
+     * @var \Magento\Catalog\Model\ProductFactory|MockObject
+     */
+    private $productFactoryMock;
+
     protected function setUp()
     {
         $this->criteria = $this->getMockBuilder(\Magento\CatalogInventory\Api\StockItemCriteriaInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $criteriaFactory = $this->getMockBuilder(\Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory::class)
-            ->setMethods(['create'])
+        $this->criteriaFactory = $this->getMockBuilder(
+            \Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory::class
+        )->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
-        $criteriaFactory->expects($this->once())->method('create')->willReturn($this->criteria);
+
+        $this->stockItemMock = $this->getMockBuilder(\Magento\CatalogInventory\Api\Data\StockItemInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getWebsiteId',
+                'getData',
+                'addData',
+                'getManageStock',
+                'getIsInStock',
+                'getQty',
+                'getOrigData',
+                'setIsInStock',
+                'setStockStatusChangedAutomaticallyFlag',
+            ])
+            ->getMockForAbstractClass();
+
+        $this->stockConfigurationMock = $this->createMock(
+            \Magento\CatalogInventory\Api\StockConfigurationInterface::class
+        );
+        $this->stockRegistryProviderMock = $this->createMock(
+            \Magento\CatalogInventory\Model\Spi\StockRegistryProviderInterface::class
+        );
+        $this->stockItemRepositoryMock = $this->createMock(
+            \Magento\CatalogInventory\Api\StockItemRepositoryInterface::class
+        );
+        $this->productFactoryMock = $this->createPartialMock(\Magento\Catalog\Model\ProductFactory::class, ['create']);
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->model = $objectManager->getObject(
             \Magento\CatalogInventory\Model\StockRegistry::class,
             [
-                'criteriaFactory' => $criteriaFactory
+                'stockConfiguration' => $this->stockConfigurationMock,
+                'stockRegistryProvider' => $this->stockRegistryProviderMock,
+                'stockItemRepository' => $this->stockItemRepositoryMock,
+                'criteriaFactory' => $this->criteriaFactory,
+                'productFactory' => $this->productFactoryMock,
             ]
         );
     }
 
     public function testGetLowStockItems()
     {
+        $this->criteriaFactory->expects($this->once())->method('create')->willReturn($this->criteria);
         $this->criteria->expects($this->once())->method('setLimit')->with(1, 0);
         $this->criteria->expects($this->once())->method('setScopeFilter')->with(1);
         $this->criteria->expects($this->once())->method('setQtyFilter')->with('<=');
         $this->criteria->expects($this->once())->method('addField')->with('qty');
         $this->model->getLowStockItems(1, 100);
     }
+
+    /**
+     * @return void
+     */
+    public function testUpdateStockItemBySku()
+    {
+        $manageStock = 1;
+        $isInStock = 0;
+        $qty = 10;
+        $origQty = 0;
+
+        $this->stockItemMock->expects($this->once())->method('getManageStock')->willReturn($manageStock);
+        $this->stockItemMock->expects($this->once())->method('getIsInStock')->willReturn($isInStock);
+        $this->stockItemMock->expects($this->once())->method('getQty')->willReturn($qty);
+        $this->stockItemMock->expects($this->exactly(2))
+            ->method('getOrigData')
+            ->with(\Magento\CatalogInventory\Api\Data\StockItemInterface::QTY)
+            ->willReturn($origQty);
+
+        $this->stockItemMock->expects($this->once())->method('setIsInStock')->with(true)->willReturnSelf();
+        $this->stockItemMock->expects($this->once())
+            ->method('setStockStatusChangedAutomaticallyFlag')
+            ->with(true)
+            ->willReturnSelf();
+
+        $this->configureAndCallUpdateStockItemBySku();
+    }
+
+    /**
+     * @return void
+     */
+    public function testUpdateStockItemBySkuWithoutUpdateStockStatus()
+    {
+        $manageStock = 0;
+
+        $this->stockItemMock->expects($this->once())->method('getManageStock')->willReturn($manageStock);
+        $this->stockItemMock->expects($this->never())->method('getIsInStock');
+        $this->stockItemMock->expects($this->never())->method('getQty');
+        $this->stockItemMock->expects($this->never())
+            ->method('getOrigData')
+            ->with(\Magento\CatalogInventory\Api\Data\StockItemInterface::QTY);
+
+        $this->stockItemMock->expects($this->never())->method('setIsInStock')->with(true);
+        $this->stockItemMock->expects($this->never())->method('setStockStatusChangedAutomaticallyFlag')->with(true);
+
+        $this->configureAndCallUpdateStockItemBySku();
+    }
+
+    /**
+     * @return void
+     */
+    private function configureAndCallUpdateStockItemBySku()
+    {
+        $productId = 1;
+        $productSku = 'Simple';
+        $websiteId = 0;
+        $scopeId = 1;
+        $data = ['item_id' => 1, 'is_in_stock' => 1];
+
+        /** @var \Magento\CatalogInventory\Api\Data\StockItemInterface|MockObject $origStockItemMock */
+        $origStockItemMock = $this->getMockBuilder(\Magento\CatalogInventory\Api\Data\StockItemInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getItemId', 'addData', 'setProductId'])
+            ->getMockForAbstractClass();
+
+        /** @var \Magento\Catalog\Model\Product|MockObject $productMock */
+        $productMock = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['getIdBySku']);
+        $this->productFactoryMock->expects($this->once())->method('create')->willReturn($productMock);
+        $productMock->expects($this->once())->method('getIdBySku')->with($productSku)->willReturn($productId);
+
+        $this->stockItemMock->expects($this->once())->method('getWebsiteId')->willReturn($websiteId);
+        $this->stockItemMock->expects($this->once())->method('getData')->willReturn($data);
+
+        $origStockItemMock->expects($this->exactly(2))->method('getItemId')->willReturn(null);
+        $origStockItemMock->expects($this->once())->method('addData')->with($data)->willReturnSelf();
+        $origStockItemMock->expects($this->once())->method('setProductId')->with($productId)->willReturnSelf();
+
+        $this->stockConfigurationMock->expects($this->once())->method('getDefaultScopeId')->willReturn($scopeId);
+        $this->stockRegistryProviderMock->expects($this->once())
+            ->method('getStockItem')
+            ->with($productId, $scopeId)
+            ->willReturn($origStockItemMock);
+
+        $this->stockItemRepositoryMock->expects($this->once())
+            ->method('save')
+            ->with($origStockItemMock)
+            ->willReturn($origStockItemMock);
+
+        $this->model->updateStockItemBySku($productSku, $this->stockItemMock);
+    }
 }
diff --git a/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/AddQuantityAndStockStatusFieldToCollection.php b/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/AddQuantityAndStockStatusFieldToCollection.php
new file mode 100644
index 0000000000000..d66a783c6720d
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/AddQuantityAndStockStatusFieldToCollection.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Ui\DataProvider\Product;
+
+use Magento\Framework\Data\Collection;
+use Magento\Ui\DataProvider\AddFieldToCollectionInterface;
+
+/**
+ * Add quantity_and_stock_status field to collection
+ */
+class AddQuantityAndStockStatusFieldToCollection implements AddFieldToCollectionInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function addField(Collection $collection, $field, $alias = null)
+    {
+        $collection->joinField(
+            'quantity_and_stock_status',
+            'cataloginventory_stock_item',
+            'is_in_stock',
+            'product_id=entity_id',
+            '{{table}}.stock_id=1',
+            'left'
+        );
+    }
+}
diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
index 41fd9db15f15a..e79e19480448a 100644
--- a/app/code/Magento/CatalogInventory/composer.json
+++ b/app/code/Magento/CatalogInventory/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-inventory",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-config": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-catalog": "102.0.*",
@@ -14,7 +14,7 @@
         "magento/module-sales": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.5",
+    "version": "100.2.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogInventory/etc/adminhtml/di.xml b/app/code/Magento/CatalogInventory/etc/adminhtml/di.xml
index 803a6dae492a0..601f7ef61973b 100644
--- a/app/code/Magento/CatalogInventory/etc/adminhtml/di.xml
+++ b/app/code/Magento/CatalogInventory/etc/adminhtml/di.xml
@@ -23,6 +23,7 @@
         <arguments>
             <argument name="addFieldStrategies" xsi:type="array">
                 <item name="qty" xsi:type="object">Magento\CatalogInventory\Ui\DataProvider\Product\AddQuantityFieldToCollection</item>
+                <item name="quantity_and_stock_status" xsi:type="object">Magento\CatalogInventory\Ui\DataProvider\Product\AddQuantityAndStockStatusFieldToCollection</item>
             </argument>
             <argument name="addFilterStrategies" xsi:type="array">
                 <item name="qty" xsi:type="object">Magento\CatalogInventory\Ui\DataProvider\Product\AddQuantityFilterToCollection</item>
diff --git a/app/code/Magento/CatalogInventory/etc/di.xml b/app/code/Magento/CatalogInventory/etc/di.xml
index 7cddb4f8f0b54..8c47865da6aa7 100644
--- a/app/code/Magento/CatalogInventory/etc/di.xml
+++ b/app/code/Magento/CatalogInventory/etc/di.xml
@@ -44,7 +44,7 @@
     </type>
     <type name="Magento\CatalogInventory\Observer\UpdateItemsStockUponConfigChangeObserver">
         <arguments>
-            <argument name="resourceStock" xsi:type="object">Magento\CatalogInventory\Model\ResourceModel\Stock\Proxy</argument>
+            <argument name="resourceStockItem" xsi:type="object">Magento\CatalogInventory\Model\ResourceModel\Stock\Item\Proxy</argument>
         </arguments>
     </type>
     <type name="Magento\Catalog\Model\Layer">
@@ -111,7 +111,7 @@
             <argument name="batchSizeManagement" xsi:type="object">Magento\CatalogInventory\Model\Indexer\Stock\BatchSizeManagement</argument>
         </arguments>
     </type>
-    <type name="\Magento\Framework\Data\CollectionModifier">
+    <type name="Magento\Framework\Data\CollectionModifier">
         <arguments>
             <argument name="conditions" xsi:type="array">
                 <item name="stockStatusCondition" xsi:type="object">Magento\CatalogInventory\Model\ProductCollectionStockCondition</item>
diff --git a/app/code/Magento/CatalogInventory/view/frontend/templates/qtyincrements.phtml b/app/code/Magento/CatalogInventory/view/frontend/templates/qtyincrements.phtml
index 8e0dbf1278ed2..8b63d29be8154 100644
--- a/app/code/Magento/CatalogInventory/view/frontend/templates/qtyincrements.phtml
+++ b/app/code/Magento/CatalogInventory/view/frontend/templates/qtyincrements.phtml
@@ -4,14 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var $block \Magento\CatalogInventory\Block\Qtyincrements
  */
 ?>
 <?php if ($block->getProductQtyIncrements()) : ?>
     <div class="product pricing">
-        <?= /* @escapeNotVerified */ __('%1 is available to buy in increments of %2', $block->getProductName(), $block->getProductQtyIncrements()) ?>
+        <?= $block->escapeHtml(__('%1 is available to buy in increments of %2', $block->getProductName(), $block->getProductQtyIncrements())) ?>
     </div>
 <?php endif ?>
diff --git a/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml b/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml
index 481ed1297a801..de667d19fadb0 100644
--- a/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml
+++ b/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml
@@ -4,30 +4,28 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var $block \Magento\CatalogInventory\Block\Stockqty\Composite
  */
 ?>
-<?php if ($block->isMsgVisible()): ?>
+<?php if ($block->isMsgVisible()) : ?>
     <div class="availability only">
         <a href="#"
-           data-mage-init='{"toggleAdvanced": {"selectorsToggleClass": "active", "baseToggleClass": "expanded", "toggleContainers": "#<?= /* @escapeNotVerified */ $block->getDetailsPlaceholderId() ?>"}}'
-           id="<?= /* @escapeNotVerified */ $block->getPlaceholderId() ?>"
-           title="<?= /* @escapeNotVerified */ __('Only %1 left', ($block->getStockQtyLeft())) ?>"
+           data-mage-init='{"toggleAdvanced": {"selectorsToggleClass": "active", "baseToggleClass": "expanded", "toggleContainers": "#<?= $block->escapeHtmlAttr($block->getDetailsPlaceholderId()) ?>"}}'
+           id="<?= $block->escapeHtmlAttr($block->getPlaceholderId()) ?>"
+           title="<?= $block->escapeHtmlAttr(__('Only %1 left', ($block->getStockQtyLeft()))) ?>"
            class="action show">
-            <?= /* @escapeNotVerified */ __('Only %1 left', "<strong>{$block->getStockQtyLeft()}</strong>") ?>
+            <?= /* @noEscape */ __('Only %1 left', "<strong>{$block->escapeHtml($block->getStockQtyLeft())}</strong>") ?>
         </a>
     </div>
-    <div class="availability only detailed" id="<?= /* @escapeNotVerified */ $block->getDetailsPlaceholderId() ?>">
+    <div class="availability only detailed" id="<?= $block->escapeHtmlAttr($block->getDetailsPlaceholderId()) ?>">
         <div class="table-wrapper">
             <table class="data table">
-                <caption class="table-caption"><?= /* @escapeNotVerified */ __('Product availability') ?></caption>
+                <caption class="table-caption"><?= $block->escapeHtml(__('Product availability')) ?></caption>
                 <thead>
                 <tr>
-                    <th class="col item" scope="col"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
-                    <th class="col qty" scope="col"><?= /* @escapeNotVerified */ __('Qty') ?></th>
+                    <th class="col item" scope="col"><?= $block->escapeHtml(__('Product Name')) ?></th>
+                    <th class="col qty" scope="col"><?= $block->escapeHtml(__('Qty')) ?></th>
                 </tr>
                 </thead>
                 <tbody>
@@ -35,8 +33,8 @@
                     <?php $childProductStockQty = $block->getProductStockQty($childProduct); ?>
                     <?php if ($childProductStockQty > 0) : ?>
                         <tr>
-                            <td data-th="<?= $block->escapeHtml(__('Product Name')) ?>" class="col item"><?= /* @escapeNotVerified */ $childProduct->getName() ?></td>
-                            <td data-th="<?= $block->escapeHtml(__('Qty')) ?>" class="col qty"><?= /* @escapeNotVerified */ $childProductStockQty ?></td>
+                            <td data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>" class="col item"><?= $block->escapeHtml($childProduct->getName()) ?></td>
+                            <td data-th="<?= $block->escapeHtmlAttr(__('Qty')) ?>" class="col qty"><?= $block->escapeHtml($childProductStockQty) ?></td>
                         </tr>
                     <?php endif ?>
                 <?php endforeach ?>
diff --git a/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/default.phtml b/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/default.phtml
index 43fb697de2621..c32cb9dd6ecda 100644
--- a/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/default.phtml
+++ b/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/default.phtml
@@ -4,14 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var $block \Magento\CatalogInventory\Block\Stockqty\DefaultStockqty
  */
 ?>
-<?php if ($block->isMsgVisible()): ?>
-    <div class="availability only" title="<?= /* @escapeNotVerified */ __('Only %1 left', ($block->getStockQtyLeft())) ?>">
-        <?= /* @escapeNotVerified */ __('Only %1 left', "<strong>{$block->getStockQtyLeft()}</strong>") ?>
+<?php if ($block->isMsgVisible()) : ?>
+    <div class="availability only" title="<?= $block->escapeHtmlAttr(__('Only %1 left', ($block->getStockQtyLeft()))) ?>">
+        <?= /* @noEscape */ __('Only %1 left', "<strong>{$block->escapeHtml($block->getStockQtyLeft())}</strong>") ?>
     </div>
 <?php endif ?>
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Edit/DeleteButton.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Edit/DeleteButton.php
index 6390822b58f4a..184cb6419294f 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Edit/DeleteButton.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Edit/DeleteButton.php
@@ -25,7 +25,7 @@ public function getButtonData()
                 'class' => 'delete',
                 'on_click' => 'deleteConfirm(\'' . __(
                     'Are you sure you want to do this?'
-                ) . '\', \'' . $this->urlBuilder->getUrl('*/*/delete', ['id' => $ruleId]) . '\')',
+                ) . '\', \'' . $this->urlBuilder->getUrl('*/*/delete', ['id' => $ruleId]) . '\', {data: {}})',
                 'sort_order' => 20,
             ];
         }
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php
index 3500506d8d6c5..be8a5a1556193 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php
@@ -12,9 +12,14 @@ class Delete extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog
 {
     /**
      * @return void
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         $id = $this->getRequest()->getParam('id');
         if ($id) {
             try {
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php b/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
index 5d93e6f216866..6b7c12dfdf463 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
@@ -10,6 +10,9 @@
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Indexer\CacheContext;
 
+/**
+ * Abstract class for CatalogRule indexers.
+ */
 abstract class AbstractIndexer implements IndexerActionInterface, MviewActionInterface, IdentityInterface
 {
     /**
@@ -66,7 +69,6 @@ public function executeFull()
     {
         $this->indexBuilder->reindexFull();
         $this->_eventManager->dispatch('clean_cache_by_tags', ['object' => $this]);
-        //TODO: remove after fix fpc. MAGETWO-50668
         $this->getCacheManager()->clean($this->getIdentities());
     }
 
@@ -137,8 +139,9 @@ public function executeRow($id)
     abstract protected function doExecuteRow($id);
 
     /**
-     * @return \Magento\Framework\App\CacheInterface|mixed
+     * Get cache manager
      *
+     * @return \Magento\Framework\App\CacheInterface|mixed
      * @deprecated 100.0.7
      */
     private function getCacheManager()
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
index 731cbe4531f42..d9e6e338e6d9d 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
@@ -7,6 +7,7 @@
 namespace Magento\CatalogRule\Model\Indexer;
 
 use Magento\Catalog\Model\Product;
+use Magento\CatalogRule\Model\ResourceModel\Rule\Collection as RuleCollection;
 use Magento\CatalogRule\Model\ResourceModel\Rule\CollectionFactory as RuleCollectionFactory;
 use Magento\CatalogRule\Model\Rule;
 use Magento\Framework\App\ObjectManager;
@@ -263,14 +264,14 @@ public function reindexByIds(array $ids)
      */
     protected function doReindexByIds($ids)
     {
-        $this->cleanByIds($ids);
+        $this->cleanProductIndex($ids);
 
         $products = $this->productLoader->getProducts($ids);
-        foreach ($this->getActiveRules() as $rule) {
-            foreach ($products as $product) {
-                $this->applyRule($rule, $product);
-            }
+        $activeRules = $this->getActiveRules();
+        foreach ($products as $product) {
+            $this->applyRules($activeRules, $product);
         }
+        $this->reindexRuleGroupWebsite->execute();
     }
 
     /**
@@ -315,6 +316,28 @@ protected function doReindexFull()
         );
     }
 
+    /**
+     * Clean product index
+     *
+     * @param array $productIds
+     */
+    private function cleanProductIndex(array $productIds)
+    {
+        $where = ['product_id IN (?)' => $productIds];
+        $this->connection->delete($this->getTable('catalogrule_product'), $where);
+    }
+
+    /**
+     * Clean product price index
+     *
+     * @param array $productIds
+     */
+    private function cleanProductPriceIndex(array $productIds)
+    {
+        $where = ['product_id IN (?)' => $productIds];
+        $this->connection->delete($this->getTable('catalogrule_product_price'), $where);
+    }
+
     /**
      * Clean by product ids
      *
@@ -323,51 +346,35 @@ protected function doReindexFull()
      */
     protected function cleanByIds($productIds)
     {
-        $query = $this->connection->deleteFromSelect(
-            $this->connection
-                ->select()
-                ->from($this->resource->getTableName('catalogrule_product'), 'product_id')
-                ->distinct()
-                ->where('product_id IN (?)', $productIds),
-            $this->resource->getTableName('catalogrule_product')
-        );
-        $this->connection->query($query);
-
-        $query = $this->connection->deleteFromSelect(
-            $this->connection->select()
-                ->from($this->resource->getTableName('catalogrule_product_price'), 'product_id')
-                ->distinct()
-                ->where('product_id IN (?)', $productIds),
-            $this->resource->getTableName('catalogrule_product_price')
-        );
-        $this->connection->query($query);
+        $this->cleanProductIndex($productIds);
+        $this->cleanProductPriceIndex($productIds);
     }
 
     /**
+     * Assign product to rule
+     *
      * @param Rule $rule
      * @param Product $product
-     * @return $this
-     * @throws \Exception
-     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @return void
      */
-    protected function applyRule(Rule $rule, $product)
+    private function assignProductToRule(Rule $rule, Product $product)
     {
-        $ruleId = $rule->getId();
-        $productEntityId = $product->getId();
-        $websiteIds = array_intersect($product->getWebsiteIds(), $rule->getWebsiteIds());
-
         if (!$rule->validate($product)) {
-            return $this;
+            return;
         }
 
+        $ruleId = (int) $rule->getId();
+        $productEntityId = (int) $product->getId();
+        $ruleProductTable = $this->getTable('catalogrule_product');
         $this->connection->delete(
-            $this->resource->getTableName('catalogrule_product'),
+            $ruleProductTable,
             [
-                $this->connection->quoteInto('rule_id = ?', $ruleId),
-                $this->connection->quoteInto('product_id = ?', $productEntityId)
+                'rule_id = ?' => $ruleId,
+                'product_id = ?' => $productEntityId,
             ]
         );
 
+        $websiteIds = array_intersect($product->getWebsiteIds(), $rule->getWebsiteIds());
         $customerGroupIds = $rule->getCustomerGroupIds();
         $fromTime = strtotime($rule->getFromDate());
         $toTime = strtotime($rule->getToDate());
@@ -378,43 +385,62 @@ protected function applyRule(Rule $rule, $product)
         $actionStop = $rule->getStopRulesProcessing();
 
         $rows = [];
-        try {
-            foreach ($websiteIds as $websiteId) {
-                foreach ($customerGroupIds as $customerGroupId) {
-                    $rows[] = [
-                        'rule_id' => $ruleId,
-                        'from_time' => $fromTime,
-                        'to_time' => $toTime,
-                        'website_id' => $websiteId,
-                        'customer_group_id' => $customerGroupId,
-                        'product_id' => $productEntityId,
-                        'action_operator' => $actionOperator,
-                        'action_amount' => $actionAmount,
-                        'action_stop' => $actionStop,
-                        'sort_order' => $sortOrder,
-                    ];
-
-                    if (count($rows) == $this->batchCount) {
-                        $this->connection->insertMultiple($this->getTable('catalogrule_product'), $rows);
-                        $rows = [];
-                    }
+        foreach ($websiteIds as $websiteId) {
+            foreach ($customerGroupIds as $customerGroupId) {
+                $rows[] = [
+                    'rule_id' => $ruleId,
+                    'from_time' => $fromTime,
+                    'to_time' => $toTime,
+                    'website_id' => $websiteId,
+                    'customer_group_id' => $customerGroupId,
+                    'product_id' => $productEntityId,
+                    'action_operator' => $actionOperator,
+                    'action_amount' => $actionAmount,
+                    'action_stop' => $actionStop,
+                    'sort_order' => $sortOrder,
+                ];
+
+                if (count($rows) == $this->batchCount) {
+                    $this->connection->insertMultiple($ruleProductTable, $rows);
+                    $rows = [];
                 }
             }
-
-            if (!empty($rows)) {
-                $this->connection->insertMultiple($this->resource->getTableName('catalogrule_product'), $rows);
-            }
-        } catch (\Exception $e) {
-            throw $e;
         }
+        if ($rows) {
+            $this->connection->insertMultiple($ruleProductTable, $rows);
+        }
+    }
 
+    /**
+     * Apply rule
+     *
+     * @param Rule $rule
+     * @param Product $product
+     * @return $this
+     * @throws \Exception
+     */
+    protected function applyRule(Rule $rule, $product)
+    {
+        $this->assignProductToRule($rule, $product);
         $this->reindexRuleProductPrice->execute($this->batchCount, $product);
         $this->reindexRuleGroupWebsite->execute();
 
         return $this;
     }
 
+    private function applyRules(RuleCollection $ruleCollection, Product $product)
+    {
+        foreach ($ruleCollection as $rule) {
+            $this->assignProductToRule($rule, $product);
+        }
+
+        $this->cleanProductPriceIndex([$product->getId()]);
+        $this->reindexRuleProductPrice->execute($this->batchCount, $product);
+    }
+
     /**
+     * Retrieve table name
+     *
      * @param string $tableName
      * @return string
      */
@@ -424,6 +450,8 @@ protected function getTable($tableName)
     }
 
     /**
+     * Update rule product data
+     *
      * @param Rule $rule
      * @return $this
      * @deprecated 100.2.0
@@ -449,6 +477,8 @@ protected function updateRuleProductData(Rule $rule)
     }
 
     /**
+     * Apply all rules
+     *
      * @param Product|null $product
      * @throws \Exception
      * @return $this
@@ -488,6 +518,8 @@ protected function deleteOldData()
     }
 
     /**
+     * Calculate rule product price
+     *
      * @param array $ruleData
      * @param null $productData
      * @return float
@@ -500,6 +532,8 @@ protected function calcRuleProductPrice($ruleData, $productData = null)
     }
 
     /**
+     * Get rule products statement
+     *
      * @param int $websiteId
      * @param Product|null $product
      * @return \Zend_Db_Statement_Interface
@@ -513,6 +547,8 @@ protected function getRuleProductsStmt($websiteId, Product $product = null)
     }
 
     /**
+     * Save rule product prices
+     *
      * @param array $arrData
      * @return $this
      * @throws \Exception
@@ -528,7 +564,7 @@ protected function saveRuleProductPrices($arrData)
     /**
      * Get active rules
      *
-     * @return array
+     * @return RuleCollection
      */
     protected function getActiveRules()
     {
@@ -538,7 +574,7 @@ protected function getActiveRules()
     /**
      * Get active rules
      *
-     * @return array
+     * @return RuleCollection
      */
     protected function getAllRules()
     {
@@ -546,6 +582,8 @@ protected function getAllRules()
     }
 
     /**
+     * Get product
+     *
      * @param int $productId
      * @return Product
      */
@@ -558,6 +596,8 @@ protected function getProduct($productId)
     }
 
     /**
+     * Log critical exception
+     *
      * @param \Exception $e
      * @return void
      */
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/RuleProductPricesPersistor.php b/app/code/Magento/CatalogRule/Model/Indexer/RuleProductPricesPersistor.php
index 537741024c5f9..9ac23e0b9158c 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/RuleProductPricesPersistor.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/RuleProductPricesPersistor.php
@@ -72,25 +72,19 @@ public function execute(array $priceData, $useAdditionalTable = false)
             );
         }
 
-        $productIds = [];
-
-        try {
-            foreach ($priceData as $key => $data) {
-                $productIds['product_id'] = $data['product_id'];
-                $priceData[$key]['rule_date'] = $this->dateFormat->formatDate($data['rule_date'], false);
-                $priceData[$key]['latest_start_date'] = $this->dateFormat->formatDate(
-                    $data['latest_start_date'],
-                    false
-                );
-                $priceData[$key]['earliest_end_date'] = $this->dateFormat->formatDate(
-                    $data['earliest_end_date'],
-                    false
-                );
-            }
-            $connection->insertOnDuplicate($indexTable, $priceData);
-        } catch (\Exception $e) {
-            throw $e;
+        foreach ($priceData as $key => $data) {
+            $priceData[$key]['rule_date'] = $this->dateFormat->formatDate($data['rule_date'], false);
+            $priceData[$key]['latest_start_date'] = $this->dateFormat->formatDate(
+                $data['latest_start_date'],
+                false
+            );
+            $priceData[$key]['earliest_end_date'] = $this->dateFormat->formatDate(
+                $data['earliest_end_date'],
+                false
+            );
         }
+        $connection->insertOnDuplicate($indexTable, $priceData);
+
         return true;
     }
 }
diff --git a/app/code/Magento/CatalogRule/Model/Rule.php b/app/code/Magento/CatalogRule/Model/Rule.php
index 57578bb0558b7..ebfe91504417c 100644
--- a/app/code/Magento/CatalogRule/Model/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Rule.php
@@ -41,7 +41,6 @@
  * @method \Magento\CatalogRule\Model\Rule setFromDate(string $value)
  * @method \Magento\CatalogRule\Model\Rule setToDate(string $value)
  * @method \Magento\CatalogRule\Model\Rule setCustomerGroupIds(string $value)
- * @method string getWebsiteIds()
  * @method \Magento\CatalogRule\Model\Rule setWebsiteIds(string $value)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
index 72e082392059e..51c87831d1f71 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
@@ -68,4 +68,30 @@
         <fillField selector="{{AdminCatalogPriceRuleConditionsSection.targetInput('1', '1')}}" userInput="{{productSku}}" after="clickEllipsis" stepKey="fillProductSku"/>
         <click selector="{{AdminCatalogPriceRuleConditionsSection.applyButton('1', '1')}}" after="fillProductSku" stepKey="clickApply"/>
     </actionGroup>
+    <!--Add Catalog Rule Condition With Category-->
+    <actionGroup name="newCatalogPriceRuleByUIWithConditionIsCategory" extends="CreateCatalogPriceRule">
+	    <arguments>
+	        <argument name="categoryId" type="string"/>
+ 	    </arguments>
+        <click selector="{{AdminCatalogPriceRuleSection.conditionsTab}}" after="discardSubsequentRules" stepKey="openConditionsTab"/>
+        <click selector="{{AdminCatalogPriceRuleConditionsSection.newCondition}}" after="openConditionsTab" stepKey="addNewCondition"/>
+        <selectOption selector="{{AdminCatalogPriceRuleConditionsSection.conditionSelect('1')}}" userInput="Magento\CatalogRule\Model\Rule\Condition\Product|category_ids" after="addNewCondition" stepKey="selectTypeCondition"/>
+        <click selector="{{AdminCatalogPriceRuleConditionsSection.targetEllipsis('1')}}" after="selectTypeCondition" stepKey="clickEllipsis"/>
+        <fillField selector="{{AdminCatalogPriceRuleConditionsSection.targetInput('1', '1')}}" userInput="{{categoryId}}" after="clickEllipsis" stepKey="fillCategoryId"/>
+        <click selector="{{AdminCatalogPriceRuleConditionsSection.applyButton('1', '1')}}" after="fillCategoryId" stepKey="clickApply"/>
+    </actionGroup>
+
+    <!-- Open rule for Edit -->
+    <actionGroup name="OpenCatalogPriceRule">
+        <arguments>
+            <argument name="ruleName" type="string" defaultValue="CustomCatalogRule.name"/>
+        </arguments>
+
+        <amOnPage url="{{AdminCatalogPriceRuleGridPage.url}}" stepKey="goToAdminCatalogPriceRuleGridPage"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
+        <fillField selector="{{AdminCatalogPriceRuleGridSection.filterByRuleName}}" userInput="{{ruleName}}" stepKey="filterByRuleName"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearch"/>
+        <click selector="{{AdminGridTableSection.row('1')}}" stepKey="clickEdit"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </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 534a2c8cc6de2..4c7172b221307 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml
@@ -34,4 +34,17 @@
         <data key="simple_action">by_percent</data>
         <data key="discount_amount">96</data>
     </entity>
+    <entity name="CatalogRuleToPercent" type="catalogRule">
+        <data key="name" unique="suffix">CatalogPriceRule</data>
+        <data key="description">Catalog Price Rule Description</data>
+        <data key="is_active">1</data>
+        <array key="customer_group_ids">
+            <item>0</item>
+        </array>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <data key="simple_action">to_percent</data>
+        <data key="discount_amount">90</data>
+    </entity>
 </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
new file mode 100644
index 0000000000000..e71325d9f719d
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Metadata/catalog-rule-meta.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateCatalogRule" dataType="catalogRule"
+               type="create" auth="adminFormKey" url="/catalog_rule/promo_catalog/save/" method="POST">
+        <contentType>application/x-www-form-urlencoded</contentType>
+        <field key="name">string</field>
+        <field key="description">string</field>
+        <field key="is_active">string</field>
+        <array key="customer_group_ids">
+            <value>integer</value>
+        </array>
+        <array key="website_ids">
+            <value>integer</value>
+        </array>
+        <field key="simple_action">string</field>
+        <field key="discount_amount">string</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontCatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontCatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml
new file mode 100644
index 0000000000000..94413788bdc21
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontCatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest">
+        <annotations>
+            <features value="Persistent"/>
+            <stories value="Check the price"/>
+            <title value="Verify that Catalog Price Rule and Customer Group Membership are persisted under long-term cookie"/>
+            <description value="Verify that Catalog Price Rule and Customer Group Membership are persisted under long-term cookie"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-76169"/>
+            <group value="persistent"/>
+        </annotations>
+        <before>
+            <createData entity="PersistentConfigEnabled" stepKey="enablePersistent"/>
+            <createData entity="PersistentLogoutClearDisabled" stepKey="persistentLogoutClearDisable"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="price">50</field>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer">
+                <field key="group_id">1</field>
+            </createData>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <!--Create Catalog Rule-->
+            <actionGroup ref="newCatalogPriceRuleByUIWithConditionIsCategory" stepKey="createCatalogPriceRule">
+                <argument name="catalogRule" value="CustomCatalogRule"/>
+                <argument name="categoryId" value="$$createCategory.id$$"/>
+            </actionGroup>
+            <click selector="{{AdminCatalogPriceRuleGridSection.applyRulesButton}}" stepKey="clickApplyRules"/>
+
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after>
+            <!-- Delete the rule -->
+            <actionGroup ref="RemoveCatalogPriceRule" stepKey="deletePriceRule">
+                <argument name="ruleName" value="CustomCatalogRule.name" />
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+            <createData entity="PersistentConfigDefault" stepKey="setDefaultPersistentState"/>
+            <createData entity="PersistentLogoutClearEnabled" stepKey="persistentLogoutClearEnabled"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+        </after>
+
+        <!--Go to category and check price-->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onStorefrontCategoryPage"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductPriceByName($$createProduct.name$$)}}" userInput="$$createProduct.price$$" stepKey="checkPriceSimpleProduct"/>
+
+        <!--Login to storfront from customer and check price-->
+        <actionGroup ref="CustomerLoginOnStorefront" stepKey="logInFromCustomer">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onStorefrontCategoryPage2"/>
+        <see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!" selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" stepKey="homeCheckWelcome"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductPriceByName($$createProduct.name$$)}}" userInput="45.00" stepKey="checkPriceSimpleProduct2"/>
+
+        <!--Click *Sign Out* and check the price of the Simple Product-->
+        <actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="storefrontSignOut"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onStorefrontCategoryPage3"/>
+        <see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!" selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" stepKey="homeCheckWelcome2"/>
+        <seeElement selector="{{StorefrontPanelHeaderSection.notYouLink}}" stepKey="checkLinkNotYou"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductPriceByName($$createProduct.name$$)}}" userInput="45.00" stepKey="checkPriceSimpleProduct3"/>
+
+        <!--Click the *Not you?* link and check the price for Simple Product-->
+        <click selector="{{StorefrontPanelHeaderSection.notYouLink}}" stepKey="clickNext"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onStorefrontCategoryPage4"/>
+        <see userInput="Default welcome msg!" selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" stepKey="homeCheckWelcome3"/>
+        <see selector="{{StorefrontCategoryProductSection.ProductPriceByName($$createProduct.name$$)}}" userInput="$$createProduct.price$$" stepKey="checkPriceSimpleProduct4"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php b/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php
index 6178d51644fde..9b80984628b12 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Block/Adminhtml/Edit/DeleteButtonTest.php
@@ -58,7 +58,7 @@ public function testGetButtonData()
             'class' => 'delete',
             'on_click' => 'deleteConfirm(\'' . __(
                 'Are you sure you want to do this?'
-            ) . '\', \'' . $deleteUrl . '\')',
+            ) . '\', \'' . $deleteUrl . '\', {data: {}})',
             'sort_order' => 20,
         ];
 
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php
index 8252b512e7810..5827bff42b038 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php
@@ -144,14 +144,12 @@ protected function setUp()
         );
         $this->ruleCollectionFactory = $this->createPartialMock(
             \Magento\CatalogRule\Model\ResourceModel\Rule\CollectionFactory::class,
-            ['create', 'addFieldToFilter']
+            ['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->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadata::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $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);
@@ -181,10 +179,16 @@ protected function setUp()
         $this->rules->expects($this->any())->method('getWebsiteIds')->will($this->returnValue([1]));
         $this->rules->expects($this->any())->method('getCustomerGroupIds')->will($this->returnValue([1]));
 
-        $this->ruleCollectionFactory->expects($this->any())->method('create')->will($this->returnSelf());
-        $this->ruleCollectionFactory->expects($this->any())->method('addFieldToFilter')->will(
-            $this->returnValue([$this->rules])
-        );
+        $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));
@@ -213,14 +217,12 @@ protected function setUp()
             ]
         );
 
-        $this->reindexRuleProductPrice =
-            $this->getMockBuilder(\Magento\CatalogRule\Model\Indexer\ReindexRuleProductPrice::class)
-                ->disableOriginalConstructor()
-                ->getMock();
-        $this->reindexRuleGroupWebsite =
-            $this->getMockBuilder(\Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite::class)
-                ->disableOriginalConstructor()
-                ->getMock();
+        $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,
diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json
index 4067d7044b158..4c0fe257202a2 100644
--- a/app/code/Magento/CatalogRule/composer.json
+++ b/app/code/Magento/CatalogRule/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-rule",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-rule": "100.2.*",
         "magento/module-catalog": "102.0.*",
@@ -17,7 +17,7 @@
         "magento/module-catalog-rule-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "101.0.5",
+    "version": "101.0.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
index 1798b1112426c..db5492d3c47c5 100644
--- a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
+++ b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
@@ -4,17 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
-/**@var \Magento\Backend\Block\Widget\Form\Renderer\Fieldset $block */
+/** @var \Magento\Backend\Block\Widget\Form\Renderer\Fieldset $block */
 ?>
 <?php $_element = $block->getElement() ?>
 <?php $_jsObjectName = $block->getFieldSetId() != null ? $block->getFieldSetId() : $_element->getHtmlId() ?>
 <div class="rule-tree">
-    <fieldset id="<?= /* @escapeNotVerified */ $_jsObjectName ?>" <?= /* @escapeNotVerified */ $_element->serialize(['class']) ?> class="fieldset">
-        <legend class="legend"><span><?= /* @escapeNotVerified */ $_element->getLegend() ?></span></legend>
+    <fieldset id="<?= $block->escapeHtmlAttr($_jsObjectName) ?>"
+        <?= /* @noEscape */ $_element->serialize(['class']) ?> class="fieldset">
+        <legend class="legend"><span><?= $block->escapeHtml($_element->getLegend()) ?></span></legend>
         <br>
-    <?php if ($_element->getComment()): ?>
+    <?php if ($_element->getComment()) : ?>
         <div class="messages">
             <div class="message message-notice"><?= $block->escapeHtml($_element->getComment()) ?></div>
         </div>
@@ -30,9 +29,10 @@ require([
     "prototype"
 ], function(VarienRulesForm){
 
-window.<?= /* @escapeNotVerified */ $_jsObjectName ?> = new VarienRulesForm('<?= /* @escapeNotVerified */ $_jsObjectName ?>', '<?= /* @escapeNotVerified */ $block->getNewChildUrl() ?>');
-<?php if ($_element->getReadonly()): ?>
-    <?= $_element->getHtmlId() ?>.setReadonly(true);
+window.<?= /* @noEscape */ $_jsObjectName ?> = new VarienRulesForm('<?= /* @noEscape */ $_jsObjectName ?>',
+    '<?= /* @noEscape */ $block->getNewChildUrl() ?>');
+<?php if ($_element->getReadonly()) : ?>
+    <?= /* @noEscape */ $_element->getHtmlId() ?>.setReadonly(true);
 <?php endif; ?>
 
 });
diff --git a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml
index 1572c8f0d4e48..4ed782edd4eec 100644
--- a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml
+++ b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml
@@ -3,11 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <div class="entry-edit rule-tree">
 <?= $block->getFormHtml() ?>
 </div>
-
diff --git a/app/code/Magento/CatalogRuleConfigurable/composer.json b/app/code/Magento/CatalogRuleConfigurable/composer.json
index 93a937ffcc45e..0a4524a769f26 100644
--- a/app/code/Magento/CatalogRuleConfigurable/composer.json
+++ b/app/code/Magento/CatalogRuleConfigurable/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-rule-configurable",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-configurable-product": "100.2.*",
         "magento/framework": "101.0.*",
         "magento/module-catalog": "102.0.*",
@@ -13,7 +13,7 @@
         "magento/module-catalog-rule": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
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 286b6427c8132..7a94dcb78cfd5 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
@@ -12,6 +12,8 @@
 use Magento\Store\Model\Store;
 
 /**
+ * Catalog search full text search data provider.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @api
@@ -571,8 +573,8 @@ public function prepareProductIndex($indexData, $productData, $storeId)
             }
         }
         foreach ($indexData as $entityId => $attributeData) {
-            foreach ($attributeData as $attributeId => $attributeValue) {
-                $value = $this->getAttributeValue($attributeId, $attributeValue, $storeId);
+            foreach ($attributeData as $attributeId => $attributeValues) {
+                $value = $this->getAttributeValue($attributeId, $attributeValues, $storeId);
                 if (!empty($value)) {
                     if (isset($index[$attributeId])) {
                         $index[$attributeId][$entityId] = $value;
@@ -603,16 +605,16 @@ public function prepareProductIndex($indexData, $productData, $storeId)
      * Retrieve attribute source value for search
      *
      * @param int $attributeId
-     * @param mixed $valueId
+     * @param mixed $valueIds
      * @param int $storeId
      * @return string
      */
-    private function getAttributeValue($attributeId, $valueId, $storeId)
+    private function getAttributeValue($attributeId, $valueIds, $storeId)
     {
         $attribute = $this->getSearchableAttribute($attributeId);
-        $value = $this->engine->processAttributeValue($attribute, $valueId);
+        $value = $this->engine->processAttributeValue($attribute, $valueIds);
         if (false !== $value) {
-            $optionValue = $this->getAttributeOptionValue($attributeId, $valueId, $storeId);
+            $optionValue = $this->getAttributeOptionValue($attributeId, $valueIds, $storeId);
             if (null === $optionValue) {
                 $value = preg_replace('/\s+/iu', ' ', trim(strip_tags($value)));
             } else {
@@ -627,13 +629,15 @@ private function getAttributeValue($attributeId, $valueId, $storeId)
      * Get attribute option value
      *
      * @param int $attributeId
-     * @param int $valueId
+     * @param int|string $valueIds
      * @param int $storeId
      * @return null|string
      */
-    private function getAttributeOptionValue($attributeId, $valueId, $storeId)
+    private function getAttributeOptionValue($attributeId, $valueIds, $storeId)
     {
         $optionKey = $attributeId . '-' . $storeId;
+        $attributeValueIds = explode(',', $valueIds);
+        $attributeOptionValue = '';
         if (!array_key_exists($optionKey, $this->attributeOptions)
         ) {
             $attribute = $this->getSearchableAttribute($attributeId);
@@ -649,6 +653,12 @@ private function getAttributeOptionValue($attributeId, $valueId, $storeId)
             }
         }
 
-        return $this->attributeOptions[$optionKey][$valueId] ?? null;
+        foreach ($attributeValueIds as $attributeValueId) {
+            if (isset($this->attributeOptions[$optionKey][$attributeValueId])) {
+                $attributeOptionValue .= $this->attributeOptions[$optionKey][$attributeValueId] . ' ';
+            }
+        }
+
+        return empty($attributeOptionValue) ? null : trim($attributeOptionValue);
     }
 }
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
index 7aac6e98fc044..7b239d84bf962 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
@@ -91,12 +91,10 @@ protected function _getItemsData()
             return $this->itemDataBuilder->build();
         }
 
-        $productSize = $productCollection->getSize();
-
         $options = $attribute->getFrontend()
             ->getSelectOptions();
         foreach ($options as $option) {
-            $this->buildOptionData($option, $isAttributeFilterable, $optionsFacetedData, $productSize);
+            $this->buildOptionData($option, $isAttributeFilterable, $optionsFacetedData);
         }
 
         return $this->itemDataBuilder->build();
@@ -108,17 +106,16 @@ protected function _getItemsData()
      * @param array $option
      * @param boolean $isAttributeFilterable
      * @param array $optionsFacetedData
-     * @param int $productSize
      * @return void
      */
-    private function buildOptionData($option, $isAttributeFilterable, $optionsFacetedData, $productSize)
+    private function buildOptionData($option, $isAttributeFilterable, $optionsFacetedData)
     {
         $value = $this->getOptionValue($option);
         if ($value === false) {
             return;
         }
         $count = $this->getOptionCount($value, $optionsFacetedData);
-        if ($isAttributeFilterable && (!$this->isOptionReducesResults($count, $productSize) || $count === 0)) {
+        if ($isAttributeFilterable && $count === 0) {
             return;
         }
 
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
index e61a886a41d6f..e9fb1070fedd5 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
@@ -111,12 +111,9 @@ protected function _getItemsData()
                 $from = '';
             }
             if ($to == '*') {
-                $to = '';
+                $to = null;
             }
-            $label = $this->renderRangeLabel(
-                empty($from) ? 0 : $from,
-                empty($to) ? 0 : $to
-            );
+            $label = $this->renderRangeLabel(empty($from) ? 0 : $from, $to);
             $value = $from . '-' . $to;
 
             $data[] = [
@@ -141,7 +138,7 @@ protected function _getItemsData()
     protected function renderRangeLabel($fromPrice, $toPrice)
     {
         $formattedFromPrice = $this->priceCurrency->format($fromPrice);
-        if ($toPrice === '') {
+        if ($toPrice === null) {
             return __('%1 and above', $formattedFromPrice);
         } else {
             if ($fromPrice != $toPrice) {
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
index fac8c4d2a47f6..831780631c124 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
@@ -107,7 +107,10 @@ public function processAttributeValue($attribute, $value)
             && in_array($attribute->getFrontendInput(), ['text', 'textarea'])
         ) {
             $result = $value;
-        } elseif ($this->isTermFilterableAttribute($attribute)) {
+        } elseif ($this->isTermFilterableAttribute($attribute)
+                  || ($attribute->getIsSearchable()
+                      && in_array($attribute->getFrontendInput(), ['select', 'multiselect']))
+        ) {
             $result = '';
         }
 
@@ -115,7 +118,8 @@ public function processAttributeValue($attribute, $value)
     }
 
     /**
-     * Prepare index array as a string glued by separator
+     * Prepare index array as a string glued by separator.
+     *
      * Support 2 level array gluing
      *
      * @param array $index
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
index ae9311b452627..b1fc35e0ed323 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\CatalogSearch\Model\ResourceModel\Search;
 
+use Magento\Search\Model\SearchCollectionInterface;
+
 /**
  * Search collection
  *
@@ -15,7 +15,7 @@
  * @api
  * @since 100.0.2
  */
-class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection implements \Magento\Search\Model\SearchCollectionInterface
+class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection implements SearchCollectionInterface
 {
     /**
      * Attribute collection
@@ -123,7 +123,8 @@ public function addSearchFilter($query)
         $this->_searchQuery = $query;
         $this->addFieldToFilter(
             $this->getEntity()->getLinkField(),
-            ['in' => new \Zend_Db_Expr($this->_getSearchEntityIdsSql($query))]);
+            ['in' => new \Zend_Db_Expr($this->_getSearchEntityIdsSql($query))]
+        );
         return $this;
     }
 
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
index 6f6a5eed642e7..a5b9a2b235c6c 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
@@ -101,7 +101,7 @@ private function generateRequest($attributeType, $container, $useFulltext)
                 }
             }
             /** @var $attribute Attribute */
-            if (!$attribute->getIsSearchable() || in_array($attribute->getAttributeCode(), ['price', 'sku'], true)) {
+            if (!$attribute->getIsSearchable() || in_array($attribute->getAttributeCode(), ['price'], true)) {
                 // Some fields have their own specific handlers
                 continue;
             }
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminAssertQueryLengthHintsActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminAssertQueryLengthHintsActionGroup.xml
new file mode 100644
index 0000000000000..61861f322b941
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminAssertQueryLengthHintsActionGroup.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="AdminAssertQueryLengthHintsActionGroup">
+        <amOnPage url="{{AdminCatalogSearchConfigurationPage.url('#catalog_search-link')}}" stepKey="navigateToConfigurationPage"/>
+        <see userInput="{{MinMaxQueryLength.hint}}" selector="{{AdminCatalogSearchConfigurationSection.minQueryLengthHint}}" stepKey="seeMinQueryLengthHint"/>
+        <see userInput="{{MinMaxQueryLength.hint}}" selector="{{AdminCatalogSearchConfigurationSection.maxQueryLengthHint}}" stepKey="seeMaxQueryLengthHint"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontSearchProductActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontSearchProductActionGroup.xml
new file mode 100644
index 0000000000000..faa6e9bcee18c
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontSearchProductActionGroup.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="StorefrontSearchProductActionGroup" extends="StorefrontQuickSearchActionGroup">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <waitForElementVisible selector="{{StorefrontCategoryProductSection.productNameInGrid(product.name)}}" after="clickSearchButton" stepKey="waitForProductNameElement"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productNameInGrid(product.name)}}" stepKey="seeProductNameInCatalogSearchPage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchConstData.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchConstData.xml
new file mode 100644
index 0000000000000..b09428bfcd34a
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchConstData.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="MinMaxQueryLength" type="constant">
+        <data key="hint">This value must be compatible with the corresponding setting in the configured search engine</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchData.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchData.xml
new file mode 100644
index 0000000000000..09ecc41cfaffa
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchData.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="SetMinQueryLengthToDefault" type="catalog_search_config">
+        <requiredEntity type="length_config">CheckUseSystemValueCheckbox</requiredEntity>
+    </entity>
+    <entity name="SetMinQueryLengthToOne" type="catalog_search_config">
+        <requiredEntity type="length_config">MinQueryLengthValue1</requiredEntity>
+    </entity>
+    <entity name="SetMinQueryLengthToTwo" type="catalog_search_config">
+        <requiredEntity type="length_config">MinQueryLengthValue2</requiredEntity>
+    </entity>
+
+    <entity name="MinQueryLengthValue1" type="length_config">
+        <data key="value">1</data>
+        <requiredEntity type="length_config_inherit">UncheckUseSystemValueCheckbox</requiredEntity>
+    </entity>
+    <entity name="MinQueryLengthValue2" type="length_config">
+        <data key="value">2</data>
+        <requiredEntity type="length_config_inherit">UncheckUseSystemValueCheckbox</requiredEntity>
+    </entity>
+
+    <entity name="UncheckUseSystemValueCheckbox" type="length_config_inherit">
+        <data key="value">false</data>
+    </entity>
+    <entity name="CheckUseSystemValueCheckbox" type="length_config_inherit">
+        <data key="inherit">true</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
new file mode 100644
index 0000000000000..65c4ba2787ffd
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Metadata/catalog_search-meta.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CatalogSearchConfig" dataType="catalog_search_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST" successRegex="/messages-message-success/">
+        <object key="groups" dataType="catalog_search_config">
+            <object key="search" dataType="catalog_search_config">
+                <object key="fields" dataType="catalog_search_config">
+                    <object key="min_query_length" dataType="length_config">
+                        <object key="inherit" dataType="length_config_inherit">
+                            <field key="value">boolean</field>
+                        </object>
+                        <field key="value">integer</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchConfigurationPage.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchConfigurationPage.xml
new file mode 100644
index 0000000000000..1914ede1e6b6f
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchConfigurationPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCatalogSearchConfigurationPage" url="admin/system_config/edit/section/catalog/{{tab_anchor}}" area="admin" module="Magento_CatalogSearch" parameterized="true">
+        <section name="AdminCatalogSearchConfigurationSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchConfigurationSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchConfigurationSection.xml
new file mode 100644
index 0000000000000..eb7601304dacb
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/AdminCatalogSearchConfigurationSection.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="AdminCatalogSearchConfigurationSection">
+        <element name="minQueryLength" type="input" selector="#catalog_search_min_query_length"/>
+        <element name="minQueryLengthInherit" type="checkbox" selector="#catalog_search_min_query_length_inherit"/>
+        <element name="minQueryLengthHint" type="text" selector="#row_catalog_search_min_query_length .value span"/>
+        <element name="maxQueryLengthHint" type="text" selector="#row_catalog_search_max_query_length .value span"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontMinimalQueryLengthForCatalogSearchTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontMinimalQueryLengthForCatalogSearchTest.xml
new file mode 100644
index 0000000000000..6162f43b311d5
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontMinimalQueryLengthForCatalogSearchTest.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="StorefrontMinimalQueryLengthForCatalogSearchTest">
+        <annotations>
+            <features value="CatalogSearch"/>
+            <title value="Minimal query length for catalog search"/>
+            <description value="Minimal query length for catalog search"/>
+            <stories value="Catalog search"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-15905"/>
+            <useCaseId value="MAGETWO-73989"/>
+            <group value="catalogSearch"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="SetMinQueryLengthToOne" stepKey="setMinQueryLengthToOne"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <createData entity="SetMinQueryLengthToDefault" stepKey="setMinimumQueryLengthToDefault"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminAssertQueryLengthHintsActionGroup" stepKey="assertQueryLengthHints"/>
+        <actionGroup ref="StorefrontSearchProductActionGroup" stepKey="searchForProducts">
+            <argument name="product" value="$$createProduct$$"/>
+            <argument name="searchPhrase" value="s"/>
+        </actionGroup>
+        <createData entity="SetMinQueryLengthToTwo" stepKey="setMinQueryLengthToTwo"/>
+        <actionGroup ref="StorefrontSearchProductActionGroup" stepKey="searchForProductsAgain">
+            <argument name="product" value="$$createProduct$$"/>
+            <argument name="searchPhrase" value="si"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/AttributeTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/AttributeTest.php
index abc0fdd1069fe..69e2c33d02d1a 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/AttributeTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/AttributeTest.php
@@ -321,10 +321,6 @@ public function testGetItemsWithoutApply()
             ->method('build')
             ->will($this->returnValue($builtData));
 
-        $this->fulltextCollection->expects($this->once())
-            ->method('getSize')
-            ->will($this->returnValue(50));
-
         $expectedFilterItems = [
             $this->createFilterItem(0, $builtData[0]['label'], $builtData[0]['value'], $builtData[0]['count']),
             $this->createFilterItem(1, $builtData[1]['label'], $builtData[1]['value'], $builtData[1]['count']),
@@ -383,9 +379,6 @@ public function testGetItemsOnlyWithResults()
         $this->fulltextCollection->expects($this->once())
             ->method('getFacetedData')
             ->willReturn($facetedData);
-        $this->fulltextCollection->expects($this->once())
-            ->method('getSize')
-            ->will($this->returnValue(50));
 
         $this->itemDataBuilder->expects($this->once())
             ->method('addItemData')
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGeneratorTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGeneratorTest.php
index 560de27ccdbc7..189f1e2cf0cf3 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGeneratorTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGeneratorTest.php
@@ -9,6 +9,9 @@
 use Magento\CatalogSearch\Model\Search\RequestGenerator\GeneratorResolver;
 use Magento\CatalogSearch\Model\Search\RequestGenerator\GeneratorInterface;
 
+/**
+ * Test for \Magento\CatalogSearch\Model\Search\RequestGenerator
+ */
 class RequestGeneratorTest extends \PHPUnit\Framework\TestCase
 {
     /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager  */
@@ -61,7 +64,7 @@ public function attributesProvider()
         return [
             [
                 [
-                    'quick_search_container' => ['queries' => 0, 'filters' => 0, 'aggregations' => 0],
+                    'quick_search_container' => ['queries' => 1, 'filters' => 0, 'aggregations' => 0],
                     'advanced_search_container' => ['queries' => 0, 'filters' => 0, 'aggregations' => 0],
                     'catalog_view_container' => ['queries' => 0, 'filters' => 0, 'aggregations' => 0]
                 ],
diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json
index 2a72af9cf96a5..9945c2140dc7c 100644
--- a/app/code/Magento/CatalogSearch/composer.json
+++ b/app/code/Magento/CatalogSearch/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-search",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-catalog": "102.0.*",
         "magento/module-indexer": "100.2.*",
@@ -20,7 +20,7 @@
         "magento/module-config": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.5",
+    "version": "100.2.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml b/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml
index 9a2c72217c472..acbce5946e217 100644
--- a/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml
+++ b/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml
@@ -19,13 +19,15 @@
                 <field id="engine" canRestore="1">
                     <backend_model>Magento\CatalogSearch\Model\Adminhtml\System\Config\Backend\Engine</backend_model>
                 </field>
-                <field id="min_query_length" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="min_query_length" translate="label comment" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Minimal Query Length</label>
                     <validate>validate-digits</validate>
+                    <comment>This value must be compatible with the corresponding setting in the configured search engine. Be aware: a low query length limit may cause the performance impact.</comment>
                 </field>
-                <field id="max_query_length" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="max_query_length" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Maximum Query Length</label>
                     <validate>validate-digits</validate>
+                    <comment>This value must be compatible with the corresponding setting in the configured search engine.</comment>
                 </field>
                 <field id="max_count_cacheable_search_terms" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Number of top search results to cache</label>
diff --git a/app/code/Magento/CatalogSearch/etc/config.xml b/app/code/Magento/CatalogSearch/etc/config.xml
index 56d7a3bea4121..47a0ec4bc7d33 100644
--- a/app/code/Magento/CatalogSearch/etc/config.xml
+++ b/app/code/Magento/CatalogSearch/etc/config.xml
@@ -13,7 +13,7 @@
             </seo>
             <search>
                 <engine>mysql</engine>
-                <min_query_length>1</min_query_length>
+                <min_query_length>3</min_query_length>
                 <max_query_length>128</max_query_length>
                 <max_count_cacheable_search_terms>100</max_count_cacheable_search_terms>
                 <enable_eav_indexer>1</enable_eav_indexer>
diff --git a/app/code/Magento/CatalogSearch/etc/indexer.xml b/app/code/Magento/CatalogSearch/etc/indexer.xml
index 9726f5372311d..a0b9ca10afccb 100644
--- a/app/code/Magento/CatalogSearch/etc/indexer.xml
+++ b/app/code/Magento/CatalogSearch/etc/indexer.xml
@@ -9,8 +9,6 @@
     <indexer id="catalogsearch_fulltext" view_id="catalogsearch_fulltext" class="Magento\CatalogSearch\Model\Indexer\Fulltext">
         <title translate="true">Catalog Search</title>
         <description translate="true">Rebuild Catalog product fulltext search index</description>
-
-        <saveHandler class="Magento\CatalogSearch\Model\Indexer\IndexHandler" />
         <structure class="Magento\CatalogSearch\Model\Indexer\IndexStructure" />
     </indexer>
 </config>
diff --git a/app/code/Magento/CatalogSearch/etc/search_request.xml b/app/code/Magento/CatalogSearch/etc/search_request.xml
index d7bfb2e6b4a5c..6f9eb6e20666e 100644
--- a/app/code/Magento/CatalogSearch/etc/search_request.xml
+++ b/app/code/Magento/CatalogSearch/etc/search_request.xml
@@ -19,7 +19,6 @@
                 <queryReference clause="must" ref="visibility"/>
             </query>
             <query xsi:type="matchQuery" value="$search_term$" name="search">
-                <match field="sku"/>
                 <match field="*"/>
             </query>
             <query xsi:type="filteredQuery" name="category">
diff --git a/app/code/Magento/CatalogSearch/i18n/en_US.csv b/app/code/Magento/CatalogSearch/i18n/en_US.csv
index ba97dc9de1d31..b5b11348bc7f1 100644
--- a/app/code/Magento/CatalogSearch/i18n/en_US.csv
+++ b/app/code/Magento/CatalogSearch/i18n/en_US.csv
@@ -38,3 +38,5 @@ name,name
 "Maximum Query Length","Maximum Query Length"
 "Rebuild Catalog product fulltext search index","Rebuild Catalog product fulltext search index"
 "Please enter a valid price range.","Please enter a valid price range."
+"This value must be compatible with the corresponding setting in the configured search engine. Be aware: a low query length limit may cause the performance impact.","This value must be compatible with the corresponding setting in the configured search engine. Be aware: a low query length limit may cause the performance impact."
+"This value must be compatible with the corresponding setting in the configured search engine.","This value must be compatible with the corresponding setting in the configured search engine."
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
index 95ea7fcef3a1a..779a0a2875d1d 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
@@ -4,8 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
 /**
@@ -14,108 +13,119 @@
  * @var $block \Magento\CatalogSearch\Block\Advanced\Form
  */
 ?>
-<?php $maxQueryLength = $this->helper('Magento\CatalogSearch\Helper\Data')->getMaxQueryLength();?>
-<form class="form search advanced" action="<?= /* @escapeNotVerified */ $block->getSearchPostUrl() ?>" method="get" id="form-validate">
+<?php $maxQueryLength = (int)$this->helper(\Magento\CatalogSearch\Helper\Data::class)->getMaxQueryLength();?>
+<form class="form search advanced" action="<?= $block->escapeUrl($block->getSearchPostUrl()) ?>" method="get" id="form-validate">
 <fieldset class="fieldset">
-    <legend class="legend"><span><?= /* @escapeNotVerified */ __('Search Settings') ?></span></legend><br />
-    <?php foreach ($block->getSearchableAttributes() as $_attribute): ?>
+    <legend class="legend"><span><?= $block->escapeHtml(__('Search Settings')) ?></span></legend><br />
+    <?php foreach ($block->getSearchableAttributes() as $_attribute) : ?>
     <?php $_code = $_attribute->getAttributeCode() ?>
-        <div class="field <?= /* @escapeNotVerified */ $_code ?>">
-            <label class="label" for="<?= /* @escapeNotVerified */ $_code ?>">
+        <div class="field <?= $block->escapeHtmlAttr($_code) ?>">
+            <label class="label" for="<?= $block->escapeHtmlAttr($_code) ?>">
                 <span><?= $block->escapeHtml(__($block->getAttributeLabel($_attribute))) ?></span>
             </label>
             <div class="control">
-            <?php switch ($block->getAttributeInputType($_attribute)):
-                case 'number': ?>
+            <?php switch ($block->getAttributeInputType($_attribute)) :
+                case 'number':
+                            ?>
                 <div class="range fields group group-2">
                     <div class="field no-label">
                         <div class="control">
                             <input type="text"
-                                   name="<?= /* @escapeNotVerified */ $_code ?>[from]"
+                                   name="<?= $block->escapeHtmlAttr($_code) ?>[from]"
                                    value="<?= $block->escapeHtml($block->getAttributeValue($_attribute, 'from')) ?>"
-                                   id="<?= /* @escapeNotVerified */ $_code ?>"
+                                   id="<?= $block->escapeHtmlAttr($_code) ?>"
                                    title="<?= $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
                                    class="input-text"
-                                   maxlength="<?= /* @escapeNotVerified */ $maxQueryLength ?>"
-                                   data-validate="{number:true, 'less-than-equals-to':'#<?= /* @escapeNotVerified */ $_code ?>_to'}" />
+                                   maxlength="<?= /* @noEscape */ $maxQueryLength ?>"
+                                   data-validate="{number:true, 'less-than-equals-to':'#<?= $block->escapeHtmlAttr($_code) ?>_to'}" />
                         </div>
                     </div>
                     <div class="field no-label">
                         <div class="control">
                             <input type="text"
-                                   name="<?= /* @escapeNotVerified */ $_code ?>[to]"
+                                   name="<?= $block->escapeHtmlAttr($_code) ?>[to]"
                                    value="<?= $block->escapeHtml($block->getAttributeValue($_attribute, 'to')) ?>"
-                                   id="<?= /* @escapeNotVerified */ $_code ?>_to"
+                                   id="<?= $block->escapeHtmlAttr($_code) ?>_to"
                                    title="<?= $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
                                    class="input-text"
-                                   maxlength="<?= /* @escapeNotVerified */ $maxQueryLength ?>"
-                                   data-validate="{number:true, 'greater-than-equals-to':'#<?= /* @escapeNotVerified */ $_code ?>'}" />
+                                   maxlength="<?= /* @noEscape */ $maxQueryLength ?>"
+                                   data-validate="{number:true, 'greater-than-equals-to':'#<?= $block->escapeHtmlAttr($_code) ?>'}" />
                         </div>
                     </div>
                 </div>
-                <?php break;
-                case 'price': ?>
+                <?php
+                          break;
+                case 'price':
+                            ?>
                 <div class="range price fields group group-2">
                     <div class="field no-label">
                         <div class="control">
-                            <input name="<?= /* @escapeNotVerified */ $_code ?>[from]"
+                            <input name="<?= $block->escapeHtmlAttr($_code) ?>[from]"
                                    value="<?= $block->escapeHtml($block->getAttributeValue($_attribute, 'from')) ?>"
-                                   id="<?= /* @escapeNotVerified */ $_code ?>"
+                                   id="<?= $block->escapeHtmlAttr($_code) ?>"
                                    title="<?= $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
                                    class="input-text"
                                    type="text"
-                                   maxlength="<?= /* @escapeNotVerified */ $maxQueryLength ?>"
-                                   data-validate="{number:true, 'less-than-equals-to':'#<?= /* @escapeNotVerified */ $_code ?>_to'}" />
+                                   maxlength="<?= /* @noEscape */ $maxQueryLength ?>"
+                                   data-validate="{number:true, 'less-than-equals-to':'#<?= $block->escapeHtmlAttr($_code) ?>_to'}" />
                         </div>
                     </div>
                     <div class="field with-addon no-label">
                         <div class="control">
                             <div class="addon">
-                                <input name="<?= /* @escapeNotVerified */ $_code ?>[to]"
+                                <input name="<?= $block->escapeHtmlAttr($_code) ?>[to]"
                                        value="<?= $block->escapeHtml($block->getAttributeValue($_attribute, 'to')) ?>"
-                                       id="<?= /* @escapeNotVerified */ $_code ?>_to"
+                                       id="<?= $block->escapeHtmlAttr($_code) ?>_to"
                                        title="<?= $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
                                        class="input-text"
                                        type="text"
-                                       maxlength="<?= /* @escapeNotVerified */ $maxQueryLength ?>"
-                                       data-validate="{number:true, 'greater-than-equals-to':'#<?= /* @escapeNotVerified */ $_code ?>'}" />
+                                       maxlength="<?= /* @noEscape */ $maxQueryLength ?>"
+                                       data-validate="{number:true, 'greater-than-equals-to':'#<?= $block->escapeHtmlAttr($_code) ?>'}" />
                                 <label class="addafter"
-                                       for="<?= /* @escapeNotVerified */ $_code ?>_to">
-                                    <?= /* @escapeNotVerified */ $block->getCurrency($_attribute) ?>
+                                       for="<?= $block->escapeHtmlAttr($_code) ?>_to">
+                                    <?= $block->escapeHtml($block->getCurrency($_attribute)) ?>
                                 </label>
                             </div>
                         </div>
                     </div>
                 </div>
-                <?php break;
-                case 'select': ?>
-                    <?= /* @escapeNotVerified */ $block->getAttributeSelectElement($_attribute) ?>
-                <?php break;
-                case 'yesno': ?>
-                    <?= /* @escapeNotVerified */ $block->getAttributeYesNoElement($_attribute) ?>
-                <?php break;
-                case 'date': ?>
+                <?php
+                          break;
+                case 'select':
+                            ?>
+                    <?= /* @noEscape */ $block->getAttributeSelectElement($_attribute) ?>
+                <?php
+                          break;
+                case 'yesno':
+                            ?>
+                    <?= /* @noEscape */ $block->getAttributeYesNoElement($_attribute) ?>
+                <?php
+                          break;
+                case 'date':
+                            ?>
                 <div class="range dates fields group group-2">
                     <div class="field date no-label">
                         <div class="control">
-                            <?= /* @escapeNotVerified */ $block->getDateInput($_attribute, 'from') ?>
+                            <?= /* @noEscape */ $block->getDateInput($_attribute, 'from') ?>
                         </div>
                     </div>
                     <div class="field date no-label">
                         <div class="control">
-                            <?= /* @escapeNotVerified */ $block->getDateInput($_attribute, 'to') ?>
+                            <?= /* @noEscape */ $block->getDateInput($_attribute, 'to') ?>
                         </div>
                     </div>
                 </div>
-                <?php break;
-                default: ?>
+                <?php
+                          break;
+                default:
+                            ?>
                 <input type="text"
-                       name="<?= /* @escapeNotVerified */ $_code ?>"
-                       id="<?= /* @escapeNotVerified */ $_code ?>"
+                       name="<?= $block->escapeHtmlAttr($_code) ?>"
+                       id="<?= $block->escapeHtmlAttr($_code) ?>"
                        value="<?= $block->escapeHtml($block->getAttributeValue($_attribute)) ?>"
                        title="<?= $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
-                       class="input-text <?= /* @escapeNotVerified */ $block->getAttributeValidationClass($_attribute) ?>"
-                       maxlength="<?= /* @escapeNotVerified */ $maxQueryLength ?>" />
+                       class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass($_attribute)) ?>"
+                       maxlength="<?= /* @noEscape */ $maxQueryLength ?>" />
             <?php endswitch; ?>
             </div>
         </div>
@@ -126,7 +136,7 @@
     <button type="submit"
             class="action search primary"
             title="<?= $block->escapeHtml(__('Search')) ?>">
-        <span><?= /* @escapeNotVerified */ __('Search') ?></span>
+        <span><?= $block->escapeHtml(__('Search')) ?></span>
     </button>
   </div>
 </div>
@@ -147,8 +157,8 @@ require([
                 }
             },
             messages: {
-                'price[to]': {'greater-than-equals-to': '<?= /* @escapeNotVerified */ __('Please enter a valid price range.') ?>'},
-                'price[from]': {'less-than-equals-to': '<?= /* @escapeNotVerified */ __('Please enter a valid price range.') ?>'}
+                'price[to]': {'greater-than-equals-to': '<?= $block->escapeJs(__('Please enter a valid price range.')) ?>'},
+                'price[from]': {'less-than-equals-to': '<?= $block->escapeJs(__('Please enter a valid price range.')) ?>'}
             }
         });
 });
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml
index 09098b1ccd003..cdbc831c8e73e 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml
@@ -4,13 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
  /** @var \Magento\CatalogSearch\Helper\Data $helper */
-$helper = $this->helper('Magento\CatalogSearch\Helper\Data');
+$helper = $this->helper(\Magento\CatalogSearch\Helper\Data::class);
 ?>
 <div class="nested">
-    <a class="action advanced" href="<?= /* @escapeNotVerified */ $helper->getAdvancedSearchUrl() ?>" data-action="advanced-search">
-        <?= /* @escapeNotVerified */ __('Advanced Search') ?>
+    <a class="action advanced" href="<?= $block->escapeUrl($helper->getAdvancedSearchUrl()) ?>" data-action="advanced-search">
+        <?= $block->escapeHtml(__('Advanced Search')) ?>
     </a>
 </div>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml
index 83808df5b95e4..325a76d04c835 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml
@@ -3,52 +3,49 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /**
  * @var $block \Magento\CatalogSearch\Block\Advanced\Result
  */
 ?>
-<?php if ($results = $block->getResultCount()): ?>
+<?php if ($results = $block->getResultCount()) : ?>
     <div class="search found">
         <?php if ($results == 1) : ?>
-            <?= /* @escapeNotVerified */ __('<strong>%1 item</strong> were found using the following search criteria', $results) ?>
-        <?php else: ?>
-            <?= /* @escapeNotVerified */ __('<strong>%1 items</strong> were found using the following search criteria', $results) ?>
+            <?= /* @noEscape */ __('<strong>%1 item</strong> were found using the following search criteria', $results) ?>
+        <?php else : ?>
+            <?= /* @noEscape */ __('<strong>%1 items</strong> were found using the following search criteria', $results) ?>
         <?php endif; ?>
     </div>
-<?php else: ?>
+<?php else : ?>
     <div role="alert" class="message error">
         <div>
-            <?= /* @escapeNotVerified */ __('We can\'t find any items matching these search criteria.') ?> <a href="<?= /* @escapeNotVerified */ $block->getFormUrl() ?>"><?= /* @escapeNotVerified */ __('Modify your search.') ?></a>
+            <?= $block->escapeHtml(__('We can\'t find any items matching these search criteria.')) ?> <a href="<?= $block->escapeUrl($block->getFormUrl()) ?>"><?= $block->escapeHtml(__('Modify your search.')) ?></a>
         </div>
     </div>
 <?php endif; ?>
 
 <?php $searchCriterias = $block->getSearchCriterias(); ?>
 <div class="search summary">
-    <?php foreach (['left', 'right'] as $side): ?>
-        <?php if (@$searchCriterias[$side]): ?>
+    <?php foreach (['left', 'right'] as $side) : ?>
+        <?php if (!empty($searchCriterias[$side])) : ?>
             <ul class="items">
-                <?php foreach ($searchCriterias[$side] as $criteria): ?>
+                <?php foreach ($searchCriterias[$side] as $criteria) : ?>
                     <li class="item"><strong><?= $block->escapeHtml(__($criteria['name'])) ?>:</strong> <?= $block->escapeHtml($criteria['value']) ?></li>
                 <?php endforeach; ?>
             </ul>
         <?php endif; ?>
     <?php endforeach; ?>
 </div>
-<?php if ($block->getResultCount()): ?>
+<?php if ($block->getResultCount()) : ?>
     <div class="message notice">
         <div>
-            <?= /* @escapeNotVerified */ __("Don't see what you're looking for?") ?>
-            <a href="<?= /* @escapeNotVerified */ $block->getFormUrl() ?>"><?= /* @escapeNotVerified */ __('Modify your search.') ?></a>
+            <?= $block->escapeHtml(__("Don't see what you're looking for?")) ?>
+            <a href="<?= $block->escapeUrl($block->getFormUrl()) ?>"><?= $block->escapeHtml(__('Modify your search.')) ?></a>
         </div>
     </div>
 <?php endif; ?>
-<?php if ($block->getResultCount()): ?>
-    <div class="search results"><?= $block->getProductListHtml() ?></div>
+<?php if ($block->getResultCount()) : ?>
+    <div class="search results"><?= /* @noEscape */ $block->getProductListHtml() ?></div>
 <?php endif; ?>
 <?php $block->getSearchCriterias(); ?>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml
index 2757ae3b5f7ed..273d6da4fc3ca 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml
@@ -3,33 +3,29 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<?php if ($block->getResultCount()): ?>
+<?php if ($block->getResultCount()) : ?>
 <?= $block->getChildHtml('tagged_product_list_rss_link') ?>
 <div class="search results">
-    <?php if ($messages = $block->getNoteMessages()):?>
+    <?php if ($messages = $block->getNoteMessages()) : ?>
     <div class="message notice">
         <div>
-            <?php foreach ($messages as $message):?>
-                <?= /* @escapeNotVerified */ $message ?><br />
+            <?php foreach ($messages as $message) : ?>
+                <?= /* @noEscape */ $message ?><br />
             <?php endforeach;?>
         </div>
     </div>
     <?php endif; ?>
-    <?= $block->getProductListHtml() ?>
+    <?= /* @noEscape */ $block->getProductListHtml() ?>
 </div>
-<?php else: ?>
-
+<?php else : ?>
 <div class="message notice">
     <div>
-        <?= /* @escapeNotVerified */ ($block->getNoResultText()) ? $block->getNoResultText() : __('Your search returned no results.') ?>
-        <?= $block->getAdditionalHtml() ?>
-        <?php if ($messages = $block->getNoteMessages()):?>
-            <?php foreach ($messages as $message):?>
-                <br /><?= /* @escapeNotVerified */ $message ?>
+        <?= $block->escapeHtml($block->getNoResultText() ? $block->getNoResultText() : __('Your search returned no results.')) ?>
+        <?= /* @noEscape */ $block->getAdditionalHtml() ?>
+        <?php if ($messages = $block->getNoteMessages()) : ?>
+            <?php foreach ($messages as $message) : ?>
+                <br /><?= /* @noEscape */ $message ?>
             <?php endforeach;?>
         <?php endif; ?>
     </div>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/search_terms_log.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/search_terms_log.phtml
index 61609bdf66bda..38ef11933a46f 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/search_terms_log.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/search_terms_log.phtml
@@ -3,14 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// @codingStandardsIgnoreFile
 ?>
-<?php if ($block->getSearchTermsLog()->isPageCacheable()): ?>
+<?php if ($block->getSearchTermsLog()->isPageCacheable()) : ?>
     <script type="text/x-magento-init">
     {
         "*": {
             "Magento_CatalogSearch/js/search-terms-log": {
-                "url": "<?= /* @escapeNotVerified */ $block->getUrl('catalogsearch/searchTermsLog/save') ?>"
+                "url": "<?= $block->escapeUrl($block->getUrl('catalogsearch/searchTermsLog/save')) ?>"
             }
         }
     }
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php
index 6aa33f37cd31f..beed1e18582c1 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php
@@ -5,12 +5,16 @@
  */
 namespace Magento\CatalogUrlRewrite\Model\Category;
 
+use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Model\Category;
-use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGeneratorFactory;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
-use Magento\UrlRewrite\Model\MergeDataProviderFactory;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGeneratorFactory;
 use Magento\Framework\App\ObjectManager;
+use Magento\UrlRewrite\Model\MergeDataProviderFactory;
 
+/**
+ * Model for generate url rewrites for children categories.
+ */
 class ChildrenUrlRewriteGenerator
 {
     /**
@@ -28,15 +32,22 @@ class ChildrenUrlRewriteGenerator
      */
     private $mergeDataProviderPrototype;
 
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
     /**
      * @param \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider $childrenCategoriesProvider
      * @param \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGeneratorFactory $categoryUrlRewriteGeneratorFactory
      * @param \Magento\UrlRewrite\Model\MergeDataProviderFactory|null $mergeDataProviderFactory
+     * @param CategoryRepositoryInterface|null $categoryRepository
      */
     public function __construct(
         ChildrenCategoriesProvider $childrenCategoriesProvider,
         CategoryUrlRewriteGeneratorFactory $categoryUrlRewriteGeneratorFactory,
-        MergeDataProviderFactory $mergeDataProviderFactory = null
+        MergeDataProviderFactory $mergeDataProviderFactory = null,
+        CategoryRepositoryInterface $categoryRepository = null
     ) {
         $this->childrenCategoriesProvider = $childrenCategoriesProvider;
         $this->categoryUrlRewriteGeneratorFactory = $categoryUrlRewriteGeneratorFactory;
@@ -44,6 +55,8 @@ public function __construct(
             $mergeDataProviderFactory = ObjectManager::getInstance()->get(MergeDataProviderFactory::class);
         }
         $this->mergeDataProviderPrototype = $mergeDataProviderFactory->create();
+        $this->categoryRepository = $categoryRepository
+            ?: ObjectManager::getInstance()->get(CategoryRepositoryInterface::class);
     }
 
     /**
@@ -57,14 +70,18 @@ public function __construct(
     public function generate($storeId, Category $category, $rootCategoryId = null)
     {
         $mergeDataProvider = clone $this->mergeDataProviderPrototype;
-        foreach ($this->childrenCategoriesProvider->getChildren($category, true) as $childCategory) {
-            $childCategory->setStoreId($storeId);
-            $childCategory->setData('save_rewrites_history', $category->getData('save_rewrites_history'));
-            /** @var CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator */
-            $categoryUrlRewriteGenerator = $this->categoryUrlRewriteGeneratorFactory->create();
-            $mergeDataProvider->merge(
-                $categoryUrlRewriteGenerator->generate($childCategory, false, $rootCategoryId)
-            );
+        $childrenIds = $this->childrenCategoriesProvider->getChildrenIds($category, true);
+        if ($childrenIds) {
+            foreach ($childrenIds as $childId) {
+                /** @var Category $childCategory */
+                $childCategory = $this->categoryRepository->get($childId, $storeId);
+                $childCategory->setData('save_rewrites_history', $category->getData('save_rewrites_history'));
+                /** @var CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator */
+                $categoryUrlRewriteGenerator = $this->categoryUrlRewriteGeneratorFactory->create();
+                $mergeDataProvider->merge(
+                    $categoryUrlRewriteGenerator->generate($childCategory, false, $rootCategoryId)
+                );
+            }
         }
 
         return $mergeDataProvider->getData();
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
index ee20b0e934b5d..2961dc4358970 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
@@ -8,6 +8,9 @@
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Model\Category;
 
+/**
+ * Class for generation category url_path.
+ */
 class CategoryUrlPathGenerator
 {
     /**
@@ -58,12 +61,13 @@ public function __construct(
     }
 
     /**
-     * Build category URL path
+     * Build category URL path.
      *
      * @param \Magento\Catalog\Api\Data\CategoryInterface|\Magento\Framework\Model\AbstractModel $category
+     * @param null|\Magento\Catalog\Api\Data\CategoryInterface|\Magento\Framework\Model\AbstractModel $parentCategory
      * @return string
      */
-    public function getUrlPath($category)
+    public function getUrlPath($category, $parentCategory = null)
     {
         if (in_array($category->getParentId(), [Category::ROOT_CATEGORY_ID, Category::TREE_ROOT_ID])) {
             return '';
@@ -77,15 +81,18 @@ public function getUrlPath($category)
             return $category->getUrlPath();
         }
         if ($this->isNeedToGenerateUrlPathForParent($category)) {
-            $parentPath = $this->getUrlPath(
-                $this->categoryRepository->get($category->getParentId(), $category->getStoreId())
-            );
+            $parentCategory = $parentCategory ??
+                $this->categoryRepository->get($category->getParentId(), $category->getStoreId());
+            $parentPath = $this->getUrlPath($parentCategory);
             $path = $parentPath === '' ? $path : $parentPath . '/' . $path;
         }
+
         return $path;
     }
 
     /**
+     * Define whether we should generate URL path for parent.
+     *
      * @param \Magento\Catalog\Model\Category $category
      * @return bool
      */
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php
index 9c5c37b51f0b2..6b838f83d31e4 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php
@@ -208,7 +208,7 @@ public function generateForSpecificStoreView($storeId, $productCategories, Produ
     public function isCategoryProperForGenerating(Category $category, $storeId)
     {
         $parentIds = $category->getParentIds();
-        if (count($parentIds) >= 2) {
+        if (is_array($parentIds) && count($parentIds) >= 2) {
             $rootCategoryId = $parentIds[1];
             return $rootCategoryId == $this->storeManager->getStore($storeId)->getRootCategoryId();
         }
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
index 64f032f2d16e9..3e858e96500c5 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
@@ -3,9 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CatalogUrlRewrite\Model;
 
-use Magento\Store\Model\Store;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Product;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 class ProductUrlPathGenerator
 {
@@ -19,36 +26,36 @@ class ProductUrlPathGenerator
     protected $productUrlSuffix = [];
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $storeManager;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @var ScopeConfigInterface
      */
     protected $scopeConfig;
 
     /**
-     * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
+     * @var CategoryUrlPathGenerator
      */
     protected $categoryUrlPathGenerator;
 
     /**
-     * @var \Magento\Catalog\Api\ProductRepositoryInterface
+     * @var ProductRepositoryInterface
      */
     protected $productRepository;
 
     /**
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param StoreManagerInterface $storeManager
+     * @param ScopeConfigInterface $scopeConfig
      * @param CategoryUrlPathGenerator $categoryUrlPathGenerator
-     * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+     * @param ProductRepositoryInterface $productRepository
      */
     public function __construct(
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator,
-        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+        StoreManagerInterface $storeManager,
+        ScopeConfigInterface $scopeConfig,
+        CategoryUrlPathGenerator $categoryUrlPathGenerator,
+        ProductRepositoryInterface $productRepository
     ) {
         $this->storeManager = $storeManager;
         $this->scopeConfig = $scopeConfig;
@@ -59,8 +66,8 @@ public function __construct(
     /**
      * Retrieve Product Url path (with category if exists)
      *
-     * @param \Magento\Catalog\Model\Product $product
-     * @param \Magento\Catalog\Model\Category $category
+     * @param Product $product
+     * @param Category $category
      *
      * @return string
      */
@@ -80,10 +87,10 @@ public function getUrlPath($product, $category = null)
     /**
      * Prepare URL Key with stored product data (fallback for "Use Default Value" logic)
      *
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
      * @return string
      */
-    protected function prepareProductDefaultUrlKey(\Magento\Catalog\Model\Product $product)
+    protected function prepareProductDefaultUrlKey(Product $product)
     {
         $storedProduct = $this->productRepository->getById($product->getId());
         $storedUrlKey = $storedProduct->getUrlKey();
@@ -93,9 +100,9 @@ protected function prepareProductDefaultUrlKey(\Magento\Catalog\Model\Product $p
     /**
      * Retrieve Product Url path with suffix
      *
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
      * @param int $storeId
-     * @param \Magento\Catalog\Model\Category $category
+     * @param Category $category
      * @return string
      */
     public function getUrlPathWithSuffix($product, $storeId, $category = null)
@@ -106,8 +113,8 @@ public function getUrlPathWithSuffix($product, $storeId, $category = null)
     /**
      * Get canonical product url path
      *
-     * @param \Magento\Catalog\Model\Product $product
-     * @param \Magento\Catalog\Model\Category|null $category
+     * @param Product $product
+     * @param Category|null $category
      * @return string
      */
     public function getCanonicalUrlPath($product, $category = null)
@@ -119,7 +126,7 @@ public function getCanonicalUrlPath($product, $category = null)
     /**
      * Generate product url key based on url_key entered by merchant or product name
      *
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
      * @return string|null
      */
     public function getUrlKey($product)
@@ -131,13 +138,15 @@ public function getUrlKey($product)
     /**
      * Prepare url key for product
      *
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
      * @return string
      */
-    protected function prepareProductUrlKey(\Magento\Catalog\Model\Product $product)
+    protected function prepareProductUrlKey(Product $product)
     {
-        $urlKey = $product->getUrlKey();
-        return $product->formatUrlKey($urlKey === '' || $urlKey === null ? $product->getName() : $urlKey);
+        $urlKey = (string)$product->getUrlKey();
+        $urlKey = trim(strtolower($urlKey));
+
+        return $urlKey ?: $product->formatUrlKey($product->getName());
     }
 
     /**
@@ -155,7 +164,7 @@ protected function getProductUrlSuffix($storeId = null)
         if (!isset($this->productUrlSuffix[$storeId])) {
             $this->productUrlSuffix[$storeId] = $this->scopeConfig->getValue(
                 self::XML_PATH_PRODUCT_URL_SUFFIX,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                ScopeInterface::SCOPE_STORE,
                 $storeId
             );
         }
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
index 022a78be00197..aeb57561e67fd 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
@@ -135,6 +135,7 @@ class AfterImportDataObserver implements ObserverInterface
         'url_path',
         'name',
         'visibility',
+        'save_rewrites_history'
     ];
 
     /**
@@ -199,6 +200,7 @@ public function __construct(
 
     /**
      * Action after data import.
+     *
      * Save new url rewrites and remove old if exist.
      *
      * @param Observer $observer
@@ -230,11 +232,8 @@ public function execute(Observer $observer)
     protected function _populateForUrlGeneration($rowData)
     {
         $newSku = $this->import->getNewSku($rowData[ImportProduct::COL_SKU]);
-        if (empty($newSku) || !isset($newSku['entity_id'])) {
-            return null;
-        }
-        if ($this->import->getRowScope($rowData) == ImportProduct::SCOPE_STORE
-            && empty($rowData[self::URL_KEY_ATTRIBUTE_CODE])) {
+        $oldSku = $this->import->getOldSku();
+        if (!$this->isNeedToPopulateForUrlGeneration($rowData, $newSku, $oldSku)) {
             return null;
         }
         $rowData['entity_id'] = $newSku['entity_id'];
@@ -267,6 +266,29 @@ protected function _populateForUrlGeneration($rowData)
     }
 
     /**
+     * Check is need to populate data for url generation
+     *
+     * @param array $rowData
+     * @param array $newSku
+     * @param array $oldSku
+     * @return bool
+     */
+    private function isNeedToPopulateForUrlGeneration($rowData, $newSku, $oldSku): bool
+    {
+        if ((empty($newSku) || !isset($newSku['entity_id']))
+            || ($this->import->getRowScope($rowData) == ImportProduct::SCOPE_STORE
+                && empty($rowData[self::URL_KEY_ATTRIBUTE_CODE]))
+            || (array_key_exists($rowData[ImportProduct::COL_SKU], $oldSku)
+                && !isset($rowData[self::URL_KEY_ATTRIBUTE_CODE])
+                && $this->import->getBehavior() === ImportExport::BEHAVIOR_APPEND)) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Add store id to product data.
+     *
      * @param \Magento\Catalog\Model\Product $product
      * @param array $rowData
      * @return void
@@ -436,6 +458,8 @@ protected function currentUrlRewritesRegenerate()
     }
 
     /**
+     * Generate url-rewrite for outogenerated url-rewirte.
+     *
      * @param UrlRewrite $url
      * @param Category $category
      * @return array
@@ -470,6 +494,8 @@ protected function generateForAutogenerated($url, $category)
     }
 
     /**
+     * Generate url-rewrite for custom url-rewirte.
+     *
      * @param UrlRewrite $url
      * @param Category $category
      * @return array
@@ -503,6 +529,8 @@ protected function generateForCustom($url, $category)
     }
 
     /**
+     * Retrieve category from url metadata.
+     *
      * @param UrlRewrite $url
      * @return Category|null|bool
      */
@@ -517,6 +545,8 @@ protected function retrieveCategoryFromMetadata($url)
     }
 
     /**
+     * Check, category suited for url-rewrite generation.
+     *
      * @param \Magento\Catalog\Model\Category $category
      * @param int $storeId
      * @return bool
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
index 5130b43333d47..745c302d619a1 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
@@ -100,16 +100,19 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         }
 
         $mapsGenerated = false;
-        if ($category->dataHasChangedFor('url_key')
-            || $category->dataHasChangedFor('is_anchor')
-            || $category->getChangedProductIds()
-        ) {
+        if ($this->isCategoryHasChanged($category)) {
             if ($category->dataHasChangedFor('url_key')) {
                 $categoryUrlRewriteResult = $this->categoryUrlRewriteGenerator->generate($category);
                 $this->urlRewriteBunchReplacer->doBunchReplace($categoryUrlRewriteResult);
             }
-            $productUrlRewriteResult = $this->urlRewriteHandler->generateProductUrlRewrites($category);
-            $this->urlRewriteBunchReplacer->doBunchReplace($productUrlRewriteResult);
+            if ($this->isChangedOnlyProduct($category)) {
+                $productUrlRewriteResult =
+                    $this->urlRewriteHandler->updateProductUrlRewritesForChangedProduct($category);
+                $this->urlRewriteBunchReplacer->doBunchReplace($productUrlRewriteResult);
+            } else {
+                $productUrlRewriteResult = $this->urlRewriteHandler->generateProductUrlRewrites($category);
+                $this->urlRewriteBunchReplacer->doBunchReplace($productUrlRewriteResult);
+            }
             $mapsGenerated = true;
         }
 
@@ -120,8 +123,42 @@ public function execute(\Magento\Framework\Event\Observer $observer)
     }
 
     /**
-     * in case store_id is not set for category then we can assume that it was passed through product import.
-     * store group must have only one root category, so receiving category's path and checking if one of it parts
+     * Check is category changed changed.
+     *
+     * @param Category $category
+     * @return bool
+     */
+    private function isCategoryHasChanged(Category $category): bool
+    {
+        if ($category->dataHasChangedFor('url_key')
+            || $category->dataHasChangedFor('is_anchor')
+            || !empty($category->getChangedProductIds())) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Check is only product changed.
+     *
+     * @param Category $category
+     * @return bool
+     */
+    private function isChangedOnlyProduct(Category $category): bool
+    {
+        if (!empty($category->getChangedProductIds())
+            && !$category->dataHasChangedFor('is_anchor')
+            && !$category->dataHasChangedFor('url_key')) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * In case store_id is not set for category then we can assume that it was passed through product import.
+     * Store group must have only one root category, so receiving category's path and checking if one of it parts
      * is the root category for store group, we can set default_store_id value from it to category.
      * it prevents urls duplication for different stores
      * ("Default Category/category/sub" and "Default Category2/category/sub")
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
index eb54f0427c11a..b49777e08bda9 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
@@ -5,14 +5,17 @@
  */
 namespace Magento\CatalogUrlRewrite\Observer;
 
+use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Model\Category;
+use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
 use Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
-use Magento\Framework\Event\Observer;
-use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Store\Model\Store;
 
+/**
+ * Class observer to initiate generation category url_path.
+ */
 class CategoryUrlPathAutogeneratorObserver implements ObserverInterface
 {
     /**
@@ -30,22 +33,32 @@ class CategoryUrlPathAutogeneratorObserver implements ObserverInterface
      */
     protected $storeViewService;
 
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
     /**
      * @param CategoryUrlPathGenerator $categoryUrlPathGenerator
      * @param ChildrenCategoriesProvider $childrenCategoriesProvider
      * @param \Magento\CatalogUrlRewrite\Service\V1\StoreViewService $storeViewService
+     * @param CategoryRepositoryInterface $categoryRepository
      */
     public function __construct(
         CategoryUrlPathGenerator $categoryUrlPathGenerator,
         ChildrenCategoriesProvider $childrenCategoriesProvider,
-        StoreViewService $storeViewService
+        StoreViewService $storeViewService,
+        CategoryRepositoryInterface $categoryRepository
     ) {
         $this->categoryUrlPathGenerator = $categoryUrlPathGenerator;
         $this->childrenCategoriesProvider = $childrenCategoriesProvider;
         $this->storeViewService = $storeViewService;
+        $this->categoryRepository = $categoryRepository;
     }
 
     /**
+     * Generate Category Url Path.
+     *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -57,45 +70,68 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $useDefaultAttribute = !$category->isObjectNew() && !empty($category->getData('use_default')['url_key']);
         if ($category->getUrlKey() !== false && !$useDefaultAttribute) {
             $resultUrlKey = $this->categoryUrlPathGenerator->getUrlKey($category);
-            if (empty($resultUrlKey)) {
-                throw new \Magento\Framework\Exception\LocalizedException(__('Invalid URL key'));
-            }
-            $category->setUrlKey($resultUrlKey)
-                ->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
-            if (!$category->isObjectNew()) {
-                $category->getResource()->saveAttribute($category, 'url_path');
-                if ($category->dataHasChangedFor('url_path')) {
-                    $this->updateUrlPathForChildren($category);
-                }
+            $this->updateUrlKey($category, $resultUrlKey);
+        } else if ($useDefaultAttribute) {
+            $resultUrlKey = $category->formatUrlKey($category->getOrigData('name'));
+            $this->updateUrlKey($category, $resultUrlKey);
+            $category->setUrlKey(null)->setUrlPath(null);
+        }
+    }
+
+    /**
+     * Update Url Key.
+     *
+     * @param Category $category
+     * @param string $urlKey
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function updateUrlKey(Category $category, string $urlKey)
+    {
+        if (empty($urlKey)) {
+            throw new \Magento\Framework\Exception\LocalizedException(__('Invalid URL key'));
+        }
+        $category->setUrlKey($urlKey)
+            ->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
+        if (!$category->isObjectNew()) {
+            $category->getResource()->saveAttribute($category, 'url_path');
+            if ($category->dataHasChangedFor('url_path')) {
+                $this->updateUrlPathForChildren($category);
             }
         }
     }
 
     /**
+     * Update URL path for children.
+     *
      * @param Category $category
      * @return void
      */
     protected function updateUrlPathForChildren(Category $category)
     {
-        $children = $this->childrenCategoriesProvider->getChildren($category, true);
-
         if ($this->isGlobalScope($category->getStoreId())) {
-            foreach ($children as $child) {
+            $childrenIds = $this->childrenCategoriesProvider->getChildrenIds($category, true);
+            foreach ($childrenIds as $childId) {
                 foreach ($category->getStoreIds() as $storeId) {
                     if ($this->storeViewService->doesEntityHaveOverriddenUrlPathForStore(
                         $storeId,
-                        $child->getId(),
+                        $childId,
                         Category::ENTITY
                     )) {
-                        $child->setStoreId($storeId);
+                        $child = $this->categoryRepository->get($childId, $storeId);
                         $this->updateUrlPathForCategory($child);
                     }
                 }
             }
         } else {
+            $children = $this->childrenCategoriesProvider->getChildren($category, true);
             foreach ($children as $child) {
+                /** @var Category $child */
                 $child->setStoreId($category->getStoreId());
-                $this->updateUrlPathForCategory($child);
+                if ($child->getParentId() === $category->getId()) {
+                    $this->updateUrlPathForCategory($child, $category);
+                } else {
+                    $this->updateUrlPathForCategory($child);
+                }
             }
         }
     }
@@ -112,13 +148,16 @@ protected function isGlobalScope($storeId)
     }
 
     /**
+     * Update URL path for category.
+     *
      * @param Category $category
+     * @param Category|null $parentCategory
      * @return void
      */
-    protected function updateUrlPathForCategory(Category $category)
+    protected function updateUrlPathForCategory(Category $category, Category $parentCategory = null)
     {
         $category->unsUrlPath();
-        $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
+        $category->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category, $parentCategory));
         $category->getResource()->saveAttribute($category, 'url_path');
     }
 }
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
index fc2056e83ec70..12334a2a773cb 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductToWebsiteChangeObserver.php
@@ -13,7 +13,12 @@
 use Magento\Store\Model\Store;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
 
+/**
+ * Observer to assign the products to website.
+ */
 class ProductToWebsiteChangeObserver implements ObserverInterface
 {
     /**
@@ -58,23 +63,30 @@ public function __construct(
      * Generate urls for UrlRewrite and save it in storage
      *
      * @param \Magento\Framework\Event\Observer $observer
+     * @throws NoSuchEntityException
+     * @throws UrlAlreadyExistsException
      * @return void
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
         foreach ($observer->getEvent()->getProducts() as $productId) {
+            $storeId = $this->request->getParam('store_id', Store::DEFAULT_STORE_ID);
+
             $product = $this->productRepository->getById(
                 $productId,
                 false,
-                $this->request->getParam('store_id', Store::DEFAULT_STORE_ID)
+                $storeId
             );
 
-            $this->urlPersist->deleteByData([
-                UrlRewrite::ENTITY_ID => $product->getId(),
-                UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
-            ]);
-            if ($product->getVisibility() != Visibility::VISIBILITY_NOT_VISIBLE) {
-                $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
+            if (!empty($this->productUrlRewriteGenerator->generate($product))) {
+                $this->urlPersist->deleteByData([
+                    UrlRewrite::ENTITY_ID => $product->getId(),
+                    UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
+                    UrlRewrite::STORE_ID => $storeId,
+                ]);
+                if ($product->getVisibility() != Visibility::VISIBILITY_NOT_VISIBLE) {
+                    $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
+                }
             }
         }
     }
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
index 18360dedf0693..3bbbcd4052c4a 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
@@ -24,6 +24,8 @@
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
 /**
+ * Class for management url rewrites.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class UrlRewriteHandler
@@ -125,7 +127,7 @@ public function generateProductUrlRewrites(Category $category): array
     {
         $mergeDataProvider = clone $this->mergeDataProviderPrototype;
         $this->isSkippedProduct[$category->getEntityId()] = [];
-        $saveRewriteHistory = $category->getData('save_rewrites_history');
+        $saveRewriteHistory = (bool)$category->getData('save_rewrites_history');
         $storeId = (int)$category->getStoreId();
 
         if ($category->getChangedProductIds()) {
@@ -156,6 +158,30 @@ public function generateProductUrlRewrites(Category $category): array
     }
 
     /**
+     * Update product url rewrites for changed product.
+     *
+     * @param Category $category
+     * @return array
+     */
+    public function updateProductUrlRewritesForChangedProduct(Category $category): array
+    {
+        $mergeDataProvider = clone $this->mergeDataProviderPrototype;
+        $this->isSkippedProduct[$category->getEntityId()] = [];
+        $saveRewriteHistory = (bool)$category->getData('save_rewrites_history');
+        $storeIds = $this->getCategoryStoreIds($category);
+
+        if ($category->getChangedProductIds()) {
+            foreach ($storeIds as $storeId) {
+                $this->generateChangedProductUrls($mergeDataProvider, $category, (int)$storeId, $saveRewriteHistory);
+            }
+        }
+
+        return $mergeDataProvider->getData();
+    }
+
+    /**
+     * Delete category rewrites for children.
+     *
      * @param Category $category
      * @return void
      */
@@ -184,6 +210,8 @@ public function deleteCategoryRewritesForChildren(Category $category)
     }
 
     /**
+     * Get category products url rewrites.
+     *
      * @param Category $category
      * @param int $storeId
      * @param bool $saveRewriteHistory
@@ -230,15 +258,15 @@ private function getCategoryProductsUrlRewrites(
      *
      * @param MergeDataProvider $mergeDataProvider
      * @param Category $category
-     * @param Product $product
      * @param int $storeId
-     * @param $saveRewriteHistory
+     * @param bool $saveRewriteHistory
+     * @return void
      */
     private function generateChangedProductUrls(
         MergeDataProvider $mergeDataProvider,
         Category $category,
         int $storeId,
-        $saveRewriteHistory
+        bool $saveRewriteHistory
     ) {
         $this->isSkippedProduct[$category->getEntityId()] = $category->getAffectedProductIds();
 
@@ -252,7 +280,7 @@ private function generateChangedProductUrls(
             /* @var Collection $collection */
             $collection = $this->productCollectionFactory->create()
                 ->setStoreId($categoryStoreId)
-                ->addIdFilter($category->getAffectedProductIds())
+                ->addIdFilter($category->getChangedProductIds())
                 ->addAttributeToSelect('visibility')
                 ->addAttributeToSelect('name')
                 ->addAttributeToSelect('url_key')
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
new file mode 100644
index 0000000000000..d52395342c092
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUrlForProductRewrittenCorrectlyTest">
+        <annotations>
+            <features value="CatalogUrlRewrite"/>
+            <stories value="Url rewrites for products"/>
+            <title value="Check that URL for product rewritten correctly"/>
+            <description value="Check that URL for product rewritten correctly"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-13913"/>
+            <useCaseId value="MAGETWO-73534"/>
+            <group value="catalog"/>
+            <group value="catalogUrlRewrite"/>
+        </annotations>
+        <before>
+            <!--Create product-->
+            <createData entity="_defaultCategory" stepKey="category"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!--Delete created data-->
+            <deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Open Created product-->
+        <amOnPage url="{{AdminProductEditPage.url($$createProduct.id$$)}}" stepKey="openProductEditPage"/>
+        <!--Switch to Default Store view-->
+        <actionGroup ref="SwitchToTheNewStoreView" stepKey="selectDefaultStoreView">
+            <argument name="storeViewName" value="_defaultStore"/>
+        </actionGroup>
+
+        <!--Set use default url-->
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSearchEngineOptimizationTab"/>
+        <waitForElementVisible selector="{{AdminProductSEOSection.useDefaultUrl}}" time="30" stepKey="waitForUseDefaultUrlCheckbox"/>
+        <uncheckOption selector="{{AdminProductSEOSection.useDefaultUrl}}" stepKey="uncheckUseDefaultUrlCheckbox"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="$$createProduct.custom_attributes[url_key]$$-updated" stepKey="changeUrlKey"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!--Select product and go toUpdate Attribute page-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="openProductsGrid"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterGridBySku">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+        <click selector="{{AdminProductFiltersSection.allCheckbox}}" stepKey="selectFilteredProduct"/>
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Update attributes')}}" stepKey="clickBulkUpdateAttributes"/>
+        <waitForPageLoad stepKey="waitForUpdateAttributesPageLoad"/>
+        <seeInCurrentUrl url="{{AdminProductUpdateAttributesPage.url}}" stepKey="seeInUrlAttributeUpdatePage"/>
+        <click selector="{{AdminUpdateAttributesWebsiteSection.website}}" stepKey="openWebsitesTab"/>
+        <waitForAjaxLoad stepKey="waitForLoadWebSiteTab"/>
+        <click selector="{{AdminUpdateAttributesWebsiteSection.addProductToWebsite}}" stepKey="checkAddProductToWebsiteCheckbox"/>
+        <click selector="{{AdminUpdateAttributesHeaderSection.saveButton}}" stepKey="clickSave"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="A total of 1 record(s) were updated." stepKey="seeSaveSuccessMessage"/>
+        <!--Got to Store front product page and check url-->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$-updated)}}" stepKey="navigateToSimpleProductPage"/>
+        <seeInCurrentUrl url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$-updated)}}" stepKey="seeProductNewUrl"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createProduct.sku$$" stepKey="seeCorrectSku"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/RewriteStoreLevelUrlKeyOfChildCategoryTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/RewriteStoreLevelUrlKeyOfChildCategoryTest.xml
new file mode 100644
index 0000000000000..ce3f98ee0058a
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/RewriteStoreLevelUrlKeyOfChildCategoryTest.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="RewriteStoreLevelUrlKeyOfChildCategoryTest">
+        <annotations>
+            <title value="Rewriting Store-level URL key of child category"/>
+            <stories value="MAGETWO-89619: #13513: Magento ignore store-level url_key of child category in URL rewrite process for global scope"/>
+            <description value="Rewriting Store-level URL key of child category"/>
+            <features value="CatalogUrlRewrite"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-96558"/>
+            <group value="catalog_url_rewrite"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" />
+
+            <createData entity="_defaultCategory" stepKey="defaultCategory"/>
+            <createData entity="SubCategoryWithParent" stepKey="subCategory">
+                <requiredEntity createDataKey="defaultCategory"/>
+            </createData>
+        </before>
+
+        <after>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+
+            <deleteData createDataKey="subCategory" stepKey="deleteSubCategory"/>
+            <deleteData createDataKey="defaultCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <actionGroup ref="AdminNavigateToCategoryInTree" stepKey="navigateToCreatedSubCategory">
+            <argument name="category" value="$$subCategory$$"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchToCustomStoreView"/>
+
+        <actionGroup ref="ChangeSeoUrlKeyForSubCategory" stepKey="changeSeoUrlKeyForSubCategory">
+            <argument name="value" value="{{BagsCategory.url_key}}"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminNavigateToCategoryInTree" stepKey="navigateToCreatedDefaultCategory">
+            <argument name="category" value="$$defaultCategory$$"/>
+        </actionGroup>
+
+        <actionGroup ref="ChangeSeoUrlKey" stepKey="changeSeoUrlKeyForDefaultCategory">
+            <argument name="value" value="{{GearCategory.url_key}}"/>
+        </actionGroup>
+
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
+
+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="storefrontSwitchStoreView"/>
+
+        <actionGroup ref="StorefrontGoToSubCategoryPage" stepKey="goToSubCategoryPage">
+            <argument name="parentCategory" value="$$defaultCategory$$"/>
+            <argument name="subCategory" value="$$subCategory$$"/>
+            <argument name="urlPath" value="{{GearCategory.url_key}}/{{BagsCategory.url_key}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/ChildrenUrlRewriteGeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/ChildrenUrlRewriteGeneratorTest.php
index 3f641256b1259..f832293706567 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/ChildrenUrlRewriteGeneratorTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/ChildrenUrlRewriteGeneratorTest.php
@@ -31,6 +31,12 @@ class ChildrenUrlRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject */
     private $serializerMock;
 
+    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    private $categoryRepository;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->serializerMock = $this->getMockBuilder(Json::class)
@@ -47,6 +53,9 @@ protected function setUp()
         $this->categoryUrlRewriteGenerator = $this->getMockBuilder(
             \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator::class
         )->disableOriginalConstructor()->getMock();
+        $this->categoryRepository = $this->getMockBuilder(
+            \Magento\Catalog\Model\CategoryRepository::class
+        )->disableOriginalConstructor()->getMock();
         $mergeDataProviderFactory = $this->createPartialMock(
             \Magento\UrlRewrite\Model\MergeDataProviderFactory::class,
             ['create']
@@ -59,14 +68,15 @@ protected function setUp()
             [
                 'childrenCategoriesProvider' => $this->childrenCategoriesProvider,
                 'categoryUrlRewriteGeneratorFactory' => $this->categoryUrlRewriteGeneratorFactory,
-                'mergeDataProviderFactory' => $mergeDataProviderFactory
+                'mergeDataProviderFactory' => $mergeDataProviderFactory,
+                'categoryRepository' => $this->categoryRepository,
             ]
         );
     }
 
     public function testNoChildrenCategories()
     {
-        $this->childrenCategoriesProvider->expects($this->once())->method('getChildren')->with($this->category, true)
+        $this->childrenCategoriesProvider->expects($this->once())->method('getChildrenIds')->with($this->category, true)
             ->will($this->returnValue([]));
 
         $this->assertEquals([], $this->childrenUrlRewriteGenerator->generate('store_id', $this->category));
@@ -76,14 +86,16 @@ public function testGenerate()
     {
         $storeId = 'store_id';
         $saveRewritesHistory = 'flag';
+        $childId = 2;
 
         $childCategory = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
             ->disableOriginalConstructor()->getMock();
-        $childCategory->expects($this->once())->method('setStoreId')->with($storeId);
         $childCategory->expects($this->once())->method('setData')
             ->with('save_rewrites_history', $saveRewritesHistory);
-        $this->childrenCategoriesProvider->expects($this->once())->method('getChildren')->with($this->category, true)
-            ->will($this->returnValue([$childCategory]));
+        $this->childrenCategoriesProvider->expects($this->once())->method('getChildrenIds')->with($this->category, true)
+            ->willReturn([$childId]);
+        $this->categoryRepository->expects($this->once())->method('get')
+            ->with($childId, $storeId)->willReturn($childCategory);
         $this->category->expects($this->any())->method('getData')->with('save_rewrites_history')
             ->will($this->returnValue($saveRewritesHistory));
         $this->categoryUrlRewriteGeneratorFactory->expects($this->once())->method('create')
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlPathGeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlPathGeneratorTest.php
index 7297d150a8e6f..e804fb9d08e54 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlPathGeneratorTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlPathGeneratorTest.php
@@ -157,6 +157,61 @@ public function testGetUrlPathWithParent(
         $this->assertEquals($result, $this->categoryUrlPathGenerator->getUrlPath($this->category));
     }
 
+    /**
+     * @return array
+     */
+    public function getUrlPathWithParentCategoryDataProvider(): array
+    {
+        $requireGenerationLevel = CategoryUrlPathGenerator::MINIMAL_CATEGORY_LEVEL_FOR_PROCESSING;
+        $noGenerationLevel = CategoryUrlPathGenerator::MINIMAL_CATEGORY_LEVEL_FOR_PROCESSING - 1;
+        return [
+            [13, 'url-key', false, $requireGenerationLevel, 10, 'parent-path', 'parent-path/url-key'],
+            [13, 'url-key', false, $requireGenerationLevel, Category::TREE_ROOT_ID, null, 'url-key'],
+            [13, 'url-key', true, $noGenerationLevel, Category::TREE_ROOT_ID, null, 'url-key'],
+        ];
+    }
+
+    /**
+     * Test receiving Url Path when parent category is presented.
+     *
+     * @param int $parentId
+     * @param string $urlKey
+     * @param bool $isCategoryNew
+     * @param bool $level
+     * @param int $parentCategoryParentId
+     * @param null|string $parentUrlPath
+     * @param string $result
+     * @dataProvider getUrlPathWithParentCategoryDataProvider
+     */
+    public function testGetUrlPathWithParentCategory(
+        int $parentId,
+        string $urlKey,
+        bool $isCategoryNew,
+        bool $level,
+        int $parentCategoryParentId,
+        $parentUrlPath,
+        string $result
+    ) {
+        $urlPath = null;
+        $this->category->expects($this->any())->method('getParentId')->willReturn($parentId);
+        $this->category->expects($this->any())->method('getLevel')->willReturn($level);
+        $this->category->expects($this->any())->method('getUrlPath')->willReturn($urlPath);
+        $this->category->expects($this->any())->method('getUrlKey')->willReturn($urlKey);
+        $this->category->expects($this->any())->method('isObjectNew')->willReturn($isCategoryNew);
+
+        $methods = ['getUrlPath', 'getParentId'];
+        $parentCategoryMock = $this->createPartialMock(\Magento\Catalog\Model\Category::class, $methods);
+        $parentCategoryMock->expects($this->any())->method('getParentId')->willReturn($parentCategoryParentId);
+        $parentCategoryMock->expects($this->any())->method('getUrlPath')->willReturn($parentUrlPath);
+
+        $this->categoryRepository->expects($this->any())
+            ->method('get')
+            ->with($parentCategoryParentId)
+            ->willReturn($parentCategoryMock);
+
+        $this->assertEquals($result, $this->categoryUrlPathGenerator->getUrlPath($this->category, $parentCategoryMock));
+    }
+
     /**
      * @return array
      */
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlPathGeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlPathGeneratorTest.php
index 956fe1b88e0ad..14f30eb7607d3 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlPathGeneratorTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlPathGeneratorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model;
 
 use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
@@ -72,10 +73,11 @@ protected function setUp()
     public function getUrlPathDataProvider()
     {
         return [
-            'path based on url key' => ['url-key', null, 'url-key'],
-            'path based on product name 1' => ['', 'product-name', 'product-name'],
-            'path based on product name 2' => [null, 'product-name', 'product-name'],
-            'path based on product name 3' => [false, 'product-name', 'product-name']
+            'path based on url key uppercase' => ['Url Key', null, 0, 'url key'],
+            'path based on url key' => ['url-key', null, 0, 'url-key'],
+            'path based on product name 1' => ['', 'product-name', 1, 'product-name'],
+            'path based on product name 2' => [null, 'product-name', 1, 'product-name'],
+            'path based on product name 3' => [false, 'product-name', 1, 'product-name']
         ];
     }
 
@@ -83,15 +85,17 @@ public function getUrlPathDataProvider()
      * @dataProvider getUrlPathDataProvider
      * @param string|null|bool $urlKey
      * @param string|null|bool $productName
+     * @param int $formatterCalled
      * @param string $result
      */
-    public function testGetUrlPath($urlKey, $productName, $result)
+    public function testGetUrlPath($urlKey, $productName, $formatterCalled, $result)
     {
         $this->product->expects($this->once())->method('getData')->with('url_path')
             ->will($this->returnValue(null));
         $this->product->expects($this->any())->method('getUrlKey')->will($this->returnValue($urlKey));
         $this->product->expects($this->any())->method('getName')->will($this->returnValue($productName));
-        $this->product->expects($this->once())->method('formatUrlKey')->will($this->returnArgument(0));
+        $this->product->expects($this->exactly($formatterCalled))
+            ->method('formatUrlKey')->will($this->returnArgument(0));
 
         $this->assertEquals($result, $this->productUrlPathGenerator->getUrlPath($this->product, null));
     }
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php
new file mode 100644
index 0000000000000..634dae5643c02
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryProcessUrlRewriteSavingObserverTest.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewrite\Test\Unit\Observer;
+
+use Magento\Catalog\Model\Category;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+use Magento\CatalogUrlRewrite\Model\Map\DatabaseMapPool;
+use Magento\CatalogUrlRewrite\Model\Map\DataCategoryUrlRewriteDatabaseMap;
+use Magento\CatalogUrlRewrite\Model\Map\DataProductUrlRewriteDatabaseMap;
+use Magento\CatalogUrlRewrite\Model\UrlRewriteBunchReplacer;
+use Magento\CatalogUrlRewrite\Observer\CategoryProcessUrlRewriteSavingObserver;
+use Magento\CatalogUrlRewrite\Observer\UrlRewriteHandler;
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\ResourceModel\Group\CollectionFactory;
+
+/**
+ * Tests Magento\CatalogUrlRewrite\Observer\CategoryProcessUrlRewriteSavingObserver.
+ */
+class CategoryProcessUrlRewriteSavingObserverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CategoryProcessUrlRewriteSavingObserver
+     */
+    private $observer;
+
+    /**
+     * @var CategoryUrlRewriteGenerator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $categoryUrlRewriteGeneratorMock;
+
+    /**
+     * @var UrlRewriteHandler|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $urlRewriteHandlerMock;
+
+    /**
+     * @var UrlRewriteBunchReplacer|\PHPUnit_Framework_MockObject_MockObject $urlRewriteMock
+     */
+    private $urlRewriteBunchReplacerMock;
+
+    /**
+     * @var DatabaseMapPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $databaseMapPoolMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->categoryUrlRewriteGeneratorMock = $this->createMock(CategoryUrlRewriteGenerator::class);
+        $this->urlRewriteHandlerMock = $this->createMock(UrlRewriteHandler::class);
+        $this->urlRewriteBunchReplacerMock = $this->createMock(UrlRewriteBunchReplacer::class);
+        $this->databaseMapPoolMock = $this->createMock(DatabaseMapPool::class);
+        /** @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject $storeGroupFactoryMock */
+        $storeGroupCollectionFactoryMock = $this->createMock(CollectionFactory::class);
+
+        $this->observer = $objectManager->getObject(
+            CategoryProcessUrlRewriteSavingObserver::class,
+            [
+                'categoryUrlRewriteGenerator' => $this->categoryUrlRewriteGeneratorMock,
+                'urlRewriteHandler' => $this->urlRewriteHandlerMock,
+                'urlRewriteBunchReplacer' => $this->urlRewriteBunchReplacerMock,
+                'databaseMapPool' => $this->databaseMapPoolMock,
+                'dataUrlRewriteClassNames' => [
+                    DataCategoryUrlRewriteDatabaseMap::class,
+                    DataProductUrlRewriteDatabaseMap::class
+                ],
+                'storeGroupFactory' => $storeGroupCollectionFactoryMock,
+            ]
+        );
+    }
+
+    /**
+     * Covers case when only associated products are changed for category.
+     *
+     * @return void
+     */
+    public function testExecuteCategoryOnlyProductHasChanged()
+    {
+        $productId = 120;
+        $productRewrites = ['product-url-rewrite'];
+
+        /** @var Observer|\PHPUnit_Framework_MockObject_MockObject $observerMock */
+        $observerMock = $this->createMock(Observer::class);
+        /** @var Event|\PHPUnit_Framework_MockObject_MockObject $eventMock */
+        $eventMock = $this->createMock(Event::class);
+        /** @var Category|\PHPUnit_Framework_MockObject_MockObject $categoryMock */
+        $categoryMock = $this->createPartialMock(
+            Category::class,
+            [
+                'hasData',
+                'dataHasChangedFor',
+                'getChangedProductIds',
+            ]
+        );
+
+        $categoryMock->expects($this->once())->method('hasData')->with('store_id')->willReturn(true);
+        $categoryMock->expects($this->exactly(2))->method('getChangedProductIds')->willReturn([$productId]);
+        $categoryMock->expects($this->any())->method('dataHasChangedFor')
+            ->willReturnMap(
+                [
+                    ['url_key', false],
+                    ['is_anchor', false],
+                ]
+            );
+        $eventMock->expects($this->once())->method('getData')->with('category')->willReturn($categoryMock);
+        $observerMock->expects($this->once())->method('getEvent')->willReturn($eventMock);
+
+        $this->urlRewriteHandlerMock->expects($this->once())
+            ->method('updateProductUrlRewritesForChangedProduct')
+            ->with($categoryMock)
+            ->willReturn($productRewrites);
+
+        $this->urlRewriteBunchReplacerMock->expects($this->once())
+            ->method('doBunchReplace')
+            ->with($productRewrites, 10000);
+
+        $this->observer->execute($observerMock);
+    }
+}
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryUrlPathAutogeneratorObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryUrlPathAutogeneratorObserverTest.php
index 1b4d1e08aa208..8ea5dc1ba621b 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryUrlPathAutogeneratorObserverTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryUrlPathAutogeneratorObserverTest.php
@@ -49,7 +49,9 @@ protected function setUp()
                 'getResource',
                 'getUrlKey',
                 'getStoreId',
-                'getData'
+                'getData',
+                'getOrigData',
+                'formatUrlKey',
             ]);
         $this->category->expects($this->any())->method('getResource')->willReturn($this->categoryResource);
         $this->observer->expects($this->any())->method('getEvent')->willReturnSelf();
@@ -109,7 +111,35 @@ public function testExecuteWithException()
         $this->categoryUrlPathGenerator->expects($this->once())
             ->method('getUrlKey')
             ->with($this->category)
-            ->willReturn(null);
+            ->willReturn('');
+        $this->categoryUrlPathAutogeneratorObserver->execute($this->observer);
+    }
+
+    /**
+     * Test execute method when option use default url key is true.
+     */
+    public function testExecuteWithUseDefault()
+    {
+        $categoryName = 'test';
+        $categoryData = ['url_key' => 1];
+        $this->category->expects($this->once())->method('getUrlKey')->willReturn($categoryName);
+        $this->category->expects($this->atLeastOnce())
+            ->method('getData')
+            ->with('use_default')
+            ->willReturn($categoryData);
+        $this->category->expects($this->once())->method('getOrigData')->with('name')->willReturn('some_name');
+        $this->category->expects($this->once())->method('formatUrlKey')->with('some_name')->willReturn('url_key');
+        $this->category->expects($this->any())->method('setUrlKey')
+            ->willReturnMap([
+                ['url_key', $this->category],
+                [null, $this->category],
+            ]);
+        $this->category->expects($this->any())->method('setUrlPath')
+            ->willReturnMap([
+                ['url_path', $this->category],
+                [null, $this->category],
+            ]);
+
         $this->categoryUrlPathAutogeneratorObserver->execute($this->observer);
     }
 
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductToWebsiteChangeObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductToWebsiteChangeObserverTest.php
new file mode 100644
index 0000000000000..f383c949b4295
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductToWebsiteChangeObserverTest.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewrite\Test\Unit\Observer;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\CatalogUrlRewrite\Observer\ProductToWebsiteChangeObserver;
+use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\Store\Model\Store;
+
+/**
+ * Test for ProductToWebsiteChangeObserver
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ProductToWebsiteChangeObserverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productRepository;
+
+    /**
+     * @var ProductUrlRewriteGenerator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productUrlRewriteGenerator;
+
+    /**
+     * @var UrlPersistInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $urlPersist;
+
+    /**
+     * @var Event|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $event;
+
+    /**
+     * @var Observer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $observer;
+
+    /**
+     * @var Product|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $product;
+
+    /**
+     * @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $request;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ProductToWebsiteChangeObserver
+     */
+    private $model;
+
+    /**
+     * @var int
+     */
+    private $productId;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $this->productId = 3;
+
+        $this->urlPersist = $this->getMockBuilder(UrlPersistInterface::class)
+            ->setMethods(['deleteByData', 'replace'])
+            ->getMockForAbstractClass();
+        $this->productRepository = $this->getMockBuilder(ProductRepositoryInterface::class)
+            ->setMethods(['getById'])
+            ->getMockForAbstractClass();
+        $this->product = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getId', 'getVisibility'])
+            ->getMock();
+        $this->product->expects($this->any())
+            ->method('getId')
+            ->willReturn($this->productId);
+        $this->productRepository->expects($this->any())
+            ->method('getById')
+            ->with($this->productId, false, Store::DEFAULT_STORE_ID)
+            ->willReturn($this->product);
+        $this->productUrlRewriteGenerator = $this->getMockBuilder(ProductUrlRewriteGenerator::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['generate'])
+            ->getMock();
+        $this->event = $this->getMockBuilder(Event::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getProducts'])
+            ->getMock();
+        $this->event->expects($this->any())
+            ->method('getProducts')
+            ->willReturn([$this->productId]);
+        $this->observer = $this->getMockBuilder(Observer::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getEvent'])
+            ->getMock();
+        $this->observer->expects($this->any())
+            ->method('getEvent')
+            ->willReturn($this->event);
+        $this->request = $this->getMockBuilder(RequestInterface::class)
+            ->setMethods(['getParam'])
+            ->getMockForAbstractClass();
+        $this->request->expects($this->any())
+            ->method('getParam')
+            ->with('store_id', Store::DEFAULT_STORE_ID)
+            ->willReturn(Store::DEFAULT_STORE_ID);
+
+        $this->objectManager = new ObjectManager($this);
+        $this->model = $this->objectManager->getObject(
+            ProductToWebsiteChangeObserver::class,
+            [
+                'productUrlRewriteGenerator' => $this->productUrlRewriteGenerator,
+                'urlPersist' => $this->urlPersist,
+                'productRepository' => $this->productRepository,
+                'request' => $this->request
+            ]
+        );
+    }
+
+    /**
+     * @param array $urlRewriteGeneratorResult
+     * @param int $numberDeleteByData
+     * @param int $productVisibility
+     * @param int $numberReplace
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException
+     * @dataProvider executeDataProvider
+     */
+    public function testExecute(
+        array $urlRewriteGeneratorResult,
+        int $numberDeleteByData,
+        int $productVisibility,
+        int $numberReplace
+    ) {
+        $this->productUrlRewriteGenerator->expects($this->any())
+            ->method('generate')
+            ->willReturn($urlRewriteGeneratorResult);
+        $this->urlPersist->expects($this->exactly($numberDeleteByData))
+            ->method('deleteByData')
+            ->with(
+                [
+                    UrlRewrite::ENTITY_ID => $this->productId,
+                    UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
+                    UrlRewrite::STORE_ID => Store::DEFAULT_STORE_ID
+                ]
+            );
+        $this->product->expects($this->any())
+            ->method('getVisibility')
+            ->willReturn($productVisibility);
+        $this->urlPersist->expects($this->exactly($numberReplace))
+            ->method('replace')
+            ->with($urlRewriteGeneratorResult);
+
+        $this->model->execute($this->observer);
+    }
+
+    /**
+     * Data provider for testExecute
+     *
+     * @return array
+     */
+    public function executeDataProvider(): array
+    {
+        return [
+            [[], 0, Visibility::VISIBILITY_NOT_VISIBLE, 0],
+            [['someRewrite'], 1, Visibility::VISIBILITY_NOT_VISIBLE, 0],
+            [['someRewrite'], 1, Visibility::VISIBILITY_BOTH, 1],
+        ];
+    }
+}
diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json
index f6d3f2102940c..1687d4b925df1 100644
--- a/app/code/Magento/CatalogUrlRewrite/composer.json
+++ b/app/code/Magento/CatalogUrlRewrite/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-url-rewrite",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-backend": "100.2.*",
         "magento/module-catalog": "102.0.*",
         "magento/module-catalog-import-export": "100.2.*",
@@ -14,10 +14,10 @@
         "magento/module-ui": "101.0.*"
     },
     "suggest": {
-        "magento/module-webapi": "*"
+        "magento/module-webapi": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.5",
+    "version": "100.2.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
index cb462ada0fc91..41f5123f3b772 100644
--- a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
+++ b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
@@ -11,6 +11,10 @@
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Widget\Block\BlockInterface;
+use Magento\Framework\Url\EncoderInterface;
+use Magento\Framework\View\LayoutFactory;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\App\ActionInterface;
 
 /**
  * Catalog Products List widget block
@@ -94,6 +98,21 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
      */
     private $json;
 
+    /**
+     * @var LayoutFactory
+     */
+    private $layoutFactory;
+
+    /**
+     * @var \Magento\Framework\Url\EncoderInterface
+     */
+    private $urlEncoder;
+
+    /**
+     * @var \Magento\Framework\View\Element\RendererList
+     */
+    private $rendererListBlock;
+
     /**
      * @param \Magento\Catalog\Block\Product\Context $context
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
@@ -104,6 +123,10 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
      * @param \Magento\Widget\Helper\Conditions $conditionsHelper
      * @param array $data
      * @param Json|null $json
+     * @param LayoutFactory|null $layoutFactory
+     * @param \Magento\Framework\Url\EncoderInterface|null $urlEncoder
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -114,7 +137,9 @@ public function __construct(
         \Magento\CatalogWidget\Model\Rule $rule,
         \Magento\Widget\Helper\Conditions $conditionsHelper,
         array $data = [],
-        Json $json = null
+        Json $json = null,
+        LayoutFactory $layoutFactory = null,
+        EncoderInterface $urlEncoder = null
     ) {
         $this->productCollectionFactory = $productCollectionFactory;
         $this->catalogProductVisibility = $catalogProductVisibility;
@@ -123,6 +148,8 @@ public function __construct(
         $this->rule = $rule;
         $this->conditionsHelper = $conditionsHelper;
         $this->json = $json ?: ObjectManager::getInstance()->get(Json::class);
+        $this->layoutFactory = $layoutFactory ?: ObjectManager::getInstance()->get(LayoutFactory::class);
+        $this->urlEncoder = $urlEncoder ?: ObjectManager::getInstance()->get(EncoderInterface::class);
         parent::__construct(
             $context,
             $data
@@ -151,6 +178,7 @@ protected function _construct()
      * Get key pieces for caching block content
      *
      * @return array
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getCacheKeyInfo()
     {
@@ -210,6 +238,43 @@ public function getProductPriceHtml(
         return $price;
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected function getDetailsRendererList()
+    {
+        if (empty($this->rendererListBlock)) {
+            /** @var $layout \Magento\Framework\View\LayoutInterface */
+            $layout = $this->layoutFactory->create(['cacheable' => false]);
+            $layout->getUpdate()->addHandle('catalog_widget_product_list')->load();
+            $layout->generateXml();
+            $layout->generateElements();
+
+            $this->rendererListBlock = $layout->getBlock('category.product.type.widget.details.renderers');
+        }
+
+        return $this->rendererListBlock;
+    }
+
+    /**
+     * Get post parameters.
+     *
+     * @param Product $product
+     * @return array
+     */
+    public function getAddToCartPostParams(Product $product): array
+    {
+        $url = $this->getAddToCartUrl($product);
+
+        return [
+            'action' => $url,
+            'data' => [
+                'product' => $product->getEntityId(),
+                ActionInterface::PARAM_NAME_URL_ENCODED => $this->urlEncoder->encode($url),
+            ]
+        ];
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -223,6 +288,7 @@ protected function _beforeToHtml()
      * Prepare and return product collection
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function createCollection()
     {
@@ -400,6 +466,24 @@ private function getPriceCurrency()
     }
 
     /**
+     * @inheritdoc
+     */
+    public function getAddToCartUrl($product, $additional = [])
+    {
+        $requestingPageUrl = $this->getRequest()->getParam('requesting_page_url');
+
+        if (!empty($requestingPageUrl)) {
+            $additional['useUencPlaceholder'] = true;
+            $url = parent::getAddToCartUrl($product, $additional);
+            return str_replace('%25uenc%25', $this->urlEncoder->encode($requestingPageUrl), $url);
+        }
+
+        return parent::getAddToCartUrl($product, $additional);
+    }
+
+    /**
+     * Get widget block name
+     *
      * @return string
      */
     private function getWidgetPagerBlockName()
diff --git a/app/code/Magento/CatalogWidget/Setup/UpgradeData.php b/app/code/Magento/CatalogWidget/Setup/UpgradeData.php
new file mode 100644
index 0000000000000..5ebdbe2390d51
--- /dev/null
+++ b/app/code/Magento/CatalogWidget/Setup/UpgradeData.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogWidget\Setup;
+
+use Magento\CatalogWidget\Block\Product\ProductsList;
+use Magento\CatalogWidget\Model\Rule\Condition\Product as ConditionProduct;
+use Magento\Framework\Serialize\Serializer\Json as Serializer;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+
+/**
+ * Upgrade data for CatalogWidget module.
+ */
+class UpgradeData implements UpgradeDataInterface
+{
+    /**
+     * @var Serializer
+     */
+    private $serializer;
+
+    /**
+     * @param Serializer $serializer
+     */
+    public function __construct(
+        Serializer $serializer
+    ) {
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        if (version_compare($context->getVersion(), '2.0.1', '<')) {
+            $this->replaceIsWithIsOneOf($setup);
+        }
+    }
+
+    /**
+     *  Replace 'is' condition with 'is one of' in database.
+     *
+     * If 'is' product list condition is used with multiple skus it should be replaced by 'is one of' condition.
+     *
+     * @param ModuleDataSetupInterface $setup
+     */
+    private function replaceIsWithIsOneOf(ModuleDataSetupInterface $setup)
+    {
+        $tableName = $setup->getTable('widget_instance');
+        $connection = $setup->getConnection();
+        $select = $connection->select()
+            ->from(
+                $tableName,
+                [
+                    'instance_id',
+                    'widget_parameters',
+                ]
+            )->where('instance_type = ? ', ProductsList::class);
+
+        $result = $setup->getConnection()->fetchAll($select);
+
+        if ($result) {
+            $updatedData = $this->updateWidgetData($result);
+
+            $connection->insertOnDuplicate(
+                $tableName,
+                $updatedData
+            );
+        }
+    }
+
+    /**
+     * Replace 'is' condition with 'is one of' in widget parameters.
+     *
+     * @param array $result
+     * @return array
+     */
+    private function updateWidgetData(array $result): array
+    {
+        return array_map(
+            function ($widgetData) {
+                $widgetParameters = $this->serializer->unserialize($widgetData['widget_parameters']);
+                foreach ($widgetParameters['conditions'] as &$condition) {
+                    if (ConditionProduct::class === $condition['type'] &&
+                        'sku' === $condition['attribute'] &&
+                        '==' === $condition['operator']) {
+                        $condition['operator'] = '()';
+                    }
+                }
+                $widgetData['widget_parameters'] = $this->serializer->serialize($widgetParameters);
+
+                return $widgetData;
+            },
+            $result
+        );
+    }
+}
diff --git a/app/code/Magento/CatalogWidget/Test/Mftf/ActionGroup/AdminCreateBlockWithWidgetActionGroup.xml b/app/code/Magento/CatalogWidget/Test/Mftf/ActionGroup/AdminCreateBlockWithWidgetActionGroup.xml
new file mode 100644
index 0000000000000..3631e56fcdcf0
--- /dev/null
+++ b/app/code/Magento/CatalogWidget/Test/Mftf/ActionGroup/AdminCreateBlockWithWidgetActionGroup.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateCmsBlockWithCatalogProductListWidget">
+        <arguments>
+            <argument name="conditionAttribute" type="string"/>
+            <argument name="conditionOperator" type="string"/>
+            <argument name="conditionValue" type="string"/>
+        </arguments>
+        <fillField selector="{{AdminCmsBlockContentSection.content}}" userInput="" stepKey="makeContentFieldEmpty"/>
+
+        <click selector="{{AdminCmsBlockContentSection.insertWidgetButton}}" stepKey="clickInsertWidgetButton"/>
+        <waitForElementVisible selector="{{AdminNewWidgetSection.widgetTypeDropDown}}" time="10" stepKey="waitForInsertWidgetFrame"/>
+
+        <selectOption selector="{{AdminNewWidgetSection.widgetTypeDropDown}}" userInput="Catalog Products List" stepKey="selectCatalogProductListOption"/>
+        <waitForElementVisible selector="{{AdminNewWidgetSection.addNewCondition}}" stepKey="waitForConditionsElementBecomeAvailable"/>
+
+        <click selector="{{AdminNewWidgetSection.addNewCondition}}" stepKey="clickToAddCondition"/>
+        <waitForElementVisible selector="{{AdminNewWidgetSection.selectCondition}}" stepKey="waitForSelectBoxOpened"/>
+
+        <selectOption selector="{{AdminNewWidgetSection.selectCondition}}" userInput="{{conditionAttribute}}" stepKey="selectConditionsSelectBox"/>
+        <waitForElementVisible selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="seeConditionsAdded"/>
+
+        <click selector="{{AdminNewWidgetSection.conditionOperator}}" stepKey="clickToConditionIs"/>
+        <selectOption selector="{{AdminNewWidgetSection.conditionOperatorSelect('1')}}" userInput="{{conditionOperator}}" stepKey="selectOperator"/>
+
+        <click selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="clickAddConditionItem"/>
+        <waitForElementVisible selector="{{AdminNewWidgetSection.setRuleParameter}}" stepKey="waitForConditionFieldOpened"/>
+
+        <fillField selector="{{AdminNewWidgetSection.setRuleParameter}}" userInput="{{conditionValue}}" stepKey="setConditionValue"/>
+        <click selector="{{AdminNewWidgetSection.insertWidget}}" stepKey="clickInsertWidget"/>
+
+        <waitForElementVisible selector="{{AdminMainActionsSection.save}}" stepKey="waitForInsertWidgetSaved"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveButton"/>
+        <see userInput="You saved the block." stepKey="seeSavedBlockMsgOnForm"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/CatalogWidget/Test/Mftf/Test/AdminCatalogProductListWidgetOperatorsTest.xml b/app/code/Magento/CatalogWidget/Test/Mftf/Test/AdminCatalogProductListWidgetOperatorsTest.xml
new file mode 100644
index 0000000000000..95cc73ae92d4e
--- /dev/null
+++ b/app/code/Magento/CatalogWidget/Test/Mftf/Test/AdminCatalogProductListWidgetOperatorsTest.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCatalogProductListWidgetOperatorsTest">
+        <annotations>
+            <features value="CatalogWidget"/>
+            <stories value="MAGETWO-90930: Problems with operator more/less in the 'catalog Products List' widget"/>
+            <title value="Checking operator more/less in the 'catalog Products List' widget"/>
+            <description value="Check 'less than', 'equals or greater than', 'equals or less than' operators"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-96479"/>
+            <group value="catalogWidget"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="createSimpleCategory"/>
+            <createData entity="SimpleProduct" stepKey="createFirstProduct">
+                <requiredEntity createDataKey="createSimpleCategory"/>
+                <field key="price">10</field>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSecondProduct">
+                <requiredEntity createDataKey="createSimpleCategory"/>
+                <field key="price">50</field>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createThirdProduct">
+                <requiredEntity createDataKey="createSimpleCategory"/>
+                <field key="price">100</field>
+            </createData>
+            <createData entity="DefaultCmsBlock" stepKey="createPreReqBlock"/>
+            <!--User log in on back-end as admin-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
+            <deleteData createDataKey="createSimpleCategory" stepKey="deleteSimpleCategory"/>
+            <deleteData createDataKey="createFirstProduct" stepKey="deleteFirstProduct"/>
+            <deleteData createDataKey="createSecondProduct" stepKey="deleteSecondProduct"/>
+            <deleteData createDataKey="createThirdProduct" stepKey="deleteThirdProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Open block with widget-->
+        <actionGroup ref="NavigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage1">
+            <argument name="cmsBlock" value="$$createPreReqBlock$$"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminCreateCmsBlockWithCatalogProductListWidget" stepKey="adminCreateBlockWithWidget">
+            <argument name="conditionAttribute" value="Price"/>
+            <argument name="conditionOperator" value="greater than"/>
+            <argument name="conditionValue" value="20"/>
+        </actionGroup>
+
+        <!--Go to Catalog > Categories (choose category where created products)-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="onCategoryIndexPage"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickExpandAll"/>
+        <waitForElementVisible selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="waitForCategoryVisible"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="clickCategoryLink"/>
+
+        <!--Categories > Content > Add CMS Block: name saved block-->
+        <waitForElementVisible selector="{{AdminCategoryContentSection.sectionHeader}}" stepKey="waitForContentSection"/>
+        <conditionalClick selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.addCMSBlock}}" visible="false" stepKey="openContentSection"/>
+
+        <selectOption selector="{{AdminCategoryContentSection.addCMSBlock}}" userInput="{{DefaultCmsBlock.title}}" stepKey="selectSavedBlock"/>
+
+        <!--Display Settings > Display Mode: Static block only-->
+        <waitForElementVisible selector="{{AdminCategoryDisplaySettingsSection.settingsHeader}}" stepKey="waitForDisplaySettingsSection"/>
+        <conditionalClick selector="{{AdminCategoryDisplaySettingsSection.settingsHeader}}" dependentSelector="{{AdminCategoryDisplaySettingsSection.displayMode}}" visible="false" stepKey="openDisplaySettingsSection"/>
+        <selectOption userInput="Static block only" selector="{{AdminCategoryDisplaySettingsSection.displayMode}}" stepKey="selectStaticBlockOnlyOption"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveCategoryWithProducts"/>
+        <see userInput="You saved the category." stepKey="seeSuccessMessage"/>
+
+        <!--Go to Storefront > category-->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createSimpleCategory.name$$)}}" stepKey="goToStorefrontCategoryPage1"/>
+
+        <!--Check operators Greater than-->
+        <dontSeeElement selector="{{StorefrontWidgetsSection.checkElementStorefrontByPrice('10')}}" stepKey="dontSeeElementByPrice10"/>
+        <seeElement selector="{{StorefrontWidgetsSection.checkElementStorefrontByPrice('50')}}" stepKey="seeElementByPrice50"/>
+        <seeElement selector="{{StorefrontWidgetsSection.checkElementStorefrontByPrice('100')}}" stepKey="seeElementByPrice100"/>
+
+        <!--Open block with widget.-->
+        <actionGroup ref="NavigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage2">
+            <argument name="cmsBlock" value="$$createPreReqBlock$$"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminCreateCmsBlockWithCatalogProductListWidget" stepKey="adminCreateBlockWithWidgetLessThan">
+            <argument name="conditionAttribute" value="Price"/>
+            <argument name="conditionOperator" value="less than"/>
+            <argument name="conditionValue" value="20"/>
+        </actionGroup>
+
+        <!--Go to Storefront > category-->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createSimpleCategory.name$$)}}" stepKey="goToStorefrontCategoryPage2"/>
+
+        <!--Check operators Greater than-->
+        <seeElement selector="{{StorefrontWidgetsSection.checkElementStorefrontByPrice('10')}}" stepKey="seeElementByPrice10"/>
+        <dontSeeElement selector="{{StorefrontWidgetsSection.checkElementStorefrontByPrice('50')}}" stepKey="dontSeeElementByPrice50"/>
+        <dontSeeElement selector="{{StorefrontWidgetsSection.checkElementStorefrontByPrice('100')}}" stepKey="dontSeeElementByPrice100"/>
+
+        <!--Open block with widget-->
+        <actionGroup ref="NavigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage3">
+            <argument name="cmsBlock" value="$$createPreReqBlock$$"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminCreateCmsBlockWithCatalogProductListWidget" stepKey="adminCreateBlockWithWidgetEqualsOrGreaterThan">
+            <argument name="conditionAttribute" value="Price"/>
+            <argument name="conditionOperator" value="equals or greater than"/>
+            <argument name="conditionValue" value="50"/>
+        </actionGroup>
+
+        <!--Go to Storefront > category-->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createSimpleCategory.name$$)}}" stepKey="goToStorefrontCategoryPage3"/>
+
+        <!--Check operators Greater than-->
+        <dontSeeElement selector="{{StorefrontWidgetsSection.checkElementStorefrontByPrice('10')}}" stepKey="dontSeeElementByPrice10a"/>
+        <seeElement selector="{{StorefrontWidgetsSection.checkElementStorefrontByPrice('50')}}" stepKey="seeElementByPrice50a"/>
+        <seeElement selector="{{StorefrontWidgetsSection.checkElementStorefrontByPrice('100')}}" stepKey="seeElementByPrice100a"/>
+
+        <!--Open block with widget-->
+        <actionGroup ref="NavigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage4">
+            <argument name="cmsBlock" value="$$createPreReqBlock$$"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminCreateCmsBlockWithCatalogProductListWidget" stepKey="adminCreateBlockWithWidgetEqualsOrLessThan">
+            <argument name="conditionAttribute" value="Price"/>
+            <argument name="conditionOperator" value="equals or less than"/>
+            <argument name="conditionValue" value="50"/>
+        </actionGroup>
+
+        <!--Go to Storefront > category-->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createSimpleCategory.name$$)}}" stepKey="goToStorefrontCategoryPage4"/>
+
+        <!--Check operators Greater than-->
+        <seeElement selector="{{StorefrontWidgetsSection.checkElementStorefrontByPrice('10')}}" stepKey="seeElementByPrice10b"/>
+        <seeElement selector="{{StorefrontWidgetsSection.checkElementStorefrontByPrice('50')}}" stepKey="seeElementByPrice50b"/>
+        <dontSeeElement selector="{{StorefrontWidgetsSection.checkElementStorefrontByPrice('100')}}" stepKey="dontSeeElementByPrice100b"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json
index 496651a6bfa17..0e315d1efbde3 100644
--- a/app/code/Magento/CatalogWidget/composer.json
+++ b/app/code/Magento/CatalogWidget/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-widget",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-catalog": "102.0.*",
         "magento/module-widget": "101.0.*",
         "magento/module-backend": "100.2.*",
@@ -14,7 +14,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogWidget/etc/module.xml b/app/code/Magento/CatalogWidget/etc/module.xml
index 8954f11f954f7..1f2d84bef2d6b 100644
--- a/app/code/Magento/CatalogWidget/etc/module.xml
+++ b/app/code/Magento/CatalogWidget/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CatalogWidget" setup_version="2.0.0">
+    <module name="Magento_CatalogWidget" setup_version="2.0.1">
         <sequence>
             <module name="Magento_Catalog"/>
             <module name="Magento_Widget"/>
diff --git a/app/code/Magento/CatalogWidget/view/frontend/layout/catalog_widget_product_list.xml b/app/code/Magento/CatalogWidget/view/frontend/layout/catalog_widget_product_list.xml
new file mode 100644
index 0000000000000..4fe7af7f34683
--- /dev/null
+++ b/app/code/Magento/CatalogWidget/view/frontend/layout/catalog_widget_product_list.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <block class="Magento\Framework\View\Element\RendererList" name="category.product.type.widget.details.renderers">
+            <block class="Magento\Framework\View\Element\Template" name="category.product.type.details.renderers.default" as="default"/>
+        </block>
+    </body>
+</page>
diff --git a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
index 574cbe1107e88..0217838b7fd8b 100644
--- a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
+++ b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+use Magento\Framework\App\Action\Action;
 
 // @codingStandardsIgnoreFile
 
@@ -48,57 +49,67 @@
                                         <?= $block->escapeHtml($_item->getName()) ?>
                                     </a>
                                 </strong>
-                                <?php
-                                echo $block->getProductPriceHtml($_item, $type);
-                                ?>
-
                                 <?php if ($templateType): ?>
                                     <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
                                 <?php endif; ?>
 
+                                <?= $block->getProductPriceHtml($_item, $type) ?>
+
+                                <?= $block->getProductDetailsHtml($_item) ?>
+
                                 <?php if ($showWishlist || $showCompare || $showCart): ?>
-                                    <div class="product-item-actions">
-                                        <?php if ($showCart): ?>
-                                            <div class="actions-primary">
-                                                <?php if ($_item->isSaleable()): ?>
-                                                    <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                        <button class="action tocart primary" data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                        </button>
-                                                    <?php else: ?>
-                                                        <?php
-                                                            $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                                            $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-                                                        ?>
-                                                        <button class="action tocart primary" data-post='<?= /* @noEscape */ $postData ?>' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                        </button>
+                                    <div class="product-item-inner">
+                                        <div class="product-item-actions">
+                                            <?php if ($showCart): ?>
+                                                <div class="actions-primary">
+                                                    <?php if ($_item->isSaleable()): ?>
+                                                        <?php $postParams = $block->getAddToCartPostParams($_item); ?>
+                                                        <form data-role="tocart-form"
+                                                              data-product-sku="<?= $block->escapeHtml($_item->getSku()) ?>"
+                                                              action="<?= /* @NoEscape */
+                                                              $postParams['action'] ?>" method="post">
+                                                            <input type="hidden" name="product"
+                                                                   value="<?= /* @escapeNotVerified */
+                                                                   $postParams['data']['product'] ?>">
+                                                            <input type="hidden" name="<?= /* @escapeNotVerified */
+                                                            Action::PARAM_NAME_URL_ENCODED ?>"
+                                                                   value="<?= /* @escapeNotVerified */
+                                                                   $postParams['data'][Action::PARAM_NAME_URL_ENCODED] ?>">
+                                                            <?= $block->getBlockHtml('formkey') ?>
+                                                            <button type="submit"
+                                                                    title="<?= $block->escapeHtml(__('Add to Cart')) ?>"
+                                                                    class="action tocart primary">
+                                                                <span><?= /* @escapeNotVerified */
+                                                                    __('Add to Cart') ?></span>
+                                                            </button>
+                                                        </form>
+                                                        <?php else: ?>
+
+                                                        <?php if ($_item->getIsSalable()): ?>
+                                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
+                                                        <?php else: ?>
+                                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                                        <?php endif; ?>
+                                                    <?php endif; ?>
+                                                </div>
+                                            <?php endif; ?>
+                                            <?php if ($showWishlist || $showCompare): ?>
+                                                <div class="actions-secondary" data-role="add-to-links">
+                                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+                                                        <a href="#"
+                                                           data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>' class="action towishlist" data-action="add-to-wishlist" title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
+                                                        </a>
                                                     <?php endif; ?>
-                                                <?php else: ?>
-                                                    <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
-                                                    <?php else: ?>
-                                                        <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                                    <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
+                                                        <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
+                                                        <a href="#" class="action tocompare" data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>' title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
+                                                        </a>
                                                     <?php endif; ?>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
-                                        <?php if ($showWishlist || $showCompare): ?>
-                                            <div class="actions-secondary" data-role="add-to-links">
-                                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                                    <a href="#"
-                                                       data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>' class="action towishlist" data-action="add-to-wishlist" title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
-                                                        <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
-                                                    <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-                                                    <a href="#" class="action tocompare" data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>' title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
-                                                        <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
+                                                </div>
+                                            <?php endif; ?>
+                                        </div>
                                     </div>
                                 <?php endif; ?>
                             </div>
diff --git a/app/code/Magento/Checkout/Api/Data/PaymentDetailsInterface.php b/app/code/Magento/Checkout/Api/Data/PaymentDetailsInterface.php
index 45e885d0dbd46..589a94243efa5 100644
--- a/app/code/Magento/Checkout/Api/Data/PaymentDetailsInterface.php
+++ b/app/code/Magento/Checkout/Api/Data/PaymentDetailsInterface.php
@@ -5,11 +5,13 @@
  */
 namespace Magento\Checkout\Api\Data;
 
+use Magento\Framework\Api\ExtensibleDataInterface;
+
 /**
  * Interface PaymentDetailsInterface
  * @api
  */
-interface PaymentDetailsInterface
+interface PaymentDetailsInterface extends ExtensibleDataInterface
 {
     /**#@+
      * Constants defined for keys of array, makes typos less likely
diff --git a/app/code/Magento/Checkout/Block/Cart/Sidebar.php b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
index 5c237eecf0a9f..5e3234e9f4cc8 100644
--- a/app/code/Magento/Checkout/Block/Cart/Sidebar.php
+++ b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
@@ -67,7 +67,7 @@ public function __construct(
     }
 
     /**
-     * Returns minicart config
+     * Returns minicart config.
      *
      * @return array
      */
@@ -82,7 +82,8 @@ public function getConfig()
             'baseUrl' => $this->getBaseUrl(),
             'minicartMaxItemsVisible' => $this->getMiniCartMaxItemsCount(),
             'websiteId' => $this->_storeManager->getStore()->getWebsiteId(),
-            'maxItemsToDisplay' => $this->getMaxItemsToDisplay()
+            'maxItemsToDisplay' => $this->getMaxItemsToDisplay(),
+            'storeId' => $this->_storeManager->getStore()->getId(),
         ];
     }
 
@@ -132,6 +133,7 @@ public function getShoppingCartUrl()
      *
      * @return string
      * @codeCoverageIgnore
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getUpdateItemQtyUrl()
     {
@@ -143,6 +145,7 @@ public function getUpdateItemQtyUrl()
      *
      * @return string
      * @codeCoverageIgnore
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getRemoveItemUrl()
     {
diff --git a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
index de996bed02439..5a01f524edeb1 100644
--- a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
+++ b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
@@ -6,10 +6,14 @@
 namespace Magento\Checkout\Block\Checkout;
 
 use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Helper\Address as AddressHelper;
 use Magento\Customer\Model\Session;
 use Magento\Directory\Helper\Data as DirectoryHelper;
 
+/**
+ * Fields attribute merger.
+ */
 class AttributeMerger
 {
     /**
@@ -46,6 +50,7 @@ class AttributeMerger
         'alpha' => 'validate-alpha',
         'numeric' => 'validate-number',
         'alphanumeric' => 'validate-alphanum',
+        'alphanum-with-spaces' => 'validate-alphanum-with-spaces',
         'url' => 'validate-url',
         'email' => 'email2',
         'length' => 'validate-length',
@@ -67,7 +72,7 @@ class AttributeMerger
     private $customerRepository;
 
     /**
-     * @var \Magento\Customer\Api\Data\CustomerInterface
+     * @var CustomerInterface
      */
     private $customer;
 
@@ -269,6 +274,7 @@ protected function getMultilineFieldConfig($attributeCode, array $attributeConfi
         for ($lineIndex = 0; $lineIndex < (int)$attributeConfig['size']; $lineIndex++) {
             $isFirstLine = $lineIndex === 0;
             $line = [
+                'label' => __("%1: Line %2", $attributeConfig['label'], $lineIndex + 1),
                 'component' => 'Magento_Ui/js/form/element/abstract',
                 'config' => [
                     // customScope is used to group elements within a single form e.g. they can be validated separately
@@ -309,6 +315,8 @@ protected function getMultilineFieldConfig($attributeCode, array $attributeConfi
     }
 
     /**
+     * Returns default attribute value.
+     *
      * @param string $attributeCode
      * @return null|string
      */
@@ -346,7 +354,9 @@ protected function getDefaultValue($attributeCode)
     }
 
     /**
-     * @return \Magento\Customer\Api\Data\CustomerInterface|null
+     * Returns logged customer.
+     *
+     * @return CustomerInterface|null
      */
     protected function getCustomer()
     {
diff --git a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
index f47e514948d69..c5d4d68b06225 100644
--- a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
+++ b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
@@ -6,8 +6,11 @@
 namespace Magento\Checkout\Block\Checkout;
 
 use Magento\Checkout\Helper\Data;
+use Magento\Customer\Model\AttributeMetadataDataProvider;
+use Magento\Customer\Model\Options;
 use Magento\Framework\App\ObjectManager;
 use Magento\Store\Api\StoreResolverInterface;
+use Magento\Ui\Component\Form\AttributeMapper;
 
 /**
  * Class LayoutProcessor
@@ -15,12 +18,12 @@
 class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcessorInterface
 {
     /**
-     * @var \Magento\Customer\Model\AttributeMetadataDataProvider
+     * @var AttributeMetadataDataProvider
      */
     private $attributeMetadataDataProvider;
 
     /**
-     * @var \Magento\Ui\Component\Form\AttributeMapper
+     * @var AttributeMapper
      */
     protected $attributeMapper;
 
@@ -30,7 +33,7 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
     protected $merger;
 
     /**
-     * @var \Magento\Customer\Model\Options
+     * @var Options
      */
     private $options;
 
@@ -50,30 +53,21 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
     private $shippingConfig;
 
     /**
-     * @param \Magento\Customer\Model\AttributeMetadataDataProvider $attributeMetadataDataProvider
-     * @param \Magento\Ui\Component\Form\AttributeMapper $attributeMapper
+     * @param AttributeMetadataDataProvider $attributeMetadataDataProvider
+     * @param AttributeMapper $attributeMapper
      * @param AttributeMerger $merger
+     * @param Options|null $options
      */
     public function __construct(
-        \Magento\Customer\Model\AttributeMetadataDataProvider $attributeMetadataDataProvider,
-        \Magento\Ui\Component\Form\AttributeMapper $attributeMapper,
-        AttributeMerger $merger
+        AttributeMetadataDataProvider $attributeMetadataDataProvider,
+        AttributeMapper $attributeMapper,
+        AttributeMerger $merger,
+        Options $options = null
     ) {
         $this->attributeMetadataDataProvider = $attributeMetadataDataProvider;
         $this->attributeMapper = $attributeMapper;
         $this->merger = $merger;
-    }
-
-    /**
-     * @deprecated 100.0.11
-     * @return \Magento\Customer\Model\Options
-     */
-    private function getOptions()
-    {
-        if (!is_object($this->options)) {
-            $this->options = ObjectManager::getInstance()->get(\Magento\Customer\Model\Options::class);
-        }
-        return $this->options;
+        $this->options = $options ?? ObjectManager::getInstance()->get(Options::class);
     }
 
     /**
@@ -143,8 +137,8 @@ private function convertElementsToSelect($elements, $attributesToConvert)
     public function process($jsLayout)
     {
         $attributesToConvert = [
-            'prefix' => [$this->getOptions(), 'getNamePrefixOptions'],
-            'suffix' => [$this->getOptions(), 'getNameSuffixOptions'],
+            'prefix' => [$this->options, 'getNamePrefixOptions'],
+            'suffix' => [$this->options, 'getNameSuffixOptions'],
         ];
 
         $elements = $this->getAddressAttributes();
diff --git a/app/code/Magento/Checkout/Block/Onepage.php b/app/code/Magento/Checkout/Block/Onepage.php
index ca6b045ddbb5d..e01d5835b4cf0 100644
--- a/app/code/Magento/Checkout/Block/Onepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage.php
@@ -38,7 +38,7 @@ class Onepage extends \Magento\Framework\View\Element\Template
     protected $layoutProcessors;
 
     /**
-     * @var \Magento\Framework\Serialize\Serializer\Json
+     * @var \Magento\Framework\Serialize\SerializerInterface
      */
     private $serializer;
 
@@ -48,8 +48,9 @@ class Onepage extends \Magento\Framework\View\Element\Template
      * @param \Magento\Checkout\Model\CompositeConfigProvider $configProvider
      * @param array $layoutProcessors
      * @param array $data
-     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
-     * @throws \RuntimeException
+     * @param \Magento\Framework\Serialize\Serializer\Json $serializer
+     * @param \Magento\Framework\Serialize\SerializerInterface $serializerInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -57,7 +58,8 @@ public function __construct(
         \Magento\Checkout\Model\CompositeConfigProvider $configProvider,
         array $layoutProcessors = [],
         array $data = [],
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
+        \Magento\Framework\Serialize\SerializerInterface $serializerInterface = null
     ) {
         parent::__construct($context, $data);
         $this->formKey = $formKey;
@@ -65,12 +67,12 @@ public function __construct(
         $this->jsLayout = isset($data['jsLayout']) && is_array($data['jsLayout']) ? $data['jsLayout'] : [];
         $this->configProvider = $configProvider;
         $this->layoutProcessors = $layoutProcessors;
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
+        $this->serializer = $serializerInterface ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\Serializer\JsonHexTag::class);
     }
 
     /**
-     * @return string
+     * @inheritdoc
      */
     public function getJsLayout()
     {
@@ -78,7 +80,7 @@ public function getJsLayout()
             $this->jsLayout = $processor->process($this->jsLayout);
         }
 
-        return json_encode($this->jsLayout, JSON_HEX_TAG);
+        return $this->serializer->serialize($this->jsLayout);
     }
 
     /**
@@ -115,11 +117,13 @@ public function getBaseUrl()
     }
 
     /**
+     * Retrieve serialized checkout config.
+     *
      * @return bool|string
      * @since 100.2.0
      */
     public function getSerializedCheckoutConfig()
     {
-        return json_encode($this->getCheckoutConfig(), JSON_HEX_TAG);
+        return  $this->serializer->serialize($this->getCheckoutConfig());
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php
index 82085281c93d9..4aebde6b3b0c0 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Add.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Add.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -75,10 +74,15 @@ protected function _initProduct()
      * Add product to shopping cart action
      *
      * @return \Magento\Framework\Controller\Result\Redirect
+     * @throws \Magento\Framework\Exception\NotFoundException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         if (!$this->_formKeyValidator->validate($this->getRequest())) {
             $this->messageManager->addErrorMessage(
                 __('Your session has expired')
diff --git a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
index 8654bdbde5893..1876d3ca37d94 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
@@ -41,6 +41,8 @@ public function execute()
                 }
             }
             $this->cart->save();
+        } else {
+            $this->messageManager->addErrorMessage(__('Please select at least one product to add to cart'));
         }
         return $this->_goBack();
     }
diff --git a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
index 56215814d2cf6..71407b32f2f22 100644
--- a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
@@ -61,11 +61,16 @@ public function __construct(
      * Initialize coupon
      *
      * @return \Magento\Framework\Controller\Result\Redirect
+     * @throws \Magento\Framework\Exception\NotFoundException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         $couponCode = $this->getRequest()->getParam('remove') == 1
             ? ''
             : trim($this->getRequest()->getParam('coupon_code'));
@@ -95,14 +100,14 @@ public function execute()
                 if (!$itemsCount) {
                     if ($isCodeLengthValid && $coupon->getId()) {
                         $this->_checkoutSession->getQuote()->setCouponCode($couponCode)->save();
-                        $this->messageManager->addSuccess(
+                        $this->messageManager->addSuccessMessage(
                             __(
                                 'You used coupon code "%1".',
                                 $escaper->escapeHtml($couponCode)
                             )
                         );
                     } else {
-                        $this->messageManager->addError(
+                        $this->messageManager->addErrorMessage(
                             __(
                                 'The coupon code "%1" is not valid.',
                                 $escaper->escapeHtml($couponCode)
@@ -111,14 +116,14 @@ public function execute()
                     }
                 } else {
                     if ($isCodeLengthValid && $coupon->getId() && $couponCode == $cartQuote->getCouponCode()) {
-                        $this->messageManager->addSuccess(
+                        $this->messageManager->addSuccessMessage(
                             __(
                                 'You used coupon code "%1".',
                                 $escaper->escapeHtml($couponCode)
                             )
                         );
                     } else {
-                        $this->messageManager->addError(
+                        $this->messageManager->addErrorMessage(
                             __(
                                 'The coupon code "%1" is not valid.',
                                 $escaper->escapeHtml($couponCode)
@@ -127,12 +132,12 @@ public function execute()
                     }
                 }
             } else {
-                $this->messageManager->addSuccess(__('You canceled the coupon code.'));
+                $this->messageManager->addSuccessMessage(__('You canceled the coupon code.'));
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('We cannot apply the coupon code.'));
+            $this->messageManager->addErrorMessage(__('We cannot apply the coupon code.'));
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
         }
 
diff --git a/app/code/Magento/Checkout/Controller/Cart/Delete.php b/app/code/Magento/Checkout/Controller/Cart/Delete.php
index c0371a6e504f6..98277072fdd99 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Delete.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Delete.php
@@ -15,7 +15,7 @@ class Delete extends \Magento\Checkout\Controller\Cart
      */
     public function execute()
     {
-        if (!$this->_formKeyValidator->validate($this->getRequest())) {
+        if (!$this->getRequest()->isPost() || !$this->_formKeyValidator->validate($this->getRequest())) {
             return $this->resultRedirectFactory->create()->setPath('*/*/');
         }
 
diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
index 118611263220b..a6eb61169363c 100644
--- a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
@@ -12,11 +12,16 @@ class UpdateItemOptions extends \Magento\Checkout\Controller\Cart
      * Update product configuration for a cart item
      *
      * @return \Magento\Framework\Controller\Result\Redirect
+     * @throws \Magento\Framework\Exception\NotFoundException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         $id = (int)$this->getRequest()->getParam('id');
         $params = $this->getRequest()->getParams();
 
diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
index 4ebf39df7defc..90335f8fe164f 100644
--- a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
diff --git a/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php b/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php
index c84aec336a589..a17fa44776555 100644
--- a/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php
+++ b/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php
@@ -58,7 +58,7 @@ public function __construct(
      */
     public function execute()
     {
-        if (!$this->getFormKeyValidator()->validate($this->getRequest())) {
+        if (!$this->getRequest()->isPost() || !$this->getFormKeyValidator()->validate($this->getRequest())) {
             return $this->resultRedirectFactory->create()->setPath('*/cart/');
         }
         $itemId = (int)$this->getRequest()->getParam('item_id');
diff --git a/app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php b/app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php
index e9a968681bf3d..3ca511cce6f4e 100644
--- a/app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php
+++ b/app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php
@@ -50,12 +50,12 @@ public function __construct(
     }
 
     /**
-     * @return $this
+     * @inheritdoc
      */
     public function execute()
     {
         $itemId = (int)$this->getRequest()->getParam('item_id');
-        $itemQty = (int)$this->getRequest()->getParam('item_qty');
+        $itemQty = $this->getRequest()->getParam('item_qty');
 
         try {
             $this->sidebar->checkQuoteItem($itemId);
diff --git a/app/code/Magento/Checkout/CustomerData/Cart.php b/app/code/Magento/Checkout/CustomerData/Cart.php
index ddb077462ef10..9154e9c99478e 100644
--- a/app/code/Magento/Checkout/CustomerData/Cart.php
+++ b/app/code/Magento/Checkout/CustomerData/Cart.php
@@ -82,7 +82,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSectionData()
     {
@@ -98,7 +98,8 @@ public function getSectionData()
             'items' => $this->getRecentItems(),
             'extra_actions' => $this->layout->createBlock(\Magento\Catalog\Block\ShortcutButtons::class)->toHtml(),
             'isGuestCheckoutAllowed' => $this->isGuestCheckoutAllowed(),
-            'website_id' => $this->getQuote()->getStore()->getWebsiteId()
+            'website_id' => $this->getQuote()->getStore()->getWebsiteId(),
+            'storeId' => $this->getQuote()->getStore()->getStoreId(),
         ];
     }
 
@@ -158,11 +159,10 @@ protected function getRecentItems()
                     : $item->getProduct();
 
                 $products = $this->catalogUrl->getRewriteByProductStore([$product->getId() => $item->getStoreId()]);
-                if (!isset($products[$product->getId()])) {
-                    continue;
+                if (isset($products[$product->getId()])) {
+                    $urlDataObject = new \Magento\Framework\DataObject($products[$product->getId()]);
+                    $item->getProduct()->setUrlDataObject($urlDataObject);
                 }
-                $urlDataObject = new \Magento\Framework\DataObject($products[$product->getId()]);
-                $item->getProduct()->setUrlDataObject($urlDataObject);
             }
             $items[] = $this->itemPoolInterface->getItemData($item);
         }
diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php
index c0ba9616754bb..0eb59fc70d92f 100644
--- a/app/code/Magento/Checkout/Model/Cart.php
+++ b/app/code/Magento/Checkout/Model/Cart.php
@@ -15,6 +15,7 @@
  * Shopping cart model
  *
  * @api
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @deprecated 100.1.0 Use \Magento\Quote\Model\Quote instead
  */
@@ -354,22 +355,10 @@ protected function _getProductRequest($requestInfo)
     public function addProduct($productInfo, $requestInfo = null)
     {
         $product = $this->_getProduct($productInfo);
-        $request = $this->_getProductRequest($requestInfo);
         $productId = $product->getId();
 
         if ($productId) {
-            $stockItem = $this->stockRegistry->getStockItem($productId, $product->getStore()->getWebsiteId());
-            $minimumQty = $stockItem->getMinSaleQty();
-            //If product quantity is not specified in request and there is set minimal qty for it
-            if ($minimumQty
-                && $minimumQty > 0
-                && !$request->getQty()
-            ) {
-                $request->setQty($minimumQty);
-            }
-        }
-
-        if ($productId) {
+            $request = $this->getQtyRequest($product, $requestInfo);
             try {
                 $result = $this->getQuote()->addProduct($product, $request);
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
@@ -425,8 +414,9 @@ public function addProductsByIds($productIds)
                 }
                 $product = $this->_getProduct($productId);
                 if ($product->getId() && $product->isVisibleInCatalog()) {
+                    $request = $this->getQtyRequest($product);
                     try {
-                        $this->getQuote()->addProduct($product);
+                        $this->getQuote()->addProduct($product, $request);
                     } catch (\Exception $e) {
                         $allAdded = false;
                     }
@@ -747,4 +737,26 @@ private function getRequestInfoFilter()
         }
         return $this->requestInfoFilter;
     }
+
+    /**
+     * Get request quantity
+     *
+     * @param Product $product
+     * @param \Magento\Framework\DataObject|int|array $request
+     * @return int|DataObject
+     */
+    private function getQtyRequest($product, $request = 0)
+    {
+        $request = $this->_getProductRequest($request);
+        $stockItem = $this->stockRegistry->getStockItem($product->getId(), $product->getStore()->getWebsiteId());
+        $minimumQty = $stockItem->getMinSaleQty();
+        //If product quantity is not specified in request and there is set minimal qty for it
+        if ($minimumQty
+            && $minimumQty > 0
+            && !$request->getQty()
+        ) {
+            $request->setQty($minimumQty);
+        }
+        return $request;
+    }
 }
diff --git a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
index 04cabf3db89c4..85065599341c1 100644
--- a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
+++ b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
@@ -14,6 +14,7 @@
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Customer\Model\Url as CustomerUrlManager;
 use Magento\Eav\Api\AttributeOptionManagementInterface;
+use Magento\Framework\Api\CustomAttributesDataInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Http\Context as HttpContext;
 use Magento\Framework\App\ObjectManager;
@@ -22,9 +23,11 @@
 use Magento\Framework\UrlInterface;
 use Magento\Quote\Api\CartItemRepositoryInterface as QuoteItemRepository;
 use Magento\Quote\Api\CartTotalRepositoryInterface;
+use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Api\ShippingMethodManagementInterface as ShippingMethodManager;
 use Magento\Quote\Model\QuoteIdMaskFactory;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Ui\Component\Form\Element\Multiline;
 
 /**
  * Default Config Provider.
@@ -268,17 +271,33 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * Return configuration array.
+     *
+     * @return array|mixed
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getConfig()
     {
-        $quoteId = $this->checkoutSession->getQuote()->getId();
+        $quote = $this->checkoutSession->getQuote();
+        $quoteId = $quote->getId();
+        $email = $quote->getShippingAddress()->getEmail();
+        $quoteItemData = $this->getQuoteItemData();
         $output['formKey'] = $this->formKey->getFormKey();
         $output['customerData'] = $this->getCustomerData();
         $output['quoteData'] = $this->getQuoteData();
-        $output['quoteItemData'] = $this->getQuoteItemData();
+        $output['quoteItemData'] = $quoteItemData;
+        $output['quoteMessages'] = $this->getQuoteItemsMessages($quoteItemData);
         $output['isCustomerLoggedIn'] = $this->isCustomerLoggedIn();
         $output['selectedShippingMethod'] = $this->getSelectedShippingMethod();
+        if ($email && !$this->isCustomerLoggedIn()) {
+            $shippingAddressFromData = $this->getAddressFromData($quote->getShippingAddress());
+            $billingAddressFromData = $this->getAddressFromData($quote->getBillingAddress());
+            $output['shippingAddressFromData'] = $shippingAddressFromData;
+            if ($shippingAddressFromData != $billingAddressFromData) {
+                $output['billingAddressFromData'] = $billingAddressFromData;
+            }
+            $output['validatedEmailValue'] = $email;
+        }
         $output['storeCode'] = $this->getStoreCode();
         $output['isGuestCheckoutAllowed'] = $this->isGuestCheckoutAllowed();
         $output['registerUrl'] = $this->getRegisterUrl();
@@ -289,14 +308,15 @@ public function getConfig()
         $output['staticBaseUrl'] = $this->getStaticBaseUrl();
         $output['priceFormat'] = $this->localeFormat->getPriceFormat(
             null,
-            $this->checkoutSession->getQuote()->getQuoteCurrencyCode()
+            $quote->getQuoteCurrencyCode()
         );
         $output['basePriceFormat'] = $this->localeFormat->getPriceFormat(
             null,
-            $this->checkoutSession->getQuote()->getBaseCurrencyCode()
+            $quote->getBaseCurrencyCode()
         );
         $output['postCodes'] = $this->postCodesConfig->getPostCodes();
         $output['imageData'] = $this->imageProvider->getImages($quoteId);
+
         $output['totalsData'] = $this->getTotalsData();
         $output['shippingPolicy'] = [
             'isEnabled' => $this->scopeConfig->isSetFlag(
@@ -431,6 +451,7 @@ private function getQuoteItemData()
                     $quoteItem->getProduct(),
                     'product_thumbnail_image'
                 )->getUrl();
+                $quoteItemData[$index]['message'] = $quoteItem->getMessage();
             }
         }
         return $quoteItemData;
@@ -525,7 +546,40 @@ private function getSelectedShippingMethod()
     }
 
     /**
-     * Retrieve store code.
+     * Create address data appropriate to fill checkout address form.
+     *
+     * @param AddressInterface $address
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getAddressFromData(AddressInterface $address): array
+    {
+        $addressData = [];
+        $attributesMetadata = $this->addressMetadata->getAllAttributesMetadata();
+        foreach ($attributesMetadata as $attributeMetadata) {
+            if (!$attributeMetadata->isVisible()) {
+                continue;
+            }
+            $attributeCode = $attributeMetadata->getAttributeCode();
+            $attributeData = $address->getData($attributeCode);
+            if ($attributeData) {
+                if ($attributeMetadata->getFrontendInput() === Multiline::NAME) {
+                    $attributeData = is_array($attributeData) ? $attributeData : explode("\n", $attributeData);
+                    $attributeData = (object)$attributeData;
+                }
+                if ($attributeMetadata->isUserDefined()) {
+                    $addressData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES][$attributeCode] = $attributeData;
+                    continue;
+                }
+                $addressData[$attributeCode] = $attributeData;
+            }
+        }
+
+        return $addressData;
+    }
+
+    /**
+     * Retrieve store code
      *
      * @return string
      * @codeCoverageIgnore
@@ -709,4 +763,22 @@ private function getAttributeLabels(array $customAttribute, string $customAttrib
 
         return $attributeOptionLabels;
     }
+
+    /**
+     * Get notification messages for the quote items
+     *
+     * @param array $quoteItemData
+     * @return array
+     */
+    private function getQuoteItemsMessages(array $quoteItemData): array
+    {
+        $quoteItemsMessages = [];
+        if ($quoteItemData) {
+            foreach ($quoteItemData as $item) {
+                $quoteItemsMessages[$item['item_id']] = $item['message'];
+            }
+        }
+
+        return $quoteItemsMessages;
+    }
 }
diff --git a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
index d1894c98e7bce..507411a19f965 100644
--- a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
@@ -13,6 +13,8 @@
 use Magento\Quote\Model\Quote;
 
 /**
+ * Guest payment information management model.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPaymentInformationManagementInterface
@@ -65,7 +67,7 @@ class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPa
      * @param \Magento\Checkout\Api\PaymentInformationManagementInterface $paymentInformationManagement
      * @param \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory
      * @param CartRepositoryInterface $cartRepository
-     * @param ResourceConnection|null
+     * @param ResourceConnection $connectionPool
      * @codeCoverageIgnore
      */
     public function __construct(
@@ -87,7 +89,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function savePaymentInformationAndPlaceOrder(
         $cartId,
@@ -128,7 +130,7 @@ public function savePaymentInformationAndPlaceOrder(
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function savePaymentInformation(
         $cartId,
@@ -155,7 +157,7 @@ public function savePaymentInformation(
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function getPaymentInformation($cartId)
     {
@@ -189,9 +191,8 @@ private function limitShippingCarrier(Quote $quote)
     {
         $shippingAddress = $quote->getShippingAddress();
         if ($shippingAddress && $shippingAddress->getShippingMethod()) {
-            $shippingDataArray = explode('_', $shippingAddress->getShippingMethod());
-            $shippingCarrier = array_shift($shippingDataArray);
-            $shippingAddress->setLimitCarrier($shippingCarrier);
+            $shippingRate = $shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod());
+            $shippingAddress->setLimitCarrier($shippingRate->getCarrier());
         }
     }
 }
diff --git a/app/code/Magento/Checkout/Model/Layout/AbstractTotalsProcessor.php b/app/code/Magento/Checkout/Model/Layout/AbstractTotalsProcessor.php
index 12a8838a7e9ed..4defcb16e7b52 100644
--- a/app/code/Magento/Checkout/Model/Layout/AbstractTotalsProcessor.php
+++ b/app/code/Magento/Checkout/Model/Layout/AbstractTotalsProcessor.php
@@ -3,9 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Checkout\Model\Layout;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Abstract totals processor.
@@ -35,12 +37,14 @@ public function __construct(
     }
 
     /**
+     * Sort total information based on configuration settings.
+     *
      * @param array $totals
      * @return array
      */
     public function sortTotals($totals)
     {
-        $configData = $this->scopeConfig->getValue('sales/totals_sort');
+        $configData = $this->scopeConfig->getValue('sales/totals_sort', ScopeInterface::SCOPE_STORES);
         foreach ($totals as $code => &$total) {
             //convert JS naming style to config naming style
             $code = str_replace('-', '_', $code);
diff --git a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
index eca747f9c042f..c2576e2830522 100644
--- a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
@@ -109,6 +109,12 @@ public function savePaymentInformation(
             $quoteRepository = $this->getCartRepository();
             /** @var \Magento\Quote\Model\Quote $quote */
             $quote = $quoteRepository->getActive($cartId);
+            $customerId = $quote->getBillingAddress()
+                ->getCustomerId();
+            if (!$billingAddress->getCustomerId() && $customerId) {
+                //It's necessary to verify the price rules with the customer data
+                $billingAddress->setCustomerId($customerId);
+            }
             $quote->removeAddress($quote->getBillingAddress()->getId());
             $quote->setBillingAddress($billingAddress);
             $quote->setDataChanges(true);
diff --git a/app/code/Magento/Checkout/Model/ShippingInformationManagement.php b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
index d8142d033f78c..a7c1b62f8a03d 100644
--- a/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
@@ -98,8 +98,8 @@ class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInf
      * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector
-     * @param CartExtensionFactory|null $cartExtensionFactory,
-     * @param ShippingAssignmentFactory|null $shippingAssignmentFactory,
+     * @param CartExtensionFactory|null $cartExtensionFactory
+     * @param ShippingAssignmentFactory|null $shippingAssignmentFactory
      * @param ShippingFactory|null $shippingFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -150,6 +150,10 @@ public function saveAddressInformation(
             $address->setCustomerAddressId(null);
         }
 
+        if ($billingAddress && !$billingAddress->getCustomerAddressId()) {
+            $billingAddress->setCustomerAddressId(null);
+        }
+
         if (!$address->getCountryId()) {
             throw new StateException(__('Shipping address is not set'));
         }
@@ -174,7 +178,9 @@ public function saveAddressInformation(
 
         $shippingAddress = $quote->getShippingAddress();
 
-        if (!$shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod())) {
+        if (!$quote->getIsVirtual()
+            && !$shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod())
+        ) {
             throw new NoSuchEntityException(
                 __('Carrier with such method not found: %1, %2', $carrierCode, $methodCode)
             );
@@ -203,6 +209,8 @@ protected function validateQuote(\Magento\Quote\Model\Quote $quote)
     }
 
     /**
+     * Prepare shipping assignment.
+     *
      * @param CartInterface $quote
      * @param AddressInterface $address
      * @param string $method
diff --git a/app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php b/app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php
index d926e33d54113..6bc7965ff5e34 100644
--- a/app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php
+++ b/app/code/Magento/Checkout/Observer/SalesQuoteSaveAfterObserver.php
@@ -7,6 +7,9 @@
 
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Class SalesQuoteSaveAfterObserver
+ */
 class SalesQuoteSaveAfterObserver implements ObserverInterface
 {
     /**
@@ -24,15 +27,18 @@ public function __construct(\Magento\Checkout\Model\Session $checkoutSession)
     }
 
     /**
+     * Assign quote to session
+     *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
+        /* @var \Magento\Quote\Model\Quote $quote */
         $quote = $observer->getEvent()->getQuote();
-        /* @var $quote \Magento\Quote\Model\Quote */
+
         if ($quote->getIsCheckoutCart()) {
-            $this->checkoutSession->getQuoteId($quote->getId());
+            $this->checkoutSession->setQuoteId($quote->getId());
         }
     }
 }
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminCheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminCheckoutActionGroup.xml
new file mode 100644
index 0000000000000..b8686f93a4039
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminCheckoutActionGroup.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <!-- Checkout select Check/Money billing method -->
+    <actionGroup name="AdminCheckoutSelectCheckMoneyOrderBillingMethodActionGroup">
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <conditionalClick selector="{{AdminCheckoutPaymentSection.checkBillingMethodByName('Check / Money order')}}" dependentSelector="{{AdminCheckoutPaymentSection.checkBillingMethodByName('Check / Money order')}}" visible="true" stepKey="selectCheckmoBillingMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterBillingMethodSelection"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertAdminEmailValidationMessageOnCheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertAdminEmailValidationMessageOnCheckoutActionGroup.xml
new file mode 100644
index 0000000000000..858dbfc5e76f3
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertAdminEmailValidationMessageOnCheckoutActionGroup.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="AssertAdminEmailValidationMessageOnCheckoutActionGroup">
+        <arguments>
+            <argument name="message" type="string" defaultValue="Please enter a valid email address (Ex: johndoe@domain.com)."/>
+        </arguments>
+        <waitForElementVisible selector="{{AdminOrderFormAccountSection.emailErrorMessage}}" stepKey="waitForFormValidation"/>
+        <see selector="{{AdminOrderFormAccountSection.emailErrorMessage}}" userInput="{{message}}" stepKey="seeTheErrorMessageIsDisplayed"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontEmailValidationMessageOnCheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontEmailValidationMessageOnCheckoutActionGroup.xml
new file mode 100644
index 0000000000000..0f7e75f062ab4
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontEmailValidationMessageOnCheckoutActionGroup.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="AssertStorefrontEmailValidationMessageOnCheckoutActionGroup">
+        <arguments>
+            <argument name="message" type="string" defaultValue="Please enter a valid email address (Ex: johndoe@domain.com)."/>
+        </arguments>
+        <waitForElementVisible selector="{{StorefrontCheckoutCheckoutCustomerLoginSection.emailErrorMessage}}" stepKey="waitForFormValidation"/>
+        <see selector="{{StorefrontCheckoutCheckoutCustomerLoginSection.emailErrorMessage}}" userInput="{{message}}" stepKey="seeTheErrorMessageIsDisplayed"/>
+    </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 aa168899ddb02..0122303510a5f 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
@@ -7,12 +7,28 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!-- Checkout select Check/Money Order payment -->
     <actionGroup name="CheckoutSelectCheckMoneyOrderPaymentActionGroup">
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
-        <conditionalClick selector="{{CheckoutPaymentSection.checkMoneyOrderPayment}}" dependentSelector="{{CheckoutPaymentSection.checkMoneyOrderPayment}}" visible="true" stepKey="clickCheckMoneyOrderPayment"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <conditionalClick selector="{{PaymentMethodSection.checkPaymentMethodByName('Check / Money order')}}" dependentSelector="{{PaymentMethodSection.checkPaymentMethodByName('Check / Money order')}}" visible="true" stepKey="selectCheckmoPaymentMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterPaymentMethodSelection"/>
+    </actionGroup>
+
+    <!-- Checkout select Flat Rate shipping method -->
+    <actionGroup name="CheckoutSelectFlatRateShippingMethodActionGroup">
+        <conditionalClick selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Flat Rate')}}" dependentSelector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Flat Rate')}}" visible="true" stepKey="selectFlatRateShippingMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForNextButton"/>
+    </actionGroup>
+
+    <!-- Go to checkout from cart -->
+    <actionGroup name="GoToCheckoutFromCartActionGroup">
+        <waitForElementNotVisible selector="{{StorefrontMinicartSection.emptyCart}}" stepKey="waitUpdateQuantity" />
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <seeInCurrentUrl url="{{CheckoutCartPage.url}}" stepKey="assertCheckoutCartUrl"/>
+        <click selector="{{StorefrontCheckoutCartSummarySection.proceedToCheckout}}" stepKey="goToCheckout"/>
     </actionGroup>
 
     <!-- Checkout place order -->
@@ -21,7 +37,7 @@
             <argument name="orderNumberMessage"/>
             <argument name="emailYouMessage"/>
         </arguments>
-        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+        <waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
         <see selector="{{CheckoutSuccessMainSection.success}}" userInput="{{orderNumberMessage}}" stepKey="seeOrderNumber"/>
         <see selector="{{CheckoutSuccessMainSection.success}}" userInput="{{emailYouMessage}}" stepKey="seeEmailYou"/>
@@ -30,8 +46,8 @@
     <!-- Logged in user checkout filling shipping section -->
     <actionGroup name="LoggedInUserCheckoutFillingShippingSectionActionGroup">
         <arguments>
-            <argument name="customerVar"/>
-            <argument name="customerAddressVar"/>
+            <argument name="customerVar" defaultValue="CustomerEntityOne"/>
+            <argument name="customerAddressVar" defaultValue="CustomerAddressSimple"/>
         </arguments>
         <waitForElementVisible selector="{{CheckoutShippingSection.firstName}}" stepKey="waitForFirstNameFieldAppears" time="30"/>
         <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>
@@ -68,9 +84,58 @@
         <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/>
     </actionGroup>
 
-    <!-- Checkout select Flat Rate shipping method -->
-    <actionGroup name="CheckoutSelectFlatRateShippingMethodActionGroup">
-        <conditionalClick selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Flat Rate')}}" dependentSelector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Flat Rate')}}" visible="true" stepKey="selectFlatRateShippingMethod"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForNextButton"/>
+    <!-- Place order with logged the user -->
+    <actionGroup name="PlaceOrderWithLoggedUserActionGroup">
+        <arguments>
+            <!--First available shipping method will be selected if value is not passed for shippingMethod-->
+            <argument name="shippingMethod" defaultValue="" type="string"/>
+            <!--First available payment method will be selected if value is not passed for paymentMethod-->
+            <argument name="paymentMethod" defaultValue="" type="string"/>
+        </arguments>
+        <waitForElementVisible selector="{{StorefrontCheckoutCartSummarySection.proceedToCheckout}}" stepKey="waitProceedToCheckout"/>
+        <click selector="{{StorefrontCheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
+        <click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('shippingMethod')}}" stepKey="selectShippingMethod"/>
+        <waitForElement selector="{{CheckoutShippingSection.next}}" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForPageLoad stepKey="waitForPaymentPageLoad"/>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSectionLoaded"/>
+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
+        <conditionalClick selector="{{CheckoutPaymentSection.checkPaymentMethodByName('paymentMethod')}}" dependentSelector="{{CheckoutPaymentSection.checkPaymentMethodByName('paymentMethod')}}"
+                          visible="true" stepKey="checkPaymentMethodIfExist"/>
+        <waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="waitForPlaceOrderButton"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/>
+    </actionGroup>
+
+    <actionGroup name="CheckoutSelectShippingMethodActionGroup">
+        <arguments>
+            <!-- First available shipping method will be selected if value is not passed for shippingMethod -->
+            <argument name="shippingMethod" defaultValue="" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName(shippingMethod)}}" dependentSelector="{{CheckoutShippingMethodsSection.checkShippingMethodByName(shippingMethod)}}" visible="true" stepKey="selectShippingMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+        <waitForPageLoad stepKey="waitForPaymentMethod"/>
+        <waitForElementVisible selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSectionLoaded"/>
+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
+    </actionGroup>
+
+    <actionGroup name="AssertStorefrontErrorMessageOnOrderSubmit">
+        <arguments>
+            <argument name="errorMessage" type="string"/>
+        </arguments>
+        <waitForElementVisible selector="{{CheckoutPaymentSection.placeOrderNoWait}}" stepKey="waitForPlaceOrderButton"/>
+        <click selector="{{CheckoutPaymentSection.placeOrderNoWait}}" stepKey="clickPlaceOrder"/>
+        <waitForText selector="{{StorefrontMessagesSection.errorMessage}}" userInput="{{errorMessage}}" time="30" stepKey="seeShippingMethodError"/>
+    </actionGroup>
+
+    <!-- Check shipping method in checkout -->
+    <actionGroup name="CheckShippingMethodInCheckoutActionGroup">
+        <arguments>
+            <argument name="shippingMethod"/>
+        </arguments>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSectionLoaded"/>
+        <seeElement selector="{{CheckoutPaymentSection.isPaymentSection}}" stepKey="assertPaymentSection"/>
+        <see userInput="{{shippingMethod}}" selector="{{CheckoutPaymentSection.shippingMethodInformation}}" stepKey="assertshippingMethodInformation"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GoToCheckoutFromMinicartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GoToCheckoutFromMinicartActionGroup.xml
index 5d91be6517097..c06ff0cb96b58 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GoToCheckoutFromMinicartActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GoToCheckoutFromMinicartActionGroup.xml
@@ -7,12 +7,14 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!-- Go to checkout from minicart -->
     <actionGroup name="GoToCheckoutFromMinicartActionGroup">
+        <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForElement selector="{{StorefrontMinicartSection.showCart}}" stepKey="waitMiniCartSectionShow" />
         <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
-        <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.goToCheckout}}" time="30" stepKey="waitForGoToCheckoutButtonVisible"/>
+        <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="clickGoToCheckoutButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
index 11cd095334113..7fe9fcb74719d 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
@@ -56,4 +56,10 @@
         <selectOption selector="{{classPrefix}} {{CheckoutShippingSection.country}}" userInput="" stepKey="clearFieldCounty"/>
         <clearField selector="{{classPrefix}} {{CheckoutShippingSection.telephone}}" stepKey="clearFieldPhoneNumber"/>
     </actionGroup>
+
+    <actionGroup name="GuestCheckoutFillNewBillingAddressWithoutEmailActionGroup"
+                 extends="GuestCheckoutFillNewBillingAddressActionGroup">
+        <remove keyForRemoval="enterEmail"/>
+        <selectOption selector="{{CheckoutPaymentSection.country}}" userInput="{{customerAddressVar.country_id}}" stepKey="selectCounty" />
+    </actionGroup>
 </actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewShippingAddressActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewShippingAddressActionGroup.xml
new file mode 100644
index 0000000000000..6ea2ccb08d8d3
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewShippingAddressActionGroup.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="GuestCheckoutFillNewShippingAddressActionGroup">
+        <arguments>
+            <argument name="customer" type="entity"/>
+            <argument name="address" type="entity"/>
+        </arguments>
+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{customer.email}}" stepKey="fillEmailField"/>
+        <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customer.firstName}}" stepKey="fillFirstName"/>
+        <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customer.lastName}}" stepKey="fillLastName"/>
+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{address.street}}" stepKey="fillStreet"/>
+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{address.city}}" stepKey="fillCity"/>
+        <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{address.state}}" stepKey="selectRegion"/>
+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{address.postcode}}" stepKey="fillZipCode"/>
+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{address.telephone}}" stepKey="fillPhone"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillingShippingSectionActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillingShippingSectionActionGroup.xml
index 8ff84e7a436e5..19aeeef8e2bc0 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillingShippingSectionActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillingShippingSectionActionGroup.xml
@@ -32,4 +32,13 @@
         <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask1"/>
     </actionGroup>
+
+    <actionGroup name="GuestCheckoutFillingShippingSectionWithoutPaymentsActionGroup" extends="GuestCheckoutFillingShippingSectionActionGroup">
+        <waitForElement selector="{{CheckoutPaymentSection.isPaymentSection}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+    </actionGroup>
+
+    <actionGroup name="GuestCheckoutFillingShippingSectionWithoutRegionActionGroup" extends="GuestCheckoutFillingShippingSectionActionGroup">
+        <selectOption selector="{{CheckoutShippingSection.country}}" userInput="{{customerAddressVar.country}}" after="enterPostcode" stepKey="selectCountry"/>
+        <remove keyForRemoval="selectRegion"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutAddNewAddressInShippingSectionActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutAddNewAddressInShippingSectionActionGroup.xml
index 722e6f1ee49ab..9c4d16ff500a0 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutAddNewAddressInShippingSectionActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutAddNewAddressInShippingSectionActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!--  Logged in user checkout add new adress shipping section -->
     <actionGroup name="LoggedInUserCheckoutAddNewAddressInShippingSectionActionGroup">
         <arguments>
@@ -21,6 +21,14 @@
         <fillField selector="{{CheckoutShippingSection.addTelephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
         <click selector="{{CheckoutShippingSection.addSaveButton}}" stepKey="clickSaveAdressAdd"/>
         <waitForPageLoad stepKey="waitPageLoad"/>
-        <see stepKey="seeRegionSelected" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerAddressVar.state}}"/>
+        <see selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerAddressVar.state}}" stepKey="seeRegionSelected"/>
+    </actionGroup>
+
+    <actionGroup name="LoggedInUserCheckoutAddNewShippingSectionWithoutRegionActionGroup"
+                 extends="LoggedInUserCheckoutAddNewAddressInShippingSectionActionGroup">
+        <remove keyForRemoval="selectRegion"/>
+        <remove keyForRemoval="seeRegionSelected"/>
+        <selectOption selector="{{CheckoutShippingSection.addCountry}}" userInput="{{customerAddressVar.country}}" after="enterPostcode" stepKey="enterCountry"/>
+        <see selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerAddressVar.city}}" after="waitPageLoad" stepKey="seeCitySelected"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoginAsCustomerOnCheckoutPageActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoginAsCustomerOnCheckoutPageActionGroup.xml
new file mode 100644
index 0000000000000..0c89d4ea78648
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoginAsCustomerOnCheckoutPageActionGroup.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="LoginAsCustomerOnCheckoutPageActionGroup">
+        <arguments>
+            <argument name="customer" type="entity"/>
+        </arguments>
+        <waitForPageLoad stepKey="waitForCheckoutShippingSectionToLoad"/>
+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{customer.email}}" stepKey="fillEmailField"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+        <waitForElementVisible selector="{{CheckoutShippingSection.password}}" stepKey="waitForElementVisible"/>
+        <fillField selector="{{CheckoutShippingSection.password}}" userInput="{{customer.password}}" stepKey="fillPasswordField"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear2"/>
+        <waitForElementVisible selector="{{CheckoutShippingSection.loginButton}}" stepKey="waitForLoginButtonVisible"/>
+        <doubleClick selector="{{CheckoutShippingSection.loginButton}}" stepKey="clickLoginBtn"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear3"/>
+        <waitForPageLoad stepKey="waitToBeLoggedIn"/>
+        <waitForElementNotVisible selector="{{CheckoutShippingSection.email}}" stepKey="waitForEmailInvisible"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/OpenStoreFrontCheckoutShippingPageActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/OpenStoreFrontCheckoutShippingPageActionGroup.xml
new file mode 100644
index 0000000000000..cea9d968b58e1
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/OpenStoreFrontCheckoutShippingPageActionGroup.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="OpenStoreFrontCheckoutShippingPageActionGroup">
+        <amOnPage url="{{CheckoutShippingPage.url}}" stepKey="amOnCheckoutShippingPage"/>
+        <waitForPageLoad stepKey="waitForCheckoutShippingPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCartEstimateShippingAndTaxActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCartEstimateShippingAndTaxActionGroup.xml
new file mode 100644
index 0000000000000..e1108e53e6edd
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCartEstimateShippingAndTaxActionGroup.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">
+    <!-- Assert Estimate Shipping and Tax Data in Cart -->
+    <actionGroup name="StorefrontAssertCartEstimateShippingAndTaxActionGroup">
+        <arguments>
+            <argument name="customerData" defaultValue="Simple_US_CA_Customer_For_Shipment"/>
+        </arguments>
+        <seeInField selector="{{StorefrontCheckoutCartSummarySection.country}}" userInput="{{customerData.country}}" stepKey="assertCountryFieldInCartEstimateShippingAndTaxSection"/>
+        <seeInField selector="{{StorefrontCheckoutCartSummarySection.stateProvinceInput}}" userInput="{{customerData.region}}" stepKey="assertStateProvinceInCartEstimateShippingAndTaxSection"/>
+        <seeInField selector="{{StorefrontCheckoutCartSummarySection.postcode}}" userInput="{{customerData.postcode}}" stepKey="assertZipPostalCodeInCartEstimateShippingAndTaxSection"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCartShippingMethodSelectedActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCartShippingMethodSelectedActionGroup.xml
new file mode 100644
index 0000000000000..d874485eb58f1
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCartShippingMethodSelectedActionGroup.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">
+    <!-- Assert Shipping Method Is Checked on Cart -->
+    <actionGroup name="StorefrontAssertCartShippingMethodSelectedActionGroup">
+        <arguments>
+            <argument name="carrierCode" type="string"/>
+            <argument name="methodCode" type="string"/>
+        </arguments>
+        <seeCheckboxIsChecked selector="{{StorefrontCheckoutCartSummarySection.shippingMethodElementId(carrierCode, methodCode)}}" stepKey="assertShippingMethodIsChecked"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCheckoutEstimateShippingInformationActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCheckoutEstimateShippingInformationActionGroup.xml
new file mode 100644
index 0000000000000..82d7e12105b8c
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCheckoutEstimateShippingInformationActionGroup.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">
+    <!-- Assert Estimate Shipping and Tax Data on Checkout -->
+    <actionGroup name="StorefrontAssertCheckoutEstimateShippingInformationActionGroup">
+        <arguments>
+            <argument name="customerData" defaultValue="Simple_US_CA_Customer_For_Shipment"/>
+        </arguments>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.country}}" userInput="{{customerData.country}}" stepKey="assertCountryField"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.region}}" userInput="{{customerData.region}}" stepKey="assertStateProvinceField"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.postcode}}" userInput="{{customerData.postcode}}" stepKey="assertZipPostalCodeField"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCheckoutShippingMethodSelectedActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCheckoutShippingMethodSelectedActionGroup.xml
new file mode 100644
index 0000000000000..33f2852f1f0ad
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCheckoutShippingMethodSelectedActionGroup.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">
+    <!-- Assert Shipping Method by Name Is Checked on Checkout -->
+    <actionGroup name="StorefrontAssertCheckoutShippingMethodSelectedActionGroup">
+        <arguments>
+            <argument name="shippingMethod"/>
+        </arguments>
+        <seeCheckboxIsChecked selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('shippingMethod')}}" stepKey="assertShippingMethodByNameIsChecked"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertGuestShippingInfoActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertGuestShippingInfoActionGroup.xml
new file mode 100644
index 0000000000000..02c362bf34058
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertGuestShippingInfoActionGroup.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">
+    <!-- Assert guest shipping info on checkout -->
+    <actionGroup name="StorefrontAssertGuestShippingInfoActionGroup">
+        <arguments>
+            <argument name="customerData" defaultValue="Simple_UK_Customer_For_Shipment"/>
+        </arguments>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{customerData.email}}" stepKey="assertEmailAddress"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{customerData.firstName}}" stepKey="assertFirstName"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{customerData.lastName}}" stepKey="assertLastName"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.company}}" userInput="{{customerData.company}}" stepKey="assertCompany"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.street}}" userInput="{{customerData.streetFirstLine}}" stepKey="assertAddressFirstLine"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.street2}}" userInput="{{customerData.streetSecondLine}}" stepKey="assertAddressSecondLine"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.city}}" userInput="{{customerData.city}}" stepKey="assertCity"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.country}}" userInput="{{customerData.country}}" stepKey="assertCountry"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.regionInput}}" userInput="{{customerData.region}}" stepKey="assertStateProvince"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.postcode}}" userInput="{{customerData.postcode}}" stepKey="assertZipPostalCode"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.telephone}}" userInput="{{customerData.telephone}}" stepKey="assertPhoneNumber"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertShippingMethodPresentInCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertShippingMethodPresentInCartActionGroup.xml
new file mode 100644
index 0000000000000..e49eb401b71f1
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertShippingMethodPresentInCartActionGroup.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">
+    <!-- Assert shipping method is present in cart -->
+    <actionGroup name="StorefrontAssertShippingMethodPresentInCartActionGroup">
+        <arguments>
+            <argument name="shippingMethod" type="string"/>
+        </arguments>
+        <see selector="{{StorefrontCheckoutCartSummarySection.shippingMethodLabel}}" userInput="{{shippingMethod}}" stepKey="assertShippingMethodIsPresentInCart"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCartEstimateShippingAndTaxActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCartEstimateShippingAndTaxActionGroup.xml
new file mode 100644
index 0000000000000..02fdeb40d8d09
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCartEstimateShippingAndTaxActionGroup.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">
+    <!-- Fill Estimate Shipping and Tax fields -->
+    <actionGroup name="StorefrontCartEstimateShippingAndTaxActionGroup">
+        <arguments>
+            <argument name="estimateAddress" defaultValue="EstimateAddressCalifornia"/>
+        </arguments>
+        <conditionalClick selector="{{StorefrontCheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{StorefrontCheckoutCartSummarySection.country}}" visible="false" stepKey="clickOnEstimateShippingAndTax"/>
+        <waitForElementVisible selector="{{StorefrontCheckoutCartSummarySection.country}}" stepKey="waitForCountrySelectorIsVisible"/>
+        <selectOption selector="{{StorefrontCheckoutCartSummarySection.country}}" userInput="{{estimateAddress.country}}" stepKey="selectCountry"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForCountryLoadingMaskDisappear"/>
+        <selectOption selector="{{StorefrontCheckoutCartSummarySection.region}}" userInput="{{estimateAddress.state}}" stepKey="selectStateProvince"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForStateLoadingMaskDisappear"/>
+        <fillField selector="{{StorefrontCheckoutCartSummarySection.postcode}}" userInput="{{estimateAddress.zipCode}}" stepKey="fillZipPostalCodeField"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForZipLoadingMaskDisappear"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontFillEmailFieldOnCheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontFillEmailFieldOnCheckoutActionGroup.xml
new file mode 100644
index 0000000000000..e1f532e7d495a
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontFillEmailFieldOnCheckoutActionGroup.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="StorefrontFillEmailFieldOnCheckoutActionGroup">
+        <arguments>
+            <argument name="email" type="string"/>
+        </arguments>
+        <fillField selector="{{StorefrontCheckoutCheckoutCustomerLoginSection.email}}" userInput="{{email}}" stepKey="fillCustomerEmailField"/>
+        <doubleClick selector="{{StorefrontCheckoutCheckoutCustomerLoginSection.emailTooltipButton}}" stepKey="clickToMoveFocusFromEmailInput"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontFillGuestShippingInfoActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontFillGuestShippingInfoActionGroup.xml
new file mode 100644
index 0000000000000..e7669d62c79a0
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontFillGuestShippingInfoActionGroup.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">
+    <!-- Fill data in checkout shipping section -->
+    <actionGroup name="StorefrontFillGuestShippingInfoActionGroup">
+        <arguments>
+            <argument name="customerData" defaultValue="Simple_UK_Customer_For_Shipment"/>
+        </arguments>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{customerData.email}}" stepKey="fillEmailAddressField"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{customerData.firstName}}" stepKey="fillFirstNameField"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{customerData.lastName}}" stepKey="fillLastNameField"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.company}}" userInput="{{customerData.company}}" stepKey="fillCompanyField"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.street}}" userInput="{{customerData.streetFirstLine}}" stepKey="fillStreetAddressFirstLineField"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.street2}}" userInput="{{customerData.streetSecondLine}}" stepKey="fillStreetAddressSecondLineField"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.city}}" userInput="{{customerData.city}}" stepKey="fillCityField"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.telephone}}" userInput="{{customerData.telephone}}" stepKey="fillPhoneNumberField"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml
new file mode 100644
index 0000000000000..b3e3c4553d504
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="clickViewAndEditCartFromMiniCart">
+        <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart"/>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForViewAndEditCartVisible"/>
+        <click selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="viewAndEditCart"/>
+        <seeInCurrentUrl url="checkout/cart" stepKey="seeInCurrentUrl"/>
+    </actionGroup>
+    <actionGroup name="assertOneProductNameInMiniCart">
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart"/>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForViewAndEditCartVisible"/>
+        <see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{productName}}" stepKey="seeInMiniCart"/>
+    </actionGroup>
+
+    <!--Remove an item from the cart using minicart-->
+    <actionGroup name="removeProductFromMiniCart">
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart"/>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForMiniCartOpen"/>
+        <click selector="{{StorefrontMinicartSection.deleteMiniCartItemByName(productName)}}" stepKey="clickDelete"/>
+        <waitForElementVisible selector="{{StoreFrontRemoveItemModalSection.message}}" stepKey="waitForConfirmationModal"/>
+        <see selector="{{StoreFrontRemoveItemModalSection.message}}" userInput="Are you sure you would like to remove this item from the shopping cart?" stepKey="seeDeleteConfirmationMessage"/>
+        <click selector="{{StoreFrontRemoveItemModalSection.ok}}" stepKey="confirmDelete"/>
+        <waitForPageLoad stepKey="waitForDeleteToFinish"/>
+    </actionGroup>
+
+    <!--Check that the minicart is empty-->
+    <actionGroup name="AssertMiniCartEmpty">
+        <dontSeeElement selector="{{StorefrontMinicartSection.productCount}}" stepKey="dontSeeMinicartProductCount"/>
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="expandMinicart"/>
+        <see selector="{{StorefrontMinicartSection.minicartContent}}" userInput="You have no items in your shopping cart." stepKey="seeEmptyCartMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml
new file mode 100644
index 0000000000000..12974617d55ae
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <!-- Free shipping -->
+    <entity name="EnableFreeShippingConfigData">
+        <data key="path">carriers/freeshipping/active</data>
+        <data key="scope">carriers</data>
+        <data key="scope_id">1</data>
+        <data key="label">Yes</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="EnableFreeShippingToSpecificCountriesConfigData">
+        <data key="path">carriers/freeshipping/sallowspecific</data>
+        <data key="scope">carriers</data>
+        <data key="scope_id">1</data>
+        <data key="label">Specific Countries</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="EnableFreeShippingToAfghanistanConfigData">
+        <data key="path">carriers/freeshipping/specificcountry</data>
+        <data key="scope">carriers</data>
+        <data key="scope_id">1</data>
+        <data key="label">Afghanistan</data>
+        <data key="value">AF</data>
+    </entity>
+    <entity name="EnableFreeShippingToAllAllowedCountriesConfigData">
+        <data key="path">carriers/freeshipping/sallowspecific</data>
+        <data key="scope">carriers</data>
+        <data key="scope_id">1</data>
+        <data key="label">All Allowed Countries</data>
+        <data key="value">0</data>
+    </entity>
+    <entity name="DisableFreeShippingConfigData">
+        <data key="path">carriers/freeshipping/active</data>
+        <data key="scope">carriers</data>
+        <data key="scope_id">1</data>
+        <data key="label">No</data>
+        <data key="value">0</data>
+    </entity>
+
+    <!-- Flat Rate shipping -->
+    <entity name="EnableFlatRateConfigData">
+        <data key="path">carriers/flatrate/active</data>
+        <data key="scope">carriers</data>
+        <data key="scope_id">1</data>
+        <data key="label">Yes</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="EnableFlatRateToSpecificCountriesConfigData">
+        <data key="path">carriers/flatrate/sallowspecific</data>
+        <data key="scope">carriers</data>
+        <data key="scope_id">1</data>
+        <data key="label">Specific Countries</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="EnableFlatRateToAfghanistanConfigData">
+        <data key="path">carriers/flatrate/specificcountry</data>
+        <data key="scope">carriers</data>
+        <data key="scope_id">1</data>
+        <data key="label">Afghanistan</data>
+        <data key="value">AF</data>
+    </entity>
+    <entity name="EnableFlatRateToAllAllowedCountriesConfigData">
+        <data key="path">carriers/flatrate/sallowspecific</data>
+        <data key="scope">carriers</data>
+        <data key="scope_id">1</data>
+        <data key="label">All Allowed Countries</data>
+        <data key="value">0</data>
+    </entity>
+    <entity name="DisableFlatRateConfigData">
+        <data key="path">carriers/flatrate/active</data>
+        <data key="scope">carriers</data>
+        <data key="scope_id">1</data>
+        <data key="label">No</data>
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/EstimateAndTaxData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/EstimateAndTaxData.xml
new file mode 100644
index 0000000000000..36dea5a521a04
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Data/EstimateAndTaxData.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="EstimateAddressCalifornia">
+        <data key="country">United States</data>
+        <data key="state">California</data>
+        <data key="zipCode">90240</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutShippingPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutShippingPage.xml
new file mode 100644
index 0000000000000..a118482357d4a
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutShippingPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="CheckoutShippingPage" url="/checkout/#shipping" module="Checkout" area="storefront">
+        <section name="CheckoutShippingGuestInfoSection"/>
+        <section name="CheckoutShippingSection"/>
+    </page>
+</pages>
\ No newline at end of file
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/AdminCheckoutPaymentSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/AdminCheckoutPaymentSection.xml
new file mode 100644
index 0000000000000..de866fbb50c80
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/AdminCheckoutPaymentSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminCheckoutPaymentSection">
+        <element name="checkBillingMethodByName" type="radio" selector="//div[@id='order-billing_method']//dl[@class='admin__payment-methods']//dt//label[contains(., '{{methodName}}')]/..//input" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
index 2e0b91d50c3ff..a2dd524abd99f 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CheckoutCartProductSection">
         <element name="itemOptionsBlock" type="block"
                  selector=".item:nth-of-type({{numElement}}) .item-options"
@@ -32,5 +32,9 @@
                  parameterized="true"/>
         <element name="removeItem" type="button"
                  selector="//table[@id='shopping-cart-table']//tbody//tr[contains(@class,'item-actions')]//a[contains(@class,'action-delete')]"/>
+        <element name="productPriceByName" type="text"
+                 selector="//table[@id='shopping-cart-table']//tbody//tr[//a/text()='{{var1}}']//ancestor::td[contains(@class,'price')]//span[@class='price']"
+                 parameterized="true"/>
+        <element name="productName" type="text" selector="#shopping-cart-table tbody strong.product-item-name"/>
     </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 c73001cfe6832..614855be46061 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
@@ -22,9 +22,11 @@
         <element name="guestRegion" type="select" selector=".billing-address-form select[name*='region_id']"/>
         <element name="guestPostcode" type="input" selector=".billing-address-form input[name*='postcode']"/>
         <element name="guestTelephone" type="input" selector=".billing-address-form input[name*='telephone']"/>
+        <element name="country" type="select" selector=".billing-address-form select[name*='country_id']"/>
         <element name="cartItems" type="text" selector=".minicart-items"/>
         <element name="billingAddress" type="text" selector="div.billing-address-details"/>
-        <element name="placeOrder" type="button" selector="button.action.primary.checkout" timeout="30"/>
+        <element name="placeOrder" type="button" selector=".payment-method._active button.action.primary.checkout" timeout="30"/>
+        <element name="placeOrderNoWait" type="button" selector=".payment-method._active button.action.primary.checkout"/>
         <element name="productOptionsByProductItemPrice" type="text" selector="//div[@class='product-item-inner']//div[@class='subtotal']//span[@class='price'][contains(.,'{{price}}')]//ancestor::div[@class='product-item-details']//div[@class='product options']" parameterized="true"/>
         <element name="productOptionsActiveByProductItemPrice" type="text" selector="//div[@class='subtotal']//span[@class='price'][contains(.,'{{price}}')]//ancestor::div[@class='product-item-details']//div[@class='product options active']" parameterized="true"/>
         <element name="productItemPriceByName" type="text" selector="//div[@class='product-item-details'][contains(., '{{ProductName}}')]//span[@class='price']" parameterized="true"/>
@@ -39,5 +41,16 @@
         <element name="newAddressSelect" type="select" selector=".payment-method._active select[name*='billing_address_id']"/>
         <element name="goToShipping" type="button" selector="#checkout>ul>li.opc-progress-bar-item._complete>span"/>
         <element name="orderSummarySubtotal" type="text" selector=".totals.sub span" />
+        <element name="billingAddressSameAsShipping" type="checkbox" selector=".payment-method._active [name='billing-address-same-as-shipping']"/>
+        <element name="orderSummaryTotal" type="text" selector="tr.grand.totals span.price" />
+        <element name="checkPaymentMethodByName" type="radio" selector="//div[@id='checkout-payment-method-load']//div[contains(., '{{paymentName}}')]/..//input[@type='radio']" parameterized="true"/>
+        <element name="orderSummaryShippingTotal" type="text" selector=".totals.shipping.excl span.price"/>
+        <element name="noPaymentMethods" type="text" selector=".no-quotes-block"/>
+        <element name="billingAddressSelectShared" type="select" selector=".checkout-billing-address select[name='billing_address_id']"/>
+        <element name="billingAddressSameAsShippingShared" type="checkbox" selector="#billing-address-same-as-shipping-shared"/>
+        <element name="addressAction" type="button" selector="//div[@class='actions-toolbar']//span[text()='{{action}}']" parameterized="true"/>
+        <element name="discount" type="block" selector="tr.totals.discount"/>
+        <element name="discountPrice" type="text" selector=".discount .price"/>
+        <element name="shippingMethodInformation" type="text" selector=".ship-via .shipping-information-content"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml
index 8e043f85a0b95..0bc31c7287e67 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml
@@ -7,15 +7,19 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CheckoutShippingGuestInfoSection">
         <element name="email" type="input" selector="#customer-email"/>
         <element name="firstName" type="input" selector="input[name=firstname]"/>
         <element name="lastName" type="input" selector="input[name=lastname]"/>
         <element name="street" type="input" selector="input[name='street[0]']"/>
+        <element name="street2" type="input" selector="input[name='street[1]']"/>
         <element name="city" type="input" selector="input[name=city]"/>
         <element name="region" type="select" selector="select[name=region_id]"/>
+        <element name="regionInput" type="input" selector="input[name=region]"/>
         <element name="postcode" type="input" selector="input[name=postcode]"/>
         <element name="telephone" type="input" selector="input[name=telephone]"/>
+        <element name="country" type="select" selector="select[name=country_id]"/>
+        <element name="company" type="input" selector="input[name=company]"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml
index a9858e70d9960..a8485ca026b22 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml
@@ -15,5 +15,8 @@
         <element name="checkShippingMethodByName" type="radio" selector="//div[@id='checkout-shipping-method-load']//td[contains(., '{{var1}}')]/..//input" parameterized="true"/>
         <element name="shippingMethodRowByName" type="text" selector="//div[@id='checkout-shipping-method-load']//td[contains(., '{{var1}}')]/.." parameterized="true"/>
         <element name="flatRate" type="radio" selector="#label_carrier_flatrate_flatrate"/>
+        <element name="noQuotesMsg" type="text" selector="#checkout-step-shipping_method div"/>
+        <element name="freeShippingShippingMethod" type="input" selector="#s_method_freeshipping_freeshipping" timeout="30"/>
+        <element name="shippingMethodFreeShipping" type="radio" selector="#checkout-shipping-method-load input[value='freeshipping_freeshipping']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
index 2a7437c44eccf..42c92cbe20c3a 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
@@ -19,7 +19,7 @@
         <element name="postcode" type="input" selector="input[name=postcode]"/>
         <element name="country" type="select" selector="select[name=country_id]"/>
         <element name="telephone" type="input" selector="input[name=telephone]"/>
-        <element name="firstShippingMethod" type="radio" selector="#checkout-shipping-method-load input[type='radio']"/>
+        <element name="firstShippingMethod" type="radio" selector="#checkout-shipping-method-load input[type='radio']" timeout="30"/>
         <element name="selectedShippingAddress" type="text" selector=".shipping-address-item.selected-item"/>
         <element name="newAddressButton" type="button" selector="#checkout-step-shipping button"/>
         <element name="next" type="button" selector="[data-role='opc-continue']"/>
@@ -30,8 +30,14 @@
         <element name="addState" type="select" selector="#shipping-new-address-form select[name='region_id']"/>
         <element name="addPostcode" type="input" selector="#shipping-new-address-form input[name='postcode']"/>
         <element name="addTelephone" type="input" selector="#shipping-new-address-form input[name='telephone']"/>
-        <element name="addcCountry" type="select" selector="#shipping-new-address-form select[name='country_id']"/>
+        <element name="addCountry" type="select" selector="#shipping-new-address-form select[name='country_id']"/>
         <element name="addSaveButton" type="button" selector=".action.primary.action-save-address"/>
         <element name="editActiveAddress" type="button" selector="//div[@class='shipping-address-item selected-item']//span[text()='Edit']" timeout="30"/>
+        <element name="namePrefix" type="select" selector="select[name=prefix]"/>
+        <element name="namePrefixOption" type="select" selector="select[name=prefix] option[value='{{optionValue}}']" parameterized="true"/>
+        <element name="nameSuffix" type="select" selector="[name='suffix']"/>
+        <element name="nameSuffixOption" type="text" selector="select[name='suffix'] option[value='{{optionValue}}']" parameterized="true" timeout="30"/>
+        <element name="password" type="input" selector="#customer-password"/>
+        <element name="loginButton" type="button" selector=".action.login"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/PaymentMethodSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/PaymentMethodSection.xml
index 57f150a1db3e5..05681a5068190 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/PaymentMethodSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/PaymentMethodSection.xml
@@ -10,5 +10,6 @@
           xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="PaymentMethodSection">
         <element name="billingAddress" type="text" selector=".checkout-billing-address"/>
+        <element name="checkPaymentMethodByName" type="radio" selector="//div[@id='checkout-payment-method-load']//div[@class='payment-method']//label//span[contains(., '{{methodName}}')]/../..//input" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutCartSummarySection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutCartSummarySection.xml
index a7c5fb484b2bf..dc523a597a405 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutCartSummarySection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutCartSummarySection.xml
@@ -6,13 +6,14 @@
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCheckoutCartSummarySection">
         <element name="subtotal" type="text" selector="#cart-totals tr.totals.sub span.price"/>
         <element name="proceedToCheckout" type="button" selector=".action.primary.checkout span" timeout="30"/>
         <element name="total" type="text" selector=".amount[data-th='Order Total'] span"/>
         <element name="country" type="select" selector="#block-summary select[name='country_id']" timeout="30"/>
         <element name="region" type="select" selector="#block-summary select[name='region_id']" timeout="30"/>
+        <element name="stateProvinceInput" type="input" selector="input[name='region']"/>
         <element name="postcode" type="text" selector="#block-summary input[name='postcode']" timeout="30"/>
         <element name="estimateShippingAndTax" type="text" selector="#block-shipping-heading" timeout="5"/>
         <element name="flatRateShippingMethod" type="radio" selector="#s_method_flatrate_flatrate" timeout="30"/>
@@ -21,5 +22,11 @@
         <element name="shippingHeading" type="button" selector="#block-shipping-heading"/>
         <element name="blockSummary" type="button" selector="#block-summary"/>
         <element name="discountAmount" type="text" selector="td[data-th='Discount']"/>
+        <element name="totalsElementByPosition" type="text" selector=".data.table.totals > tbody tr:nth-of-type({{value}}) > th" parameterized="true"/>
+        <element name="tableTotals" type="text" selector="#cart-totals .data.table.totals"/>
+        <element name="shippingMethodLabel" type="text" selector="#co-shipping-method-form dl dt span"/>
+        <element name="shippingMethodElementId" type="radio" selector="#s_method_{{carrierCode}}_{{methodCode}}" parameterized="true"/>
+        <element name="methodName" type="text" selector="#co-shipping-method-form label"/>
+        <element name="shippingPrice" type="text" selector="#co-shipping-method-form span .price"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutCheckoutCustomerLoginSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutCheckoutCustomerLoginSection.xml
new file mode 100644
index 0000000000000..174b91434931e
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutCheckoutCustomerLoginSection.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="StorefrontCheckoutCheckoutCustomerLoginSection">
+        <element name="email" type="input" selector="form[data-role='email-with-possible-login'] input[name='username']"/>
+        <element name="emailErrorMessage" type="text" selector="#customer-email-error"/>
+        <element name="emailTooltipButton" type="button" selector="#customer-email-fieldset .field-tooltip-action"/>
+    </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 baf098c855eab..17ea090ad14d0 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml
@@ -22,5 +22,9 @@
         <element name="viewAndEditCart" type="button" selector=".action.viewcart" timeout="30"/>
         <element name="miniCartItemsText" type="text" selector=".minicart-items"/>
         <element name="miniCartSubtotalField" type="text" selector=".block-minicart .amount span.price"/>
+        <element name="itemQuantity" type="input" selector="//a[text()='{{productName}}']/../..//input[contains(@class,'cart-item-qty')]" parameterized="true"/>
+        <element name="itemQuantityUpdate" type="button" selector="//a[text()='{{productName}}']/../..//span[text()='Update']" parameterized="true"/>
+        <element name="emptyCart" type="text" selector=".counter.qty.empty"/>
+        <element name="minicartContent" type="block" selector="#minicart-content-wrapper"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/AdminCheckConfigsChangesIsNotAffectedStartedCheckoutProcessTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/AdminCheckConfigsChangesIsNotAffectedStartedCheckoutProcessTest.xml
new file mode 100644
index 0000000000000..c86261be4f374
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/AdminCheckConfigsChangesIsNotAffectedStartedCheckoutProcessTest.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCheckConfigsChangesAreNotAffectedStartedCheckoutProcessTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Changes in configs are not affecting checkout process"/>
+            <title value="Admin check configs changes are not affected started checkout process test"/>
+            <description value="Changes in admin for shipping rates are not affecting checkout process that has been started"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-8893"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <!-- Create simple product -->
+            <createData entity="SimpleProduct3" stepKey="createProduct"/>
+
+            <!-- Enable free shipping method -->
+            <magentoCLI command="config:set {{EnableFreeShippingConfigData.path}} {{EnableFreeShippingConfigData.value}}" stepKey="enableFreeShipping"/>
+
+            <!-- Disable flat rate method -->
+            <magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
+        </before>
+        <after>
+            <!-- Roll back configuration -->
+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
+            <magentoCLI command="config:set {{DisableFreeShippingConfigData.path}} {{DisableFreeShippingConfigData.value}}" stepKey="disableFreeShipping"/>
+
+            <!-- Delete simple product -->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Add product to cart -->
+        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
+            <argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+
+        <!-- Proceed to Checkout from mini shopping cart -->
+        <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>
+
+        <!-- Assert Free Shipping checkbox -->
+        <seeCheckboxIsChecked selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShipping}}" stepKey="freeShippingMethodCheckboxIsChecked"/>
+
+        <!-- Click Next button -->
+        <click selector="{{GuestCheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForPageLoad stepKey="waitForShipmentPageLoad"/>
+
+        <!-- Payment step is opened -->
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSectionLoaded"/>
+
+        <!-- Order Summary block contains information about shipping -->
+        <actionGroup ref="CheckShippingMethodInCheckoutActionGroup" stepKey="guestCheckoutCheckShippingMethod">
+            <argument name="shippingMethod" value="freeTitleDefault.value"/>
+        </actionGroup>
+
+        <!-- Open new browser's window and login as Admin -->
+        <openNewTab stepKey="openNewTab"/>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+        <!-- Go to Store > Configuration > Sales > Shipping Methods -->
+        <actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPage"/>
+
+        <!-- Enable "Flat Rate" -->
+        <actionGroup ref="AdminChangeFlatRateShippingMethodStatusActionGroup" stepKey="enableFlatRateShippingStatus"/>
+
+        <!-- Flush cache -->
+        <magentoCLI command="cache:flush" stepKey="cacheFlush"/>
+
+        <!-- Back to the Checkout and refresh the page -->
+        <switchToPreviousTab stepKey="switchToPreviousTab"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitPageReload"/>
+
+        <!-- Payment step is opened after refreshing -->
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSection"/>
+
+        <!-- Order Summary block contains information about free shipping -->
+        <actionGroup ref="CheckShippingMethodInCheckoutActionGroup" stepKey="guestCheckoutCheckFreeShippingMethod">
+            <argument  name="shippingMethod" value="freeTitleDefault.value"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/CheckNotVisibleProductInMinicartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/CheckNotVisibleProductInMinicartTest.xml
new file mode 100644
index 0000000000000..4b4ca1935fd78
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/CheckNotVisibleProductInMinicartTest.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="CheckNotVisibleProductInMinicartTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="MAGETWO-96422: Hidden Products are absent in Storefront Mini-Cart" />
+            <title value="Not visible individually product in mini-shopping cart."/>
+            <description value="To be sure that product in mini-shopping cart remains visible after admin makes it not visible individually"/>
+            <severity value="MAJOR"/>
+            <group value="checkout"/>
+        </annotations>
+
+        <!--Create simple product1 and simple product2-->
+        <createData entity="SimpleTwo" stepKey="createSimpleProduct1"/>
+        <createData entity="SimpleTwo" stepKey="createSimpleProduct2"/>
+
+        <!--Go to simple product1 page-->
+        <amOnPage url="$$createSimpleProduct1.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage1"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad"/>
+
+        <!--Add simple product1 to Shopping Cart-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage1">
+            <argument name="productName" value="$$createSimpleProduct1.name$$"/>
+        </actionGroup>
+
+        <!--Check simple product1 in minicart-->
+        <comment userInput="Check simple product 1 in minicart" stepKey="commentCheckSimpleProduct1InMinicart" after="addToCartFromStorefrontProductPage1"/>
+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="assertProduct1NameInMiniCart">
+            <argument name="productName" value="$$createSimpleProduct1.name$$"/>
+        </actionGroup>
+
+        <!--Make simple product1 not visible individually-->
+        <updateData entity="SetProductVisibilityHidden" createDataKey="createSimpleProduct1" stepKey="updateSimpleProduct1">
+            <requiredEntity createDataKey="createSimpleProduct1"/>
+        </updateData>
+
+        <!--Go to simple product2 page-->
+        <amOnPage url="$$createSimpleProduct2.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage2"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad2"/>
+
+        <!--Add simple product2 to Shopping Cart for updating cart items-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage2">
+            <argument name="productName" value="$$createSimpleProduct2.name$$"/>
+        </actionGroup>
+
+        <!--Check simple product1 in minicart-->
+        <comment userInput="Check hidden simple product 1 in minicart" stepKey="commentCheckHiddenSimpleProduct1InMinicart" after="addToCartFromStorefrontProductPage2"/>
+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="assertHiddenProduct1NameInMiniCart">
+            <argument name="productName" value="$$createSimpleProduct1.name$$"/>
+        </actionGroup>
+
+        <!--Check simple product2 in minicart-->
+        <comment userInput="Check hidden simple product 2 in minicart" stepKey="commentCheckSimpleProduct2InMinicart" after="addToCartFromStorefrontProductPage2"/>
+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="assertProduct2NameInMiniCart">
+            <argument name="productName" value="$$createSimpleProduct2.name$$"/>
+        </actionGroup>
+
+        <!--Delete simple product1 and simple product2-->
+        <deleteData createDataKey="createSimpleProduct1" stepKey="deleteProduct1"/>
+        <deleteData createDataKey="createSimpleProduct2" stepKey="deleteProduct2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.xml
new file mode 100644
index 0000000000000..256c59ae05c20
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.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="DefaultBillingAddressShouldBeCheckedOnPaymentPageTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout via the Storefront"/>
+            <title value="The default billing address should be used on checkout"/>
+            <description value="Default billing address should be preselected on payments page on checkout if it exist"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-98974"/>
+            <useCaseId value="MAGETWO-72961"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <!--Go to Storefront as Customer-->
+            <actionGroup ref="CustomerLoginOnStorefront" stepKey="loginToStorefrontAccount">
+                <argument name="customer" value="$$createCustomer$$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <!--Logout from customer account-->
+            <actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="logoutCustomer"/>
+        </after>
+        <!-- Add simple product to cart and go to checkout-->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <!-- Click "+ New Address" and Fill new address-->
+        <click selector="{{CheckoutShippingSection.newAdress}}" stepKey="addAddress"/>
+        <actionGroup ref="LoggedInUserCheckoutAddNewAddressInShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingAddress">
+            <argument name="customerVar" value="CustomerEntityOne"/>
+            <argument name="customerAddressVar" value="US_Address_CA"/>
+        </actionGroup>
+        <dontSeeElement selector="{{CheckoutAddressPopupSection.newAddressModalPopup}}" stepKey="dontSeeModalPopup"/>
+        <!--Select Shipping Rate "Flat Rate" and click "Next" button-->
+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShipping"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForShippingMethodMaskDisappear"/>
+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+        <waitForPageLoad stepKey="waitForAddressSaved"/>
+        <!--Verify that "My billing and shipping address are the same" is unchecked and billing address is preselected-->
+        <dontSeeCheckboxIsChecked selector="{{CheckoutPaymentSection.billingAddressSameAsShipping}}" stepKey="shippingAndBillingAddressIsSameUnchecked"/>
+        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" stepKey="assertBillingAddress"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontApplyPromoCodeDuringCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontApplyPromoCodeDuringCheckoutTest.xml
new file mode 100644
index 0000000000000..7563df33b471e
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontApplyPromoCodeDuringCheckoutTest.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="StorefrontApplyPromoCodeDuringCheckoutTest">
+        <annotations>
+            <features value="OnePageCheckout"/>
+            <stories value="OnePageCheckout with Promo Code"/>
+            <title value="Storefront apply promo code during checkout test"/>
+            <description value="Apply promo code during checkout for physical product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-8316"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <!-- Create simple product -->
+            <createData entity="SimpleProduct3" stepKey="createProduct">
+                <field key="price">10.00</field>
+            </createData>
+
+            <!-- Create cart price rule -->
+            <createData entity="ActiveSalesRuleForNotLoggedIn" stepKey="createCartPriceRule"/>
+            <createData entity="SimpleSalesRuleCoupon" stepKey="createCouponForCartPriceRule">
+                <requiredEntity createDataKey="createCartPriceRule"/>
+            </createData>
+        </before>
+        <after>
+            <!-- Delete simple product -->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+
+            <!-- Delete sales rule -->
+            <deleteData createDataKey="createCartPriceRule" stepKey="deleteCartPriceRule"/>
+
+            <!-- Admin log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to Storefront as Guest and add simple product to cart -->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+
+        <!-- Go to Checkout -->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+
+        <!-- Fill all required fields with valid data and select Flat Rate, price = 5, shipping -->
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShipping">
+            <argument name="shippingMethod" value="Flat Rate"/>
+        </actionGroup>
+
+        <!-- Click Apply Discount Code: section is expanded. Input promo code, apply and see success message -->
+        <actionGroup ref="StorefrontApplyDiscountCodeActionGroup" stepKey="applyCoupon">
+            <argument name="discountCode" value="$$createCouponForCartPriceRule.code$$"/>
+        </actionGroup>
+
+        <!-- Apply button is disappeared -->
+        <dontSeeElement selector="{{StorefrontDiscountSection.applyCodeBtn}}" stepKey="dontSeeApplyButton"/>
+
+        <!-- Cancel coupon button is appeared -->
+        <seeElement selector="{{StorefrontDiscountSection.CancelCouponBtn}}" stepKey="seeCancelCouponButton"/>
+
+        <!-- Order summary contains information about applied code -->
+        <seeElement selector="{{CheckoutPaymentSection.discount}}" stepKey="seeDiscountCouponInSummaryBlock"/>
+        <see selector="{{CheckoutPaymentSection.discountPrice}}" userInput="-$5.00" stepKey="seeDiscountPrice"/>
+
+        <!-- Select payment solution -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="clickCheckMoneyOrderPayment"/>
+
+        <!-- Place Order: order is successfully placed -->
+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
+
+        <!-- Login as admin -->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+        <!-- Verify total on order page -->
+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderById">
+            <argument name="orderId" value="$grabOrderNumber"/>
+        </actionGroup>
+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <waitForPageLoad stepKey="waitForAdminOrderPageLoad"/>
+        <scrollTo selector="{{AdminOrderTotalSection.grandTotal}}" stepKey="scrollToOrderTotalSection"/>
+        <see selector="{{AdminOrderTotalSection.grandTotal}}" userInput="$$createProduct.price$$" stepKey="checkTotal"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCustomerInfoCreatedByGuestTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCustomerInfoCreatedByGuestTest.xml
new file mode 100644
index 0000000000000..32cc254543bca
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCustomerInfoCreatedByGuestTest.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="StorefrontCheckCustomerInfoCreatedByGuestTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Check order customer information created by guest"/>
+            <title value="Check Order Customer Information Created By Guest"/>
+            <description value="Check customer information after placing the order as the guest who created an account"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-13839"/>
+            <useCaseId value="MAGETWO-95182"/>
+            <group value="checkout"/>
+            <group value="customer"/>
+            <group value="sales"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct" />
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory" />
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+            <actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="customerLogoutFromStorefront" />
+        </after>
+
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.name$$)}}" stepKey="navigateToProductPage"/>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
+            <argument name="customerVar" value="CustomerEntityOne"/>
+            <argument name="customerAddressVar" value="CustomerAddressSimple"/>
+        </actionGroup>
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="placeOrder">
+            <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage"/>
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
+        </actionGroup>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
+        <click selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="clickCreateAccountButton"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.passwordField}}" userInput="{{CustomerEntityOne.password}}" stepKey="typePassword"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}" userInput="{{CustomerEntityOne.password}}" stepKey="typeConfirmationPassword"/>
+        <click selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}" stepKey="clickOnCreateAccount"/>
+        <see selector="{{StorefrontMessagesSection.successMessage}}" userInput="Thank you for registering" stepKey="verifyAccountCreated"/>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginToAdmin"/>
+        <amOnPage url="{{AdminOrderDetailsPage.url('$grabOrderNumber')}}" stepKey="navigateToOrderPage"/>
+        <see userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminOrderDetailsInformationSection.customerName}}" stepKey="seeCustomerName"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutTotalsSortOrderInCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutTotalsSortOrderInCartTest.xml
new file mode 100644
index 0000000000000..11aae024d2e0a
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutTotalsSortOrderInCartTest.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCheckoutTotalsSortOrderInCartTest">
+        <annotations>
+            <title value="Checkout Totals Sort Order configuration and displaying in cart"/>
+            <stories value="MAGETWO-89397: Wrong Checkout Totals Sort Order in cart"/>
+            <description value="Checkout Totals Sort Order configuration and displaying in cart"/>
+            <features value="Checkout"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MAGETWO-96635"/>
+            <group value="checkout"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="SaleRule50PercentDiscountNoCoupon" stepKey="createCartRule"/>
+            <createData entity="CheckoutShippingTotalsSortOrder" stepKey="setConfigShippingTotalsSortOrder"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCartRule" stepKey="deleteCartRule"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <createData entity="DefaultTotalsSortOrder" stepKey="setDefaultTotalsSortOrder"/>
+        </after>
+
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+
+        <actionGroup ref="VerifyDiscountAmount" stepKey="verifyDiscountAmount">
+            <argument name="expectedDiscount" value="-$100"/>
+        </actionGroup>
+
+        <see userInput="Shipping (Flat Rate - Fixed)" selector="{{StorefrontCheckoutCartSummarySection.totalsElementByPosition('3')}}" stepKey="assertElementPosition"/>
+    </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 7af9c646db1e8..374ce8dbb425c 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
@@ -62,7 +62,7 @@
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
 
         <amOnPage stepKey="s67" url="{{AdminOrdersPage.url}}"/>
-        <waitForPageLoad stepKey="s75"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
         <fillField stepKey="s77" selector="{{OrdersGridSection.search}}" userInput="{$s53}" />
         <waitForPageLoad stepKey="s78"/>
 
@@ -77,6 +77,7 @@
         <see stepKey="s95" selector="{{OrderDetailsInformationSection.itemsOrdered}}" userInput="$$simpleproduct1.name$$" />
         <amOnPage stepKey="s96" url="{{AdminCustomerPage.url}}"/>
         <waitForPageLoad stepKey="s97"/>
+        <waitForElementVisible selector="{{AdminCustomerFiltersSection.filtersButton}}" time="30" stepKey="waitFiltersButton"/>
         <click stepKey="s98" selector="{{AdminCustomerFiltersSection.filtersButton}}"/>
         <fillField stepKey="s99" selector="{{AdminCustomerFiltersSection.emailInput}}" userInput="$$simpleuscustomer.email$$"/>
         <click stepKey="s100" selector="{{AdminCustomerFiltersSection.apply}}"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTestWithRestrictedCountriesForPaymentTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTestWithRestrictedCountriesForPaymentTest.xml
new file mode 100644
index 0000000000000..fef6b9a203735
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTestWithRestrictedCountriesForPaymentTest.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="StorefrontCustomerCheckoutTestWithRestrictedCountriesForPaymentTest"
+        extends="StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest">
+        <annotations>
+            <stories value="Checkout via the Storefront"/>
+            <title value="Checkout via Customer Checkout with restricted countries for payment"/>
+            <description value="Should be able to place an order as a Customer with restricted countries for payment."/>
+            <testCaseId value="MC-10831"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer" stepKey="createSimpleUsCustomer"/>
+        </before>
+        <after>
+            <actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="customerLogoutStorefront"/>
+            <deleteData createDataKey="createSimpleUsCustomer" stepKey="deleteCustomer"/>
+        </after>
+
+        <remove keyForRemoval="guestCheckoutFillingShippingSection"/>
+        <remove keyForRemoval="guestCheckoutFillingShippingSectionUK"/>
+        <remove keyForRemoval="guestPlaceOrder"/>
+
+        <!-- Login as Customer -->
+        <actionGroup ref="CustomerLoginOnStorefront" before="goToProductPage" stepKey="customerLogin">
+            <argument name="customer" value="$$createSimpleUsCustomer$$" />
+        </actionGroup>
+
+        <!-- Select address and go to payments page-->
+        <see selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{US_Address_TX.state}}" after="shippingStepIsOpened" stepKey="seeRegion" />
+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" after="seeRegion" stepKey="waitNextButton"/>
+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" after="waitNextButton" stepKey="selectShippingMethod"/>
+        <click selector="{{CheckoutShippingMethodsSection.next}}" after="selectShippingMethod" stepKey="clickNextButton" />
+        <waitForPageLoad after="clickNextButton" stepKey="waitForPaymentStep"/>
+        <selectOption selector="{{CheckoutPaymentSection.billingAddressSelectShared}}" userInput="New Address" after="uncheckBillingAddressSameAsShippingCheckCheckBox" stepKey="clickOnNewAddress"/>
+        <waitForPageLoad stepKey="waitBillingAddressForm"/>
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="customerPlaceorder">
+            <argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage" />
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerLoginDuringCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerLoginDuringCheckoutTest.xml
new file mode 100644
index 0000000000000..a64fbb0e4ac3a
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerLoginDuringCheckoutTest.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCustomerLoginDuringCheckoutTest">
+        <annotations>
+            <features value="OnePageCheckout"/>
+            <stories value="Customer Login during checkout"/>
+            <title value="Storefront customer login during checkout test"/>
+            <description value="Logging during checkout for customer without addresses in address book"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-8120"/>
+            <group value="OnePageCheckout"/>
+        </annotations>
+        <before>
+            <!-- Create simple product -->
+            <createData entity="SimpleProduct3" stepKey="createProduct"/>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Delete simple product -->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+
+            <!-- Customer log out -->
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
+
+            <!-- Delete customer -->
+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
+                <argument name="customerEmail" value="CustomerEntityOne.email"/>
+            </actionGroup>
+
+            <!-- Logout admin -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Go to Storefront as Guest and create new account -->
+        <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="createNewCustomerAccount"/>
+
+        <!-- Sign Out -->
+        <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
+
+        <!-- Add simple product to cart as Guest -->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddSimpleProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+
+        <!-- Go to Checkout page -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
+        <click selector="{{StorefrontCheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
+        <waitForPageLoad stepKey="waitForProceedToCheckout"/>
+
+        <!-- Input in field email and password for newly created customer; click Login button -->
+        <actionGroup ref="LoginAsCustomerOnCheckoutPageActionGroup" stepKey="customerLogin">
+            <argument name="customer" value="CustomerEntityOne"/>
+        </actionGroup>
+
+        <!-- Shipping form is pre-filed with first name and last name -->
+        <seeInField selector="{{CheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="seeCustomerFirstNameInField"/>
+        <seeInField selector="{{CheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="seeCustomerLastNameInField"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
index c80e284633f12..f2c41e0a08763 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
@@ -71,6 +71,7 @@
 
         <!--Refresh Page and Place Order-->
         <reloadPage stepKey="reloadPage"/>
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
         <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrder"/>
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="grabOrderNumber"/>
 
@@ -82,7 +83,7 @@
         <amOnPage url="{{StorefrontCustomerOrderViewPage.url({$grabOrderNumber})}}" stepKey="goToOrderReviewPage"/>
         <see userInput="{{UK_Default_Address.street[0]}} {{UK_Default_Address.city}}, {{UK_Default_Address.postcode}}"
              selector="{{StorefrontCustomerOrderViewSection.shippingAddress}}" stepKey="checkShippingAddress"/>
-        <see userInput="{{UK_Default_Address.street[0]}} {{UK_Default_Address.city}}, {{UK_Default_Address.postcode}}"
+        <see userInput="{{US_Address_TX.street[0]}}"
              selector="{{StorefrontCustomerOrderViewSection.billingAddress}}" stepKey="checkBillingAddress"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutDataPersistTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutDataPersistTest.xml
new file mode 100644
index 0000000000000..bebb7be6c9b15
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutDataPersistTest.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="StorefrontGuestCheckoutDataPersistTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="MAGETWO-95067: Checkout data (shipping address etc) not persistant after cart update"/>
+            <title value="Check that checkout data persist after cart update"/>
+            <description value="Checkout data should be persist after updating cart"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-96670"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+        </after>
+
+        <!-- Add simple product to cart -->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+        <!-- Navigate to checkout -->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <!-- Fill shipping address -->
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShipping">
+            <argument name="shippingMethod" value="Flat Rate"/>
+        </actionGroup>
+        <!-- Add simple product to cart -->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart1">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+        <!-- Navigate to checkout -->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart1"/>
+        <seeInField selector="{{GuestCheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="assertGuestEmail"/>
+        <seeInField selector="{{GuestCheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="assertGuestFirstName"/>
+        <seeInField selector="{{GuestCheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="assertGuestLastName"/>
+        <seeInField selector="{{GuestCheckoutShippingSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="assertGuestStreet"/>
+        <seeInField selector="{{GuestCheckoutShippingSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="assertGuestCity"/>
+        <seeInField selector="{{GuestCheckoutShippingSection.region}}" userInput="{{CustomerAddressSimple.state}}" stepKey="assertGuestRegion"/>
+        <seeInField selector="{{GuestCheckoutShippingSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="assertGuestPostcode"/>
+        <seeInField selector="{{GuestCheckoutShippingSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="assertGuestTelephone"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutForSpecificCountriesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutForSpecificCountriesTest.xml
new file mode 100644
index 0000000000000..f6a428ab08bfb
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutForSpecificCountriesTest.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontGuestCheckoutForSpecificCountriesTest">
+        <annotations>
+            <features value="One Page Checkout"/>
+            <stories value="Checkout for Specific Countries"/>
+            <title value="Storefront guest checkout for specific countries test"/>
+            <description value="Checkout flow if shipping rates are not available"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-8190"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <!-- Create simple product -->
+            <createData entity="SimpleProduct3" stepKey="createProduct"/>
+
+            <!-- Enable free shipping to specific country -  Afghanistan  -->
+            <magentoCLI command="config:set {{EnableFreeShippingConfigData.path}} {{EnableFreeShippingConfigData.value}}" stepKey="enableFreeShipping"/>
+            <magentoCLI command="config:set {{EnableFreeShippingToSpecificCountriesConfigData.path}} {{EnableFreeShippingToSpecificCountriesConfigData.value}}" stepKey="allowFreeShippingSpecificCountries"/>
+            <magentoCLI command="config:set {{EnableFreeShippingToAfghanistanConfigData.path}} {{EnableFreeShippingToAfghanistanConfigData.value}}" stepKey="enableFreeShippingToAfghanistan"/>
+
+            <!-- Enable flat rate shipping to specific country -  Afghanistan -->
+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
+            <magentoCLI command="config:set {{EnableFlatRateToSpecificCountriesConfigData.path}} {{EnableFlatRateToSpecificCountriesConfigData.value}}" stepKey="allowFlatRateSpecificCountries"/>
+            <magentoCLI command="config:set {{EnableFlatRateToAfghanistanConfigData.path}} {{EnableFlatRateToAfghanistanConfigData.value}}" stepKey="enableFlatRateToAfghanistan"/>
+        </before>
+        <after>
+            <!-- Rollback all configurations -->
+            <magentoCLI command="config:set {{DisableFreeShippingConfigData.path}} {{DisableFreeShippingConfigData.value}}" stepKey="disableFreeShipping"/>
+            <magentoCLI command="config:set {{EnableFreeShippingToAllAllowedCountriesConfigData.path}} {{EnableFreeShippingToAllAllowedCountriesConfigData.value}}" stepKey="allowFreeShippingToAllCountries"/>
+            <magentoCLI command="config:set {{EnableFlatRateToAllAllowedCountriesConfigData.path}} {{EnableFlatRateToAllAllowedCountriesConfigData.value}}" stepKey="allowFlatRateToAllCountries"/>
+
+            <!-- Delete product -->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+        </after>
+
+        <!-- Go to Storefront as Guest. Check that "Log out" button absent on page -->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnHomePage"/>
+        <waitForPageLoad stepKey="waitForPage"/>
+        <dontSeeElement selector="{{StorefrontPanelHeaderSection.customerLogoutLink}}" stepKey="dontSeeLogOutButton"/>
+
+        <!-- Add product to cart -->
+        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
+            <argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+
+        <!-- Go to checkout page -->
+        <actionGroup ref="OpenStoreFrontCheckoutShippingPageActionGroup" stepKey="openCheckoutShippingPage"/>
+
+        <!-- Assert shipping methods are unavailable -->
+        <actionGroup ref="AssertStoreFrontShippingMethodUnavailableActionGroup" stepKey="dontSeeFlatRateShippingMethod">
+            <argument name="shippingMethodName" value="Flat Rate"/>
+        </actionGroup>
+        <actionGroup ref="AssertStoreFrontShippingMethodUnavailableActionGroup" stepKey="dontFreeShippingMethod"/>
+
+        <!-- Assert no quotes message -->
+        <actionGroup ref="AssertStoreFrontNoQuotesMessageActionGroup" stepKey="assertNoQuotesMessage"/>
+
+        <!-- Assert Next button -->
+        <dontSeeElement selector="{{CheckoutShippingMethodsSection.next}}" stepKey="dontSeeNextButton"/>
+
+        <!-- Fill form with valid data for US > California -->
+        <selectOption selector="{{CheckoutShippingSection.country}}" userInput="{{US_Address_CA.country}}" stepKey="selectCountry"/>
+        <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{US_Address_CA.state}}" stepKey="selectState"/>
+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{US_Address_CA.postcode}}" stepKey="fillPostcode"/>
+
+        <!-- Assert shipping methods are unavailable for US > California -->
+        <actionGroup ref="AssertStoreFrontShippingMethodUnavailableActionGroup" stepKey="dontSeeFlatRateShippingMtd">
+            <argument name="shippingMethodName" value="Flat Rate"/>
+        </actionGroup>
+        <actionGroup ref="AssertStoreFrontShippingMethodUnavailableActionGroup" stepKey="dontFreeShippingMtd"/>
+
+        <!-- Assert no quotes message for US > California -->
+        <actionGroup ref="AssertStoreFrontNoQuotesMessageActionGroup" stepKey="assertNoQuotesMsg"/>
+
+        <!-- Assert Next button for US > California -->
+        <dontSeeElement selector="{{CheckoutShippingMethodsSection.next}}" stepKey="dontSeeNextBtn"/>
+
+        <!-- Fill form for specific country - Afghanistan -->
+        <selectOption selector="{{CheckoutShippingSection.country}}" userInput="Afghanistan" stepKey="selectSpecificCountry"/>
+
+        <!-- Assert shipping methods are available -->
+        <actionGroup ref="AssertStoreFrontShippingMethodAvailableActionGroup" stepKey="seeFlatRateShippingMethod"/>
+        <actionGroup ref="AssertStoreFrontShippingMethodAvailableActionGroup" stepKey="seeFreeShippingMethod">
+            <argument name="shippingMethodName" value="Free Shipping"/>
+        </actionGroup>
+
+        <!-- Assert Next button is available -->
+        <seeElement selector="{{CheckoutShippingMethodsSection.next}}" stepKey="seeNextButton"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
index dff957457da95..249c6dafae1a3 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
@@ -25,7 +25,10 @@
             </createData>
         </before>
         <after>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <!--Clear filter in orders grid-->
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="ordersGridClearFilters"/>
+            <actionGroup ref="logout" stepKey="logoutAdminUserAfterTest"/>
+
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
         </after>
@@ -50,6 +53,7 @@
         <click selector="{{GuestCheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
         <waitForElement selector="{{GuestCheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
         <click selector="{{GuestCheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="checkPaymentMethod"/>
         <waitForElement selector="{{GuestCheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
         <conditionalClick selector="{{GuestCheckoutPaymentSection.cartItemsArea}}" dependentSelector="{{GuestCheckoutPaymentSection.cartItemsAreaActive}}" visible="false" stepKey="exposeMiniCart"/>
         <see selector="{{GuestCheckoutPaymentSection.cartItems}}" userInput="{{_defaultProduct.name}}" stepKey="seeProductInCart"/>
@@ -61,18 +65,37 @@
 
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
 
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnOrdersPage"/>
-        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
-        <fillField selector="{{OrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
-        <click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
+        <!--Navigate to orders index page and filter orders-->
+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById">
+            <argument name="orderId" value="$grabOrderNumber"/>
+        </actionGroup>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
         <click selector="{{OrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
         <see selector="{{OrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeAdminOrderStatus"/>
-        <see selector="{{OrderDetailsInformationSection.accountInformation}}" userInput="Guest" stepKey="seeAdminOrderGuest"/>
+        <see selector="{{OrderDetailsInformationSection.accountInformation}}" userInput="{{CustomerEntityOne.fullname}}" stepKey="seeAdminOrderGuest"/>
         <see selector="{{OrderDetailsInformationSection.accountInformation}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeAdminOrderEmail"/>
         <see selector="{{OrderDetailsInformationSection.billingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeAdminOrderBillingAddress"/>
         <see selector="{{OrderDetailsInformationSection.shippingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeAdminOrderShippingAddress"/>
         <see selector="{{OrderDetailsInformationSection.itemsOrdered}}" userInput="{{_defaultProduct.name}}" stepKey="seeAdminOrderProduct"/>
     </test>
+    <test name="StorefrontGuestCheckoutWithSidebarDisabledTest" extends="StorefrontGuestCheckoutTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout via Guest Checkout"/>
+            <title value="Guest Checkout when Cart sidebar disabled"/>
+            <description value="Should be able to place an order as a Guest when Cart sidebar is disabled"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-97155"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set checkout/sidebar/display 0" stepKey="disableSidebar" />
+        </before>
+        <after>
+            <magentoCLI command="config:set checkout/sidebar/display 1" stepKey="enableSidebar" />
+        </after>
+        <remove keyForRemoval="addProductNavigateToCheckout" />
+        <actionGroup ref="GoToCheckoutFromCartActionGroup" stepKey="guestGoToCheckoutFromCart" after="seeCartQuantity" />
+    </test>
 </tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest.xml
new file mode 100644
index 0000000000000..ab04763a448bd
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout via Guest Checkout"/>
+            <title value="Checkout via Guest Checkout with restricted countries for payment"/>
+            <description value="Should be able to place an order as a Guest with restricted countries for payment."/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-8243"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <magentoCLI command="config:set checkout/options/display_billing_address_on 1"  stepKey="setShowBillingAddressOnPaymentPage" />
+            <magentoCLI command="config:set payment/checkmo/allowspecific" arguments="1" stepKey="setAllowSpecificCountiesValue" />
+            <magentoCLI command="config:set payment/checkmo/specificcountry" arguments="GB" stepKey="setSpecificCountryValue" />
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <magentoCLI command="config:set payment/checkmo/allowspecific 0" stepKey="unsetAllowSpecificCountiesValue"/>
+            <magentoCLI command="config:set payment/checkmo/specificcountry ''" stepKey="unsetSpecificCountryValue" />
+            <magentoCLI command="config:set checkout/options/display_billing_address_on 0" stepKey="setDisplayBillingAddressOnPaymentMethod" />
+        </after>
+
+        <!-- Add product to cart -->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.sku$$)}}" stepKey="goToProductPage"/>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProductToCart">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+        <!-- Go to checkout page -->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
+
+        <!-- Fill US Address and verify that no payment available -->
+        <seeElement selector="{{CheckoutShippingSection.isShippingStep}}" stepKey="shippingStepIsOpened"/>
+        <actionGroup ref="GuestCheckoutFillingShippingSectionWithoutPaymentsActionGroup" stepKey="guestCheckoutFillingShippingSection">
+            <argument name="customerVar" value="Simple_US_Customer"/>
+            <argument name="customerAddressVar" value="US_Address_TX"/>
+            <argument name="shippingMethod" value="Flat Rate"/>
+        </actionGroup>
+
+        <waitForElementVisible selector="{{CheckoutPaymentSection.noPaymentMethods}}" stepKey="waitMessage"/>
+        <see userInput="No Payment method available." stepKey="checkMessage"/>
+
+        <!-- Fill UK Address and verify that payment available and checkout successful -->
+        <uncheckOption selector="{{CheckoutPaymentSection.billingAddressSameAsShippingShared}}" stepKey="uncheckBillingAddressSameAsShippingCheckCheckBox"/>
+        <waitForPageLoad stepKey="waitNewAddressBillingForm"/>
+        <actionGroup ref="GuestCheckoutFillNewBillingAddressWithoutEmailActionGroup" stepKey="guestCheckoutFillingShippingAddress">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="UK_Default_Address" />
+        </actionGroup>
+        <click selector="{{CheckoutPaymentSection.addressAction('Update')}}" stepKey="clickUpdateBillingAddressButton" />
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrderPayment" />
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="guestPlaceOrder">
+            <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage" />
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
new file mode 100644
index 0000000000000..093435b8c8f26
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontOnePageCheckoutDataWhenChangeQtyTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout via Guest Checkout"/>
+            <title value="One page Checkout Customer data when changing Product Qty"/>
+            <description value="One page Checkout Customer data when changing Product Qty"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-13609"/>
+            <useCaseId value="MAGETWO-96711"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <!--Create a product-->
+            <createData entity="SimpleProduct3" stepKey="createProduct"/>
+        </before>
+        <after>
+            <!--Delete created data-->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+        </after>
+
+        <!--Add product to cart and checkout-->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$createProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
+        <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
+        <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>
+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="enterStreet"/>
+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="enterCity"/>
+        <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{CustomerAddressSimple.state}}" stepKey="selectRegion"/>
+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="enterPostcode"/>
+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="enterTelephone"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+
+        <!--Grab customer data to check it-->
+        <grabValueFrom selector="{{CheckoutShippingSection.email}}" stepKey="grabEmail"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.firstName}}" stepKey="grabFirstName"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.lastName}}" stepKey="grabLastName"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.street}}" stepKey="grabStreet"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.city}}" stepKey="grabCity"/>
+        <grabTextFrom selector="{{CheckoutShippingSection.region}}" stepKey="grabRegion"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.postcode}}" stepKey="grabPostcode"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.telephone}}" stepKey="grabTelephone"/>
+
+        <!--Select shipping method and finalize checkout-->
+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
+
+        <!--Go to cart page, update qty and proceed to checkout-->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
+        <see userInput="Shopping Cart" stepKey="seeCartPageIsOpened"/>
+        <fillField selector="{{CheckoutCartProductSection.productQuantityByName($$createProduct.name$$)}}" userInput="2" stepKey="updateProductQty"/>
+        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="clickUpdateShoppingCart"/>
+        <grabValueFrom selector="{{CheckoutCartProductSection.productQuantityByName($$createProduct.name$$)}}" stepKey="grabQty"/>
+        <assertEquals expected="2" actual="$grabQty" stepKey="assertQty"/>
+        <click selector="{{StorefrontCheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
+
+        <!--Check that form is filled with customer data-->
+        <grabValueFrom selector="{{CheckoutShippingSection.email}}" stepKey="grabEmail1"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.firstName}}" stepKey="grabFirstName1"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.lastName}}" stepKey="grabLastName1"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.street}}" stepKey="grabStreet1"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.city}}" stepKey="grabCity1"/>
+        <grabTextFrom selector="{{CheckoutShippingSection.region}}" stepKey="grabRegion1"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.postcode}}" stepKey="grabPostcode1"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.telephone}}" stepKey="grabTelephone1"/>
+
+        <assertEquals expected="$grabEmail" actual="$grabEmail1" stepKey="assertEmail"/>
+        <assertEquals expected="$grabFirstName" actual="$grabFirstName1" stepKey="assertFirstName"/>
+        <assertEquals expected="$grabLastName" actual="$grabLastName1" stepKey="assertLastName"/>
+        <assertEquals expected="$grabStreet" actual="$grabStreet1" stepKey="assertStreet"/>
+        <assertEquals expected="$grabCity" actual="$grabCity1" stepKey="assertCity"/>
+        <assertEquals expected="$grabRegion" actual="$grabRegion1" stepKey="assertRegion"/>
+        <assertEquals expected="$grabPostcode" actual="$grabPostcode1" stepKey="assertPostcode"/>
+        <assertEquals expected="$grabTelephone" actual="$grabTelephone1" stepKey="assertTelephone"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontPersistentDataForGuestCustomerWithPhysicalQuoteTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontPersistentDataForGuestCustomerWithPhysicalQuoteTest.xml
new file mode 100644
index 0000000000000..553d50c0bae64
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontPersistentDataForGuestCustomerWithPhysicalQuoteTest.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontPersistentDataForGuestCustomerWithPhysicalQuoteTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout via Guest Checkout"/>
+            <title value="Persistent Data for Guest Customer with physical quote"/>
+            <description value="One can use Persistent Data for Guest Customer with physical quote"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-8176"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleProduct3" stepKey="createProduct">
+                <field key="price">10</field>
+            </createData>
+            <createData entity="FreeShippinMethodConfig" stepKey="enableFreeShipping"/>
+            <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefront"/>
+            <executeJS function="window.localStorage.clear();" stepKey="clearLocalStorage"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <createData entity="FreeShippinMethodDefault" stepKey="disableFreeShipping"/>
+        </after>
+        <!-- 1. Add simple product to cart and go to checkout-->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addSimpleProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+        <!-- 2. Go to Shopping Cart -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckoutCartIndexPage"/>
+        <!-- 3. Open "Estimate Shipping and Tax" section and input data -->
+        <actionGroup ref="StorefrontCartEstimateShippingAndTaxActionGroup" stepKey="fillEstimateShippingAndTaxSection"/>
+        <actionGroup ref="StorefrontAssertShippingMethodPresentInCartActionGroup" stepKey="assertShippingMethodFlatRateIsPresentInCart">
+            <argument name="shippingMethod" value="Flat Rate"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertShippingMethodPresentInCartActionGroup" stepKey="assertShippingMethodFreeShippingIsPresentInCart">
+            <argument name="shippingMethod" value="Free Shipping"/>
+        </actionGroup>
+        <!-- 4. Select Flat Rate as shipping -->
+        <checkOption selector="{{StorefrontCheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectFlatRateShippingMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearAfterFlatRateSelection"/>
+        <see selector="{{StorefrontCheckoutCartSummarySection.total}}" userInput="15" stepKey="assertOrderTotalField"/>
+        <!-- 5. Refresh browser page (F5) -->
+        <reloadPage stepKey="reloadPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="StorefrontAssertCartEstimateShippingAndTaxActionGroup" stepKey="assertCartEstimateShippingAndTaxAfterPageReload"/>
+        <actionGroup ref="StorefrontAssertCartShippingMethodSelectedActionGroup" stepKey="assertFlatRateShippingMethodIsChecked">
+            <argument name="carrierCode" value="flatrate"/>
+            <argument name="methodCode" value="flatrate"/>
+        </actionGroup>
+        <!-- 6. Go to Checkout -->
+        <click selector="{{StorefrontCheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
+        <actionGroup ref="StorefrontAssertCheckoutEstimateShippingInformationActionGroup" stepKey="assertCheckoutEstimateShippingInformationAfterGoingToCheckout"/>
+        <actionGroup ref="StorefrontAssertCheckoutShippingMethodSelectedActionGroup" stepKey="assertFlatRateShippingMethodIsCheckedAfterGoingToCheckout">
+            <argument name="shippingMethod" value="Flat Rate"/>
+        </actionGroup>
+        <!-- 7. Change  persisted data -->
+        <selectOption selector="{{CheckoutShippingGuestInfoSection.country}}" userInput="United Kingdom" stepKey="changeCountryField"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.regionInput}}" userInput="" stepKey="changeStateProvinceField"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.postcode}}" userInput="KW1 7NQ" stepKey="changeZipPostalCodeField"/>
+        <!-- 8. Change shipping rate, select Free Shipping -->
+        <checkOption selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Free Shipping')}}" stepKey="checkFreeShippingAsShippingMethod"/>
+        <!-- 9. Fill other fields -->
+        <actionGroup ref="StorefrontFillGuestShippingInfoActionGroup" stepKey="fillOtherFieldsInCheckoutShippingSection"/>
+        <!-- 10. Refresh browser page(F5) -->
+        <reloadPage stepKey="reloadCheckoutPage"/>
+        <waitForPageLoad stepKey="waitForCheckoutPageLoad"/>
+        <actionGroup ref="StorefrontAssertGuestShippingInfoActionGroup" stepKey="assertGuestShippingPersistedInfoAfterReloadingCheckoutShippingPage"/>
+        <actionGroup ref="StorefrontAssertCheckoutShippingMethodSelectedActionGroup" stepKey="assertFreeShippingShippingMethodIsChecked">
+            <argument name="shippingMethod" value="Free Shipping"/>
+        </actionGroup>
+        <!-- 11. Go back to the shopping cart -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckoutCartIndexPage1"/>
+        <actionGroup ref="StorefrontAssertCartEstimateShippingAndTaxActionGroup" stepKey="assertCartEstimateShippingAndTaxAfterGoingBackToShoppingCart">
+            <argument name="customerData" value="Simple_UK_Customer_For_Shipment"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertCartShippingMethodSelectedActionGroup" stepKey="assertFreeShippingShippingMethodIsCheckedAfterGoingBackToShoppingCart">
+            <argument name="carrierCode" value="freeshipping"/>
+            <argument name="methodCode" value="freeshipping"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.xml
new file mode 100644
index 0000000000000..736b5e66558d0
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.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="StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest">
+        <annotations>
+            <features value="Checkout"/>
+            <title value="Checking Product name with custom store views"/>
+            <description value="Checking Product name in Minicart and on Checkout page with custom store views"/>
+            <stories value="Checkout via Guest Checkout"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14944"/>
+            <useCaseId value="MAGETWO-95904"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <!--Create a product-->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!--Login as Admin-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!-- Create store view -->
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
+                <argument name="customStore" value="customStore"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!--Delete product-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <!--Delete store view-->
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView">
+                <argument name="customStore" value="customStore"/>
+            </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
+            <!--Logout from admin-->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Go to created product page-->
+        <amOnPage url="{{AdminProductEditPage.url($$createProduct.id$$)}}" stepKey="goToEditPage"/>
+
+        <!--Switch to second store view and change the product name-->
+        <actionGroup ref="SwitchToTheNewStoreView" stepKey="switchToCustomStoreView">
+            <argument name="storeViewName" value="customStore"/>
+        </actionGroup>
+        <scrollToTopOfPage stepKey="scrolToShowNameField"/>
+        <click selector="{{AdminProductFormSection.productNameUseDefault}}" stepKey="uncheckUseDefault"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="$$createProduct.name$$-new" stepKey="fillProductName"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+
+        <!--Add product to cart-->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="amOnProductPage"/>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$createProduct.name$$"/>
+        </actionGroup>
+
+        <!--Check simple product in minicart-->
+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="assertProductNameInMiniCart1">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+
+        <!--Switch to second store view-->
+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchStoreView">
+            <argument name="storeView" value="customStore"/>
+        </actionGroup>
+
+        <!--Check simple product in minicart-->
+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="assertProductNameInMiniCart2">
+            <argument name="productName" value="$$createProduct.name$$-new"/>
+        </actionGroup>
+
+        <!--Go to Shopping Cart-->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
+        <seeElement selector="{{CheckoutCartProductSection.productLinkByName($$createProduct.name$$-new)}}" stepKey="assertProductName"/>
+
+        <!--Proceed to checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutPage"/>
+        <conditionalClick selector="{{CheckoutOrderSummarySection.miniCartTab}}" dependentSelector="{{CheckoutOrderSummarySection.miniCartTab}}" visible="true" stepKey="clickItemsInCart"/>
+        <waitForElementVisible selector="{{CheckoutOrderSummarySection.productItemName}}" stepKey="waitForProduct"/>
+        <see selector="{{CheckoutOrderSummarySection.productItemName}}" userInput="$$createProduct.name$$-new" stepKey="seeProductNameAtCheckout"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontRefreshPageDuringGuestCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontRefreshPageDuringGuestCheckoutTest.xml
new file mode 100644
index 0000000000000..3c7a6433cf818
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontRefreshPageDuringGuestCheckoutTest.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontRefreshPageDuringGuestCheckoutTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Guest checkout"/>
+            <title value="Storefront refresh page during guest checkout test"/>
+            <description value="Address is not lost for guest checkout if guest refresh page during checkout"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-8549"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Create simple product -->
+            <createData entity="SimpleProduct3" stepKey="createProduct"/>
+        </before>
+        <after>
+            <!-- Delete simple product -->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+
+            <!-- Logout admin -->
+            <actionGroup ref="logout" stepKey="logoutAsAdmin"/>
+        </after>
+        <!-- Add simple product to cart as Guest -->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddSimpleProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+
+        <!-- Go to Checkout page -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
+        <click selector="{{StorefrontCheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
+        <waitForPageLoad stepKey="waitForProceedToCheckout"/>
+
+        <!-- Fill email field and addresses form and go next -->
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShipping">
+            <argument name="shippingMethod" value="Flat Rate"/>
+        </actionGroup>
+
+        <!-- Refresh page -->
+        <reloadPage stepKey="refreshPage"/>
+
+        <!-- Click Place Order and assert order is placed -->
+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
+
+        <!-- Order review page has address that was created during checkout -->
+        <amOnPage url="{{AdminOrderDetailsPage.url({$grabOrderNumber})}}" stepKey="navigateToOrderPage"/>
+        <waitForPageLoad stepKey="waitForCreatedOrderPage"/>
+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{CustomerAddressSimple.street[0]}} {{CustomerAddressSimple.city}}, {{CustomerAddressSimple.state}}, {{CustomerAddressSimple.postcode}}" stepKey="checkShippingAddress"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml
new file mode 100644
index 0000000000000..7750ce0e1686a
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.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="StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout via the Storefront"/>
+            <title value="Estimator in Shopping cart must be pre-filled by Customer default shipping address for virtual quote"/>
+            <description value="Estimator in Shopping cart must be pre-filled by Customer default shipping address for virtual quote"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-78596"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="VirtualProduct" stepKey="createVirtualProduct"/>
+            <createData entity="Customer_With_Different_Default_Billing_Shipping_Addresses" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="customerLogout"/>
+            <deleteData createDataKey="createVirtualProduct" stepKey="deleteVirtualProduct"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+        </after>
+        <!-- Steps -->
+        <!-- Step 1: Go to Storefront as Customer -->
+        <actionGroup ref="CustomerLoginOnStorefront" stepKey="customerLogin">
+            <argument name="customer" value="$$createCustomer$$" />
+        </actionGroup>
+        <!-- Step 2: Add virtual product to cart -->
+        <amOnPage url="{{StorefrontProductPage.url($$createVirtualProduct.custom_attributes[url_key]$)}}" stepKey="amOnPage"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$$createVirtualProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <!-- Step 3: Go to Shopping Cart -->
+        <actionGroup ref="StorefrontViewAndEditCartFromMiniCartActionGroup" stepKey="goToShoppingcart"/>
+        <!-- Step 4: Open Estimate Tax section -->
+        <click selector="{{StorefrontCheckoutCartSummarySection.estimateShippingAndTax}}" stepKey="openEstimateTaxSection"/>
+        <seeOptionIsSelected selector="{{StorefrontCheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country}}" stepKey="checkCountry"/>
+        <seeOptionIsSelected selector="{{StorefrontCheckoutCartSummarySection.region}}" userInput="{{US_Address_CA.state}}" stepKey="checkState"/>
+        <scrollTo selector="{{StorefrontCheckoutCartSummarySection.postcode}}" stepKey="scrollToPostCodeField"/>
+        <grabValueFrom  selector="{{StorefrontCheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
+        <assertEquals message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
+            <expectedResult type="string">{{US_Address_CA.postcode}}</expectedResult>
+            <actualResult type="variable">grabTextPostCode</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateQtyInShoppingCartAfterUpdateInMinicartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateQtyInShoppingCartAfterUpdateInMinicartTest.xml
new file mode 100644
index 0000000000000..b0a2c0bfb7e13
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdateQtyInShoppingCartAfterUpdateInMinicartTest.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="StorefrontUpdateQtyInShoppingCartAfterUpdateInMinicartTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout via Guest Checkout"/>
+            <title value="Check updating shopping cart while updating items from minicart"/>
+            <description value="Check updating shopping cart while updating items from minicart"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-13626"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <!--Create category-->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <!--Create product-->
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <!--Delete product-->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <!--Delete category-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!--Open Product Page-->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.name$$)}}" stepKey="openProductPage"/>
+        <!--Add product to cart-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProductToCart">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+
+        <!--Go to Shopping cart-->
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openShoppingCart"/>
+        <!--Check quantity in Shopping cart-->
+        <grabValueFrom selector="{{CheckoutCartProductSection.productQuantityByName($$createProduct.name$$)}}" stepKey="grabQtyFromShoppingCart"/>
+        <assertEquals expected="1" actual="$grabQtyFromShoppingCart" stepKey="assertQtyInShoppingCart"/>
+
+        <!--Open minicart-->
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="openMiniCart"/>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.itemQuantity($$createProduct.name$$)}}" stepKey="waitForItemQuantity"/>
+        <pressKey selector="{{StorefrontMinicartSection.itemQuantity($$createProduct.name$$)}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::BACKSPACE]" stepKey="clearQtyField"/>
+        <fillField selector="{{StorefrontMinicartSection.itemQuantity($$createProduct.name$$)}}" userInput="5" stepKey="fillQtyField"/>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.itemQuantityUpdate($$createProduct.name$$)}}" stepKey="waitForUpdateButton"/>
+        <click selector="{{StorefrontMinicartSection.itemQuantityUpdate($$createProduct.name$$)}}" stepKey="clickUpdateButton"/>
+        <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
+        <!--Check quantity in shopping cart after updating-->
+        <grabValueFrom selector="{{CheckoutCartProductSection.productQuantityByName($$createProduct.name$$)}}" stepKey="grabQtyFromShoppingCart1"/>
+        <assertEquals expected="5" actual="$grabQtyFromShoppingCart1" stepKey="assertQtyInShoppingCart1"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php
index 88751b899d7c9..015d8ccbe928f 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php
@@ -6,6 +6,8 @@
 namespace Magento\Checkout\Test\Unit\Block\Cart;
 
 /**
+ * Unit tests for Magento\Checkout\Block\Cart\Sidebar.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SidebarTest extends \PHPUnit\Framework\TestCase
@@ -123,6 +125,11 @@ public function testGetTotalsHtml()
         $this->assertEquals($totalsHtml, $this->model->getTotalsHtml());
     }
 
+    /**
+     * Unit test for getConfig method.
+     *
+     * @return void
+     */
     public function testGetConfig()
     {
         $websiteId = 100;
@@ -144,14 +151,15 @@ public function testGetConfig()
             'baseUrl' => $baseUrl,
             'minicartMaxItemsVisible' => 3,
             'websiteId' => 100,
-            'maxItemsToDisplay' => 8
+            'maxItemsToDisplay' => 8,
+            'storeId' => null,
         ];
 
         $valueMap = [
             ['checkout/cart', [], $shoppingCartUrl],
             ['checkout', [], $checkoutUrl],
             ['checkout/sidebar/updateItemQty', ['_secure' => false], $updateItemQtyUrl],
-            ['checkout/sidebar/removeItem', ['_secure' => false], $removeItemUrl]
+            ['checkout/sidebar/removeItem', ['_secure' => false], $removeItemUrl],
         ];
 
         $this->requestMock->expects($this->any())
@@ -161,7 +169,7 @@ public function testGetConfig()
         $this->urlBuilderMock->expects($this->exactly(4))
             ->method('getUrl')
             ->willReturnMap($valueMap);
-        $this->storeManagerMock->expects($this->exactly(2))->method('getStore')->willReturn($storeMock);
+        $this->storeManagerMock->expects($this->atLeastOnce())->method('getStore')->willReturn($storeMock);
         $storeMock->expects($this->once())->method('getBaseUrl')->willReturn($baseUrl);
         $this->imageHelper->expects($this->once())->method('getFrame')->willReturn(false);
 
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Checkout/AttributeMergerTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/AttributeMergerTest.php
new file mode 100644
index 0000000000000..bff2243f30d03
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/AttributeMergerTest.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Test\Unit\Block\Checkout;
+
+use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
+use Magento\Customer\Helper\Address as AddressHelper;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Directory\Helper\Data as DirectoryHelper;
+use Magento\Checkout\Block\Checkout\AttributeMerger;
+
+class AttributeMergerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CustomerRepository
+     */
+    private $customerRepositoryMock;
+
+    /**
+     * @var CustomerSession
+     */
+    private $customerSessionMock;
+
+    /**
+     * @var AddressHelper
+     */
+    private $addressHelperMock;
+
+    /**
+     * @var DirectoryHelper
+     */
+    private $directoryHelperMock;
+
+    /**
+     * @var AttributeMerger
+     */
+    private $attributeMerger;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+
+        $this->customerRepositoryMock = $this->createMock(CustomerRepository::class);
+        $this->customerSessionMock = $this->createMock(CustomerSession::class);
+        $this->addressHelperMock = $this->createMock(AddressHelper::class);
+        $this->directoryHelperMock = $this->createMock(DirectoryHelper::class);
+
+        $this->attributeMerger = new AttributeMerger(
+            $this->addressHelperMock,
+            $this->customerSessionMock,
+            $this->customerRepositoryMock,
+            $this->directoryHelperMock
+        );
+    }
+
+    /**
+     * Tests of element attributes merging.
+     *
+     * @param string $validationRule
+     * @param string $expectedValidation
+     * @return void
+     * @dataProvider validationRulesDataProvider
+     */
+    public function testMerge($validationRule, $expectedValidation)
+    {
+        $elements = [
+            'field' => [
+                'visible' => true,
+                'formElement' => 'input',
+                'label' => __('City'),
+                'value' => null,
+                'sortOrder' => 1,
+                'validation' => [
+                    'input_validation' => $validationRule,
+                ],
+            ]
+        ];
+
+        $actualResult = $this->attributeMerger->merge(
+            $elements,
+            'provider',
+            'dataScope',
+            [
+                'field' =>
+                    [
+                        'validation' => ['length' => true],
+                    ],
+            ]
+        );
+
+        $expectedResult = [
+            $expectedValidation => true,
+            'length' => true,
+        ];
+
+        $this->assertEquals($expectedResult, $actualResult['field']['validation']);
+    }
+
+    /**
+     * Provides possible validation types.
+     *
+     * @return array
+     */
+    public function validationRulesDataProvider(): array
+    {
+        return [
+            ['alpha', 'validate-alpha'],
+            ['numeric', 'validate-number'],
+            ['alphanumeric', 'validate-alphanum'],
+            ['alphanum-with-spaces', 'validate-alphanum-with-spaces'],
+            ['url', 'validate-url'],
+            ['email', 'email2'],
+            ['length', 'validate-length'],
+        ];
+    }
+}
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
index 54f77c95148ac..b54339aa2c1d8 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
@@ -35,7 +35,7 @@ class OnepageTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    private $serializer;
+    private $serializerMock;
 
     protected function setUp()
     {
@@ -49,7 +49,7 @@ protected function setUp()
             \Magento\Checkout\Block\Checkout\LayoutProcessorInterface::class
         );
 
-        $this->serializer = $this->createMock(\Magento\Framework\Serialize\Serializer\Json::class);
+        $this->serializerMock = $this->createMock(\Magento\Framework\Serialize\Serializer\JsonHexTag::class);
 
         $this->model = new \Magento\Checkout\Block\Onepage(
             $contextMock,
@@ -57,7 +57,8 @@ protected function setUp()
             $this->configProviderMock,
             [$this->layoutProcessorMock],
             [],
-            $this->serializer
+            $this->serializerMock,
+            $this->serializerMock
         );
     }
 
@@ -93,6 +94,7 @@ public function testGetJsLayout()
         $processedLayout = ['layout' => ['processed' => true]];
         $jsonLayout = '{"layout":{"processed":true}}';
         $this->layoutProcessorMock->expects($this->once())->method('process')->with([])->willReturn($processedLayout);
+        $this->serializerMock->expects($this->once())->method('serialize')->willReturn($jsonLayout);
 
         $this->assertEquals($jsonLayout, $this->model->getJsLayout());
     }
@@ -101,6 +103,7 @@ public function testGetSerializedCheckoutConfig()
     {
         $checkoutConfig = ['checkout', 'config'];
         $this->configProviderMock->expects($this->once())->method('getConfig')->willReturn($checkoutConfig);
+        $this->serializerMock->expects($this->once())->method('serialize')->willReturn(json_encode($checkoutConfig));
 
         $this->assertEquals(json_encode($checkoutConfig), $this->model->getSerializedCheckoutConfig());
     }
diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/AddTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/AddTest.php
index b06000662e093..f7721bbc58f18 100644
--- a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/AddTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/AddTest.php
@@ -58,7 +58,10 @@ public function setUp()
         $this->resultRedirectFactory = $this->getMockBuilder(RedirectFactory::class)
                 ->disableOriginalConstructor()->getMock();
         $this->request = $this->getMockBuilder(RequestInterface::class)
-            ->disableOriginalConstructor()->getmock();
+            ->disableOriginalConstructor()
+            ->setMethods(['isPost'])
+            ->getMockForAbstractClass();
+        $this->request->expects($this->any())->method('isPost')->willReturn(true);
         $this->messageManager = $this->getMockBuilder(ManagerInterface::class)
             ->disableOriginalConstructor()->getMock();
 
diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php
index b8f46feab0a48..491f4c741e645 100644
--- a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php
@@ -85,6 +85,7 @@ class CouponPostTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->request = $this->createMock(\Magento\Framework\App\Request\Http::class);
+        $this->request->expects($this->any())->method('isPost')->willReturn(true);
         $this->response = $this->createMock(\Magento\Framework\App\Response\Http::class);
         $this->quote = $this->createPartialMock(\Magento\Quote\Model\Quote::class, [
                 'setCouponCode',
@@ -165,15 +166,12 @@ protected function setUp()
 
     public function testExecuteWithEmptyCoupon()
     {
-        $this->request->expects($this->at(0))
-            ->method('getParam')
-            ->with('remove')
-            ->willReturn(0);
-
-        $this->request->expects($this->at(1))
-            ->method('getParam')
-            ->with('coupon_code')
-            ->willReturn('');
+        $this->request->expects($this->any())->method('getParam')->willReturnMap(
+            [
+                ['remove', null, 0],
+                ['coupon_code', null, ''],
+            ]
+        );
 
         $this->cart->expects($this->once())
             ->method('getQuote')
@@ -184,15 +182,12 @@ public function testExecuteWithEmptyCoupon()
 
     public function testExecuteWithGoodCouponAndItems()
     {
-        $this->request->expects($this->at(0))
-            ->method('getParam')
-            ->with('remove')
-            ->willReturn(0);
-
-        $this->request->expects($this->at(1))
-            ->method('getParam')
-            ->with('coupon_code')
-            ->willReturn('CODE');
+        $this->request->expects($this->any())->method('getParam')->willReturnMap(
+            [
+                ['remove', null, 0],
+                ['coupon_code', null, 'CODE'],
+            ]
+        );
 
         $this->cart->expects($this->any())
             ->method('getQuote')
@@ -236,7 +231,7 @@ public function testExecuteWithGoodCouponAndItems()
             ->willReturn('CODE');
 
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->willReturnSelf();
 
         $this->objectManagerMock->expects($this->once())
@@ -248,15 +243,12 @@ public function testExecuteWithGoodCouponAndItems()
 
     public function testExecuteWithGoodCouponAndNoItems()
     {
-        $this->request->expects($this->at(0))
-            ->method('getParam')
-            ->with('remove')
-            ->willReturn(0);
-
-        $this->request->expects($this->at(1))
-            ->method('getParam')
-            ->with('coupon_code')
-            ->willReturn('CODE');
+        $this->request->expects($this->any())->method('getParam')->willReturnMap(
+            [
+                ['remove', null, 0],
+                ['coupon_code', null, 'CODE'],
+            ]
+        );
 
         $this->cart->expects($this->any())
             ->method('getQuote')
@@ -290,7 +282,7 @@ public function testExecuteWithGoodCouponAndNoItems()
             ->willReturnSelf();
 
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->willReturnSelf();
 
         $this->objectManagerMock->expects($this->once())
@@ -302,15 +294,12 @@ public function testExecuteWithGoodCouponAndNoItems()
 
     public function testExecuteWithBadCouponAndItems()
     {
-        $this->request->expects($this->at(0))
-            ->method('getParam')
-            ->with('remove')
-            ->willReturn(0);
-
-        $this->request->expects($this->at(1))
-            ->method('getParam')
-            ->with('coupon_code')
-            ->willReturn('');
+        $this->request->expects($this->any())->method('getParam')->willReturnMap(
+            [
+                ['remove', null, 0],
+                ['coupon_code', null, ''],
+            ]
+        );
 
         $this->cart->expects($this->any())
             ->method('getQuote')
@@ -344,7 +333,7 @@ public function testExecuteWithBadCouponAndItems()
             ->willReturnSelf();
 
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('You canceled the coupon code.')
             ->willReturnSelf();
 
@@ -353,15 +342,12 @@ public function testExecuteWithBadCouponAndItems()
 
     public function testExecuteWithBadCouponAndNoItems()
     {
-        $this->request->expects($this->at(0))
-            ->method('getParam')
-            ->with('remove')
-            ->willReturn(0);
-
-        $this->request->expects($this->at(1))
-            ->method('getParam')
-            ->with('coupon_code')
-            ->willReturn('CODE');
+        $this->request->expects($this->any())->method('getParam')->willReturnMap(
+            [
+                ['remove', null, 0],
+                ['coupon_code', null, 'CODE'],
+            ]
+        );
 
         $this->cart->expects($this->any())
             ->method('getQuote')
@@ -386,7 +372,7 @@ public function testExecuteWithBadCouponAndNoItems()
             ->willReturn($coupon);
 
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->willReturnSelf();
 
         $this->objectManagerMock->expects($this->once())
diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php
index 7653a51b2f9b7..3f9a84c1b1763 100644
--- a/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php
@@ -47,7 +47,11 @@ protected function setUp()
         $this->sidebarMock = $this->createMock(\Magento\Checkout\Model\Sidebar::class);
         $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
         $this->jsonHelperMock = $this->createMock(\Magento\Framework\Json\Helper\Data::class);
-        $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
+        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isPost'])
+            ->getMockForAbstractClass();
+        $this->requestMock->expects($this->any())->method('isPost')->willReturn(true);
         $this->responseMock = $this->getMockForAbstractClass(
             \Magento\Framework\App\ResponseInterface::class,
             [],
diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/UpdateItemQtyTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/UpdateItemQtyTest.php
index e2a00c6872542..269536baa9c59 100644
--- a/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/UpdateItemQtyTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/UpdateItemQtyTest.php
@@ -5,40 +5,46 @@
  */
 namespace Magento\Checkout\Test\Unit\Controller\Sidebar;
 
+use Magento\Checkout\Controller\Sidebar\UpdateItemQty;
+use Magento\Checkout\Model\Sidebar;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Json\Helper\Data;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Psr\Log\LoggerInterface;
 
 class UpdateItemQtyTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\Checkout\Controller\Sidebar\UpdateItemQty */
-    protected $updateItemQty;
+    /** @var UpdateItemQty */
+    private $updateItemQty;
 
     /** @var ObjectManagerHelper */
-    protected $objectManagerHelper;
+    private $objectManagerHelper;
 
-    /** @var \Magento\Checkout\Model\Sidebar|\PHPUnit_Framework_MockObject_MockObject */
-    protected $sidebarMock;
+    /** @var Sidebar|\PHPUnit_Framework_MockObject_MockObject */
+    private $sidebarMock;
 
-    /** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $loggerMock;
+    /** @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $loggerMock;
 
-    /** @var \Magento\Framework\Json\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
-    protected $jsonHelperMock;
+    /** @var Data|\PHPUnit_Framework_MockObject_MockObject */
+    private $jsonHelperMock;
 
-    /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $requestMock;
+    /** @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $requestMock;
 
-    /** @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $responseMock;
+    /** @var ResponseInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $responseMock;
 
     protected function setUp()
     {
-        $this->sidebarMock = $this->createMock(\Magento\Checkout\Model\Sidebar::class);
-        $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
-        $this->jsonHelperMock = $this->createMock(\Magento\Framework\Json\Helper\Data::class);
-        $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
+        $this->sidebarMock = $this->createMock(Sidebar::class);
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+        $this->jsonHelperMock = $this->createMock(Data::class);
+        $this->requestMock = $this->createMock(RequestInterface::class);
         $this->responseMock = $this->getMockForAbstractClass(
-            \Magento\Framework\App\ResponseInterface::class,
+            ResponseInterface::class,
             [],
             '',
             false,
@@ -49,7 +55,7 @@ protected function setUp()
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->updateItemQty = $this->objectManagerHelper->getObject(
-            \Magento\Checkout\Controller\Sidebar\UpdateItemQty::class,
+            UpdateItemQty::class,
             [
                 'sidebar' => $this->sidebarMock,
                 'logger' => $this->loggerMock,
@@ -60,6 +66,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * Tests execute action.
+     */
     public function testExecute()
     {
         $this->requestMock->expects($this->at(0))
@@ -113,6 +122,9 @@ public function testExecute()
         $this->assertEquals('json represented', $this->updateItemQty->execute());
     }
 
+    /**
+     * Tests with localized exception.
+     */
     public function testExecuteWithLocalizedException()
     {
         $this->requestMock->expects($this->at(0))
@@ -157,6 +169,9 @@ public function testExecuteWithLocalizedException()
         $this->assertEquals('json represented', $this->updateItemQty->execute());
     }
 
+    /**
+     * Tests with exception.
+     */
     public function testExecuteWithException()
     {
         $this->requestMock->expects($this->at(0))
@@ -207,4 +222,31 @@ public function testExecuteWithException()
 
         $this->assertEquals('json represented', $this->updateItemQty->execute());
     }
+
+    /**
+     * Tests execute with float item quantity.
+     */
+    public function testExecuteWithFloatItemQty()
+    {
+        $itemId = '1';
+        $floatItemQty = '2.2';
+
+        $this->requestMock->expects($this->at(0))
+            ->method('getParam')
+            ->with('item_id', null)
+            ->willReturn($itemId);
+        $this->requestMock->expects($this->at(1))
+            ->method('getParam')
+            ->with('item_qty', null)
+            ->willReturn($floatItemQty);
+
+        $this->sidebarMock->expects($this->once())
+            ->method('checkQuoteItem')
+            ->with($itemId);
+        $this->sidebarMock->expects($this->once())
+            ->method('updateQuoteItem')
+            ->with($itemId, $floatItemQty);
+
+        $this->updateItemQty->execute();
+    }
 }
diff --git a/app/code/Magento/Checkout/Test/Unit/CustomerData/CartTest.php b/app/code/Magento/Checkout/Test/Unit/CustomerData/CartTest.php
index 75e181cbabd08..9f718f00b4b9d 100644
--- a/app/code/Magento/Checkout/Test/Unit/CustomerData/CartTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/CustomerData/CartTest.php
@@ -7,6 +7,8 @@
 namespace Magento\Checkout\Test\Unit\CustomerData;
 
 /**
+ * Unit tests for Magento\Checkout\CustomerData\Cart.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CartTest extends \PHPUnit\Framework\TestCase
@@ -78,6 +80,11 @@ public function testIsGuestCheckoutAllowed()
         $this->assertTrue($this->model->isGuestCheckoutAllowed());
     }
 
+    /**
+     * Unit test for getSectionData method.
+     *
+     * @return void
+     */
     public function testGetSectionData()
     {
         $summaryQty = 100;
@@ -113,7 +120,7 @@ public function testGetSectionData()
 
         $storeMock = $this->createPartialMock(\Magento\Store\Model\System\Store::class, ['getWebsiteId']);
         $storeMock->expects($this->once())->method('getWebsiteId')->willReturn($websiteId);
-        $quoteMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+        $quoteMock->expects($this->atLeastOnce())->method('getStore')->willReturn($storeMock);
 
         $productMock = $this->createPartialMock(
             \Magento\Catalog\Model\Product::class,
@@ -162,6 +169,7 @@ public function testGetSectionData()
             'isGuestCheckoutAllowed' => 1,
             'website_id' => $websiteId,
             'subtotalAmount' => 200,
+            'storeId' => null,
         ];
         $this->assertEquals($expectedResult, $this->model->getSectionData());
     }
@@ -199,7 +207,7 @@ public function testGetSectionDataWithCompositeProduct()
 
         $storeMock = $this->createPartialMock(\Magento\Store\Model\System\Store::class, ['getWebsiteId']);
         $storeMock->expects($this->once())->method('getWebsiteId')->willReturn($websiteId);
-        $quoteMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+        $quoteMock->expects($this->atLeastOnce())->method('getStore')->willReturn($storeMock);
 
         $this->checkoutCartMock->expects($this->once())->method('getSummaryQty')->willReturn($summaryQty);
         $this->checkoutHelperMock->expects($this->once())
@@ -265,6 +273,7 @@ public function testGetSectionDataWithCompositeProduct()
             'isGuestCheckoutAllowed' => 1,
             'website_id' => $websiteId,
             'subtotalAmount' => 200,
+            'storeId' => null,
         ];
         $this->assertEquals($expectedResult, $this->model->getSectionData());
     }
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
index 2d313d2f50052..7a731c1c07039 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
@@ -280,9 +280,11 @@ private function getMockForAssignBillingAddress($cartId, $billingAddressMock)
         $billingAddressId = 1;
         $quote = $this->createMock(Quote::class);
         $quoteBillingAddress = $this->createMock(Address::class);
+        $shippingRate = $this->createPartialMock(\Magento\Quote\Model\Quote\Address\Rate::class, []);
+        $shippingRate->setCarrier('flatrate');
         $quoteShippingAddress = $this->createPartialMock(
             Address::class,
-            ['setLimitCarrier', 'getShippingMethod']
+            ['setLimitCarrier', 'getShippingMethod', 'getShippingRateByCode']
         );
         $this->cartRepositoryMock->method('getActive')
             ->with($cartId)
@@ -302,6 +304,9 @@ private function getMockForAssignBillingAddress($cartId, $billingAddressMock)
         $quote->expects($this->once())
             ->method('setBillingAddress')
             ->with($billingAddressMock);
+        $quoteShippingAddress->expects($this->any())
+            ->method('getShippingRateByCode')
+            ->willReturn($shippingRate);
         $quote->expects($this->once())
             ->method('setDataChanges')
             ->willReturnSelf();
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php
index 6ecd759b8b826..7663c1c3c9645 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php
@@ -159,6 +159,31 @@ public function testSavePaymentInformationAndPlaceOrderWithLocolizedException()
         $this->model->savePaymentInformationAndPlaceOrder($cartId, $paymentMock, $billingAddressMock);
     }
 
+    /**
+     * Test for save payment and place order with new billing address
+     *
+     * @return void
+     */
+    public function testSavePaymentInformationAndPlaceOrderWithNewBillingAddress()
+    {
+        $cartId = 100;
+        $quoteBillingAddressId = 1;
+        $customerId = 1;
+        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
+        $quoteBillingAddress = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
+        $billingAddressMock = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
+        $paymentMock = $this->createMock(\Magento\Quote\Api\Data\PaymentInterface::class);
+
+        $quoteBillingAddress->method('getCustomerId')->willReturn($customerId);
+        $quoteMock->method('getBillingAddress')->willReturn($quoteBillingAddress);
+        $quoteBillingAddress->method('getId')->willReturn($quoteBillingAddressId);
+        $this->cartRepositoryMock->method('getActive')->with($cartId)->willReturn($quoteMock);
+        
+        $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
+        $billingAddressMock->expects($this->once())->method('setCustomerId')->with($customerId);
+        $this->assertTrue($this->model->savePaymentInformation($cartId, $paymentMock, $billingAddressMock));
+    }
+
     /**
      * @param int $cartId
      * @param \PHPUnit_Framework_MockObject_MockObject $billingAddressMock
@@ -175,9 +200,10 @@ private function getMockForAssignBillingAddress($cartId, $billingAddressMock)
             ['setLimitCarrier', 'getShippingMethod', 'getShippingRateByCode']
         );
         $this->cartRepositoryMock->expects($this->any())->method('getActive')->with($cartId)->willReturn($quoteMock);
-        $quoteMock->expects($this->once())->method('getBillingAddress')->willReturn($quoteBillingAddress);
+        $quoteMock->method('getBillingAddress')->willReturn($quoteBillingAddress);
         $quoteMock->expects($this->once())->method('getShippingAddress')->willReturn($quoteShippingAddress);
         $quoteBillingAddress->expects($this->once())->method('getId')->willReturn($billingAddressId);
+        $quoteBillingAddress->expects($this->once())->method('getId')->willReturn($billingAddressId);
         $quoteMock->expects($this->once())->method('removeAddress')->with($billingAddressId);
         $quoteMock->expects($this->once())->method('setBillingAddress')->with($billingAddressMock);
         $quoteMock->expects($this->once())->method('setDataChanges')->willReturnSelf();
diff --git a/app/code/Magento/Checkout/Test/Unit/Observer/SalesQuoteSaveAfterObserverTest.php b/app/code/Magento/Checkout/Test/Unit/Observer/SalesQuoteSaveAfterObserverTest.php
index 6070bb5d424c1..dabaf173d90b3 100644
--- a/app/code/Magento/Checkout/Test/Unit/Observer/SalesQuoteSaveAfterObserverTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Observer/SalesQuoteSaveAfterObserverTest.php
@@ -30,13 +30,14 @@ protected function setUp()
 
     public function testSalesQuoteSaveAfter()
     {
+        $quoteId = 7;
         $observer = $this->createMock(\Magento\Framework\Event\Observer::class);
         $observer->expects($this->once())->method('getEvent')->will(
             $this->returnValue(new \Magento\Framework\DataObject(
-                ['quote' => new \Magento\Framework\DataObject(['is_checkout_cart' => 1, 'id' => 7])]
+                ['quote' => new \Magento\Framework\DataObject(['is_checkout_cart' => 1, 'id' => $quoteId])]
             ))
         );
-        $this->checkoutSession->expects($this->once())->method('getQuoteId')->with(7);
+        $this->checkoutSession->expects($this->once())->method('setQuoteId')->with($quoteId);
 
         $this->object->execute($observer);
     }
diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json
index 32cb6c53864db..2593155cb5155 100644
--- a/app/code/Magento/Checkout/composer.json
+++ b/app/code/Magento/Checkout/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-checkout",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-sales": "101.0.*",
         "magento/module-catalog-inventory": "100.2.*",
@@ -26,7 +26,7 @@
         "magento/module-cookie": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.6",
+    "version": "100.2.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Checkout/etc/di.xml b/app/code/Magento/Checkout/etc/di.xml
index 71dfd12bb4779..4ebd594a28562 100644
--- a/app/code/Magento/Checkout/etc/di.xml
+++ b/app/code/Magento/Checkout/etc/di.xml
@@ -49,7 +49,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Quote\Model\Quote">
-        <plugin name="clear_addresses_after_product_delete" type="Magento\Checkout\Plugin\Model\Quote\ResetQuoteAddresses"/>
-    </type>
 </config>
diff --git a/app/code/Magento/Checkout/etc/frontend/di.xml b/app/code/Magento/Checkout/etc/frontend/di.xml
index d80f88786c87b..8f35fe9f37abf 100644
--- a/app/code/Magento/Checkout/etc/frontend/di.xml
+++ b/app/code/Magento/Checkout/etc/frontend/di.xml
@@ -59,6 +59,7 @@
                 <item name="totalsSortOrder" xsi:type="object">Magento\Checkout\Block\Checkout\TotalsProcessor</item>
                 <item name="directoryData" xsi:type="object">Magento\Checkout\Block\Checkout\DirectoryDataProcessor</item>
             </argument>
+            <argument name="serializer" xsi:type="object">Magento\Framework\Serialize\Serializer\JsonHexTag</argument>
         </arguments>
     </type>
     <type name="Magento\Checkout\Block\Cart\Totals">
@@ -95,4 +96,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Quote\Model\Quote">
+        <plugin name="clear_addresses_after_product_delete" type="Magento\Checkout\Plugin\Model\Quote\ResetQuoteAddresses"/>
+    </type>
 </config>
diff --git a/app/code/Magento/Checkout/etc/frontend/sections.xml b/app/code/Magento/Checkout/etc/frontend/sections.xml
index 35733a6119a25..90c2878f501cf 100644
--- a/app/code/Magento/Checkout/etc/frontend/sections.xml
+++ b/app/code/Magento/Checkout/etc/frontend/sections.xml
@@ -46,7 +46,6 @@
     </action>
     <action name="rest/*/V1/guest-carts/*/payment-information">
         <section name="cart"/>
-        <section name="checkout-data"/>
     </action>
     <action name="rest/*/V1/guest-carts/*/selected-payment-method">
         <section name="cart"/>
diff --git a/app/code/Magento/Checkout/i18n/en_US.csv b/app/code/Magento/Checkout/i18n/en_US.csv
index 2dcb611c1fe60..bacfe169c1bff 100644
--- a/app/code/Magento/Checkout/i18n/en_US.csv
+++ b/app/code/Magento/Checkout/i18n/en_US.csv
@@ -181,3 +181,4 @@ Payment,Payment
 "Item in Cart","Item in Cart"
 "Items in Cart","Items in Cart"
 "Close","Close"
+"You added %1 to your <a href=""%2"">shopping cart</a>.","You added %1 to your <a href=""%2"">shopping cart</a>."
diff --git a/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html b/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html
index fb55f9b601dc9..03ad7d9e8d848 100644
--- a/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html
+++ b/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html
@@ -23,43 +23,43 @@ <h1>{{trans "Payment Transaction Failed"}}</h1>
 
 <ul>
     <li>
-        <b>{{trans "Reason"}}</b><br />
+        <strong>{{trans "Reason"}}</strong><br />
         {{var reason}}
     </li>
     <li>
-        <b>{{trans "Checkout Type"}}</b><br />
+        <strong>{{trans "Checkout Type"}}</strong><br />
         {{var checkoutType}}
     </li>
     <li>
-        <b>{{trans "Customer:"}}</b><br />
+        <strong>{{trans "Customer:"}}</strong><br />
         <a href="mailto:{{var customerEmail}}">{{var customer}}</a> &lt;{{var customerEmail}}&gt;
     </li>
     <li>
-        <b>{{trans "Items"}}</b><br />
+        <strong>{{trans "Items"}}</strong><br />
         {{var items|raw}}
     </li>
     <li>
-        <b>{{trans "Total:"}}</b><br />
+        <strong>{{trans "Total:"}}</strong><br />
         {{var total}}
     </li>
     <li>
-        <b>{{trans "Billing Address:"}}</b><br />
+        <strong>{{trans "Billing Address:"}}</strong><br />
         {{var billingAddress.format('html')|raw}}
     </li>
     <li>
-        <b>{{trans "Shipping Address:"}}</b><br />
+        <strong>{{trans "Shipping Address:"}}</strong><br />
         {{var shippingAddress.format('html')|raw}}
     </li>
     <li>
-        <b>{{trans "Shipping Method:"}}</b><br />
+        <strong>{{trans "Shipping Method:"}}</strong><br />
         {{var shippingMethod}}
     </li>
     <li>
-        <b>{{trans "Payment Method:"}}</b><br />
+        <strong>{{trans "Payment Method:"}}</strong><br />
         {{var paymentMethod}}
     </li>
     <li>
-        <b>{{trans "Date & Time:"}}</b><br />
+        <strong>{{trans "Date & Time:"}}</strong><br />
         {{var dateAndTime}}
     </li>
 </ul>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
index 6c562f0b9027b..642fb5664ddc0 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
@@ -404,6 +404,10 @@
                                                                         <item name="component" xsi:type="string">Magento_Checkout/js/view/summary/item/details/subtotal</item>
                                                                         <item name="displayArea" xsi:type="string">after_details</item>
                                                                     </item>
+                                                                    <item name="message" xsi:type="array">
+                                                                        <item name="component" xsi:type="string">Magento_Checkout/js/view/summary/item/details/message</item>
+                                                                        <item name="displayArea" xsi:type="string">item_message</item>
+                                                                    </item>
                                                                 </item>
                                                             </item>
                                                         </item>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/button.phtml b/app/code/Magento/Checkout/view/frontend/templates/button.phtml
index c3edfe30f8bdd..b0087794ea850 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/button.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/button.phtml
@@ -3,15 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block \Magento\Checkout\Block\Onepage\Success */ ?>
 
 <?php if ($block->getCanViewOrder() && $block->getCanPrintOrder()) :?>
-    <a href="<?= /* @escapeNotVerified */ $block->getPrintUrl() ?>" target="_blank" class="print">
-        <?= /* @escapeNotVerified */ __('Print receipt') ?>
+    <a href="<?= $block->escapeUrl($block->getPrintUrl()) ?>" target="_blank" class="print">
+        <?= $block->escapeHtml(__('Print receipt')) ?>
     </a>
     <?= $block->getChildHtml() ?>
 <?php endif;?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart.phtml
index 929f053febfc7..e71ea8c66288c 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart.phtml
@@ -12,7 +12,9 @@
  */
 
 if ($block->getItemsCount()) {
+    // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
     echo $block->getChildHtml('with-items');
 } else {
+    // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
     echo $block->getChildHtml('no-items');
 }
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/additional/info.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/additional/info.phtml
index cb92e62f1f0c8..050a256ff7930 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/additional/info.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/additional/info.phtml
@@ -4,18 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /**
  * Shopping cart additional info
  * @var $block \Magento\Framework\View\Element\Template
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?php
 $name = $block->getNameInLayout();
 foreach ($block->getChildNames($name) as $childName) {
+    // phpcs:ignore Magento2.Security.LanguageConstruct.DirectOutput
     echo $block->getChildBlock($childName)->setItem($block->getItem())->toHtml();
 }
 ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
index 1d67b325e01c5..4522500d395b6 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
@@ -4,16 +4,17 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
-<div class="block discount" id="block-discount" data-mage-init='{"collapsible":{"openedState": "active", "saveState": false}}'>
+<div class="block discount"
+     id="block-discount"
+     data-mage-init='{"collapsible":{"openedState": "active", "saveState": false}}'
+>
     <div class="title" data-role="title">
-        <strong id="block-discount-heading" role="heading" aria-level="2"><?= /* @escapeNotVerified */ __('Apply Discount Code') ?></strong>
+        <strong id="block-discount-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Apply Discount Code')) ?></strong>
     </div>
     <div class="content" data-role="content" aria-labelledby="block-discount-heading">
         <form id="discount-coupon-form"
-              action="<?= /* @escapeNotVerified */ $block->getUrl('checkout/cart/couponPost') ?>"
+              action="<?= $block->escapeUrl($block->getUrl('checkout/cart/couponPost')) ?>"
               method="post"
               data-mage-init='{"discountCode":{"couponCodeSelector": "#coupon_code",
                                                "removeCouponSelector": "#remove-coupon",
@@ -22,21 +23,30 @@
             <div class="fieldset coupon<?= strlen($block->getCouponCode()) ? ' applied' : '' ?>">
                 <input type="hidden" name="remove" id="remove-coupon" value="0" />
                 <div class="field">
-                    <label for="coupon_code" class="label"><span><?= /* @escapeNotVerified */ __('Enter discount code') ?></span></label>
+                    <label for="coupon_code" class="label"><span><?= $block->escapeHtml(__('Enter discount code')) ?></span></label>
                     <div class="control">
-                        <input type="text" class="input-text" id="coupon_code" name="coupon_code" value="<?= $block->escapeHtml($block->getCouponCode()) ?>" placeholder="<?= $block->escapeHtml(__('Enter discount code')) ?>" <?php if (strlen($block->getCouponCode())): ?> disabled="disabled" <?php endif; ?> />
+                        <input type="text"
+                               class="input-text"
+                               id="coupon_code"
+                               name="coupon_code"
+                               value="<?= $block->escapeHtmlAttr($block->getCouponCode()) ?>"
+                               placeholder="<?= $block->escapeHtmlAttr(__('Enter discount code')) ?>"
+                                <?php if (strlen($block->getCouponCode())) :?>
+                                   disabled="disabled"
+                                <?php endif; ?>
+                        />
                     </div>
                 </div>
                 <div class="actions-toolbar">
-                    <?php if (!strlen($block->getCouponCode())): ?>
+                    <?php if (!strlen($block->getCouponCode())) :?>
                     <div class="primary">
-                        <button class="action apply primary" type="button" value="<?= /* @escapeNotVerified */ __('Apply Discount') ?>">
-                            <span><?= /* @escapeNotVerified */ __('Apply Discount') ?></span>
+                        <button class="action apply primary" type="button" value="<?= $block->escapeHtmlAttr(__('Apply Discount')) ?>">
+                            <span><?= $block->escapeHtml(__('Apply Discount')) ?></span>
                         </button>
                     </div>
-                    <?php else: ?>
+                    <?php else :?>
                         <div class="primary">
-                            <button  type="button" class="action cancel primary" value="<?= /* @escapeNotVerified */ __('Cancel Coupon') ?>"><span><?= /* @escapeNotVerified */ __('Cancel Coupon') ?></span></button>
+                            <button  type="button" class="action cancel primary" value="<?= $block->escapeHtmlAttr(__('Cancel Coupon')) ?>"><span><?= $block->escapeHtml(__('Cancel Coupon')) ?></span></button>
                         </div>
                     <?php endif; ?>
                 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
index 1005c11e44d95..e1ab036c7d889 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
@@ -4,51 +4,56 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
 /**  @var $block \Magento\Checkout\Block\Cart\Grid */
 ?>
-<?php $mergedCells = ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?>
+<?php $mergedCells = ($this->helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices() ? 2 : 1); ?>
 <?= $block->getChildHtml('form_before') ?>
-<form action="<?= /* @escapeNotVerified */ $block->getUrl('checkout/cart/updatePost') ?>"
+<form action="<?= $block->escapeUrl($block->getUrl('checkout/cart/updatePost')) ?>"
           method="post"
           id="form-validate"
           data-mage-init='{"Magento_Checkout/js/action/update-shopping-cart":
-              {"validationURL" : "/checkout/cart/updateItemQty"}
+              {"validationURL" : "<?= $block->escapeUrl($block->getUrl('checkout/cart/updateItemQty')) ?>",
+              "updateCartActionContainer": "#update_cart_action_container"}
           }'
           class="form form-cart">
     <?= $block->getBlockHtml('formkey') ?>
     <div class="cart table-wrapper<?= $mergedCells == 2 ? ' detailed' : '' ?>">
-        <?php if ($block->getPagerHtml()): ?>
-            <div class="cart-products-toolbar cart-products-toolbar-top toolbar" data-attribute="cart-products-toolbar-top"><?= $block->getPagerHtml() ?></div>
+        <?php if ($block->getPagerHtml()) :?>
+            <div class="cart-products-toolbar cart-products-toolbar-top toolbar"
+                 data-attribute="cart-products-toolbar-top"><?= $block->getPagerHtml() ?>
+            </div>
         <?php endif ?>
         <table id="shopping-cart-table"
                class="cart items data table"
                data-mage-init='{"shoppingCart":{"emptyCartButton": ".action.clear",
                "updateCartActionContainer": "#update_cart_action_container"}}'>
-            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Shopping Cart Items') ?></caption>
+            <caption class="table-caption"><?= $block->escapeHtml(__('Shopping Cart Items')) ?></caption>
             <thead>
                 <tr>
-                    <th class="col item" scope="col"><span><?= /* @escapeNotVerified */ __('Item') ?></span></th>
-                    <th class="col price" scope="col"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
-                    <th class="col qty" scope="col"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
-                    <th class="col subtotal" scope="col"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
+                    <th class="col item" scope="col"><span><?= $block->escapeHtml(__('Item')) ?></span></th>
+                    <th class="col price" scope="col"><span><?= $block->escapeHtml(__('Price')) ?></span></th>
+                    <th class="col qty" scope="col"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
+                    <th class="col subtotal" scope="col"><span><?= $block->escapeHtml(__('Subtotal')) ?></span></th>
                 </tr>
             </thead>
-            <?php foreach ($block->getItems() as $_item): ?>
+            <?php foreach ($block->getItems() as $_item) :?>
                 <?= $block->getItemHtml($_item) ?>
             <?php endforeach ?>
         </table>
-        <?php if ($block->getPagerHtml()): ?>
-            <div class="cart-products-toolbar cart-products-toolbar-bottom toolbar" data-attribute="cart-products-toolbar-bottom"><?= $block->getPagerHtml() ?></div>
+        <?php if ($block->getPagerHtml()) :?>
+            <div class="cart-products-toolbar cart-products-toolbar-bottom toolbar"
+                 data-attribute="cart-products-toolbar-bottom"><?= $block->getPagerHtml() ?>
+            </div>
         <?php endif ?>
     </div>
     <div class="cart main actions">
-        <?php if ($block->getContinueShoppingUrl()): ?>
+        <?php if ($block->getContinueShoppingUrl()) :?>
             <a class="action continue"
                href="<?= $block->escapeUrl($block->getContinueShoppingUrl()) ?>"
                title="<?= $block->escapeHtml(__('Continue Shopping')) ?>">
-                <span><?= /* @escapeNotVerified */ __('Continue Shopping') ?></span>
+                <span><?= $block->escapeHtml(__('Continue Shopping')) ?></span>
             </a>
         <?php endif; ?>
         <button type="submit"
@@ -57,7 +62,7 @@
                 value="empty_cart"
                 title="<?= $block->escapeHtml(__('Clear Shopping Cart')) ?>"
                 class="action clear" id="empty_cart_button">
-            <span><?= /* @escapeNotVerified */ __('Clear Shopping Cart') ?></span>
+            <span><?= $block->escapeHtml(__('Clear Shopping Cart')) ?></span>
         </button>
         <button type="submit"
                 name="update_cart_action"
@@ -65,7 +70,7 @@
                 value="update_qty"
                 title="<?= $block->escapeHtml(__('Update Shopping Cart')) ?>"
                 class="action update">
-            <span><?= /* @escapeNotVerified */ __('Update Shopping Cart') ?></span>
+            <span><?= $block->escapeHtml(__('Update Shopping Cart')) ?></span>
         </button>
         <input type="hidden" value="" id="update_cart_action_container" data-cart-item-update=""/>
     </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
index c1db2f7775ca8..3b09512eb505b 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
@@ -4,24 +4,23 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Catalog\Block\Product\View */
 ?>
 <?php $_product = $block->getProduct(); ?>
 <?php $buttonTitle = __('Update Cart'); ?>
-<?php if ($_product->isSaleable()): ?>
+<?php if ($_product->isSaleable()) :?>
     <div class="box-tocart update">
         <fieldset class="fieldset">
-            <?php if ($block->shouldRenderQuantity()): ?>
+            <?php if ($block->shouldRenderQuantity()) :?>
             <div class="field qty">
-                <label class="label" for="qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></label>
+                <label class="label" for="qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></label>
                 <div class="control">
                     <input type="number"
                            name="qty"
                            id="qty"
+                           min="0"
                            value=""
-                           title="<?= /* @escapeNotVerified */ __('Qty') ?>"
+                           title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
                            class="input-text qty"
                            data-validate="<?= $block->escapeHtml(json_encode($block->getQuantityValidators())) ?>"/>
                 </div>
@@ -29,10 +28,10 @@
             <?php endif; ?>
             <div class="actions">
                 <button type="submit"
-                        title="<?= /* @escapeNotVerified */ $buttonTitle ?>"
+                        title="<?= $block->escapeHtmlAttr($buttonTitle) ?>"
                         class="action primary tocart"
                         id="product-updatecart-button">
-                    <span><?= /* @escapeNotVerified */ $buttonTitle ?></span>
+                    <span><?= $block->escapeHtml($buttonTitle) ?></span>
                 </button>
                 <?= $block->getChildHtml('', true) ?>
             </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
index c96df9cdd3195..77dde1eab482a 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
@@ -4,7 +4,8 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
+// phpcs:disable Magento2.Files.LineLength.MaxExceeded
 
 /** @var $block \Magento\Checkout\Block\Cart\Item\Renderer */
 
@@ -12,100 +13,110 @@ $_item = $block->getItem();
 $product = $_item->getProduct();
 $isVisibleProduct = $product->isVisibleInSiteVisibility();
 /** @var \Magento\Msrp\Helper\Data $helper */
-$helper = $this->helper('Magento\Msrp\Helper\Data');
+$helper = $this->helper(Magento\Msrp\Helper\Data::class);
 $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinimalPriceLessMsrp($product);
 ?>
 <tbody class="cart item">
     <tr class="item-info">
         <td data-th="<?= $block->escapeHtml(__('Item')) ?>" class="col item">
-            <?php if ($block->hasProductUrl()):?>
-                <a href="<?= /* @escapeNotVerified */ $block->getProductUrl() ?>"
+            <?php if ($block->hasProductUrl()) :?>
+                <a href="<?= $block->escapeUrl($block->getProductUrl()) ?>"
                    title="<?= $block->escapeHtml($block->getProductName()) ?>"
                    tabindex="-1"
                    class="product-item-photo">
-            <?php else:?>
+            <?php else :?>
                 <span class="product-item-photo">
             <?php endif;?>
             <?= $block->getImage($block->getProductForThumbnail(), 'cart_page_product_thumbnail')->toHtml() ?>
-            <?php if ($block->hasProductUrl()):?>
+            <?php if ($block->hasProductUrl()) :?>
                 </a>
-            <?php else: ?>
+            <?php else :?>
                 </span>
             <?php endif; ?>
             <div class="product-item-details">
                 <strong class="product-item-name">
-                    <?php if ($block->hasProductUrl()):?>
-                        <a href="<?= /* @escapeNotVerified */ $block->getProductUrl() ?>"><?= $block->escapeHtml($block->getProductName()) ?></a>
-                    <?php else: ?>
+                    <?php if ($block->hasProductUrl()) :?>
+                        <a href="<?= $block->escapeUrl($block->getProductUrl()) ?>"><?= $block->escapeHtml($block->getProductName()) ?></a>
+                    <?php else :?>
                         <?= $block->escapeHtml($block->getProductName()) ?>
                     <?php endif; ?>
                 </strong>
-                <?php if ($_options = $block->getOptionList()):?>
+                <?php if ($_options = $block->getOptionList()) :?>
                     <dl class="item-options">
-                        <?php foreach ($_options as $_option) : ?>
+                        <?php foreach ($_options as $_option) :?>
                             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
                             <dd>
-                                <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                                    <?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?>
-                                <?php else: ?>
-                                    <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
+                                <?php if (isset($_formatedOptionValue['full_view'])) :?>
+                                    <?= $block->escapeHtml($_formatedOptionValue['full_view']) ?>
+                                <?php else :?>
+                                    <?= $block->escapeHtml($_formatedOptionValue['value'], ['span']) ?>
                                 <?php endif; ?>
                             </dd>
                         <?php endforeach; ?>
                     </dl>
                 <?php endif;?>
-                <?php if ($messages = $block->getMessages()): ?>
-                    <?php foreach ($messages as $message): ?>
-                        <div class="cart item message <?= /* @escapeNotVerified */ $message['type'] ?>"><div><?= $block->escapeHtml($message['text']) ?></div></div>
+                <?php if ($messages = $block->getMessages()) :?>
+                    <?php foreach ($messages as $message) :?>
+                        <div class= "cart item message <?= $block->escapeHtmlAttr($message['type']) ?>">
+                            <div><?= $block->escapeHtml($message['text']) ?></div>
+                        </div>
                     <?php endforeach; ?>
                 <?php endif; ?>
                 <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
-                <?php if ($addInfoBlock): ?>
+                <?php if ($addInfoBlock) :?>
                     <?= $addInfoBlock->setItem($_item)->toHtml() ?>
                 <?php endif;?>
             </div>
         </td>
 
-        <?php if ($canApplyMsrp): ?>
+        <?php if ($canApplyMsrp) :?>
             <td class="col msrp" data-th="<?= $block->escapeHtml(__('Price')) ?>">
                 <span class="pricing msrp">
-                    <span class="msrp notice"><?= /* @escapeNotVerified */ __('See price before order confirmation.') ?></span>
+                    <span class="msrp notice"><?= $block->escapeHtml(__('See price before order confirmation.')) ?></span>
                     <?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
-                    <a href="#" class="action help map" id="<?= /* @escapeNotVerified */ ($helpLinkId) ?>" data-mage-init='{"addToCart":{"helpLinkId": "#<?= /* @escapeNotVerified */ $helpLinkId ?>","productName": "<?= /* @escapeNotVerified */ $product->getName() ?>","showAddToCart": false}}'>
-                        <span><?= /* @escapeNotVerified */ __("What's this?") ?></span>
+                    <a href="#" class="action help map"
+                       id="<?= ($block->escapeHtmlAttr($helpLinkId)) ?>"
+                       data-mage-init='{"addToCart":{
+                                            "helpLinkId": "#<?= $block->escapeJs($block->escapeHtml($helpLinkId)) ?>",
+                                            "productName": "<?= $block->escapeJs($block->escapeHtml($product->getName())) ?>",
+                                            "showAddToCart": false
+                                            }
+                                        }'
+                    >
+                        <span><?= $block->escapeHtml(__("What's this?")) ?></span>
                     </a>
                 </span>
             </td>
-        <?php else: ?>
+        <?php else :?>
             <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
                 <?= $block->getUnitPriceHtml($_item) ?>
             </td>
         <?php endif; ?>
         <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>">
             <div class="field qty">
-                <label class="label" for="cart-<?= /* @escapeNotVerified */ $_item->getId() ?>-qty">
-                    <span><?= /* @escapeNotVerified */ __('Qty') ?></span>
-                </label>
                 <div class="control qty">
-                    <input id="cart-<?= /* @escapeNotVerified */ $_item->getId() ?>-qty"
-                           name="cart[<?= /* @escapeNotVerified */ $_item->getId() ?>][qty]"
-                           data-cart-item-id="<?= $block->escapeHtml($_item->getSku()) ?>"
-                           value="<?= /* @escapeNotVerified */ $block->getQty() ?>"
-                           type="number"
-                           size="4"
-                           title="<?= $block->escapeHtml(__('Qty')) ?>"
-                           class="input-text qty"
-                           data-validate="{required:true,'validate-greater-than-zero':true}"
-                           data-role="cart-item-qty"/>
+                    <label for="cart-<?= $block->escapeHtmlAttr($_item->getId()) ?>-qty">
+                        <span class="label"><?= $block->escapeHtml(__('Qty')) ?></span>
+                        <input id="cart-<?= $block->escapeHtmlAttr($_item->getId()) ?>-qty"
+                               name="cart[<?= $block->escapeHtmlAttr($_item->getId()) ?>][qty]"
+                               data-cart-item-id="<?= $block->escapeHtmlAttr($_item->getSku()) ?>"
+                               value="<?= $block->escapeHtmlAttr($block->getQty()) ?>"
+                               type="number"
+                               size="4"
+                               title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
+                               class="input-text qty"
+                               data-validate="{required:true,'validate-greater-than-zero':true}"
+                               data-role="cart-item-qty"/>
+                    </label>
                 </div>
             </div>
         </td>
 
         <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
-            <?php if ($canApplyMsrp): ?>
+            <?php if ($canApplyMsrp) :?>
                 <span class="cart msrp subtotal">--</span>
-            <?php else: ?>
+            <?php else :?>
                 <?= $block->getRowTotalHtml($_item) ?>
             <?php endif; ?>
         </td>
@@ -113,7 +124,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
     <tr class="item-actions">
         <td colspan="4">
             <div class="actions-toolbar">
-                <?= /* @escapeNotVerified */ $block->getActions($_item) ?>
+                <?= /* @noEscape */ $block->getActions($_item) ?>
             </div>
         </td>
     </tr>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml
index d7a625695b476..1d30cfc8dc45d 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml
@@ -4,12 +4,17 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
 /** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
 ?>
 <?php $_item = $block->getItem() ?>
 <div class="price-container">
-    <span class="price-label"><?= /* @escapeNotVerified */ __('Price') ?></span>
-    <span class="price-wrapper"><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?></span>
+    <span class="price-label"><?= $block->escapeHtml(__('Price')) ?></span>
+    <span class="price-wrapper">
+        <?= $block->escapeHtml(
+            $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice()),
+            ['span']
+        ) ?>
+    </span>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml
index 1876cf2edb786..357bbf27772b5 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml
@@ -4,16 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Checkout\Block\Cart\Item\Renderer\Actions\Edit */
 ?>
-<?php if ($block->isProductVisibleInSiteVisibility()): ?>
+<?php if ($block->isProductVisibleInSiteVisibility()) :?>
     <a class="action action-edit"
-       href="<?= /* @escapeNotVerified */ $block->getConfigureUrl() ?>"
-       title="<?= $block->escapeHtml(__('Edit item parameters')) ?>">
-        <span>
-            <?= /* @escapeNotVerified */ __('Edit') ?>
-        </span>
-   </a>
+       href="<?= $block->escapeUrl($block->getConfigureUrl()) ?>"
+       title="<?= $block->escapeHtmlAttr(__('Edit item parameters')) ?>">
+        <span><?= $block->escapeHtml(__('Edit')) ?></span>
+    </a>
 <?php endif ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml
index 445721ca5d0c2..8b72b6c55e821 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml
@@ -4,15 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Checkout\Block\Cart\Item\Renderer\Actions\Remove */
 ?>
 <a href="#"
    title="<?= $block->escapeHtml(__('Remove item')) ?>"
    class="action action-delete"
-   data-post='<?= /* @escapeNotVerified */ $block->getDeletePostJson() ?>'>
+   data-post='<?= /* @noEscape */ $block->getDeletePostJson() ?>'>
     <span>
-        <?= /* @escapeNotVerified */ __('Remove item') ?>
+        <?= $block->escapeHtml(__('Remove item')) ?>
     </span>
 </a>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
index d329e2e8c1770..b045f4ec98ff7 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
@@ -4,20 +4,18 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var $block \Magento\Checkout\Block\Cart */
 ?>
-<?php if (!$block->hasError()): ?>
-<?php $methods = $block->getMethods('methods') ?: $block->getMethods('top_methods') ?>
-<ul class="checkout methods items checkout-methods-items">
-<?php foreach ($methods as $method): ?>
-    <?php $methodHtml = $block->getMethodHtml($method); ?>
-    <?php if (trim($methodHtml) !== ''): ?>
-    <li class="item"><?= /* @escapeNotVerified */ $methodHtml ?></li>
-    <?php endif; ?>
-<?php endforeach; ?>
-</ul>
+<?php if (!$block->hasError()) :?>
+    <?php $methods = $block->getMethods('methods') ?: $block->getMethods('top_methods') ?>
+    <ul class="checkout methods items checkout-methods-items">
+        <?php foreach ($methods as $method) :?>
+            <?php $methodHtml = $block->getMethodHtml($method); ?>
+            <?php if (trim($methodHtml) !== '') :?>
+                <li class="item"><?= /* @noEscape */ $methodHtml ?></li>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    </ul>
 <?php endif; ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
index e6d0260cf2305..28275e0223936 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
@@ -4,17 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Checkout\Block\Cart\Sidebar */
 ?>
 
 <div data-block="minicart" class="minicart-wrapper">
-    <a class="action showcart" href="<?= /* @escapeNotVerified */ $block->getShoppingCartUrl() ?>"
+    <a class="action showcart" href="<?= $block->escapeUrl($block->getShoppingCartUrl()) ?>"
        data-bind="scope: 'minicart_content'">
-        <span class="text"><?= /* @escapeNotVerified */ __('My Cart') ?></span>
+        <span class="text"><?= $block->escapeHtml(__('My Cart')) ?></span>
         <span class="counter qty empty"
-              data-bind="css: { empty: !!getCartParam('summary_count') == false }, blockLoader: isLoading">
+              data-bind="css: { empty: !!getCartParam('summary_count') == false && !isLoading() }, blockLoader: isLoading">
             <span class="counter-number"><!-- ko text: getCartParam('summary_count') --><!-- /ko --></span>
             <span class="counter-label">
             <!-- ko if: getCartParam('summary_count') -->
@@ -24,7 +22,7 @@
             </span>
         </span>
     </a>
-    <?php if ($block->getIsNeedToDisplaySideBar()): ?>
+    <?php if ($block->getIsNeedToDisplaySideBar()) :?>
         <div class="block block-minicart"
              data-role="dropdownDialog"
              data-mage-init='{"dropdownDialog":{
@@ -41,17 +39,27 @@
             </div>
             <?= $block->getChildHtml('minicart.addons') ?>
         </div>
+    <?php else :?>
+        <script>
+            require(['jquery'], function ($) {
+                $('a.action.showcart').click(function() {
+                    $(document.body).trigger('processStart');
+                });
+            });
+        </script>
     <?php endif ?>
     <script>
-        window.checkout = <?= /* @escapeNotVerified */ $block->getSerializedConfig() ?>;
+        window.checkout = <?= /* @noEscape */ $block->getSerializedConfig() ?>;
     </script>
     <script type="text/x-magento-init">
     {
         "[data-block='minicart']": {
-            "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
+            "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
         },
         "*": {
-            "Magento_Ui/js/block-loader": "<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/loader-1.gif') ?>"
+            "Magento_Ui/js/block-loader": "<?= $block->escapeJs(
+                $block->escapeUrl($block->getViewFileUrl('images/loader-1.gif'))
+            ) ?>"
         }
     }
     </script>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml
index 1c0c221a550cd..39289c711aa8c 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml
@@ -3,13 +3,26 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// @codingStandardsIgnoreFile
+
 /**  @var $block \Magento\Checkout\Block\Cart */
 ?>
 <div class="cart-empty">
     <?= $block->getChildHtml('checkout_cart_empty_widget') ?>
-    <p><?= /* @escapeNotVerified */ __('You have no items in your shopping cart.') ?></p>
-    <p><?php /* @escapeNotVerified */ echo __('Click <a href="%1">here</a> to continue shopping.',
-            $block->escapeUrl($block->getContinueShoppingUrl())) ?></p>
+    <p><?= $block->escapeHtml(__('You have no items in your shopping cart.')) ?></p>
+    <p><?= $block->escapeHtml(
+        __(
+            'Click <a href="%1">here</a> to continue shopping.',
+            $block->escapeUrl($block->getContinueShoppingUrl())
+        ),
+        ['a']
+    ) ?>
+    </p>
     <?= $block->getChildHtml('shopping.cart.table.after') ?>
 </div>
+<script type="text/x-magento-init">
+{
+    "*": {
+        "Magento_Checkout/js/empty-cart": {}
+    }
+}
+</script>
\ No newline at end of file
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
index b5ddb8446ba05..a44d37dccfdc5 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
@@ -4,36 +4,47 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block \Magento\Checkout\Block\Cart\Shipping */ ?>
 
-<div id="block-shipping" class="block shipping" data-mage-init='{"collapsible":{"openedState": "active", "saveState": true}}'>
+<div id="block-shipping"
+     class="block shipping"
+     data-mage-init='{"collapsible":{"openedState": "active", "saveState": true}}'
+>
     <div class="title" data-role="title">
         <strong id="block-shipping-heading" role="heading" aria-level="2">
-            <?= /* @escapeNotVerified */ $block->getQuote()->isVirtual() ? __('Estimate Tax') : __('Estimate Shipping and Tax') ?>
+            <?= $block->getQuote()->isVirtual()
+                ? $block->escapeHtml(__('Estimate Tax'))
+                : $block->escapeHtml(__('Estimate Shipping and Tax'))
+            ?>
         </strong>
     </div>
-    <div id="block-summary" data-bind="scope:'block-summary'" class="content" data-role="content" aria-labelledby="block-shipping-heading">
+    <div id="block-summary"
+         data-bind="scope:'block-summary'"
+         class="content"
+         data-role="content"
+         aria-labelledby="block-shipping-heading"
+    >
         <!-- ko template: getTemplate() --><!-- /ko -->
         <script type="text/x-magento-init">
             {
                 "#block-summary": {
-                    "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
+                    "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
                 }
             }
         </script>
         <script>
-            window.checkoutConfig = <?= /* @escapeNotVerified */ $block->getSerializedCheckoutConfig() ?>;
+            window.checkoutConfig = <?= /* @noEscape */ $block->getSerializedCheckoutConfig() ?>;
             window.customerData = window.checkoutConfig.customerData;
             window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
             require([
                 'mage/url',
                 'Magento_Ui/js/block-loader'
             ], function(url, blockLoader) {
-                blockLoader("<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/loader-1.gif') ?>");
-                return url.setBaseUrl('<?= /* @escapeNotVerified */ $block->getBaseUrl() ?>');
+                blockLoader(
+                    "<?= $block->escapeJs($block->escapeUrl($block->getViewFileUrl('images/loader-1.gif'))) ?>"
+                );
+                return url.setBaseUrl('<?= $block->escapeJs($block->escapeUrl($block->getBaseUrl())) ?>');
             })
         </script>
     </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/totals.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/totals.phtml
index f39b70df98424..784c4c39076e6 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/totals.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/totals.phtml
@@ -15,7 +15,7 @@
     <script type="text/x-magento-init">
             {
                 "#cart-totals": {
-                    "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
+                    "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
                 }
             }
     </script>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml
index 37a945b238d30..533d75b6ae843 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
 /** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
 
@@ -12,6 +12,9 @@ $_item = $block->getItem();
 ?>
 <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
     <span class="cart-price">
-        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
+        <?= $block->escapeHtml(
+            $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getRowTotal()),
+            ['span']
+        ) ?>
     </span>
 </span>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml
index 45a6ef48e36d6..fafbe9c7c969d 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
 /** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
 
@@ -12,6 +12,9 @@ $_item = $block->getItem();
 ?>
 <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
     <span class="cart-price">
-        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
+        <?= $block->escapeHtml(
+            $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice()),
+            ['span']
+        ) ?>
     </span>
 </span>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/js/components.phtml b/app/code/Magento/Checkout/view/frontend/templates/js/components.phtml
index bad5acc209b5f..13f44b97fc789 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/js/components.phtml
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/messages/addCartSuccessMessage.phtml b/app/code/Magento/Checkout/view/frontend/templates/messages/addCartSuccessMessage.phtml
index e835037b5fcb4..a6686444d2ed5 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/messages/addCartSuccessMessage.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/messages/addCartSuccessMessage.phtml
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// @codingStandardsIgnoreFile
+
 /** @var \Magento\Framework\View\Element\Template $block */
 ?>
 
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
index 47a56e8f333bc..55f7039f33344 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
@@ -4,13 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/** @var $block \Magento\Checkout\Block\Onepage */
 ?>
 <div id="checkout" data-bind="scope:'checkout'" class="checkout-container">
     <div id="checkout-loader" data-role="checkout-loader" class="loading-mask" data-mage-init='{"checkoutLoader": {}}'>
         <div class="loader">
-            <img src="<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/loader-1.gif') ?>"
-                 alt="<?= /* @escapeNotVerified */ __('Loading...') ?>"
+            <img src="<?= $block->escapeUrl($block->getViewFileUrl('images/loader-1.gif')) ?>"
+                 alt="<?= $block->escapeHtmlAttr(__('Loading...')) ?>"
                  style="position: absolute;">
         </div>
     </div>
@@ -18,12 +18,12 @@
     <script type="text/x-magento-init">
         {
             "#checkout": {
-                "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
+                "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
             }
         }
     </script>
     <script>
-        window.checkoutConfig = <?= /* @escapeNotVerified */ $block->getSerializedCheckoutConfig() ?>;
+        window.checkoutConfig = <?= /* @noEscape */ $block->getSerializedCheckoutConfig() ?>;
         // Create aliases for customer.js model from customer module
         window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
         window.customerData = window.checkoutConfig.customerData;
@@ -33,8 +33,8 @@
             'mage/url',
             'Magento_Ui/js/block-loader'
         ], function(url, blockLoader) {
-            blockLoader("<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/loader-1.gif') ?>");
-            return url.setBaseUrl('<?= /* @escapeNotVerified */ $block->getBaseUrl() ?>');
+            blockLoader("<?= $block->escapeJs($block->escapeUrl($block->getViewFileUrl('images/loader-1.gif'))) ?>");
+            return url.setBaseUrl('<?= $block->escapeJs($block->escapeUrl($block->getBaseUrl())) ?>');
         })
     </script>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml
index 43791ef496745..ace2b0464171c 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml
@@ -4,9 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var $block \Magento\Checkout\Block\Onepage\Failure */
 ?>
-<?php if ($block->getRealOrderId()) : ?><p><?= /* @escapeNotVerified */ __('Order #') . $block->getRealOrderId() ?></p><?php endif ?>
-<?php if ($error = $block->getErrorMessage()) : ?><p><?= /* @escapeNotVerified */ $error ?></p><?php endif ?>
-<p><?= /* @escapeNotVerified */ __('Click <a href="%1">here</a> to continue shopping.', $block->escapeUrl($block->getContinueShoppingUrl())) ?></p>
+<?php if ($block->getRealOrderId()) :?>
+    <p><?= $block->escapeHtml(__('Order #') . $block->getRealOrderId()) ?></p>
+<?php endif ?>
+<?php if ($error = $block->getErrorMessage()) :?>
+    <p><?= $block->escapeHtml($error) ?></p>
+<?php endif ?>
+<p><?= $block->escapeHtml(
+    __('Click <a href="%1">here</a> to continue shopping.', $block->escapeUrl($block->getContinueShoppingUrl())),
+    ['a']
+) ?>
+</p>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml
index 53a1fe8783509..b667764ac7bba 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml
@@ -4,15 +4,21 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/** @var $block \Magento\Checkout\Block\Onepage\Link */
 ?>
-<?php if ($block->isPossibleOnepageCheckout()):?>
+<?php if ($block->isPossibleOnepageCheckout()) :?>
     <button type="button"
             data-role="proceed-to-checkout"
-            title="<?= /* @escapeNotVerified */ __('Proceed to Checkout') ?>"
-            data-mage-init='{"Magento_Checkout/js/proceed-to-checkout":{"checkoutUrl":"<?= /* @escapeNotVerified */ $block->getCheckoutUrl() ?>"}}'
+            title="<?= $block->escapeHtmlAttr(__('Proceed to Checkout')) ?>"
+            data-mage-init='{
+                "Magento_Checkout/js/proceed-to-checkout":{
+                    "checkoutUrl":"<?= $block->escapeJs($block->escapeUrl($block->getCheckoutUrl())) ?>"
+                }
+            }'
             class="action primary checkout<?= ($block->isDisabled()) ? ' disabled' : '' ?>"
-            <?php if ($block->isDisabled()):?>disabled="disabled"<?php endif; ?>>
-        <span><?= /* @escapeNotVerified */ __('Proceed to Checkout') ?></span>
+            <?php if ($block->isDisabled()) :?>
+                disabled="disabled"
+            <?php endif; ?>>
+        <span><?= $block->escapeHtml(__('Proceed to Checkout')) ?></span>
     </button>
 <?php endif?>
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 2428cc010779d..2a7ccc38e9d83 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
@@ -4,11 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
 /** @var $block Magento\Checkout\Block\Cart\Item\Renderer */
 
 $_item = $block->getItem();
+$taxDataHelper = $this->helper(Magento\Tax\Helper\Data::class);
 ?>
 <tbody class="cart item">
     <tr>
@@ -17,47 +18,53 @@ $_item = $block->getItem();
                 <?= $block->getImage($block->getProductForThumbnail(), 'cart_page_product_thumbnail')->toHtml() ?>
             </span>
             <div class="product-item-details">
-                <strong class="product name product-item-name"><?= $block->escapeHtml($block->getProductName()) ?></strong>
-                <?php if ($_options = $block->getOptionList()):?>
-                <dl class="item-options">
-                    <?php foreach ($_options as $_option) : ?>
-                    <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                    <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                    <dd>
-                        <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                            <?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?>
-                        <?php else: ?>
-                            <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
-                        <?php endif; ?>
-                    </dd>
-                    <?php endforeach; ?>
-                </dl>
+                <strong class="product name product-item-name">
+                    <?= $block->escapeHtml($block->getProductName()) ?>
+                </strong>
+                <?php if ($_options = $block->getOptionList()) :?>
+                    <dl class="item-options">
+                        <?php foreach ($_options as $_option) :?>
+                            <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
+                            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                            <dd>
+                                <?php if (isset($_formatedOptionValue['full_view'])) :?>
+                                    <?= $block->escapeHtml($_formatedOptionValue['full_view']) ?>
+                                <?php else :?>
+                                    <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
+                                <?php endif; ?>
+                            </dd>
+                        <?php endforeach; ?>
+                    </dl>
                 <?php endif;?>
-                <?php if ($addtInfoBlock = $block->getProductAdditionalInformationBlock()):?>
+                <?php if ($addtInfoBlock = $block->getProductAdditionalInformationBlock()) :?>
                     <?= $addtInfoBlock->setItem($_item)->toHtml() ?>
                 <?php endif;?>
             </div>
         </td>
         <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+            <?php if ($taxDataHelper->displayCartPriceInclTax() || $taxDataHelper->displayCartBothPrices()) :?>
                 <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
                     <?= $block->getUnitPriceInclTaxHtml($_item) ?>
                 </span>
             <?php endif; ?>
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+            <?php if ($taxDataHelper->displayCartPriceExclTax() || $taxDataHelper->displayCartBothPrices()) :?>
                 <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
                     <?= $block->getUnitPriceExclTaxHtml($_item) ?>
                 </span>
             <?php endif; ?>
         </td>
-        <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><span class="qty"><?= /* @escapeNotVerified */ $_item->getQty() ?></span></td>
+        <td class="col qty"
+            data-th="<?= $block->escapeHtml(__('Qty')) ?>"
+        >
+            <span class="qty"><?= $block->escapeHtml($_item->getQty()) ?></span>
+        </td>
         <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+            <?php if ($taxDataHelper->displayCartPriceInclTax() || $taxDataHelper->displayCartBothPrices()) :?>
                 <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
                     <?= $block->getRowTotalInclTaxHtml($_item) ?>
                 </span>
             <?php endif; ?>
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+            <?php if ($taxDataHelper->displayCartPriceExclTax() || $taxDataHelper->displayCartBothPrices()) :?>
                 <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
                     <?= $block->getRowTotalExclTaxHtml($_item) ?>
                 </span>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml
index 7ee3e416b9ade..64eefd0dad011 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml
@@ -4,12 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
 /** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
 ?>
 <span class="cart-price">
-    <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
+    <?= $block->escapeHtml(
+        $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getRowTotal()),
+        ['span']
+    ) ?>
 </span>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml
index 2f364aafbbcc0..14deb07640e6d 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml
@@ -4,13 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
 /** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
 ?>
-<?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
+<?php $_incl = $this->helper(Magento\Checkout\Helper\Data::class)->getSubtotalInclTax($_item); ?>
 <span class="cart-price">
-    <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
+    <?= $block->escapeHtml(
+        $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_incl),
+        ['span']
+    ) ?>
 </span>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml
index a1ec004c2a886..a65a5a50ae1a1 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml
@@ -4,12 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
 /** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
 ?>
 <span class="cart-price">
-    <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
+    <?= $block->escapeHtml(
+        $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice()),
+        ['span']
+    ) ?>
 </span>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml
index 0ed3c05ee6d1f..b623e1f1c3fd9 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml
@@ -4,13 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
 /** @var $block \Magento\Checkout\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
 ?>
-<?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
+<?php $_incl = $this->helper(Magento\Checkout\Helper\Data::class)->getPriceInclTax($_item); ?>
 <span class="cart-price">
-    <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
+    <?= $block->escapeHtml(
+        $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_incl),
+        ['span']
+    ) ?>
 </span>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/registration.phtml b/app/code/Magento/Checkout/view/frontend/templates/registration.phtml
index f239fbd47dec2..da36b4b61d656 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/registration.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/registration.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/** @var $block \Magento\Checkout\Block\Registration */
 ?>
 <div id="registration" data-bind="scope:'registration'">
     <br />
@@ -17,8 +17,9 @@
                         "registration": {
                             "component": "Magento_Checkout/js/view/registration",
                             "config": {
-                                "registrationUrl": "<?= /* @escapeNotVerified */ $block->getCreateAccountUrl() ?>",
-                                "email": "<?= /* @escapeNotVerified */ $block->getEmailAddress() ?>"
+                                "registrationUrl":
+                                    "<?= $block->escapeJs($block->escapeUrl($block->getCreateAccountUrl())) ?>",
+                                "email": "<?= $block->escapeJs($block->getEmailAddress()) ?>"
                             },
                             "children": {
                                 "errors": {
diff --git a/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml b/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml
index 892b7926525f3..6aa883bc6b042 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml
@@ -4,10 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+?>
+<?php
+// phpcs:disable PSR2.Files.ClosingTag
 
+/** @var $block \Magento\Checkout\Block\Shipping\Price */
 ?>
-<?php /** @var $block \Magento\Checkout\Block\Shipping\Price */ ?>
 
 <?php $shippingPrice = $block->getShippingPrice(); ?>
-<?= /* @escapeNotVerified */ $shippingPrice ?>
+<?= $block->escapeHtml($shippingPrice) ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/success.phtml b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
index b3517eab8a5d3..828b4eb86c330 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/success.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
@@ -4,25 +4,23 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block \Magento\Checkout\Block\Onepage\Success */ ?>
 <div class="checkout-success">
-    <?php if ($block->getOrderId()):?>
+    <?php if ($block->getOrderId()) :?>
         <?php if ($block->getCanViewOrder()) :?>
-            <p><?= __('Your order number is: %1.', sprintf('<a href="%s" class="order-number"><strong>%s</strong></a>', $block->escapeHtml($block->getViewOrderUrl()), $block->escapeHtml($block->getOrderId()))) ?></p>
+            <p><?= $block->escapeHtml(__('Your order number is: %1.', sprintf('<a href="%s" class="order-number"><strong>%s</strong></a>', $block->escapeUrl($block->getViewOrderUrl()), $block->getOrderId())), ['a', 'strong']) ?></p>
         <?php  else :?>
-            <p><?= __('Your order # is: <span>%1</span>.', $block->escapeHtml($block->getOrderId())) ?></p>
+            <p><?= $block->escapeHtml(__('Your order # is: <span>%1</span>.', $block->getOrderId()), ['span']) ?></p>
         <?php endif;?>
-            <p><?= /* @escapeNotVerified */ __('We\'ll email you an order confirmation with details and tracking info.') ?></p>
+            <p><?= $block->escapeHtml(__('We\'ll email you an order confirmation with details and tracking info.')) ?></p>
     <?php endif;?>
 
     <?= $block->getAdditionalInfoHtml() ?>
 
     <div class="actions-toolbar">
         <div class="primary">
-            <a class="action primary continue" href="<?= /* @escapeNotVerified */ $block->getContinueUrl() ?>"><span><?= /* @escapeNotVerified */ __('Continue Shopping') ?></span></a>
+            <a class="action primary continue" href="<?= $block->escapeUrl($block->getContinueUrl()) ?>"><span><?= $block->escapeHtml(__('Continue Shopping')) ?></span></a>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
index 2ea1cdd7f53f5..0d9da171c11a8 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
@@ -4,18 +4,40 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
+/** @var $block \Magento\Checkout\Block\Total\DefaultTotal */
 ?>
 <tr class="totals">
-    <th colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="mark" scope="row">
-        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
-            <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
-        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?></strong><?php endif; ?>
+    <th
+            colspan="<?= $block->escapeHtmlAttr($block->getColspan()) ?>"
+            style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>"
+            class="mark" scope="row"
+    >
+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) :?>
+            <strong>
+        <?php endif; ?>
+        <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) :?>
+            </strong>
+        <?php endif; ?>
     </th>
-    <td style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
-        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
-            <span><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></span>
-        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?></strong><?php endif; ?>
+    <td
+            style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>"
+            class="amount"
+            data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>"
+    >
+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) :?>
+            <strong>
+        <?php endif; ?>
+            <span>
+                <?= $block->escapeHtml(
+                    $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue()),
+                    ['span']
+                ) ?>
+            </span>
+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) :?>
+            </strong>
+        <?php endif; ?>
     </td>
 </tr>
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
new file mode 100644
index 0000000000000..4085da82f4151
--- /dev/null
+++ b/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information-extended.js
@@ -0,0 +1,60 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @api
+ */
+define([
+    'Magento_Checkout/js/model/quote',
+    'Magento_Checkout/js/model/url-builder',
+    'mage/storage',
+    'Magento_Checkout/js/model/error-processor',
+    'Magento_Customer/js/model/customer',
+    'Magento_Checkout/js/action/get-totals',
+    'Magento_Checkout/js/model/full-screen-loader'
+], function (quote, urlBuilder, storage, errorProcessor, customer, getTotalsAction, fullScreenLoader) {
+    'use strict';
+
+    return function (messageContainer, paymentData, skipBilling) {
+        var serviceUrl,
+            payload;
+
+        skipBilling = skipBilling || false;
+        payload = {
+            cartId: quote.getQuoteId(),
+            paymentMethod: paymentData
+        };
+
+        /**
+         * Checkout for guest and registered customer.
+         */
+        if (!customer.isLoggedIn()) {
+            serviceUrl = urlBuilder.createUrl('/guest-carts/:cartId/set-payment-information', {
+                cartId: quote.getQuoteId()
+            });
+            payload.email = quote.guestEmail;
+        } else {
+            serviceUrl = urlBuilder.createUrl('/carts/mine/set-payment-information', {});
+        }
+
+        if (skipBilling === false) {
+            payload.billingAddress = quote.billingAddress();
+        }
+
+        fullScreenLoader.startLoader();
+
+        return storage.post(
+            serviceUrl, JSON.stringify(payload)
+        ).fail(
+            function (response) {
+                errorProcessor.process(response, messageContainer);
+            }
+        ).always(
+            function () {
+                fullScreenLoader.stopLoader();
+            }
+        );
+    };
+});
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information.js b/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information.js
index 997b60503a2b3..d5261c976a725 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information.js
@@ -7,54 +7,13 @@
  * @api
  */
 define([
-    'Magento_Checkout/js/model/quote',
-    'Magento_Checkout/js/model/url-builder',
-    'mage/storage',
-    'Magento_Checkout/js/model/error-processor',
-    'Magento_Customer/js/model/customer',
-    'Magento_Checkout/js/action/get-totals',
-    'Magento_Checkout/js/model/full-screen-loader'
-], function (quote, urlBuilder, storage, errorProcessor, customer, getTotalsAction, fullScreenLoader) {
+    'Magento_Checkout/js/action/set-payment-information-extended'
+
+], function (setPaymentInformationExtended) {
     'use strict';
 
     return function (messageContainer, paymentData) {
-        var serviceUrl,
-            payload;
-
-        /**
-         * Checkout for guest and registered customer.
-         */
-        if (!customer.isLoggedIn()) {
-            serviceUrl = urlBuilder.createUrl('/guest-carts/:cartId/set-payment-information', {
-                cartId: quote.getQuoteId()
-            });
-            payload = {
-                cartId: quote.getQuoteId(),
-                email: quote.guestEmail,
-                paymentMethod: paymentData,
-                billingAddress: quote.billingAddress()
-            };
-        } else {
-            serviceUrl = urlBuilder.createUrl('/carts/mine/set-payment-information', {});
-            payload = {
-                cartId: quote.getQuoteId(),
-                paymentMethod: paymentData,
-                billingAddress: quote.billingAddress()
-            };
-        }
-
-        fullScreenLoader.startLoader();
 
-        return storage.post(
-            serviceUrl, JSON.stringify(payload)
-        ).fail(
-            function (response) {
-                errorProcessor.process(response, messageContainer);
-            }
-        ).always(
-            function () {
-                fullScreenLoader.stopLoader();
-            }
-        );
+        return setPaymentInformationExtended(messageContainer, paymentData, false);
     };
 });
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/update-shopping-cart.js b/app/code/Magento/Checkout/view/frontend/web/js/action/update-shopping-cart.js
index ce1527b3d72d6..1920bc4d7ac41 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/action/update-shopping-cart.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/action/update-shopping-cart.js
@@ -14,7 +14,8 @@ define([
     $.widget('mage.updateShoppingCart', {
         options: {
             validationURL: '',
-            eventName: 'updateCartItemQty'
+            eventName: 'updateCartItemQty',
+            updateCartActionContainer: ''
         },
 
         /** @inheritdoc */
@@ -31,7 +32,9 @@ define([
          * @return {Boolean}
          */
         onSubmit: function (event) {
-            if (!this.options.validationURL) {
+            var action = this.element.find(this.options.updateCartActionContainer).val();
+
+            if (!this.options.validationURL || action === 'empty_cart') {
                 return true;
             }
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
index 22b37b2da0b2f..1858ce946fb07 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
@@ -10,7 +10,8 @@
  */
 define([
     'jquery',
-    'Magento_Customer/js/customer-data'
+    'Magento_Customer/js/customer-data',
+    'jquery/jquery-storageapi'
 ], function ($, storage) {
     'use strict';
 
@@ -23,6 +24,22 @@ define([
             storage.set(cacheKey, data);
         },
 
+        /**
+         * @return {*}
+         */
+        initData = function () {
+            return {
+                'selectedShippingAddress': null, //Selected shipping address pulled from persistence storage
+                'shippingAddressFromData': null, //Shipping address pulled from persistence storage
+                'newCustomerShippingAddress': null, //Shipping address pulled from persistence storage for customer
+                'selectedShippingRate': null, //Shipping rate pulled from persistence storage
+                'selectedPaymentMethod': null, //Payment method pulled from persistence storage
+                'selectedBillingAddress': null, //Selected billing address pulled from persistence storage
+                'billingAddressFromData': null, //Billing address pulled from persistence storage
+                'newCustomerBillingAddress': null //Billing address pulled from persistence storage for new customer
+            };
+        },
+
         /**
          * @return {*}
          */
@@ -30,17 +47,12 @@ define([
             var data = storage.get(cacheKey)();
 
             if ($.isEmptyObject(data)) {
-                data = {
-                    'selectedShippingAddress': null, //Selected shipping address pulled from persistence storage
-                    'shippingAddressFromData': null, //Shipping address pulled from persistence storage
-                    'newCustomerShippingAddress': null, //Shipping address pulled from persistence storage for customer
-                    'selectedShippingRate': null, //Shipping rate pulled from persistence storage
-                    'selectedPaymentMethod': null, //Payment method pulled from persistence storage
-                    'selectedBillingAddress': null, //Selected billing address pulled from persistence storage
-                    'billingAddressFromData': null, //Billing address pulled from persistence storage
-                    'newCustomerBillingAddress': null //Billing address pulled from persistence storage for new customer
-                };
-                saveData(data);
+                data = $.initNamespaceStorage('mage-cache-storage').localStorage.get(cacheKey);
+
+                if ($.isEmptyObject(data)) {
+                    data = initData();
+                    saveData(data);
+                }
             }
 
             return data;
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/empty-cart.js b/app/code/Magento/Checkout/view/frontend/web/js/empty-cart.js
new file mode 100644
index 0000000000000..27d38697afe39
--- /dev/null
+++ b/app/code/Magento/Checkout/view/frontend/web/js/empty-cart.js
@@ -0,0 +1,12 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Customer/js/customer-data'
+], function (customerData) {
+    'use strict';
+
+    customerData.reload(['cart'], false);
+});
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 a1aacf6e80320..9b20a782c38d9 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
@@ -58,6 +58,16 @@ define([
             }
             delete addressData['region_id'];
 
+            if (addressData['custom_attributes']) {
+                addressData['custom_attributes'] = Object.entries(addressData['custom_attributes'])
+                    .map(function (customAttribute) {
+                        return {
+                            'attribute_code': customAttribute[0],
+                            'value': customAttribute[1]
+                        };
+                    });
+            }
+
             return address(addressData);
         },
 
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 28e04699f8daf..e54f464f24d02 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
@@ -60,14 +60,21 @@ define([
                     this.resolveBillingAddress();
                 }
             }
-
         },
 
         /**
          * Resolve shipping address. Used local storage
          */
         resolveShippingAddress: function () {
-            var newCustomerShippingAddress = checkoutData.getNewCustomerShippingAddress();
+            var newCustomerShippingAddress;
+
+            if (!checkoutData.getShippingAddressFromData() &&
+                window.checkoutConfig.shippingAddressFromData
+            ) {
+                checkoutData.setShippingAddressFromData(window.checkoutConfig.shippingAddressFromData);
+            }
+
+            newCustomerShippingAddress = checkoutData.getNewCustomerShippingAddress();
 
             if (newCustomerShippingAddress) {
                 createShippingAddress(newCustomerShippingAddress);
@@ -196,8 +203,17 @@ define([
          * Resolve billing address. Used local storage
          */
         resolveBillingAddress: function () {
-            var selectedBillingAddress = checkoutData.getSelectedBillingAddress(),
-                newCustomerBillingAddressData = checkoutData.getNewCustomerBillingAddress();
+            var selectedBillingAddress,
+                newCustomerBillingAddressData;
+
+            if (!checkoutData.getBillingAddressFromData() &&
+                window.checkoutConfig.billingAddressFromData
+            ) {
+                checkoutData.setBillingAddressFromData(window.checkoutConfig.billingAddressFromData);
+            }
+
+            selectedBillingAddress = checkoutData.getSelectedBillingAddress();
+            newCustomerBillingAddressData = checkoutData.getNewCustomerBillingAddress();
 
             if (selectedBillingAddress) {
                 if (selectedBillingAddress == 'new-customer-address' && newCustomerBillingAddressData) { //eslint-disable-line
@@ -227,7 +243,7 @@ define([
                 return;
             }
 
-            if (quote.isVirtual()) {
+            if (quote.isVirtual() || !quote.billingAddress()) {
                 isBillingAddressInitialized = addressList.some(function (addrs) {
                     if (addrs.isDefaultBilling()) {
                         selectBillingAddress(addrs);
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js b/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js
index c3c5b9d68cec0..c07878fcaea92 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js
@@ -9,9 +9,10 @@ define(
     [
         'mage/storage',
         'Magento_Checkout/js/model/error-processor',
-        'Magento_Checkout/js/model/full-screen-loader'
+        'Magento_Checkout/js/model/full-screen-loader',
+        'Magento_Customer/js/customer-data'
     ],
-    function (storage, errorProcessor, fullScreenLoader) {
+    function (storage, errorProcessor, fullScreenLoader, customerData) {
         'use strict';
 
         return function (serviceUrl, payload, messageContainer) {
@@ -23,6 +24,23 @@ define(
                 function (response) {
                     errorProcessor.process(response, messageContainer);
                 }
+            ).success(
+                function (response) {
+                    var clearData = {
+                        'selectedShippingAddress': null,
+                        'shippingAddressFromData': null,
+                        'newCustomerShippingAddress': null,
+                        'selectedShippingRate': null,
+                        'selectedPaymentMethod': null,
+                        'selectedBillingAddress': null,
+                        'billingAddressFromData': null,
+                        'newCustomerBillingAddress': null
+                    };
+
+                    if (response.responseType !== 'error') {
+                        customerData.set('checkout-data', clearData);
+                    }
+                }
             ).always(
                 function () {
                     fullScreenLoader.stopLoader();
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js
index a95471d90dab8..0a5334a42c7e5 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js
@@ -14,11 +14,13 @@ define([
         /**
          * @param {*} postCode
          * @param {*} countryId
+         * @param {Array} postCodesPatterns
          * @return {Boolean}
          */
-        validate: function (postCode, countryId) {
-            var patterns = window.checkoutConfig.postCodes[countryId],
-                pattern, regex;
+        validate: function (postCode, countryId, postCodesPatterns) {
+            var pattern, regex,
+                patterns = postCodesPatterns ? postCodesPatterns[countryId] :
+                    window.checkoutConfig.postCodes[countryId];
 
             this.validatedPostCodeExample = [];
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/quote.js b/app/code/Magento/Checkout/view/frontend/web/js/model/quote.js
index 2510d1aced3d3..3486a92736617 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/quote.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/quote.js
@@ -7,7 +7,8 @@
  */
 define([
     'ko',
-    'underscore'
+    'underscore',
+    'domReady!'
 ], function (ko, _) {
     'use strict';
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
index fde88ebadb393..8b07c02e4d380 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
@@ -42,6 +42,7 @@ define([
 
     return {
         validateAddressTimeout: 0,
+        validateZipCodeTimeout: 0,
         validateDelay: 2000,
 
         /**
@@ -133,16 +134,20 @@ define([
                 });
             } else {
                 element.on('value', function () {
+                    clearTimeout(self.validateZipCodeTimeout);
+                    self.validateZipCodeTimeout = setTimeout(function () {
+                        if (element.index === postcodeElementName) {
+                            self.postcodeValidation(element);
+                        } else {
+                            $.each(postcodeElements, function (index, elem) {
+                                self.postcodeValidation(elem);
+                            });
+                        }
+                    }, delay);
+
                     if (!formPopUpState.isVisible()) {
                         clearTimeout(self.validateAddressTimeout);
                         self.validateAddressTimeout = setTimeout(function () {
-                            if (element.index === postcodeElementName) {
-                                self.postcodeValidation(element);
-                            } else {
-                                $.each(postcodeElements, function (index, elem) {
-                                    self.postcodeValidation(elem);
-                                });
-                            }
                             self.validateFields();
                         }, delay);
                     }
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-save-processor/default.js b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-save-processor/default.js
index 447d626b339bd..e34f861f7714f 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-save-processor/default.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-save-processor/default.js
@@ -35,8 +35,9 @@ define([
         saveShippingInformation: function () {
             var payload;
 
-            /* Assign selected address every time buyer selects address*/
-            selectBillingAddressAction(quote.shippingAddress());
+            if (!quote.billingAddress() && quote.shippingAddress().canUseForBilling()) {
+                selectBillingAddressAction(quote.shippingAddress());
+            }
 
             payload = {
                 addressInformation: {
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
index 399321bd2f67d..8935242724f3e 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
@@ -14,7 +14,11 @@ define([
         _create: function () {
             var items, i;
 
-            $(this.options.emptyCartButton).on('click', $.proxy(function () {
+            $(this.options.emptyCartButton).on('click', $.proxy(function (event) {
+                if (event.detail === 0) {
+                    return;
+                }
+
                 $(this.options.emptyCartButton).attr('name', 'update_cart_action_temp');
                 $(this.options.updateCartActionContainer)
                     .attr('name', 'update_cart_action').attr('value', 'empty_cart');
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 dde1ad72ba15e..e66c66006246c 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
@@ -25,6 +25,7 @@ define([
             }
         },
         scrollHeight: 0,
+        shoppingCartUrl: window.checkout.shoppingCartUrl,
 
         /**
          * Create sidebar.
@@ -227,6 +228,10 @@ define([
 
             if (!_.isUndefined(productData)) {
                 $(document).trigger('ajax:updateCartItemQty');
+
+                if (window.location.href === this.shoppingCartUrl) {
+                    window.location.reload(false);
+                }
             }
             this._hideItemButton(elem);
         },
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 6f9a1a46826da..d68b0682eb511 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
@@ -202,6 +202,13 @@ function (
             }
         },
 
+        /**
+         * Manage cancel button visibility
+         */
+        canUseCancelBillingAddress: ko.computed(function () {
+            return quote.billingAddress() || lastSelectedBillingAddress;
+        }),
+
         /**
          * Restore billing address
          */
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 90ad07da0ae37..a195037394085 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
@@ -17,7 +17,16 @@ define([
 ], function ($, Component, ko, customer, checkEmailAvailability, loginAction, quote, checkoutData, fullScreenLoader) {
     'use strict';
 
-    var validatedEmail = checkoutData.getValidatedEmailValue();
+    var validatedEmail;
+
+    if (!checkoutData.getValidatedEmailValue() &&
+        window.checkoutConfig.validatedEmailValue
+    ) {
+        checkoutData.setInputFieldEmailValue(window.checkoutConfig.validatedEmailValue);
+        checkoutData.setValidatedEmailValue(window.checkoutConfig.validatedEmailValue);
+    }
+
+    validatedEmail = checkoutData.getValidatedEmailValue();
 
     if (validatedEmail && !customer.isLoggedIn()) {
         quote.guestEmail = validatedEmail;
@@ -33,6 +42,9 @@ define([
             listens: {
                 email: 'emailHasChanged',
                 emailFocused: 'validateEmail'
+            },
+            ignoreTmpls: {
+                email: true
             }
         },
         checkDelay: 2000,
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js b/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
index a2f8c8c56ff33..5e29fa209a641 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
@@ -81,6 +81,7 @@ define([
         maxItemsToDisplay: window.checkout.maxItemsToDisplay,
         cart: {},
 
+        // jscs:disable requireCamelCaseOrUpperCaseIdentifiers
         /**
          * @override
          */
@@ -101,12 +102,16 @@ define([
                 self.isLoading(true);
             });
 
-            if (cartData()['website_id'] !== window.checkout.websiteId) {
+            if (cartData().website_id !== window.checkout.websiteId ||
+                cartData().store_id !== window.checkout.storeId
+            ) {
                 customerData.reload(['cart'], false);
             }
 
             return this._super();
         },
+        //jscs:enable requireCamelCaseOrUpperCaseIdentifiers
+
         isLoading: ko.observable(false),
         initSidebar: initSidebar,
 
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 c17e5e40d5c98..e8994c61b7221 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
@@ -66,9 +66,21 @@ define([
         navigate: function () {
             var self = this;
 
-            getPaymentInformation().done(function () {
-                self.isVisible(true);
-            });
+            if (!self.hasShippingMethod()) {
+                this.isVisible(false);
+                stepNavigator.setHash('shipping');
+            } else {
+                getPaymentInformation().done(function () {
+                    self.isVisible(true);
+                });
+            }
+        },
+
+        /**
+         * @return {Boolean}
+         */
+        hasShippingMethod: function () {
+            return window.checkoutConfig.selectedShippingMethod !== null;
         },
 
         /**
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js b/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js
index 7b200860c4d55..1b5463c0770a3 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js
@@ -133,15 +133,14 @@ define([
                 event.preventDefault();
             }
 
-            if (this.validate() && additionalValidators.validate()) {
+            if (this.validate() &&
+                additionalValidators.validate() &&
+                this.isPlaceOrderActionAllowed() === true
+            ) {
                 this.isPlaceOrderActionAllowed(false);
 
                 this.getPlaceOrderDeferredObject()
-                    .fail(
-                        function () {
-                            self.isPlaceOrderActionAllowed(true);
-                        }
-                    ).done(
+                    .done(
                         function () {
                             self.afterPlaceOrder();
 
@@ -149,6 +148,10 @@ define([
                                 redirectOnSuccessAction.execute();
                             }
                         }
+                    ).always(
+                        function () {
+                            self.isPlaceOrderActionAllowed(true);
+                        }
                     );
 
                 return true;
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
index df50a5ae94ae9..b4997f9664c81 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
@@ -247,6 +247,7 @@ define([
          */
         setShippingInformation: function () {
             if (this.validateShippingInformation()) {
+                quote.billingAddress(null);
                 checkoutDataResolver.resolveBillingAddress();
                 setShippingInformationAction().done(
                     function () {
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/summary/item/details/message.js b/app/code/Magento/Checkout/view/frontend/web/js/view/summary/item/details/message.js
new file mode 100644
index 0000000000000..ed41fd26c47ec
--- /dev/null
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/summary/item/details/message.js
@@ -0,0 +1,30 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define(['uiComponent'], function (Component) {
+    'use strict';
+
+    var quoteMessages = window.checkoutConfig.quoteMessages;
+
+    return Component.extend({
+        defaults: {
+            template: 'Magento_Checkout/summary/item/details/message'
+        },
+        displayArea: 'item_message',
+        quoteMessages: quoteMessages,
+
+        /**
+         * @param {Object} item
+         * @return {null}
+         */
+        getMessage: function (item) {
+            if (this.quoteMessages[item['item_id']]) {
+                return this.quoteMessages[item['item_id']];
+            }
+
+            return null;
+        }
+    });
+});
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
index 5f735fbb4daa9..63edb5057b933 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
@@ -22,7 +22,7 @@
                 <button class="action action-update" type="button" data-bind="click: updateAddress">
                     <span data-bind="i18n: 'Update'"></span>
                 </button>
-                <button class="action action-cancel" type="button" data-bind="click: cancelAddressEdit">
+                <button class="action action-cancel" type="button" data-bind="click: cancelAddressEdit, visible: canUseCancelBillingAddress()">
                     <span data-bind="i18n: 'Cancel'"></span>
                 </button>
             </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
index 2daca51a2f5da..fb128a891aea2 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
@@ -97,7 +97,7 @@
         </div>
     </div>
 
-    <div id="minicart-widgets" class="minicart-widgets">
+    <div id="minicart-widgets" class="minicart-widgets" if="getRegion('promotion').length">
         <each args="getRegion('promotion')" render=""/>
     </div>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
index 357b0e550af0f..41d442a76d510 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
@@ -45,7 +45,7 @@
                                 <span data-bind="html: option.value.join('<br>')"></span>
                             <!-- /ko -->
                             <!-- ko ifnot: Array.isArray(option.value) -->
-                                <span data-bind="html: option.value"></span>
+                                <span data-bind="text: option.value"></span>
                             <!-- /ko -->
                         </dd>
                         <!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
index dd59bd78416c6..9c0621099060b 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
@@ -35,7 +35,7 @@
                     <dd class="values" data-bind="html: full_view"></dd>
                     <!-- /ko -->
                     <!-- ko ifnot: ($data.full_view)-->
-                    <dd class="values" data-bind="html: value"></dd>
+                    <dd class="values" data-bind="text: value"></dd>
                     <!-- /ko -->
                 <!-- /ko -->
             </dl>
@@ -43,3 +43,6 @@
     </div>
     <!-- /ko -->
 </div>
+<!-- ko foreach: getRegion('item_message') -->
+    <!-- ko template: getTemplate() --><!-- /ko -->
+<!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/message.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/message.html
new file mode 100644
index 0000000000000..ea8f58cccd595
--- /dev/null
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/message.html
@@ -0,0 +1,9 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="cart item message notice" if="getMessage($parents[1])">
+    <div data-bind="text: getMessage($parents[1])"></div>
+</div>
diff --git a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php
index f7b178df99624..447689c95dfd0 100644
--- a/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php
+++ b/app/code/Magento/CheckoutAgreements/Controller/Adminhtml/Agreement/Delete.php
@@ -9,6 +9,7 @@
 use Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface;
 use Magento\CheckoutAgreements\Controller\Adminhtml\Agreement;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Registry;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
@@ -36,9 +37,14 @@ public function __construct(
     }
     /**
      * @return void
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         $id = (int)$this->getRequest()->getParam('id');
         $agreement = $this->agreementRepository->get($id);
         if (!$agreement->getAgreementId()) {
diff --git a/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php b/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php
index 331307292e40a..61326207d24ec 100644
--- a/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php
+++ b/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php
@@ -45,17 +45,18 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConfig()
     {
         $agreements = [];
         $agreements['checkoutAgreements'] = $this->getAgreementsConfig();
+
         return $agreements;
     }
 
     /**
-     * Returns agreements config
+     * Returns agreements config.
      *
      * @return array
      */
@@ -75,7 +76,7 @@ protected function getAgreementsConfig()
                 'content' => $agreement->getIsHtml()
                     ? $agreement->getContent()
                     : nl2br($this->escaper->escapeHtml($agreement->getContent())),
-                'checkboxText' => $agreement->getCheckboxText(),
+                'checkboxText' => $this->escaper->escapeHtml($agreement->getCheckboxText()),
                 'mode' => $agreement->getMode(),
                 'agreementId' => $agreement->getAgreementId()
             ];
diff --git a/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement/Grid/Collection.php b/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement/Grid/Collection.php
index fe600d64a7c48..2cce918c5edd4 100644
--- a/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement/Grid/Collection.php
+++ b/app/code/Magento/CheckoutAgreements/Model/ResourceModel/Agreement/Grid/Collection.php
@@ -63,7 +63,7 @@ private function getStoresForAgreements()
 
         if (!empty($agreementId)) {
             $select = $this->getConnection()->select()->from(
-                ['agreement_store' => 'checkout_agreement_store']
+                ['agreement_store' => $this->getResource()->getTable('checkout_agreement_store')]
             )->where(
                 'agreement_store.agreement_id IN (?)',
                 $agreementId
diff --git a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php
index eae347e27aa11..cacc1c1226cff 100644
--- a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php
+++ b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php
@@ -8,6 +8,9 @@
 use Magento\CheckoutAgreements\Model\AgreementsProvider;
 use Magento\Store\Model\ScopeInterface;
 
+/**
+ * Tests for AgreementsConfigProvider.
+ */
 class AgreementsConfigProviderTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -30,6 +33,9 @@ class AgreementsConfigProviderTest extends \PHPUnit\Framework\TestCase
      */
     protected $escaperMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
@@ -45,10 +51,16 @@ protected function setUp()
         );
     }
 
+    /**
+     * Test for getConfig if content is HTML.
+     *
+     * @return void
+     */
     public function testGetConfigIfContentIsHtml()
     {
         $content = 'content';
         $checkboxText = 'checkbox_text';
+        $escapedCheckboxText = 'escaped_checkbox_text';
         $mode = \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO;
         $agreementId = 100;
         $expectedResult = [
@@ -57,12 +69,12 @@ public function testGetConfigIfContentIsHtml()
                 'agreements' => [
                     [
                         'content' => $content,
-                        'checkboxText' => $checkboxText,
+                        'checkboxText' => $escapedCheckboxText,
                         'mode' => $mode,
-                        'agreementId' => $agreementId
-                    ]
-                ]
-            ]
+                        'agreementId' => $agreementId,
+                    ],
+                ],
+            ],
         ];
 
         $this->scopeConfigMock->expects($this->once())
@@ -71,8 +83,12 @@ public function testGetConfigIfContentIsHtml()
             ->willReturn(true);
 
         $agreement = $this->createMock(\Magento\CheckoutAgreements\Api\Data\AgreementInterface::class);
-        $this->agreementsRepositoryMock->expects($this->any())->method('getList')->willReturn([$agreement]);
+        $this->agreementsRepositoryMock->expects($this->once())->method('getList')->willReturn([$agreement]);
 
+        $this->escaperMock->expects($this->once())
+            ->method('escapeHtml')
+            ->with($checkboxText)
+            ->willReturn($escapedCheckboxText);
         $agreement->expects($this->once())->method('getIsHtml')->willReturn(true);
         $agreement->expects($this->once())->method('getContent')->willReturn($content);
         $agreement->expects($this->once())->method('getCheckboxText')->willReturn($checkboxText);
@@ -82,11 +98,17 @@ public function testGetConfigIfContentIsHtml()
         $this->assertEquals($expectedResult, $this->model->getConfig());
     }
 
+    /**
+     * Test for getConfig if content is not HTML.
+     *
+     * @return void
+     */
     public function testGetConfigIfContentIsNotHtml()
     {
         $content = 'content';
         $escapedContent = 'escaped_content';
         $checkboxText = 'checkbox_text';
+        $escapedCheckboxText = 'escaped_checkbox_text';
         $mode = \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO;
         $agreementId = 100;
         $expectedResult = [
@@ -95,12 +117,12 @@ public function testGetConfigIfContentIsNotHtml()
                 'agreements' => [
                     [
                         'content' => $escapedContent,
-                        'checkboxText' => $checkboxText,
+                        'checkboxText' => $escapedCheckboxText,
                         'mode' => $mode,
-                        'agreementId' => $agreementId
-                    ]
-                ]
-            ]
+                        'agreementId' => $agreementId,
+                    ],
+                ],
+            ],
         ];
 
         $this->scopeConfigMock->expects($this->once())
@@ -109,9 +131,13 @@ public function testGetConfigIfContentIsNotHtml()
             ->willReturn(true);
 
         $agreement = $this->createMock(\Magento\CheckoutAgreements\Api\Data\AgreementInterface::class);
-        $this->agreementsRepositoryMock->expects($this->any())->method('getList')->willReturn([$agreement]);
-        $this->escaperMock->expects($this->once())->method('escapeHtml')->with($content)->willReturn($escapedContent);
+        $this->agreementsRepositoryMock->expects($this->once())->method('getList')->willReturn([$agreement]);
 
+        $this->escaperMock->expects($this->at(0))->method('escapeHtml')->with($content)->willReturn($escapedContent);
+        $this->escaperMock->expects($this->at(1))
+            ->method('escapeHtml')
+            ->with($checkboxText)
+            ->willReturn($escapedCheckboxText);
         $agreement->expects($this->once())->method('getIsHtml')->willReturn(false);
         $agreement->expects($this->once())->method('getContent')->willReturn($content);
         $agreement->expects($this->once())->method('getCheckboxText')->willReturn($checkboxText);
diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json
index a53558981e2f8..4897676b4bd59 100644
--- a/app/code/Magento/CheckoutAgreements/composer.json
+++ b/app/code/Magento/CheckoutAgreements/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-checkout-agreements",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-checkout": "100.2.*",
         "magento/module-quote": "101.0.*",
         "magento/module-store": "100.2.*",
@@ -10,7 +10,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml b/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml
index 3f742de0177da..122160f1a10cd 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="checkout_overview">
-            <block class="Magento\CheckoutAgreements\Block\Agreements" name="checkout.multishipping.agreements" as="agreements" template="Magento_CheckoutAgreements::multishipping_agreements.phtml"/>
+            <block class="Magento\CheckoutAgreements\Block\Agreements" name="checkout.multishipping.agreements" as="agreements" template="Magento_CheckoutAgreements::additional_agreements.phtml"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml
index 663cae4debcfa..7486b6d870565 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var $block \Magento\CheckoutAgreements\Block\Agreements
  */
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
index b0c6384bcc9fe..5cb256090c196 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Files.LineLength
 
 ?>
 <?php
@@ -17,30 +17,42 @@
 } ?>
 <ol id="checkout-agreements" class="agreements checkout items">
     <?php /** @var \Magento\CheckoutAgreements\Api\Data\AgreementInterface $agreement */ ?>
-    <?php foreach ($block->getAgreements() as $agreement): ?>
+    <?php foreach ($block->getAgreements() as $agreement) :?>
         <li class="item">
-            <div class="checkout-agreement-item-content"<?= ($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '') ?>>
-                <?php if ($agreement->getIsHtml()):?>
-                    <?= /* @escapeNotVerified */ $agreement->getContent() ?>
-                <?php else:?>
-                    <?= nl2br($block->escapeHtml($agreement->getContent())) ?>
+            <div class="checkout-agreement-item-content"<?= $block->escapeHtmlAttr($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '') ?>>
+                <?php if ($agreement->getIsHtml()) :?>
+                    <?= /* @noEscape */ $agreement->getContent() ?>
+                <?php else :?>
+                    <?= $block->escapeHtml(nl2br($agreement->getContent())) ?>
                 <?php endif; ?>
             </div>
-            <form id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree required">
-                <?php if($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL): ?>
+            <form id="checkout-agreements-form-<?= (int) $agreement->getAgreementId() ?>" class="field choice agree required">
+                <?php if ($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL) :?>
                 <input type="checkbox"
-                       id="agreement-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>"
-                       name="agreement[<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>]"
+                       id="agreement-<?= (int) $agreement->getAgreementId() ?>"
+                       name="agreement[<?= (int) $agreement->getAgreementId() ?>]"
                        value="1"
                        title="<?= $block->escapeHtml($agreement->getCheckboxText()) ?>"
                        class="checkbox"
                        data-validate="{required:true}"/>
-                <label class="label" for="agreement-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>">
-                    <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
+                <label class="label" for="agreement-<?= (int) $agreement->getAgreementId() ?>">
+                    <span>
+                        <?php if ($agreement->getIsHtml()) :?>
+                            <?= /* @noEscape */ $agreement->getCheckboxText() ?>
+                        <?php else :?>
+                            <?= $block->escapeHtml($agreement->getCheckboxText()) ?>
+                        <?php endif; ?>
+                    </span>
                 </label>
-                <?php elseif($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO): ?>
-                <div id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree">
-                    <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
+                <?php elseif ($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO) :?>
+                <div id="checkout-agreements-form-<?= (int) $agreement->getAgreementId() ?>" class="field choice agree">
+                    <span>
+                        <?php if ($agreement->getIsHtml()) :?>
+                            <?= /* @noEscape */ $agreement->getCheckboxText() ?>
+                        <?php else :?>
+                            <?= $block->escapeHtml($agreement->getCheckboxText()) ?>
+                        <?php endif; ?>
+                    </span>
                 </div>
                 <?php endif; ?>
             </form>
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
index 3400770f5cee8..fb2d5168d21de 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
@@ -4,7 +4,8 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// @deprecated
+// phpcs:disable Magento2.Files.LineLength
 
 ?>
 <?php
@@ -17,31 +18,43 @@
 } ?>
 <ol id="checkout-agreements" class="agreements checkout items">
     <?php /** @var \Magento\CheckoutAgreements\Api\Data\AgreementInterface $agreement */ ?>
-    <?php foreach ($block->getAgreements() as $agreement): ?>
+    <?php foreach ($block->getAgreements() as $agreement) :?>
         <li class="item">
-            <div class="checkout-agreement-item-content"<?= ($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '') ?>>
-                <?php if ($agreement->getIsHtml()):?>
-                    <?= /* @escapeNotVerified */ $agreement->getContent() ?>
-                <?php else:?>
-                    <?= nl2br($block->escapeHtml($agreement->getContent())) ?>
+            <div class="checkout-agreement-item-content"<?= $block->escapeHtmlAttr($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '') ?>>
+                <?php if ($agreement->getIsHtml()) :?>
+                    <?= /* @noEscape */ $agreement->getContent() ?>
+                <?php else :?>
+                    <?= $block->escapeHtml(nl2br($agreement->getContent())) ?>
                 <?php endif; ?>
             </div>
-            <?php if($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL): ?>
-            <div id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree required">
+            <?php if ($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL) :?>
+            <div id="checkout-agreements-form-<?= (int) $agreement->getAgreementId() ?>" class="field choice agree required">
                 <input type="checkbox"
-                       id="agreement-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>"
-                       name="agreement[<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>]"
+                       id="agreement-<?= (int) $agreement->getAgreementId() ?>"
+                       name="agreement[<?= (int) $agreement->getAgreementId() ?>]"
                        value="1"
                        title="<?= $block->escapeHtml($agreement->getCheckboxText()) ?>"
                        class="checkbox"
                        data-validate="{required:true}"/>
-                <label class="label" for="agreement-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>">
-                    <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
+                <label class="label" for="agreement-<?= (int) $agreement->getAgreementId() ?>">
+                    <span>
+                        <?php if ($agreement->getIsHtml()) :?>
+                            <?= /* @noEscape */ $agreement->getCheckboxText() ?>
+                        <?php else :?>
+                            <?= $block->escapeHtml($agreement->getCheckboxText()) ?>
+                        <?php endif; ?>
+                    </span>
                 </label>
             </div>
-            <?php elseif($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO): ?>
-            <div id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree">
-                <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
+            <?php elseif ($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO) :?>
+            <div id="checkout-agreements-form-<?= (int) $agreement->getAgreementId() ?>" class="field choice agree">
+                <span>
+                    <?php if ($agreement->getIsHtml()) :?>
+                        <?= /* @noEscape */ $agreement->getCheckboxText() ?>
+                    <?php else :?>
+                        <?= $block->escapeHtml($agreement->getCheckboxText()) ?>
+                    <?php endif; ?>
+                </span>
             </div>
             <?php endif; ?>
         </li>
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 a448537d64e83..4b1a68624e547 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
@@ -5,17 +5,17 @@
  */
 -->
 <div data-role="checkout-agreements">
-    <div class="checkout-agreements" data-bind="visible: isVisible">
+    <div class="checkout-agreements fieldset" data-bind="visible: isVisible">
         <!-- ko foreach: agreements -->
             <!-- ko if: ($parent.isAgreementRequired($data)) -->
-            <div class="checkout-agreement required">
+            <div class="checkout-agreement field choice required">
                 <input type="checkbox" class="required-entry"
                        data-bind="attr: {
                                     'id': $parent.getCheckboxId($parentContext, agreementId),
                                     'name': 'agreement[' + agreementId + ']',
                                     'value': agreementId
                                     }"/>
-                <label data-bind="attr: {'for': $parent.getCheckboxId($parentContext, agreementId)}">
+                <label class="label" data-bind="attr: {'for': $parent.getCheckboxId($parentContext, agreementId)}">
                     <button type="button"
                             class="action action-show"
                             data-bind="click: function(data, event) { return $parent.showContent(data, event) }"
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/DeleteButton.php b/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/DeleteButton.php
index a7410cac64d76..926886316f16a 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/DeleteButton.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/DeleteButton.php
@@ -24,7 +24,7 @@ public function getButtonData()
                 'class' => 'delete',
                 'on_click' => 'deleteConfirm(\'' . __(
                     'Are you sure you want to do this?'
-                ) . '\', \'' . $this->getDeleteUrl() . '\')',
+                ) . '\', \'' . $this->getDeleteUrl() . '\', {data: {}})',
                 'sort_order' => 20,
             ];
         }
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/DeleteButton.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/DeleteButton.php
index 1fc599e4c856a..b11c2fc4163b2 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/DeleteButton.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/DeleteButton.php
@@ -24,7 +24,7 @@ public function getButtonData()
                 'class' => 'delete',
                 'on_click' => 'deleteConfirm(\'' . __(
                     'Are you sure you want to do this?'
-                ) . '\', \'' . $this->getDeleteUrl() . '\')',
+                ) . '\', \'' . $this->getDeleteUrl() . '\', {data: {}})',
                 'sort_order' => 20,
             ];
         }
diff --git a/app/code/Magento/Cms/Block/Block.php b/app/code/Magento/Cms/Block/Block.php
index d0d75ea691195..c611f4b1e9f05 100644
--- a/app/code/Magento/Cms/Block/Block.php
+++ b/app/code/Magento/Cms/Block/Block.php
@@ -84,4 +84,14 @@ public function getIdentities()
     {
         return [\Magento\Cms\Model\Block::CACHE_TAG . '_' . $this->getBlockId()];
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCacheKeyInfo()
+    {
+        $cacheKeyInfo = parent::getCacheKeyInfo();
+        $cacheKeyInfo[] = $this->_storeManager->getStore()->getId();
+        return $cacheKeyInfo;
+    }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
index 3aaf40e7d0ab2..22672e57ee6ab 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
@@ -12,9 +12,14 @@ class Delete extends \Magento\Cms\Controller\Adminhtml\Block
      * Delete action
      *
      * @return \Magento\Framework\Controller\ResultInterface
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
         // check if we know what should be deleted
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
index 92bc7ad71f590..ef0fa937dbd5c 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
@@ -49,10 +49,14 @@ public function __construct(Context $context, Filter $filter, CollectionFactory
      * Execute action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @throws \Magento\Framework\Exception\LocalizedException|\Exception
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         $collection = $this->filter->getCollection($this->collectionFactory->create());
         $collectionSize = $collection->getSize();
 
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
index 16c99e9857c33..78753aee66cef 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -19,9 +18,14 @@ class Delete extends \Magento\Backend\App\Action
      * Delete action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         // check if we know what should be deleted
         $id = $this->getRequest()->getParam('page_id');
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
index a1d32aa97a382..6d8fda918689d 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
@@ -48,10 +48,14 @@ public function __construct(Context $context, Filter $filter, CollectionFactory
      * Execute action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @throws \Magento\Framework\Exception\LocalizedException|\Exception
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         $collection = $this->filter->getCollection($this->collectionFactory->create());
         $collectionSize = $collection->getSize();
 
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
index a85b8ecd5e5a1..b36cf087ed9d6 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
@@ -48,10 +48,14 @@ public function __construct(Context $context, Filter $filter, CollectionFactory
      * Execute action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @throws \Magento\Framework\Exception\LocalizedException|\Exception
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         $collection = $this->filter->getCollection($this->collectionFactory->create());
 
         foreach ($collection as $item) {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
index 3f26769e4c9e9..5ab7ae246a76f 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
@@ -48,10 +48,14 @@ public function __construct(Context $context, Filter $filter, CollectionFactory
      * Execute action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @throws \Magento\Framework\Exception\LocalizedException|\Exception
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         $collection = $this->filter->getCollection($this->collectionFactory->create());
 
         foreach ($collection as $item) {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
index 1364e61816796..42b5c8f8497ec 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
@@ -44,8 +44,8 @@ class Save extends \Magento\Backend\App\Action
      * @param Action\Context $context
      * @param PostDataProcessor $dataProcessor
      * @param DataPersistorInterface $dataPersistor
-     * @param \Magento\Cms\Model\PageFactory $pageFactory
-     * @param \Magento\Cms\Api\PageRepositoryInterface $pageRepository
+     * @param \Magento\Cms\Model\PageFactory|null $pageFactory
+     * @param \Magento\Cms\Api\PageRepositoryInterface|null $pageRepository
      */
     public function __construct(
         Action\Context $context,
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
index 890c9bf5eae52..f7970b0a93ca9 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
@@ -79,7 +79,7 @@ public function execute()
                 $filesystem = $this->_objectManager->get(\Magento\Framework\Filesystem::class);
                 $dir = $filesystem->getDirectoryRead(DirectoryList::MEDIA);
                 $filePath = $path . '/' . \Magento\Framework\File\Uploader::getCorrectFileName($file);
-                if ($dir->isFile($dir->getRelativePath($filePath))) {
+                if ($dir->isFile($dir->getRelativePath($filePath)) && !preg_match('/^\.htaccess$/', $file)) {
                     $this->getStorage()->deleteFile($filePath);
                 }
             }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
index a1de11c3c462e..81ae1affb5e00 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
@@ -7,6 +7,7 @@
 namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\NotFoundException;
 
 /**
  * Delete image folder.
@@ -57,6 +58,10 @@ public function __construct(
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         try {
             $path = $this->getStorage()->getCmsWysiwygImages()->getCurrentPath();
             if (!$this->directoryResolver->validatePath($path, DirectoryList::MEDIA)) {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
index 7816e29405f27..5171430e67371 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
@@ -7,6 +7,7 @@
 namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\NotFoundException;
 
 /**
  * Creates new folder.
@@ -28,7 +29,6 @@ class NewFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\App\Filesystem\DirectoryResolver|null $directoryResolver
-     * @throws \RuntimeException
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -50,6 +50,10 @@ public function __construct(
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         try {
             $this->_initAction();
             $name = $this->getRequest()->getPost('name');
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
index 5c9aa2243bc6d..b25ad695ba008 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
@@ -50,6 +50,10 @@ public function __construct(
     public function execute()
     {
         try {
+            if (!$this->getRequest()->isPost()) {
+                throw new \Exception('Wrong request.');
+            }
+
             $this->_initAction();
             $path = $this->getStorage()->getSession()->getCurrentPath();
             if (!$this->directoryResolver->validatePath($path, DirectoryList::MEDIA)) {
diff --git a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
index 18c7d14cc8fcf..01bd20a5753cc 100644
--- a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
+++ b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
@@ -239,11 +239,7 @@ public function getCurrentUrl()
     {
         if (!$this->_currentUrl) {
             $path = $this->getCurrentPath();
-            $mediaUrl = $this->_storeManager->getStore(
-                $this->_storeId
-            )->getBaseUrl(
-                \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
-            );
+            $mediaUrl = $this->_storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA);
             $this->_currentUrl = $mediaUrl . $this->_directory->getRelativePath($path) . '/';
         }
         return $this->_currentUrl;
diff --git a/app/code/Magento/Cms/Model/Block.php b/app/code/Magento/Cms/Model/Block.php
index 3795409a95d2b..a8b8661bfb913 100644
--- a/app/code/Magento/Cms/Model/Block.php
+++ b/app/code/Magento/Cms/Model/Block.php
@@ -12,8 +12,8 @@
 /**
  * CMS block model
  *
- * @method Block setStoreId(array $storeId)
- * @method array getStoreId()
+ * @method Block setStoreId(int $storeId)
+ * @method int getStoreId()
  */
 class Block extends AbstractModel implements BlockInterface, IdentityInterface
 {
@@ -41,6 +41,8 @@ class Block extends AbstractModel implements BlockInterface, IdentityInterface
     protected $_eventPrefix = 'cms_block';
 
     /**
+     * Construct.
+     *
      * @return void
      */
     protected function _construct()
diff --git a/app/code/Magento/Cms/Model/Page.php b/app/code/Magento/Cms/Model/Page.php
index d950f484cd1d9..8eefe26236ba5 100644
--- a/app/code/Magento/Cms/Model/Page.php
+++ b/app/code/Magento/Cms/Model/Page.php
@@ -16,8 +16,8 @@
  * Cms Page Model
  *
  * @api
- * @method Page setStoreId(array $storeId)
- * @method array getStoreId()
+ * @method Page setStoreId(int $storeId)
+ * @method int getStoreId()
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @since 100.0.2
  */
@@ -103,8 +103,7 @@ public function getStores()
     }
 
     /**
-     * Check if page identifier exist for specific store
-     * return page id if page exists
+     * Check if page identifier exist for specific store return page id if page exists
      *
      * @param string $identifier
      * @param int $storeId
@@ -116,8 +115,7 @@ public function checkIdentifier($identifier, $storeId)
     }
 
     /**
-     * Prepare page's statuses.
-     * Available event cms_page_get_available_statuses to customize statuses.
+     * Prepare page's statuses, available event cms_page_get_available_statuses to customize statuses.
      *
      * @return array
      */
@@ -538,7 +536,7 @@ public function setIsActive($isActive)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function beforeSave()
@@ -571,6 +569,8 @@ public function beforeSave()
     }
 
     /**
+     * Returns scope config.
+     *
      * @return ScopeConfigInterface
      */
     private function getScopeConfig()
diff --git a/app/code/Magento/Cms/Model/Page/Source/PageLayout.php b/app/code/Magento/Cms/Model/Page/Source/PageLayout.php
index fb759348759b2..23a452c0fe58c 100644
--- a/app/code/Magento/Cms/Model/Page/Source/PageLayout.php
+++ b/app/code/Magento/Cms/Model/Page/Source/PageLayout.php
@@ -20,6 +20,7 @@ class PageLayout implements OptionSourceInterface
 
     /**
      * @var array
+     * @deprecated since the cache is now handled by \Magento\Theme\Model\PageLayout\Config\Builder::$configFiles
      */
     protected $options;
 
@@ -34,16 +35,10 @@ public function __construct(BuilderInterface $pageLayoutBuilder)
     }
 
     /**
-     * Get options
-     *
-     * @return array
+     * @inheritdoc
      */
     public function toOptionArray()
     {
-        if ($this->options !== null) {
-            return $this->options;
-        }
-
         $configOptions = $this->pageLayoutBuilder->getPageLayoutsConfig()->getOptions();
         $options = [];
         foreach ($configOptions as $key => $value) {
@@ -54,6 +49,6 @@ public function toOptionArray()
         }
         $this->options = $options;
 
-        return $this->options;
+        return $options;
     }
 }
diff --git a/app/code/Magento/Cms/Model/Plugin/Product.php b/app/code/Magento/Cms/Model/Plugin/Product.php
new file mode 100644
index 0000000000000..c8456d5cd6bfe
--- /dev/null
+++ b/app/code/Magento/Cms/Model/Plugin/Product.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\Plugin;
+
+use Magento\Catalog\Model\Product as CatalogProduct;
+use Magento\Cms\Model\Page;
+
+/**
+ * Cleaning no-route page cache for the product details page after enabling product that is not assigned to a category
+ */
+class Product
+{
+    /**
+     * @var Page
+     */
+    private $page;
+
+    /**
+     * @param Page $page
+     */
+    public function __construct(Page $page)
+    {
+        $this->page = $page;
+    }
+
+    /**
+     * After get identities
+     *
+     * @param CatalogProduct $product
+     * @param array $identities
+     * @return array
+     */
+    public function afterGetIdentities(CatalogProduct $product, array $identities)
+    {
+        if ($product->getOrigData('status') > $product->getData('status')) {
+            if (empty($product->getCategoryIds())) {
+                $noRoutePage = $this->page->load(Page::NOROUTE_PAGE_ID);
+                $noRoutePageId = $noRoutePage->getId();
+                $identities[] = Page::CACHE_TAG . '_' . $noRoutePageId;
+            }
+        }
+
+        return array_unique($identities);
+    }
+}
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Block.php b/app/code/Magento/Cms/Model/ResourceModel/Block.php
index 9aab54b02bc14..9b4bc5ec3ea11 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Block.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Block.php
@@ -95,9 +95,11 @@ protected function _beforeSave(AbstractModel $object)
     }
 
     /**
+     * Get block id.
+     *
      * @param AbstractModel $object
      * @param mixed $value
-     * @param null $field
+     * @param string $field
      * @return bool|int|string
      * @throws LocalizedException
      * @throws \Exception
@@ -183,10 +185,12 @@ public function getIsUniqueBlockToStores(AbstractModel $object)
         $entityMetadata = $this->metadataPool->getMetadata(BlockInterface::class);
         $linkField = $entityMetadata->getLinkField();
 
-        if ($this->_storeManager->isSingleStoreMode()) {
-            $stores = [Store::DEFAULT_STORE_ID];
-        } else {
-            $stores = (array)$object->getData('store_id');
+        $stores = (array)$object->getData('store_id');
+        $isDefaultStore = $this->_storeManager->isSingleStoreMode()
+            || array_search(Store::DEFAULT_STORE_ID, $stores) !== false;
+
+        if (!$isDefaultStore) {
+            $stores[] = Store::DEFAULT_STORE_ID;
         }
 
         $select = $this->getConnection()->select()
@@ -196,8 +200,11 @@ public function getIsUniqueBlockToStores(AbstractModel $object)
                 'cb.' . $linkField . ' = cbs.' . $linkField,
                 []
             )
-            ->where('cb.identifier = ?', $object->getData('identifier'))
-            ->where('cbs.store_id IN (?)', $stores);
+            ->where('cb.identifier = ?', $object->getData('identifier'));
+
+        if (!$isDefaultStore) {
+            $select->where('cbs.store_id IN (?)', $stores);
+        }
 
         if ($object->getId()) {
             $select->where('cb.' . $entityMetadata->getIdentifierField() . ' <> ?', $object->getId());
@@ -236,6 +243,8 @@ public function lookupStoreIds($id)
     }
 
     /**
+     * Save an object.
+     *
      * @param AbstractModel $object
      * @return $this
      * @throws \Exception
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index 2cd1647a1bf22..90dcf3dc8df78 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -270,7 +270,8 @@ public function getDirsCollection($path)
         $collection = $this->getCollection($path)
             ->setCollectDirs(true)
             ->setCollectFiles(false)
-            ->setCollectRecursively(false);
+            ->setCollectRecursively(false)
+            ->setOrder('basename', \Magento\Framework\Data\Collection\Filesystem::SORT_ORDER_ASC);
 
         $conditions = $this->getConditionsForExcludeDirs();
 
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCmsBlockActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCmsBlockActionGroup.xml
new file mode 100644
index 0000000000000..597df165f61d1
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCmsBlockActionGroup.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="FillCmsBlockForm">
+        <arguments>
+            <argument name="title" type="string" defaultValue="{{DefaultCmsBlock.title}}"/>
+            <argument name="identifier" type="string" defaultValue="{{DefaultCmsBlock.identifier}}"/>
+            <argument name="store" type="string" defaultValue="[All Store View]"/>
+            <argument name="content" type="string" defaultValue="{{DefaultCmsBlock.content}}"/>
+        </arguments>
+        <fillField selector="{{AdminCmsBlockContentSection.title}}" userInput="{{title}}" stepKey="fillFieldTitle"/>
+        <fillField selector="{{AdminCmsBlockContentSection.identifier}}" userInput="{{identifier}}" stepKey="fillFieldIdentifier"/>
+        <selectOption selector="{{AdminCmsBlockContentSection.storeView}}" parameterArray="{{store}}" stepKey="selectStore" />
+        <fillField selector="{{AdminCmsBlockContentSection.content}}" userInput="{{content}}" stepKey="fillContentField"/>
+    </actionGroup>
+    <actionGroup name="DeleteCmsBlockActionGroup">
+        <arguments>
+            <argument name="cmsBlockIdentifier" type="string" defaultValue="{{DefaultCmsBlock.identifier}}"/>
+        </arguments>
+        <amOnPage url="{{AdminCmsBlockGridPage.url}}" stepKey="navigateToCmsBlockListingPage"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFiltersBeforeDelete"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openCmsBlockFilters"/>
+        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('identifier')}}" userInput="{{cmsBlockIdentifier}}" stepKey="fillFilter"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <click selector="{{CmsPagesPageActionsSection.select(cmsBlockIdentifier)}}" stepKey="clickOnSelect"/>
+        <click selector="{{CmsPagesPageActionsSection.delete(cmsBlockIdentifier)}}" stepKey="clickOnDelete"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForConfirmModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirm"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the block." stepKey="verifyBlockIsDeleted"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFiltersAfterDelete"/>
+    </actionGroup>
+    <actionGroup name="NavigateToCreateCmsBlockActionGroup">
+        <amOnPage url="{{AdminCmsBlockNewPage.url}}" stepKey="navigateToCreateCmsBlockPage"/>
+    </actionGroup>
+    <actionGroup name="SaveCmsBlockActionGroup">
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveBlockButton"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the block." stepKey="verifyMessage"/>
+    </actionGroup>
+    <actionGroup name="SaveCmsBlockWithErrorActionGroup" extends="SaveCmsBlockActionGroup">
+        <arguments>
+            <argument name="errorMessage" type="string" defaultValue="A block identifier with the same properties already exists in the selected store."/>
+        </arguments>
+        <see selector="{{AdminMessagesSection.error}}" userInput="{{errorMessage}}" stepKey="verifyMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewCmsPageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewCmsPageActionGroup.xml
new file mode 100644
index 0000000000000..667dc79d2d6b4
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewCmsPageActionGroup.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CreateNewCmsPageActionGroup">
+        <arguments>
+            <argument name="cmsPage" defaultValue="_defaultCmsPage"/>
+        </arguments>
+        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="amOnCMSNewPage"/>
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{cmsPage.title}}" stepKey="fillFieldTitle"/>
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{cmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the page." stepKey="seeSaveSuccessMessage"/>
+    </actionGroup>
+
+    <actionGroup name="CreateNewPageWithWidgetWithCategoryCondition" extends="CreateNewCmsPageActionGroup">
+        <arguments>
+            <argument name="categoryId" type="string"/>
+            <argument name="conditionOperator" type="string" defaultValue="is"/>
+            <argument name="widgetType" type="string" defaultValue="Catalog Products List"/>
+        </arguments>
+        <click selector="{{CmsNewPagePageContentSection.header}}" after="fillFieldUrlKey" stepKey="clickExpandContent"/>
+        <click selector="{{CmsNewPagePageActionsSection.insertWidgetButton}}" after="clickExpandContent" stepKey="clickInsertWidgetButton"/>
+
+        <selectOption selector="{{AdminNewWidgetSection.widgetTypeDropDown}}" userInput="{{widgetType}}" after="clickInsertWidgetButton" stepKey="selectCatalogProductListOption"/>
+        <waitForElementVisible selector="{{AdminNewWidgetSection.addNewCondition}}" after="selectCatalogProductListOption" stepKey="waitForConditionsElementBecomeAvailable"/>
+
+        <click selector="{{AdminNewWidgetSection.addNewCondition}}" after="waitForConditionsElementBecomeAvailable" stepKey="clickToAddCondition"/>
+        <waitForElementVisible selector="{{AdminNewWidgetSection.selectCondition}}" after="clickToAddCondition" stepKey="waitForSelectBoxOpened"/>
+
+        <selectOption selector="{{AdminNewWidgetSection.selectCondition}}" userInput="Category" after="waitForSelectBoxOpened" stepKey="selectCategoryCondition"/>
+        <waitForElementVisible selector="{{AdminNewWidgetSection.ruleParameter}}" after="selectCategoryCondition" stepKey="seeConditionsAdded"/>
+
+        <click selector="{{AdminNewWidgetSection.conditionOperator}}" after="seeConditionsAdded" stepKey="clickToConditionIs"/>
+        <selectOption selector="{{AdminNewWidgetSection.conditionOperatorSelect('1')}}" after="clickToConditionIs" userInput="{{conditionOperator}}" stepKey="selectOperator"/>
+
+        <click selector="{{AdminNewWidgetSection.ruleParameter}}" after="selectOperator" stepKey="clickAddConditionItem"/>
+        <waitForElementVisible selector="{{AdminNewWidgetSection.setRuleParameter}}" after="clickAddConditionItem" stepKey="waitForConditionFieldOpened"/>
+
+        <fillField selector="{{AdminNewWidgetSection.setRuleParameter}}" userInput="{{categoryId}}" after="waitForConditionFieldOpened" stepKey="setCategoryId"/>
+        <click selector="{{AdminNewWidgetSection.insertWidget}}" after="setCategoryId" stepKey="clickInsertWidget"/>
+        <waitForElementVisible selector="{{AdminMainActionsSection.save}}" after="clickInsertWidget" stepKey="waitForInsertWidgetSaved"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeletePageByUrlKeyActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeletePageByUrlKeyActionGroup.xml
index 05e61ac86e166..fd20954dc7a9e 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeletePageByUrlKeyActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeletePageByUrlKeyActionGroup.xml
@@ -6,18 +6,22 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="DeletePageByUrlKeyActionGroup">
         <arguments>
             <argument name="urlKey" type="string"/>
         </arguments>
         <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnCMSPagesIndexPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <waitForPageLoad time="30" stepKey="waitForCmsPageListingLoaded"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFiltersBeforeDelete"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openCmsPageFilters"/>
+        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('identifier')}}" userInput="{{urlKey}}" stepKey="fillFilter"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFilters"/>
         <click selector="{{CmsPagesPageActionsSection.select(urlKey)}}" stepKey="clickSelect"/>
         <click selector="{{CmsPagesPageActionsSection.delete(urlKey)}}" stepKey="clickDelete"/>
-        <waitForElementVisible selector="{{CmsPagesPageActionsSection.deleteConfirm}}" stepKey="waitForOkButtonToBeVisible"/>
-        <click selector="{{CmsPagesPageActionsSection.deleteConfirm}}" stepKey="clickOkButton"/>
-        <waitForPageLoad stepKey="waitForPageLoad3"/>
-        <see userInput="The page has been deleted." stepKey="seeSuccessMessage"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForOkButtonToBeVisible"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickOkButton"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The page has been deleted." stepKey="seeSuccessMessage"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFiltersAfterDelete"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/NavigateToCMSPagesActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/NavigateToCMSPagesActionGroup.xml
new file mode 100644
index 0000000000000..6a2012b551407
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/NavigateToCMSPagesActionGroup.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="NavigateToCreatedCMSBlockPage">
+        <arguments>
+            <argument name="cmsBlock"/>
+        </arguments>
+        <amOnPage url="{{AdminCmsBlockGridPage.url}}" stepKey="navigateToCMSBlocksGrid"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickToResetFilters"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="clickOnFilters"/>
+        <fillField userInput="{{cmsBlock.identifier}}" selector="{{AdminDataGridHeaderSection.filterFieldInput('identifier')}}" stepKey="fillFilterAttributeCodeField"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminDataGridTableSection.rowActionSelect}}" stepKey="clickSelectCreatedCMSBlock" />
+        <click selector="{{AdminDataGridTableSection.rowEditAction}}" stepKey="navigateToCreatedCMSBlock" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/Data/CmsBlockData.xml b/app/code/Magento/Cms/Test/Mftf/Data/CmsBlockData.xml
new file mode 100644
index 0000000000000..79da00f26ecb9
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Data/CmsBlockData.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="DefaultCmsBlock" type="cms_block">
+        <data key="title">Default Block</data>
+        <data key="identifier" unique="suffix" >block</data>
+        <data key="content">Here is a block test. Yeah!</data>
+        <data key="active">true</data>
+    </entity>
+    <entity name="Sales25offBlock" type="cms_block">
+        <data key="title" unique="suffix">Sales25off</data>
+        <data key="identifier" unique="suffix">Sales25off</data>
+        <data key="content">sales25off everything!</data>
+        <data key="active">false</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml b/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml
index cb019006f7a0a..67bde89c516d2 100644
--- a/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="_defaultCmsPage" type="cms_page">
         <data key="title">Test CMS Page</data>
         <data key="content_heading">Test Content Heading</data>
@@ -26,6 +26,7 @@
         <data key="file_type">Upload File</data>
         <data key="shareable">Yes</data>
         <data key="file">magento.jpg</data>
+        <data key="fileName">magento</data>
         <data key="content">Image content. Yeah.</data>
         <data key="height">1000</data>
     </entity>
@@ -35,9 +36,14 @@
         <data key="file_type">Upload File</data>
         <data key="shareable">Yes</data>
         <data key="file">magento2.jpg</data>
+        <data key="fileName">magento2</data>
         <data key="content">Image content. Yeah.</data>
         <data key="height">1000</data>
     </entity>
+    <entity name="ImageUpload2" type="uploadImage">
+        <data key="file">medium.jpg</data>
+        <data key="fileName">medium</data>
+    </entity>
     <entity name="ImageFolder" type="uploadImage">
         <data key="name" unique="suffix">Test</data>
     </entity>
diff --git a/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml b/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml
new file mode 100644
index 0000000000000..bc69c94329ac9
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="WysiwygEnabledByDefault">
+        <data key="path">cms/wysiwyg/enabled</data>
+        <data key="scope_id">0</data>
+        <data key="value">enabled</data>
+    </entity>
+    <entity name="WysiwygDisabledByDefault">
+        <data key="path">cms/wysiwyg/enabled</data>
+        <data key="scope_id">0</data>
+        <data key="value">hidden</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Cms/Test/Mftf/Metadata/cms_block-meta.xml b/app/code/Magento/Cms/Test/Mftf/Metadata/cms_block-meta.xml
new file mode 100644
index 0000000000000..60a33c132a6c1
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Metadata/cms_block-meta.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateCmsBlock" dataType="cms_block" type="create" auth="adminOauth" url="/V1/cmsBlock" method="POST">
+        <contentType>application/json</contentType>
+        <object key="block" dataType="cms_block">
+            <field key="title">string</field>
+            <field key="identifier">string</field>
+            <field key="content">string</field>
+            <field key="active">string</field>
+        </object>
+    </operation>
+
+    <operation name="DeleteCmsBlock" dataType="cms_block" type="delete" auth="adminOauth" url="/V1/cmsBlock/{id}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsBlockEditPage.xml b/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsBlockEditPage.xml
new file mode 100644
index 0000000000000..328dc156a38fb
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsBlockEditPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCmsBlockEditPage" url="/cms/block/edit/block_id/{{blockId}}/" area="admin" module="Magento_Cms" parameterized="true">
+        <section name="AdminCmsBlockContentSection" />
+        <section name="AdminMediaGallerySection" />
+    </page>
+</pages>
diff --git a/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsBlockGridPage.xml b/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsBlockGridPage.xml
new file mode 100644
index 0000000000000..2cabe182714dc
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsBlockGridPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCmsBlockGridPage" url="/cms/block/" area="admin" module="Magento_Cms">
+    </page>
+</pages>
diff --git a/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsBlockNewPage.xml b/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsBlockNewPage.xml
new file mode 100644
index 0000000000000..2868d832ad762
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsBlockNewPage.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="AdminCmsBlockNewPage" url="/cms/block/new/" area="admin" module="Magento_Cms">
+        <section name="AdminCmsBlockContentSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Cms/Test/Mftf/Page/StorefrontCmsPage.xml b/app/code/Magento/Cms/Test/Mftf/Page/StorefrontCmsPage.xml
new file mode 100644
index 0000000000000..b2de3a225f8ce
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Page/StorefrontCmsPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCmsPage" url="/{{urlKey}}" area="storefront" module="Magento_Cms" parameterized="true">
+    </page>
+</pages>
diff --git a/app/code/Magento/Cms/Test/Mftf/Page/StorefrontHomePage.xml b/app/code/Magento/Cms/Test/Mftf/Page/StorefrontHomePage.xml
index fe1719a640070..5468d08bd4e0b 100644
--- a/app/code/Magento/Cms/Test/Mftf/Page/StorefrontHomePage.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Page/StorefrontHomePage.xml
@@ -7,9 +7,11 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="StorefrontHomePage" url="/" module="Magento_Cms" area="storefront">
         <section name="StorefrontHeaderSection"/>
         <section name="StorefrontQuickSearchSection"/>
+        <section name="StorefrontHeaderCurrencySwitcherSection"/>
+        <section name="StorefrontCmsPageSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/AdminCmsBlockContentSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/AdminCmsBlockContentSection.xml
new file mode 100644
index 0000000000000..20e55c49ec235
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/AdminCmsBlockContentSection.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="AdminCmsBlockContentSection">
+        <element name="content" type="textarea" selector="#cms_block_form_content"/>
+        <element name="insertWidgetButton" type="button" selector=".scalable.action-add-widget.plugin"/>
+        <element name="title" type="input" selector="input[name=title]"/>
+        <element name="identifier" type="input" selector="input[name=identifier]"/>
+        <element name="storeView" type="multiselect" selector="select[name=store_id]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/AdminMediaGallerySection.xml b/app/code/Magento/Cms/Test/Mftf/Section/AdminMediaGallerySection.xml
new file mode 100644
index 0000000000000..9d08bc708aef9
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/AdminMediaGallerySection.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="AdminMediaGallerySection">
+        <element name="imageSelected" type="text" selector="//small[text()='{{imageName}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
+        <element name="uploadImage" type="file" selector="input.fileupload" />
+        <element name="insertFile" type="text" selector="#insert_files"/>
+        <element name="imageBlockByName" type="block" selector="//div[@data-row='file'][contains(., '{{imageName}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
index f60fced7d05d4..740650d6fdfa9 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
@@ -11,5 +11,6 @@
     <section name="CmsNewPagePageActionsSection">
         <element name="savePage" type="button" selector="#save" timeout="30"/>
         <element name="saveAndContinueEdit" type="button" selector="#save_and_continue" timeout="10"/>
+        <element name="insertWidgetButton" type="button" selector=".scalable.action-add-widget.plugin" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageBasicFieldsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageBasicFieldsSection.xml
index cf07d1003b7c2..1d9e58e870cfb 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageBasicFieldsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageBasicFieldsSection.xml
@@ -7,8 +7,9 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CmsNewPagePageBasicFieldsSection">
         <element name="pageTitle" type="input" selector="input[name=title]"/>
+        <element name="requiredFieldIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index=title]&gt;.admin__field-label span'), ':after').getPropertyValue('content');"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
index 63069c2ccf264..370e7af15d4b2 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CmsPagesPageActionsSection">
         <element name="addNewPage" type="button" selector="#add" timeout="30"/>
         <element name="select" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//button[text()='Select']" parameterized="true"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCmsPageSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCmsPageSection.xml
new file mode 100644
index 0000000000000..3795af36fc004
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCmsPageSection.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="StorefrontCmsPageSection">
+        <element name="imageSource" type="text" selector="img[src*='{{imageName}}']" parameterized="true"/>
+        <element name="mainContent" type="text" selector="#maincontent"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminRestrictedUserOnlyAccessCmsBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminRestrictedUserOnlyAccessCmsBlockTest.xml
new file mode 100644
index 0000000000000..d0ed330779676
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminRestrictedUserOnlyAccessCmsBlockTest.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="AdminRestrictedUserOnlyAccessCmsBlockTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="Check access for restricted admin user"/>
+            <title value="Check: restricted admin with access only to CMS Block"/>
+            <description value="Check that the system shows information only in Blocks"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-13814"/>
+            <useCaseId value="MAGETWO-88612"/>
+            <group value="Cms"/>
+        </annotations>
+        <before>
+            <createData entity="restrictedWebUser" stepKey="createRestrictedAdmin"/>
+            <actionGroup ref="LoginToAdminActionGroup" stepKey="loginToBackend"/>
+            <actionGroup ref="AdminCreateUserRoleActionGroup" stepKey="createRestrictedAdminRole">
+                <argument name="roleName" value="{{RoleTest.roleName}}"/>
+                <argument name="resourceAccess" value="Custom"/>
+                <argument name="resource" value="Magento_Cms::block"/>
+            </actionGroup>
+            <actionGroup ref="AdminAssignUserRoleActionGroup" stepKey="assignAdminRole">
+                <argument name="user_restricted" value="$$createRestrictedAdmin$$"/>
+                <argument name="roleName" value="{{RoleTest.roleName}}"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logOut"/>
+        </before>
+        <after>
+            <actionGroup ref="LoginActionGroup" stepKey="loginAsAdminWithAllAccess"/>
+            <actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteRestrictedRole">
+                <argument name="roleName" value="{{RoleTest.roleName}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteUserActionGroup" stepKey="deleteRestrictedUser">
+                <argument name="user_restricted" value="$$createRestrictedAdmin$$"/>
+            </actionGroup>
+            <!--Log Out-->
+            <actionGroup ref="logout" stepKey="logOut"/>
+        </after>
+
+        <!--login as restricted user-->
+        <actionGroup ref="AdminLoginAsAnyUser" stepKey="logAsNewUser">
+            <argument name="login" value="$$createRestrictedAdmin.username$$"/>
+            <argument name="password" value="$$createRestrictedAdmin.password$$"/>
+        </actionGroup>
+
+        <!--Verify that The system shows information included in "Blocks"-->
+        <see userInput="Blocks" stepKey="seeBlocksPage"/>
+        <seeInCurrentUrl url="{{AdminCmsBlockGridPage.url}}" stepKey="assertUrl"/>
+        <!--Log Out-->
+        <actionGroup ref="logout" stepKey="logOut"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/CheckCreateStaticBlockOnDuplicateIdentifierTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/CheckCreateStaticBlockOnDuplicateIdentifierTest.xml
new file mode 100644
index 0000000000000..ac1b68269740f
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/CheckCreateStaticBlockOnDuplicateIdentifierTest.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="CheckCreateStaticBlockOnDuplicateIdentifierTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="Create CMS Block"/>
+            <title value="Check static blocks: ID should be unique per Store View"/>
+            <description value="Check static blocks: ID should be unique per Store View"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-13912"/>
+            <useCaseId value="MAGETWO-86215"/>
+            <group value="cms"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createSecondWebsite">
+                <argument name="newWebsiteName" value="{{SecondWebsite.name}}"/>
+                <argument name="websiteCode" value="{{SecondWebsite.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createSecondStoreGroup">
+                <argument name="website" value="{{SecondWebsite.name}}"/>
+                <argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
+                <argument name="storeGroupCode" value="{{SecondStoreGroupUnique.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createSecondStoreView">
+                <argument name="storeGroup" value="SecondStoreGroupUnique"/>
+                <argument name="customStore" value="SecondStoreUnique"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCmsBlockActionGroup" stepKey="deleteCMSBlockActionGroup"/>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
+                <argument name="websiteName" value="{{SecondWebsite.name}}"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="NavigateToCreateCmsBlockActionGroup" stepKey="navigateToCreateCmsBlock"/>
+        <actionGroup ref="FillCmsBlockForm" stepKey="fillCmsBlockForm"/>
+        <actionGroup ref="SaveCmsBlockActionGroup" stepKey="saveCmsBlock"/>
+        <actionGroup ref="NavigateToCreateCmsBlockActionGroup" stepKey="navigateToCreateDuplicateCmsBlock"/>
+        <actionGroup ref="FillCmsBlockForm" stepKey="fillDuplicateCmsBlockForm">
+            <argument name="store" value="[{{_defaultStore.name}},{{SecondStoreUnique.name}}]"/>
+        </actionGroup>
+        <actionGroup ref="SaveCmsBlockWithErrorActionGroup" stepKey="assertErrorMessageOnSave"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/DeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/DeleteTest.php
index 55e8382d9ca23..c11c7c3810832 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/DeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/DeleteTest.php
@@ -73,7 +73,7 @@ protected function setUp()
             false,
             true,
             true,
-            ['getParam']
+            ['getParam', 'isPost']
         );
 
         $this->blockMock = $this->getMockBuilder(\Magento\Cms\Model\Block::class)
@@ -110,6 +110,8 @@ protected function setUp()
             ->method('getResultRedirectFactory')
             ->willReturn($this->resultRedirectFactoryMock);
 
+        $this->requestMock->expects($this->any())->method('isPost')->willReturn(true);
+
         $this->deleteController = $this->objectManager->getObject(
             \Magento\Cms\Controller\Adminhtml\Block\Delete::class,
             [
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
index 39a7d0d74e4d8..3088e3b62c364 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
@@ -36,12 +36,16 @@ protected function setUp()
         $this->blockCollectionMock =
             $this->createMock(\Magento\Cms\Model\ResourceModel\Block\Collection::class);
 
+        $requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
+        $requestMock->expects($this->any())->method('isPost')->willReturn(true);
+        $this->contextMock->expects($this->any())->method('getRequest')->willReturn($requestMock);
+
         $this->massDeleteController = $this->objectManager->getObject(
             \Magento\Cms\Controller\Adminhtml\Block\MassDelete::class,
             [
                 'context' => $this->contextMock,
                 'filter' => $this->filterMock,
-                'collectionFactory' => $this->collectionFactoryMock
+                'collectionFactory' => $this->collectionFactoryMock,
             ]
         );
     }
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/DeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/DeleteTest.php
index 09b36bc41d405..48098242197ae 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/DeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/DeleteTest.php
@@ -56,7 +56,7 @@ protected function setUp()
             false,
             true,
             true,
-            ['getParam']
+            ['getParam', 'isPost']
         );
 
         $this->pageMock = $this->getMockBuilder(\Magento\Cms\Model\Page::class)
@@ -95,6 +95,8 @@ protected function setUp()
             ->method('getResultRedirectFactory')
             ->willReturn($this->resultRedirectFactoryMock);
 
+        $this->requestMock->expects($this->any())->method('isPost')->willReturn(true);
+
         $this->deleteController = $this->objectManager->getObject(
             \Magento\Cms\Controller\Adminhtml\Page\Delete::class,
             [
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
index f51ab152ba2a4..c0f3a719091d7 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
@@ -36,12 +36,16 @@ protected function setUp()
         $this->pageCollectionMock =
             $this->createMock(\Magento\Cms\Model\ResourceModel\Page\Collection::class);
 
+        $requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
+        $requestMock->expects($this->any())->method('isPost')->willReturn(true);
+        $this->contextMock->expects($this->any())->method('getRequest')->willReturn($requestMock);
+
         $this->massDeleteController = $this->objectManager->getObject(
             \Magento\Cms\Controller\Adminhtml\Page\MassDelete::class,
             [
                 'context' => $this->contextMock,
                 'filter' => $this->filterMock,
-                'collectionFactory' => $this->collectionFactoryMock
+                'collectionFactory' => $this->collectionFactoryMock,
             ]
         );
     }
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
index 5b80dd1873d5c..64b47b5a08416 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
@@ -35,6 +35,10 @@ protected function setUp()
 
         $this->pageCollectionMock = $this->createMock(\Magento\Cms\Model\ResourceModel\Page\Collection::class);
 
+        $requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
+        $requestMock->expects($this->any())->method('isPost')->willReturn(true);
+        $this->contextMock->expects($this->any())->method('getRequest')->willReturn($requestMock);
+
         $this->massDisableController = $this->objectManager->getObject(
             \Magento\Cms\Controller\Adminhtml\Page\MassDisable::class,
             [
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
index 16b3dfe4ee638..a63a81882dfe9 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
@@ -35,6 +35,10 @@ protected function setUp()
 
         $this->pageCollectionMock = $this->createMock(\Magento\Cms\Model\ResourceModel\Page\Collection::class);
 
+        $requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
+        $requestMock->expects($this->any())->method('isPost')->willReturn(true);
+        $this->contextMock->expects($this->any())->method('getRequest')->willReturn($requestMock);
+
         $this->massEnableController = $this->objectManager->getObject(
             \Magento\Cms\Controller\Adminhtml\Page\MassEnable::class,
             [
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Plugin/ProductTest.php b/app/code/Magento/Cms/Test/Unit/Model/Plugin/ProductTest.php
new file mode 100644
index 0000000000000..3e8d811623616
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Unit/Model/Plugin/ProductTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cms\Test\Unit\Model\Plugin;
+
+use Magento\Catalog\Model\Product as CatalogProduct;
+use Magento\Cms\Model\Page;
+use Magento\Cms\Model\Plugin\Product;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Product plugin test
+ */
+class ProductTest extends TestCase
+{
+    /**
+     * @var Product
+     */
+    private $plugin;
+
+    /**
+     * @var MockObject|CatalogProduct
+     */
+    private $product;
+
+    /**
+     * @var MockObject|Page
+     */
+    private $page;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->product = $this->getMockBuilder(CatalogProduct::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getEntityId', 'getOrigData', 'getData', 'getCategoryIds'])
+            ->getMock();
+
+        $this->page = $this->getMockBuilder(Page::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getId', 'load'])
+            ->getMock();
+
+        $this->plugin = $objectManager->getObject(
+            Product::class,
+            [
+                'page' => $this->page
+            ]
+        );
+    }
+
+    public function testAfterGetIdentities()
+    {
+        $baseIdentities = [
+            'SomeCacheId',
+            'AnotherCacheId',
+        ];
+        $id = 12345;
+        $pageId = 1;
+        $expectedIdentities = [
+            'SomeCacheId',
+            'AnotherCacheId',
+            Page::CACHE_TAG . '_' . $pageId,
+        ];
+
+        $this->product->method('getEntityId')
+            ->willReturn($id);
+        $this->product->method('getOrigData')
+            ->with('status')
+            ->willReturn(2);
+        $this->product->method('getData')
+            ->with('status')
+            ->willReturn(1);
+        $this->page->method('getId')
+            ->willReturn(1);
+        $this->page->method('load')
+            ->willReturnSelf();
+
+        $identities = $this->plugin->afterGetIdentities($this->product, $baseIdentities);
+
+        $this->assertEquals($expectedIdentities, $identities);
+    }
+}
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 906a7d4fbc605..20c0b2075f5c3 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
@@ -414,6 +414,10 @@ protected function generalTestGetDirsCollection($path, $collectionArray = [], $e
             ->method('setCollectRecursively')
             ->with(false)
             ->willReturnSelf();
+        $storageCollectionMock->expects($this->once())
+            ->method('setOrder')
+            ->with('basename', \Magento\Framework\Data\Collection\Filesystem::SORT_ORDER_ASC)
+            ->willReturnSelf();
         $storageCollectionMock->expects($this->once())
             ->method('getIterator')
             ->willReturn(new \ArrayIterator($collectionArray));
diff --git a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/BlockActionsTest.php b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/BlockActionsTest.php
index 3dcf6c4a3fce0..3095abef7bbe3 100644
--- a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/BlockActionsTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/BlockActionsTest.php
@@ -95,6 +95,7 @@ public function testPrepareDataSource()
                             'title' => __('Delete %1', $title),
                             'message' => __('Are you sure you want to delete a %1 record?', $title)
                         ],
+                        'post' => true
                     ]
                 ],
             ]
diff --git a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php
index b0cc1bf061a48..9b3165a2c5517 100644
--- a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php
@@ -70,6 +70,7 @@ public function testPrepareItemsByPageId()
                             'title' => __('Delete %1', $title),
                             'message' => __('Are you sure you want to delete a %1 record?', $title)
                         ],
+                        'post' => true
                     ]
                 ],
             ]
diff --git a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php
index 54e0e17ab7ad6..ec9cb86c6c9dc 100644
--- a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php
@@ -118,11 +118,12 @@ public function testPrepareMetadata()
                         'config' => [
                             'editorConfig' => [
                                 'enabled' => false
-                            ]
-                        ]
-                    ]
-                ]
-            ]
+                            ],
+                            'componentType' => \Magento\Ui\Component\Container::NAME,
+                        ],
+                    ],
+                ],
+            ],
         ];
 
         $this->assertEquals(
diff --git a/app/code/Magento/Cms/Ui/Component/DataProvider.php b/app/code/Magento/Cms/Ui/Component/DataProvider.php
index 5fc9c5a896037..a0f68f8dde05a 100644
--- a/app/code/Magento/Cms/Ui/Component/DataProvider.php
+++ b/app/code/Magento/Cms/Ui/Component/DataProvider.php
@@ -13,6 +13,9 @@
 use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\View\Element\UiComponent\DataProvider\Reporting;
 
+/**
+ * DataProvider for cms ui.
+ */
 class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider
 {
     /**
@@ -67,6 +70,8 @@ public function __construct(
     }
 
     /**
+     * Get authorization info.
+     *
      * @deprecated 101.0.7
      * @return AuthorizationInterface|mixed
      */
@@ -95,11 +100,12 @@ public function prepareMetadata()
                             'config' => [
                                 'editorConfig' => [
                                     'enabled' => false
-                                ]
-                            ]
-                        ]
-                    ]
-                ]
+                                ],
+                                'componentType' => \Magento\Ui\Component\Container::NAME,
+                            ],
+                        ],
+                    ],
+                ],
             ];
         }
 
diff --git a/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php b/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
index 60b9f34d29ae6..30b966c6a8610 100644
--- a/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
+++ b/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
@@ -87,7 +87,8 @@ public function prepareDataSource(array $dataSource)
                             'confirm' => [
                                 'title' => __('Delete %1', $title),
                                 'message' => __('Are you sure you want to delete a %1 record?', $title)
-                            ]
+                            ],
+                            'post' => true,
                         ]
                     ];
                 }
@@ -99,6 +100,7 @@ public function prepareDataSource(array $dataSource)
 
     /**
      * Get instance of escaper
+     *
      * @return Escaper
      * @deprecated 101.0.7
      */
diff --git a/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php b/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
index ea6882e21c85f..f7c16e2065c47 100644
--- a/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
+++ b/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
@@ -89,7 +89,8 @@ public function prepareDataSource(array $dataSource)
                         'confirm' => [
                             'title' => __('Delete %1', $title),
                             'message' => __('Are you sure you want to delete a %1 record?', $title)
-                        ]
+                        ],
+                        'post' => true,
                     ];
                 }
                 if (isset($item['identifier'])) {
@@ -110,6 +111,7 @@ public function prepareDataSource(array $dataSource)
 
     /**
      * Get instance of escaper
+     *
      * @return Escaper
      * @deprecated 101.0.7
      */
diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json
index 64e97e0a38e18..547814a8680ea 100644
--- a/app/code/Magento/Cms/composer.json
+++ b/app/code/Magento/Cms/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-cms",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-theme": "100.2.*",
         "magento/module-widget": "101.0.*",
@@ -18,7 +18,7 @@
         "magento/module-cms-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "102.0.6",
+    "version": "102.0.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Cms/etc/di.xml b/app/code/Magento/Cms/etc/di.xml
index e11f7bf5933e6..622745434483c 100644
--- a/app/code/Magento/Cms/etc/di.xml
+++ b/app/code/Magento/Cms/etc/di.xml
@@ -197,4 +197,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\Product">
+        <plugin name="cms" type="Magento\Cms\Model\Plugin\Product" sortOrder="100"/>
+    </type>
 </config>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
index a4c570f9d65a1..f19450cb09c66 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
@@ -15,7 +15,7 @@ $_height = $block->getImagesHeight();
 <?php if ($block->getFilesCount() > 0): ?>
     <?php foreach ($block->getFiles() as $file): ?>
     <div data-row="file" class="filecnt" id="<?= $block->escapeHtmlAttr($block->getFileId($file)) ?>">
-        <p class="nm" style="height:<?= $block->escapeHtmlAttr($_height) ?>px;width:<?= $block->escapeHtmlAttr($_width) ?>px;">
+        <p class="nm" style="height:<?= $block->escapeHtmlAttr($_height) ?>px;">
         <?php if ($block->getFileThumbUrl($file)):?>
             <img src="<?= $block->escapeHtmlAttr($block->getFileThumbUrl($file)) ?>" alt="<?= $block->escapeHtmlAttr($block->getFileName($file)) ?>"/>
         <?php endif; ?>
diff --git a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml
index 9f886f6f1345e..793fc7d26cb4a 100644
--- a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml
+++ b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml
@@ -146,7 +146,6 @@
                 <editor>
                     <validation>
                         <rule name="required-entry" xsi:type="boolean">true</rule>
-                        <rule name="validate-xml-identifier" xsi:type="boolean">true</rule>
                     </validation>
                     <editorType>text</editorType>
                 </editor>
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 5441481f6cea2..a73c8e803c7d2 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
@@ -287,6 +287,7 @@
             <settings>
                 <validation>
                     <rule name="validate-date" xsi:type="boolean">true</rule>
+                    <rule name="validate-date-range" xsi:type="string">custom_theme_from</rule>
                 </validation>
                 <dataType>text</dataType>
                 <label translate="true">To</label>
diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json
index 414dcdf54921d..572e95c0f0c03 100644
--- a/app/code/Magento/CmsUrlRewrite/composer.json
+++ b/app/code/Magento/CmsUrlRewrite/composer.json
@@ -2,14 +2,14 @@
     "name": "magento/module-cms-url-rewrite",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-cms": "102.0.*",
         "magento/module-url-rewrite": "101.0.*",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Config/App/Config/Type/System.php b/app/code/Magento/Config/App/Config/Type/System.php
index 83c61f90f789a..c07872a630830 100644
--- a/app/code/Magento/Config/App/Config/Type/System.php
+++ b/app/code/Magento/Config/App/Config/Type/System.php
@@ -11,6 +11,7 @@
 use Magento\Framework\App\Config\Spi\PreProcessorInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Config\App\Config\Type\System\Reader;
+use Magento\Framework\Lock\LockManagerInterface;
 use Magento\Framework\Serialize\Serializer\Sensitive as SensitiveSerializer;
 use Magento\Framework\Serialize\Serializer\SensitiveFactory as SensitiveSerializerFactory;
 use Magento\Framework\App\ScopeInterface;
@@ -24,12 +25,43 @@
  *
  * @api
  * @since 100.1.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class System implements ConfigTypeInterface
 {
+    /**
+     * Config cache tag.
+     */
     const CACHE_TAG = 'config_scopes';
+
+    /**
+     * System config type.
+     */
     const CONFIG_TYPE = 'system';
 
+    /**
+     * @var string
+     */
+    private static $lockName = 'SYSTEM_CONFIG';
+
+    /**
+     * Timeout between retrieves to load the configuration from the cache.
+     *
+     * Value of the variable in microseconds.
+     *
+     * @var int
+     */
+    private static $delayTimeout = 50000;
+
+    /**
+     * Lifetime of the lock for write in cache.
+     *
+     * Value of the variable in seconds.
+     *
+     * @var int
+     */
+    private static $lockTimeout = 8;
+
     /**
      * @var array
      */
@@ -71,6 +103,11 @@ class System implements ConfigTypeInterface
      */
     private $availableDataScopes;
 
+    /**
+     * @var LockManagerInterface
+     */
+    private $locker;
+
     /**
      * @param ConfigSourceInterface $source
      * @param PostProcessorInterface $postProcessor
@@ -82,7 +119,7 @@ class System implements ConfigTypeInterface
      * @param string $configType
      * @param Reader $reader
      * @param SensitiveSerializerFactory|null $sensitiveFactory
-     *
+     * @param LockManagerInterface|null $locker
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -96,7 +133,8 @@ public function __construct(
         $cachingNestedLevel = 1,
         $configType = self::CONFIG_TYPE,
         Reader $reader = null,
-        SensitiveSerializerFactory $sensitiveFactory = null
+        SensitiveSerializerFactory $sensitiveFactory = null,
+        LockManagerInterface $locker = null
     ) {
         $this->postProcessor = $postProcessor;
         $this->cache = $cache;
@@ -110,6 +148,7 @@ public function __construct(
         $this->serializer = $sensitiveFactory->create(
             ['serializer' => $serializer]
         );
+        $this->locker = $locker ?: ObjectManager::getInstance()->get(LockManagerInterface::class);
     }
 
     /**
@@ -153,7 +192,7 @@ private function getWithParts($path)
 
         if (count($pathParts) === 1 && $pathParts[0] !== ScopeInterface::SCOPE_DEFAULT) {
             if (!isset($this->data[$pathParts[0]])) {
-                $data = $this->readData();
+                $data = $this->loadAllData();
                 $this->data = array_replace_recursive($data, $this->data);
             }
 
@@ -186,21 +225,60 @@ private function getWithParts($path)
     }
 
     /**
-     * Load configuration data for all scopes
+     * Make lock on data load.
      *
+     * @param callable $dataLoader
+     * @param bool $flush
      * @return array
      */
-    private function loadAllData()
+    private function lockedLoadData(callable $dataLoader, bool $flush = false): array
     {
-        $cachedData = $this->cache->load($this->configType);
+        $cachedData = $dataLoader(); //optimistic read
 
-        if ($cachedData === false) {
-            $data = $this->readData();
-        } else {
-            $data = $this->serializer->unserialize($cachedData);
+        while ($cachedData === false && $this->locker->isLocked(self::$lockName)) {
+            usleep(self::$delayTimeout);
+            $cachedData = $dataLoader();
         }
 
-        return $data;
+        while ($cachedData === false) {
+            try {
+                if ($this->locker->lock(self::$lockName, self::$lockTimeout)) {
+                    if (!$flush) {
+                        $data = $this->readData();
+                        $this->cacheData($data);
+                        $cachedData = $data;
+                    } else {
+                        $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [self::CACHE_TAG]);
+                        $cachedData = [];
+                    }
+                }
+            } finally {
+                $this->locker->unlock(self::$lockName);
+            }
+
+            if ($cachedData === false) {
+                usleep(self::$delayTimeout);
+                $cachedData = $dataLoader();
+            }
+        }
+
+        return $cachedData;
+    }
+
+    /**
+     * Load configuration data for all scopes
+     *
+     * @return array
+     */
+    private function loadAllData()
+    {
+        return $this->lockedLoadData(function () {
+            $cachedData = $this->cache->load($this->configType);
+            if ($cachedData === false) {
+                return $cachedData;
+            }
+            return $this->serializer->unserialize($cachedData);
+        });
     }
 
     /**
@@ -211,16 +289,13 @@ private function loadAllData()
      */
     private function loadDefaultScopeData($scopeType)
     {
-        $cachedData = $this->cache->load($this->configType . '_' . $scopeType);
-
-        if ($cachedData === false) {
-            $data = $this->readData();
-            $this->cacheData($data);
-        } else {
-            $data = [$scopeType => $this->serializer->unserialize($cachedData)];
-        }
-
-        return $data;
+        return $this->lockedLoadData(function () use ($scopeType) {
+            $cachedData = $this->cache->load($this->configType . '_' . $scopeType);
+            if ($cachedData === false) {
+                return $cachedData;
+            }
+            return  [$scopeType => $this->serializer->unserialize($cachedData)];
+        });
     }
 
     /**
@@ -232,25 +307,22 @@ private function loadDefaultScopeData($scopeType)
      */
     private function loadScopeData($scopeType, $scopeId)
     {
-        $cachedData = $this->cache->load($this->configType . '_' . $scopeType . '_' . $scopeId);
-
-        if ($cachedData === false) {
-            if ($this->availableDataScopes === null) {
-                $cachedScopeData = $this->cache->load($this->configType . '_scopes');
-                if ($cachedScopeData !== false) {
-                    $this->availableDataScopes = $this->serializer->unserialize($cachedScopeData);
+        return $this->lockedLoadData(function () use ($scopeType, $scopeId) {
+            $cachedData = $this->cache->load($this->configType . '_' . $scopeType . '_' . $scopeId);
+            if ($cachedData === false) {
+                if ($this->availableDataScopes === null) {
+                    $cachedScopeData = $this->cache->load($this->configType . '_scopes');
+                    if ($cachedScopeData !== false) {
+                        $this->availableDataScopes = $this->serializer->unserialize($cachedScopeData);
+                    }
                 }
+                if (is_array($this->availableDataScopes) && !isset($this->availableDataScopes[$scopeType][$scopeId])) {
+                    return [$scopeType => [$scopeId => []]];
+                }
+                return false;
             }
-            if (is_array($this->availableDataScopes) && !isset($this->availableDataScopes[$scopeType][$scopeId])) {
-                return [$scopeType => [$scopeId => []]];
-            }
-            $data = $this->readData();
-            $this->cacheData($data);
-        } else {
-            $data = [$scopeType => [$scopeId => $this->serializer->unserialize($cachedData)]];
-        }
-
-        return $data;
+            return [$scopeType => [$scopeId => $this->serializer->unserialize($cachedData)]];
+        });
     }
 
     /**
@@ -340,6 +412,11 @@ private function readData(): array
     public function clean()
     {
         $this->data = [];
-        $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [self::CACHE_TAG]);
+        $this->lockedLoadData(
+            function () {
+                return false;
+            },
+            true
+        );
     }
 }
diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
index 81e39a83296d7..63a2b811f93ec 100644
--- a/app/code/Magento/Config/Block/System/Config/Form.php
+++ b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -143,13 +143,15 @@ public function __construct(
         \Magento\Config\Model\Config\Structure $configStructure,
         \Magento\Config\Block\System\Config\Form\Fieldset\Factory $fieldsetFactory,
         \Magento\Config\Block\System\Config\Form\Field\Factory $fieldFactory,
-        array $data = []
+        array $data = [],
+        SettingChecker $settingChecker = null
     ) {
         parent::__construct($context, $registry, $formFactory, $data);
         $this->_configFactory = $configFactory;
         $this->_configStructure = $configStructure;
         $this->_fieldsetFactory = $fieldsetFactory;
         $this->_fieldFactory = $fieldFactory;
+        $this->settingChecker = $settingChecker ?: ObjectManager::getInstance()->get(SettingChecker::class);
 
         $this->_scopeLabels = [
             self::SCOPE_DEFAULT => __('[GLOBAL]'),
@@ -158,18 +160,6 @@ public function __construct(
         ];
     }
 
-    /**
-     * @deprecated 100.1.2
-     * @return SettingChecker
-     */
-    private function getSettingChecker()
-    {
-        if ($this->settingChecker === null) {
-            $this->settingChecker = ObjectManager::getInstance()->get(SettingChecker::class);
-        }
-        return $this->settingChecker;
-    }
-
     /**
      * Initialize objects required to render config form
      *
@@ -366,9 +356,8 @@ protected function _initElement(
 
         $sharedClass = $this->_getSharedCssClass($field);
         $requiresClass = $this->_getRequiresCssClass($field, $fieldPrefix);
+        $isReadOnly = $this->isReadOnly($field, $path);
 
-        $isReadOnly = $this->getElementVisibility()->isDisabled($field->getPath())
-            ?: $this->getSettingChecker()->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
         $formField = $fieldset->addField(
             $elementId,
             $field->getType(),
@@ -417,7 +406,7 @@ private function getFieldData(\Magento\Config\Model\Config\Structure\Element\Fie
     {
         $data = $this->getAppConfigDataValue($path);
 
-        $placeholderValue = $this->getSettingChecker()->getPlaceholderValue(
+        $placeholderValue = $this->settingChecker->getPlaceholderValue(
             $path,
             $this->getScope(),
             $this->getStringScopeCode()
@@ -434,6 +423,10 @@ private function getFieldData(\Magento\Config\Model\Config\Structure\Element\Fie
                 $backendModel = $field->getBackendModel();
                 // Backend models which implement ProcessorInterface are processed by ScopeConfigInterface
                 if (!$backendModel instanceof ProcessorInterface) {
+                    if (array_key_exists($path, $this->_configData)) {
+                        $data = $this->_configData[$path];
+                    }
+
                     $backendModel->setPath($path)
                         ->setValue($data)
                         ->setWebsite($this->getWebsiteCode())
@@ -718,6 +711,7 @@ protected function _getAdditionalElementTypes()
      *
      * @TODO delete this methods when {^see above^} is done
      * @return string
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getSectionCode()
     {
@@ -729,6 +723,7 @@ public function getSectionCode()
      *
      * @TODO delete this methods when {^see above^} is done
      * @return string
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getWebsiteCode()
     {
@@ -740,6 +735,7 @@ public function getWebsiteCode()
      *
      * @TODO delete this methods when {^see above^} is done
      * @return string
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getStoreCode()
     {
@@ -797,6 +793,26 @@ private function getAppConfig()
         return $this->appConfig;
     }
 
+    /**
+     * Check Path is Readonly
+     *
+     * @param \Magento\Config\Model\Config\Structure\Element\Field $field
+     * @param string $path
+     * @return boolean
+     */
+    private function isReadOnly(\Magento\Config\Model\Config\Structure\Element\Field $field, $path)
+    {
+        $isReadOnly = $this->settingChecker->isReadOnly(
+            $path,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+        );
+        if (!$isReadOnly) {
+            $isReadOnly = $this->getElementVisibility()->isDisabled($field->getPath())
+                ?: $this->settingChecker->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
+        }
+        return $isReadOnly;
+    }
+
     /**
      * Retrieve deployment config data value by path
      *
diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
index d7d513bfad423..a3c7c7d079cbb 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
@@ -7,17 +7,19 @@
 
 use Magento\Config\App\Config\Type\System;
 use Magento\Config\Console\Command\ConfigSetCommand;
+use Magento\Config\Model\Config\Factory as ConfigFactory;
 use Magento\Framework\App\Config\ConfigPathResolver;
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Config\Model\PreparedValueFactory;
-use Magento\Framework\App\Config\Value;
 
 /**
  * Processes default flow of config:set command.
+ *
  * This processor saves the value of configuration into database.
  *
- * {@inheritdoc}
+ * @inheritdoc
  * @api
  * @since 100.2.0
  */
@@ -44,26 +46,36 @@ class DefaultProcessor implements ConfigSetProcessorInterface
      */
     private $preparedValueFactory;
 
+    /**
+     * @var ConfigFactory
+     */
+    private $configFactory;
+
     /**
      * @param PreparedValueFactory $preparedValueFactory The factory for prepared value
      * @param DeploymentConfig $deploymentConfig The deployment configuration reader
      * @param ConfigPathResolver $configPathResolver The resolver for configuration paths according to source type
+     * @param ConfigFactory|null $configFactory
      */
     public function __construct(
         PreparedValueFactory $preparedValueFactory,
         DeploymentConfig $deploymentConfig,
-        ConfigPathResolver $configPathResolver
+        ConfigPathResolver $configPathResolver,
+        ConfigFactory $configFactory = null
     ) {
         $this->preparedValueFactory = $preparedValueFactory;
         $this->deploymentConfig = $deploymentConfig;
         $this->configPathResolver = $configPathResolver;
+
+        $this->configFactory = $configFactory ?? ObjectManager::getInstance()->get(ConfigFactory::class);
     }
 
     /**
      * Processes database flow of config:set command.
+     *
      * Requires installed application.
      *
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 100.2.0
      */
     public function process($path, $value, $scope, $scopeCode)
@@ -78,12 +90,14 @@ public function process($path, $value, $scope, $scopeCode)
         }
 
         try {
-            /** @var Value $backendModel */
-            $backendModel = $this->preparedValueFactory->create($path, $value, $scope, $scopeCode);
-            if ($backendModel instanceof Value) {
-                $resourceModel = $backendModel->getResource();
-                $resourceModel->save($backendModel);
-            }
+            $config = $this->configFactory->create([
+                'data' => [
+                    'scope' => $scope,
+                    'scope_code' => $scopeCode,
+                ],
+            ]);
+            $config->setDataByPath($path, $value);
+            $config->save();
         } catch (\Exception $exception) {
             throw new CouldNotSaveException(__('%1', $exception->getMessage()), $exception);
         }
diff --git a/app/code/Magento/Config/Console/Command/ConfigSetCommand.php b/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
index cb79daddbf5f9..999d8e41af5bc 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
@@ -114,13 +114,13 @@ protected function configure()
                 ),
                 new InputOption(
                     static::OPTION_LOCK_ENV,
-                    'le',
+                    'e',
                     InputOption::VALUE_NONE,
                     'Lock value which prevents modification in the Admin (will be saved in app/etc/env.php)'
                 ),
                 new InputOption(
                     static::OPTION_LOCK_CONFIG,
-                    'lc',
+                    'c',
                     InputOption::VALUE_NONE,
                     'Lock and share value with other installations, prevents modification in the Admin '
                     . '(will be saved in app/etc/config.php)'
@@ -139,8 +139,10 @@ protected function configure()
     /**
      * Creates and run appropriate processor, depending on input options.
      *
-     * {@inheritdoc}
+     * @param InputInterface $input
+     * @param OutputInterface $output
      * @since 100.2.0
+     * @return int|null
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php
index 7f7d461ea090d..893a73654137e 100644
--- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php
+++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php
@@ -6,6 +6,7 @@
 namespace Magento\Config\Controller\Adminhtml\System\Config;
 
 use Magento\Config\Controller\Adminhtml\System\AbstractConfig;
+use Magento\Framework\Exception\NotFoundException;
 
 /**
  * System Configuration Save Controller
@@ -140,9 +141,14 @@ protected function _saveAdvanced()
      * Save configuration
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         try {
             // custom save logic
             $this->_saveSection();
diff --git a/app/code/Magento/Config/Model/Config.php b/app/code/Magento/Config/Model/Config.php
index 0472c5daa276f..e562b637fac23 100644
--- a/app/code/Magento/Config/Model/Config.php
+++ b/app/code/Magento/Config/Model/Config.php
@@ -9,15 +9,32 @@
 use Magento\Config\Model\Config\Structure\Element\Group;
 use Magento\Config\Model\Config\Structure\Element\Field;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ScopeInterface;
+use Magento\Framework\App\ScopeResolverPool;
+use Magento\Store\Model\ScopeInterface as StoreScopeInterface;
+use Magento\Store\Model\ScopeTypeNormalizer;
 
 /**
  * Backend config model
+ *
  * Used to save configuration
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
+ * @method string getSection()
+ * @method void setSection(string $section)
+ * @method string getWebsite()
+ * @method void setWebsite(string $website)
+ * @method string getStore()
+ * @method void setStore(string $store)
+ * @method string getScope()
+ * @method void setScope(string $scope)
+ * @method int getScopeId()
+ * @method void setScopeId(int $scopeId)
+ * @method string getScopeCode()
+ * @method void setScopeCode(string $scopeCode)
  */
 class Config extends \Magento\Framework\DataObject
 {
@@ -87,6 +104,16 @@ class Config extends \Magento\Framework\DataObject
      */
     private $settingChecker;
 
+    /**
+     * @var ScopeResolverPool
+     */
+    private $scopeResolverPool;
+
+    /**
+     * @var ScopeTypeNormalizer
+     */
+    private $scopeTypeNormalizer;
+
     /**
      * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -97,6 +124,9 @@ class Config extends \Magento\Framework\DataObject
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param Config\Reader\Source\Deployed\SettingChecker|null $settingChecker
      * @param array $data
+     * @param ScopeResolverPool|null $scopeResolverPool
+     * @param ScopeTypeNormalizer|null $scopeTypeNormalizer
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\App\Config\ReinitableConfigInterface $config,
@@ -107,7 +137,9 @@ public function __construct(
         \Magento\Framework\App\Config\ValueFactory $configValueFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         SettingChecker $settingChecker = null,
-        array $data = []
+        array $data = [],
+        ScopeResolverPool $scopeResolverPool = null,
+        ScopeTypeNormalizer $scopeTypeNormalizer = null
     ) {
         parent::__construct($data);
         $this->_eventManager = $eventManager;
@@ -117,11 +149,17 @@ public function __construct(
         $this->_configLoader = $configLoader;
         $this->_configValueFactory = $configValueFactory;
         $this->_storeManager = $storeManager;
-        $this->settingChecker = $settingChecker ?: ObjectManager::getInstance()->get(SettingChecker::class);
+        $this->settingChecker = $settingChecker
+            ?? ObjectManager::getInstance()->get(SettingChecker::class);
+        $this->scopeResolverPool = $scopeResolverPool
+            ?? ObjectManager::getInstance()->get(ScopeResolverPool::class);
+        $this->scopeTypeNormalizer = $scopeTypeNormalizer
+            ?? ObjectManager::getInstance()->get(ScopeTypeNormalizer::class);
     }
 
     /**
      * Save config section
+     *
      * Require set: section, website, store and groups
      *
      * @throws \Exception
@@ -386,6 +424,11 @@ protected function _processGroup(
                 if (!isset($fieldData['value'])) {
                     $fieldData['value'] = null;
                 }
+                
+                if ($field->getType() == 'multiline' && is_array($fieldData['value'])) {
+                    $fieldData['value'] = trim(implode(PHP_EOL, $fieldData['value']));
+                }
+                
                 $data = [
                     'field' => $fieldId,
                     'groups' => $groups,
@@ -482,30 +525,37 @@ public function setDataByPath($path, $value)
         if ($path === '') {
             throw new \UnexpectedValueException('Path must not be empty');
         }
+
         $pathParts = explode('/', $path);
         $keyDepth = count($pathParts);
-        if ($keyDepth !== 3) {
+        if ($keyDepth < 3) {
             throw new \UnexpectedValueException(
-                "Allowed depth of configuration is 3 (<section>/<group>/<field>). Your configuration depth is "
-                . $keyDepth . " for path '$path'"
+                'Minimal depth of configuration is 3. Your configuration depth is ' . $keyDepth
             );
         }
+
+        $section = array_shift($pathParts);
+        $this->setData('section', $section);
+
         $data = [
-            'section' => $pathParts[0],
-            'groups' => [
-                $pathParts[1] => [
-                    'fields' => [
-                        $pathParts[2] => ['value' => $value],
-                    ],
-                ],
+            'fields' => [
+                array_pop($pathParts) => ['value' => $value],
             ],
         ];
-        $this->addData($data);
+        while ($pathParts) {
+            $data = [
+                'groups' => [
+                    array_pop($pathParts) => $data,
+                ],
+            ];
+        }
+        $groups = array_replace_recursive((array) $this->getData('groups'), $data['groups']);
+        $this->setData('groups', $groups);
     }
 
     /**
-     * Get scope name and scopeId
-     * @todo refactor to scope resolver
+     * Set scope data
+     *
      * @return void
      */
     private function initScope()
@@ -513,31 +563,66 @@ private function initScope()
         if ($this->getSection() === null) {
             $this->setSection('');
         }
+
+        $scope = $this->retrieveScope();
+        $this->setScope($this->scopeTypeNormalizer->normalize($scope->getScopeType()));
+        $this->setScopeCode($scope->getCode());
+        $this->setScopeId($scope->getId());
+
         if ($this->getWebsite() === null) {
-            $this->setWebsite('');
+            $this->setWebsite(StoreScopeInterface::SCOPE_WEBSITES === $this->getScope() ? $scope->getId() : '');
         }
         if ($this->getStore() === null) {
-            $this->setStore('');
+            $this->setStore(StoreScopeInterface::SCOPE_STORES === $this->getScope() ? $scope->getId() : '');
         }
+    }
 
-        if ($this->getStore()) {
-            $scope = 'stores';
-            $store = $this->_storeManager->getStore($this->getStore());
-            $scopeId = (int)$store->getId();
-            $scopeCode = $store->getCode();
-        } elseif ($this->getWebsite()) {
-            $scope = 'websites';
-            $website = $this->_storeManager->getWebsite($this->getWebsite());
-            $scopeId = (int)$website->getId();
-            $scopeCode = $website->getCode();
+    /**
+     * Retrieve scope from initial data
+     *
+     * @return ScopeInterface
+     */
+    private function retrieveScope(): ScopeInterface
+    {
+        $scopeType = $this->getScope();
+        if (!$scopeType) {
+            switch (true) {
+                case $this->getStore():
+                    $scopeType = StoreScopeInterface::SCOPE_STORES;
+                    $scopeIdentifier = $this->getStore();
+                    break;
+                case $this->getWebsite():
+                    $scopeType = StoreScopeInterface::SCOPE_WEBSITES;
+                    $scopeIdentifier = $this->getWebsite();
+                    break;
+                default:
+                    $scopeType = ScopeInterface::SCOPE_DEFAULT;
+                    $scopeIdentifier = null;
+                    break;
+            }
         } else {
-            $scope = 'default';
-            $scopeId = 0;
-            $scopeCode = '';
+            switch (true) {
+                case $this->getScopeId() !== null:
+                    $scopeIdentifier = $this->getScopeId();
+                    break;
+                case $this->getScopeCode() !== null:
+                    $scopeIdentifier = $this->getScopeCode();
+                    break;
+                case $this->getStore() !== null:
+                    $scopeIdentifier = $this->getStore();
+                    break;
+                case $this->getWebsite() !== null:
+                    $scopeIdentifier = $this->getWebsite();
+                    break;
+                default:
+                    $scopeIdentifier = null;
+                    break;
+            }
         }
-        $this->setScope($scope);
-        $this->setScopeId($scopeId);
-        $this->setScopeCode($scopeCode);
+        $scope = $this->scopeResolverPool->get($scopeType)
+            ->getScope($scopeIdentifier);
+
+        return $scope;
     }
 
     /**
diff --git a/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php b/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php
index 9a483de6a695b..d12569eebe5b2 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php
@@ -56,8 +56,9 @@ public function beforeSave()
     {
         $value = $this->getValue();
         if ($value == 1) {
-            $customUrl = $this->getData('groups/url/fields/custom/value');
-            if (empty($customUrl)) {
+            $customUrlField = $this->getData('groups/url/fields/custom/value');
+            $customUrlConfig = $this->_config->getValue('admin/url/custom');
+            if (empty($customUrlField) && empty($customUrlConfig)) {
                 throw new \Magento\Framework\Exception\LocalizedException(__('Please specify the admin custom URL.'));
             }
         }
diff --git a/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php b/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
index 4ae66bfd9692b..25303093ace5d 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
@@ -14,6 +14,8 @@
 namespace Magento\Config\Model\Config\Backend\Currency;
 
 /**
+ * Base currency class
+ *
  * @api
  * @since 100.0.2
  */
@@ -26,18 +28,19 @@ abstract class AbstractCurrency extends \Magento\Framework\App\Config\Value
      */
     protected function _getAllowedCurrencies()
     {
-        if (!$this->isFormData() || $this->getData('groups/options/fields/allow/inherit')) {
-            return explode(
+        $allowValue = $this->getData('groups/options/fields/allow/value');
+        $allowedCurrencies = $allowValue === null || $this->getData('groups/options/fields/allow/inherit')
+            ? explode(
                 ',',
                 (string)$this->_config->getValue(
                     \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_ALLOW,
                     $this->getScope(),
                     $this->getScopeId()
                 )
-            );
-        }
+            )
+            : (array) $allowValue;
 
-        return (array)$this->getData('groups/options/fields/allow/value');
+        return $allowedCurrencies;
     }
 
     /**
diff --git a/app/code/Magento/Config/Model/Config/Backend/Serialized.php b/app/code/Magento/Config/Model/Config/Backend/Serialized.php
index 3d5713357c39c..4d5da764db470 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Serialized.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Serialized.php
@@ -52,7 +52,18 @@ protected function _afterLoad()
     {
         $value = $this->getValue();
         if (!is_array($value)) {
-            $this->setValue(empty($value) ? false : $this->serializer->unserialize($value));
+            try {
+                $this->setValue(empty($value) ? false : $this->serializer->unserialize($value));
+            } catch (\Exception $e) {
+                $this->_logger->critical(
+                    sprintf(
+                        'Failed to unserialize %s config value. The error is: %s',
+                        $this->getPath(),
+                        $e->getMessage()
+                    )
+                );
+                $this->setValue(false);
+            }
         }
     }
 
diff --git a/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php b/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php
index b3474674cf76d..5beff0d043ade 100644
--- a/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php
+++ b/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php
@@ -4,12 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Locale currency source
- */
 namespace Magento\Config\Model\Config\Source\Locale;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Locale\ListsInterface;
+
 /**
+ * Locale currency source.
+ *
  * @api
  * @since 100.0.2
  */
@@ -21,27 +24,70 @@ class Currency implements \Magento\Framework\Option\ArrayInterface
     protected $_options;
 
     /**
-     * @var \Magento\Framework\Locale\ListsInterface
+     * @var ListsInterface
      */
     protected $_localeLists;
 
     /**
-     * @param \Magento\Framework\Locale\ListsInterface $localeLists
+     * @var ScopeConfigInterface
      */
-    public function __construct(\Magento\Framework\Locale\ListsInterface $localeLists)
-    {
+    private $config;
+
+    /**
+     * @var array
+     */
+    private $installedCurrencies;
+
+    /**
+     * @param ListsInterface $localeLists
+     * @param ScopeConfigInterface $config
+     */
+    public function __construct(
+        ListsInterface $localeLists,
+        ScopeConfigInterface $config = null
+    ) {
         $this->_localeLists = $localeLists;
+        $this->config = $config ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
     }
 
     /**
-     * @return array
+     * @inheritdoc
      */
     public function toOptionArray()
     {
         if (!$this->_options) {
             $this->_options = $this->_localeLists->getOptionCurrencies();
         }
-        $options = $this->_options;
+
+        $selected = array_flip($this->getInstalledCurrencies());
+
+        $options = array_filter(
+            $this->_options,
+            function ($option) use ($selected) {
+                return isset($selected[$option['value']]);
+            }
+        );
+
         return $options;
     }
+
+    /**
+     * Retrieve Installed Currencies.
+     *
+     * @return array
+     */
+    private function getInstalledCurrencies()
+    {
+        if (!$this->installedCurrencies) {
+            $this->installedCurrencies = explode(
+                ',',
+                $this->config->getValue(
+                    'system/currency/installed',
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                )
+            );
+        }
+
+        return $this->installedCurrencies;
+    }
 }
diff --git a/app/code/Magento/Config/Setup/ConfigOptionsList.php b/app/code/Magento/Config/Setup/ConfigOptionsList.php
new file mode 100644
index 0000000000000..45e3987d282f1
--- /dev/null
+++ b/app/code/Magento/Config/Setup/ConfigOptionsList.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Config\Setup;
+
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Config\Data\ConfigDataFactory;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Setup\ConfigOptionsListInterface;
+use Magento\Framework\Setup\Option\SelectConfigOption;
+
+/**
+ * Deployment configuration options required for the Config module.
+ */
+class ConfigOptionsList implements ConfigOptionsListInterface
+{
+    /**
+     * Input key for the option.
+     */
+    const INPUT_KEY_DEBUG_LOGGING = 'enable-debug-logging';
+
+    /**
+     * Path to the value in the deployment config.
+     */
+    const CONFIG_PATH_DEBUG_LOGGING = 'dev/debug/debug_logging';
+
+    /**
+     * @var ConfigDataFactory
+     */
+    private $configDataFactory;
+
+    /**
+     * @param ConfigDataFactory $configDataFactory
+     */
+    public function __construct(ConfigDataFactory $configDataFactory)
+    {
+        $this->configDataFactory = $configDataFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getOptions()
+    {
+        return [
+            new SelectConfigOption(
+                self::INPUT_KEY_DEBUG_LOGGING,
+                SelectConfigOption::FRONTEND_WIZARD_RADIO,
+                [true, false, 1, 0],
+                self::CONFIG_PATH_DEBUG_LOGGING,
+                'Enable debug logging'
+            )
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function createConfig(array $options, DeploymentConfig $deploymentConfig)
+    {
+        $config = [];
+        if (isset($options[self::INPUT_KEY_DEBUG_LOGGING])) {
+            $configData = $this->configDataFactory->create(ConfigFilePool::APP_ENV);
+            if ($options[self::INPUT_KEY_DEBUG_LOGGING] === 'true'
+                || $options[self::INPUT_KEY_DEBUG_LOGGING] === '1') {
+                $value = 1;
+            } else {
+                $value = 0;
+            }
+            $configData->set(self::CONFIG_PATH_DEBUG_LOGGING, $value);
+            $config[] = $configData;
+        }
+
+        return $config;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(array $options, DeploymentConfig $deploymentConfig)
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSaveConfigActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSaveConfigActionGroup.xml
new file mode 100644
index 0000000000000..6ed0cfe95cb94
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSaveConfigActionGroup.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="AdminSaveConfigActionGroup">
+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="clickSaveConfigBtn"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminWebsiteCountryOptionsActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminWebsiteCountryOptionsActionGroup.xml
new file mode 100644
index 0000000000000..d80736529173f
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminWebsiteCountryOptionsActionGroup.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AllowOnlyOneCountryActionGroup">
+        <arguments>
+            <argument name="country" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{AdminConfigurationGeneralCountryOptionsSection.countryOptions}}" dependentSelector="{{AdminConfigurationGeneralCountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="openCountryOptionsTab"/>
+        <waitForElementVisible selector="{{AdminConfigurationGeneralCountryOptionsSection.allowedCountries}}" stepKey="waitAllowedCountriesToBeVisible"/>
+        <uncheckOption selector="{{AdminConfigurationGeneralCountryOptionsSection.generalCountryDefaultInherit}}" stepKey="uncheckDefaultCountryInheritCheckbox"/>
+        <selectOption selector="{{AdminConfigurationGeneralCountryOptionsSection.generalCountryDefault}}" userInput="{{country}}" stepKey="chooseDefaultCountry"/>
+        <uncheckOption selector="{{AdminConfigurationGeneralCountryOptionsSection.generalCountryAllowInherit}}" stepKey="uncheckAllowInheritCheckbox"/>
+        <selectOption selector="{{AdminConfigurationGeneralCountryOptionsSection.allowedCountries}}" userInput="{{country}}" stepKey="chooseAllowedCountries"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfig"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+    <actionGroup name="AllowAllCountriesExceptOneActionGroup" extends="AllowOnlyOneCountryActionGroup">
+        <remove keyForRemoval="uncheckDefaultCountryInheritCheckbox"/>
+        <remove keyForRemoval="chooseDefaultCountry"/>
+        <remove keyForRemoval="chooseAllowedCountries"/>
+        <unselectOption selector="{{AdminConfigurationGeneralCountryOptionsSection.allowedCountries}}" userInput="{{country}}" after="uncheckAllowInheritCheckbox" stepKey="unselectCountry"/>
+    </actionGroup>
+    <actionGroup name="SetWebsiteCountryOptionsToDefaultActionGroup">
+        <conditionalClick selector="{{AdminConfigurationGeneralCountryOptionsSection.countryOptions}}" dependentSelector="{{AdminConfigurationGeneralCountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="openCountryOptionsTab"/>
+        <waitForElementVisible selector="{{AdminConfigurationGeneralCountryOptionsSection.topDestinations}}" stepKey="waitCheckboxToBeVisible"/>
+        <checkOption selector="{{AdminConfigurationGeneralCountryOptionsSection.generalCountryAllowInherit}}" stepKey="setAllowInheritToDefault"/>
+        <checkOption selector="{{AdminConfigurationGeneralCountryOptionsSection.generalCountryDefaultInherit}}" stepKey="setDefaultCountryInheritToDefault"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfig"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/Data/LocaleOptionsData.xml b/app/code/Magento/Config/Test/Mftf/Data/LocaleOptionsData.xml
new file mode 100644
index 0000000000000..e998730d11ae7
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Data/LocaleOptionsData.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SetLocaleOptions" type="locale_options_config">
+        <requiredEntity type="code">LocaleOptionsFrance</requiredEntity>
+    </entity>
+    <entity name="LocaleOptionsFrance" type="code">
+        <data key="value">fr_FR</data>
+    </entity>
+
+    <entity name="DefaultLocaleOptions" type="locale_options_config">
+        <requiredEntity type="code">LocaleOptionsUSA</requiredEntity>
+    </entity>
+    <entity name="LocaleOptionsUSA" type="code">
+        <data key="value">en_US</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Config/Test/Mftf/Data/WebUrlOptionsConfigData.xml b/app/code/Magento/Config/Test/Mftf/Data/WebUrlOptionsConfigData.xml
new file mode 100644
index 0000000000000..5010e383ba55c
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Data/WebUrlOptionsConfigData.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="DefaultWebUrlOptionsConfig" type="web_url_use_store">
+        <requiredEntity type="url_use_store_value">DefaultConfigWebUrlOptions</requiredEntity>
+    </entity>
+    <entity name="DefaultConfigWebUrlOptions" type="url_use_store_value">
+        <data key="value">0</data>
+    </entity>
+
+    <entity name="EnableWebUrlOptionsConfig" type="web_url_use_store">
+        <requiredEntity type="url_use_store_value">WebUrlOptionsYes</requiredEntity>
+    </entity>
+    <entity name="WebUrlOptionsYes" type="url_use_store_value">
+        <data key="value">1</data>
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/locale_options_config-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/locale_options_config-meta.xml
new file mode 100644
index 0000000000000..6398d51cda916
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Metadata/locale_options_config-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="GeneralLocaleOptionsConfig" dataType="locale_options_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/general/" method="POST" successRegex="/messages-message-success/">
+        <object key="groups" dataType="locale_options_config">
+            <object key="locale" dataType="locale_options_config">
+                <object key="fields" dataType="locale_options_config">
+                    <object key="code" dataType="code">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/web_url_options_config-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/web_url_options_config-meta.xml
new file mode 100644
index 0000000000000..58809f8b41e28
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Metadata/web_url_options_config-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="WebUrlOptionsConfig" dataType="web_url_use_store" type="create" auth="adminFormKey" url="/admin/system_config/save/section/web/"
+               method="POST" successRegex="/messages-message-success/" returnRegex="">
+        <object key="groups" dataType="web_url_use_store">
+            <object key="url" dataType="web_url_use_store">
+                <object key="fields" dataType="web_url_use_store">
+                    <object key="use_store" dataType="url_use_store_value">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
\ No newline at end of file
diff --git a/app/code/Magento/Config/Test/Mftf/Page/AdminCatalogSearchConfigurationPage.xml b/app/code/Magento/Config/Test/Mftf/Page/AdminCatalogSearchConfigurationPage.xml
new file mode 100644
index 0000000000000..6b3c6e1a40871
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Page/AdminCatalogSearchConfigurationPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCatalogSearchConfigurationPage" url="admin/system_config/edit/section/catalog/" area="admin" module="Magento_Config">
+        <section name="AdminCatalogSearchEngineConfigurationSection"/>
+    </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 ded825ea89098..90b4e6d0bdaa9 100644
--- a/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml
+++ b/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="AdminConfigPage" url="admin/system_config/" area="admin" module="Magento_Config">
         <section name="AdminConfigSection"/>
     </page>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminCatalogSearchEngineConfigurationSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminCatalogSearchEngineConfigurationSection.xml
new file mode 100644
index 0000000000000..2cde11434b26d
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminCatalogSearchEngineConfigurationSection.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="AdminCatalogSearchEngineConfigurationSection">
+        <element name="searchEngineOptimization" type="button" selector="#catalog_seo-head"/>
+        <element name="openedEngineOptimization" type="button" selector="#catalog_seo-head.open"/>
+        <element name="systemValueUseCategoriesPath" type="checkbox" selector="#catalog_seo_product_use_categories_inherit"/>
+        <element name="selectUseCategoriesPatForProductUrls" type="select" selector="#catalog_seo_product_use_categories"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
index c58e77d200bfb..62b5cdcf9ceec 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminSalesConfigSection">
         <element name="enableMAPUseSystemValue" type="checkbox" selector="#sales_msrp_enabled_inherit"/>
         <element name="enableMAPSelect" type="select" selector="#sales_msrp_enabled"/>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml b/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
index 18a124ac669ec..409a9222eebec 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ContentManagementSection">
         <element name="WYSIWYGOptions" type="button" selector="#cms_wysiwyg-head"/>
         <element name="CheckIfTabExpand" type="button" selector="#cms_wysiwyg-head:not(.open)"/>
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php
index de18d45d26864..011bcfee64af5 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php
@@ -11,6 +11,11 @@
 
 class FileTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $escaperMock;
+
     /**
      * @var \Magento\Config\Block\System\Config\Form\Field\File
      */
@@ -24,6 +29,8 @@ class FileTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $this->escaperMock->method('escapeHtml')->willReturnArgument(0);
 
         $this->testData = [
             'before_element_html' => 'test_before_element_html',
@@ -40,7 +47,10 @@ protected function setUp()
 
         $this->file = $objectManager->getObject(
             \Magento\Config\Block\System\Config\Form\Field\File::class,
-            ['data' => $this->testData]
+            [
+                'escaper' => $this->escaperMock,
+                'data' => $this->testData
+            ]
         );
 
         $formMock = new \Magento\Framework\DataObject();
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
index e62aa37af47dc..6f771a2e38078 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
@@ -13,6 +13,11 @@
 
 class ImageTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $escaperMock;
+
     /**
      * @var \Magento\Framework\Url|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -31,10 +36,13 @@ class ImageTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $this->escaperMock->method('escapeHtml')->willReturnArgument(0);
         $this->urlBuilderMock = $this->createMock(\Magento\Framework\Url::class);
         $this->image = $objectManager->getObject(
             \Magento\Config\Block\System\Config\Form\Field\Image::class,
             [
+                'escaper' => $this->escaperMock,
                 'urlBuilder' => $this->urlBuilderMock,
             ]
         );
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
index f5c65e848b3bf..3799136aea9c0 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
@@ -7,6 +7,11 @@
 
 class AllowspecificTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $escaperMock;
+
     /**
      * @var \Magento\Config\Block\System\Config\Form\Field\Select\Allowspecific
      */
@@ -20,8 +25,11 @@ class AllowspecificTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $this->escaperMock->method('escapeHtml')->willReturnArgument(0);
         $this->_object = $testHelper->getObject(
-            \Magento\Config\Block\System\Config\Form\Field\Select\Allowspecific::class
+            \Magento\Config\Block\System\Config\Form\Field\Select\Allowspecific::class,
+            ['escaper' => $this->escaperMock]
         );
         $this->_object->setData('html_id', 'spec_element');
         $this->_formMock = $this->createPartialMock(
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
index 83b7bd5fda42e..528d141306cce 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
@@ -103,6 +103,9 @@ protected function setUp()
         $this->_fieldsetFactoryMock = $this->createMock(\Magento\Config\Block\System\Config\Form\Fieldset\Factory::class);
         $this->_fieldFactoryMock = $this->createMock(\Magento\Config\Block\System\Config\Form\Field\Factory::class);
         $this->_coreConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $settingCheckerMock = $this->getMockBuilder(SettingChecker::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->_backendConfigMock = $this->createMock(\Magento\Config\Model\Config::class);
 
@@ -150,6 +153,7 @@ protected function setUp()
             'fieldsetFactory' => $this->_fieldsetFactoryMock,
             'fieldFactory' => $this->_fieldFactoryMock,
             'context' => $context,
+            'settingChecker' => $settingCheckerMock,
         ];
 
         $objectArguments = $helper->getConstructArguments(\Magento\Config\Block\System\Config\Form::class, $data);
@@ -529,7 +533,7 @@ public function testInitFields(
 
         $elementVisibilityMock = $this->getMockBuilder(ElementVisibilityInterface::class)
             ->getMockForAbstractClass();
-        $elementVisibilityMock->expects($this->once())
+        $elementVisibilityMock->expects($this->any())
             ->method('isDisabled')
             ->willReturn($isDisabled);
 
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
index 984e0fe842687..b5665aa8ae7d0 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
@@ -7,13 +7,14 @@
 
 use Magento\Config\App\Config\Type\System;
 use Magento\Config\Console\Command\ConfigSet\DefaultProcessor;
+use Magento\Config\Model\Config;
+use Magento\Config\Model\Config\Factory as ConfigFactory;
 use Magento\Framework\App\Config\ConfigPathResolver;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Config\Model\PreparedValueFactory;
 use Magento\Framework\App\Config\Value;
-use Magento\Framework\App\Config\ValueInterface;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use PHPUnit_Framework_MockObject_MockObject as Mock;
 
@@ -55,17 +56,18 @@ class DefaultProcessorTest extends \PHPUnit\Framework\TestCase
      */
     private $resourceModelMock;
 
+    /**
+     * @var ConfigFactory|Mock
+     */
+    private $configFactory;
+
     /**
      * @inheritdoc
      */
     protected function setUp()
     {
-        $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->configPathResolverMock = $this->getMockBuilder(ConfigPathResolver::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+        $this->configPathResolverMock = $this->createMock(ConfigPathResolver::class);
         $this->resourceModelMock = $this->getMockBuilder(AbstractDb::class)
             ->disableOriginalConstructor()
             ->setMethods(['save'])
@@ -74,14 +76,14 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['getResource'])
             ->getMock();
-        $this->preparedValueFactoryMock = $this->getMockBuilder(PreparedValueFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->preparedValueFactoryMock = $this->createMock(PreparedValueFactory::class);
+        $this->configFactory = $this->createMock(ConfigFactory::class);
 
         $this->model = new DefaultProcessor(
             $this->preparedValueFactoryMock,
             $this->deploymentConfigMock,
-            $this->configPathResolverMock
+            $this->configPathResolverMock,
+            $this->configFactory
         );
     }
 
@@ -97,16 +99,16 @@ protected function setUp()
     public function testProcess($path, $value, $scope, $scopeCode)
     {
         $this->configMockForProcessTest($path, $scope, $scopeCode);
-
-        $this->preparedValueFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($this->valueMock);
-        $this->valueMock->expects($this->once())
-            ->method('getResource')
-            ->willReturn($this->resourceModelMock);
-        $this->resourceModelMock->expects($this->once())
+        $scopeData = ['scope' => $scope, 'scope_code' => $scopeCode];
+
+        $config = $this->createMock(Config::class);
+        $this->configFactory->method('create')
+            ->with(['data' => $scopeData])
+            ->willReturn($config);
+        $config->method('setDataByPath')
+            ->with($path, $value);
+        $config->expects($this->once())
             ->method('save')
-            ->with($this->valueMock)
             ->willReturnSelf();
 
         $this->model->process($path, $value, $scope, $scopeCode);
@@ -124,28 +126,6 @@ public function processDataProvider()
         ];
     }
 
-    public function testProcessWithWrongValueInstance()
-    {
-        $path = 'test/test/test';
-        $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT;
-        $scopeCode = null;
-        $value = 'value';
-        $valueInterfaceMock = $this->getMockBuilder(ValueInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->configMockForProcessTest($path, $scope, $scopeCode);
-
-        $this->preparedValueFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($valueInterfaceMock);
-        $this->valueMock->expects($this->never())
-            ->method('getResource');
-        $this->resourceModelMock->expects($this->never())
-            ->method('save');
-
-        $this->model->process($path, $value, $scope, $scopeCode);
-    }
-
     /**
      * @param string $path
      * @param string $scope
@@ -185,6 +165,9 @@ public function testProcessLockedValue()
             ->method('resolve')
             ->willReturn('system/default/test/test/test');
 
+        $this->configFactory->expects($this->never())
+            ->method('create');
+
         $this->model->process($path, $value, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null);
     }
 }
diff --git a/app/code/Magento/Config/Test/Unit/Controller/Adminhtml/System/Config/SaveTest.php b/app/code/Magento/Config/Test/Unit/Controller/Adminhtml/System/Config/SaveTest.php
index 069a1c20b2966..980d8355de555 100644
--- a/app/code/Magento/Config/Test/Unit/Controller/Adminhtml/System/Config/SaveTest.php
+++ b/app/code/Magento/Config/Test/Unit/Controller/Adminhtml/System/Config/SaveTest.php
@@ -69,6 +69,7 @@ class SaveTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->_requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
+        $this->_requestMock->expects($this->any())->method('isPost')->willReturn(true);
         $this->_responseMock = $this->createMock(\Magento\Framework\App\Response\Http::class);
 
         $configStructureMock = $this->createMock(\Magento\Config\Model\Config\Structure::class);
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php
index bb1e0e0225901..048df95f98649 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php
@@ -9,6 +9,7 @@
 use Magento\Framework\Model\Context;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Psr\Log\LoggerInterface;
 
 class SerializedTest extends \PHPUnit\Framework\TestCase
 {
@@ -18,14 +19,20 @@ class SerializedTest extends \PHPUnit\Framework\TestCase
     /** @var Json|\PHPUnit_Framework_MockObject_MockObject */
     private $serializerMock;
 
+    /** @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $loggerMock;
+
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
         $this->serializerMock = $this->createMock(Json::class);
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
         $contextMock = $this->createMock(Context::class);
         $eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
         $contextMock->method('getEventDispatcher')
             ->willReturn($eventManagerMock);
+        $contextMock->method('getLogger')
+            ->willReturn($this->loggerMock);
         $this->serializedConfig = $objectManager->getObject(
             Serialized::class,
             [
@@ -72,6 +79,20 @@ public function afterLoadDataProvider()
         ];
     }
 
+    public function testAfterLoadWithException()
+    {
+        $value = '{"key":';
+        $expected = false;
+        $this->serializedConfig->setValue($value);
+        $this->serializerMock->expects($this->once())
+            ->method('unserialize')
+            ->willThrowException(new \Exception());
+        $this->loggerMock->expects($this->once())
+            ->method('critical');
+        $this->serializedConfig->afterLoad();
+        $this->assertEquals($expected, $this->serializedConfig->getValue());
+    }
+
     /**
      * @param string $expected
      * @param int|double|string|array|boolean|null $value
diff --git a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
index fcc1ff8b9c70c..a731be96af963 100644
--- a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
@@ -5,138 +5,183 @@
  */
 namespace Magento\Config\Test\Unit\Model;
 
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Config\Model\Config;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Config\Model\Config\Structure\Reader;
+use Magento\Framework\DB\TransactionFactory;
+use Magento\Config\Model\Config\Loader;
+use Magento\Framework\App\Config\ValueFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Config\Model\Config\Structure;
+use Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker;
+use Magento\Framework\App\ScopeResolverPool;
+use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\App\ScopeInterface;
+use Magento\Store\Model\ScopeTypeNormalizer;
+use Magento\Framework\DB\Transaction;
+use Magento\Framework\App\Config\Value;
+use Magento\Store\Model\Website;
+use Magento\Config\Model\Config\Structure\Element\Group;
+use Magento\Config\Model\Config\Structure\Element\Field;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Config\Model\Config
+     * @var Config
+     */
+    private $model;
+
+    /**
+     * @var ManagerInterface|MockObject
+     */
+    private $eventManagerMock;
+
+    /**
+     * @var Reader|MockObject
+     */
+    private $structureReaderMock;
+
+    /**
+     * @var TransactionFactory|MockObject
      */
-    protected $_model;
+    private $transFactoryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var ReinitableConfigInterface|MockObject
      */
-    protected $_eventManagerMock;
+    private $appConfigMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Loader|MockObject
      */
-    protected $_structureReaderMock;
+    private $configLoaderMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var ValueFactory|MockObject
      */
-    protected $_transFactoryMock;
+    private $dataFactoryMock;
 
     /**
-     * @var \Magento\Framework\App\Config\ReinitableConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StoreManagerInterface|MockObject
      */
-    protected $_appConfigMock;
+    private $storeManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Structure|MockObject
      */
-    protected $_applicationMock;
+    private $configStructure;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var SettingChecker|MockObject
      */
-    protected $_configLoaderMock;
+    private $settingsChecker;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var ScopeResolverPool|MockObject
      */
-    protected $_dataFactoryMock;
+    private $scopeResolverPool;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var ScopeResolverInterface|MockObject
      */
-    protected $_storeManager;
+    private $scopeResolver;
 
     /**
-     * @var \Magento\Config\Model\Config\Structure
+     * @var ScopeInterface|MockObject
      */
-    protected $_configStructure;
+    private $scope;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var ScopeTypeNormalizer|MockObject
      */
-    private $_settingsChecker;
+    private $scopeTypeNormalizer;
 
     protected function setUp()
     {
-        $this->_eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
-        $this->_structureReaderMock = $this->createPartialMock(
-            \Magento\Config\Model\Config\Structure\Reader::class,
+        $this->eventManagerMock = $this->createMock(ManagerInterface::class);
+        $this->structureReaderMock = $this->createPartialMock(
+            Reader::class,
             ['getConfiguration']
         );
-        $this->_configStructure = $this->createMock(\Magento\Config\Model\Config\Structure::class);
+        $this->configStructure = $this->createMock(Structure::class);
 
-        $this->_structureReaderMock->expects(
-            $this->any()
-        )->method(
-            'getConfiguration'
-        )->will(
-            $this->returnValue($this->_configStructure)
-        );
+        $this->structureReaderMock->method('getConfiguration')
+            ->willReturn($this->configStructure);
 
-        $this->_transFactoryMock = $this->createPartialMock(
-            \Magento\Framework\DB\TransactionFactory::class,
+        $this->transFactoryMock = $this->createPartialMock(
+            TransactionFactory::class,
             ['create', 'addObject']
         );
-        $this->_appConfigMock = $this->createMock(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
-        $this->_configLoaderMock = $this->createPartialMock(
-            \Magento\Config\Model\Config\Loader::class,
+        $this->appConfigMock = $this->createMock(ReinitableConfigInterface::class);
+        $this->configLoaderMock = $this->createPartialMock(
+            Loader::class,
             ['getConfigByPath']
         );
-        $this->_dataFactoryMock = $this->createMock(\Magento\Framework\App\Config\ValueFactory::class);
-
-        $this->_storeManager = $this->getMockForAbstractClass(\Magento\Store\Model\StoreManagerInterface::class);
-
-        $this->_settingsChecker = $this
-            ->createMock(\Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker::class);
-
-        $this->_model = new \Magento\Config\Model\Config(
-            $this->_appConfigMock,
-            $this->_eventManagerMock,
-            $this->_configStructure,
-            $this->_transFactoryMock,
-            $this->_configLoaderMock,
-            $this->_dataFactoryMock,
-            $this->_storeManager,
-            $this->_settingsChecker
+        $this->dataFactoryMock = $this->createMock(ValueFactory::class);
+
+        $this->storeManager = $this->createMock(StoreManagerInterface::class);
+
+        $this->settingsChecker = $this->createMock(SettingChecker::class);
+
+        $this->scopeResolverPool = $this->createMock(ScopeResolverPool::class);
+        $this->scopeResolver = $this->createMock(ScopeResolverInterface::class);
+        $this->scopeResolverPool->method('get')
+            ->willReturn($this->scopeResolver);
+        $this->scope = $this->createMock(ScopeInterface::class);
+        $this->scopeResolver->method('getScope')
+            ->willReturn($this->scope);
+
+        $this->scopeTypeNormalizer = $this->createMock(ScopeTypeNormalizer::class);
+
+        $this->model = new Config(
+            $this->appConfigMock,
+            $this->eventManagerMock,
+            $this->configStructure,
+            $this->transFactoryMock,
+            $this->configLoaderMock,
+            $this->dataFactoryMock,
+            $this->storeManager,
+            $this->settingsChecker,
+            [],
+            $this->scopeResolverPool,
+            $this->scopeTypeNormalizer
         );
     }
 
     public function testSaveDoesNotDoAnythingIfGroupsAreNotPassed()
     {
-        $this->_configLoaderMock->expects($this->never())->method('getConfigByPath');
-        $this->_model->save();
+        $this->configLoaderMock->expects($this->never())->method('getConfigByPath');
+        $this->model->save();
     }
 
     public function testSaveEmptiesNonSetArguments()
     {
-        $this->_structureReaderMock->expects($this->never())->method('getConfiguration');
-        $this->assertNull($this->_model->getSection());
-        $this->assertNull($this->_model->getWebsite());
-        $this->assertNull($this->_model->getStore());
-        $this->_model->save();
-        $this->assertSame('', $this->_model->getSection());
-        $this->assertSame('', $this->_model->getWebsite());
-        $this->assertSame('', $this->_model->getStore());
+        $this->structureReaderMock->expects($this->never())->method('getConfiguration');
+        $this->assertNull($this->model->getSection());
+        $this->assertNull($this->model->getWebsite());
+        $this->assertNull($this->model->getStore());
+        $this->model->save();
+        $this->assertSame('', $this->model->getSection());
+        $this->assertSame('', $this->model->getWebsite());
+        $this->assertSame('', $this->model->getStore());
     }
 
     public function testSaveToCheckAdminSystemConfigChangedSectionEvent()
     {
-        $transactionMock = $this->createMock(\Magento\Framework\DB\Transaction::class);
+        $transactionMock = $this->createMock(Transaction::class);
 
-        $this->_transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
+        $this->transFactoryMock->method('create')
+            ->willReturn($transactionMock);
 
-        $this->_configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
+        $this->configLoaderMock->method('getConfigByPath')
+            ->willReturn([]);
 
-        $this->_eventManagerMock->expects(
+        $this->eventManagerMock->expects(
             $this->at(0)
         )->method(
             'dispatch'
@@ -145,7 +190,7 @@ public function testSaveToCheckAdminSystemConfigChangedSectionEvent()
             $this->arrayHasKey('website')
         );
 
-        $this->_eventManagerMock->expects(
+        $this->eventManagerMock->expects(
             $this->at(0)
         )->method(
             'dispatch'
@@ -154,123 +199,147 @@ public function testSaveToCheckAdminSystemConfigChangedSectionEvent()
             $this->arrayHasKey('store')
         );
 
-        $this->_model->setGroups(['1' => ['data']]);
-        $this->_model->save();
+        $this->model->setGroups(['1' => ['data']]);
+        $this->model->save();
     }
 
     public function testDoNotSaveReadOnlyFields()
     {
-        $transactionMock = $this->createMock(\Magento\Framework\DB\Transaction::class);
-        $this->_transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
+        $transactionMock = $this->createMock(Transaction::class);
+        $this->transFactoryMock->method('create')
+            ->willReturn($transactionMock);
 
-        $this->_settingsChecker->expects($this->any())->method('isReadOnly')->will($this->returnValue(true));
-        $this->_configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
+        $this->settingsChecker->method('isReadOnly')
+            ->willReturn(true);
+        $this->configLoaderMock->method('getConfigByPath')
+            ->willReturn([]);
 
-        $this->_model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
-        $this->_model->setSection('section');
+        $this->model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
+        $this->model->setSection('section');
 
-        $group = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Group::class);
-        $group->method('getPath')->willReturn('section/1');
+        $group = $this->createMock(Group::class);
+        $group->method('getPath')
+            ->willReturn('section/1');
 
-        $field = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Field::class);
-        $field->method('getGroupPath')->willReturn('section/1');
-        $field->method('getId')->willReturn('key');
+        $field = $this->createMock(Field::class);
+        $field->method('getGroupPath')
+            ->willReturn('section/1');
+        $field->method('getId')
+            ->willReturn('key');
 
-        $this->_configStructure->expects($this->at(0))
+        $this->configStructure->expects($this->at(0))
             ->method('getElement')
             ->with('section/1')
-            ->will($this->returnValue($group));
-        $this->_configStructure->expects($this->at(1))
+            ->willReturn($group);
+        $this->configStructure->expects($this->at(1))
             ->method('getElement')
             ->with('section/1')
-            ->will($this->returnValue($group));
-        $this->_configStructure->expects($this->at(2))
+            ->willReturn($group);
+        $this->configStructure->expects($this->at(2))
             ->method('getElement')
             ->with('section/1/key')
-            ->will($this->returnValue($field));
+            ->willReturn($field);
 
         $backendModel = $this->createPartialMock(
-            \Magento\Framework\App\Config\Value::class,
+            Value::class,
             ['addData']
         );
-        $this->_dataFactoryMock->expects($this->any())->method('create')->will($this->returnValue($backendModel));
+        $this->dataFactoryMock->method('create')
+            ->willReturn($backendModel);
 
-        $this->_transFactoryMock->expects($this->never())->method('addObject');
-        $backendModel->expects($this->never())->method('addData');
+        $this->transFactoryMock->expects($this->never())
+            ->method('addObject');
+        $backendModel->expects($this->never())
+            ->method('addData');
 
-        $this->_model->save();
+        $this->model->save();
     }
 
     public function testSaveToCheckScopeDataSet()
     {
-        $transactionMock = $this->createMock(\Magento\Framework\DB\Transaction::class);
-        $this->_transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
+        $transactionMock = $this->createMock(Transaction::class);
+        $this->transFactoryMock->method('create')
+            ->willReturn($transactionMock);
 
-        $this->_configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
+        $this->configLoaderMock->method('getConfigByPath')
+            ->willReturn([]);
 
-        $this->_eventManagerMock->expects($this->at(0))
+        $this->eventManagerMock->expects($this->at(0))
             ->method('dispatch')
             ->with(
                 $this->equalTo('admin_system_config_changed_section_section'),
                 $this->arrayHasKey('website')
             );
-        $this->_eventManagerMock->expects($this->at(0))
+        $this->eventManagerMock->expects($this->at(0))
             ->method('dispatch')
             ->with(
                 $this->equalTo('admin_system_config_changed_section_section'),
                 $this->arrayHasKey('store')
             );
 
-        $group = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Group::class);
+        $group = $this->createMock(Group::class);
         $group->method('getPath')->willReturn('section/1');
 
-        $field = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Field::class);
+        $field = $this->createMock(Field::class);
         $field->method('getGroupPath')->willReturn('section/1');
         $field->method('getId')->willReturn('key');
 
-        $this->_configStructure->expects($this->at(0))
+        $this->configStructure->expects($this->at(0))
             ->method('getElement')
             ->with('section/1')
-            ->will($this->returnValue($group));
-        $this->_configStructure->expects($this->at(1))
+            ->willReturn($group);
+        $this->configStructure->expects($this->at(1))
             ->method('getElement')
             ->with('section/1')
-            ->will($this->returnValue($group));
-        $this->_configStructure->expects($this->at(2))
+            ->willReturn($group);
+        $this->configStructure->expects($this->at(2))
             ->method('getElement')
             ->with('section/1/key')
-            ->will($this->returnValue($field));
-        $this->_configStructure->expects($this->at(3))
+            ->willReturn($field);
+        $this->configStructure->expects($this->at(3))
             ->method('getElement')
             ->with('section/1')
-            ->will($this->returnValue($group));
-        $this->_configStructure->expects($this->at(4))
+            ->willReturn($group);
+        $this->configStructure->expects($this->at(4))
             ->method('getElement')
             ->with('section/1/key')
-            ->will($this->returnValue($field));
-
-        $website = $this->createMock(\Magento\Store\Model\Website::class);
-        $website->expects($this->any())->method('getCode')->will($this->returnValue('website_code'));
-        $this->_storeManager->expects($this->any())->method('getWebsite')->will($this->returnValue($website));
-        $this->_storeManager->expects($this->any())->method('getWebsites')->will($this->returnValue([$website]));
-        $this->_storeManager->expects($this->any())->method('isSingleStoreMode')->will($this->returnValue(true));
-
-        $this->_model->setWebsite('website');
-        $this->_model->setSection('section');
-        $this->_model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
+            ->willReturn($field);
+
+        $this->scopeResolver->method('getScope')
+            ->with('1')
+            ->willReturn($this->scope);
+        $this->scope->expects($this->atLeastOnce())
+            ->method('getScopeType')
+            ->willReturn('website');
+        $this->scope->expects($this->atLeastOnce())
+            ->method('getId')
+            ->willReturn(1);
+        $this->scope->expects($this->atLeastOnce())
+            ->method('getCode')
+            ->willReturn('website_code');
+        $this->scopeTypeNormalizer->expects($this->atLeastOnce())
+            ->method('normalize')
+            ->with('website')
+            ->willReturn('websites');
+        $website = $this->createMock(Website::class);
+        $this->storeManager->method('getWebsites')->willReturn([$website]);
+        $this->storeManager->method('isSingleStoreMode')->willReturn(true);
+
+        $this->model->setWebsite('1');
+        $this->model->setSection('section');
+        $this->model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
 
         $backendModel = $this->createPartialMock(
-            \Magento\Framework\App\Config\Value::class,
+            Value::class,
             ['setPath', 'addData', '__sleep', '__wakeup']
         );
-        $backendModel->expects($this->once())
-            ->method('addData')
+        $backendModel->method('addData')
             ->with([
                 'field' => 'key',
                 'groups' => [1 => ['fields' => ['key' => ['data']]]],
                 'group_id' => null,
                 'scope' => 'websites',
-                'scope_id' => 0,
+                'scope_id' => 1,
                 'scope_code' => 'website_code',
                 'field_config' => null,
                 'fieldset_data' => ['key' => null],
@@ -278,29 +347,68 @@ public function testSaveToCheckScopeDataSet()
         $backendModel->expects($this->once())
             ->method('setPath')
             ->with('section/1/key')
-            ->will($this->returnValue($backendModel));
+            ->willReturn($backendModel);
 
-        $this->_dataFactoryMock->expects($this->any())->method('create')->will($this->returnValue($backendModel));
+        $this->dataFactoryMock->method('create')
+            ->willReturn($backendModel);
 
-        $this->_model->save();
+        $this->model->save();
     }
 
-    public function testSetDataByPath()
+    /**
+     * @param string $path
+     * @param string $value
+     * @param string $section
+     * @param array $groups
+     * @return void
+     * @dataProvider setDataByPathDataProvider
+     */
+    public function testSetDataByPath(string $path, string $value, string $section, array $groups)
     {
-        $value = 'value';
-        $path = '<section>/<group>/<field>';
-        $this->_model->setDataByPath($path, $value);
-        $expected = [
-            'section' => '<section>',
-            'groups' => [
-                '<group>' => [
-                    'fields' => [
-                        '<field>' => ['value' => $value],
+        $this->model->setDataByPath($path, $value);
+        $this->assertEquals($section, $this->model->getData('section'));
+        $this->assertEquals($groups, $this->model->getData('groups'));
+    }
+
+    /**
+     * @return array
+     */
+    public function setDataByPathDataProvider(): array
+    {
+        return [
+            'depth 3' => [
+                'a/b/c',
+                'value1',
+                'a',
+                [
+                    'b' => [
+                        'fields' => [
+                            'c' => ['value' => 'value1'],
+                        ],
+                    ],
+                ],
+            ],
+            'depth 5' => [
+                'a/b/c/d/e',
+                'value1',
+                'a',
+                [
+                    'b' => [
+                        'groups' => [
+                            'c' => [
+                                'groups' => [
+                                    'd' => [
+                                        'fields' => [
+                                            'e' => ['value' => 'value1'],
+                                        ],
+                                    ],
+                                ],
+                            ],
+                        ],
                     ],
                 ],
             ],
         ];
-        $this->assertSame($expected, $this->_model->getData());
     }
 
     /**
@@ -309,34 +417,32 @@ public function testSetDataByPath()
      */
     public function testSetDataByPathEmpty()
     {
-        $this->_model->setDataByPath('', 'value');
+        $this->model->setDataByPath('', 'value');
     }
 
     /**
      * @param string $path
-     * @param string $expectedException
-     *
+     * @return void
      * @dataProvider setDataByPathWrongDepthDataProvider
      */
-    public function testSetDataByPathWrongDepth($path, $expectedException)
+    public function testSetDataByPathWrongDepth(string $path)
     {
-        $expectedException = 'Allowed depth of configuration is 3 (<section>/<group>/<field>). ' . $expectedException;
-        $this->expectException('\UnexpectedValueException');
+        $currentDepth = count(explode('/', $path));
+        $expectedException = 'Minimal depth of configuration is 3. Your configuration depth is ' . $currentDepth;
+        $this->expectException(\UnexpectedValueException::class);
         $this->expectExceptionMessage($expectedException);
         $value = 'value';
-        $this->_model->setDataByPath($path, $value);
+        $this->model->setDataByPath($path, $value);
     }
 
     /**
      * @return array
      */
-    public function setDataByPathWrongDepthDataProvider()
+    public function setDataByPathWrongDepthDataProvider(): array
     {
         return [
-            'depth 2' => ['section/group', "Your configuration depth is 2 for path 'section/group'"],
-            'depth 1' => ['section', "Your configuration depth is 1 for path 'section'"],
-            'depth 4' => ['section/group/field/sub-field', "Your configuration depth is 4 for path"
-            . " 'section/group/field/sub-field'", ],
+            'depth 2' => ['section/group'],
+            'depth 1' => ['section'],
         ];
     }
 }
diff --git a/app/code/Magento/Config/composer.json b/app/code/Magento/Config/composer.json
index e43c9b0382e25..5b737b4c213d5 100644
--- a/app/code/Magento/Config/composer.json
+++ b/app/code/Magento/Config/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-config",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-cron": "100.2.*",
@@ -13,7 +13,7 @@
         "magento/module-deploy": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "101.0.6",
+    "version": "101.0.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Config/etc/di.xml b/app/code/Magento/Config/etc/di.xml
index a5dd18097fb47..87a0e666d2d7b 100644
--- a/app/code/Magento/Config/etc/di.xml
+++ b/app/code/Magento/Config/etc/di.xml
@@ -77,6 +77,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Lock\Backend\Cache">
+        <arguments>
+            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
+        </arguments>
+    </type>
     <type name="Magento\Config\App\Config\Type\System">
         <arguments>
             <argument name="source" xsi:type="object">systemConfigSourceAggregatedProxy</argument>
@@ -85,6 +90,7 @@
             <argument name="preProcessor" xsi:type="object">Magento\Framework\App\Config\PreProcessorComposite</argument>
             <argument name="serializer" xsi:type="object">Magento\Framework\Serialize\Serializer\Serialize</argument>
             <argument name="reader" xsi:type="object">Magento\Config\App\Config\Type\System\Reader\Proxy</argument>
+            <argument name="locker" xsi:type="object">Magento\Framework\Lock\Backend\Cache</argument>
         </arguments>
     </type>
     <type name="Magento\Config\App\Config\Type\System\Reader">
diff --git a/app/code/Magento/Config/etc/module.xml b/app/code/Magento/Config/etc/module.xml
index cdf31ab7a5d19..b7df33554af90 100644
--- a/app/code/Magento/Config/etc/module.xml
+++ b/app/code/Magento/Config/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_Config" setup_version="2.0.0">
+    <module name="Magento_Config" setup_version="2.1.0">
         <sequence>
             <module name="Magento_Store"/>
         </sequence>
diff --git a/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml b/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml
index e8082dae94d98..e8a79efa8d568 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml
@@ -20,7 +20,7 @@ $jsonHelper = $this->helper('Magento\Framework\Json\Helper\Data');
     ], function ($) {
         window.resetRobotsToDefault = function(){
             $('#design_search_engine_robots_custom_instructions').val(<?php
-                /* @escapeNotVerified */ echo $jsonHelper->jsonEncode($block->getRobotsDefaultCustomInstructions())
+                /* @noEscape */ echo $jsonHelper->jsonEncode($block->getRobotsDefaultCustomInstructions())
             ?>);
         }
     });
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
index 9bdca2bdfd280..d11f60134f7e4 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
@@ -4,10 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
-?>
-<?php
 /**
  * @methods
  *  getTitle() - string
@@ -16,7 +12,7 @@
  *  getForm() - html
  */
 ?>
-<form action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>" method="post" id="config-edit-form" enctype="multipart/form-data">
+<form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" id="config-edit-form" enctype="multipart/form-data">
     <?= $block->getBlockHtml('formkey') ?>
     <div class="accordion">
         <?= $block->getChildHtml('form') ?>
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
index cf235d368b9bc..b9cb02927a78f 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php
@@ -13,30 +10,30 @@ $_htmlId = $block->getHtmlId() ? $block->getHtmlId() : '_' . uniqid();
 $_colspan = $block->isAddAfter() ? 2 : 1;
 ?>
 
-<div class="design_theme_ua_regexp" id="grid<?= /* @escapeNotVerified */ $_htmlId ?>">
+<div class="design_theme_ua_regexp" id="grid<?= $block->escapeHtmlAttr($_htmlId) ?>">
     <div class="admin__control-table-wrapper">
-        <table class="admin__control-table" id="<?= /* @escapeNotVerified */ $block->getElement()->getId() ?>">
+        <table class="admin__control-table" id="<?= $block->escapeHtmlAttr($block->getElement()->getId()) ?>">
             <thead>
             <tr>
-                <?php foreach ($block->getColumns() as $columnName => $column): ?>
-                    <th><?= /* @escapeNotVerified */ $column['label'] ?></th>
-                <?php endforeach;?>
-                <th class="col-actions" colspan="<?= /* @escapeNotVerified */ $_colspan ?>"><?= /* @escapeNotVerified */ __('Action') ?></th>
+                <?php foreach ($block->getColumns() as $columnName => $column) : ?>
+                    <th><?= $block->escapeHtml($column['label']) ?></th>
+                <?php endforeach; ?>
+                <th class="col-actions" colspan="<?= (int)$_colspan ?>"><?= $block->escapeHtml(__('Action')) ?></th>
             </tr>
             </thead>
             <tfoot>
             <tr>
                 <td colspan="<?= count($block->getColumns())+$_colspan ?>" class="col-actions-add">
-                    <button id="addToEndBtn<?= /* @escapeNotVerified */ $_htmlId ?>" class="action-add" title="<?= /* @escapeNotVerified */ __('Add') ?>" type="button">
-                        <span><?= /* @escapeNotVerified */ $block->getAddButtonLabel() ?></span>
+                    <button id="addToEndBtn<?= $block->escapeHtmlAttr($_htmlId) ?>" class="action-add" title="<?= $block->escapeHtmlAttr(__('Add')) ?>" type="button">
+                        <span><?= $block->escapeHtml($block->getAddButtonLabel()) ?></span>
                     </button>
                 </td>
             </tr>
             </tfoot>
-            <tbody id="addRow<?= /* @escapeNotVerified */ $_htmlId ?>"></tbody>
+            <tbody id="addRow<?= $block->escapeHtmlAttr($_htmlId) ?>"></tbody>
         </table>
     </div>
-    <input type="hidden" name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[__empty]" value="" />
+    <input type="hidden" name="<?= $block->escapeHtmlAttr($block->getElement()->getName()) ?>[__empty]" value="" />
 
     <script>
         require([
@@ -44,23 +41,28 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
             'prototype'
         ], function (mageTemplate) {
         // create row creator
-        window.arrayRow<?= /* @escapeNotVerified */ $_htmlId ?> = {
+        window.arrayRow<?= $block->escapeJs($_htmlId) ?> = {
 
             // define row prototypeJS template
             template: mageTemplate(
                     '<tr id="<%- _id %>">'
-                    <?php foreach ($block->getColumns() as $columnName => $column): ?>
-                            + '<td>'
-                            + '<?= /* @escapeNotVerified */ $block->renderCellTemplate($columnName) ?>'
-                            + '<\/td>'
-                        <?php endforeach; ?>
-
-                    <?php if ($block->isAddAfter()): ?>
-                            + '<td><button class="action-add" type="button" id="addAfterBtn<%- _id %>"><span><?= /* @escapeNotVerified */ __('Add after') ?><\/span><\/button><\/td>'
-                        <?php endif; ?>
+                    <?php foreach ($block->getColumns() as $columnName => $column) : ?>
+                        + '<td>'
+                        + '<?= $block->escapeJs($block->renderCellTemplate($columnName)) ?>'
+                        + '<\/td>'
+                    <?php endforeach; ?>
 
-                            + '<td class="col-actions"><button onclick="arrayRow<?= /* @escapeNotVerified */ $_htmlId ?>.del(\'<%- _id %>\')" class="action-delete" type="button"><span><?= /* @escapeNotVerified */ __('Delete') ?><\/span><\/button><\/td>'
-                            +'<\/tr>'
+                    <?php if ($block->isAddAfter()) : ?>
+                        + '<td><button class="action-add" type="button" id="addAfterBtn<%- _id %>"><span>'
+                        + '<?= $block->escapeJs($block->escapeHtml(__('Add after'))) ?>'
+                        + '<\/span><\/button><\/td>'
+                    <?php endif; ?>
+
+                    + '<td class="col-actions"><button '
+                    + 'onclick="arrayRow<?= $block->escapeJs($_htmlId) ?>.del(\'<%- _id %>\')" '
+                    + 'class="action-delete" type="button">'
+                    + '<span><?= $block->escapeJs($block->escapeHtml(__('Delete'))) ?><\/span><\/button><\/td>'
+                    + '<\/tr>'
             ),
 
             add: function(rowData, insertAfterId) {
@@ -73,56 +75,61 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
                 } else {
                     var d = new Date();
                     templateValues = {
-                <?php foreach ($block->getColumns() as $columnName => $column): ?>
-                    <?= /* @escapeNotVerified */ $columnName ?>: '',
-                        'option_extra_attrs': {},
-                    <?php endforeach; ?>
+                        <?php foreach ($block->getColumns() as $columnName => $column) : ?>
+                            <?= $block->escapeJs($columnName) ?>: '',
+                                'option_extra_attrs': {},
+                        <?php endforeach; ?>
                         _id: '_' + d.getTime() + '_' + d.getMilliseconds()
                 };
             }
 
             // Insert new row after specified row or at the bottom
             if (insertAfterId) {
-            Element.insert($(insertAfterId), {after: this.template(templateValues)});
-        } else {
-            Element.insert($('addRow<?= /* @escapeNotVerified */ $_htmlId ?>'), {bottom: this.template(templateValues)});
-        }
+                Element.insert($(insertAfterId), {after: this.template(templateValues)});
+            } else {
+                Element.insert($('addRow<?= $block->escapeJs($_htmlId) ?>'), {bottom: this.template(templateValues)});
+            }
 
-        // Fill controls with data
-        if (rowData) {
-            var rowInputElementNames = Object.keys(rowData.column_values);
-            for (var i = 0; i < rowInputElementNames.length; i++) {
-                if ($(rowInputElementNames[i])) {
-                    $(rowInputElementNames[i]).setValue(rowData.column_values[rowInputElementNames[i]]);
+            // Fill controls with data
+            if (rowData) {
+                var rowInputElementNames = Object.keys(rowData.column_values);
+                for (var i = 0; i < rowInputElementNames.length; i++) {
+                    if ($(rowInputElementNames[i])) {
+                        $(rowInputElementNames[i]).setValue(rowData.column_values[rowInputElementNames[i]]);
+                    }
                 }
             }
-        }
 
-        // Add event for {addAfterBtn} button
-        <?php if ($block->isAddAfter()): ?>
-        Event.observe('addAfterBtn' + templateValues._id, 'click', this.add.bind(this, false, templateValues._id));
+            // Add event for {addAfterBtn} button
+            <?php if ($block->isAddAfter()) : ?>
+            Event.observe('addAfterBtn' + templateValues._id, 'click', this.add.bind(this, false, templateValues._id));
             <?php endif; ?>
-        },
+            },
 
-        del: function(rowId) {
-            $(rowId).remove();
-        }
+            del: function(rowId) {
+                $(rowId).remove();
+            }
         }
 
         // bind add action to "Add" button in last row
-        Event.observe('addToEndBtn<?= /* @escapeNotVerified */ $_htmlId ?>', 'click', arrayRow<?= /* @escapeNotVerified */ $_htmlId ?>.add.bind(arrayRow<?= /* @escapeNotVerified */ $_htmlId ?>, false, false));
+        Event.observe('addToEndBtn<?= $block->escapeJs($_htmlId) ?>',
+            'click',
+            arrayRow<?= $block->escapeJs($_htmlId) ?>.add.bind(
+                arrayRow<?= $block->escapeJs($_htmlId) ?>, false, false
+            )
+        );
 
         // add existing rows
         <?php
         foreach ($block->getArrayRows() as $_rowId => $_row) {
-            /* @escapeNotVerified */ echo "arrayRow{$_htmlId}.add(" . $_row->toJson() . ");\n";
+            echo /* @noEscape */ "arrayRow{$block->escapeJs($_htmlId)}.add(" . /* @noEscape */ $_row->toJson() . ");\n";
         }
         ?>
 
         // Toggle the grid availability, if element is disabled (depending on scope)
-        <?php if ($block->getElement()->getDisabled()):?>
-        toggleValueElements({checked: true}, $('grid<?= /* @escapeNotVerified */ $_htmlId ?>').parentNode);
-            <?php endif;?>
+        <?php if ($block->getElement()->getDisabled()) : ?>
+        toggleValueElements({checked: true}, $('grid<?= $block->escapeJs($_htmlId) ?>').parentNode);
+        <?php endif; ?>
         });
     </script>
 </div>
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml
index b703641acadb8..297687786833d 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <script>
 require([
@@ -71,7 +68,7 @@ originModel.prototype = {
     {
         this.reload = false;
         this.loader = new varienLoader(true);
-        this.regionsUrl = "<?= /* @escapeNotVerified */ $block->getUrl('directory/json/countryRegion') ?>";
+        this.regionsUrl = "<?= $block->escapeJs($block->escapeUrl($block->getUrl('directory/json/countryRegion'))) ?>";
 
         this.bindCountryRegionRelation();
     },
@@ -146,21 +143,32 @@ originModel.prototype = {
             var value = this.regionElement.value;
             var disabled = this.regionElement.disabled;
             if (data.length) {
-                var html = '<select name="'+this.regionElement.name+'" id="'+this.regionElement.id+'" class="required-entry select" title="'+this.regionElement.title+'"'+(disabled?" disabled":"")+'>';
+                var select = document.createElement('select');
+                select.setAttribute('name', this.regionElement.name);
+                select.setAttribute('title', this.regionElement.title);
+                select.setAttribute('id', this.regionElement.id);
+                select.setAttribute('class', 'required-entry select');
+                if (disabled) {
+                    select.setAttribute('disabled', '');
+                }
                 for (var i in data) {
                     if (data[i].label) {
-                        html+= '<option value="'+data[i].value+'"';
-                        if (this.regionElement.value && (this.regionElement.value == data[i].value || this.regionElement.value == data[i].label)) {
-                            html+= ' selected';
+                        var option = document.createElement('option');
+                        option.setAttribute('value', data[i].value);
+                        option.innerText = data[i].label;
+                        if (this.regionElement.value &&
+                            (this.regionElement.value == data[i].value || this.regionElement.value == data[i].label)
+                        ) {
+                            option.setAttribute('selected', '');
                         }
-                        html+='>'+data[i].label+'<\/option>';
+                        select.add(option);
                     }
                 }
-                html+= '<\/select>';
 
                 var parentNode = this.regionElement.parentNode;
                 var regionElementId = this.regionElement.id;
-                parentNode.innerHTML = html;
+                parentNode.innerHTML = select.outerHTML;
+
                 this.regionElement = $(regionElementId);
             } else if (this.reload) {
                 this.clearRegionField(disabled);
@@ -168,10 +176,18 @@ originModel.prototype = {
         }
     },
     clearRegionField: function(disabled) {
-        var html = '<input type="text" name="' + this.regionElement.name + '" id="' + this.regionElement.id + '" class="input-text" title="' + this.regionElement.title + '"' + (disabled ? " disabled" : "") + '>';
+        var text = document.createElement('input');
+        text.setAttribute('type', 'text');
+        text.setAttribute('name', this.regionElement.name);
+        text.setAttribute('title', this.regionElement.title);
+        text.setAttribute('id', this.regionElement.id);
+        text.setAttribute('class', 'input-text');
+        if (disabled) {
+            text.setAttribute('disabled', '');
+        }
         var parentNode = this.regionElement.parentNode;
         var regionElementId = this.regionElement.id;
-        parentNode.innerHTML = html;
+        parentNode.innerHTML = text.outerHTML;
         this.regionElement = $(regionElementId);
     }
 }
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml
index 6677b80076478..78ab4e5acffc3 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml
@@ -3,34 +3,31 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /* @var $block \Magento\Backend\Block\Template */ ?>
 <div class="field field-store-switcher">
-    <label class="label" for="store_switcher"><?= /* @escapeNotVerified */ __('Current Configuration Scope:') ?></label>
+    <label class="label" for="store_switcher"><?= $block->escapeHtml(__('Current Configuration Scope:')) ?></label>
     <div class="control">
         <select id="store_switcher" class="system-config-store-switcher" onchange="location.href=this.options[this.selectedIndex].getAttribute('url')">
-        <?php foreach ($block->getStoreSelectOptions() as $_value => $_option): ?>
-        <?php if (isset($_option['is_group'])): ?>
-            <?php if ($_option['is_close']): ?>
+        <?php foreach ($block->getStoreSelectOptions() as $_value => $_option) : ?>
+        <?php if (isset($_option['is_group'])) : ?>
+            <?php if ($_option['is_close']) : ?>
                 </optgroup>
-            <?php else: ?>
-                <optgroup label="<?= $block->escapeHtml($_option['label']) ?>" style="<?= /* @escapeNotVerified */ $_option['style'] ?>">
+            <?php else : ?>
+                <optgroup label="<?= $block->escapeHtmlAttr($_option['label']) ?>" style="<?= $block->escapeHtmlAttr($_option['style']) ?>">
             <?php endif; ?>
             <?php continue ?>
         <?php endif; ?>
-          <option value="<?= $block->escapeHtml($_value) ?>" url="<?= /* @escapeNotVerified */ $_option['url'] ?>" <?= $_option['selected'] ? 'selected="selected"' : '' ?> style="<?= /* @escapeNotVerified */ $_option['style'] ?>">
-              <?= $block->escapeHtml($_option['label']) ?>
-          </option>
+            <option value="<?= $block->escapeHtmlAttr($_value) ?>" url="<?= $block->escapeUrl($_option['url']) ?>" <?= $_option['selected'] ? 'selected="selected"' : '' ?> style="<?= $block->escapeHtmlAttr($_option['style']) ?>">
+                <?= $block->escapeHtml($_option['label']) ?>
+            </option>
         <?php endforeach ?>
         </select>
     </div>
     <?= $block->getHintHtml() ?>
-    <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::store')): ?>
+    <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::store')) : ?>
         <div class="actions">
-            <a href="<?= /* @escapeNotVerified */ $block->getUrl('*/system_store') ?>"><?= /* @escapeNotVerified */ __('Stores') ?></a>
+            <a href="<?= $block->escapeUrl($block->getUrl('*/system_store')) ?>"><?= $block->escapeHtml(__('Stores')) ?></a>
         </div>
     <?php endif; ?>
 </div>
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/tabs.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/tabs.phtml
index d7000f28b5ef3..dd56ba584bd80 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/tabs.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/tabs.phtml
@@ -4,52 +4,46 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Config\Block\System\Config\Tabs */
 ?>
 
-<?php if ($block->getTabs()): ?>
-    <div id="<?= /* @escapeNotVerified */ $block->getId() ?>" class="config-nav">
+<?php if ($block->getTabs()) : ?>
+    <div id="<?= $block->escapeHtmlAttr($block->getId()) ?>" class="config-nav">
         <?php
         /** @var $_tab \Magento\Config\Model\Config\Structure\Element\Tab */
-        foreach ($block->getTabs() as $_tab):
-            ?>
-
-            <?php
-                $activeCollapsible = false;
-                foreach ($_tab->getChildren() as $_section) {
-                    if ($block->isSectionActive($_section)) {
-                        $activeCollapsible = true;
-                    }
+        foreach ($block->getTabs() as $_tab) :
+            $activeCollapsible = false;
+            foreach ($_tab->getChildren() as $_section) {
+                if ($block->isSectionActive($_section)) {
+                    $activeCollapsible = true;
                 }
-            ?>
+            } ?>
 
             <div class="config-nav-block admin__page-nav _collapsed
-                <?php if ($_tab->getClass()): ?>
-                    <?= /* @escapeNotVerified */ $_tab->getClass() ?>
+                <?php if ($_tab->getClass()) : ?>
+                    <?= $block->escapeHtmlAttr($_tab->getClass()) ?>
                 <?php endif ?>"
-                 data-mage-init='{"collapsible":{"active": "<?= /* @escapeNotVerified */ $activeCollapsible ?>",
-                 "openedState": "_show",
-                 "closedState": "_hide",
-                 "collapsible": true,
-                 "animate": 200}}'>
+                 data-mage-init='{"collapsible":{"active": "<?= $block->escapeHtmlAttr($activeCollapsible) ?>",
+                     "openedState": "_show",
+                     "closedState": "_hide",
+                     "collapsible": true,
+                     "animate": 200}}'>
                 <div class="admin__page-nav-title title _collapsible" data-role="title">
-                    <strong><?= /* @escapeNotVerified */ $_tab->getLabel() ?></strong>
+                    <strong><?= $block->escapeHtml($_tab->getLabel()) ?></strong>
                 </div>
 
                 <ul class="admin__page-nav-items items" data-role="content">
                     <?php $_iterator = 1; ?>
                     <?php
                     /** @var $_section \Magento\Config\Model\Config\Structure\Element\Section */
-                    foreach ($_tab->getChildren() as $_section): ?>
+                    foreach ($_tab->getChildren() as $_section) : ?>
                         <li class="admin__page-nav-item item
-                            <?= /* @escapeNotVerified */ $_section->getClass() ?>
-                            <?php if ($block->isSectionActive($_section)): ?> _active<?php endif ?>
+                            <?= $block->escapeHtml($_section->getClass()) ?>
+                            <?php if ($block->isSectionActive($_section)) : ?> _active<?php endif ?>
                             <?= $_tab->getChildren()->isLast($_section) ? ' _last' : '' ?>">
-                            <a href="<?= /* @escapeNotVerified */ $block->getSectionUrl($_section) ?>"
+                            <a href="<?= $block->escapeUrl($block->getSectionUrl($_section)) ?>"
                                class="admin__page-nav-link item-nav">
-                               <span><?= /* @escapeNotVerified */ $_section->getLabel() ?></span>
+                               <span><?= $block->escapeHtml($_section->getLabel()) ?></span>
                             </a>
                         </li>
                         <?php $_iterator++; ?>
@@ -57,8 +51,6 @@
                 </ul>
 
             </div>
-        <?php
-        endforeach;
-        ?>
+        <?php endforeach; ?>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php b/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
index 58462b873d8b1..7146108f61fe1 100644
--- a/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
+++ b/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
@@ -3,14 +3,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\ConfigurableImportExport\Model\Export;
 
-use Magento\CatalogImportExport\Model\Export\RowCustomizerInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProductType;
+use Magento\CatalogImportExport\Model\Export\RowCustomizerInterface;
 use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProductType;
 use Magento\ImportExport\Model\Import;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
 
+/**
+ * Customizes output during export
+ */
 class RowCustomizer implements RowCustomizerInterface
 {
     /**
@@ -36,6 +43,19 @@ class RowCustomizer implements RowCustomizerInterface
         self::CONFIGURABLE_VARIATIONS_LABELS_COLUMN
     ];
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(StoreManagerInterface $storeManager)
+    {
+        $this->storeManager = $storeManager;
+    }
+
     /**
      * Prepare configurable data for export
      *
@@ -49,6 +69,9 @@ public function prepareData($collection, $productIds)
         $productCollection->addAttributeToFilter('entity_id', ['in' => $productIds])
             ->addAttributeToFilter('type_id', ['eq' => ConfigurableProductType::TYPE_CODE]);
 
+        // set global scope during export
+        $this->storeManager->setCurrentStore(Store::DEFAULT_STORE_ID);
+
         while ($product = $productCollection->fetchItem()) {
             $productAttributesOptions = $product->getTypeInstance()->getConfigurableOptions($product);
             $this->configurableData[$product->getId()] = [];
diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json
index b2070fe7ebc44..aefc558733dd6 100644
--- a/app/code/Magento/ConfigurableImportExport/composer.json
+++ b/app/code/Magento/ConfigurableImportExport/composer.json
@@ -2,16 +2,17 @@
     "name": "magento/module-configurable-import-export",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-catalog": "102.0.*",
         "magento/module-catalog-import-export": "100.2.*",
         "magento/module-eav": "101.0.*",
         "magento/module-import-export": "100.2.*",
         "magento/module-configurable-product": "100.2.*",
-        "magento/framework": "101.0.*"
+        "magento/framework": "101.0.*",
+        "magento/module-store": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
index 4c7c5df736112..b128458665d73 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
@@ -70,4 +70,12 @@ public function getIdentities()
         }
         return $identities;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getProductPriceHtml(\Magento\Catalog\Model\Product $product)
+    {
+        return parent::getProductPriceHtml($this->getChildProduct());
+    }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
index a80a15b59c2ce..efade5cd2c605 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
@@ -15,6 +15,8 @@
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 /**
+ * Configurable product view type.
+ *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
@@ -277,6 +279,8 @@ protected function getOptionImages()
     }
 
     /**
+     * Collect price options.
+     *
      * @return array
      */
     protected function getOptionPrices()
@@ -315,6 +319,11 @@ protected function getOptionPrices()
                         ),
                     ],
                     'tierPrices' => $tierPrices,
+                    'msrpPrice' => [
+                        'amount' => $this->localeFormat->getNumber(
+                            $product->getMsrp()
+                        ),
+                    ],
                  ];
         }
         return $prices;
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php
index 6f5f106a8bb24..45057a3591044 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php
@@ -50,7 +50,11 @@ public function __construct(
      */
     public function execute()
     {
-        $this->getResponse()->representJson($this->jsonHelper->jsonEncode($this->saveAttributeOptions()));
+        $result = [];
+        if ($this->getRequest()->isPost()) {
+            $result = $this->saveAttributeOptions();
+        }
+        $this->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
     }
 
     /**
diff --git a/app/code/Magento/ConfigurableProduct/Model/Inventory/ParentItemProcessor.php b/app/code/Magento/ConfigurableProduct/Model/Inventory/ParentItemProcessor.php
new file mode 100644
index 0000000000000..38204790a910f
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Model/Inventory/ParentItemProcessor.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Model\Inventory;
+
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Catalog\Model\Product;
+use Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory;
+use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+
+/**
+ * Process parent stock item
+ */
+class ParentItemProcessor
+{
+    /**
+     * @var Configurable
+     */
+    private $configurableType;
+
+    /**
+     * @var StockItemCriteriaInterfaceFactory
+     */
+    private $criteriaInterfaceFactory;
+
+    /**
+     * @var StockItemRepositoryInterface
+     */
+    private $stockItemRepository;
+
+    /**
+     * @var StockConfigurationInterface
+     */
+    private $stockConfiguration;
+
+    /**
+     * @param Configurable $configurableType
+     * @param StockItemCriteriaInterfaceFactory $criteriaInterfaceFactory
+     * @param StockItemRepositoryInterface $stockItemRepository
+     * @param StockConfigurationInterface $stockConfiguration
+     */
+    public function __construct(
+        Configurable $configurableType,
+        StockItemCriteriaInterfaceFactory $criteriaInterfaceFactory,
+        StockItemRepositoryInterface $stockItemRepository,
+        StockConfigurationInterface $stockConfiguration
+    ) {
+        $this->configurableType = $configurableType;
+        $this->criteriaInterfaceFactory = $criteriaInterfaceFactory;
+        $this->stockItemRepository = $stockItemRepository;
+        $this->stockConfiguration = $stockConfiguration;
+    }
+
+    /**
+     * Process parent products
+     *
+     * @param Product $product
+     * @return void
+     */
+    public function process(Product $product)
+    {
+        $parentIds = $this->configurableType->getParentIdsByChild($product->getId());
+        foreach ($parentIds as $productId) {
+            $this->processStockForParent((int)$productId);
+        }
+    }
+
+    /**
+     * Change stock item for parent product depending on children stock items
+     *
+     * @param int $productId
+     * @return void
+     */
+    private function processStockForParent(int $productId)
+    {
+        $criteria = $this->criteriaInterfaceFactory->create();
+        $criteria->setScopeFilter($this->stockConfiguration->getDefaultScopeId());
+
+        $criteria->setProductsFilter($productId);
+        $stockItemCollection = $this->stockItemRepository->getList($criteria);
+        $allItems = $stockItemCollection->getItems();
+        if (empty($allItems)) {
+            return;
+        }
+        $parentStockItem = array_shift($allItems);
+
+        $childrenIds = $this->configurableType->getChildrenIds($productId);
+        $criteria->setProductsFilter($childrenIds);
+        $stockItemCollection = $this->stockItemRepository->getList($criteria);
+        $allItems = $stockItemCollection->getItems();
+
+        $childrenIsInStock = false;
+
+        foreach ($allItems as $childItem) {
+            if ($childItem->getIsInStock() === true) {
+                $childrenIsInStock = true;
+                break;
+            }
+        }
+
+        if ($this->isNeedToUpdateParent($parentStockItem, $childrenIsInStock)) {
+            $parentStockItem->setIsInStock($childrenIsInStock);
+            $parentStockItem->setStockStatusChangedAuto(1);
+            $this->stockItemRepository->save($parentStockItem);
+        }
+    }
+
+    /**
+     * Check is parent item should be updated
+     *
+     * @param StockItemInterface $parentStockItem
+     * @param bool $childrenIsInStock
+     * @return bool
+     */
+    private function isNeedToUpdateParent(
+        StockItemInterface $parentStockItem,
+        bool $childrenIsInStock
+    ): bool {
+        return $parentStockItem->getIsInStock() !== $childrenIsInStock &&
+            ($childrenIsInStock === false || $parentStockItem->getStockStatusChangedAuto());
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
index 01981b5dae9db..7e11fd02793ea 100644
--- a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
+++ b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -10,6 +9,11 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
 
+/**
+ * Configurable product link management.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class LinkManagement implements \Magento\ConfigurableProduct\Api\LinkManagementInterface
 {
     /**
@@ -67,7 +71,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getChildren($sku)
     {
@@ -106,11 +110,15 @@ public function getChildren($sku)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     * @throws InputException
+     * @throws NoSuchEntityException
+     * @throws StateException
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
      */
     public function addChild($sku, $childSku)
     {
-        $product = $this->productRepository->get($sku);
+        $product = $this->productRepository->get($sku, true);
         $child = $this->productRepository->get($childSku);
 
         $childrenIds = array_values($this->configurableType->getChildrenIds($product->getId())[0]);
@@ -123,15 +131,17 @@ public function addChild($sku, $childSku)
             throw new StateException(__('Parent product does not have configurable product options'));
         }
 
-        $attributeIds = [];
+        $attributeData = [];
         foreach ($configurableProductOptions as $configurableProductOption) {
             $attributeCode = $configurableProductOption->getProductAttribute()->getAttributeCode();
             if (!$child->getData($attributeCode)) {
                 throw new StateException(__('Child product does not have attribute value %1', $attributeCode));
             }
-            $attributeIds[] = $configurableProductOption->getAttributeId();
+            $attributeData[$configurableProductOption->getAttributeId()] = [
+                'position' => $configurableProductOption->getPosition()
+            ];
         }
-        $configurableOptionData = $this->getConfigurableAttributesData($attributeIds);
+        $configurableOptionData = $this->getConfigurableAttributesData($attributeData);
 
         /** @var \Magento\ConfigurableProduct\Helper\Product\Options\Factory $optionFactory */
         $optionFactory = $this->getOptionsFactory();
@@ -144,7 +154,11 @@ public function addChild($sku, $childSku)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     * @throws InputException
+     * @throws NoSuchEntityException
+     * @throws StateException
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
      */
     public function removeChild($sku, $childSku)
     {
@@ -191,16 +205,16 @@ private function getOptionsFactory()
     /**
      * Get Configurable Attribute Data
      *
-     * @param int[] $attributeIds
+     * @param int[] $attributeData
      * @return array
      */
-    private function getConfigurableAttributesData($attributeIds)
+    private function getConfigurableAttributesData($attributeData)
     {
         $configurableAttributesData = [];
         $attributeValues = [];
         $attributes = $this->attributeFactory->create()
             ->getCollection()
-            ->addFieldToFilter('attribute_id', $attributeIds)
+            ->addFieldToFilter('attribute_id', array_keys($attributeData))
             ->getItems();
         foreach ($attributes as $attribute) {
             foreach ($attribute->getOptions() as $option) {
@@ -217,6 +231,7 @@ private function getConfigurableAttributesData($attributeIds)
                     'attribute_id' => $attribute->getId(),
                     'code' => $attribute->getAttributeCode(),
                     'label' => $attribute->getStoreLabel(),
+                    'position' => $attributeData[$attribute->getId()]['position'],
                     'values' => $attributeValues,
                 ];
         }
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index f98075f2294cc..46f10608bc95e 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -24,6 +24,7 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @api
  * @since 100.0.2
  */
@@ -1385,7 +1386,7 @@ function ($item) {
      */
     private function getUsedProductsCacheKey($keyParts)
     {
-        return md5(implode('_', $keyParts));
+        return sha1(implode('_', $keyParts));
     }
 
     /**
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
index bee334596e990..f2bf3116af9e4 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
@@ -7,14 +7,15 @@
  */
 namespace Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 
+use Magento\Catalog\Model\Product;
+
+/**
+ * Class Price for configurable product
+ */
 class Price extends \Magento\Catalog\Model\Product\Type\Price
 {
     /**
-     * Get product final price
-     *
-     * @param   float $qty
-     * @param   \Magento\Catalog\Model\Product $product
-     * @return  float
+     * @inheritdoc
      */
     public function getFinalPrice($qty, $product)
     {
@@ -22,7 +23,10 @@ public function getFinalPrice($qty, $product)
             return $product->getCalculatedFinalPrice();
         }
         if ($product->getCustomOption('simple_product') && $product->getCustomOption('simple_product')->getProduct()) {
-            $finalPrice = parent::getFinalPrice($qty, $product->getCustomOption('simple_product')->getProduct());
+            /** @var Product $simpleProduct */
+            $simpleProduct = $product->getCustomOption('simple_product')->getProduct();
+            $simpleProduct->setCustomerGroupId($product->getCustomerGroupId());
+            $finalPrice = parent::getFinalPrice($qty, $simpleProduct);
         } else {
             $priceInfo = $product->getPriceInfo();
             $finalPrice = $priceInfo->getPrice('final_price')->getAmount()->getValue();
@@ -35,7 +39,7 @@ public function getFinalPrice($qty, $product)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPrice($product)
     {
@@ -48,6 +52,7 @@ public function getPrice($product)
                 }
             }
         }
+
         return 0;
     }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
index 81e2e99bfe93a..b7bbf7aa1871c 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
@@ -12,6 +12,11 @@
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Query\BaseFinalPrice;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructureFactory;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\CatalogInventory\Model\Stock;
+use Magento\CatalogInventory\Model\Configuration;
 
 /**
  * Configurable Products Price Indexer Resource model
@@ -65,6 +70,11 @@ class Configurable implements DimensionalIndexerInterface
      */
     private $basePriceModifier;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * @param BaseFinalPrice $baseFinalPrice
      * @param IndexTableStructureFactory $indexTableStructureFactory
@@ -74,6 +84,7 @@ class Configurable implements DimensionalIndexerInterface
      * @param BasePriceModifier $basePriceModifier
      * @param bool $fullReindexAction
      * @param string $connectionName
+     * @param ScopeConfigInterface $scopeConfig
      */
     public function __construct(
         BaseFinalPrice $baseFinalPrice,
@@ -83,7 +94,8 @@ public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
         BasePriceModifier $basePriceModifier,
         $fullReindexAction = false,
-        $connectionName = 'indexer'
+        $connectionName = 'indexer',
+        ScopeConfigInterface $scopeConfig = null
     ) {
         $this->baseFinalPrice = $baseFinalPrice;
         $this->indexTableStructureFactory = $indexTableStructureFactory;
@@ -93,10 +105,11 @@ public function __construct(
         $this->resource = $resource;
         $this->fullReindexAction = $fullReindexAction;
         $this->basePriceModifier = $basePriceModifier;
+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @throws \Exception
      */
@@ -184,7 +197,19 @@ private function fillTemporaryOptionsTable(string $temporaryOptionsTableName, ar
             ['le' => $this->getTable('catalog_product_entity')],
             'le.' . $linkField . ' = l.parent_id',
             []
-        )->columns(
+        );
+
+        // Does not make sense to extend query if out of stock products won't appear in tables for indexing
+        if ($this->isConfigShowOutOfStock()) {
+            $select->join(
+                ['si' => $this->getTable('cataloginventory_stock_item')],
+                'si.product_id = l.product_id',
+                []
+            );
+            $select->where('si.is_in_stock = ?', Stock::STOCK_IN_STOCK);
+        }
+
+        $select->columns(
             [
                 'le.entity_id',
                 'customer_group_id',
@@ -250,7 +275,7 @@ private function getMainTable($dimensions)
     /**
      * Get connection
      *
-     * return \Magento\Framework\DB\Adapter\AdapterInterface
+     * @return \Magento\Framework\DB\Adapter\AdapterInterface
      * @throws \DomainException
      */
     private function getConnection(): \Magento\Framework\DB\Adapter\AdapterInterface
@@ -272,4 +297,17 @@ private function getTable($tableName)
     {
         return $this->resource->getTableName($tableName, $this->connectionName);
     }
+
+    /**
+     * Is flag Show Out Of Stock setted
+     *
+     * @return bool
+     */
+    private function isConfigShowOutOfStock(): bool
+    {
+        return $this->scopeConfig->isSetFlag(
+            Configuration::XML_PATH_SHOW_OUT_OF_STOCK,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php b/app/code/Magento/ConfigurableProduct/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php
index 8a7e846c0e9f1..8c80a56a649e7 100644
--- a/app/code/Magento/ConfigurableProduct/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php
+++ b/app/code/Magento/ConfigurableProduct/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\ConfigurableProduct\Plugin\Catalog\Model\Product\Pricing\Renderer;
 
-use Magento\ConfigurableProduct\Pricing\Price\LowestPriceOptionsProviderInterface;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as TypeConfigurable;
 
 /**
  * A plugin for a salable resolver.
@@ -13,17 +13,16 @@
 class SalableResolver
 {
     /**
-     * @var LowestPriceOptionsProviderInterface
+     * @var TypeConfigurable
      */
-    private $lowestPriceOptionsProvider;
+    private $typeConfigurable;
 
     /**
-     * @param LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider
+     * @param TypeConfigurable $typeConfigurable
      */
-    public function __construct(
-        LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider
-    ) {
-        $this->lowestPriceOptionsProvider = $lowestPriceOptionsProvider;
+    public function __construct(TypeConfigurable $typeConfigurable)
+    {
+        $this->typeConfigurable = $typeConfigurable;
     }
 
     /**
@@ -33,9 +32,7 @@ public function __construct(
      * @param \Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver $subject
      * @param bool $result
      * @param \Magento\Framework\Pricing\SaleableInterface $salableItem
-     *
      * @return bool
-     *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterIsSalable(
@@ -43,8 +40,8 @@ public function afterIsSalable(
         $result,
         \Magento\Framework\Pricing\SaleableInterface $salableItem
     ) {
-        if ($salableItem->getTypeId() == 'configurable' && $result) {
-            $result = $salableItem->isSalable();
+        if ($salableItem->getTypeId() === TypeConfigurable::TYPE_CODE && $result) {
+            $result = $this->typeConfigurable->isSalable($salableItem);
         }
 
         return $result;
diff --git a/app/code/Magento/ConfigurableProduct/Plugin/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php b/app/code/Magento/ConfigurableProduct/Plugin/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
new file mode 100644
index 0000000000000..8bdde2aeb0cff
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Plugin/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Plugin\Tax\Model\Sales\Total\Quote;
+
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Quote\Model\Quote\Item\AbstractItem;
+use Magento\Tax\Api\Data\QuoteDetailsItemInterface;
+use Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory;
+
+/**
+ * Plugin for CommonTaxCollector to apply Tax Class ID from child item for configurable product
+ */
+class CommonTaxCollector
+{
+    /**
+     * Apply Tax Class ID from child item for configurable product
+     *
+     * @param \Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector $subject
+     * @param QuoteDetailsItemInterface $result
+     * @param QuoteDetailsItemInterfaceFactory $itemDataObjectFactory
+     * @param AbstractItem $item
+     * @return QuoteDetailsItemInterface
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterMapItem(
+        \Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector $subject,
+        QuoteDetailsItemInterface $result,
+        QuoteDetailsItemInterfaceFactory $itemDataObjectFactory,
+        AbstractItem $item
+    ) : QuoteDetailsItemInterface {
+        if ($item->getProduct()->getTypeId() === Configurable::TYPE_CODE && $item->getHasChildren()) {
+            $childItem = $item->getChildren()[0];
+            $result->getTaxClassKey()->setValue($childItem->getProduct()->getTaxClassId());
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Render/TierPriceBox.php b/app/code/Magento/ConfigurableProduct/Pricing/Render/TierPriceBox.php
index 611523a60b06d..816de36b16f96 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Render/TierPriceBox.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Render/TierPriceBox.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\ConfigurableProduct\Pricing\Render;
 
+use Magento\Catalog\Pricing\Price\TierPrice;
+
 /**
  * Responsible for displaying tier price box on configurable product page.
  *
@@ -17,9 +19,28 @@ class TierPriceBox extends FinalPriceBox
      */
     public function toHtml()
     {
-        // Hide tier price block in case of MSRP.
-        if (!$this->isMsrpPriceApplicable()) {
+        // Hide tier price block in case of MSRP or in case when no options with tier price.
+        if (!$this->isMsrpPriceApplicable() && $this->isTierPriceApplicable()) {
             return parent::toHtml();
         }
     }
+
+    /**
+     * Check if at least one of simple products has tier price.
+     *
+     * @return bool
+     */
+    private function isTierPriceApplicable(): bool
+    {
+        $product = $this->getSaleableItem();
+        foreach ($product->getTypeInstance()->getUsedProducts($product) as $simpleProduct) {
+            if ($simpleProduct->isSalable()
+                && !empty($simpleProduct->getPriceInfo()->getPrice(TierPrice::PRICE_CODE)->getTierPriceList())
+            ) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Setup/InstallData.php b/app/code/Magento/ConfigurableProduct/Setup/InstallData.php
index 1c26f159405dd..57cc287aa24aa 100644
--- a/app/code/Magento/ConfigurableProduct/Setup/InstallData.php
+++ b/app/code/Magento/ConfigurableProduct/Setup/InstallData.php
@@ -57,18 +57,24 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
             'color'
         ];
         foreach ($attributes as $attributeCode) {
-            $relatedProductTypes = explode(
-                ',',
-                $eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode, 'apply_to')
-            );
-            if (!in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
-                $relatedProductTypes[] = Configurable::TYPE_CODE;
-                $eavSetup->updateAttribute(
-                    \Magento\Catalog\Model\Product::ENTITY,
-                    $attributeCode,
-                    'apply_to',
-                    implode(',', $relatedProductTypes)
+            if ($attribute = $eavSetup->getAttribute(
+                \Magento\Catalog\Model\Product::ENTITY,
+                $attributeCode,
+                'apply_to'
+            )) {
+                $relatedProductTypes = explode(
+                    ',',
+                    $attribute
                 );
+                if (!in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
+                    $relatedProductTypes[] = Configurable::TYPE_CODE;
+                    $eavSetup->updateAttribute(
+                        \Magento\Catalog\Model\Product::ENTITY,
+                        $attributeCode,
+                        'apply_to',
+                        implode(',', $relatedProductTypes)
+                    );
+                }
             }
         }
     }
diff --git a/app/code/Magento/ConfigurableProduct/Setup/UpgradeData.php b/app/code/Magento/ConfigurableProduct/Setup/UpgradeData.php
index 1ff78a632c3bb..ca100cbf85bfc 100644
--- a/app/code/Magento/ConfigurableProduct/Setup/UpgradeData.php
+++ b/app/code/Magento/ConfigurableProduct/Setup/UpgradeData.php
@@ -47,16 +47,18 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
 
         if (version_compare($context->getVersion(), '2.2.0') < 0) {
             $relatedProductTypes = $this->getRelatedProductTypes('tier_price', $eavSetup);
-            $key = array_search(Configurable::TYPE_CODE, $relatedProductTypes);
-            if ($key !== false) {
-                unset($relatedProductTypes[$key]);
-                $this->updateRelatedProductTypes('tier_price', $relatedProductTypes, $eavSetup);
+            if (!empty($relatedProductTypes)) {
+                $key = array_search(Configurable::TYPE_CODE, $relatedProductTypes);
+                if ($key !== false) {
+                    unset($relatedProductTypes[$key]);
+                    $this->updateRelatedProductTypes('tier_price', $relatedProductTypes, $eavSetup);
+                }
             }
         }
 
         if (version_compare($context->getVersion(), '2.2.1') < 0) {
             $relatedProductTypes = $this->getRelatedProductTypes('manufacturer', $eavSetup);
-            if (!in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
+            if (!empty($relatedProductTypes) && !in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
                 $relatedProductTypes[] = Configurable::TYPE_CODE;
                 $this->updateRelatedProductTypes('manufacturer', $relatedProductTypes, $eavSetup);
             }
@@ -78,10 +80,17 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
      */
     private function getRelatedProductTypes(string $attributeId, EavSetup $eavSetup)
     {
-        return explode(
-            ',',
-            $eavSetup->getAttribute(Product::ENTITY, $attributeId, 'apply_to')
-        );
+        if ($attribute = $eavSetup->getAttribute(
+            Product::ENTITY,
+            $attributeId,
+            'apply_to'
+        )) {
+            return explode(
+                ',',
+                $attribute
+            );
+        }
+        return [];
     }
 
     /**
@@ -109,8 +118,10 @@ private function updateRelatedProductTypes(string $attributeId, array $relatedPr
      */
     private function upgradeQuoteItemPrice(ModuleDataSetupInterface $setup)
     {
-        $connection = $setup->getConnection();
-        $quoteItemTable = $setup->getTable('quote_item');
+        $connectionName = 'checkout';
+        $connection = $setup->getConnection($connectionName);
+        $quoteItemTable = $setup->getTable('quote_item', $connectionName);
+
         $select = $connection->select();
         $select->joinLeft(
             ['qi2' => $quoteItemTable],
@@ -121,10 +132,10 @@ private function upgradeQuoteItemPrice(ModuleDataSetupInterface $setup)
             . ' AND qi1.parent_item_id IS NOT NULL'
             . ' AND qi2.product_type = "' . Configurable::TYPE_CODE . '"'
         );
-        $updateQuoteItem = $setup->getConnection()->updateFromSelect(
+        $updateQuoteItem = $connection->updateFromSelect(
             $select,
             ['qi1' => $quoteItemTable]
         );
-        $setup->getConnection()->query($updateQuoteItem);
+        $connection->query($updateQuoteItem);
     }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
index 462fd64031849..58ebd207eeddf 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!--
 
     Create a configurable product with three options for color: red, white, and blue
@@ -75,4 +75,28 @@
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
         <seeInTitle userInput="{{product.name}}" stepKey="seeProductNameInTitle"/>
     </actionGroup>
+
+    <!--Click in Next Step and see Title-->
+    <actionGroup name="AdminConfigurableWizardMoveToNextStepActionGroup">
+        <arguments>
+            <argument name="title" type="string"/>
+        </arguments>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.next}}" stepKey="clickNextButton"/>
+        <waitForPageLoad stepKey="waitForNextStepLoaded"/>
+        <see userInput="{{title}}" selector="{{AdminProductFormConfigurationsSection.stepsWizardTitle}}" stepKey="seeStepTitle"/>
+    </actionGroup>
+
+    <!-- Add unique image to configurable product option-->
+    <actionGroup name="AddUniqueImageToConfigurableProductOptionActionGroup">
+        <arguments>
+            <argument name="image" defaultValue="ProductImage"/>
+            <argument name="frontend_label" type="string"/>
+            <argument name="label" type="string"/>
+        </arguments>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.applyUniqueImagesToEachSkus}}" stepKey="clickOnApplyUniqueImagesToEachSku"/>
+        <selectOption userInput="{{frontend_label}}" selector="{{AdminCreateProductConfigurationsPanelSection.selectImagesButton}}" stepKey="selectOption"/>
+        <attachFile selector="{{AdminCreateProductConfigurationsPanelSection.uploadImagesButton(label)}}" userInput="{{image.file}}" stepKey="uploadFile"/>
+        <waitForElementNotVisible selector="{{AdminProductImagesSection.uploadProgressBar}}" stepKey="waitForUpload"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanelSection.imageFile(image.fileName)}}" stepKey="waitForThumbnail"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateApiConfigurableProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateApiConfigurableProductActionGroup.xml
index d918649ed4914..abbef02adc520 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateApiConfigurableProductActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateApiConfigurableProductActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminCreateApiConfigurableProductActionGroup">
         <arguments>
-            <argument name="productName" defaultValue="ApiConfigurableProductWithOutCategory" type="string"/>
+            <argument name="productName" defaultValue="{{ApiConfigurableProductWithOutCategory.name}}" type="string"/>
         </arguments>
 
         <!-- Create the configurable product based on the data in the /data folder -->
@@ -69,4 +69,70 @@
             <requiredEntity createDataKey="getConfigAttributeOption1"/>
         </createData>
     </actionGroup>
+
+    <!-- Create the configurable product, children are not visible individually -->
+    <actionGroup name="AdminCreateApiConfigurableProductWithHiddenChildActionGroup" extends="AdminCreateApiConfigurableProductActionGroup">
+        <!-- Create the 2 children that will be a part of the configurable product -->
+        <createData entity="ApiSimpleOneHidden" stepKey="createConfigChildProduct1">
+            <requiredEntity createDataKey="createConfigProductAttribute"/>
+            <requiredEntity createDataKey="getConfigAttributeOption1"/>
+        </createData>
+        <createData entity="ApiSimpleTwoHidden" stepKey="createConfigChildProduct2">
+            <requiredEntity createDataKey="createConfigProductAttribute"/>
+            <requiredEntity createDataKey="getConfigAttributeOption2"/>
+        </createData>
+    </actionGroup>
+
+    <!--Create the configurable product with three child products-->
+    <actionGroup name="AdminCreateApiConfigurableProductWithThreeChildActionGroup" extends="AdminCreateApiConfigurableProductActionGroup">
+        <remove keyForRemoval="createConfigProductOption"/>
+        <remove keyForRemoval="createConfigChildProduct1"/>
+        <remove keyForRemoval="createConfigChildProduct2"/>
+        <remove keyForRemoval="createConfigProductAddChild1"/>
+        <remove keyForRemoval="createConfigProductAddChild2"/>
+
+        <createData entity="ProductAttributeOption3" after="createConfigProductAttributeOption2" stepKey="createConfigProductAttributeOption3">
+            <requiredEntity createDataKey="createConfigProductAttribute"/>
+        </createData>
+        <getData entity="ProductAttributeOptionGetter" index="3" after="getConfigAttributeOption2" stepKey="getConfigAttributeOption3">
+            <requiredEntity createDataKey="createConfigProductAttribute"/>
+        </getData>
+
+        <createData entity="ApiSimpleOne" stepKey="createChildProduct1">
+            <field key="price">50</field>
+            <requiredEntity createDataKey="createConfigProductAttribute"/>
+            <requiredEntity createDataKey="getConfigAttributeOption1"/>
+        </createData>
+        <createData entity="ApiSimpleOne" stepKey="createChildProduct2">
+            <field key="price">60</field>
+            <requiredEntity createDataKey="createConfigProductAttribute"/>
+            <requiredEntity createDataKey="getConfigAttributeOption2"/>
+        </createData>
+        <createData entity="ApiSimpleOne" stepKey="createChildProduct3">
+            <field key="price">70</field>
+            <requiredEntity createDataKey="createConfigProductAttribute"/>
+            <requiredEntity createDataKey="getConfigAttributeOption3"/>
+        </createData>
+
+        <createData entity="ConfigurableProductThreeOptions" stepKey="createConfigProductOptions">
+            <requiredEntity createDataKey="createConfigProduct"/>
+            <requiredEntity createDataKey="createConfigProductAttribute"/>
+            <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            <requiredEntity createDataKey="getConfigAttributeOption3"/>
+        </createData>
+
+        <createData entity="ConfigurableProductAddChild" stepKey="createProductAddChild1">
+            <requiredEntity createDataKey="createConfigProduct"/>
+            <requiredEntity createDataKey="createChildProduct1"/>
+        </createData>
+        <createData entity="ConfigurableProductAddChild" stepKey="createProductAddChild2">
+            <requiredEntity createDataKey="createConfigProduct"/>
+            <requiredEntity createDataKey="createChildProduct2"/>
+        </createData>
+        <createData entity="ConfigurableProductAddChild" stepKey="createProductAddChild3">
+            <requiredEntity createDataKey="createConfigProduct"/>
+            <requiredEntity createDataKey="createChildProduct3"/>
+        </createData>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateConfigurableProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateConfigurableProductActionGroup.xml
index a01a9e14b97b6..6c47a24315c9a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateConfigurableProductActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateConfigurableProductActionGroup.xml
@@ -62,6 +62,69 @@
         <!-- Save the product -->
         <click selector="{{AdminProductFormActionSection.saveArrow}}" stepKey="openSaveDropDown"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSave"/>
+        <conditionalClick selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" dependentSelector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" visible="true" stepKey="clickConfirm"/>
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product." stepKey="assertSuccess"/>
     </actionGroup>
+
+    <actionGroup name="AdminGenerateProductConfigurations">
+        <arguments>
+            <argument name="attributeCode" type="string"/>
+            <argument name="qty" type="string"/>
+            <argument name="price" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="clickOnFilters"/>
+        <fillField selector="{{AdminProductAttributeGridSection.attributeCodeFilterInput}}" userInput="{{attributeCode}}" stepKey="fillFilterAttributeCodeField"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminDataGridTableSection.rowCheckbox('1')}}" stepKey="clickOnFirstCheckbox"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickNextStep"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanelSection.selectAllByAttribute(attributeCode)}}" stepKey="waitForNextPageOpened"/>
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.selectAllByAttribute(attributeCode)}}" stepKey="clickSelectAll"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickNextStep1"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" stepKey="waitForNextPageOpened1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" stepKey="clickOnApplySinglePriceToAllSkus"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.singlePrice}}" userInput="{{price}}" stepKey="enterAttributePrice"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="{{qty}}" stepKey="enterAttributeQuantity"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickNextStep2"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="waitForNextPageOpened2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="generateProducts"/>
+    </actionGroup>
+
+    <actionGroup name="AdminCreateConfigurableProductTwoAttributesWithOptionsActionGroup" extends="AdminCreateConfigurableProductActionGroup">
+        <arguments>
+            <argument name="attributeOption" type="string"/>
+            <argument name="attributeOption1" type="string"/>
+            <argument name="configurableAttributeCode1" type="string"/>
+            <argument name="attribute1Option" type="string"/>
+            <argument name="attribute1Option1" type="string"/>
+            <argument name="attribute1Option2" type="string"/>
+        </arguments>
+
+        <remove keyForRemoval="startEditAttrSet"/>
+        <remove keyForRemoval="searchForAttrSet"/>
+        <remove keyForRemoval="waitForLoad"/>
+        <remove keyForRemoval="selectAttrSetProd"/>
+        <remove keyForRemoval="saveEditedProductForProduct"/>
+        <remove keyForRemoval="clickClearFilters"/>
+        <remove keyForRemoval="clickFiltersExpand"/>
+        <remove keyForRemoval="fillFilter"/>
+        <remove keyForRemoval="clickSearch"/>
+        <remove keyForRemoval="clickAttributeColorCheckbox"/>
+        <remove keyForRemoval="clickOnSelectAllSecond"/>
+
+        <fillField userInput="{{configurationsPrice}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
+        <fillField userInput="{{configurationsQty}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+
+        <!--Select attributes -->
+        <click selector="{{AdminCreateProductConfigurationsPanel.checkboxByName(configurableAttributeCode)}}" after="openConfigurationPanel" stepKey="selectAttribute"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.checkboxByName(configurableAttributeCode1)}}" after="selectAttribute" stepKey="selectAttribute1"/>
+
+        <!--Select options-->
+        <click selector="{{AdminCreateProductConfigurationsPanel.attributeByName(attributeOption)}}" after="clickNextButton" stepKey="selectAttributeOption"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.attributeByName(attributeOption1)}}" after="selectAttributeOption" stepKey="selectAttributeOption1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.attributeByName(attribute1Option)}}" after="selectAttributeOption1" stepKey="selectAttribute1Option"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.attributeByName(attribute1Option1)}}" after="selectAttribute1Option" stepKey="selectAttribute1Option1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.attributeByName(attribute1Option2)}}" after="selectAttribute1Option1" stepKey="selectAttribute1Option2"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
index b1caaa5782c8f..f9e72f302d6f8 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
@@ -7,9 +7,10 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCreateProductConfigurationsPanelSection">
         <element name="next" type="button" selector=".steps-wizard-navigation .action-next-step" timeout="30"/>
+        <element name="generateConfigure" type="button" selector="//div[@class='nav-bar-outer-actions']//*[contains(text(),'Generate Products')]"/>
         <element name="createNewAttribute" type="button" selector=".select-attributes-actions button[title='Create New Attribute']" timeout="30"/>
         <element name="filters" type="button" selector="button[data-action='grid-filter-expand']"/>
         <element name="attributeCode" type="input" selector=".admin__control-text[name='attribute_code']"/>
@@ -25,5 +26,12 @@
         <element name="attribute" type="input" selector="#apply-single-price-input-{{var1}}" parameterized="true"/>
         <element name="applySingleQuantityToEachSkus" type="radio" selector=".admin__field-label[for='apply-single-inventory-radio']" timeout="30"/>
         <element name="quantity" type="input" selector="#apply-single-inventory-input"/>
+        <element name="optionPrice" type="input" selector="//*[text()='{{optionName}}']/../..//input[contains(@id, 'apply-single-price-input')]" parameterized="true"/>
+
+        <!--Image Section-->
+        <element name="applyUniqueImagesToEachSkus" type="radio" selector="label[for='apply-unique-images-radio']" timeout="30"/>
+        <element name="selectImagesButton" type="select" selector="#apply-images-attributes" timeout="30"/>
+        <element name="uploadImagesButton" type="file" selector="//span[text()='{{optionName}}']/../../div[@data-role='gallery']//input[@type='file']" timeout="30" parameterized="true"/>
+        <element name="imageFile" type="text" selector="div[data-role='gallery'] img[src*='{{url}}']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
index 429d535952f76..7a722959c9996 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminNewAttributePanelSection">
         <element name="container" type="text" selector="#create_new_attribute"/>
         <element name="saveAttribute" type="button" selector="#save"/>
@@ -21,5 +21,12 @@
         <element name="deleteOption" type="button" selector="#delete_button_option_{{row}}" parameterized="true"/>
         <element name="attributeSelect" type="select" selector="product[{{var}}]" parameterized="true"/>
         <element name="attributeName" type="select" selector="//option[text()='{{var}}']" parameterized="true"/>
+        <element name="useInSearch" type="select" selector="#is_searchable"/>
+        <element name="visibleInAdvancedSearch" type="select" selector="#is_visible_in_advanced_search"/>
+        <element name="comparableOnStorefront" type="select" selector="#is_comparable"/>
+        <element name="useInLayeredNavigation" type="select" selector="#is_filterable"/>
+        <element name="visibleOnCatalogPagesOnStorefront" type="select" selector="#is_visible_on_front"/>
+        <element name="useInProductListing" type="select" selector="#used_in_product_listing"/>
+        <element name="storefrontPropertiesTab" type="button" selector="#front_fieldset-wrapper"/>
     </section>
 </sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
index 5ae70488d164d..cf50c383075f5 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminProductFormConfigurationsSection">
         <element name="sectionHeader" type="text" selector=".admin__collapsible-block-wrapper[data-index='configurable']"/>
         <element name="createConfigurations" type="button" selector="button[data-index='create_configurable_products_button']" timeout="30"/>
@@ -22,5 +22,10 @@
         <element name="removeProductBtn" type="button" selector="//a[text()='Remove Product']"/>
         <element name="disableProductBtn" type="button" selector="//a[text()='Disable Product']"/>
         <element name="enableProductBtn" type="button" selector="//a[text()='Enable Product']"/>
+        <element name="configurableMatrixSku" type="input" selector="input[name='configurable-matrix[{{index}}][sku]']" parameterized="true"/>
+        <element name="skuValidationMessage" type="text" selector="input[name='configurable-matrix[{{index}}][sku]'] + label" parameterized="true"/>
+        <element name="stepsWizardTitle" type="text" selector="div.content:not([style='display: none;']) .steps-wizard-title"/>
+        <element name="attributeEntityByName" type="text" selector="//div[@class='attribute-entity']//div[normalize-space(.)='{{attributeLabel}}']" parameterized="true"/>
+        <element name="fileUploaderInput" type="file" selector="//input[@type='file' and @class='file-uploader-input']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index be0c2b05e48ba..4f2320666efbc 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -14,5 +14,6 @@
         <element name="stockIndication" type="block" selector=".stock" />
         <element name="productAttributeOptionsSelectButton" type="select" selector="#product-options-wrapper .super-attribute-select"/>
         <element name="optionByAttributeId" type="input" selector="#attribute{{var1}}" parameterized="true"/>
+        <element name="productPriceBox" type="block" selector=".price-box"/>
     </section>
 </sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest.xml
new file mode 100644
index 0000000000000..63209419fbbb5
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Update product"/>
+            <title value="Adding new options with images and prices to Configurable Product"/>
+            <description value="Test case verifies possibility to add new options for configurable attribute for existing configurable product."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-8398"/>
+            <group value="configurableProduct"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="AdminCreateApiConfigurableProductActionGroup" stepKey="createConfigurableProduct"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createConfigProductCreateConfigurableProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigProductAttributeCreateConfigurableProduct" stepKey="deleteConfigProductAttribute"/>
+            <deleteData createDataKey="createConfigChildProduct1CreateConfigurableProduct" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2CreateConfigurableProduct" stepKey="deleteConfigChildProduct2"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Open edit product page-->
+        <amOnPage url="{{AdminProductEditPage.url($$createConfigProductCreateConfigurableProduct.id$$)}}" stepKey="goToProductEditPage"/>
+
+        <!--Open edit configuration wizard-->
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickEditConfigurations"/>
+        <see userInput="Select Attributes" selector="{{AdminProductFormConfigurationsSection.stepsWizardTitle}}" stepKey="seeStepTitle"/>
+
+        <!--Click Next button-->
+        <actionGroup ref="AdminConfigurableWizardMoveToNextStepActionGroup" stepKey="navigateToAttributeValuesStep">
+            <argument name="title" value="Attribute Values"/>
+        </actionGroup>
+        <seeElement selector="{{AdminProductFormConfigurationsSection.attributeEntityByName($$createConfigProductAttributeCreateConfigurableProduct.default_frontend_label$$)}}" stepKey="seeAttribute"/>
+
+        <!--Create one color option via "Create New Value" link-->
+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue"/>
+        <fillField userInput="green" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute"/>
+
+        <!--Click Next button-->
+        <actionGroup ref="AdminConfigurableWizardMoveToNextStepActionGroup" stepKey="navigateToBulkStep">
+            <argument name="title" value="Bulk Images, Price and Quantity"/>
+        </actionGroup>
+
+        <!-- Add images to configurable product attribute options -->
+        <actionGroup ref="AddUniqueImageToConfigurableProductOptionActionGroup" stepKey="addImageToConfigurableProductOptionOne">
+            <argument name="image" value="ImageUpload"/>
+            <argument name="frontend_label" value="$$createConfigProductAttributeCreateConfigurableProduct.default_frontend_label$$"/>
+            <argument name="label" value="$$getConfigAttributeOption1CreateConfigurableProduct.label$$"/>
+        </actionGroup>
+        <actionGroup ref="AddUniqueImageToConfigurableProductOptionActionGroup" stepKey="addImageToConfigurableProductOptionTwo">
+            <argument name="image" value="ImageUpload1"/>
+            <argument name="frontend_label" value="$$createConfigProductAttributeCreateConfigurableProduct.default_frontend_label$$"/>
+            <argument name="label" value="$$getConfigAttributeOption2CreateConfigurableProduct.label$$"/>
+        </actionGroup>
+        <actionGroup ref="AddUniqueImageToConfigurableProductOptionActionGroup" stepKey="addImageToConfigurableProductOptionThree">
+            <argument name="image" value="ImageUpload2"/>
+            <argument name="frontend_label" value="$$createConfigProductAttributeCreateConfigurableProduct.default_frontend_label$$"/>
+            <argument name="label" value="green"/>
+        </actionGroup>
+
+        <!--Add prices to configurable product attribute options-->
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.applyUniquePricesByAttributeToEachSku}}" stepKey="clickOnApplyUniquePricesByAttributeToEachSku"/>
+        <selectOption  userInput="$$createConfigProductAttributeCreateConfigurableProduct.default_frontend_label$$"
+                       selector="{{AdminCreateProductConfigurationsPanel.selectAttribute}}" stepKey="selectAttributes"/>
+        <fillField userInput="10" selector="{{AdminCreateProductConfigurationsPanelSection.optionPrice($$getConfigAttributeOption1CreateConfigurableProduct.label$$)}}" stepKey="fillAttributePrice"/>
+        <fillField userInput="20" selector="{{AdminCreateProductConfigurationsPanelSection.optionPrice($$getConfigAttributeOption2CreateConfigurableProduct.label$$)}}" stepKey="fillAttributePrice1"/>
+        <fillField userInput="30" selector="{{AdminCreateProductConfigurationsPanelSection.optionPrice('green')}}" stepKey="fillAttributePrice2"/>
+
+        <!-- Add quantity to product attribute options -->
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="100" stepKey="enterAttributeQuantity"/>
+
+        <!--Click Next button-->
+        <actionGroup ref="AdminConfigurableWizardMoveToNextStepActionGroup" stepKey="navigateToSummaryStep">
+            <argument name="title" value="Summary"/>
+        </actionGroup>
+
+        <!--Click Generate Configure button-->
+        <click selector="{{AdminCreateProductConfigurationsPanelSection.generateConfigure}}" stepKey="clickGenerateConfigure"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!--Go to frontend and check image and price-->
+        <amOnPage url="{{StorefrontProductPage.url($$createConfigProductCreateConfigurableProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
+
+        <actionGroup ref="AssertOptionImageAndPriceInStorefrontProductActionGroup" stepKey="assertFirstOptionImageAndPriceInStorefrontProductPage">
+            <argument name="label" value="$$getConfigAttributeOption1CreateConfigurableProduct.label$$"/>
+            <argument name="image" value="{{ImageUpload.filename}}"/>
+            <argument name="price" value="10"/>
+        </actionGroup>
+
+        <actionGroup ref="AssertOptionImageAndPriceInStorefrontProductActionGroup" stepKey="assertSecondOptionImageAndPriceInStorefrontProductPage">
+            <argument name="label" value="$$getConfigAttributeOption2CreateConfigurableProduct.label$$"/>
+            <argument name="image" value="{{ImageUpload1.filename}}"/>
+            <argument name="price" value="20"/>
+        </actionGroup>
+
+        <actionGroup ref="AssertOptionImageAndPriceInStorefrontProductActionGroup" stepKey="assertThirdOptionImageAndPriceInStorefrontProductPage">
+            <argument name="label" value="green"/>
+            <argument name="image" value="{{ImageUpload2.filename}}"/>
+            <argument name="price" value="30"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
new file mode 100644
index 0000000000000..03f4d8461cebb
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCheckValidatorConfigurableProductTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create a Configurable Product via the Admin"/>
+            <title value="Check that validator works correctly when creating Configurations for Configurable Products"/>
+            <description value="Verify validator works correctly for Configurable Products"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-13719"/>
+            <group value="configurableProduct"/>
+        </annotations>
+
+        <before>
+            <!--Login as admin-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create Category-->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <!--Create Configurable product-->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+
+        <after>
+            <!--Delete created data-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="ApiConfigurableProduct"/>
+                <argument name="productCount" value="2"/>
+            </actionGroup>
+
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="openAdminProductPage"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="resetProductsFilter" />
+
+            <!-- Remove attribute -->
+            <actionGroup ref="deleteProductAttribute" stepKey="deleteAttribute">
+                <argument name="ProductAttribute" value="productAttributeWithDropdownTwoOptions"/>
+            </actionGroup>
+            <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributesGridPage"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="resetAttributesFilter" />
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Find the product that we just created using the product grid -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct">
+            <argument name="product" value="ApiConfigurableProduct"/>
+        </actionGroup>
+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProduct"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+
+        <!-- Create configurations for product we created earlier -->
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations"/>
+
+        <!--Create new attribute-->
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="waitForNewAttributePageOpened"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickCreateNewAttribute"/>
+        <switchToIFrame selector="{{AdminNewAttributePanelSection.newAttributeIFrame}}" stepKey="enterAttributePanelIFrame"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.defaultLabel}}" time="30" stepKey="waitForIframeLoad"/>
+        <fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{productAttributeWithDropdownTwoOptions.attribute_code}}" stepKey="fillDefaultLabel"/>
+        <selectOption selector="{{AdminNewAttributePanelSection.inputType}}" userInput="{{colorProductAttribute.input_type}}" stepKey="selectAttributeInputType"/>
+        <!--Add option to attribute-->
+        <click selector="{{AdminNewAttributePanelSection.addOption}}" stepKey="clickAddOption"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanelSection.isDefault('1')}}" time="30" stepKey="waitForOptionRow"/>
+        <fillField selector="{{AdminNewAttributePanelSection.optionAdminValue('0')}}" userInput="ThisIsLongNameNameLengthMoreThanSixtyFourThisIsLongNameNameLength" stepKey="fillAdminLabel"/>
+        <fillField selector="{{AdminNewAttributePanelSection.optionDefaultStoreValue('0')}}" userInput="{{colorProductAttribute1.name}}" stepKey="fillDefaultLabel1"/>
+
+        <!--Save attribute-->
+        <click selector="{{AdminNewAttributePanelSection.saveAttribute}}" stepKey="clickOnNewAttributePanel"/>
+        <waitForPageLoad stepKey="waitForSaveAttribute"/>
+        <switchToIFrame stepKey="switchOutOfIFrame"/>
+
+        <!-- Generate products -->
+        <actionGroup ref="AdminGenerateProductConfigurations" stepKey="generateProducts">
+            <argument name="attributeCode" value="{{productAttributeWithDropdownTwoOptions.attribute_code}}"/>
+            <argument name="qty" value="100"/>
+            <argument name="price" value="10"/>
+        </actionGroup>
+        <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveButtonVisible"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="waitForPopUpVisible"/>
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
+        <dontSeeElement selector="{{AdminMessagesSection.success}}" stepKey="dontSeeSaveProductMessage"/>
+
+        <!--Close modal window-->
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.closePopUp}}" stepKey="clickOnClosePopup"/>
+        <waitForElementNotVisible selector="{{AdminChooseAffectedAttributeSetPopup.closePopUp}}" stepKey="waitForDialogClosed"/>
+
+        <!--See that validation message is shown under the fields-->
+        <scrollTo selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" stepKey="scrollTConfigurationTab"/>
+        <see userInput="Please enter less or equal than 64 symbols." selector="{{AdminProductFormConfigurationsSection.skuValidationMessage('0')}}" stepKey="seeValidationMessage"/>
+
+        <!--Edit "SKU" with valid quantity-->
+        <fillField selector="{{AdminProductFormConfigurationsSection.configurableMatrixSku('0')}}" userInput="{{ApiConfigurableProduct.sku}}-thisIsShortName" stepKey="fillValidValue"/>
+
+        <!--Click on "Save"-->
+        <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveBtnVisible"/>
+        <scrollToTopOfPage stepKey="scrollToTop1"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductAgain"/>
+
+        <!--Click on "Confirm". Product is saved, success message appears -->
+        <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="waitPopUpVisible"/>
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmPopup"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the product." stepKey="seeSaveProductMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckingProductQtyAfterOrderCancelTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckingProductQtyAfterOrderCancelTest.xml
new file mode 100644
index 0000000000000..af463c9042357
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckingProductQtyAfterOrderCancelTest.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCheckingProductQtyAfterOrderCancelTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Product quantity after order cancel"/>
+            <title value="Products quantity return after order cancel"/>
+            <description value="Checking product quantity after the order cancel"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-13790"/>
+            <group value="configurableProduct"/>
+        </annotations>
+        <before>
+            <!--Create category-->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <!--Create configurable product and add it to the category-->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!--Create attribute-->
+            <createData entity="productAttributeWithDropdownTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <!--Add the attribute to default attribute set-->
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <!--Get the option of the attribute-->
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <!--Create simple product and give it the attribute with option-->
+            <createData entity="ApiSimpleWithQty100" stepKey="createConfigChildProduct">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption"/>
+            </createData>
+            <!--Create configurable product-->
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption"/>
+            </createData>
+            <!--Add simple product to the configurable product-->
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct"/>
+            </createData>
+            <!--Create customer-->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <!--Login-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!--Clear grid filters-->
+            <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrderGridPage"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
+            <!--Delete entities-->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct" stepKey="deleteConfigChildProduct"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <!--Logout-->
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+            <actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="logoutFromStorefront"/>
+        </after>
+
+        <!--Go to Storefront as Customer-->
+        <actionGroup ref="CustomerLoginOnStorefront" stepKey="customerLogin">
+            <argument name="customer" value="$$createCustomer$$" />
+        </actionGroup>
+
+        <!--Go to the configurable product page on Storefront-->
+        <amOnPage url="{{StorefrontProductPage.url($$createConfigProduct.sku$$)}}" stepKey="goToProductPage"/>
+        <!--Select option-->
+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$getConfigAttributeOption.label$$" stepKey="selectOption"/>
+        <!--Add product to the Shopping cart-->
+        <actionGroup ref="StorefrontAddProductToCartQuantityActionGroup" stepKey="addProductToCart">
+            <argument name="productName" value="$createConfigProduct.name$"/>
+            <argument name="quantity" value="4"/>
+        </actionGroup>
+
+        <!--Open Shopping cart-->
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openShoppingCartFromMinicart"/>
+        <!--Place order-->
+        <actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeOrder">
+            <argument name="shippingMethod" value="Flat Rate"/>
+            <argument name="paymentMethod" value="Check / Money order"/>
+        </actionGroup>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
+
+        <!--Open order-->
+        <actionGroup ref="OpenOrderById" stepKey="openOrderById">
+            <argument name="orderId" value="{$grabOrderNumber}"/>
+        </actionGroup>
+
+        <!--Start create invoice-->
+        <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startCreateInvoice"/>
+        <!--Create partial invoice-->
+        <actionGroup ref="CreatePartialInvoice" stepKey="createPartialInvoice">
+            <argument name="productSku" value="$createConfigChildProduct.sku$"/>
+            <argument name="qtyToInvoice" value="1"/>
+        </actionGroup>
+        <!--Submit Invoice-->
+        <actionGroup ref="SubmitInvoice" stepKey="submitInvoice"/>
+        <!--Create Shipment-->
+        <actionGroup ref="StartCreateShipmentFromOrderPage" stepKey="startCreateShipment"/>
+        <fillField selector="{{AdminShipmentItemsSection.itemQtyToShip('1')}}" userInput="1" stepKey="changeItemQtyToShip"/>
+        <actionGroup ref="SubmitShipment" stepKey="submitShipment"/>
+
+        <!--Cancel order-->
+        <actionGroup ref="CancelProcessingOrder" stepKey="cancelOrder"/>
+        <!--Check quantities in "Items Ordered" table-->
+        <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Invoiced 1" stepKey="seeInvoicedQuantity"/>
+        <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Shipped 1" stepKey="seeShippedQuantity"/>
+        <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Canceled 3" stepKey="seeCanceledQuantity"/>
+
+        <!--Go to catalog products page on Admin-->
+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="goToCatalogProductPage"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterProductGrid">
+            <argument name="product" value="$$createConfigChildProduct$$"/>
+        </actionGroup>
+
+        <!--Check quantity of configurable child product-->
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Quantity')}}" userInput="99" stepKey="seeProductSkuInGrid"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml
new file mode 100644
index 0000000000000..5daf699294155
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.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="AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="View configurable product details on storefront"/>
+            <title value="Check that 'trie price' block not available for simple product from options without 'trie price'"/>
+            <description value="Check that 'trie price' block not available for simple product from options without 'trie price'"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-13789"/>
+            <useCaseId value="MAGETWO-96457"/>
+            <group value="catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create Configurable product-->
+            <actionGroup ref="AdminCreateApiConfigurableProductActionGroup" stepKey="createConfigurableProduct"/>
+        </before>
+        <after>
+            <!--Delete created data-->
+            <deleteData createDataKey="createConfigProductCreateConfigurableProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1CreateConfigurableProduct" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2CreateConfigurableProduct" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProductAttributeCreateConfigurableProduct" stepKey="deleteConfigProductAttribute"/>
+
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+
+        <!--Go to storefront product page an check price box css-->
+        <amOnPage url="{{StorefrontProductPage.url($$createConfigProductCreateConfigurableProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToSimpleProductPage"/>
+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$getConfigAttributeOption1CreateConfigurableProduct.value$$" stepKey="selectOption"/>
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productPriceBox}}" userInput="class" stepKey="grabGrabPriceClass"/>
+        <assertContains actual="$grabGrabPriceClass" expected="price-box price-final_price" expectedType="string" stepKey="assertEquals"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml
index a1e3e0b83e722..bddd71f565c33 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontConfigurableProductWithFileCustomOptionTest">
         <annotations>
             <features value="ConfigurableProduct"/>
@@ -42,7 +42,9 @@
             <argument name="category" value="$$createCategory$$"/>
         </actionGroup>
         <!--Add custom option to configurable product-->
-        <actionGroup ref="AddProductCustomOptionFile" stepKey="addCustomOptionToProduct"/>
+        <actionGroup ref="AddProductCustomOptionFile" stepKey="addCustomOptionToProduct">
+            <argument name="option" value="ProductOptionFile"/>
+        </actionGroup>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
 
         <!--Go to storefront-->
@@ -60,7 +62,6 @@
         <!--Try invalid file-->
         <attachFile selector="{{StorefrontProductInfoMainSection.addLinkFileUploadFile(ProductOptionFile.title)}}" userInput="lorem_ipsum.docx" stepKey="attachInvalidFile"/>
         <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCartInvalidFile"/>
-        <waitForPageLoad time="30" stepKey="waitForAddToCartWithError"/>
         <waitForElementVisible selector="{{StorefrontProductPageSection.alertMessage}}" stepKey="waitForErrorMessageInvalidFile"/>
         <see selector="{{StorefrontProductPageSection.messagesBlock}}" userInput="The file 'lorem_ipsum.docx' for '{{ProductOptionFile.title}}' has an invalid extension." stepKey="seeMessageInvalidFile"/>
         <!--Option remains selected-->
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml
index d07ff3ec4d656..c8ca2ced0d60f 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml
@@ -16,9 +16,6 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-76081"/>
             <group value="configurable_product"/>
-            <skip>
-                <issueId value="MAGETWO-96271"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="ApiCategory" stepKey="createCategory"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Cart/Item/Renderer/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Cart/Item/Renderer/ConfigurableTest.php
index f324494f5918a..698a7ac9f2693 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Cart/Item/Renderer/ConfigurableTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Cart/Item/Renderer/ConfigurableTest.php
@@ -8,6 +8,9 @@
 use Magento\Catalog\Model\Config\Source\Product\Thumbnail as ThumbnailSource;
 use Magento\ConfigurableProduct\Block\Cart\Item\Renderer\Configurable as Renderer;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ConfigurableTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -30,6 +33,16 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
      */
     private $productConfigMock;
 
+    /**
+     * @var \Magento\Backend\Block\Template\Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var \Magento\Framework\View\Layout|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $layoutMock;
+
     /**
      * @var Renderer
      */
@@ -39,6 +52,10 @@ protected function setUp()
     {
         parent::setUp();
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->contextMock = $this->createPartialMock(\Magento\Backend\Block\Template\Context::class, ['getLayout']);
+        $this->layoutMock = $this->createPartialMock(\Magento\Framework\View\Layout::class, ['getBlock']);
+        $this->contextMock->expects($this->once())->method('getLayout')->willReturn($this->layoutMock);
+
         $this->configManager = $this->createMock(\Magento\Framework\View\ConfigInterface::class);
         $this->imageHelper = $this->createPartialMock(
             \Magento\Catalog\Helper\Image::class,
@@ -53,6 +70,7 @@ protected function setUp()
                 'imageHelper' => $this->imageHelper,
                 'scopeConfig' => $this->scopeConfig,
                 'productConfig' => $this->productConfigMock,
+                'context' => $this->contextMock,
             ]
         );
     }
@@ -75,4 +93,42 @@ public function testGetIdentities()
         $this->renderer->setItem($item);
         $this->assertEquals(array_merge($productTags, $productTags), $this->renderer->getIdentities());
     }
+
+    /**
+     * Product price renderer test.
+     *
+     * @return void
+     */
+    public function testGetProductPriceHtml()
+    {
+        $priceHtml = 'some price html';
+        $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
+
+        $item = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
+        $item->expects($this->atLeastOnce())->method('getProduct')->willReturn($productMock);
+
+        $priceRenderMock = $this->getMockBuilder(\Magento\Framework\Pricing\Render::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->layoutMock->expects($this->once())
+            ->method('getBlock')
+            ->with('product.price.render.default')
+            ->willReturn($priceRenderMock);
+
+        $priceRenderMock->expects($this->once())
+            ->method('render')
+            ->with(
+                \Magento\Catalog\Pricing\Price\ConfiguredPriceInterface::CONFIGURED_PRICE_CODE,
+                $productMock,
+                [
+                    'include_container' => true,
+                    'display_minimal_price' => true,
+                    'zone' => \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
+                ]
+            )->willReturn($priceHtml);
+
+        $this->renderer->setItem($item);
+        $this->assertEquals($priceHtml, $this->renderer->getProductPriceHtml($productMock));
+    }
 }
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 b45306d670bff..20b0905b7707b 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
@@ -347,15 +347,15 @@ public function testGetJsonConfig()
     }
 
     /**
-     * Retrieve array with expected parameters for method getJsonConfig()
+     * Retrieve array with expected parameters for method getJsonConfig().
      *
-     * @param $productId
-     * @param $amount
-     * @param $priceQty
-     * @param $percentage
+     * @param int $productId
+     * @param float $amount
+     * @param int $priceQty
+     * @param int $percentage
      * @return array
      */
-    private function getExpectedArray($productId, $amount, $priceQty, $percentage)
+    private function getExpectedArray(int $productId, float $amount, int $priceQty, int $percentage): array
     {
         $expectedArray = [
             'attributes' => [],
@@ -379,6 +379,9 @@ private function getExpectedArray($productId, $amount, $priceQty, $percentage)
                             'percentage' => $percentage,
                         ],
                     ],
+                    'msrpPrice' => [
+                        'amount' => null,
+                    ],
                 ],
             ],
             'priceFormat' => [],
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php
index acbb976318b3b..279880d546424 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php
@@ -158,7 +158,7 @@ public function testAddChild()
             ->getMock();
         $optionMock = $this->getMockBuilder(\Magento\ConfigurableProduct\Api\Data\Option::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getProductAttribute', 'getAttributeId'])
+            ->setMethods(['getProductAttribute', 'getPosition', 'getAttributeId'])
             ->getMock();
         $productAttributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class)
             ->disableOriginalConstructor()
@@ -216,6 +216,7 @@ public function testAddChild()
         $productAttributeMock->expects($this->any())->method('getAttributeCode')->willReturn('color');
         $simple->expects($this->any())->method('getData')->willReturn('color');
         $optionMock->expects($this->any())->method('getAttributeId')->willReturn('1');
+        $optionMock->expects($this->any())->method('getPosition')->willReturn('0');
 
         $optionsFactoryMock->expects($this->any())->method('create')->willReturn([$optionMock]);
         $attributeFactoryMock->expects($this->any())->method('create')->willReturn($attributeMock);
@@ -223,6 +224,7 @@ public function testAddChild()
         $attributeCollectionMock->expects($this->any())->method('addFieldToFilter')->willReturnSelf();
         $attributeCollectionMock->expects($this->any())->method('getItems')->willReturn([$attributeMock]);
 
+        $attributeMock->expects($this->any())->method('getId')->willReturn(1);
         $attributeMock->expects($this->any())->method('getOptions')->willReturn([$attributeOptionMock]);
 
         $extensionAttributesMock->expects($this->any())->method('setConfigurableProductOptions');
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php
index 64b9b3776442a..0fc650a4113c6 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php
@@ -6,22 +6,47 @@
 
 namespace Magento\ConfigurableProduct\Test\Unit\Model\Product\Type\Configurable;
 
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Configuration\Item\Option;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Price as ConfigurablePrice;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Pricing\Amount\AmountInterface;
+use Magento\Framework\Pricing\Price\PriceInterface;
+use Magento\Framework\Pricing\PriceInfo\Base as PriceInfoBase;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class PriceTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Price */
+    /**
+     * @var ObjectManagerHelper
+     */
+    protected $objectManagerHelper;
+
+    /**
+     * @var ConfigurablePrice
+     */
     protected $model;
 
-    /** @var ObjectManagerHelper */
-    protected $objectManagerHelper;
+    /**
+     * @var ManagerInterface|MockObject
+     */
+    private $eventManagerMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManagerHelper = new ObjectManagerHelper($this);
 
+        $this->eventManagerMock = $this->createPartialMock(
+            ManagerInterface::class,
+            ['dispatch']
+        );
         $this->model = $this->objectManagerHelper->getObject(
-            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Price::class
+            ConfigurablePrice::class,
+            ['eventManager' => $this->eventManagerMock]
         );
     }
 
@@ -29,29 +54,29 @@ public function testGetFinalPrice()
     {
         $finalPrice = 10;
         $qty = 1;
-        $configurableProduct = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getCustomOption', 'getPriceInfo', 'setFinalPrice', '__wakeUp'])
-            ->getMock();
-        $customOption = $this->getMockBuilder(\Magento\Catalog\Model\Product\Configuration\Item\Option::class)
+
+        /** @var Product|MockObject $configurableProduct */
+        $configurableProduct = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getProduct'])
+            ->setMethods(['getCustomOption', 'getPriceInfo', 'setFinalPrice'])
             ->getMock();
-        $priceInfo = $this->getMockBuilder(\Magento\Framework\Pricing\PriceInfo\Base::class)
+        /** @var PriceInfoBase|MockObject $priceInfo */
+        $priceInfo = $this->getMockBuilder(PriceInfoBase::class)
             ->disableOriginalConstructor()
             ->setMethods(['getPrice'])
             ->getMock();
-        $price = $this->getMockBuilder(\Magento\Framework\Pricing\Price\PriceInterface::class)
+        /** @var PriceInterface|MockObject $price */
+        $price = $this->getMockBuilder(PriceInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $amount = $this->getMockBuilder(\Magento\Framework\Pricing\Amount\AmountInterface::class)
+        /** @var AmountInterface|MockObject $amount */
+        $amount = $this->getMockBuilder(AmountInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $configurableProduct->expects($this->any())
             ->method('getCustomOption')
             ->willReturnMap([['simple_product', false], ['option_ids', false]]);
-        $customOption->expects($this->never())->method('getProduct');
         $configurableProduct->expects($this->once())->method('getPriceInfo')->willReturn($priceInfo);
         $priceInfo->expects($this->once())->method('getPrice')->with('final_price')->willReturn($price);
         $price->expects($this->once())->method('getAmount')->willReturn($amount);
@@ -60,4 +85,60 @@ public function testGetFinalPrice()
 
         $this->assertEquals($finalPrice, $this->model->getFinalPrice($qty, $configurableProduct));
     }
+
+    public function testGetFinalPriceWithSimpleProduct()
+    {
+        $finalPrice = 10;
+        $qty = 1;
+        $customerGroupId = 1;
+
+        /** @var Product|MockObject $configurableProduct */
+        $configurableProduct = $this->createPartialMock(
+            Product::class,
+            ['getCustomOption', 'setFinalPrice', 'getCustomerGroupId']
+        );
+        /** @var Option|MockObject $customOption */
+        $customOption = $this->createPartialMock(
+            Option::class,
+            ['getProduct']
+        );
+        /** @var Product|MockObject $simpleProduct */
+        $simpleProduct = $this->createPartialMock(
+            Product::class,
+            ['setCustomerGroupId', 'setFinalPrice', 'getPrice', 'getTierPrice', 'getData', 'getCustomOption']
+        );
+
+        $configurableProduct->method('getCustomOption')
+            ->willReturnMap([
+                ['simple_product', $customOption],
+                ['option_ids', false]
+            ]);
+        $configurableProduct->method('getCustomerGroupId')->willReturn($customerGroupId);
+        $configurableProduct->expects($this->atLeastOnce())
+            ->method('setFinalPrice')
+            ->with($finalPrice)
+            ->willReturnSelf();
+        $customOption->method('getProduct')->willReturn($simpleProduct);
+        $simpleProduct->expects($this->atLeastOnce())
+            ->method('setCustomerGroupId')
+            ->with($customerGroupId)
+            ->willReturnSelf();
+        $simpleProduct->method('getPrice')->willReturn($finalPrice);
+        $simpleProduct->method('getTierPrice')->with($qty)->willReturn($finalPrice);
+        $simpleProduct->expects($this->atLeastOnce())
+            ->method('setFinalPrice')
+            ->with($finalPrice)
+            ->willReturnSelf();
+        $simpleProduct->method('getData')->with('final_price')->willReturn($finalPrice);
+        $simpleProduct->method('getCustomOption')->with('option_ids')->willReturn(false);
+        $this->eventManagerMock->expects($this->once())
+            ->method('dispatch')
+            ->with('catalog_product_get_final_price', ['product' => $simpleProduct, 'qty' => $qty]);
+
+        $this->assertEquals(
+            $finalPrice,
+            $this->model->getFinalPrice($qty, $configurableProduct),
+            'The final price calculation is wrong'
+        );
+    }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php
index d1cf77f03a7bd..c351d12fa813d 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php
@@ -11,10 +11,13 @@
 use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface;
 use Magento\ConfigurableProduct\Model\Product\Type\Collection\SalableProcessor;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable\AttributeFactory;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\CollectionFactory;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection as ProductCollection;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\CollectionFactory
+    as ProductCollectionFactory;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\ConfigurableFactory;
 use Magento\Customer\Model\Session;
 use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
@@ -27,7 +30,6 @@
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
- * @codingStandardsIgnoreFile
  */
 class ConfigurableTest extends \PHPUnit\Framework\TestCase
 {
@@ -154,8 +156,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->productCollectionFactory = $this->getMockBuilder(
-            \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\CollectionFactory::class)
+        $this->productCollectionFactory = $this->getMockBuilder(ProductCollectionFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
@@ -281,8 +282,7 @@ public function testSave()
         $product->expects($this->atLeastOnce())
             ->method('getData')
             ->willReturnMap($dataMap);
-        $attribute = $this->getMockBuilder(
-            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class)
+        $attribute = $this->getMockBuilder(Attribute::class)
             ->disableOriginalConstructor()
             ->setMethods(['addData', 'setStoreId', 'setProductId', 'save', '__wakeup', '__sleep'])
             ->getMock();
@@ -464,8 +464,7 @@ public function testGetConfigurableAttributesAsArray($productStore)
         $eavAttribute->expects($this->once())->method('getSource')->willReturn($attributeSource);
         $eavAttribute->expects($this->atLeastOnce())->method('getStoreLabel')->willReturn('Store Label');
 
-        $attribute = $this->getMockBuilder(
-            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class)
+        $attribute = $this->getMockBuilder(Attribute::class)
             ->disableOriginalConstructor()
             ->setMethods(['getProductAttribute', '__wakeup', '__sleep'])
             ->getMock();
@@ -524,7 +523,7 @@ public function testGetConfigurableAttributesNewProduct()
         $this->assertEquals([], $this->model->getConfigurableAttributes($product));
     }
 
-        public function testGetConfigurableAttributes()
+    public function testGetConfigurableAttributes()
     {
         $configurableAttributes = '_cache_instance_configurable_attributes';
 
@@ -591,8 +590,7 @@ public function testHasOptionsConfigurableAttribute()
             ->setMethods(['__wakeup', 'getAttributeCode', 'getOptions', 'hasData', 'getData'])
             ->disableOriginalConstructor()
             ->getMock();
-        $attributeMock = $this->getMockBuilder(
-            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class)
+        $attributeMock = $this->getMockBuilder(Attribute::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -698,7 +696,7 @@ function ($value) {
             ->disableOriginalConstructor()
             ->getMock();
         $usedAttributeMock = $this->getMockBuilder(
-            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class
+            Attribute::class
         )
             ->setMethods(['getProductAttribute'])
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolverTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolverTest.php
new file mode 100644
index 0000000000000..71bd6fd83c24d
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolverTest.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Test\Unit\Plugin\Catalog\Model\Product\Pricing\Renderer;
+
+use Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as TypeConfigurable;
+use Magento\ConfigurableProduct\Plugin\Catalog\Model\Product\Pricing\Renderer\SalableResolver as SalableResolverPlugin;
+use Magento\Framework\Pricing\SaleableInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class SalableResolverTest
+ */
+class SalableResolverTest extends TestCase
+{
+    /**
+     * @var TypeConfigurable|MockObject
+     */
+    private $typeConfigurable;
+
+    /**
+     * @var SalableResolverPlugin
+     */
+    private $salableResolver;
+
+    protected function setUp()
+    {
+        $this->typeConfigurable = $this->createMock(TypeConfigurable::class);
+        $this->salableResolver = new SalableResolverPlugin($this->typeConfigurable);
+    }
+
+    /**
+     * @param SaleableInterface|MockObject $salableItem
+     * @param bool $isSalable
+     * @param bool $typeIsSalable
+     * @param bool $expectedResult
+     * @return void
+     * @dataProvider afterIsSalableDataProvider
+     */
+    public function testAfterIsSalable($salableItem, bool $isSalable, bool $typeIsSalable, bool $expectedResult)
+    {
+        $salableResolver = $this->createMock(SalableResolver::class);
+
+        $this->typeConfigurable->method('isSalable')
+            ->willReturn($typeIsSalable);
+
+        $result = $this->salableResolver->afterIsSalable($salableResolver, $isSalable, $salableItem);
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    /**
+     * Data provider for testAfterIsSalable
+     *
+     * @return array
+     */
+    public function afterIsSalableDataProvider(): array
+    {
+        $simpleSalableItem = $this->createMock(SaleableInterface::class);
+        $simpleSalableItem->method('getTypeId')
+            ->willReturn('simple');
+
+        $configurableSalableItem = $this->createMock(SaleableInterface::class);
+        $configurableSalableItem->method('getTypeId')
+            ->willReturn('configurable');
+
+        return [
+            [
+                $simpleSalableItem,
+                true,
+                false,
+                true,
+            ],
+            [
+                $configurableSalableItem,
+                true,
+                false,
+                false,
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Tax/Model/Sales/Total/Quote/CommonTaxCollectorTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Tax/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
new file mode 100644
index 0000000000000..1a5c6c0003bfa
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Tax/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Test\Unit\Plugin\Tax\Model\Sales\Total\Quote;
+
+use Magento\Catalog\Model\Product;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\ConfigurableProduct\Plugin\Tax\Model\Sales\Total\Quote\CommonTaxCollector as CommonTaxCollectorPlugin;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Quote\Model\Quote\Item\AbstractItem;
+use Magento\Tax\Api\Data\QuoteDetailsItemInterface;
+use Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory;
+use Magento\Tax\Api\Data\TaxClassKeyInterface;
+use Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector;
+use PHPUnit\Framework\MockObject\MockObject;
+
+/**
+ * Test for CommonTaxCollector plugin
+ */
+class CommonTaxCollectorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var CommonTaxCollectorPlugin
+     */
+    private $commonTaxCollectorPlugin;
+
+    /**
+     * @inheritdoc
+     */
+    public function setUp()
+    {
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->commonTaxCollectorPlugin = $this->objectManager->getObject(CommonTaxCollectorPlugin::class);
+    }
+
+    /**
+     * Test to apply Tax Class Id from child item for configurable product
+     */
+    public function testAfterMapItem()
+    {
+        $childTaxClassId = 10;
+
+        /** @var Product|MockObject $childProductMock */
+        $childProductMock = $this->createPartialMock(
+            Product::class,
+            ['getTaxClassId']
+        );
+        $childProductMock->method('getTaxClassId')->willReturn($childTaxClassId);
+        /* @var AbstractItem|MockObject $quoteItemMock */
+        $childQuoteItemMock = $this->createMock(
+            AbstractItem::class
+        );
+        $childQuoteItemMock->method('getProduct')->willReturn($childProductMock);
+
+        /** @var Product|MockObject $productMock */
+        $productMock = $this->createPartialMock(
+            Product::class,
+            ['getTypeId']
+        );
+        $productMock->method('getTypeId')->willReturn(Configurable::TYPE_CODE);
+        /* @var AbstractItem|MockObject $quoteItemMock */
+        $quoteItemMock = $this->createPartialMock(
+            AbstractItem::class,
+            ['getProduct', 'getHasChildren', 'getChildren', 'getQuote', 'getAddress', 'getOptionByCode']
+        );
+        $quoteItemMock->method('getProduct')->willReturn($productMock);
+        $quoteItemMock->method('getHasChildren')->willReturn(true);
+        $quoteItemMock->method('getChildren')->willReturn([$childQuoteItemMock]);
+
+        /* @var TaxClassKeyInterface|MockObject $taxClassObjectMock */
+        $taxClassObjectMock = $this->createMock(TaxClassKeyInterface::class);
+        $taxClassObjectMock->expects($this->once())->method('setValue')->with($childTaxClassId);
+
+        /* @var QuoteDetailsItemInterface|MockObject $quoteDetailsItemMock */
+        $quoteDetailsItemMock = $this->createMock(QuoteDetailsItemInterface::class);
+        $quoteDetailsItemMock->method('getTaxClassKey')->willReturn($taxClassObjectMock);
+
+        $this->commonTaxCollectorPlugin->afterMapItem(
+            $this->createMock(CommonTaxCollector::class),
+            $quoteDetailsItemMock,
+            $this->createMock(QuoteDetailsItemInterfaceFactory::class),
+            $quoteItemMock
+        );
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
index 9fd225e8acaab..44d0ca86d98d0 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Model\Product\Attribute\Backend\Sku;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
+use Magento\Framework\UrlInterface;
 use Magento\Ui\Component\Container;
-use Magento\Ui\Component\Form;
 use Magento\Ui\Component\DynamicRows;
+use Magento\Ui\Component\Form;
 use Magento\Ui\Component\Modal;
-use Magento\Framework\UrlInterface;
-use Magento\Catalog\Model\Locator\LocatorInterface;
 
 /**
  * Data provider for Configurable panel
@@ -90,7 +90,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyData(array $data)
     {
@@ -98,7 +98,7 @@ public function modifyData(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function modifyMeta(array $meta)
@@ -197,7 +197,7 @@ public function modifyMeta(array $meta)
                                         'autoRender' => false,
                                         'componentType' => 'insertListing',
                                         'component' => 'Magento_ConfigurableProduct/js'
-                                            .'/components/associated-product-insert-listing',
+                                            . '/components/associated-product-insert-listing',
                                         'dataScope' => $this->associatedListingPrefix
                                             . static::ASSOCIATED_PRODUCT_LISTING,
                                         'externalProvider' => $this->associatedListingPrefix
@@ -328,14 +328,12 @@ protected function getButtonSet()
                                 'component' => 'Magento_Ui/js/form/components/button',
                                 'actions' => [
                                     [
-                                        'targetName' =>
-                                            $this->dataScopeName . '.configurableModal',
+                                        'targetName' => $this->dataScopeName . '.configurableModal',
                                         'actionName' => 'trigger',
                                         'params' => ['active', true],
                                     ],
                                     [
-                                        'targetName' =>
-                                            $this->dataScopeName . '.configurableModal',
+                                        'targetName' => $this->dataScopeName . '.configurableModal',
                                         'actionName' => 'openModal',
                                     ],
                                 ],
@@ -574,6 +572,7 @@ protected function getColumn(
             'dataType' => Form\Element\DataType\Text::NAME,
             'dataScope' => $name,
             'visibleIfCanEdit' => false,
+            'labelVisible' => false,
             'imports' => [
                 'visible' => '!${$.provider}:${$.parentScope}.canEdit'
             ],
@@ -591,7 +590,9 @@ protected function getColumn(
             'formElement' => Container::NAME,
             'component' => 'Magento_Ui/js/form/components/group',
             'label' => $label,
+            'showLabel' => false,
             'dataScope' => '',
+            'showLabel' => false
         ];
         $container['children'] = [
             $name . '_edit' => $fieldEdit,
diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json
index eae9dac046b23..218d66579b13e 100644
--- a/app/code/Magento/ConfigurableProduct/composer.json
+++ b/app/code/Magento/ConfigurableProduct/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-configurable-product",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-catalog": "102.0.*",
         "magento/module-catalog-inventory": "100.2.*",
@@ -22,10 +22,11 @@
         "magento/module-sales-rule": "101.0.*",
         "magento/module-product-video": "100.2.*",
         "magento/module-configurable-sample-data": "Sample Data version:100.2.*",
-        "magento/module-product-links-sample-data": "Sample Data version:100.2.*"
+        "magento/module-product-links-sample-data": "Sample Data version:100.2.*",
+        "magento/module-tax": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.6",
+    "version": "100.2.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml
index e6e0da721e150..fa9ed70cfb2cd 100644
--- a/app/code/Magento/ConfigurableProduct/etc/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/di.xml
@@ -43,6 +43,13 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\CatalogInventory\Observer\SaveInventoryDataObserver">
+        <arguments>
+            <argument name="parentItemProcessorPool" xsi:type="array">
+                <item name="configurable" xsi:type="object"> Magento\ConfigurableProduct\Model\Inventory\ParentItemProcessor</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Sales\Model\ResourceModel\Report\Bestsellers">
         <arguments>
             <argument name="ignoredProductTypes" xsi:type="array">
@@ -245,4 +252,14 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector">
+        <plugin name="apply_tax_class_id" type="Magento\ConfigurableProduct\Plugin\Tax\Model\Sales\Total\Quote\CommonTaxCollector" />
+    </type>
+    <type name="Magento\Eav\Model\Entity\Attribute\Group">
+        <arguments>
+            <argument name="reservedSystemNames" xsi:type="array">
+                <item name="configurable" xsi:type="string">configurable</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml
index 110defd5248b9..9307da21e6659 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml
@@ -8,7 +8,7 @@
 <script>
 (function ($) {
 
-    var data = <?= /* @escapeNotVerified */ $block->getAttributesBlockJson() ?>;
+    var data = <?= /* @noEscape */ $block->getAttributesBlockJson() ?>;
     var set = data.set || {id: $('#attribute_set_id').val()};
     if (data.tab == 'variations') {
         $('[data-role=product-variations-matrix]').trigger('add', data.attribute);
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml
index 9c4612c972d96..5f49d5eb47442 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml
@@ -5,8 +5,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
 <script>
 require([
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 a8712cdc183de..62e0eccdd7c32 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
@@ -3,35 +3,32 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
- ?>
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+?>
 
 <?php /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Composite\Fieldset\Configurable */ ?>
 <?php $_product = $block->getProduct(); ?>
 <?php $_attributes = $block->decorateArray($block->getAllowAttributes()); ?>
-<?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
-<?php if (($_product->isSaleable() || $_skipSaleableCheck) && count($_attributes)):?>
+<?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
+<?php if (($_product->isSaleable() || $_skipSaleableCheck) && count($_attributes)) :?>
 <fieldset id="catalog_product_composite_configure_fields_configurable" class="fieldset admin__fieldset">
     <legend class="legend admin__legend">
-        <span><?= /* @escapeNotVerified */ __('Associated Products') ?></span>
+        <span><?= $block->escapeHtml(__('Associated Products'))?></span>
     </legend>
     <div class="product-options">
         <div class="field admin__field _required required">
-            <?php foreach ($_attributes as $_attribute): ?>
-                <label class="label admin__field-label"><?php
-                    /* @escapeNotVerified */ echo $_attribute->getProductAttribute()
-                        ->getStoreLabel($_product->getStoreId());
-                    ?></label>
+            <?php foreach ($_attributes as $_attribute) : ?>
+                <label class="label admin__field-label"><?=
+                    $block->escapeHtml($_attribute->getProductAttribute()->getStoreLabel($_product->getStoreId()))
+                ?></label>
                 <div class="control admin__field-control <?php
-                    if ($_attribute->getDecoratedIsLast()):
-                        ?> last<?php
+                if ($_attribute->getDecoratedIsLast()) :
+                    ?> last<?php
                     endif; ?>">
-                    <select name="super_attribute[<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>]"
-                            id="attribute<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>"
+                    <select name="super_attribute[<?= $block->escapeHtmlAttr($_attribute->getAttributeId()) ?>]"
+                            id="attribute<?= $block->escapeHtmlAttr($_attribute->getAttributeId()) ?>"
                             class="admin__control-select required-entry super-attribute-select">
-                        <option><?= /* @escapeNotVerified */ __('Choose an Option...') ?></option>
+                        <option><?= $block->escapeHtml(__('Choose an Option...')) ?></option>
                     </select>
                 </div>
             <?php endforeach; ?>
@@ -44,7 +41,7 @@ require([
     "Magento_Catalog/catalog/product/composite/configure"
 ], function(){
 
-    var config = <?= /* @escapeNotVerified */ $block->getJsonConfig() ?>;
+    var config = <?= /* @noEscape */ $block->getJsonConfig() ?>;
     if (window.productConfigure) {
         config.containerId = window.productConfigure.blockFormFields.id;
         if (window.productConfigure.restorePhase) {
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
index cc25474049190..44413c67ed5ba 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
@@ -4,18 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\AttributeValues */
 ?>
 <div data-bind="scope: '<?= /* @noEscape */  $block->getComponentName() ?>'">
     <h2 class="steps-wizard-title"><?= $block->escapeHtml(
-            __('Step 2: Attribute Values')
-        ); ?></h2>
+        __('Step 2: Attribute Values')
+    ); ?></h2>
     <div class="steps-wizard-info">
         <span><?= $block->escapeHtml(
-                __('Select values from each attribute to include in this product. Each unique combination of values creates a unique product SKU.')
-            );?></span>
+            __('Select values from each attribute to include in this product. Each unique combination of values creates a unique product SKU.')
+        );?></span>
     </div>
     <div data-bind="foreach: attributes, sortableList: attributes">
 
@@ -41,24 +39,24 @@
                             data-bind="click: $parent.selectAllAttributes"
                             title="<?= $block->escapeHtml(__('Select All')) ?>">
                         <span><?= $block->escapeHtml(
-                                __('Select All')
-                            ); ?></span>
+                            __('Select All')
+                        ); ?></span>
                     </button>
                     <button type="button"
                             class="action-deselect-all action-tertiary"
                             data-bind="click: $parent.deSelectAllAttributes"
                             title="<?= $block->escapeHtml(__('Deselect All')) ?>">
                         <span><?= $block->escapeHtml(
-                                __('Deselect All')
-                            ); ?></span>
+                            __('Deselect All')
+                        ); ?></span>
                     </button>
                     <button type="button"
                             class="action-remove-all action-tertiary"
                             data-bind="click: $parent.removeAttribute.bind($parent)"
                             title="<?= $block->escapeHtml(__('Remove Attribute')) ?>">
                         <span><?= $block->escapeHtml(
-                                __('Remove Attribute')
-                            ); ?></span>
+                            __('Remove Attribute')
+                        ); ?></span>
                     </button>
                 </div>
             </div>
@@ -87,8 +85,8 @@
                                     data-action="save"
                                     data-bind="click: $parents[1].saveOption.bind($parent)">
                                 <span><?= $block->escapeHtml(
-                                        __('Save Option')
-                                    ); ?></span>
+                                    __('Save Option')
+                                ); ?></span>
                             </button>
                             <button type="button"
                                     class="action-remove"
@@ -96,8 +94,8 @@
                                     data-action="remove"
                                     data-bind="click: $parents[1].removeOption.bind($parent)">
                                 <span><?= $block->escapeHtml(
-                                        __('Remove Option')
-                                    ); ?></span>
+                                    __('Remove Option')
+                                ); ?></span>
                             </button>
                         </div>
                     </li>
@@ -108,8 +106,8 @@
                     data-action="addOption"
                     data-bind="click: $parent.createOption, visible: canCreateOption">
                 <span><?= $block->escapeHtml(
-                        __('Create New Value')
-                    ); ?></span>
+                    __('Create New Value')
+                ); ?></span>
             </button>
         </div>
     </div>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
index 9d144b0f569e0..bee4a4ebe890e 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
@@ -3,24 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\Bulk */
 ?>
 
 <div data-bind="scope: '<?= /* @noEscape */  $block->getComponentName() ?>'" data-role="bulk-step">
     <h2 class="steps-wizard-title"><?= $block->escapeHtml(__('Step 3: Bulk Images, Price and Quantity')) ?></h2>
     <div class="steps-wizard-info">
-        <?= /* @escapeNotVerified */ __('Based on your selections %1 new products will be created. Use this step to customize images and price for your new products.', '<span class="new-products-count" data-bind="text:countVariations"></span>') ?>
+        <?= /* @noEscape */ __('Based on your selections %1 new products will be created. Use this step to customize images and price for your new products.', '<span class="new-products-count" data-bind="text:countVariations"></span>') ?>
     </div>
 
     <div data-bind="with: sections().images" class="steps-wizard-section">
         <div data-role="section">
             <div class="steps-wizard-section-title">
-            <span><?= $block->escapeHtml(
-                    __('Images')
-                ); ?></span>
+            <span><?= $block->escapeHtml(__('Images')); ?></span>
             </div>
 
             <ul class="steps-wizard-section-list">
@@ -32,9 +28,7 @@
                                value="single"
                                data-bind="checked:type">
                         <label for="apply-single-set-radio" class="admin__field-label">
-                        <span><?= $block->escapeHtml(
-                                __('Apply single set of images to all SKUs')
-                            ); ?></span>
+                        <span><?= $block->escapeHtml(__('Apply single set of images to all SKUs')); ?></span>
                         </label>
                     </div>
                 </li>
@@ -71,9 +65,7 @@
                 <div data-role="gallery"
                      class="gallery"
                      data-images="[]"
-                     data-types="<?= $block->escapeHtml(
-                         $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getImageTypes())
-                     ) ?>"
+                     data-types="<?= $block->escapeHtml($this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getImageTypes())) ?>"
                 >
                     <div class="image image-placeholder">
                         <div data-role="uploader" class="uploader">
@@ -92,8 +84,7 @@
                         </div>
                     </div>
 
-                    <?php foreach ($block->getImageTypes() as $typeData):
-                        ?>
+                    <?php foreach ($block->getImageTypes() as $typeData) : ?>
                         <input name="<?= $block->escapeHtml($typeData['name']) ?>"
                                class="image-<?= $block->escapeHtml($typeData['code']) ?>"
                                type="hidden"
@@ -156,13 +147,9 @@
                             </div>
                             <ul class="item-roles" data-role="roles-labels">
                                 <?php
-                                foreach ($block->getMediaAttributes() as $attribute):
-                                    ?>
-                                    <li data-role-code="<?= $block->escapeHtml(
-                                        $attribute->getAttributeCode()
-                                    ) ?>" class="item-role item-role-<?= $block->escapeHtml(
-                                        $attribute->getAttributeCode()
-                                    ) ?>">
+                                foreach ($block->getMediaAttributes() as $attribute) :?>
+                                    <li data-role-code="<?= $block->escapeHtml($attribute->getAttributeCode()) ?>"
+                                        class="item-role item-role-<?= $block->escapeHtml($attribute->getAttributeCode()) ?>">
                                         <?= /* @noEscape */ $attribute->getFrontendLabel() ?>
                                     </li>
                                     <?php
@@ -229,9 +216,7 @@
 
                                 <div class="admin__field field-image-role">
                                     <label class="admin__field-label">
-                                    <span><?= $block->escapeHtml(
-                                            __('Role')
-                                        ); ?></span>
+                                    <span><?= $block->escapeHtml(__('Role')); ?></span>
                                     </label>
                                     <div class="admin__field-control">
                                         <ul class="multiselect-alt">
@@ -243,13 +228,9 @@
                                                         <input class="image-type"
                                                                data-role="type-selector"
                                                                type="checkbox"
-                                                               value="<?= $block->escapeHtml(
-                                                                   $attribute->getAttributeCode()
-                                                               ) ?>"
+                                                               value="<?= $block->escapeHtml($attribute->getAttributeCode()) ?>"
                                                         />
-                                                        <?= $block->escapeHtml(
-                                                            $attribute->getFrontendLabel()
-                                                        ); ?>
+                                                        <?= $block->escapeHtml($attribute->getFrontendLabel()); ?>
                                                     </label>
                                                 </li>
                                                 <?php
@@ -261,24 +242,16 @@
 
                                 <div class="admin__field admin__field-inline field-image-size" data-role="size">
                                     <label class="admin__field-label">
-                                    <span><?= $block->escapeHtml(
-                                            __('Image Size')
-                                        ); ?></span>
+                                    <span><?= $block->escapeHtml(__('Image Size')); ?></span>
                                     </label>
-                                    <div class="admin__field-value" data-message="<?= $block->escapeHtml(
-                                        __('{size}')
-                                    );?>"></div>
+                                    <div class="admin__field-value" data-message="<?= $block->escapeHtml(__('{size}'));?>"></div>
                                 </div>
 
                                 <div class="admin__field admin__field-inline field-image-resolution" data-role="resolution">
                                     <label class="admin__field-label">
-                                    <span><?= $block->escapeHtml(
-                                            __('Image Resolution')
-                                        ); ?></span>
+                                    <span><?= $block->escapeHtml(__('Image Resolution')); ?></span>
                                     </label>
-                                    <div class="admin__field-value" data-message="<?= $block->escapeHtml(
-                                        __('{width}^{height} px')
-                                    );?>"></div>
+                                    <div class="admin__field-value" data-message="<?= $block->escapeHtml(__('{width}^{height} px'));?>"></div>
                                 </div>
 
                                 <div class="admin__field field-image-hide">
@@ -293,9 +266,7 @@
                                             <% if (data.disabled == 1) { %>checked="checked"<% } %> />
 
                                             <label for="hide-from-product-page" class="admin__field-label">
-                                                <?= $block->escapeHtml(
-                                                    __('Hide from Product Page')
-                                                ); ?>
+                                                <?= $block->escapeHtml(__('Hide from Product Page')); ?>
                                             </label>
                                         </div>
                                     </div>
@@ -310,9 +281,7 @@
                 <fieldset class="admin__fieldset bulk-attribute-values">
                     <div class="admin__field _required">
                         <label class="admin__field-label" for="apply-images-attributes">
-                        <span><?= $block->escapeHtml(
-                                __('Select attribute')
-                            ); ?></span>
+                        <span><?= $block->escapeHtml(__('Select attribute')); ?></span>
                         </label>
                         <div class="admin__field-control">
                             <select
@@ -322,9 +291,7 @@
                                 options: $parent.attributes,
                                 optionsText: 'label',
                                 value: attribute,
-                                optionsCaption: '<?= $block->escapeHtml(
-                                    __("Select")
-                                ); ?>'
+                                optionsCaption: '<?= $block->escapeHtml(__("Select")); ?>'
                                 ">
                             </select>
                         </div>
@@ -341,24 +308,18 @@
                         <div data-role="gallery"
                              class="gallery"
                              data-images="[]"
-                             data-types="<?= $block->escapeHtml(
-                                 $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getImageTypes())
-                             ) ?>"
+                             data-types="<?= $block->escapeHtml($this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getImageTypes())) ?>"
                         >
                             <div class="image image-placeholder">
                                 <div data-role="uploader" class="uploader">
                                     <div class="image-browse">
-                                    <span><?= $block->escapeHtml(
-                                            __('Browse Files...')
-                                        ); ?></span>
+                                    <span><?= $block->escapeHtml(__('Browse Files...')); ?></span>
                                         <input type="file" name="image" multiple="multiple"
                                                data-url="<?= /* @noEscape */ $block->getUrl('catalog/product_gallery/upload') ?>" />
                                     </div>
                                 </div>
                                 <div class="product-image-wrapper">
-                                    <p class="image-placeholder-text"><?= $block->escapeHtml(
-                                            __('Browse to find or drag image here')
-                                        ); ?></p>
+                                    <p class="image-placeholder-text"><?= $block->escapeHtml(__('Browse to find or drag image here')); ?></p>
                                 </div>
                                 <div class="spinner">
                                     <span></span><span></span><span></span><span></span>
@@ -366,8 +327,7 @@
                                 </div>
                             </div>
 
-                            <?php foreach ($block->getImageTypes() as $typeData):
-                                ?>
+                            <?php foreach ($block->getImageTypes() as $typeData) :?>
                                 <input name="<?= $block->escapeHtml($typeData['name']) ?>"
                                        class="image-<?= $block->escapeHtml($typeData['code']) ?>"
                                        type="hidden"
@@ -418,15 +378,11 @@
                                                     class="action-remove"
                                                     data-role="delete-button"
                                                     title="<?= $block->escapeHtml(__('Remove image')) ?>">
-                                            <span><?= $block->escapeHtml(
-                                                    __('Remove image')
-                                                ); ?></span>
+                                            <span><?= $block->escapeHtml(__('Remove image')); ?></span>
                                             </button>
                                             <div class="draggable-handle"></div>
                                         </div>
-                                        <div class="image-fade"><span><?= $block->escapeHtml(
-                                                    __('Hidden')
-                                                ); ?></span></div>
+                                        <div class="image-fade"><span><?= $block->escapeHtml(__('Hidden')); ?></span></div>
                                     </div>
                                     <div class="item-description">
                                         <div class="item-title" data-role="img-title"><%- data.label %></div>
@@ -436,13 +392,10 @@
                                     </div>
                                     <ul class="item-roles" data-role="roles-labels">
                                         <?php
-                                        foreach ($block->getMediaAttributes() as $attribute):
+                                        foreach ($block->getMediaAttributes() as $attribute) :
                                             ?>
-                                            <li data-role-code="<?= $block->escapeHtml(
-                                                $attribute->getAttributeCode()
-                                            ) ?>" class="item-role item-role-<?= $block->escapeHtml(
-                                                $attribute->getAttributeCode()
-                                            ) ?>">
+                                            <li data-role-code="<?= $block->escapeHtml($attribute->getAttributeCode()) ?>"
+                                                class="item-role item-role-<?= $block->escapeHtml($attribute->getAttributeCode()) ?>">
                                                 <?= $block->escapeHtml($attribute->getFrontendLabel()) ?>
                                             </li>
                                             <?php
@@ -492,9 +445,7 @@
                                     <fieldset class="admin__fieldset fieldset-image-panel">
                                         <div class="admin__field field-image-description">
                                             <label class="admin__field-label" for="image-description">
-                                            <span><?= $block->escapeHtml(
-                                                    __('Alt Text')
-                                                );?></span>
+                                            <span><?= $block->escapeHtml(__('Alt Text'));?></span>
                                             </label>
 
                                             <div class="admin__field-control">
@@ -508,9 +459,7 @@
 
                                         <div class="admin__field field-image-role">
                                             <label class="admin__field-label">
-                                            <span><?= $block->escapeHtml(
-                                                    __('Role')
-                                                );?></span>
+                                            <span><?= $block->escapeHtml(__('Role'));?></span>
                                             </label>
                                             <div class="admin__field-control">
                                                 <ul class="multiselect-alt">
@@ -522,13 +471,9 @@
                                                                 <input class="image-type"
                                                                        data-role="type-selector"
                                                                        type="checkbox"
-                                                                       value="<?= $block->escapeHtml(
-                                                                           $attribute->getAttributeCode()
-                                                                       ) ?>"
+                                                                       value="<?= $block->escapeHtml($attribute->getAttributeCode()) ?>"
                                                                 />
-                                                                <?= $block->escapeHtml(
-                                                                    $attribute->getFrontendLabel()
-                                                                ) ?>
+                                                                <?= $block->escapeHtml($attribute->getFrontendLabel()) ?>
                                                             </label>
                                                         </li>
                                                         <?php
@@ -540,24 +485,16 @@
 
                                         <div class="admin__field admin__field-inline field-image-size" data-role="size">
                                             <label class="admin__field-label">
-                                            <span><?= $block->escapeHtml(
-                                                    __('Image Size')
-                                                ); ?></span>
+                                            <span><?= $block->escapeHtml(__('Image Size')); ?></span>
                                             </label>
-                                            <div class="admin__field-value" data-message="<?= $block->escapeHtml(
-                                                __('{size}')
-                                            ); ?>"></div>
+                                            <div class="admin__field-value" data-message="<?= $block->escapeHtml(__('{size}')); ?>"></div>
                                         </div>
 
                                         <div class="admin__field admin__field-inline field-image-resolution" data-role="resolution">
                                             <label class="admin__field-label">
-                                            <span><?= $block->escapeHtml(
-                                                    __('Image Resolution')
-                                                ); ?></span>
+                                            <span><?= $block->escapeHtml(__('Image Resolution')); ?></span>
                                             </label>
-                                            <div class="admin__field-value" data-message="<?= $block->escapeHtml(
-                                                __('{width}^{height} px')
-                                            ); ?>"></div>
+                                            <div class="admin__field-value" data-message="<?= $block->escapeHtml(__('{width}^{height} px')); ?>"></div>
                                         </div>
 
                                         <div class="admin__field field-image-hide">
@@ -572,9 +509,7 @@
                                                     <% if (data.disabled == 1) { %>checked="checked"<% } %> />
 
                                                     <label for="hide-from-product-page" class="admin__field-label">
-                                                        <?= $block->escapeHtml(
-                                                            __('Hide from Product Page')
-                                                        ); ?>
+                                                        <?= $block->escapeHtml(__('Hide from Product Page')); ?>
                                                     </label>
                                                 </div>
                                             </div>
@@ -593,9 +528,7 @@
     <div data-bind="with: sections().price" class="steps-wizard-section">
         <div data-role="section">
             <div class="steps-wizard-section-title">
-                <span><?= $block->escapeHtml(
-                        __('Price')
-                    ); ?></span>
+                <span><?= $block->escapeHtml(__('Price')); ?></span>
             </div>
             <ul class="steps-wizard-section-list">
                 <li>
@@ -607,9 +540,7 @@
                                data-bind="checked:type" />
                         <label for="apply-single-price-radio"
                                class="admin__field-label">
-                            <span><?= $block->escapeHtml(
-                                    __('Apply single price to all SKUs')
-                                ); ?></span>
+                            <span><?= $block->escapeHtml(__('Apply single price to all SKUs')); ?></span>
                         </label>
                     </div>
                 </li>
@@ -622,9 +553,7 @@
                                data-bind="checked:type" />
                         <label for="apply-unique-prices-radio"
                                class="admin__field-label">
-                            <span><?= $block->escapeHtml(
-                                    __('Apply unique prices by attribute to each SKU')
-                                ); ?></span>
+                            <span><?= $block->escapeHtml(__('Apply unique prices by attribute to each SKU')); ?></span>
                         </label>
                     </div>
                 </li>
@@ -637,9 +566,7 @@
                                checked
                                data-bind="checked:type" />
                         <label for="skip-pricing-radio" class="admin__field-label">
-                            <span><?= $block->escapeHtml(
-                                    __('Skip price at this time')
-                                ); ?></span>
+                            <span><?= $block->escapeHtml(__('Skip price at this time')); ?></span>
                         </label>
                     </div>
                 </li>
@@ -648,9 +575,7 @@
                 <fieldset class="admin__fieldset bulk-attribute-values" data-bind="visible: type() == 'single'">
                     <div class="admin__field _required">
                         <label for="apply-single-price-input" class="admin__field-label">
-                        <span><?= $block->escapeHtml(
-                                __('Price')
-                            ); ?></span>
+                        <span><?= $block->escapeHtml(__('Price')); ?></span>
                         </label>
                         <div class="admin__field-control">
                             <div class="currency-addon">
@@ -667,9 +592,7 @@
                 <fieldset class="admin__fieldset bulk-attribute-values">
                     <div class="admin__field _required">
                         <label for="select-each-price" class="admin__field-label">
-                            <span><?= $block->escapeHtml(
-                                    __('Select attribute')
-                                ); ?></span>
+                            <span><?= $block->escapeHtml(__('Select attribute')); ?></span>
                         </label>
                         <div class="admin__field-control">
                             <select id="select-each-price" class="admin__control-select" data-bind="
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml
index cfb742e80f719..c3dc614232201 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\SelectAttributes */
 ?>
 <div class="select-attributes-block <?= /* @noEscape */ $block->getData('config/dataScope') ?>" data-role="select-attributes-step">
@@ -13,8 +11,8 @@
         <?= /* @noEscape */  $block->getAddNewAttributeButton() ?>
     </div>
     <h2 class="steps-wizard-title"><?= $block->escapeHtml(
-            __('Step 1: Select Attributes')
-        ); ?></h2>
+        __('Step 1: Select Attributes')
+    ); ?></h2>
     <div class="selected-attributes" data-bind="scope: '<?= /* @noEscape */  $block->getComponentName() ?>'">
         <?= $block->escapeHtml(
             __('Selected Attributes:')
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/summary.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/summary.phtml
index 2ded3aa1079a9..379e129b68c7e 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/summary.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/summary.phtml
@@ -4,14 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\Summary */
 ?>
 <div data-bind="scope: '<?= /* @noEscape */  $block->getComponentName() ?>'">
     <h2 class="steps-wizard-title"><?= $block->escapeHtml(
-            __('Step 4: Summary')
-        ); ?></h2>
+        __('Step 4: Summary')
+    ); ?></h2>
 
     <div class="admin__data-grid-wrap admin__data-grid-wrap-static">
         <!-- ko if: gridNew().length -->
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
index 07f4e39e43de6..c11a1adc19896 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
@@ -4,34 +4,32 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
- /** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config */
+/** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config */
 ?>
-<div class="entry-edit form-inline" id="<?= /* @escapeNotVerified */ $block->getId() ?>" data-panel="product-variations">
+<div class="entry-edit form-inline" id="<?= $block->escapeHtmlAttr($block->getId()) ?>" data-panel="product-variations">
     <div data-bind="scope: 'variation-steps-wizard'" class="product-create-configuration">
         <div class="product-create-configuration-info">
             <div class="note" data-role="product-create-configuration-info">
-                <?= /* @escapeNotVerified */  __('Configurable products allow customers to choose options (Ex: shirt color).
-            You need to create a simple product for each configuration (Ex: a product for each color).');?>
+                <?= $block->escapeHtml(__('Configurable products allow customers to choose options (Ex: shirt color).
+            You need to create a simple product for each configuration (Ex: a product for each color).'));?>
             </div>
         </div>
         <div class="product-create-configuration-actions" data-action="product-create-configuration-buttons">
             <div class="product-create-configuration-action">
                 <button type="button" data-action="open-steps-wizard" title="Create Product Configurations"
                         class="action-secondary" data-bind="click: open">
-                <span data-role="button-label" data-edit-label="<?= /* @escapeNotVerified */  __('Edit Configurations') ?>">
-                    <?= /* @escapeNotVerified */  $block->isHasVariations()
+                <span data-role="button-label" data-edit-label="<?= $block->escapeHtmlAttr(__('Edit Configurations')) ?>">
+                    <?= $block->escapeHtml($block->isHasVariations()
                         ? __('Edit Configurations')
-                        : __('Create Configurations')
-                    ?>
+                        : __('Create Configurations'))
+?>
                 </span>
                 </button>
             </div>
             <div class="product-create-configuration-action" data-bind="scope: 'configurableProductGrid'">
                 <button class="action-tertiary action-menu-item" type="button" data-action="choose"
                         data-bind="click: showManuallyGrid, visible: button">
-                    <?= /* @noEscape */ __('Add Products Manually') ?>
+                    <?= $block->escapeHtml(__('Add Products Manually')) ?>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
index 230e0fd14ccb6..71ae19d4a4813 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 /** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config\Matrix */
 ?>
 <?php
@@ -17,7 +15,7 @@ $currencySymbol = $block->getCurrencySymbol();
 <div id="product-variations-matrix" data-role="product-variations-matrix">
     <div data-bind="scope: 'configurableVariations'">
         <h3 class="hidden" data-bind="css: {hidden: !showVariations() }" class="title">
-            <?= /* @escapeNotVerified */ __('Current Variations') ?>
+            <?= $block->escapeHtml(__('Current Variations')) ?>
         </h3>
 
         <script data-template-for="variation-image" type="text/x-magento-template">
@@ -47,22 +45,22 @@ $currencySymbol = $block->getCurrencySymbol();
                         <thead>
                             <tr>
                                 <th class="data-grid-th data-grid-thumbnail-cell col-image" data-column="image">
-                                    <?= /* @escapeNotVerified */  __('Image') ?>
+                                    <?= $block->escapeHtml(__('Image')) ?>
                                 </th>
                                 <th class="data-grid-th col-name" data-column="name">
-                                    <?= /* @escapeNotVerified */  __('Name') ?>
+                                    <?= $block->escapeHtml(__('Name')) ?>
                                 </th>
                                 <th class="data-grid-th col-sku" data-column="sku">
-                                    <?= /* @escapeNotVerified */  __('SKU') ?>
+                                    <?= $block->escapeHtml(__('SKU')) ?>
                                 </th>
                                 <th class="data-grid-th col-price" data-column="price">
-                                    <?= /* @escapeNotVerified */  __('Price') ?>
+                                    <?= $block->escapeHtml(__('Price')) ?>
                                 </th>
                                 <th class="data-grid-th col-qty" data-column="qty">
-                                    <?= /* @escapeNotVerified */  __('Quantity') ?>
+                                    <?= $block->escapeHtml(__('Quantity')) ?>
                                 </th>
                                 <th class="data-grid-th col-weight" data-column="weight">
-                                    <?= /* @escapeNotVerified */  __('Weight') ?>
+                                    <?= $block->escapeHtml(__('Weight')) ?>
                                 </th>
                                 <!-- ko foreach: getAttributesOptions() -->
                                     <th data-bind="attr: {class:'data-grid-th col-' + $data.attribute_code},
@@ -70,7 +68,7 @@ $currencySymbol = $block->getCurrencySymbol();
                                     </th>
                                 <!-- /ko -->
                                 <th class="data-grid-th">
-                                    <?= /* @escapeNotVerified */  __('Actions') ?>
+                                    <?= $block->escapeHtml(__('Actions')) ?>
                                 </th>
                             </tr>
                         </thead>
@@ -88,7 +86,7 @@ $currencySymbol = $block->getCurrencySymbol();
                                                 <input type="hidden" data-bind="
                                                     attr: {id: $parent.getRowId(variation, 'image'),
                                                     name: $parent.getVariationRowName(variation, 'image')}"/>
-                                                <span><?= /* @escapeNotVerified */  __('Upload Image') ?></span>
+                                                <span><?= $block->escapeHtml(__('Upload Image')) ?></span>
                                                 <input name="image" type="file"
                                                        data-url="<?= $block->escapeHtml($block->getImageUploadUrl()) ?>"
                                                        title="<?= $block->escapeHtml(__('Upload image')) ?>"/>
@@ -102,11 +100,11 @@ $currencySymbol = $block->getCurrencySymbol();
                                         <!-- /ko -->
                                         <button type="button" class="action toggle no-display" data-toggle="dropdown"
                                                 data-mage-init='{"dropdown":{}}'>
-                                            <span><?= /* @escapeNotVerified */  __('Select') ?></span>
+                                            <span><?= $block->escapeHtml(__('Select')) ?></span>
                                         </button>
                                         <ul class="dropdown">
                                             <li>
-                                                <a class="item" data-action="no-image"><?= /* @escapeNotVerified */  __('No Image') ?></a>
+                                                <a class="item" data-action="no-image"><?= $block->escapeHtml(__('No Image')) ?></a>
                                             </li>
                                         </ul>
                                     </div>
@@ -208,7 +206,7 @@ $currencySymbol = $block->getCurrencySymbol();
                                                     "
                                                    data-action="choose"
                                                    href="#">
-                                                    <?= /* @escapeNotVerified */  __('Choose a different Product') ?>
+                                                    <?= $block->escapeHtml(__('Choose a different Product')) ?>
                                                 </a>
                                             </li>
                                             <li>
@@ -219,7 +217,7 @@ $currencySymbol = $block->getCurrencySymbol();
                                             </li>
                                             <li>
                                                 <a class="action-menu-item" data-bind="click: $parent.removeProduct.bind($parent, $index())">
-                                                    <?= /* @escapeNotVerified */  __('Remove Product') ?>
+                                                    <?= $block->escapeHtml(__('Remove Product')) ?>
                                                 </a>
                                             </li>
                                         </ul>
@@ -233,15 +231,14 @@ $currencySymbol = $block->getCurrencySymbol();
         <!-- /ko -->
     </div>
     <div data-role="step-wizard-dialog"
-         data-mage-init='{"Magento_Ui/js/modal/modal":{"type":"slide","title":"<?= /* @escapeNotVerified */  __('Create Product Configurations') ?>",
+         data-mage-init='{"Magento_Ui/js/modal/modal":{"type":"slide","title":"<?= $block->escapeHtmlAttr(__('Create Product Configurations')) ?>",
          "buttons":[]}}'
          class="no-display">
-        <?php
-        /* @escapeNotVerified */ echo $block->getVariationWizard([
+        <?= /* @noEscape */ $block->getVariationWizard([
             'attributes' => $attributes,
             'configurations' => $productMatrix
         ]);
-        ?>
+?>
     </div>
 </div>
 
@@ -252,8 +249,8 @@ $currencySymbol = $block->getCurrencySymbol();
                 "components": {
                     "configurableVariations": {
                         "component": "Magento_ConfigurableProduct/js/variations/variations",
-                        "variations": <?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($productMatrix) ?>,
-                        "productAttributes": <?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($attributes) ?>,
+                        "variations": <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($productMatrix) ?>,
+                        "productAttributes": <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($attributes) ?>,
                         "productUrl": "<?= /* @noEscape */ $block->getUrl('catalog/product/edit', ['id' => '%id%']) ?>",
                         "currencySymbol": "<?= /* @noEscape */ $currencySymbol ?>",
                         "configurableProductGrid": "configurableProductGrid"
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml
index 2e38633218652..7b85efdbb73aa 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config\Matrix */
 
 $productMatrix = $block->getProductMatrix();
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml
index 3a23257cbbf9b..f009962bb97ff 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 /** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config\Matrix */
 ?>
 <?php
@@ -48,9 +46,9 @@ $currencySymbol = $block->getCurrencySymbol();
                         "attributeSetHandler": "<?= /* @noEscape */ $block->getForm() ?>.configurable_attribute_set_handler_modal",
                         "wizardModalButtonName": "<?= /* @noEscape */ $block->getForm() ?>.configurable.configurable_products_button_set.create_configurable_products_button",
                         "wizardModalButtonTitle": "<?= $block->escapeHtml(__('Edit Configurations')) ?>",
-                        "productAttributes": <?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($attributes) ?>,
+                        "productAttributes": <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($attributes) ?>,
                         "productUrl": "<?= /* @noEscape */ $block->getUrl('catalog/product/edit', ['id' => '%id%']) ?>",
-                        "variations": <?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($productMatrix) ?>,
+                        "variations": <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($productMatrix) ?>,
                         "currencySymbol": "<?= /* @noEscape */ $currencySymbol ?>",
                         "attributeSetCreationUrl": "<?= /* @noEscape */ $block->getUrl('*/product_set/save') ?>"
                     }
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml
index 6c993b243da23..6b30b3eba33b4 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /* @var $block \Magento\Framework\View\Element\Template */
 ?>
 <div data-role="affected-attribute-set-selector" class="no-display affected-attribute-set">
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
index d70576d975ac3..6631a47e0a6a6 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /* @var $block \Magento\ConfigurableProduct\Block\Product\Configurable\AttributeSelector */
 ?>
 <script>
@@ -48,12 +46,12 @@
 
         $form
             .modal({
-                title: '<?= /* @escapeNotVerified */ __('Choose Affected Attribute Set') ?>',
+                title: '<?= $block->escapeJs(__('Choose Affected Attribute Set')) ?>',
                 closed: function () {
                     resetValidation();
                 },
                 buttons: [{
-                    text: '<?= /* @escapeNotVerified */ __('Confirm') ?>',
+                    text: '<?= $block->escapeJs(__('Confirm')) ?>',
                     attr: {
                         'data-action': 'confirm'
                     },
@@ -77,12 +75,12 @@
 
                         $.ajax({
                             type: 'POST',
-                            url: '<?= /* @escapeNotVerified */ $block->getAttributeSetCreationUrl() ?>',
+                            url: '<?= $block->escapeUrl($block->getAttributeSetCreationUrl()) ?>',
                             data: {
                                 gotoEdit: 1,
                                 attribute_set_name: $form.find('input[name=new-attribute-set-name]').val(),
                                 skeleton_set: $('#attribute_set_id').val(),
-                                form_key: '<?= /* @escapeNotVerified */ $block->getFormKey() ?>',
+                                form_key: '<?= $block->escapeJs($block->getFormKey()) ?>',
                                 return_session_messages_only: 1
                             },
                             dataType: 'json',
@@ -101,8 +99,8 @@
                         return false;
                     }
                 },{
-                    text: '<?= /* @escapeNotVerified */ __('Cancel') ?>',
-                    id: '<?= /* @escapeNotVerified */ $block->getJsId('close-button') ?>',
+                    text: '<?= $block->escapeJs(__('Cancel')) ?>',
+                    id: '<?= $block->escapeJs($block->getJsId('close-button')) ?>',
                     'class': 'action-close',
                     click: function() {
                         $form.modal('closeModal');
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml
index 4246d8f53a79c..e6cf1e9c6870d 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml
@@ -3,16 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 /** @var $block \Magento\ConfigurableProduct\Block\Product\Configurable\AttributeSelector */
 ?>
 <script>
 require(["jquery","mage/mage","mage/backend/suggest"], function($){
-    var options = <?php
-        /* @escapeNotVerified */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getSuggestWidgetOptions())
-    ?>;
+    var options = <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getSuggestWidgetOptions()) ?>;
     $('#configurable-attribute-selector')
         .mage('suggest', options)
         .on('suggestselect', function (event, ui) {
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
index 01abce7696014..df800c9a64a39 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
@@ -6,8 +6,9 @@
 define([
     'underscore',
     'uiRegistry',
-    'Magento_Ui/js/dynamic-rows/dynamic-rows'
-], function (_, registry, dynamicRows) {
+    'Magento_Ui/js/dynamic-rows/dynamic-rows',
+    'jquery'
+], function (_, registry, dynamicRows, $) {
     'use strict';
 
     return dynamicRows.extend({
@@ -217,6 +218,8 @@ define([
 
             _.each(tmpData, function (row, index) {
                 path = this.dataScope + '.' + this.index + '.' + (this.startIndex + index);
+                row.attributes = $('<i></i>').text(row.attributes).html();
+                row.sku = $('<i></i>').text(row.sku).html();
                 this.source.set(path, row);
             }, this);
 
@@ -376,8 +379,8 @@ define([
                 product = {
                     'id': row.productId,
                     'product_link': row.productUrl,
-                    'name': row.name,
-                    'sku': row.sku,
+                    'name': $('<i></i>').text(row.name).html(),
+                    'sku': $('<i></i>').text(row.sku).html(),
                     'status': row.status,
                     'price': row.price,
                     'price_currency': row.priceCurrency,
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js
index 28e775b984b05..b2ef35546eea8 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js
@@ -11,9 +11,6 @@ define([
 
     return Abstract.extend({
         defaults: {
-            listens: {
-                isConfigurable: 'handlePriceValue'
-            },
             imports: {
                 isConfigurable: '!ns = ${ $.ns }, index = configurable-matrix:isEmpty'
             },
@@ -22,12 +19,15 @@ define([
             }
         },
 
-        /**
-         * Invokes initialize method of parent class,
-         * contains initialization logic
-         */
+        /** @inheritdoc */
         initialize: function () {
             this._super();
+            // resolve initial disable state
+            this.handlePriceValue(this.isConfigurable);
+            // add listener to track "configurable" type
+            this.setListeners({
+                isConfigurable: 'handlePriceValue'
+            });
 
             return this;
         },
@@ -50,8 +50,9 @@ define([
          * @param {String} isConfigurable
          */
         handlePriceValue: function (isConfigurable) {
+            this.disabled(!!this.isUseDefault() || isConfigurable);
+
             if (isConfigurable) {
-                this.disable();
                 this.clear();
             }
         }
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/paging/sizes.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/paging/sizes.js
index a8b8f95f6536f..155b176bd431b 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/paging/sizes.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/paging/sizes.js
@@ -9,21 +9,21 @@ define([
 
     return Sizes.extend({
         defaults: {
-            excludedOptions: ['100', '200']
-        },
-
-        /**
-         * @override
-         */
-        initialize: function () {
-            this._super();
-
-            this.excludedOptions.forEach(function (excludedOption) {
-                delete this.options[excludedOption];
-            }, this);
-            this.updateArray();
-
-            return this;
+            options: {
+                '20': {
+                    value: 20,
+                    label: 20
+                },
+                '30': {
+                    value: 30,
+                    label: 30
+                },
+                '50': {
+                    value: 50,
+                    label: 50
+                }
+            },
+            value: 20
         }
     });
 });
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
index e2e0faec3b805..1d251f8ecc333 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
@@ -383,7 +383,11 @@ define([
          * Chose action for the form save button
          */
         saveFormHandler: function () {
-            this.serializeData();
+            this.formElement().validate();
+
+            if (this.formElement().source.get('params.invalid') === false) {
+                this.serializeData();
+            }
 
             if (this.checkForNewAttributes()) {
                 this.formSaveParams = arguments;
diff --git a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
index 97238d0813b09..8ca80e2985a3a 100644
--- a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php
@@ -31,12 +28,12 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
         ];
 
         /* @noEscape */ echo $block->renderAmount($finalPriceModel->getAmount(), $arguments);
-    ?>
+        ?>
 </span>
 
-<?php if (!$block->isProductList() && $block->hasSpecialPrice()): ?>
+<?php if (!$block->isProductList() && $block->hasSpecialPrice()) : ?>
     <span class="old-price sly-old-price no-display">
-        <?php /* @escapeNotVerified */ echo $block->renderAmount($priceModel->getAmount(), [
+        <?= /* @noEscape */ $block->renderAmount($priceModel->getAmount(), [
             'display_label'     => __('Regular Price'),
             'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
             'price_type'        => 'oldPrice',
@@ -46,14 +43,14 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
     </span>
 <?php endif; ?>
 
-<?php if ($block->showMinimalPrice()): ?>
-    <?php if ($block->getUseLinkForAsLowAs()):?>
-        <a href="<?= /* @escapeNotVerified */ $block->getSaleableItem()->getProductUrl() ?>" class="minimal-price-link">
-            <?= /* @escapeNotVerified */ $block->renderAmountMinimal() ?>
+<?php if ($block->showMinimalPrice()) : ?>
+    <?php if ($block->getUseLinkForAsLowAs()) :?>
+        <a href="<?= $block->escapeUrl($block->getSaleableItem()->getProductUrl()) ?>" class="minimal-price-link">
+            <?= /* @noEscape */ $block->renderAmountMinimal() ?>
         </a>
-    <?php else:?>
+    <?php else :?>
         <span class="minimal-price-link">
-            <?= /* @escapeNotVerified */ $block->renderAmountMinimal() ?>
+            <?= /* @noEscape */ $block->renderAmountMinimal() ?>
         </span>
     <?php endif?>
 <?php endif; ?>
diff --git a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml
index 18f96cfaaf398..c68419b955e6d 100644
--- a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 ?>
 <script type="text/x-magento-template" id="tier-prices-template">
     <ul class="prices-tier items">
@@ -15,10 +14,13 @@
                 + '</span>'
             + '</span>'; %>
         <li class="item">
-            <%= $t('Buy %1 for %2 each and').replace('%1', item.qty).replace('%2', priceStr) %>
-                <strong class="benefit">
-                        <%= $t('save') %><span class="percent tier-<%= key %>">&nbsp;<%= item.percentage %></span>%
-                </strong>
+            <%= '<?= $block->escapeHtml(__('Buy %1 for %2 each and', '%1', '%2')) ?>'
+            .replace('%1', item.qty)
+            .replace('%2', priceStr) %>
+            <strong class="benefit">
+                <?= $block->escapeHtml(__('save')) ?><span
+                        class="percent tier-<%= key %>">&nbsp;<%= item.percentage %></span>%
+            </strong>
         </li>
         <% }); %>
     </ul>
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/templates/js/components.phtml b/app/code/Magento/ConfigurableProduct/view/frontend/templates/js/components.phtml
index bad5acc209b5f..4ca5983081a6f 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/templates/js/components.phtml
@@ -3,8 +3,5 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<?= $block->getChildHtml() ?>
+<?= $block->getChildHtml();
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml b/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
index f5ed067967547..f7db41225c970 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php
@@ -13,19 +10,19 @@
 $_product    = $block->getProduct();
 $_attributes = $block->decorateArray($block->getAllowAttributes());
 ?>
-<?php if ($_product->isSaleable() && count($_attributes)):?>
-    <?php foreach ($_attributes as $_attribute): ?>
+<?php if ($_product->isSaleable() && count($_attributes)) :?>
+    <?php foreach ($_attributes as $_attribute) : ?>
         <div class="field configurable required">
-            <label class="label" for="attribute<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>">
+            <label class="label" for="attribute<?= $block->escapeHtmlAttr($_attribute->getAttributeId()) ?>">
                 <span><?= $block->escapeHtml($_attribute->getProductAttribute()->getStoreLabel()) ?></span>
             </label>
             <div class="control">
-                <select name="super_attribute[<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>]"
-                        data-selector="super_attribute[<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>]"
+                <select name="super_attribute[<?= $block->escapeHtmlAttr($_attribute->getAttributeId()) ?>]"
+                        data-selector="super_attribute[<?= $block->escapeHtmlAttr($_attribute->getAttributeId()) ?>]"
                         data-validate="{required:true}"
-                        id="attribute<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>"
+                        id="attribute<?= $block->escapeHtmlAttr($_attribute->getAttributeId()) ?>"
                         class="super-attribute-select">
-                    <option value=""><?= /* @escapeNotVerified */ __('Choose an Option...') ?></option>
+                    <option value=""><?= $block->escapeHtml(__('Choose an Option...')) ?></option>
                 </select>
             </div>
         </div>
@@ -34,9 +31,11 @@ $_attributes = $block->decorateArray($block->getAllowAttributes());
         {
             "#product_addtocart_form": {
                 "configurable": {
-                    "spConfig": <?= /* @escapeNotVerified */ $block->getJsonConfig() ?>,
-                    "gallerySwitchStrategy": "<?php /* @escapeNotVerified */ echo $block->getVar('gallery_switch_strategy',
-                        'Magento_ConfigurableProduct') ?: 'replace'; ?>"
+                    "spConfig": <?= /* @noEscape */ $block->getJsonConfig() ?>,
+                    "gallerySwitchStrategy": "<?= $block->escapeJs($block->getVar(
+                        'gallery_switch_strategy',
+                        'Magento_ConfigurableProduct'
+                    ) ?: 'replace'); ?>"
                 }
             },
             "*" : {
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 78974877dd90d..ef40dcb9a7323 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
@@ -291,6 +291,8 @@ define([
             images = this.options.spConfig.images[this.simpleProduct];
 
             if (images) {
+                images = this._sortImages(images);
+
                 if (this.options.gallerySwitchStrategy === 'prepend') {
                     images = images.concat(initialImages);
                 }
@@ -309,7 +311,17 @@ define([
                 $(this.options.mediaGallerySelector).AddFotoramaVideoEvents();
             }
 
-            galleryObject.first();
+        },
+
+        /**
+         * Sorting images array
+         *
+         * @private
+         */
+        _sortImages: function (images) {
+            return _.sortBy(images, function (image) {
+                return image.position;
+            });
         },
 
         /**
@@ -361,10 +373,11 @@ define([
                 allowedProducts,
                 i,
                 j,
-                basePrice = parseFloat(this.options.spConfig.prices.basePrice.amount),
+                finalPrice = parseFloat(this.options.spConfig.prices.finalPrice.amount),
                 optionFinalPrice,
                 optionPriceDiff,
-                optionPrices = this.options.spConfig.optionPrices;
+                optionPrices = this.options.spConfig.optionPrices,
+                allowedProductMinPrice;
 
             this._clearSelect(element);
             element.options[0] = new Option('', '');
@@ -395,9 +408,9 @@ define([
 
                         if (typeof allowedProducts[0] !== 'undefined' &&
                             typeof optionPrices[allowedProducts[0]] !== 'undefined') {
-
-                            optionFinalPrice = parseFloat(optionPrices[allowedProducts[0]].finalPrice.amount);
-                            optionPriceDiff = optionFinalPrice - basePrice;
+                            allowedProductMinPrice = this._getAllowedProductWithMinPrice(allowedProducts);
+                            optionFinalPrice = parseFloat(optionPrices[allowedProductMinPrice].finalPrice.amount);
+                            optionPriceDiff = optionFinalPrice - finalPrice;
 
                             if (optionPriceDiff !== 0) {
                                 options[i].label = options[i].label + ' ' + priceUtils.formatPrice(
@@ -477,36 +490,27 @@ define([
         _getPrices: function () {
             var prices = {},
                 elements = _.toArray(this.options.settings),
-                hasProductPrice = false,
-                optionPriceDiff = 0,
-                allowedProduct, optionPrices, basePrice, optionFinalPrice;
+                allowedProduct;
 
             _.each(elements, function (element) {
                 var selected = element.options[element.selectedIndex],
                     config = selected && selected.config,
                     priceValue = {};
 
-                if (config && config.allowedProducts.length === 1 && !hasProductPrice) {
-                    prices = {};
+                if (config && config.allowedProducts.length === 1) {
                     priceValue = this._calculatePrice(config);
-                    hasProductPrice = true;
                 } else if (element.value) {
                     allowedProduct = this._getAllowedProductWithMinPrice(config.allowedProducts);
-                    optionPrices = this.options.spConfig.optionPrices;
-                    basePrice = parseFloat(this.options.spConfig.prices.basePrice.amount);
-
-                    if (!_.isEmpty(allowedProduct)) {
-                        optionFinalPrice = parseFloat(optionPrices[allowedProduct].finalPrice.amount);
-                        optionPriceDiff = optionFinalPrice - basePrice;
-                    }
-
-                    if (optionPriceDiff !== 0) {
-                        prices = {};
-                        priceValue = this._calculatePriceDifference(allowedProduct);
-                    }
+                    priceValue = this._calculatePrice({
+                        'allowedProducts': [
+                            allowedProduct
+                        ]
+                    });
                 }
 
-                prices[element.attributeId] = priceValue;
+                if (!_.isEmpty(priceValue)) {
+                    prices.prices = priceValue;
+                }
             }, this);
 
             return prices;
@@ -527,40 +531,15 @@ define([
             _.each(allowedProducts, function (allowedProduct) {
                 optionFinalPrice = parseFloat(optionPrices[allowedProduct].finalPrice.amount);
 
-                if (_.isEmpty(product)) {
+                if (_.isEmpty(product) || optionFinalPrice < optionMinPrice) {
                     optionMinPrice = optionFinalPrice;
                     product = allowedProduct;
                 }
-
-                if (optionFinalPrice < optionMinPrice) {
-                    product = allowedProduct;
-                }
             }, this);
 
             return product;
         },
 
-        /**
-         * Calculate price difference for allowed product
-         *
-         * @param {*} allowedProduct - Product
-         * @returns {*}
-         * @private
-         */
-        _calculatePriceDifference: function (allowedProduct) {
-            var displayPrices = $(this.options.priceHolderSelector).priceBox('option').prices,
-                newPrices = this.options.spConfig.optionPrices[allowedProduct];
-
-            _.each(displayPrices, function (price, code) {
-
-                if (newPrices[code]) {
-                    displayPrices[code].amount = newPrices[code].amount - displayPrices[code].amount;
-                }
-            });
-
-            return displayPrices;
-        },
-
         /**
          * Returns prices for configured products
          *
@@ -630,6 +609,13 @@ define([
             } else {
                 $(this.options.slyOldPriceSelector).hide();
             }
+
+            $(document).trigger('updateMsrpPriceBlock',
+                [
+                    optionId,
+                    this.options.spConfig.optionPrices
+                ]
+            );
         },
 
         /**
diff --git a/app/code/Magento/ConfigurableProductSales/composer.json b/app/code/Magento/ConfigurableProductSales/composer.json
index ca6638924b8c6..591eefdbed54f 100644
--- a/app/code/Magento/ConfigurableProductSales/composer.json
+++ b/app/code/Magento/ConfigurableProductSales/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-configurable-product-sales",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-catalog": "102.0.*",
         "magento/module-sales": "101.0.*",
         "magento/module-store": "100.2.*",
@@ -12,7 +12,7 @@
         "magento/module-configurable-product": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json
index 49ac8ec40dbc4..fc5bcfe0d9782 100644
--- a/app/code/Magento/Contact/composer.json
+++ b/app/code/Magento/Contact/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-contact",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-config": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-customer": "101.0.*",
@@ -10,7 +10,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Contact/view/frontend/email/submitted_form.html b/app/code/Magento/Contact/view/frontend/email/submitted_form.html
index 1bce6159c586a..17146257aeff1 100644
--- a/app/code/Magento/Contact/view/frontend/email/submitted_form.html
+++ b/app/code/Magento/Contact/view/frontend/email/submitted_form.html
@@ -16,19 +16,19 @@
 
 <table class="message-details">
     <tr>
-        <td><b>{{trans "Name"}}</b></td>
+        <td><strong>{{trans "Name"}}</strong></td>
         <td>{{var data.name}}</td>
     </tr>
     <tr>
-        <td><b>{{trans "Email"}}</b></td>
+        <td><strong>{{trans "Email"}}</strong></td>
         <td>{{var data.email}}</td>
     </tr>
     <tr>
-        <td><b>{{trans "Phone"}}</b></td>
+        <td><strong>{{trans "Phone"}}</strong></td>
         <td>{{var data.telephone}}</td>
     </tr>
 </table>
-<p><b>{{trans "Message"}}</b></p>
+<p><strong>{{trans "Message"}}</strong></p>
 <p>{{var data.comment}}</p>
 
 {{template config_path="design/email/footer_template"}}
diff --git a/app/code/Magento/Contact/view/frontend/web/css/source/_module.less b/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
new file mode 100644
index 0000000000000..d79806eecbe9b
--- /dev/null
+++ b/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
@@ -0,0 +1,52 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+*/
+
+& when (@media-common = true) {
+    .contact-index-index {
+        .column:not(.sidebar-main) {
+            .form.contact {
+                float: none;
+                width: 50%;
+            }
+        }
+
+        .column:not(.sidebar-additional) {
+            .form.contact {
+                float: none;
+                width: 50%;
+            }
+        }
+    }
+}
+
+//
+//  Desktop
+//  _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
+    .contact-index-index .column:not(.sidebar-additional) .form.contact {
+        min-width: 600px;
+    }
+}
+
+//  Mobile
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
+    .contact-index-index {
+        .column:not(.sidebar-main) {
+            .form.contact {
+                float: none;
+                width: 100%;
+            }
+        }
+
+        .column:not(.sidebar-additional) {
+            .form.contact {
+                float: none;
+                width: 100%;
+            }
+        }
+    }
+}
+
diff --git a/app/code/Magento/Cookie/composer.json b/app/code/Magento/Cookie/composer.json
index cc04b0ccd5d7d..ea3334b20b86b 100644
--- a/app/code/Magento/Cookie/composer.json
+++ b/app/code/Magento/Cookie/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-cookie",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/framework": "101.0.*"
     },
@@ -10,7 +10,7 @@
         "magento/module-backend": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Cron/Model/Schedule.php b/app/code/Magento/Cron/Model/Schedule.php
index 39a58ef360cb3..a9ae04cb0c5d1 100644
--- a/app/code/Magento/Cron/Model/Schedule.php
+++ b/app/code/Magento/Cron/Model/Schedule.php
@@ -9,6 +9,7 @@
 use Magento\Framework\Exception\CronException;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\Intl\DateTimeFactory;
 
 /**
  * Crontab schedule model
@@ -50,13 +51,19 @@ class Schedule extends \Magento\Framework\Model\AbstractModel
      */
     private $timezoneConverter;
 
+    /**
+     * @var DateTimeFactory
+     */
+    private $dateTimeFactory;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @param TimezoneInterface $timezoneConverter
+     * @param TimezoneInterface|null $timezoneConverter
+     * @param DateTimeFactory|null $dateTimeFactory
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -64,10 +71,12 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        TimezoneInterface $timezoneConverter = null
+        TimezoneInterface $timezoneConverter = null,
+        DateTimeFactory $dateTimeFactory = null
     ) {
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
         $this->timezoneConverter = $timezoneConverter ?: ObjectManager::getInstance()->get(TimezoneInterface::class);
+        $this->dateTimeFactory = $dateTimeFactory ?: ObjectManager::getInstance()->get(DateTimeFactory::class);
     }
 
     /**
@@ -109,17 +118,20 @@ public function trySchedule()
         if (!$e || !$time) {
             return false;
         }
+        $configTimeZone = $this->timezoneConverter->getConfigTimezone();
+        $storeDateTime = $this->dateTimeFactory->create(null, new \DateTimeZone($configTimeZone));
         if (!is_numeric($time)) {
             //convert time from UTC to admin store timezone
             //we assume that all schedules in configuration (crontab.xml and DB tables) are in admin store timezone
-            $time = $this->timezoneConverter->date($time)->format('Y-m-d H:i');
-            $time = strtotime($time);
+            $dateTimeUtc = $this->dateTimeFactory->create($time);
+            $time = $dateTimeUtc->getTimestamp();
         }
-        $match = $this->matchCronExpression($e[0], strftime('%M', $time))
-            && $this->matchCronExpression($e[1], strftime('%H', $time))
-            && $this->matchCronExpression($e[2], strftime('%d', $time))
-            && $this->matchCronExpression($e[3], strftime('%m', $time))
-            && $this->matchCronExpression($e[4], strftime('%w', $time));
+        $time = $storeDateTime->setTimestamp($time);
+        $match = $this->matchCronExpression($e[0], $time->format('i'))
+            && $this->matchCronExpression($e[1], $time->format('H'))
+            && $this->matchCronExpression($e[2], $time->format('d'))
+            && $this->matchCronExpression($e[3], $time->format('m'))
+            && $this->matchCronExpression($e[4], $time->format('w'));
 
         return $match;
     }
diff --git a/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php b/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
index c8dcd8049fbe8..6008d4ebce218 100644
--- a/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
+++ b/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
@@ -3,16 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 /**
  * Handling cron jobs
  */
 namespace Magento\Cron\Observer;
 
+use Magento\Cron\Model\Schedule;
 use Magento\Framework\App\State;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Event\ObserverInterface;
-use \Magento\Cron\Model\Schedule;
 use Magento\Framework\Profiler\Driver\Standard\Stat;
 use Magento\Framework\Profiler\Driver\Standard\StatFactory;
 
@@ -201,7 +200,6 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-
         $currentTime = $this->dateTime->gmtTimestamp();
         $jobGroupsRoot = $this->_config->getJobs();
         // sort jobs groups to start from used in separated process
@@ -255,7 +253,6 @@ function ($groupId) use ($currentTime, $jobsRoot) {
      */
     private function lockGroup($groupId, callable $callback)
     {
-
         if (!$this->lockManager->lock(self::LOCK_PREFIX . $groupId, self::LOCK_TIMEOUT)) {
             $this->logger->warning(
                 sprintf(
@@ -290,17 +287,20 @@ protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule,
         $scheduleLifetime = $scheduleLifetime * self::SECONDS_IN_MINUTE;
         if ($scheduledTime < $currentTime - $scheduleLifetime) {
             $schedule->setStatus(Schedule::STATUS_MISSED);
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception(sprintf('Cron Job %s is missed at %s', $jobCode, $schedule->getScheduledAt()));
         }
 
         if (!isset($jobConfig['instance'], $jobConfig['method'])) {
             $schedule->setStatus(Schedule::STATUS_ERROR);
-            throw new \Exception('No callbacks found');
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
+            throw new \Exception(sprintf('No callbacks found for cron job %s', $jobCode));
         }
         $model = $this->_objectManager->create($jobConfig['instance']);
         $callback = [$model, $jobConfig['method']];
         if (!is_callable($callback)) {
             $schedule->setStatus(Schedule::STATUS_ERROR);
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception(
                 sprintf('Invalid callback: %s::%s can\'t be called', $jobConfig['instance'], $jobConfig['method'])
             );
@@ -311,15 +311,18 @@ protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule,
         $this->startProfiling();
         try {
             $this->logger->info(sprintf('Cron Job %s is run', $jobCode));
+            //phpcs:ignore Magento2.Functions.DiscouragedFunction
             call_user_func_array($callback, [$schedule]);
         } catch (\Throwable $e) {
             $schedule->setStatus(Schedule::STATUS_ERROR);
-            $this->logger->error(sprintf(
-                'Cron Job %s has an error: %s. Statistics: %s',
-                $jobCode,
-                $e->getMessage(),
-                $this->getProfilingStat()
-            ));
+            $this->logger->error(
+                sprintf(
+                    'Cron Job %s has an error: %s. Statistics: %s',
+                    $jobCode,
+                    $e->getMessage(),
+                    $this->getProfilingStat()
+                )
+            );
             if (!$e instanceof \Exception) {
                 $e = new \RuntimeException(
                     'Error when running a cron job',
@@ -332,16 +335,22 @@ protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule,
             $this->stopProfiling();
         }
 
-        $schedule->setStatus(Schedule::STATUS_SUCCESS)->setFinishedAt(strftime(
-            '%Y-%m-%d %H:%M:%S',
-            $this->dateTime->gmtTimestamp()
-        ));
+        $schedule->setStatus(
+            Schedule::STATUS_SUCCESS
+        )->setFinishedAt(
+            strftime(
+                '%Y-%m-%d %H:%M:%S',
+                $this->dateTime->gmtTimestamp()
+            )
+        );
 
-        $this->logger->info(sprintf(
-            'Cron Job %s is successfully finished. Statistics: %s',
-            $jobCode,
-            $this->getProfilingStat()
-        ));
+        $this->logger->info(
+            sprintf(
+                'Cron Job %s is successfully finished. Statistics: %s',
+                $jobCode,
+                $this->getProfilingStat()
+            )
+        );
     }
 
     /**
@@ -391,6 +400,28 @@ private function getPendingSchedules($groupId)
         return $pendingJobs;
     }
 
+    /**
+     * Return job collection from database with status 'pending', 'running' or 'success'
+     *
+     * @param string $groupId
+     * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
+     */
+    private function getNonExitedSchedules($groupId)
+    {
+        $jobs = $this->_config->getJobs();
+        $pendingJobs = $this->_scheduleFactory->create()->getCollection();
+        $pendingJobs->addFieldToFilter(
+            'status',
+            [
+                'in' => [
+                    Schedule::STATUS_PENDING, Schedule::STATUS_RUNNING, Schedule::STATUS_SUCCESS
+                ]
+            ]
+        );
+        $pendingJobs->addFieldToFilter('job_code', ['in' => array_keys($jobs[$groupId])]);
+        return $pendingJobs;
+    }
+
     /**
      * Generate cron schedule
      *
@@ -422,7 +453,7 @@ private function generateSchedules($groupId)
             null
         );
 
-        $schedules = $this->getPendingSchedules($groupId);
+        $schedules = $this->getNonExitedSchedules($groupId);
         $exists = [];
         /** @var Schedule $schedule */
         foreach ($schedules as $schedule) {
@@ -653,11 +684,14 @@ private function cleanupScheduleMismatches()
         /** @var \Magento\Cron\Model\ResourceModel\Schedule $scheduleResource */
         $scheduleResource = $this->_scheduleFactory->create()->getResource();
         foreach ($this->invalid as $jobCode => $scheduledAtList) {
-            $scheduleResource->getConnection()->delete($scheduleResource->getMainTable(), [
-                'status = ?' => Schedule::STATUS_PENDING,
-                'job_code = ?' => $jobCode,
-                'scheduled_at in (?)' => $scheduledAtList,
-            ]);
+            $scheduleResource->getConnection()->delete(
+                $scheduleResource->getMainTable(),
+                [
+                    'status = ?' => Schedule::STATUS_PENDING,
+                    'job_code = ?' => $jobCode,
+                    'scheduled_at in (?)' => $scheduledAtList,
+                ]
+            );
         }
         return $this;
     }
diff --git a/app/code/Magento/Cron/Test/Unit/Model/ScheduleTest.php b/app/code/Magento/Cron/Test/Unit/Model/ScheduleTest.php
index e9f4c61c7f551..76e9627ad7098 100644
--- a/app/code/Magento/Cron/Test/Unit/Model/ScheduleTest.php
+++ b/app/code/Magento/Cron/Test/Unit/Model/ScheduleTest.php
@@ -6,6 +6,9 @@
 namespace Magento\Cron\Test\Unit\Model;
 
 use Magento\Cron\Model\Schedule;
+use Magento\Framework\Intl\DateTimeFactory;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Class \Magento\Cron\Test\Unit\Model\ObserverTest
@@ -18,11 +21,27 @@ class ScheduleTest extends \PHPUnit\Framework\TestCase
      */
     protected $helper;
 
+    /**
+     * @var \Magento\Cron\Model\ResourceModel\Schedule
+     */
     protected $resourceJobMock;
 
+    /**
+     * @var TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $timezoneConverter;
+
+    /**
+     * @var DateTimeFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dateTimeFactory;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->helper = new ObjectManager($this);
 
         $this->resourceJobMock = $this->getMockBuilder(\Magento\Cron\Model\ResourceModel\Schedule::class)
             ->disableOriginalConstructor()
@@ -32,18 +51,30 @@ protected function setUp()
         $this->resourceJobMock->expects($this->any())
             ->method('getIdFieldName')
             ->will($this->returnValue('id'));
+
+        $this->timezoneConverter = $this->getMockBuilder(TimezoneInterface::class)
+            ->setMethods(['date'])
+            ->getMockForAbstractClass();
+
+        $this->dateTimeFactory = $this->getMockBuilder(DateTimeFactory::class)
+            ->setMethods(['create'])
+            ->getMock();
     }
 
     /**
+     * Test for SetCronExpr
+     *
      * @param string $cronExpression
      * @param array $expected
+     *
+     * @return void
      * @dataProvider setCronExprDataProvider
      */
     public function testSetCronExpr($cronExpression, $expected)
     {
         // 1. Create mocks
-        /** @var \Magento\Cron\Model\Schedule $model */
-        $model = $this->helper->getObject(\Magento\Cron\Model\Schedule::class);
+        /** @var Schedule $model */
+        $model = $this->helper->getObject(Schedule::class);
 
         // 2. Run tested method
         $model->setCronExpr($cronExpression);
@@ -61,7 +92,7 @@ public function testSetCronExpr($cronExpression, $expected)
      *
      * @return array
      */
-    public function setCronExprDataProvider()
+    public function setCronExprDataProvider(): array
     {
         return [
             ['1 2 3 4 5', [1, 2, 3, 4, 5]],
@@ -121,27 +152,33 @@ public function setCronExprDataProvider()
     }
 
     /**
+     * Test for SetCronExprException
+     *
      * @param string $cronExpression
+     *
+     * @return void
      * @expectedException \Magento\Framework\Exception\CronException
      * @dataProvider setCronExprExceptionDataProvider
      */
     public function testSetCronExprException($cronExpression)
     {
         // 1. Create mocks
-        /** @var \Magento\Cron\Model\Schedule $model */
-        $model = $this->helper->getObject(\Magento\Cron\Model\Schedule::class);
+        /** @var Schedule $model */
+        $model = $this->helper->getObject(Schedule::class);
 
         // 2. Run tested method
         $model->setCronExpr($cronExpression);
     }
 
     /**
+     * Data provider
+     *
      * Here is a list of allowed characters and values for Cron expression
      * http://docs.oracle.com/cd/E12058_01/doc/doc.1014/e12030/cron_expressions.htm
      *
      * @return array
      */
-    public function setCronExprExceptionDataProvider()
+    public function setCronExprExceptionDataProvider(): array
     {
         return [
             [''],
@@ -153,17 +190,31 @@ public function setCronExprExceptionDataProvider()
     }
 
     /**
+     * Test for trySchedule
+     *
      * @param int $scheduledAt
      * @param array $cronExprArr
      * @param $expected
+     *
+     * @return void
      * @dataProvider tryScheduleDataProvider
      */
     public function testTrySchedule($scheduledAt, $cronExprArr, $expected)
     {
         // 1. Create mocks
+        $this->timezoneConverter->method('getConfigTimezone')
+            ->willReturn('UTC');
+
+        $this->dateTimeFactory->method('create')
+            ->willReturn(new \DateTime());
+
         /** @var \Magento\Cron\Model\Schedule $model */
         $model = $this->helper->getObject(
-            \Magento\Cron\Model\Schedule::class
+            \Magento\Cron\Model\Schedule::class,
+            [
+                'timezoneConverter' => $this->timezoneConverter,
+                'dateTimeFactory' => $this->dateTimeFactory,
+            ]
         );
 
         // 2. Set fixtures
@@ -177,22 +228,29 @@ public function testTrySchedule($scheduledAt, $cronExprArr, $expected)
         $this->assertEquals($expected, $result);
     }
 
+    /**
+     * Test for tryScheduleWithConversionToAdminStoreTime
+     *
+     * @return void
+     */
     public function testTryScheduleWithConversionToAdminStoreTime()
     {
         $scheduledAt = '2011-12-13 14:15:16';
         $cronExprArr = ['*', '*', '*', '*', '*'];
 
-        // 1. Create mocks
-        $timezoneConverter = $this->createMock(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
-        $timezoneConverter->expects($this->once())
-            ->method('date')
-            ->with($scheduledAt)
-            ->willReturn(new \DateTime($scheduledAt));
+        $this->timezoneConverter->method('getConfigTimezone')
+            ->willReturn('UTC');
+
+        $this->dateTimeFactory->method('create')
+            ->willReturn(new \DateTime());
 
         /** @var \Magento\Cron\Model\Schedule $model */
         $model = $this->helper->getObject(
             \Magento\Cron\Model\Schedule::class,
-            ['timezoneConverter' => $timezoneConverter]
+            [
+                'timezoneConverter' => $this->timezoneConverter,
+                'dateTimeFactory' => $this->dateTimeFactory,
+            ]
         );
 
         // 2. Set fixtures
@@ -207,11 +265,15 @@ public function testTryScheduleWithConversionToAdminStoreTime()
     }
 
     /**
+     * Data provider
+     *
      * @return array
      */
-    public function tryScheduleDataProvider()
+    public function tryScheduleDataProvider(): array
     {
         $date = '2011-12-13 14:15:16';
+        $timestamp = (new \DateTime($date))->getTimestamp();
+        $day = 'Monday';
         return [
             [$date, [], false],
             [$date, null, false],
@@ -219,19 +281,23 @@ public function tryScheduleDataProvider()
             [$date, [], false],
             [$date, null, false],
             [$date, false, false],
-            [strtotime($date), ['*', '*', '*', '*', '*'], true],
-            [strtotime($date), ['15', '*', '*', '*', '*'], true],
-            [strtotime($date), ['*', '14', '*', '*', '*'], true],
-            [strtotime($date), ['*', '*', '13', '*', '*'], true],
-            [strtotime($date), ['*', '*', '*', '12', '*'], true],
-            [strtotime('Monday'), ['*', '*', '*', '*', '1'], true],
+            [$timestamp, ['*', '*', '*', '*', '*'], true],
+            [$timestamp, ['15', '*', '*', '*', '*'], true],
+            [$timestamp, ['*', '14', '*', '*', '*'], true],
+            [$timestamp, ['*', '*', '13', '*', '*'], true],
+            [$timestamp, ['*', '*', '*', '12', '*'], true],
+            [(new \DateTime($day))->getTimestamp(), ['*', '*', '*', '*', '1'], true],
         ];
     }
 
     /**
+     * Test for matchCronExpression
+     *
      * @param string $cronExpressionPart
      * @param int $dateTimePart
      * @param bool $expectedResult
+     *
+     * @return void
      * @dataProvider matchCronExpressionDataProvider
      */
     public function testMatchCronExpression($cronExpressionPart, $dateTimePart, $expectedResult)
@@ -248,9 +314,11 @@ public function testMatchCronExpression($cronExpressionPart, $dateTimePart, $exp
     }
 
     /**
+     * Data provider
+     *
      * @return array
      */
-    public function matchCronExpressionDataProvider()
+    public function matchCronExpressionDataProvider(): array
     {
         return [
             ['*', 0, true],
@@ -287,7 +355,11 @@ public function matchCronExpressionDataProvider()
     }
 
     /**
+     * Test for matchCronExpressionException
+     *
      * @param string $cronExpressionPart
+     *
+     * @return void
      * @expectedException \Magento\Framework\Exception\CronException
      * @dataProvider matchCronExpressionExceptionDataProvider
      */
@@ -304,9 +376,11 @@ public function testMatchCronExpressionException($cronExpressionPart)
     }
 
     /**
+     * Data provider
+     *
      * @return array
      */
-    public function matchCronExpressionExceptionDataProvider()
+    public function matchCronExpressionExceptionDataProvider(): array
     {
         return [
             ['1/2/3'],    //Invalid cron expression, expecting 'match/modulus': 1/2/3
@@ -317,8 +391,12 @@ public function matchCronExpressionExceptionDataProvider()
     }
 
     /**
+     * Test for GetNumeric
+     *
      * @param mixed $param
      * @param int $expectedResult
+     *
+     * @return void
      * @dataProvider getNumericDataProvider
      */
     public function testGetNumeric($param, $expectedResult)
@@ -335,9 +413,11 @@ public function testGetNumeric($param, $expectedResult)
     }
 
     /**
+     * Data provider
+     *
      * @return array
      */
-    public function getNumericDataProvider()
+    public function getNumericDataProvider(): array
     {
         return [
             [null, false],
@@ -362,6 +442,11 @@ public function getNumericDataProvider()
         ];
     }
 
+    /**
+     * Test for tryLockJobSuccess
+     *
+     * @return void
+     */
     public function testTryLockJobSuccess()
     {
         $scheduleId = 1;
@@ -386,6 +471,11 @@ public function testTryLockJobSuccess()
         $this->assertEquals(Schedule::STATUS_RUNNING, $model->getStatus());
     }
 
+    /**
+     * Test for tryLockJobFailure
+     *
+     * @return void
+     */
     public function testTryLockJobFailure()
     {
         $scheduleId = 1;
diff --git a/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php b/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
index d14249e6b0e57..213071f013a67 100644
--- a/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
+++ b/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
@@ -174,7 +174,8 @@ protected function setUp()
 
         $this->statFactory = $this->getMockBuilder(StatFactory::class)
             ->setMethods(['create'])
-            ->getMockForAbstractClass();
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->stat = $this->getMockBuilder(\Magento\Framework\Profiler\Driver\Standard\Stat::class)
             ->disableOriginalConstructor()
@@ -354,7 +355,8 @@ public function testDispatchExceptionTooLate()
      */
     public function testDispatchExceptionNoCallback()
     {
-        $exceptionMessage = 'No callbacks found';
+        $jobCode = 'test_job1';
+        $exceptionMessage = sprintf('No callbacks found for cron job %s', $jobCode);
         $exception = new \Exception(__($exceptionMessage));
 
         $dateScheduledAt = date('Y-m-d H:i:s', $this->time - 86400);
@@ -363,7 +365,7 @@ public function testDispatchExceptionNoCallback()
         )->setMethods(
             ['getJobCode', 'tryLockJob', 'getScheduledAt', 'save', 'setStatus', 'setMessages', '__wakeup', 'getStatus']
         )->disableOriginalConstructor()->getMock();
-        $schedule->expects($this->any())->method('getJobCode')->will($this->returnValue('test_job1'));
+        $schedule->expects($this->any())->method('getJobCode')->will($this->returnValue($jobCode));
         $schedule->expects($this->once())->method('getScheduledAt')->will($this->returnValue($dateScheduledAt));
         $schedule->expects($this->once())->method('tryLockJob')->will($this->returnValue(true));
         $schedule->expects(
@@ -383,7 +385,7 @@ public function testDispatchExceptionNoCallback()
 
         $this->loggerMock->expects($this->once())->method('critical')->with($exception);
 
-        $jobConfig = ['test_group' => ['test_job1' => ['instance' => 'Some_Class']]];
+        $jobConfig = ['test_group' => [$jobCode => ['instance' => 'Some_Class']]];
 
         $this->_config->expects($this->exactly(2))->method('getJobs')->will($this->returnValue($jobConfig));
 
diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json
index a8c124dc57207..20426bedadd0e 100644
--- a/app/code/Magento/Cron/composer.json
+++ b/app/code/Magento/Cron/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-cron",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/framework": "101.0.*"
     },
@@ -10,7 +10,7 @@
         "magento/module-config": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php
index ae13c4d399e47..3ab1bfc086721 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php
@@ -7,15 +7,22 @@
 
 namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency;
 
+use Magento\Framework\Exception\NotFoundException;
+
 class SaveRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency
 {
     /**
      * Save rates action
      *
      * @return void
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         $data = $this->getRequest()->getParam('rate');
         if (is_array($data)) {
             try {
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php
index eee7961b02f4a..ad80833d8da5d 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php
@@ -6,15 +6,22 @@
  */
 namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol;
 
+use Magento\Framework\Exception\NotFoundException;
+
 class Save extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol
 {
     /**
      * Save custom Currency symbol
      *
      * @return void
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         $symbolsDataArray = $this->getRequest()->getParam('custom_currency_symbol', null);
         if (is_array($symbolsDataArray)) {
             foreach ($symbolsDataArray as &$symbolsData) {
@@ -27,9 +34,9 @@ public function execute()
         try {
             $this->_objectManager->create(\Magento\CurrencySymbol\Model\System\Currencysymbol::class)
                 ->setCurrencySymbolsData($symbolsDataArray);
-            $this->messageManager->addSuccess(__('You applied the custom currency symbols.'));
+            $this->messageManager->addSuccessMessage(__('You applied the custom currency symbols.'));
         } catch (\Exception $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         }
 
         $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
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 0863104a2bf8d..455449a449103 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
@@ -57,11 +57,18 @@ class SaveTest extends \PHPUnit\Framework\TestCase
      */
     protected $filterManagerMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
 
-        $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
+        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isPost'])
+            ->getMockForAbstractClass();
+        $this->requestMock->expects($this->any())->method('isPost')->willReturn(true);
 
         $this->helperMock = $this->createMock(\Magento\Backend\Helper\Data::class);
 
@@ -128,7 +135,7 @@ public function testExecute()
             ->willReturn($this->filterManagerMock);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('You applied the custom currency symbols.'));
 
         $this->action->execute();
diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json
index da76425436038..2d9dd65422a98 100644
--- a/app/code/Magento/CurrencySymbol/composer.json
+++ b/app/code/Magento/CurrencySymbol/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-currency-symbol",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-config": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-page-cache": "100.2.*",
@@ -11,7 +11,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
index 6e9b9a396ec2f..6950da072e67b 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /**
@@ -13,28 +10,28 @@
  */
 ?>
 
-<form id="currency-symbols-form" action="<?= /* @escapeNotVerified */ $block->getFormActionUrl() ?>" method="post">
-    <input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
+<form id="currency-symbols-form" action="<?= $block->escapeUrl($block->getFormActionUrl()) ?>" method="post">
+    <input name="form_key" type="hidden" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" />
     <fieldset class="admin__fieldset">
-        <?php foreach ($block->getCurrencySymbolsData() as $code => $data): ?>
+        <?php foreach ($block->getCurrencySymbolsData() as $code => $data) : ?>
         <div class="admin__field _required">
-            <label class="admin__field-label" for="custom_currency_symbol<?= /* @escapeNotVerified */ $code ?>">
-                <span><?= /* @escapeNotVerified */ $code ?> (<?= /* @escapeNotVerified */ $data['displayName'] ?>)</span>
+            <label class="admin__field-label" for="custom_currency_symbol<?= $block->escapeHtmlAttr($code) ?>">
+                <span><?= $block->escapeHtml($code) ?> (<?= $block->escapeHtml($data['displayName']) ?>)</span>
             </label>
             <div class="admin__field-control">
-                <input id="custom_currency_symbol<?= /* @escapeNotVerified */ $code ?>"
+                <input id="custom_currency_symbol<?= $block->escapeHtmlAttr($code) ?>"
                        class="required-entry admin__control-text <?= $data['inherited'] ? 'disabled' : '' ?>"
                        type="text"
                        value="<?= $block->escapeHtmlAttr($data['displaySymbol']) ?>"
-                       name="custom_currency_symbol[<?= /* @escapeNotVerified */ $code ?>]">
+                       name="custom_currency_symbol[<?= $block->escapeHtmlAttr($code) ?>]">
                 <div class="admin__field admin__field-option">
-                    <input id="custom_currency_symbol_inherit<?= /* @escapeNotVerified */ $code ?>"
+                    <input id="custom_currency_symbol_inherit<?= $block->escapeHtmlAttr($code) ?>"
                            class="admin__control-checkbox" type="checkbox"
-                           onclick="toggleUseDefault(<?= /* @escapeNotVerified */ '\'' . $code . '\',\'' . $block->escapeJs($data['parentSymbol']) . '\'' ?>)"
+                           onclick="toggleUseDefault(<?= '\'' . $block->escapeJs($code) . '\',\'' . $block->escapeJs($data['parentSymbol']) . '\'' ?>)"
                             <?= $data['inherited'] ? ' checked="checked"' : '' ?>
                            value="1"
-                           name="inherit_custom_currency_symbol[<?= /* @escapeNotVerified */ $code ?>]">
-                    <label class="admin__field-label" for="custom_currency_symbol_inherit<?= /* @escapeNotVerified */ $code ?>"><span><?= /* @escapeNotVerified */ $block->getInheritText() ?></span></label>
+                           name="inherit_custom_currency_symbol[<?= $block->escapeHtmlAttr($code) ?>]">
+                    <label class="admin__field-label" for="custom_currency_symbol_inherit<?= $block->escapeHtmlAttr($code) ?>"><span><?= $block->escapeHtml($block->getInheritText()) ?></span></label>
                 </div>
             </div>
         </div>
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
index 8e0abcb319764..b52be91a5b071 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
@@ -4,63 +4,58 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
-?>
-<?php
 /**
  * @var $block \Magento\CurrencySymbol\Block\Adminhtml\System\Currency\Rate\Matrix
  */
-?>
-<?php
+
 $_oldRates = $block->getOldRates();
 $_newRates = $block->getNewRates();
 $_rates = ($_newRates) ? $_newRates : $_oldRates;
 ?>
-<?php if (empty($_rates)): ?>
-    <div class="message message-warning warning"><p><?= /* @escapeNotVerified */ __('You must first configure currency options before being able to see currency rates.') ?></p></div>
-<?php else: ?>
-    <form name="rateForm" id="rate-form" method="post" action="<?= /* @escapeNotVerified */ $block->getRatesFormAction() ?>">
+<?php if (empty($_rates)) : ?>
+    <div class="message message-warning warning"><p><?= $block->escapeHtml(__('You must first configure currency options before being able to see currency rates.')) ?></p></div>
+<?php else : ?>
+    <form name="rateForm" id="rate-form" method="post" action="<?= $block->escapeUrl($block->getRatesFormAction()) ?>">
         <?= $block->getBlockHtml('formkey') ?>
         <div class="admin__control-table-wrapper">
             <table class="admin__control-table">
                 <thead>
                     <tr>
                         <th>&nbsp;</th>
-                        <?php $_i = 0; foreach ($block->getAllowedCurrencies() as $_currencyCode): ?>
-                            <th><span><?= /* @escapeNotVerified */ $_currencyCode ?></span></th>
+                        <?php $_i = 0; foreach ($block->getAllowedCurrencies() as $_currencyCode) : ?>
+                            <th><span><?= $block->escapeHtml($_currencyCode) ?></span></th>
                         <?php endforeach; ?>
                     </tr>
                 </thead>
-                <?php $_j = 0; foreach ($block->getDefaultCurrencies() as $_currencyCode): ?>
+                <?php $_j = 0; foreach ($block->getDefaultCurrencies() as $_currencyCode) : ?>
                 <tr>
-                    <?php if (isset($_rates[$_currencyCode]) && is_array($_rates[$_currencyCode])): ?>
-                        <?php foreach ($_rates[$_currencyCode] as $_rate => $_value): ?>
-                            <?php if (++$_j == 1): ?>
-                                <td><span class="admin__control-support-text"><?= /* @escapeNotVerified */ $_currencyCode ?></span></td>
+                    <?php if (isset($_rates[$_currencyCode]) && is_array($_rates[$_currencyCode])) : ?>
+                        <?php foreach ($_rates[$_currencyCode] as $_rate => $_value) : ?>
+                            <?php if (++$_j == 1) : ?>
+                                <td><span class="admin__control-support-text"><?= $block->escapeHtml($_currencyCode) ?></span></td>
                                 <td>
                                     <input type="text"
-                                           name="rate[<?= /* @escapeNotVerified */ $_currencyCode ?>][<?= /* @escapeNotVerified */ $_rate ?>]"
-                                           value="<?= ($_currencyCode == $_rate) ? '1.0000' : ($_value>0 ? $_value : (isset($_oldRates[$_currencyCode][$_rate]) ? $_oldRates[$_currencyCode][$_rate] : '')) ?>"
+                                           name="rate[<?= $block->escapeHtmlAttr($_currencyCode) ?>][<?= $block->escapeHtmlAttr($_rate) ?>]"
+                                           value="<?= ($_currencyCode == $_rate) ? '1.0000' : ($_value>0 ? $block->escapeHtmlAttr($_value) : (isset($_oldRates[$_currencyCode][$_rate]) ? $block->escapeHtmlAttr($_oldRates[$_currencyCode][$_rate]) : '')) ?>"
                                            class="admin__control-text"
                                             <?= ($_currencyCode == $_rate) ? ' disabled' : '' ?> />
-                                    <?php if (isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
-                                    <div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <b><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></b></div>
+                                    <?php if (isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])) : ?>
+                                    <div class="admin__field-note"><?= $block->escapeHtml(__('Old rate:')) ?> <strong><?= $block->escapeHtml($_oldRates[$_currencyCode][$_rate]) ?></strong></div>
                                     <?php endif; ?>
                                 </td>
-                            <?php else: ?>
+                            <?php else : ?>
                                 <td>
                                     <input type="text"
-                                           name="rate[<?= /* @escapeNotVerified */ $_currencyCode ?>][<?= /* @escapeNotVerified */ $_rate ?>]"
-                                           value="<?= ($_currencyCode == $_rate) ? '1.0000' : ($_value>0 ? $_value : (isset($_oldRates[$_currencyCode][$_rate]) ? $_oldRates[$_currencyCode][$_rate] : '')) ?>"
-                                           class="admin__control-text"
-                                           <?= ($_currencyCode == $_rate) ? ' disabled' : '' ?> />
-                                    <?php if (isset($_newRates)  && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
-                                    <div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <b><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></b></div>
+                                           name="rate[<?= $block->escapeHtmlAttr($_currencyCode) ?>][<?= $block->escapeHtmlAttr($_rate) ?>]"
+                                           value="<?= ($_currencyCode == $_rate) ? '1.0000' : ($_value>0 ? $block->escapeHtmlAttr($_value) : (isset($_oldRates[$_currencyCode][$_rate]) ? $block->escapeHtmlAttr($_oldRates[$_currencyCode][$_rate]) : '')) ?>"
+                                           class="admin__control-text" <?= ($_currencyCode == $_rate) ? ' disabled' : '' ?> />
+                                    <?php if (isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])) : ?>
+                                    <div class="admin__field-note"><?= $block->escapeHtml(__('Old rate:')) ?> <strong><?= $block->escapeHtml($_oldRates[$_currencyCode][$_rate]) ?></strong></div>
                                     <?php endif; ?>
                                 </td>
                             <?php endif; ?>
-                        <?php endforeach; $_j = 0; ?>
+                        <?php endforeach; ?>
+                        <?php $_j = 0; ?>
                     <?php endif; ?>
                 </tr>
                 <?php endforeach; ?>
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml
index 985831c5de79f..916b6f8d54182 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml
@@ -4,16 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
-?>
-<?php
 /**
  * @var $block \Magento\CurrencySymbol\Block\Adminhtml\System\Currency\Rate\Services
  */
 ?>
 <div class="admin__field">
-    <label class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Import Service') ?></span></label>
+    <label class="admin__field-label"><span><?= $block->escapeHtml(__('Import Service')) ?></span></label>
     <div class="admin__field-control">
         <?= $block->getChildHtml('import_services') ?>
     </div>
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml
index 42b2affa2c176..db00909e14892 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml
@@ -4,16 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
-?>
-<?php
 /**
  * @var $block \Magento\CurrencySymbol\Block\Adminhtml\System\Currency
  */
 ?>
 
-<form action="<?= /* @escapeNotVerified */ $block->getImportFormAction() ?>" method="post" class="import-service">
+<form action="<?= $block->escapeUrl($block->getImportFormAction()) ?>" method="post" class="import-service">
     <?= $block->getBlockHtml('formkey') ?>
     <fieldset class="admin__fieldset admin__fieldset-import-service">
         <?= $block->getServicesHtml() ?>
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit.php b/app/code/Magento/Customer/Block/Adminhtml/Edit.php
index 973016baba29c..701e38bea6b58 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit.php
@@ -122,7 +122,7 @@ protected function _construct()
                 [
                     'label' => __('Force Sign-In'),
                     'onclick' => 'deleteConfirm(\'' . $this->escapeJs($this->escapeHtml($deleteConfirmMsg)) .
-                        '\', \'' . $url . '\')',
+                        '\', \'' . $url . '\', {data: {}})',
                     'class' => 'invalidate-token'
                 ],
                 10
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/InvalidateTokenButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/InvalidateTokenButton.php
index 180cb3d66ea35..506ba3fb9bfda 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/InvalidateTokenButton.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/InvalidateTokenButton.php
@@ -25,7 +25,8 @@ public function getButtonData()
             $data = [
                 'label' => __('Force Sign-In'),
                 'class' => 'invalidate-token',
-                'on_click' => 'deleteConfirm("' . $deleteConfirmMsg . '", "' . $this->getInvalidateTokenUrl() . '")',
+                'on_click' => 'deleteConfirm("' . $deleteConfirmMsg . '", "' . $this->getInvalidateTokenUrl() .
+                '", {data: {}})',
                 'sort_order' => 65,
             ];
         }
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php
index 9a025211c9b0a..0aeed1562c51e 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php
@@ -48,7 +48,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
 
         $regionId = $element->getForm()->getElement('region_id')->getValue();
 
-        $html = '<div class="field field-state required admin__field _required">';
+        $html = '<div class="field field-state admin__field">';
         $element->setClass('input-text admin__control-text');
         $element->setRequired(true);
         $html .= $element->getLabelHtml() . '<div class="control admin__field-control">';
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php
index 43d9af36a5652..500646c8e05a7 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php
@@ -10,6 +10,11 @@
  */
 class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
     /**
      * Core registry
      *
@@ -21,17 +26,24 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
+     * @param \Magento\Framework\Escaper|null $escaper
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
         \Magento\Framework\Registry $registry,
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Escaper $escaper = null
     ) {
         $this->_coreRegistry = $registry;
+        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\Escaper::class
+        );
         parent::__construct($context, $data);
     }
 
     /**
+     * Render actions
+     *
      * @param \Magento\Framework\DataObject $row
      * @return string
      */
@@ -57,15 +69,20 @@ public function render(\Magento\Framework\DataObject $row)
     }
 
     /**
+     * Retrieve escaped value
+     *
      * @param string $value
      * @return string
      */
     protected function _getEscapedValue($value)
     {
-        return addcslashes(htmlspecialchars($value), '\\\'');
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        return addcslashes($this->escaper->escapeHtml($value), '\\\'');
     }
 
     /**
+     * Actions to html
+     *
      * @param array $actions
      * @return string
      */
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php
index bb190260e4776..c1266febff99d 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php
@@ -63,7 +63,8 @@ protected function _construct()
     {
         parent::_construct();
         $this->setId('customer_orders_grid');
-        $this->setDefaultSort('created_at', 'desc');
+        $this->setDefaultSort('created_at');
+        $this->setDefaultDir('desc');
         $this->setUseAjax(true);
     }
 
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php
index 3f2c7cda7608d..988a157805b36 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php
@@ -77,7 +77,8 @@ protected function _construct()
     {
         parent::_construct();
         $this->setId('customer_view_cart_grid');
-        $this->setDefaultSort('added_at', 'desc');
+        $this->setDefaultSort('added_at');
+        $this->setDefaultDir('desc');
         $this->setSortable(false);
         $this->setPagerVisibility(false);
         $this->setFilterVisibility(false);
@@ -94,7 +95,7 @@ protected function _prepareCollection()
         $quote = $this->getQuote();
 
         if ($quote) {
-            $collection = $quote->getItemsCollection(false);
+            $collection = $quote->getItemsCollection(true);
         } else {
             $collection = $this->_dataCollectionFactory->create();
         }
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Wishlist/Grid/Renderer/Description.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Wishlist/Grid/Renderer/Description.php
index d0b47886dca7e..aef91184fc782 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Wishlist/Grid/Renderer/Description.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Wishlist/Grid/Renderer/Description.php
@@ -18,6 +18,6 @@ class Description extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abs
      */
     public function render(\Magento\Framework\DataObject $row)
     {
-        return nl2br(htmlspecialchars($row->getData($this->getColumn()->getIndex())));
+        return nl2br($this->escapeHtml($row->getData($this->getColumn()->getIndex())));
     }
 }
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Group/Edit.php b/app/code/Magento/Customer/Block/Adminhtml/Group/Edit.php
index be2d143e7f864..0bf7f607a531b 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Group/Edit.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Group/Edit.php
@@ -57,6 +57,8 @@ public function __construct(
      * Update Save and Delete buttons. Remove Delete button if group can't be deleted.
      *
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     protected function _construct()
     {
@@ -68,6 +70,23 @@ protected function _construct()
 
         $this->buttonList->update('save', 'label', __('Save Customer Group'));
         $this->buttonList->update('delete', 'label', __('Delete Customer Group'));
+        $this->buttonList->update(
+            'delete',
+            'onclick',
+            sprintf(
+                "deleteConfirm('%s','%s', %s)",
+                'Are you sure?',
+                $this->getDeleteUrl(),
+                json_encode(
+                    [
+                        'action' => '',
+                        'data' => [
+                            'form_key' => $this->getFormKey()
+                        ]
+                    ]
+                )
+            )
+        );
 
         $groupId = $this->coreRegistry->registry(RegistryConstants::CURRENT_GROUP_ID);
         if (!$groupId || $this->groupManagement->isReadonly($groupId)) {
diff --git a/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php b/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php
new file mode 100644
index 0000000000000..280948439e1f8
--- /dev/null
+++ b/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Block\DataProviders;
+
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Directory\Model\Country\Postcode\Config as PostCodeConfig;
+
+/**
+ * Provides postcodes patterns into template.
+ */
+class PostCodesPatternsAttributeData implements ArgumentInterface
+{
+    /**
+     * @var PostCodeConfig
+     */
+    private $postCodeConfig;
+
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * Constructor
+     *
+     * @param PostCodeConfig $postCodeConfig
+     * @param SerializerInterface $serializer
+     */
+    public function __construct(PostCodeConfig $postCodeConfig, SerializerInterface $serializer)
+    {
+        $this->postCodeConfig = $postCodeConfig;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Get serialized post codes
+     *
+     * @return string
+     */
+    public function getSerializedPostCodes(): string
+    {
+        return $this->serializer->serialize($this->postCodeConfig->getPostCodes());
+    }
+}
diff --git a/app/code/Magento/Customer/Block/Form/Login.php b/app/code/Magento/Customer/Block/Form/Login.php
index 7b265ae1f0f32..d3d3306a49b44 100644
--- a/app/code/Magento/Customer/Block/Form/Login.php
+++ b/app/code/Magento/Customer/Block/Form/Login.php
@@ -47,15 +47,6 @@ public function __construct(
         $this->_customerSession = $customerSession;
     }
 
-    /**
-     * @return $this
-     */
-    protected function _prepareLayout()
-    {
-        $this->pageConfig->getTitle()->set(__('Customer Login'));
-        return parent::_prepareLayout();
-    }
-
     /**
      * Retrieve form posting url
      *
diff --git a/app/code/Magento/Customer/Block/Widget/Name.php b/app/code/Magento/Customer/Block/Widget/Name.php
index 35f3bbefb8f00..2576545601c73 100644
--- a/app/code/Magento/Customer/Block/Widget/Name.php
+++ b/app/code/Magento/Customer/Block/Widget/Name.php
@@ -245,10 +245,14 @@ public function getStoreLabel($attributeCode)
      */
     public function getAttributeValidationClass($attributeCode)
     {
-        return $this->_addressHelper->getAttributeValidationClass($attributeCode);
+        $attributeMetadata = $this->_getAttribute($attributeCode);
+
+        return $attributeMetadata ? $attributeMetadata->getFrontendClass() : '';
     }
 
     /**
+     * Check if attribute is required
+     *
      * @param string $attributeCode
      * @return bool
      */
@@ -259,6 +263,8 @@ private function _isAttributeRequired($attributeCode)
     }
 
     /**
+     * Check if attribute is visible
+     *
      * @param string $attributeCode
      * @return bool
      */
diff --git a/app/code/Magento/Customer/Controller/Account/CreatePost.php b/app/code/Magento/Customer/Controller/Account/CreatePost.php
index 27d8ddd99344c..1d67a6b5d5eba 100644
--- a/app/code/Magento/Customer/Controller/Account/CreatePost.php
+++ b/app/code/Magento/Customer/Controller/Account/CreatePost.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Customer\Controller\Account;
 
+use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
 use Magento\Customer\Model\Account\Redirect as AccountRedirect;
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Framework\Api\DataObjectHelper;
@@ -31,6 +32,8 @@
 use Magento\Framework\Data\Form\FormKey\Validator;
 
 /**
+ * Post create customer action
+ *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -126,6 +129,11 @@ class CreatePost extends \Magento\Customer\Controller\AbstractAccount
      */
     private $formKeyValidator;
 
+    /**
+     * @var CustomerRepository
+     */
+    private $customerRepository;
+
     /**
      * @param Context $context
      * @param Session $customerSession
@@ -145,6 +153,7 @@ class CreatePost extends \Magento\Customer\Controller\AbstractAccount
      * @param CustomerExtractor $customerExtractor
      * @param DataObjectHelper $dataObjectHelper
      * @param AccountRedirect $accountRedirect
+     * @param CustomerRepository $customerRepository
      * @param Validator $formKeyValidator
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -168,6 +177,7 @@ public function __construct(
         CustomerExtractor $customerExtractor,
         DataObjectHelper $dataObjectHelper,
         AccountRedirect $accountRedirect,
+        CustomerRepository $customerRepository = null,
         Validator $formKeyValidator = null
     ) {
         $this->session = $customerSession;
@@ -188,6 +198,7 @@ public function __construct(
         $this->dataObjectHelper = $dataObjectHelper;
         $this->accountRedirect = $accountRedirect;
         $this->formKeyValidator = $formKeyValidator ?: ObjectManager::getInstance()->get(Validator::class);
+        $this->customerRepository = $customerRepository ?: ObjectManager::getInstance()->get(CustomerRepository::class);
         parent::__construct($context);
     }
 
@@ -294,34 +305,29 @@ public function execute()
             $resultRedirect->setUrl($this->_redirect->error($url));
             return $resultRedirect;
         }
-
         $this->session->regenerateId();
-
         try {
             $address = $this->extractAddress();
             $addresses = $address === null ? [] : [$address];
-
             $customer = $this->customerExtractor->extract('customer_account_create', $this->_request);
             $customer->setAddresses($addresses);
-
             $password = $this->getRequest()->getParam('password');
             $confirmation = $this->getRequest()->getParam('password_confirmation');
             $redirectUrl = $this->session->getBeforeAuthUrl();
-
             $this->checkPasswordConfirmation($password, $confirmation);
-
             $customer = $this->accountManagement
                 ->createAccount($customer, $password, $redirectUrl);
 
             if ($this->getRequest()->getParam('is_subscribed', false)) {
-                $this->subscriberFactory->create()->subscribeCustomerById($customer->getId());
+                $extensionAttributes = $customer->getExtensionAttributes();
+                $extensionAttributes->setIsSubscribed(true);
+                $customer->setExtensionAttributes($extensionAttributes);
+                $this->customerRepository->save($customer);
             }
-
             $this->_eventManager->dispatch(
                 'customer_register_success',
                 ['account_controller' => $this, 'customer' => $customer]
             );
-
             $confirmationStatus = $this->accountManagement->getConfirmationStatus($customer->getId());
             if ($confirmationStatus === AccountManagementInterface::ACCOUNT_CONFIRMATION_REQUIRED) {
                 $email = $this->customerUrl->getEmailConfirmationUrl($customer->getEmail());
diff --git a/app/code/Magento/Customer/Controller/Account/EditPost.php b/app/code/Magento/Customer/Controller/Account/EditPost.php
index da0ad29c5c72f..4d9ec962c292d 100644
--- a/app/code/Magento/Customer/Controller/Account/EditPost.php
+++ b/app/code/Magento/Customer/Controller/Account/EditPost.php
@@ -6,6 +6,8 @@
  */
 namespace Magento\Customer\Controller\Account;
 
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\AddressRegistry;
 use Magento\Customer\Model\AuthenticationInterface;
 use Magento\Customer\Model\Customer\Mapper;
 use Magento\Customer\Model\EmailNotificationInterface;
@@ -23,7 +25,8 @@
 use Magento\Framework\Escaper;
 
 /**
- * Class EditPost
+ * Class to editing post.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class EditPost extends \Magento\Customer\Controller\AbstractAccount
@@ -73,9 +76,16 @@ class EditPost extends \Magento\Customer\Controller\AbstractAccount
      */
     private $customerMapper;
 
-    /** @var Escaper */
+    /**
+     * @var Escaper
+     */
     private $escaper;
 
+    /**
+     * @var AddressRegistry
+     */
+    private $addressRegistry;
+
     /**
      * @param Context $context
      * @param Session $customerSession
@@ -84,6 +94,7 @@ class EditPost extends \Magento\Customer\Controller\AbstractAccount
      * @param Validator $formKeyValidator
      * @param CustomerExtractor $customerExtractor
      * @param Escaper|null $escaper
+     * @param AddressRegistry|null $addressRegistry
      */
     public function __construct(
         Context $context,
@@ -92,7 +103,8 @@ public function __construct(
         CustomerRepositoryInterface $customerRepository,
         Validator $formKeyValidator,
         CustomerExtractor $customerExtractor,
-        Escaper $escaper = null
+        Escaper $escaper = null,
+        AddressRegistry $addressRegistry = null
     ) {
         parent::__construct($context);
         $this->session = $customerSession;
@@ -101,6 +113,7 @@ public function __construct(
         $this->formKeyValidator = $formKeyValidator;
         $this->customerExtractor = $customerExtractor;
         $this->escaper = $escaper ?: ObjectManager::getInstance()->get(Escaper::class);
+        $this->addressRegistry = $addressRegistry ?: ObjectManager::getInstance()->get(AddressRegistry::class);
     }
 
     /**
@@ -138,7 +151,7 @@ private function getEmailNotification()
     }
 
     /**
-     * Change customer email or password action
+     * Change customer email or password action.
      *
      * @return \Magento\Framework\Controller\Result\Redirect
      */
@@ -162,6 +175,9 @@ public function execute()
                 // whether a customer enabled change password option
                 $isPasswordChanged = $this->changeCustomerPassword($currentCustomerDataObject->getEmail());
 
+                // No need to validate customer address while editing customer profile
+                $this->disableAddressValidation($customerCandidateDataObject);
+
                 $this->customerRepository->save($customerCandidateDataObject);
                 $this->getEmailNotification()->credentialsChanged(
                     $customerCandidateDataObject,
@@ -170,6 +186,7 @@ public function execute()
                 );
                 $this->dispatchSuccessEvent($customerCandidateDataObject);
                 $this->messageManager->addSuccess(__('You saved the account information.'));
+
                 return $resultRedirect->setPath('customer/account');
             } catch (InvalidEmailOrPasswordException $e) {
                 $this->messageManager->addError($e->getMessage());
@@ -180,6 +197,7 @@ public function execute()
                 $this->session->logout();
                 $this->session->start();
                 $this->messageManager->addError($message);
+
                 return $resultRedirect->setPath('customer/account/login');
             } catch (InputException $e) {
                 $this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage()));
@@ -313,4 +331,18 @@ private function getCustomerMapper()
         }
         return $this->customerMapper;
     }
+
+    /**
+     * Disable Customer Address Validation.
+     *
+     * @param CustomerInterface $customer
+     * @return void
+     */
+    private function disableAddressValidation(CustomerInterface $customer)
+    {
+        foreach ($customer->getAddresses() as $address) {
+            $addressModel = $this->addressRegistry->retrieve($address->getId());
+            $addressModel->setShouldIgnoreValidation(true);
+        }
+    }
 }
diff --git a/app/code/Magento/Customer/Controller/Address/Delete.php b/app/code/Magento/Customer/Controller/Address/Delete.php
index ef92bd2ef533b..d287808b4056d 100644
--- a/app/code/Magento/Customer/Controller/Address/Delete.php
+++ b/app/code/Magento/Customer/Controller/Address/Delete.php
@@ -6,13 +6,20 @@
  */
 namespace Magento\Customer\Controller\Address;
 
+use Magento\Framework\Exception\NotFoundException;
+
 class Delete extends \Magento\Customer\Controller\Address
 {
     /**
      * @return \Magento\Framework\Controller\Result\Redirect
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         $addressId = $this->getRequest()->getParam('id', false);
 
         if ($addressId && $this->_formKeyValidator->validate($this->getRequest())) {
@@ -20,12 +27,12 @@ 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.'));
+                $this->messageManager->addExceptionMessage($other, __('We can\'t delete the address right now.'));
             }
         }
         return $this->resultRedirectFactory->create()->setPath('*/*/index');
diff --git a/app/code/Magento/Customer/Controller/Address/Index.php b/app/code/Magento/Customer/Controller/Address/Index.php
index ad04c7bd5c71b..674d3bcf0e0d3 100644
--- a/app/code/Magento/Customer/Controller/Address/Index.php
+++ b/app/code/Magento/Customer/Controller/Address/Index.php
@@ -28,9 +28,9 @@ class Index extends \Magento\Customer\Controller\Address
      * @param \Magento\Customer\Api\Data\RegionInterfaceFactory $regionDataFactory
      * @param \Magento\Framework\Reflection\DataObjectProcessor $dataProcessor
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
-     * @param CustomerRepositoryInterface $customerRepository
      * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param CustomerRepositoryInterface $customerRepository
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php
index 571ef57702bc3..6fc9f45ab62ff 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php
@@ -7,6 +7,7 @@
 namespace Magento\Customer\Controller\Adminhtml\Group;
 
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\NotFoundException;
 
 class Delete extends \Magento\Customer\Controller\Adminhtml\Group
 {
@@ -14,9 +15,14 @@ class Delete extends \Magento\Customer\Controller\Adminhtml\Group
      * Delete customer group.
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         $id = $this->getRequest()->getParam('id');
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php
index 936d9cdbc1704..6b35397d9be13 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php
@@ -9,6 +9,7 @@
 use Magento\Customer\Api\Data\GroupInterfaceFactory;
 use Magento\Customer\Api\Data\GroupInterface;
 use Magento\Customer\Api\GroupRepositoryInterface;
+use Magento\Framework\Exception\NotFoundException;
 
 class Save extends \Magento\Customer\Controller\Adminhtml\Group
 {
@@ -66,9 +67,14 @@ protected function storeCustomerGroupDataToSession($customerGroupData)
      * Create or save customer group.
      *
      * @return \Magento\Backend\Model\View\Result\Redirect|\Magento\Backend\Model\View\Result\Forward
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         $taxClass = (int)$this->getRequest()->getParam('tax_class');
 
         /** @var \Magento\Customer\Api\Data\GroupInterface $customerGroup */
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
index 6753a48d02d6a..4d1bc18a98a06 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
@@ -8,12 +8,14 @@
 use Magento\Backend\App\Action;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\AddressRegistry;
 use Magento\Customer\Model\EmailNotificationInterface;
 use Magento\Customer\Ui\Component\Listing\AttributeRepository;
 use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
- * Customer inline edit action
+ * Customer inline edit action.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -61,6 +63,11 @@ class InlineEdit extends \Magento\Backend\App\Action
      */
     private $emailNotification;
 
+    /**
+     * @var AddressRegistry
+     */
+    private $addressRegistry;
+
     /**
      * @param Action\Context $context
      * @param CustomerRepositoryInterface $customerRepository
@@ -68,6 +75,7 @@ class InlineEdit extends \Magento\Backend\App\Action
      * @param \Magento\Customer\Model\Customer\Mapper $customerMapper
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param \Psr\Log\LoggerInterface $logger
+     * @param AddressRegistry|null $addressRegistry
      */
     public function __construct(
         Action\Context $context,
@@ -75,13 +83,15 @@ public function __construct(
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
         \Magento\Customer\Model\Customer\Mapper $customerMapper,
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
-        \Psr\Log\LoggerInterface $logger
+        \Psr\Log\LoggerInterface $logger,
+        AddressRegistry $addressRegistry = null
     ) {
         $this->customerRepository = $customerRepository;
         $this->resultJsonFactory = $resultJsonFactory;
         $this->customerMapper = $customerMapper;
         $this->dataObjectHelper = $dataObjectHelper;
         $this->logger = $logger;
+        $this->addressRegistry = $addressRegistry ?: ObjectManager::getInstance()->get(AddressRegistry::class);
         parent::__construct($context);
     }
 
@@ -106,8 +116,6 @@ private function getEmailNotification()
      * Inline edit action execute
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function execute()
     {
@@ -115,7 +123,7 @@ public function execute()
         $resultJson = $this->resultJsonFactory->create();
 
         $postItems = $this->getRequest()->getParam('items', []);
-        if (!($this->getRequest()->getParam('isAjax') && count($postItems))) {
+        if (!($this->getRequest()->getParam('isAjax') && $this->getRequest()->isPost() && count($postItems))) {
             return $resultJson->setData([
                 'messages' => [__('Please correct the data sent.')],
                 'error' => true,
@@ -210,7 +218,7 @@ protected function updateDefaultBilling(array $data)
     }
 
     /**
-     * Save customer with error catching
+     * Save customer with error catching.
      *
      * @param CustomerInterface $customer
      * @return void
@@ -218,6 +226,8 @@ protected function updateDefaultBilling(array $data)
     protected function saveCustomer(CustomerInterface $customer)
     {
         try {
+            // No need to validate customer address during inline edit action
+            $this->disableAddressValidation($customer);
             $this->customerRepository->save($customer);
         } catch (\Magento\Framework\Exception\InputException $e) {
             $this->getMessageManager()->addError($this->getErrorWithCustomerId($e->getMessage()));
@@ -303,4 +313,18 @@ protected function getErrorWithCustomerId($errorText)
     {
         return '[Customer ID: ' . $this->getCustomer()->getId() . '] ' . __($errorText);
     }
+
+    /**
+     * Disable Customer Address Validation.
+     *
+     * @param CustomerInterface $customer
+     * @return void
+     */
+    private function disableAddressValidation(CustomerInterface $customer)
+    {
+        foreach ($customer->getAddresses() as $address) {
+            $addressModel = $this->addressRegistry->retrieve($address->getId());
+            $addressModel->setShouldIgnoreValidation(true);
+        }
+    }
 }
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php
index 762b872b97b6d..49a51052beb90 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Backend\App\Action\Context;
 use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
@@ -13,7 +14,7 @@
 use Magento\Framework\Controller\ResultFactory;
 
 /**
- * Class MassAssignGroup
+ * Class to execute MassAssignGroup action.
  */
 class MassAssignGroup extends AbstractMassAction
 {
@@ -39,7 +40,7 @@ public function __construct(
     }
 
     /**
-     * Customer mass assign group action
+     * Customer mass assign group action.
      *
      * @param AbstractCollection $collection
      * @return \Magento\Backend\Model\View\Result\Redirect
@@ -51,6 +52,8 @@ protected function massAction(AbstractCollection $collection)
             // Verify customer exists
             $customer = $this->customerRepository->getById($customerId);
             $customer->setGroupId($this->getRequest()->getParam('group'));
+            // No need to validate customer and customer address during assigning customer to the group
+            $this->setIgnoreValidationFlag($customer);
             $this->customerRepository->save($customer);
             $customersUpdated++;
         }
@@ -64,4 +67,15 @@ protected function massAction(AbstractCollection $collection)
 
         return $resultRedirect;
     }
+
+    /**
+     * Set ignore_validation_flag to skip unnecessary address and customer validation.
+     *
+     * @param CustomerInterface $customer
+     * @return void
+     */
+    private function setIgnoreValidationFlag(CustomerInterface $customer)
+    {
+        $customer->setData('ignore_validation_flag', true);
+    }
 }
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php
index 37c8ed5a252f8..eab18520e69a7 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/ResetPassword.php
@@ -31,7 +31,9 @@ public function execute()
                 \Magento\Customer\Model\AccountManagement::EMAIL_REMINDER,
                 $customer->getWebsiteId()
             );
-            $this->messageManager->addSuccess(__('The customer will receive an email with a link to reset password.'));
+            $this->messageManager->addSuccessMessage(
+                __('The customer will receive an email with a link to reset password.')
+            );
         } catch (NoSuchEntityException $exception) {
             $resultRedirect->setPath('customer/index');
             return $resultRedirect;
@@ -44,7 +46,7 @@ public function execute()
         } catch (SecurityViolationException $exception) {
             $this->messageManager->addErrorMessage($exception->getMessage());
         } catch (\Exception $exception) {
-            $this->messageManager->addException(
+            $this->messageManager->addExceptionMessage(
                 $exception,
                 __('Something went wrong while resetting customer password.')
             );
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
index 12732f81f78a0..561039990f705 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
@@ -5,6 +5,15 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+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\Customer\Api\AddressMetadataInterface;
 use Magento\Customer\Api\CustomerMetadataInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
@@ -12,8 +21,11 @@
 use Magento\Customer\Model\EmailNotificationInterface;
 use Magento\Customer\Model\Metadata\Form;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\ObjectManager;
 
 /**
+ * Class to Save customer.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Save extends \Magento\Customer\Controller\Adminhtml\Index
@@ -23,6 +35,98 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index
      */
     private $emailNotification;
 
+    /**
+     * @var AddressRegistry
+     */
+    private $addressRegistry;
+
+    /**
+     * @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 CustomerRepositoryInterface $customerRepository
+     * @param \Magento\Framework\Api\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 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 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,
+        CustomerRepositoryInterface $customerRepository,
+        \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter,
+        Mapper $addressMapper,
+        AccountManagementInterface $customerAccountManagement,
+        AddressRepositoryInterface $addressRepository,
+        CustomerInterfaceFactory $customerDataFactory,
+        AddressInterfaceFactory $addressDataFactory,
+        \Magento\Customer\Model\Customer\Mapper $customerMapper,
+        \Magento\Framework\Reflection\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,
+        AddressRegistry $addressRegistry = null
+    ) {
+        parent::__construct(
+            $context,
+            $coreRegistry,
+            $fileFactory,
+            $customerFactory,
+            $addressFactory,
+            $formFactory,
+            $subscriberFactory,
+            $viewHelper,
+            $random,
+            $customerRepository,
+            $extensibleDataObjectConverter,
+            $addressMapper,
+            $customerAccountManagement,
+            $addressRepository,
+            $customerDataFactory,
+            $addressDataFactory,
+            $customerMapper,
+            $dataObjectProcessor,
+            $dataObjectHelper,
+            $objectFactory,
+            $layoutFactory,
+            $resultLayoutFactory,
+            $resultPageFactory,
+            $resultForwardFactory,
+            $resultJsonFactory
+        );
+        $this->addressRegistry = $addressRegistry ?: ObjectManager::getInstance()->get(AddressRegistry::class);
+    }
+
     /**
      * Reformat customer account data to be compatible with customer service interface
      *
@@ -169,7 +273,7 @@ protected function _extractCustomerAddressData(array & $extractedCustomerData)
     }
 
     /**
-     * Save customer action
+     * Save customer action.
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -179,11 +283,9 @@ protected function _extractCustomerAddressData(array & $extractedCustomerData)
     public function execute()
     {
         $returnToEdit = false;
-        $originalRequestData = $this->getRequest()->getPostValue();
-
         $customerId = $this->getCurrentCustomerId();
 
-        if ($originalRequestData) {
+        if ($this->getRequest()->getPostValue()) {
             try {
                 // optional fields might be set in request for future processing by observers in other modules
                 $customerData = $this->_extractCustomerData();
@@ -191,6 +293,8 @@ public function execute()
 
                 if ($customerId) {
                     $currentCustomer = $this->_customerRepository->getById($customerId);
+                    // No need to validate customer address while editing customer profile
+                    $this->disableAddressValidation($currentCustomer);
                     $customerData = array_merge(
                         $this->customerMapper->toFlatArray($currentCustomer),
                         $customerData
@@ -269,7 +373,7 @@ public function execute()
                     $messages = $exception->getMessage();
                 }
                 $this->_addSessionErrorMessages($messages);
-                $this->_getSession()->setCustomerFormData($originalRequestData);
+                $this->_getSession()->setCustomerFormData($this->retrieveFormattedFormData());
                 $returnToEdit = true;
             } catch (\Magento\Framework\Exception\AbstractAggregateException $exception) {
                 $errors = $exception->getErrors();
@@ -278,18 +382,19 @@ public function execute()
                     $messages[] = $error->getMessage();
                 }
                 $this->_addSessionErrorMessages($messages);
-                $this->_getSession()->setCustomerFormData($originalRequestData);
+                $this->_getSession()->setCustomerFormData($this->retrieveFormattedFormData());
                 $returnToEdit = true;
             } catch (LocalizedException $exception) {
                 $this->_addSessionErrorMessages($exception->getMessage());
-                $this->_getSession()->setCustomerFormData($originalRequestData);
+                $this->_getSession()->setCustomerFormData($this->retrieveFormattedFormData());
                 $returnToEdit = true;
             } catch (\Exception $exception) {
                 $this->messageManager->addException($exception, __('Something went wrong while saving the customer.'));
-                $this->_getSession()->setCustomerFormData($originalRequestData);
+                $this->_getSession()->setCustomerFormData($this->retrieveFormattedFormData());
                 $returnToEdit = true;
             }
         }
+
         $resultRedirect = $this->resultRedirectFactory->create();
         if ($returnToEdit) {
             if ($customerId) {
@@ -306,6 +411,7 @@ public function execute()
         } else {
             $resultRedirect->setPath('customer/index');
         }
+
         return $resultRedirect;
     }
 
@@ -380,4 +486,43 @@ private function getCurrentCustomerId()
 
         return $customerId;
     }
+
+    /**
+     * Disable Customer Address Validation
+     *
+     * @param CustomerInterface $customer
+     * @return void
+     */
+    private function disableAddressValidation(CustomerInterface $customer)
+    {
+        foreach ($customer->getAddresses() as $address) {
+            $addressModel = $this->addressRegistry->retrieve($address->getId());
+            $addressModel->setShouldIgnoreValidation(true);
+        }
+    }
+
+    /**
+     * Retrieve formatted form data
+     *
+     * @return array
+     */
+    private function retrieveFormattedFormData(): array
+    {
+        $originalRequestData = $this->getRequest()->getPostValue();
+
+        /* Customer data filtration */
+        if (isset($originalRequestData['customer'])) {
+            $customerData = $this->_extractData(
+                'adminhtml_customer',
+                CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
+                [],
+                'customer'
+            );
+
+            $customerData = array_intersect_key($customerData, $originalRequestData['customer']);
+            $originalRequestData['customer'] = array_merge($originalRequestData['customer'], $customerData);
+        }
+
+        return $originalRequestData;
+    }
 }
diff --git a/app/code/Magento/Customer/CustomerData/Plugin/SessionChecker.php b/app/code/Magento/Customer/CustomerData/Plugin/SessionChecker.php
index aa73e275ee0ca..f82a4d15ae8bf 100644
--- a/app/code/Magento/Customer/CustomerData/Plugin/SessionChecker.php
+++ b/app/code/Magento/Customer/CustomerData/Plugin/SessionChecker.php
@@ -5,10 +5,13 @@
  */
 namespace Magento\Customer\CustomerData\Plugin;
 
-use Magento\Framework\Session\SessionManager;
+use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 use Magento\Framework\Stdlib\Cookie\PhpCookieManager;
 
+/**
+ * Class SessionChecker
+ */
 class SessionChecker
 {
     /**
@@ -36,10 +39,12 @@ public function __construct(
     /**
      * Delete frontend session cookie if customer session is expired
      *
-     * @param SessionManager $sessionManager
+     * @param SessionManagerInterface $sessionManager
      * @return void
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Stdlib\Cookie\FailureToSendException
      */
-    public function beforeStart(SessionManager $sessionManager)
+    public function beforeStart(SessionManagerInterface $sessionManager)
     {
         if (!$this->cookieManager->getCookie($sessionManager->getName())
             && $this->cookieManager->getCookie('mage-cache-sessid')
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
index b5b1905e68d8d..e90ab18172ecc 100644
--- a/app/code/Magento/Customer/Model/AccountManagement.php
+++ b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -16,7 +16,10 @@
 use Magento\Customer\Model\Config\Share as ConfigShare;
 use Magento\Customer\Model\Customer as CustomerModel;
 use Magento\Customer\Model\Customer\CredentialsValidator;
+use Magento\Customer\Model\Data\Customer;
 use Magento\Customer\Model\Metadata\Validator;
+use Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory;
+use Magento\Directory\Model\AllowedCountries;
 use Magento\Eav\Model\Validator\Attribute\Backend;
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Framework\Api\SearchCriteriaBuilder;
@@ -44,21 +47,21 @@
 use Magento\Framework\Phrase;
 use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Framework\Registry;
+use Magento\Framework\Session\SaveHandlerInterface;
+use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Stdlib\StringUtils as StringHelper;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Psr\Log\LoggerInterface as PsrLogger;
-use Magento\Framework\Session\SessionManagerInterface;
-use Magento\Framework\Session\SaveHandlerInterface;
-use Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory;
 
 /**
- * Handle various customer account actions
+ * Handle various customer account actions.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class AccountManagement implements AccountManagementInterface
 {
@@ -332,6 +335,16 @@ class AccountManagement implements AccountManagementInterface
      */
     private $searchCriteriaBuilder;
 
+    /**
+     * @var AddressRegistry
+     */
+    private $addressRegistry;
+
+    /**
+     * @var AllowedCountries
+     */
+    private $allowedCountriesReader;
+
     /**
      * @param CustomerFactory $customerFactory
      * @param ManagerInterface $eventManager
@@ -359,12 +372,15 @@ class AccountManagement implements AccountManagementInterface
      * @param CredentialsValidator|null $credentialsValidator
      * @param DateTimeFactory|null $dateTimeFactory
      * @param AccountConfirmation|null $accountConfirmation
-     * @param DateTimeFactory $dateTimeFactory
      * @param SessionManagerInterface|null $sessionManager
      * @param SaveHandlerInterface|null $saveHandler
      * @param CollectionFactory|null $visitorCollectionFactory
      * @param SearchCriteriaBuilder|null $searchCriteriaBuilder
+     * @param AddressRegistry|null $addressRegistry
+     * @param AllowedCountries|null $allowedCountriesReader
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function __construct(
         CustomerFactory $customerFactory,
@@ -396,7 +412,9 @@ public function __construct(
         SessionManagerInterface $sessionManager = null,
         SaveHandlerInterface $saveHandler = null,
         CollectionFactory $visitorCollectionFactory = null,
-        SearchCriteriaBuilder $searchCriteriaBuilder = null
+        SearchCriteriaBuilder $searchCriteriaBuilder = null,
+        AddressRegistry $addressRegistry = null,
+        AllowedCountries $allowedCountriesReader = null
     ) {
         $this->customerFactory = $customerFactory;
         $this->eventManager = $eventManager;
@@ -434,6 +452,10 @@ public function __construct(
             ?: ObjectManager::getInstance()->get(CollectionFactory::class);
         $this->searchCriteriaBuilder = $searchCriteriaBuilder
             ?: ObjectManager::getInstance()->get(SearchCriteriaBuilder::class);
+        $this->addressRegistry = $addressRegistry
+            ?: ObjectManager::getInstance()->get(AddressRegistry::class);
+        $this->allowedCountriesReader = $allowedCountriesReader
+            ?: ObjectManager::getInstance()->get(AllowedCountries::class);
     }
 
     /**
@@ -453,7 +475,7 @@ private function getAuthentication()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function resendConfirmation($email, $websiteId = null, $redirectUrl = '')
     {
@@ -476,7 +498,7 @@ public function resendConfirmation($email, $websiteId = null, $redirectUrl = '')
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function activate($email, $confirmationKey)
     {
@@ -485,7 +507,7 @@ public function activate($email, $confirmationKey)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function activateById($customerId, $confirmationKey)
     {
@@ -499,8 +521,11 @@ public function activateById($customerId, $confirmationKey)
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
      * @param string $confirmationKey
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @throws \Magento\Framework\Exception\State\InvalidTransitionException
-     * @throws \Magento\Framework\Exception\State\InputMismatchException
+     * @throws InputException
+     * @throws InputMismatchException
+     * @throws InvalidTransitionException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     private function activateCustomer($customer, $confirmationKey)
     {
@@ -514,13 +539,15 @@ private function activateCustomer($customer, $confirmationKey)
         }
 
         $customer->setConfirmation(null);
+        // No need to validate customer and customer address while activating customer
+        $this->setIgnoreValidationFlag($customer);
         $this->customerRepository->save($customer);
         $this->getEmailNotification()->newAccount($customer, 'confirmed', '', $this->storeManager->getStore()->getId());
         return $customer;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function authenticate($username, $password)
     {
@@ -555,7 +582,7 @@ public function authenticate($username, $password)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function validateResetPasswordLinkToken($customerId, $resetPasswordLinkToken)
     {
@@ -564,7 +591,7 @@ public function validateResetPasswordLinkToken($customerId, $resetPasswordLinkTo
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function initiatePasswordReset($email, $template, $websiteId = null)
     {
@@ -574,6 +601,9 @@ public function initiatePasswordReset($email, $template, $websiteId = null)
         // load customer by email
         $customer = $this->customerRepository->get($email, $websiteId);
 
+        // No need to validate customer address while saving customer reset password token
+        $this->disableAddressValidation($customer);
+
         $newPasswordToken = $this->mathRandom->getUniqueHash();
         $this->changeResetPasswordLinkToken($customer, $newPasswordToken);
 
@@ -611,10 +641,10 @@ public function initiatePasswordReset($email, $template, $websiteId = null)
      * Match a customer by their RP token.
      *
      * @param string $rpToken
+     * @return CustomerInterface
      * @throws ExpiredException
+     * @throws LocalizedException
      * @throws NoSuchEntityException
-     *
-     * @return CustomerInterface
      */
     private function matchCustomerByRpToken(string $rpToken): CustomerInterface
     {
@@ -647,7 +677,7 @@ private function matchCustomerByRpToken(string $rpToken): CustomerInterface
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function resetPassword($email, $resetToken, $newPassword)
     {
@@ -657,6 +687,11 @@ public function resetPassword($email, $resetToken, $newPassword)
         } else {
             $customer = $this->customerRepository->get($email);
         }
+
+        // No need to validate customer and customer address while saving customer reset password token
+        $this->disableAddressValidation($customer);
+        $this->setIgnoreValidationFlag($customer);
+
         //Validate Token and new password strength
         $this->validateResetPasswordToken($customer->getId(), $resetToken);
         $this->credentialsValidator->checkPasswordDifferentFromEmail(
@@ -671,7 +706,12 @@ public function resetPassword($email, $resetToken, $newPassword)
         $customerSecure->setPasswordHash($this->createPasswordHash($newPassword));
         $this->getAuthentication()->unlock($customer->getId());
         $this->destroyCustomerSessions($customer->getId());
-        $this->sessionManager->destroy();
+        if ($this->sessionManager->isSessionExists() && !headers_sent()) {
+            //delete old session and move data to the new session
+            //use this instead of $this->sessionManager->regenerateId because last one doesn't delete old session
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            session_regenerate_id(true);
+        }
         $this->customerRepository->save($customer);
 
         return true;
@@ -763,7 +803,7 @@ protected function getMinPasswordLength()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConfirmationStatus($customerId)
     {
@@ -779,9 +819,9 @@ public function getConfirmationStatus($customerId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
-    public function createAccount(CustomerInterface $customer, $password = null, $redirectUrl = '')
+    public function createAccount(CustomerInterface $customer, $password = null, $redirectUrl = '', $extensions = [])
     {
         if ($password !== null) {
             $this->checkPasswordStrength($password);
@@ -795,16 +835,21 @@ public function createAccount(CustomerInterface $customer, $password = null, $re
         } else {
             $hash = null;
         }
-        return $this->createAccountWithPasswordHash($customer, $hash, $redirectUrl);
+
+        return $this->createAccountWithPasswordHash($customer, $hash, $redirectUrl, $extensions);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function createAccountWithPasswordHash(CustomerInterface $customer, $hash, $redirectUrl = '')
-    {
+    public function createAccountWithPasswordHash(
+        CustomerInterface $customer,
+        $hash,
+        $redirectUrl = '',
+        $extensions = []
+    ) {
         // This logic allows an existing customer to be added to a different store.  No new account is created.
         // The plan is to move this logic into a new method called something like 'registerAccountWithStore'
         if ($customer->getId()) {
@@ -853,6 +898,9 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
         }
         try {
             foreach ($customerAddresses as $address) {
+                if (!$this->isAddressAllowedForWebsite($address, $customer->getStoreId())) {
+                    continue;
+                }
                 if ($address->getId()) {
                     $newAddress = clone $address;
                     $newAddress->setId(null);
@@ -871,13 +919,13 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
         $customer = $this->customerRepository->getById($customer->getId());
         $newLinkToken = $this->mathRandom->getUniqueHash();
         $this->changeResetPasswordLinkToken($customer, $newLinkToken);
-        $this->sendEmailConfirmation($customer, $redirectUrl);
+        $this->sendEmailConfirmation($customer, $redirectUrl, $extensions);
 
         return $customer;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultBillingAddress($customerId)
     {
@@ -886,7 +934,7 @@ public function getDefaultBillingAddress($customerId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultShippingAddress($customerId)
     {
@@ -899,9 +947,12 @@ public function getDefaultShippingAddress($customerId)
      *
      * @param CustomerInterface $customer
      * @param string $redirectUrl
+     * @param array $extensions
      * @return void
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
-    protected function sendEmailConfirmation(CustomerInterface $customer, $redirectUrl)
+    protected function sendEmailConfirmation(CustomerInterface $customer, $redirectUrl, $extensions = [])
     {
         try {
             $hash = $this->customerRegistry->retrieveSecureData($customer->getId())->getPasswordHash();
@@ -911,7 +962,14 @@ protected function sendEmailConfirmation(CustomerInterface $customer, $redirectU
             } elseif ($hash == '') {
                 $templateType = self::NEW_ACCOUNT_EMAIL_REGISTERED_NO_PASSWORD;
             }
-            $this->getEmailNotification()->newAccount($customer, $templateType, $redirectUrl, $customer->getStoreId());
+            $this->getEmailNotification()->newAccount(
+                $customer,
+                $templateType,
+                $redirectUrl,
+                $customer->getStoreId(),
+                null,
+                $extensions
+            );
         } catch (MailException $e) {
             // If we are not able to send a new account email, this should be ignored
             $this->logger->critical($e);
@@ -921,7 +979,7 @@ protected function sendEmailConfirmation(CustomerInterface $customer, $redirectU
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function changePassword($email, $currentPassword, $newPassword)
     {
@@ -934,7 +992,7 @@ public function changePassword($email, $currentPassword, $newPassword)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function changePasswordById($customerId, $currentPassword, $newPassword)
     {
@@ -947,14 +1005,17 @@ public function changePasswordById($customerId, $currentPassword, $newPassword)
     }
 
     /**
-     * Change customer password
+     * Change customer password.
      *
      * @param CustomerInterface $customer
      * @param string $currentPassword
      * @param string $newPassword
      * @return bool true on success
      * @throws InputException
+     * @throws InputMismatchException
      * @throws InvalidEmailOrPasswordException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      * @throws UserLockedException
      */
     private function changePasswordForCustomer($customer, $currentPassword, $newPassword)
@@ -972,6 +1033,7 @@ private function changePasswordForCustomer($customer, $currentPassword, $newPass
         $this->checkPasswordStrength($newPassword);
         $customerSecure->setPasswordHash($this->createPasswordHash($newPassword));
         $this->destroyCustomerSessions($customer->getId());
+        $this->disableAddressValidation($customer);
         $this->customerRepository->save($customer);
 
         return true;
@@ -989,6 +1051,8 @@ protected function createPasswordHash($password)
     }
 
     /**
+     * Get EAV validator
+     *
      * @return Backend
      */
     private function getEavValidator()
@@ -1000,7 +1064,7 @@ private function getEavValidator()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function validate(CustomerInterface $customer)
     {
@@ -1025,7 +1089,7 @@ public function validate(CustomerInterface $customer)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isEmailAvailable($customerEmail, $websiteId = null)
     {
@@ -1041,7 +1105,7 @@ public function isEmailAvailable($customerEmail, $websiteId = null)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function isCustomerInStore($customerWebsiteId, $storeId)
     {
@@ -1063,10 +1127,11 @@ public function isCustomerInStore($customerWebsiteId, $storeId)
      * @param int $customerId
      * @param string $resetPasswordLinkToken
      * @return bool
-     * @throws \Magento\Framework\Exception\State\InputMismatchException If token is mismatched
-     * @throws \Magento\Framework\Exception\State\ExpiredException If token is expired
-     * @throws \Magento\Framework\Exception\InputException If token or customer id is invalid
-     * @throws \Magento\Framework\Exception\NoSuchEntityException If customer doesn't exist
+     * @throws ExpiredException
+     * @throws InputException
+     * @throws InputMismatchException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     private function validateResetPasswordToken($customerId, $resetPasswordLinkToken)
     {
@@ -1156,6 +1221,8 @@ protected function sendNewAccountEmail(
      *
      * @param CustomerInterface $customer
      * @return $this
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      * @deprecated 100.1.0
      */
     protected function sendPasswordResetNotificationEmail($customer)
@@ -1169,6 +1236,7 @@ protected function sendPasswordResetNotificationEmail($customer)
      * @param CustomerInterface $customer
      * @param int|string|null $defaultStoreId
      * @return int
+     * @throws LocalizedException
      * @deprecated 100.1.0
      */
     protected function getWebsiteStoreId($customer, $defaultStoreId = null)
@@ -1182,6 +1250,8 @@ protected function getWebsiteStoreId($customer, $defaultStoreId = null)
     }
 
     /**
+     * Get email template types
+     *
      * @return array
      * @deprecated 100.1.0
      */
@@ -1215,6 +1285,7 @@ protected function getTemplateTypes()
      * @param int|null $storeId
      * @param string $email
      * @return $this
+     * @throws MailException
      * @deprecated 100.1.0
      */
     protected function sendEmailTemplate(
@@ -1313,14 +1384,15 @@ public function isResetPasswordLinkTokenExpired($rpToken, $rpTokenCreatedAt)
     }
 
     /**
-     * Change reset password link token
-     *
-     * Stores new reset password link token
+     * Set a new reset password link token.
      *
      * @param CustomerInterface $customer
      * @param string $passwordLinkToken
      * @return bool
      * @throws InputException
+     * @throws InputMismatchException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     public function changeResetPasswordLinkToken($customer, $passwordLinkToken)
     {
@@ -1338,8 +1410,10 @@ public function changeResetPasswordLinkToken($customer, $passwordLinkToken)
             $customerSecure->setRpTokenCreatedAt(
                 $this->dateTimeFactory->create()->format(DateTime::DATETIME_PHP_FORMAT)
             );
+            $this->setIgnoreValidationFlag($customer);
             $this->customerRepository->save($customer);
         }
+
         return true;
     }
 
@@ -1348,6 +1422,8 @@ public function changeResetPasswordLinkToken($customer, $passwordLinkToken)
      *
      * @param CustomerInterface $customer
      * @return $this
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      * @deprecated 100.1.0
      */
     public function sendPasswordReminderEmail($customer)
@@ -1375,6 +1451,8 @@ public function sendPasswordReminderEmail($customer)
      *
      * @param CustomerInterface $customer
      * @return $this
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      * @deprecated 100.1.0
      */
     public function sendPasswordResetConfirmationEmail($customer)
@@ -1419,6 +1497,7 @@ protected function getAddressById(CustomerInterface $customer, $addressId)
      *
      * @param CustomerInterface $customer
      * @return Data\CustomerSecure
+     * @throws NoSuchEntityException
      * @deprecated 100.1.0
      */
     protected function getFullCustomerObject($customer)
@@ -1444,6 +1523,20 @@ public function getPasswordHash($password)
         return $this->encryptor->getHash($password);
     }
 
+    /**
+     * Disable Customer Address Validation
+     *
+     * @param CustomerInterface $customer
+     * @throws NoSuchEntityException
+     */
+    private function disableAddressValidation($customer)
+    {
+        foreach ($customer->getAddresses() as $address) {
+            $addressModel = $this->addressRegistry->retrieve($address->getId());
+            $addressModel->setShouldIgnoreValidation(true);
+        }
+    }
+
     /**
      * Get email notification
      *
@@ -1463,6 +1556,7 @@ private function getEmailNotification()
 
     /**
      * Destroy all active customer sessions by customer id (current session will not be destroyed).
+     *
      * Customer sessions which should be deleted are collecting  from the "customer_visitor" table considering
      * configured session lifetime.
      *
@@ -1489,4 +1583,29 @@ private function destroyCustomerSessions($customerId)
             $this->saveHandler->destroy($sessionId);
         }
     }
+
+    /**
+     * Set ignore_validation_flag for reset password flow to skip unnecessary address and customer validation.
+     *
+     * @param Customer $customer
+     * @return void
+     */
+    private function setIgnoreValidationFlag(Customer $customer)
+    {
+        $customer->setData('ignore_validation_flag', true);
+    }
+
+    /**
+     * Check is address allowed for store
+     *
+     * @param AddressInterface $address
+     * @param int|null $storeId
+     * @return bool
+     */
+    private function isAddressAllowedForWebsite(AddressInterface $address, $storeId): bool
+    {
+        $allowedCountries = $this->allowedCountriesReader->getAllowedCountries(ScopeInterface::SCOPE_STORE, $storeId);
+
+        return in_array($address->getCountryId(), $allowedCountries);
+    }
 }
diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
index db3436c441ec2..09b3540f2b689 100644
--- a/app/code/Magento/Customer/Model/Address/AbstractAddress.php
+++ b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
@@ -119,6 +119,11 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
      */
     protected $dataObjectHelper;
 
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -136,6 +141,7 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param \Magento\Framework\Escaper|null $escaper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -154,7 +160,8 @@ public function __construct(
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Escaper $escaper = null
     ) {
         $this->_directoryData = $directoryData;
         $data = $this->_implodeArrayField($data);
@@ -166,6 +173,9 @@ public function __construct(
         $this->addressDataFactory = $addressDataFactory;
         $this->regionDataFactory = $regionDataFactory;
         $this->dataObjectHelper = $dataObjectHelper;
+        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\Escaper::class
+        );
         parent::__construct(
             $context,
             $registry,
@@ -629,7 +639,7 @@ public function validate()
                     'Invalid value of "%value" provided for the %fieldName field.',
                     [
                         'fieldName' => 'countryId',
-                        'value' => htmlspecialchars($countryId)
+                        'value' => $this->escaper->escapeHtml($countryId)
                     ]
                 );
             } else {
@@ -654,7 +664,7 @@ public function validate()
                         'Invalid value of "%value" provided for the %fieldName field.',
                         [
                             'fieldName' => 'regionId',
-                            'value' => htmlspecialchars($regionId)
+                            'value' => $this->escaper->escapeHtml($regionId)
                         ]
                     );
                 }
diff --git a/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php b/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
index fc0fa3ebc073d..40a10a1db0935 100644
--- a/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
+++ b/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
@@ -87,15 +87,20 @@ public function afterDelete()
     {
         $result = parent::afterDelete();
 
-        if ($this->getScope() == \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES) {
-            $attribute = $this->_eavConfig->getAttribute('customer_address', 'street');
-            $website = $this->_storeManager->getWebsite($this->getScopeCode());
-            $attribute->setWebsite($website);
-            $attribute->load($attribute->getId());
-            $attribute->setData('scope_multiline_count', null);
-            $attribute->save();
-        }
+        $attribute = $this->_eavConfig->getAttribute('customer_address', 'street');
+        switch ($this->getScope()) {
+            case \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES:
+                $website = $this->_storeManager->getWebsite($this->getScopeCode());
+                $attribute->setWebsite($website);
+                $attribute->load($attribute->getId());
+                $attribute->setData('scope_multiline_count', null);
+                break;
 
+            case ScopeConfigInterface::SCOPE_TYPE_DEFAULT:
+                $attribute->setData('multiline_count', 2);
+                break;
+        }
+        $attribute->save();
         return $result;
     }
 }
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Group.php b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Group.php
index e70fc30d7a528..e590e5e213acd 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Group.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Group.php
@@ -42,9 +42,9 @@ public function __construct(
     }
 
     /**
-     * @return array
+     * @inheritdoc
      */
-    public function getAllOptions()
+    public function getAllOptions($withEmpty = true, $defaultValues = false)
     {
         if (!$this->_options) {
             $groups = $this->_groupManagement->getLoggedInGroups();
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Store.php b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Store.php
index 1845ba36d46c1..e730033641da0 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Store.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Store.php
@@ -40,9 +40,9 @@ public function __construct(
     }
 
     /**
-     * @return array
+     * @inheritdoc
      */
-    public function getAllOptions()
+    public function getAllOptions($withEmpty = true, $defaultValues = false)
     {
         if (!$this->_options) {
             $collection = $this->_createStoresCollection();
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Website.php b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Website.php
index d670ed73db654..43c68f06d5f6c 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Website.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Website.php
@@ -32,9 +32,9 @@ public function __construct(
     }
 
     /**
-     * @return array
+     * @inheritdoc
      */
-    public function getAllOptions()
+    public function getAllOptions($withEmpty = true, $defaultValues = false)
     {
         if (!$this->_options) {
             $this->_options = $this->_store->getWebsiteValuesForForm();
diff --git a/app/code/Magento/Customer/Model/Customer/DataProvider.php b/app/code/Magento/Customer/Model/Customer/DataProvider.php
index ce976d3f62c74..37fa2b396b50e 100644
--- a/app/code/Magento/Customer/Model/Customer/DataProvider.php
+++ b/app/code/Magento/Customer/Model/Customer/DataProvider.php
@@ -27,6 +27,7 @@
 use Magento\Framework\View\Element\UiComponent\DataProvider\FilterPool;
 use Magento\Ui\Component\Form\Field;
 use Magento\Ui\DataProvider\EavValidationRules;
+use Magento\Ui\Component\Form\Element\Multiline;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -375,45 +376,17 @@ protected function getAttributesMeta(Type $entityType)
         return $meta;
     }
 
-    /**
-     * Check whether the specific attribute can be shown in form: customer registration, customer edit, etc...
-     *
-     * @param Attribute $customerAttribute
-     * @return bool
-     */
-    private function canShowAttributeInForm(AbstractAttribute $customerAttribute)
-    {
-        $isRegistration = $this->context->getRequestParam($this->getRequestFieldName()) === null;
-
-        if ($customerAttribute->getEntityType()->getEntityTypeCode() === 'customer') {
-            return is_array($customerAttribute->getUsedInForms()) &&
-                (
-                    (in_array('customer_account_create', $customerAttribute->getUsedInForms()) && $isRegistration) ||
-                    (in_array('customer_account_edit', $customerAttribute->getUsedInForms()) && !$isRegistration)
-                );
-        } else {
-            return is_array($customerAttribute->getUsedInForms()) &&
-                in_array('customer_address_edit', $customerAttribute->getUsedInForms());
-        }
-    }
-
     /**
      * Detect can we show attribute on specific form or not
      *
      * @param Attribute $customerAttribute
      * @return bool
      */
-    private function canShowAttribute(AbstractAttribute $customerAttribute)
+    private function canShowAttribute(AbstractAttribute $customerAttribute): bool
     {
-        $userDefined = (bool) $customerAttribute->getIsUserDefined();
-        if (!$userDefined) {
-            return $customerAttribute->getIsVisible();
-        }
-
-        $canShowOnForm = $this->canShowAttributeInForm($customerAttribute);
-
-        return ($this->allowToShowHiddenAttributes && $canShowOnForm) ||
-            (!$this->allowToShowHiddenAttributes && $canShowOnForm && $customerAttribute->getIsVisible());
+        return $this->allowToShowHiddenAttributes && (bool) $customerAttribute->getIsUserDefined()
+            ? true
+            : (bool) $customerAttribute->getIsVisible();
     }
 
     /**
@@ -596,8 +569,14 @@ protected function prepareAddressData($addressId, array &$addresses, array $cust
         ) {
             $addresses[$addressId]['default_shipping'] = $customer['default_shipping'];
         }
-        if (isset($addresses[$addressId]['street']) && !is_array($addresses[$addressId]['street'])) {
-            $addresses[$addressId]['street'] = explode("\n", $addresses[$addressId]['street']);
+
+        foreach ($this->meta['address']['children'] as $attributeName => $attributeMeta) {
+            if ($attributeMeta['arguments']['data']['config']['dataType'] === Multiline::NAME
+                && isset($addresses[$addressId][$attributeName])
+                && !\is_array($addresses[$addressId][$attributeName])
+            ) {
+                $addresses[$addressId][$attributeName] = explode("\n", $addresses[$addressId][$attributeName]);
+            }
         }
     }
 
diff --git a/app/code/Magento/Customer/Model/CustomerAuthUpdate.php b/app/code/Magento/Customer/Model/CustomerAuthUpdate.php
index 06de649524e71..bc9bffb6ffdf0 100644
--- a/app/code/Magento/Customer/Model/CustomerAuthUpdate.php
+++ b/app/code/Magento/Customer/Model/CustomerAuthUpdate.php
@@ -6,31 +6,43 @@
 
 namespace Magento\Customer\Model;
 
+use Magento\Customer\Model\ResourceModel\Customer as CustomerResourceModel;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
+
 /**
  * Customer Authentication update model.
  */
 class CustomerAuthUpdate
 {
     /**
-     * @var \Magento\Customer\Model\CustomerRegistry
+     * @var CustomerRegistry
      */
     protected $customerRegistry;
 
     /**
-     * @var \Magento\Customer\Model\ResourceModel\Customer
+     * @var CustomerResourceModel
      */
     protected $customerResourceModel;
 
     /**
-     * @param \Magento\Customer\Model\CustomerRegistry $customerRegistry
-     * @param \Magento\Customer\Model\ResourceModel\Customer $customerResourceModel
+     * @var Customer
+     */
+    private $customerModel;
+
+    /**
+     * @param CustomerRegistry $customerRegistry
+     * @param CustomerResourceModel $customerResourceModel
+     * @param Customer|null $customerModel
      */
     public function __construct(
-        \Magento\Customer\Model\CustomerRegistry $customerRegistry,
-        \Magento\Customer\Model\ResourceModel\Customer $customerResourceModel
+        CustomerRegistry $customerRegistry,
+        CustomerResourceModel $customerResourceModel,
+        Customer $customerModel = null
     ) {
         $this->customerRegistry = $customerRegistry;
         $this->customerResourceModel = $customerResourceModel;
+        $this->customerModel = $customerModel ?: ObjectManager::getInstance()->get(Customer::class);
     }
 
     /**
@@ -38,21 +50,30 @@ public function __construct(
      *
      * @param int $customerId
      * @return $this
+     * @throws NoSuchEntityException
      */
     public function saveAuth($customerId)
     {
         $customerSecure = $this->customerRegistry->retrieveSecureData($customerId);
 
+        $this->customerResourceModel->load($this->customerModel, $customerId);
+        $currentLockExpiresVal = $this->customerModel->getData('lock_expires');
+        $newLockExpiresVal = $customerSecure->getData('lock_expires');
+
         $this->customerResourceModel->getConnection()->update(
             $this->customerResourceModel->getTable('customer_entity'),
             [
                 'failures_num' => $customerSecure->getData('failures_num'),
                 'first_failure' => $customerSecure->getData('first_failure'),
-                'lock_expires' => $customerSecure->getData('lock_expires'),
+                'lock_expires' => $newLockExpiresVal,
             ],
             $this->customerResourceModel->getConnection()->quoteInto('entity_id = ?', $customerId)
         );
 
+        if ($currentLockExpiresVal !== $newLockExpiresVal) {
+            $this->customerModel->reindex();
+        }
+
         return $this;
     }
 }
diff --git a/app/code/Magento/Customer/Model/EmailNotification.php b/app/code/Magento/Customer/Model/EmailNotification.php
index 740dc33b72710..679c108ab1d30 100644
--- a/app/code/Magento/Customer/Model/EmailNotification.php
+++ b/app/code/Magento/Customer/Model/EmailNotification.php
@@ -17,6 +17,8 @@
 use Magento\Framework\Exception\LocalizedException;
 
 /**
+ * Class for notification customer.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class EmailNotification implements EmailNotificationInterface
@@ -63,6 +65,8 @@ class EmailNotification implements EmailNotificationInterface
         self::NEW_ACCOUNT_EMAIL_CONFIRMATION => self::XML_PATH_CONFIRM_EMAIL_TEMPLATE,
     ];
 
+    const CUSTOMER_CONFIRM_URL = 'customer/account/confirm/';
+
     /**#@-*/
 
     /**#@-*/
@@ -362,6 +366,7 @@ public function passwordResetConfirmation(CustomerInterface $customer)
      * @param string $backUrl
      * @param string $storeId
      * @param string $sendemailStoreId
+     * @param array $extensions
      * @return void
      * @throws LocalizedException
      */
@@ -370,7 +375,8 @@ public function newAccount(
         $type = self::NEW_ACCOUNT_EMAIL_REGISTERED,
         $backUrl = '',
         $storeId = 0,
-        $sendemailStoreId = null
+        $sendemailStoreId = null,
+        $extensions = []
     ) {
         $types = self::TEMPLATE_TYPES;
 
@@ -386,11 +392,26 @@ public function newAccount(
 
         $customerEmailData = $this->getFullCustomerObject($customer);
 
+        $templateVars = [
+            'customer' => $customerEmailData,
+            'back_url' => $backUrl,
+            'store' => $store,
+        ];
+        if ($type == self::NEW_ACCOUNT_EMAIL_CONFIRMATION) {
+            if (empty($extensions)) {
+                $templateVars['url'] = self::CUSTOMER_CONFIRM_URL;
+                $templateVars['extensions'] = $extensions;
+            } else {
+                $templateVars['url'] = $extensions['url'];
+                $templateVars['extensions'] = $extensions['extension_info'];
+            }
+        }
+
         $this->sendEmailTemplate(
             $customer,
             $types[$type],
             self::XML_PATH_REGISTER_EMAIL_IDENTITY,
-            ['customer' => $customerEmailData, 'back_url' => $backUrl, 'store' => $store],
+            $templateVars,
             $storeId
         );
     }
diff --git a/app/code/Magento/Customer/Model/Metadata/AttributeMetadataCache.php b/app/code/Magento/Customer/Model/Metadata/AttributeMetadataCache.php
index 5a46fdb9defc4..71f0b393e4a5d 100644
--- a/app/code/Magento/Customer/Model/Metadata/AttributeMetadataCache.php
+++ b/app/code/Magento/Customer/Model/Metadata/AttributeMetadataCache.php
@@ -12,6 +12,7 @@
 use Magento\Framework\App\Cache\StateInterface;
 use Magento\Framework\App\CacheInterface;
 use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Cache for attribute metadata
@@ -53,6 +54,11 @@ class AttributeMetadataCache
      */
     private $serializer;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * Constructor
      *
@@ -60,17 +66,21 @@ class AttributeMetadataCache
      * @param StateInterface $state
      * @param SerializerInterface $serializer
      * @param AttributeMetadataHydrator $attributeMetadataHydrator
+     * @param StoreManagerInterface|null $storeManager
      */
     public function __construct(
         CacheInterface $cache,
         StateInterface $state,
         SerializerInterface $serializer,
-        AttributeMetadataHydrator $attributeMetadataHydrator
+        AttributeMetadataHydrator $attributeMetadataHydrator,
+        StoreManagerInterface $storeManager = null
     ) {
         $this->cache = $cache;
         $this->state = $state;
         $this->serializer = $serializer;
         $this->attributeMetadataHydrator = $attributeMetadataHydrator;
+        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(StoreManagerInterface::class);
     }
 
     /**
@@ -82,11 +92,12 @@ public function __construct(
      */
     public function load($entityType, $suffix = '')
     {
-        if (isset($this->attributes[$entityType . $suffix])) {
-            return $this->attributes[$entityType . $suffix];
+        $storeId = $this->storeManager->getStore()->getId();
+        if (isset($this->attributes[$entityType . $suffix . $storeId])) {
+            return $this->attributes[$entityType . $suffix . $storeId];
         }
         if ($this->isEnabled()) {
-            $cacheKey = self::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
+            $cacheKey = self::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
             $serializedData = $this->cache->load($cacheKey);
             if ($serializedData) {
                 $attributesData = $this->serializer->unserialize($serializedData);
@@ -94,7 +105,7 @@ public function load($entityType, $suffix = '')
                 foreach ($attributesData as $key => $attributeData) {
                     $attributes[$key] = $this->attributeMetadataHydrator->hydrate($attributeData);
                 }
-                $this->attributes[$entityType . $suffix] = $attributes;
+                $this->attributes[$entityType . $suffix . $storeId] = $attributes;
                 return $attributes;
             }
         }
@@ -111,9 +122,10 @@ public function load($entityType, $suffix = '')
      */
     public function save($entityType, array $attributes, $suffix = '')
     {
-        $this->attributes[$entityType . $suffix] = $attributes;
+        $storeId = $this->storeManager->getStore()->getId();
+        $this->attributes[$entityType . $suffix . $storeId] = $attributes;
         if ($this->isEnabled()) {
-            $cacheKey = self::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
+            $cacheKey = self::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
             $attributesData = [];
             foreach ($attributes as $key => $attribute) {
                 $attributesData[$key] = $this->attributeMetadataHydrator->extract($attribute);
diff --git a/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php b/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php
index 7ed806e657e82..a9753fc810a99 100644
--- a/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php
+++ b/app/code/Magento/Customer/Model/Metadata/CustomerMetadata.php
@@ -33,16 +33,26 @@ class CustomerMetadata implements CustomerMetadataInterface
      */
     private $attributeMetadataDataProvider;
 
+    /**
+     * List of system attributes which should be available to the clients.
+     *
+     * @var string[]
+     */
+    private $systemAttributes;
+
     /**
      * @param AttributeMetadataConverter $attributeMetadataConverter
      * @param AttributeMetadataDataProvider $attributeMetadataDataProvider
+     * @param string[] $systemAttributes
      */
     public function __construct(
         AttributeMetadataConverter $attributeMetadataConverter,
-        AttributeMetadataDataProvider $attributeMetadataDataProvider
+        AttributeMetadataDataProvider $attributeMetadataDataProvider,
+        array $systemAttributes = []
     ) {
         $this->attributeMetadataConverter = $attributeMetadataConverter;
         $this->attributeMetadataDataProvider = $attributeMetadataDataProvider;
+        $this->systemAttributes = $systemAttributes;
     }
 
     /**
@@ -116,7 +126,7 @@ public function getAllAttributesMetadata()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomAttributesMetadata($dataObjectClassName = self::DATA_INTERFACE_NAME)
     {
@@ -134,9 +144,10 @@ public function getCustomAttributesMetadata($dataObjectClassName = self::DATA_IN
             $isDataObjectMethod = isset($this->customerDataObjectMethods['get' . $camelCaseKey])
                 || isset($this->customerDataObjectMethods['is' . $camelCaseKey]);
 
-            /** Even though disable_auto_group_change is system attribute, it should be available to the clients */
             if (!$isDataObjectMethod
-                && (!$attributeMetadata->isSystem() || $attributeCode == 'disable_auto_group_change')
+                && (!$attributeMetadata->isSystem()
+                    || in_array($attributeCode, $this->systemAttributes)
+                )
             ) {
                 $customAttributes[] = $attributeMetadata;
             }
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php b/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
index f28cce0ea2ae1..0e4fc68503122 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Form Element Abstract Data Model
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -14,6 +12,8 @@
 use Magento\Framework\Validator\EmailAddress;
 
 /**
+ * Form Element Abstract Data Model.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 abstract class AbstractData
@@ -138,7 +138,8 @@ public function setRequestScope($scope)
     }
 
     /**
-     * Set scope visibility
+     * Set scope visibility.
+     *
      * Search value only in scope or search value in scope and global
      *
      * @param boolean $flag
@@ -283,9 +284,13 @@ protected function _validateInputRule($value)
         );
 
         if (!is_null($inputValidation)) {
+            $allowWhiteSpace = false;
             switch ($inputValidation) {
+                case 'alphanum-with-spaces':
+                    $allowWhiteSpace = true;
+                    // continue to alphanumeric validation
                 case 'alphanumeric':
-                    $validator = new \Zend_Validate_Alnum(true);
+                    $validator = new \Zend_Validate_Alnum($allowWhiteSpace);
                     $validator->setMessage(__('"%1" invalid type entered.', $label), \Zend_Validate_Alnum::INVALID);
                     $validator->setMessage(
                         __('"%1" contains non-alphabetic or non-numeric characters.', $label),
diff --git a/app/code/Magento/Customer/Model/Options.php b/app/code/Magento/Customer/Model/Options.php
index 7747e309d82a6..f8761b4888a32 100644
--- a/app/code/Magento/Customer/Model/Options.php
+++ b/app/code/Magento/Customer/Model/Options.php
@@ -8,7 +8,11 @@
 use Magento\Config\Model\Config\Source\Nooptreq as NooptreqSource;
 use Magento\Customer\Helper\Address as AddressHelper;
 use Magento\Framework\Escaper;
+use Magento\Store\Api\Data\StoreInterface;
 
+/**
+ * Customer Options.
+ */
 class Options
 {
     /**
@@ -38,7 +42,7 @@ public function __construct(
     /**
      * Retrieve name prefix dropdown options
      *
-     * @param null $store
+     * @param null|string|bool|int|StoreInterface $store
      * @return array|bool
      */
     public function getNamePrefixOptions($store = null)
@@ -52,7 +56,7 @@ public function getNamePrefixOptions($store = null)
     /**
      * Retrieve name suffix dropdown options
      *
-     * @param null $store
+     * @param null|string|bool|int|StoreInterface $store
      * @return array|bool
      */
     public function getNameSuffixOptions($store = null)
@@ -64,7 +68,9 @@ public function getNameSuffixOptions($store = null)
     }
 
     /**
-     * @param $options
+     * Unserialize and clear name prefix or suffix options.
+     *
+     * @param string $options
      * @param bool $isOptional
      * @return array|bool
      *
@@ -91,7 +97,7 @@ private function prepareNamePrefixSuffixOptions($options, $isOptional = false)
             return false;
         }
         $result = [];
-        $options = explode(';', $options);
+        $options = array_filter(explode(';', $options));
         foreach ($options as $value) {
             $value = $this->escaper->escapeHtml(trim($value));
             $result[$value] = $value;
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address.php b/app/code/Magento/Customer/Model/ResourceModel/Address.php
index a52c372310843..8b5c9a08931b5 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address.php
@@ -13,7 +13,8 @@
 use Magento\Framework\App\ObjectManager;
 
 /**
- * Class Address
+ * Customer Address resource model.
+ *
  * @package Magento\Customer\Model\ResourceModel
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -31,8 +32,8 @@ class Address extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
 
     /**
      * @param \Magento\Eav\Model\Entity\Context $context
-     * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot,
-     * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite,
+     * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot
+     * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite
      * @param \Magento\Framework\Validator\Factory $validatorFactory
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param array $data
@@ -90,7 +91,7 @@ protected function _beforeSave(\Magento\Framework\DataObject $address)
     }
 
     /**
-     * Validate customer address entity
+     * Validate customer address entity.
      *
      * @param \Magento\Framework\DataObject $address
      * @return void
@@ -98,6 +99,9 @@ protected function _beforeSave(\Magento\Framework\DataObject $address)
      */
     protected function _validate($address)
     {
+        if ($address->getDataByKey('should_ignore_validation')) {
+            return;
+        };
         $validator = $this->_validatorFactory->createValidator('customer_address', 'save');
 
         if (!$validator->isValid($address)) {
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php
index cf7105c1519af..37b3b1af0a42d 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php
@@ -45,11 +45,9 @@ public function __construct(
     }
 
     /**
-     * Retrieve all options
-     *
-     * @return array
+     * @inheritdoc
      */
-    public function getAllOptions()
+    public function getAllOptions($withEmpty = true, $defaultValues = false)
     {
         if (!$this->_options) {
             $this->_options = $this->_createCountriesCollection()->loadByStore(
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php
index 3f45993a3e143..b25d11e424660 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php
@@ -70,8 +70,9 @@ public function __construct(
      * Retrieve all options
      *
      * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function getAllOptions()
+    public function getAllOptions($withEmpty = true, $defaultValues = false)
     {
         if (!$this->options) {
             $allowedCountries = [];
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Region.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Region.php
index 8e45e4a91ecd4..2cafdab077d67 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Region.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Region.php
@@ -33,11 +33,9 @@ public function __construct(
     }
 
     /**
-     * Retrieve all region options
-     *
-     * @return array
+     * @inheritdoc
      */
-    public function getAllOptions()
+    public function getAllOptions($withEmpty = true, $defaultValues = false)
     {
         if (!$this->_options) {
             $this->_options = $this->_createRegionsCollection()->load()->toOptionArray();
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Customer.php b/app/code/Magento/Customer/Model/ResourceModel/Customer.php
index 7e5f9d51549ec..daacb2655f588 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Customer.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Customer.php
@@ -11,7 +11,7 @@
 use Magento\Framework\Exception\AlreadyExistsException;
 
 /**
- * Customer entity resource model
+ * Customer entity resource model.
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -92,7 +92,7 @@ protected function _getDefaultAttributes()
     }
 
     /**
-     * Check customer scope, email and confirmation key before saving
+     * Check customer scope, email and confirmation key before saving.
      *
      * @param \Magento\Framework\DataObject $customer
      * @return $this
@@ -150,7 +150,9 @@ protected function _beforeSave(\Magento\Framework\DataObject $customer)
             $customer->setConfirmation(null);
         }
 
-        $this->_validate($customer);
+        if (!$customer->getData('ignore_validation_flag')) {
+            $this->_validate($customer);
+        }
 
         return $this;
     }
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Customer/Relation.php b/app/code/Magento/Customer/Model/ResourceModel/Customer/Relation.php
index e55c5d443c9d1..d55a5c0aea2be 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Customer/Relation.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Customer/Relation.php
@@ -7,12 +7,12 @@
 namespace Magento\Customer\Model\ResourceModel\Customer;
 
 /**
- * Class Relation
+ * Class to process object relations.
  */
 class Relation implements \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationInterface
 {
     /**
-     * Save relations for Customer
+     * Save relations for Customer.
      *
      * @param \Magento\Framework\Model\AbstractModel $customer
      * @return void
@@ -23,41 +23,43 @@ public function processRelation(\Magento\Framework\Model\AbstractModel $customer
         $defaultBillingId = $customer->getData('default_billing');
         $defaultShippingId = $customer->getData('default_shipping');
 
-        /** @var \Magento\Customer\Model\Address $address */
-        foreach ($customer->getAddresses() as $address) {
-            if ($address->getData('_deleted')) {
-                if ($address->getId() == $defaultBillingId) {
-                    $customer->setData('default_billing', null);
-                }
+        if (!$customer->getData('ignore_validation_flag')) {
+            /** @var \Magento\Customer\Model\Address $address */
+            foreach ($customer->getAddresses() as $address) {
+                if ($address->getData('_deleted')) {
+                    if ($address->getId() == $defaultBillingId) {
+                        $customer->setData('default_billing', null);
+                    }
 
-                if ($address->getId() == $defaultShippingId) {
-                    $customer->setData('default_shipping', null);
-                }
+                    if ($address->getId() == $defaultShippingId) {
+                        $customer->setData('default_shipping', null);
+                    }
 
-                $removedAddressId = $address->getId();
-                $address->delete();
+                    $removedAddressId = $address->getId();
+                    $address->delete();
 
-                // Remove deleted address from customer address collection
-                $customer->getAddressesCollection()->removeItemByKey($removedAddressId);
-            } else {
-                $address->setParentId(
-                    $customer->getId()
-                )->setStoreId(
-                    $customer->getStoreId()
-                )->setIsCustomerSaveTransaction(
-                    true
-                )->save();
+                    // Remove deleted address from customer address collection
+                    $customer->getAddressesCollection()->removeItemByKey($removedAddressId);
+                } else {
+                    $address->setParentId(
+                        $customer->getId()
+                    )->setStoreId(
+                        $customer->getStoreId()
+                    )->setIsCustomerSaveTransaction(
+                        true
+                    )->save();
 
-                if (($address->getIsPrimaryBilling() ||
-                        $address->getIsDefaultBilling()) && $address->getId() != $defaultBillingId
-                ) {
-                    $customer->setData('default_billing', $address->getId());
-                }
+                    if (($address->getIsPrimaryBilling() ||
+                            $address->getIsDefaultBilling()) && $address->getId() != $defaultBillingId
+                    ) {
+                        $customer->setData('default_billing', $address->getId());
+                    }
 
-                if (($address->getIsPrimaryShipping() ||
-                        $address->getIsDefaultShipping()) && $address->getId() != $defaultShippingId
-                ) {
-                    $customer->setData('default_shipping', $address->getId());
+                    if (($address->getIsPrimaryShipping() ||
+                            $address->getIsDefaultShipping()) && $address->getId() != $defaultShippingId
+                    ) {
+                        $customer->setData('default_shipping', $address->getId());
+                    }
                 }
             }
         }
diff --git a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
index 9e745769e2c36..cda132d4b4ddc 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
 use Magento\Customer\Model\CustomerFactory;
 use Magento\Customer\Model\CustomerRegistry;
+use \Magento\Customer\Model\Customer as CustomerModel;
 use Magento\Customer\Model\Data\CustomerSecureFactory;
 use Magento\Customer\Model\Customer\NotificationStorage;
 use Magento\Customer\Model\Delegation\Data\NewOperation;
@@ -170,7 +171,8 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -212,7 +214,9 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
 
         $storeId = $customerModel->getStoreId();
         if ($storeId === null) {
-            $customerModel->setStoreId($this->storeManager->getStore()->getId());
+            $customerModel->setStoreId(
+                $prevCustomerData ? $prevCustomerData->getStoreId() : $this->storeManager->getStore()->getId()
+            );
         }
 
         $this->populateCustomerWithSecureData($customerModel, $passwordHash);
@@ -240,7 +244,7 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
                 $prevCustomerDataArr['default_shipping']
             );
         }
-
+        $this->setIgnoreValidationFlag($customerArr, $customerModel);
         $customerModel->save();
         $this->customerRegistry->push($customerModel);
         $customerId = $customerModel->getId();
@@ -253,7 +257,7 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
                 $delegatedNewOperation->getCustomer()->getAddresses()
             );
         }
-        if ($customer->getAddresses() !== null) {
+        if ($customer->getAddresses() !== null && !$customerModel->getData('ignore_validation_flag')) {
             if ($customer->getId()) {
                 $existingAddresses = $this->getById($customer->getId())->getAddresses();
                 $getIdFunc = function ($address) {
@@ -365,7 +369,7 @@ public function getList(SearchCriteriaInterface $searchCriteria)
             ->joinAttribute('billing_telephone', 'customer_address/telephone', 'default_billing', null, 'left')
             ->joinAttribute('billing_region', 'customer_address/region', 'default_billing', null, 'left')
             ->joinAttribute('billing_country_id', 'customer_address/country_id', 'default_billing', null, 'left')
-            ->joinAttribute('company', 'customer_address/company', 'default_billing', null, 'left');
+            ->joinAttribute('billing_company', 'customer_address/company', 'default_billing', null, 'left');
 
         $this->collectionProcessor->process($searchCriteria, $collection);
 
@@ -420,4 +424,18 @@ protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collecti
             $collection->addFieldToFilter($fields);
         }
     }
+
+    /**
+     * Set ignore_validation_flag to skip model validation.
+     *
+     * @param array $customerArray
+     * @param CustomerModel $customerModel
+     * @return void
+     */
+    private function setIgnoreValidationFlag(array $customerArray, CustomerModel $customerModel)
+    {
+        if (isset($customerArray['ignore_validation_flag'])) {
+            $customerModel->setData('ignore_validation_flag', true);
+        }
+    }
 }
diff --git a/app/code/Magento/Customer/Model/Vat.php b/app/code/Magento/Customer/Model/Vat.php
index f608a6cf4c11c..123a9eef4b75a 100644
--- a/app/code/Magento/Customer/Model/Vat.php
+++ b/app/code/Magento/Customer/Model/Vat.php
@@ -179,18 +179,21 @@ public function checkVatNumber($countryCode, $vatNumber, $requesterCountryCode =
             return $gatewayResponse;
         }
 
+        $countryCodeForVatNumber = $this->getCountryCodeForVatNumber($countryCode);
+        $requesterCountryCodeForVatNumber = $this->getCountryCodeForVatNumber($requesterCountryCode);
+
         try {
             $soapClient = $this->createVatNumberValidationSoapClient();
 
             $requestParams = [];
-            $requestParams['countryCode'] = $countryCode;
+            $requestParams['countryCode'] = $countryCodeForVatNumber;
             $vatNumberSanitized = $this->isCountryInEU($countryCode)
-                ? str_replace([' ', '-', $countryCode], ['', '', ''], $vatNumber)
+                ? str_replace([' ', '-', $countryCodeForVatNumber], ['', '', ''], $vatNumber)
                 : str_replace([' ', '-'], ['', ''], $vatNumber);
             $requestParams['vatNumber'] = $vatNumberSanitized;
-            $requestParams['requesterCountryCode'] = $requesterCountryCode;
+            $requestParams['requesterCountryCode'] = $requesterCountryCodeForVatNumber;
             $reqVatNumSanitized = $this->isCountryInEU($requesterCountryCode)
-                ? str_replace([' ', '-', $requesterCountryCode], ['', '', ''], $requesterVatNumber)
+                ? str_replace([' ', '-', $requesterCountryCodeForVatNumber], ['', '', ''], $requesterVatNumber)
                 : str_replace([' ', '-'], ['', ''], $requesterVatNumber);
             $requestParams['requesterVatNumber'] = $reqVatNumSanitized;
             // Send request to service
@@ -301,4 +304,22 @@ public function isCountryInEU($countryCode, $storeId = null)
         );
         return in_array($countryCode, $euCountries);
     }
+
+    /**
+     * Returns the country code to use in the VAT number which is not always the same as the normal country code
+     *
+     * @param string $countryCode
+     * @return string
+     */
+    private function getCountryCodeForVatNumber(string $countryCode): string
+    {
+        // Greece uses a different code for VAT numbers then its country code
+        // See: http://ec.europa.eu/taxation_customs/vies/faq.html#item_11
+        // And https://en.wikipedia.org/wiki/VAT_identification_number:
+        // "The full identifier starts with an ISO 3166-1 alpha-2 (2 letters) country code
+        // (except for Greece, which uses the ISO 639-1 language code EL for the Greek language,
+        // instead of its ISO 3166-1 alpha-2 country code GR)"
+
+        return $countryCode === 'GR' ? 'EL' : $countryCode;
+    }
 }
diff --git a/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php b/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php
index eb7e81009c92c..831506af17cf6 100644
--- a/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php
+++ b/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php
@@ -6,11 +6,15 @@
 
 namespace Magento\Customer\Observer;
 
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\CustomerRegistry;
 
+/**
+ * Observer to execute upgrading customer password hash when customer has logged in.
+ */
 class UpgradeCustomerPasswordObserver implements ObserverInterface
 {
     /**
@@ -46,7 +50,7 @@ public function __construct(
     }
 
     /**
-     * Upgrade customer password hash when customer has logged in
+     * Upgrade customer password hash when customer has logged in.
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
@@ -61,7 +65,20 @@ public function execute(\Magento\Framework\Event\Observer $observer)
 
         if (!$this->encryptor->validateHashVersion($customerSecure->getPasswordHash(), true)) {
             $customerSecure->setPasswordHash($this->encryptor->getHash($password, true));
+            // No need to validate customer and customer address while upgrading customer password
+            $this->setIgnoreValidationFlag($customer);
             $this->customerRepository->save($customer);
         }
     }
+
+    /**
+     * Set ignore_validation_flag to skip unnecessary address and customer validation.
+     *
+     * @param CustomerInterface $customer
+     * @return void
+     */
+    private function setIgnoreValidationFlag(CustomerInterface $customer)
+    {
+        $customer->setData('ignore_validation_flag', true);
+    }
 }
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAddCustomerAddressActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAddCustomerAddressActionGroup.xml
new file mode 100644
index 0000000000000..1ffc258e78a43
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAddCustomerAddressActionGroup.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="AdminAddCustomerAddressWithRegionTypeSelectActionGroup" >
+        <arguments>
+            <argument name="customerAddress" defaultValue="CustomerAddressSimple"/>
+        </arguments>
+        <click selector="{{AdminCustomerAccountAddressSection.addresses}}" stepKey="proceedToAddresses"/>
+        <click selector="{{AdminCustomerAccountAddressSection.addNewAddress}}" stepKey="addNewAddresses"/>
+        <fillField userInput="{{customerAddress.street[0]}}" selector="{{AdminCustomerAccountNewAddressSection.street}}" stepKey="fillStreetAddress"/>
+        <fillField userInput="{{customerAddress.city}}" selector="{{AdminCustomerAccountNewAddressSection.city}}" stepKey="fillCity"/>
+        <selectOption userInput="{{customerAddress.country_id}}" selector="{{AdminCustomerAccountNewAddressSection.country}}" stepKey="selectCountry"/>
+        <selectOption userInput="{{customerAddress.state}}" selector="{{AdminCustomerAccountNewAddressSection.regionId}}" stepKey="selectState"/>
+        <fillField userInput="{{customerAddress.postcode}}" selector="{{AdminCustomerAccountNewAddressSection.zip}}" stepKey="fillZipCode"/>
+        <fillField userInput="{{customerAddress.telephone}}" selector="{{AdminCustomerAccountNewAddressSection.phone}}" stepKey="fillPhone"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveCustomer"/>
+        <see userInput="You saved the customer." selector="{{AdminMessagesSection.success}}" stepKey="customerIsSaved"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerInCustomersGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerInCustomersGridActionGroup.xml
new file mode 100644
index 0000000000000..d7529b3bdd58e
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerInCustomersGridActionGroup.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">
+    <!--Assert customer info in customers grid row -->
+    <actionGroup name="AdminAssertCustomerInCustomersGrid">
+        <arguments>
+            <argument name="text" type="string"/>
+            <argument name="row" type="string"/>
+        </arguments>
+        <see selector="{{AdminCustomerGridSection.gridRow(row)}}" userInput="{{text}}"  stepKey="seeCustomerInGrid"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
new file mode 100644
index 0000000000000..8b908fa1456a9
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateCustomerWithWebsiteAndStoreViewActionGroup">
+        <arguments>
+            <argument name="customer"/>
+            <argument name="address"/>
+            <argument name="websiteName" type="string"/>
+            <argument name="storeViewName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomersPage"/>
+        <click selector="{{AdminCustomerGridMainActionsSection.addNewCustomer}}" stepKey="addNewCustomer"/>
+        <selectOption selector="{{AdminCustomerAccountInformationSection.associateToWebsite}}" userInput="{{websiteName}}" stepKey="selectWebSite"/>
+        <fillField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{customer.firstname}}" stepKey="fillFirstName"/>
+        <fillField selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{customer.lastname}}" stepKey="fillLastName"/>
+        <fillField selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{customer.email}}" stepKey="fillEmail"/>
+        <selectOption selector="{{AdminCustomerAccountInformationSection.storeView}}" userInput="{{storeViewName}}" stepKey="selectStoreView"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfThePage"/>
+        <click selector="{{AdminCustomerAccountInformationSection.addressesButton}}" stepKey="goToAddresses"/>
+        <waitForPageLoad stepKey="waitForAddresses"/>
+        <click selector="{{AdminCustomerEditAddressesSection.addNewAddress}}" stepKey="clickOnAddNewAddress"/>
+        <waitForPageLoad stepKey="waitForAddressFields"/>
+        <click selector="{{AdminCustomerEditAddressesSection.defaultBillingAddress}}" stepKey="tickBillingAddress"/>
+        <click selector="{{AdminCustomerEditAddressesSection.defaultShippingAddress}}" stepKey="tickShippingAddress"/>
+        <fillField selector="{{AdminCustomerEditAddressesSection.firstName}}" userInput="{{address.firstname}}" stepKey="fillFirstNameForAddress"/>
+        <fillField selector="{{AdminCustomerEditAddressesSection.lastName}}" userInput="{{address.lastname}}" stepKey="fillLastNameForAddress"/>
+        <fillField selector="{{AdminCustomerEditAddressesSection.streetAddress}}" userInput="{{address.street[0]}}" stepKey="fillStreetAddress"/>
+        <fillField selector="{{AdminCustomerEditAddressesSection.city}}" userInput="{{address.city}}" stepKey="fillCity"/>
+        <selectOption selector="{{AdminCustomerEditAddressesSection.country}}" userInput="{{address.country}}" stepKey="selectCountry"/>
+        <selectOption selector="{{AdminCustomerEditAddressesSection.state}}" userInput="{{address.state}}" stepKey="selectState"/>
+        <fillField selector="{{AdminCustomerEditAddressesSection.zip}}" userInput="{{address.postcode}}" stepKey="fillZip"/>
+        <fillField selector="{{AdminCustomerEditAddressesSection.phoneNumber}}" userInput="{{address.telephone}}" stepKey="fillPhoneNumber"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="save"/>
+        <see userInput="You saved the customer." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerActionGroup.xml
new file mode 100644
index 0000000000000..b9bac35b503b3
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerActionGroup.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="AdminSaveCustomerForm">
+        <scrollToTopOfPage stepKey="scrollToPageTop"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveButton"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the customer." stepKey="seeSaveMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerActionGroup.xml
new file mode 100644
index 0000000000000..d0d7f839fd957
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerActionGroup.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="AdminDeleteCustomerActionGroup">
+        <arguments>
+            <argument name="customerEmail"/>
+        </arguments>
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomersPage"/>
+        <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
+        <conditionalClick selector="{{AdminCustomerFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerFiltersSection.clearAll}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminCustomerGridMainActionsSection.customerCheckbox(customerEmail)}}" stepKey="chooseCustomer"/>
+        <click selector="{{AdminCustomerGridMainActionsSection.actions}}" stepKey="openActions"/>
+        <waitForPageLoad stepKey="waitActions"/>
+        <click selector="{{AdminCustomerGridMainActionsSection.delete}}" stepKey="deleteCustomer"/>
+        <waitForPageLoad stepKey="waitForConfirmationAlert"/>
+        <click selector="{{AdminCustomerGridMainActionsSection.ok}}" stepKey="acceptDeletion"/>
+        <waitForPageLoad stepKey="waitForDelete"/>
+        <see userInput="were deleted." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/CustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/CustomerActionGroup.xml
index 6a253a6053076..031e1c679933e 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/CustomerActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/CustomerActionGroup.xml
@@ -7,13 +7,12 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="CustomerLoginOnStorefront">
         <arguments>
             <argument name="customer" defaultValue="customer"/>
         </arguments>
         <amOnPage stepKey="loginPage" url="customer/account/login/"/>
-        <waitForPageLoad stepKey="pageLoadBeforeLogin"/>
         <fillField stepKey="fillEmail" userInput="{{customer.email}}" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
         <fillField stepKey="fillPassword" userInput="{{customer.password}}" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
         <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
@@ -21,6 +20,5 @@
 
     <actionGroup name="CustomerLogoutStorefrontActionGroup">
         <amOnPage url="customer/account/logout/" stepKey="storefrontSignOut"/>
-        <waitForPageLoad time="30" stepKey="waitForLogOut"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml
new file mode 100644
index 0000000000000..a77f17ed4382c
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.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="LoginToStorefrontActionGroup">
+        <arguments>
+            <argument name="Customer"/>
+        </arguments>
+        <amOnPage url="{{StorefrontCustomerSignInPage.url}}" stepKey="amOnSignInPage"/>
+        <waitForPageLoad stepKey="waitPageFullyLoaded"/>
+        <waitForElementVisible selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="waitFormAppears"/>
+        <fillField userInput="{{Customer.email}}" selector="{{StorefrontCustomerSignInFormSection.emailField}}" stepKey="fillEmail"/>
+        <fillField userInput="{{Customer.password}}" selector="{{StorefrontCustomerSignInFormSection.passwordField}}" stepKey="fillPassword"/>
+        <click selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}" stepKey="clickSignInAccountButton"/>
+        <waitForPageLoad stepKey="waitForCustomerLoggedIn" />
+    </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 3d6e0fb54b054..3b7aab22f749e 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
@@ -6,18 +6,17 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="OpenEditCustomerFromAdminActionGroup">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="OpenEditCustomerFromAdminActionGroup" extends="clearFiltersAdminDataGrid">
         <arguments>
-            <argument name="customer"/>
+            <argument name="customer" defaultValue="CustomerEntityOne"/>
         </arguments>
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
-        <waitForPageLoad stepKey="waitForPageLoad1" />
+        <amOnPage url="{{AdminCustomerPage.url}}" before="waitForPageLoad" stepKey="navigateToCustomers"/>
         <click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="openFilter"/>
         <fillField userInput="{{customer.email}}" selector="{{AdminCustomerFiltersSection.emailInput}}" stepKey="filterEmail"/>
         <click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="applyFilter"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
         <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEdit"/>
-        <waitForPageLoad stepKey="waitForPageLoad2" />
+        <waitForPageLoad stepKey="waitForPageLoad" />
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/RemoveCustomerFromAdminActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/RemoveCustomerFromAdminActionGroup.xml
index a53968a920806..f4d73157eb0b3 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/RemoveCustomerFromAdminActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/RemoveCustomerFromAdminActionGroup.xml
@@ -6,14 +6,13 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!--Delete a customer by Email by filtering grid and using delete action-->
     <actionGroup name="RemoveCustomerFromAdminActionGroup">
         <arguments>
-            <argument name="customer"/>
+            <argument name="customer" defaultValue="CustomerEntityOne"/>
         </arguments>
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
-        <waitForPageLoad stepKey="waitForPageLoad1" />
         <conditionalClick selector="{{AdminCustomerFiltersSection.clearFilters}}" dependentSelector="{{AdminCustomerFiltersSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
         <click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="openFilter"/>
         <fillField userInput="{{customer.email}}" selector="{{AdminCustomerFiltersSection.emailInput}}" stepKey="filterEmail"/>
@@ -28,6 +27,6 @@
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmProductDelete"/>
         <see selector="{{AdminCustomerMessagesSection.successMessage}}" userInput="A total of 1 record(s) were deleted." stepKey="seeSuccessMessage"/>
         <conditionalClick selector="{{AdminCustomerFiltersSection.clearFilters}}" dependentSelector="{{AdminCustomerFiltersSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
index a8ee604edee0a..d86591b799a33 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
@@ -9,10 +9,9 @@
               xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="SignUpNewUserFromStorefrontActionGroup">
         <arguments>
-            <argument name="Customer"/>
+            <argument name="Customer" defaultValue="CustomerEntityOne"/>
         </arguments>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
-        <waitForPageLoad stepKey="waitForStorefrontPage"/>
         <click selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}" stepKey="clickOnCreateAccountLink"/>
         <fillField userInput="{{Customer.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}" stepKey="fillFirstName"/>
         <fillField userInput="{{Customer.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}" stepKey="fillLastName"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertCustomerWelcomeMessageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertCustomerWelcomeMessageActionGroup.xml
new file mode 100644
index 0000000000000..01f80f4c17d2c
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertCustomerWelcomeMessageActionGroup.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="StorefrontAssertCustomerWelcomeMessageActionGroup">
+        <arguments>
+            <argument name="customerFullName" type="string" />
+        </arguments>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" userInput="Welcome, {{customerFullName}}!" stepKey="verifyMessage" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertMessageCustomerCreateAccountActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertMessageCustomerCreateAccountActionGroup.xml
new file mode 100644
index 0000000000000..37a9a0ec23e03
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertMessageCustomerCreateAccountActionGroup.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="StorefrontAssertMessageCustomerCreateAccountActionGroup">
+        <arguments>
+            <argument name="message" type="string" defaultValue="Thank you for registering with Main Website Store." />
+        </arguments>
+        <see selector="{{StorefrontMessagesSection.successMessage}}" userInput="{{message}}" stepKey="verifyMessage" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertRegistrationPageFieldsActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertRegistrationPageFieldsActionGroup.xml
new file mode 100644
index 0000000000000..d76277d2e5e45
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertRegistrationPageFieldsActionGroup.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="StorefrontAssertRegistrationPageFields">
+        <seeInCurrentUrl url="{{StorefrontCustomerCreatePage.url}}" stepKey="seeCreateNewCustomerAccountPage"/>
+        <seeElement selector="{{StorefrontCustomerCreateFormSection.firstnameField}}" stepKey="seeFirstNameField"/>
+        <seeElement selector="{{StorefrontCustomerCreateFormSection.lastnameField}}" stepKey="seeFLastNameField"/>
+        <seeElement selector="{{StorefrontCustomerCreateFormSection.emailField}}" stepKey="seeEmailField"/>
+        <seeElement selector="{{StorefrontCustomerCreateFormSection.passwordField}}" stepKey="seePasswordField"/>
+        <seeElement selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}" stepKey="seeConfirmPasswordField"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAccountActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAccountActionGroup.xml
new file mode 100644
index 0000000000000..aa764e5f51de1
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerAccountActionGroup.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="StorefrontCustomerAccountCheckTab">
+        <arguments>
+            <argument name="tabName" type="string"/>
+        </arguments>
+
+        <see selector="{{StorefrontCustomerSidebarSection.sidebarTab(tabName)}}" userInput="{{tabName}}" stepKey="checkTabExists"/>
+        <click selector="{{StorefrontCustomerSidebarSection.sidebarTab(tabName)}}" stepKey="clickToOpenTab"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{StorefrontHeaderSection.mainTitle}}"  userInput="{{tabName}}" stepKey="checkTabTitle"/>
+    </actionGroup>
+
+    <!--Go to Storefront > Account Information-->
+    <actionGroup name="StorefrontStartCustomerAccountInformationEdit">
+        <amOnPage url="{{StorefrontCustomerAccountInformationPage.url}}" stepKey="goToAccountInformationEditPage"/>
+        <see selector="{{StorefrontCustomerAccountInformationSection.title}}" userInput="Edit Account Information" stepKey="seeEditAccountInformationPageTitle"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
new file mode 100644
index 0000000000000..1199d0f80948f
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.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="CustomerLogoutStorefrontByMenuItemsActionGroup">
+        <conditionalClick selector="{{StorefrontPanelHeaderSection.customerWelcome}}"
+                          dependentSelector="{{StorefrontPanelHeaderSection.customerWelcomeMenu}}"
+                          visible="false"
+                          stepKey="clickHeaderCustomerMenuButton" />
+        <click selector="{{StorefrontPanelHeaderSection.customerLogoutLink}}" stepKey="clickSignOutButton" />
+    </actionGroup>
+
+    <actionGroup name="StorefrontWaitCustomerLoggedOut">
+        <seeInCurrentUrl url="{{StorefrontCustomerLogoutSuccessPage.url}}" stepKey="seeLogoutSuccessPageUrlAfterLogOutJohnSmithCustomer"/>
+        <waitForPageLoad stepKey="waitForRedirectToHomePage"/>
+        <waitForText selector="{{StorefrontCmsPageSection.mainContent}}" userInput="CMS homepage content goes here." stepKey="waitForLoadContentMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerLogoutActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerLogoutActionGroup.xml
new file mode 100644
index 0000000000000..de97bb47de796
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerLogoutActionGroup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontCustomerLogoutActionGroup">
+        <amOnPage url="{{StorefrontCustomerLogoutPage.url}}" stepKey="storefrontSignOut"/>
+    </actionGroup>
+
+    <actionGroup name="StorefrontSignOutActionGroup">
+        <click selector="{{StoreFrontSignOutSection.customerAccount}}" stepKey="clickCustomerButton"/>
+        <click selector="{{StoreFrontSignOutSection.signOut}}" stepKey="clickToSignOut"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see userInput="You are signed out" stepKey="signOut"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillRegistrationFormActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillRegistrationFormActionGroup.xml
new file mode 100644
index 0000000000000..c1a1920b3c734
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillRegistrationFormActionGroup.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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontFillRegistrationFormActionGroup">
+        <arguments>
+            <argument name="customer" defaultValue="CustomerEntityOne"/>
+        </arguments>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForNavigateToCustomersPageLoad"/>
+        <click stepKey="clickOnCreateAccountLink" selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}"/>
+        <fillField stepKey="fillFirstName" userInput="{{customer.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}"/>
+        <fillField stepKey="fillLastName" userInput="{{customer.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}"/>
+        <fillField stepKey="fillEmail" userInput="{{customer.email}}" selector="{{StorefrontCustomerCreateFormSection.emailField}}"/>
+        <fillField stepKey="fillPassword" userInput="{{customer.password}}" selector="{{StorefrontCustomerCreateFormSection.passwordField}}"/>
+        <fillField stepKey="fillConfirmPassword" userInput="{{customer.password}}" selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontRegisterCustomerFromOrderSuccessPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontRegisterCustomerFromOrderSuccessPageActionGroup.xml
new file mode 100644
index 0000000000000..a97ad2a8b1907
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontRegisterCustomerFromOrderSuccessPageActionGroup.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="StorefrontRegisterCustomerFromOrderSuccessPage">
+        <arguments>
+            <argument name="customer" />
+        </arguments>
+        <click selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="clickCreateAccountButton"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.passwordField}}" userInput="{{customer.password}}" stepKey="typePassword"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}" userInput="{{customer.password}}" stepKey="typeConfirmationPassword"/>
+        <click selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}" stepKey="clickOnCreateAccount"/>
+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{StorefrontMessagesSection.success}}" userInput="Thank you for registering" stepKey="verifyAccountCreated"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontSaveRegistrationFormActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontSaveRegistrationFormActionGroup.xml
new file mode 100644
index 0000000000000..e5af973e78851
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontSaveRegistrationFormActionGroup.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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontSaveRegistrationFormActionGroup">
+        <click selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}" stepKey="clickCreateAccountButton"/>
+        <waitForPageLoad stepKey="waitForCreateAccountButtonToLoad"/>
+    </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 c8ba70c7f8b50..ebce94a10f9e5 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -67,6 +67,7 @@
         <data key="state">California</data>
         <data key="postcode">90230</data>
         <data key="country_id">US</data>
+        <data key="country">United States</data>
         <data key="default_billing">Yes</data>
         <data key="default_shipping">Yes</data>
         <requiredEntity type="region">RegionCA</requiredEntity>
@@ -85,6 +86,7 @@
         <data key="state">New York</data>
         <data key="postcode">11001</data>
         <data key="country_id">US</data>
+        <data key="country">United States</data>
         <data key="default_billing">Yes</data>
         <data key="default_shipping">Yes</data>
         <requiredEntity type="region">RegionNY</requiredEntity>
@@ -100,6 +102,28 @@
         <data key="state"></data>
         <data key="postcode">SE1 7RW</data>
         <data key="country_id">GB</data>
+        <data key="country">United Kingdom</data>
         <data key="telephone">444-44-444-44</data>
     </entity>
+    <entity name="US_Default_Billing_Address_TX" type="address" extends="US_Address_TX">
+        <data key="default_billing">false</data>
+        <data key="default_shipping">true</data>
+    </entity>
+    <entity name="US_Default_Shipping_Address_CA" type="address" extends="US_Address_CA">
+        <data key="default_billing">true</data>
+        <data key="default_shipping">false</data>
+    </entity>
+    <entity name="Canada_Address">
+        <data key="firstname">Robert</data>
+        <data key="lastname">Roe</data>
+        <array key="street">
+            <item>3197 rue Parc</item>
+        </array>
+        <data key="city">Sherbrooke</data>
+        <data key="state">Quebec</data>
+        <data key="postcode">J1L 1C9</data>
+        <data key="country_id">CA</data>
+        <data key="country">Canada</data>
+        <data key="telephone">999-99-99-99</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml
new file mode 100644
index 0000000000000..8a25815c06dfd
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="CustomerAccountSharingDefault" type="customer_account_sharing_config">
+        <requiredEntity type="account_share_scope_value">CustomerAccountSharingPerWebsite</requiredEntity>
+    </entity>
+    <entity name="CustomerAccountSharingPerWebsite" type="account_share_scope_value">
+        <data key="value">1</data>
+    </entity>
+
+    <entity name="CustomerAccountSharingGlobal" type="customer_account_sharing_config">
+        <requiredEntity type="account_share_scope_value">GlobalCustomerAccountSharing</requiredEntity>
+    </entity>
+    <entity name="GlobalCustomerAccountSharing" type="account_share_scope_value">
+        <data key="value">0</data>
+    </entity>
+
+    <entity name="CustomerAccountSharingSystemValue" type="customer_account_sharing_config">
+        <requiredEntity type="account_share_scope_value">CustomerAccountSharingInherit</requiredEntity>
+    </entity>
+    <entity name="CustomerAccountSharingInherit" type="account_share_scope_value">
+        <data key="inherit">true</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 74da84c01b861..7cd8ca0a3690c 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="CustomerEntityOne" type="customer">
         <data key="group_id">0</data>
         <data key="default_billing">defaultBillingValue</data>
@@ -21,6 +21,7 @@
         <data key="firstname">John</data>
         <data key="lastname">Doe</data>
         <data key="middlename">S</data>
+        <data key="fullname">John Doe</data>
         <data key="password">pwdTest123!</data>
         <data key="prefix">Mr</data>
         <data key="suffix">Sr</data>
@@ -33,7 +34,7 @@
         <!--requiredEntity type="extension_attribute">ExtensionAttributeSimple</requiredEntity-->
     </entity>
     <entity name="Simple_US_Customer" type="customer">
-        <data key="group_id">0</data>
+        <data key="group_id">1</data>
         <data key="default_billing">true</data>
         <data key="default_shipping">true</data>
         <data key="email" unique="prefix">John.Doe@example.com</data>
@@ -44,6 +45,16 @@
         <data key="website_id">0</data>
         <requiredEntity type="address">US_Address_TX</requiredEntity>
     </entity>
+    <entity name="Simple_Customer_Without_Address" 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">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+    </entity>
     <entity name="Simple_US_Customer_For_Update" type="customer">
         <var key="id" entityKey="id" entityType="customer"/>
         <data key="firstname">Jane</data>
@@ -74,4 +85,39 @@
         <data key="website_id">0</data>
         <requiredEntity type="address">US_Address_NY</requiredEntity>
     </entity>
+    <entity name="Customer_With_Different_Default_Billing_Shipping_Addresses" 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">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+        <requiredEntity type="address">US_Default_Billing_Address_TX</requiredEntity>
+        <requiredEntity type="address">US_Default_Shipping_Address_CA</requiredEntity>
+    </entity>
+    <entity name="John_Smith_Customer" type="customer">
+        <data key="group_id">1</data>
+        <data key="email" unique="prefix">john.smith@example.com</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Smith</data>
+        <data key="fullname">John Smith</data>
+        <data key="password">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+    </entity>
+    <entity name="Simple_US_Customer_Incorrect_Email" type="customer">
+        <data key="group_id">1</data>
+        <data key="default_billing">true</data>
+        <data key="default_shipping">true</data>
+        <data key="email">&gt;&lt;script&gt;alert(1);&lt;/script&gt;@example.com</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="fullname">John Doe</data>
+        <data key="password">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+        <requiredEntity type="address">US_Address_CA</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerNameAddressOptionsConfigData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerNameAddressOptionsConfigData.xml
new file mode 100644
index 0000000000000..1331f288286e5
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerNameAddressOptionsConfigData.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="CustomerPrefixOptions" type="customer_name_address_options">
+        <requiredEntity type="prefix_options">PrefixOptions</requiredEntity>
+    </entity>
+    <entity name="PrefixOptions" type="prefix_options">
+        <data key="value">Mr;Mrs;Ms;Dr</data>
+    </entity>
+
+    <entity name="DefaultCustomerPrefixOptions" type="customer_name_address_options">
+        <requiredEntity type="prefix_options">DefaultPrefixOptions</requiredEntity>
+    </entity>
+    <entity name="DefaultPrefixOptions" type="prefix_options">
+        <data key="value"></data>
+    </entity>
+
+    <entity name="CustomerSuffixOptions" type="customer_name_address_options">
+        <requiredEntity type="suffix_options">SuffixOptions</requiredEntity>
+    </entity>
+    <entity name="SuffixOptions" type="suffix_options">
+        <data key="value">Jr;Sr</data>
+    </entity>
+
+    <entity name="DefaultCustomerSuffixOptions" type="customer_name_address_options">
+        <requiredEntity type="suffix_options">DefaultSuffixOptions</requiredEntity>
+    </entity>
+    <entity name="DefaultSuffixOptions" type="suffix_options">
+        <data key="value"></data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/NewCustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/NewCustomerData.xml
new file mode 100644
index 0000000000000..0a357c86ed9f8
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Data/NewCustomerData.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="Simple_UK_Customer_For_Shipment" type="customer">
+        <data key="firstName">John</data>
+        <data key="lastName">Doe</data>
+        <data key="email">johndoe@example.com</data>
+        <data key="company">Test Company</data>
+        <data key="streetFirstLine">39 St Maurices Road</data>
+        <data key="streetSecondLine">ap. 654</data>
+        <data key="city">PULDAGON</data>
+        <data key="telephone">077 5866 0667</data>
+        <data key="country">United Kingdom</data>
+        <data key="region"> </data>
+        <data key="postcode">KW1 7NQ</data>
+    </entity>
+    <entity name="Simple_US_CA_Customer_For_Shipment" type="customer">
+        <data key="firstName">John</data>
+        <data key="lastName">Doe</data>
+        <data key="email">johndoeusca@example.com</data>
+        <data key="company">Magento</data>
+        <data key="streetFirstLine">123 Alphabet Drive</data>
+        <data key="streetSecondLine">ap. 350</data>
+        <data key="city">Los Angeles</data>
+        <data key="telephone">555-55-555-55</data>
+        <data key="country">United States</data>
+        <data key="region">California</data>
+        <data key="postcode">90240</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/customer_config_account_sharing-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_config_account_sharing-meta.xml
new file mode 100644
index 0000000000000..b52eda0c4cfdd
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_config_account_sharing-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CustomerAccountShareConfig" dataType="customer_account_sharing_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/customer/"
+               successRegex="/messages-message-success/" returnRegex="" method="POST">
+        <object key="groups" dataType="customer_account_sharing_config">
+            <object key="account_share" dataType="customer_account_sharing_config">
+                <object key="fields" dataType="customer_account_sharing_config">
+                    <object key="scope" dataType="account_share_scope_value">
+                        <field key="value">string</field>
+                        <field key="inherit">boolean</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/customer_name_address_options_config-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_name_address_options_config-meta.xml
new file mode 100644
index 0000000000000..07175a09fe3e1
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_name_address_options_config-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CustomerConfigNameAddressOptions" dataType="customer_name_address_options" type="create" auth="adminFormKey" url="/admin/system_config/save/section/customer/" method="POST" successRegex="/messages-message-success/">
+        <object key="groups" dataType="customer_name_address_options">
+            <object key="address" dataType="customer_name_address_options">
+                <object key="fields" dataType="customer_name_address_options">
+                    <object key="prefix_options" dataType="prefix_options">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="suffix_options" dataType="suffix_options">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
index 72d5d90bdc05f..7cd36c12c80bd 100644
--- a/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
@@ -12,5 +12,6 @@
         <section name="AdminCustomerMainActionsSection"/>
         <section name="AdminCustomerAccountAddressSection"/>
         <section name="AdminCustomerAccountEditAddressSection"/>
+        <section name="AdminCustomerAccountNewAddressSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerAccountInformationPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerAccountInformationPage.xml
new file mode 100644
index 0000000000000..80caea5a1f541
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerAccountInformationPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomerAccountInformationPage" url="/customer/account/edit" area="storefront" module="Magento_Customer">
+        <section name="StorefrontCustomerSidebarSection"/>
+        <section name="StorefrontCustomerAccountInformationSection" />
+    </page>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerAddressNewPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerAddressNewPage.xml
new file mode 100644
index 0000000000000..8fbc7b10fdd95
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerAddressNewPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomerAddressNewPage" url="/customer/address/new" area="storefront" module="Magento_Customer">
+        <section name="StorefrontCustomerAddressEditFormSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutPage.xml
new file mode 100644
index 0000000000000..b3cea8f2c2939
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutPage.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomerLogoutPage" url="customer/account/logout/" area="storefront" module="Magento_Customer"/>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutSuccessPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutSuccessPage.xml
new file mode 100644
index 0000000000000..9c1fc7aa8a88d
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutSuccessPage.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomerLogoutSuccessPage" url="customer/account/logoutSuccess/" area="storefront" module="Magento_Customer"/>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderPage.xml
deleted file mode 100644
index 4e2ff7e907aa2..0000000000000
--- a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderPage.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="StorefrontCustomerOrderPage" url="/sales/order/history/" area="storefront" module="Magento_Customer">
-        <section name="StorefrontCustomerOrderViewSection" />
-    </page>
-</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderViewPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderViewPage.xml
index 3ac90876a7acf..9cd6dc1e69e35 100644
--- a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderViewPage.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderViewPage.xml
@@ -7,8 +7,9 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="StorefrontCustomerOrderViewPage" url="sales/order/view/order_id/{{var1}}" area="storefront" module="Magento_Customer" parameterized="true">
         <section name="StorefrontCustomerOrderSection" />
+        <section name="StorefrontCustomerOrderViewSection" />
     </page>
-</pages>
\ No newline at end of file
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrdersGridPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrdersGridPage.xml
new file mode 100644
index 0000000000000..effc07d00f408
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrdersGridPage.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="StorefrontCustomerOrdersGridPage" url="/sales/order/history/" area="storefront" module="Magento_Customer">
+        <section name="StorefrontCustomerOrdersGridSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountAddressSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountAddressSection.xml
index db9619dde671f..70042e2a71467 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountAddressSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountAddressSection.xml
@@ -7,7 +7,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCustomerAccountAddressSection">
-        <element name="addresses" type="button" selector="a#tab_address"/>
-        <element name="addNewAddress" type="button" selector=".address-list-actions button.scalable.add span"/>
+        <element name="addresses" type="button" selector="#tab_address" timeout="30"/>
+        <element name="addNewAddress" type="button" selector=".address-list-actions button.scalable.add span" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
index 7eef792f0f048..6b988b067043a 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
@@ -9,6 +9,7 @@
     <section name="AdminCustomerAccountInformationSection">
         <element name="accountInformationTitle" type="text" selector=".admin__page-nav-title"/>
         <element name="accountInformationButton" type="text" selector="//a/span[text()='Account Information']"/>
+        <element name="addressesButton" type="select" selector="//a//span[contains(text(), 'Addresses')]"/>
         <element name="firstName" type="input" selector="input[name='customer[firstname]']"/>
         <element name="lastName" type="input" selector="input[name='customer[lastname]']"/>
         <element name="email" type="input" selector="input[name='customer[email]']"/>
@@ -16,5 +17,7 @@
         <element name="groupValue" type="button" selector="//span[text()='{{groupValue}}']" parameterized="true"/>
         <element name="associateToWebsite" type="select" selector="select[name='customer[website_id]']"/>
         <element name="storeView" type="select" selector="select[name='customer[sendemail_store_id]']"/>
+        <element name="accountInformationTab" type="button" selector="#tab_customer"/>
+        <element name="attributeImage" type="block" selector=".file-uploader-preview img"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountNewAddressSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountNewAddressSection.xml
new file mode 100644
index 0000000000000..8445343c9b9c0
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountNewAddressSection.xml
@@ -0,0 +1,19 @@
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerAccountNewAddressSection">
+        <element name="firstName" type="button" selector="input[name*='address'][name*='new'][name*='firstname']"/>
+        <element name="lastName" type="button" selector="input[name*='address'][name*='new'][name*='lastname']"/>
+        <element name="street" type="button" selector="input[name*='new'][name*='street']"/>
+        <element name="city" type="input" selector="input[name*='new'][name*='city']"/>
+        <element name="country" type="select" selector="select[name*='address'][name*='new'][name*='country']" timeout="10"/>
+        <element name="regionId" type="select" selector="select[name*='address'][name*='new'][name*='region_id']"/>
+        <element name="zip" type="input" selector="input[name*='address'][name*='new'][name*='postcode']"/>
+        <element name="phone" type="text" selector="input[name*='address'][name*='new'][name*='telephone']" />
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressFiltersSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressFiltersSection.xml
new file mode 100644
index 0000000000000..22eae72c880f9
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressFiltersSection.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="AdminCustomerAddressFiltersSection">
+        <element name="viewDropdown" type="button" selector=".admin__data-grid-action-bookmarks button.admin__action-dropdown"/>
+        <element name="viewBookmark" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerEditAddressesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerEditAddressesSection.xml
new file mode 100644
index 0000000000000..3c9e14033fb0d
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerEditAddressesSection.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerEditAddressesSection">
+        <element name="addNewAddress" type="button" selector="//span[text()='Add New Addresses']"/>
+        <element name="defaultBillingAddress" type="button" selector="//label[text()='Default Billing Address']"/>
+        <element name="defaultShippingAddress" type="button" selector="//label[text()='Default Shipping Address']"/>
+        <element name="firstName" type="button" selector="input[name*='address'][name*=firstname]"/>
+        <element name="lastName" type="button" selector="input[name*='address'][name*=lastname]"/>
+        <element name="streetAddress" type="button" selector="input[name*='address'][name*=street]"/>
+        <element name="city" type="input" selector="input[name*='address'][name*=city]"/>
+        <element name="country" type="select" selector="select[name*='address'][name*=country_id]"/>
+        <element name="state" type="select" selector="select[name*=address][name*=region_id]"/>
+        <element name="zip" type="input" selector="input[name*=address][name*=postcode]"/>
+        <element name="phoneNumber" type="input" selector="input[name*=address][name*=telephone]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml
index 5414b449ca470..564fc69f58704 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml
@@ -7,12 +7,16 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCustomerFiltersSection">
         <element name="filtersButton" type="button" selector="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button" timeout="30"/>
         <element name="nameInput" type="input" selector="input[name=name]"/>
         <element name="emailInput" type="input" selector="input[name=email]"/>
         <element name="apply" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
         <element name="clearFilters" type="button" selector=".admin__data-grid-header button[data-action='grid-filter-reset']" timeout="30"/>
+        <element name="clearAll" type="button" selector=".admin__data-grid-header .action-tertiary.action-clear" timeout="30"/>
+        <element name="viewDropdown" type="button" selector=".admin__data-grid-action-bookmarks button.admin__action-dropdown"/>
+        <element name="countryOptions" type="button" selector=".admin__data-grid-filters select[name=billing_country_id] option"/>
+        <element name="countryOptionsWithoutEmptyOption" type="button" selector=".admin__data-grid-filters select[name=billing_country_id] option:not([value=''])"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
index 183885dc81a3f..c1553de65111e 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
@@ -7,8 +7,12 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCustomerGridMainActionsSection">
         <element name="addNewCustomer" type="button" selector="#add" timeout="30"/>
+        <element name="actions" type="text" selector=".action-select"/>
+        <element name="customerCheckbox" type="button" selector="//*[contains(text(),'{{arg}}')]/../preceding-sibling::td[contains(@class, 'data-grid-checkbox-cell')]//input" parameterized="true"/>
+        <element name="delete" type="button" selector="//*[contains(@class, 'admin__data-grid-header')]//span[contains(@class,'action-menu-item') and text()='Delete']"/>
+        <element name="ok" type="button" selector=".modal-footer button.action-accept"/>
     </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 73a53d334db5f..265b520bc91cc 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml
@@ -15,5 +15,6 @@
         <element name="multicheckOption" type="button" selector="//div[@data-role='grid-wrapper']//th[contains(@class, data-grid-multicheck-cell)]//li//span[text() = '{{label}}']" parameterized="true"/>
         <element name="bulkActionDropdown" type="button" selector="div.admin__data-grid-header-row.row div.action-select-wrap button.action-select"/>
         <element name="bulkActionOption" type="button" selector="//div[contains(@class,'admin__data-grid-header-row') and contains(@class, 'row')]//div[contains(@class, 'action-select-wrap')]//ul/li/span[text() = '{{label}}']" parameterized="true"/>
+        <element name="gridRow" type="text" selector="//*[@data-role='sticky-el-root']/parent::div/parent::div/following-sibling::div//tbody//*[@class='data-row'][{{row}}]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
index 0a77890033295..9553752539757 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
@@ -7,8 +7,9 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCustomerMainActionsSection">
         <element name="saveButton" type="button" selector="#save" timeout="30"/>
+        <element name="deleteButton" type="button" selector="div.page-actions button.delete" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
new file mode 100644
index 0000000000000..f6706d0e16ab3
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.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="StorefrontCustomerAccountInformationSection">
+        <element name="title" type="text" selector=".page-title span"/>
+        <element name="firstName" type="input" selector="#firstname"/>
+        <element name="lastName" type="input" selector="#lastname"/>
+        <element name="changeEmail" type="checkbox" selector="#change_email"/>
+        <element name="changePassword" type="checkbox" selector="#change_password"/>
+        <element name="customAttributeFiled" type="input" selector="#{{attribute_code}}" parameterized="true"/>
+        <element name="saveButton" type="button" selector="#form-validate .action.save.primary" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressEditFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressEditFormSection.xml
new file mode 100644
index 0000000000000..2af00532301ed
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressEditFormSection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerAddressEditFormSection">
+        <element name="country" type="select" selector=".form-address-edit select#country" />
+        <element name="countryEmptyOption" type="select" selector=".form-address-edit select#country option[value='']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerDashboardAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerDashboardAccountInformationSection.xml
index edbcee2e8226a..83d671d30da3f 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerDashboardAccountInformationSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerDashboardAccountInformationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerDashboardAccountInformationSection">
         <element name="ContactInformation" type="textarea" selector=".box.box-information .box-content"/>
     </section>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrdersGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrdersGridSection.xml
new file mode 100644
index 0000000000000..419387fd92d1f
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrdersGridSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerOrdersGridSection">
+        <element name="viewOrderAction" type="text" selector="//*[@id='my-orders-table']//*[text()='{{orderId}}']/..//a[contains(@class, 'action view')]" parameterized="true"/>
+        <element name="orderStatus" type="text" selector="//*[@id='my-orders-table']//*[text()='{{orderId}}']/..//td[contains(@class,'status')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
index 9cc4a43d31bc6..d5eed446750bf 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
@@ -7,10 +7,11 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerSignInFormSection">
         <element name="emailField" type="input" selector="#email"/>
         <element name="passwordField" type="input" selector="#pass"/>
         <element name="signInAccountButton" type="button" selector="#send2" timeout="30"/>
+        <element name="customerLoginBlock" type="text" selector=".login-container .block.block-customer-login"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
index bee3adea898aa..575eabe68bd5c 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
@@ -7,8 +7,14 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontPanelHeaderSection">
         <element name="createAnAccountLink" type="select" selector=".panel.header li:nth-child(3)"/>
+        <element name="customerWelcome" type="text" selector=".panel.header .customer-welcome"/>
+        <element name="customerWelcomeMenu" type="text" selector=".panel.header .customer-welcome .customer-menu"/>
+        <element name="customerLogoutLink" type="text" selector=".panel.header .customer-welcome .customer-menu .authorization-link a" timeout="30"/>
+        <element name="welcomeMessage" type="text" selector=".greet.welcome span"/>
+        <element name="notYouLink" type="button" selector=".greet.welcome span a"/>
+        <element name="welcomeMessageFullText" type="button" selector=".greet.welcome"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
index 8e4d69e6a270d..c354d0647da64 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
@@ -23,6 +23,8 @@
             <magentoCLI command="indexer:reindex customer_grid" stepKey="reindexCustomerGrid"/>
         </before>
         <after>
+            <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearCustomerGridFilter"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
@@ -35,6 +37,7 @@
         <click selector="{{AdminNewCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
         <waitForElementNotVisible selector="div [data-role='spinner']" time="10" stepKey="waitForSpinner1"/>
         <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearCustomerGridFilter"/>
         <click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="openFilter"/>
         <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerFiltersSection.emailInput}}" stepKey="filterEmail"/>
         <click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="applyFilter"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminExactMatchSearchInCustomerGridTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminExactMatchSearchInCustomerGridTest.xml
new file mode 100644
index 0000000000000..757504fe25627
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminExactMatchSearchInCustomerGridTest.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="AdminExactMatchSearchInCustomerGridTest">
+        <annotations>
+            <features value="Customer"/>
+            <stories value="Customer Search"/>
+            <title value="Admin customer grid exact match searching"/>
+            <description value="Admin customer grid exact match searching with quotes in keyword"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-17026"/>
+            <useCaseId value="MAGETWO-99569"/>
+            <group value="customer"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer" stepKey="createFirstCustomer"/>
+            <createData entity="Simple_US_Customer" stepKey="createSecondCustomer">
+                <field key="firstname">&quot;Jane Doe&quot;</field>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createFirstCustomer" stepKey="deleteFirstCustomer"/>
+            <deleteData createDataKey="createSecondCustomer" stepKey="deleteSecondCustomer"/>
+            <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearCustomerGridFilter"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Step 1: Go to Customers > All Customers-->
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <!--Step 2: On Customers grid page search customer by keyword with quotes-->
+        <actionGroup ref="searchAdminDataGridByKeyword" stepKey="searchCustomer">
+            <argument name="keyword" value="$$createSecondCustomer.firstname$$"/>
+        </actionGroup>
+        <!--Step 3: Check if customer is placed in a first row and clear grid filter-->
+        <actionGroup ref="AdminAssertCustomerInCustomersGrid" stepKey="checkCustomerInGrid">
+            <argument name="text" value="$$createSecondCustomer.fullname$$"/>
+            <argument name="row" value="1"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
new file mode 100644
index 0000000000000..3b45dc286f410
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AllowedCountriesRestrictionApplyOnBackendTest">
+        <annotations>
+            <title value="Country filter on Customers page when allowed countries restriction for a default website is applied"/>
+            <description value="Country filter on Customers page when allowed countries restriction for a default website is applied"/>
+            <features value="Customer"/>
+            <stories value="Admin Customer Grid"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-17282"/>
+            <useCaseId value="MAGETWO-86624"/>
+            <group value="customer"/>
+        </annotations>
+        <before>
+            <createData entity="CustomerAccountSharingDefault" stepKey="setCustomerAccountSharingToDefault"/>
+            <createData entity="Simple_Customer_Without_Address" stepKey="createCustomer"/>
+            <actionGroup ref="LoginActionGroup" stepKey="loginToAdmin"/>
+
+            <!--Create new website,store and store view-->
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="adminCreateNewWebsite">
+                <argument name="newWebsiteName" value="{{CustomWebSite.name}}"/>
+                <argument name="websiteCode" value="{{CustomWebSite.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="adminCreateNewStore">
+                <argument name="website" value="{{CustomWebSite.name}}"/>
+                <argument name="storeGroupName" value="{{customStore.name}}"/>
+                <argument name="storeGroupCode" value="{{customStore.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="adminCreateNewStoreView">
+                <argument name="storeGroup" value="customStore"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!--Delete all created data and set main website country options to default-->
+            <comment userInput="Delete all created data and set main website country options to default" stepKey="resetConfigToDefault"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <createData entity="CustomerAccountSharingSystemValue" stepKey="setAccountSharingToSystemValue"/>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
+                <argument name="websiteName" value="{{CustomWebSite.name}}"/>
+            </actionGroup>
+            <amOnPage url="{{AdminConfigurationGeneralSectionPage.url('#general_country-link')}}" stepKey="goToConfigurationSectionPage"/>
+            <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="adminSwitchWebsiteActionGroup">
+                <argument name="scopeName" value="_defaultWebsite.name"/>
+            </actionGroup>
+            <actionGroup ref="SetWebsiteCountryOptionsToDefaultActionGroup" stepKey="setCountryOptionsToDefault"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+
+        <!--Check that all countries are allowed initially and get amount-->
+        <amOnPage url="{{AdminConfigurationGeneralSectionPage.url('#general_country-link')}}" stepKey="goToCountryConfigurationSectionPage"/>
+        <executeJS function="return document.querySelectorAll('{{AdminConfigurationGeneralCountryOptionsSection.allowedCountriesOptions}}').length" stepKey="countriesAmount"/>
+
+        <!-- Switch to first website, allow only Canada and set Canada as default country -->
+        <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="adminSwitchWebsite">
+            <argument name="scopeName" value="_defaultWebsite.name"/>
+        </actionGroup>
+        <actionGroup ref="AllowOnlyOneCountryActionGroup" stepKey="allowCanadaCountry">
+            <argument name="country" value="Canada"/>
+        </actionGroup>
+
+        <!--Switch to second website and allow all countries except Canada-->
+        <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="adminSwitchToSecondWebsite">
+            <argument name="scopeName" value="CustomWebSite.name"/>
+        </actionGroup>
+        <actionGroup ref="AllowAllCountriesExceptOneActionGroup" stepKey="allowAllCountriesExceptCanada">
+            <argument name="country" value="Canada"/>
+        </actionGroup>
+
+        <!--Open created customer details page and add Canada address-->
+        <amOnPage url="{{AdminEditCustomerPage.url($$createCustomer.id$$)}}" stepKey="goToCustomerEditPage"/>
+        <actionGroup ref="AdminAddCustomerAddressWithRegionTypeSelectActionGroup" stepKey="addAddressForCustomer">
+            <argument name="customerAddress" value="Canada_Address"/>
+        </actionGroup>
+
+        <!--Go to Customers grid and check that filter countries amount is the same as initial allowed countries amount-->
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomersGrid"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomersGrid"/>
+        <seeNumberOfElements userInput="$countriesAmount" selector="{{AdminCustomerFiltersSection.countryOptionsWithoutEmptyOption}}" stepKey="assertCountryAmounts"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php
index f2860725dbbae..0e8cffc0bf434 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php
@@ -19,6 +19,8 @@
 use Magento\Framework\Message\ManagerInterface;
 
 /**
+ * Unit tests for Magento\Customer\Controller\Account\EditPost.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class EditPostTest extends \PHPUnit\Framework\TestCase
@@ -98,6 +100,9 @@ class EditPostTest extends \PHPUnit\Framework\TestCase
      */
     private $customerMapperMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->prepareContext();
@@ -707,6 +712,8 @@ protected function prepareContext()
     }
 
     /**
+     * Executes methods needed for new Customer.
+     *
      * @param int $customerId
      * @param \PHPUnit_Framework_MockObject_MockObject $address
      * @return \PHPUnit_Framework_MockObject_MockObject
@@ -720,9 +727,9 @@ protected function getNewCustomerMock($customerId, $address)
             ->method('setId')
             ->with($customerId)
             ->willReturnSelf();
-        $newCustomerMock->expects($this->once())
+        $newCustomerMock->expects($this->atLeastOnce())
             ->method('getAddresses')
-            ->willReturn(null);
+            ->willReturn([]);
         $newCustomerMock->expects($this->once())
             ->method('setAddresses')
             ->with([$address])
@@ -732,6 +739,8 @@ protected function getNewCustomerMock($customerId, $address)
     }
 
     /**
+     * Executes methods needed for existing Customer.
+     *
      * @param int $customerId
      * @param \PHPUnit_Framework_MockObject_MockObject $address
      * @return \PHPUnit_Framework_MockObject_MockObject
@@ -741,7 +750,7 @@ protected function getCurrentCustomerMock($customerId, $address)
         $currentCustomerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
             ->getMockForAbstractClass();
 
-        $currentCustomerMock->expects($this->once())
+        $currentCustomerMock->expects($this->atLeastOnce())
             ->method('getAddresses')
             ->willReturn([$address]);
 
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..f28053a6611fc 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Address/DeleteTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Address/DeleteTest.php
@@ -78,7 +78,9 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->request = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
+            ->setMethods(['isPost'])
             ->getMockForAbstractClass();
+        $this->request->expects($this->any())->method('isPost')->willReturn(true);
         $this->address = $this->getMockBuilder(\Magento\Customer\Api\Data\AddressInterface::class)
             ->getMockForAbstractClass();
         $this->messageManager = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
@@ -146,7 +148,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,11 +185,11 @@ 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())
-            ->method('addException')
+            ->method('addExceptionMessage')
             ->with($exception, __('We can\'t delete the address right now.'));
         $this->resultRedirect->expects($this->once())
             ->method('setPath')
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..55967854f97ca 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
@@ -88,7 +88,9 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->request = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
+            ->setMethods(['isPost'])
             ->getMockForAbstractClass();
+        $this->request->expects($this->any())->method('isPost')->willReturn(true);
         $this->resultRedirectFactory = $this->getMockBuilder(RedirectFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
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 78d9dd7003522..1e10d702174c3 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
@@ -5,10 +5,14 @@
  */
 namespace Magento\Customer\Test\Unit\Controller\Adminhtml\Index;
 
+use Magento\Customer\Model\AddressRegistry;
 use Magento\Customer\Model\EmailNotificationInterface;
+use Magento\Framework\DataObject;
 use Magento\Framework\Message\MessageInterface;
 
 /**
+ * Unit tests for Inline customer edit.
+ *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -68,14 +72,25 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
     /** @var EmailNotificationInterface|\PHPUnit_Framework_MockObject_MockObject */
     private $emailNotification;
 
+    /** @var AddressRegistry|\PHPUnit_Framework_MockObject_MockObject */
+    private $addressRegistry;
+
     /** @var array */
     private $items;
 
+    /**
+     * @inheritdoc
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->request = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class, [], '', false);
+        $this->request = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
+            ->setMethods(['isPost'])
+            ->getMockForAbstractClass();
+        $this->request->expects($this->any())->method('isPost')->willReturn(true);
         $this->messageManager = $this->getMockForAbstractClass(
             \Magento\Framework\Message\ManagerInterface::class,
             [],
@@ -125,8 +140,12 @@ protected function setUp()
             '',
             false
         );
-        $this->logger = $this->getMockForAbstractClass(\Psr\Log\LoggerInterface::class, [], '', false);
-
+        $this->logger = $this->getMockForAbstractClass(
+            \Psr\Log\LoggerInterface::class,
+            [],
+            '',
+            false
+        );
         $this->emailNotification = $this->getMockBuilder(EmailNotificationInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -138,6 +157,7 @@ protected function setUp()
                 'messageManager' => $this->messageManager,
             ]
         );
+        $this->addressRegistry = $this->createMock(\Magento\Customer\Model\AddressRegistry::class);
         $this->controller = $objectManager->getObject(
             \Magento\Customer\Controller\Adminhtml\Index\InlineEdit::class,
             [
@@ -150,6 +170,7 @@ protected function setUp()
                 'addressDataFactory' => $this->addressDataFactory,
                 'addressRepository' => $this->addressRepository,
                 'logger' => $this->logger,
+                'addressRegistry' => $this->addressRegistry,
             ]
         );
         $reflection = new \ReflectionClass(get_class($this->controller));
@@ -204,6 +225,11 @@ protected function prepareMocksForTesting($populateSequence = 0)
             ->willReturn(12);
     }
 
+    /**
+     * Prepare mocks for update customers default billing address use case.
+     *
+     * @return void
+     */
     protected function prepareMocksForUpdateDefaultBilling()
     {
         $this->prepareMocksForProcessAddressData();
@@ -212,12 +238,15 @@ protected function prepareMocksForUpdateDefaultBilling()
             'firstname' => 'Firstname',
             'lastname' => 'Lastname',
         ];
-        $this->customerData->expects($this->once())
+        $this->customerData->expects($this->exactly(2))
             ->method('getAddresses')
             ->willReturn([$this->address]);
         $this->address->expects($this->once())
             ->method('isDefaultBilling')
             ->willReturn(true);
+        $this->addressRegistry->expects($this->once())
+            ->method('retrieve')
+            ->willReturn(new DataObject());
         $this->dataObjectHelper->expects($this->at(0))
             ->method('populateWithArray')
             ->with(
@@ -305,6 +334,11 @@ public function testExecuteWithoutItems()
         $this->assertSame($this->resultJson, $this->controller->execute());
     }
 
+    /**
+     * Unit test for verifying Localized Exception during inline edit.
+     *
+     * @return void
+     */
     public function testExecuteLocalizedException()
     {
         $exception = new \Magento\Framework\Exception\LocalizedException(__('Exception message'));
@@ -312,6 +346,9 @@ public function testExecuteLocalizedException()
         $this->customerData->expects($this->once())
             ->method('getDefaultBilling')
             ->willReturn(false);
+        $this->customerData->expects($this->once())
+            ->method('getAddresses')
+            ->willReturn([]);
         $this->customerRepository->expects($this->once())
             ->method('save')
             ->with($this->customerData)
@@ -327,6 +364,11 @@ public function testExecuteLocalizedException()
         $this->assertSame($this->resultJson, $this->controller->execute());
     }
 
+    /**
+     * Unit test for verifying Execute Exception during inline edit.
+     *
+     * @return void
+     */
     public function testExecuteException()
     {
         $exception = new \Exception('Exception message');
@@ -334,6 +376,9 @@ public function testExecuteException()
         $this->customerData->expects($this->once())
             ->method('getDefaultBilling')
             ->willReturn(false);
+        $this->customerData->expects($this->once())
+            ->method('getAddresses')
+            ->willReturn([]);
         $this->customerRepository->expects($this->once())
             ->method('save')
             ->with($this->customerData)
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
new file mode 100644
index 0000000000000..01f26a8906cc7
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php
@@ -0,0 +1,265 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Test\Unit\Controller\Adminhtml\Index;
+
+use Magento\Framework\App\Action\Context;
+use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
+use Magento\Customer\Model\ResourceModel\Customer\Collection;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Unit tests for Magento\Customer\Controller\Adminhtml\Index\MassAssignGroup.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class MassAssignGroupTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Customer\Controller\Adminhtml\Index\MassAssignGroup
+     */
+    private $massAction;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultRedirectMock;
+
+    /**
+     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $responseMock;
+
+    /**
+     * @var \Magento\Framework\Message\Manager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $messageManagerMock;
+
+    /**
+     * @var \Magento\Framework\ObjectManager\ObjectManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * @var Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerCollectionMock;
+
+    /**
+     * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerCollectionFactoryMock;
+
+    /**
+     * @var \Magento\Ui\Component\MassAction\Filter|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $filterMock;
+
+    /**
+     * @var \Magento\Customer\Api\CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerRepositoryMock;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestInterfaceMock;
+
+    /**
+     * @var \Magento\Framework\Controller\ResultFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultFactoryMock;
+
+    /**
+     * @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $redirectMock;
+
+    /**
+     * @var \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultRedirectFactoryMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->contextMock = $this->createMock(\Magento\Backend\App\Action\Context::class);
+        $this->resultRedirectFactoryMock = $this->createMock(
+            \Magento\Backend\Model\View\Result\RedirectFactory::class
+        );
+        $this->responseMock = $this->createMock(\Magento\Framework\App\ResponseInterface::class);
+        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->objectManagerMock = $this->createPartialMock(
+            \Magento\Framework\ObjectManager\ObjectManager::class,
+            ['create']
+        );
+        $this->requestInterfaceMock = $this->getMockForAbstractClass(
+            \Magento\Framework\App\RequestInterface::class,
+            [],
+            '',
+            false,
+            true,
+            true,
+            ['isPost']
+        );
+        $this->messageManagerMock = $this->createMock(\Magento\Framework\Message\Manager::class);
+        $this->customerCollectionMock = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->customerCollectionFactoryMock = $this->getMockBuilder(CollectionFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->redirectMock = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resultFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resultRedirectMock = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->filterMock = $this->createMock(\Magento\Ui\Component\MassAction\Filter::class);
+
+        $this->resultRedirectFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->resultRedirectMock);
+
+        $this->contextMock->expects($this->once())->method('getMessageManager')->willReturn($this->messageManagerMock);
+        $this->contextMock->expects($this->once())->method('getRequest')->willReturn($this->requestMock);
+        $this->contextMock->expects($this->once())->method('getResponse')->willReturn($this->responseMock);
+        $this->contextMock->expects($this->once())->method('getObjectManager')->willReturn($this->objectManagerMock);
+        $this->contextMock->expects($this->once())
+            ->method('getResultRedirectFactory')
+            ->willReturn($this->resultRedirectFactoryMock);
+        $this->contextMock->expects($this->once())
+            ->method('getResultFactory')
+            ->willReturn($this->resultFactoryMock);
+        $this->customerRepositoryMock = $this
+            ->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
+            ->getMockForAbstractClass();
+        $this->massAction = $objectManagerHelper->getObject(
+            \Magento\Customer\Controller\Adminhtml\Index\MassAssignGroup::class,
+            [
+                'context' => $this->contextMock,
+                'filter' => $this->filterMock,
+                'collectionFactory' => $this->customerCollectionFactoryMock,
+                'customerRepository' => $this->customerRepositoryMock,
+            ]
+        );
+    }
+
+    /**
+     * Execute Create resultFactory and Create and Get customerCollectionFactory.
+     *
+     * @return void
+     */
+    private function expectsCreateAndGetCollectionMethods()
+    {
+        $this->resultFactoryMock->expects($this->once())
+            ->method('create')
+            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT)
+            ->willReturn($this->redirectMock);
+        $this->customerCollectionFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->customerCollectionMock);
+        $this->filterMock->expects($this->once())
+            ->method('getCollection')
+            ->with($this->customerCollectionMock)
+            ->willReturnArgument(0);
+    }
+
+    /**
+     * Unit test to verify mass customer group assignment use case.
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function testExecute()
+    {
+
+        $customersIds = [10, 11, 12];
+        $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+            ->setMethods(['setData'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->expectsCreateAndGetCollectionMethods();
+        $this->requestMock->expects($this->once())->method('isPost')->willReturn(true);
+        $this->customerCollectionMock->expects($this->once())
+            ->method('getAllIds')
+            ->willReturn($customersIds);
+
+        $this->customerRepositoryMock->expects($this->any())
+            ->method('getById')
+            ->willReturnMap([[10, $customerMock], [11, $customerMock], [12, $customerMock]]);
+
+        $this->messageManagerMock->expects($this->once())
+            ->method('addSuccess')
+            ->with(__('A total of %1 record(s) were updated.', count($customersIds)));
+
+        $this->resultRedirectMock->expects($this->any())
+            ->method('setPath')
+            ->with('customer/*/index')
+            ->willReturnSelf();
+
+        $this->massAction->execute();
+    }
+
+    /**
+     * Unit test to verify expected error during mass customer group assignment use case.
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function testExecuteWithException()
+    {
+        $customersIds = [10, 11, 12];
+        $this->expectsCreateAndGetCollectionMethods();
+        $this->requestMock->expects($this->once())->method('isPost')->willReturn(true);
+        $this->customerCollectionMock->expects($this->once())
+            ->method('getAllIds')
+            ->willReturn($customersIds);
+
+        $this->customerRepositoryMock->expects($this->once())
+            ->method('getById')
+            ->willThrowException(new \Exception('Some message.'));
+
+        $this->messageManagerMock->expects($this->once())
+            ->method('addError')
+            ->with('Some message.');
+
+        $this->massAction->execute();
+    }
+
+    /**
+     * Check that error throws when request is not a POST.
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\NotFoundException
+     */
+    public function testExecuteWithNotPostRequest()
+    {
+        $this->requestMock->expects($this->once())->method('isPost')->willReturn(false);
+
+        $this->massAction->execute();
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ResetPasswordTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ResetPasswordTest.php
index 02d071ab394a5..35ac522499b63 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ResetPasswordTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ResetPasswordTest.php
@@ -143,7 +143,7 @@ protected function setUp()
         $this->messageManager = $this->getMockBuilder(
             \Magento\Framework\Message\Manager::class
         )->disableOriginalConstructor()->setMethods(
-            ['addSuccess', 'addMessage', 'addException', 'addErrorMessage']
+            ['addSuccessMessage', 'addMessage', 'addExceptionMessage', 'addErrorMessage']
         )->getMock();
 
         $this->resultRedirectFactoryMock = $this->getMockBuilder(
@@ -443,7 +443,7 @@ public function testResetPasswordActionException()
         $this->messageManager->expects(
             $this->once()
         )->method(
-            'addException'
+            'addExceptionMessage'
         )->with(
             $this->equalTo($exception),
             $this->equalTo('Something went wrong while resetting customer password.')
@@ -503,7 +503,7 @@ public function testResetPasswordActionSendEmail()
         $this->messageManager->expects(
             $this->once()
         )->method(
-            'addSuccess'
+            'addSuccessMessage'
         )->with(
             $this->equalTo('The customer will receive an email with a link to reset password.')
         );
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
index 5372bb11a89b5..09082a0a9de53 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
@@ -15,6 +15,8 @@
 use Magento\Framework\Controller\Result\Redirect;
 
 /**
+ * Testing Save Customer use case from admin page.
+ *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @covers \Magento\Customer\Controller\Adminhtml\Index\Save
@@ -275,6 +277,8 @@ protected function setUp()
     }
 
     /**
+     * Test for Execute method with existent customer.
+     *
      * @covers \Magento\Customer\Controller\Adminhtml\Index\Index::execute
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -540,6 +544,10 @@ public function testExecuteWithExistentCustomer()
         $customerEmail = 'customer@email.com';
         $customerMock->expects($this->once())->method('getEmail')->willReturn($customerEmail);
 
+        $customerMock->expects($this->once())
+            ->method('getAddresses')
+            ->willReturn([]);
+
         $this->emailNotificationMock->expects($this->once())
             ->method('credentialsChanged')
             ->with($customerMock, $customerEmail)
@@ -878,22 +886,24 @@ public function testExecuteWithNewCustomerAndValidationException()
             'customer' => [
                 'coolness' => false,
                 'disable_auto_group_change' => 'false',
+                'dob' => '3/12/1996',
             ],
             'subscription' => $subscription,
         ];
         $extractedData = [
             'coolness' => false,
             'disable_auto_group_change' => 'false',
+            'dob' => '1996-03-12',
         ];
 
         /** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
         $attributeMock = $this->getMockBuilder(
             \Magento\Customer\Api\Data\AttributeMetadataInterface::class
         )->disableOriginalConstructor()->getMock();
-        $attributeMock->expects($this->once())
+        $attributeMock->expects($this->exactly(2))
             ->method('getAttributeCode')
             ->willReturn('coolness');
-        $attributeMock->expects($this->once())
+        $attributeMock->expects($this->exactly(2))
             ->method('getFrontendInput')
             ->willReturn('int');
         $attributes = [$attributeMock];
@@ -904,7 +914,7 @@ public function testExecuteWithNewCustomerAndValidationException()
                 [null, null, $postValue],
                 [CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, null, $postValue['customer']],
             ]);
-        $this->requestMock->expects($this->exactly(2))
+        $this->requestMock->expects($this->any())
             ->method('getPost')
             ->willReturnMap(
                 [
@@ -917,12 +927,12 @@ public function testExecuteWithNewCustomerAndValidationException()
         $objectMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $objectMock->expects($this->once())
+        $objectMock->expects($this->exactly(2))
             ->method('getData')
             ->with('customer')
             ->willReturn($postValue['customer']);
 
-        $this->objectFactoryMock->expects($this->once())
+        $this->objectFactoryMock->expects($this->exactly(2))
             ->method('create')
             ->with(['data' => $postValue])
             ->willReturn($objectMock);
@@ -930,19 +940,19 @@ public function testExecuteWithNewCustomerAndValidationException()
         $customerFormMock = $this->getMockBuilder(
             \Magento\Customer\Model\Metadata\Form::class
         )->disableOriginalConstructor()->getMock();
-        $customerFormMock->expects($this->once())
+        $customerFormMock->expects($this->exactly(2))
             ->method('extractData')
             ->with($this->requestMock, 'customer')
             ->willReturn($extractedData);
-        $customerFormMock->expects($this->once())
+        $customerFormMock->expects($this->exactly(2))
             ->method('compactData')
             ->with($extractedData)
             ->willReturn($extractedData);
-        $customerFormMock->expects($this->once())
+        $customerFormMock->expects($this->exactly(2))
             ->method('getAttributes')
             ->willReturn($attributes);
 
-        $this->formFactoryMock->expects($this->once())
+        $this->formFactoryMock->expects($this->exactly(2))
             ->method('create')
             ->with(
                 CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
@@ -990,7 +1000,10 @@ public function testExecuteWithNewCustomerAndValidationException()
 
         $this->sessionMock->expects($this->once())
             ->method('setCustomerFormData')
-            ->with($postValue);
+            ->with([
+                'customer' => $extractedData,
+                'subscription' => $subscription,
+            ]);
 
         /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
         $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
@@ -1021,22 +1034,24 @@ public function testExecuteWithNewCustomerAndLocalizedException()
             'customer' => [
                 'coolness' => false,
                 'disable_auto_group_change' => 'false',
+                'dob' => '3/12/1996',
             ],
             'subscription' => $subscription,
         ];
         $extractedData = [
             'coolness' => false,
             'disable_auto_group_change' => 'false',
+            'dob' => '1996-03-12',
         ];
 
         /** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
         $attributeMock = $this->getMockBuilder(
             \Magento\Customer\Api\Data\AttributeMetadataInterface::class
         )->disableOriginalConstructor()->getMock();
-        $attributeMock->expects($this->once())
+        $attributeMock->expects($this->exactly(2))
             ->method('getAttributeCode')
             ->willReturn('coolness');
-        $attributeMock->expects($this->once())
+        $attributeMock->expects($this->exactly(2))
             ->method('getFrontendInput')
             ->willReturn('int');
         $attributes = [$attributeMock];
@@ -1047,7 +1062,7 @@ public function testExecuteWithNewCustomerAndLocalizedException()
                 [null, null, $postValue],
                 [CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, null, $postValue['customer']],
             ]);
-        $this->requestMock->expects($this->exactly(2))
+        $this->requestMock->expects($this->any())
             ->method('getPost')
             ->willReturnMap(
                 [
@@ -1060,12 +1075,12 @@ public function testExecuteWithNewCustomerAndLocalizedException()
         $objectMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $objectMock->expects($this->once())
+        $objectMock->expects($this->exactly(2))
             ->method('getData')
             ->with('customer')
             ->willReturn($postValue['customer']);
 
-        $this->objectFactoryMock->expects($this->once())
+        $this->objectFactoryMock->expects($this->exactly(2))
             ->method('create')
             ->with(['data' => $postValue])
             ->willReturn($objectMock);
@@ -1074,19 +1089,19 @@ public function testExecuteWithNewCustomerAndLocalizedException()
         $customerFormMock = $this->getMockBuilder(
             \Magento\Customer\Model\Metadata\Form::class
         )->disableOriginalConstructor()->getMock();
-        $customerFormMock->expects($this->once())
+        $customerFormMock->expects($this->exactly(2))
             ->method('extractData')
             ->with($this->requestMock, 'customer')
             ->willReturn($extractedData);
-        $customerFormMock->expects($this->once())
+        $customerFormMock->expects($this->exactly(2))
             ->method('compactData')
             ->with($extractedData)
             ->willReturn($extractedData);
-        $customerFormMock->expects($this->once())
+        $customerFormMock->expects($this->exactly(2))
             ->method('getAttributes')
             ->willReturn($attributes);
 
-        $this->formFactoryMock->expects($this->once())
+        $this->formFactoryMock->expects($this->exactly(2))
             ->method('create')
             ->with(
                 CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
@@ -1133,7 +1148,10 @@ public function testExecuteWithNewCustomerAndLocalizedException()
 
         $this->sessionMock->expects($this->once())
             ->method('setCustomerFormData')
-            ->with($postValue);
+            ->with([
+                'customer' => $extractedData,
+                'subscription' => $subscription,
+            ]);
 
         /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
         $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
@@ -1164,22 +1182,24 @@ public function testExecuteWithNewCustomerAndException()
             'customer' => [
                 'coolness' => false,
                 'disable_auto_group_change' => 'false',
+                'dob' => '3/12/1996',
             ],
             'subscription' => $subscription,
         ];
         $extractedData = [
             'coolness' => false,
             'disable_auto_group_change' => 'false',
+            'dob' => '1996-03-12',
         ];
 
         /** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
         $attributeMock = $this->getMockBuilder(
             \Magento\Customer\Api\Data\AttributeMetadataInterface::class
         )->disableOriginalConstructor()->getMock();
-        $attributeMock->expects($this->once())
+        $attributeMock->expects($this->exactly(2))
             ->method('getAttributeCode')
             ->willReturn('coolness');
-        $attributeMock->expects($this->once())
+        $attributeMock->expects($this->exactly(2))
             ->method('getFrontendInput')
             ->willReturn('int');
         $attributes = [$attributeMock];
@@ -1190,7 +1210,7 @@ public function testExecuteWithNewCustomerAndException()
                 [null, null, $postValue],
                 [CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, null, $postValue['customer']],
             ]);
-        $this->requestMock->expects($this->exactly(2))
+        $this->requestMock->expects($this->any())
             ->method('getPost')
             ->willReturnMap(
                 [
@@ -1203,12 +1223,12 @@ public function testExecuteWithNewCustomerAndException()
         $objectMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $objectMock->expects($this->once())
+        $objectMock->expects($this->exactly(2))
             ->method('getData')
             ->with('customer')
             ->willReturn($postValue['customer']);
 
-        $this->objectFactoryMock->expects($this->once())
+        $this->objectFactoryMock->expects($this->exactly(2))
             ->method('create')
             ->with(['data' => $postValue])
             ->willReturn($objectMock);
@@ -1216,19 +1236,19 @@ public function testExecuteWithNewCustomerAndException()
         $customerFormMock = $this->getMockBuilder(
             \Magento\Customer\Model\Metadata\Form::class
         )->disableOriginalConstructor()->getMock();
-        $customerFormMock->expects($this->once())
+        $customerFormMock->expects($this->exactly(2))
             ->method('extractData')
             ->with($this->requestMock, 'customer')
             ->willReturn($extractedData);
-        $customerFormMock->expects($this->once())
+        $customerFormMock->expects($this->exactly(2))
             ->method('compactData')
             ->with($extractedData)
             ->willReturn($extractedData);
-        $customerFormMock->expects($this->once())
+        $customerFormMock->expects($this->exactly(2))
             ->method('getAttributes')
             ->willReturn($attributes);
 
-        $this->formFactoryMock->expects($this->once())
+        $this->formFactoryMock->expects($this->exactly(2))
             ->method('create')
             ->with(
                 CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
@@ -1277,7 +1297,10 @@ public function testExecuteWithNewCustomerAndException()
 
         $this->sessionMock->expects($this->once())
             ->method('setCustomerFormData')
-            ->with($postValue);
+            ->with([
+                'customer' => $extractedData,
+                'subscription' => $subscription,
+            ]);
 
         /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
         $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
new file mode 100644
index 0000000000000..f5688c1f87481
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
@@ -0,0 +1,347 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Test\Unit\Model;
+
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\AccountConfirmation;
+use Magento\Customer\Model\AccountManagement;
+use Magento\Customer\Model\AuthenticationInterface;
+use Magento\Customer\Model\EmailNotificationInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Intl\DateTimeFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Unit test for Magento\Customer\Model\AccountManagement.
+ *
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class AccountManagementTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var AccountManagement */
+    private $accountManagement;
+
+    /** @var ObjectManagerHelper */
+    private $objectManagerHelper;
+
+    /** @var \Magento\Customer\Model\CustomerFactory|\PHPUnit_Framework_MockObject_MockObject */
+    private $customerFactoryMock;
+
+    /** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $managerMock;
+
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $storeManagerMock;
+
+    /** @var \Magento\Framework\Math\Random|\PHPUnit_Framework_MockObject_MockObject */
+    private $randomMock;
+
+    /** @var \Magento\Customer\Model\Metadata\Validator|\PHPUnit_Framework_MockObject_MockObject */
+    private $validatorMock;
+
+    /** @var \Magento\Customer\Api\Data\ValidationResultsInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject */
+    private $validationResultsInterfaceFactoryMock;
+
+    /** @var \Magento\Customer\Api\AddressRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $addressRepositoryMock;
+
+    /** @var \Magento\Customer\Api\CustomerMetadataInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $customerMetadataMock;
+
+    /** @var \Magento\Customer\Model\CustomerRegistry|\PHPUnit_Framework_MockObject_MockObject */
+    private $customerRegistryMock;
+
+    /** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $loggerMock;
+
+    /** @var \Magento\Framework\Encryption\EncryptorInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $encryptorMock;
+
+    /** @var \Magento\Customer\Model\Config\Share|\PHPUnit_Framework_MockObject_MockObject */
+    private $shareMock;
+
+    /** @var \Magento\Framework\Stdlib\StringUtils|\PHPUnit_Framework_MockObject_MockObject */
+    private $stringMock;
+
+    /** @var \Magento\Customer\Api\CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $customerRepositoryMock;
+
+    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $scopeConfigMock;
+
+    /** @var \Magento\Framework\Mail\Template\TransportBuilder|\PHPUnit_Framework_MockObject_MockObject */
+    private $transportBuilderMock;
+
+    /** @var \Magento\Framework\Reflection\DataObjectProcessor|\PHPUnit_Framework_MockObject_MockObject */
+    private $dataObjectProcessorMock;
+
+    /** @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject */
+    private $registryMock;
+
+    /** @var \Magento\Customer\Helper\View|\PHPUnit_Framework_MockObject_MockObject */
+    private $customerViewHelperMock;
+
+    /** @var \Magento\Framework\Stdlib\DateTime|\PHPUnit_Framework_MockObject_MockObject */
+    private $dateTimeMock;
+
+    /** @var \Magento\Customer\Model\Customer|\PHPUnit_Framework_MockObject_MockObject */
+    private $customerMock;
+
+    /** @var \Magento\Framework\DataObjectFactory|\PHPUnit_Framework_MockObject_MockObject */
+    private $objectFactoryMock;
+
+    /** @var \Magento\Framework\Api\ExtensibleDataObjectConverter|\PHPUnit_Framework_MockObject_MockObject */
+    private $extensibleDataObjectConverterMock;
+
+    /** @var \Magento\Customer\Model\Data\CustomerSecure|\PHPUnit_Framework_MockObject_MockObject */
+    private $customerSecureMock;
+
+    /** @var AuthenticationInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $authenticationMock;
+
+    /** @var EmailNotificationInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $emailNotificationMock;
+
+    /** @var DateTimeFactory|\PHPUnit_Framework_MockObject_MockObject */
+    private $dateTimeFactoryMock;
+
+    /** @var AccountConfirmation|\PHPUnit_Framework_MockObject_MockObject */
+    private $accountConfirmationMock;
+
+    /** @var \Magento\Framework\Session\SessionManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $sessionManagerMock;
+
+    /** @var \Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject */
+    private $visitorCollectionFactoryMock;
+
+    /** @var \Magento\Framework\Session\SaveHandlerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $saveHandlerMock;
+
+    /** @var \Magento\Customer\Model\AddressRegistry|\PHPUnit_Framework_MockObject_MockObject */
+    private $addressRegistryMock;
+
+    /** @var SearchCriteriaBuilder|\PHPUnit_Framework_MockObject_MockObject */
+    private $searchCriteriaBuilderMock;
+
+    /**
+     * @inheritdoc
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    protected function setUp()
+    {
+        $this->customerFactoryMock = $this->createPartialMock(
+            \Magento\Customer\Model\CustomerFactory::class,
+            ['create']
+        );
+        $this->managerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
+        $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
+        $this->randomMock = $this->createMock(\Magento\Framework\Math\Random::class);
+        $this->validatorMock = $this->createMock(\Magento\Customer\Model\Metadata\Validator::class);
+        $this->validationResultsInterfaceFactoryMock = $this->createMock(
+            \Magento\Customer\Api\Data\ValidationResultsInterfaceFactory::class
+        );
+        $this->addressRepositoryMock = $this->createMock(\Magento\Customer\Api\AddressRepositoryInterface::class);
+        $this->customerMetadataMock = $this->createMock(\Magento\Customer\Api\CustomerMetadataInterface::class);
+        $this->customerRegistryMock = $this->createMock(\Magento\Customer\Model\CustomerRegistry::class);
+        $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
+        $this->encryptorMock = $this->createMock(\Magento\Framework\Encryption\EncryptorInterface::class);
+        $this->shareMock = $this->createMock(\Magento\Customer\Model\Config\Share::class);
+        $this->stringMock = $this->createMock(\Magento\Framework\Stdlib\StringUtils::class);
+        $this->customerRepositoryMock = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+        $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $this->transportBuilderMock = $this->createMock(\Magento\Framework\Mail\Template\TransportBuilder::class);
+        $this->dataObjectProcessorMock = $this->createMock(\Magento\Framework\Reflection\DataObjectProcessor::class);
+        $this->registryMock = $this->createMock(\Magento\Framework\Registry::class);
+        $this->customerViewHelperMock = $this->createMock(\Magento\Customer\Helper\View::class);
+        $this->dateTimeMock = $this->createMock(\Magento\Framework\Stdlib\DateTime::class);
+        $this->customerMock = $this->createMock(\Magento\Customer\Model\Customer::class);
+        $this->objectFactoryMock = $this->createMock(\Magento\Framework\DataObjectFactory::class);
+        $this->addressRegistryMock = $this->createMock(\Magento\Customer\Model\AddressRegistry::class);
+        $this->extensibleDataObjectConverterMock = $this->createMock(
+            \Magento\Framework\Api\ExtensibleDataObjectConverter::class
+        );
+        $this->authenticationMock = $this->createMock(AuthenticationInterface::class);
+        $this->emailNotificationMock = $this->createMock(EmailNotificationInterface::class);
+
+        $this->customerSecureMock = $this->getMockBuilder(\Magento\Customer\Model\Data\CustomerSecure::class)
+            ->setMethods(['setRpToken', 'addData', 'setRpTokenCreatedAt', 'setData'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->accountConfirmationMock = $this->createMock(AccountConfirmation::class);
+        $this->searchCriteriaBuilderMock = $this->createMock(SearchCriteriaBuilder::class);
+
+        $this->visitorCollectionFactoryMock = $this->getMockBuilder(
+            \Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory::class
+        )->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->sessionManagerMock = $this->createMock(\Magento\Framework\Session\SessionManagerInterface::class);
+        $this->saveHandlerMock = $this->createMock(\Magento\Framework\Session\SaveHandlerInterface::class);
+
+        $this->dateTimeInit();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->accountManagement = $this->objectManagerHelper->getObject(
+            AccountManagement::class,
+            [
+                'customerFactory' => $this->customerFactoryMock,
+                'eventManager' => $this->managerMock,
+                'storeManager' => $this->storeManagerMock,
+                'mathRandom' => $this->randomMock,
+                'validator' => $this->validatorMock,
+                'validationResultsDataFactory' => $this->validationResultsInterfaceFactoryMock,
+                'addressRepository' => $this->addressRepositoryMock,
+                'customerMetadataService' => $this->customerMetadataMock,
+                'customerRegistry' => $this->customerRegistryMock,
+                'logger' => $this->loggerMock,
+                'encryptor' => $this->encryptorMock,
+                'configShare' => $this->shareMock,
+                'stringHelper' => $this->stringMock,
+                'customerRepository' => $this->customerRepositoryMock,
+                'scopeConfig' => $this->scopeConfigMock,
+                'transportBuilder' => $this->transportBuilderMock,
+                'dataProcessor' => $this->dataObjectProcessorMock,
+                'registry' => $this->registryMock,
+                'customerViewHelper' => $this->customerViewHelperMock,
+                'dateTime' => $this->dateTimeMock,
+                'customerModel' => $this->customerMock,
+                'objectFactory' => $this->objectFactoryMock,
+                'extensibleDataObjectConverter' => $this->extensibleDataObjectConverterMock,
+                'dateTimeFactory' => $this->dateTimeFactoryMock,
+                'accountConfirmation' => $this->accountConfirmationMock,
+                'sessionManager' => $this->sessionManagerMock,
+                'saveHandler' => $this->saveHandlerMock,
+                'visitorCollectionFactory' => $this->visitorCollectionFactoryMock,
+                'searchCriteriaBuilder' => $this->searchCriteriaBuilderMock,
+                'addressRegistry' => $this->addressRegistryMock,
+            ]
+        );
+    }
+
+    /**
+     * Init DateTimeFactory.
+     *
+     * @return void
+     */
+    private function dateTimeInit()
+    {
+        $dateTime = '2017-10-25 18:57:08';
+        $timestamp = '1508983028';
+        $dateTimeMock = $this->getMockBuilder(\DateTime::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['format', 'getTimestamp', 'setTimestamp'])
+            ->getMock();
+
+        $dateTimeMock->expects($this->once())
+            ->method('format')
+            ->with(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT)
+            ->willReturn($dateTime);
+        $dateTimeMock->expects($this->once())
+            ->method('getTimestamp')
+            ->willReturn($timestamp);
+        $dateTimeMock->expects($this->once())
+            ->method('setTimestamp')
+            ->willReturnSelf();
+        $this->dateTimeFactoryMock = $this->getMockBuilder(DateTimeFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->dateTimeFactoryMock->expects($this->once())->method('create')->willReturn($dateTimeMock);
+    }
+
+    /**
+     * Test for changePassword method.
+     *
+     * @return void
+     */
+    public function testChangePassword()
+    {
+        $customerId = 7;
+        $email = 'test@example.com';
+        $currentPassword = '1234567';
+        $newPassword = 'abcdefg';
+
+        $customer = $this->createMock(CustomerInterface::class);
+
+        $customer->expects($this->atLeastOnce())
+            ->method('getId')
+            ->willReturn($customerId);
+        $customer->expects($this->once())
+            ->method('getAddresses')
+            ->willReturn([]);
+        $this->customerRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($email)
+            ->willReturn($customer);
+        $this->customerSecureMock->expects($this->once())
+            ->method('setRpToken')
+            ->with(null)
+            ->willReturnSelf();
+        $this->customerSecureMock->expects($this->once())
+            ->method('setRpTokenCreatedAt')
+            ->with(null)
+            ->willReturnSelf();
+        $this->customerRegistryMock->expects($this->once())
+            ->method('retrieveSecureData')
+            ->with($customerId)
+            ->willReturn($this->customerSecureMock);
+
+        $this->scopeConfigMock->expects($this->atLeastOnce())
+            ->method('getValue')
+            ->willReturnMap(
+                [
+                    [
+                        AccountManagement::XML_PATH_MINIMUM_PASSWORD_LENGTH,
+                        'default',
+                        null,
+                        7,
+                    ],
+                    [
+                        AccountManagement::XML_PATH_REQUIRED_CHARACTER_CLASSES_NUMBER,
+                        'default',
+                        null,
+                        1,
+                    ],
+                ]
+            );
+        $this->stringMock->expects($this->atLeastOnce())
+            ->method('strlen')
+            ->with($newPassword)
+            ->willReturn(7);
+        $this->customerRepositoryMock
+            ->expects($this->once())
+            ->method('save')
+            ->with($customer);
+        $this->sessionManagerMock->expects($this->atLeastOnce())->method('getSessionId');
+        $visitor = $this->getMockBuilder(\Magento\Customer\Model\Visitor::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getSessionId'])
+            ->getMock();
+        $visitor->expects($this->atLeastOnce())->method('getSessionId')
+            ->willReturnOnConsecutiveCalls('session_id_1', 'session_id_2');
+        $visitorCollection = $this->getMockBuilder(
+            \Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory::class
+        )->disableOriginalConstructor()
+            ->setMethods(['addFieldToFilter', 'getItems'])
+            ->getMock();
+        $visitorCollection->expects($this->atLeastOnce())->method('addFieldToFilter')->willReturnSelf();
+        $visitorCollection->expects($this->once())->method('getItems')->willReturn([$visitor, $visitor]);
+        $this->visitorCollectionFactoryMock->expects($this->once())->method('create')
+            ->willReturn($visitorCollection);
+        $this->saveHandlerMock->expects($this->atLeastOnce())->method('destroy')
+            ->withConsecutive(
+                ['session_id_1'],
+                ['session_id_2']
+            );
+
+        $this->assertTrue($this->accountManagement->changePassword($email, $currentPassword, $newPassword));
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php b/app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php
index a3b0dc257515b..0a94c94b95b88 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php
@@ -95,7 +95,8 @@ protected function setUp()
                 'regionFactory' => $this->regionFactoryMock,
                 'countryFactory' => $this->countryFactoryMock,
                 'resource' => $this->resourceMock,
-                'resourceCollection' => $this->resourceCollectionMock
+                'resourceCollection' => $this->resourceCollectionMock,
+                'escaper' => $this->objectManager->getObject(\Magento\Framework\Escaper::class)
             ]
         );
     }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php
index 50c21379054bf..701612c7e60fd 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php
@@ -249,7 +249,25 @@ public function getAttributesMetaDataProvider()
                                         ],
                                     ],
                                 ],
-                            ]
+                            ],
+                            'street' => [
+                                'arguments' => [
+                                    'data' => [
+                                        'config' => [
+                                            'dataType' => 'multiline',
+                                            'formElement' => 'multiline',
+                                            'visible' => true,
+                                            'required' => '1',
+                                            'label' => __('Multiline address'),
+                                            'sortOrder' => '70',
+                                            'notice' => 'note',
+                                            'default' => 'Default',
+                                            'size' => '2',
+                                            'componentType' => Field::NAME,
+                                        ],
+                                    ],
+                                ],
+                            ],
                         ],
                     ],
                 ]
@@ -477,6 +495,7 @@ protected function getAttributeMock($type = 'customer', $options = [])
         $this->injectVisibilityProps($attributeMock, $attributeBooleanMock, $options);
         if ($type == "address") {
             $mocks[] = $this->getCountryAttrMock();
+            $mocks[] = $this->getStreetAttrMock();
         }
         return $mocks;
     }
@@ -544,6 +563,54 @@ function ($origName) {
         return $countryAttrMock;
     }
 
+    /**
+     * @return AbstractAttribute|\PHPUnit_Framework_MockObject_MockObjec
+     */
+    private function getStreetAttrMock()
+    {
+        $attributeMock = $this->getMockBuilder(AbstractAttribute::class)
+            ->setMethods(
+                [
+                    'getAttributeCode',
+                    'getDataUsingMethod',
+                    'usesSource',
+                    'getFrontendInput',
+                    'getIsVisible',
+                    'getSource',
+                    'getIsUserDefined',
+                    'getUsedInForms',
+                    'getEntityType',
+                ]
+            )
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $map = [
+            ['frontend_input', null, 'multiline'],
+            ['is_required', null, '1'],
+            ['frontend_label', null, __('Multiline address')],
+            ['note', null, 'note'],
+            ['sort_order', null, '70'],
+            ['note', null, null],
+            ['default_value', null, 'Default'],
+            ['multiline_count', null, 2],
+        ];
+
+        $attributeMock->method('getDataUsingMethod')
+            ->will($this->returnValueMap($map));
+
+        $attributeMock->method('getAttributeCode')
+            ->willReturn('street');
+
+        $attributeMock->method('usesSource')
+            ->willReturn(false);
+
+        $attributeMock->method('getIsVisible')
+            ->willReturn(true);
+
+        return $attributeMock;
+    }
+
     /**
      * @return void
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -1295,16 +1362,15 @@ public function testGetDataWithVisibleAttributesWithAccountEdit()
 
         $meta = $dataProvider->getMeta();
         $this->assertNotEmpty($meta);
-        $this->assertEquals($this->getExpectationForVisibleAttributes(false), $meta);
+        $this->assertEquals($this->getExpectationForVisibleAttributes(), $meta);
     }
 
     /**
      * Retrieve all customer variations of attributes with all variations of visibility
      *
-     * @param bool $isRegistration
      * @return array
      */
-    private function getCustomerAttributeExpectations($isRegistration)
+    private function getCustomerAttributeExpectations()
     {
         return [
             self::ATTRIBUTE_CODE . "_1" => [
@@ -1314,7 +1380,7 @@ private function getCustomerAttributeExpectations($isRegistration)
                             'dataType' => 'frontend_input',
                             'formElement' => 'frontend_input',
                             'options' => 'test-options',
-                            'visible' => !$isRegistration,
+                            'visible' => true,
                             'required' => 'is_required',
                             'label' => __('frontend_label'),
                             'sortOrder' => 'sort_order',
@@ -1351,7 +1417,7 @@ private function getCustomerAttributeExpectations($isRegistration)
                         'config' => [
                             'dataType' => 'frontend_input',
                             'formElement' => 'frontend_input',
-                            'visible' => $isRegistration,
+                            'visible' => true,
                             'required' => 'is_required',
                             'label' => __('frontend_label'),
                             'sortOrder' => 'sort_order',
@@ -1374,7 +1440,7 @@ private function getCustomerAttributeExpectations($isRegistration)
                         'config' => [
                             'dataType' => 'frontend_input',
                             'formElement' => 'frontend_input',
-                            'visible' => $isRegistration,
+                            'visible' => true,
                             'required' => 'is_required',
                             'label' => __('frontend_label'),
                             'sortOrder' => 'sort_order',
@@ -1397,14 +1463,13 @@ private function getCustomerAttributeExpectations($isRegistration)
     /**
      * Retrieve all variations of attributes with all variations of visibility
      *
-     * @param bool $isRegistration
      * @return  array
      */
-    private function getExpectationForVisibleAttributes($isRegistration = true)
+    private function getExpectationForVisibleAttributes()
     {
         return [
             'customer' => [
-                'children' => $this->getCustomerAttributeExpectations($isRegistration),
+                'children' => $this->getCustomerAttributeExpectations(),
             ],
             'address' => [
                 'children' => [
@@ -1472,7 +1537,25 @@ private function getExpectationForVisibleAttributes($isRegistration = true)
                                 ],
                             ],
                         ],
-                    ]
+                    ],
+                    'street' => [
+                        'arguments' => [
+                            'data' => [
+                                'config' => [
+                                    'dataType' => 'multiline',
+                                    'formElement' => 'multiline',
+                                    'visible' => true,
+                                    'required' => '1',
+                                    'label' => __('Multiline address'),
+                                    'sortOrder' => '70',
+                                    'notice' => 'note',
+                                    'default' => 'Default',
+                                    'size' => '2',
+                                    'componentType' => Field::NAME,
+                                ],
+                            ],
+                        ],
+                    ],
                 ],
             ],
         ];
diff --git a/app/code/Magento/Customer/Test/Unit/Model/CustomerAuthUpdateTest.php b/app/code/Magento/Customer/Test/Unit/Model/CustomerAuthUpdateTest.php
index a1a243066bb7d..81a612c519f52 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/CustomerAuthUpdateTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/CustomerAuthUpdateTest.php
@@ -5,7 +5,14 @@
  */
 namespace Magento\Customer\Test\Unit\Model;
 
+use Magento\Customer\Model\Customer as CustomerModel;
 use Magento\Customer\Model\CustomerAuthUpdate;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Customer\Model\Data\CustomerSecure;
+use Magento\Customer\Model\ResourceModel\Customer as CustomerResourceModel;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Class CustomerAuthUpdateTest
@@ -18,17 +25,22 @@ class CustomerAuthUpdateTest extends \PHPUnit\Framework\TestCase
     protected $model;
 
     /**
-     * @var \Magento\Customer\Model\CustomerRegistry|\PHPUnit_Framework_MockObject_MockObject
+     * @var CustomerRegistry|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $customerRegistry;
 
     /**
-     * @var \Magento\Customer\Model\ResourceModel\Customer|\PHPUnit_Framework_MockObject_MockObject
+     * @var CustomerResourceModel|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $customerResourceModel;
 
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var CustomerModel|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $customerModel;
+
+    /**
+     * @var ObjectManager
      */
     protected $objectManager;
 
@@ -37,32 +49,36 @@ class CustomerAuthUpdateTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->objectManager = new ObjectManager($this);
 
         $this->customerRegistry =
-            $this->createMock(\Magento\Customer\Model\CustomerRegistry::class);
+            $this->createMock(CustomerRegistry::class);
         $this->customerResourceModel =
-            $this->createMock(\Magento\Customer\Model\ResourceModel\Customer::class);
+            $this->createMock(CustomerResourceModel::class);
+        $this->customerModel =
+            $this->createMock(CustomerModel::class);
 
         $this->model = $this->objectManager->getObject(
-            \Magento\Customer\Model\CustomerAuthUpdate::class,
+            CustomerAuthUpdate::class,
             [
                 'customerRegistry' => $this->customerRegistry,
                 'customerResourceModel' => $this->customerResourceModel,
+                'customerModel' => $this->customerModel
             ]
         );
     }
 
     /**
      * test SaveAuth
+     * @throws NoSuchEntityException
      */
     public function testSaveAuth()
     {
         $customerId = 1;
 
-        $customerSecureMock = $this->createMock(\Magento\Customer\Model\Data\CustomerSecure::class);
+        $customerSecureMock = $this->createMock(CustomerSecure::class);
 
-        $dbAdapter = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
+        $dbAdapter = $this->createMock(AdapterInterface::class);
 
         $this->customerRegistry->expects($this->once())
             ->method('retrieveSecureData')
@@ -98,6 +114,9 @@ public function testSaveAuth()
                 $customerId
             );
 
+        $this->customerModel->expects($this->once())
+            ->method('reindex');
+
         $this->model->saveAuth($customerId);
     }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php b/app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php
index 49a2d5e51f8f8..33757b82db891 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php
@@ -603,23 +603,35 @@ public function testPasswordResetConfirmation()
     }
 
     /**
+     * @dataProvider emailDataProvider
+     * @param string $emailType
+     * @param string $template
+     * @param string $templateIdentifier
+     * @param string|null $sendemailStoreId
+     * @param array $extensions
+     *
+     * @return void
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function testNewAccount()
-    {
+    public function testNewAccount(
+        string $emailType,
+        string $template,
+        string $templateIdentifier,
+        $sendemailStoreId,
+        array $extensions
+    ) {
         $customerId = 1;
         $customerStoreId = 2;
+        $customerName = 'Customer Name';
         $customerEmail = 'email@email.com';
         $customerData = ['key' => 'value'];
-        $customerName = 'Customer Name';
-        $templateIdentifier = 'Template Identifier';
         $sender = 'Sender';
-        $senderValues = ['name' => $sender, 'email' => $sender];
+        $senderEmail = 'sender@sender.com';
+        $senderValues = ['name' => $sender, 'email' => $senderEmail];
 
         $this->senderResolverMock
             ->expects($this->once())
             ->method('resolve')
-            ->with($sender, $customerStoreId)
             ->willReturn($senderValues);
 
         /** @var CustomerInterface | \PHPUnit_Framework_MockObject_MockObject $customer */
@@ -669,23 +681,76 @@ public function testNewAccount()
 
         $this->scopeConfigMock->expects($this->at(0))
             ->method('getValue')
-            ->with(EmailNotification::XML_PATH_REGISTER_EMAIL_TEMPLATE, ScopeInterface::SCOPE_STORE, $customerStoreId)
+            ->with($template, ScopeInterface::SCOPE_STORE, $customerStoreId)
             ->willReturn($templateIdentifier);
+
         $this->scopeConfigMock->expects($this->at(1))
             ->method('getValue')
             ->with(EmailNotification::XML_PATH_REGISTER_EMAIL_IDENTITY, ScopeInterface::SCOPE_STORE, $customerStoreId)
             ->willReturn($sender);
 
+        $templateVars = [
+            'customer' => $this->customerSecureMock,
+            'back_url' => '',
+            'store' => $this->storeMock,
+        ];
+
+        if ($template === EmailNotification::XML_PATH_CONFIRM_EMAIL_TEMPLATE) {
+            if (!empty($extensions)) {
+                $templateVars['url'] = $extensions['url'];
+                $templateVars['extensions'] = $extensions['extension_info'];
+            } else {
+                $templateVars['url'] = EmailNotification::CUSTOMER_CONFIRM_URL;
+                $templateVars['extensions'] = $extensions;
+            }
+        }
+
         $this->mockDefaultTransportBuilder(
             $templateIdentifier,
             $customerStoreId,
             $senderValues,
             $customerEmail,
             $customerName,
-            ['customer' => $this->customerSecureMock, 'back_url' => '', 'store' => $this->storeMock]
+            $templateVars
         );
 
-        $this->model->newAccount($customer, EmailNotification::NEW_ACCOUNT_EMAIL_REGISTERED, '', $customerStoreId);
+        $this->model->newAccount($customer, $emailType, '', $customerStoreId, $sendemailStoreId, $extensions);
+    }
+
+    /**
+     * @return array
+     */
+    public function emailDataProvider(): array
+    {
+        return
+        [
+            [
+                EmailNotification::NEW_ACCOUNT_EMAIL_REGISTERED,
+                EmailNotification::XML_PATH_REGISTER_EMAIL_TEMPLATE,
+                'Register',
+                null,
+                [],
+            ],
+            [
+                EmailNotification::NEW_ACCOUNT_EMAIL_CONFIRMATION,
+                EmailNotification::XML_PATH_CONFIRM_EMAIL_TEMPLATE,
+                'Confirm',
+                null,
+                [],
+            ],
+            [
+                EmailNotification::NEW_ACCOUNT_EMAIL_CONFIRMATION,
+                EmailNotification::XML_PATH_CONFIRM_EMAIL_TEMPLATE,
+                'Confirm',
+                null,
+                [
+                    'url' => "customer/account/confirm",
+                    'extension_info' => [
+                        'test_extension' => "NTowU0Q5amZneEtSZnRDajRFZFVDVmZCbnhRWnZ0cFFkOA,,",
+                    ],
+                ],
+            ],
+        ];
     }
 
     /**
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataCacheTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataCacheTest.php
index 658472d13ab93..d93ed3c7b351a 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataCacheTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataCacheTest.php
@@ -15,7 +15,14 @@
 use Magento\Framework\App\CacheInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
+/**
+ * Class AttributeMetadataCache Test
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class AttributeMetadataCacheTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -43,6 +50,16 @@ class AttributeMetadataCacheTest extends \PHPUnit\Framework\TestCase
      */
     private $attributeMetadataCache;
 
+    /**
+     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeMock;
+
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
@@ -50,13 +67,18 @@ protected function setUp()
         $this->stateMock = $this->createMock(StateInterface::class);
         $this->serializerMock = $this->createMock(SerializerInterface::class);
         $this->attributeMetadataHydratorMock = $this->createMock(AttributeMetadataHydrator::class);
+        $this->storeMock = $this->createMock(StoreInterface::class);
+        $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
+        $this->storeManagerMock->method('getStore')->willReturn($this->storeMock);
+        $this->storeMock->method('getId')->willReturn(1);
         $this->attributeMetadataCache = $objectManager->getObject(
             AttributeMetadataCache::class,
             [
                 'cache' => $this->cacheMock,
                 'state' => $this->stateMock,
                 'serializer' => $this->serializerMock,
-                'attributeMetadataHydrator' => $this->attributeMetadataHydratorMock
+                'attributeMetadataHydrator' => $this->attributeMetadataHydratorMock,
+                'storeManager' => $this->storeManagerMock
             ]
         );
     }
@@ -80,7 +102,8 @@ public function testLoadNoCache()
     {
         $entityType = 'EntityType';
         $suffix = 'none';
-        $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
+        $storeId = 1;
+        $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
         $this->stateMock->expects($this->once())
             ->method('isEnabled')
             ->with(Type::TYPE_IDENTIFIER)
@@ -96,7 +119,8 @@ public function testLoad()
     {
         $entityType = 'EntityType';
         $suffix = 'none';
-        $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
+        $storeId = 1;
+        $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
         $serializedString = 'serialized string';
         $attributeMetadataOneData = [
             'attribute_code' => 'attribute_code',
@@ -156,7 +180,8 @@ public function testSave()
     {
         $entityType = 'EntityType';
         $suffix = 'none';
-        $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
+        $storeId = 1;
+        $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
         $serializedString = 'serialized string';
         $attributeMetadataOneData = [
             'attribute_code' => 'attribute_code',
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php
index e4dc22ba40e31..667fc87b6a82b 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php
@@ -205,6 +205,8 @@ public function applyOutputFilterDataProvider()
     }
 
     /**
+     * Tests input validation rules.
+     *
      * @param null|string $value
      * @param null|string $label
      * @param null|string $inputValidation
@@ -217,25 +219,18 @@ public function testValidateInputRule($value, $label, $inputValidation, $expecte
             ->disableOriginalConstructor()
             ->setMethods(['getName', 'getValue'])
             ->getMockForAbstractClass();
-        $validationRule->expects($this->any())
-            ->method('getName')
-            ->will($this->returnValue('input_validation'));
-        $validationRule->expects($this->any())
-            ->method('getValue')
-            ->will($this->returnValue($inputValidation));
-
-        $this->_attributeMock->expects($this->any())->method('getStoreLabel')->will($this->returnValue($label));
-        $this->_attributeMock->expects(
-            $this->any()
-        )->method(
-            'getValidationRules'
-        )->will(
-            $this->returnValue(
-                [
-                    $validationRule,
-                ]
-            )
-        );
+
+        $validationRule->method('getName')
+            ->willReturn('input_validation');
+
+        $validationRule->method('getValue')
+            ->willReturn($inputValidation);
+
+        $this->_attributeMock->method('getStoreLabel')
+            ->willReturn($label);
+
+        $this->_attributeMock->method('getValidationRules')
+            ->willReturn([$validationRule]);
 
         $this->assertEquals($expectedOutput, $this->_model->validateInputRule($value));
     }
@@ -256,6 +251,16 @@ public function validateInputRuleDataProvider()
                     \Zend_Validate_Alnum::NOT_ALNUM => '"mylabel" contains non-alphabetic or non-numeric characters.'
                 ]
             ],
+            [
+                'abc qaz',
+                'mylabel',
+                'alphanumeric',
+                [
+                    \Zend_Validate_Alnum::NOT_ALNUM => '"mylabel" contains non-alphabetic or non-numeric characters.',
+                ],
+            ],
+            ['abcqaz', 'mylabel', 'alphanumeric', true],
+            ['abc qaz', 'mylabel', 'alphanum-with-spaces', true],
             [
                 '!@#$',
                 'mylabel',
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php b/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php
index c655ff7056ed6..0f0fb9f29eb2c 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Customer\Test\Unit\Model\Renderer;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
 class RegionTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -23,7 +25,7 @@ public function testRender($regionCollection)
         $escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
         $elementMock = $this->createPartialMock(
             \Magento\Framework\Data\Form\Element\AbstractElement::class,
-            ['getForm', 'getHtmlAttributes']
+            ['getForm', 'getHtmlAttributes', 'getHtmlId', 'getName']
         );
         $countryMock = $this->createPartialMock(
             \Magento\Framework\Data\Form\Element\AbstractElement::class,
@@ -58,6 +60,15 @@ public function testRender($regionCollection)
                 ]
             )
         );
+
+        $objectManager = new ObjectManager($this);
+        $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
+        $objectManager->setBackwardCompatibleProperty(
+            $elementMock,
+            '_escaper',
+            $escaper
+        );
+
         $formMock->expects(
             $this->any()
         )->method(
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
index 215cc32193b18..16dfdc4eb9158 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
@@ -19,72 +19,72 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Customer\Model\CustomerFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $customerFactory;
+    private $customerFactory;
 
     /**
      * @var \Magento\Customer\Model\Data\CustomerSecureFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $customerSecureFactory;
+    private $customerSecureFactory;
 
     /**
      * @var \Magento\Customer\Model\CustomerRegistry|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $customerRegistry;
+    private $customerRegistry;
 
     /**
      * @var \Magento\Customer\Model\ResourceModel\AddressRepository|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $addressRepository;
+    private $addressRepository;
 
     /**
      * @var \Magento\Customer\Model\ResourceModel\Customer|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $customerResourceModel;
+    private $customerResourceModel;
 
     /**
      * @var \Magento\Customer\Api\CustomerMetadataInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $customerMetadata;
+    private $customerMetadata;
 
     /**
      * @var \Magento\Customer\Api\Data\CustomerSearchResultsInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $searchResultsFactory;
+    private $searchResultsFactory;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $eventManager;
+    private $eventManager;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $storeManager;
+    private $storeManager;
 
     /**
      * @var \Magento\Framework\Api\ExtensibleDataObjectConverter|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $extensibleDataObjectConverter;
+    private $extensibleDataObjectConverter;
 
     /**
      * @var \Magento\Framework\Api\DataObjectHelper|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $dataObjectHelper;
+    private $dataObjectHelper;
 
     /**
      * @var \Magento\Framework\Api\ImageProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $imageProcessor;
+    private $imageProcessor;
 
     /**
      * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $extensionAttributesJoinProcessor;
+    private $extensionAttributesJoinProcessor;
 
     /**
      * @var \Magento\Customer\Api\Data\CustomerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $customer;
+    private $customer;
 
     /**
      * @var CollectionProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
@@ -92,14 +92,14 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
     private $collectionProcessorMock;
 
     /**
-     * @var \Magento\Customer\Model\ResourceModel\CustomerRepository
+     * @var NotificationStorage|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $model;
+    private $notificationStorage;
 
     /**
-     * @var NotificationStorage
+     * @var \Magento\Customer\Model\ResourceModel\CustomerRepository
      */
-    private $notificationStorage;
+    private $model;
 
     protected function setUp()
     {
@@ -107,7 +107,7 @@ protected function setUp()
             $this->createMock(\Magento\Customer\Model\ResourceModel\Customer::class);
         $this->customerRegistry = $this->createMock(\Magento\Customer\Model\CustomerRegistry::class);
         $this->dataObjectHelper = $this->createMock(\Magento\Framework\Api\DataObjectHelper::class);
-        $this->customerFactory  =
+        $this->customerFactory =
             $this->createPartialMock(\Magento\Customer\Model\CustomerFactory::class, ['create']);
         $this->customerSecureFactory = $this->createPartialMock(
             \Magento\Customer\Model\Data\CustomerSecureFactory::class,
@@ -193,38 +193,10 @@ protected function setUp()
     public function testSave()
     {
         $customerId = 1;
-        $storeId = 2;
 
-        $region = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\RegionInterface::class, [], '', false);
-        $address = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\Data\AddressInterface::class,
-            [],
-            '',
-            false,
-            false,
-            true,
+        $customerModel = $this->createPartialMock(
+            \Magento\Customer\Model\Customer::class,
             [
-                'setCustomerId',
-                'setRegion',
-                'getRegion',
-                'getId'
-            ]
-        );
-        $address2 = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\Data\AddressInterface::class,
-            [],
-            '',
-            false,
-            false,
-            true,
-            [
-                'setCustomerId',
-                'setRegion',
-                'getRegion',
-                'getId'
-            ]
-        );
-        $customerModel = $this->createPartialMock(\Magento\Customer\Model\Customer::class, [
                 'getId',
                 'setId',
                 'setStoreId',
@@ -239,14 +211,11 @@ public function testSave()
                 'setFirstFailure',
                 'setLockExpires',
                 'save',
-            ]);
+            ]
+        );
 
         $origCustomer = $this->customer;
 
-        $this->customer->expects($this->atLeastOnce())
-            ->method('__toArray')
-            ->willReturn(['default_billing', 'default_shipping']);
-
         $customerAttributesMetaData = $this->getMockForAbstractClass(
             \Magento\Framework\Api\CustomAttributesDataInterface::class,
             [],
@@ -262,17 +231,23 @@ public function testSave()
                 'setAddresses'
             ]
         );
-        $customerSecureData = $this->createPartialMock(\Magento\Customer\Model\Data\CustomerSecure::class, [
+        $customerSecureData = $this->createPartialMock(
+            \Magento\Customer\Model\Data\CustomerSecure::class,
+            [
                 'getRpToken',
                 'getRpTokenCreatedAt',
                 'getPasswordHash',
                 'getFailuresNum',
                 'getFirstFailure',
                 'getLockExpires',
-            ]);
+            ]
+        );
         $this->customer->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($customerId);
+        $this->customer->expects($this->atLeastOnce())
+            ->method('__toArray')
+            ->willReturn([]);
         $this->customerRegistry->expects($this->atLeastOnce())
             ->method('retrieve')
             ->with($customerId)
@@ -287,28 +262,6 @@ public function testSave()
         $this->customerRegistry->expects($this->atLeastOnce())
             ->method("remove")
             ->with($customerId);
-        $address->expects($this->once())
-            ->method('setCustomerId')
-            ->with($customerId)
-            ->willReturnSelf();
-        $address->expects($this->once())
-            ->method('getRegion')
-            ->willReturn($region);
-        $address->expects($this->atLeastOnce())
-            ->method('getId')
-            ->willReturn(7);
-        $address->expects($this->once())
-            ->method('setRegion')
-            ->with($region);
-        $customerAttributesMetaData->expects($this->atLeastOnce())
-            ->method('getAddresses')
-            ->willReturn([$address]);
-        $customerAttributesMetaData->expects($this->at(1))
-            ->method('setAddresses')
-            ->with([]);
-        $customerAttributesMetaData->expects($this->at(2))
-            ->method('setAddresses')
-            ->with([$address]);
         $this->extensibleDataObjectConverter->expects($this->once())
             ->method('toNestedArray')
             ->with($customerAttributesMetaData, [], \Magento\Customer\Api\Data\CustomerInterface::class)
@@ -320,17 +273,6 @@ public function testSave()
         $customerModel->expects($this->once())
             ->method('getStoreId')
             ->willReturn(null);
-        $store = $this->createMock(\Magento\Store\Model\Store::class);
-        $store->expects($this->once())
-            ->method('getId')
-            ->willReturn($storeId);
-        $this->storeManager
-            ->expects($this->once())
-            ->method('getStore')
-            ->willReturn($store);
-        $customerModel->expects($this->once())
-            ->method('setStoreId')
-            ->with($storeId);
         $customerModel->expects($this->once())
             ->method('setId')
             ->with($customerId);
@@ -362,16 +304,20 @@ public function testSave()
 
         $customerModel->expects($this->once())
             ->method('setRpToken')
-            ->willReturnMap([
-                ['rpToken', $customerModel],
-                [null, $customerModel],
-            ]);
+            ->willReturnMap(
+                [
+                    ['rpToken', $customerModel],
+                    [null, $customerModel],
+                ]
+            );
         $customerModel->expects($this->once())
             ->method('setRpTokenCreatedAt')
-            ->willReturnMap([
-                ['rpTokenCreatedAt', $customerModel],
-                [null, $customerModel],
-            ]);
+            ->willReturnMap(
+                [
+                    ['rpTokenCreatedAt', $customerModel],
+                    [null, $customerModel],
+                ]
+            );
 
         $customerModel->expects($this->once())
             ->method('setPasswordHash')
@@ -393,12 +339,6 @@ public function testSave()
         $this->customerRegistry->expects($this->once())
             ->method('push')
             ->with($customerModel);
-        $this->customer->expects($this->once())
-            ->method('getAddresses')
-            ->willReturn([$address, $address2]);
-        $this->addressRepository->expects($this->once())
-            ->method('save')
-            ->with($address);
         $customerAttributesMetaData->expects($this->once())
             ->method('getEmail')
             ->willReturn('example@example.com');
@@ -429,59 +369,24 @@ public function testSave()
     public function testSaveWithPasswordHash()
     {
         $customerId = 1;
-        $storeId = 2;
         $passwordHash = 'ukfa4sdfa56s5df02asdf4rt';
 
-        $customerSecureData = $this->createPartialMock(\Magento\Customer\Model\Data\CustomerSecure::class, [
+        $customerSecureData = $this->createPartialMock(
+            \Magento\Customer\Model\Data\CustomerSecure::class,
+            [
                 'getRpToken',
                 'getRpTokenCreatedAt',
                 'getPasswordHash',
                 'getFailuresNum',
                 'getFirstFailure',
                 'getLockExpires',
-            ]);
-        $region = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\Data\RegionInterface::class,
-            [],
-            '',
-            false
-        );
-        $address = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\Data\AddressInterface::class,
-            [],
-            '',
-            false,
-            false,
-            true,
-            [
-                'setCustomerId',
-                'setRegion',
-                'getRegion',
-                'getId'
-            ]
-        );
-        $address2 = $this->getMockForAbstractClass(
-            \Magento\Customer\Api\Data\AddressInterface::class,
-            [],
-            '',
-            false,
-            false,
-            true,
-            [
-                'setCustomerId',
-                'setRegion',
-                'getRegion',
-                'getId'
             ]
         );
-
         $origCustomer = $this->customer;
 
-        $this->customer->expects($this->atLeastOnce())
-            ->method('__toArray')
-            ->willReturn(['default_billing', 'default_shipping']);
-
-        $customerModel = $this->createPartialMock(\Magento\Customer\Model\Customer::class, [
+        $customerModel = $this->createPartialMock(
+            \Magento\Customer\Model\Customer::class,
+            [
                 'getId',
                 'setId',
                 'setStoreId',
@@ -493,7 +398,8 @@ public function testSaveWithPasswordHash()
                 'getDataModel',
                 'setPasswordHash',
                 'save',
-            ]);
+            ]
+        );
         $customerAttributesMetaData = $this->getMockForAbstractClass(
             \Magento\Framework\Api\CustomAttributesDataInterface::class,
             [],
@@ -544,10 +450,12 @@ public function testSaveWithPasswordHash()
         $customerSecureData->expects($this->once())
             ->method('getLockExpires')
             ->willReturn('lockExpires');
-
         $this->customer->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($customerId);
+        $this->customer->expects($this->atLeastOnce())
+            ->method('__toArray')
+            ->willReturn([]);
         $this->customerRegistry->expects($this->atLeastOnce())
             ->method('retrieve')
             ->with($customerId)
@@ -559,28 +467,6 @@ public function testSaveWithPasswordHash()
             ->method('save')
             ->with($this->customer, CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, $this->customer)
             ->willReturn($customerAttributesMetaData);
-        $address->expects($this->once())
-            ->method('setCustomerId')
-            ->with($customerId)
-            ->willReturnSelf();
-        $address->expects($this->once())
-            ->method('getRegion')
-            ->willReturn($region);
-        $address->expects($this->atLeastOnce())
-            ->method('getId')
-            ->willReturn(7);
-        $address->expects($this->once())
-            ->method('setRegion')
-            ->with($region);
-        $customerAttributesMetaData->expects($this->any())
-            ->method('getAddresses')
-            ->willReturn([$address]);
-        $customerAttributesMetaData->expects($this->at(1))
-            ->method('setAddresses')
-            ->with([]);
-        $customerAttributesMetaData->expects($this->at(2))
-            ->method('setAddresses')
-            ->with([$address]);
         $customerAttributesMetaData
             ->expects($this->atLeastOnce())
             ->method('getId')
@@ -593,20 +479,6 @@ public function testSaveWithPasswordHash()
             ->method('create')
             ->with(['data' => ['customerData']])
             ->willReturn($customerModel);
-        $customerModel->expects($this->once())
-            ->method('getStoreId')
-            ->willReturn(null);
-        $store = $this->createMock(\Magento\Store\Model\Store::class);
-        $store->expects($this->once())
-            ->method('getId')
-            ->willReturn($storeId);
-        $this->storeManager
-            ->expects($this->once())
-            ->method('getStore')
-            ->willReturn($store);
-        $customerModel->expects($this->once())
-            ->method('setStoreId')
-            ->with($storeId);
         $customerModel->expects($this->once())
             ->method('setId')
             ->with($customerId);
@@ -618,12 +490,6 @@ public function testSaveWithPasswordHash()
         $this->customerRegistry->expects($this->once())
             ->method('push')
             ->with($customerModel);
-        $this->customer->expects($this->any())
-            ->method('getAddresses')
-            ->willReturn([$address, $address2]);
-        $this->addressRepository->expects($this->once())
-            ->method('save')
-            ->with($address);
         $customerAttributesMetaData->expects($this->once())
             ->method('getEmail')
             ->willReturn('example@example.com');
@@ -740,7 +606,7 @@ public function testGetList()
             ->willReturnSelf();
         $collection->expects($this->at(7))
             ->method('joinAttribute')
-            ->with('company', 'customer_address/company', 'default_billing', null, 'left')
+            ->with('billing_company', 'customer_address/company', 'default_billing', null, 'left')
             ->willReturnSelf();
         $this->collectionProcessorMock->expects($this->once())
             ->method('process')
diff --git a/app/code/Magento/Customer/Test/Unit/Observer/UpgradeCustomerPasswordObserverTest.php b/app/code/Magento/Customer/Test/Unit/Observer/UpgradeCustomerPasswordObserverTest.php
index 8971f155f782e..313121604e567 100644
--- a/app/code/Magento/Customer/Test/Unit/Observer/UpgradeCustomerPasswordObserverTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Observer/UpgradeCustomerPasswordObserverTest.php
@@ -7,6 +7,9 @@
 
 use Magento\Customer\Observer\UpgradeCustomerPasswordObserver;
 
+/**
+ * Unit test for Magento\Customer\Observer\UpgradeCustomerPasswordObserver.
+ */
 class UpgradeCustomerPasswordObserverTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -29,9 +32,13 @@ class UpgradeCustomerPasswordObserverTest extends \PHPUnit\Framework\TestCase
      */
     protected $customerRegistry;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->customerRepository = $this->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
+        $this->customerRepository = $this
+            ->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
             ->getMockForAbstractClass();
         $this->customerRegistry = $this->getMockBuilder(\Magento\Customer\Model\CustomerRegistry::class)
             ->disableOriginalConstructor()
@@ -47,6 +54,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * Unit test for verifying customers password upgrade observer
+     */
     public function testUpgradeCustomerPassword()
     {
         $customerId = '1';
@@ -57,6 +67,8 @@ public function testUpgradeCustomerPassword()
             ->setMethods(['getId'])
             ->getMock();
         $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+            ->setMethods(['setData'])
+            ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $customerSecure = $this->getMockBuilder(\Magento\Customer\Model\Data\CustomerSecure::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php
index 130b3acd11e76..b57bc53ef09f9 100644
--- a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php
@@ -18,12 +18,6 @@ class ValidationRulesTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->validationRules = $this->getMockBuilder(
-            \Magento\Customer\Ui\Component\Listing\Column\ValidationRules::class
-        )
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $this->validationRule = $this->getMockBuilder(\Magento\Customer\Api\Data\ValidationRuleInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -31,18 +25,25 @@ protected function setUp()
         $this->validationRules = new ValidationRules();
     }
 
-    public function testGetValidationRules()
+    /**
+     * Tests input validation rules.
+     *
+     * @param string $validationRule
+     * @param string $validationClass
+     * @return void
+     * @dataProvider validationRulesDataProvider
+     */
+    public function testGetValidationRules(string $validationRule, string $validationClass)
     {
         $expectsRules = [
             'required-entry' => true,
-            'validate-number' => true,
+            $validationClass => true,
         ];
-        $this->validationRule->expects($this->atLeastOnce())
-            ->method('getName')
+        $this->validationRule->method('getName')
             ->willReturn('input_validation');
-        $this->validationRule->expects($this->atLeastOnce())
-            ->method('getValue')
-            ->willReturn('numeric');
+
+        $this->validationRule->method('getValue')
+            ->willReturn($validationRule);
 
         $this->assertEquals(
             $expectsRules,
@@ -66,4 +67,21 @@ public function testGetValidationRulesWithOnlyRequiredRule()
             $this->validationRules->getValidationRules(true, [])
         );
     }
+
+    /**
+     * Provides possible validation rules.
+     *
+     * @return array
+     */
+    public function validationRulesDataProvider(): array
+    {
+        return [
+            ['alpha', 'validate-alpha'],
+            ['numeric', 'validate-number'],
+            ['alphanumeric', 'validate-alphanum'],
+            ['alphanum-with-spaces', 'validate-alphanum-with-spaces'],
+            ['url', 'validate-url'],
+            ['email', 'validate-email'],
+        ];
+    }
 }
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php
index b8f83421a6d62..6befec8e942a1 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php
@@ -7,6 +7,9 @@
 
 use Magento\Customer\Api\Data\ValidationRuleInterface;
 
+/**
+ * Provides validation classes according to corresponding rules.
+ */
 class ValidationRules
 {
     /**
@@ -16,6 +19,7 @@ class ValidationRules
         'alpha' => 'validate-alpha',
         'numeric' => 'validate-number',
         'alphanumeric' => 'validate-alphanum',
+        'alphanum-with-spaces' => 'validate-alphanum-with-spaces',
         'url' => 'validate-url',
         'email' => 'validate-email',
     ];
diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json
index e3d8f22088ef6..67945e6ea5b4c 100644
--- a/app/code/Magento/Customer/composer.json
+++ b/app/code/Magento/Customer/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-customer",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-eav": "101.0.*",
         "magento/module-directory": "100.2.*",
@@ -29,7 +29,7 @@
         "magento/module-customer-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "101.0.6",
+    "version": "101.0.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Customer/etc/di.xml b/app/code/Magento/Customer/etc/di.xml
index fa7dd80882632..c6e383fb73bde 100644
--- a/app/code/Magento/Customer/etc/di.xml
+++ b/app/code/Magento/Customer/etc/di.xml
@@ -127,6 +127,13 @@
             <argument name="groupManagement" xsi:type="object">Magento\Customer\Api\GroupManagementInterface\Proxy</argument>
         </arguments>
     </type>
+    <type name="Magento\Customer\Model\Metadata\CustomerMetadata">
+        <arguments>
+            <argument name="systemAttributes" xsi:type="array">
+                <item name="disable_auto_group_change" xsi:type="string">disable_auto_group_change</item>
+            </argument>
+        </arguments>
+    </type>
     <virtualType name="SectionInvalidationConfigReader" type="Magento\Framework\Config\Reader\Filesystem">
         <arguments>
             <argument name="idAttributes" xsi:type="array">
diff --git a/app/code/Magento/Customer/etc/frontend/di.xml b/app/code/Magento/Customer/etc/frontend/di.xml
index 4a45c4ad48d19..c31742519e581 100644
--- a/app/code/Magento/Customer/etc/frontend/di.xml
+++ b/app/code/Magento/Customer/etc/frontend/di.xml
@@ -57,7 +57,7 @@
     <type name="Magento\Checkout\Block\Cart\Sidebar">
         <plugin name="customer_cart" type="Magento\Customer\Model\Cart\ConfigPlugin" />
     </type>
-    <type name="Magento\Framework\Session\SessionManager">
+    <type name="Magento\Framework\Session\SessionManagerInterface">
         <plugin name="session_checker" type="Magento\Customer\CustomerData\Plugin\SessionChecker" />
     </type>
     <type name="Magento\Authorization\Model\CompositeUserContext">
@@ -77,4 +77,4 @@
             </argument>
         </arguments>
     </type>
-</config>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml
index f8aa078f45e4d..0e6f31a90243f 100644
--- a/app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml
+++ b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml
@@ -174,6 +174,7 @@
         </column>
         <column name="billing_country_id" component="Magento_Ui/js/grid/columns/select" sortOrder="80">
             <settings>
+                <options class="Magento\Customer\Model\ResourceModel\Address\Attribute\Source\CountryWithWebsites"/>
                 <filter>select</filter>
                 <dataType>select</dataType>
                 <label translate="true">Country</label>
diff --git a/app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html b/app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html
index 010087ace2d42..9b183d63471f3 100644
--- a/app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html
+++ b/app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html
@@ -9,7 +9,9 @@
 "var this.getUrl($store, 'customer/account/confirm/', [_query:[id:$customer.id, key:$customer.confirmation, back_url:$back_url]])":"Account Confirmation URL",
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
 "var customer.email":"Customer Email",
-"var customer.name":"Customer Name"
+"var customer.name":"Customer Name",
+"var extensions":"Extensions",
+"var url":"Url"
 } @-->
 
 {{template config_path="design/email/header_template"}}
@@ -23,7 +25,7 @@
             <table class="inner-wrapper" border="0" cellspacing="0" cellpadding="0" align="center">
                 <tr>
                     <td align="center">
-                        <a href="{{var this.getUrl($store,'customer/account/confirm/',[_query:[id:$customer.id,key:$customer.confirmation,back_url:$back_url],_nosid:1])}}" target="_blank">{{trans "Confirm Your Account"}}</a>
+                        <a href="{{var this.getUrl($store,$url,[_query:[id:$customer.id,key:$customer.confirmation,extensions:$extensions,back_url:$back_url],_nosid:1])}}" target="_blank">{{trans "Confirm Your Account"}}</a>
                     </td>
                 </tr>
             </table>
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_forgotpassword.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_forgotpassword.xml
index 9a701c14a0307..24cede5f0232a 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account_forgotpassword.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_forgotpassword.xml
@@ -7,7 +7,7 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
-        <title>Forgot Your Password</title>
+        <title>Forgot Your Password?</title>
     </head>
     <body>
         <referenceBlock name="root">
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_login.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_login.xml
index d49dae6dee58f..3518df736c4ac 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account_login.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_login.xml
@@ -6,6 +6,9 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <title>Customer Login</title>
+    </head>
     <body>
         <referenceContainer name="content">
             <!-- customer.form.login.extra -->
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml b/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
index f053805409fe5..f5ee2b347a5b2 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
@@ -20,6 +20,7 @@
             <block class="Magento\Customer\Block\Address\Edit" name="customer_address_edit" template="Magento_Customer::address/edit.phtml" cacheable="false">
                 <arguments>
                     <argument name="attribute_data" xsi:type="object">Magento\Customer\Block\DataProviders\AddressAttributeData</argument>
+                    <argument name="post_code_config" xsi:type="object">Magento\Customer\Block\DataProviders\PostCodesPatternsAttributeData</argument>
                 </arguments>
             </block>
         </referenceContainer>
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
index 644238e3949c5..992c866316d79 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -126,6 +126,9 @@
                        title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?>"
                        id="zip"
                        class="input-text validate-zip-international <?= $block->escapeHtmlAttr($this->helper(\Magento\Customer\Helper\Address::class)->getAttributeValidationClass('postcode')) ?>">
+                <div role="alert" class="message warning" style="display:none">
+                    <span></span>
+                </div>
             </div>
         </div>
         <div class="field country required">
@@ -184,7 +187,9 @@
 <script type="text/x-magento-init">
     {
         "#form-validate": {
-            "addressValidation": {}
+            "addressValidation": {
+                "postCodes": <?= /* @noEscape */ $block->getPostCodeConfig()->getSerializedPostCodes(); ?>
+            }
         },
         "#country": {
             "regionUpdater": {
diff --git a/app/code/Magento/Customer/view/frontend/web/js/address.js b/app/code/Magento/Customer/view/frontend/web/js/address.js
index c6d05b51bdf0b..5499327c2e27d 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/address.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/address.js
@@ -6,9 +6,10 @@
 define([
     'jquery',
     'Magento_Ui/js/modal/confirm',
+    'mage/dataPost',
     'jquery/ui',
     'mage/translate'
-], function ($, confirm) {
+], function ($, confirm, dataPost) {
     'use strict';
 
     $.widget('mage.address', {
@@ -53,7 +54,8 @@ define([
          * @return {Boolean}
          */
         _deleteAddress: function (e) {
-            var self = this;
+            var self = this,
+                addressId;
 
             confirm({
                 content: this.options.deleteConfirmMessage,
@@ -62,12 +64,17 @@ define([
                     /** @inheritdoc */
                     confirm: function () {
                         if (typeof $(e.target).parent().data('address') !== 'undefined') {
-                            window.location = self.options.deleteUrlPrefix + $(e.target).parent().data('address') +
-                                '/form_key/' + $.mage.cookies.get('form_key');
+                            addressId = $(e.target).parent().data('address');
                         } else {
-                            window.location = self.options.deleteUrlPrefix + $(e.target).data('address') +
-                                '/form_key/' + $.mage.cookies.get('form_key');
+                            addressId = $(e.target).data('address');
                         }
+
+                        dataPost().postData({
+                            action: self.options.deleteUrlPrefix + addressId,
+                            data: {
+                                'form_key': $.mage.cookies.get('form_key')
+                            }
+                        });
                     }
                 }
             });
diff --git a/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js b/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js
index be2960701deed..c014b814ea98b 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js
@@ -5,25 +5,38 @@
 
 define([
     'jquery',
+    'underscore',
+    'mageUtils',
+    'mage/translate',
+    'Magento_Checkout/js/model/postcode-validator',
     'jquery/ui',
     'validation'
-], function ($) {
+], function ($, __, utils, $t, postCodeValidator) {
     'use strict';
 
     $.widget('mage.addressValidation', {
         options: {
             selectors: {
-                button: '[data-action=save-address]'
+                button: '[data-action=save-address]',
+                zip: '#zip',
+                country: 'select[name="country_id"]:visible'
             }
         },
 
+        zipInput: null,
+        countrySelect: null,
+
         /**
          * Validation creation
+         *
          * @protected
          */
         _create: function () {
             var button = $(this.options.selectors.button, this.element);
 
+            this.zipInput = $(this.options.selectors.zip, this.element);
+            this.countrySelect = $(this.options.selectors.country, this.element);
+
             this.element.validation({
 
                 /**
@@ -36,6 +49,75 @@ define([
                     form.submit();
                 }
             });
+
+            this._addPostCodeValidation();
+        },
+
+        /**
+         * Add postcode validation
+         *
+         * @protected
+         */
+        _addPostCodeValidation: function () {
+            var self = this;
+
+            this.zipInput.on('keyup', __.debounce(function (event) {
+                    var valid = self._validatePostCode(event.target.value);
+
+                    self._renderValidationResult(valid);
+                }, 500)
+            );
+
+            this.countrySelect.on('change', function () {
+                var valid = self._validatePostCode(self.zipInput.val());
+
+                self._renderValidationResult(valid);
+            });
+        },
+
+        /**
+         * Validate post code value.
+         *
+         * @protected
+         * @param {String} postCode - post code
+         * @return {Boolean} Whether is post code valid
+         */
+        _validatePostCode: function (postCode) {
+            var countryId = this.countrySelect.val();
+
+            if (postCode === null) {
+                return true;
+            }
+
+            return postCodeValidator.validate(postCode, countryId, this.options.postCodes);
+        },
+
+        /**
+         * Renders warning messages for invalid post code.
+         *
+         * @protected
+         * @param {Boolean} valid
+         */
+        _renderValidationResult: function (valid) {
+            var warnMessage,
+                alertDiv = this.zipInput.next();
+
+            if (!valid) {
+                warnMessage = $t('Provided Zip/Postal Code seems to be invalid.');
+
+                if (postCodeValidator.validatedPostCodeExample.length) {
+                    warnMessage += $t(' Example: ') + postCodeValidator.validatedPostCodeExample.join('; ') + '. ';
+                }
+                warnMessage += $t('If you believe it is the right one you can ignore this notice.');
+            }
+
+            alertDiv.children(':first').text(warnMessage);
+
+            if (valid) {
+                alertDiv.hide();
+            } else {
+                alertDiv.show();
+            }
         }
     });
 
diff --git a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
index 39e3f8d95ee3b..66d37cb84e9cb 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
@@ -216,6 +216,9 @@ define([
                     $.cookieStorage.set(privateContentVersion, privateContent);
                 }
                 $.localStorage.set(privateContentVersion, privateContent);
+                _.each(dataProvider.getFromStorage(storage.keys()), function (sectionData, sectionName) {
+                    buffer.notify(sectionName, sectionData);
+                });
                 this.reload([], false);
                 isLoading = true;
             } else if (expiredSectionNames.length > 0) {
diff --git a/app/code/Magento/CustomerAnalytics/composer.json b/app/code/Magento/CustomerAnalytics/composer.json
index d9c428ffcf5b7..9f0a1953eef99 100644
--- a/app/code/Magento/CustomerAnalytics/composer.json
+++ b/app/code/Magento/CustomerAnalytics/composer.json
@@ -2,12 +2,12 @@
     "name": "magento/module-customer-analytics",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*",
         "magento/module-customer": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json
index d71be31723043..a77ce7a6fb63e 100644
--- a/app/code/Magento/CustomerImportExport/composer.json
+++ b/app/code/Magento/CustomerImportExport/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-customer-import-export",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-backend": "100.2.*",
         "magento/module-customer": "101.0.*",
@@ -12,7 +12,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Deploy/Collector/Collector.php b/app/code/Magento/Deploy/Collector/Collector.php
index b02c8e478d639..0a71af5758b7d 100644
--- a/app/code/Magento/Deploy/Collector/Collector.php
+++ b/app/code/Magento/Deploy/Collector/Collector.php
@@ -5,9 +5,11 @@
  */
 namespace Magento\Deploy\Collector;
 
-use Magento\Deploy\Source\SourcePool;
 use Magento\Deploy\Package\Package;
 use Magento\Deploy\Package\PackageFactory;
+use Magento\Deploy\Source\SourcePool;
+use Magento\Deploy\Package\PackageFile;
+use Magento\Framework\Module\Manager;
 use Magento\Framework\View\Asset\PreProcessor\FileNameResolver;
 
 /**
@@ -44,6 +46,9 @@ class Collector implements CollectorInterface
      */
     private $packageFactory;
 
+    /** @var \Magento\Framework\Module\Manager */
+    private $moduleManager;
+
     /**
      * Default values for package primary identifiers
      *
@@ -61,15 +66,19 @@ class Collector implements CollectorInterface
      * @param SourcePool $sourcePool
      * @param FileNameResolver $fileNameResolver
      * @param PackageFactory $packageFactory
+     * @param Manager $moduleManager
      */
     public function __construct(
         SourcePool $sourcePool,
         FileNameResolver $fileNameResolver,
-        PackageFactory $packageFactory
+        PackageFactory $packageFactory,
+        Manager $moduleManager = null
     ) {
         $this->sourcePool = $sourcePool;
         $this->fileNameResolver = $fileNameResolver;
         $this->packageFactory = $packageFactory;
+        $this->moduleManager = $moduleManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(Manager::class);
     }
 
     /**
@@ -81,19 +90,11 @@ public function collect()
         foreach ($this->sourcePool->getAll() as $source) {
             $files = $source->get();
             foreach ($files as $file) {
-                $file->setDeployedFileName($this->fileNameResolver->resolve($file->getFileName()));
-                $params = [
-                    'area' => $file->getArea(),
-                    'theme' => $file->getTheme(),
-                    'locale' => $file->getLocale(),
-                    'module' => $file->getModule(),
-                    'isVirtual' => (!$file->getLocale() || !$file->getTheme() || !$file->getArea())
-                ];
-                foreach ($this->packageDefaultValues as $name => $value) {
-                    if (!isset($params[$name])) {
-                        $params[$name] = $value;
-                    }
+                if ($file->getModule() && !$this->moduleManager->isEnabled($file->getModule())) {
+                    continue;
                 }
+                $file->setDeployedFileName($this->fileNameResolver->resolve($file->getFileName()));
+                $params = $this->getParams($file);
                 $packagePath = "{$params['area']}/{$params['theme']}/{$params['locale']}";
                 if (!isset($packages[$packagePath])) {
                     $packages[$packagePath] = $this->packageFactory->create($params);
@@ -105,4 +106,28 @@ public function collect()
         }
         return $packages;
     }
+
+    /**
+     * Retrieve package params.
+     *
+     * @param PackageFile $file
+     * @return array
+     */
+    private function getParams(PackageFile $file)
+    {
+        $params = [
+            'area' => $file->getArea(),
+            'theme' => $file->getTheme(),
+            'locale' => $file->getLocale(),
+            'module' => $file->getModule(),
+            'isVirtual' => (!$file->getLocale() || !$file->getTheme() || !$file->getArea())
+        ];
+        foreach ($this->packageDefaultValues as $name => $value) {
+            if (!isset($params[$name])) {
+                $params[$name] = $value;
+            }
+        }
+
+        return $params;
+    }
 }
diff --git a/app/code/Magento/Deploy/Console/DeployStaticOptions.php b/app/code/Magento/Deploy/Console/DeployStaticOptions.php
index 9a73dd5d65fc7..096d926262057 100644
--- a/app/code/Magento/Deploy/Console/DeployStaticOptions.php
+++ b/app/code/Magento/Deploy/Console/DeployStaticOptions.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Deploy\Console;
 
+use Magento\Deploy\Process\Queue;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
 
@@ -57,6 +58,11 @@ class DeployStaticOptions
      */
     const JOBS_AMOUNT = 'jobs';
 
+    /**
+     * Key for max execution time option
+     */
+    const MAX_EXECUTION_TIME = 'max-execution-time';
+
     /**
      * Force run of static deploy
      */
@@ -150,6 +156,7 @@ public function getOptionsList()
      * Basic options
      *
      * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     private function getBasicOptions()
     {
@@ -216,6 +223,13 @@ private function getBasicOptions()
                 'Enable parallel processing using the specified number of jobs.',
                 self::DEFAULT_JOBS_AMOUNT
             ),
+            new InputOption(
+                self::MAX_EXECUTION_TIME,
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'The maximum expected execution time of deployment static process (in seconds).',
+                Queue::DEFAULT_MAX_EXEC_TIME
+            ),
             new InputOption(
                 self::SYMLINK_LOCALE,
                 null,
diff --git a/app/code/Magento/Deploy/Console/InputValidator.php b/app/code/Magento/Deploy/Console/InputValidator.php
index b3301f60fec26..0e07f53ee500a 100644
--- a/app/code/Magento/Deploy/Console/InputValidator.php
+++ b/app/code/Magento/Deploy/Console/InputValidator.php
@@ -5,10 +5,11 @@
  */
 namespace Magento\Deploy\Console;
 
-use Magento\Setup\Console\Command\DeployStaticContentCommand;
+use Magento\Framework\App\ObjectManager;
 use Magento\Deploy\Console\DeployStaticOptions as Options;
 use Magento\Framework\Validator\Locale;
 use Symfony\Component\Console\Input\InputInterface;
+use Magento\Framework\Validator\RegexFactory;
 
 /**
  * Command input arguments validator class
@@ -55,14 +56,24 @@ class InputValidator
      */
     private $localeValidator;
 
+    /**
+     * @var RegexFactory
+     */
+    private $versionValidatorFactory;
+
     /**
      * InputValidator constructor
      *
      * @param Locale $localeValidator
+     * @param RegexFactory|null $versionValidatorFactory
      */
-    public function __construct(Locale $localeValidator)
-    {
+    public function __construct(
+        Locale $localeValidator,
+        RegexFactory $versionValidatorFactory = null
+    ) {
         $this->localeValidator = $localeValidator;
+        $this->versionValidatorFactory = $versionValidatorFactory ?: ObjectManager::getInstance()
+            ->get(RegexFactory::class);
     }
 
     /**
@@ -70,6 +81,7 @@ public function __construct(Locale $localeValidator)
      *
      * @param InputInterface $input
      * @return void
+     * @throws \InvalidArgumentException
      */
     public function validate(InputInterface $input)
     {
@@ -85,6 +97,9 @@ public function validate(InputInterface $input)
             $input->getArgument(Options::LANGUAGES_ARGUMENT) ?: ['all'],
             $input->getOption(Options::EXCLUDE_LANGUAGE)
         );
+        $this->checkVersionInput(
+            $input->getOption(Options::CONTENT_VERSION) ?: ''
+        );
     }
 
     /**
@@ -147,4 +162,22 @@ private function checkLanguagesInput(array $languagesInclude, array $languagesEx
             }
         }
     }
+
+    /**
+     * @param string $contentVersion
+     * @throws \InvalidArgumentException
+     */
+    private function checkVersionInput(string $contentVersion)
+    {
+        if ($contentVersion) {
+            $versionValidator = $this->versionValidatorFactory->create(['pattern' => '/^[A-Za-z0-9_.]+$/']);
+            if (!$versionValidator->isValid($contentVersion)) {
+                throw new \InvalidArgumentException(__(
+                    'Argument "' .
+                    Options::CONTENT_VERSION
+                    . '" has invalid value, content version should contain only characters, digits and dots'
+                ));
+            }
+        }
+    }
 }
diff --git a/app/code/Magento/Deploy/Model/Filesystem.php b/app/code/Magento/Deploy/Model/Filesystem.php
index 0557914f48d24..64c0fa3a3302b 100644
--- a/app/code/Magento/Deploy/Model/Filesystem.php
+++ b/app/code/Magento/Deploy/Model/Filesystem.php
@@ -123,6 +123,7 @@ public function __construct(
      *
      * @param OutputInterface $output
      * @return void
+     * @throws \Exception
      */
     public function regenerateStatic(
         OutputInterface $output
@@ -137,9 +138,14 @@ public function regenerateStatic(
                 DirectoryList::STATIC_VIEW
             ]
         );
-        
+
+        $this->reinitCacheDirectories();
+
         // Trigger code generation
         $this->compile($output);
+
+        $this->reinitCacheDirectories();
+
         // Trigger static assets compilation and deployment
         $this->deployStaticContent($output);
     }
@@ -190,9 +196,14 @@ private function getAdminUserInterfaceLocales()
      *
      * @return array
      * @throws \InvalidArgumentException if unknown locale is provided by the store configuration
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     private function getUsedLocales()
     {
+        /** init cache directory */
+        $this->filesystem
+            ->getDirectoryWrite(DirectoryList::CACHE)
+            ->create();
         $usedLocales = array_merge(
             $this->storeView->retrieveLocales(),
             $this->getAdminUserInterfaceLocales()
@@ -221,13 +232,6 @@ function ($locale) {
     protected function compile(OutputInterface $output)
     {
         $output->writeln('Starting compilation');
-        $this->cleanupFilesystem(
-            [
-                DirectoryList::CACHE,
-                DirectoryList::GENERATED_CODE,
-                DirectoryList::GENERATED_METADATA,
-            ]
-        );
         $cmd = $this->functionCallPath . 'setup:di:compile';
 
         /**
@@ -251,6 +255,7 @@ protected function compile(OutputInterface $output)
      *
      * @param array $directoryCodeList
      * @return void
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     public function cleanupFilesystem($directoryCodeList)
     {
@@ -294,6 +299,7 @@ public function cleanupFilesystem($directoryCodeList)
      * of inverse mask for setting access permissions to files and directories generated by Magento.
      * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
      * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     protected function changePermissions($directoryCodeList, $dirPermissions, $filePermissions)
     {
@@ -319,6 +325,7 @@ protected function changePermissions($directoryCodeList, $dirPermissions, $fileP
      * of inverse mask for setting access permissions to files and directories generated by Magento.
      * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
      * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     public function lockStaticResources()
     {
@@ -333,4 +340,15 @@ public function lockStaticResources()
             self::PERMISSIONS_FILE
         );
     }
+
+    /**
+     * Flush cache and restore the basic cache directories.
+     *
+     * @throws LocalizedException
+     */
+    private function reinitCacheDirectories()
+    {
+        $command = $this->functionCallPath . 'cache:flush ';
+        $this->shell->execute($command);
+    }
 }
diff --git a/app/code/Magento/Deploy/Package/Processor/PostProcessor/CssUrls.php b/app/code/Magento/Deploy/Package/Processor/PostProcessor/CssUrls.php
index 1c139d5682df1..ec8988d9386f6 100644
--- a/app/code/Magento/Deploy/Package/Processor/PostProcessor/CssUrls.php
+++ b/app/code/Magento/Deploy/Package/Processor/PostProcessor/CssUrls.php
@@ -124,8 +124,21 @@ private function parseCss(array $urlMap, $cssFilePath, $packagePath, $cssContent
                         . str_repeat('../', count(explode('/', $cssFileBasePath)))
                         . $this->minification->addMinifiedSign($matchedFile->getDeployedFilePath())
                 ];
+            } else {
+                $filePathInBase = $package->getArea() .
+                    '/' . Package::BASE_THEME .
+                    '/' . $package->getLocale() .
+                    '/' . $lookupFileId;
+                if ($this->staticDir->isReadable($this->minification->addMinifiedSign($filePathInBase))) {
+                    $urlMap[$url][] = [
+                        'filePath' => $this->minification->addMinifiedSign($packagePath . '/' . $cssFilePath),
+                        'replace' => str_repeat('../', count(explode('/', $cssFileBasePath)) + 4)
+                            . $this->minification->addMinifiedSign($filePathInBase),
+                    ];
+                }
             }
         }
+
         return $urlMap;
     }
 
diff --git a/app/code/Magento/Deploy/Process/Queue.php b/app/code/Magento/Deploy/Process/Queue.php
index d8089457ce5b4..ca75bf1acb732 100644
--- a/app/code/Magento/Deploy/Process/Queue.php
+++ b/app/code/Magento/Deploy/Process/Queue.php
@@ -3,14 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Deploy\Process;
 
 use Magento\Deploy\Package\Package;
 use Magento\Deploy\Service\DeployPackage;
 use Magento\Framework\App\ResourceConnection;
-use Psr\Log\LoggerInterface;
 use Magento\Framework\App\State as AppState;
 use Magento\Framework\Locale\ResolverInterface as LocaleResolver;
+use Psr\Log\LoggerInterface;
 
 /**
  * Deployment Queue
@@ -125,6 +127,8 @@ public function __construct(
     }
 
     /**
+     * Adds deployment package.
+     *
      * @param Package $package
      * @param Package[] $dependencies
      * @return bool true on success
@@ -140,6 +144,8 @@ public function add(Package $package, array $dependencies = [])
     }
 
     /**
+     * Returns packages array.
+     *
      * @return Package[]
      */
     public function getPackages()
@@ -159,9 +165,11 @@ public function process()
         $packages = $this->packages;
         while (count($packages) && $this->checkTimeout()) {
             foreach ($packages as $name => $packageJob) {
+                // 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)) {
@@ -182,8 +190,6 @@ public function process()
      * @param array $packages
      * @param array $packageJob
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function assertAndExecute($name, array & $packages, array $packageJob)
     {
@@ -207,13 +213,23 @@ private function assertAndExecute($name, array & $packages, array $packageJob)
                 }
             }
         }
+        $this->executePackage($package, $name, $packages, $dependenciesNotFinished);
+    }
 
+    /**
+     * Executes deployment package.
+     *
+     * @param Package $package
+     * @param string $name
+     * @param array $packages
+     * @param bool $dependenciesNotFinished
+     * @return void
+     */
+    private function executePackage(Package $package, string $name, array &$packages, bool $dependenciesNotFinished)
+    {
         if (!$dependenciesNotFinished
             && !$this->isDeployed($package)
-            && (
-                $this->maxProcesses < 2
-                || (count($this->inProgress) < $this->maxProcesses)
-            )
+            && ($this->maxProcesses < 2 || (count($this->inProgress) < $this->maxProcesses))
         ) {
             unset($packages[$name]);
             $this->execute($package);
@@ -234,6 +250,7 @@ private function awaitForAllProcesses()
                 }
             }
             $this->logger->info('.');
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             sleep(5);
         }
         if ($this->isCanBeParalleled()) {
@@ -243,6 +260,8 @@ private function awaitForAllProcesses()
     }
 
     /**
+     * Checks if can be parallel.
+     *
      * @return bool
      */
     private function isCanBeParalleled()
@@ -251,9 +270,12 @@ private function isCanBeParalleled()
     }
 
     /**
+     * Executes the process.
+     *
      * @param Package $package
      * @return bool true on success for main process and exit for child process
      * @SuppressWarnings(PHPMD.ExitExpression)
+     * @throws \RuntimeException
      */
     private function execute(Package $package)
     {
@@ -281,6 +303,7 @@ function () use ($package) {
         );
 
         if ($this->isCanBeParalleled()) {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $pid = pcntl_fork();
             if ($pid === -1) {
                 throw new \RuntimeException('Unable to fork a new process');
@@ -295,6 +318,7 @@ function () use ($package) {
             // process child process
             $this->inProgress = [];
             $this->deployPackageService->deploy($package, $this->options, true);
+            // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
             exit(0);
         } else {
             $this->deployPackageService->deploy($package, $this->options);
@@ -303,6 +327,8 @@ function () use ($package) {
     }
 
     /**
+     * Checks if package is deployed.
+     *
      * @param Package $package
      * @return bool
      */
@@ -310,12 +336,41 @@ private function isDeployed(Package $package)
     {
         if ($this->isCanBeParalleled()) {
             if ($package->getState() === null) {
-                $pid = pcntl_waitpid($this->getPid($package), $status, WNOHANG);
-                if ($pid === $this->getPid($package)) {
+                $pid = $this->getPid($package);
+
+                // When $pid comes back as null the child process for this package has not yet started; prevents both
+                // hanging until timeout expires (which was behaviour in 2.2.x) and the type error from strict_types
+                if ($pid === null) {
+                    return false;
+                }
+
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                $result = pcntl_waitpid($pid, $status, WNOHANG);
+                if ($result === $pid) {
                     $package->setState(Package::STATE_COMPLETED);
+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                    $exitStatus = pcntl_wexitstatus($status);
+
+                    $this->logger->info(
+                        "Exited: " . $package->getPath() . "(status: $exitStatus)",
+                        [
+                            'process' => $package->getPath(),
+                            'status' => $exitStatus,
+                        ]
+                    );
 
                     unset($this->inProgress[$package->getPath()]);
+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
                     return pcntl_wexitstatus($status) === 0;
+                } elseif ($result === -1) {
+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                    $errno = pcntl_errno();
+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                    $strerror = pcntl_strerror($errno);
+
+                    throw new \RuntimeException(
+                        "Error encountered checking child process status (PID: $pid): $strerror (errno: $errno)"
+                    );
                 }
                 return false;
             }
@@ -324,17 +379,19 @@ private function isDeployed(Package $package)
     }
 
     /**
+     * Returns process ID or null if not found.
+     *
      * @param Package $package
      * @return int|null
      */
     private function getPid(Package $package)
     {
-        return isset($this->processIds[$package->getPath()])
-            ? $this->processIds[$package->getPath()]
-            : null;
+        return $this->processIds[$package->getPath()] ?? null;
     }
 
     /**
+     * Checks timeout.
+     *
      * @return bool
      */
     private function checkTimeout()
@@ -347,14 +404,31 @@ private function checkTimeout()
      *
      * Protect against zombie process
      *
+     * @throws \RuntimeException
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      * @return void
      */
     public function __destruct()
     {
         foreach ($this->inProgress as $package) {
-            if (pcntl_waitpid($this->getPid($package), $status) === -1) {
+            $pid = $this->getPid($package);
+            $this->logger->info(
+                "Reaping child process: {$package->getPath()} (PID: $pid)",
+                [
+                    'process' => $package->getPath(),
+                    'pid' => $pid,
+                ]
+            );
+
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            if (pcntl_waitpid($pid, $status) === -1) {
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                $errno = pcntl_errno();
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                $strerror = pcntl_strerror($errno);
+
                 throw new \RuntimeException(
-                    'Error while waiting for package deployed: ' . $this->getPid($package) . '; Status: ' . $status
+                    "Error encountered waiting for child process (PID: $pid): $strerror (errno: $errno)"
                 );
             }
         }
diff --git a/app/code/Magento/Deploy/Service/DeployPackage.php b/app/code/Magento/Deploy/Service/DeployPackage.php
index 0de339b16ba24..e143648868364 100644
--- a/app/code/Magento/Deploy/Service/DeployPackage.php
+++ b/app/code/Magento/Deploy/Service/DeployPackage.php
@@ -112,6 +112,8 @@ function () use ($package, $options, $skipLogging) {
     }
 
     /**
+     * Execute package deploy procedure when area already emulated
+     *
      * @param Package $package
      * @param array $options
      * @param bool $skipLogging
@@ -141,7 +143,9 @@ public function deployEmulated(Package $package, array $options, $skipLogging =
                 $this->errorsCount++;
                 $this->logger->critical($errorMessage);
             } catch (\Exception $exception) {
-                $this->logger->critical($exception->getTraceAsString());
+                $this->logger->critical(
+                    'Compilation from source ' . $file->getSourcePath() . ' failed' . PHP_EOL . (string)$exception
+                );
                 $this->errorsCount++;
             }
         }
@@ -224,7 +228,9 @@ private function checkIfCanCopy(PackageFile $file, Package $package, Package $pa
     private function checkFileSkip($filePath, array $options)
     {
         if ($filePath !== '.') {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $ext = strtolower(pathinfo($filePath, PATHINFO_EXTENSION));
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $basename = pathinfo($filePath, PATHINFO_BASENAME);
             if ($ext === 'less' && strpos($basename, '_') === 0) {
                 return true;
diff --git a/app/code/Magento/Deploy/Service/DeployStaticContent.php b/app/code/Magento/Deploy/Service/DeployStaticContent.php
index 72de645868e22..aaef3f6e9ea5b 100644
--- a/app/code/Magento/Deploy/Service/DeployStaticContent.php
+++ b/app/code/Magento/Deploy/Service/DeployStaticContent.php
@@ -85,24 +85,26 @@ public function deploy(array $options)
             return;
         }
 
-        $queue = $this->queueFactory->create(
-            [
-                'logger' => $this->logger,
-                'options' => $options,
-                'maxProcesses' => $this->getProcessesAmount($options),
-                'deployPackageService' => $this->objectManager->create(
-                    \Magento\Deploy\Service\DeployPackage::class,
-                    [
-                        'logger' => $this->logger
-                    ]
-                )
-            ]
-        );
+        $queueOptions = [
+            'logger' => $this->logger,
+            'options' => $options,
+            'maxProcesses' => $this->getProcessesAmount($options),
+            'deployPackageService' => $this->objectManager->create(
+                \Magento\Deploy\Service\DeployPackage::class,
+                [
+                    'logger' => $this->logger
+                ]
+            )
+        ];
+
+        if (isset($options[Options::MAX_EXECUTION_TIME])) {
+            $queueOptions['maxExecTime'] = (int)$options[Options::MAX_EXECUTION_TIME];
+        }
 
         $deployStrategy = $this->deployStrategyFactory->create(
             $options[Options::STRATEGY],
             [
-                'queue' => $queue
+                'queue' => $this->queueFactory->create($queueOptions)
             ]
         );
 
@@ -134,6 +136,8 @@ public function deploy(array $options)
     }
 
     /**
+     * Returns amount of parallel processes, returns zero if option wasn't set.
+     *
      * @param array $options
      * @return int
      */
@@ -143,6 +147,8 @@ private function getProcessesAmount(array $options)
     }
 
     /**
+     * Checks if need to refresh only version.
+     *
      * @param array $options
      * @return bool
      */
diff --git a/app/code/Magento/Deploy/Test/Unit/Console/InputValidatorTest.php b/app/code/Magento/Deploy/Test/Unit/Console/InputValidatorTest.php
new file mode 100644
index 0000000000000..2dc9eca7c5e14
--- /dev/null
+++ b/app/code/Magento/Deploy/Test/Unit/Console/InputValidatorTest.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Deploy\Test\Unit\Console;
+
+use Magento\Framework\Validator\Regex;
+use Magento\Framework\Validator\RegexFactory;
+use PHPUnit\Framework\TestCase;
+use Magento\Deploy\Console\InputValidator;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Deploy\Console\DeployStaticOptions as Options;
+use Magento\Framework\Validator\Locale;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\ArrayInput;
+use InvalidArgumentException;
+use Symfony\Component\Console\Input\InputArgument;
+
+/**
+ * Class InputValidatorTest
+ * @package Magento\Deploy\Test\Unit\Console
+ *  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class InputValidatorTest extends TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    protected $objectManagerHelper;
+
+    /**
+     * @var InputValidator
+     */
+    protected $inputValidator;
+
+    /**
+     * @var Locale
+     */
+    protected $localeValidator;
+
+    /**
+     * @throws \Zend_Validate_Exception
+     */
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $regexFactoryMock = $this->getMockBuilder(RegexFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $regexObject = new Regex('/^[A-Za-z0-9_.]+$/');
+
+        $regexFactoryMock->expects($this->any())->method('create')
+            ->willReturn($regexObject);
+
+        $localeObjectMock = $this->getMockBuilder(Locale::class)->setMethods(['isValid'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $localeObjectMock->expects($this->any())->method('isValid')
+            ->with('en_US')
+            ->will($this->returnValue(true));
+
+        $this->inputValidator = $this->objectManagerHelper->getObject(
+            InputValidator::class,
+            [
+                'localeValidator' => $localeObjectMock,
+                'versionValidatorFactory' => $regexFactoryMock
+            ]
+        );
+    }
+
+    /**
+     * @throws \Zend_Validate_Exception
+     */
+    public function testValidate()
+    {
+        $input = $this->getMockBuilder(ArrayInput::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getOption', 'getArgument'])
+            ->getMock();
+
+        $input->expects($this->atLeastOnce())->method('getArgument')->willReturn(['all']);
+
+        $input->expects($this->atLeastOnce())->method('getOption')
+            ->willReturnMap(
+                [
+                    [Options::AREA, ['all']],
+                    [Options::EXCLUDE_AREA, ['none']],
+                    [Options::THEME, ['all']],
+                    [Options::EXCLUDE_THEME, ['none']],
+                    [Options::EXCLUDE_LANGUAGE, ['none']],
+                    [Options::CONTENT_VERSION, '12345']
+                ]
+            );
+
+        /** @noinspection PhpParamsInspection */
+        $this->inputValidator->validate($input);
+    }
+
+    /**
+     * @covers \Magento\Deploy\Console\InputValidator::checkAreasInput()
+     */
+    public function testCheckAreasInputException()
+    {
+        $options = [
+            new InputOption(Options::AREA, null, 4, null, ['test']),
+            new InputOption(Options::EXCLUDE_AREA, null, 4, null, ['test'])
+        ];
+
+        $inputDefinition = new InputDefinition($options);
+
+        try {
+            $this->inputValidator->validate(
+                new ArrayInput([], $inputDefinition)
+            );
+        } catch (\Exception $e) {
+            $this->assertContains('--area (-a) and --exclude-area cannot be used at the same time', $e->getMessage());
+            $this->assertInstanceOf(InvalidArgumentException::class, $e);
+        }
+    }
+
+    /**
+     * @covers \Magento\Deploy\Console\InputValidator::checkThemesInput()
+     */
+    public function testCheckThemesInputException()
+    {
+        $options = [
+            new InputOption(Options::AREA, null, 4, null, ['all']),
+            new InputOption(Options::EXCLUDE_AREA, null, 4, null, ['none']),
+            new InputOption(Options::THEME, null, 4, '', ['blank']),
+            new InputOption(Options::EXCLUDE_THEME, null, 4, '', ['luma'])
+        ];
+
+        $inputDefinition = new InputDefinition($options);
+
+        try {
+            $this->inputValidator->validate(
+                new ArrayInput([], $inputDefinition)
+            );
+        } catch (\Exception $e) {
+            $this->assertContains('--theme (-t) and --exclude-theme cannot be used at the same time', $e->getMessage());
+            $this->assertInstanceOf(InvalidArgumentException::class, $e);
+        }
+    }
+
+    public function testCheckLanguagesInputException()
+    {
+        $options = [
+            new InputOption(Options::AREA, null, 4, null, ['all']),
+            new InputOption(Options::EXCLUDE_AREA, null, 4, null, ['none']),
+            new InputOption(Options::THEME, null, 4, '', ['all']),
+            new InputOption(Options::EXCLUDE_THEME, null, 4, '', ['none']),
+            new InputArgument(Options::LANGUAGES_ARGUMENT, null, 4, ['en_US']),
+            new InputOption(Options::EXCLUDE_LANGUAGE, null, 4, '', ['all'])
+        ];
+
+        $inputDefinition = new InputDefinition($options);
+
+        try {
+            $this->inputValidator->validate(
+                new ArrayInput([], $inputDefinition)
+            );
+        } catch (\Exception $e) {
+            $this->assertContains(
+                '--language (-l) and --exclude-language cannot be used at the same time',
+                $e->getMessage()
+            );
+
+            $this->assertInstanceOf(InvalidArgumentException::class, $e);
+        }
+    }
+
+    public function testCheckVersionInputException()
+    {
+        $options = [
+            new InputOption(Options::AREA, null, 4, null, ['all']),
+            new InputOption(Options::EXCLUDE_AREA, null, 4, null, ['none']),
+            new InputOption(Options::THEME, null, 4, '', ['all']),
+            new InputOption(Options::EXCLUDE_THEME, null, 4, '', ['none']),
+            new InputArgument(Options::LANGUAGES_ARGUMENT, null, 4, ['en_US']),
+            new InputOption(Options::EXCLUDE_LANGUAGE, null, 4, '', ['none']),
+            new InputOption(Options::CONTENT_VERSION, null, 4, '', '/*!#')
+        ];
+
+        $inputDefinition = new InputDefinition($options);
+
+        try {
+            $this->inputValidator->validate(
+                new ArrayInput([], $inputDefinition)
+            );
+        } catch (\Exception $e) {
+            $this->assertContains(
+                'Argument "' .
+                Options::CONTENT_VERSION
+                . '" has invalid value, content version should contain only characters, digits and dots',
+                $e->getMessage()
+            );
+
+            $this->assertInstanceOf(InvalidArgumentException::class, $e);
+        }
+    }
+}
diff --git a/app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php b/app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php
index d14c86c4a3264..c1391cb7d9c5d 100644
--- a/app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php
@@ -116,17 +116,27 @@ public function testRegenerateStatic()
         $this->storeView->method('retrieveLocales')
             ->willReturn($storeLocales);
 
-        $setupDiCompileCmd = $this->cmdPrefix . 'setup:di:compile';
+        $setupDiCompileCmd = $this->cmdPrefix . 'cache:flush ';
         $this->shell->expects(self::at(0))
             ->method('execute')
             ->with($setupDiCompileCmd);
 
+        $setupDiCompileCmd = $this->cmdPrefix . 'setup:di:compile';
+        $this->shell->expects(self::at(1))
+            ->method('execute')
+            ->with($setupDiCompileCmd);
+
+        $setupDiCompileCmd = $this->cmdPrefix . 'cache:flush ';
+        $this->shell->expects(self::at(2))
+            ->method('execute')
+            ->with($setupDiCompileCmd);
+
         $this->initAdminLocaleMock('en_US');
 
         $usedLocales = ['fr_FR', 'de_DE', 'nl_NL', 'en_US'];
         $staticContentDeployCmd = $this->cmdPrefix . 'setup:static-content:deploy -f '
             . implode(' ', $usedLocales);
-        $this->shell->expects(self::at(1))
+        $this->shell->expects(self::at(3))
             ->method('execute')
             ->with($staticContentDeployCmd);
 
diff --git a/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php b/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
index 75edc8cb4f6ee..396381960e544 100644
--- a/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Deploy\Test\Unit\Service;
 
+use Magento\Deploy\Console\DeployStaticOptions;
 use Magento\Deploy\Package\Package;
 use Magento\Deploy\Process\Queue;
 use Magento\Deploy\Service\Bundle;
@@ -221,4 +222,35 @@ public function deployDataProvider()
             ]
         ];
     }
+
+    public function testMaxExecutionTimeOptionPassed()
+    {
+        $options = [
+            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,
+        ];
+
+        $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
+            ])
+            ->willReturn($queueMock);
+        $this->deployStrategyFactory->expects($this->once())
+            ->method('create')
+            ->with('compact', ['queue' => $queueMock])
+            ->willReturn($strategyMock);
+
+        $this->service->deploy($options);
+    }
 }
diff --git a/app/code/Magento/Deploy/composer.json b/app/code/Magento/Deploy/composer.json
index 3c28dc345cba4..11d2482278a21 100644
--- a/app/code/Magento/Deploy/composer.json
+++ b/app/code/Magento/Deploy/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-deploy",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-require-js": "100.2.*",
@@ -10,7 +10,7 @@
         "magento/module-config": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.5",
+    "version": "100.2.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Deploy/etc/di.xml b/app/code/Magento/Deploy/etc/di.xml
index fd604aa1b397b..0c32baebf12df 100644
--- a/app/code/Magento/Deploy/etc/di.xml
+++ b/app/code/Magento/Deploy/etc/di.xml
@@ -71,18 +71,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Deploy\App\Mode\ConfigProvider">
-        <arguments>
-            <argument name="config" xsi:type="array">
-                <item name="developer" xsi:type="array">
-                    <item name="production" xsi:type="array">
-                        <item name="dev/debug/debug_logging" xsi:type="string">0</item>
-                    </item>
-                    <item name="developer" xsi:type="array">
-                        <item name="dev/debug/debug_logging" xsi:type="null" />
-                    </item>
-                </item>
-            </argument>
-        </arguments>
-    </type>
 </config>
diff --git a/app/code/Magento/Developer/Model/Logger/Handler/Debug.php b/app/code/Magento/Developer/Model/Logger/Handler/Debug.php
index 9bfee42fa6a83..d14da17b6ef74 100644
--- a/app/code/Magento/Developer/Model/Logger/Handler/Debug.php
+++ b/app/code/Magento/Developer/Model/Logger/Handler/Debug.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Developer\Model\Logger\Handler;
 
+use Magento\Config\Setup\ConfigOptionsList;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\State;
 use Magento\Framework\Filesystem\DriverInterface;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\DeploymentConfig;
 
 /**
@@ -60,9 +60,26 @@ public function isHandling(array $record)
         if ($this->deploymentConfig->isAvailable()) {
             return
                 parent::isHandling($record)
-                && $this->scopeConfig->getValue('dev/debug/debug_logging', ScopeInterface::SCOPE_STORE);
+                    && $this->isLoggingEnabled();
         }
 
         return parent::isHandling($record);
     }
+
+    /**
+     * Check that logging functionality is enabled.
+     *
+     * @return bool
+     */
+    private function isLoggingEnabled(): bool
+    {
+        $configValue = $this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_DEBUG_LOGGING);
+        if ($configValue === null) {
+            $isEnabled = $this->state->getMode() !== State::MODE_PRODUCTION;
+        } else {
+            $isEnabled = (bool)$configValue;
+        }
+
+        return $isEnabled;
+    }
 }
diff --git a/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/DebugTest.php b/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/DebugTest.php
index c116775d582bb..0e009465872cd 100644
--- a/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/DebugTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/DebugTest.php
@@ -10,7 +10,6 @@
 use Magento\Framework\App\State;
 use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Store\Model\ScopeInterface;
 use Monolog\Formatter\FormatterInterface;
 use Monolog\Logger;
 use Magento\Framework\App\DeploymentConfig;
@@ -51,6 +50,9 @@ class DebugTest extends \PHPUnit\Framework\TestCase
      */
     private $deploymentConfigMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->filesystemMock = $this->getMockBuilder(DriverInterface::class)
@@ -80,70 +82,95 @@ protected function setUp()
         $this->model->setFormatter($this->formatterMock);
     }
 
-    public function testHandle()
+    /**
+     * @return void
+     */
+    public function testHandleEnabledInDeveloperMode()
     {
         $this->deploymentConfigMock->expects($this->once())
             ->method('isAvailable')
             ->willReturn(true);
-        $this->stateMock->expects($this->never())
-            ->method('getMode');
-        $this->scopeConfigMock->expects($this->once())
-            ->method('getValue')
-            ->with('dev/debug/debug_logging', ScopeInterface::SCOPE_STORE, null)
-            ->willReturn(true);
+        $this->stateMock
+            ->expects($this->once())
+            ->method('getMode')
+            ->willReturn(State::MODE_DEVELOPER);
+        $this->scopeConfigMock
+            ->expects($this->never())
+            ->method('getValue');
 
         $this->assertTrue($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
     }
 
-    public function testHandleDisabledByProduction()
+    /**
+     * @return void
+     */
+    public function testHandleEnabledInDefaultMode()
     {
         $this->deploymentConfigMock->expects($this->once())
             ->method('isAvailable')
             ->willReturn(true);
-        $this->stateMock->expects($this->never())
-            ->method('getMode');
-        $this->scopeConfigMock->expects($this->once())
+        $this->stateMock
+            ->expects($this->once())
+            ->method('getMode')
+            ->willReturn(State::MODE_DEFAULT);
+        $this->scopeConfigMock
+            ->expects($this->never())
             ->method('getValue');
 
-        $this->assertFalse($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
+        $this->assertTrue($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
     }
 
-    public function testHandleDisabledByConfig()
+    /**
+     * @return void
+     */
+    public function testHandleDisabledByProduction()
     {
         $this->deploymentConfigMock->expects($this->once())
             ->method('isAvailable')
             ->willReturn(true);
-        $this->stateMock->expects($this->never())
-            ->method('getMode');
-        $this->scopeConfigMock->expects($this->once())
-            ->method('getValue')
-            ->with('dev/debug/debug_logging', ScopeInterface::SCOPE_STORE, null)
-            ->willReturn(false);
+        $this->stateMock
+            ->expects($this->once())
+            ->method('getMode')
+            ->willReturn(State::MODE_PRODUCTION);
+        $this->scopeConfigMock
+            ->expects($this->never())
+            ->method('getValue');
 
         $this->assertFalse($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
     }
 
+    /**
+     * @return void
+     */
     public function testHandleDisabledByLevel()
     {
         $this->deploymentConfigMock->expects($this->once())
             ->method('isAvailable')
             ->willReturn(true);
-        $this->stateMock->expects($this->never())
-            ->method('getMode');
-        $this->scopeConfigMock->expects($this->never())
+        $this->stateMock
+            ->expects($this->never())
+            ->method('getMode')
+            ->willReturn(State::MODE_DEVELOPER);
+        $this->scopeConfigMock
+            ->expects($this->never())
             ->method('getValue');
 
         $this->assertFalse($this->model->isHandling(['formatted' => false, 'level' => Logger::API]));
     }
 
+    /**
+     * @return void
+     */
     public function testDeploymentConfigIsNotAvailable()
     {
         $this->deploymentConfigMock->expects($this->once())
             ->method('isAvailable')
             ->willReturn(false);
-        $this->stateMock->expects($this->never())
+        $this->stateMock
+            ->expects($this->never())
             ->method('getMode');
-        $this->scopeConfigMock->expects($this->never())
+        $this->scopeConfigMock
+            ->expects($this->never())
             ->method('getValue');
 
         $this->assertTrue($this->model->isHandling(['formatted' => false, 'level' => Logger::DEBUG]));
diff --git a/app/code/Magento/Developer/composer.json b/app/code/Magento/Developer/composer.json
index e2236e248cfc3..8c5063f111f66 100644
--- a/app/code/Magento/Developer/composer.json
+++ b/app/code/Magento/Developer/composer.json
@@ -2,13 +2,13 @@
     "name": "magento/module-developer",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/framework": "101.0.*",
         "magento/module-config": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Developer/etc/adminhtml/system.xml b/app/code/Magento/Developer/etc/adminhtml/system.xml
index db685a5453cd4..c64abd6eae725 100644
--- a/app/code/Magento/Developer/etc/adminhtml/system.xml
+++ b/app/code/Magento/Developer/etc/adminhtml/system.xml
@@ -25,13 +25,6 @@
                     <backend_model>Magento\Developer\Model\Config\Backend\AllowedIps</backend_model>
                 </field>
             </group>
-            <group id="debug" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-                <field id="debug_logging" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0">
-                    <label>Log to File</label>
-                    <comment>Not available in production mode.</comment>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                </field>
-            </group>
         </section>
     </system>
 </config>
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index 55df0748b1f06..6cb9f0e917dfb 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -7,6 +7,7 @@
 namespace Magento\Dhl\Model;
 
 use Magento\Catalog\Model\Product\Type;
+use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\Module\Dir;
 use Magento\Sales\Exception\DocumentValidationException;
 use Magento\Sales\Model\Order\Shipment;
@@ -56,6 +57,27 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      */
     const CODE = 'dhl';
 
+    /**
+     * DHL service Quote prefix used for message reference.
+     *
+     * @var string
+     */
+    private $servicePrefixQuote = 'QUOT';
+
+    /**
+     * DHL service Shipping prefix used for message reference.
+     *
+     * @var string
+     */
+    private $servicePrefixShipval = 'SHIP';
+
+    /**
+     * DHL service Tracking prefix used for message reference.
+     *
+     * @var string
+     */
+    private $servicePrefixTracking = 'TRCK';
+
     /**
      * Rate request data
      *
@@ -206,6 +228,11 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      */
     private $xmlValidator;
 
+    /**
+     * @var ProductMetadataInterface
+     */
+    private $productMetadata;
+
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
@@ -232,7 +259,8 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
      * @param array $data
-     * @param \Magento\Dhl\Model\Validator\XmlValidatorFactory $xmlValidatorFactory
+     * @param \Magento\Dhl\Model\Validator\XmlValidatorFactory|null $xmlValidatorFactory
+     * @param ProductMetadataInterface|null $productMetadata
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -261,7 +289,8 @@ public function __construct(
         \Magento\Framework\Stdlib\DateTime $dateTime,
         \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory,
         array $data = [],
-        \Magento\Dhl\Model\Validator\XmlValidator $xmlValidator = null
+        \Magento\Dhl\Model\Validator\XmlValidator $xmlValidator = null,
+        ProductMetadataInterface $productMetadata = null
     ) {
         $this->readFactory = $readFactory;
         $this->_carrierHelper = $carrierHelper;
@@ -295,6 +324,8 @@ public function __construct(
         }
         $this->xmlValidator = $xmlValidator
             ?: \Magento\Framework\App\ObjectManager::getInstance()->get(XmlValidator::class);
+        $this->productMetadata = $productMetadata
+            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(ProductMetadataInterface::class);
     }
 
     /**
@@ -983,19 +1014,30 @@ protected function _getQuotesFromServer($request)
     protected function _buildQuotesRequestXml()
     {
         $rawRequest = $this->_rawRequest;
-        $xmlStr = '<?xml version = "1.0" encoding = "UTF-8"?>' .
-            '<p:DCTRequest xmlns:p="http://www.dhl.com" xmlns:p1="http://www.dhl.com/datatypes" ' .
-            'xmlns:p2="http://www.dhl.com/DCTRequestdatatypes" ' .
+
+        $xmlStr = '<?xml version="1.0" encoding="UTF-8"?>' .
+            '<req:DCTRequest schemaVersion="2.0" ' .
+            'xmlns:req="http://www.dhl.com" ' .
             'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ' .
-            'xsi:schemaLocation="http://www.dhl.com DCT-req.xsd "/>';
+            'xsi:schemaLocation="http://www.dhl.com DCT-req_global-2.0.xsd"/>';
+
         $xml = $this->_xmlElFactory->create(['data' => $xmlStr]);
         $nodeGetQuote = $xml->addChild('GetQuote', '', '');
         $nodeRequest = $nodeGetQuote->addChild('Request');
 
         $nodeServiceHeader = $nodeRequest->addChild('ServiceHeader');
+        $nodeServiceHeader->addChild('MessageTime', $this->buildMessageTimestamp());
+        $nodeServiceHeader->addChild(
+            'MessageReference',
+            $this->buildMessageReference($this->servicePrefixQuote)
+        );
         $nodeServiceHeader->addChild('SiteID', (string)$this->getConfigData('id'));
         $nodeServiceHeader->addChild('Password', (string)$this->getConfigData('password'));
 
+        $nodeMetaData = $nodeRequest->addChild('MetaData');
+        $nodeMetaData->addChild('SoftwareName', $this->buildSoftwareName());
+        $nodeMetaData->addChild('SoftwareVersion', $this->buildSoftwareVersion());
+
         $nodeFrom = $nodeGetQuote->addChild('From');
         $nodeFrom->addChild('CountryCode', $rawRequest->getOrigCountryId());
         $nodeFrom->addChild('Postalcode', $rawRequest->getOrigPostal());
@@ -1386,44 +1428,37 @@ protected function _doRequest()
     {
         $rawRequest = $this->_request;
 
-        $originRegion = $this->getCountryParams(
-            $this->_scopeConfig->getValue(
-                Shipment::XML_PATH_STORE_COUNTRY_ID,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                $this->getStore()
-            )
-        )->getRegion();
-
-        if (!$originRegion) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Wrong Region'));
-        }
-
-        if ($originRegion == 'AM') {
-            $originRegion = '';
-        }
-
         $xmlStr = '<?xml version="1.0" encoding="UTF-8"?>' .
-            '<req:ShipmentValidateRequest' .
-            $originRegion .
+            '<req:ShipmentRequest' .
             ' xmlns:req="http://www.dhl.com"' .
             ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' .
-            ' xsi:schemaLocation="http://www.dhl.com ship-val-req' .
-            ($originRegion ? '_' .
-                $originRegion : '') .
-            '.xsd" />';
+            ' xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.0.xsd"' .
+            ' schemaVersion="6.0" />';
         $xml = $this->_xmlElFactory->create(['data' => $xmlStr]);
 
         $nodeRequest = $xml->addChild('Request', '', '');
         $nodeServiceHeader = $nodeRequest->addChild('ServiceHeader');
+        $nodeServiceHeader->addChild('MessageTime', $this->buildMessageTimestamp());
+        // MessageReference must be 28 to 32 chars.
+        $nodeServiceHeader->addChild(
+            'MessageReference',
+            $this->buildMessageReference($this->servicePrefixShipval)
+        );
         $nodeServiceHeader->addChild('SiteID', (string)$this->getConfigData('id'));
         $nodeServiceHeader->addChild('Password', (string)$this->getConfigData('password'));
 
-        if (!$originRegion) {
-            $xml->addChild('RequestedPickupTime', 'N', '');
-        }
-        if ($originRegion !== 'AP') {
-            $xml->addChild('NewShipper', 'N', '');
+        $originRegion = $this->getCountryParams(
+            $this->_scopeConfig->getValue(
+                Shipment::XML_PATH_STORE_COUNTRY_ID,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                $this->getStore()
+            )
+        )->getRegion();
+        if ($originRegion) {
+            $xml->addChild('RegionCode', $originRegion, '');
         }
+        $xml->addChild('RequestedPickupTime', 'N', '');
+        $xml->addChild('NewShipper', 'N', '');
         $xml->addChild('LanguageCode', 'EN', '');
         $xml->addChild('PiecesEnabled', 'Y', '');
 
@@ -1465,8 +1500,9 @@ protected function _doRequest()
         }
 
         $nodeConsignee->addChild('City', $rawRequest->getRecipientAddressCity());
-        if ($originRegion !== 'AP') {
-            $nodeConsignee->addChild('Division', $rawRequest->getRecipientAddressStateOrProvinceCode());
+        $recipientAddressStateOrProvinceCode = $rawRequest->getRecipientAddressStateOrProvinceCode();
+        if ($recipientAddressStateOrProvinceCode) {
+            $nodeConsignee->addChild('Division', $recipientAddressStateOrProvinceCode);
         }
         $nodeConsignee->addChild('PostalCode', $rawRequest->getRecipientAddressPostalCode());
         $nodeConsignee->addChild('CountryCode', $rawRequest->getRecipientAddressCountryCode());
@@ -1510,15 +1546,13 @@ protected function _doRequest()
         $nodeReference->addChild('ReferenceType', 'St');
 
         /** Shipment Details */
-        $this->_shipmentDetails($xml, $rawRequest, $originRegion);
+        $this->_shipmentDetails($xml, $rawRequest);
 
         /** Shipper */
         $nodeShipper = $xml->addChild('Shipper', '', '');
         $nodeShipper->addChild('ShipperID', (string)$this->getConfigData('account'));
         $nodeShipper->addChild('CompanyName', $rawRequest->getShipperContactCompanyName());
-        if ($originRegion !== 'AP') {
-            $nodeShipper->addChild('RegisteredAccount', (string)$this->getConfigData('account'));
-        }
+        $nodeShipper->addChild('RegisteredAccount', (string)$this->getConfigData('account'));
 
         $address = $rawRequest->getShipperAddressStreet1() . ' ' . $rawRequest->getShipperAddressStreet2();
         $address = $this->string->split($address, 35, false, true);
@@ -1531,8 +1565,9 @@ protected function _doRequest()
         }
 
         $nodeShipper->addChild('City', $rawRequest->getShipperAddressCity());
-        if ($originRegion !== 'AP') {
-            $nodeShipper->addChild('Division', $rawRequest->getShipperAddressStateOrProvinceCode());
+        $shipperAddressStateOrProvinceCode = $rawRequest->getShipperAddressStateOrProvinceCode();
+        if ($shipperAddressStateOrProvinceCode) {
+            $nodeShipper->addChild('Division', $shipperAddressStateOrProvinceCode);
         }
         $nodeShipper->addChild('PostalCode', $rawRequest->getShipperAddressPostalCode());
         $nodeShipper->addChild('CountryCode', $rawRequest->getShipperAddressCountryCode());
@@ -1584,19 +1619,13 @@ protected function _doRequest()
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
     {
         $nodeShipmentDetails = $xml->addChild('ShipmentDetails', '', '');
         $nodeShipmentDetails->addChild('NumberOfPieces', count($rawRequest->getPackages()));
 
-        if ($originRegion) {
-            $nodeShipmentDetails->addChild(
-                'CurrencyCode',
-                $this->_storeManager->getWebsite($this->_request->getWebsiteId())->getBaseCurrencyCode()
-            );
-        }
-
         $nodePieces = $nodeShipmentDetails->addChild('Pieces', '', '');
 
         /*
@@ -1615,18 +1644,12 @@ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
             }
             $nodePiece->addChild('PieceID', ++$i);
             $nodePiece->addChild('PackageType', $packageType);
-            $nodePiece->addChild('Weight', sprintf('%.1f', $package['params']['weight']));
+            $nodePiece->addChild('Weight', sprintf('%.3f', $package['params']['weight']));
             $params = $package['params'];
             if ($params['width'] && $params['length'] && $params['height']) {
-                if (!$originRegion) {
-                    $nodePiece->addChild('Width', round($params['width']));
-                    $nodePiece->addChild('Height', round($params['height']));
-                    $nodePiece->addChild('Depth', round($params['length']));
-                } else {
-                    $nodePiece->addChild('Depth', round($params['length']));
-                    $nodePiece->addChild('Width', round($params['width']));
-                    $nodePiece->addChild('Height', round($params['height']));
-                }
+                $nodePiece->addChild('Width', round($params['width']));
+                $nodePiece->addChild('Height', round($params['height']));
+                $nodePiece->addChild('Depth', round($params['length']));
             }
             $content = [];
             foreach ($package['items'] as $item) {
@@ -1635,51 +1658,34 @@ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
             $nodePiece->addChild('PieceContents', substr(implode(',', $content), 0, 34));
         }
 
-        if (!$originRegion) {
-            $nodeShipmentDetails->addChild('Weight', sprintf('%.1f', $rawRequest->getPackageWeight()));
-            $nodeShipmentDetails->addChild('WeightUnit', substr($this->_getWeightUnit(), 0, 1));
-            $nodeShipmentDetails->addChild('GlobalProductCode', $rawRequest->getShippingMethod());
-            $nodeShipmentDetails->addChild('LocalProductCode', $rawRequest->getShippingMethod());
-            $nodeShipmentDetails->addChild('Date', $this->_coreDate->date('Y-m-d'));
-            $nodeShipmentDetails->addChild('Contents', 'DHL Parcel');
-            /**
-             * The DoorTo Element defines the type of delivery service that applies to the shipment.
-             * The valid values are DD (Door to Door), DA (Door to Airport) , AA and DC (Door to
-             * Door non-compliant)
-             */
-            $nodeShipmentDetails->addChild('DoorTo', 'DD');
-            $nodeShipmentDetails->addChild('DimensionUnit', substr($this->_getDimensionUnit(), 0, 1));
-            if ($package['params']['container'] == self::DHL_CONTENT_TYPE_NON_DOC) {
-                $packageType = 'CP';
-            }
-            $nodeShipmentDetails->addChild('PackageType', $packageType);
-            if ($this->isDutiable($rawRequest->getOrigCountryId(), $rawRequest->getDestCountryId())) {
-                $nodeShipmentDetails->addChild('IsDutiable', 'Y');
-            }
-            $nodeShipmentDetails->addChild(
-                'CurrencyCode',
-                $this->_storeManager->getWebsite($this->_request->getWebsiteId())->getBaseCurrencyCode()
-            );
-        } else {
-            if ($package['params']['container'] == self::DHL_CONTENT_TYPE_NON_DOC) {
-                $packageType = 'CP';
-            }
-            $nodeShipmentDetails->addChild('PackageType', $packageType);
-            $nodeShipmentDetails->addChild('Weight', sprintf('%.3f', $rawRequest->getPackageWeight()));
-            $nodeShipmentDetails->addChild('DimensionUnit', substr($this->_getDimensionUnit(), 0, 1));
-            $nodeShipmentDetails->addChild('WeightUnit', substr($this->_getWeightUnit(), 0, 1));
-            $nodeShipmentDetails->addChild('GlobalProductCode', $rawRequest->getShippingMethod());
-            $nodeShipmentDetails->addChild('LocalProductCode', $rawRequest->getShippingMethod());
-
-            /**
-             * The DoorTo Element defines the type of delivery service that applies to the shipment.
-             * The valid values are DD (Door to Door), DA (Door to Airport) , AA and DC (Door to
-             * Door non-compliant)
-             */
-            $nodeShipmentDetails->addChild('DoorTo', 'DD');
-            $nodeShipmentDetails->addChild('Date', $this->_coreDate->date('Y-m-d'));
-            $nodeShipmentDetails->addChild('Contents', 'DHL Parcel TEST');
+        $nodeShipmentDetails->addChild('Weight', sprintf('%.3f', $rawRequest->getPackageWeight()));
+        $nodeShipmentDetails->addChild('WeightUnit', substr($this->_getWeightUnit(), 0, 1));
+        $nodeShipmentDetails->addChild('GlobalProductCode', $rawRequest->getShippingMethod());
+        $nodeShipmentDetails->addChild('LocalProductCode', $rawRequest->getShippingMethod());
+        $nodeShipmentDetails->addChild(
+            'Date',
+            $this->_coreDate->date('Y-m-d', strtotime('now + 1day'))
+        );
+        $nodeShipmentDetails->addChild('Contents', 'DHL Parcel');
+
+        /**
+         * The DoorTo Element defines the type of delivery service that applies to the shipment.
+         * The valid values are DD (Door to Door), DA (Door to Airport) , AA and DC (Door to
+         * Door non-compliant)
+         */
+        $nodeShipmentDetails->addChild('DoorTo', 'DD');
+        $nodeShipmentDetails->addChild('DimensionUnit', substr($this->_getDimensionUnit(), 0, 1));
+        if ($package['params']['container'] == self::DHL_CONTENT_TYPE_NON_DOC) {
+            $packageType = 'CP';
+        }
+        $nodeShipmentDetails->addChild('PackageType', $packageType);
+        if ($this->isDutiable($rawRequest->getOrigCountryId(), $rawRequest->getDestCountryId())) {
+            $nodeShipmentDetails->addChild('IsDutiable', 'Y');
         }
+        $nodeShipmentDetails->addChild(
+            'CurrencyCode',
+            $this->_storeManager->getWebsite($this->_request->getWebsiteId())->getBaseCurrencyCode()
+        );
     }
 
     /**
@@ -1710,12 +1716,15 @@ protected function _getXMLTracking($trackings)
             '<req:KnownTrackingRequest' .
             ' xmlns:req="http://www.dhl.com"' .
             ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' .
-            ' xsi:schemaLocation="http://www.dhl.com TrackingRequestKnown.xsd" />';
+            ' xsi:schemaLocation="http://www.dhl.com TrackingRequestKnown-1.0.xsd"' .
+            ' schemaVersion="1.0" />';
 
         $xml = $this->_xmlElFactory->create(['data' => $xmlStr]);
 
         $requestNode = $xml->addChild('Request', '', '');
         $serviceHeaderNode = $requestNode->addChild('ServiceHeader', '', '');
+        $serviceHeaderNode->addChild('MessageTime', $this->buildMessageTimestamp());
+        $serviceHeaderNode->addChild('MessageReference', $this->buildMessageReference($this->servicePrefixTracking));
         $serviceHeaderNode->addChild('SiteID', (string)$this->getConfigData('id'));
         $serviceHeaderNode->addChild('Password', (string)$this->getConfigData('password'));
 
@@ -1968,8 +1977,61 @@ protected function isDutiable($origCountryId, $destCountryId)
     {
         $this->_checkDomesticStatus($origCountryId, $destCountryId);
 
-        return
-            self::DHL_CONTENT_TYPE_NON_DOC == $this->getConfigData('content_type')
-            || !$this->_isDomestic;
+        return !$this->_isDomestic;
+    }
+
+    /**
+     * Builds a datetime string to be used as the MessageTime in accordance to the expected format.
+     *
+     * @param string|null $datetime
+     * @return string
+     */
+    private function buildMessageTimestamp(string $datetime = null): string
+    {
+        return $this->_coreDate->date(\DATE_RFC3339, $datetime);
+    }
+
+    /**
+     * Builds a string to be used as the MessageReference.
+     *
+     * @param string $servicePrefix
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function buildMessageReference(string $servicePrefix): string
+    {
+        $validPrefixes = [
+            $this->servicePrefixQuote,
+            $this->servicePrefixShipval,
+            $this->servicePrefixTracking,
+        ];
+
+        if (!in_array($servicePrefix, $validPrefixes)) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __("Invalid service prefix \"$servicePrefix\" provided while attempting to build MessageReference")
+            );
+        }
+
+        return str_replace('.', '', uniqid("MAGE_{$servicePrefix}_", true));
+    }
+
+    /**
+     * Builds a string to be used as the request SoftwareName.
+     *
+     * @return string
+     */
+    private function buildSoftwareName(): string
+    {
+        return substr($this->productMetadata->getName(), 0, 30);
+    }
+
+    /**
+     * Builds a string to be used as the request SoftwareVersion.
+     *
+     * @return string
+     */
+    private function buildSoftwareVersion(): string
+    {
+        return substr($this->productMetadata->getVersion(), 0, 10);
     }
 }
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
index 949311bb65d05..74217c24d3b10 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
@@ -3,17 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Dhl\Test\Unit\Model;
 
 use Magento\Dhl\Model\Carrier;
 use Magento\Dhl\Model\Validator\XmlValidator;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\Filesystem\Directory\Read;
 use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\Framework\HTTP\ZendClient;
 use Magento\Framework\HTTP\ZendClientFactory;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Module\Dir\Reader;
+use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Xml\Security;
 use Magento\Quote\Model\Quote\Address\RateRequest;
@@ -32,7 +35,6 @@
 use Magento\Store\Model\Website;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Psr\Log\LoggerInterface;
-use Magento\Store\Model\ScopeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -80,14 +82,19 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
     private $xmlValidator;
 
     /**
-     * @var Request|MockObject
+     * @var LoggerInterface|MockObject
      */
-    private $request;
+    private $logger;
 
     /**
-     * @var LoggerInterface|MockObject
+     * @var DateTime|MockObject
      */
-    private $logger;
+    private $coreDateMock;
+
+    /**
+     * @var ProductMetadataInterface
+     */
+    private $productMetadataMock;
 
     /**
      * @inheritdoc
@@ -96,35 +103,8 @@ protected function setUp()
     {
         $this->objectManager = new ObjectManager($this);
 
-        $this->request = $this->getMockBuilder(Request::class)
-            ->disableOriginalConstructor()
-            ->setMethods(
-                [
-                    'getPackages',
-                    'getOrigCountryId',
-                    'setPackages',
-                    'setPackageWeight',
-                    'setPackageValue',
-                    'setValueWithDiscount',
-                    'setPackageCustomsValue',
-                    'setFreeMethodWeight',
-                    'getPackageWeight',
-                    'getFreeMethodWeight',
-                    'getOrderShipment',
-                ]
-            )
-            ->getMock();
-
         $this->scope = $this->getMockForAbstractClass(ScopeConfigInterface::class);
 
-        $xmlElFactory = $this->getXmlFactory();
-        $rateFactory = $this->getRateFactory();
-        $rateMethodFactory = $this->getRateMethodFactory();
-        $httpClientFactory = $this->getHttpClientFactory();
-        $configReader = $this->getConfigReader();
-        $readFactory = $this->getReadFactory();
-        $storeManager = $this->getStoreManager();
-
         $this->error = $this->getMockBuilder(Error::class)
             ->setMethods(['setCarrier', 'setCarrierTitle', 'setErrorMessage'])
             ->getMock();
@@ -135,31 +115,45 @@ protected function setUp()
         $this->errorFactory->method('create')
             ->willReturn($this->error);
 
-        $carrierHelper = $this->getCarrierHelper();
-
         $this->xmlValidator = $this->getMockBuilder(XmlValidator::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->logger = $this->getMockForAbstractClass(LoggerInterface::class);
 
+        $this->coreDateMock = $this->getMockBuilder(DateTime::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->coreDateMock->method('date')
+            ->willReturn('currentTime');
+
+        $this->productMetadataMock = $this->getMockBuilder(ProductMetadataInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->productMetadataMock->method('getName')
+            ->willReturn('Software_Product_Name_30_Char_123456789');
+        $this->productMetadataMock->method('getVersion')
+            ->willReturn('10Char_Ver123456789');
+
         $this->model = $this->objectManager->getObject(
             Carrier::class,
             [
                 'scopeConfig' => $this->scope,
-                'xmlSecurity' => new Security(),
-                'logger' => $this->logger,
-                'xmlElFactory' => $xmlElFactory,
-                'rateFactory' => $rateFactory,
                 'rateErrorFactory' => $this->errorFactory,
-                'rateMethodFactory' => $rateMethodFactory,
-                'httpClientFactory' => $httpClientFactory,
-                'readFactory' => $readFactory,
-                'storeManager' => $storeManager,
-                'configReader' => $configReader,
-                'carrierHelper' => $carrierHelper,
+                'logger' => $this->logger,
+                'xmlSecurity' => new Security(),
+                'xmlElFactory' => $this->getXmlFactory(),
+                'rateFactory' => $this->getRateFactory(),
+                'rateMethodFactory' => $this->getRateMethodFactory(),
+                'carrierHelper' => $this->getCarrierHelper(),
+                'configReader' => $this->getConfigReader(),
+                'storeManager' => $this->getStoreManager(),
+                'readFactory' => $this->getReadFactory(),
+                'httpClientFactory' => $this->getHttpClientFactory(),
                 'data' => ['id' => 'dhl', 'store' => '1'],
                 'xmlValidator' => $this->xmlValidator,
+                'coreDate' => $this->coreDateMock,
+                'productMetadata' => $this->productMetadataMock
             ]
         );
     }
@@ -176,14 +170,14 @@ public function scopeConfigGetValue($path)
             'carriers/dhl/shipment_days' => 'Mon,Tue,Wed,Thu,Fri,Sat',
             'carriers/dhl/intl_shipment_days' => 'Mon,Tue,Wed,Thu,Fri,Sat',
             'carriers/dhl/allowed_methods' => 'IE',
-            'carriers/dhl/international_searvice' => 'IE',
+            'carriers/dhl/international_service' => 'IE',
             'carriers/dhl/gateway_url' => 'https://xmlpi-ea.dhl.com/XMLShippingServlet',
             'carriers/dhl/id' => 'some ID',
             'carriers/dhl/password' => 'some password',
             'carriers/dhl/content_type' => 'N',
             'carriers/dhl/nondoc_methods' => '1,3,4,8,P,Q,E,F,H,J,M,V,Y',
             'carriers/dhl/showmethod' => 1,
-            'carriers/dhl/title' => 'dhl Title',
+            'carriers/dhl/title' => 'DHL Title',
             'carriers/dhl/specificerrmsg' => 'dhl error message',
             'carriers/dhl/unit_of_measure' => 'K',
             'carriers/dhl/size' => '1',
@@ -191,11 +185,16 @@ public function scopeConfigGetValue($path)
             'carriers/dhl/width' => '1.6',
             'carriers/dhl/depth' => '1.6',
             'carriers/dhl/debug' => 1,
-            'shipping/origin/country_id' => 'GB',
+            'shipping/origin/country_id' => 'GB'
         ];
         return isset($pathMap[$path]) ? $pathMap[$path] : null;
     }
 
+    /**
+     * Prepare shipping label content test
+     *
+     * @throws \ReflectionException
+     */
     public function testPrepareShippingLabelContent()
     {
         $xml = simplexml_load_file(
@@ -207,6 +206,8 @@ public function testPrepareShippingLabelContent()
     }
 
     /**
+     * Prepare shipping label content exception test
+     *
      * @dataProvider prepareShippingLabelContentExceptionDataProvider
      * @expectedException \Magento\Framework\Exception\LocalizedException
      * @expectedExceptionMessage Unable to retrieve shipping label
@@ -217,6 +218,8 @@ public function testPrepareShippingLabelContentException(\SimpleXMLElement $xml)
     }
 
     /**
+     * Prepare shipping label content exception data provider
+     *
      * @return array
      */
     public function prepareShippingLabelContentExceptionDataProvider()
@@ -236,8 +239,11 @@ public function prepareShippingLabelContentExceptionDataProvider()
     }
 
     /**
+     * Invoke prepare shipping label content
+     *
      * @param \SimpleXMLElement $xml
      * @return \Magento\Framework\DataObject
+     * @throws \ReflectionException
      */
     protected function _invokePrepareShippingLabelContent(\SimpleXMLElement $xml)
     {
@@ -247,8 +253,14 @@ protected function _invokePrepareShippingLabelContent(\SimpleXMLElement $xml)
         return $method->invoke($model, $xml);
     }
 
+    /**
+     * Tests that valid rates are returned when sending a quotes request.
+     */
     public function testCollectRates()
     {
+        $requestData = require __DIR__ . '/_files/dhl_quote_request_data.php';
+        $responseXml = file_get_contents(__DIR__ . '/_files/dhl_quote_response.xml');
+
         $this->scope->method('getValue')
             ->willReturnCallback([$this, 'scopeConfigGetValue']);
 
@@ -256,29 +268,44 @@ public function testCollectRates()
             ->willReturn(true);
 
         $this->httpResponse->method('getBody')
-            ->willReturn(file_get_contents(__DIR__ . '/_files/success_dhl_response_rates.xml'));
+            ->willReturn($responseXml);
 
-        /** @var RateRequest $request */
-        $request = $this->objectManager->getObject(
-            RateRequest::class,
-            require __DIR__ . '/_files/rates_request_data_dhl.php'
-        );
+        $this->coreDateMock->method('date')
+            ->willReturnCallback(function () {
+                return date(\DATE_RFC3339);
+            });
+
+        $request = $this->objectManager->getObject(RateRequest::class, $requestData);
 
         $reflectionClass = new \ReflectionObject($this->httpClient);
         $rawPostData = $reflectionClass->getProperty('raw_post_data');
         $rawPostData->setAccessible(true);
 
-        $this->logger->expects(self::once())
+        $this->logger->expects($this->once())
             ->method('debug')
-            ->with(self::stringContains('<SiteID>****</SiteID><Password>****</Password>'));
+            ->with($this->stringContains('<SiteID>****</SiteID><Password>****</Password>'));
+
+        $expectedRates = require __DIR__ . '/_files/dhl_quote_response_rates.php';
+        $actualRates = $this->model->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);
+        }
 
-        self::assertNotEmpty($this->model->collectRates($request)->getAllRates());
-        self::assertContains('<Weight>18.223</Weight>', $rawPostData->getValue($this->httpClient));
-        self::assertContains('<Height>0.630</Height>', $rawPostData->getValue($this->httpClient));
-        self::assertContains('<Width>0.630</Width>', $rawPostData->getValue($this->httpClient));
-        self::assertContains('<Depth>0.630</Depth>', $rawPostData->getValue($this->httpClient));
+        $requestXml = $rawPostData->getValue($this->httpClient);
+        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);
     }
 
+    /**
+     * Tests that an error is returned when attempting to collect rates for an inactive shipping method.
+     */
     public function testCollectRatesErrorMessage()
     {
         $this->scope->method('getValue')
@@ -296,26 +323,81 @@ public function testCollectRatesErrorMessage()
         $this->assertSame($this->error, $this->model->collectRates($request));
     }
 
-    public function testCollectRatesFail()
+    /**
+     * Test request to shipment sends valid xml values.
+     *
+     * @dataProvider requestToShipmentDataProvider
+     * @param string $origCountryId
+     * @param string $expectedRegionCode
+     * @param string $destCountryId
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \ReflectionException
+     */
+    public function testRequestToShipment(string $origCountryId, string $expectedRegionCode, string $destCountryId)
     {
-        $this->scope->expects($this->once())->method('isSetFlag')->willReturn(true);
+        $scopeConfigValueMap = [
+            ['carriers/dhl/account', 'store', null, '1234567890'],
+            ['carriers/dhl/gateway_url', 'store', null, 'https://xmlpi-ea.dhl.com/XMLShippingServlet'],
+            ['carriers/dhl/id', 'store', null, 'some ID'],
+            ['carriers/dhl/password', 'store', null, 'some password'],
+            ['carriers/dhl/content_type', 'store', null, 'N'],
+            ['carriers/dhl/nondoc_methods', 'store', null, '1,3,4,8,P,Q,E,F,H,J,M,V,Y'],
+            ['shipping/origin/country_id', 'store', null, $origCountryId],
+        ];
 
-        $request = new RateRequest();
-        $request->setPackageWeight(1);
+        $this->scope->method('getValue')
+            ->willReturnMap($scopeConfigValueMap);
+
+        $this->httpResponse->method('getBody')
+            ->willReturn(utf8_encode(file_get_contents(__DIR__ . '/_files/response_shipping_label.xml')));
 
-        $this->assertFalse(false, $this->model->collectRates($request));
+        $request = $this->getRequest($origCountryId, $destCountryId);
+
+        $this->logger->method('debug')
+            ->with($this->stringContains('<SiteID>****</SiteID><Password>****</Password>'));
+
+        $result = $this->model->requestToShipment($request);
+
+        $reflectionClass = new \ReflectionObject($this->httpClient);
+        $rawPostData = $reflectionClass->getProperty('raw_post_data');
+        $rawPostData->setAccessible(true);
+
+        $this->assertNotNull($result);
+        $requestXml = $rawPostData->getValue($this->httpClient);
+        $requestElement = new Element($requestXml);
+
+        $messageReference = $requestElement->Request->ServiceHeader->MessageReference->__toString();
+        $this->assertStringStartsWith('MAGE_SHIP_', $messageReference);
+        $this->assertGreaterThanOrEqual(28, strlen($messageReference));
+        $this->assertLessThanOrEqual(32, strlen($messageReference));
+        $requestElement->Request->ServiceHeader->MessageReference = 'MAGE_SHIP_28TO32_Char_CHECKED';
+
+        $this->assertXmlStringEqualsXmlString(
+            $this->getExpectedRequestXml($origCountryId, $destCountryId, $expectedRegionCode)->asXML(),
+            $requestElement->asXML()
+        );
     }
 
     /**
-     * Test request to shipment sends valid xml values.
+     * Prepare and retrieve request object
+     *
+     * @param string $origCountryId
+     * @param string $destCountryId
+     * @return Request|MockObject
      */
-    public function testRequestToShipment()
+    private function getRequest(string $origCountryId, string $destCountryId)
     {
-        $this->scope->method('getValue')
-            ->willReturnCallback([$this, 'scopeConfigGetValue']);
+        $order = $this->getMockBuilder(Order::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $order->method('getSubtotal')
+            ->willReturn('10.00');
 
-        $this->httpResponse->method('getBody')
-            ->willReturn(utf8_encode(file_get_contents(__DIR__ . '/_files/response_shipping_label.xml')));
+        $shipment = $this->getMockBuilder(Order\Shipment::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $shipment->method('getOrder')
+            ->willReturn($order);
 
         $packages = [
             'package' => [
@@ -334,130 +416,106 @@ public function testRequestToShipment()
                         'name' => 'item_name',
                     ],
                 ],
-            ]
+            ],
         ];
 
-        $order = $this->getMockBuilder(Order::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $order->method('getSubtotal')
-            ->willReturn('10.00');
+        $methods = [
+            'getPackages' => $packages,
+            'getOrigCountryId' => $origCountryId,
+            'getDestCountryId' => $destCountryId,
+            'getShipperAddressCountryCode' => $origCountryId,
+            'getRecipientAddressCountryCode' => $destCountryId,
+            'setPackages' => null,
+            'setPackageWeight' => null,
+            'setPackageValue' => null,
+            'setValueWithDiscount' => null,
+            'setPackageCustomsValue' => null,
+            'setFreeMethodWeight' => null,
+            'getPackageWeight' => '0.454000000001',
+            'getFreeMethodWeight' => '0.454000000001',
+            'getOrderShipment' => $shipment,
+        ];
 
-        $shipment = $this->getMockBuilder(Order\Shipment::class)
+        /** @var Request|MockObject $request */
+        $request = $this->getMockBuilder(Request::class)
             ->disableOriginalConstructor()
+            ->setMethods(array_keys($methods))
             ->getMock();
-        $shipment->method('getOrder')
-            ->willReturn($order);
-
-        $this->request->method('getPackages')
-            ->willReturn($packages);
-        $this->request->method('getOrigCountryId')
-            ->willReturn('GB');
-        $this->request->method('setPackages')
-            ->willReturnSelf();
-        $this->request->method('setPackageWeight')
-            ->willReturnSelf();
-        $this->request->method('setPackageValue')
-            ->willReturnSelf();
-        $this->request->method('setValueWithDiscount')
-            ->willReturnSelf();
-        $this->request->method('setPackageCustomsValue')
-            ->willReturnSelf();
-        $this->request->method('setFreeMethodWeight')
-            ->willReturnSelf();
-        $this->request->method('getPackageWeight')
-            ->willReturn('0.454000000001');
-        $this->request->method('getFreeMethodWeight')
-            ->willReturn('0.454000000001');
-        $this->request->method('getOrderShipment')
-            ->willReturn($shipment);
-
-        $this->logger->method('debug')
-            ->with(self::stringContains('<SiteID>****</SiteID><Password>****</Password>'));
 
-        $result = $this->model->requestToShipment($this->request);
+        foreach ($methods as $method => $return) {
+            $return ? $request->method($method)->willReturn($return) : $request->method($method)->willReturnSelf();
+        }
 
-        $reflectionClass = new \ReflectionObject($this->httpClient);
-        $rawPostData = $reflectionClass->getProperty('raw_post_data');
-        $rawPostData->setAccessible(true);
-
-        $this->assertNotNull($result);
-        $this->assertContains('<Weight>0.454</Weight>', $rawPostData->getValue($this->httpClient));
+        return $request;
     }
 
     /**
-     * Test that shipping label request for origin country from AP region doesn't contain restricted fields.
+     * Prepare and retrieve expected request xml element
+     *
+     * @param string $origCountryId
+     * @param string $destCountryId
+     * @return Element
      */
-    public function testShippingLabelRequestForAsiaPacificRegion()
+    private function getExpectedRequestXml(string $origCountryId, string $destCountryId, string $regionCode)
     {
-        $this->scope->method('getValue')
-            ->willReturnMap(
-                [
-                    ['shipping/origin/country_id', ScopeInterface::SCOPE_STORE, null, 'SG'],
-                    ['carriers/dhl/gateway_url', ScopeInterface::SCOPE_STORE, null, 'https://xmlpi-ea.dhl.com'],
-                ]
-            );
+        $requestXmlPath = $origCountryId == $destCountryId
+            ? '/_files/domestic_shipment_request.xml'
+            : '/_files/shipment_request.xml';
 
-        $this->httpResponse->method('getBody')
-            ->willReturn(utf8_encode(file_get_contents(__DIR__ . '/_files/response_shipping_label.xml')));
+        $expectedRequestElement = new Element(file_get_contents(__DIR__ . $requestXmlPath));
 
-        $packages = [
-            'package' => [
-                'params' => [
-                    'width' => '1',
-                    'length' => '1',
-                    'height' => '1',
-                    'dimension_units' => 'INCH',
-                    'weight_units' => 'POUND',
-                    'weight' => '0.45',
-                    'customs_value' => '10.00',
-                    'container' => Carrier::DHL_CONTENT_TYPE_NON_DOC,
-                ],
-                'items' => [
-                    'item1' => [
-                        'name' => 'item_name',
-                    ],
-                ],
-            ]
-        ];
+        $expectedRequestElement->Consignee->CountryCode = $destCountryId;
+        $expectedRequestElement->Consignee->CountryName = $this->getCountryName($destCountryId);
 
-        $this->request->method('getPackages')->willReturn($packages);
-        $this->request->method('getOrigCountryId')->willReturn('SG');
-        $this->request->method('setPackages')->willReturnSelf();
-        $this->request->method('setPackageWeight')->willReturnSelf();
-        $this->request->method('setPackageValue')->willReturnSelf();
-        $this->request->method('setValueWithDiscount')->willReturnSelf();
-        $this->request->method('setPackageCustomsValue')->willReturnSelf();
+        $expectedRequestElement->Shipper->CountryCode = $origCountryId;
+        $expectedRequestElement->Shipper->CountryName = $this->getCountryName($origCountryId);
 
-        $result = $this->model->requestToShipment($this->request);
+        $expectedRequestElement->RegionCode = $regionCode;
 
-        $reflectionClass = new \ReflectionObject($this->httpClient);
-        $rawPostData = $reflectionClass->getProperty('raw_post_data');
-        $rawPostData->setAccessible(true);
+        return $expectedRequestElement;
+    }
 
-        $this->assertNotNull($result);
-        $requestXml = $rawPostData->getValue($this->httpClient);
+    /**
+     * Get Country Name by Country Code
+     *
+     * @param string $countryCode
+     * @return string
+     */
+    private function getCountryName($countryCode)
+    {
+        $countryNames = [
+            'US' => 'United States of America',
+            'SG' => 'Singapore',
+            'GB' => 'United Kingdom',
+            'DE' => 'Germany',
+        ];
+        return $countryNames[$countryCode];
+    }
 
-        $this->assertNotContains(
-            'NewShipper',
-            $requestXml,
-            'NewShipper is restricted field for AP region'
-        );
-        $this->assertNotContains(
-            'Division',
-            $requestXml,
-            'Division is restricted field for AP region'
-        );
-        $this->assertNotContains(
-            'RegisteredAccount',
-            $requestXml,
-            'RegisteredAccount is restricted field for AP region'
-        );
+    /**
+     * Data provider to testRequestToShipment
+     *
+     * @return array
+     */
+    public function requestToShipmentDataProvider()
+    {
+        return [
+            [
+                'GB', 'EU', 'US'
+            ],
+            [
+                'SG', 'AP', 'US'
+            ],
+            [
+                'DE', 'EU', 'DE'
+            ]
+        ];
     }
 
     /**
-     * @dataProvider dhlProductsDataProvider
+     * Get DHL products test
      *
+     * @dataProvider dhlProductsDataProvider
      * @param string $docType
      * @param array $products
      */
@@ -467,9 +525,11 @@ public function testGetDhlProducts(string $docType, array $products)
     }
 
     /**
+     * DHL products data provider
+     *
      * @return array
      */
-    public function dhlProductsDataProvider() : array
+    public function dhlProductsDataProvider(): array
     {
         return [
             'doc' => [
@@ -495,7 +555,7 @@ public function dhlProductsDataProvider() : array
                     'S' => 'Same day',
                     'T' => 'Express 12:00',
                     'X' => 'Express envelope',
-                ]
+                ],
             ],
             'non-doc' => [
                 'docType' => Carrier::DHL_CONTENT_TYPE_NON_DOC,
@@ -513,8 +573,120 @@ public function dhlProductsDataProvider() : array
                     'M' => 'Express 10:30',
                     'V' => 'Europack',
                     'Y' => 'Express 12:00',
-                ]
-            ]
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Tests that the built MessageReference string is of the appropriate format.
+     *
+     * @dataProvider buildMessageReferenceDataProvider
+     * @param string $servicePrefix
+     *
+     * @return void
+     */
+    public function testBuildMessageReference(string $servicePrefix)
+    {
+        $method = new \ReflectionMethod($this->model, 'buildMessageReference');
+        $method->setAccessible(true);
+
+        $messageReference = $method->invoke($this->model, $servicePrefix);
+        $this->assertGreaterThanOrEqual(28, strlen($messageReference));
+        $this->assertLessThanOrEqual(32, strlen($messageReference));
+    }
+
+    /**
+     * Build message reference data provider
+     *
+     * @return array
+     */
+    public function buildMessageReferenceDataProvider(): array
+    {
+        return [
+            'quote_prefix' => ['QUOT'],
+            'shipval_prefix' => ['SHIP'],
+            'tracking_prefix' => ['TRCK'],
+        ];
+    }
+
+    /**
+     * Tests that an exception is thrown when an invalid service prefix is provided.
+     *
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Invalid service prefix
+     *
+     * @return void
+     */
+    public function testBuildMessageReferenceInvalidPrefix()
+    {
+        $method = new \ReflectionMethod($this->model, 'buildMessageReference');
+        $method->setAccessible(true);
+
+        $method->invoke($this->model, 'INVALID');
+    }
+
+    /**
+     * Tests that the built software name string is of the appropriate format.
+     *
+     * @dataProvider buildSoftwareNameDataProvider
+     * @param string $productName
+     *
+     * @return void
+     */
+    public function testBuildSoftwareName(string $productName)
+    {
+        $method = new \ReflectionMethod($this->model, 'buildSoftwareName');
+        $method->setAccessible(true);
+
+        $this->productMetadataMock->method('getName')->willReturn($productName);
+
+        $softwareName = $method->invoke($this->model);
+        $this->assertLessThanOrEqual(30, strlen($softwareName));
+    }
+
+    /**
+     * Data provider for testBuildSoftwareName
+     *
+     * @return array
+     */
+    public function buildSoftwareNameDataProvider(): array
+    {
+        return [
+            'valid_length' => ['Magento'],
+            'exceeds_length' => ['Product_Name_Longer_Than_30_Char'],
+        ];
+    }
+
+    /**
+     * Tests that the built software version string is of the appropriate format.
+     *
+     * @dataProvider buildSoftwareVersionProvider
+     * @param string $productVersion
+     *
+     * @return void
+     */
+    public function testBuildSoftwareVersion(string $productVersion)
+    {
+        $method = new \ReflectionMethod($this->model, 'buildSoftwareVersion');
+        $method->setAccessible(true);
+
+        $this->productMetadataMock->method('getVersion')->willReturn($productVersion);
+
+        $softwareVersion = $method->invoke($this->model);
+        $this->assertLessThanOrEqual(10, strlen($softwareVersion));
+    }
+
+    /**
+     * Data provider for testBuildSoftwareVersion
+     *
+     * @return array
+     */
+    public function buildSoftwareVersionProvider(): array
+    {
+        return [
+            'valid_length' => ['2.3.1'],
+            'exceeds_length' => ['dev-MC-1000'],
         ];
     }
 
@@ -576,19 +748,25 @@ private function getRateMethodFactory(): MockObject
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $rateMethod = $this->getMockBuilder(Method::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['setPrice'])
-            ->getMock();
-        $rateMethod->method('setPrice')
-            ->willReturnSelf();
+
         $rateMethodFactory->method('create')
-            ->willReturn($rateMethod);
+            ->willReturnCallback(function () {
+                $rateMethod = $this->getMockBuilder(Method::class)
+                    ->disableOriginalConstructor()
+                    ->setMethods(['setPrice'])
+                    ->getMock();
+                $rateMethod->method('setPrice')
+                    ->willReturnSelf();
+
+                return $rateMethod;
+            });
 
         return $rateMethodFactory;
     }
 
     /**
+     * Get config reader
+     *
      * @return MockObject
      */
     private function getConfigReader(): MockObject
@@ -603,6 +781,8 @@ private function getConfigReader(): MockObject
     }
 
     /**
+     * Get read factory
+     *
      * @return MockObject
      */
     private function getReadFactory(): MockObject
@@ -621,6 +801,8 @@ private function getReadFactory(): MockObject
     }
 
     /**
+     * Get store manager
+     *
      * @return MockObject
      */
     private function getStoreManager(): MockObject
@@ -642,6 +824,8 @@ private function getStoreManager(): MockObject
     }
 
     /**
+     * Get carrier helper
+     *
      * @return CarrierHelper
      */
     private function getCarrierHelper(): CarrierHelper
@@ -652,7 +836,7 @@ private function getCarrierHelper(): CarrierHelper
         $carrierHelper = $this->objectManager->getObject(
             CarrierHelper::class,
             [
-                'localeResolver' => $localeResolver
+                'localeResolver' => $localeResolver,
             ]
         );
 
@@ -660,6 +844,8 @@ private function getCarrierHelper(): CarrierHelper
     }
 
     /**
+     * Get HTTP client factory
+     *
      * @return MockObject
      */
     private function getHttpClientFactory(): MockObject
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/apregion_shipment_request.xml b/app/code/Magento/Dhl/Test/Unit/Model/_files/apregion_shipment_request.xml
new file mode 100644
index 0000000000000..91f8372cd8dbb
--- /dev/null
+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/apregion_shipment_request.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<req:ShipmentValidateRequestAP xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com ship-val-req_AP.xsd">
+    <Request xmlns="">
+        <ServiceHeader>
+            <SiteID>some ID</SiteID>
+            <Password>some password</Password>
+        </ServiceHeader>
+    </Request>
+    <LanguageCode xmlns="">EN</LanguageCode>
+    <PiecesEnabled xmlns="">Y</PiecesEnabled>
+    <Billing xmlns="">
+        <ShipperAccountNumber>1234567890</ShipperAccountNumber>
+        <ShippingPaymentType>S</ShippingPaymentType>
+        <BillingAccountNumber>1234567890</BillingAccountNumber>
+        <DutyPaymentType>S</DutyPaymentType>
+        <DutyAccountNumber>1234567890</DutyAccountNumber>
+    </Billing>
+    <Consignee xmlns="">
+        <CompanyName/>
+        <AddressLine/>
+        <City/>
+        <PostalCode/>
+        <CountryCode/>
+        <CountryName/>
+        <Contact>
+            <PersonName/>
+            <PhoneNumber/>
+        </Contact>
+    </Consignee>
+    <Commodity xmlns="">
+        <CommodityCode>1</CommodityCode>
+    </Commodity>
+    <Dutiable xmlns="">
+        <DeclaredValue>10.00</DeclaredValue>
+        <DeclaredCurrency>USD</DeclaredCurrency>
+    </Dutiable>
+    <Reference xmlns="">
+        <ReferenceID>shipment reference</ReferenceID>
+        <ReferenceType>St</ReferenceType>
+    </Reference>
+    <ShipmentDetails xmlns="">
+        <NumberOfPieces>1</NumberOfPieces>
+        <CurrencyCode>USD</CurrencyCode>
+        <Pieces xmlns="">
+            <Piece xmlns="">
+                <PieceID>1</PieceID>
+                <PackageType>CP</PackageType>
+                <Weight>0.5</Weight>
+                <Depth>3</Depth>
+                <Width>3</Width>
+                <Height>3</Height>
+                <PieceContents>item_name</PieceContents>
+            </Piece>
+        </Pieces>
+        <PackageType>CP</PackageType>
+        <Weight>0.454</Weight>
+        <DimensionUnit>C</DimensionUnit>
+        <WeightUnit>K</WeightUnit>
+        <GlobalProductCode/>
+        <LocalProductCode/>
+        <DoorTo>DD</DoorTo>
+        <Date/>
+        <Contents>DHL Parcel TEST</Contents>
+    </ShipmentDetails>
+    <Shipper xmlns="">
+        <ShipperID>1234567890</ShipperID>
+        <CompanyName/>
+        <AddressLine/>
+        <City/>
+        <PostalCode/>
+        <CountryCode/>
+        <CountryName/>
+        <Contact xmlns="">
+            <PersonName/>
+            <PhoneNumber/>
+        </Contact>
+    </Shipper>
+    <LabelImageFormat xmlns="">PDF</LabelImageFormat>
+</req:ShipmentValidateRequestAP>
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 3f28111f229d1..fb9188fa37653 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/_files/countries.xml
+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/countries.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © Magento, Inc. All rights reserved.
@@ -83,7 +83,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Austria</name>
         <domestic>1</domestic>
     </AT>
@@ -132,7 +132,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Belgium</name>
         <domestic>1</domestic>
     </BE>
@@ -146,7 +146,7 @@
         <currency>BGN</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Bulgaria</name>
         <domestic>1</domestic>
     </BG>
@@ -257,7 +257,7 @@
         <currency>CHF</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Switzerland</name>
     </CH>
     <CI>
@@ -331,7 +331,7 @@
         <currency>CZK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Czech Republic, The</name>
         <domestic>1</domestic>
     </CZ>
@@ -339,7 +339,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Germany</name>
         <domestic>1</domestic>
     </DE>
@@ -353,7 +353,7 @@
         <currency>DKK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Denmark</name>
         <domestic>1</domestic>
     </DK>
@@ -389,7 +389,7 @@
         <currency>EEK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Estonia</name>
         <domestic>1</domestic>
     </EE>
@@ -410,7 +410,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Spain</name>
         <domestic>1</domestic>
     </ES>
@@ -424,7 +424,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Finland</name>
         <domestic>1</domestic>
     </FI>
@@ -457,7 +457,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>France</name>
         <domestic>1</domestic>
     </FR>
@@ -471,7 +471,7 @@
         <currency>GBP</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>United Kingdom</name>
         <domestic>1</domestic>
     </GB>
@@ -549,7 +549,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Greece</name>
         <domestic>1</domestic>
     </GR>
@@ -612,7 +612,7 @@
         <currency>HUF</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Hungary</name>
         <domestic>1</domestic>
     </HU>
@@ -633,7 +633,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Ireland, Republic Of</name>
         <domestic>1</domestic>
     </IE>
@@ -668,14 +668,14 @@
         <currency>ISK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Iceland</name>
     </IS>
     <IT>
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Italy</name>
         <domestic>1</domestic>
     </IT>
@@ -834,7 +834,7 @@
         <currency>LTL</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Lithuania</name>
         <domestic>1</domestic>
     </LT>
@@ -842,7 +842,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Luxembourg</name>
         <domestic>1</domestic>
     </LU>
@@ -850,7 +850,7 @@
         <currency>LVL</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Latvia</name>
         <domestic>1</domestic>
     </LV>
@@ -1039,7 +1039,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Netherlands, The</name>
         <domestic>1</domestic>
     </NL>
@@ -1047,7 +1047,7 @@
         <currency>NOK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Norway</name>
     </NO>
     <NP>
@@ -1127,7 +1127,7 @@
         <currency>PLN</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Poland</name>
         <domestic>1</domestic>
     </PL>
@@ -1142,7 +1142,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Portugal</name>
         <domestic>1</domestic>
     </PT>
@@ -1177,7 +1177,7 @@
         <currency>RON</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Romania</name>
         <domestic>1</domestic>
     </RO>
@@ -1231,7 +1231,7 @@
         <currency>SEK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Sweden</name>
         <domestic>1</domestic>
     </SE>
@@ -1246,7 +1246,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Slovenia</name>
         <domestic>1</domestic>
     </SI>
@@ -1254,7 +1254,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Slovakia</name>
         <domestic>1</domestic>
     </SK>
@@ -1417,7 +1417,7 @@
         <weight_unit>LB</weight_unit>
         <measure_unit>IN</measure_unit>
         <region>AM</region>
-        <name>United States Of America</name>
+        <name>United States of America</name>
     </US>
     <UY>
         <currency>UYU</currency>
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_request_data.php b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_request_data.php
new file mode 100644
index 0000000000000..0de635388e583
--- /dev/null
+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_request_data.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+return [
+    'data' => [
+        'dest_country_id' => 'DE',
+        'dest_region_id' => '82',
+        'dest_region_code' => 'BER',
+        'dest_street' => 'Turmstraße 17',
+        'dest_city' => 'Berlin',
+        'dest_postcode' => '10559',
+        'dest_postal' => '10559',
+        'package_value' => '5',
+        'package_value_with_discount' => '5',
+        'package_weight' => '8.2657',
+        'package_qty' => '1',
+        'package_physical_value' => '5',
+        'free_method_weight' => '5',
+        'store_id' => '1',
+        'website_id' => '1',
+        'free_shipping' => '0',
+        'limit_carrier' => null,
+        'base_subtotal_incl_tax' => '5',
+        'orig_country_id' => 'US',
+        'country_id' => 'US',
+        'orig_region_id' => '12',
+        'orig_city' => 'Fremont',
+        'orig_postcode' => '94538',
+        'dhl_id' => 'MAGEN_8501',
+        'dhl_password' => 'QR2GO1U74X',
+        'dhl_account' => '799909537',
+        'dhl_shipping_intl_key' => '54233F2B2C4E5C4B4C5E5A59565530554B405641475D5659',
+        'girth' => null,
+        'height' => null,
+        'length' => null,
+        'width' => null,
+        'weight' => 1,
+        'dhl_shipment_type' => 'P',
+        'dhl_duitable' => 0,
+        'dhl_duty_payment_type' => 'R',
+        'dhl_content_desc' => 'Big Box',
+        'limit_method' => 'IE',
+        'ship_date' => '2014-01-09',
+        'action' => 'RateEstimate',
+        'all_items' => [],
+    ],
+];
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response.xml b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response.xml
new file mode 100644
index 0000000000000..349cfbd4f1ce5
--- /dev/null
+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response.xml
@@ -0,0 +1,518 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<res:DCTResponse xmlns:res="http://www.dhl.com"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 xsi:schemaLocation="http://www.dhl.com DCT-Response_global-2.0.xsd">
+    <GetQuoteResponse>
+        <Response>
+            <ServiceHeader>
+                <MessageTime>2014-01-09T12:13:29.498+00:00</MessageTime>
+                <SiteID>EvgeniyUSA</SiteID>
+            </ServiceHeader>
+        </Response>
+        <BkgDetails>
+            <QtdShp>
+                <OriginServiceArea>
+                    <FacilityCode>NUQ</FacilityCode>
+                    <ServiceAreaCode>NUQ</ServiceAreaCode>
+                </OriginServiceArea>
+                <DestinationServiceArea>
+                    <FacilityCode>BER</FacilityCode>
+                    <ServiceAreaCode>BER</ServiceAreaCode>
+                </DestinationServiceArea>
+                <GlobalProductCode>E</GlobalProductCode>
+                <LocalProductCode>E</LocalProductCode>
+                <ProductShortName>EXPRESS 9:00</ProductShortName>
+                <LocalProductName>EXPRESS 9:00 NONDOC</LocalProductName>
+                <NetworkTypeCode>TD</NetworkTypeCode>
+                <POfferedCustAgreement>N</POfferedCustAgreement>
+                <TransInd>Y</TransInd>
+                <PickupDate>2014-01-09</PickupDate>
+                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
+                <BookingTime>PT15H15M</BookingTime>
+                <CurrencyCode>USD</CurrencyCode>
+                <ExchangeRate>1.000000</ExchangeRate>
+                <WeightCharge>42.060</WeightCharge>
+                <WeightChargeTax>0.000</WeightChargeTax>
+                <TotalTransitDays>2</TotalTransitDays>
+                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
+                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
+                <DeliveryDate>
+                    <DlvyDateTime>2014-01-13 11:59:00</DlvyDateTime>
+                    <DeliveryDateTimeOffset>+00:00</DeliveryDateTimeOffset>
+                </DeliveryDate>
+                <DeliveryTime>PT9H</DeliveryTime>
+                <DimensionalWeight>2.205</DimensionalWeight>
+                <WeightUnit>LB</WeightUnit>
+                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
+                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
+                <QtdShpExChrg>
+                    <SpecialServiceType>FF</SpecialServiceType>
+                    <LocalServiceType>FF</LocalServiceType>
+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
+                    <ChargeCodeType>SCH</ChargeCodeType>
+                    <CurrencyCode>USD</CurrencyCode>
+                    <ChargeValue>3.790</ChargeValue>
+                    <QtdSExtrChrgInAdCur>
+                        <ChargeValue>3.790</ChargeValue>
+                        <CurrencyCode>USD</CurrencyCode>
+                        <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
+                    </QtdSExtrChrgInAdCur>
+                    <QtdSExtrChrgInAdCur>
+                        <ChargeValue>3.790</ChargeValue>
+                        <CurrencyCode>USD</CurrencyCode>
+                        <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
+                    </QtdSExtrChrgInAdCur>
+                    <QtdSExtrChrgInAdCur>
+                        <ChargeValue>3.790</ChargeValue>
+                        <CurrencyCode>USD</CurrencyCode>
+                        <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
+                    </QtdSExtrChrgInAdCur>
+                </QtdShpExChrg>
+                <PricingDate>2014-01-09</PricingDate>
+                <ShippingCharge>45.850</ShippingCharge>
+                <TotalTaxAmount>0.000</TotalTaxAmount>
+                <QtdSInAdCur>
+                    <CurrencyCode>USD</CurrencyCode>
+                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
+                    <WeightCharge>42.060</WeightCharge>
+                    <TotalAmount>45.850</TotalAmount>
+                    <TotalTaxAmount>0.000</TotalTaxAmount>
+                    <WeightChargeTax>0.000</WeightChargeTax>
+                </QtdSInAdCur>
+                <QtdSInAdCur>
+                    <CurrencyCode>USD</CurrencyCode>
+                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
+                    <WeightCharge>42.060</WeightCharge>
+                    <TotalAmount>45.850</TotalAmount>
+                    <TotalTaxAmount>0.000</TotalTaxAmount>
+                    <WeightChargeTax>0.000</WeightChargeTax>
+                </QtdSInAdCur>
+                <QtdSInAdCur>
+                    <CurrencyCode>USD</CurrencyCode>
+                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
+                    <WeightCharge>42.060</WeightCharge>
+                    <TotalAmount>45.850</TotalAmount>
+                    <TotalTaxAmount>0.000</TotalTaxAmount>
+                    <WeightChargeTax>0.000</WeightChargeTax>
+                </QtdSInAdCur>
+                <PickupWindowEarliestTime>09:00:00</PickupWindowEarliestTime>
+                <PickupWindowLatestTime>17:00:00</PickupWindowLatestTime>
+                <BookingCutoffOffset>PT1H</BookingCutoffOffset>
+            </QtdShp>
+            <QtdShp>
+                <OriginServiceArea>
+                    <FacilityCode>NUQ</FacilityCode>
+                    <ServiceAreaCode>NUQ</ServiceAreaCode>
+                </OriginServiceArea>
+                <DestinationServiceArea>
+                    <FacilityCode>BER</FacilityCode>
+                    <ServiceAreaCode>BER</ServiceAreaCode>
+                </DestinationServiceArea>
+                <GlobalProductCode>Q</GlobalProductCode>
+                <LocalProductCode>Q</LocalProductCode>
+                <ProductShortName>MEDICAL EXPRESS</ProductShortName>
+                <LocalProductName>MEDICAL EXPRESS</LocalProductName>
+                <NetworkTypeCode>TD</NetworkTypeCode>
+                <POfferedCustAgreement>Y</POfferedCustAgreement>
+                <TransInd>N</TransInd>
+                <PickupDate>2014-01-09</PickupDate>
+                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
+                <BookingTime>PT15H15M</BookingTime>
+                <CurrencyCode>USD</CurrencyCode>
+                <ExchangeRate>1.000000</ExchangeRate>
+                <WeightCharge>32.350</WeightCharge>
+                <WeightChargeTax>0.000</WeightChargeTax>
+                <TotalTransitDays>2</TotalTransitDays>
+                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
+                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
+                <DeliveryDate>
+                    <DlvyDateTime>2014-01-13 11:59:00</DlvyDateTime>
+                    <DeliveryDateTimeOffset>+00:00</DeliveryDateTimeOffset>
+                </DeliveryDate>
+                <DeliveryTime>PT9H</DeliveryTime>
+                <DimensionalWeight>2.205</DimensionalWeight>
+                <WeightUnit>LB</WeightUnit>
+                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
+                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
+                <QtdShpExChrg>
+                    <SpecialServiceType>FF</SpecialServiceType>
+                    <LocalServiceType>FF</LocalServiceType>
+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
+                    <ChargeCodeType>SCH</ChargeCodeType>
+                    <CurrencyCode>USD</CurrencyCode>
+                    <ChargeValue>2.910</ChargeValue>
+                    <QtdSExtrChrgInAdCur>
+                        <ChargeValue>2.910</ChargeValue>
+                        <CurrencyCode>USD</CurrencyCode>
+                        <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
+                    </QtdSExtrChrgInAdCur>
+                    <QtdSExtrChrgInAdCur>
+                        <ChargeValue>2.910</ChargeValue>
+                        <CurrencyCode>USD</CurrencyCode>
+                        <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
+                    </QtdSExtrChrgInAdCur>
+                    <QtdSExtrChrgInAdCur>
+                        <ChargeValue>2.910</ChargeValue>
+                        <CurrencyCode>USD</CurrencyCode>
+                        <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
+                    </QtdSExtrChrgInAdCur>
+                </QtdShpExChrg>
+                <PricingDate>2014-01-09</PricingDate>
+                <ShippingCharge>35.260</ShippingCharge>
+                <TotalTaxAmount>0.000</TotalTaxAmount>
+                <QtdSInAdCur>
+                    <CurrencyCode>USD</CurrencyCode>
+                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
+                    <WeightCharge>32.350</WeightCharge>
+                    <TotalAmount>35.260</TotalAmount>
+                    <TotalTaxAmount>0.000</TotalTaxAmount>
+                    <WeightChargeTax>0.000</WeightChargeTax>
+                </QtdSInAdCur>
+                <QtdSInAdCur>
+                    <CurrencyCode>USD</CurrencyCode>
+                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
+                    <WeightCharge>32.350</WeightCharge>
+                    <TotalAmount>35.260</TotalAmount>
+                    <TotalTaxAmount>0.000</TotalTaxAmount>
+                    <WeightChargeTax>0.000</WeightChargeTax>
+                </QtdSInAdCur>
+                <QtdSInAdCur>
+                    <CurrencyCode>USD</CurrencyCode>
+                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
+                    <WeightCharge>32.350</WeightCharge>
+                    <TotalAmount>35.260</TotalAmount>
+                    <TotalTaxAmount>0.000</TotalTaxAmount>
+                    <WeightChargeTax>0.000</WeightChargeTax>
+                </QtdSInAdCur>
+                <PickupWindowEarliestTime>09:00:00</PickupWindowEarliestTime>
+                <PickupWindowLatestTime>17:00:00</PickupWindowLatestTime>
+                <BookingCutoffOffset>PT1H</BookingCutoffOffset>
+            </QtdShp>
+            <QtdShp>
+                <OriginServiceArea>
+                    <FacilityCode>NUQ</FacilityCode>
+                    <ServiceAreaCode>NUQ</ServiceAreaCode>
+                </OriginServiceArea>
+                <DestinationServiceArea>
+                    <FacilityCode>BER</FacilityCode>
+                    <ServiceAreaCode>BER</ServiceAreaCode>
+                </DestinationServiceArea>
+                <GlobalProductCode>Y</GlobalProductCode>
+                <LocalProductCode>Y</LocalProductCode>
+                <ProductShortName>EXPRESS 12:00</ProductShortName>
+                <LocalProductName>EXPRESS 12:00 NONDOC</LocalProductName>
+                <NetworkTypeCode>TD</NetworkTypeCode>
+                <POfferedCustAgreement>N</POfferedCustAgreement>
+                <TransInd>Y</TransInd>
+                <PickupDate>2014-01-09</PickupDate>
+                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
+                <BookingTime>PT15H15M</BookingTime>
+                <CurrencyCode>USD</CurrencyCode>
+                <ExchangeRate>1.000000</ExchangeRate>
+                <WeightCharge>34.290</WeightCharge>
+                <WeightChargeTax>0.000</WeightChargeTax>
+                <TotalTransitDays>2</TotalTransitDays>
+                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
+                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
+                <DeliveryDate>
+                    <DlvyDateTime>2014-01-13 11:59:00</DlvyDateTime>
+                    <DeliveryDateTimeOffset>+00:00</DeliveryDateTimeOffset>
+                </DeliveryDate>
+                <DeliveryTime>PT12H</DeliveryTime>
+                <DimensionalWeight>2.205</DimensionalWeight>
+                <WeightUnit>LB</WeightUnit>
+                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
+                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
+                <QtdShpExChrg>
+                    <SpecialServiceType>FF</SpecialServiceType>
+                    <LocalServiceType>FF</LocalServiceType>
+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
+                    <ChargeCodeType>SCH</ChargeCodeType>
+                    <CurrencyCode>USD</CurrencyCode>
+                    <ChargeValue>3.090</ChargeValue>
+                    <QtdSExtrChrgInAdCur>
+                        <ChargeValue>3.090</ChargeValue>
+                        <CurrencyCode>USD</CurrencyCode>
+                        <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
+                    </QtdSExtrChrgInAdCur>
+                    <QtdSExtrChrgInAdCur>
+                        <ChargeValue>3.090</ChargeValue>
+                        <CurrencyCode>USD</CurrencyCode>
+                        <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
+                    </QtdSExtrChrgInAdCur>
+                    <QtdSExtrChrgInAdCur>
+                        <ChargeValue>3.090</ChargeValue>
+                        <CurrencyCode>USD</CurrencyCode>
+                        <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
+                    </QtdSExtrChrgInAdCur>
+                </QtdShpExChrg>
+                <PricingDate>2014-01-09</PricingDate>
+                <ShippingCharge>37.380</ShippingCharge>
+                <TotalTaxAmount>0.000</TotalTaxAmount>
+                <QtdSInAdCur>
+                    <CurrencyCode>USD</CurrencyCode>
+                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
+                    <WeightCharge>34.290</WeightCharge>
+                    <TotalAmount>37.380</TotalAmount>
+                    <TotalTaxAmount>0.000</TotalTaxAmount>
+                    <WeightChargeTax>0.000</WeightChargeTax>
+                </QtdSInAdCur>
+                <QtdSInAdCur>
+                    <CurrencyCode>USD</CurrencyCode>
+                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
+                    <WeightCharge>34.290</WeightCharge>
+                    <TotalAmount>37.380</TotalAmount>
+                    <TotalTaxAmount>0.000</TotalTaxAmount>
+                    <WeightChargeTax>0.000</WeightChargeTax>
+                </QtdSInAdCur>
+                <QtdSInAdCur>
+                    <CurrencyCode>USD</CurrencyCode>
+                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
+                    <WeightCharge>34.290</WeightCharge>
+                    <TotalAmount>37.380</TotalAmount>
+                    <TotalTaxAmount>0.000</TotalTaxAmount>
+                    <WeightChargeTax>0.000</WeightChargeTax>
+                </QtdSInAdCur>
+                <PickupWindowEarliestTime>09:00:00</PickupWindowEarliestTime>
+                <PickupWindowLatestTime>17:00:00</PickupWindowLatestTime>
+                <BookingCutoffOffset>PT1H</BookingCutoffOffset>
+            </QtdShp>
+            <QtdShp>
+                <OriginServiceArea>
+                    <FacilityCode>NUQ</FacilityCode>
+                    <ServiceAreaCode>NUQ</ServiceAreaCode>
+                </OriginServiceArea>
+                <DestinationServiceArea>
+                    <FacilityCode>BER</FacilityCode>
+                    <ServiceAreaCode>BER</ServiceAreaCode>
+                </DestinationServiceArea>
+                <GlobalProductCode>3</GlobalProductCode>
+                <LocalProductCode>3</LocalProductCode>
+                <ProductShortName>B2C</ProductShortName>
+                <LocalProductName>EXPRESS WORLDWIDE (B2C)</LocalProductName>
+                <NetworkTypeCode>TD</NetworkTypeCode>
+                <POfferedCustAgreement>Y</POfferedCustAgreement>
+                <TransInd>N</TransInd>
+                <PickupDate>2014-01-09</PickupDate>
+                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
+                <BookingTime>PT15H15M</BookingTime>
+                <ExchangeRate>1.000000</ExchangeRate>
+                <WeightCharge>0</WeightCharge>
+                <WeightChargeTax>0.000</WeightChargeTax>
+                <TotalTransitDays>2</TotalTransitDays>
+                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
+                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
+                <DeliveryDate>
+                    <DlvyDateTime>2014-01-13 11:59:00</DlvyDateTime>
+                    <DeliveryDateTimeOffset>+00:00</DeliveryDateTimeOffset>
+                </DeliveryDate>
+                <DeliveryTime>PT23H59M</DeliveryTime>
+                <DimensionalWeight>2.205</DimensionalWeight>
+                <WeightUnit>LB</WeightUnit>
+                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
+                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
+                <PricingDate>2014-01-09</PricingDate>
+                <ShippingCharge>0.000</ShippingCharge>
+                <TotalTaxAmount>0.000</TotalTaxAmount>
+                <QtdSInAdCur>
+                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
+                    <WeightCharge>0</WeightCharge>
+                    <TotalAmount>0.000</TotalAmount>
+                    <TotalTaxAmount>0.000</TotalTaxAmount>
+                    <WeightChargeTax>0.000</WeightChargeTax>
+                </QtdSInAdCur>
+                <QtdSInAdCur>
+                    <CurrencyCode>USD</CurrencyCode>
+                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
+                    <WeightCharge>0</WeightCharge>
+                    <TotalAmount>0.000</TotalAmount>
+                    <TotalTaxAmount>0.000</TotalTaxAmount>
+                    <WeightChargeTax>0.000</WeightChargeTax>
+                </QtdSInAdCur>
+                <QtdSInAdCur>
+                    <CurrencyCode>USD</CurrencyCode>
+                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
+                    <WeightCharge>0</WeightCharge>
+                    <TotalAmount>0.000</TotalAmount>
+                    <TotalTaxAmount>0.000</TotalTaxAmount>
+                    <WeightChargeTax>0.000</WeightChargeTax>
+                </QtdSInAdCur>
+                <PickupWindowEarliestTime>09:00:00</PickupWindowEarliestTime>
+                <PickupWindowLatestTime>17:00:00</PickupWindowLatestTime>
+                <BookingCutoffOffset>PT1H</BookingCutoffOffset>
+            </QtdShp>
+            <QtdShp>
+                <GlobalProductCode>P</GlobalProductCode>
+                <LocalProductCode>P</LocalProductCode>
+                <ProductShortName>EXPRESS WORLDWIDE</ProductShortName>
+                <LocalProductName>EXPRESS WORLDWIDE NONDOC</LocalProductName>
+                <NetworkTypeCode>TD</NetworkTypeCode>
+                <POfferedCustAgreement>N</POfferedCustAgreement>
+                <TransInd>Y</TransInd>
+                <PickupDate>2014-01-09</PickupDate>
+                <PickupCutoffTime>PT16H15M</PickupCutoffTime>
+                <BookingTime>PT15H15M</BookingTime>
+                <CurrencyCode>USD</CurrencyCode>
+                <ExchangeRate>1.000000</ExchangeRate>
+                <WeightCharge>32.350</WeightCharge>
+                <WeightChargeTax>0.000</WeightChargeTax>
+                <TotalTransitDays>2</TotalTransitDays>
+                <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
+                <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
+                <PickupNonDHLCourierCode />
+                <DeliveryNonDHLCourierCode />
+                <DeliveryDate>2014-01-13</DeliveryDate>
+                <DeliveryTime>PT23H59M</DeliveryTime>
+                <DimensionalWeight>2.205</DimensionalWeight>
+                <WeightUnit>LB</WeightUnit>
+                <PickupDayOfWeekNum>4</PickupDayOfWeekNum>
+                <DestinationDayOfWeekNum>1</DestinationDayOfWeekNum>
+                <QtdShpExChrg>
+                    <SpecialServiceType>FF</SpecialServiceType>
+                    <LocalServiceType>FF</LocalServiceType>
+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
+                    <ChargeCodeType>SCH</ChargeCodeType>
+                    <CurrencyCode>USD</CurrencyCode>
+                    <ChargeValue>2.910</ChargeValue>
+                    <QtdSExtrChrgInAdCur>
+                        <ChargeValue>2.910</ChargeValue>
+                        <CurrencyCode>USD</CurrencyCode>
+                        <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
+                    </QtdSExtrChrgInAdCur>
+                    <QtdSExtrChrgInAdCur>
+                        <ChargeValue>2.910</ChargeValue>
+                        <CurrencyCode>USD</CurrencyCode>
+                        <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
+                    </QtdSExtrChrgInAdCur>
+                    <QtdSExtrChrgInAdCur>
+                        <ChargeValue>2.910</ChargeValue>
+                        <CurrencyCode>USD</CurrencyCode>
+                        <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
+                    </QtdSExtrChrgInAdCur>
+                </QtdShpExChrg>
+                <PricingDate>2014-01-09</PricingDate>
+                <ShippingCharge>35.260</ShippingCharge>
+                <TotalTaxAmount>0.000</TotalTaxAmount>
+                <QtdSInAdCur>
+                    <CurrencyCode>USD</CurrencyCode>
+                    <CurrencyRoleTypeCode>BILLC</CurrencyRoleTypeCode>
+                    <WeightCharge>32.350</WeightCharge>
+                    <TotalAmount>35.260</TotalAmount>
+                    <TotalTaxAmount>0.000</TotalTaxAmount>
+                    <WeightChargeTax>0.000</WeightChargeTax>
+                </QtdSInAdCur>
+                <QtdSInAdCur>
+                    <CurrencyCode>USD</CurrencyCode>
+                    <CurrencyRoleTypeCode>PULCL</CurrencyRoleTypeCode>
+                    <WeightCharge>32.350</WeightCharge>
+                    <TotalAmount>35.260</TotalAmount>
+                    <TotalTaxAmount>0.000</TotalTaxAmount>
+                    <WeightChargeTax>0.000</WeightChargeTax>
+                </QtdSInAdCur>
+                <QtdSInAdCur>
+                    <CurrencyCode>USD</CurrencyCode>
+                    <CurrencyRoleTypeCode>BASEC</CurrencyRoleTypeCode>
+                    <WeightCharge>32.350</WeightCharge>
+                    <TotalAmount>35.260</TotalAmount>
+                    <TotalTaxAmount>0.000</TotalTaxAmount>
+                    <WeightChargeTax>0.000</WeightChargeTax>
+                </QtdSInAdCur>
+            </QtdShp>
+        </BkgDetails>
+        <Srvs>
+            <Srv>
+                <GlobalProductCode>E</GlobalProductCode>
+                <MrkSrv>
+                    <LocalProductCode>E</LocalProductCode>
+                    <ProductShortName>EXPRESS 9:00</ProductShortName>
+                    <LocalProductName>EXPRESS 9:00 NONDOC</LocalProductName>
+                    <NetworkTypeCode>TD</NetworkTypeCode>
+                    <POfferedCustAgreement>N</POfferedCustAgreement>
+                    <TransInd>Y</TransInd>
+                </MrkSrv>
+                <MrkSrv>
+                    <LocalServiceType>FF</LocalServiceType>
+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
+                    <ChargeCodeType>SCH</ChargeCodeType>
+                    <MrkSrvInd>N</MrkSrvInd>
+                </MrkSrv>
+            </Srv>
+            <Srv>
+                <GlobalProductCode>Q</GlobalProductCode>
+                <MrkSrv>
+                    <LocalProductCode>Q</LocalProductCode>
+                    <ProductShortName>MEDICAL EXPRESS</ProductShortName>
+                    <LocalProductName>MEDICAL EXPRESS</LocalProductName>
+                    <NetworkTypeCode>TD</NetworkTypeCode>
+                    <POfferedCustAgreement>Y</POfferedCustAgreement>
+                    <TransInd>N</TransInd>
+                </MrkSrv>
+                <MrkSrv>
+                    <LocalServiceType>FF</LocalServiceType>
+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
+                    <ChargeCodeType>SCH</ChargeCodeType>
+                    <MrkSrvInd>N</MrkSrvInd>
+                </MrkSrv>
+            </Srv>
+            <Srv>
+                <GlobalProductCode>Y</GlobalProductCode>
+                <MrkSrv>
+                    <LocalProductCode>Y</LocalProductCode>
+                    <ProductShortName>EXPRESS 12:00</ProductShortName>
+                    <LocalProductName>EXPRESS 12:00 NONDOC</LocalProductName>
+                    <NetworkTypeCode>TD</NetworkTypeCode>
+                    <POfferedCustAgreement>N</POfferedCustAgreement>
+                    <TransInd>Y</TransInd>
+                </MrkSrv>
+                <MrkSrv>
+                    <LocalServiceType>FF</LocalServiceType>
+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
+                    <ChargeCodeType>SCH</ChargeCodeType>
+                    <MrkSrvInd>N</MrkSrvInd>
+                </MrkSrv>
+            </Srv>
+            <Srv>
+                <GlobalProductCode>3</GlobalProductCode>
+                <MrkSrv>
+                    <LocalProductCode>3</LocalProductCode>
+                    <ProductShortName>B2C</ProductShortName>
+                    <LocalProductName>EXPRESS WORLDWIDE (B2C)</LocalProductName>
+                    <NetworkTypeCode>TD</NetworkTypeCode>
+                    <POfferedCustAgreement>Y</POfferedCustAgreement>
+                    <TransInd>N</TransInd>
+                </MrkSrv>
+            </Srv>
+            <Srv>
+                <GlobalProductCode>P</GlobalProductCode>
+                <MrkSrv>
+                    <LocalProductCode>P</LocalProductCode>
+                    <ProductShortName>EXPRESS WORLDWIDE</ProductShortName>
+                    <LocalProductName>EXPRESS WORLDWIDE NONDOC</LocalProductName>
+                    <NetworkTypeCode>TD</NetworkTypeCode>
+                    <POfferedCustAgreement>N</POfferedCustAgreement>
+                    <TransInd>Y</TransInd>
+                </MrkSrv>
+                <MrkSrv>
+                    <LocalServiceType>FF</LocalServiceType>
+                    <GlobalServiceName>FUEL SURCHARGE</GlobalServiceName>
+                    <LocalServiceTypeName>FUEL SURCHARGE</LocalServiceTypeName>
+                    <ChargeCodeType>SCH</ChargeCodeType>
+                    <MrkSrvInd>N</MrkSrvInd>
+                </MrkSrv>
+            </Srv>
+        </Srvs>
+    </GetQuoteResponse>
+</res:DCTResponse>
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response_rates.php b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response_rates.php
new file mode 100644
index 0000000000000..5646bb8464bf0
--- /dev/null
+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response_rates.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+return [
+    [
+        'carrier' => 'dhl',
+        'carrier_title' => 'DHL Title',
+        'cost' => 45.85,
+        'method' => 'E',
+    ],
+    [
+        'carrier' => 'dhl',
+        'carrier_title' => 'DHL Title',
+        'cost' => 35.26,
+        'method' => 'Q',
+    ],
+    [
+        'carrier' => 'dhl',
+        'carrier_title' => 'DHL Title',
+        'cost' => 37.38,
+        'method' => 'Y',
+    ],
+    [
+        'carrier' => 'dhl',
+        'carrier_title' => 'DHL Title',
+        'cost' => 35.26,
+        'method' => 'P',
+    ],
+];
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/domestic_shipment_request.xml b/app/code/Magento/Dhl/Test/Unit/Model/_files/domestic_shipment_request.xml
new file mode 100644
index 0000000000000..e4d72bb94e78e
--- /dev/null
+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/domestic_shipment_request.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<req:ShipmentRequest xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                     xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.0.xsd" schemaVersion="6.0">
+    <Request xmlns="">
+        <ServiceHeader>
+            <MessageTime>currentTime</MessageTime>
+            <MessageReference>MAGE_SHIP_28TO32_Char_CHECKED</MessageReference>
+            <SiteID>some ID</SiteID>
+            <Password>some password</Password>
+        </ServiceHeader>
+    </Request>
+    <RegionCode xmlns="">CHECKED</RegionCode>
+    <RequestedPickupTime xmlns="">N</RequestedPickupTime>
+    <NewShipper xmlns="">N</NewShipper>
+    <LanguageCode xmlns="">EN</LanguageCode>
+    <PiecesEnabled xmlns="">Y</PiecesEnabled>
+    <Billing xmlns="">
+        <ShipperAccountNumber>1234567890</ShipperAccountNumber>
+        <ShippingPaymentType>S</ShippingPaymentType>
+        <BillingAccountNumber>1234567890</BillingAccountNumber>
+        <DutyPaymentType>S</DutyPaymentType>
+        <DutyAccountNumber>1234567890</DutyAccountNumber>
+    </Billing>
+    <Consignee xmlns="">
+        <CompanyName/>
+        <AddressLine/>
+        <City/>
+        <PostalCode/>
+        <CountryCode/>
+        <CountryName/>
+        <Contact>
+            <PersonName/>
+            <PhoneNumber/>
+        </Contact>
+    </Consignee>
+    <Commodity xmlns="">
+        <CommodityCode>1</CommodityCode>
+    </Commodity>
+    <Reference xmlns="">
+        <ReferenceID>shipment reference</ReferenceID>
+        <ReferenceType>St</ReferenceType>
+    </Reference>
+    <ShipmentDetails xmlns="">
+        <NumberOfPieces>1</NumberOfPieces>
+        <Pieces xmlns="">
+            <Piece xmlns="">
+                <PieceID>1</PieceID>
+                <PackageType>CP</PackageType>
+                <Weight>0.454</Weight>
+                <Width>3</Width>
+                <Height>3</Height>
+                <Depth>3</Depth>
+                <PieceContents>item_name</PieceContents>
+            </Piece>
+        </Pieces>
+        <Weight>0.454</Weight>
+        <WeightUnit>K</WeightUnit>
+        <GlobalProductCode/>
+        <LocalProductCode/>
+        <Date>currentTime</Date>
+        <Contents>DHL Parcel</Contents>
+        <DoorTo>DD</DoorTo>
+        <DimensionUnit>C</DimensionUnit>
+        <PackageType>CP</PackageType>
+        <CurrencyCode>USD</CurrencyCode>
+    </ShipmentDetails>
+    <Shipper xmlns="">
+        <ShipperID>1234567890</ShipperID>
+        <CompanyName/>
+        <RegisteredAccount>1234567890</RegisteredAccount>
+        <AddressLine/>
+        <City/>
+        <PostalCode/>
+        <CountryCode/>
+        <CountryName/>
+        <Contact xmlns="">
+            <PersonName/>
+            <PhoneNumber/>
+        </Contact>
+    </Shipper>
+    <LabelImageFormat xmlns="">PDF</LabelImageFormat>
+</req:ShipmentRequest>
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/euregion_dutiable_shipment_request.xml b/app/code/Magento/Dhl/Test/Unit/Model/_files/euregion_dutiable_shipment_request.xml
new file mode 100644
index 0000000000000..50a8c1b7a02a9
--- /dev/null
+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/euregion_dutiable_shipment_request.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<req:ShipmentValidateRequestEU xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com ship-val-req_EU.xsd">
+    <Request xmlns="">
+        <ServiceHeader>
+            <SiteID>some ID</SiteID>
+            <Password>some password</Password>
+        </ServiceHeader>
+    </Request>
+    <NewShipper xmlns="">N</NewShipper>
+    <LanguageCode xmlns="">EN</LanguageCode>
+    <PiecesEnabled xmlns="">Y</PiecesEnabled>
+    <Billing xmlns="">
+        <ShipperAccountNumber>1234567890</ShipperAccountNumber>
+        <ShippingPaymentType>S</ShippingPaymentType>
+        <BillingAccountNumber>1234567890</BillingAccountNumber>
+        <DutyPaymentType>S</DutyPaymentType>
+        <DutyAccountNumber>1234567890</DutyAccountNumber>
+    </Billing>
+    <Consignee xmlns="">
+        <CompanyName/>
+        <AddressLine/>
+        <City/>
+        <Division/>
+        <PostalCode/>
+        <CountryCode/>
+        <CountryName/>
+        <Contact>
+            <PersonName/>
+            <PhoneNumber/>
+        </Contact>
+    </Consignee>
+    <Commodity xmlns="">
+        <CommodityCode>1</CommodityCode>
+    </Commodity>
+    <Dutiable>
+        <DeclaredValue>10.00</DeclaredValue>
+        <DeclaredCurrency>USD</DeclaredCurrency>
+    </Dutiable>
+    <Reference xmlns="">
+        <ReferenceID>shipment reference</ReferenceID>
+        <ReferenceType>St</ReferenceType>
+    </Reference>
+    <ShipmentDetails xmlns="">
+        <NumberOfPieces>1</NumberOfPieces>
+        <CurrencyCode>USD</CurrencyCode>
+        <Pieces xmlns="">
+            <Piece xmlns="">
+                <PieceID>1</PieceID>
+                <PackageType>CP</PackageType>
+                <Weight>0.5</Weight>
+                <Depth>3</Depth>
+                <Width>3</Width>
+                <Height>3</Height>
+                <PieceContents>item_name</PieceContents>
+            </Piece>
+        </Pieces>
+        <PackageType>CP</PackageType>
+        <Weight>0.454</Weight>
+        <DimensionUnit>C</DimensionUnit>
+        <WeightUnit>K</WeightUnit>
+        <GlobalProductCode/>
+        <LocalProductCode/>
+        <DoorTo>DD</DoorTo>
+        <Date/>
+        <Contents>DHL Parcel TEST</Contents>
+    </ShipmentDetails>
+    <Shipper xmlns="">
+        <ShipperID>1234567890</ShipperID>
+        <CompanyName/>
+        <RegisteredAccount>1234567890</RegisteredAccount>
+        <AddressLine/>
+        <City/>
+        <Division/>
+        <PostalCode/>
+        <CountryCode/>
+        <CountryName/>
+        <Contact xmlns="">
+            <PersonName/>
+            <PhoneNumber/>
+        </Contact>
+    </Shipper>
+    <LabelImageFormat xmlns="">PDF</LabelImageFormat>
+</req:ShipmentValidateRequestEU>
\ No newline at end of file
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/euregion_shipment_request.xml b/app/code/Magento/Dhl/Test/Unit/Model/_files/euregion_shipment_request.xml
new file mode 100644
index 0000000000000..6dccea89f8f6a
--- /dev/null
+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/euregion_shipment_request.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<req:ShipmentValidateRequestEU xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com ship-val-req_EU.xsd">
+    <Request xmlns="">
+        <ServiceHeader>
+            <SiteID>some ID</SiteID>
+            <Password>some password</Password>
+        </ServiceHeader>
+    </Request>
+    <NewShipper xmlns="">N</NewShipper>
+    <LanguageCode xmlns="">EN</LanguageCode>
+    <PiecesEnabled xmlns="">Y</PiecesEnabled>
+    <Billing xmlns="">
+        <ShipperAccountNumber>1234567890</ShipperAccountNumber>
+        <ShippingPaymentType>S</ShippingPaymentType>
+        <BillingAccountNumber>1234567890</BillingAccountNumber>
+        <DutyPaymentType>S</DutyPaymentType>
+        <DutyAccountNumber>1234567890</DutyAccountNumber>
+    </Billing>
+    <Consignee xmlns="">
+        <CompanyName/>
+        <AddressLine/>
+        <City/>
+        <Division/>
+        <PostalCode/>
+        <CountryCode/>
+        <CountryName/>
+        <Contact>
+            <PersonName/>
+            <PhoneNumber/>
+        </Contact>
+    </Consignee>
+    <Commodity xmlns="">
+        <CommodityCode>1</CommodityCode>
+    </Commodity>
+    <Reference xmlns="">
+        <ReferenceID>shipment reference</ReferenceID>
+        <ReferenceType>St</ReferenceType>
+    </Reference>
+    <ShipmentDetails xmlns="">
+        <NumberOfPieces>1</NumberOfPieces>
+        <CurrencyCode>USD</CurrencyCode>
+        <Pieces xmlns="">
+            <Piece xmlns="">
+                <PieceID>1</PieceID>
+                <PackageType>CP</PackageType>
+                <Weight>0.5</Weight>
+                <Depth>3</Depth>
+                <Width>3</Width>
+                <Height>3</Height>
+                <PieceContents>item_name</PieceContents>
+            </Piece>
+        </Pieces>
+        <PackageType>CP</PackageType>
+        <Weight>0.454</Weight>
+        <DimensionUnit>C</DimensionUnit>
+        <WeightUnit>K</WeightUnit>
+        <GlobalProductCode/>
+        <LocalProductCode/>
+        <DoorTo>DD</DoorTo>
+        <Date/>
+        <Contents>DHL Parcel TEST</Contents>
+    </ShipmentDetails>
+    <Shipper xmlns="">
+        <ShipperID>1234567890</ShipperID>
+        <CompanyName/>
+        <RegisteredAccount>1234567890</RegisteredAccount>
+        <AddressLine/>
+        <City/>
+        <Division/>
+        <PostalCode/>
+        <CountryCode/>
+        <CountryName/>
+        <Contact xmlns="">
+            <PersonName/>
+            <PhoneNumber/>
+        </Contact>
+    </Shipper>
+    <LabelImageFormat xmlns="">PDF</LabelImageFormat>
+</req:ShipmentValidateRequestEU>
\ No newline at end of file
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml b/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml
new file mode 100644
index 0000000000000..d411041c96072
--- /dev/null
+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<req:ShipmentRequest xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                     xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.0.xsd" schemaVersion="6.0">
+    <Request xmlns="">
+        <ServiceHeader>
+            <MessageTime>currentTime</MessageTime>
+            <MessageReference>MAGE_SHIP_28TO32_Char_CHECKED</MessageReference>
+            <SiteID>some ID</SiteID>
+            <Password>some password</Password>
+        </ServiceHeader>
+    </Request>
+    <RegionCode xmlns="">CHECKED</RegionCode>
+    <RequestedPickupTime xmlns="">N</RequestedPickupTime>
+    <NewShipper xmlns="">N</NewShipper>
+    <LanguageCode xmlns="">EN</LanguageCode>
+    <PiecesEnabled xmlns="">Y</PiecesEnabled>
+    <Billing xmlns="">
+        <ShipperAccountNumber>1234567890</ShipperAccountNumber>
+        <ShippingPaymentType>S</ShippingPaymentType>
+        <BillingAccountNumber>1234567890</BillingAccountNumber>
+        <DutyPaymentType>S</DutyPaymentType>
+        <DutyAccountNumber>1234567890</DutyAccountNumber>
+    </Billing>
+    <Consignee xmlns="">
+        <CompanyName/>
+        <AddressLine/>
+        <City/>
+        <PostalCode/>
+        <CountryCode/>
+        <CountryName/>
+        <Contact>
+            <PersonName/>
+            <PhoneNumber/>
+        </Contact>
+    </Consignee>
+    <Commodity xmlns="">
+        <CommodityCode>1</CommodityCode>
+    </Commodity>
+    <Dutiable xmlns="">
+        <DeclaredValue>10.00</DeclaredValue>
+        <DeclaredCurrency>USD</DeclaredCurrency>
+    </Dutiable>
+    <Reference xmlns="">
+        <ReferenceID>shipment reference</ReferenceID>
+        <ReferenceType>St</ReferenceType>
+    </Reference>
+    <ShipmentDetails xmlns="">
+        <NumberOfPieces>1</NumberOfPieces>
+        <Pieces xmlns="">
+            <Piece xmlns="">
+                <PieceID>1</PieceID>
+                <PackageType>CP</PackageType>
+                <Weight>0.454</Weight>
+                <Width>3</Width>
+                <Height>3</Height>
+                <Depth>3</Depth>
+                <PieceContents>item_name</PieceContents>
+            </Piece>
+        </Pieces>
+        <Weight>0.454</Weight>
+        <WeightUnit>K</WeightUnit>
+        <GlobalProductCode/>
+        <LocalProductCode/>
+        <Date>currentTime</Date>
+        <Contents>DHL Parcel</Contents>
+        <DoorTo>DD</DoorTo>
+        <DimensionUnit>C</DimensionUnit>
+        <PackageType>CP</PackageType>
+        <IsDutiable>Y</IsDutiable>
+        <CurrencyCode>USD</CurrencyCode>
+    </ShipmentDetails>
+    <Shipper xmlns="">
+        <ShipperID>1234567890</ShipperID>
+        <CompanyName/>
+        <RegisteredAccount>1234567890</RegisteredAccount>
+        <AddressLine/>
+        <City/>
+        <PostalCode/>
+        <CountryCode/>
+        <CountryName/>
+        <Contact xmlns="">
+            <PersonName/>
+            <PhoneNumber/>
+        </Contact>
+    </Shipper>
+    <LabelImageFormat xmlns="">PDF</LabelImageFormat>
+</req:ShipmentRequest>
diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json
index fae1eb9e1454f..5d95a2fffa7c0 100644
--- a/app/code/Magento/Dhl/composer.json
+++ b/app/code/Magento/Dhl/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-dhl",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-config": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-shipping": "100.2.*",
@@ -19,7 +19,7 @@
         "magento/module-checkout": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Dhl/etc/adminhtml/system.xml b/app/code/Magento/Dhl/etc/adminhtml/system.xml
index 91ed6c6568a70..7ab37de2f3658 100644
--- a/app/code/Magento/Dhl/etc/adminhtml/system.xml
+++ b/app/code/Magento/Dhl/etc/adminhtml/system.xml
@@ -31,8 +31,9 @@
                 <field id="account" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Account Number</label>
                 </field>
-                <field id="content_type" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                    <label>Content Type</label>
+                <field id="content_type" translate="label comment" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                    <label>Content Type (Non Domestic)</label>
+                    <comment>Whether to use Documents or NonDocuments service for non domestic shipments. (Shipments within the EU are classed as domestic)</comment>
                     <source_model>Magento\Dhl\Model\Source\Contenttype</source_model>
                 </field>
                 <field id="handling_type" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
@@ -81,18 +82,12 @@
                     </depends>
                 </field>
                 <field id="doc_methods" translate="label" type="multiselect" sortOrder="170" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                    <label>Allowed Methods</label>
+                    <label>Documents Allowed Methods</label>
                     <source_model>Magento\Dhl\Model\Source\Method\Doc</source_model>
-                    <depends>
-                        <field id="content_type">D</field>
-                    </depends>
                 </field>
                 <field id="nondoc_methods" translate="label" type="multiselect" sortOrder="170" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                    <label>Allowed Methods</label>
+                    <label>Non Documents Allowed Methods</label>
                     <source_model>Magento\Dhl\Model\Source\Method\Nondoc</source_model>
-                    <depends>
-                        <field id="content_type">N</field>
-                    </depends>
                 </field>
                 <field id="ready_time" translate="label comment" type="text" sortOrder="180" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Ready time</label>
diff --git a/app/code/Magento/Dhl/etc/countries.xml b/app/code/Magento/Dhl/etc/countries.xml
index 48837dbefb576..792465ce45942 100644
--- a/app/code/Magento/Dhl/etc/countries.xml
+++ b/app/code/Magento/Dhl/etc/countries.xml
@@ -83,7 +83,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Austria</name>
         <domestic>1</domestic>
     </AT>
@@ -132,7 +132,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Belgium</name>
         <domestic>1</domestic>
     </BE>
@@ -146,7 +146,7 @@
         <currency>BGN</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Bulgaria</name>
         <domestic>1</domestic>
     </BG>
@@ -257,7 +257,7 @@
         <currency>CHF</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Switzerland</name>
     </CH>
     <CI>
@@ -331,7 +331,7 @@
         <currency>CZK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Czech Republic, The</name>
         <domestic>1</domestic>
     </CZ>
@@ -339,7 +339,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Germany</name>
         <domestic>1</domestic>
     </DE>
@@ -353,7 +353,7 @@
         <currency>DKK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Denmark</name>
         <domestic>1</domestic>
     </DK>
@@ -389,7 +389,7 @@
         <currency>EEK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Estonia</name>
         <domestic>1</domestic>
     </EE>
@@ -410,7 +410,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Spain</name>
         <domestic>1</domestic>
     </ES>
@@ -424,7 +424,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Finland</name>
         <domestic>1</domestic>
     </FI>
@@ -457,7 +457,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>France</name>
         <domestic>1</domestic>
     </FR>
@@ -471,7 +471,7 @@
         <currency>GBP</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>United Kingdom</name>
         <domestic>1</domestic>
     </GB>
@@ -549,7 +549,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Greece</name>
         <domestic>1</domestic>
     </GR>
@@ -612,7 +612,7 @@
         <currency>HUF</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Hungary</name>
         <domestic>1</domestic>
     </HU>
@@ -633,7 +633,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Ireland, Republic Of</name>
         <domestic>1</domestic>
     </IE>
@@ -668,14 +668,14 @@
         <currency>ISK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Iceland</name>
     </IS>
     <IT>
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Italy</name>
         <domestic>1</domestic>
     </IT>
@@ -834,7 +834,7 @@
         <currency>LTL</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Lithuania</name>
         <domestic>1</domestic>
     </LT>
@@ -842,7 +842,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Luxembourg</name>
         <domestic>1</domestic>
     </LU>
@@ -850,7 +850,7 @@
         <currency>LVL</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Latvia</name>
         <domestic>1</domestic>
     </LV>
@@ -1039,7 +1039,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Netherlands, The</name>
         <domestic>1</domestic>
     </NL>
@@ -1047,7 +1047,7 @@
         <currency>NOK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Norway</name>
     </NO>
     <NP>
@@ -1127,7 +1127,7 @@
         <currency>PLN</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Poland</name>
         <domestic>1</domestic>
     </PL>
@@ -1142,7 +1142,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Portugal</name>
         <domestic>1</domestic>
     </PT>
@@ -1177,7 +1177,7 @@
         <currency>RON</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Romania</name>
         <domestic>1</domestic>
     </RO>
@@ -1231,7 +1231,7 @@
         <currency>SEK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Sweden</name>
         <domestic>1</domestic>
     </SE>
@@ -1246,7 +1246,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Slovenia</name>
         <domestic>1</domestic>
     </SI>
@@ -1254,7 +1254,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Slovakia</name>
         <domestic>1</domestic>
     </SK>
diff --git a/app/code/Magento/Dhl/i18n/en_US.csv b/app/code/Magento/Dhl/i18n/en_US.csv
index a5532c2cea963..0e4c7a8385b93 100644
--- a/app/code/Magento/Dhl/i18n/en_US.csv
+++ b/app/code/Magento/Dhl/i18n/en_US.csv
@@ -61,6 +61,7 @@ Title,Title
 Password,Password
 "Account Number","Account Number"
 "Content Type","Content Type"
+"Whether to use Documents or NonDocuments service for non domestic shipments. (Shipments within the EU are classed as domestic)","Whether to use Documents or NonDocuments service for non domestic shipments. (Shipments within the EU are classed as domestic)"
 "Calculate Handling Fee","Calculate Handling Fee"
 "Handling Applied","Handling Applied"
 """Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package.","""Per Order"" allows a single handling fee for the entire order. ""Per Package"" allows an individual handling fee for each package."
diff --git a/app/code/Magento/Directory/Model/Config/Source/Country/Full.php b/app/code/Magento/Directory/Model/Config/Source/Country/Full.php
index f9b9463b16a87..4e1fad8c512c0 100644
--- a/app/code/Magento/Directory/Model/Config/Source/Country/Full.php
+++ b/app/code/Magento/Directory/Model/Config/Source/Country/Full.php
@@ -16,10 +16,9 @@
 class Full extends \Magento\Directory\Model\Config\Source\Country implements \Magento\Framework\Option\ArrayInterface
 {
     /**
-     * @param bool $isMultiselect
-     * @return array
+     * @inheritDoc
      */
-    public function toOptionArray($isMultiselect = false)
+    public function toOptionArray($isMultiselect = false, $foregroundCountries = '')
     {
         return parent::toOptionArray(true);
     }
diff --git a/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php b/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
index 4e2758b362a43..97d22633af03c 100644
--- a/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
+++ b/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Directory\Model\Config\Source;
 
 /**
@@ -14,10 +15,23 @@
 class WeightUnit implements \Magento\Framework\Option\ArrayInterface
 {
     /**
-     * {@inheritdoc}
+     * @var string
+     */
+    const CODE_LBS = 'lbs';
+
+    /**
+     * @var string
+     */
+    const CODE_KGS = 'kgs';
+
+    /**
+     * @inheritdoc
      */
     public function toOptionArray()
     {
-        return [['value' => 'lbs', 'label' => __('lbs')], ['value' => 'kgs', 'label' => __('kgs')]];
+        return [
+            ['value' => self::CODE_LBS, 'label' => __('lbs')],
+            ['value' => self::CODE_KGS, 'label' => __('kgs')]
+        ];
     }
 }
diff --git a/app/code/Magento/Directory/Model/CurrencyConfig.php b/app/code/Magento/Directory/Model/CurrencyConfig.php
index fdb561c224170..f7230df6e86ea 100644
--- a/app/code/Magento/Directory/Model/CurrencyConfig.php
+++ b/app/code/Magento/Directory/Model/CurrencyConfig.php
@@ -57,7 +57,7 @@ public function __construct(
      */
     public function getConfigCurrencies(string $path)
     {
-        $result = $this->appState->getAreaCode() === Area::AREA_ADMINHTML
+        $result = in_array($this->appState->getAreaCode(), [Area::AREA_ADMINHTML, Area::AREA_CRONTAB])
             ? $this->getConfigForAllStores($path)
             : $this->getConfigForCurrentStore($path);
         sort($result);
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Country.php b/app/code/Magento/Directory/Model/ResourceModel/Country.php
index 59fb2de85c8a3..00f0c1cefb75a 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Country.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Country.php
@@ -13,6 +13,27 @@
  */
 class Country extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
+    /**
+     * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
+     * @param null|string $connectionName
+     * @param \Magento\Framework\Escaper|null $escaper
+     */
+    public function __construct(
+        \Magento\Framework\Model\ResourceModel\Db\Context $context,
+        string $connectionName = null,
+        \Magento\Framework\Escaper $escaper = null
+    ) {
+        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\Escaper::class
+        );
+        parent::__construct($context, $connectionName);
+    }
+
     /**
      * Resource initialization
      *
@@ -44,7 +65,7 @@ public function loadByCode(\Magento\Directory\Model\Country $country, $code)
 
             default:
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Please correct the country code: %1.', htmlspecialchars($code))
+                    __('Please correct the country code: %1.', $this->escaper->escapeHtml($code))
                 );
         }
 
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php b/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
index da5ad64f8b239..bb50c4a80b9ea 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php
@@ -128,24 +128,6 @@ public function __construct(
      */
     protected $_foregroundCountries = [];
 
-    /**
-     * Add top destinition countries to head of option array
-     *
-     * @param $emptyLabel
-     * @param $options
-     * @return array
-     */
-    private function addForegroundCountriesToOptionArray($emptyLabel, $options)
-    {
-        if ($emptyLabel !== false && count($this->_foregroundCountries) !== 0 &&
-            count($options) === count($this->_foregroundCountries)
-        ) {
-            $options[] = ['value' => '', 'label' => $emptyLabel];
-            return $options;
-        }
-        return $options;
-    }
-
     /**
      * Define main table
      *
@@ -207,6 +189,7 @@ public function getItemById($countryId)
 
     /**
      * Add filter by country code to collection.
+     *
      * $countryCode can be either array of country codes or string representing one country code.
      * $iso can be either array containing 'iso2', 'iso3' values or string with containing one of that values directly.
      * The collection will contain countries where at least one of contry $iso fields matches $countryCode.
@@ -270,24 +253,20 @@ public function addCountryIdFilter($countryId)
     public function toOptionArray($emptyLabel = ' ')
     {
         $options = $this->_toOptionArray('country_id', 'name', ['title' => 'iso2_code']);
-        $sort = [];
-        foreach ($options as $data) {
-            $name = (string)$this->_localeLists->getCountryTranslation($data['value']);
-            if (!empty($name)) {
-                $sort[$name] = $data['value'];
-            }
-        }
+        $sort = $this->getSort($options);
+
         $this->_arrayUtils->ksortMultibyte($sort, $this->_localeResolver->getLocale());
         foreach (array_reverse($this->_foregroundCountries) as $foregroundCountry) {
             $name = array_search($foregroundCountry, $sort);
-            unset($sort[$name]);
-            $sort = [$name => $foregroundCountry] + $sort;
+            if ($name) {
+                unset($sort[$name]);
+                $sort = [$name => $foregroundCountry] + $sort;
+            }
         }
         $isRegionVisible = (bool)$this->helperData->isShowNonRequiredState();
 
         $options = [];
         foreach ($sort as $label => $value) {
-            $options = $this->addForegroundCountriesToOptionArray($emptyLabel, $options);
             $option = ['value' => $value, 'label' => $label];
             if ($this->helperData->isRegionRequired($value)) {
                 $option['is_region_required'] = true;
@@ -299,7 +278,7 @@ public function toOptionArray($emptyLabel = ' ')
             }
             $options[] = $option;
         }
-        if ($emptyLabel !== false && count($options) > 0) {
+        if ($emptyLabel !== false && count($options) > 1) {
             array_unshift($options, ['value' => '', 'label' => $emptyLabel]);
         }
 
@@ -328,7 +307,7 @@ private function addDefaultCountryToOptions(array &$options)
 
         foreach ($options as $key => $option) {
             if (isset($defaultCountry[$option['value']])) {
-                $options[$key]['is_default'] = $defaultCountry[$option['value']];
+                $options[$key]['is_default'] = !empty($defaultCountry[$option['value']]);
             }
         }
     }
@@ -369,4 +348,23 @@ public function getCountriesWithRequiredStates()
         }
         return $countries;
     }
+
+    /**
+     * Get sort
+     *
+     * @param array $options
+     * @return array
+     */
+    private function getSort(array $options): array
+    {
+        $sort = [];
+        foreach ($options as $data) {
+            $name = (string)$this->_localeLists->getCountryTranslation($data['value']);
+            if (!empty($name)) {
+                $sort[$name] = $data['value'];
+            }
+        }
+
+        return $sort;
+    }
 }
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Currency.php b/app/code/Magento/Directory/Model/ResourceModel/Currency.php
index ffbcce11cb4f6..5339b0c9eb5bd 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Currency.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Currency.php
@@ -216,7 +216,7 @@ protected function _getRatesByCode($code, $toCurrencies = null)
         $connection = $this->getConnection();
         $bind = [':currency_from' => $code];
         $select = $connection->select()->from(
-            $this->getTable('directory_currency_rate'),
+            $this->_currencyRateTable,
             ['currency_to', 'rate']
         )->where(
             'currency_from = :currency_from'
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..1fd39933f51af
--- /dev/null
+++ b/app/code/Magento/Directory/Test/Mftf/Data/CurrencyConfigData.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="DefaultCurrencySetting" type="currency_config_default">
+        <requiredEntity type="base_currency">BaseCurrency</requiredEntity>
+        <requiredEntity type="default_currency">DefaultCurrency</requiredEntity>
+        <requiredEntity type="allowed_currencies">AllowedCurrencies</requiredEntity>
+    </entity>
+    <entity name="BaseCurrency" type="base_currency">
+        <data key="value">USD</data>
+    </entity>
+    <entity name="DefaultCurrency" type="default_currency">
+        <data key="value">USD</data>
+    </entity>
+    <entity name="AllowedCurrencies" type="allowed_currencies">
+        <array key="value">
+            <item>USD</item>
+        </array>
+    </entity>
+    <entity name="CurrencySettingWithEuroAndUSD" type="currency_config_default">
+        <requiredEntity type="base_currency">BaseCurrency</requiredEntity>
+        <requiredEntity type="default_currency">DefaultCurrency</requiredEntity>
+        <requiredEntity type="allowed_currencies">AllowedCurrenciesEuroAndUSD</requiredEntity>
+    </entity>
+    <entity name="AllowedCurrenciesEuroAndUSD" type="allowed_currencies">
+        <array key="value">
+            <item>EUR</item>
+            <item>USD</item>
+        </array>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Directory/Test/Mftf/Metadata/currency_config-meta.xml b/app/code/Magento/Directory/Test/Mftf/Metadata/currency_config-meta.xml
new file mode 100644
index 0000000000000..5ef1179ea7829
--- /dev/null
+++ b/app/code/Magento/Directory/Test/Mftf/Metadata/currency_config-meta.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CurrencyConfigAllowedCurrencies" dataType="currency_config_default" type="create" auth="adminFormKey" url="/admin/system_config/save/section/currency/" method="POST" successRegex="/messages-message-success/">
+        <contentType>application/x-www-form-urlencoded</contentType>
+        <object key="groups" dataType="currency_config_default">
+            <object key="options" dataType="currency_config_default">
+                <object key="fields" dataType="currency_config_default">
+                    <object key="base" dataType="base_currency">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="default" dataType="default_currency">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="allow" dataType="allowed_currencies">
+                        <array key="value">
+                            <value>string</value>
+                        </array>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Directory/Test/Mftf/Page/AdminConfigurationGeneralSectionPage.xml b/app/code/Magento/Directory/Test/Mftf/Page/AdminConfigurationGeneralSectionPage.xml
index 732a27504a97d..edbc33c1de339 100644
--- a/app/code/Magento/Directory/Test/Mftf/Page/AdminConfigurationGeneralSectionPage.xml
+++ b/app/code/Magento/Directory/Test/Mftf/Page/AdminConfigurationGeneralSectionPage.xml
@@ -6,8 +6,9 @@
   */
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="AdminConfigurationGeneralSectionPage" url="admin/system_config/edit/section/general/{{group_anchor}}" parameterized="true" area="admin" module="Magento_Config">
         <section name="AdminConfigurationGeneralSectionStateOptionsGroupSection"/>
+        <section name="AdminConfigurationGeneralCountryOptionsSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Directory/Test/Mftf/Section/AdminConfigurationGeneralCountryOptionsSection.xml b/app/code/Magento/Directory/Test/Mftf/Section/AdminConfigurationGeneralCountryOptionsSection.xml
new file mode 100644
index 0000000000000..9f61c9876d8fa
--- /dev/null
+++ b/app/code/Magento/Directory/Test/Mftf/Section/AdminConfigurationGeneralCountryOptionsSection.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminConfigurationGeneralCountryOptionsSection">
+        <element name="allowedCountries" type="select" selector="#general_country_allow"/>
+        <element name="notAllowedCountry" type="button" selector="#general_country_allow option:not([selected])"/>
+        <element name="generalCountryAllowInherit" type="checkbox" selector="#general_country_allow_inherit"/>
+        <element name="generalCountryDefaultInherit" type="checkbox" selector="#general_country_default_inherit"/>
+        <element name="generalCountryDefault" type="select" selector="#general_country_default"/>
+        <element name="countryOptions" type="button" selector="#general_country-head"/>
+        <element name="countryOptionsOpen" type="button" selector="#general_country-head.open"/>
+        <element name="topDestinations" type="select" selector="#general_country_destinations"/>
+        <element name="allowedCountriesOptions" type="select" selector="#general_country_allow option"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Directory/Test/Mftf/Section/StorefrontHeaderCurrencySwitcherSection.xml b/app/code/Magento/Directory/Test/Mftf/Section/StorefrontHeaderCurrencySwitcherSection.xml
new file mode 100644
index 0000000000000..d7e8bf1a71c1d
--- /dev/null
+++ b/app/code/Magento/Directory/Test/Mftf/Section/StorefrontHeaderCurrencySwitcherSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontHeaderCurrencySwitcherSection">
+        <element name="currencyTrigger" type="select" selector="#switcher-currency-trigger" timeout="30"/>
+        <element name="currency" type="select" selector="//ul[@class='dropdown switcher-dropdown']//a[text()='{{arg}}']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Directory/Test/Mftf/Test/StorefrontCheckingCountryDropdownWithOneAllowedCountryTest.xml b/app/code/Magento/Directory/Test/Mftf/Test/StorefrontCheckingCountryDropdownWithOneAllowedCountryTest.xml
new file mode 100644
index 0000000000000..90133737c6a1d
--- /dev/null
+++ b/app/code/Magento/Directory/Test/Mftf/Test/StorefrontCheckingCountryDropdownWithOneAllowedCountryTest.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="StorefrontCheckingCountryDropdownWithOneAllowedCountryTest">
+        <annotations>
+            <features value="Directory"/>
+            <stories value="Country dropdown"/>
+            <title value="Checking country dropdown with one allowed country"/>
+            <description value="Checking country dropdown with one allowed country"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14810"/>
+            <useCaseId value="MAGETWO-76424"/>
+            <group value="directory"/>
+            <group value="customer"/>
+        </annotations>
+        <before>
+            <!--Create customer-->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <!--Set "Allow Countries" config to US only-->
+            <createData entity="SetAllowCountriesConfigUS" stepKey="setAllowCountriesConfigToUS"/>
+            <!--Flush cache-->
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <!--Login as Customer-->
+            <actionGroup ref="CustomerLoginOnStorefront" stepKey="customerLogin">
+                <argument name="customer" value="$createCustomer$" />
+            </actionGroup>
+        </before>
+        <after>
+            <!--Delete Customer-->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <!--Set "Allow Countries" config to default-->
+            <createData entity="DefaultAllowCountriesConfig" stepKey="setAllowCountriesConfigToDefault"/>
+            <!--Flush cache-->
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <!--Logout-->
+            <actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="logoutFromStorefront"/>
+        </after>
+
+        <!--Go to "Add New Address" page-->
+        <amOnPage url="{{StorefrontCustomerAddressNewPage.url}}" stepKey="goToAddNewAddressPage"/>
+        <!--Click on Country dropdown-->
+        <click selector="{{StorefrontCustomerAddressEditFormSection.country}}" stepKey="clickOnCountryDropdown"/>
+        <!--Check dropdown options-->
+        <see selector="{{StorefrontCustomerAddressEditFormSection.country}}" userInput="United States" stepKey="seeUSInCountryDropdown"/>
+        <dontSee selector="{{StorefrontCustomerAddressEditFormSection.country}}" userInput="Brazil" stepKey="dontSeeBrazilInCountryDropdown"/>
+        <dontSeeElement selector="{{StorefrontCustomerAddressEditFormSection.countryEmptyOption}}" stepKey="dontSeeEmptyOptionInCountryDropdown"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Directory/Test/Unit/Model/CurrencyConfigTest.php b/app/code/Magento/Directory/Test/Unit/Model/CurrencyConfigTest.php
index 9b52bae26f90f..e594be90b26dd 100644
--- a/app/code/Magento/Directory/Test/Unit/Model/CurrencyConfigTest.php
+++ b/app/code/Magento/Directory/Test/Unit/Model/CurrencyConfigTest.php
@@ -68,7 +68,7 @@ protected function setUp()
     }
 
     /**
-     * Test get currency config for admin and storefront areas.
+     * Test get currency config for admin, crontab and storefront areas.
      *
      * @dataProvider getConfigCurrenciesDataProvider
      * @return void
@@ -91,7 +91,7 @@ public function testGetConfigCurrencies(string $areCode)
             ->method('getCode')
             ->willReturn('testCode');
 
-        if ($areCode === Area::AREA_ADMINHTML) {
+        if (in_array($areCode, [Area::AREA_ADMINHTML, Area::AREA_CRONTAB])) {
             $this->storeManager->expects(self::once())
                 ->method('getStores')
                 ->willReturn([$store]);
@@ -121,6 +121,7 @@ public function getConfigCurrenciesDataProvider()
     {
         return [
             ['areaCode' => Area::AREA_ADMINHTML],
+            ['areaCode' => Area::AREA_CRONTAB],
             ['areaCode' => Area::AREA_FRONTEND],
         ];
     }
diff --git a/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Country/CollectionTest.php b/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Country/CollectionTest.php
index 796fbaae8edda..9cfc232f419c7 100644
--- a/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Country/CollectionTest.php
+++ b/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Country/CollectionTest.php
@@ -101,8 +101,7 @@ public function testToOptionArray($optionsArray, $emptyLabel, $foregroundCountri
 
         $this->_model->setForegroundCountries($foregroundCountries);
         $result = $this->_model->toOptionArray($emptyLabel);
-        $this->assertCount(count($optionsArray) + (int)(!empty($emptyLabel) && !empty($foregroundCountries)) +
-            (int)(!empty($emptyLabel)), $result);
+        $this->assertCount(count($optionsArray) + (int)(!empty($emptyLabel)), $result);
         foreach ($expectedResults as $index => $expectedResult) {
             $this->assertEquals($expectedResult, $result[$index]['label']);
         }
@@ -123,8 +122,10 @@ public function toOptionArrayDataProvider()
             [$optionsArray, false, [], ['AD', 'US', 'ES', 'BZ']],
             [$optionsArray, false, 'US', ['US', 'AD', 'ES', 'BZ']],
             [$optionsArray, false, ['US', 'BZ'], ['US', 'BZ', 'AD', 'ES']],
-            [$optionsArray, ' ', 'US', [' ', 'US', ' ', 'AD', 'ES', 'BZ']],
-            [$optionsArray, ' ', [], [' ', 'AD', 'US', 'ES', 'BZ']]
+            [$optionsArray, ' ', 'US', [' ', 'US', 'AD', 'ES', 'BZ']],
+            [$optionsArray, ' ', [], [' ', 'AD', 'US', 'ES', 'BZ']],
+            [$optionsArray, ' ', 'UA', [' ', 'AD', 'US', 'ES', 'BZ']],
+            [$optionsArray, ' ', ['AF', 'UA'], [' ', 'AD', 'US', 'ES', 'BZ']],
         ];
     }
 }
diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json
index c6de1d1eefe6c..420bd11e61d69 100644
--- a/app/code/Magento/Directory/composer.json
+++ b/app/code/Magento/Directory/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-directory",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-config": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-backend": "100.2.*",
@@ -10,7 +10,7 @@
         "lib-libxml": "*"
     },
     "type": "magento2-module",
-    "version": "100.2.5",
+    "version": "100.2.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php
index f56b219f72db2..a283891afc406 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php
@@ -11,6 +11,9 @@
 use Magento\Downloadable\Api\Data\SampleInterfaceFactory;
 use Magento\Downloadable\Api\Data\LinkInterfaceFactory;
 
+/**
+ * Class for initialization downloadable info from request.
+ */
 class Downloadable
 {
     /**
@@ -92,6 +95,8 @@ public function afterInitialize(
                     }
                 }
                 $extension->setDownloadableProductLinks($links);
+            } else {
+                $extension->setDownloadableProductLinks([]);
             }
             if (isset($downloadable['sample']) && is_array($downloadable['sample'])) {
                 $samples = [];
@@ -107,6 +112,8 @@ public function afterInitialize(
                     }
                 }
                 $extension->setDownloadableProductSamples($samples);
+            } else {
+                $extension->setDownloadableProductSamples([]);
             }
             $product->setExtensionAttributes($extension);
             if ($product->getLinksPurchasedSeparately()) {
diff --git a/app/code/Magento/Downloadable/Helper/Download.php b/app/code/Magento/Downloadable/Helper/Download.php
index 910eaa42f0e84..e98d400794dd1 100644
--- a/app/code/Magento/Downloadable/Helper/Download.php
+++ b/app/code/Magento/Downloadable/Helper/Download.php
@@ -15,6 +15,7 @@
 /**
  * Downloadable Products Download Helper
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Download extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -188,19 +189,20 @@ public function getFileSize()
     public function getContentType()
     {
         $this->_getHandle();
-        if ($this->_linkType == self::LINK_TYPE_FILE) {
-            if (function_exists(
-                'mime_content_type'
-            ) && ($contentType = mime_content_type(
-                $this->_workingDirectory->getAbsolutePath($this->_resourceFile)
-            ))
+        if ($this->_linkType === self::LINK_TYPE_FILE) {
+            if (function_exists('mime_content_type')
+                && ($contentType = mime_content_type(
+                    $this->_workingDirectory->getAbsolutePath($this->_resourceFile)
+                ))
             ) {
                 return $contentType;
-            } else {
-                return $this->_downloadableFile->getFileType($this->_resourceFile);
             }
-        } elseif ($this->_linkType == self::LINK_TYPE_URL) {
-            return $this->_handle->stat($this->_resourceFile)['type'];
+            return $this->_downloadableFile->getFileType($this->_resourceFile);
+        }
+        if ($this->_linkType === self::LINK_TYPE_URL) {
+            return (is_array($this->_handle->stat($this->_resourceFile)['type'])
+                ? end($this->_handle->stat($this->_resourceFile)['type'])
+                : $this->_handle->stat($this->_resourceFile)['type']);
         }
         return $this->_contentType;
     }
@@ -254,10 +256,21 @@ public function setResource($resourceFile, $linkType = self::LINK_TYPE_FILE)
                 );
             }
         }
-
+        
         $this->_resourceFile = $resourceFile;
+        
+        /**
+        * check header for urls
+        */
+        if ($linkType === self::LINK_TYPE_URL) {
+            $headers = array_change_key_case(get_headers($this->_resourceFile, 1), CASE_LOWER);
+            if (isset($headers['location'])) {
+                $this->_resourceFile  = is_array($headers['location']) ? current($headers['location'])
+                    : $headers['location'];
+            }
+        }
+        
         $this->_linkType = $linkType;
-
         return $this;
     }
 
diff --git a/app/code/Magento/Downloadable/Model/SampleRepository.php b/app/code/Magento/Downloadable/Model/SampleRepository.php
index 5b9e8e784b9f3..00f653e87b5ae 100644
--- a/app/code/Magento/Downloadable/Model/SampleRepository.php
+++ b/app/code/Magento/Downloadable/Model/SampleRepository.php
@@ -299,8 +299,11 @@ protected function updateSample(
             $existingSample->setTitle($sample->getTitle());
         }
 
-        if ($sample->getSampleType() === 'file' && $sample->getSampleFileContent() === null) {
-            $sample->setSampleFile($existingSample->getSampleFile());
+        if ($sample->getSampleType() === 'file'
+            && $sample->getSampleFileContent() === null
+            && $sample->getSampleFile() !== null
+        ) {
+            $existingSample->setSampleFile($sample->getSampleFile());
         }
         $this->saveSample($product, $sample, $isGlobalScopeContent);
         return $existingSample->getId();
diff --git a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
index 64305cfce9b08..4aed7818b5095 100644
--- a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
+++ b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
@@ -92,9 +92,15 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         if ($purchasedLink->getId()) {
             return $this;
         }
+        $storeId = $orderItem->getOrder()->getStoreId();
+        $orderStatusToEnableItem = $this->_scopeConfig->getValue(
+            \Magento\Downloadable\Model\Link\Purchased\Item::XML_PATH_ORDER_ITEM_STATUS,
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
         if (!$product) {
             $product = $this->_createProductModel()->setStoreId(
-                $orderItem->getOrder()->getStoreId()
+                $storeId
             )->load(
                 $orderItem->getProductId()
             );
@@ -150,6 +156,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                         )->setNumberOfDownloadsBought(
                             $numberOfDownloads
                         )->setStatus(
+                            \Magento\Sales\Model\Order\Item::STATUS_PENDING == $orderStatusToEnableItem ?
+                            \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_AVAILABLE :
                             \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_PENDING
                         )->setCreatedAt(
                             $orderItem->getCreatedAt()
diff --git a/app/code/Magento/Downloadable/Observer/UpdateLinkPurchasedObserver.php b/app/code/Magento/Downloadable/Observer/UpdateLinkPurchasedObserver.php
new file mode 100644
index 0000000000000..fc6430710aa59
--- /dev/null
+++ b/app/code/Magento/Downloadable/Observer/UpdateLinkPurchasedObserver.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Downloadable\Observer;
+
+use Magento\Downloadable\Model\ResourceModel\Link\Purchased\Collection as PurchasedCollection;
+use Magento\Downloadable\Model\ResourceModel\Link\Purchased\CollectionFactory;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+
+/**
+ * Assign Downloadable links to customer created after issuing guest order.
+ */
+class UpdateLinkPurchasedObserver implements ObserverInterface
+{
+    /**
+     * Purchased links collection factory
+     *
+     * @var CollectionFactory
+     */
+    private $purchasedCollectionFactory;
+
+    /**
+     * @param CollectionFactory $purchasedCollectionFactory
+     */
+    public function __construct(
+        CollectionFactory $purchasedCollectionFactory
+    ) {
+        $this->purchasedCollectionFactory = $purchasedCollectionFactory;
+    }
+
+    /**
+     * Link customer_id to downloadable link purchased after update order
+     *
+     * @param Observer $observer
+     * @return $this
+     */
+    public function execute(Observer $observer)
+    {
+        $order = $observer->getEvent()->getOrder();
+        $orderId = $order->getId();
+        $customerId = $order->getCustomerId();
+        if (!$orderId || !$customerId) {
+            return $this;
+        }
+        $purchasedLinksCollection = $this->getPurchasedCollection((int)$orderId);
+        foreach ($purchasedLinksCollection as $linkPurchased) {
+            $linkPurchased->setCustomerId($customerId)->save();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get purchased collection by order id
+     *
+     * @param int $orderId
+     * @return PurchasedCollection
+     */
+    private function getPurchasedCollection(int $orderId): PurchasedCollection
+    {
+        return $this->purchasedCollectionFactory->create()->addFieldToFilter(
+            'order_id',
+            ['eq' => $orderId]
+        );
+    }
+}
diff --git a/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/StorefrontAssertDownloadableProductIsPresentInCustomerAccountActionGroup.xml b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/StorefrontAssertDownloadableProductIsPresentInCustomerAccountActionGroup.xml
new file mode 100644
index 0000000000000..d672e5bd0f95f
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/StorefrontAssertDownloadableProductIsPresentInCustomerAccountActionGroup.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="StorefrontAssertDownloadableProductIsPresentInCustomerAccount">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <amOnPage url="{{StorefrontCustomerDownloadableProductsPage.url}}" stepKey="goToCustomerDownloadableProductsPage"/>
+        <seeElement selector="{{StorefrontCustomerDownloadableProductsSection.productName(product.name)}}" stepKey="seeStorefontDownloadableProductsProductName" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Data/CatalogConfigData.xml b/app/code/Magento/Downloadable/Test/Mftf/Data/CatalogConfigData.xml
new file mode 100644
index 0000000000000..8bb81f9c7579d
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Data/CatalogConfigData.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="EnableGuestCheckoutWithDownloadableItems">
+        <data key="path">catalog/downloadable/disable_guest_checkout</data>
+        <data key="scope_id">0</data>
+        <data key="value">0</data>
+    </entity>
+    <entity name="DisableGuestCheckoutWithDownloadableItems">
+        <data key="path">catalog/downloadable/disable_guest_checkout</data>
+        <data key="scope_id">0</data>
+        <data key="value">1</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Page/StorefrontCustomerDownloadableProductsPage.xml b/app/code/Magento/Downloadable/Test/Mftf/Page/StorefrontCustomerDownloadableProductsPage.xml
new file mode 100644
index 0000000000000..eafb37111fda2
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Page/StorefrontCustomerDownloadableProductsPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomerDownloadableProductsPage" url="downloadable/customer/products/" area="storefront" module="Magento_Downloadable">
+        <section name="StorefrontCustomerDownloadableProductsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontCustomerDownloadableProductsSection.xml b/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontCustomerDownloadableProductsSection.xml
new file mode 100644
index 0000000000000..d45a774077ba0
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontCustomerDownloadableProductsSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerDownloadableProductsSection">
+        <element name="productName" type="text" selector="//table[@id='my-downloadable-products-table']//strong[contains(@class, 'product-name') and normalize-space(.)='{{productName}}']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml
new file mode 100644
index 0000000000000..f9046623a8f7c
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="LinkDownloadableProductFromGuestToCustomerTest">
+        <annotations>
+            <features value="Downloadable"/>
+            <stories value="Downloadable products in customer account"/>
+            <title value="Customer should see downloadable products after place order as guest and registering after that"/>
+            <description value="Verify that in 'My Downloadable Products' section in customer account user can see products."/>
+            <severity value="AVERAGE"/>
+            <useCaseId value="MAGETWO-98655"/>
+            <testCaseId value="MC-16148"/>
+            <group value="catalog"/>
+            <group value="downloadable"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{EnableGuestCheckoutWithDownloadableItems.path}} {{EnableGuestCheckoutWithDownloadableItems.value}}" stepKey="enableGuestCheckoutWithDownloadableItems" />
+            <createData entity="ApiDownloadableProduct" stepKey="createProduct"/>
+            <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink">
+                <requiredEntity createDataKey="createProduct"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set {{DisableGuestCheckoutWithDownloadableItems.path}} {{DisableGuestCheckoutWithDownloadableItems.value}}" stepKey="disableGuestCheckoutWithDownloadableItems" />
+            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
+            <actionGroup ref="RemoveCustomerFromAdminActionGroup" stepKey="deleteCustomer">
+                <argument name="customer" value="Simple_US_NY_Customer"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Step 1: Go to Storefront as Guest-->
+        <actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="logoutCustomer"/>
+        <!--Step 2: Add downloadable product to shopping cart-->
+        <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>
+        <!--Step 3: Go to checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
+        <!--Step 4: Select Check/Money Order payment, fill required fields and click Update and Place Order-->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrderPayment"/>
+        <actionGroup ref="GuestCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
+            <argument name="customerVar" value="Simple_US_NY_Customer"/>
+            <argument name="customerAddressVar" value="US_Address_NY"/>
+        </actionGroup>
+        <click selector="{{CheckoutPaymentSection.update}}"  stepKey="clickUpdateButton" />
+        <waitForPageLoad stepKey="waitUpdateAddress"/>
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="placeOrder">
+            <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage"/>
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
+        </actionGroup>
+        <!--Step 5: Create customer account after placing order-->
+        <actionGroup ref="StorefrontRegisterCustomerFromOrderSuccessPage" stepKey="createCustomerAfterPlaceOrder">
+            <argument name="customer" value="CustomerEntityOne"/>
+        </actionGroup>
+        <!--Step 6: Go To My Account -> My Downloadable Products and check if downloadable product link exist-->
+        <actionGroup ref="StorefrontAssertDownloadableProductIsPresentInCustomerAccount" stepKey="seeStorefontMyDownloadableProductsProductName">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
index a352c4bdf7bc3..9ab664cb27839 100644
--- a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
+++ b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
@@ -3,22 +3,24 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Downloadable\Model\Product\Type;
-use Magento\Downloadable\Model\Source\TypeUpload;
 use Magento\Downloadable\Model\Source\Shareable;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Downloadable\Model\Source\TypeUpload;
 use Magento\Framework\Stdlib\ArrayManager;
-use Magento\Ui\Component\DynamicRows;
 use Magento\Framework\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\Component\Container;
+use Magento\Ui\Component\DynamicRows;
 use Magento\Ui\Component\Form;
 
 /**
- * Class adds a grid with links
+ * Class adds a grid with links.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Links extends AbstractModifier
@@ -86,7 +88,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyData(array $data)
     {
@@ -101,7 +103,7 @@ public function modifyData(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function modifyMeta(array $meta)
@@ -160,6 +162,8 @@ public function modifyMeta(array $meta)
     }
 
     /**
+     * Get dynamic rows meta.
+     *
      * @return array
      */
     protected function getDynamicRows()
@@ -180,6 +184,8 @@ protected function getDynamicRows()
     }
 
     /**
+     * Get single link record meta.
+     *
      * @return array
      */
     protected function getRecord()
@@ -221,6 +227,8 @@ protected function getRecord()
     }
 
     /**
+     * Get link title meta.
+     *
      * @return array
      */
     protected function getTitleColumn()
@@ -232,6 +240,7 @@ protected function getTitleColumn()
             'label' => __('Title'),
             'showLabel' => false,
             'dataScope' => '',
+            'sortOrder' => 10,
         ];
         $titleField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Input::NAME,
@@ -247,6 +256,8 @@ protected function getTitleColumn()
     }
 
     /**
+     * Get link price meta.
+     *
      * @return array
      */
     protected function getPriceColumn()
@@ -258,6 +269,7 @@ protected function getPriceColumn()
             'label' => __('Price'),
             'showLabel' => false,
             'dataScope' => '',
+            'sortOrder' => 20,
         ];
         $priceField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Input::NAME,
@@ -281,6 +293,8 @@ protected function getPriceColumn()
     }
 
     /**
+     * Get link file element meta.
+     *
      * @return array
      */
     protected function getFileColumn()
@@ -292,6 +306,7 @@ protected function getFileColumn()
             'label' => __('File'),
             'showLabel' => false,
             'dataScope' => '',
+            'sortOrder' => 30,
         ];
         $fileTypeField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Select::NAME,
@@ -344,6 +359,8 @@ protected function getFileColumn()
     }
 
     /**
+     * Get sample container meta.
+     *
      * @return array
      */
     protected function getSampleColumn()
@@ -355,6 +372,7 @@ protected function getSampleColumn()
             'label' => __('Sample'),
             'showLabel' => false,
             'dataScope' => '',
+            'sortOrder' => 40,
         ];
         $sampleTypeField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Select::NAME,
@@ -403,6 +421,8 @@ protected function getSampleColumn()
     }
 
     /**
+     * Get link "is sharable" element meta.
+     *
      * @return array
      */
     protected function getShareableColumn()
@@ -413,6 +433,7 @@ protected function getShareableColumn()
             'componentType' => Form\Field::NAME,
             'dataType' => Form\Element\DataType\Number::NAME,
             'dataScope' => 'is_shareable',
+            'sortOrder' => 50,
             'options' => $this->shareable->toOptionArray(),
         ];
 
@@ -420,6 +441,8 @@ protected function getShareableColumn()
     }
 
     /**
+     * Get link "max downloads" element meta.
+     *
      * @return array
      */
     protected function getMaxDownloadsColumn()
@@ -431,6 +454,7 @@ protected function getMaxDownloadsColumn()
             'label' => __('Max. Downloads'),
             'showLabel' => false,
             'dataScope' => '',
+            'sortOrder' => 60,
         ];
         $numberOfDownloadsField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Input::NAME,
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
index 1587163ba8121..3890ee5b9e2b2 100644
--- a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
+++ b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
@@ -3,21 +3,23 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Downloadable\Model\Product\Type;
 use Magento\Downloadable\Model\Source\TypeUpload;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Stdlib\ArrayManager;
-use Magento\Ui\Component\DynamicRows;
 use Magento\Framework\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\Component\Container;
+use Magento\Ui\Component\DynamicRows;
 use Magento\Ui\Component\Form;
 
 /**
- * Class adds a grid with samples
+ * Class adds a grid with samples.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Samples extends AbstractModifier
@@ -77,7 +79,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyData(array $data)
     {
@@ -90,7 +92,7 @@ public function modifyData(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function modifyMeta(array $meta)
@@ -135,6 +137,8 @@ public function modifyMeta(array $meta)
     }
 
     /**
+     * Get sample rows meta.
+     *
      * @return array
      */
     protected function getDynamicRows()
@@ -155,6 +159,8 @@ protected function getDynamicRows()
     }
 
     /**
+     * Get single sample row meta.
+     *
      * @return array
      */
     protected function getRecord()
@@ -192,6 +198,8 @@ protected function getRecord()
     }
 
     /**
+     * Get sample title meta.
+     *
      * @return array
      */
     protected function getTitleColumn()
@@ -203,6 +211,7 @@ protected function getTitleColumn()
             'showLabel' => false,
             'label' => __('Title'),
             'dataScope' => '',
+            'sortOrder' => 10,
         ];
         $titleField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Input::NAME,
@@ -218,6 +227,8 @@ protected function getTitleColumn()
     }
 
     /**
+     * Get sample element meta.
+     *
      * @return array
      */
     protected function getSampleColumn()
@@ -229,6 +240,7 @@ protected function getSampleColumn()
             'label' => __('File'),
             'showLabel' => false,
             'dataScope' => '',
+            'sortOrder' => 20,
         ];
         $sampleType['arguments']['data']['config'] = [
             'formElement' => Form\Element\Select::NAME,
diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json
index e737c3121f454..9f347db1ff8d8 100644
--- a/app/code/Magento/Downloadable/composer.json
+++ b/app/code/Magento/Downloadable/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-downloadable",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-catalog": "102.0.*",
         "magento/module-customer": "101.0.*",
@@ -25,7 +25,7 @@
         "magento/module-downloadable-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.5",
+    "version": "100.2.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Downloadable/etc/events.xml b/app/code/Magento/Downloadable/etc/events.xml
index 5a985fc33802e..21cc50ddc9669 100644
--- a/app/code/Magento/Downloadable/etc/events.xml
+++ b/app/code/Magento/Downloadable/etc/events.xml
@@ -11,6 +11,7 @@
     </event>
     <event name="sales_order_save_after">
         <observer name="downloadable_observer" instance="Magento\Downloadable\Observer\SetLinkStatusObserver" />
+        <observer name="downloadable_observer_assign_customer" instance="Magento\Downloadable\Observer\UpdateLinkPurchasedObserver" />
     </event>
     <event name="sales_model_service_quote_submit_success">
         <observer name="checkout_type_onepage_save_order_after" instance="Magento\Downloadable\Observer\SetHasDownloadableProductsObserver" />
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 c86eb56a39008..6a259136951e1 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
@@ -3,50 +3,47 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php /* @var $block \Magento\Downloadable\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Downloadable */ ?>
 <?php $_linksPurchasedSeparately = $block->getLinksPurchasedSeparately(); ?>
-<?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
-<?php if (($block->getProduct()->isSaleable() || $_skipSaleableCheck) && $block->hasLinks()):?>
-
+<?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
+<?php if (($block->getProduct()->isSaleable() || $_skipSaleableCheck) && $block->hasLinks()) :?>
 <fieldset id="catalog_product_composite_configure_fields_downloadable"
           class="fieldset admin__fieldset downloadable information<?= $block->getIsLastFieldset() ? ' last-fieldset' : '' ?>">
-    <legend class="legend admin__legend"><span><?= /* @escapeNotVerified */ __('Downloadable Information') ?></span></legend><br />
+    <legend class="legend admin__legend"><span><?= $block->escapeHtml(__('Downloadable Information')) ?></span></legend><br />
     <?php $_links = $block->getLinks(); ?>
     <?php $_isRequired = $block->getLinkSelectionRequired(); ?>
-    <div class="field admin__field link<?php if ($_isRequired) echo ' required _required' ?>">
-        <label class="label admin__field-label"><span><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></span></label>
+    <div class="field admin__field link<?php if ($_isRequired) { echo ' required _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): ?>
+            <?php foreach ($_links as $_link) : ?>
                 <div class="nested admin__field-option">
-                <?php if ($_linksPurchasedSeparately): ?>
+                <?php if ($_linksPurchasedSeparately) : ?>
                     <input type="checkbox"
-                           class="admin__control-checkbox checkbox<?php if ($_isRequired):?> validate-one-required-by-name<?php endif; ?> product downloadable link"
-                           name="links[]" id="links_<?= /* @escapeNotVerified */ $_link->getId() ?>"
-                           value="<?= /* @escapeNotVerified */ $_link->getId() ?>" <?= /* @escapeNotVerified */ $block->getLinkCheckedValue($_link) ?>
-                           price="<?= /* @escapeNotVerified */ $block->getCurrencyPrice($_link->getPrice()) ?>"/>
+                           class="admin__control-checkbox checkbox<?php if ($_isRequired) :?> validate-one-required-by-name<?php endif; ?> product downloadable link"
+                           name="links[]" id="links_<?= $block->escapeHtmlAttr($_link->getId()) ?>"
+                           value="<?= $block->escapeHtmlAttr($_link->getId()) ?>" <?= $block->escapeHtmlAttr($block->getLinkCheckedValue($_link)) ?>
+                           price="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_link->getPrice())) ?>"/>
                     <?php endif; ?>
-                    <label for="links_<?= /* @escapeNotVerified */ $_link->getId() ?>" class="label">
+                    <label for="links_<?= $block->escapeHtmlAttr($_link->getId()) ?>" class="label admin__field-label">
                         <?= $block->escapeHtml($_link->getTitle()) ?>
-                        <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
-                            &nbsp;(<a href="<?= /* @escapeNotVerified */ $block->getLinkSampleUrl($_link) ?>" <?= $block->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':'' ?>><?= /* @escapeNotVerified */ __('sample') ?></a>)
+                        <?php if ($_link->getSampleFile() || $_link->getSampleUrl()) : ?>
+                            &nbsp;(<a href="<?= $block->escapeUrl($block->getLinkSampleUrl($_link)) ?>" <?= /* @noEscape */ $block->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':'' ?>><?= $block->escapeHtmlAttr(__('sample')) ?></a>)
                         <?php endif; ?>
-                        <?php if ($_linksPurchasedSeparately): ?>
-                        <?= /* @escapeNotVerified */ $block->getFormattedLinkPrice($_link) ?>
+                        <?php if ($_linksPurchasedSeparately) : ?>
+                            <?= /* @noEscape */ $block->getFormattedLinkPrice($_link) ?>
                             <br />
-                            <?= /* @escapeNotVerified */ $block->getLinkPrice($_link) ?>
+                            <?=  /* @noEscape */ $block->getLinkPrice($_link) ?>
                         <?php endif; ?>
                     </label>
-                <?php if ($_isRequired): ?>
+                <?php if ($_isRequired) : ?>
                     <script>
 require(['prototype'], function(){
 
     //<![CDATA[
-    $('links_<?= /* @escapeNotVerified */ $_link->getId() ?>').advaiceContainer = 'links-advice-container';
-    $('links_<?= /* @escapeNotVerified */ $_link->getId() ?>').callbackFunction = 'validateDownloadableCallback';
+    $('links_<?= $block->escapeJs($_link->getId()) ?>').advaiceContainer = 'links-advice-container';
+    $('links_<?= $block->escapeJs($_link->getId()) ?>').callbackFunction = 'validateDownloadableCallback';
     //]]>
                     
 });
@@ -54,7 +51,7 @@ require(['prototype'], function(){
                 <?php endif; ?>
             </div>
             <?php endforeach; ?>
-        <?php if ($_isRequired): ?>
+        <?php if ($_isRequired) : ?>
             <span id="links-advice-container"></span>
         <?php endif;?>
         </div>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml
index 7dc547c5e2752..3090912da2304 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php
@@ -113,7 +110,7 @@ var uploaderTemplate = '<div class="no-display" id="[[idName]]-template">' +
             this.idName = idName;
             this.config = config;
             uploaderTemplate = new Template(this.uploaderText, this.uploaderSyntax);
-            <?php if (!$block->isReadonly()):?>
+            <?php if (!$block->isReadonly()) :?>
             Element.insert(
                 elmContainer,
                 {'top' : uploaderTemplate.evaluate({
@@ -203,8 +200,8 @@ var uploaderTemplate = '<div class="no-display" id="[[idName]]-template">' +
 });
 </script>
 
-<div data-tab-type="tab_content_downloadableInfo" id="<?= /* @escapeNotVerified */ $block->getId() ?>_content"
-    <?= /* @escapeNotVerified */ $block->getUiId('tab', 'content', $block->getId()) ?>
+<div data-tab-type="tab_content_downloadableInfo" id="<?= $block->escapeHtmlAttr($block->getId()) ?>_content"
+    <?= $block->escapeHtmlAttr($block->getUiId('tab', 'content', $block->getId())) ?>
 >
 <div id="alert_messages_block"><?= $block->getMessageHtml() ?></div>
 <div class="admin__field admin__field-option admin__field-is-downloaodable">
@@ -220,11 +217,11 @@ var uploaderTemplate = '<div class="no-display" id="[[idName]]-template">' +
 <div style="display:none">
     <div id="custom-advice-container"></div>
 </div>
-<?php if ($block->isReadonly()): ?>
+<?php if ($block->isReadonly()) : ?>
     <script>
         require(['prototype'], function(){
 
-        $(<?= /* @escapeNotVerified */  $block->getContentTabId() ?>).select('input', 'select', 'textarea', 'button').each(function (item){
+        $(<?= $block->escapeJs($block->getContentTabId()) ?>).select('input', 'select', 'textarea', 'button').each(function (item){
             item.disabled = true;
             if (item.tagName.toLowerCase() == 'button') {
                 item.addClassName('disabled');
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
index 3ec6010218fb6..42b3b6908a663 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 
@@ -16,23 +13,23 @@
 <?php $_product = $block->getProduct()?>
 <?php $block->getConfigJson() ?>
 <fieldset class="admin__fieldset downloadable-form" data-ui-id="downloadable-links">
-    <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Links') ?></span></legend><br>
-    <p class="note"><?= /* @escapeNotVerified */ __('Add links to your product files here.') ?></p>
-    <div class="admin__field" <?= !$block->isSingleStoreMode() ? ' data-config-scope="' . __('[STORE VIEW]') . '"' : '' ?>>
-        <label class="admin__field-label" for="downloadable_links_title"><span><?= /* @escapeNotVerified */ __('Title') ?></span></label>
+    <legend class="admin__legend"><span><?= $block->escapeHtml(__('Links')) ?></span></legend><br>
+    <p class="note"><?= $block->escapeHtml(__('Add links to your product files here.')) ?></p>
+    <div class="admin__field" <?= $block->escapeHtml(!$block->isSingleStoreMode() ? ' data-config-scope="' . __('[STORE VIEW]') . '"' : '') ?>>
+        <label class="admin__field-label" for="downloadable_links_title"><span><?= $block->escapeHtml(__('Title')) ?></span></label>
         <div class="admin__field-control">
             <input type="text" class="admin__control-text" id="downloadable_links_title" name="product[links_title]" value="<?= $block->escapeHtml($block->getLinksTitle()) ?>" <?= ($_product->getStoreId() && $block->getUsedDefault()) ? 'disabled="disabled"' : '' ?>>
-            <?php if ($_product->getStoreId()): ?>
+            <?php if ($_product->getStoreId()) : ?>
                 <div class="admin__field admin__field-option">
                     <input id="link_title_default" class="admin__control-checkbox" type="checkbox" name="use_default[]" value="links_title" onclick="toggleValueElements(this, this.parentNode.parentNode)" <?= $block->getUsedDefault() ? 'checked="checked"' : '' ?> />
-                    <label class="admin__field-label" for="link_title_default"><span><?= /* @escapeNotVerified */ __('Use Default Value') ?></span></label>
+                    <label class="admin__field-label" for="link_title_default"><span><?= $block->escapeHtml(__('Use Default Value')) ?></span></label>
                 </div>
             <?php endif; ?>
         </div>
     </div>
 
-    <div class="admin__field" <?= !$block->isSingleStoreMode() ? ' data-config-scope="' . __('[GLOBAL]') . '"' : '' ?>>
-        <label class="admin__field-label" for="downloadable_link_purchase_type"><span><?= /* @escapeNotVerified */ __('Links can be purchased separately') ?></span></label>
+    <div class="admin__field" <?= $block->escapeHtml(!$block->isSingleStoreMode() ? ' data-config-scope="' . __('[GLOBAL]') . '"' : '') ?>>
+        <label class="admin__field-label" for="downloadable_link_purchase_type"><span><?= $block->escapeHtml(__('Links can be purchased separately')) ?></span></label>
         <div class="admin__field-control">
             <div class="admin__field-control link-switcher" data-role="link-switcher">
                 <div class="admin__field-control-group">
@@ -40,9 +37,9 @@
                         <input type="radio" name="product[links_purchased_separately]" value="1"
                                class="admin__control-radio"
                                id="link-switcher1"
-                           <?php if($block->isProductLinksCanBePurchasedSeparately()): ?>
+                            <?php if ($block->isProductLinksCanBePurchasedSeparately()) : ?>
                                checked="checked"
-                           <?php endif; ?>
+                            <?php endif; ?>
                             >
                         <label class="admin__field-label" for="link-switcher1">
                             <span>Yes</span>
@@ -52,7 +49,7 @@
                         <input type="radio" name="product[links_purchased_separately]" value="0"
                                 class="admin__control-radio"
                                 id="link-switcher0"
-                            <?php if(!$block->isProductLinksCanBePurchasedSeparately()): ?>
+                            <?php if (!$block->isProductLinksCanBePurchasedSeparately()) : ?>
                                 checked="checked"
                             <?php endif; ?>
                             >
@@ -70,15 +67,15 @@
                 <table class="admin__control-table">
                     <thead>
                         <tr>
-                            <th class="col-sort"><span><?= /* @escapeNotVerified */ __('Sort Order') ?></span></th>
-                            <th class="col-title _required"><span><?= /* @escapeNotVerified */ __('Title') ?></span></th>
+                            <th class="col-sort"><span><?= $block->escapeHtml(__('Sort Order')) ?></span></th>
+                            <th class="col-title _required"><span><?= $block->escapeHtml(__('Title')) ?></span></th>
                             <?php if ($block->getCanReadPrice() !== false) : ?>
-                                <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
+                                <th class="col-price"><span><?= $block->escapeHtml(__('Price')) ?></span></th>
                             <?php endif; ?>
-                            <th class="col-file"><span><?= /* @escapeNotVerified */ __('Attach File or Enter Link') ?></span></th>
-                            <th class="col-sample"><span><?= /* @escapeNotVerified */ __('Sample') ?></span></th>
-                            <th class="col-share"><span><?= /* @escapeNotVerified */ __('Shareable') ?></span></th>
-                            <th class="col-limit"><span><?= /* @escapeNotVerified */ __('Max. Downloads') ?></span></th>
+                            <th class="col-file"><span><?= $block->escapeHtml(__('Attach File or Enter Link')) ?></span></th>
+                            <th class="col-sample"><span><?= $block->escapeHtml(__('Sample')) ?></span></th>
+                            <th class="col-share"><span><?= $block->escapeHtml(__('Shareable')) ?></span></th>
+                            <th class="col-limit"><span><?= $block->escapeHtml(__('Max. Downloads')) ?></span></th>
                             <th class="col-actions">&nbsp;</th>
                         </tr>
                     </thead>
@@ -92,7 +89,7 @@
                 </table>
             </div>
             <div class="admin__field-note">
-                <span><?= /* @escapeNotVerified */ __('Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'.') ?></span>
+                <span><?= $block->escapeHtml(__('Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'.')) ?></span>
             </div>
         </div>
     </div>
@@ -114,16 +111,16 @@ require([
             'data.id' +
             ' %>][sort_order]" ' +
             'value="<%- data.sort_order %>" class="input-text admin__control-text sort" />' +
-                '<span class="draggable-handle" title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Sort Variations')) ?>"></span>' +
+                '<span class="draggable-handle" title="<?= $block->escapeJs($block->escapeHtmlAttr(__('Sort Variations'))) ?>"></span>' +
             '</td>'+
             '<td class="col-title">'+
                 '<input type="hidden" class="__delete__" name="downloadable[link][<%- data.id %>][is_delete]" value="" />'+
                 '<input type="hidden" name="downloadable[link][<%- data.id %>][link_id]" value="<%- data.link_id %>" />'+
                 '<input type="text" class="required-entry input-text admin__control-text" name="downloadable[link][<%- data.id %>][title]" value="<%- data.title %>" />'+
-                <?php if($_product->getStoreId()): ?>
+                <?php if ($_product->getStoreId()) : ?>
                     '<div class="admin__field admin__field-option">'+
                     '<input type="checkbox" id="downloadable_link_<%- data.id %>_title" name="downloadable[link][<%- data.id %>][use_default_title]" value="1" class="admin__control-checkbox" />'+
-                    '<label for="downloadable_link_<%- data.id %>_title" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Use Default Value') ?></span></label>'+
+                    '<label for="downloadable_link_<%- data.id %>_title" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('Use Default Value'))) ?></span></label>'+
                     '</div>' +
                 <?php endif; ?>
                 <?php if ($block->getCanReadPrice() == false) : ?>
@@ -137,12 +134,12 @@ require([
                 '<td class="col-price">'+
                     '<div class="admin__control-addon">' +
                         '<input type="text" id="downloadable_link_<%- data.id %>_price_value" class="input-text admin__control-text validate-number link-prices<?php if ($block->getCanEditPrice() === false) : ?> disabled<?php endif; ?>" name="downloadable[link][<%- data.id %>][price]" value="<%- data.price %>"<?php if ($block->getCanEditPrice() === false) : ?> disabled="disabled"<?php endif; ?> /> ' +
-                        '<label class="admin__addon-prefix"><span><?= $block->escapeHtml($block->getBaseCurrencySymbol($_product->getStoreId())) ?></span></label>' +
+                        '<label class="admin__addon-prefix"><span><?= $block->escapeJs($block->escapeHtml($block->getBaseCurrencySymbol($_product->getStoreId()))) ?></span></label>' +
                     '</div>' +
                     <?php if ($_product->getStoreId() && $block->getIsPriceWebsiteScope()) : ?>
                         '<div class="admin__field admin__field-option">'+
                             '<input type="checkbox" id="downloadable_link_<%- data.id %>_price" name="downloadable[link][<%- data.id %>][use_default_price]" value="1"<?php if ($block->getCanEditPrice() === false) : ?> disabled="disabled"<?php endif; ?> class="admin__control-checkbox" />'+
-                            '<label for="downloadable_link_<%- data.id %>_price" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Use Default Value') ?></span></label>' +
+                            '<label for="downloadable_link_<%- data.id %>_price" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('Use Default Value'))) ?></span></label>' +
                         '</div>' +
                     <?php endif; ?>
                 '</td>' +
@@ -150,14 +147,14 @@ require([
             '<td class="col-file">'+
                 '<div class="admin__field admin__field-option">'+
                     '<input type="radio" class="admin__control-radio validate-one-required-by-name" id="downloadable_link_<%- data.id %>_file_type" name="downloadable[link][<%- data.id %>][type]" value="file"<%- data.file_checked %> />' +
-                    '<label for="downloadable_link_<%- data.id %>_file_type" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('File') ?></span></label>'+
+                    '<label for="downloadable_link_<%- data.id %>_file_type" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('File'))) ?></span></label>'+
                     '<input type="hidden" class="validate-downloadable-file" id="downloadable_link_<%- data.id %>_file_save" name="downloadable[link][<%- data.id %>][file]" value="<%- data.file_save %>" />'+
 
                     '<div id="downloadable_link_<%- data.id %>_file" class="admin__field-uploader">'+
                         '<div id="downloadable_link_<%- data.id %>_file-old" class="file-row-info"></div>'+
                         '<div id="downloadable_link_<%- data.id %>_file-new" class="file-row-info new-file"></div>'+
                         '<div class="fileinput-button form-buttons">'+
-                            '<span><?= /* @escapeNotVerified */ __('Browse Files...') ?></span>' +
+                            '<span><?= $block->escapeJs($block->escapeHtml(__('Browse Files...'))) ?></span>' +
                             '<input id="downloadable_link_<%- data.id %>_file" type="file" name="<?= $block->escapeHtml($block->getFileFieldName('links')) ?>">' +
                             '<script>' +
                                 'linksUploader("#downloadable_link_<%- data.id %>_file", "<?= $block->escapeUrl($block->getUploadUrl('links')) ?>"); ' +
@@ -167,8 +164,8 @@ require([
                 '</div>'+
                 '<div class="admin__field admin__field-option admin__field-file-url">'+
                     '<input type="radio" class="admin__control-radio validate-one-required-by-name" id="downloadable_link_<%- data.id %>_url_type" name="downloadable[link][<%- data.id %>][type]" value="url"<%- data.url_checked %> />' +
-                    '<label for="downloadable_link_<%- data.id %>_url_type" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('URL') ?></span></label>' +
-                    '<input type="text" class="validate-downloadable-url validate-url admin__control-text" name="downloadable[link][<%- data.id %>][link_url]" value="<%- data.link_url %>" placeholder="<?= /* @escapeNotVerified */ __('URL') ?>" />'+
+                    '<label for="downloadable_link_<%- data.id %>_url_type" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('URL'))) ?></span></label>' +
+                    '<input type="text" class="validate-downloadable-url validate-url admin__control-text" name="downloadable[link][<%- data.id %>][link_url]" value="<%- data.link_url %>" placeholder="<?= $block->escapeJs($block->escapeHtmlAttr(__('URL'))) ?>" />'+
                 '</div>'+
                 '<div>'+
                     '<span id="downloadable_link_<%- data.id %>_link_container"></span>'+
@@ -177,16 +174,16 @@ require([
             '<td class="col-sample">'+
                 '<div class="admin__field admin__field-option">'+
                     '<input type="radio" class="admin__control-radio" id="downloadable_link_<%- data.id %>_sample_file_type" name="downloadable[link][<%- data.id %>][sample][type]" value="file"<%- data.sample_file_checked %> />' +
-                    '<label for="downloadable_link_<%- data.id %>_sample_file_type" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('File') ?>:</span></label>'+
+                    '<label for="downloadable_link_<%- data.id %>_sample_file_type" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('File'))) ?>:</span></label>'+
                     '<input type="hidden" id="downloadable_link_<%- data.id %>_sample_file_save" name="downloadable[link][<%- data.id %>][sample][file]" value="<%- data.sample_file_save %>" class="validate-downloadable-file"/>'+
                     '<div id="downloadable_link_<%- data.id %>_sample_file" class="admin__field-uploader">'+
                         '<div id="downloadable_link_<%- data.id %>_sample_file-old" class="file-row-info"></div>'+
                         '<div id="downloadable_link_<%- data.id %>_sample_file-new" class="file-row-info new-file"></div>'+
                         '<div class="fileinput-button form-buttons">'+
-                        '<span><?= /* @escapeNotVerified */ __('Browse Files...') ?></span>' +
-                        '<input id="downloadable_link_<%- data.id %>_sample_file" type="file" name="<?= $block->escapeHtml($block->getFileFieldName('link_samples'), '"') ?>">' +
+                        '<span><?= $block->escapeJs($block->escapeHtml(__('Browse Files...'))) ?></span>' +
+                        '<input id="downloadable_link_<%- data.id %>_sample_file" type="file" name="<?= $block->escapeJs($block->escapeHtmlAttr($block->getFileFieldName('link_samples'), '"')) ?>">' +
                         '<script>'+
-                        'linksUploader("#downloadable_link_<%- data.id %>_sample_file", "<?= $block->escapeUrl($block->getUploadUrl('link_samples')) ?>"); ' +
+                        'linksUploader("#downloadable_link_<%- data.id %>_sample_file", "<?= $block->escapeJs($block->escapeUrl($block->getUploadUrl('link_samples'))) ?>"); ' +
                         '</scr'+'ipt>'+
                         '</div>'+
                     '</div>'+
@@ -194,8 +191,8 @@ require([
 
                 '<div class="admin__field admin__field-option admin__field-file-url">'+
                     '<input type="radio" class="admin__control-radio validate-one-required-by-name" id="downloadable_link_<%- data.id %>_sample_url_type" name="downloadable[link][<%- data.id %>][sample][type]" value="url"<%- data.sample_url_checked %> />' +
-                    '<label for="downloadable_link_<%- data.id %>_sample_url_type" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('URL') ?></span></label>'+
-                    '<input type="text" class="validate-downloadable-url validate-url admin__control-text" name="downloadable[link][<%- data.id %>][sample][url]" value="<%- data.sample_url %>" placeholder="<?= /* @escapeNotVerified */ __('URL') ?>" />'+
+                    '<label for="downloadable_link_<%- data.id %>_sample_url_type" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('URL'))) ?></span></label>'+
+                    '<input type="text" class="validate-downloadable-url validate-url admin__control-text" name="downloadable[link][<%- data.id %>][sample][url]" value="<%- data.sample_url %>" placeholder="<?= $block->escapeJs($block->escapeHtmlAttr(__('URL'))) ?>" />'+
                 '</div>'+
                 '<div>'+
                     '<span id="downloadable_link_<%- data.id %>_sample_container"></span>'+
@@ -203,20 +200,20 @@ require([
             '</td>'+
             '<td class="col-share">'+
                 '<select id="downloadable_link _<%- data.id %>_shareable" class="admin__control-select" name="downloadable[link][<%- data.id %>][is_shareable]">'+
-                    '<option value="1"><?= /* @escapeNotVerified */ __('Yes') ?></option>'+
-                    '<option value="0"><?= /* @escapeNotVerified */ __('No') ?></option>'+
-                    '<option value="2" selected="selected"><?= /* @escapeNotVerified */ __('Use config') ?></option>'+
+                    '<option value="1"><?= $block->escapeJs($block->escapeHtml(__('Yes'))) ?></option>'+
+                    '<option value="0"><?= $block->escapeJs($block->escapeHtml(__('No'))) ?></option>'+
+                    '<option value="2" selected="selected"><?= $block->escapeJs($block->escapeHtml(__('Use config'))) ?></option>'+
                 '</select>'+
             '</td>'+
             '<td class="col-limit">' +
                 '<input type="text" id="downloadable_link_<%- data.id %>_downloads" name="downloadable[link][<%- data.id %>][number_of_downloads]" class="input-text validate-zero-or-greater admin__control-text downloads" value="<%- data.number_of_downloads %>" />'+
                 '<div class="admin__field admin__field-option">' +
                     '<input type="checkbox" class="admin__control-checkbox" id="downloadable_link_<%- data.id %>_is_unlimited" name="downloadable[link][<%- data.id %>][is_unlimited]" value="1" <%- data.is_unlimited %> />' +
-                    '<label for="downloadable_link_<%- data.id %>_is_unlimited" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Unlimited') ?></span></label>' +
+                    '<label for="downloadable_link_<%- data.id %>_is_unlimited" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('Unlimited'))) ?></span></label>' +
                 '</div>' +
             '</td>'+
             '<td class="col-action">'+
-                '<button id="downloadable_link_<%- data.id %>_delete_button" type="button" class="action-delete" title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Delete')) ?>"><span><?= /* @escapeNotVerified */ __('Delete') ?></span></button>'+
+                '<button id="downloadable_link_<%- data.id %>_delete_button" type="button" class="action-delete" title="<?= $block->escapeJs($block->escapeHtmlAttr(__('Delete'))) ?>"><span><?= $block->escapeJs($block->escapeHtml(__('Delete'))) ?></span></button>'+
             '</td>'+
         '</tr>';
 
@@ -233,7 +230,7 @@ require([
                     data.link_id  = 0;
                     data.link_type = 'file';
                     data.sample_type = 'none';
-                    data.number_of_downloads = '<?= /* @escapeNotVerified */ $block->getConfigMaxDownloads() ?>';
+                    data.number_of_downloads = '<?= $block->escapeJs($block->getConfigMaxDownloads()) ?>';
                     data.sort_order = this.itemCount + 1;
                 }
 
@@ -324,7 +321,7 @@ require([
                     'downloadable[link]['+data.id+'][sample]',
                     data.sample_file_save,
                     'downloadable_link_'+data.id+'_sample_file',
-                    <?= /* @escapeNotVerified */ $block->getConfigJson('link_samples') ?>
+                    <?= /* @noEscape */ $block->getConfigJson('link_samples') ?>
                 );
                 // link file
                 new Downloadable.FileUploader(
@@ -334,7 +331,7 @@ require([
                     'downloadable[link]['+data.id+']',
                     data.file_save,
                     'downloadable_link_'+data.id+'_file',
-                    <?= /* @escapeNotVerified */ $block->getConfigJson() ?>
+                    <?= /* @noEscape */ $block->getConfigJson() ?>
                 );
 
                 linkFile = $('downloadable_link_'+data.id+'_file_type');
@@ -478,8 +475,8 @@ require([
             Event.observe('add_link_item', 'click', linkItems.add.bind(linkItems));
         }
 
-        <?php foreach ($block->getLinkData() as $item): ?>
-            linkItems.add(<?= /* @escapeNotVerified */ $item->toJson() ?>);
+        <?php foreach ($block->getLinkData() as $item) : ?>
+            linkItems.add(<?= /* @noEscape */ $item->toJson() ?>);
         <?php endforeach; ?>
 
     });
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
index 3645a184df216..8303c195f6e34 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /**
@@ -16,13 +13,13 @@ $_product = $block->getProduct();
 $block->getConfigJson();
 ?>
 <fieldset class="admin__fieldset downloadable-form" data-ui-id="downloadable-samples">
-    <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Samples') ?></span></legend><br>
-    <p class="note"><?= /* @escapeNotVerified */ __('Add product preview files here.') ?></p>
-    <div class="admin__field"<?= !$block->isSingleStoreMode() ? ' data-config-scope="' . __('[STORE VIEW]') . '"' : '' ?>>
-        <label class="admin__field-label" for="downloadable_samples_title"><span><?= /* @noEscape */ __('Title') ?></span></label>
+    <legend class="admin__legend"><span><?= $block->escapeHtml(__('Samples')) ?></span></legend><br>
+    <p class="note"><?= $block->escapeHtml(__('Add product preview files here.')) ?></p>
+    <div class="admin__field"<?= $block->escapeHtml(!$block->isSingleStoreMode() ? ' data-config-scope="' . __('[STORE VIEW]') . '"' : '') ?>>
+        <label class="admin__field-label" for="downloadable_samples_title"><span><?= $block->escapeHtml(__('Title')) ?></span></label>
         <div class="admin__field-control">
             <input type="text" class="admin__control-text" id="downloadable_samples_title" name="product[samples_title]" value="<?= $block->escapeHtml($block->getSamplesTitle()) ?>" <?= /* @noEscape */ ($_product->getStoreId() && $block->getUsedDefault()) ? 'disabled="disabled"' : '' ?>>
-            <?php if ($_product->getStoreId()): ?>
+            <?php if ($_product->getStoreId()) : ?>
                 <div class="admin__field admin__field-option">
                     <input id="sample_title_default" class="admin__control-checkbox" type="checkbox" name="use_default[]" value="samples_title" onclick="toggleValueElements(this, this.parentNode.parentNode)" <?= /* @noEscape */ $block->getUsedDefault() ? 'checked="checked"' : '' ?> />
                     <label class="admin__field-label" for="sample_title_default"><span>Use Default Value</span></label>
@@ -36,9 +33,9 @@ $block->getConfigJson();
                 <table class="admin__control-table">
                     <thead>
                         <tr>
-                            <th class="col-sort"><span><?= /* @noEscape */ __('Sort Order') ?></span></th>
-                            <th class="_required col-title"><span><?= /* @noEscape */ __('Title') ?></span></th>
-                            <th class="col-file"><span><?= /* @noEscape */ __('Attach File or Enter Link') ?></span></th>
+                            <th class="col-sort"><span><?= $block->escapeHtml(__('Sort Order')) ?></span></th>
+                            <th class="_required col-title"><span><?= $block->escapeHtml(__('Title')) ?></span></th>
+                            <th class="col-file"><span><?= $block->escapeHtml(__('Attach File or Enter Link')) ?></span></th>
                             <th class="col-actions">&nbsp;</th>
                         </tr>
                     </thead>
@@ -70,30 +67,30 @@ require([
         var sampleTemplate = '<tr>'+
             '<td class="col-sort" data-role="draggable-handle">' +
                 '<input data-container="link-order" type="hidden" name="downloadable[sample][<%- data.id %>][sort_order]" value="<%- data.sort_order %>" class="sort" />' +
-                '<span class="draggable-handle" title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Sort Variations')) ?>"></span>' +
+                '<span class="draggable-handle" title="<?= $block->escapeJs($block->escapeHtmlAttr(__('Sort Variations'))) ?>"></span>' +
             '</td>'+
             '<td class="col-title">'+
                 '<input type="hidden" class="__delete__" name="downloadable[sample][<%- data.id %>][is_delete]" value="" />'+
                 '<input type="hidden" name="downloadable[sample][<%- data.id %>][sample_id]" value="<%- data.sample_id %>" />'+
                 '<input type="text" class="required-entry input-text admin__control-text" name="downloadable[sample][<%- data.id %>][title]" value="<%- data.title %>" />'+
-                <?php if($_product->getStoreId()): ?>
+                <?php if ($_product->getStoreId()) : ?>
                     '<div class="admin__field admin__field-option">'+
                         '<input type="checkbox" id="downloadable_sample_<%- data.id %>_title" name="downloadable[sample][<%- data.id %>][use_default_title]" value="1" class="admin__control-checkbox" />'+
-                        '<label for="downloadable_link_<%- data.id %>_price" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Use Default Value') ?></span></label>'+
+                        '<label for="downloadable_link_<%- data.id %>_price" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('Use Default Value'))) ?></span></label>'+
                     '</div>' +
                 <?php endif; ?>
             '</td>'+
             '<td class="col-file">'+
                 '<div class="admin__field admin__field-option">'+
                     '<input type="radio" class="admin__control-radio validate-one-required-by-name" id="downloadable_sample_<%- data.id %>_file_type" name="downloadable[sample][<%- data.id %>][type]" value="file"<%- data.file_checked %> />' +
-                    '<label for="downloadable_sample_<%- data.id %>_file_type" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('File') ?>:</span></label>'+
+                    '<label for="downloadable_sample_<%- data.id %>_file_type" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('File'))) ?>:</span></label>'+
                     '<input type="hidden" class="validate-downloadable-file" id="downloadable_sample_<%- data.id %>_file_save" name="downloadable[sample][<%- data.id %>][file]" value="<%- data.file_save %>" />'+
                     '<div id="downloadable_sample_<%- data.id %>_file" class="admin__field-uploader">'+
                         '<div id="downloadable_sample_<%- data.id %>_file-old" class="file-row-info"></div>'+
                         '<div id="downloadable_sample_<%- data.id %>_file-new" class="file-row-info new-file"></div>'+
                         '<div class="fileinput-button">'+
-                            '<span><?= /* @noEscape */ __('Browse Files...') ?></span>' +
-                            '<input id="downloadable_sample_<%- data.id %>_file" type="file" name="<?= /* @noEscape */ $block->getConfig()->getFileField() ?>" data-url="<?= $block->escapeHtml($block->getConfig()->getUrl()) ?>">' +
+                            '<span><?= $block->escapeJs($block->escapeHtml(__('Browse Files...'))) ?></span>' +
+                            '<input id="downloadable_sample_<%- data.id %>_file" type="file" name="<?= /* @noEscape */ $block->getConfig()->getFileField() ?>" data-url="<?= /* @noEscape */ $block->getConfig()->getUrl() ?>">' +
                             '<script>' +
                             '/*<![CDATA[*/' +
                                 'sampleUploader("#downloadable_sample_<%- data.id %>_file"); ' +
@@ -104,15 +101,15 @@ require([
                 '</div>'+
                 '<div class="admin__field admin__field-option admin__field-file-url">'+
                     '<input type="radio" class="admin__control-radio validate-one-required-by-name" id="downloadable_sample_<%- data.id %>_url_type" name="downloadable[sample][<%- data.id %>][type]" value="url"<%- data.url_checked %> />' +
-                    '<label for="downloadable_sample_<%- data.id %>_url_type" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('URL') ?></span></label>' +
-                    '<input type="text" class="validate-downloadable-url validate-url admin__control-text" name="downloadable[sample][<%- data.id %>][sample_url]" value="<%- data.sample_url %>" placeholder="<?= /* @escapeNotVerified */ __('URL') ?>" />'+
+                    '<label for="downloadable_sample_<%- data.id %>_url_type" class="admin__field-label"><span><?= $block->escapeJs($block->escapeHtml(__('URL'))) ?></span></label>' +
+                    '<input type="text" class="validate-downloadable-url validate-url admin__control-text" name="downloadable[sample][<%- data.id %>][sample_url]" value="<%- data.sample_url %>" placeholder="<?=  $block->escapeJs($block->escapeHtmlAttr(__('URL'))) ?>" />'+
                 '</div>'+
                 '<div>'+
                     '<span id="downloadable_sample_<%- data.id %>_container"></span>'+
                 '</div>'+
             '</td>'+
             '<td class="col-actions">'+
-                '<button type="button" class="action-delete" title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Delete')) ?>"><span><?= /* @escapeNotVerified */ __('Delete') ?></span></button>'+
+                '<button type="button" class="action-delete" title="<?=  $block->escapeJs($block->escapeHtmlAttr(__('Delete'))) ?>"><span><?= $block->escapeJs($block->escapeHtml(__('Delete'))) ?></span></button>'+
             '</td>'+
         '</tr>';
         sampleItems = {
@@ -288,7 +285,7 @@ require([
             Event.observe('add_sample_item', 'click', sampleItems.add.bind(sampleItems));
         }
 
-        <?php foreach ($block->getSampleData() as $item): ?>
+        <?php foreach ($block->getSampleData() as $item) : ?>
             sampleItems.add(<?= /* @noEscape */ $item->toJson() ?>);
         <?php endforeach; ?>
 
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
index 7438275bf5874..97bfc05b64f05 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
@@ -3,44 +3,41 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 
-<?php if ($_item = $block->getItem()): ?>
-    <div class="product-title"><?= /* @escapeNotVerified */ $_item->getName() ?></div>
-    <div><strong><?= /* @escapeNotVerified */ __('SKU') ?>:</strong> <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))) ?></div>
-    <?php if ($block->getOrderOptions()): ?>
+<?php if ($_item = $block->getItem()) : ?>
+    <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
+    <div><strong><?= $block->escapeHtml(__('SKU')) ?>:</strong> <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($block->getSku())) ?></div>
+    <?php if ($block->getOrderOptions()) : ?>
         <dl class="item-options">
-        <?php foreach ($block->getOrderOptions() as $_option): ?>
+        <?php foreach ($block->getOrderOptions() as $_option) : ?>
             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
             <dd>
-            <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
-                <?= /* @escapeNotVerified */ $_option['value'] ?>
-            <?php else: ?>
-                <?= $block->truncateString($_option['value'], 55, '', $_remainder) ?>
-                <?php if ($_remainder):?>
-                    ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
+            <?php if (isset($_option['custom_view']) && $_option['custom_view']) : ?>
+                <?= $block->escapeHtml($_option['value']) ?>
+            <?php else : ?>
+                <?= $block->escapeHtml($block->truncateString($_option['value'], 55, '', $_remainder)) ?>
+                <?php if ($_remainder) :?>
+                    ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
                     <script>
-require(['prototype'], function(){
-
-    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
-    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
-    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
-
-});
-</script>
+                        require(['prototype'], function(){
+                            <?php $escapedId = $block->escapeJs($_id) ?>
+                            $('<?= /* @noEscape */ $escapedId ?>').hide();
+                            $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
+                            $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
+                        });
+                    </script>
                 <?php endif;?>
             <?php endif;?>
             </dd>
         <?php endforeach; ?>
         </dl>
     <?php endif; ?>
-    <?php if ($block->getLinks()): ?>
+    <?php if ($block->getLinks()) : ?>
         <dl class="item-options">
             <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
-            <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
+            <?php foreach ($block->getLinks()->getPurchasedItems() as $_link) : ?>
                 <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?></dd>
             <?php endforeach; ?>
         </dl>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
index b00c4b4b45392..9a45066f64d15 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
@@ -3,45 +3,42 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 
-<?php if ($_item = $block->getItem()): ?>
-    <div class="product-title"><?= /* @escapeNotVerified */ $_item->getName() ?></div>
-    <div><strong><?= /* @escapeNotVerified */ __('SKU') ?>:</strong> <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))) ?></div>
-    <?php if ($block->getOrderOptions()): ?>
+<?php if ($_item = $block->getItem()) : ?>
+    <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
+    <div><strong><?= $block->escapeHtml(__('SKU')) ?>:</strong> <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($block->getSku())) ?></div>
+    <?php if ($block->getOrderOptions()) : ?>
         <dl class="item-options">
-        <?php foreach ($block->getOrderOptions() as $_option): ?>
+        <?php foreach ($block->getOrderOptions() as $_option) : ?>
             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
             <dd>
-            <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
-                <?= /* @escapeNotVerified */ $_option['value'] ?>
-            <?php else: ?>
-                <?= $block->truncateString($_option['value'], 55, '', $_remainder) ?>
-                <?php if ($_remainder):?>
-                    ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
+            <?php if (isset($_option['custom_view']) && $_option['custom_view']) : ?>
+                <?= $block->escapeHtml($_option['value']) ?>
+            <?php else : ?>
+                <?= $block->escapeHtml($block->truncateString($_option['value'], 55, '', $_remainder)) ?>
+                <?php if ($_remainder) :?>
+                    ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
                     <script>
-require(['prototype'], function(){
-
-    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
-    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
-    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
-
-});
-</script>
+                        require(['prototype'], function(){
+                            <?php $escapedId = $block->escapeJs($_id) ?>
+                            $('<?= /* @noEscape */ $escapedId ?>').hide();
+                            $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
+                            $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
+                        });
+                    </script>
                 <?php endif;?>
             <?php endif;?>
             </dd>
         <?php endforeach; ?>
         </dl>
     <?php endif; ?>
-    <?php if ($block->getLinks()): ?>
+    <?php if ($block->getLinks()) : ?>
         <dl class="item-options">
             <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
-            <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
-                <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?> (<?= /* @escapeNotVerified */ $_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('Unlimited') ?>)</dd>
+            <?php foreach ($block->getLinks()->getPurchasedItems() as $_link) : ?>
+                <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?> (<?= $block->escapeHtml($_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('Unlimited')) ?>)</dd>
             <?php endforeach; ?>
         </dl>
     <?php endif; ?>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
index 9e6a73263bf25..b5fe7b3385630 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
@@ -3,48 +3,45 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 
-<?php if ($_item = $block->getItem()): ?>
-    <div class="product-title"><?= /* @escapeNotVerified */ $_item->getName() ?></div>
+<?php if ($_item = $block->getItem()) : ?>
+    <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
     <div class="product-sku-block">
-        <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
-        <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))) ?>
+        <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
+        <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($block->getSku())) ?>
     </div>
-    <?php if ($block->getOrderOptions()): ?>
+    <?php if ($block->getOrderOptions()) : ?>
         <dl class="item-options">
-        <?php foreach ($block->getOrderOptions() as $_option): ?>
+        <?php foreach ($block->getOrderOptions() as $_option) : ?>
             <dt><?= $block->escapeHtml($_option['label']) ?>:</dt>
             <dd>
-            <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
-                <?= /* @escapeNotVerified */ $_option['value'] ?>
-            <?php else: ?>
-                <?= $block->truncateString($_option['value'], 55, '', $_remainder) ?>
-                <?php if ($_remainder):?>
-                    ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
+            <?php if (isset($_option['custom_view']) && $_option['custom_view']) : ?>
+                <?= $block->escapeHtml($_option['value']) ?>
+            <?php else : ?>
+                <?= $block->escapeHtml($block->truncateString($_option['value'], 55, '', $_remainder)) ?>
+                <?php if ($_remainder) :?>
+                    ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
                     <script>
-require(['prototype'], function(){
-
-    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
-    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
-    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
-
-});
-</script>
+                        require(['prototype'], function(){
+                            <?php $escapedId = $block->escapeJs($_id) ?>
+                            $('<?= /* @noEscape */ $escapedId ?>').hide();
+                            $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
+                            $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
+                        });
+                    </script>
                 <?php endif;?>
             <?php endif;?>
             </dd>
         <?php endforeach; ?>
         </dl>
     <?php endif; ?>
-    <?php if ($block->getLinks()): ?>
+    <?php if ($block->getLinks()) : ?>
         <dl class="item-options">
             <dt><?= $block->escapeHtml($block->getLinksTitle()) ?>:</dt>
-            <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
-                <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?> (<?= /* @escapeNotVerified */ $_link->getNumberOfDownloadsUsed() . ' / ' . ($_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('U')) ?>)</dd>
+            <?php foreach ($block->getLinks()->getPurchasedItems() as $_link) : ?>
+                <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?> (<?= $block->escapeHtml($_link->getNumberOfDownloadsUsed() . ' / ' . ($_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('U'))) ?>)</dd>
             <?php endforeach; ?>
         </dl>
     <?php endif; ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
index 5548279a1118b..ad8b19cc1b843 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
@@ -3,61 +3,62 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /* @var $block \Magento\Downloadable\Block\Catalog\Product\Links */ ?>
 <?php $_linksPurchasedSeparately = $block->getLinksPurchasedSeparately(); ?>
-<?php if ($block->getProduct()->isSaleable() && $block->hasLinks()):?>
+<?php if ($block->getProduct()->isSaleable() && $block->hasLinks()) :?>
     <?php $_links = $block->getLinks(); ?>
     <?php $_linksLength = 0; ?>
     <?php $_isRequired = $block->getLinkSelectionRequired(); ?>
     <legend class="legend links-title"><span><?= $block->escapeHtml($block->getLinksTitle()) ?></span></legend><br>
-    <div class="field downloads<?php if ($_isRequired) echo ' required' ?><?php if (!$_linksPurchasedSeparately) echo ' downloads-no-separately' ?>">
+    <div class="field downloads<?php if ($_isRequired) { echo ' required'; } ?><?php if (!$_linksPurchasedSeparately) { echo ' downloads-no-separately'; } ?>">
         <label class="label"><span><?= $block->escapeHtml($block->getLinksTitle()) ?></span></label>
         <div class="control" id="downloadable-links-list"
              data-mage-init='{"downloadable":{
                  "linkElement":"input:checkbox[value]",
                  "allElements":"#links_all",
-                 "config":<?= /* @escapeNotVerified */ $block->getJsonConfig() ?>}
+                 "config":<?= /* @noEscape */ $block->getJsonConfig() ?>}
              }'
              data-container-for="downloadable-links">
-            <?php foreach ($_links as $_link): ?>
+            <?php foreach ($_links as $_link) : ?>
                 <?php $_linksLength++;?>
                 <div class="field choice" data-role="link">
-                    <?php if ($_linksPurchasedSeparately): ?>
+                    <?php if ($_linksPurchasedSeparately) : ?>
                         <input type="checkbox"
-                               <?php if ($_isRequired): ?>data-validate="{'validate-one-checkbox-required-by-name':'downloadable-links-list'}" <?php endif; ?>
+                                <?php if ($_isRequired) : ?>
+                                   data-validate="{'validate-one-checkbox-required-by-name':'downloadable-links-list'}"
+                                <?php endif; ?>
                                name="links[]"
-                               id="links_<?= /* @escapeNotVerified */ $_link->getId() ?>"
-                               value="<?= /* @escapeNotVerified */ $_link->getId() ?>" <?= /* @escapeNotVerified */ $block->getLinkCheckedValue($_link) ?> />
+                               id="links_<?= $block->escapeHtmlAttr($_link->getId()) ?>"
+                               value="<?= $block->escapeHtmlAttr($_link->getId()) ?>"
+                                <?= /* @noEscape */ $block->getLinkCheckedValue($_link) ?> />
                     <?php endif; ?>
-                    <label class="label" for="links_<?= /* @escapeNotVerified */ $_link->getId() ?>">
+                    <label class="label" for="links_<?= $block->escapeHtmlAttr($_link->getId()) ?>">
                         <span><?= $block->escapeHtml($_link->getTitle()) ?></span>
-                        <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
+                        <?php if ($_link->getSampleFile() || $_link->getSampleUrl()) : ?>
                             <a class="sample link"
-                               href="<?= $block->escapeUrl($block->getLinkSampleUrl($_link)) ?>" <?= $block->getIsOpenInNewWindow() ? 'target="_blank"' : '' ?>>
-                                <?= /* @escapeNotVerified */ __('sample') ?>
+                               href="<?= $block->escapeUrl($block->getLinkSampleUrl($_link)) ?>"
+                                <?= $block->getIsOpenInNewWindow() ? 'target="_blank"' : '' ?>>
+                                <?= $block->escapeHtml(__('sample')) ?>
                             </a>
                         <?php endif; ?>
-                        <?php if ($_linksPurchasedSeparately): ?>
-                            <?= /* @escapeNotVerified */ $block->getLinkPrice($_link) ?>
+                        <?php if ($_linksPurchasedSeparately) : ?>
+                            <?= /* @noEscape */ $block->getLinkPrice($_link) ?>
                         <?php endif; ?>
                     </label>
                 </div>
             <?php endforeach; ?>
-            <?php if ($_linksPurchasedSeparately && $_linksLength > 1): ?>
+            <?php if ($_linksPurchasedSeparately && $_linksLength > 1) : ?>
                 <div class="field choice downloads-all">
                     <input type="checkbox"
-                           data-notchecked="<?= /* @escapeNotVerified */ __('Select all') ?>"
-                           data-checked="<?= /* @escapeNotVerified */ __('Unselect all') ?>"
+                           data-notchecked="<?= $block->escapeHtmlAttr(__('Select all')) ?>"
+                           data-checked="<?= $block->escapeHtmlAttr(__('Unselect all')) ?>"
                            id="links_all" />
-                    <label class="label" for="links_all"><span><?= /* @escapeNotVerified */ __('Select all') ?></span></label>
+                    <label class="label" for="links_all"><span><?= $block->escapeHtml(__('Select all')) ?></span></label>
                 </div>
             <?php endif; ?>
         </div>
-        <?php if ($_isRequired): ?>
+        <?php if ($_isRequired) : ?>
             <span id="links-advice-container"></span>
         <?php endif;?>
     </div>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml
index c6b2281196e69..3eea3803a0513 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * Downloadable product links
  *
@@ -13,11 +11,11 @@
  */
 ?>
 
-<?php if ($block->hasSamples()): ?>
+<?php if ($block->hasSamples()) : ?>
     <dl class="items samples">
         <dt class="item-title samples-item-title"><?= $block->escapeHtml($block->getSamplesTitle()) ?></dt>
         <?php $_samples = $block->getSamples() ?>
-        <?php foreach ($_samples as $_sample): ?>
+        <?php foreach ($_samples as $_sample) : ?>
             <dd class="item samples-item">
                 <a href="<?= $block->escapeHtml($block->getSampleUrl($_sample)) ?>" <?= $block->getIsOpenInNewWindow() ? 'onclick="this.target=\'_blank\'"' : '' ?>
                    class="item-link samples-item-link">
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml
index d4afdf5f81fe2..ba6d9e0abec71 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * Downloadable product type
  *
@@ -14,13 +12,13 @@
 ?>
 <?php $_product = $block->getProduct() ?>
 
-<?php if ($_product->getIsSalable()): ?>
-    <div class="stock available" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
-        <span><?= /* @escapeNotVerified */ __('In stock') ?></span>
+<?php if ($_product->getIsSalable()) : ?>
+    <div class="stock available" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
+        <span><?= $block->escapeHtml(__('In stock')) ?></span>
     </div>
-<?php else: ?>
-    <div class="stock unavailable" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
-        <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
+<?php else : ?>
+    <div class="stock unavailable" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
+        <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
     </div>
 <?php endif; ?>
 <?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/checkout/success.phtml b/app/code/Magento/Downloadable/view/frontend/templates/checkout/success.phtml
index a32d854d3b47f..f036fb9837345 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/checkout/success.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/checkout/success.phtml
@@ -3,10 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<?php if ($block->getOrderHasDownloadable()): ?>
-    <?= /* @escapeNotVerified */ __('Go to <a href="%1">My Downloadable Products</a>', $block->getDownloadableProductsUrl()) ?>
-<?php endif; ?>
+<?php if ($block->getOrderHasDownloadable()) : ?>
+    <?= /* @noEscape */ __('Go to <a href="%1">My Downloadable Products</a>', $block->escapeUrl($block->getDownloadableProductsUrl())) ?>
+<?php endif;
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml b/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml
index 08cadb2d78f11..eca72b3500924 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /**
@@ -13,55 +10,55 @@
  */
 ?>
 <?php $_items = $block->getItems(); ?>
-<?php if (count($_items)): ?>
+<?php if (count($_items)) : ?>
     <div class="table-wrapper downloadable-products">
         <table id="my-downloadable-products-table" class="data table table-downloadable-products">
-            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Downloadable Products') ?></caption>
+            <caption class="table-caption"><?= $block->escapeHtml(__('Downloadable Products')) ?></caption>
             <thead>
                 <tr>
-                    <th scope="col" class="col id"><?= /* @escapeNotVerified */ __('Order #') ?></th>
-                    <th scope="col" class="col date"><?= /* @escapeNotVerified */ __('Date') ?></th>
-                    <th scope="col" class="col title"><?= /* @escapeNotVerified */ __('Title') ?></th>
-                    <th scope="col" class="col status"><?= /* @escapeNotVerified */ __('Status') ?></th>
-                    <th scope="col" class="col remaining"><?= /* @escapeNotVerified */ __('Remaining Downloads') ?></th>
+                    <th scope="col" class="col id"><?= $block->escapeHtml(__('Order #')) ?></th>
+                    <th scope="col" class="col date"><?= $block->escapeHtml(__('Date')) ?></th>
+                    <th scope="col" class="col title"><?= $block->escapeHtml(__('Title')) ?></th>
+                    <th scope="col" class="col status"><?= $block->escapeHtml(__('Status')) ?></th>
+                    <th scope="col" class="col remaining"><?= $block->escapeHtml(__('Remaining Downloads')) ?></th>
                 </tr>
             </thead>
             <tbody>
-            <?php foreach ($_items as $_item): ?>
+            <?php foreach ($_items as $_item) : ?>
                 <tr>
-                    <td data-th="<?= $block->escapeHtml(__('Order #')) ?>" class="col id">
-                        <a href="<?= /* @escapeNotVerified */ $block->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>"
+                    <td data-th="<?= $block->escapeHtmlAttr(__('Order #')) ?>" class="col id">
+                        <a href="<?= $block->escapeUrl($block->getOrderViewUrl($_item->getPurchased()->getOrderId())) ?>"
                             title="<?= $block->escapeHtml(__('View Order')) ?>">
-                            <?= /* @escapeNotVerified */ $_item->getPurchased()->getOrderIncrementId() ?>
+                            <?= $block->escapeHtml($_item->getPurchased()->getOrderIncrementId()) ?>
                         </a>
                     </td>
-                    <td data-th="<?= $block->escapeHtml(__('Date')) ?>" class="col date"><?= /* @escapeNotVerified */ $block->formatDate($_item->getPurchased()->getCreatedAt()) ?></td>
-                    <td data-th="<?= $block->escapeHtml(__('Title')) ?>" class="col title">
+                    <td data-th="<?= $block->escapeHtmlAttr(__('Date')) ?>" class="col date"><?= $block->escapeHtml($block->formatDate($_item->getPurchased()->getCreatedAt())) ?></td>
+                    <td data-th="<?= $block->escapeHtmlAttr(__('Title')) ?>" class="col title">
                         <strong class="product-name"><?= $block->escapeHtml($_item->getPurchased()->getProductName()) ?></strong>
-                        <?php if ($_item->getStatus() == \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_AVAILABLE): ?>
-                        <a href="<?= /* @escapeNotVerified */ $block->getDownloadUrl($_item) ?>" title="<?= $block->escapeHtml(__('Start Download')) ?>" class="action download" <?= $block->getIsOpenInNewWindow() ? 'onclick="this.target=\'_blank\'"' : '' ?>><?= $block->escapeHtml($_item->getLinkTitle()) ?></a>
+                        <?php if ($_item->getStatus() == \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_AVAILABLE) : ?>
+                        <a href="<?= $block->escapeUrl($block->getDownloadUrl($_item)) ?>" title="<?= $block->escapeHtmlAttr(__('Start Download')) ?>" class="action download" <?= /* @noEscape */ $block->getIsOpenInNewWindow() ? 'onclick="this.target=\'_blank\'"' : '' ?>><?= $block->escapeHtml($_item->getLinkTitle()) ?></a>
                         <?php endif; ?>
                     </td>
-                    <td data-th="<?= $block->escapeHtml(__('Status')) ?>" class="col status"><?= /* @escapeNotVerified */ __(ucfirst($_item->getStatus())) ?></td>
-                    <td data-th="<?= $block->escapeHtml(__('Remaining Downloads')) ?>" class="col remaining"><?= /* @escapeNotVerified */ $block->getRemainingDownloads($_item) ?></td>
+                    <td data-th="<?= $block->escapeHtmlAttr(__('Status')) ?>" class="col status"><?= $block->escapeHtml(__(ucfirst($_item->getStatus()))) ?></td>
+                    <td data-th="<?= $block->escapeHtmlAttr(__('Remaining Downloads')) ?>" class="col remaining"><?= $block->escapeHtml($block->getRemainingDownloads($_item)) ?></td>
                 </tr>
             <?php endforeach; ?>
             </tbody>
         </table>
     </div>
-    <?php if ($block->getChildHtml('pager')): ?>
+    <?php if ($block->getChildHtml('pager')) : ?>
         <div class="toolbar downloadable-products-toolbar bottom">
             <?= $block->getChildHtml('pager') ?>
         </div>
     <?php endif; ?>
-<?php else: ?>
-    <div class="message info empty"><span><?= /* @escapeNotVerified */ __('You have not purchased any downloadable products yet.') ?></span></div>
+<?php else : ?>
+    <div class="message info empty"><span><?= $block->escapeHtml(__('You have not purchased any downloadable products yet.')) ?></span></div>
 <?php endif; ?>
 
 <div class="actions-toolbar">
     <div class="secondary">
         <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
-            <span><?= /* @escapeNotVerified */ __('Back') ?></span>
+            <span><?= $block->escapeHtml(__('Back')) ?></span>
         </a>
     </div>
 </div>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml
index 4882074b60074..25d2302e94b1c 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block \Magento\Downloadable\Block\Sales\Order\Email\Items\Downloadable */ ?>
 <?php $_item = $block->getItem() ?>
@@ -13,19 +10,19 @@
 <tr>
     <td class="item-info has-extra">
         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-        <?php if ($block->getItemOptions()): ?>
+        <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+        <?php if ($block->getItemOptions()) : ?>
         <dl>
-            <?php foreach ($block->getItemOptions() as $option): ?>
-            <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
-            <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
+            <?php foreach ($block->getItemOptions() as $option) : ?>
+            <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
+            <dd><?= $block->escapeHtml($option['value']) ?></dd>
             <?php endforeach; ?>
         </dl>
         <?php endif; ?>
-        <?php if ($links = $block->getLinks()->getPurchasedItems()): ?>
+        <?php if ($links = $block->getLinks()->getPurchasedItems()) : ?>
         <dl>
-            <dt><strong><em><?= /* @escapeNotVerified */  $block->getLinksTitle() ?></em></strong></dt>
-            <?php foreach ($links as $link): ?>
+            <dt><strong><em><?= $block->escapeHtml($block->getLinksTitle()) ?></em></strong></dt>
+            <?php foreach ($links as $link) : ?>
                 <dd>
                     <?= $block->escapeHtml($link->getLinkTitle()) ?>
                 </dd>
@@ -34,8 +31,8 @@
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
+    <td class="item-qty"><?= (float)$_item->getQty() * 1 ?></td>
     <td class="item-price">
-        <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
+        <?= /* @noEscape */ $block->getItemPrice($_item) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml
index 1be4ac56bad3e..88f3b2cc6f9c7 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block \Magento\Downloadable\Block\Sales\Order\Email\Items\Downloadable */ ?>
 <?php $_item = $block->getItem() ?>
@@ -13,30 +10,30 @@
 <tr>
     <td class="item-info has-extra">
         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-        <?php if ($block->getItemOptions()): ?>
+        <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+        <?php if ($block->getItemOptions()) : ?>
         <dl>
-            <?php foreach ($block->getItemOptions() as $option): ?>
-            <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
-            <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
+            <?php foreach ($block->getItemOptions() as $option) : ?>
+            <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
+            <dd><?= $block->escapeHtml($option['value']) ?></dd>
             <?php endforeach; ?>
         </dl>
         <?php endif; ?>
-        <?php if ($links = $block->getLinks()->getPurchasedItems()): ?>
+        <?php if ($links = $block->getLinks()->getPurchasedItems()) : ?>
         <dl>
-            <dt><strong><em><?= /* @escapeNotVerified */  $block->getLinksTitle() ?></em></strong></dt>
-            <?php foreach ($links as $link): ?>
+            <dt><strong><em><?= $block->escapeHtml($block->getLinksTitle()) ?></em></strong></dt>
+            <?php foreach ($links as $link) : ?>
                 <dd>
                     <?= $block->escapeHtml($link->getLinkTitle()) ?>&nbsp;
-                    (<a href="<?= /* @escapeNotVerified */  $block->getPurchasedLinkUrl($link) ?>"><?= /* @escapeNotVerified */  __('download') ?></a>)
+                    (<a href="<?= $block->escapeUrl($block->getPurchasedLinkUrl($link)) ?>"><?= $block->escapeHtml(__('download')) ?></a>)
                 </dd>
             <?php endforeach; ?>
         </dl>
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
+    <td class="item-qty"><?= (float)$_item->getQty() * 1 ?></td>
     <td class="item-price">
-        <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
+        <?= /* @noEscape */ $block->getItemPrice($_item) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml
index 21b4ebc598917..8dc552933fd3f 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php /** @var $block \Magento\Downloadable\Block\Sales\Order\Email\Items\Order\Downloadable */ ?>
 <?php $_item = $block->getItem() ?>
@@ -13,43 +11,43 @@
 <tr>
     <td class="item-info has-extra">
         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-        <?php if ($block->getItemOptions()): ?>
+        <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+        <?php if ($block->getItemOptions()) : ?>
         <dl>
-            <?php foreach ($block->getItemOptions() as $option): ?>
-            <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
-            <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
+            <?php foreach ($block->getItemOptions() as $option) : ?>
+            <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
+            <dd><?= $block->escapeHtml($option['value']) ?></dd>
             <?php endforeach; ?>
         </dl>
         <?php endif; ?>
-        <?php if ($links = $block->getLinks()->getPurchasedItems()): ?>
+        <?php if ($links = $block->getLinks()->getPurchasedItems()) : ?>
         <dl>
-            <dt><strong><em><?= /* @escapeNotVerified */  $block->getLinksTitle() ?></em></strong></dt>
-            <?php foreach ($links as $link): ?>
+            <dt><strong><em><?= $block->escapeHtml($block->getLinksTitle()) ?></em></strong></dt>
+            <?php foreach ($links as $link) : ?>
                 <dd>
                     <?= $block->escapeHtml($link->getLinkTitle()) ?>&nbsp;
-                    (<a href="<?= /* @escapeNotVerified */  $block->getPurchasedLinkUrl($link) ?>"><?= /* @escapeNotVerified */  __('download') ?></a>)
+                    (<a href="<?= $block->escapeUrl($block->getPurchasedLinkUrl($link)) ?>"><?= $block->escapeHtml(__('download')) ?></a>)
                 </dd>
             <?php endforeach; ?>
         </dl>
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
-        <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_item->getGiftMessageId())): ?>
+        <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper(Magento\GiftMessage\Helper\Message::class)->getGiftMessage($_item->getGiftMessageId())) : ?>
             <table class="message-gift">
                 <tr>
                     <td>
-                        <h3><?= /* @escapeNotVerified */  __('Gift Message') ?></h3>
-                        <strong><?= /* @escapeNotVerified */  __('From:') ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-                        <br /><strong><?= /* @escapeNotVerified */  __('To:') ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-                        <br /><strong><?= /* @escapeNotVerified */  __('Message:') ?></strong>
+                        <h3><?= $block->escapeHtml(__('Gift Message')) ?></h3>
+                        <strong><?= $block->escapeHtml(__('From:')) ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
+                        <br /><strong><?= $block->escapeHtml(__('To:')) ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
+                        <br /><strong><?= $block->escapeHtml(__('Message:')) ?></strong>
                         <br /><?= $block->escapeHtml($_giftMessage->getMessage()) ?>
                     </td>
                 </tr>
             </table>
         <?php endif; ?>
     </td>
-    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQtyOrdered() * 1 ?></td>
+    <td class="item-qty"><?= (float)$_item->getQtyOrdered() * 1 ?></td>
     <td class="item-price">
-        <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
+        <?= /* @noEscape */ $block->getItemPrice($_item) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/js/components.phtml b/app/code/Magento/Downloadable/view/frontend/templates/js/components.phtml
index bad5acc209b5f..4ca5983081a6f 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/js/components.phtml
@@ -3,8 +3,5 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<?= $block->getChildHtml() ?>
+<?= $block->getChildHtml();
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
index 49422e4d2e483..491d83ac0d5f9 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
@@ -4,43 +4,41 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
 ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<tr class="border" id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
-    <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+<tr class="border" id="order-item-row-<?= $block->escapeHtmlAttr($_item->getId()) ?>">
+    <td class="col name" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>">
         <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
-        <?php if ($_options = $block->getItemOptions()): ?>
+        <?php if ($_options = $block->getItemOptions()) : ?>
             <dl class="item-options links">
                 <?php foreach ($_options as $_option) : ?>
                     <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                    <?php if (!$block->getPrintStatus()): ?>
+                    <?php if (!$block->getPrintStatus()) : ?>
                         <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                        <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                            <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
-                            <?php if (isset($_formatedOptionValue['full_view'])): ?>
+                        <dd<?php if (isset($_formatedOptionValue['full_view'])) : ?> class="tooltip wrapper"<?php endif; ?>>
+                            <?= /* @noEscape */ $_formatedOptionValue['value'] ?>
+                            <?php if (isset($_formatedOptionValue['full_view'])) : ?>
                                 <div class="tooltip content">
                                     <dl class="item options">
                                         <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                                        <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
+                                        <dd><?= /* @noEscape */ $_formatedOptionValue['full_view'] ?></dd>
                                     </dl>
                                 </div>
                             <?php endif; ?>
                         </dd>
-                    <?php else: ?>
+                    <?php else : ?>
                         <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
                     <?php endif; ?>
                 <?php endforeach; ?>
             </dl>
         <?php endif; ?>
         <?php /* downloadable */?>
-        <?php if ($links = $block->getLinks()): ?>
+        <?php if ($links = $block->getLinks()) : ?>
             <dl class="item-options links">
                 <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
-                <?php foreach ($links->getPurchasedItems() as $link): ?>
+                <?php foreach ($links->getPurchasedItems() as $link) : ?>
                     <dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
                 <?php endforeach; ?>
             </dl>
@@ -53,16 +51,16 @@
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
-    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
+    <td class="col sku" data-th="<?= $block->escapeHtmlAttr(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
+    <td class="col price" data-th="<?= $block->escapeHtmlAttr(__('Price')) ?>">
         <?= $block->getItemPriceHtml() ?>
     </td>
-    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
-    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
+    <td class="col qty" data-th="<?= $block->escapeHtmlAttr(__('Qty')) ?>"><?= (float)$_item->getQty() * 1 ?></td>
+    <td class="col subtotal" data-th="<?= $block->escapeHtmlAttr(__('Subtotal')) ?>">
         <?= $block->getItemRowTotalHtml() ?>
     </td>
-    <td class="col discount" data-th="<?= $block->escapeHtml(__('Discount Amount')) ?>"><?= /* @escapeNotVerified */ $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
-    <td class="col total" data-th="<?= $block->escapeHtml(__('Row Total')) ?>">
+    <td class="col discount" data-th="<?= $block->escapeHtmlAttr(__('Discount Amount')) ?>"><?= /* @noEscape */ $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
+    <td class="col total" data-th="<?= $block->escapeHtmlAttr(__('Row Total')) ?>">
         <?= $block->getItemRowTotalAfterDiscountHtml() ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
index 202f123a331b0..7ea2de6e46ba1 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
@@ -4,43 +4,41 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
 ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
-    <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+<tr id="order-item-row-<?= $block->escapeHtmlAttr($_item->getId()) ?>">
+    <td class="col name" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>">
         <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
-        <?php if ($_options = $block->getItemOptions()): ?>
+        <?php if ($_options = $block->getItemOptions()) : ?>
             <dl class="item-options links">
                 <?php foreach ($_options as $_option) : ?>
                     <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                    <?php if (!$block->getPrintStatus()): ?>
+                    <?php if (!$block->getPrintStatus()) : ?>
                         <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                        <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                            <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
-                            <?php if (isset($_formatedOptionValue['full_view'])): ?>
+                        <dd<?php if (isset($_formatedOptionValue['full_view'])) : ?> class="tooltip wrapper"<?php endif; ?>>
+                            <?= /* @noEscape */ $_formatedOptionValue['value'] ?>
+                            <?php if (isset($_formatedOptionValue['full_view'])) : ?>
                                 <div class="tooltip content">
                                     <dl class="item options">
                                         <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                                        <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
+                                        <dd><?= /* @noEscape */ $_formatedOptionValue['full_view'] ?></dd>
                                     </dl>
                                 </div>
                             <?php endif; ?>
                         </dd>
-                    <?php else: ?>
+                    <?php else : ?>
                         <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
                     <?php endif; ?>
                 <?php endforeach; ?>
             </dl>
         <?php endif; ?>
         <?php /* downloadable */ ?>
-        <?php if ($links = $block->getLinks()): ?>
+        <?php if ($links = $block->getLinks()) : ?>
             <dl class="item-options links">
                 <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
-                <?php foreach ($links->getPurchasedItems() as $link): ?>
+                <?php foreach ($links->getPurchasedItems() as $link) : ?>
                     <dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
                 <?php endforeach; ?>
             </dl>
@@ -52,14 +50,14 @@
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
-    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
+    <td class="col sku" data-th="<?= $block->escapeHtmlAttr(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
+    <td class="col price" data-th="<?= $block->escapeHtmlAttr(__('Price')) ?>">
         <?= $block->getItemPriceHtml() ?>
     </td>
-    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Invoiced')) ?>">
-        <span class="qty summary" data-label="<?= $block->escapeHtml(__('Qty Invoiced')) ?>"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></span>
+    <td class="col qty" data-th="<?= $block->escapeHtmlAttr(__('Qty Invoiced')) ?>">
+        <span class="qty summary" data-label="<?= $block->escapeHtmlAttr(__('Qty Invoiced')) ?>"><?= (float)$_item->getQty() * 1 ?></span>
     </td>
-    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
+    <td class="col subtotal" data-th="<?= $block->escapeHtmlAttr(__('Subtotal')) ?>">
         <?= $block->getItemRowTotalHtml() ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
index c10bb0db591b4..368f17449bb71 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
@@ -4,44 +4,42 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
 ?>
 <?php $_item = $block->getItem() ?>
-<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
-    <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+<tr id="order-item-row-<?= $block->escapeHtmlAttr($_item->getId()) ?>">
+    <td class="col name" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>">
         <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
-        <?php if ($_options = $block->getItemOptions()): ?>
+        <?php if ($_options = $block->getItemOptions()) : ?>
             <dl class="item-options links">
                 <?php foreach ($_options as $_option) : ?>
                     <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                    <?php if (!$block->getPrintStatus()): ?>
+                    <?php if (!$block->getPrintStatus()) : ?>
                         <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                        <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                            <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
-                            <?php if (isset($_formatedOptionValue['full_view'])): ?>
+                        <dd<?php if (isset($_formatedOptionValue['full_view'])) : ?> class="tooltip wrapper"<?php endif; ?>>
+                            <?= /* @noEscape */ $_formatedOptionValue['value'] ?>
+                            <?php if (isset($_formatedOptionValue['full_view'])) : ?>
                                 <div class="tooltip content">
                                     <dl class="item options">
                                         <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                                        <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
+                                        <dd><?= /* @noEscape */ $_formatedOptionValue['full_view'] ?></dd>
                                     </dl>
                                 </div>
                             <?php endif; ?>
                         </dd>
-                    <?php else: ?>
+                    <?php else : ?>
                         <dd>
-                            <?= nl2br($block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value']))) ?>
+                            <?= /* @noEscape */ nl2br((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?>
                         </dd>
                     <?php endif; ?>
                 <?php endforeach; ?>
             </dl>
         <?php endif; ?>
         <?php /* downloadable */ ?>
-        <?php if ($links = $block->getLinks()): ?>
+        <?php if ($links = $block->getLinks()) : ?>
             <dl class="item-options links">
                 <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
-                <?php foreach ($links->getPurchasedItems() as $link): ?>
+                <?php foreach ($links->getPurchasedItems() as $link) : ?>
                     <dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
                 <?php endforeach; ?>
             </dl>
@@ -53,39 +51,39 @@
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
-    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
+    <td class="col sku" data-th="<?= $block->escapeHtmlAttr(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
+    <td class="col price" data-th="<?= $block->escapeHtmlAttr(__('Price')) ?>">
         <?= $block->getItemPriceHtml() ?>
     </td>
-    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>">
+    <td class="col qty" data-th="<?= $block->escapeHtmlAttr(__('Qty')) ?>">
         <ul class="items-qty">
-            <?php if ($block->getItem()->getQtyOrdered() > 0): ?>
+            <?php if ($block->getItem()->getQtyOrdered() > 0) : ?>
                 <li class="item">
-                    <span class="title"><?= /* @escapeNotVerified */ __('Ordered') ?></span>
-                    <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyOrdered()*1 ?></span>
+                    <span class="title"><?= $block->escapeHtml(__('Ordered')) ?></span>
+                    <span class="content"><?= (float)$block->getItem()->getQtyOrdered() * 1 ?></span>
                 </li>
             <?php endif; ?>
-            <?php if ($block->getItem()->getQtyShipped() > 0): ?>
+            <?php if ($block->getItem()->getQtyShipped() > 0) : ?>
                 <li class="item">
-                    <span class="title"><?= /* @escapeNotVerified */ __('Shipped') ?></span>
-                    <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyShipped() * 1 ?></span>
+                    <span class="title"><?= $block->escapeHtml(__('Shipped')) ?></span>
+                    <span class="content"><?= (float)$block->getItem()->getQtyShipped() * 1 ?></span>
                 </li>
             <?php endif; ?>
-            <?php if ($block->getItem()->getQtyCanceled() > 0): ?>
+            <?php if ($block->getItem()->getQtyCanceled() > 0) : ?>
                 <li class="item">
-                    <span class="title"><?= /* @escapeNotVerified */ __('Canceled') ?></span>
-                    <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyCanceled()*1 ?></span>
+                    <span class="title"><?= $block->escapeHtml(__('Canceled')) ?></span>
+                    <span class="content"><?= (float)$block->getItem()->getQtyCanceled() * 1 ?></span>
                 </li>
             <?php endif; ?>
-            <?php if ($block->getItem()->getQtyRefunded() > 0): ?>
+            <?php if ($block->getItem()->getQtyRefunded() > 0) : ?>
                 <li class="item">
-                    <span class="title"><?= /* @escapeNotVerified */ __('Refunded') ?></span>
-                    <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyRefunded()*1 ?></span>
+                    <span class="title"><?= $block->escapeHtml(__('Refunded')) ?></span>
+                    <span class="content"><?= (float)$block->getItem()->getQtyRefunded() * 1 ?></span>
                 </li>
             <?php endif; ?>
         </ul>
     </td>
-    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
+    <td class="col subtotal" data-th="<?= $block->escapeHtmlAttr(__('Subtotal')) ?>">
         <?= $block->getItemRowTotalHtml() ?>
     </td>
 </tr>
diff --git a/app/code/Magento/DownloadableImportExport/composer.json b/app/code/Magento/DownloadableImportExport/composer.json
index 763eceaea8460..302953b1dcad6 100644
--- a/app/code/Magento/DownloadableImportExport/composer.json
+++ b/app/code/Magento/DownloadableImportExport/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-downloadable-import-export",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-catalog": "102.0.*",
         "magento/module-import-export": "100.2.*",
         "magento/module-catalog-import-export": "100.2.*",
@@ -12,7 +12,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php b/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
index 12023acc3b33b..f4bcdf7764d95 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
@@ -144,7 +144,8 @@ public function setRequestScope($scope)
     }
 
     /**
-     * Set scope visibility
+     * Set scope visibility.
+     *
      * Search value only in scope or search value in scope and global
      *
      * @param bool $flag
@@ -313,9 +314,13 @@ protected function _validateInputRule($value)
 
         if (!empty($validateRules['input_validation'])) {
             $label = $this->getAttribute()->getStoreLabel();
+            $allowWhiteSpace = false;
             switch ($validateRules['input_validation']) {
+                case 'alphanum-with-spaces':
+                    $allowWhiteSpace = true;
+                    // continue to alphanumeric validation
                 case 'alphanumeric':
-                    $validator = new \Zend_Validate_Alnum(true);
+                    $validator = new \Zend_Validate_Alnum($allowWhiteSpace);
                     $validator->setMessage(__('"%1" invalid type entered.', $label), \Zend_Validate_Alnum::INVALID);
                     $validator->setMessage(
                         __('"%1" contains non-alphabetic or non-numeric characters.', $label),
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/File.php b/app/code/Magento/Eav/Model/Attribute/Data/File.php
index 0364330517b88..1ee66915453c3 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/File.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/File.php
@@ -120,8 +120,7 @@ public function extractValue(RequestInterface $request)
     }
 
     /**
-     * Validate file by attribute validate rules
-     * Return array of errors
+     * Validate file by attribute validate rules and return array of errors.
      *
      * @param array $value
      * @return string[]
@@ -147,7 +146,7 @@ protected function _validateByRules($value)
             return $this->_fileValidator->getMessages();
         }
 
-        if (!is_uploaded_file($value['tmp_name'])) {
+        if (!empty($value['tmp_name']) && !file_exists($value['tmp_name'])) {
             return [__('"%1" is not a valid file.', $label)];
         }
 
@@ -174,12 +173,22 @@ public function validateValue($value)
         if ($this->getIsAjaxRequest()) {
             return true;
         }
+        $fileData = $value;
+
+        if (is_string($value) && !empty($value)) {
+            $dir = $this->_directory->getAbsolutePath($this->getAttribute()->getEntityType()->getEntityTypeCode());
+            $fileData = [
+                'size' => filesize($dir . $value),
+                'name' => $value,
+                'tmp_name' => $dir . $value,
+            ];
+        }
 
         $errors = [];
         $attribute = $this->getAttribute();
 
         $toDelete = !empty($value['delete']) ? true : false;
-        $toUpload = !empty($value['tmp_name']) ? true : false;
+        $toUpload = !empty($value['tmp_name']) || is_string($value) && !empty($value) ? true : false;
 
         if (!$toUpload && !$toDelete && $this->getEntity()->getData($attribute->getAttributeCode())) {
             return true;
@@ -195,11 +204,13 @@ public function validateValue($value)
         }
 
         if ($toUpload) {
-            $errors = array_merge($errors, $this->_validateByRules($value));
+            $errors = array_merge($errors, $this->_validateByRules($fileData));
         }
 
         if (count($errors) == 0) {
             return true;
+        } elseif (is_string($value) && !empty($value)) {
+            $this->_directory->delete($dir . $value);
         }
 
         return $errors;
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Text.php b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
index 8235b409a39ec..1371b0f645775 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Text.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
@@ -82,7 +82,7 @@ public function validateValue($value)
             $errors = array_merge($errors, $result);
         }
 
-        $result = $this->_validateInputRule($value);
+        $result = $this->_validateInputRule(trim($value));
         if ($result !== true) {
             $errors = array_merge($errors, $result);
         }
diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
index 40b884aec529f..9b7abde37cc19 100644
--- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
+++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -1686,14 +1686,16 @@ public function saveAttribute(DataObject $object, $attributeCode)
         $connection->beginTransaction();
 
         try {
-            $select = $connection->select()->from($table, 'value_id')->where($where);
-            $origValueId = $connection->fetchOne($select);
+            $select = $connection->select()->from($table, ['value_id', 'value'])->where($where);
+            $origRow = $connection->fetchRow($select);
+            $origValueId = $origRow['value_id'] ?? false;
+            $origValue = $origRow['value'] ?? null;
 
             if ($origValueId === false && $newValue !== null) {
                 $this->_insertAttribute($object, $attribute, $newValue);
             } elseif ($origValueId !== false && $newValue !== null) {
                 $this->_updateAttribute($object, $attribute, $origValueId, $newValue);
-            } elseif ($origValueId !== false && $newValue === null) {
+            } elseif ($origValueId !== false && $newValue === null && $origValue !== null) {
                 $connection->delete($table, $where);
             }
             $this->_processAttributeValues();
@@ -1984,7 +1986,7 @@ public function afterDelete(DataObject $object)
 
     /**
      * Load attributes for object
-     *  if the object will not pass all attributes for this entity type will be loaded
+     * If the object will not pass all attributes for this entity type will be loaded
      *
      * @param array $attributes
      * @param AbstractEntity|null $object
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
index 740b29c9676f3..6c3caef7b3fd6 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -238,22 +238,6 @@ public function beforeSave()
             );
         }
 
-        /**
-         * Check for maximum attribute_code length
-         */
-        if (isset(
-            $this->_data['attribute_code']
-        ) && !\Zend_Validate::is(
-            $this->_data['attribute_code'],
-            'StringLength',
-            ['max' => self::ATTRIBUTE_CODE_MAX_LENGTH]
-        )
-        ) {
-            throw new LocalizedException(
-                __('An attribute code must not be more than %1 characters.', self::ATTRIBUTE_CODE_MAX_LENGTH)
-            );
-        }
-
         $defaultValue = $this->getDefaultValue();
         $hasDefaultValue = (string)$defaultValue != '';
 
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
index 13c0b7a627edb..cd7639080509f 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
@@ -20,6 +20,8 @@
 use Magento\Eav\Model\Entity\Attribute\Source\BooleanFactory;
 
 /**
+ * EAV entity attribute form renderer.
+ *
  * @api
  * @since 100.0.2
  */
@@ -234,6 +236,9 @@ protected function _getInputValidateClass()
                 case 'alphanumeric':
                     $class = 'validate-alphanum';
                     break;
+                case 'alphanum-with-spaces':
+                    $class = 'validate-alphanum-with-spaces';
+                    break;
                 case 'numeric':
                     $class = 'validate-digits';
                     break;
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Group.php b/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
index 0b6ac2b998de7..7c7fcec6fc8f8 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
@@ -5,9 +5,14 @@
  */
 namespace Magento\Eav\Model\Entity\Attribute;
 
+use Magento\Eav\Api\Data\AttributeGroupExtensionInterface;
+use Magento\Eav\Api\Data\AttributeGroupInterface;
 use Magento\Framework\Api\AttributeValueFactory;
+use Magento\Framework\Model\AbstractExtensibleModel;
 
 /**
+ * Entity attribute group model.
+ *
  * @api
  * @method int getSortOrder()
  * @method \Magento\Eav\Model\Entity\Attribute\Group setSortOrder(int $value)
@@ -19,14 +24,18 @@
  * @method \Magento\Eav\Model\Entity\Attribute\Group setTabGroupCode(string $value)
  * @since 100.0.2
  */
-class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
-    \Magento\Eav\Api\Data\AttributeGroupInterface
+class Group extends AbstractExtensibleModel implements AttributeGroupInterface
 {
     /**
      * @var \Magento\Framework\Filter\Translit
      */
     private $translitFilter;
 
+    /**
+     * @var array
+     */
+    private $reservedSystemNames = [];
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -36,6 +45,7 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param array $reservedSystemNames
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -45,7 +55,8 @@ public function __construct(
         \Magento\Framework\Filter\Translit $translitFilter,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        array $reservedSystemNames = []
     ) {
         parent::__construct(
             $context,
@@ -57,10 +68,11 @@ public function __construct(
             $data
         );
         $this->translitFilter = $translitFilter;
+        $this->reservedSystemNames = $reservedSystemNames;
     }
 
     /**
-     * Resource initialization
+     * Resource initialization.
      *
      * @return void
      * @codeCoverageIgnore
@@ -71,7 +83,7 @@ protected function _construct()
     }
 
     /**
-     * Checks if current attribute group exists
+     * Checks if current attribute group exists.
      *
      * @return bool
      * @codeCoverageIgnore
@@ -82,7 +94,7 @@ public function itemExists()
     }
 
     /**
-     * Delete groups
+     * Delete groups.
      *
      * @return $this
      * @codeCoverageIgnore
@@ -93,7 +105,7 @@ public function deleteGroups()
     }
 
     /**
-     * Processing object before save data
+     * Processing object before save data.
      *
      * @return $this
      */
@@ -110,18 +122,20 @@ public function beforeSave()
                     ),
                     '-'
                 );
-                if (empty($attributeGroupCode)) {
+                $isReservedSystemName = in_array(strtolower($attributeGroupCode), $this->reservedSystemNames);
+                if (empty($attributeGroupCode) || $isReservedSystemName) {
                     // in the following code md5 is not used for security purposes
-                    $attributeGroupCode = md5($groupName);
+                    $attributeGroupCode = md5(strtolower($groupName));
                 }
                 $this->setAttributeGroupCode($attributeGroupCode);
             }
         }
+
         return parent::beforeSave();
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @codeCoverageIgnoreStart
      */
     public function getAttributeGroupId()
@@ -130,7 +144,7 @@ public function getAttributeGroupId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAttributeGroupName()
     {
@@ -138,7 +152,7 @@ public function getAttributeGroupName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAttributeSetId()
     {
@@ -146,7 +160,7 @@ public function getAttributeSetId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAttributeGroupId($attributeGroupId)
     {
@@ -154,7 +168,7 @@ public function setAttributeGroupId($attributeGroupId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAttributeGroupName($attributeGroupName)
     {
@@ -162,7 +176,7 @@ public function setAttributeGroupName($attributeGroupName)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAttributeSetId($attributeSetId)
     {
@@ -170,9 +184,9 @@ public function setAttributeSetId($attributeSetId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
-     * @return \Magento\Eav\Api\Data\AttributeGroupExtensionInterface|null
+     * @return AttributeGroupExtensionInterface|null
      */
     public function getExtensionAttributes()
     {
@@ -180,14 +194,13 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
-     * @param \Magento\Eav\Api\Data\AttributeGroupExtensionInterface $extensionAttributes
+     * @param AttributeGroupExtensionInterface $extensionAttributes
      * @return $this
      */
-    public function setExtensionAttributes(
-        \Magento\Eav\Api\Data\AttributeGroupExtensionInterface $extensionAttributes
-    ) {
+    public function setExtensionAttributes(AttributeGroupExtensionInterface $extensionAttributes)
+    {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
 
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
index 0991b3f9f4b23..36ad026029056 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/AbstractSource.php
@@ -73,13 +73,15 @@ public function getOptionText($value)
             }
         }
         // End
-        if (isset($options[$value])) {
+        if (is_scalar($value) && isset($options[$value])) {
             return $options[$value];
         }
         return false;
     }
 
     /**
+     * Get option id.
+     *
      * @param string $value
      * @return null|string
      */
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Store.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Store.php
index 00450088e86aa..cef1db109c750 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Store.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Store.php
@@ -35,10 +35,10 @@ public function __construct(
 
     /**
      * Retrieve Full Option values array
-     *
-     * @return array
+     * @inheritdoc
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function getAllOptions()
+    public function getAllOptions($withEmpty = true, $defaultValues = false)
     {
         if ($this->_options === null) {
             $this->_options = $this->_storeCollectionFactory->create()->load()->toOptionArray();
diff --git a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
index 2177686a4a6be..242a44d9dabfd 100644
--- a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
+++ b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
@@ -394,7 +394,7 @@ public function addAttributeToFilter($attribute, $condition = null, $joinType =
      */
     public function addFieldToFilter($attribute, $condition = null)
     {
-        return $this->addAttributeToFilter($attribute, $condition);
+        return $this->addAttributeToFilter($attribute, $condition, 'left');
     }
 
     /**
@@ -1035,6 +1035,7 @@ public function importFromArray($arr)
                 $this->_items[$entityId]->addData($row);
             }
         }
+        $this->_setIsLoaded();
         return $this;
     }
 
diff --git a/app/code/Magento/Eav/Model/Entity/Type.php b/app/code/Magento/Eav/Model/Entity/Type.php
index aa298d7d547bf..5ee15287e8899 100644
--- a/app/code/Magento/Eav/Model/Entity/Type.php
+++ b/app/code/Magento/Eav/Model/Entity/Type.php
@@ -167,11 +167,8 @@ public function getAttributeCollection($setId = null)
      */
     protected function _getAttributeCollection()
     {
-        $collection = $this->_attributeFactory->create()->getCollection();
-        $objectsModel = $this->getAttributeModel();
-        if ($objectsModel) {
-            $collection->setModel($objectsModel);
-        }
+        $collection = $this->_universalFactory->create($this->getEntityAttributeCollection());
+        $collection->setItemObjectClass($this->getAttributeModel());
 
         return $collection;
     }
diff --git a/app/code/Magento/Eav/Model/Form.php b/app/code/Magento/Eav/Model/Form.php
index c8c50521f5509..a34b53eede354 100644
--- a/app/code/Magento/Eav/Model/Form.php
+++ b/app/code/Magento/Eav/Model/Form.php
@@ -286,7 +286,8 @@ public function getFormCode()
     }
 
     /**
-     * Return entity type instance
+     * Return entity type instance.
+     *
      * Return EAV entity type if entity type is not defined
      *
      * @return \Magento\Eav\Model\Entity\Type
@@ -323,6 +324,8 @@ public function getAttributes()
         if ($this->_attributes === null) {
             $this->_attributes = [];
             $this->_userAttributes = [];
+            $this->_systemAttributes = [];
+            $this->_allowedAttributes = [];
             /** @var $attribute \Magento\Eav\Model\Attribute */
             foreach ($this->_getFilteredFormAttributeCollection() as $attribute) {
                 $this->_attributes[$attribute->getAttributeCode()] = $attribute;
diff --git a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
index cd2fe7477ca60..18bb62b3f7d93 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
@@ -5,13 +5,19 @@
  */
 namespace Magento\Eav\Model\ResourceModel;
 
+use Magento\Eav\Model\Config;
 use Magento\Framework\DataObject;
+use Magento\Framework\DB\Select;
+use Magento\Framework\DB\Sql\UnionExpression;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\AttributeInterface;
 use Magento\Framework\Model\Entity\ScopeInterface;
 use Magento\Framework\Model\Entity\ScopeResolver;
 use Psr\Log\LoggerInterface;
 
+/**
+ * EAV read handler.
+ */
 class ReadHandler implements AttributeInterface
 {
     /**
@@ -30,23 +36,21 @@ class ReadHandler implements AttributeInterface
     private $logger;
 
     /**
-     * @var \Magento\Eav\Model\Config
+     * @var Config
      */
     private $config;
 
     /**
-     * ReadHandler constructor.
-     *
      * @param MetadataPool $metadataPool
      * @param ScopeResolver $scopeResolver
      * @param LoggerInterface $logger
-     * @param \Magento\Eav\Model\Config $config
+     * @param Config $config
      */
     public function __construct(
         MetadataPool $metadataPool,
         ScopeResolver $scopeResolver,
         LoggerInterface $logger,
-        \Magento\Eav\Model\Config $config
+        Config $config
     ) {
         $this->metadataPool = $metadataPool;
         $this->scopeResolver = $scopeResolver;
@@ -86,6 +90,8 @@ private function getEntityAttributes(string $entityType, DataObject $entity): ar
     }
 
     /**
+     * Get context variables.
+     *
      * @param ScopeInterface $scope
      * @return array
      */
@@ -99,6 +105,8 @@ protected function getContextVariables(ScopeInterface $scope)
     }
 
     /**
+     * Execute read handler.
+     *
      * @param string $entityType
      * @param array $entityData
      * @param array $arguments
@@ -129,33 +137,40 @@ public function execute($entityType, $entityData, $arguments = [])
             }
         }
         if (count($attributeTables)) {
-            $attributeTables = array_keys($attributeTables);
-            foreach ($attributeTables as $attributeTable) {
+            $identifiers = null;
+            foreach ($attributeTables as $attributeTable => $attributeIds) {
                 $select = $connection->select()
                     ->from(
                         ['t' => $attributeTable],
                         ['value' => 't.value', 'attribute_id' => 't.attribute_id']
                     )
-                    ->where($metadata->getLinkField() . ' = ?', $entityData[$metadata->getLinkField()]);
+                    ->where($metadata->getLinkField() . ' = ?', $entityData[$metadata->getLinkField()])
+                    ->where('attribute_id IN (?)', $attributeIds);
+                $attributeIdentifiers = [];
                 foreach ($context as $scope) {
                     //TODO: if (in table exists context field)
                     $select->where(
-                        $metadata->getEntityConnection()->quoteIdentifier($scope->getIdentifier()) . ' IN (?)',
+                        $connection->quoteIdentifier($scope->getIdentifier()) . ' IN (?)',
                         $this->getContextVariables($scope)
-                    )->order('t.' . $scope->getIdentifier() . ' DESC');
+                    );
+                    $attributeIdentifiers[] = $scope->getIdentifier();
                 }
+                $attributeIdentifiers = array_unique($attributeIdentifiers);
+                $identifiers = array_intersect($identifiers ?? $attributeIdentifiers, $attributeIdentifiers);
                 $selects[] = $select;
             }
-            $unionSelect = new \Magento\Framework\DB\Sql\UnionExpression(
-                $selects,
-                \Magento\Framework\DB\Select::SQL_UNION_ALL
-            );
-            foreach ($connection->fetchAll($unionSelect) as $attributeValue) {
+            $this->applyIdentifierForSelects($selects, $identifiers);
+            $unionSelect = new UnionExpression($selects, Select::SQL_UNION_ALL, '( %s )');
+            $orderedUnionSelect = $connection->select();
+            $orderedUnionSelect->from(['u' => $unionSelect]);
+            $this->applyIdentifierForUnion($orderedUnionSelect, $identifiers);
+            $attributes = $connection->fetchAll($orderedUnionSelect);
+            foreach ($attributes as $attributeValue) {
                 if (isset($attributesMap[$attributeValue['attribute_id']])) {
                     $entityData[$attributesMap[$attributeValue['attribute_id']]] = $attributeValue['value'];
                 } else {
                     $this->logger->warning(
-                        "Attempt to load value of nonexistent EAV attribute '{$attributeValue['attribute_id']}' 
+                        "Attempt to load value of nonexistent EAV attribute '{$attributeValue['attribute_id']}'
                         for entity type '$entityType'."
                     );
                 }
@@ -163,4 +178,34 @@ public function execute($entityType, $entityData, $arguments = [])
         }
         return $entityData;
     }
+
+    /**
+     * Apply identifiers column on select array.
+     *
+     * @param Select[] $selects
+     * @param array $identifiers
+     * @return void
+     */
+    private function applyIdentifierForSelects(array $selects, array $identifiers)
+    {
+        foreach ($selects as $select) {
+            foreach ($identifiers as $identifier) {
+                $select->columns($identifier, 't');
+            }
+        }
+    }
+
+    /**
+     * Apply identifiers order on union select.
+     *
+     * @param Select $unionSelect
+     * @param array $identifiers
+     * @return void
+     */
+    private function applyIdentifierForUnion(Select $unionSelect, array $identifiers)
+    {
+        foreach ($identifiers as $identifier) {
+            $unionSelect->order($identifier);
+        }
+    }
 }
diff --git a/app/code/Magento/Eav/Model/Validator/Attribute/Code.php b/app/code/Magento/Eav/Model/Validator/Attribute/Code.php
new file mode 100644
index 0000000000000..91443fec97d1e
--- /dev/null
+++ b/app/code/Magento/Eav/Model/Validator/Attribute/Code.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Eav\Model\Validator\Attribute;
+
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
+use Magento\Eav\Model\Entity\Attribute;
+use Magento\Framework\Validator\AbstractValidator;
+use Zend_Validate;
+use Zend_Validate_Exception;
+
+class Code extends AbstractValidator
+{
+    /**
+     * Validation pattern for attribute code
+     */
+    const VALIDATION_RULE_PATTERN = '/^[a-zA-Z]+[a-zA-Z0-9_]*$/u';
+
+    /**
+     * Returns true if and only if $value meets the validation requirements
+     *
+     * If $value fails validation, then this method returns false, and
+     * getMessages() will return an array of messages that explain why the
+     * validation failed.
+     *
+     * @param string $attributeCode
+     * @return boolean
+     * @throws Zend_Validate_Exception If validation of $attributeCode is impossible
+     */
+    public function isValid($attributeCode): bool
+    {
+        $errorMessages = [];
+        /**
+         * Check attribute_code for allowed characters
+         */
+        if (trim($attributeCode)
+            && !preg_match(self::VALIDATION_RULE_PATTERN, trim($attributeCode))
+        ) {
+            $errorMessages[] = __(
+                'Attribute code "%1" 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.',
+                $attributeCode
+            );
+        }
+
+        /**
+         * Check attribute_code for allowed length
+         */
+        $minLength = Attribute::ATTRIBUTE_CODE_MIN_LENGTH;
+        $maxLength = Attribute::ATTRIBUTE_CODE_MAX_LENGTH;
+        $isAllowedLength = Zend_Validate::is(
+            trim($attributeCode),
+            'StringLength',
+            ['min' => $minLength, 'max' => $maxLength]
+        );
+        if (!$isAllowedLength) {
+            $errorMessages[] = __(
+                'An attribute code must not be less than %1 and more than %2 characters.',
+                $minLength,
+                $maxLength
+            );
+        }
+
+        /**
+         * Check attribute_code for prohibited prefix
+         */
+        if (strpos($attributeCode, AbstractModifier::CONTAINER_PREFIX) === 0) {
+            $errorMessages[] = __(
+                '"%1" prefix is reserved by the system and cannot be used in attribute code names.',
+                AbstractModifier::CONTAINER_PREFIX
+            );
+        }
+
+        $this->_addMessages($errorMessages);
+
+        return !$this->hasMessages();
+    }
+}
diff --git a/app/code/Magento/Eav/Plugin/Model/Entity/Attribute.php b/app/code/Magento/Eav/Plugin/Model/Entity/Attribute.php
new file mode 100644
index 0000000000000..ef88ef40e84aa
--- /dev/null
+++ b/app/code/Magento/Eav/Plugin/Model/Entity/Attribute.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Eav\Plugin\Model\Entity;
+
+use Magento\Eav\Model\Entity\Attribute as EavEntityAttribute;
+use Magento\Eav\Model\Validator\Attribute\Code as AttributeCodeValidator;
+use Magento\Framework\Exception\LocalizedException;
+
+class Attribute
+{
+    /**
+     * @var AttributeCodeValidator
+     */
+    private $attributeCodeValidator;
+
+    /**
+     * @param AttributeCodeValidator $attributeCodeValidator
+     */
+    public function __construct(AttributeCodeValidator $attributeCodeValidator)
+    {
+        $this->attributeCodeValidator = $attributeCodeValidator;
+    }
+
+    /**
+     * @param EavEntityAttribute $subject
+     * @throws \Zend_Validate_Exception
+     * @throws LocalizedException
+     */
+    public function beforeSave(EavEntityAttribute $subject)
+    {
+        $attributeCode = $subject->getData('attribute_code')
+            ?? $subject->getData('frontend_label')[0];
+
+        if (!$this->attributeCodeValidator->isValid($attributeCode)) {
+            throw new LocalizedException(current($this->attributeCodeValidator->getMessages()));
+        }
+    }
+}
diff --git a/app/code/Magento/Eav/Setup/EavSetup.php b/app/code/Magento/Eav/Setup/EavSetup.php
index 13f55308e6fa6..2f43d6543df3f 100644
--- a/app/code/Magento/Eav/Setup/EavSetup.php
+++ b/app/code/Magento/Eav/Setup/EavSetup.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Eav\Setup;
 
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Eav\Model\Entity\Setup\Context;
 use Magento\Eav\Model\Entity\Setup\PropertyMapperInterface;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
@@ -782,13 +783,18 @@ private function _validateAttributeData($data)
         );
 
         if (!$isAllowedLength) {
-            $errorMessage = __(
+            throw new LocalizedException(__(
                 'An attribute code must not be less than %1 and more than %2 characters.',
                 $minLength,
                 $maxLength
-            );
+            ));
+        }
 
-            throw new LocalizedException($errorMessage);
+        if (strpos($attributeCode, AbstractModifier::CONTAINER_PREFIX) === 0) {
+            throw new LocalizedException(__(
+                '"%1" prefix is reserved by the system and cannot be used in attribute code names.',
+                AbstractModifier::CONTAINER_PREFIX
+            ));
         }
 
         return true;
diff --git a/app/code/Magento/Eav/Test/Mftf/Section/AdminAttributesEditSection.xml b/app/code/Magento/Eav/Test/Mftf/Section/AdminAttributesEditSection.xml
new file mode 100644
index 0000000000000..da48db84f99ed
--- /dev/null
+++ b/app/code/Magento/Eav/Test/Mftf/Section/AdminAttributesEditSection.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="AdminAttributesEditSection">
+        <element name="label" type="input" selector="#attribute_label"/>
+        <element name="code" type="input" selector="#attribute_code"/>
+        <element name="inputType" type="select" selector="#frontend_input"/>
+        <element name="valuesRequired" type="select" selector="#is_required"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Eav/Test/Mftf/Section/AdminAttributesGridSection.xml b/app/code/Magento/Eav/Test/Mftf/Section/AdminAttributesGridSection.xml
new file mode 100644
index 0000000000000..36360a0ebc565
--- /dev/null
+++ b/app/code/Magento/Eav/Test/Mftf/Section/AdminAttributesGridSection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminAttributesGridSection">
+        <element name="attribute" type="text" selector="//td[contains(text(), '{{arg3}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/TextTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/TextTest.php
index 217a04045b939..b1e2c1e37d67c 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/TextTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/TextTest.php
@@ -6,22 +6,27 @@
 
 namespace Magento\Eav\Test\Unit\Model\Attribute\Data;
 
+use Magento\Framework\Stdlib\StringUtils;
+
+/**
+ * Eav text attribute model test
+ */
 class TextTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \Magento\Eav\Model\Attribute\Data\Text
      */
-    protected $_model;
+    private $model;
 
     protected function setUp()
     {
         $locale = $this->createMock(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
         $localeResolver = $this->createMock(\Magento\Framework\Locale\ResolverInterface::class);
         $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
-        $helper = $this->createMock(\Magento\Framework\Stdlib\StringUtils::class);
+        $helper = new StringUtils;
 
-        $this->_model = new \Magento\Eav\Model\Attribute\Data\Text($locale, $logger, $localeResolver, $helper);
-        $this->_model->setAttribute(
+        $this->model = new \Magento\Eav\Model\Attribute\Data\Text($locale, $logger, $localeResolver, $helper);
+        $this->model->setAttribute(
             $this->createAttribute(
                 [
                     'store_label' => 'Test',
@@ -35,24 +40,39 @@ protected function setUp()
 
     protected function tearDown()
     {
-        $this->_model = null;
+        $this->model = null;
     }
 
+    /**
+     * Test of string validation.
+     *
+     * @return void
+     */
     public function testValidateValueString()
     {
         $inputValue = '0';
         $expectedResult = true;
-        $this->assertEquals($expectedResult, $this->_model->validateValue($inputValue));
+        $this->assertEquals($expectedResult, $this->model->validateValue($inputValue));
     }
 
+    /**
+     * Test of integer validation.
+     *
+     * @return void
+     */
     public function testValidateValueInteger()
     {
         $inputValue = 0;
         $expectedResult = ['"Test" is a required value.'];
-        $result = $this->_model->validateValue($inputValue);
+        $result = $this->model->validateValue($inputValue);
         $this->assertEquals($expectedResult, [(string)$result[0]]);
     }
 
+    /**
+     * Test without length validation.
+     *
+     * @return void
+     */
     public function testWithoutLengthValidation()
     {
         $expectedResult = true;
@@ -64,12 +84,110 @@ public function testWithoutLengthValidation()
         ];
 
         $defaultAttributeData['validate_rules']['min_text_length'] = 2;
-        $this->_model->setAttribute($this->createAttribute($defaultAttributeData));
-        $this->assertEquals($expectedResult, $this->_model->validateValue('t'));
+        $this->model->setAttribute($this->createAttribute($defaultAttributeData));
+        $this->assertEquals($expectedResult, $this->model->validateValue('t'));
 
         $defaultAttributeData['validate_rules']['max_text_length'] = 3;
-        $this->_model->setAttribute($this->createAttribute($defaultAttributeData));
-        $this->assertEquals($expectedResult, $this->_model->validateValue('test'));
+        $this->model->setAttribute($this->createAttribute($defaultAttributeData));
+        $this->assertEquals($expectedResult, $this->model->validateValue('test'));
+    }
+
+    /**
+     * Test of alphanumeric validation.
+     *
+     * @param string $value
+     * @param bool|array $expectedResult
+     * @return void
+     * @dataProvider alphanumDataProvider
+     */
+    public function testAlphanumericValidation(string $value, $expectedResult)
+    {
+        $defaultAttributeData = [
+            'store_label' => 'Test',
+            'attribute_code' => 'test',
+            'is_required' => 1,
+            'validate_rules' => [
+                'min_text_length' => 0,
+                'max_text_length' => 10,
+                'input_validation' => 'alphanumeric',
+            ],
+        ];
+
+        $this->model->setAttribute($this->createAttribute($defaultAttributeData));
+        $this->assertEquals($expectedResult, $this->model->validateValue($value));
+    }
+
+    /**
+     * Provides possible input values.
+     *
+     * @return array
+     */
+    public function alphanumDataProvider(): array
+    {
+        return [
+            ['QazWsx', true],
+            ['QazWsx123', true],
+            [
+                'QazWsx 123',
+                [\Zend_Validate_Alnum::NOT_ALNUM => '"Test" contains non-alphabetic or non-numeric characters.'],
+            ],
+            [
+                'QazWsx_123',
+                [\Zend_Validate_Alnum::NOT_ALNUM => '"Test" contains non-alphabetic or non-numeric characters.'],
+            ],
+            [
+                'QazWsx12345',
+                [__('"%1" length must be equal or less than %2 characters.', 'Test', 10)],
+            ],
+            [' 12345 ', true],
+        ];
+    }
+
+    /**
+     * Test of alphanumeric validation with spaces.
+     *
+     * @param string $value
+     * @param bool|array $expectedResult
+     * @return void
+     * @dataProvider alphanumWithSpacesDataProvider
+     */
+    public function testAlphanumericValidationWithSpaces(string $value, $expectedResult)
+    {
+        $defaultAttributeData = [
+            'store_label' => 'Test',
+            'attribute_code' => 'test',
+            'is_required' => 1,
+            'validate_rules' => [
+                'min_text_length' => 0,
+                'max_text_length' => 10,
+                'input_validation' => 'alphanum-with-spaces',
+            ],
+        ];
+
+        $this->model->setAttribute($this->createAttribute($defaultAttributeData));
+        $this->assertEquals($expectedResult, $this->model->validateValue($value));
+    }
+
+    /**
+     * Provides possible input values.
+     *
+     * @return array
+     */
+    public function alphanumWithSpacesDataProvider(): array
+    {
+        return [
+            ['QazWsx', true],
+            ['QazWsx123', true],
+            ['QazWsx 123', true],
+            [
+                'QazWsx_123',
+                [\Zend_Validate_Alnum::NOT_ALNUM => '"Test" contains non-alphabetic or non-numeric characters.'],
+            ],
+            [
+                'QazWsx12345',
+                [__('"%1" length must be equal or less than %2 characters.', 'Test', 10)],
+            ],
+        ];
     }
 
     /**
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
index a61c9ef447458..2c5b1aeb7bbfd 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
@@ -13,41 +13,42 @@
 use Magento\Framework\App\CacheInterface;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class DefaultFrontendTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var DefaultFrontend
      */
-    protected $model;
+    private $model;
 
     /**
-     * @var BooleanFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var BooleanFactory|MockObject
      */
-    protected $booleanFactory;
+    private $booleanFactory;
 
     /**
-     * @var Serializer|\PHPUnit_Framework_MockObject_MockObject
+     * @var Serializer|MockObject
      */
     private $serializerMock;
 
     /**
-     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StoreManagerInterface|MockObject
      */
     private $storeManagerMock;
 
     /**
-     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StoreInterface|MockObject
      */
     private $storeMock;
 
     /**
-     * @var CacheInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CacheInterface|MockObject
      */
     private $cacheMock;
 
     /**
-     * @var AbstractAttribute|\PHPUnit_Framework_MockObject_MockObject
+     * @var AbstractAttribute|MockObject
      */
     private $attributeMock;
 
@@ -57,7 +58,7 @@ class DefaultFrontendTest extends \PHPUnit\Framework\TestCase
     private $cacheTags;
 
     /**
-     * @var AbstractSource|\PHPUnit_Framework_MockObject_MockObject
+     * @var AbstractSource|MockObject
      */
     private $sourceMock;
 
@@ -76,44 +77,31 @@ protected function setUp()
             ->getMockForAbstractClass();
         $this->cacheMock = $this->getMockBuilder(CacheInterface::class)
             ->getMockForAbstractClass();
-        $this->attributeMock = $this->getMockBuilder(AbstractAttribute::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getAttributeCode', 'getSource'])
-            ->getMockForAbstractClass();
+        $this->attributeMock = $this->createAttributeMock();
         $this->sourceMock = $this->getMockBuilder(AbstractSource::class)
             ->disableOriginalConstructor()
             ->setMethods(['getAllOptions'])
             ->getMockForAbstractClass();
 
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->model = $objectManager->getObject(
-            DefaultFrontend::class,
-            [
-                '_attrBooleanFactory' => $this->booleanFactory,
-                'cache' => $this->cacheMock,
-                'storeManager' => $this->storeManagerMock,
-                'serializer' => $this->serializerMock,
-                '_attribute' => $this->attributeMock,
-                'cacheTags' => $this->cacheTags
-            ]
+        $this->model = new DefaultFrontend(
+            $this->booleanFactory,
+            $this->cacheMock,
+            null,
+            $this->cacheTags,
+            $this->storeManagerMock,
+            $this->serializerMock
         );
+
+        $this->model->setAttribute($this->attributeMock);
     }
 
     public function testGetClassEmpty()
     {
-        $attributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class)
-            ->disableOriginalConstructor()
-            ->setMethods([
-                'getIsRequired',
-                'getFrontendClass',
-                'getValidateRules',
-            ])
-            ->getMock();
-        $attributeMock->expects($this->once())
-            ->method('getIsRequired')
+        /** @var AbstractAttribute|MockObject $attributeMock */
+        $attributeMock = $this->createAttributeMock();
+        $attributeMock->method('getIsRequired')
             ->willReturn(false);
-        $attributeMock->expects($this->once())
-            ->method('getFrontendClass')
+        $attributeMock->method('getFrontendClass')
             ->willReturn('');
         $attributeMock->expects($this->exactly(2))
             ->method('getValidateRules')
@@ -123,26 +111,26 @@ public function testGetClassEmpty()
         $this->assertEmpty($this->model->getClass());
     }
 
-    public function testGetClass()
+    /**
+     * Validates generated html classes.
+     *
+     * @param string $validationRule
+     * @param string $expectedClass
+     * @return void
+     * @dataProvider validationRulesDataProvider
+     */
+    public function testGetClass(string $validationRule, string $expectedClass)
     {
-        $attributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class)
-            ->disableOriginalConstructor()
-            ->setMethods([
-                'getIsRequired',
-                'getFrontendClass',
-                'getValidateRules',
-            ])
-            ->getMock();
-        $attributeMock->expects($this->once())
-            ->method('getIsRequired')
+        /** @var AbstractAttribute|MockObject $attributeMock */
+        $attributeMock = $this->createAttributeMock();
+        $attributeMock->method('getIsRequired')
             ->willReturn(true);
-        $attributeMock->expects($this->once())
-            ->method('getFrontendClass')
+        $attributeMock->method('getFrontendClass')
             ->willReturn('');
         $attributeMock->expects($this->exactly(3))
             ->method('getValidateRules')
             ->willReturn([
-                'input_validation' => 'alphanumeric',
+                'input_validation' => $validationRule,
                 'min_text_length' => 1,
                 'max_text_length' => 2,
             ]);
@@ -150,7 +138,7 @@ public function testGetClass()
         $this->model->setAttribute($attributeMock);
         $result = $this->model->getClass();
 
-        $this->assertContains('validate-alphanum', $result);
+        $this->assertContains($expectedClass, $result);
         $this->assertContains('minimum-length-1', $result);
         $this->assertContains('maximum-length-2', $result);
         $this->assertContains('validate-length', $result);
@@ -158,19 +146,11 @@ public function testGetClass()
 
     public function testGetClassLength()
     {
-        $attributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class)
-            ->disableOriginalConstructor()
-            ->setMethods([
-                'getIsRequired',
-                'getFrontendClass',
-                'getValidateRules',
-            ])
-            ->getMock();
-        $attributeMock->expects($this->once())
-            ->method('getIsRequired')
+        /** @var AbstractAttribute|MockObject $attributeMock */
+        $attributeMock = $this->createAttributeMock();
+        $attributeMock->method('getIsRequired')
             ->willReturn(true);
-        $attributeMock->expects($this->once())
-            ->method('getFrontendClass')
+        $attributeMock->method('getFrontendClass')
             ->willReturn('');
         $attributeMock->expects($this->exactly(3))
             ->method('getValidateRules')
@@ -196,33 +176,62 @@ public function testGetSelectOptions()
         $options = ['option1', 'option2'];
         $serializedOptions = "{['option1', 'option2']}";
 
-        $this->storeManagerMock->expects($this->once())
-            ->method('getStore')
+        $this->storeManagerMock->method('getStore')
             ->willReturn($this->storeMock);
-        $this->storeMock->expects($this->once())
-            ->method('getId')
+        $this->storeMock->method('getId')
             ->willReturn($storeId);
-        $this->attributeMock->expects($this->once())
-            ->method('getAttributeCode')
+        $this->attributeMock->method('getAttributeCode')
             ->willReturn($attributeCode);
-        $this->cacheMock->expects($this->once())
-            ->method('load')
+        $this->cacheMock->method('load')
             ->with($cacheKey)
             ->willReturn(false);
-        $this->attributeMock->expects($this->once())
-            ->method('getSource')
+        $this->attributeMock->method('getSource')
             ->willReturn($this->sourceMock);
-        $this->sourceMock->expects($this->once())
-            ->method('getAllOptions')
+        $this->sourceMock->method('getAllOptions')
             ->willReturn($options);
-        $this->serializerMock->expects($this->once())
-            ->method('serialize')
+        $this->serializerMock->method('serialize')
             ->with($options)
             ->willReturn($serializedOptions);
-        $this->cacheMock->expects($this->once())
-            ->method('save')
+        $this->cacheMock->method('save')
             ->with($serializedOptions, $cacheKey, $this->cacheTags);
 
         $this->assertSame($options, $this->model->getSelectOptions());
     }
+
+    /**
+     * Provides possible validation types.
+     *
+     * @return array
+     */
+    public function validationRulesDataProvider(): array
+    {
+        return [
+            ['alphanumeric', 'validate-alphanum'],
+            ['alphanum-with-spaces', 'validate-alphanum-with-spaces'],
+            ['alpha', 'validate-alpha'],
+            ['numeric', 'validate-digits'],
+            ['url', 'validate-url'],
+            ['email', 'validate-email'],
+            ['length', 'validate-length'],
+        ];
+    }
+
+    /**
+     * Entity attribute factory.
+     *
+     * @return AbstractAttribute|MockObject
+     */
+    private function createAttributeMock()
+    {
+        return $this->getMockBuilder(AbstractAttribute::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getIsRequired',
+                'getFrontendClass',
+                'getValidateRules',
+                'getAttributeCode',
+                'getSource'
+            ])
+            ->getMockForAbstractClass();
+    }
 }
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php
index d4c91e98d9608..3f663558f4b8c 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/GroupTest.php
@@ -6,7 +6,12 @@
 namespace Magento\Eav\Test\Unit\Model\Entity\Attribute;
 
 use Magento\Eav\Model\Entity\Attribute\Group;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group as ResourceGroup;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Filter\Translit;
+use Magento\Framework\Model\Context;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class GroupTest extends \PHPUnit\Framework\TestCase
 {
@@ -16,34 +21,38 @@ class GroupTest extends \PHPUnit\Framework\TestCase
     private $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var ResourceGroup|MockObject
      */
     private $resourceMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var ManagerInterface|MockObject
      */
     private $eventManagerMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->resourceMock = $this->createMock(\Magento\Eav\Model\ResourceModel\Entity\Attribute\Group::class);
-        $translitFilter = $this->getMockBuilder(\Magento\Framework\Filter\Translit::class)
+        $this->resourceMock = $this->createMock(ResourceGroup::class);
+        $translitFilter = $this->getMockBuilder(Translit::class)
             ->disableOriginalConstructor()
             ->getMock();
         $translitFilter->expects($this->atLeastOnce())->method('filter')->willReturnArgument(0);
 
-        $this->eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
-        $contextMock = $this->createMock(\Magento\Framework\Model\Context::class);
+        $this->eventManagerMock = $this->createMock(ManagerInterface::class);
+        $contextMock = $this->createMock(Context::class);
         $contextMock->expects($this->any())->method('getEventDispatcher')->willReturn($this->eventManagerMock);
         $constructorArguments = [
             'resource' => $this->resourceMock,
             'translitFilter' => $translitFilter,
             'context' => $contextMock,
+            'reservedSystemNames' => ['configurable'],
         ];
         $objectManager = new ObjectManager($this);
         $this->model = $objectManager->getObject(
-            \Magento\Eav\Model\Entity\Attribute\Group::class,
+            Group::class,
             $constructorArguments
         );
     }
@@ -67,6 +76,8 @@ public function attributeGroupCodeDataProvider()
     {
         return [
             ['General Group', 'general-group'],
+            ['configurable', md5('configurable')],
+            ['configurAble', md5('configurable')],
             ['///', md5('///')],
         ];
     }
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 18c94381a5054..e12ccbf016ea2 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeTest.php
@@ -118,6 +118,7 @@ public function testGetFrontendLabels()
         $attributeId = 1;
         $storeLabels = ['test_attribute_store1'];
         $frontendLabelFactory = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\FrontendLabelFactory::class)
+            ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
         $resource = $this->getMockBuilder(\Magento\Eav\Model\ResourceModel\Entity\Attribute::class)
diff --git a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/ReadHandlerTest.php b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
index 82e9033496b78..9020f22c497b6 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
@@ -5,19 +5,35 @@
  */
 namespace Magento\Eav\Test\Unit\Model\ResourceModel;
 
+use Magento\Eav\Model\Config;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
+use Magento\Eav\Model\ResourceModel\ReadHandler;
+use Magento\Framework\DataObject;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\DB\Sql\UnionExpression;
 use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Model\Entity\ScopeResolver;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Model\Entity\ScopeInterface;
+use Psr\Log\LoggerInterface;
 
+/**
+ * Test for Magento\Eav\Model\ResourceModel\ReadHandler class.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ReadHandlerTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
      */
     private $configMock;
 
     /**
-     * @var \Magento\Framework\EntityManager\MetadataPool|\PHPUnit_Framework_MockObject_MockObject
+     * @var MetadataPool|\PHPUnit_Framework_MockObject_MockObject
      */
     private $metadataPoolMock;
 
@@ -27,112 +43,208 @@ class ReadHandlerTest extends \PHPUnit\Framework\TestCase
     private $metadataMock;
 
     /**
-     * @var \Magento\Eav\Model\ResourceModel\ReadHandler
+     * @var ScopeResolver|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $readHandler;
+    private $scopeResolverMock;
 
     /**
-     * @var \Magento\Framework\Model\Entity\ScopeResolver|\PHPUnit_Framework_MockObject_MockObject
+     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $scopeResolverMock;
+    private $loggerMock;
+
+    /**
+     * @var ScopeInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeMock;
+
+    /**
+     * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * @var AbstractAttribute|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeMock;
 
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ReadHandler
+     */
+    private $readHandler;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $objectManager = new ObjectManager($this);
-        $args = $objectManager->getConstructArguments(\Magento\Eav\Model\ResourceModel\ReadHandler::class);
-        $this->metadataPoolMock = $args['metadataPool'];
-        $this->metadataMock = $this->getMockBuilder(EntityMetadataInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->metadataPoolMock->expects($this->any())
-            ->method('getMetadata')
-            ->willReturn($this->metadataMock);
-        $this->configMock = $args['config'];
-        $this->scopeResolverMock = $args['scopeResolver'];
-        $this->scopeResolverMock->method('getEntityContext')
-            ->willReturn([]);
+        $this->objectManager = new ObjectManager($this);
+
+        $this->metadataPoolMock = $this->createMock(MetadataPool::class);
+        $this->scopeResolverMock = $this->createMock(ScopeResolver::class);
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+        $this->configMock = $this->createMock(Config::class);
+        $this->metadataMock = $this->createMock(EntityMetadataInterface::class);
+        $this->scopeMock = $this->createMock(ScopeInterface::class);
+        $this->connectionMock = $this->createMock(AdapterInterface::class);
+        $this->attributeMock = $this->createMock(AbstractAttribute::class);
 
-        $this->readHandler = $objectManager->getObject(\Magento\Eav\Model\ResourceModel\ReadHandler::class, $args);
+        $this->readHandler = $this->objectManager->getObject(
+            ReadHandler::class,
+            [
+                'metadataPool' => $this->metadataPoolMock,
+                'scopeResolver' => $this->scopeResolverMock,
+                'logger' => $this->loggerMock,
+                'config' => $this->configMock,
+            ]
+        );
     }
 
     /**
-     * @param string $eavEntityType
-     * @param int $callNum
-     * @param array $expected
-     * @param bool $isStatic
-     * @dataProvider executeDataProvider
+     * @return void
      */
-    public function testExecute($eavEntityType, $callNum, array $expected, $isStatic = true)
+    public function testExecute()
     {
+        $eavEntityType = 'env-entity-type';
         $entityData = ['linkField' => 'theLinkField'];
-        $this->metadataMock->method('getEavEntityType')
-            ->willReturn($eavEntityType);
-        $connectionMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $selectMock->method('from')
+        $attributeId = '1';
+        $attributeCode = 'attribute_code';
+        $identifier = 'store_id';
+        $expectedEntityData = [
+            'linkField' => 'theLinkField',
+            $attributeCode => $attributeId,
+        ];
+        $entityDataObject = $this->objectManager->getObject(DataObject::class, ['data' => $entityData]);
+        $abstractBackendMock = $this->createMock(AbstractBackend::class);
+        $selectMock = $this->createMock(Select::class);
+        $orderedUnionSelectMock = $this->createMock(Select::class);
+        $fallbackScopeMock = $this->createMock(ScopeInterface::class);
+
+        $this->metadataPoolMock->expects($this->exactly(2))->method('getMetadata')->willReturn($this->metadataMock);
+        $this->metadataMock->expects($this->exactly(2))->method('getEavEntityType')->willReturn($eavEntityType);
+        $this->scopeResolverMock->expects($this->once())
+            ->method('getEntityContext')
+            ->with($eavEntityType, $entityData)
+            ->willReturn([$this->scopeMock]);
+        $this->metadataMock->expects($this->once())->method('getEntityConnection')->willReturn($this->connectionMock);
+        $this->configMock->expects($this->once())
+            ->method('getEntityAttributes')
+            ->with($eavEntityType, $entityDataObject)
+            ->willReturn([$this->attributeMock]);
+        $this->attributeMock->expects($this->once())->method('isStatic')->willReturn(false);
+        $this->attributeMock->expects($this->once())->method('getBackend')->willReturn($abstractBackendMock);
+        $abstractBackendMock->expects($this->once())->method('getTable')->willReturn('some_table');
+        $this->attributeMock->expects($this->exactly(2))->method('getAttributeId')->willReturn($attributeId);
+        $this->attributeMock->expects($this->once())->method('getAttributeCode')->willReturn($attributeCode);
+        $this->connectionMock->expects($this->at(0))->method('select')->willReturn($selectMock);
+        $selectMock->expects($this->at(0))
+            ->method('from')
+            ->with(
+                [
+                    't' => 'some_table',
+                ],
+                [
+                    'value' => 't.value',
+                    'attribute_id' => 't.attribute_id',
+                ]
+            )->willReturnSelf();
+        $this->metadataMock->expects($this->exactly(2))->method('getLinkField')->willReturn('linkField');
+        $selectMock->expects($this->at(1))
+            ->method('where')
+            ->with('linkField = ?', 'theLinkField')
             ->willReturnSelf();
-        $selectMock->method('where')
+        $selectMock->expects($this->at(2))
+            ->method('where')
+            ->with('attribute_id IN (?)', [$attributeId])
             ->willReturnSelf();
-        $connectionMock->method('select')
-            ->willReturn($selectMock);
-        $connectionMock->method('fetchAll')
-            ->willReturn(
+        $this->scopeMock->expects($this->exactly(2))->method('getIdentifier')->willReturn($identifier);
+        $this->connectionMock->expects($this->at(1))
+            ->method('quoteIdentifier')
+            ->with($identifier)
+            ->willReturn("`$identifier`");
+        $selectMock->expects($this->at(3))
+            ->method('where')
+            ->with(
+                "`$identifier` IN (?)",
                 [
-                    [
-                        'attribute_id' => 'attributeId',
-                        'value' => 'attributeValue',
-                    ]
+                    0 => '1',
+                    1 => 0,
                 ]
-            );
-        $this->metadataMock->method('getEntityConnection')
-            ->willReturn($connectionMock);
-        $this->metadataMock->method('getLinkField')
-            ->willReturn('linkField');
-
-        $attributeMock = $this->getMockBuilder(AbstractAttribute::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $attributeMock->method('isStatic')
-            ->willReturn($isStatic);
-        $backendMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $backendMock->method('getTable')
-            ->willReturn('backendTable');
-        $attributeMock->method('getBackend')
-            ->willReturn($backendMock);
-        $attributeMock->method('getAttributeId')
-            ->willReturn('attributeId');
-        $attributeMock->method('getAttributeCode')
-            ->willReturn('attributeCode');
-        $this->configMock->expects($this->exactly($callNum))
+            )->willReturnSelf();
+        $this->scopeMock->expects($this->once())->method('getValue')->willReturn('1');
+        $this->scopeMock->expects($this->exactly(2))->method('getFallback')->willReturn($fallbackScopeMock);
+        $fallbackScopeMock->expects($this->once())->method('getValue')->willReturn(0);
+        $fallbackScopeMock->expects($this->once())->method('getFallback')->willReturn(null);
+        $selectMock->expects($this->at(4))->method('columns')->with($identifier, 't')->willReturnSelf();
+        $this->connectionMock->expects($this->at(2))->method('select')->willReturn($orderedUnionSelectMock);
+
+        $unionSelect = $this->objectManager->getObject(
+            UnionExpression::class,
+            [
+                'parts' => [$selectMock],
+                'type' => 'UNION ALL',
+                'pattern' => '( %s )',
+            ]
+        );
+        $orderedUnionSelectMock->expects($this->once())->method('from')->with(['u' => $unionSelect])->willReturnSelf();
+        $orderedUnionSelectMock->expects($this->once())->method('order')->with($identifier)->willReturnSelf();
+        $this->connectionMock->expects($this->at(3))
+            ->method('fetchAll')
+            ->with($orderedUnionSelectMock)
+            ->willReturn([
+                [
+                    'attribute_id' => '1',
+                    'value' => '1',
+                    'store_id' => '1',
+                ]
+            ]);
+
+        $this->assertEquals($expectedEntityData, $this->readHandler->execute($eavEntityType, $entityData));
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithStaticAttributeAttributes()
+    {
+        $eavEntityType = 'env-entity-type';
+        $entityData = ['linkField' => 'theLinkField'];
+        $entityDataObject = $this->objectManager->getObject(DataObject::class, ['data' => $entityData]);
+        $this->attributeMock = $this->createMock(AbstractAttribute::class);
+
+        $this->metadataPoolMock->expects($this->exactly(2))
+            ->method('getMetadata')
+            ->willReturn($this->metadataMock);
+        $this->metadataMock->expects($this->exactly(2))->method('getEavEntityType')->willReturn($eavEntityType);
+        $this->scopeResolverMock->expects($this->once())
+            ->method('getEntityContext')
+            ->with($eavEntityType, $entityData)
+            ->willReturn([$this->scopeMock]);
+        $this->metadataMock->expects($this->once())->method('getEntityConnection')->willReturn($this->connectionMock);
+        $this->configMock->expects($this->once())
             ->method('getEntityAttributes')
-            ->willReturn([$attributeMock]);
-        $this->assertEquals($expected, $this->readHandler->execute('entity_type', $entityData));
+            ->with($eavEntityType, $entityDataObject)
+            ->willReturn([$this->attributeMock]);
+        $this->attributeMock->expects($this->once())->method('isStatic')->willReturn(true);
+
+        $this->assertEquals($entityData, $this->readHandler->execute($eavEntityType, $entityData));
     }
 
     /**
-     * @return array
+     * @return void
      */
-    public function executeDataProvider()
+    public function testExecuteWithoutAttribute()
     {
-        return [
-            'null entity type' => [null, 0, ['linkField' => 'theLinkField']],
-            'static attribute' => ['env-entity-type', 1, ['linkField' => 'theLinkField']],
-            'non-static attribute' => [
-                'env-entity-type',
-                1,
-                [
-                    'linkField' => 'theLinkField',
-                    'attributeCode' => 'attributeValue'
-                ],
-                false
-            ],
-        ];
+        $entityData = ['linkField' => 'theLinkField'];
+
+        $this->metadataPoolMock->expects($this->once())->method('getMetadata')->willReturn($this->metadataMock);
+        $this->metadataMock->expects($this->once())->method('getEavEntityType')->willReturn(null);
+
+        $this->assertEquals($entityData, $this->readHandler->execute('env-entity-type', $entityData));
     }
 
     /**
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/CodeTest.php b/app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/CodeTest.php
new file mode 100644
index 0000000000000..72bd25cf9b665
--- /dev/null
+++ b/app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/CodeTest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Eav\Test\Unit\Model\Validator\Attribute;
+
+use Magento\Eav\Model\Validator\Attribute\Code;
+use PHPUnit\Framework\TestCase;
+
+class CodeTest extends TestCase
+{
+    /**
+     * Testing \Magento\Eav\Model\Validator\Attribute\Code::isValid
+     *
+     * @dataProvider isValidDataProvider
+     * @param string $attributeCode
+     * @param bool $expected
+     * @throws \Zend_Validate_Exception
+     */
+    public function testIsValid(string $attributeCode, bool $expected)
+    {
+        $validator = new Code();
+        $this->assertEquals($expected, $validator->isValid($attributeCode));
+    }
+
+    /**
+     * Data provider for testIsValid
+     *
+     * @return array
+     */
+    public function isValidDataProvider(): array
+    {
+        return [
+            [
+                'Attribute_code',
+                true
+            ], [
+                'attribute_1',
+                true
+            ],[
+                'Attribute_1',
+                true
+            ], [
+                '_attribute_code',
+                false
+            ], [
+                'attribute.code',
+                false
+            ], [
+                '1attribute_code',
+                false
+            ], [
+                'more_than_60_chars_more_than_60_chars_more_than_60_chars_more',
+                false
+            ], [
+                'container_attribute',
+                false,
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json
index 2f0a7fa3c79a9..0fbb17591a1ba 100644
--- a/app/code/Magento/Eav/composer.json
+++ b/app/code/Magento/Eav/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-eav",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-backend": "100.2.*",
         "magento/module-catalog": "102.0.*",
@@ -11,7 +11,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "101.0.5",
+    "version": "101.0.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Eav/etc/di.xml b/app/code/Magento/Eav/etc/di.xml
index c8afd10aa3eee..9825ed7c177de 100644
--- a/app/code/Magento/Eav/etc/di.xml
+++ b/app/code/Magento/Eav/etc/di.xml
@@ -53,6 +53,7 @@
         </arguments>
     </type>
     <type name="Magento\Eav\Model\Entity\Attribute">
+        <plugin name="eav_code_validator" type="Magento\Eav\Plugin\Model\Entity\Attribute" />
         <arguments>
             <argument name="reservedAttributeList" xsi:type="object">Magento\Catalog\Model\Product\ReservedAttributeList\Proxy</argument>
         </arguments>
diff --git a/app/code/Magento/Eav/i18n/en_US.csv b/app/code/Magento/Eav/i18n/en_US.csv
index 73f8b359d1c1b..c8c376eaa5da8 100644
--- a/app/code/Magento/Eav/i18n/en_US.csv
+++ b/app/code/Magento/Eav/i18n/en_US.csv
@@ -143,3 +143,6 @@ hello,hello
 "The value of attribute not valid","The value of attribute not valid"
 "EAV types and attributes","EAV types and attributes"
 "Entity types declaration cache","Entity types declaration cache"
+"Attribute code ""%1"" is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Attribute code ""%1"" is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
+"An attribute code must not be less than %1 and more than %2 characters.","An attribute code must not be less than %1 and more than %2 characters."
+"""%1"" prefix is reserved by the system and cannot be used in attribute code names.","""%1"" prefix is reserved by the system and cannot be used in attribute code names."
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Action.php b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Action.php
index a2ba63d78d144..65f9e41b074a3 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Action.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Action.php
@@ -41,7 +41,8 @@ public function render(\Magento\Framework\DataObject $row)
      */
     protected function _getEscapedValue($value)
     {
-        return addcslashes(htmlspecialchars($value), '\\\'');
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        return addcslashes($this->escapeHtml($value), '\\\'');
     }
 
     /**
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Sender.php b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Sender.php
index 24c39884661ca..005d211a8962e 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Sender.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Sender.php
@@ -23,7 +23,7 @@ public function render(\Magento\Framework\DataObject $row)
         $str = '';
 
         if ($row->getTemplateSenderName()) {
-            $str .= htmlspecialchars($row->getTemplateSenderName()) . ' ';
+            $str .= $this->escapeHtml($row->getTemplateSenderName()) . ' ';
         }
 
         if ($row->getTemplateSenderEmail()) {
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php b/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php
index 5f22a36510c4e..9096e6c5d9048 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php
@@ -12,8 +12,11 @@
 namespace Magento\Email\Block\Adminhtml\Template;
 
 /**
+ * Template Preview Block
+ *
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
  */
 class Preview extends \Magento\Backend\Block\Widget
 {
@@ -80,7 +83,7 @@ protected function _toHtml()
         $template->revertDesign();
 
         if ($template->isPlain()) {
-            $templateProcessed = "<pre>" . htmlspecialchars($templateProcessed) . "</pre>";
+            $templateProcessed = "<pre>" . $this->escapeHtml($templateProcessed) . "</pre>";
         }
 
         \Magento\Framework\Profiler::stop($this->profilerName);
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php
index eedcf5009ccfa..a609a14f663c1 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Delete.php
@@ -12,9 +12,14 @@ class Delete extends \Magento\Email\Controller\Adminhtml\Email\Template
      * Delete transactional email action
      *
      * @return void
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         $template = $this->_initTemplate('id');
         if ($template->getId()) {
             try {
diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
index a6ecdaf24ebbb..db4a5f1d8c58b 100644
--- a/app/code/Magento/Email/Model/AbstractTemplate.php
+++ b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -14,6 +14,7 @@
 use Magento\Store\Model\Information as StoreInformation;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
+use Magento\MediaStorage\Helper\File\Storage\Database;
 
 /**
  * Template model class
@@ -163,6 +164,11 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
      */
     private $urlModel;
 
+    /**
+     * @var Database
+     */
+    private $fileStorageDatabase;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\View\DesignInterface $design
@@ -177,6 +183,7 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
      * @param \Magento\Framework\Filter\FilterManager $filterManager
      * @param \Magento\Framework\UrlInterface $urlModel
      * @param array $data
+     * @param Database $fileStorageDatabase
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -193,7 +200,8 @@ public function __construct(
         \Magento\Email\Model\TemplateFactory $templateFactory,
         \Magento\Framework\Filter\FilterManager $filterManager,
         \Magento\Framework\UrlInterface $urlModel,
-        array $data = []
+        array $data = [],
+        Database $fileStorageDatabase = null
     ) {
         $this->design = $design;
         $this->area = isset($data['area']) ? $data['area'] : null;
@@ -207,6 +215,8 @@ public function __construct(
         $this->templateFactory = $templateFactory;
         $this->filterManager = $filterManager;
         $this->urlModel = $urlModel;
+        $this->fileStorageDatabase = $fileStorageDatabase ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(Database::class);
         parent::__construct($context, $registry, null, null, $data);
     }
 
@@ -394,6 +404,11 @@ protected function getLogoUrl($store)
         if ($fileName) {
             $uploadDir = \Magento\Email\Model\Design\Backend\Logo::UPLOAD_DIR;
             $mediaDirectory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
+            if ($this->fileStorageDatabase->checkDbUsage() &&
+                !$mediaDirectory->isFile($uploadDir . '/' . $fileName)
+            ) {
+                $this->fileStorageDatabase->saveFileToFilesystem($uploadDir . '/' . $fileName);
+            }
             if ($mediaDirectory->isFile($uploadDir . '/' . $fileName)) {
                 return $this->storeManager->getStore()->getBaseUrl(
                     \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index 7ac9b944d03ed..27aa5adaee8eb 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -321,6 +321,8 @@ public function setDesignParams(array $designParams)
     }
 
     /**
+     * Retrieve CSS processor
+     *
      * @deprecated 100.1.2
      * @return Css\Processor
      */
@@ -333,6 +335,8 @@ private function getCssProcessor()
     }
 
     /**
+     * Retrieve pub directory
+     *
      * @deprecated 100.1.2
      * @param string $dirType
      * @return ReadInterface
@@ -523,6 +527,7 @@ public function mediaDirective($construction)
 
     /**
      * Retrieve store URL directive
+     *
      * Support url and direct_url properties
      *
      * @param string[] $construction
@@ -607,7 +612,7 @@ protected function getTransParameters($value)
         if (preg_match(self::TRANS_DIRECTIVE_REGEX, $value, $matches) !== 1) {
             return ['', []];  // malformed directive body; return without breaking list
         }
-
+        // phpcs:disable Magento2.Functions.DiscouragedFunction
         $text = stripslashes($matches[2]);
 
         $params = [];
@@ -683,7 +688,7 @@ protected function applyModifiers($value, $modifiers)
                     $callback = $modifier;
                 }
                 array_unshift($params, $value);
-                $value = call_user_func_array($callback, $params);
+                $value = $callback(...$params);
             }
         }
         return $value;
@@ -700,7 +705,7 @@ public function modifierEscape($value, $type = 'html')
     {
         switch ($type) {
             case 'html':
-                return htmlspecialchars($value, ENT_QUOTES);
+                return $this->_escaper->escapeHtml($value);
 
             case 'htmlentities':
                 return htmlentities($value, ENT_QUOTES);
@@ -950,6 +955,7 @@ public function getCssFilesContent(array $files)
             }
         } catch (ContentProcessorException $exception) {
             $css = $exception->getMessage();
+            // phpcs:disable Magento2.Exceptions.ThrowCatch
         } catch (\Magento\Framework\View\Asset\File\NotFoundException $exception) {
             $css = '';
         }
@@ -958,6 +964,8 @@ public function getCssFilesContent(array $files)
     }
 
     /**
+     * Apply Inline CSS
+     *
      * Merge HTML and CSS and return HTML that has CSS styles applied "inline" to the HTML tags. This is necessary
      * in order to support all email clients.
      *
diff --git a/app/code/Magento/Email/Test/Mftf/ActionGroup/AdminEmailTemplateActionGroup.xml b/app/code/Magento/Email/Test/Mftf/ActionGroup/AdminEmailTemplateActionGroup.xml
index 4019e0538dd06..b0899c6d5ce4d 100644
--- a/app/code/Magento/Email/Test/Mftf/ActionGroup/AdminEmailTemplateActionGroup.xml
+++ b/app/code/Magento/Email/Test/Mftf/ActionGroup/AdminEmailTemplateActionGroup.xml
@@ -35,7 +35,8 @@
             <argument name="emailTemplate" defaultValue="EmailTemplate"/>
         </arguments>
         <seeInCurrentUrl url="email_template/edit/id" stepKey="seeCreatedTemplateUrl"/>
-        <click selector="{{AdminMainActionsSection.delete}}" stepKey="clickDeleteTemplateButton"/>
+        <!--Do not change it to use element from AdminMainActionsSection. Refer to AdminEmailTemplateEditSection comment -->
+        <click selector="{{AdminEmailTemplateEditSection.delete}}" stepKey="clickDeleteTemplateButton"/>
         <acceptPopup stepKey="acceptDeletingTemplatePopUp"/>
         <see userInput="You deleted the email template." stepKey="seeSuccessfulMessage"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickResetFilterButton"/>
diff --git a/app/code/Magento/Email/Test/Mftf/Section/AdminEmailTemplateEditSection.xml b/app/code/Magento/Email/Test/Mftf/Section/AdminEmailTemplateEditSection.xml
index 9da02b64cb2e7..81c29b28a3fd6 100644
--- a/app/code/Magento/Email/Test/Mftf/Section/AdminEmailTemplateEditSection.xml
+++ b/app/code/Magento/Email/Test/Mftf/Section/AdminEmailTemplateEditSection.xml
@@ -14,5 +14,7 @@
         <element name="templateNameField" type="input" selector="#template_code"/>
         <element name="templateSubjectField" type="input" selector="#template_subject"/>
         <element name="previewTemplateButton" type="button" selector="#preview"/>
+        <!--Do not add time to this element. It call alert when clicking, so adding time will brake test-->
+        <element name="delete" type="button" selector="#delete"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php
index b9a555c3207fc..1a493e23adb53 100644
--- a/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php
+++ b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php
@@ -18,7 +18,15 @@ class SenderTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->sender = $objectManager->getObject(\Magento\Email\Block\Adminhtml\Template\Grid\Renderer\Sender::class);
+        $escaper = $objectManager->getObject(
+            \Magento\Framework\Escaper::class
+        );
+        $this->sender = $objectManager->getObject(
+            \Magento\Email\Block\Adminhtml\Template\Grid\Renderer\Sender::class,
+            [
+                'escaper' => $escaper
+            ]
+        );
     }
 
     /**
diff --git a/app/code/Magento/Email/Test/Unit/Model/BackendTemplateTest.php b/app/code/Magento/Email/Test/Unit/Model/BackendTemplateTest.php
index a3bbae826f15a..849bab969d3be 100644
--- a/app/code/Magento/Email/Test/Unit/Model/BackendTemplateTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/BackendTemplateTest.php
@@ -48,6 +48,11 @@ class BackendTemplateTest extends \PHPUnit\Framework\TestCase
      */
     private $serializerMock;
 
+    /**
+     * @var \Magento\MediaStorage\Helper\File\Storage\Database|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $databaseHelperMock;
+
     protected function setUp()
     {
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -58,14 +63,25 @@ protected function setUp()
         $this->structureMock = $this->createMock(\Magento\Config\Model\Config\Structure::class);
         $this->structureMock->expects($this->any())->method('getFieldPathsByAttribute')->willReturn(['path' => 'test']);
 
+        $this->databaseHelperMock = $this->createMock(\Magento\MediaStorage\Helper\File\Storage\Database::class);
         $this->resourceModelMock = $this->createMock(\Magento\Email\Model\ResourceModel\Template::class);
         $this->resourceModelMock->expects($this->any())->method('getSystemConfigByPathsAndTemplateId')->willReturn(['test_config' => 2015]);
         /** @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManagerMock*/
         $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
         $objectManagerMock->expects($this->any())
             ->method('get')
-            ->with(\Magento\Email\Model\ResourceModel\Template::class)
-            ->will($this->returnValue($this->resourceModelMock));
+            ->willReturnCallback(
+                function ($value) {
+                    switch($value) {
+                        case \Magento\MediaStorage\Helper\File\Storage\Database::class:
+                            return ($this->databaseHelperMock);
+                        case \Magento\Email\Model\ResourceModel\Template::class:
+                            return ($this->resourceModelMock);
+                        default:
+                            return(NULL);
+                    }
+                }
+            );
 
         \Magento\Framework\App\ObjectManager::setInstance($objectManagerMock);
 
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 2eb8f582c54fa..b3f144f507cae 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
@@ -104,9 +104,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->escaper = $this->getMockBuilder(\Magento\Framework\Escaper::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->escaper = $this->objectManager->getObject(\Magento\Framework\Escaper::class);
 
         $this->assetRepo = $this->getMockBuilder(\Magento\Framework\View\Asset\Repository::class)
             ->disableOriginalConstructor()
@@ -158,23 +156,25 @@ protected function setUp()
     protected function getModel($mockedMethods = null)
     {
         return $this->getMockBuilder(\Magento\Email\Model\Template\Filter::class)
-            ->setConstructorArgs([
-                $this->string,
-                $this->logger,
-                $this->escaper,
-                $this->assetRepo,
-                $this->scopeConfig,
-                $this->coreVariableFactory,
-                $this->storeManager,
-                $this->layout,
-                $this->layoutFactory,
-                $this->appState,
-                $this->backendUrlBuilder,
-                $this->emogrifier,
-                $this->configVariables,
-                [],
-                $this->cssInliner,
-            ])
+            ->setConstructorArgs(
+                [
+                    $this->string,
+                    $this->logger,
+                    $this->escaper,
+                    $this->assetRepo,
+                    $this->scopeConfig,
+                    $this->coreVariableFactory,
+                    $this->storeManager,
+                    $this->layout,
+                    $this->layoutFactory,
+                    $this->appState,
+                    $this->backendUrlBuilder,
+                    $this->emogrifier,
+                    $this->configVariables,
+                    [],
+                    $this->cssInliner,
+                ]
+            )
             ->setMethods($mockedMethods)
             ->getMock();
     }
diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json
index bffc825a4c872..4f2c13bfe023b 100644
--- a/app/code/Magento/Email/composer.json
+++ b/app/code/Magento/Email/composer.json
@@ -2,20 +2,21 @@
     "name": "magento/module-email",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-theme": "100.2.*",
         "magento/module-config": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-cms": "102.0.*",
         "magento/module-backend": "100.2.*",
         "magento/module-variable": "100.2.*",
+        "magento/module-media-storage": "100.2.*",
         "magento/framework": "101.0.*"
     },
     "suggest": {
         "magento/module-theme": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
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 c1beb3ecb5a77..1bf0ea947605d 100644
--- a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
@@ -63,10 +63,11 @@ require([
     "jquery",
     "tinymce",
     "Magento_Ui/js/modal/alert",
+    "mage/dataPost",
     "mage/mage",
     "Magento_Variable/variables",
     "prototype"
-], function(jQuery, tinyMCE, alert){
+], function(jQuery, tinyMCE, alert, dataPost){
 
 //<![CDATA[
     jQuery('#email_template_edit_form').mage('form').mage('validation');
@@ -167,7 +168,10 @@ require([
 
         deleteTemplate: function() {
             if(window.confirm("<?= $block->escapeJs($block->escapeHtml(__('Are you sure you want to delete this template?'))) ?>")) {
-                   window.location.href = '<?= $block->escapeJs($block->escapeUrl($block->getDeleteUrl())) ?>';
+                dataPost().postData({
+                    action: '<?= $block->escapeJs($block->escapeUrl($block->getDeleteUrl())) ?>',
+                    data: {}
+                });
             }
         },
 
diff --git a/app/code/Magento/Email/view/frontend/email/header.html b/app/code/Magento/Email/view/frontend/email/header.html
index a6895f629b641..c4f49698dc69b 100644
--- a/app/code/Magento/Email/view/frontend/email/header.html
+++ b/app/code/Magento/Email/view/frontend/email/header.html
@@ -43,8 +43,6 @@
 
                                 {{if logo_height}}
                                     height="{{var logo_height}}"
-                                {{else}}
-                                    height="52"
                                 {{/if}}
 
                                 src="{{var logo_url}}"
diff --git a/app/code/Magento/Email/view/frontend/web/logo_email.png b/app/code/Magento/Email/view/frontend/web/logo_email.png
index d01b530456e81..215e9d06edcdc 100644
Binary files a/app/code/Magento/Email/view/frontend/web/logo_email.png and b/app/code/Magento/Email/view/frontend/web/logo_email.png differ
diff --git a/app/code/Magento/EncryptionKey/composer.json b/app/code/Magento/EncryptionKey/composer.json
index 57298d2a9736b..1f1594e036617 100644
--- a/app/code/Magento/EncryptionKey/composer.json
+++ b/app/code/Magento/EncryptionKey/composer.json
@@ -2,13 +2,13 @@
     "name": "magento/module-encryption-key",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-config": "101.0.*",
         "magento/module-backend": "100.2.*",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "proprietary"
     ],
diff --git a/app/code/Magento/Fedex/Plugin/Block/DataProviders/Tracking/ChangeTitle.php b/app/code/Magento/Fedex/Plugin/Block/DataProviders/Tracking/ChangeTitle.php
new file mode 100644
index 0000000000000..b271251c4d214
--- /dev/null
+++ b/app/code/Magento/Fedex/Plugin/Block/DataProviders/Tracking/ChangeTitle.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Fedex\Plugin\Block\DataProviders\Tracking;
+
+use Magento\Fedex\Model\Carrier;
+use Magento\Shipping\Model\Tracking\Result\Status;
+use Magento\Shipping\Block\DataProviders\Tracking\DeliveryDateTitle as Subject;
+
+/**
+ * Plugin to change delivery date title with FedEx customized value
+ */
+class ChangeTitle
+{
+    /**
+     * Update title in case if Fedex used as carrier
+     *
+     * @param Subject $subject
+     * @param \Magento\Framework\Phrase|string $result
+     * @param Status $trackingStatus
+     * @return \Magento\Framework\Phrase|string
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetTitle(Subject $subject, $result, Status $trackingStatus)
+    {
+        if ($trackingStatus->getCarrier() === Carrier::CODE) {
+            $result = __('Expected Delivery:');
+        }
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Fedex/Plugin/Block/Tracking/PopupDeliveryDate.php b/app/code/Magento/Fedex/Plugin/Block/Tracking/PopupDeliveryDate.php
new file mode 100644
index 0000000000000..e1597707f9d02
--- /dev/null
+++ b/app/code/Magento/Fedex/Plugin/Block/Tracking/PopupDeliveryDate.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Fedex\Plugin\Block\Tracking;
+
+use Magento\Shipping\Block\Tracking\Popup;
+use Magento\Fedex\Model\Carrier;
+use Magento\Shipping\Model\Tracking\Result\Status;
+
+/**
+ * Plugin to update delivery date value in case if Fedex used
+ */
+class PopupDeliveryDate
+{
+    /**
+     * Show only date for expected delivery in case if Fedex is a carrier
+     *
+     * @param Popup $subject
+     * @param string $result
+     * @param string $date
+     * @param string $time
+     * @return string
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterFormatDeliveryDateTime(Popup $subject, $result, $date, $time)
+    {
+        if ($this->getCarrier($subject) === Carrier::CODE) {
+            $result = $subject->formatDeliveryDate($date);
+        }
+        return $result;
+    }
+
+    /**
+     * Retrieve carrier name from tracking info
+     *
+     * @param Popup $subject
+     * @return string
+     */
+    private function getCarrier(Popup $subject): string
+    {
+        foreach ($subject->getTrackingInfo() as $trackingData) {
+            foreach ($trackingData as $trackingInfo) {
+                if ($trackingInfo instanceof Status) {
+                    $carrier = $trackingInfo->getCarrier();
+                    return $carrier;
+                }
+            }
+        }
+        return '';
+    }
+}
diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json
index 55ff9fb83eb68..fb6795306ac54 100644
--- a/app/code/Magento/Fedex/composer.json
+++ b/app/code/Magento/Fedex/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-fedex",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-shipping": "100.2.*",
         "magento/module-directory": "100.2.*",
@@ -15,7 +15,7 @@
         "lib-libxml": "*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Fedex/etc/di.xml b/app/code/Magento/Fedex/etc/di.xml
index f17f8f2afe663..c542b1f04d1eb 100644
--- a/app/code/Magento/Fedex/etc/di.xml
+++ b/app/code/Magento/Fedex/etc/di.xml
@@ -22,4 +22,10 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Shipping\Block\DataProviders\Tracking\DeliveryDateTitle">
+        <plugin name="update_delivery_date_title" type="Magento\Fedex\Plugin\Block\DataProviders\Tracking\ChangeTitle"/>
+    </type>
+    <type name="Magento\Shipping\Block\Tracking\Popup">
+        <plugin name="update_delivery_date_value" type="Magento\Fedex\Plugin\Block\Tracking\PopupDeliveryDate"/>
+    </type>
 </config>
diff --git a/app/code/Magento/GiftMessage/Block/Message/Inline.php b/app/code/Magento/GiftMessage/Block/Message/Inline.php
index 9f68199106cc7..b3b690710ec47 100644
--- a/app/code/Magento/GiftMessage/Block/Message/Inline.php
+++ b/app/code/Magento/GiftMessage/Block/Message/Inline.php
@@ -139,7 +139,7 @@ public function getType()
     /**
      * Define checkout type
      *
-     * @param $type string
+     * @param string $type
      * @return $this
      * @codeCoverageIgnore
      */
@@ -238,7 +238,7 @@ public function getMessage($entity = null)
      */
     public function getItems()
     {
-        if (!$this->getData('items')) {
+        if (!$this->hasData('items')) {
             $items = [];
 
             $entityItems = $this->getEntity()->getAllItems();
@@ -277,13 +277,24 @@ public function countItems()
         return count($this->getItems());
     }
 
+    /**
+     * Call method getItemsHasMessages.
+     *
+     * @deprecated Misspelled method
+     * @see getItemsHasMessages
+     */
+    public function getItemsHasMesssages()
+    {
+        return $this->getItemsHasMessages();
+    }
+
     /**
      * Check if items has messages
      *
      * @return bool
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
-    public function getItemsHasMesssages()
+    public function getItemsHasMessages()
     {
         foreach ($this->getItems() as $item) {
             if ($item->getGiftMessageId()) {
@@ -316,6 +327,21 @@ public function getEscaped($value, $defaultValue = '')
         return $this->escapeHtml(trim($value) != '' ? $value : $defaultValue);
     }
 
+    /**
+     * Check availability of order level functionality.
+     *
+     * @return bool|null
+     */
+    public function isMessagesOrderAvailable()
+    {
+        $entity = $this->getEntity();
+        if (!$entity->hasIsGiftOptionsAvailable()) {
+            $this->_eventManager->dispatch('gift_options_prepare', ['entity' => $entity]);
+        }
+
+        return $entity->getIsGiftOptionsAvailable();
+    }
+
     /**
      * Check availability of giftmessages on order level
      *
@@ -346,7 +372,7 @@ public function isItemMessagesAvailable($item)
     protected function _toHtml()
     {
         // render HTML when messages are allowed for order or for items only
-        if ($this->isItemsAvailable() || $this->isMessagesAvailable()) {
+        if ($this->isItemsAvailable() || $this->isMessagesAvailable() || $this->isMessagesOrderAvailable()) {
             return parent::_toHtml();
         }
         return '';
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml b/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml
new file mode 100644
index 0000000000000..bb3f566f1cbc6
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="EnableGiftMessageForOrder" type="gift_message_config_state">
+        <requiredEntity type="allow_order">AllowGiftMessageForOrder</requiredEntity>
+    </entity>
+    <entity name="AllowGiftMessageForOrder" type="allow_order">
+        <data key="value">1</data>
+    </entity>
+    <entity name="DefaultConfigGiftMessageOptions" type="gift_message_config_state">
+        <requiredEntity type="allow_order">OrderDefault</requiredEntity>
+        <requiredEntity type="allow_items">ItemsDefault</requiredEntity>
+    </entity>
+    <entity name="OrderDefault" type="allow_order">
+        <data key="value">0</data>
+    </entity>
+    <entity name="ItemsDefault" type="allow_items">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml b/app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml
new file mode 100644
index 0000000000000..d4b7997e77d15
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="SalesGiftMessageConfigState" dataType="gift_message_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/sales/" method="POST" successRegex="/messages-message-success/">
+        <object key="groups" dataType="gift_message_config_state">
+            <object key="gift_options" dataType="gift_message_config_state">
+                <object key="fields" dataType="gift_message_config_state">
+                    <object key="allow_order" dataType="allow_order">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="allow_items" dataType="allow_items">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Section/StorefrontCheckoutGiftOptionsSection.xml b/app/code/Magento/GiftMessage/Test/Mftf/Section/StorefrontCheckoutGiftOptionsSection.xml
new file mode 100644
index 0000000000000..f80237fc28423
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Test/Mftf/Section/StorefrontCheckoutGiftOptionsSection.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="StorefrontCheckoutGiftOptionsSection">
+        <element name="addGiftOptionsCheckbox" type="checkbox"
+                 selector="//span[text()='Add Gift Options']/../../input[@class='checkbox']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json
index 6a098af78e28b..1817b60285ae2 100644
--- a/app/code/Magento/GiftMessage/composer.json
+++ b/app/code/Magento/GiftMessage/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-gift-message",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-catalog": "102.0.*",
         "magento/module-checkout": "100.2.*",
@@ -17,7 +17,7 @@
         "magento/module-multishipping": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml
index 15e87b00622ac..264fdab0ade8d 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml
@@ -3,15 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
-<?php if ($block->canDisplayGiftmessageForm()): ?>
+<?php if ($block->canDisplayGiftmessageForm()) : ?>
 <div id="gift_options_giftmessage" class="giftcard-form giftcard-send-form fieldset admin__fieldset">
     <div class="field admin__field">
-        <label class="admin__field-label" for="current_item_giftmessage_sender"><?= /* @escapeNotVerified */ __('From') ?></label>
+        <label class="admin__field-label" for="current_item_giftmessage_sender"><?= $block->escapeHtml(__('From')) ?></label>
         <div class="control admin__field-control">
             <input type="text" class="input-text admin__control-text"
                    name="current_item_giftmessage_sender"
@@ -19,7 +16,7 @@
         </div>
     </div>
     <div class="field admin__field">
-        <label class="admin__field-label" for="current_item_giftmessage_recipient"><?= /* @escapeNotVerified */ __('To') ?></label>
+        <label class="admin__field-label" for="current_item_giftmessage_recipient"><?= $block->escapeHtml(__('To')) ?></label>
         <div class="control admin__field-control">
             <input type="text"
                    class="input-text admin__control-text"
@@ -28,7 +25,7 @@
         </div>
     </div>
     <div class="field admin__field">
-        <label class="admin__field-label" for="current_item_giftmessage_message"><?= /* @escapeNotVerified */ __('Message') ?></label>
+        <label class="admin__field-label" for="current_item_giftmessage_message"><?= $block->escapeHtml(__('Message')) ?></label>
         <div class="control admin__field-control">
             <textarea class="textarea admin__control-textarea"
                       cols="15"
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
index c15d717c2291a..908d6c91bfb5f 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php if ($block->getChildHtml()) :?>
@@ -15,8 +12,8 @@
             <?= $block->getChildHtml() ?>
         </div>
         <div class="ui-dialog-buttonset">
-            <button type="button" class="action-close" id="gift_options_cancel_button"><span><?= /* @escapeNotVerified */ __('Cancel') ?></span></button>
-            <button type="button" class="action-primary" id="gift_options_ok_button"><span><?= /* @escapeNotVerified */ __('OK') ?></span></button>
+            <button type="button" class="action-close" id="gift_options_cancel_button"><span><?= $block->escapeHtml(__('Cancel')) ?></span></button>
+            <button type="button" class="action-primary" id="gift_options_ok_button"><span><?= $block->escapeHtml(__('OK')) ?></span></button>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml
index 377b870ce450a..1833ae0d2e339 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml
@@ -3,29 +3,26 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php $_item = $block->getItem() ?>
-<?php if ($_item): ?>
+<?php if ($_item) : ?>
     <?php $_childHtml = trim($block->getChildHtml('', false));?>
-    <?php if ($_childHtml): ?>
+    <?php if ($_childHtml) : ?>
         <tr class="row-gift-options">
             <td colspan="7">
-                <a class="action-link" href="#" id="gift_options_link_<?= /* @escapeNotVerified */ $_item->getId() ?>"><?= /* @escapeNotVerified */ __('Gift Options') ?></a>
+                <a class="action-link" href="#" id="gift_options_link_<?= (int) $_item->getId() ?>"><?= $block->escapeHtml(__('Gift Options')) ?></a>
                 <script>
 require([
     "Magento_Sales/order/giftoptions_tooltip"
 ], function(){
 
-    giftOptionsTooltip.addTargetLink('gift_options_link_<?= /* @escapeNotVerified */ $_item->getId() ?>', <?= /* @escapeNotVerified */ $_item->getId() ?>);
+    giftOptionsTooltip.addTargetLink('gift_options_link_<?= (int) $_item->getId() ?>', <?= (int) $_item->getId() ?>);
 
 });
 </script>
-                <div id="gift_options_data_<?= /* @escapeNotVerified */ $_item->getId() ?>">
-                    <?= /* @escapeNotVerified */ $_childHtml ?>
+                <div id="gift_options_data_<?= (int) $_item->getId() ?>">
+                    <?= /* @noEscape */ $_childHtml ?>
                 </div>
             </td>
         </tr>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/items.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/items.phtml
index 5b0c61375f8c6..edd08fdddcfb1 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/items.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/items.phtml
@@ -3,21 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
-<?php if ($block->canDisplayGiftMessage()): ?>
+<?php if ($block->canDisplayGiftMessage()) : ?>
     <div class="no-display">
-        <div id="gift-message-form-data-<?= /* @escapeNotVerified */ $block->getItem()->getId() ?>">
+        <div id="gift-message-form-data-<?= (int) $block->getItem()->getId() ?>">
             <?= $block->getFormHtml() ?>
         </div>
 
-        <?php if ($block->getMessageText()): ?>
+        <?php if ($block->getMessageText()) : ?>
         <div class="gift-options-tooltip-content">
-            <div><strong><?= /* @escapeNotVerified */ __('Gift Message') ?></strong>:</div>
-            <div><?= /* @escapeNotVerified */ $block->getMessageText() ?></div>
+            <div><strong><?= $block->escapeHtml(__('Gift Message')) ?></strong>:</div>
+            <div><?= /* @noEscape */ $block->getMessageText() ?></div>
         </div>
         <?php endif; ?>
     </div>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml
index 47b5957fd2765..60a6e1b222b17 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml
@@ -3,29 +3,29 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php $_childHtml = trim($block->getChildHtml('', false)); ?>
-<?php if ($_childHtml): ?>
-<?php $_item = $block->getItem() ?>
-<tr>
-    <td colspan="10" class="last">
-        <a class="action-link" href="#" id="gift_options_link_<?= /* @escapeNotVerified */ $_item->getId() ?>"><?= /* @escapeNotVerified */ __('Gift Options') ?></a>
-        <script>
-require([
-	"Magento_Sales/order/giftoptions_tooltip"
-], function(){
-
-	giftOptionsTooltip.addTargetLink('gift_options_link_<?= /* @escapeNotVerified */ $_item->getId() ?>', <?= /* @escapeNotVerified */ $_item->getId() ?>);
-
-});
-</script>
-        <div id="gift_options_data_<?= /* @escapeNotVerified */ $_item->getId() ?>">
-            <?= /* @escapeNotVerified */ $_childHtml ?>
-        </div>
-    </td>
-</tr>
+<?php if ($_childHtml) : ?>
+    <?php $_item = $block->getItem() ?>
+    <tr>
+        <td colspan="10" class="last">
+            <a class="action-link" href="#" id="gift_options_link_<?= (int) $_item->getId() ?>">
+                <?= $block->escapeHtml(__('Gift Options')) ?>
+            </a>
+            <script>
+    require([
+        "Magento_Sales/order/giftoptions_tooltip"
+    ], function(){
+        giftOptionsTooltip.addTargetLink(
+            'gift_options_link_<?= (int) ($_item->getId()) ?>',
+            <?= (int) $_item->getId() ?>
+        );
+    });
+    </script>
+            <div id="gift_options_data_<?= (int) $_item->getId() ?>">
+                <?= /* @noEscape */ $_childHtml ?>
+            </div>
+        </td>
+    </tr>
 <?php endif ?>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/items.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/items.phtml
index 5680f1ef98a5d..915603e3d7146 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/items.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/items.phtml
@@ -3,24 +3,34 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
-<?php if ($block->canDisplayGiftmessage()): ?>
-<div id="gift-message-form-data-<?= /* @escapeNotVerified */ $block->getItem()->getId() ?>" class="no-display">
-    <form id="<?= /* @escapeNotVerified */ $block->getFieldId('form') ?>" action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>">
-        <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId('type') ?>" name="<?= /* @escapeNotVerified */ $block->getFieldName('type') ?>" value="order_item" />
-        <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId('sender') ?>" name="<?= /* @escapeNotVerified */ $block->getFieldName('sender') ?>" value="<?= /* @escapeNotVerified */ $block->getSender() ?>" />
-        <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId('recipient') ?>" name="<?= /* @escapeNotVerified */ $block->getFieldName('recipient') ?>"  value="<?= /* @escapeNotVerified */ $block->getRecipient() ?>" />
-        <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId('message') ?>" name="<?= /* @escapeNotVerified */ $block->getFieldName('message') ?>"  value="<?= /* @escapeNotVerified */ $block->getMessageText() ?>" />
+<?php if ($block->canDisplayGiftmessage()) : ?>
+<div id="gift-message-form-data-<?= (int) $block->getItem()->getId() ?>" class="no-display">
+    <form id="<?= $block->escapeHtmlAttr($block->getFieldId('form')) ?>"
+          action="<?= $block->escapeUrl($block->getSaveUrl()) ?>">
+        <input type="hidden"
+               id="<?= $block->escapeHtmlAttr($block->getFieldId('type')) ?>"
+               name="<?= $block->escapeHtmlAttr($block->getFieldName('type')) ?>"
+               value="order_item" />
+        <input type="hidden"
+               id="<?= $block->escapeHtmlAttr($block->getFieldId('sender')) ?>"
+               name="<?= $block->escapeHtmlAttr($block->getFieldName('sender')) ?>"
+               value="<?= $block->escapeHtmlAttr($block->getSender()) ?>" />
+        <input type="hidden"
+               id="<?= $block->escapeHtmlAttr($block->getFieldId('recipient')) ?>"
+               name="<?= $block->escapeHtmlAttr($block->getFieldName('recipient')) ?>"
+               value="<?= $block->escapeHtmlAttr($block->getRecipient()) ?>" />
+        <input type="hidden"
+               id="<?= $block->escapeHtmlAttr($block->getFieldId('message')) ?>"
+               name="<?= $block->escapeHtmlAttr($block->getFieldName('message')) ?>"
+               value="<?= $block->escapeHtmlAttr($block->getMessageText()) ?>" />
     </form>
 
-    <?php if ($block->getMessageText()): ?>
+    <?php if ($block->getMessageText()) : ?>
     <div class="gift-options-tooltip-content">
-        <div><strong><?= /* @escapeNotVerified */ __('Gift Message') ?></strong>: </div>
-        <div><?= /* @escapeNotVerified */ $block->getMessageText() ?></div>
+        <div><strong><?= $block->escapeHtml(__('Gift Message')) ?></strong>: </div>
+        <div><?= /* @noEscape */ $block->getMessageText() ?></div>
     </div>
     <?php endif; ?>
 </div>
diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/cart/gift_options.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/cart/gift_options.phtml
index 0211c5464315c..4d8a054e67fc5 100644
--- a/app/code/Magento/GiftMessage/view/frontend/templates/cart/gift_options.phtml
+++ b/app/code/Magento/GiftMessage/view/frontend/templates/cart/gift_options.phtml
@@ -9,11 +9,11 @@
     <script type="text/x-magento-init">
         {
             "#gift-options-cart": {
-                "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
+                "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
             }
         }
     </script>
     <script>
-        window.giftOptionsConfig = <?= /* @escapeNotVerified */ $block->getGiftOptionsConfigJson() ?>;
+        window.giftOptionsConfig = <?= /* @noEscape */ $block->getGiftOptionsConfigJson() ?>;
     </script>
 </div>
diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/cart/item/renderer/actions/gift_options.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/cart/item/renderer/actions/gift_options.phtml
index f98ec0714671a..6fcad0faaa694 100644
--- a/app/code/Magento/GiftMessage/view/frontend/templates/cart/item/renderer/actions/gift_options.phtml
+++ b/app/code/Magento/GiftMessage/view/frontend/templates/cart/item/renderer/actions/gift_options.phtml
@@ -4,19 +4,17 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\GiftMessage\Block\Cart\Item\Renderer\Actions\GiftOptions */
 ?>
-<?php if (!$block->isVirtual()): ?>
-    <div id="gift-options-cart-item-<?= /* @escapeNotVerified */ $block->getItem()->getId() ?>"
-        data-bind="scope:'giftOptionsCartItem-<?= /* @escapeNotVerified */ $block->getItem()->getId() ?>'"
+<?php if (!$block->isVirtual()) : ?>
+    <div id="gift-options-cart-item-<?= (int) $block->getItem()->getId() ?>"
+        data-bind="scope:'giftOptionsCartItem-<?= (int) $block->getItem()->getId() ?>'"
         class="gift-options-cart-item">
         <!-- ko template: getTemplate() --><!-- /ko -->
         <script type="text/x-magento-init">
             {
-                "#gift-options-cart-item-<?= /* @escapeNotVerified */ $block->getItem()->getId() ?>": {
-                    "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
+                "#gift-options-cart-item-<?= (int) $block->getItem()->getId() ?>": {
+                    "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
                 }
             }
         </script>
diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
index dec54cfeb9df9..cbd30be501dce 100644
--- a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
+++ b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
@@ -3,61 +3,62 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+//phpcs:disable Squiz.ControlStructures.ControlSignature
+//phpcs:disable Squiz.WhiteSpace.ScopeClosingBrace
+//phpcs:disable PSR2.ControlStructures.SwitchDeclaration
+//phpcs:disable Magento2.Files.LineLength.MaxExceeded
 ?>
 <?php $_giftMessage = false; ?>
-<?php switch ($block->getCheckoutType()): case 'onepage_checkout': ?>
+<?php switch ($block->getCheckoutType()) : case 'onepage_checkout': ?>
     <fieldset class="fieldset gift-message">
-        <legend class="legend"><span><?= /* @escapeNotVerified */ __('Do you have any gift items in your order?') ?></span></legend><br>
+        <legend class="legend"><span><?= $block->escapeHtml(__('Do you have any gift items in your order?')) ?></span></legend><br>
 
-        <div class="field choice" id="add-gift-options-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>">
+        <div class="field choice" id="add-gift-options-<?= (int) $block->getEntity()->getId() ?>">
             <input type="checkbox" name="allow_gift_options" id="allow_gift_options" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-container"}'<?php if ($block->getItemsHasMesssages() || $block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-            <label for="allow_gift_options" class="label"><span><?= /* @escapeNotVerified */ __('Add Gift Options') ?></span></label>
+            <label for="allow_gift_options" class="label"><span><?= $block->escapeHtml(__('Add Gift Options')) ?></span></label>
         </div>
 
         <dl class="options-items" id="allow-gift-options-container">
             <?php if ($block->isMessagesAvailable()): ?>
-            <dt id="add-gift-options-for-order-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title">
+            <dt id="add-gift-options-for-order-<?= (int) $block->getEntity()->getId() ?>" class="order-title">
                 <div class="field choice">
                     <input type="checkbox" name="allow_gift_messages_for_order" id="allow_gift_options_for_order" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-order-container"}'<?php if ($block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                    <label for="allow_gift_options_for_order" class="label"><span><?= /* @escapeNotVerified */ __('Gift Options for the Entire Order') ?></span></label>
+                    <label for="allow_gift_options_for_order" class="label"><span><?= $block->escapeHtml(__('Gift Options for the Entire Order')) ?></span></label>
                 </div>
             </dt>
 
             <dd id="allow-gift-options-for-order-container" class="order-options">
-                <div class="options-order-container" id="options-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"></div>
+                <div class="options-order-container" id="options-order-container-<?= (int) $block->getEntity()->getId() ?>"></div>
                     <button class="action action-gift"
                             data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#allow-gift-messages-for-order-container"}}'>
-                        <span><?= /* @escapeNotVerified */ __('Gift Message') ?></span>
+                        <span><?= $block->escapeHtml(__('Gift Message')) ?></span>
                     </button>
                     <div id="allow-gift-messages-for-order-container" class="gift-messages-order hidden">
                         <fieldset class="fieldset">
-                            <p><?= /* @escapeNotVerified */ __('Leave this box blank if you don\'t want to leave a gift message for the entire order.') ?></p>
+                            <p><?= $block->escapeHtml(__('Leave this box blank if you don\'t want to leave a gift message for the entire order.')) ?></p>
                             <div class="field from">
-                                <label for="gift-message-whole-from" class="label"><span><?= /* @escapeNotVerified */ __('From') ?></span></label>
+                                <label for="gift-message-whole-from" class="label"><span><?= $block->escapeHtml(__('From')) ?></span></label>
                                 <div class="control">
-                                    <input type="text" name="giftmessage[quote][<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>][from]" id="gift-message-whole-from" title="<?= /* @escapeNotVerified */ __('From') ?>"  value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage()->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
+                                    <input type="text" name="giftmessage[quote][<?= (int) $block->getEntity()->getId() ?>][from]" id="gift-message-whole-from" title="<?= $block->escapeHtmlAttr(__('From')) ?>"  value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
                                 </div>
                             </div>
                             <div class="field to">
-                                <label for="gift-message-whole-to" class="label"><span><?= /* @escapeNotVerified */ __('To') ?></span></label>
+                                <label for="gift-message-whole-to" class="label"><span><?= $block->escapeHtml(__('To')) ?></span></label>
                                 <div class="control">
-                                    <input type="text" name="giftmessage[quote][<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>][to]" id="gift-message-whole-to" title="<?= /* @escapeNotVerified */ __('To') ?>" value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage()->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
+                                    <input type="text" name="giftmessage[quote][<?= (int) $block->getEntity()->getId() ?>][to]" id="gift-message-whole-to" title="<?= $block->escapeHtmlAttr(__('To')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
                                 </div>
                             </div>
                             <div class="field text">
-                                <label for="gift-message-whole-message" class="label"><span><?= /* @escapeNotVerified */ __('Message') ?></span></label>
+                                <label for="gift-message-whole-message" class="label"><span><?= $block->escapeHtml(__('Message')) ?></span></label>
                                 <div class="control">
-                                    <textarea id="gift-message-whole-message" class="input-text" name="giftmessage[quote][<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>][message]" title="<?= /* @escapeNotVerified */ __('Message') ?>" rows="5" cols="10"><?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
+                                    <textarea id="gift-message-whole-message" class="input-text" name="giftmessage[quote][<?= (int) $block->getEntity()->getId() ?>][message]" title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="10"><?= /* @noEscape */ $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
                                 </div>
                             </div>
                         </fieldset>
                         <script>
                             require(['jquery'], function(jQuery){
-                                jQuery('#add-gift-options-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>')
-                                    .add('#add-gift-options-for-order-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>')
+                                jQuery('#add-gift-options-<?= (int) $block->getEntity()->getId() ?>')
+                                    .add('#add-gift-options-for-order-<?= (int) $block->getEntity()->getId() ?>')
                                     .removeClass('hidden');
                             });
                         </script>
@@ -65,72 +66,72 @@
             </dd>
             <?php endif ?>
             <?php if ($block->isItemsAvailable()): ?>
-            <dt id="add-gift-options-for-items-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title individual">
+            <dt id="add-gift-options-for-items-<?= (int) $block->getEntity()->getId() ?>" class="order-title individual">
                 <div class="field choice">
                     <input type="checkbox" name="allow_gift_options_for_items" id="allow_gift_options_for_items" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-items-container"}'<?php if ($block->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                    <label for="allow_gift_options_for_items" class="label"><span><?= /* @escapeNotVerified */ __('Gift Options for Individual Items') ?></span></label>
+                    <label for="allow_gift_options_for_items" class="label"><span><?= $block->escapeHtml(__('Gift Options for Individual Items')) ?></span></label>
                 </div>
             </dt>
 
             <dd id="allow-gift-options-for-items-container" class="order-options individual">
                 <ol class="items">
                     <?php foreach ($block->getItems() as $_index => $_item): ?>
-                    <?php $_product = $_item->getProduct() ?>
-                    <li class="item">
-                         <div class="product">
-                             <div class="number">
-                                 <?= /* @escapeNotVerified */ __('<span>Item %1</span> of %2', $_index+1, $block->countItems()) ?>
-                             </div>
-                             <div class="img photo container">
-                                 <?= $block->getImage($_product, 'gift_messages_checkout_thumbnail')->toHtml() ?>
-                             </div>
-                             <strong class="product name"><?= $block->escapeHtml($_product->getName()) ?></strong>
-                         </div>
-                         <div class="options">
-                             <div class="options-items-container" id="options-items-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-<?= /* @escapeNotVerified */ $_item->getId() ?>"></div>
-                             <?php if ($block->isItemMessagesAvailable($_item)): ?>
-                             <button class="action action-gift"
-                                     data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
-                                 <span><?= /* @escapeNotVerified */ __('Gift Message') ?></span>
-                             </button>
-                             <div id="gift-messages-for-item-container-<?= /* @escapeNotVerified */ $_item->getId() ?>" class="block message hidden">
-                                 <fieldset class="fieldset">
-                                     <p><?= /* @escapeNotVerified */ __('Leave a box blank if you don\'t want to add a gift message for that item.') ?></p>
-                                     <div class="field from">
-                                         <label for="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-from" class="label"><span><?= /* @escapeNotVerified */ __('From') ?></span></label>
-                                         <div class="control">
-                                             <input type="text" name="giftmessage[quote_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][from]" id="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-from" title="<?= /* @escapeNotVerified */ __('From') ?>" value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
-                                         </div>
-                                     </div>
-                                     <div class="field to">
-                                        <label for="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-to" class="label"><span><?= /* @escapeNotVerified */ __('To') ?></span></label>
-                                        <div class="control">
-                                            <input type="text" name="giftmessage[quote_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][to]" id="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-to" title="<?= /* @escapeNotVerified */ __('To') ?>" value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
-                                        </div>
-                                     </div>
-                                     <div class="field text">
-                                         <label for="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-message" class="label"><span><?= /* @escapeNotVerified */ __('Message') ?></span></label>
-                                         <div class="control">
-                                            <textarea id="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][message]" title="<?= /* @escapeNotVerified */ __('Message') ?>" rows="5" cols="40"><?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
-                                         </div>
-                                     </div>
-                                </fieldset>
-                             </div>
-                         <?php endif; ?>
-                         </div>
-                    </li>
+                        <?php $_product = $_item->getProduct() ?>
+                        <li class="item">
+                            <div class="product">
+                                <div class="number">
+                                    <?= $block->escapeHtml(__('<span>Item %1</span> of %2', $_index+1, $block->countItems()), ['span']) ?>
+                                </div>
+                                <div class="img photo container">
+                                    <?= $block->getImage($_product, 'gift_messages_checkout_thumbnail')->toHtml() ?>
+                                </div>
+                                <strong class="product name"><?= $block->escapeHtml($_product->getName()) ?></strong>
+                            </div>
+                            <div class="options">
+                                <div class="options-items-container" id="options-items-container-<?= (int) $block->getEntity()->getId() ?>-<?= (int) $_item->getId() ?>"></div>
+                                <?php if ($block->isItemMessagesAvailable($_item)): ?>
+                                    <button class="action action-gift"
+                                            data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?= (int) $_item->getId() ?>"}}'>
+                                        <span><?= $block->escapeHtml(__('Gift Message')) ?></span>
+                                    </button>
+                                    <div id="gift-messages-for-item-container-<?= (int) $_item->getId() ?>" class="block message hidden">
+                                        <fieldset class="fieldset">
+                                            <p><?= $block->escapeHtml(__('Leave a box blank if you don\'t want to add a gift message for that item.')) ?></p>
+                                            <div class="field from">
+                                                <label for="gift-message-<?= (int) $_item->getId() ?>-from" class="label"><span><?= $block->escapeHtml(__('From')) ?></span></label>
+                                                <div class="control">
+                                                    <input type="text" name="giftmessage[quote_item][<?= (int) $_item->getId() ?>][from]" id="gift-message-<?= (int) $_item->getId() ?>-from" title="<?= $block->escapeHtmlAttr(__('From')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
+                                                </div>
+                                            </div>
+                                            <div class="field to">
+                                                <label for="gift-message-<?= (int) $_item->getId() ?>-to" class="label"><span><?= $block->escapeHtmlAttr(__('To')) ?></span></label>
+                                                <div class="control">
+                                                    <input type="text" name="giftmessage[quote_item][<?= (int) $_item->getId() ?>][to]" id="gift-message-<?= (int) $_item->getId() ?>-to" title="<?= $block->escapeHtmlAttr(__('To')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
+                                                </div>
+                                            </div>
+                                            <div class="field text">
+                                                <label for="gift-message-<?= (int) $_item->getId() ?>-message" class="label"><span><?= $block->escapeHtml(__('Message')) ?></span></label>
+                                                <div class="control">
+                                                    <textarea id="gift-message-<?= (int) $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_item][<?= (int) $_item->getId() ?>][message]" title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="40"><?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
+                                                </div>
+                                            </div>
+                                        </fieldset>
+                                    </div>
+                                <?php endif; ?>
+                            </div>
+                        </li>
                     <?php endforeach; ?>
                 </ol>
             </dd>
             <script>
                 require(['jquery'], function(jQuery){
-                    jQuery('#add-gift-options-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>')
-                        .add('#add-gift-options-for-items-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>')
+                    jQuery('#add-gift-options-<?= (int) $block->getEntity()->getId() ?>')
+                        .add('#add-gift-options-for-items-<?= (int) $block->getEntity()->getId() ?>')
                         .removeClass('hidden');
                 });
             </script>
             <?php endif; ?>
-            <dt class="extra-options-container" id="extra-options-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"></dt>
+            <dt class="extra-options-container" id="extra-options-container-<?= (int) $block->getEntity()->getId() ?>"></dt>
         </dl>
     </fieldset>
     <script type="text/x-magento-init">
@@ -140,126 +141,125 @@
         }
     }
     </script>
-<?php break; ?>
+<?php break;
+case 'multishipping_address': ?>
+    <fieldset id="add-gift-options-<?= (int) $block->getEntity()->getId() ?>" class="fieldset gift-message">
+        <legend class="legend"><span><?= $block->escapeHtml(__('Do you have any gift items in your order?')) ?></span></legend><br>
 
-<?php case 'multishipping_address': ?>
-    <fieldset id="add-gift-options-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="fieldset gift-message">
-        <legend class="legend"><span><?= /* @escapeNotVerified */ __('Do you have any gift items in your order?') ?></span></legend><br>
-
-        <div class="field choice" id="add-gift-options-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>">
-            <input type="checkbox" name="allow_gift_options_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" id="allow_gift_options_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"}'<?php if ($block->getItemsHasMesssages() || $block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-            <label for="allow_gift_options_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="label"><span><?= /* @escapeNotVerified */ __('Add Gift Options') ?></span></label>
+        <div class="field choice" id="add-gift-options-<?= (int) $block->getEntity()->getId() ?>">
+            <input type="checkbox" name="allow_gift_options_<?= (int) $block->getEntity()->getId() ?>" id="allow_gift_options_<?= (int) $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-container-<?= (int) $block->getEntity()->getId() ?>"}'<?php if ($block->getItemsHasMesssages() || $block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
+            <label for="allow_gift_options_<?= (int) $block->getEntity()->getId() ?>" class="label"><span><?= $block->escapeHtml(__('Add Gift Options')) ?></span></label>
         </div>
 
-        <dl class="options-items" id="allow-gift-options-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>">
-            <dt id="add-gift-options-for-order-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title">
+        <dl class="options-items" id="allow-gift-options-container-<?= (int) $block->getEntity()->getId() ?>">
+            <?php if ($block->isMessagesOrderAvailable() || $block->isMessagesAvailable()): ?>
+            <dt id="add-gift-options-for-order-<?= (int) $block->getEntity()->getId() ?>" class="order-title">
                 <div class="field choice">
-                    <input type="checkbox" name="allow_gift_options_for_order_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" id="allow_gift_options_for_order_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"}'<?php if ($block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                    <label for="allow_gift_options_for_order_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="label"><span><?= /* @escapeNotVerified */ __('Add Gift Options for the Entire Order') ?></span></label>
+                    <input type="checkbox" name="allow_gift_options_for_order_<?= (int) $block->getEntity()->getId() ?>" id="allow_gift_options_for_order_<?= (int) $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-order-container-<?= (int) $block->getEntity()->getId() ?>"}'<?php if ($block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
+                    <label for="allow_gift_options_for_order_<?= (int) $block->getEntity()->getId() ?>" class="label"><span><?= $block->escapeHtml(__('Add Gift Options for the Entire Order')) ?></span></label>
                 </div>
             </dt>
 
-            <dd id="allow-gift-options-for-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-options">
-                <div class="options-order-container" id="options-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"></div>
+            <dd id="allow-gift-options-for-order-container-<?= (int) $block->getEntity()->getId() ?>" class="order-options">
+                <div class="options-order-container" id="options-order-container-<?= (int) $block->getEntity()->getId() ?>"></div>
                 <?php if ($block->isMessagesAvailable()): ?>
                     <?php $_giftMessage = true; ?>
                     <button class="action action-gift"
-                            data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"}}'>
-                        <span><?= /* @escapeNotVerified */ __('Gift Message') ?></span>
+                            data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-order-container-<?= (int) $block->getEntity()->getId() ?>"}}'>
+                        <span><?= $block->escapeHtml(__('Gift Message')) ?></span>
                     </button>
-                    <div id="gift-messages-for-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="gift-messages-order hidden">
+                    <div id="gift-messages-for-order-container-<?= (int) $block->getEntity()->getId() ?>" class="gift-messages-order hidden">
                         <fieldset class="fieldset">
-                            <p><?= /* @escapeNotVerified */ __('You can leave this box blank if you don\'t want to add a gift message for this address.') ?></p>
+                            <p><?= $block->escapeHtml(__('You can leave this box blank if you don\'t want to add a gift message for this address.')) ?></p>
                             <div class="field from">
-                                <label for="gift-message-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-from" class="label"><span><?= /* @escapeNotVerified */ __('From') ?></span></label>
+                                <label for="gift-message-<?= (int) $block->getEntity()->getId() ?>-from" class="label"><span><?= $block->escapeHtml(__('From')) ?></span></label>
                                 <div class="control">
-                                    <input type="text" name="giftmessage[quote_address][<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>][from]" id="gift-message-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-from" title="<?= /* @escapeNotVerified */ __('From') ?>" value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage()->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
+                                    <input type="text" name="giftmessage[quote_address][<?= (int) $block->getEntity()->getId() ?>][from]" id="gift-message-<?= (int) $block->getEntity()->getId() ?>-from" title="<?= $block->escapeHtmlAttr(__('From')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
                                 </div>
                             </div>
                             <div class="field to">
-                                <label for="gift-message-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-to" class="label"><span><?= /* @escapeNotVerified */ __('To') ?></span></label>
+                                <label for="gift-message-<?= (int) $block->getEntity()->getId() ?>-to" class="label"><span><?= $block->escapeHtml(__('To')) ?></span></label>
                                 <div class="control">
-                                    <input type="text" name="giftmessage[quote_address][<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>][to]" id="gift-message-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-to" title="<?= /* @escapeNotVerified */ __('To') ?>" value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage()->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
+                                    <input type="text" name="giftmessage[quote_address][<?= (int) $block->getEntity()->getId() ?>][to]" id="gift-message-<?= (int) $block->getEntity()->getId() ?>-to" title="<?= $block->escapeHtmlAttr(__('To')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
                                 </div>
                             </div>
                             <div class="field text">
-                                <label for="gift-message-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-message" class="label"><span><?= /* @escapeNotVerified */ __('Message') ?></span></label>
+                                <label for="gift-message-<?= (int) $block->getEntity()->getId() ?>-message" class="label"><span><?= $block->escapeHtml(__('Message')) ?></span></label>
                                 <div class="control">
-                                    <textarea id="gift-message-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-message" class="input-text" name="giftmessage[quote_address][<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>][message]" title="<?= /* @escapeNotVerified */ __('Message') ?>" rows="5" cols="40"><?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
+                                    <textarea id="gift-message-<?= (int) $block->getEntity()->getId() ?>-message" class="input-text" name="giftmessage[quote_address][<?= (int) $block->getEntity()->getId() ?>][message]" title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="40"><?= /* @noEscape */ $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
                                 </div>
                             </div>
                         </fieldset>
                     </div>
-                 <?php endif; ?>
+                <?php endif; ?>
             </dd>
-
+            <?php endif; ?>
             <?php if ($block->isItemsAvailable()): ?>
-            <dt id="add-gift-options-for-items-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title individual">
+            <dt id="add-gift-options-for-items-<?= (int) $block->getEntity()->getId() ?>" class="order-title individual">
                 <div class="field choice">
-                    <input type="checkbox" name="allow_gift_options_for_items_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" id="allow_gift_options_for_items_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-items-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"}'<?php if ($block->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                    <label for="allow_gift_options_for_items_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="label"><span><?= /* @escapeNotVerified */ __('Add Gift Options for Individual Items') ?></span></label>
+                    <input type="checkbox" name="allow_gift_options_for_items_<?= (int) $block->getEntity()->getId() ?>" id="allow_gift_options_for_items_<?= (int) $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-items-container-<?= (int) $block->getEntity()->getId() ?>"}'<?php if ($block->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?> class="checkbox" />
+                    <label for="allow_gift_options_for_items_<?= (int) $block->getEntity()->getId() ?>" class="label"><span><?= $block->escapeHtml(__('Add Gift Options for Individual Items')) ?></span></label>
                 </div>
             </dt>
 
-            <dd id="allow-gift-options-for-items-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-options individual">
-                 <ol class="items">
-                 <?php foreach ($block->getItems() as $_index => $_item): ?>
-                 <?php $_product = $_item->getProduct() ?>
-                     <li class="item">
-                         <div class="product">
-                             <div class="number"><?= /* @escapeNotVerified */ __('<span>Item %1</span> of %2', $_index+1, $block->countItems()) ?></div>
-                             <div class="img photo container">
-                                 <?= $block->getImage($_product, 'gift_messages_checkout_thumbnail')->toHtml() ?>
-                             </div>
-                             <strong class="product-name"><?= $block->escapeHtml($_product->getName()) ?></strong>
-                         </div>
-                         <div class="options">
-                             <div class="options-items-container" id="options-items-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-<?= /* @escapeNotVerified */ $_item->getId() ?>"></div>
-                             <input type="hidden" name="giftoptions[quote_address_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][address]" value="<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" />
-
-                             <?php if ($block->isItemMessagesAvailable($_item)): ?>
-                             <?php $_giftMessage = true; ?>
-                                 <button class="action action-gift"
-                                         data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
-                                     <span><?= /* @escapeNotVerified */ __('Gift Message') ?></span>
-                                 </button>
-                                 <div id="gift-messages-for-item-container-<?= /* @escapeNotVerified */ $_item->getId() ?>" class="block message hidden">
-                                     <fieldset class="fieldset">
-                                        <p><?= /* @escapeNotVerified */ __('You can leave this box blank if you don\'t want to add a gift message for the item.') ?></p>
-                                         <input type="hidden" name="giftmessage[quote_address_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][address]" value="<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" />
-                                         <div class="field from">
-                                             <label for="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-from" class="label"><span><?= /* @escapeNotVerified */ __('From') ?></span></label>
-                                             <div class="control">
-                                                 <input type="text" name="giftmessage[quote_address_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][from]" id="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-from" title="<?= /* @escapeNotVerified */ __('From') ?>"  value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
-                                             </div>
-                                         </div>
-                                         <div class="field to">
-                                            <label for="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-to" class="label"><span><?= /* @escapeNotVerified */ __('To') ?></span></label>
-                                            <div class="control">
-                                                <input type="text" name="giftmessage[quote_address_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][to]" id="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-to" title="<?= /* @escapeNotVerified */ __('To') ?>" value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
+            <dd id="allow-gift-options-for-items-container-<?= (int) $block->getEntity()->getId() ?>" class="order-options individual">
+                <ol class="items">
+                    <?php foreach ($block->getItems() as $_index => $_item): ?>
+                        <?php $_product = $_item->getProduct() ?>
+                        <li class="item">
+                            <div class="product">
+                                <div class="number"><?= $block->escapeHtml(__('<span>Item %1</span> of %2', $_index+1, $block->countItems()), ['span']) ?></div>
+                                <div class="img photo container">
+                                    <?= $block->getImage($_product, 'gift_messages_checkout_thumbnail')->toHtml() ?>
+                                </div>
+                                <strong class="product-name"><?= $block->escapeHtml($_product->getName()) ?></strong>
+                            </div>
+                            <div class="options">
+                                <div class="options-items-container" id="options-items-container-<?= (int) $block->getEntity()->getId() ?>-<?= (int) $_item->getId() ?>"></div>
+                                <input type="hidden" name="giftoptions[quote_address_item][<?= (int) $_item->getId() ?>][address]" value="<?= (int) $block->getEntity()->getId() ?>" />
+                                <?php if ($block->isItemMessagesAvailable($_item)): ?>
+                                    <?php $_giftMessage = true; ?>
+                                    <button class="action action-gift"
+                                            data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?= (int) $_item->getId() ?>"}}'>
+                                        <span><?= $block->escapeHtml(__('Gift Message')) ?></span>
+                                    </button>
+                                    <div id="gift-messages-for-item-container-<?= (int) $_item->getId() ?>" class="block message hidden">
+                                        <fieldset class="fieldset">
+                                            <p><?= $block->escapeHtml(__('You can leave this box blank if you don\'t want to add a gift message for the item.')) ?></p>
+                                            <input type="hidden" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][address]" value="<?= (int) $block->getEntity()->getId() ?>" />
+                                            <div class="field from">
+                                                <label for="gift-message-<?= (int) $_item->getId() ?>-from" class="label"><span><?= $block->escapeHtml(__('From')) ?></span></label>
+                                                <div class="control">
+                                                    <input type="text" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][from]" id="gift-message-<?= (int) $_item->getId() ?>-from" title="<?= $block->escapeHtmlAttr(__('From')) ?>"  value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
+                                                </div>
                                             </div>
-                                        </div>
-                                         <div class="field text">
-                                             <label for="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-message" class="label"><span><?= /* @escapeNotVerified */ __('Message') ?></span></label>
-                                             <div class="control">
-                                                <textarea id="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_address_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][message]" title="<?= /* @escapeNotVerified */ __('Message') ?>" rows="5" cols="10"><?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
-                                             </div>
-                                         </div>
-                                     </fieldset>
-                                 </div>
-                             <?php endif; ?>
-                         </div>
-                     </li>
-                 <?php endforeach; ?>
-                 </ol>
+                                            <div class="field to">
+                                                <label for="gift-message-<?= (int) $_item->getId() ?>-to" class="label"><span><?= $block->escapeHtml(__('To')) ?></span></label>
+                                                <div class="control">
+                                                    <input type="text" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][to]" id="gift-message-<?= (int) $_item->getId() ?>-to" title="<?= $block->escapeHtmlAttr(__('To')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
+                                                </div>
+                                            </div>
+                                            <div class="field text">
+                                                <label for="gift-message-<?= (int) $_item->getId() ?>-message" class="label"><span><?= $block->escapeHtml(__('Message')) ?></span></label>
+                                                <div class="control">
+                                                    <textarea id="gift-message-<?= (int) $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][message]" title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="10"><?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
+                                                </div>
+                                            </div>
+                                        </fieldset>
+                                    </div>
+                                <?php endif; ?>
+                            </div>
+                        </li>
+                    <?php endforeach; ?>
+                </ol>
             </dd>
             <?php endif; ?>
-            <dt class="extra-options-container" id="extra-options-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"></dt>
+            <dt class="extra-options-container" id="extra-options-container-<?= (int) $block->getEntity()->getId() ?>"></dt>
         </dl>
     </fieldset>
     <script type="text/x-magento-init">
         {
-            "#allow_gift_options_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>, #allow_gift_options_for_order_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>, #allow_gift_options_for_items_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>": {
+            "#allow_gift_options_<?= (int) $block->getEntity()->getId() ?>, #allow_gift_options_for_order_<?= (int) $block->getEntity()->getId() ?>, #allow_gift_options_for_items_<?= (int) $block->getEntity()->getId() ?>": {
                 "giftOptions": {}
             }
         }
diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json
index da44eb6c785d2..514c600294906 100644
--- a/app/code/Magento/GoogleAdwords/composer.json
+++ b/app/code/Magento/GoogleAdwords/composer.json
@@ -2,13 +2,13 @@
     "name": "magento/module-google-adwords",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-sales": "101.0.*",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml b/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
index 9388a3cb6fcfb..31d21117590d9 100644
--- a/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
+++ b/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
@@ -3,8 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
 ?>
 <?php
 /** @var $block \Magento\GoogleAdwords\Block\Code */
@@ -12,19 +10,19 @@
 <!-- Google Code for Sale Conversion Page -->
 <script>
     /* <![CDATA[ */
-    var google_conversion_id = <?= /* @escapeNotVerified */ $block->getHelper()->getConversionId() ?>;
-    var google_conversion_language = "<?= /* @escapeNotVerified */ $block->getHelper()->getConversionLanguage() ?>";
-    var google_conversion_format = "<?= /* @escapeNotVerified */ $block->getHelper()->getConversionFormat() ?>";
-    var google_conversion_color = "<?= /* @escapeNotVerified */ $block->getHelper()->getConversionColor() ?>";
-    var google_conversion_label = "<?= /* @escapeNotVerified */ $block->getHelper()->getConversionLabel() ?>";
-    var google_conversion_value = <?= /* @escapeNotVerified */ $block->getHelper()->getConversionValue() ?>;
+    var google_conversion_id = <?= $block->escapeJs($block->getHelper()->getConversionId()) ?>;
+    var google_conversion_language = "<?= $block->escapeJs($block->getHelper()->getConversionLanguage()) ?>";
+    var google_conversion_format = "<?= $block->escapeJs($block->getHelper()->getConversionFormat()) ?>";
+    var google_conversion_color = "<?= $block->escapeJs($block->getHelper()->getConversionColor()) ?>";
+    var google_conversion_label = "<?= $block->escapeJs($block->getHelper()->getConversionLabel()) ?>";
+    var google_conversion_value = <?= $block->escapeJs($block->getHelper()->getConversionValue()) ?>;
     /* ]]> */
 </script>
-<script src="<?= /* @escapeNotVerified */ $block->getHelper()->getConversionJsSrc() ?>"></script>
+<script src="<?= $block->escapeHtmlAttr($block->getHelper()->getConversionJsSrc()) ?>"></script>
 <noscript>
     <div style="display:inline;">
         <img height="1" width="1" style="border-style:none;" alt=""
-             src="<?= /* @escapeNotVerified */ $block->getHelper()->getConversionImgSrc() ?>"/>
+             src="<?= $block->escapeHtmlAttr($block->getHelper()->getConversionImgSrc()) ?>"/>
     </div>
 </noscript>
 <!-- END Google Code for Sale Conversion Page -->
diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json
index a5ab4caff2927..03b6159d592cb 100644
--- a/app/code/Magento/GoogleAnalytics/composer.json
+++ b/app/code/Magento/GoogleAnalytics/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-google-analytics",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-sales": "101.0.*",
         "magento/framework": "101.0.*",
@@ -12,7 +12,7 @@
         "magento/module-config": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml b/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml
index ed8c0e3fe3cc8..f1c850087b347 100644
--- a/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml
+++ b/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block \Magento\GoogleAnalytics\Block\Ga */ ?>
 <?php $accountId = $block->getConfig(\Magento\GoogleAnalytics\Helper\Data::XML_PATH_ACCOUNT) ?>
@@ -16,9 +13,9 @@
         "Magento_GoogleAnalytics/js/google-analytics": {
             "isCookieRestrictionModeEnabled": <?= (int)$block->isCookieRestrictionModeEnabled() ?>,
             "currentWebsite": <?= (int)$block->getCurrentWebsiteId() ?>,
-            "cookieName": "<?= /* @escapeNotVerified */ \Magento\Cookie\Helper\Cookie::IS_USER_ALLOWED_SAVE_COOKIE ?>",
-            "ordersTrackingData": <?= /* @escapeNotVerified */ json_encode($block->getOrdersTrackingData()) ?>,
-            "pageTrackingData": <?= /* @escapeNotVerified */ json_encode($block->getPageTrackingData($accountId)) ?>
+            "cookieName": "<?= /* @noEscape */ \Magento\Cookie\Helper\Cookie::IS_USER_ALLOWED_SAVE_COOKIE ?>",
+            "ordersTrackingData": <?= /* @noEscape */ json_encode($block->getOrdersTrackingData()) ?>,
+            "pageTrackingData": <?= /* @noEscape */ json_encode($block->getPageTrackingData($accountId)) ?>
         }
     }
 }
diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json
index a84645b897298..08eee723a118a 100644
--- a/app/code/Magento/GoogleOptimizer/composer.json
+++ b/app/code/Magento/GoogleOptimizer/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-google-optimizer",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-google-analytics": "100.2.*",
         "magento/module-catalog": "102.0.*",
@@ -12,7 +12,7 @@
         "magento/module-ui": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json
index 09d5f8894b354..103803024b626 100644
--- a/app/code/Magento/GroupedImportExport/composer.json
+++ b/app/code/Magento/GroupedImportExport/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-grouped-import-export",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-catalog": "102.0.*",
         "magento/module-import-export": "100.2.*",
         "magento/module-catalog-import-export": "100.2.*",
@@ -11,7 +11,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
index 7bdf7c0112795..ec0157bdfcfe5 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
@@ -208,7 +208,7 @@ public function getAssociatedProducts($product)
             $collection = $this->getAssociatedProductCollection(
                 $product
             )->addAttributeToSelect(
-                ['name', 'price', 'special_price', 'special_from_date', 'special_to_date', 'tax_class_id']
+                ['name', 'price', 'special_price', 'special_from_date', 'special_to_date', 'tax_class_id', 'image']
             )->addFilterByRequiredOptions()->setPositionOrder()->addStoreFilter(
                 $this->getStoreFilter($product)
             )->addAttributeToFilter(
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminGroupedProductActionGroup.xml b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminGroupedProductActionGroup.xml
new file mode 100644
index 0000000000000..b827115f6e066
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminGroupedProductActionGroup.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="AdminAssignProductToGroup">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+
+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToGroupedSection"/>
+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" visible="false" stepKey="openGroupedProductsSection"/>
+        <click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="clickAddProductsToGroup"/>
+        <conditionalClick selector="{{AdminAddProductsToGroupPanelSection.clearFilters}}" dependentSelector="{{AdminAddProductsToGroupPanelSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
+        <click selector="{{AdminAddProductsToGroupPanelSection.filters}}" stepKey="showFiltersPanel"/>
+        <fillField userInput="{{product.name}}" selector="{{AdminAddProductsToGroupPanelSection.nameFilter}}" stepKey="fillNameFilter"/>
+        <click selector="{{AdminAddProductsToGroupPanelSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <click selector="{{AdminAddProductsToGroupPanelSection.firstCheckbox}}" stepKey="selectProduct"/>
+        <click selector="{{AdminAddProductsToGroupPanelSection.addSelectedProducts}}" stepKey="clickAddSelectedGroupProducts"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AssertLinkPresenceOnGroupedProductPageActionGroup.xml b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AssertLinkPresenceOnGroupedProductPageActionGroup.xml
new file mode 100644
index 0000000000000..bce78f8bf9961
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AssertLinkPresenceOnGroupedProductPageActionGroup.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">
+    <!-- Check for the product link. -->
+    <!-- Assumes web client is on Grouped Product Page -->
+    <actionGroup name="AssertLinkPresenceOnGroupedProductPage">
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <see selector="{{StorefrontProductInfoMainSection.groupedProductsTable}}" userInput="{{productName}}" stepKey="seeFirstStagedGroupedProduct"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
index e760b877fa33d..4d979953a934e 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
@@ -8,6 +8,15 @@
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="GroupedProduct" type="product">
+        <data key="sku" unique="suffix">groupedproduct</data>
+        <data key="type_id">grouped</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name" unique="suffix">GroupedProduct</data>
+        <data key="status">1</data>
+        <data key="urlKey" unique="suffix">groupedproduct</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+    </entity>
     <entity name="ApiGroupedProduct" type="product3">
         <data key="sku" unique="suffix">api-grouped-product</data>
         <data key="type_id">grouped</data>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Page/AdminOrderCreatePage.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Page/AdminOrderCreatePage.xml
new file mode 100644
index 0000000000000..d9c6c4023c07d
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Page/AdminOrderCreatePage.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="AdminOrderCreatePage" url="sales/order_create/index" area="admin" module="Magento_Sales">
+        <section name="AdminOrderConfigureGroupedProductSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Page/AdminProductCreatePage.xml
new file mode 100644
index 0000000000000..4fd214111de93
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
+        <section name="AdminAddProductsToGroupPanelSection"/>
+        <section name="AdminProductFormGroupedProductsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminAddProductsToGroupPanelSection.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminAddProductsToGroupPanelSection.xml
new file mode 100644
index 0000000000000..a0de10e580dea
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminAddProductsToGroupPanelSection.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="AdminAddProductsToGroupPanelSection">
+        <element name="addSelectedProducts" type="button" selector=".product_form_product_form_grouped_grouped_products_modal button.action-primary" timeout="30"/>
+        <element name="clearFilters" type="button" selector=".product_form_product_form_grouped_grouped_products_modal [data-action='grid-filter-reset']" timeout="30"/>
+        <element name="filters" type="button" selector=".product_form_product_form_grouped_grouped_products_modal [data-action='grid-filter-expand']" timeout="30"/>
+        <element name="applyFilters" type="button" selector=".product_form_product_form_grouped_grouped_products_modal [data-action='grid-filter-apply']" timeout="30"/>
+        <element name="nameFilter" type="input" selector=".product_form_product_form_grouped_grouped_products_modal [name='name']"/>
+        <element name="firstCheckbox" type="input" selector=".product_form_product_form_grouped_grouped_products_modal tr[data-repeat-index='0'] .admin__control-checkbox"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminOrderConfigureGroupedProductSection.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminOrderConfigureGroupedProductSection.xml
new file mode 100644
index 0000000000000..04f9f68a27589
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminOrderConfigureGroupedProductSection.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="AdminOrderConfigureGroupedProductSection">
+        <element name="configureProductOk" type="button" selector="[data-role='modal']._show [data-role='action']" timeout="30"/>
+        <element name="configureProductQtyField" type="input" selector="#super-product-table tr:nth-of-type({{index}}) td.col-qty input.qty" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminProductFormGroupedProductsSection.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminProductFormGroupedProductsSection.xml
new file mode 100644
index 0000000000000..5d9e35adca664
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminProductFormGroupedProductsSection.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="AdminProductFormGroupedProductsSection">
+        <element name="toggleGroupedProduct" type="button" selector="[data-index=grouped] .admin__collapsible-title"/>
+        <element name="addProductsToGroup" type="button" selector="[data-index=grouped] button[data-index='grouped_products_button']" timeout="30"/>
+        <element name="nextActionButton" type="button" selector="[data-index='grouped'] .action-next"/>
+        <element name="previousActionButton" type="button" selector="[data-index='grouped'] .action-previous"/>
+        <element name="positionProduct" type="input" selector="[data-index='grouped'] tr[class*='data-row']:nth-child({{arg}}) td[data-index='positionCalculated'] .position-widget-input" parameterized="true"/>
+        <element name="nameProductFromGrid" type="text" selector="[data-index='grouped'] tr[class*='data-row']:nth-child({{arg}}) td[data-index='name'] .admin__field-control span" parameterized="true"/>
+        <element name="buttonContainer" type="block" selector="[data-index='grouped_products_button_set']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
new file mode 100644
index 0000000000000..45d8e63343734
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductInfoMainSection">
+        <element name="groupedProductsTable" type="text" selector="#super-product-table .product-item-name"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminSortingAssociatedProductsTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminSortingAssociatedProductsTest.xml
new file mode 100644
index 0000000000000..d1e1a36285890
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminSortingAssociatedProductsTest.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="AdminSortingAssociatedProductsTest">
+        <annotations>
+            <features value="GroupedProduct"/>
+            <stories value="MAGETWO-90189: Grouped Products: Associated Products Can't Be Sorted Between Pages"/>
+            <title value="Grouped Products: Sorting Associated Products Between Pages"/>
+            <description value="Make sure that products in grid were recalculated when sorting associated products between pages"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-96474"/>
+            <group value="groupedProduct"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <!-- Create 23 products so that grid can have more than one page -->
+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct1">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct2">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct3">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct4">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct5">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct6">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct7">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct8">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct9">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct10">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct11">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct12">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct13">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct14">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct15">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct16">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct17">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct18">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct19">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct20">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct21">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct22">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <!--Delete created products-->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="GroupedProduct"/>
+            </actionGroup>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="createProduct1" stepKey="deleteProduct2"/>
+            <deleteData createDataKey="createProduct2" stepKey="deleteProduct3"/>
+            <deleteData createDataKey="createProduct3" stepKey="deleteProduct4"/>
+            <deleteData createDataKey="createProduct4" stepKey="deleteProduct5"/>
+            <deleteData createDataKey="createProduct5" stepKey="deleteProduct6"/>
+            <deleteData createDataKey="createProduct6" stepKey="deleteProduct7"/>
+            <deleteData createDataKey="createProduct7" stepKey="deleteProduct8"/>
+            <deleteData createDataKey="createProduct8" stepKey="deleteProduct9"/>
+            <deleteData createDataKey="createProduct9" stepKey="deleteProduct10"/>
+            <deleteData createDataKey="createProduct10" stepKey="deleteProduct11"/>
+            <deleteData createDataKey="createProduct11" stepKey="deleteProduct12"/>
+            <deleteData createDataKey="createProduct12" stepKey="deleteProduct13"/>
+            <deleteData createDataKey="createProduct13" stepKey="deleteProduct14"/>
+            <deleteData createDataKey="createProduct14" stepKey="deleteProduct15"/>
+            <deleteData createDataKey="createProduct15" stepKey="deleteProduct16"/>
+            <deleteData createDataKey="createProduct16" stepKey="deleteProduct17"/>
+            <deleteData createDataKey="createProduct17" stepKey="deleteProduct18"/>
+            <deleteData createDataKey="createProduct18" stepKey="deleteProduct19"/>
+            <deleteData createDataKey="createProduct19" stepKey="deleteProduct20"/>
+            <deleteData createDataKey="createProduct20" stepKey="deleteProduct21"/>
+            <deleteData createDataKey="createProduct21" stepKey="deleteProduct22"/>
+            <deleteData createDataKey="createProduct22" stepKey="deleteProduct23"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create grouped Product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillProductForm">
+            <argument name="product" value="GroupedProduct"/>
+        </actionGroup>
+
+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToGroupedSection"/>
+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}"
+                          dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}"
+                          visible="false"
+                          stepKey="openGroupedProductsSection"
+        />
+
+        <click selector="{{AdminProductFormGroupedProductsSection.buttonContainer}}" stepKey="moveFocusToGroup"/>
+        <click selector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}" stepKey="clickAddProductsToGroup"/>
+        <waitForElementVisible selector="{{AdminAddProductsToGroupPanelSection.filters}}" stepKey="waitForGroupedProductModal"/>
+        <actionGroup ref="AdminGridFilterSearchResultsByInput" stepKey="filterSimplesForGroupedProduct">
+            <argument name="inputName" value="sku"/>
+            <argument name="value" value="{{ApiSimpleProduct.sku}}"/>
+        </actionGroup>
+
+        <!-- Select all, then start the bulk update attributes flow -->
+        <click selector="{{AdminProductGridSection.multicheckDropdown}}" stepKey="openMulticheckDropdown"/>
+        <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGrid"/>
+        <click selector="{{AdminAddProductsToGroupPanelSection.addSelectedProducts}}" stepKey="clickAddSelectedGroupProducts"/>
+
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!--Open created Grouped Product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
+        <actionGroup ref="searchAdminDataGridByKeyword" stepKey="searchProductGridForm">
+            <argument name="keyword" value="GroupedProduct.name"/>
+        </actionGroup>
+        <click selector="{{AdminProductGridSection.selectRowBasedOnName(GroupedProduct.name)}}" stepKey="openGroupedProduct"/>
+        <waitForPageLoad stepKey="waitForProductEditPageLoad"/>
+
+        <scrollTo selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}" x="0" y="-100" stepKey="scrollToGroupedSection2"/>
+        <conditionalClick selector="{{AdminProductFormGroupedProductsSection.toggleGroupedProduct}}"
+                          dependentSelector="{{AdminProductFormGroupedProductsSection.addProductsToGroup}}"
+                          visible="false"
+                          stepKey="openGroupedProductsSection2"
+        />
+
+        <!--Change position value for the Product Position 0-->
+        <grabTextFrom selector="{{AdminProductFormGroupedProductsSection.nameProductFromGrid('1')}}" stepKey="grabNameProductPosition0"/>
+        <grabTextFrom selector="{{AdminProductFormGroupedProductsSection.nameProductFromGrid('2')}}" stepKey="grabNameProductPositionFirst"/>
+        <fillField selector="{{AdminProductFormGroupedProductsSection.positionProduct('1')}}" userInput="21" stepKey="fillFieldProductPosition0"/>
+        <click selector="{{AdminProductFormGroupedProductsSection.nextActionButton}}" stepKey="clickButton"/>
+        <waitForAjaxLoad stepKey="waitForAjax"/>
+
+        <!--Go to next page and verify that Products in grid were recalculated-->
+        <click selector="{{AdminProductFormGroupedProductsSection.nextActionButton}}" stepKey="clickNextActionButton"/>
+        <waitForAjaxLoad stepKey="waitForAjax1"/>
+
+        <grabTextFrom selector="{{AdminProductFormGroupedProductsSection.nameProductFromGrid('2')}}" stepKey="grabNameProductPosition21"/>
+        <assertEquals stepKey="assertProductsRecalculated">
+            <actualResult type="string">$grabNameProductPosition0</actualResult>
+            <expectedResult type="string">$grabNameProductPosition21</expectedResult>
+        </assertEquals>
+
+        <!--Change position value for the product to 1-->
+        <fillField selector="{{AdminProductFormGroupedProductsSection.positionProduct('2')}}" userInput="1" stepKey="fillFieldProductPosition1"/>
+        <click selector="{{AdminProductFormGroupedProductsSection.previousActionButton}}" stepKey="clickButton2"/>
+        <waitForAjaxLoad stepKey="waitForAjax2"/>
+
+        <!--Go to previous page and verify that Products in grid were recalculated-->
+        <click selector="{{AdminProductFormGroupedProductsSection.previousActionButton}}" stepKey="clickPreviousActionButton"/>
+        <waitForAjaxLoad stepKey="waitForAjax3"/>
+        <grabTextFrom selector="{{AdminProductFormGroupedProductsSection.nameProductFromGrid('2')}}" stepKey="grabNameProductPosition2"/>
+        <grabTextFrom selector="{{AdminProductFormGroupedProductsSection.nameProductFromGrid('1')}}" stepKey="grabNameProductPositionZero"/>
+        <assertEquals stepKey="assertProductsRecalculated2">
+            <actualResult type="string">$grabNameProductPosition2</actualResult>
+            <expectedResult type="string">$grabNameProductPosition0</expectedResult>
+        </assertEquals>
+        <assertEquals stepKey="assertProductsRecalculated3">
+            <actualResult type="string">$grabNameProductPositionFirst</actualResult>
+            <expectedResult type="string">$grabNameProductPositionZero</expectedResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/Grouped/PriceTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/Grouped/PriceTest.php
index f02849c244cb3..1023dcf552d2f 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/Grouped/PriceTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/Grouped/PriceTest.php
@@ -64,7 +64,7 @@ public function testGetFinalPrice(
         $expectedFinalPrice
     ) {
         $rawFinalPrice = 10;
-        $rawPriceCheckStep = 6;
+        $rawPriceCheckStep = 5;
 
         $this->productMock->expects(
             $this->any()
@@ -155,7 +155,7 @@ public function getFinalPriceDataProvider()
             'custom_option_null' => [
                 'associatedProducts' => [],
                 'options' => [[], []],
-                'expectedPriceCall' => 6, /* product call number to check final price formed correctly */
+                'expectedPriceCall' => 5, /* product call number to check final price formed correctly */
                 'expectedFinalPrice' => 10, /* 10(product price) + 2(options count) * 5(qty) * 5(option price) */
             ],
             'custom_option_exist' => [
@@ -165,9 +165,9 @@ public function getFinalPriceDataProvider()
                     ['associated_product_2', $optionMock],
                     ['associated_product_3', $optionMock],
                 ],
-                'expectedPriceCall' => 16, /* product call number to check final price formed correctly */
+                'expectedPriceCall' => 15, /* product call number to check final price formed correctly */
                 'expectedFinalPrice' => 35, /* 10(product price) + 2(options count) * 5(qty) * 5(option price) */
-            ]
+            ],
         ];
     }
 
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GroupedTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GroupedTest.php
index 6ef87117deae2..ad4b86351a66c 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GroupedTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GroupedTest.php
@@ -21,6 +21,9 @@
 use Magento\GroupedProduct\Model\Product\Type\Grouped as GroupedProductType;
 use Magento\GroupedProduct\Ui\DataProvider\Product\Form\Modifier\Grouped;
 use Magento\Store\Api\Data\StoreInterface;
+use Magento\Catalog\Model\Product;
+use Magento\GroupedProduct\Model\Product\Link\CollectionProvider\Grouped as GroupedProducts;
+use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;
 
 /**
  * Class GroupedTest
@@ -34,6 +37,7 @@ class GroupedTest extends AbstractModifierTest
     const LINKED_PRODUCT_NAME = 'linked';
     const LINKED_PRODUCT_QTY = '0';
     const LINKED_PRODUCT_POSITION = 1;
+    const LINKED_PRODUCT_POSITION_CALCULATED = 1;
     const LINKED_PRODUCT_PRICE = '1';
 
     /**
@@ -81,23 +85,38 @@ class GroupedTest extends AbstractModifierTest
      */
     protected $storeMock;
 
+    /**
+     * @var GroupedProducts|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $groupedProductsMock;
+
+    /**
+     * @var ProductLinkInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productLinkFactoryMock;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = new ObjectManager($this);
         $this->locatorMock = $this->getMockBuilder(LocatorInterface::class)
             ->getMockForAbstractClass();
-        $this->productMock = $this->getMockBuilder(ProductInterface::class)
+        $this->productMock = $this->getMockBuilder(Product::class)
             ->setMethods(['getId', 'getTypeId'])
-            ->getMockForAbstractClass();
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->productMock->expects($this->any())
             ->method('getId')
             ->willReturn(self::PRODUCT_ID);
         $this->productMock->expects($this->any())
             ->method('getTypeId')
             ->willReturn(GroupedProductType::TYPE_CODE);
-        $this->linkedProductMock = $this->getMockBuilder(ProductInterface::class)
+        $this->linkedProductMock = $this->getMockBuilder(Product::class)
             ->setMethods(['getId', 'getName', 'getPrice'])
-            ->getMockForAbstractClass();
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->linkedProductMock->expects($this->any())
             ->method('getId')
             ->willReturn(self::LINKED_PRODUCT_ID);
@@ -134,7 +153,7 @@ protected function setUp()
         $this->linkRepositoryMock->expects($this->any())
             ->method('getList')
             ->with($this->productMock)
-            ->willReturn([$this->linkMock]);
+            ->willReturn([$this->linkedProductMock]);
         $this->productRepositoryMock = $this->getMockBuilder(ProductRepositoryInterface::class)
             ->setMethods(['get'])
             ->getMockForAbstractClass();
@@ -154,7 +173,7 @@ protected function setUp()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function createModel()
     {
@@ -168,6 +187,16 @@ protected function createModel()
             ->setMethods(['init', 'getUrl'])
             ->disableOriginalConstructor()
             ->getMock();
+
+        $this->groupedProductsMock = $this->getMockBuilder(GroupedProducts::class)
+            ->setMethods(['getLinkedProducts'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->productLinkFactoryMock = $this->getMockBuilder(ProductLinkInterfaceFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
         $this->imageHelperMock->expects($this->any())
             ->method('init')
             ->willReturn($this->imageHelperMock);
@@ -188,16 +217,23 @@ protected function createModel()
             'localeCurrency' => $this->currencyMock,
             'imageHelper' => $this->imageHelperMock,
             'attributeSetRepository' => $this->attributeSetRepositoryMock,
+            'groupedProducts' => $this->groupedProductsMock,
+            'productLinkFactory' => $this->productLinkFactoryMock,
         ]);
     }
 
+    /**
+     * Assert array has key
+     *
+     * @return void
+     */
     public function testModifyMeta()
     {
         $this->assertArrayHasKey(Grouped::GROUP_GROUPED, $this->getModel()->modifyMeta([]));
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function testModifyData()
     {
@@ -212,6 +248,7 @@ public function testModifyData()
                             'price' => null,
                             'qty' => self::LINKED_PRODUCT_QTY,
                             'position' => self::LINKED_PRODUCT_POSITION,
+                            'positionCalculated' => self::LINKED_PRODUCT_POSITION_CALCULATED,
                             'thumbnail' => null,
                             'type_id' => null,
                             'status' => null,
@@ -224,6 +261,42 @@ public function testModifyData()
                 ],
             ],
         ];
-        $this->assertSame($expectedData, $this->getModel()->modifyData([]));
+        $model = $this->getModel();
+        $linkedProductMock = $this->getMockBuilder(Product::class)
+            ->setMethods(['getId', 'getName', 'getPrice', 'getSku', 'getImage', 'getPosition', 'getQty'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $linkedProductMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(self::LINKED_PRODUCT_ID);
+        $linkedProductMock->expects($this->once())
+            ->method('getName')
+            ->willReturn(self::LINKED_PRODUCT_NAME);
+        $linkedProductMock->expects($this->once())
+            ->method('getPrice')
+            ->willReturn(self::LINKED_PRODUCT_PRICE);
+        $linkedProductMock->expects($this->once())
+            ->method('getSku')
+            ->willReturn(self::LINKED_PRODUCT_SKU);
+        $linkedProductMock->expects($this->once())
+            ->method('getImage')
+            ->willReturn('');
+        $linkedProductMock->expects($this->exactly(2))
+            ->method('getPosition')
+            ->willReturn(self::LINKED_PRODUCT_POSITION);
+        $linkedProductMock->expects($this->once())
+            ->method('getQty')
+            ->willReturn(self::LINKED_PRODUCT_QTY);
+        $this->groupedProductsMock->expects($this->once())
+            ->method('getLinkedProducts')
+            ->willReturn([$linkedProductMock]);
+        $linkMock = $this->getMockBuilder(ProductLinkInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->productLinkFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($linkMock);
+
+        $this->assertSame($expectedData, $model->modifyData([]));
     }
 }
diff --git a/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/Grouped.php b/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/Grouped.php
index 2d1a1d19757e2..ce221935c62bd 100644
--- a/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/Grouped.php
@@ -21,6 +21,9 @@
 use Magento\Eav\Api\AttributeSetRepositoryInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Framework\Locale\CurrencyInterface;
+use Magento\GroupedProduct\Model\Product\Link\CollectionProvider\Grouped as GroupedProducts;
+use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;
 
 /**
  * Data provider for Grouped products
@@ -99,6 +102,16 @@ class Grouped extends AbstractModifier
      */
     private static $codeQty = 'qty';
 
+    /**
+     * @var GroupedProducts
+     */
+    private $groupedProducts;
+
+    /**
+     * @var ProductLinkInterfaceFactory
+     */
+    private $productLinkFactory;
+
     /**
      * @param LocatorInterface $locator
      * @param UrlInterface $urlBuilder
@@ -109,6 +122,9 @@ class Grouped extends AbstractModifier
      * @param AttributeSetRepositoryInterface $attributeSetRepository
      * @param CurrencyInterface $localeCurrency
      * @param array $uiComponentsConfig
+     * @param GroupedProducts|null $groupedProducts
+     * @param ProductLinkInterfaceFactory|null $productLinkFactory
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         LocatorInterface $locator,
@@ -119,7 +135,9 @@ public function __construct(
         Status $status,
         AttributeSetRepositoryInterface $attributeSetRepository,
         CurrencyInterface $localeCurrency,
-        array $uiComponentsConfig = []
+        array $uiComponentsConfig = [],
+        GroupedProducts $groupedProducts = null,
+        ProductLinkInterfaceFactory $productLinkFactory = null
     ) {
         $this->locator = $locator;
         $this->urlBuilder = $urlBuilder;
@@ -130,10 +148,13 @@ public function __construct(
         $this->status = $status;
         $this->localeCurrency = $localeCurrency;
         $this->uiComponentsConfig = array_replace_recursive($this->uiComponentsConfig, $uiComponentsConfig);
+        $this->groupedProducts = $groupedProducts ?: ObjectManager::getInstance()->get(GroupedProducts::class);
+        $this->productLinkFactory = $productLinkFactory ?: ObjectManager::getInstance()
+            ->get(ProductLinkInterfaceFactory::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyData(array $data)
     {
@@ -143,13 +164,15 @@ public function modifyData(array $data)
         if ($modelId) {
             $storeId = $this->locator->getStore()->getId();
             $data[$product->getId()]['links'][self::LINK_TYPE] = [];
-            foreach ($this->productLinkRepository->getList($product) as $linkItem) {
-                if ($linkItem->getLinkType() !== self::LINK_TYPE) {
-                    continue;
-                }
+            $linkedItems = $this->groupedProducts->getLinkedProducts($product);
+            usort($linkedItems, function ($a, $b) {
+                return $a->getPosition() <=> $b->getPosition();
+            });
+            $productLink = $this->productLinkFactory->create();
+            foreach ($linkedItems as $index => $linkItem) {
                 /** @var \Magento\Catalog\Api\Data\ProductInterface $linkedProduct */
-                $linkedProduct = $this->productRepository->get($linkItem->getLinkedProductSku(), false, $storeId);
-                $data[$modelId]['links'][self::LINK_TYPE][] = $this->fillData($linkedProduct, $linkItem);
+                $linkItem->setPosition($index);
+                $data[$modelId]['links'][self::LINK_TYPE][] = $this->fillData($linkItem, $productLink);
             }
             $data[$modelId][self::DATA_SOURCE_DEFAULT]['current_store_id'] = $storeId;
         }
@@ -162,6 +185,7 @@ public function modifyData(array $data)
      * @param ProductInterface $linkedProduct
      * @param ProductLinkInterface $linkItem
      * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function fillData(ProductInterface $linkedProduct, ProductLinkInterface $linkItem)
     {
@@ -171,11 +195,15 @@ protected function fillData(ProductInterface $linkedProduct, ProductLinkInterfac
         return [
             'id' => $linkedProduct->getId(),
             'name' => $linkedProduct->getName(),
-            'sku' => $linkItem->getLinkedProductSku(),
+            'sku' => $linkedProduct->getSku(),
             'price' => $currency->toCurrency(sprintf("%f", $linkedProduct->getPrice())),
-            'qty' => $linkItem->getExtensionAttributes()->getQty(),
-            'position' => $linkItem->getPosition(),
-            'thumbnail' => $this->imageHelper->init($linkedProduct, 'product_listing_thumbnail')->getUrl(),
+            'qty' => $linkedProduct->getQty(),
+            'position' => $linkedProduct->getPosition(),
+            'positionCalculated' => $linkedProduct->getPosition(),
+            'thumbnail' => $this->imageHelper
+                ->init($linkedProduct, 'product_listing_thumbnail')
+                ->setImageFile($linkedProduct->getImage())
+                ->getUrl(),
             'type_id' => $linkedProduct->getTypeId(),
             'status' => $this->status->getOptionText($linkedProduct->getStatus()),
             'attribute_set' => $this->attributeSetRepository
@@ -185,7 +213,7 @@ protected function fillData(ProductInterface $linkedProduct, ProductLinkInterfac
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyMeta(array $meta)
     {
@@ -454,7 +482,7 @@ protected function getGrid()
                         'label' => null,
                         'renderDefaultRecord' => false,
                         'template' => 'ui/dynamic-rows/templates/grid',
-                        'component' => 'Magento_Ui/js/dynamic-rows/dynamic-rows-grid',
+                        'component' => 'Magento_GroupedProduct/js/grouped-product-grid',
                         'addButton' => false,
                         'itemTemplate' => 'record',
                         'dataScope' => 'data.links',
@@ -555,6 +583,22 @@ protected function fillMeta()
                     ],
                 ],
             ],
+            'positionCalculated' => [
+                'arguments' => [
+                    'data' => [
+                        'config' => [
+                            'label' => __('Position'),
+                            'dataType' => Form\Element\DataType\Number::NAME,
+                            'formElement' => Form\Element\Input::NAME,
+                            'componentType' => Form\Field::NAME,
+                            'elementTmpl' => 'Magento_GroupedProduct/components/position',
+                            'sortOrder' => 90,
+                            'fit' => true,
+                            'dataScope' => 'positionCalculated'
+                        ],
+                    ],
+                ],
+            ],
             'actionDelete' => [
                 'arguments' => [
                     'data' => [
@@ -563,7 +607,7 @@ protected function fillMeta()
                             'componentType' => 'actionDelete',
                             'dataType' => Form\Element\DataType\Text::NAME,
                             'label' => __('Actions'),
-                            'sortOrder' => 90,
+                            'sortOrder' => 100,
                             'fit' => true,
                         ],
                     ],
@@ -577,7 +621,7 @@ protected function fillMeta()
                             'formElement' => Form\Element\Input::NAME,
                             'componentType' => Form\Field::NAME,
                             'dataScope' => 'position',
-                            'sortOrder' => 100,
+                            'sortOrder' => 110,
                             'visible' => false,
                         ],
                     ],
diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json
index c2031fc3332f0..46ff706d4fc93 100644
--- a/app/code/Magento/GroupedProduct/composer.json
+++ b/app/code/Magento/GroupedProduct/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-grouped-product",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-catalog": "102.0.*",
         "magento/module-catalog-inventory": "100.2.*",
@@ -21,7 +21,7 @@
         "magento/module-grouped-product-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml
index 6bd2c4e3c67f9..eed55039da4c0 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml
@@ -3,73 +3,71 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
- ?>
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+?>
 
 <?php /* @var $block \Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped */ ?>
-<?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
+<?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
 <div id="catalog_product_composite_configure_fields_grouped" class="<?= $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
-    <h4><?= /* @escapeNotVerified */ __('Associated Products') ?></h4>
+    <h4><?= $block->escapeHtml(__('Associated Products')) ?></h4>
     <div class="product-options">
         <?php $_product = $block->getProduct(); ?>
         <?php $block->setPreconfiguredValue(); ?>
         <?php $_associatedProducts = $block->getAssociatedProducts(); ?>
         <?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
-        <?php if ((!$_product->isAvailable() && !$_skipSaleableCheck) || !$_hasAssociatedProducts): ?>
-            <p class="availability out-of-stock"><?= /* @escapeNotVerified */ __('Availability:') ?> <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></p>
+        <?php if ((!$_product->isAvailable() && !$_skipSaleableCheck) || !$_hasAssociatedProducts) : ?>
+            <p class="availability out-of-stock"><?= $block->escapeHtml(__('Availability:')) ?> <span><?= $block->escapeHtml(__('Out of stock')) ?></span></p>
         <?php endif; ?>
         <table class="data-table admin__table-primary grouped-items-table" id="super-product-table">
             <thead>
                 <tr class="headings">
-                    <th class="col-id"><?= /* @escapeNotVerified */ __('ID') ?></th>
-                    <th class="col-sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
-                    <th class="col-name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
-                    <?php if ($block->getCanShowProductPrice($_product)): ?>
-                    <th class="col-price"><?= /* @escapeNotVerified */ __('Price') ?></th>
+                    <th class="col-id"><?= $block->escapeHtml(__('ID')) ?></th>
+                    <th class="col-sku"><?= $block->escapeHtml(__('SKU')) ?></th>
+                    <th class="col-name"><?= $block->escapeHtml(__('Product Name')) ?></th>
+                    <?php if ($block->getCanShowProductPrice($_product)) : ?>
+                    <th class="col-price"><?= $block->escapeHtml(__('Price')) ?></th>
                     <?php endif; ?>
-                    <?php if ($_product->isSaleable() || $_skipSaleableCheck): ?>
-                    <th class="col-qty"><?= /* @escapeNotVerified */ __('Qty') ?></th>
+                    <?php if ($_product->isSaleable() || $_skipSaleableCheck) : ?>
+                    <th class="col-qty"><?= $block->escapeHtml(__('Qty')) ?></th>
                     <?php endif; ?>
                 </tr>
             </thead>
             <tbody>
-            <?php if ($_hasAssociatedProducts): ?>
+            <?php if ($_hasAssociatedProducts) : ?>
                 <?php $i = 0 ?>
-            <?php foreach ($_associatedProducts as $_item): ?>
-                <tr class="<?= /* @escapeNotVerified */ (++$i % 2) ? 'even' : 'odd' ?>">
-                    <td class="col-id"><?= /* @escapeNotVerified */ $_item->getId() ?></td>
+                <?php foreach ($_associatedProducts as $_item) : ?>
+                <tr class="<?= /* @noEscape */ ((++$i % 2) ? 'even' : 'odd') ?>">
+                    <td class="col-id"><?= $block->escapeHtml($_item->getId()) ?></td>
                     <td class="col-sku"><?= $block->escapeHtml($_item->getSku()) ?></td>
                     <td class="col-name"><?= $block->escapeHtml($_item->getName()) ?></td>
-                    <?php if ($block->getCanShowProductPrice($_product)): ?>
+                    <?php if ($block->getCanShowProductPrice($_product)) : ?>
                     <td class="col-price">
-                        <?php if ($block->getCanShowProductPrice($_item)): ?>
-                        <?= /* @escapeNotVerified */ $block->getProductPrice($_item) ?>
+                        <?php if ($block->getCanShowProductPrice($_item)) : ?>
+                            <?= /* @noEscape */ $block->getProductPrice($_item) ?>
                         <?php endif; ?>
                     </td>
                     <?php endif; ?>
-                    <?php if ($_product->isSaleable() || $_skipSaleableCheck): ?>
+                    <?php if ($_product->isSaleable() || $_skipSaleableCheck) : ?>
                     <td class="col-qty">
-                    <?php if ($_item->isSaleable() || $_skipSaleableCheck) : ?>
+                        <?php if ($_item->isSaleable() || $_skipSaleableCheck) : ?>
                         <input type="text"
-                               name="super_group[<?= /* @escapeNotVerified */ $_item->getId() ?>]"
-                               id="super_group[<?= /* @escapeNotVerified */ $_item->getId() ?>]"
+                               name="super_group[<?= $block->escapeHtmlAttr($_item->getId()) ?>]"
+                               id="super_group[<?= $block->escapeHtmlAttr($_item->getId()) ?>]"
                                maxlength="12"
-                               value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>"
-                               title="<?= /* @escapeNotVerified */ __('Qty') ?>"
+                               value="<?= $block->escapeHtmlAttr($_item->getQty()*1) ?>"
+                               title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
                                class="input-text admin__control-text qty" />
-                        <input type="hidden" value="1" price="<?= /* @escapeNotVerified */ $block->getCurrencyPrice($_item->getPrice()) ?>" qtyId="super_group[<?= /* @escapeNotVerified */ $_item->getId() ?>]" />
-                    <?php else: ?>
-                        <p class="availability out-of-stock"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></p>
+                        <input type="hidden" value="1" price="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_item->getPrice())) ?>" qtyId="super_group[<?= $block->escapeHtmlAttr($_item->getId()) ?>]" />
+                    <?php else : ?>
+                        <p class="availability out-of-stock"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></p>
                     <?php endif; ?>
                     </td>
                     <?php endif; ?>
                 </tr>
             <?php endforeach; ?>
-            <?php else: ?>
+            <?php else : ?>
                <tr>
-                   <td class="empty-text" colspan="<?php if ($_product->isSaleable() || $_skipSaleableCheck): ?>4<?php else : ?>3<?php endif; ?>"><?= /* @escapeNotVerified */ __('No options of this product are available.') ?></td>
+                   <td class="empty-text" colspan="<?php if ($_product->isSaleable() || $_skipSaleableCheck) : ?>4<?php else : ?>3<?php endif; ?>"><?= $block->escapeHtml(__('No options of this product are available.')) ?></td>
                </tr>
             <?php endif; ?>
             </tbody>
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml
index 2c5a24195dd3a..ac6161d940a3a 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml
@@ -4,17 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Framework\View\Element\Template */
 
 /** @var $block \Magento\Framework\View\Element\Template */
 $_gridPopupBlock = $block->getChildBlock('catalog.product.group.grid.popup.container')->getChildBlock('grid');
 $_gridPopupBlock->setRowClickCallback('function(){}');
 ?>
-<div id="grouped-product-container" data-mage-init='{"groupedProduct":{"gridPopup":"[data-grid-id=<?= /* @escapeNotVerified */ $_gridPopupBlock->getId() ?>]"}}'>
+<div id="grouped-product-container" data-mage-init='{"groupedProduct":{"gridPopup":"[data-grid-id=<?= $block->escapeHtmlAttr($_gridPopupBlock->getId()) ?>]"}}'>
     <div class="no-products-message">
-        <?= /* @escapeNotVerified */ __('There are no grouped products.') ?>
+        <?= $block->escapeHtml(__('There are no grouped products.')) ?>
     </div>
     <?= $block->getChildHtml('list') ?>
     <div data-role="add-product-dialog" class="no-display">
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml
index c931304fcaeac..0872afcc8b3c7 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 /* @var $block \Magento\GroupedProduct\Block\Product\Grouped\AssociatedProducts\ListAssociatedProducts */
 ?>
 <script type="text/x-magento-template" id="group-product-template">
@@ -56,16 +56,16 @@
                     <span></span>
                 </th>
                 <th data-column="name" class="no-link col-name">
-                    <span><?= /* @escapeNotVerified */ __('Name') ?></span>
+                    <span><?= $block->escapeHtml(__('Name')) ?></span>
                 </th>
                 <th data-column="sku" class="no-link col-sku">
-                    <span><?= /* @escapeNotVerified */ __('SKU') ?></span>
+                    <span><?= $block->escapeHtml(__('SKU')) ?></span>
                 </th>
                 <th data-column="price" class="no-link col-price">
-                    <span><?= /* @escapeNotVerified */ __('Price') ?></span>
+                    <span><?= $block->escapeHtml(__('Price')) ?></span>
                     </th>
                 <th data-column="qty" class="no-link col-qty">
-                    <span><?= /* @escapeNotVerified */ __('Default Qty') ?></span>
+                    <span><?= $block->escapeHtml(__('Default Qty')) ?></span>
                 </th>
                 <th data-column="actions" class="last no-link col-actions">
                     <span></span>
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/web/css/grouped-product.css b/app/code/Magento/GroupedProduct/view/adminhtml/web/css/grouped-product.css
index 3d723387d23b0..9142eaf90899e 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/web/css/grouped-product.css
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/web/css/grouped-product.css
@@ -66,3 +66,49 @@
     overflow: hidden;
     text-overflow: ellipsis;
 }
+
+.position {
+    width: 100px;
+}
+
+.icon-rearrange-position > span {
+    border: 0;
+    clip: rect(0, 0, 0, 0);
+    height: 1px;
+    margin: -1px;
+    overflow: hidden;
+    padding: 0;
+    position: absolute;
+    width: 1px;
+}
+
+.icon-forward,
+.icon-backward {
+    -webkit-font-smoothing: antialiased;
+    font-family: 'Admin Icons';
+    font-size: 17px;
+    speak: none;
+}
+
+.position > * {
+    float: left;
+    margin: 3px;
+}
+
+.position-widget-input {
+    text-align: center;
+    width: 40px;
+}
+
+.icon-forward:before {
+    content: '\e618';
+}
+
+.icon-backward:before {
+    content: '\e619';
+}
+
+.icon-rearrange-position, .icon-rearrange-position:hover   {
+    color: #d9d9d9;
+    text-decoration: none;
+}
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/web/js/grouped-product-grid.js b/app/code/Magento/GroupedProduct/view/adminhtml/web/js/grouped-product-grid.js
new file mode 100644
index 0000000000000..0ac3b58d6e3a7
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/web/js/grouped-product-grid.js
@@ -0,0 +1,219 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/dynamic-rows/dynamic-rows-grid'
+], function (_, registry, dynamicRowsGrid) {
+    'use strict';
+
+    return dynamicRowsGrid.extend({
+
+        /**
+         * Set max element position
+         *
+         * @param {Number} position - element position
+         * @param {Object} elem - instance
+         */
+        setMaxPosition: function (position, elem) {
+
+            if (position || position === 0) {
+                this.checkMaxPosition(position);
+                this.sort(position, elem);
+
+                if (~~position === this.maxPosition && ~~position > this.getDefaultPageBoundary() + 1) {
+                    this.shiftNextPagesPositions(position);
+                }
+            } else {
+                this.maxPosition += 1;
+            }
+        },
+
+        /**
+         * Shift positions for next page elements
+         *
+         * @param {Number} position
+         */
+        shiftNextPagesPositions: function (position) {
+
+            var recordData = this.recordData(),
+                startIndex = ~~this.currentPage() * this.pageSize,
+                offset = position - startIndex + 1,
+                index = startIndex;
+
+            if (~~this.currentPage() === this.pages()) {
+                return false;
+            }
+
+            for (index; index < recordData.length; index++) {
+                recordData[index].position = index + offset;
+            }
+            this.recordData(recordData);
+        },
+
+        /**
+         * Update position for element after position from another page is entered
+         *
+         * @param {Object} data
+         * @param {Object} event
+         */
+        updateGridPosition: function (data, event) {
+            var inputValue = parseInt(event.target.value, 10),
+                recordData = this.recordData(),
+                record,
+                previousValue,
+                updatedRecord;
+
+            record = this.elems().find(function (obj) {
+                return obj.dataScope === data.parentScope;
+            });
+
+            previousValue = this.getCalculatedPosition(record);
+
+            if (isNaN(inputValue) || inputValue < 0 || inputValue === previousValue) {
+                return false;
+            }
+
+            this.elems([]);
+
+            updatedRecord = this.getUpdatedRecordIndex(recordData, record.data().id);
+
+            if (inputValue >= this.recordData().size() - 1) {
+                recordData[updatedRecord].position = this.getGlobalMaxPosition() + 1;
+            } else {
+                recordData.forEach(function (value, index) {
+                    if (~~value.id === ~~record.data().id) {
+                        recordData[index].position = inputValue;
+                    } else if (inputValue > previousValue && index <= inputValue) {
+                        recordData[index].position = index - 1;
+                    } else if (inputValue < previousValue && index >= inputValue) {
+                        recordData[index].position = index + 1;
+                    }
+                });
+            }
+
+            this.reloadGridData(recordData);
+
+        },
+
+        /**
+         * Get updated record index
+         *
+         * @param  {Array} recordData
+         * @param {Number} recordId
+         * @return {Number}
+         */
+        getUpdatedRecordIndex: function (recordData, recordId) {
+            return recordData.map(function (o) {
+                return ~~o.id;
+            }).indexOf(~~recordId);
+        },
+
+        /**
+         *
+         * @param {Array} recordData - to reprocess
+         */
+        reloadGridData: function (recordData) {
+            this.recordData(recordData.sort(function (a, b) {
+                return ~~a.position - ~~b.position;
+            }));
+            this._updateCollection();
+            this.reload();
+        },
+
+        /**
+         * Event handler for "Send to bottom" button
+         *
+         * @param {Object} positionObj
+         * @return {Boolean}
+         */
+        sendToBottom: function (positionObj) {
+
+            var objectToUpdate = this.getObjectToUpdate(positionObj),
+                recordData = this.recordData(),
+                updatedRecord;
+
+            if (~~this.currentPage() === this.pages) {
+                objectToUpdate.position = this.maxPosition;
+            } else {
+                this.elems([]);
+                updatedRecord = this.getUpdatedRecordIndex(recordData, objectToUpdate.data().id);
+                recordData[updatedRecord].position = this.getGlobalMaxPosition() + 1;
+                this.reloadGridData(recordData);
+            }
+
+            return false;
+        },
+
+        /**
+         * Event handler for "Send to top" button
+         *
+         * @param {Object} positionObj
+         * @return {Boolean}
+         */
+        sendToTop: function (positionObj) {
+            var objectToUpdate = this.getObjectToUpdate(positionObj),
+                recordData = this.recordData(),
+                updatedRecord;
+
+            //isFirst
+            if (~~this.currentPage() === 1) {
+                objectToUpdate.position = 0;
+            } else {
+                this.elems([]);
+                updatedRecord = this.getUpdatedRecordIndex(recordData, objectToUpdate.data().id);
+                recordData.forEach(function (value, index) {
+                    recordData[index].position = index === updatedRecord ? 0 : value.position + 1;
+                });
+                this.reloadGridData(recordData);
+            }
+
+            return false;
+        },
+
+        /**
+         * Get element from grid for update
+         *
+         * @param {Object} object
+         * @return {*}
+         */
+        getObjectToUpdate: function (object) {
+            return this.elems().filter(function (item) {
+                return item.name === object.parentName;
+            })[0];
+        },
+
+        /**
+         * Value function for position input
+         *
+         * @param {Object} data
+         * @return {Number}
+         */
+        getCalculatedPosition: function (data) {
+            return (~~this.currentPage() - 1) * this.pageSize + this.elems().pluck('name').indexOf(data.name);
+        },
+
+        /**
+         * Return Page Boundary
+         *
+         * @return {Number}
+         */
+        getDefaultPageBoundary: function () {
+            return ~~this.currentPage() * this.pageSize - 1;
+        },
+
+        /**
+         * Returns position for last element to be moved after
+         *
+         * @return {Number}
+         */
+        getGlobalMaxPosition: function () {
+            return _.max(this.recordData().map(function (r) {
+                return ~~r.position;
+            }));
+        }
+    });
+});
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/web/template/components/position.html b/app/code/Magento/GroupedProduct/view/adminhtml/web/template/components/position.html
new file mode 100644
index 0000000000000..9d1e464e58b62
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/web/template/components/position.html
@@ -0,0 +1,15 @@
+<div class="position">
+    <a href="#" class="move-top icon-backward icon-rearrange-position"
+       data-bind="click: $parent.sendToTop.bind($parent)">
+        <span>Top</span>
+    </a>
+    <input type="text" class="position-widget-input"
+           data-bind="
+                value: $parent.getCalculatedPosition($record()),
+                event: {blur: $parent.updateGridPosition.bind($parent)}
+            "/>
+    <a href="#" class="move-bottom icon-forward icon-rearrange-position"
+       data-bind="click: $parent.sendToBottom.bind($parent)">
+        <span>Bottom</span>
+    </a>
+</div>
diff --git a/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml b/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml
index d9238e9794d7e..c9c03b9f214d9 100644
--- a/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml
+++ b/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * Template for displaying grouped product price
  */
@@ -27,9 +25,9 @@ if ($minProduct) {
 }
 ?>
 <div class="price-box">
-    <?php if ($minProduct && \Magento\Framework\Pricing\Render::ZONE_ITEM_VIEW != $block->getZone()): ?>
+    <?php if ($minProduct && \Magento\Framework\Pricing\Render::ZONE_ITEM_VIEW != $block->getZone()) : ?>
     <p class="minimal-price">
-        <span class="price-label"><?= /* @escapeNotVerified */ __('Starting at') ?></span><?= $amountRender->toHtml() ?>
+        <span class="price-label"><?= $block->escapeHtml(__('Starting at')) ?></span><?= $amountRender->toHtml() ?>
     </p>
     <?php endif ?>
 </div>
diff --git a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml
index 89434ac7b13cd..b1697bfb012b9 100644
--- a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml
+++ b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml
@@ -3,23 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /* @var $block \Magento\Catalog\Block\Product\View\AbstractView */?>
 <?php $_product = $block->getProduct() ?>
 
 <?php $_associatedProducts = $block->getAssociatedProducts(); ?>
 <?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
-<?php if ($block->displayProductStockStatus()): ?>
-    <?php if ($_product->isAvailable() && $_hasAssociatedProducts): ?>
-        <div class="stock available" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
-            <span><?= /* @escapeNotVerified */ __('In stock') ?></span>
+<?php if ($block->displayProductStockStatus()) : ?>
+    <?php if ($_product->isAvailable() && $_hasAssociatedProducts) : ?>
+        <div class="stock available" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
+            <span><?= $block->escapeHtml(__('In stock')) ?></span>
         </div>
-    <?php else: ?>
-        <div class="stock unavailable" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
-            <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
+    <?php else : ?>
+        <div class="stock unavailable" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
+            <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
         </div>
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
index 900d4a1bd5bbc..0257d87a2d9ee 100644
--- a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
+++ b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * Grouped product data template
  *
@@ -22,55 +20,55 @@
     <table class="table data grouped"
            id="super-product-table"
            data-mage-init='{ "Magento_GroupedProduct/js/product-ids-resolver": {} }'>
-        <caption class="table-caption"><?= /* @escapeNotVerified */ __('Grouped product items') ?></caption>
+        <caption class="table-caption"><?= $block->escapeHtml(__('Grouped product items')) ?></caption>
         <thead>
         <tr>
-            <th class="col item" scope="col"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
-            <?php if ($_product->isSaleable()): ?>
-                <th class="col qty" scope="col"><?= /* @escapeNotVerified */ __('Qty') ?></th>
+            <th class="col item" scope="col"><?= $block->escapeHtml(__('Product Name')) ?></th>
+            <?php if ($_product->isSaleable()) : ?>
+                <th class="col qty" scope="col"><?= $block->escapeHtml(__('Qty')) ?></th>
             <?php endif; ?>
         </tr>
         </thead>
 
-        <?php if ($_hasAssociatedProducts): ?>
-        <?php foreach ($_associatedProducts as $_item): ?>
+        <?php if ($_hasAssociatedProducts) : ?>
         <tbody>
+            <?php foreach ($_associatedProducts as $_item) : ?>
             <tr>
                 <td data-th="<?= $block->escapeHtml(__('Product Name')) ?>" class="col item">
                     <strong class="product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
-                    <?php if ($block->getCanShowProductPrice($_product)): ?>
-                        <?php if ($block->getCanShowProductPrice($_item)): ?>
-                            <?= /* @escapeNotVerified */ $block->getProductPrice($_item) ?>
+                    <?php if ($block->getCanShowProductPrice($_product)) : ?>
+                        <?php if ($block->getCanShowProductPrice($_item)) : ?>
+                            <?= /* @noEscape */ $block->getProductPrice($_item) ?>
+                        <?php endif; ?>
                         <?php endif; ?>
-                     <?php endif; ?>
                 </td>
-                <?php if ($_product->isSaleable()): ?>
+                <?php if ($_product->isSaleable()) : ?>
                 <td data-th="<?= $block->escapeHtml(__('Qty')) ?>" class="col qty">
-                <?php if ($_item->isSaleable()) : ?>
+                    <?php if ($_item->isSaleable()) : ?>
                     <div class="control qty">
                         <input type="number"
-                               name="super_group[<?= /* @escapeNotVerified */ $_item->getId() ?>]"
-                               data-selector="super_group[<?= /* @escapeNotVerified */ $_item->getId() ?>]"
-                               value="<?= /* @escapeNotVerified */ $_item->getQty() * 1 ?>"
-                               title="<?= /* @escapeNotVerified */ __('Qty') ?>"
+                               name="super_group[<?= $block->escapeHtmlAttr($_item->getId()) ?>]"
+                               data-selector="super_group[<?= $block->escapeHtmlAttr($_item->getId()) ?>]"
+                               value="<?= $block->escapeHtmlAttr($_item->getQty() * 1) ?>"
+                               title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
                                class="input-text qty"
                                data-validate="{'validate-grouped-qty':'#super-product-table'}"
                                data-errors-message-box="#validation-message-box"/>
                     </div>
-                <?php else: ?>
-                    <div class="stock unavailable" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
-                        <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
+                <?php else : ?>
+                    <div class="stock unavailable" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
+                        <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
                     </div>
                 <?php endif; ?>
                 </td>
                 <?php endif; ?>
             </tr>
-            <?php if ($block->getCanShowProductPrice($_product)
+                <?php if ($block->getCanShowProductPrice($_product)
                 && $block->getCanShowProductPrice($_item)
                 && trim($block->getProductPriceHtml(
                     $_item,
                     \Magento\Catalog\Pricing\Price\TierPrice::PRICE_CODE
-                ))): ?>
+                ))) : ?>
                 <tr class="row-tier-price">
                     <td colspan="2">
                         <?= $block->getProductPriceHtml(
@@ -80,14 +78,14 @@
                     </td>
                 </tr>
             <?php endif; ?>
-        </tbody>
         <?php endforeach; ?>
-        <?php else: ?>
+        </tbody>
+        <?php else : ?>
         <tbody>
             <tr>
                 <td class="unavailable"
-                    colspan="<?php if ($_product->isSaleable()): ?>4<?php else : ?>3<?php endif; ?>">
-                    <?= /* @escapeNotVerified */ __('No options of this product are available.') ?>
+                    colspan="<?php if ($_product->isSaleable()) : ?>4<?php else : ?>3<?php endif; ?>">
+                    <?= $block->escapeHtml(__('No options of this product are available.')) ?>
                 </td>
             </tr>
         </tbody>
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
index 94dc0ee7493b0..7655b0e8929f6 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
@@ -236,8 +236,8 @@ protected function _getSelectHtmlWithValue(Attribute $attribute, $value)
         if ($attribute->getFilterOptions()) {
             $options = [];
 
-            foreach ($attribute->getFilterOptions() as $value => $label) {
-                $options[] = ['value' => $value, 'label' => $label];
+            foreach ($attribute->getFilterOptions() as $optionValue => $label) {
+                $options[] = ['value' => $optionValue, 'label' => $label];
             }
         } else {
             $options = $attribute->getSource()->getAllOptions(false);
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
index 822795abb0b44..f67a4c5db1317 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
@@ -199,7 +199,10 @@ protected function _prepareForm()
                 'label' => __('Select File to Import'),
                 'title' => __('Select File to Import'),
                 'required' => true,
-                'class' => 'input-file'
+                'class' => 'input-file',
+                'note' => __(
+                    'File must be saved in UTF-8 encoding for proper import'
+                ),
             ]
         );
         $fieldsets['upload']->addField(
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
index 33dbba8320051..8b16e232856cd 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\ImportExport\Controller\Adminhtml\Import;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\ImportExport\Controller\Adminhtml\Import as ImportController;
-use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
  * Download sample file controller
@@ -36,6 +36,11 @@ class Download extends ImportController
      */
     protected $fileFactory;
 
+    /**
+     * @var \Magento\ImportExport\Model\Import\SampleFileProvider
+     */
+    private $sampleFileProvider;
+
     /**
      * Constructor
      *
@@ -44,46 +49,48 @@ class Download extends ImportController
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
      * @param \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory
      * @param ComponentRegistrar $componentRegistrar
+     * @param \Magento\ImportExport\Model\Import\SampleFileProvider|null $sampleFileProvider
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
         \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
         \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory,
-        \Magento\Framework\Component\ComponentRegistrar $componentRegistrar
+        \Magento\Framework\Component\ComponentRegistrar $componentRegistrar,
+        \Magento\ImportExport\Model\Import\SampleFileProvider $sampleFileProvider = null
     ) {
-        parent::__construct(
-            $context
-        );
+        parent::__construct($context);
         $this->fileFactory = $fileFactory;
         $this->resultRawFactory = $resultRawFactory;
         $this->readFactory = $readFactory;
         $this->componentRegistrar = $componentRegistrar;
+        $this->sampleFileProvider = $sampleFileProvider
+            ?: \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\ImportExport\Model\Import\SampleFileProvider::class);
     }
 
     /**
      * Download sample file action
      *
-     * @return \Magento\Framework\Controller\Result\Raw
+     * @return \Magento\Framework\Controller\Result\Raw|\Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
-        $fileName = $this->getRequest()->getParam('filename') . '.csv';
-        $moduleDir = $this->componentRegistrar->getPath(ComponentRegistrar::MODULE, self::SAMPLE_FILES_MODULE);
-        $fileAbsolutePath = $moduleDir . '/Files/Sample/' . $fileName;
-        $directoryRead = $this->readFactory->create($moduleDir);
-        $filePath = $directoryRead->getRelativePath($fileAbsolutePath);
+        $entityName = $this->getRequest()->getParam('filename');
 
-        if (!$directoryRead->isFile($filePath)) {
+        try {
+            $fileContents = $this->sampleFileProvider->getFileContents($entityName);
+        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
             /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
             $this->messageManager->addError(__('There is no sample file for this entity.'));
             $resultRedirect = $this->resultRedirectFactory->create();
             $resultRedirect->setPath('*/import');
+
             return $resultRedirect;
         }
 
-        $fileSize = isset($directoryRead->stat($filePath)['size'])
-            ? $directoryRead->stat($filePath)['size'] : null;
+        $fileSize = $this->sampleFileProvider->getSize($entityName);
+        $fileName = $entityName . '.csv';
 
         $this->fileFactory->create(
             $fileName,
@@ -95,7 +102,8 @@ public function execute()
 
         /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
         $resultRaw = $this->resultRawFactory->create();
-        $resultRaw->setContents($directoryRead->readFile($filePath));
+        $resultRaw->setContents($fileContents);
+
         return $resultRaw;
     }
 }
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
index 695a0e61709f1..42d3ef696b8bc 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
@@ -7,7 +7,11 @@
 
 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.
+ */
 class Start extends ImportResultController
 {
     /**
@@ -62,6 +66,11 @@ public function execute()
 
             $this->importModel->setData($data);
             $errorAggregator = $this->importModel->getErrorAggregator();
+            $errorAggregator->initValidationStrategy(
+                $this->importModel->getData(Import::FIELD_NAME_VALIDATION_STRATEGY),
+                $this->importModel->getData(Import::FIELD_NAME_ALLOWED_ERROR_COUNT)
+            );
+
             try {
                 $this->importModel->importSource();
             } catch (\Exception $e) {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
index df9f63e79b75e..d51e75e2c753b 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
@@ -5,13 +5,10 @@
  */
 namespace Magento\ImportExport\Controller\Adminhtml\Import;
 
+use Magento\Framework\Controller\ResultFactory;
+use Magento\ImportExport\Block\Adminhtml\Import\Frame\Result;
 use Magento\ImportExport\Controller\Adminhtml\ImportResult as ImportResultController;
 use Magento\ImportExport\Model\Import;
-use Magento\ImportExport\Block\Adminhtml\Import\Frame\Result;
-use Magento\Framework\Controller\ResultFactory;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\ImportExport\Model\Import\Adapter as ImportAdapter;
-use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 
 class Validate extends ImportResultController
 {
@@ -42,12 +39,7 @@ public function execute()
             /** @var $import \Magento\ImportExport\Model\Import */
             $import = $this->getImport()->setData($data);
             try {
-                $source = ImportAdapter::findAdapterFor(
-                    $import->uploadSource(),
-                    $this->_objectManager->create(\Magento\Framework\Filesystem::class)
-                        ->getDirectoryWrite(DirectoryList::ROOT),
-                    $data[$import::FIELD_FIELD_SEPARATOR]
-                );
+                $source = $import->uploadFileAndGetSource();
                 $this->processValidationResult($import->validateSource($source), $resultBlock);
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $resultBlock->addError($e->getMessage());
diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index 092b721b82435..2d8b84cd035ff 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -5,11 +5,13 @@
  */
 
 // @codingStandardsIgnoreFile
-
 namespace Magento\ImportExport\Model;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\HTTP\Adapter\FileTransferFactory;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 
@@ -21,6 +23,7 @@
  * @method string getBehavior() getBehavior()
  * @method \Magento\ImportExport\Model\Import setEntity() setEntity(string $value)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @since 100.0.2
  */
 class Import extends \Magento\ImportExport\Model\AbstractModel
@@ -79,6 +82,11 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
      */
     const FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR = '_import_multiple_value_separator';
 
+    /**
+     * Import empty attribute value constant.
+     */
+    const FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT = '_import_empty_attribute_value_constant';
+
     /**
      * Allow multiple values wrapping in double quotes for additional attributes.
      */
@@ -91,6 +99,11 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
      */
     const DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR = ',';
 
+    /**
+     * default empty attribute value constant
+     */
+    const DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT = '__EMPTY__VALUE__';
+
     /**#@+
      * Import constants
      */
@@ -159,6 +172,21 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
      */
     protected $_filesystem;
 
+    /**
+     * @var History
+     */
+    private $importHistoryModel;
+
+    /**
+     * @var DateTime
+     */
+    private $localeDate;
+
+    /**
+     * @var ManagerInterface
+     */
+    private $messageManager;
+
     /**
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Filesystem $filesystem
@@ -173,8 +201,9 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
      * @param Source\Import\Behavior\Factory $behaviorFactory
      * @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
      * @param History $importHistoryModel
-     * @param \Magento\Framework\Stdlib\DateTime\DateTime
+     * @param DateTime $localeDate
      * @param array $data
+     * @param ManagerInterface|null $messageManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -191,8 +220,9 @@ public function __construct(
         \Magento\ImportExport\Model\Source\Import\Behavior\Factory $behaviorFactory,
         \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry,
         \Magento\ImportExport\Model\History $importHistoryModel,
-        \Magento\Framework\Stdlib\DateTime\DateTime $localeDate,
-        array $data = []
+        DateTime $localeDate,
+        array $data = [],
+        ManagerInterface $messageManager = null
     ) {
         $this->_importExportData = $importExportData;
         $this->_coreConfig = $coreConfig;
@@ -207,6 +237,7 @@ public function __construct(
         $this->_filesystem = $filesystem;
         $this->importHistoryModel = $importHistoryModel;
         $this->localeDate = $localeDate;
+        $this->messageManager = $messageManager ?: ObjectManager::getInstance()->get(ManagerInterface::class);
         parent::__construct($logger, $filesystem, $data);
     }
 
@@ -234,7 +265,9 @@ protected function _getEntityAdapter()
                 ) {
                     throw new \Magento\Framework\Exception\LocalizedException(
                         __(
-                            'The entity adapter object must be an instance of %1 or %2.', \Magento\ImportExport\Model\Import\Entity\AbstractEntity::class, \Magento\ImportExport\Model\Import\AbstractEntity::class
+                            'The entity adapter object must be an instance of %1 or %2.',
+                            \Magento\ImportExport\Model\Import\Entity\AbstractEntity::class,
+                            \Magento\ImportExport\Model\Import\AbstractEntity::class
                         )
                     );
                 }
@@ -433,6 +466,8 @@ public function importSource()
     }
 
     /**
+     * Process import.
+     *
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -452,6 +487,8 @@ public function isImportAllowed()
     }
 
     /**
+     * Get error aggregator instance.
+     *
      * @return ProcessingErrorAggregatorInterface
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -461,7 +498,7 @@ public function getErrorAggregator()
     }
 
     /**
-     * Move uploaded file and create source adapter instance.
+     * Move uploaded file.
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return string Source file path
@@ -513,14 +550,27 @@ public function uploadSource()
         }
         $this->_removeBom($sourceFile);
         $this->createHistoryReport($sourceFileRelative, $entity, $extension, $result);
-        // trying to create source adapter for file and catch possible exception to be convinced in its adequacy
+
+        return $sourceFile;
+    }
+
+    /**
+     * Move uploaded file and provide source instance.
+     *
+     * @return Import\AbstractSource
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function uploadFileAndGetSource()
+    {
+        $sourceFile = $this->uploadSource();
         try {
-            $this->_getSourceAdapter($sourceFile);
+            $source = $this->_getSourceAdapter($sourceFile);
         } catch (\Exception $e) {
-            $this->_varDirectory->delete($sourceFileRelative);
+            $this->_varDirectory->delete($this->_varDirectory->getRelativePath($sourceFile));
             throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()));
         }
-        return $sourceFile;
+
+        return $source;
     }
 
     /**
@@ -574,10 +624,13 @@ public function validateSource(\Magento\ImportExport\Model\Import\AbstractSource
         $messages = $this->getOperationResultMessages($errorAggregator);
         $this->addLogComment($messages);
 
-        $result = !$errorAggregator->getErrorsCount();
+        $errorsCount = $errorAggregator->getErrorsCount();
+        $result = !$errorsCount;
+
         if ($result) {
             $this->addLogComment(__('Import data validation is complete.'));
         }
+
         return $result;
     }
 
@@ -684,7 +737,9 @@ public function isReportEntityType($entity = null)
                 try {
                     $result = $this->_getEntityAdapter()->isNeedToLogInHistory();
                 } catch (\Exception $e) {
-                    throw new \Magento\Framework\Exception\LocalizedException(__('Please enter a correct entity model'));
+                    throw new \Magento\Framework\Exception\LocalizedException(
+                        __('Please enter a correct entity model')
+                    );
                 }
             } else {
                 throw new \Magento\Framework\Exception\LocalizedException(__('Please enter a correct entity model'));
@@ -696,11 +751,11 @@ public function isReportEntityType($entity = null)
     }
 
     /**
-     * Create history report
+     * Create history report.
      *
+     * @param string $sourceFileRelative
      * @param string $entity
      * @param string $extension
-     * @param string $sourceFileRelative
      * @param array $result
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -713,7 +768,7 @@ protected function createHistoryReport($sourceFileRelative, $entity, $extension
                 $sourceFileRelative = $this->_varDirectory->getRelativePath(self::IMPORT_DIR . $fileName);
             } elseif (isset($result['name'])) {
                 $fileName = $result['name'];
-            } elseif (!is_null($extension)) {
+            } elseif ($extension !== null) {
                 $fileName = $entity . $extension;
             } else {
                 $fileName = basename($sourceFileRelative);
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
index e2398e792b817..848c866dd75b3 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
@@ -408,7 +408,9 @@ protected function _saveValidatedBunches()
             if ($source->valid()) {
                 try {
                     $rowData = $source->current();
-                    $skuSet[$rowData['sku']] = true;
+                    if (array_key_exists('sku', $rowData)) {
+                        $skuSet[$rowData['sku']] = true;
+                    }
                 } catch (\InvalidArgumentException $e) {
                     $this->addRowError($e->getMessage(), $this->_processedRowsCount);
                     $this->_processedRowsCount++;
@@ -436,7 +438,7 @@ protected function _saveValidatedBunches()
                 $source->next();
             }
         }
-        $this->_processedEntitiesCount = count($skuSet);
+        $this->_processedEntitiesCount = (count($skuSet)) ? : $this->_processedRowsCount;
 
         return $this;
     }
@@ -554,6 +556,7 @@ public function getBehavior()
             $this->_parameters['behavior']
         ) ||
             $this->_parameters['behavior'] != ImportExport::BEHAVIOR_APPEND &&
+            $this->_parameters['behavior'] != ImportExport::BEHAVIOR_ADD_UPDATE &&
             $this->_parameters['behavior'] != ImportExport::BEHAVIOR_REPLACE &&
             $this->_parameters['behavior'] != ImportExport::BEHAVIOR_DELETE
         ) {
diff --git a/app/code/Magento/ImportExport/Model/Import/SampleFileProvider.php b/app/code/Magento/ImportExport/Model/Import/SampleFileProvider.php
new file mode 100644
index 0000000000000..badffa6632174
--- /dev/null
+++ b/app/code/Magento/ImportExport/Model/Import/SampleFileProvider.php
@@ -0,0 +1,127 @@
+<?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\Component\ComponentRegistrar;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Magento\Framework\Filesystem\Directory\ReadFactory;
+
+/**
+ * Import sample file provider model.
+ *
+ * This class support only *.csv.
+ */
+class SampleFileProvider
+{
+    /**
+     * Associate an import entity to its module, e.g ['entity_name' => 'module_name']
+     *
+     * @var array
+     */
+    private $samples;
+
+    /**
+     * @var ComponentRegistrar
+     */
+    private $componentRegistrar;
+
+    /**
+     * @var ReadFactory
+     */
+    private $readFactory;
+
+    /**
+     * @param ReadFactory $readFactory
+     * @param ComponentRegistrar $componentRegistrar
+     * @param array $samples
+     */
+    public function __construct(
+        ReadFactory $readFactory,
+        ComponentRegistrar $componentRegistrar,
+        array $samples = []
+    ) {
+        $this->readFactory = $readFactory;
+        $this->componentRegistrar = $componentRegistrar;
+        $this->samples = $samples;
+    }
+
+    /**
+     * Returns the size for the given file associated to an import entity.
+     *
+     * @param string $entityName
+     * @return int|null
+     */
+    public function getSize(string $entityName)
+    {
+        $directoryRead = $this->getDirectoryRead($entityName);
+        $filePath = $this->getPath($entityName);
+        $fileSize = $directoryRead->stat($filePath)['size'] ?? null;
+
+        return $fileSize;
+    }
+
+    /**
+     * Returns content for the given file associated to an import entity.
+     *
+     * @param string $entityName
+     * @return string
+     */
+    public function getFileContents(string $entityName): string
+    {
+        $directoryRead = $this->getDirectoryRead($entityName);
+        $filePath = $this->getPath($entityName);
+
+        return $directoryRead->readFile($filePath);
+    }
+
+    /**
+     * @param string $entityName
+     * @return string
+     * @throws NoSuchEntityException
+     */
+    private function getPath(string $entityName): string
+    {
+        $directoryRead = $this->getDirectoryRead($entityName);
+        $fileAbsolutePath = 'Files/Sample/' . $entityName . '.csv';
+        $filePath = $directoryRead->getRelativePath($fileAbsolutePath);
+
+        if (!$directoryRead->isFile($filePath)) {
+            throw new NoSuchEntityException(__("There is no file: %file", ['file' => $filePath]));
+        }
+
+        return $filePath;
+    }
+
+    /**
+     * @param string $entityName
+     * @return ReadInterface
+     */
+    private function getDirectoryRead(string $entityName): ReadInterface
+    {
+        $moduleName = $this->getModuleName($entityName);
+        $moduleDir = $this->componentRegistrar->getPath(ComponentRegistrar::MODULE, $moduleName);
+        $directoryRead = $this->readFactory->create($moduleDir);
+
+        return $directoryRead;
+    }
+
+    /**
+     * @param string $entityName
+     * @return string
+     * @throws NoSuchEntityException
+     */
+    private function getModuleName(string $entityName): string
+    {
+        if (!isset($this->samples[$entityName])) {
+            throw new NoSuchEntityException();
+        }
+
+        return $this->samples[$entityName];
+    }
+}
diff --git a/app/code/Magento/ImportExport/Model/Import/Source/Zip.php b/app/code/Magento/ImportExport/Model/Import/Source/Zip.php
index b7fafc43ca4ed..8ff46b9509de7 100644
--- a/app/code/Magento/ImportExport/Model/Import/Source/Zip.php
+++ b/app/code/Magento/ImportExport/Model/Import/Source/Zip.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\ImportExport\Model\Import\Source;
 
+use Magento\Framework\Exception\ValidatorException;
+
 /**
  * Zip import adapter.
  */
@@ -14,6 +16,7 @@ class Zip extends Csv
      * @param string $file
      * @param \Magento\Framework\Filesystem\Directory\Write $directory
      * @param string $options
+     * @throws \Magento\Framework\Exception\ValidatorException
      */
     public function __construct(
         $file,
@@ -21,10 +24,14 @@ public function __construct(
         $options
     ) {
         $zip = new \Magento\Framework\Archive\Zip();
-        $file = $zip->unpack(
-            $directory->getRelativePath($file),
-            $directory->getRelativePath(preg_replace('/\.zip$/i', '.csv', $file))
+        $csvFile = $zip->unpack(
+            $file,
+            preg_replace('/\.zip$/i', '.csv', $file)
         );
-        parent::__construct($file, $directory, $options);
+        if (!$csvFile) {
+            throw new ValidatorException(__('Sorry, but the data is invalid or the file is not uploaded.'));
+        }
+        $directory->delete($directory->getRelativePath($file));
+        parent::__construct($csvFile, $directory, $options);
     }
 }
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Page/AdminImportIndexPage.xml b/app/code/Magento/ImportExport/Test/Mftf/Page/AdminImportIndexPage.xml
new file mode 100644
index 0000000000000..87807eb9b0e85
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Page/AdminImportIndexPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminImportIndexPage" url="admin/import/" area="admin" module="Magento_ImportExport">
+        <section name="AdminImportHeaderSection"/>
+        <section name="AdminImportMainSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml
new file mode 100644
index 0000000000000..748580be09406
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminImportHeaderSection">
+        <element name="checkDataButton" type="button" selector="#upload_button" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml
new file mode 100644
index 0000000000000..2ce6b1e35777f
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.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="AdminImportMainSection">
+        <element name="entityType" type="select" selector="#entity"/>
+        <element name="importBehavior" type="select" selector="#basic_behavior"/>
+        <element name="selectFileToImport" type="input" selector="#import_file"/>
+        <element name="importButton" type="button" selector="#import_validation_container button" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteBehaviorTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteBehaviorTest.xml
new file mode 100644
index 0000000000000..04cef6d6db232
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteBehaviorTest.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminImportProductsWithDeleteBehaviorTest">
+        <annotations>
+            <description value="Verify Magento native import products with delete behavior."/>
+            <stories value="Verify Magento native import products with delete behavior."/>
+            <features value="Import/Export"/>
+            <title value="Verify Magento native import products with delete behavior."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-79495"/>
+            <group value="importExport"/>
+        </annotations>
+        <before>
+            <!--Create Simple product-->
+            <createData entity="SimpleProduct3" stepKey="createSimpleProduct">
+                <field key="name">Simple Product for Test</field>
+                <field key="sku">Simple Product for Test</field>
+            </createData>
+            <!--Create Virtual product-->
+            <createData entity="VirtualProduct" stepKey="createVirtualProduct">
+                <field key="name">Virtual Product for Test</field>
+                <field key="sku">Virtual Product for Test</field>
+            </createData>
+            <!-- Create Downloadable product -->
+            <createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct">
+                <field key="name">Api Downloadable Product for Test</field>
+                <field key="sku">Api Downloadable Product for Test</field>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndexPage"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductFilters"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+        <amOnPage url="{{AdminImportIndexPage.url}}" stepKey="goToImportIndexPage"/>
+        <selectOption selector="{{AdminImportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
+        <waitForElementVisible selector="{{AdminImportMainSection.importBehavior}}" stepKey="waitForImportBehaviorElementVisible"/>
+        <selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="Delete" stepKey="selectDeleteOption"/>
+        <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"/>
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchSimpleProductOnBackend">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchVirtualProductOnBackend">
+            <argument name="product" value="$$createVirtualProduct$$"/>
+        </actionGroup>
+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage1"/>
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchDownloadableProductOnBackend">
+            <argument name="product" value="$$createDownloadableProduct$$"/>
+        </actionGroup>
+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/_files/invalidExportXmlArray.php b/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/_files/invalidExportXmlArray.php
index 288a99770974a..179f3f3cadab0 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/_files/invalidExportXmlArray.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/_files/invalidExportXmlArray.php
@@ -22,15 +22,15 @@
     'attributes_with_type_modelName_and_invalid_value' => [
         '<?xml version="1.0"?><config><entity name="Name/one" model="model_one" '
             . 'entityAttributeFilterType="model_one"/><entityType entity="Name/one" name="name_one" model="1"/>'
-            . ' <fileFormat name="name_one" model="model1"/></config>',
+            . ' <fileFormat name="name_one" model="1model"/></config>',
         [
             "Element 'entityType', attribute 'model': [facet 'pattern'] The value '1' is not accepted by the " .
-            "pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
+            "pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
             "Element 'entityType', attribute 'model': '1' is not a valid value of the atomic type" .
             " 'modelName'.\nLine: 1\n",
-            "Element 'fileFormat', attribute 'model': [facet 'pattern'] The value 'model1' is not " .
-            "accepted by the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
-            "Element 'fileFormat', attribute 'model': 'model1' is not a valid " .
+            "Element 'fileFormat', attribute 'model': [facet 'pattern'] The value '1model' is not " .
+            "accepted by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
+            "Element 'fileFormat', attribute 'model': '1model' is not a valid " .
             "value of the atomic type 'modelName'.\nLine: 1\n"
         ],
     ],
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportMergedXmlArray.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportMergedXmlArray.php
index 357b35e8a313c..409c1af9cb38a 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportMergedXmlArray.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportMergedXmlArray.php
@@ -26,12 +26,12 @@
         ["Element 'entity', attribute 'notallowed': The attribute 'notallowed' is not allowed.\nLine: 1\n"],
     ],
     'entity_model_with_invalid_value' => [
-        '<?xml version="1.0"?><config><entity name="test_name" label="test_label" model="afwer34" ' .
+        '<?xml version="1.0"?><config><entity name="test_name" label="test_label" model="34afwer" ' .
         'behaviorModel="test" /></config>',
         [
-            "Element 'entity', attribute 'model': [facet 'pattern'] The value 'afwer34' is not " .
-            "accepted by the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
-            "Element 'entity', attribute 'model': 'afwer34' is not a valid value of the atomic type" .
+            "Element 'entity', attribute 'model': [facet 'pattern'] The value '34afwer' is not " .
+            "accepted by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
+            "Element 'entity', attribute 'model': '34afwer' is not a valid value of the atomic type" .
             " 'modelName'.\nLine: 1\n"
         ],
     ],
@@ -40,7 +40,7 @@
         '</config>',
         [
             "Element 'entity', attribute 'behaviorModel': [facet 'pattern'] The value '666' is not accepted by " .
-            "the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
+            "the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
             "Element 'entity', attribute 'behaviorModel': '666' is not a valid value of the atomic type" .
             " 'modelName'.\nLine: 1\n"
         ],
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportXmlArray.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportXmlArray.php
index c913b53e8b531..c7b06a8731f02 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportXmlArray.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportXmlArray.php
@@ -19,7 +19,7 @@
         '<?xml version="1.0"?><config><entity name="some_name" model="12345"/></config>',
         [
             "Element 'entity', attribute 'model': [facet 'pattern'] The value '12345' is not accepted by " .
-            "the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
+            "the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
             "Element 'entity', attribute 'model': '12345' is not a valid value of the atomic type" .
             " 'modelName'.\nLine: 1\n"
         ],
@@ -28,7 +28,7 @@
         '<?xml version="1.0"?><config><entity name="some_name" behaviorModel="=--09"/></config>',
         [
             "Element 'entity', attribute 'behaviorModel': [facet 'pattern'] The value '=--09' is not " .
-            "accepted by the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
+            "accepted by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
             "Element 'entity', attribute 'behaviorModel': '=--09' is not a valid value of the atomic type" .
             " 'modelName'.\nLine: 1\n"
         ],
@@ -46,11 +46,11 @@
         ["Element 'entityType': The attribute 'model' is required but missing.\nLine: 1\n"],
     ],
     'entitytype_with_invalid_model_attribute_value' => [
-        '<?xml version="1.0"?><config><entityType entity="entity_name" name="some_name" model="test1"/></config>',
+        '<?xml version="1.0"?><config><entityType entity="entity_name" name="some_name" model="1test"/></config>',
         [
-            "Element 'entityType', attribute 'model': [facet 'pattern'] The value 'test1' is not " .
-            "accepted by the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
-            "Element 'entityType', attribute 'model': 'test1' is not a valid value of the atomic type" .
+            "Element 'entityType', attribute 'model': [facet 'pattern'] The value '1test' is not " .
+            "accepted by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\nLine: 1\n",
+            "Element 'entityType', attribute 'model': '1test' is not a valid value of the atomic type" .
             " 'modelName'.\nLine: 1\n"
         ],
     ],
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/SampleFileProviderTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/SampleFileProviderTest.php
new file mode 100644
index 0000000000000..28ed10ac3c3b9
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/SampleFileProviderTest.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ImportExport\Test\Unit\Model\Import;
+
+use Magento\Framework\Filesystem\Directory\ReadFactory;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\ImportExport\Model\Import\SampleFileProvider;
+
+/**
+ * Test class for Magento\ImportExport\Model\Import\SampleFileProvider.
+ */
+class SampleFileProviderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ReadInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $readerMock;
+
+    /**
+     * @var ReadFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $readerFactoryMock;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var SampleFileProvider
+     */
+    private $model;
+
+    /**
+     * @var string
+     */
+    private $entityName = 'test_sample';
+
+    /**
+     * @var string
+     */
+    private $moduleName = 'Test_Sample';
+
+    /**
+     * @var string
+     */
+    private $filePath = 'Files/Sample/test_sample.csv';
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->readerMock = $this->getMockBuilder(ReadInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->readerFactoryMock = $this->createMock(ReadFactory::class);
+        $this->readerFactoryMock->expects($this->any())->method('create')->willReturn($this->readerMock);
+        $this->readerMock->expects($this->any())->method('getRelativePath')->willReturnArgument(0);
+        $this->model = $this->objectManager->getObject(
+            SampleFileProvider::class,
+            [
+                'readFactory' => $this->readerFactoryMock,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetSize()
+    {
+        $fileSize = 10;
+
+        $this->objectManager->setBackwardCompatibleProperty(
+            $this->model,
+            'samples',
+            [$this->entityName => $this->moduleName]
+        );
+        $this->readerMock->expects($this->atLeastOnce())->method('isFile')->willReturn(true);
+        $this->readerMock->expects($this->once())->method('stat')
+            ->with($this->filePath)
+            ->willReturn(['size' => $fileSize]);
+
+        $actualSize = $this->model->getSize($this->entityName);
+        $this->assertEquals($fileSize, $actualSize);
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetFileContents()
+    {
+        $fileContent = 'test';
+
+        $this->objectManager->setBackwardCompatibleProperty(
+            $this->model,
+            'samples',
+            [$this->entityName => $this->moduleName]
+        );
+        $this->readerMock->expects($this->atLeastOnce())->method('isFile')->willReturn(true);
+        $this->readerMock->expects($this->once())->method('readFile')
+            ->with($this->filePath)
+            ->willReturn($fileContent);
+
+        $actualContent = $this->model->getFileContents($this->entityName);
+        $this->assertEquals($fileContent, $actualContent);
+    }
+
+    /**
+     * @dataProvider methodDataProvider
+     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+     * @param string $methodName
+     * @return void
+     */
+    public function testMethodCallMissingSample(string $methodName)
+    {
+        $this->model->{$methodName}('missingType');
+    }
+
+    /**
+     * @dataProvider methodDataProvider
+     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+     * @expectedExceptionMessage There is no file: Files/Sample/test_sample.csv
+     * @param string $methodName
+     * @return void
+     */
+    public function testMethodCallMissingFile(string $methodName)
+    {
+        $this->objectManager->setBackwardCompatibleProperty(
+            $this->model,
+            'samples',
+            [$this->entityName => $this->moduleName]
+        );
+        $this->readerMock->expects($this->atLeastOnce())->method('isFile')->willReturn(false);
+
+        $this->model->{$methodName}($this->entityName);
+    }
+
+    /**
+     * @return array
+     */
+    public function methodDataProvider(): array
+    {
+        return [
+            ['getSize'],
+            ['getFileContents'],
+        ];
+    }
+}
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/SourceAbstractTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/SourceAbstractTest.php
index 06d2292dfb1a0..ba65677d53b95 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/SourceAbstractTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/SourceAbstractTest.php
@@ -57,7 +57,7 @@ public function testIteratorInterface()
         )->method(
             '_getNextRow'
         )->will(
-            $this->onConsecutiveCalls([1, 2, 3], [4, 5, 5], [6, 7, 8])
+            $this->onConsecutiveCalls([1, 2, 3], [4, 5, 5], [6, 7, 8], [])
         );
         $data = [];
         foreach ($this->_model as $key => $value) {
diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json
index affe85aed48bd..63dcf71bd714e 100644
--- a/app/code/Magento/ImportExport/composer.json
+++ b/app/code/Magento/ImportExport/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-import-export",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-catalog": "102.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-backend": "100.2.*",
@@ -12,7 +12,7 @@
         "ext-ctype": "*"
     },
     "type": "magento2-module",
-    "version": "100.2.6",
+    "version": "100.2.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/ImportExport/etc/di.xml b/app/code/Magento/ImportExport/etc/di.xml
index 47acf7a356d93..36c76022a41c7 100644
--- a/app/code/Magento/ImportExport/etc/di.xml
+++ b/app/code/Magento/ImportExport/etc/di.xml
@@ -17,4 +17,16 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\ImportExport\Model\Import\SampleFileProvider">
+        <arguments>
+            <argument name="samples" xsi:type="array">
+                <item name="advanced_pricing" xsi:type="string">Magento_ImportExport</item>
+                <item name="catalog_product" xsi:type="string">Magento_ImportExport</item>
+                <item name="customer" xsi:type="string">Magento_ImportExport</item>
+                <item name="customer_address" xsi:type="string">Magento_ImportExport</item>
+                <item name="customer_composite" xsi:type="string">Magento_ImportExport</item>
+                <item name="customer_finance" xsi:type="string">Magento_ImportExport</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/ImportExport/etc/export.xsd b/app/code/Magento/ImportExport/etc/export.xsd
index 65728a9be5c62..f62dbc891ef0f 100644
--- a/app/code/Magento/ImportExport/etc/export.xsd
+++ b/app/code/Magento/ImportExport/etc/export.xsd
@@ -71,11 +71,11 @@
     <xs:simpleType name="modelName">
         <xs:annotation>
             <xs:documentation>
-                Model name can contain only [A-Za-z_\\].
+                Model name can contain only ([\\]?[a-zA-Z_][a-zA-Z0-9_]*)+.
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Za-z_\\]+" />
+            <xs:pattern value="([\\]?[a-zA-Z_][a-zA-Z0-9_]*)+" />
         </xs:restriction>
     </xs:simpleType>
 </xs:schema>
diff --git a/app/code/Magento/ImportExport/etc/import.xsd b/app/code/Magento/ImportExport/etc/import.xsd
index aefa6541d7e13..e73038ebc0710 100644
--- a/app/code/Magento/ImportExport/etc/import.xsd
+++ b/app/code/Magento/ImportExport/etc/import.xsd
@@ -61,11 +61,11 @@
     <xs:simpleType name="modelName">
         <xs:annotation>
             <xs:documentation>
-                Model name can contain only [A-Za-z_\\].
+                Model name can contain only ([\\]?[a-zA-Z_][a-zA-Z0-9_]*)+.
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Za-z_\\]+" />
+            <xs:pattern value="([\\]?[a-zA-Z_][a-zA-Z0-9_]*)+" />
         </xs:restriction>
     </xs:simpleType>
 </xs:schema>
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/busy.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/busy.phtml
index 4f13b759efd87..fe1763d3e0286 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/busy.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/busy.phtml
@@ -6,11 +6,11 @@
 ?>
 <div class="fieldset">
     <div class="legend">
-        <span><?= /* @escapeNotVerified */ __('Status') ?></span>
+        <span><?= $block->escapeHtml(__('Status')) ?></span>
     </div><br>
     <div class="messages">
         <div class="message message-success success">
-            <div><?= /* @escapeNotVerified */ $block->getStatusMessage() ?></div>
+            <div><?= $block->escapeHtml($block->getStatusMessage()) ?></div>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml
index 7e801bcd1d662..150f7dbeb1046 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml
@@ -3,20 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
 ?>
 <fieldset class="admin__fieldset" id="export_filter_container" style="display:none;">
     <legend class="admin__legend">
-        <span><?= /* @escapeNotVerified */ __('Entity Attributes') ?></span>
+        <span><?= $block->escapeHtml(__('Entity Attributes')) ?></span>
     </legend>
     <br />
-    <form id="export_filter_form" action="<?= /* @escapeNotVerified */ $block->getUrl('*/*/export') ?>" method="post">
-        <input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
+    <form id="export_filter_form" action="<?= $block->escapeUrl($block->getUrl('*/*/export')) ?>" method="post">
+        <input name="form_key" type="hidden" value="<?= /* @noEscape */ $block->getFormKey() ?>" />
         <div id="export_filter_grid_container"><!-- --></div>
     </form>
-    <button class="action- scalable" type="button" onclick="getFile();"><span><?php
-        /* @escapeNotVerified */ echo __('Continue')
+    <button class="action- scalable" type="button" onclick="getFile();"><span><?=
+        $block->escapeHtml(__('Continue'))
     ?></span></button>
 </fieldset>
 <script>
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
index 093830d6fdb1c..1214366afba04 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
@@ -44,7 +44,7 @@ require([
          */
         getFilter: function() {
             if ($('entity') && $F('entity')) {
-                var url    = "<?= /* @escapeNotVerified */ $block->getUrl('*/*/getFilter') ?>";
+                var url    = "<?= $block->escapeJs($block->escapeUrl($block->getUrl('*/*/getFilter'))) ?>";
                 var entity = $F('entity');
                 if (entity != this.previousGridEntity) {
                     this.previousGridEntity = entity;
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/after.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/after.phtml
index b6c67e4167aac..f629e6c9e9f59 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/after.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/after.phtml
@@ -3,13 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
 ?>
 <div class="entry-edit fieldset" id="import_validation_container" style="display:none;">
     <div class="entry-edit-head legend">
         <span class="icon-head head-edit-form fieldset-legend"
-            id="import_validation_container_header"><?= /* @escapeNotVerified */ __('Validation Results') ?></span>
+            id="import_validation_container_header"><?= $block->escapeHtml(__('Validation Results')) ?></span>
     </div><br>
     <div id="import_validation_messages" class="fieldset"><!-- --></div>
 </div>
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
index 73b013fdb8df4..529899970dfe2 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
@@ -3,8 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
 ?>
 <?php
 /** @var $block \Magento\ImportExport\Block\Adminhtml\Import\Edit\Before */
@@ -29,25 +27,27 @@ require([
          * List of existing behavior sets
          * @type {Array}
          */
-        uniqueBehaviors: <?= /* @escapeNotVerified */ $block->getUniqueBehaviors() ?>,
+        uniqueBehaviors: <?= /* @noEscape */ $block->getUniqueBehaviors() ?>,
 
         /**
          * Behaviour codes for import entities
          * @type {Array}
          */
-        entityBehaviors: <?= /* @escapeNotVerified */ $block->getEntityBehaviors() ?>,
+        entityBehaviors: <?= /* @noEscape */ $block->getEntityBehaviors() ?>,
 
         /**
          * Behaviour notes for import entities
          * @type {Array}
          */
-        entityBehaviorsNotes: <?= /* @escapeNotVerified */ $block->getEntityBehaviorsNotes() ?>,
+        entityBehaviorsNotes: <?= /* @noEscape */ $block->getEntityBehaviorsNotes() ?>,
 
         /**
          * Base url
          * @type {string}
          */
-        sampleFilesBaseUrl: '<?= /* @escapeNotVerified */ $block->getUrl('*/*/download/', ['filename' => 'entity-name']) ?>',
+        sampleFilesBaseUrl: '<?= $block->escapeJs(
+            $block->escapeUrl($block->getUrl('*/*/download/', ['filename' => 'entity-name']))
+        ) ?>',
 
         /**
          * Reset selected index
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/import/frame/result.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/import/frame/result.phtml
index fbb9baa452ac8..57f521fba946f 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/import/frame/result.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/import/frame/result.phtml
@@ -6,6 +6,6 @@
 ?>
 <script type='text/javascript'>
 //<![CDATA[
-    top.varienImport.postToFrameComplete(<?= /* @escapeNotVerified */ $block->getResponseJson() ?>);
+    top.varienImport.postToFrameComplete(<?= /* @noEscape */ $block->getResponseJson() ?>);
 //]]>
 </script>
diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php
index b4a4d9f06ae48..dab47d091416e 100644
--- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php
+++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php
@@ -6,18 +6,25 @@
  */
 namespace Magento\Indexer\Controller\Adminhtml\Indexer;
 
+use Magento\Framework\Exception\NotFoundException;
+
 class MassChangelog extends \Magento\Indexer\Controller\Adminhtml\Indexer
 {
     /**
      * Turn mview on for the given indexers
      *
      * @return void
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         $indexerIds = $this->getRequest()->getParam('indexer_ids');
         if (!is_array($indexerIds)) {
-            $this->messageManager->addError(__('Please select indexers.'));
+            $this->messageManager->addErrorMessage(__('Please select indexers.'));
         } else {
             try {
                 foreach ($indexerIds as $indexerId) {
@@ -27,13 +34,13 @@ public function execute()
                     )->get($indexerId);
                     $model->setScheduled(true);
                 }
-                $this->messageManager->addSuccess(
+                $this->messageManager->addSuccessMessage(
                     __('%1 indexer(s) are in "Update by Schedule" mode.', count($indexerIds))
                 );
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException(
+                $this->messageManager->addExceptionMessage(
                     $e,
                     __("We couldn't change indexer(s)' mode because of an error.")
                 );
diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php
index 7ace4a64d3829..ac6bb046dba22 100644
--- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php
+++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php
@@ -6,15 +6,22 @@
  */
 namespace Magento\Indexer\Controller\Adminhtml\Indexer;
 
+use Magento\Framework\Exception\NotFoundException;
+
 class MassOnTheFly extends \Magento\Indexer\Controller\Adminhtml\Indexer
 {
     /**
      * Turn mview off for the given indexers
      *
      * @return void
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         $indexerIds = $this->getRequest()->getParam('indexer_ids');
         if (!is_array($indexerIds)) {
             $this->messageManager->addError(__('Please select indexers.'));
diff --git a/app/code/Magento/Indexer/Model/Indexer.php b/app/code/Magento/Indexer/Model/Indexer.php
index 4e9b3dbdb8866..afeff3f38d63a 100644
--- a/app/code/Magento/Indexer/Model/Indexer.php
+++ b/app/code/Magento/Indexer/Model/Indexer.php
@@ -361,7 +361,7 @@ public function getLatestUpdated()
                 return $this->getView()->getUpdated();
             }
         }
-        return $this->getState()->getUpdated();
+        return $this->getState()->getUpdated() ?: '';
     }
 
     /**
diff --git a/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminIndexerActionGroup.xml b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminIndexerActionGroup.xml
new file mode 100644
index 0000000000000..5cf6656f9fb50
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminIndexerActionGroup.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="UpdateIndexerMode">
+        <arguments>
+            <argument name="indexerId" type="string"/>
+            <argument name="indexerMode" type="string" defaultValue="Update on Save"/>
+        </arguments>
+        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="amOnIndexManagementPage"/>
+        <checkOption selector="{{AdminIndexManagementSection.indexerCheckbox(indexerId)}}" stepKey="selectIndexer"/>
+        <selectOption selector="{{AdminIndexManagementSection.massActionSelect}}" userInput="{{indexerMode}}" stepKey="selectIndexerMode"/>
+        <click selector="{{AdminIndexManagementSection.massActionSubmit}}" stepKey="submitIndexerForm"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput='1 indexer(s) are in "{{indexerMode}}" mode.' stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminSwitchAllIndexerToActionModeActionGroup.xml b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminSwitchAllIndexerToActionModeActionGroup.xml
new file mode 100644
index 0000000000000..ab6bee0bf234a
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminSwitchAllIndexerToActionModeActionGroup.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="AdminSwitchAllIndexerToActionModeActionGroup">
+        <arguments>
+            <argument name="action" type="string" defaultValue="Update by Schedule"/>
+        </arguments>
+        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="onIndexManagement"/>
+        <waitForPageLoad stepKey="waitForManagementPage"/>
+        <selectOption userInput="selectAll" selector="{{AdminIndexManagementSection.selectMassAction}}" stepKey="checkIndexer"/>
+        <selectOption userInput="{{action}}" selector="{{AdminIndexManagementSection.massActionSelect}}" stepKey="selectAction"/>
+        <click selector="{{AdminIndexManagementSection.massActionSubmit}}" stepKey="clickSubmit"/>
+        <waitForPageLoad stepKey="waitForSubmit"/>
+        <see userInput="indexer(s) are in &quot;{{action}}&quot; mode." stepKey="seeMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminSwitchIndexerToActionModeActionGroup.xml b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminSwitchIndexerToActionModeActionGroup.xml
new file mode 100644
index 0000000000000..6622d911eec8f
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminSwitchIndexerToActionModeActionGroup.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="AdminSwitchIndexerToActionModeActionGroup">
+        <arguments>
+            <argument name="indexerValue" type="string"/>
+            <argument name="action" type="string" defaultValue="Update by Schedule"/>
+        </arguments>
+        <checkOption selector="{{AdminIndexManagementSection.indexerCheckbox(indexerValue)}}" stepKey="checkIndexer"/>
+        <selectOption userInput="{{action}}" selector="{{AdminIndexManagementSection.massActionSelect}}" stepKey="selectAction"/>
+        <click selector="{{AdminIndexManagementSection.massActionSubmit}}" stepKey="clickSubmit"/>
+        <waitForPageLoad stepKey="waitForSubmit"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="1 indexer(s) are in &quot;{{action}}&quot; mode." stepKey="seeMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Indexer/Test/Mftf/Page/AdminIndexManagementPage.xml b/app/code/Magento/Indexer/Test/Mftf/Page/AdminIndexManagementPage.xml
new file mode 100644
index 0000000000000..504608d0721fe
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Mftf/Page/AdminIndexManagementPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminIndexManagementPage" url="indexer/indexer/list" module="Magento_Indexer" area="admin">
+        <section name="AdminIndexManagementSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Indexer/Test/Mftf/Section/AdminIndexManagementSection.xml b/app/code/Magento/Indexer/Test/Mftf/Section/AdminIndexManagementSection.xml
new file mode 100644
index 0000000000000..dad163107eb3e
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Mftf/Section/AdminIndexManagementSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminIndexManagementSection">
+        <element name="indexerCheckbox" type="checkbox" selector="#gridIndexer_table input[value='{{indexerId}}']" parameterized="true"/>
+        <element name="massActionSelect" type="select" selector="#gridIndexer_massaction-select"/>
+        <element name="massActionSubmit" type="button" selector="#gridIndexer_massaction-form button" timeout="30"/>
+        <element name="selectMassAction" type="select" selector="#gridIndexer_massaction-mass-select"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassChangelogTest.php b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassChangelogTest.php
index df15a0a58949f..16b5f90cead58 100644
--- a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassChangelogTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassChangelogTest.php
@@ -134,12 +134,10 @@ protected function setUp()
             \Magento\Framework\TestFramework\Unit\Helper\ObjectManager::class,
             ['get']
         );
-        $this->request = $this->getMockForAbstractClass(
-            \Magento\Framework\App\RequestInterface::class,
-            ['getParam', 'getRequest'],
-            '',
-            false
-        );
+        $this->request = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
+            ->setMethods(['getParam', 'getRequest', 'isPost'])
+            ->getMockForAbstractClass();
+        $this->request->expects($this->any())->method('isPost')->willReturn(true);
 
         $this->response->expects($this->any())->method("setRedirect")->willReturn(1);
         $this->page = $this->createMock(\Magento\Framework\View\Result\Page::class);
@@ -147,7 +145,7 @@ protected function setUp()
         $this->title = $this->createMock(\Magento\Framework\View\Page\Title::class);
         $this->messageManager = $this->getMockForAbstractClass(
             \Magento\Framework\Message\ManagerInterface::class,
-            ['addError', 'addSuccess'],
+            ['addErrorMessage', 'addSuccessMessage'],
             '',
             false
         );
@@ -181,7 +179,7 @@ public function testExecute($indexerIds, $exception, $expectsExceptionValues)
 
         if (!is_array($indexerIds)) {
             $this->messageManager->expects($this->once())
-                ->method('addError')->with(__('Please select indexers.'))
+                ->method('addErrorMessage')->with(__('Please select indexers.'))
                 ->will($this->returnValue(1));
         } else {
             $this->objectManager->expects($this->any())
@@ -210,10 +208,10 @@ public function testExecute($indexerIds, $exception, $expectsExceptionValues)
             if ($exception !== null) {
                 $this->messageManager
                     ->expects($this->exactly($expectsExceptionValues[2]))
-                    ->method('addError')
+                    ->method('addErrorMessage')
                     ->with($exception->getMessage());
                 $this->messageManager->expects($this->exactly($expectsExceptionValues[1]))
-                    ->method('addException')
+                    ->method('addExceptionMessage')
                     ->with($exception, "We couldn't change indexer(s)' mode because of an error.");
             }
         }
diff --git a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassOnTheFlyTest.php b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassOnTheFlyTest.php
index a0e8134522461..956e102a3cc44 100644
--- a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassOnTheFlyTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassOnTheFlyTest.php
@@ -137,12 +137,9 @@ protected function setUp()
             \Magento\Framework\TestFramework\Unit\Helper\ObjectManager::class,
             ['get']
         );
-        $this->request = $this->getMockForAbstractClass(
-            \Magento\Framework\App\RequestInterface::class,
-            ['getParam', 'getRequest'],
-            '',
-            false
-        );
+        $this->request = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
+            ->setMethods(['getParam', 'getRequest', 'isPost'])
+            ->getMockForAbstractClass();
 
         $this->response->expects($this->any())->method("setRedirect")->willReturn(1);
         $this->page = $this->createMock(\Magento\Framework\View\Result\Page::class);
@@ -181,6 +178,7 @@ public function testExecute($indexerIds, $exception, $expectsExceptionValues)
         $this->request->expects($this->any())
             ->method('getParam')->with('indexer_ids')
             ->will($this->returnValue($indexerIds));
+        $this->request->expects($this->any())->method('isPost')->willReturn(true);
 
         if (!is_array($indexerIds)) {
             $this->messageManager->expects($this->once())
diff --git a/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php b/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
index 6b7cc12218990..ca2da9585f934 100644
--- a/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
@@ -164,7 +164,12 @@ public function testGetLatestUpdated($getViewIsEnabled, $getViewGetUpdated, $get
                 }
             }
         } else {
-            $this->assertEquals($getStateGetUpdated, $this->model->getLatestUpdated());
+            $getLatestUpdated = $this->model->getLatestUpdated();
+            $this->assertEquals($getStateGetUpdated, $getLatestUpdated);
+
+            if ($getStateGetUpdated === null) {
+                $this->assertNotNull($getLatestUpdated);
+            }
         }
     }
 
@@ -182,7 +187,8 @@ public function getLatestUpdatedDataProvider()
             [true, '', '06-Jan-1944'],
             [true, '06-Jan-1944', ''],
             [true, '', ''],
-            [true, '06-Jan-1944', '05-Jan-1944']
+            [true, '06-Jan-1944', '05-Jan-1944'],
+            [false, null, null],
         ];
     }
 
diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json
index 1667f8a05a5e8..448a81b432a38 100644
--- a/app/code/Magento/Indexer/composer.json
+++ b/app/code/Magento/Indexer/composer.json
@@ -2,12 +2,12 @@
     "name": "magento/module-indexer",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-backend": "100.2.*",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/InstantPurchase/composer.json b/app/code/Magento/InstantPurchase/composer.json
index cd7684254e408..e1bfd440ba96d 100644
--- a/app/code/Magento/InstantPurchase/composer.json
+++ b/app/code/Magento/InstantPurchase/composer.json
@@ -2,13 +2,13 @@
     "name": "magento/module-instant-purchase",
     "description": "N/A",
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-catalog": "102.0.*",
         "magento/module-customer": "101.0.*",
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
index 36073af56327a..94f4c80239712 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
@@ -6,6 +6,7 @@
  */
 namespace Magento\Integration\Controller\Adminhtml\Integration;
 
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
 use Magento\Framework\Exception\IntegrationException;
 use Magento\Framework\Controller\ResultFactory;
@@ -16,9 +17,14 @@ class Delete extends \Magento\Integration\Controller\Adminhtml\Integration
      * Delete the integration.
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $integrationId = (int)$this->getRequest()->getParam(self::PARAM_INTEGRATION_ID);
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
index dfddd8b954bd3..7afdfbb4de8c3 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Integration\Controller\Adminhtml\Integration;
 
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
 use Magento\Framework\Exception\IntegrationException;
 use Magento\Framework\Exception\LocalizedException;
@@ -43,9 +44,15 @@ private function getSecurityCookie()
      * Save integration action.
      *
      * @return void
+     * @throws NotFoundException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         /** @var array $integrationData */
         $integrationData = [];
         try {
diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php
index 8173c50083973..1b2167ef104d1 100644
--- a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php
@@ -23,6 +23,7 @@ protected function setUp()
     {
         parent::setUp();
 
+        $this->_requestMock->expects($this->any())->method('isPost')->willReturn(true);
         $this->integrationController = $this->_createIntegrationController('Delete');
 
         $resultRedirect = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php
index ca614966194a2..7401b86d29d6b 100644
--- a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php
@@ -17,6 +17,15 @@
 
 class SaveTest extends \Magento\Integration\Test\Unit\Controller\Adminhtml\IntegrationTest
 {
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->_requestMock->expects($this->any())->method('isPost')->willReturn(true);
+    }
+
     public function testSaveAction()
     {
         // Use real translate model
diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json
index 75bd7a04d0dcc..945dd8c784eb9 100644
--- a/app/code/Magento/Integration/composer.json
+++ b/app/code/Magento/Integration/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-integration",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-backend": "100.2.*",
         "magento/module-customer": "101.0.*",
@@ -12,7 +12,7 @@
         "magento/module-authorization": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml
index 3264b640c8840..d51ac9e41ba3e 100644
--- a/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml
+++ b/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml
@@ -7,10 +7,8 @@
  *
  * @var \Magento\Backend\Block\Widget\Form\Container $block
  */
-
-// @codingStandardsIgnoreFile
 ?>
-<div><p><?= /* @escapeNotVerified */ __('The integration you selected asks you to approve access to the following:') ?></p></div>
+<div><p><?= $block->escapeHtml(__('The integration you selected asks you to approve access to the following:')) ?></p></div>
 <div id="integration-activate-permissions-tabs">
     <?= $block->getChildHtml('tabs') ?>
 </div>
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml
index 2a0ac30d67df7..1730509a65910 100644
--- a/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml
+++ b/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml
@@ -7,14 +7,11 @@
  *
  * @var \Magento\Integration\Block\Adminhtml\Integration\Activate\Permissions\Tab\Webapi $block
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <fieldset class="admin__fieldset form-inline entry-edit">
-    <?php if ($block->isTreeEmpty()): ?>
-        <p class="empty"><?= /* @escapeNotVerified */ __('No permissions requested') ?></p>
-    <?php else: ?>
+    <?php if ($block->isTreeEmpty()) : ?>
+        <p class="empty"><?= $block->escapeHtml(__('No permissions requested')) ?></p>
+    <?php else : ?>
         <div class="field" data-role="tree-resources-container">
             <div class="control">
                 <div id="resource-tree" class="tree x-tree" data-role="resource-tree"></div>
@@ -22,7 +19,7 @@
         </div>
     <?php endif ?>
 </fieldset>
-<?php if (!$block->isTreeEmpty()): ?>
+<?php if (!$block->isTreeEmpty()) : ?>
     <script>
         require(["jquery", "Magento_User/js/roles-tree"], function($){
             $.widget('mage.rolesTree', $.mage.rolesTree, {
@@ -35,8 +32,8 @@
             });
 
             $('[data-role="resource-tree"]').rolesTree({
-                'treeInitData': <?= /* @escapeNotVerified */ $block->getResourcesTreeJson() ?>,
-                'treeInitSelectedData': <?= /* @escapeNotVerified */ $block->getSelectedResourcesJson() ?>
+                'treeInitData': <?= /* @noEscape */ $block->getResourcesTreeJson() ?>,
+                'treeInitSelectedData': <?= /* @noEscape */ $block->getSelectedResourcesJson() ?>
             });
         });
     </script>
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
index 8b7e787337e1a..41856e2415e40 100644
--- a/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
+++ b/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
@@ -7,23 +7,22 @@
  *
  * @var \Magento\Backend\Block\Template $block
  */
-
-// @codingStandardsIgnoreFile
 ?>
 <script>
     require([
         "jquery",
         'Magento_Ui/js/modal/confirm',
         "jquery/ui",
-        "Magento_Integration/js/integration"
+        "Magento_Integration/js/integration",
+        'mage/dataPost'
     ], function ($, Confirm) {
 
         window.integration = new Integration(
-            '<?= /* @escapeNotVerified */ $block->getUrl('*/*/permissionsDialog', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]) ?>',
-            '<?= /* @escapeNotVerified */ $block->getUrl('*/*/tokensDialog', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]) ?>',
-            '<?= /* @escapeNotVerified */ $block->getUrl('*/*/tokensExchange', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]) ?>',
-            '<?= /* @escapeNotVerified */ $block->getUrl('*/*') ?>',
-            '<?= /* @escapeNotVerified */ $block->getUrl('*/*/loginSuccessCallback') ?>'
+            '<?= $block->escapeUrl($block->getUrl('*/*/permissionsDialog', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false])) ?>',
+            '<?= $block->escapeUrl($block->getUrl('*/*/tokensDialog', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false])) ?>',
+            '<?= $block->escapeUrl($block->getUrl('*/*/tokensExchange', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false])) ?>',
+            '<?= $block->escapeUrl($block->getUrl('*/*')) ?>',
+            '<?= $block->escapeUrl($block->getUrl('*/*/loginSuccessCallback')) ?>'
         );
 
         /**
@@ -33,11 +32,11 @@
             $('div#integrationGrid').on('click', 'button#delete', function (e) {
 
                 new Confirm({
-                    title: '<?= /* @escapeNotVerified */ __('Are you sure?') ?>',
-                    content: "<?= /* @escapeNotVerified */ __("Are you sure you want to delete this integration? You can't undo this action.") ?>",
+                    title: '<?= $block->escapeHtml(__('Are you sure?')) ?>',
+                    content: "<?= $block->escapeHtml(__("Are you sure you want to delete this integration? You can't undo this action.")) ?>",
                     actions: {
                         confirm: function () {
-                            window.location.href = $(e.target).data('url');
+                            $.mage.dataPost().postData({action: $(e.target).data('url'), data: {}});
                         }
                     }
                 });
@@ -47,4 +46,4 @@
     });
 </script>
 
-<div id="integration-popup-container" style="display: none;"></div>
\ No newline at end of file
+<div id="integration-popup-container" style="display: none;"></div>
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/tokens_exchange.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/tokens_exchange.phtml
index c8e4c914b7c82..e1d85ec5361c0 100644
--- a/app/code/Magento/Integration/view/adminhtml/templates/integration/tokens_exchange.phtml
+++ b/app/code/Magento/Integration/view/adminhtml/templates/integration/tokens_exchange.phtml
@@ -7,8 +7,5 @@
  *
  * @var \Magento\Backend\Block\Template $block
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<div><p><?= /* @escapeNotVerified */ __("Please setup or sign in into your 3rd party account to complete setup of this integration.") ?></p></div>
+<div><p><?= $block->escapeHtml(__("Please setup or sign in into your 3rd party account to complete setup of this integration.")) ?></p></div>
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml b/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
index 00f78226b6ac5..c65dcdd3cb966 100644
--- a/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
+++ b/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
@@ -4,11 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
-?>
-
-<?php
 /** @var $block \Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Webapi */
 ?>
 
@@ -16,26 +11,26 @@
 
 <fieldset class="fieldset form-inline entry-edit">
     <legend class="legend">
-        <span><?= /* @escapeNotVerified */ __('Available APIs') ?></span>
+        <span><?= $block->escapeHtml(__('Available APIs')) ?></span>
     </legend><br />
 
     <div class="field">
-        <label class="label" for="all_resources"><span><?= /* @escapeNotVerified */ __('Resource Access') ?></span></label>
+        <label class="label" for="all_resources"><span><?= $block->escapeHtml(__('Resource Access')) ?></span></label>
 
         <div class="control">
             <select id="all_resources" name="all_resources" onchange="jQuery('[data-role=tree-resources-container]').toggle()" class="select">
-                <option value="0" <?= ($block->isEverythingAllowed() ? '' : 'selected="selected"') ?>><?= /* @escapeNotVerified */ __('Custom') ?></option>
-                <option value="1" <?= ($block->isEverythingAllowed() ? 'selected="selected"' : '') ?>><?= /* @escapeNotVerified */ __('All') ?></option>
+                <option value="0" <?= ($block->isEverythingAllowed() ? '' : 'selected="selected"') ?>><?= $block->escapeHtml(__('Custom')) ?></option>
+                <option value="1" <?= ($block->isEverythingAllowed() ? 'selected="selected"' : '') ?>><?= $block->escapeHtml(__('All')) ?></option>
             </select>
         </div>
     </div>
 
-    <div class="field<?php if ($block->isEverythingAllowed()):?> no-display<?php endif?>" data-role="tree-resources-container">
-        <label class="label"><span><?= /* @escapeNotVerified */ __('Resources') ?></span></label>
+    <div class="field<?php if ($block->isEverythingAllowed()) : ?> no-display<?php endif?>" data-role="tree-resources-container">
+        <label class="label"><span><?= $block->escapeHtml(__('Resources')) ?></span></label>
 
         <div class="control">
-            <div class="tree x-tree" data-role="resource-tree" data-mage-init='<?php
-            echo $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode([
+            <div class="tree x-tree" data-role="resource-tree" data-mage-init='<?=
+            $block->escapeHtml($this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([
                 'rolesTree' => [
                     "treeInitData" => $block->getTree(),
                     "treeInitSelectedData" => $block->getSelectedResources(),
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontCheckingResultsOfFiltersTest.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontCheckingResultsOfFiltersTest.xml
index 1d4a861ffe7b8..e6c3cb1788b31 100644
--- a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontCheckingResultsOfFiltersTest.xml
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontCheckingResultsOfFiltersTest.xml
@@ -37,7 +37,7 @@
             <click selector="{{AdminProductAttributeSetGridSection.deleteOptionByName('Black')}}" stepKey="deleteOption5"/>
 
             <!--Save attribute-->
-            <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveColorAttribute"/>
+            <actionGroup ref="SaveProductAttribute" stepKey="clickSaveColorAttribute"/>
 
             <!--Delete Category-->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
@@ -87,7 +87,7 @@
         <waitForElementVisible selector="{{AdminNewAttributePanelSection.isDefault('5')}}" time="30" stepKey="waitForOptionRow5"/>
         <fillField selector="{{AdminNewAttributePanelSection.optionAdminValue('4')}}" userInput="{{ColorProductAttribute5.name}}" stepKey="fillAdminLabel5"/>
         <!--Save attribute-->
-        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveAttribute"/>
+        <actionGroup ref="SaveProductAttribute" stepKey="clickSaveAttribute"/>
 
         <!--Create 'material' attribute:-->
         <amOnPage url="{{ProductAttributePage.url}}" stepKey="goToNewProductAttributePage"/>
@@ -122,9 +122,7 @@
         <selectOption selector="{{AttributePropertiesSection.useInLayeredNavigation}}" userInput="1" stepKey="selectUseInLayeredNavigation"/>
 
         <!--Save attribute-->
-        <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickSaveNewAttribute"/>
-        <waitForPageLoad stepKey="waitForSavingNewAttribute"/>
-        <see userInput="You saved the product attribute." stepKey="seeSuccessMessage"/>
+        <actionGroup ref="SaveProductAttribute" stepKey="clickSaveNewAttribute"/>
         <click selector="{{AdminUserGridSection.resetButton}}" stepKey="clickResetButton"/>
 
         <!--Create attribute set-->
@@ -204,8 +202,7 @@
         <dragAndDrop selector1="{{AdminNewAttributePanelSection.attributeName('cotton')}}" selector2="{{AdminNewAttributePanelSection.attributeName('fabric')}}" stepKey="selectMaterialsSimple"/>
 
         <!-- Save the product -->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveSimpleProduct"/>
-        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product." stepKey="assertSuccessSimpleProduct"/>
+        <actionGroup ref="saveProductForm" stepKey="saveSimpleProduct"/>
 
         <!--Clear caches-->
         <magentoCLI command="cache:flush" stepKey="flushCache"/>
diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json
index b8dfc77532784..c198c0635b164 100644
--- a/app/code/Magento/LayeredNavigation/composer.json
+++ b/app/code/Magento/LayeredNavigation/composer.json
@@ -2,13 +2,13 @@
     "name": "magento/module-layered-navigation",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-config": "101.0.*",
         "magento/module-catalog": "102.0.*",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
index fab89973d908b..b24257d0cb64b 100644
--- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
+++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
@@ -4,8 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
 /**
@@ -16,21 +15,21 @@
 ?>
 
 <ol class="items">
-    <?php foreach ($filterItems as $filterItem): ?>
+    <?php foreach ($filterItems as $filterItem) : ?>
         <li class="item">
-            <?php if ($filterItem->getCount() > 0): ?>
+            <?php if ($filterItem->getCount() > 0) : ?>
                 <a href="<?= $block->escapeUrl($filterItem->getUrl()) ?>">
-                    <?= /* @escapeNotVerified */ $filterItem->getLabel() ?>
-                    <?php if ($this->helper('\Magento\Catalog\Helper\Data')->shouldDisplayProductCountOnLayer()): ?>
-                        <span class="count"><?= /* @escapeNotVerified */ $filterItem->getCount() ?><span class="filter-count-label">
-                            <?php if ($filterItem->getCount() == 1):?> <?= /* @escapeNotVerified */ __('item') ?><?php else:?> <?= /* @escapeNotVerified */ __('items') ?><?php endif;?></span></span>
+                    <?= /* @noEscape */ $filterItem->getLabel() ?>
+                    <?php if ($this->helper(\Magento\Catalog\Helper\Data::class)->shouldDisplayProductCountOnLayer()) : ?>
+                        <span class="count"><?= /* @noEscape */ (int)$filterItem->getCount() ?><span class="filter-count-label">
+                            <?php if ($filterItem->getCount() == 1) : ?> <?= $block->escapeHtml(__('item')) ?><?php else : ?> <?= $block->escapeHtml(__('items')) ?><?php endif;?></span></span>
                     <?php endif; ?>
                 </a>
-            <?php else:?>
-                <?= /* @escapeNotVerified */ $filterItem->getLabel() ?>
-                <?php if ($this->helper('\Magento\Catalog\Helper\Data')->shouldDisplayProductCountOnLayer()): ?>
-                    <span class="count"><?= /* @escapeNotVerified */ $filterItem->getCount() ?><span class="filter-count-label">
-                        <?php if ($filterItem->getCount() == 1):?><?= /* @escapeNotVerified */ __('item') ?><?php else:?><?= /* @escapeNotVerified */ __('items') ?><?php endif;?></span></span>
+            <?php else :?>
+                <?= /* @noEscape */ $filterItem->getLabel() ?>
+                <?php if ($this->helper(\Magento\Catalog\Helper\Data::class)->shouldDisplayProductCountOnLayer()) : ?>
+                    <span class="count"><?= /* @noEscape */ (int)$filterItem->getCount() ?><span class="filter-count-label">
+                        <?php if ($filterItem->getCount() == 1) : ?><?= $block->escapeHtml(__('item')) ?><?php else : ?><?= $block->escapeHtml(__('items')) ?><?php endif;?></span></span>
                 <?php endif; ?>
             <?php endif; ?>
         </li>
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml
index 603f2f93ff754..2673f32288752 100644
--- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml
+++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /**
@@ -15,35 +12,35 @@
  */
 ?>
 <?php $_filters = $block->getActiveFilters() ?>
-<?php if (!empty($_filters)): ?>
+<?php if (!empty($_filters)) : ?>
 <div class="filter-current">
     <strong class="block-subtitle filter-current-subtitle"
             role="heading"
             aria-level="2"
-            data-count="<?= count($_filters) ?>"><?= /* @escapeNotVerified */ __('Now Shopping by') ?></strong>
+            data-count="<?= count($_filters) ?>"><?= $block->escapeHtmlAttr(__('Now Shopping by')) ?></strong>
     <ol class="items">
-        <?php foreach ($_filters as $_filter): ?>
+        <?php foreach ($_filters as $_filter) : ?>
             <li class="item">
                 <span class="filter-label"><?= $block->escapeHtml(__($_filter->getName())) ?></span>
-                <span class="filter-value"><?= /* @escapeNotVerified */ $block->stripTags($_filter->getLabel()) ?></span>
+                <span class="filter-value"><?= $block->escapeHtml($block->stripTags($_filter->getLabel())) ?></span>
                 <?php
                 $clearLinkUrl = $_filter->getClearLinkUrl();
-                $currentFilterName = $block->escapeHtml(__($_filter->getName())) . " " . $block->stripTags($_filter->getLabel());
-                if ($clearLinkUrl):
+                $currentFilterName = $block->escapeHtml(__($_filter->getName()) . " " . $block->stripTags($_filter->getLabel()));
+                if ($clearLinkUrl) :
                     ?>
-                    <a class="action previous" href="<?= /* @escapeNotVerified */ $_filter->getRemoveUrl() ?>"
-                       title="<?= /* @escapeNotVerified */ __('Previous') ?>">
-                        <span><?= /* @escapeNotVerified */ __('Previous') ?></span>
+                    <a class="action previous" href="<?= $block->escapeUrl($_filter->getRemoveUrl()) ?>"
+                       title="<?= $block->escapeHtmlAttr(__('Previous')) ?>">
+                        <span><?= $block->escapeHtml(__('Previous')) ?></span>
                     </a>
                     <a class="action remove"
-                       title="<?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>"
-                       href="<?= /* @escapeNotVerified */ $clearLinkUrl ?>">
+                       title="<?= $block->escapeHtmlAttr($_filter->getFilter()->getClearLinkText()) ?>"
+                       href="<?= $block->escapeUrl($clearLinkUrl) ?>">
                         <span><?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
                     </a>
-                <?php else: ?>
-                    <a class="action remove" href="<?= /* @escapeNotVerified */ $_filter->getRemoveUrl() ?>"
-                       title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Remove')) . " " . $currentFilterName ?>">
-                        <span><?= /* @escapeNotVerified */ __('Remove This Item') ?></span>
+                <?php else : ?>
+                    <a class="action remove" href="<?= $block->escapeUrl($_filter->getRemoveUrl()) ?>"
+                       title="<?= /* @noEscape */ $block->escapeHtmlAttr(__('Remove')) . " " . $currentFilterName ?>">
+                        <span><?= $block->escapeHtml(__('Remove This Item')) ?></span>
                     </a>
                 <?php endif; ?>
             </li>
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml
index b2159d2ff08d4..74ec37604ec85 100644
--- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml
+++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /**
@@ -15,32 +12,33 @@
  */
 ?>
 
-<?php if ($block->canShowBlock()): ?>
+<?php if ($block->canShowBlock()) : ?>
     <div class="block filter">
         <div class="block-title filter-title">
-            <strong><?= /* @escapeNotVerified */ __('Shop By') ?></strong>
+            <strong><?= $block->escapeHtml(__('Shop By')) ?></strong>
         </div>
 
         <div class="block-content filter-content">
             <?= $block->getChildHtml('state') ?>
 
-            <?php if ($block->getLayer()->getState()->getFilters()): ?>
+            <?php if ($block->getLayer()->getState()->getFilters()) : ?>
                 <div class="block-actions filter-actions">
-                    <a href="<?= /* @escapeNotVerified */ $block->getClearUrl() ?>" class="action clear filter-clear"><span><?= /* @escapeNotVerified */ __('Clear All') ?></span></a>
+                    <a href="<?= $block->escapeUrl($block->getClearUrl()) ?>" class="action clear filter-clear"><span><?= $block->escapeHtml(__('Clear All')) ?></span></a>
                 </div>
             <?php endif; ?>
             <?php $wrapOptions = false; ?>
-            <?php foreach ($block->getFilters() as $filter): ?>
-                <?php if (!$wrapOptions): ?>
-                    <strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?= /* @escapeNotVerified */ __('Shopping Options') ?></strong>
+            <?php foreach ($block->getFilters() as $filter) : ?>
+                <?php if (!$wrapOptions) : ?>
+                    <strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?= $block->escapeHtml(__('Shopping Options')) ?></strong>
                     <dl class="filter-options" id="narrow-by-list">
-                <?php $wrapOptions = true; endif; ?>
-                    <?php if ($filter->getItemsCount()): ?>
+                <?php $wrapOptions = true;
+endif; ?>
+                    <?php if ($filter->getItemsCount()) : ?>
                         <dt role="heading" aria-level="3" class="filter-options-title"><?= $block->escapeHtml(__($filter->getName())) ?></dt>
-                        <dd class="filter-options-content"><?= /* @escapeNotVerified */ $block->getChildBlock('renderer')->render($filter) ?></dd>
+                        <dd class="filter-options-content"><?= /* @noEscape */ $block->getChildBlock('renderer')->render($filter) ?></dd>
                     <?php endif; ?>
             <?php endforeach; ?>
-            <?php if ($wrapOptions): ?>
+            <?php if ($wrapOptions) : ?>
                 </dl>
             <?php endif; ?>
         </div>
diff --git a/app/code/Magento/Marketplace/composer.json b/app/code/Magento/Marketplace/composer.json
index 5ce8666ec1bb2..b8b4c8384af09 100644
--- a/app/code/Magento/Marketplace/composer.json
+++ b/app/code/Magento/Marketplace/composer.json
@@ -2,12 +2,12 @@
     "name": "magento/module-marketplace",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*",
         "magento/module-backend": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml
index a37306bf1eed7..91c0f79fec6b2 100644
--- a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml
+++ b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml
@@ -3,20 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
 ?>
 
 <section class="page-partners">
-    <h2 class="page-sub-title"><?= /* @escapeNotVerified */ __('Platinum Partners') ?></h2>
+    <h2 class="page-sub-title"><?= $block->escapeHtml(__('Platinum Partners')) ?></h2>
     <p class="partners-description">
-        <?php /* @escapeNotVerified */
-        echo __(
+        <?= $block->escapeHtml(__(
             'Representing Magento\'s highest level of partner engagement, Magento Platinum Partners have established themselves as leaders and innovators of key products and services designed to help merchants and brands grow their business. ' .
             'Magento reserves the Platinum level for select trusted partners that are committed to offering integrations of commerce features, functions, and tools, as well as back-end systems and operations, to extend and enhance the power of the Magento commerce platform.'
-        ); ?>
+        )); ?>
     </p>
-    <h3 class="page-sub-sub-title"><?= /* @escapeNotVerified */ __('Featured Platinum Partners') ?></h3>
+    <h3 class="page-sub-sub-title"><?= $block->escapeHtml(__('Featured Platinum Partners')) ?></h3>
     <div data-role="partners-block" class="partners-block">
         <div data-role="spinner" class="admin__data-grid-loading-mask">
             <div class="spinner">
@@ -29,40 +26,39 @@
     <div class="row row-gutter partners-footer">
         <div class="col-m-5">
             <div class="partners-search">
-                <h2 class="page-sub-title"><?= /* @escapeNotVerified */ __('Partner search') ?></h2>
+                <h2 class="page-sub-title"><?= $block->escapeHtml(__('Partner search')) ?></h2>
                 <p>
-                    <?php /* @escapeNotVerified */
-                    echo __(
+                    <?= $block->escapeHtml(__(
                         'Magento has a thriving ecosystem of technology partners to help merchants and brands deliver the best possible customer experiences. ' .
                         'They are recognized as experts in eCommerce, search, email marketing, payments, tax, fraud, optimization and analytics, fulfillment, and more. ' .
                         'Visit the Magento Partner Directory to see all of our trusted partners.'
-                    ); ?>
+                    )); ?>
                 </p>
                 <a class="action-secondary" target="_blank"
                    href="http://partners.magento.com/partner_locator/search.aspx">
-                    <?= /* @escapeNotVerified */ __('More Partners') ?>
+                    <?= $block->escapeHtml(__('More Partners')) ?>
                 </a>
             </div>
         </div>
         <div class="col-m-3">
             <img
                 class="magento-marketplace-logo"
-                src="<?php /* @escapeNotVerified */ echo $block
-                    ->getViewFileUrl('Magento_Marketplace::partners/images/magento-marketplace.svg');
+                src="<?= $block->escapeUrl($block
+                    ->getViewFileUrl('Magento_Marketplace::partners/images/magento-marketplace.svg'));
                 ?>"
                 alt="Partner"/>
         </div>
         <div class="col-m-4">
-            <h2 class="page-sub-title"><?= /* @escapeNotVerified */ __('Magento Marketplace') ?></h2>
+            <h2 class="page-sub-title"><?= $block->escapeHtml(__('Magento Marketplace')) ?></h2>
             <p class="partner-description">
-                <?php /* @escapeNotVerified */ echo __(
+                <?= $block->escapeHtml(__(
                     'Extensions and Themes are an essential component of the Magento Ecosystem. ' .
                     'Please visit the Magento Marketplace to see the latest innovations that developers have created to enhance your Magento Store.'
-                ); ?>
+                )); ?>
             </p>
             <a class="action-secondary" target="_blank"
                href="https://marketplace.magento.com/">
-                <?= /* @escapeNotVerified */ __('Visit Magento Marketplaces') ?>
+                <?= $block->escapeHtml(__('Visit Magento Marketplaces')) ?>
             </a>
         </div>
     </div>
@@ -73,8 +69,10 @@
     {
         "*": {
             "Magento_Marketplace/default": {
-                "url": "<?= $block->getUrl('marketplace/partners/index',
-                    ['_current' => true, 'block' => '', 'period' => '']) ?>"
+                "url": "<?= $block->escapeUrl($block->getUrl(
+                    'marketplace/partners/index',
+                    ['_current' => true, 'block' => '', 'period' => '']
+                )) ?>"
             }
         }
     }
diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml
index b63bf9ebd50eb..924d6fd7410a5 100644
--- a/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml
+++ b/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 $partners = $block->getPartners();
@@ -22,17 +19,17 @@ $partners = $block->getPartners();
                 <?= $block->escapeHtml($partner['description']) ?>
                 <br />
                 <a href="<?= $block->escapeHtml($partner['url_page']) ?>" target="_blank">
-                    <?= /* @escapeNotVerified */ __('Read More') ?>
+                    <?= $block->escapeHtml(__('Read More')) ?>
                 </a>
                 <br />
                 <a href="<?= $block->escapeHtml($partner['url_partner_page']) ?>" target="_blank">
-                    <?= /* @escapeNotVerified */ __('Partner Page') ?>
+                    <?= $block->escapeHtml(__('Partner Page')) ?>
                 </a>
             </p>
         </div>
     <?php endforeach; ?>
 <?php else : ?>
     <p>
-        <?= /* @escapeNotVerified */ __('No partners were found') ?>
+        <?= $block->escapeHtml(__('No partners were found')) ?>
     </p>
 <?php endif; ?>
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage.php b/app/code/Magento/MediaStorage/Model/File/Storage.php
index 7489b261576aa..861f2d82c7e7b 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\MediaStorage\Model\File;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -171,7 +169,7 @@ public function getSyncFlag()
      */
     public function getStorageModel($storage = null, $params = [])
     {
-        if (is_null($storage)) {
+        if ($storage === null) {
             $storage = $this->_coreFileStorage->getCurrentStorageCode();
         }
 
@@ -295,7 +293,10 @@ public function getScriptConfig()
             $config['allowed_resources'][] = $allowedResource;
         }
 
-        $config['update_time'] = $this->_scopeConfig->getValue(self::XML_PATH_MEDIA_UPDATE_TIME, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        $config['update_time'] = $this->_scopeConfig->getValue(
+            self::XML_PATH_MEDIA_UPDATE_TIME,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
 
         return $config;
     }
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Directory/Database.php b/app/code/Magento/MediaStorage/Model/File/Storage/Directory/Database.php
index 2951f83cdc2f7..2617e88e7538a 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage/Directory/Database.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage/Directory/Database.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\MediaStorage\Model\File\Storage\Directory;
 
 /**
diff --git a/app/code/Magento/MediaStorage/Model/File/Validator/NotProtectedExtension.php b/app/code/Magento/MediaStorage/Model/File/Validator/NotProtectedExtension.php
index 89bf05446452b..18a2e5e6de54c 100644
--- a/app/code/Magento/MediaStorage/Model/File/Validator/NotProtectedExtension.php
+++ b/app/code/Magento/MediaStorage/Model/File/Validator/NotProtectedExtension.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\MediaStorage\Model\File\Validator;
 
 /**
@@ -99,7 +97,11 @@ protected function _initProtectedFileExtensions()
      */
     public function getProtectedFileExtensions($store = null)
     {
-        return $this->_scopeConfig->getValue(self::XML_PATH_PROTECTED_FILE_EXTENSIONS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return $this->_scopeConfig->getValue(
+            self::XML_PATH_PROTECTED_FILE_EXTENSIONS,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $store
+        );
     }
 
     /**
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Model/Config/Source/Storage/Media/DatabaseTest.php b/app/code/Magento/MediaStorage/Test/Unit/Model/Config/Source/Storage/Media/DatabaseTest.php
index d47ad175002e1..2690a4070232f 100644
--- a/app/code/Magento/MediaStorage/Test/Unit/Model/Config/Source/Storage/Media/DatabaseTest.php
+++ b/app/code/Magento/MediaStorage/Test/Unit/Model/Config/Source/Storage/Media/DatabaseTest.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\MediaStorage\Test\Unit\Model\Config\Source\Storage\Media;
 
 use Magento\MediaStorage\Model\Config\Source\Storage\Media\Database;
@@ -36,11 +34,11 @@ protected function setUp()
             'resource'
         )->will(
             $this->returnValue(
-            [
+                [
                 'default_setup' => ['name' => 'default_setup', 'connection' => 'connect1'],
                 'custom_resource' => ['name' => 'custom_resource', 'connection' => 'connect2'],
-            ]
-        )
+                ]
+            )
         );
         $this->mediaDatabase = new Database($this->deploymentConfig);
     }
diff --git a/app/code/Magento/MediaStorage/composer.json b/app/code/Magento/MediaStorage/composer.json
index afb290a682274..18d55c4d68231 100644
--- a/app/code/Magento/MediaStorage/composer.json
+++ b/app/code/Magento/MediaStorage/composer.json
@@ -2,14 +2,14 @@
     "name": "magento/module-media-storage",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-backend": "100.2.*",
         "magento/module-config": "101.0.*",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml b/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml
index f3c301b490282..5578f57c838f9 100644
--- a/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml
+++ b/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php /* @var $block \Magento\MediaStorage\Block\System\Config\System\Storage\Media\Synchronize */ ?>
@@ -35,7 +32,7 @@ require([
     );
 
     <?php $syncStorageParams = $block->getSyncStorageParams() ?>
-    addAllowedStorage(<?= /* @escapeNotVerified */ $syncStorageParams['storage_type'] ?>, '<?= /* @escapeNotVerified */ $syncStorageParams['connection_name'] ?>');
+    addAllowedStorage(<?= $block->escapeJs($syncStorageParams['storage_type']) ?>, '<?= $block->escapeJs($syncStorageParams['connection_name']) ?>');
 
     defaultValues   = [];
     defaultValues['system_media_storage_configuration_media_storage']   = $('system_media_storage_configuration_media_storage').value;
@@ -93,7 +90,7 @@ require([
     }
 
     var checkStatus = function() {
-        u = new Ajax.PeriodicalUpdater('', '<?= /* @escapeNotVerified */ $block->getAjaxStatusUpdateUrl() ?>', {
+        u = new Ajax.PeriodicalUpdater('', '<?= $block->escapeUrl($block->getAjaxStatusUpdateUrl())  ?>', {
             method:     'get',
             frequency:  5,
             loaderArea: false,
@@ -103,7 +100,7 @@ require([
 
                 try {
                     response = JSON.parse(transport.responseText);
-                    if (response.state == '<?= /* @escapeNotVerified */ \Magento\MediaStorage\Model\File\Storage\Flag::STATE_RUNNING ?>'
+                    if (response.state == '<?= /* @noEscape */ (int)\Magento\MediaStorage\Model\File\Storage\Flag::STATE_RUNNING ?>'
                         && response.message
                     ) {
                         if ($('sync_span').hasClassName('no-display')) {
@@ -115,12 +112,12 @@ require([
                         enableStorageSelection();
                         $('sync_span').addClassName('no-display');
 
-                        if (response.state == '<?= /* @escapeNotVerified */ \Magento\MediaStorage\Model\File\Storage\Flag::STATE_FINISHED ?>') {
+                        if (response.state == '<?= /* @noEscape */ (int)\Magento\MediaStorage\Model\File\Storage\Flag::STATE_FINISHED ?>') {
                             addAllowedStorage(
                                 $('system_media_storage_configuration_media_storage').value,
                                 $('system_media_storage_configuration_media_database').value
                             );
-                        } else if (response.state == '<?= /* @escapeNotVerified */ \Magento\MediaStorage\Model\File\Storage\Flag::STATE_NOTIFIED ?>') {
+                        } else if (response.state == '<?= /* @noEscape */ (int)\Magento\MediaStorage\Model\File\Storage\Flag::STATE_NOTIFIED ?>') {
                             if (response.has_errors) {
                                 enableSyncButton();
                             } else {
@@ -155,7 +152,7 @@ require([
             connection: $('system_media_storage_configuration_media_database').value
         };
 
-        new Ajax.Request('<?= /* @escapeNotVerified */ $block->getAjaxSyncUrl() ?>', {
+        new Ajax.Request('<?= $block->escapeUrl($block->getAjaxSyncUrl()) ?>', {
             parameters:     params,
             loaderArea:     false,
             asynchronous:   true
@@ -179,7 +176,7 @@ require([
 
 <?= $block->getButtonHtml() ?>
 <span class="sync-indicator no-display" id="sync_span">
-    <img alt="Synchronize" style="margin:0 5px" src="<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/process_spinner.gif') ?>"/>
+    <img alt="Synchronize" style="margin:0 5px" src="<?= $block->escapeUrl($block->getViewFileUrl('images/process_spinner.gif')) ?>"/>
     <span id="sync_message_span"></span>
 </span>
 <input type="hidden" id="synchronize-validation-input" class="required-synchronize no-display"/>
diff --git a/app/code/Magento/Msrp/Helper/Data.php b/app/code/Magento/Msrp/Helper/Data.php
index b4ec34ebee19c..e8f8ca17a8b64 100644
--- a/app/code/Magento/Msrp/Helper/Data.php
+++ b/app/code/Magento/Msrp/Helper/Data.php
@@ -11,6 +11,8 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\GroupedProduct\Model\Product\Type\Grouped;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 
 /**
  * Msrp data helper
@@ -70,8 +72,7 @@ public function __construct(
     }
 
     /**
-     * Check if can apply Minimum Advertise price to product
-     * in specific visibility
+     * Check if can apply MAP to product in specific visibility.
      *
      * @param int|Product $product
      * @param int|null $visibility Check displaying price in concrete place (by default generally)
@@ -135,6 +136,8 @@ public function isShowPriceOnGesture($product)
     }
 
     /**
+     * Check if should show MAP price before order confirmation.
+     *
      * @param int|Product $product
      * @return bool
      */
@@ -144,6 +147,8 @@ public function isShowBeforeOrderConfirm($product)
     }
 
     /**
+     * Check if any MAP price is larger than "As low as" value.
+     *
      * @param int|Product $product
      * @return bool|float
      */
@@ -155,10 +160,18 @@ public function isMinimalPriceLessMsrp($product)
         $msrp = $product->getMsrp();
         $price = $product->getPriceInfo()->getPrice(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE);
         if ($msrp === null) {
-            if ($product->getTypeId() !== \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE) {
-                return false;
-            } else {
+            if ($product->getTypeId() === Grouped::TYPE_CODE) {
                 $msrp = $product->getTypeInstance()->getChildrenMsrp($product);
+            } elseif ($product->getTypeId() === Configurable::TYPE_CODE) {
+                $prices = [];
+                foreach ($product->getTypeInstance()->getUsedProducts($product) as $item) {
+                    if ($item->getMsrp() !== null) {
+                        $prices[] = $item->getMsrp();
+                    }
+                }
+                $msrp = $prices ? max($prices) : 0;
+            } else {
+                return false;
             }
         }
         if ($msrp) {
diff --git a/app/code/Magento/Msrp/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Msrp/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
new file mode 100644
index 0000000000000..c8cdf8db42a7b
--- /dev/null
+++ b/app/code/Magento/Msrp/Test/Mftf/ActionGroup/AdminProductActionGroup.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="AdminProductSetMsrp">
+        <arguments>
+            <argument name="product"/>
+            <argument name="msrp" type="string" defaultValue="100"/>
+        </arguments>
+        <amOnPage url="{{AdminProductEditPage.url(product.id)}}" stepKey="goToProductEditPage"/>
+        <scrollToTopOfPage stepKey="scrollToTopToSeeAdvancedPricingButton"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
+        <waitForElementVisible selector="{{AdminProductFormAdvancedPricingSection.msrp}}" stepKey="waitForMsrpElement"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.msrp}}" userInput="{{msrp}}" stepKey="fillMsrpField"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Msrp/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml b/app/code/Magento/Msrp/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
new file mode 100644
index 0000000000000..b3742574c8235
--- /dev/null
+++ b/app/code/Magento/Msrp/Test/Mftf/ActionGroup/StorefrontProductActionGroup.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">
+    <!--Check MSRP of product-->
+    <actionGroup name="AssertMsrpOfProduct">
+        <arguments>
+            <argument name="msrp" type="string"/>
+        </arguments>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.msrp}}" stepKey="waitForMsrp"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.msrp}}" stepKey="grabMsrp"/>
+        <assertEquals stepKey="assertMsrp">
+            <expectedResult type="string">${{msrp}}</expectedResult>
+            <actualResult type="variable">grabMsrp</actualResult>
+        </assertEquals>
+        <seeElement selector="{{StorefrontProductInfoMainSection.clickForPriceLink}}" stepKey="seeClickForPriceLink"/>
+    </actionGroup>
+    <!--Check product price when MSRP is not set or is less than price-->
+    <actionGroup name="AssertMsrpFallbackOfProduct" extends="AssertMsrpOfProduct">
+        <remove keyForRemoval="seeClickForPriceLink"/>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.msrpFallback}}" stepKey="waitForMsrp"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.msrpFallback}}" stepKey="grabMsrp"/>
+        <dontSeeElement selector="{{StorefrontProductInfoMainSection.clickForPriceLink}}" after="assertMsrp" stepKey="dontSeeClickForPriceLink"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Msrp/Test/Mftf/Data/MsrpConfigData.xml b/app/code/Magento/Msrp/Test/Mftf/Data/MsrpConfigData.xml
new file mode 100644
index 0000000000000..731169aa40041
--- /dev/null
+++ b/app/code/Magento/Msrp/Test/Mftf/Data/MsrpConfigData.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="EnableMAPConfig" type="msrp_config">
+        <requiredEntity type="enabled">EnableMAP</requiredEntity>
+    </entity>
+    <entity name="EnableMAP" type="msrp_config">
+        <data key="value">1</data>
+    </entity>
+
+    <entity name="DisableMAPConfig" type="msrp_config">
+        <requiredEntity type="enabled">DisableMAP</requiredEntity>
+    </entity>
+    <entity name="DisableMAP" type="msrp_config">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Msrp/Test/Mftf/Metadata/msrp_config-meta.xml b/app/code/Magento/Msrp/Test/Mftf/Metadata/msrp_config-meta.xml
new file mode 100644
index 0000000000000..f911d7072fb9a
--- /dev/null
+++ b/app/code/Magento/Msrp/Test/Mftf/Metadata/msrp_config-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="MsrpConfig" dataType="msrp_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/sales/" method="POST" successRegex="/messages-message-success/">
+        <object key="groups" dataType="msrp_config">
+            <object key="msrp" dataType="msrp_config">
+                <object key="fields" dataType="msrp_config">
+                    <object key="enabled" dataType="enabled">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Msrp/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml b/app/code/Magento/Msrp/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
new file mode 100644
index 0000000000000..08c0cb8d48309
--- /dev/null
+++ b/app/code/Magento/Msrp/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductFormAdvancedPricingSection">
+        <element name="msrp" type="input" selector="input[name='product[msrp]']" timeout="5"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Msrp/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Msrp/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
new file mode 100644
index 0000000000000..7aba2d8d6e211
--- /dev/null
+++ b/app/code/Magento/Msrp/Test/Mftf/Section/StorefrontProductInfoMainSection.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="StorefrontProductInfoMainSection">
+        <element name="msrp" type="text" selector=".price-final_price .map-old-price .price-msrp_price .price-wrapper"/>
+        <element name="msrpFallback" type="text" selector=".price-final_price .map-fallback-price .price-msrp_price .price-wrapper"/>
+        <element name="clickForPriceLink" type="button" selector="//a[@class='action map-show-info' and contains(text(),'Click for price')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontCheckingConfigurableProductPriceWithMapTest.xml b/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontCheckingConfigurableProductPriceWithMapTest.xml
new file mode 100644
index 0000000000000..1a2d4ad8e06e4
--- /dev/null
+++ b/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontCheckingConfigurableProductPriceWithMapTest.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCheckingConfigurableProductPriceWithMapTest">
+        <annotations>
+            <features value="Mrsp"/>
+            <stories value="Configurable child products with MAP"/>
+            <title value="Simple product with MAP assigned to configurable should displays the same way as products with special price"/>
+            <description value="Check that simple products with MAP assigned to configurable product displayed correctly"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-15014"/>
+            <useCaseId value="MAGETWO-73985"/>
+            <group value="msrp"/>
+            <group value="configurableProduct"/>
+        </annotations>
+        <before>
+            <!--Enable MAP in configuration-->
+            <createData entity="EnableMAPConfig" stepKey="enableMapConfig"/>
+            <!--Create configurable product-->
+            <actionGroup ref="AdminCreateApiConfigurableProductWithThreeChildActionGroup" stepKey="createConfigProduct"/>
+            <!--Login-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!--Disable MAP in configuration-->
+            <createData entity="DisableMAPConfig" stepKey="disableMAPConfig"/>
+            <!--Delete entities-->
+            <deleteData createDataKey="createConfigProductCreateConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createChildProduct1CreateConfigProduct" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createChildProduct2CreateConfigProduct" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createChildProduct3CreateConfigProduct" stepKey="deleteConfigChildProduct3"/>
+            <deleteData createDataKey="createConfigProductAttributeCreateConfigProduct" stepKey="deleteConfigProductAttribute"/>
+            <!--Logout-->
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+
+        <!--Set MSRP for Child product 1-->
+        <actionGroup ref="AdminProductSetMsrp" stepKey="setMsrpForChildProduct1">
+            <argument name="product" value="$createChildProduct1CreateConfigProduct$"/>
+            <argument name="msrp" value="45"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveChildProduct1"/>
+
+        <!--Set MSRP for Child product 2-->
+        <actionGroup ref="AdminProductSetMsrp" stepKey="setMsrpForChildProduct2">
+            <argument name="product" value="$createChildProduct2CreateConfigProduct$"/>
+            <argument name="msrp" value="66"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveChildProduct2"/>
+
+        <amOnPage url="{{StorefrontProductPage.url($createConfigProductCreateConfigProduct.custom_attributes[url_key]$)}}" stepKey="goToProductPage"/>
+        <!--Checking MSRP of configurable product on Storefront page-->
+        <actionGroup ref="AssertMsrpOfProduct" stepKey="assertMsrpOfChildProduct">
+            <argument name="msrp" value="66.00"/>
+        </actionGroup>
+
+        <!--Checking when Option has a price higher than MSRP-->
+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$getConfigAttributeOption1CreateConfigProduct.value$" stepKey="selectOption1"/>
+        <actionGroup ref="AssertMsrpFallbackOfProduct" stepKey="assertMsrpOfChildProduct1">
+            <argument name="msrp" value="50.00"/>
+        </actionGroup>
+
+        <!--Checking when Option has a price less than MSRP-->
+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$getConfigAttributeOption2CreateConfigProduct.value$" stepKey="selectOption2"/>
+        <actionGroup ref="AssertMsrpOfProduct" stepKey="assertMsrpOfChildProduct2">
+            <argument name="msrp" value="66.00"/>
+        </actionGroup>
+
+        <!--Checking when Option doesn't have MSRP-->
+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$getConfigAttributeOption3CreateConfigProduct.value$" stepKey="selectOption3"/>
+        <actionGroup ref="AssertMsrpFallbackOfProduct" stepKey="assertMsrpOfChildProduct3">
+            <argument name="msrp" value="70.00"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Msrp/Test/Unit/Ui/DataProvider/Product/Listing/Collector/MsrpPriceTest.php b/app/code/Magento/Msrp/Test/Unit/Ui/DataProvider/Product/Listing/Collector/MsrpPriceTest.php
index b096fe760ffbc..80e9266ee503f 100644
--- a/app/code/Magento/Msrp/Test/Unit/Ui/DataProvider/Product/Listing/Collector/MsrpPriceTest.php
+++ b/app/code/Magento/Msrp/Test/Unit/Ui/DataProvider/Product/Listing/Collector/MsrpPriceTest.php
@@ -86,6 +86,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testCollect()
     {
         $product = $this->getMockBuilder(Product::class)
@@ -97,11 +100,11 @@ public function testCollect()
         $productRenderInfoDto->expects($this->once())
             ->method('getPriceInfo')
             ->willReturn($productPriceInfo);
-        $extensionAttirbutes = $this->getMockBuilder(
+        $extensionAttributes = $this->getMockBuilder(
             \Magento\Catalog\Api\Data\ProductRender\PriceInfoExtensionInterface::class
         )
             ->setMethods(['setMsrp'])
-            ->getMock();
+            ->getMockForAbstractClass();
 
         $priceInfo = $this->getMockBuilder(MsrpPriceInfoInterface::class)
             ->setMethods(['getPrice', 'getExtensionAttributes'])
@@ -113,14 +116,14 @@ public function testCollect()
         $this->adjustmentCalculator->expects($this->once())
             ->method('getAmount')
             ->willReturn($amountInterface);
-        $extensionAttirbutes->expects($this->once())
+        $extensionAttributes->expects($this->once())
             ->method('setMsrp');
         $this->msrpPriceInfoFactory->expects($this->once())
             ->method('create')
             ->willReturn($priceInfo);
         $this->priceInfoExtensionFactory->expects($this->once())
             ->method('create')
-            ->willReturn($extensionAttirbutes);
+            ->willReturn($extensionAttributes);
         $price = $this->getMockBuilder(\Magento\Msrp\Pricing\Price\MsrpPrice::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
index 97bc64e48ce01..ef16e069e7d2f 100644
--- a/app/code/Magento/Msrp/composer.json
+++ b/app/code/Magento/Msrp/composer.json
@@ -2,12 +2,13 @@
     "name": "magento/module-msrp",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-catalog": "102.0.*",
         "magento/module-downloadable": "100.2.*",
         "magento/module-eav": "101.0.*",
         "magento/module-grouped-product": "100.2.*",
+        "magento/module-configurable-product": "100.2.*",
         "magento/module-tax": "100.2.*",
         "magento/framework": "101.0.*"
     },
@@ -16,7 +17,7 @@
         "magento/module-msrp-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Msrp/etc/adminhtml/system.xml b/app/code/Magento/Msrp/etc/adminhtml/system.xml
index 8ce0ea67343f8..c20d753a2e794 100644
--- a/app/code/Magento/Msrp/etc/adminhtml/system.xml
+++ b/app/code/Magento/Msrp/etc/adminhtml/system.xml
@@ -10,7 +10,7 @@
         <section id="sales">
             <group id="msrp" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>Minimum Advertised Price</label>
-                <field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Enable MAP</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>
diff --git a/app/code/Magento/Msrp/i18n/en_US.csv b/app/code/Magento/Msrp/i18n/en_US.csv
index d647f8527ec15..d47d72b2bdc9a 100644
--- a/app/code/Magento/Msrp/i18n/en_US.csv
+++ b/app/code/Magento/Msrp/i18n/en_US.csv
@@ -13,6 +13,7 @@ Price,Price
 "Add to Cart","Add to Cart"
 "Minimum Advertised Price","Minimum Advertised Price"
 "Enable MAP","Enable MAP"
+"<strong style=""color:red"">Warning!</strong> Enabling MAP by default will hide all product prices on Storefront.","<strong style=""color:red"">Warning!</strong> Enabling MAP by default will hide all product prices on Storefront."
 "Display Actual Price","Display Actual Price"
 "Default Popup Text Message","Default Popup Text Message"
 "Default ""What's This"" Text Message","Default ""What's This"" Text Message"
diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
index 869d81563645a..80d7cdb4fcaac 100644
--- a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
+++ b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
@@ -4,98 +4,118 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
- * Template for displaying product price at product view page, gift registry and wish-list
+ * Template for displaying product price at product view page, gift registry and wish-list.
  *
- * @var $block \Magento\Catalog\Pricing\Render\PriceBox
+ * @var \Magento\Catalog\Pricing\Render\PriceBox $block
  */
 ?>
 <?php
 
-/** @var Magento\Msrp\Pricing\Price\MsrpPriceInterface $priceType */
+/** @var \Magento\Msrp\Pricing\Price\MsrpPriceInterface $priceType */
 $priceType = $block->getPrice();
 
-/** @var $product \Magento\Catalog\Model\Product */
+/** @var \Magento\Catalog\Model\Product $product */
 $product = $block->getSaleableItem();
 $productId = $product->getId();
+$amount = 0;
+
+if ($product->getMsrp()) {
+    $amount = $product->getMsrp();
+} elseif ($product->getTypeId() === \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE) {
+    $amount = $product->getTypeInstance()->getChildrenMsrp($product);
+} elseif ($product->getTypeId() === \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE) {
+    foreach ($product->getTypeInstance()->getUsedProducts($product) as $item) {
+        if ($item->getMsrp() !== null) {
+            $prices[] = $item->getMsrp();
+        }
+    }
+    $amount = $prices ? max($prices) : 0;
+}
+
 $msrpPrice = $block->renderAmount(
-    $priceType->getCustomAmount($product->getMsrp() ?: $product->getTypeInstance()->getChildrenMsrp($product)),
+    $priceType->getCustomAmount($amount),
     [
         'price_id' => $block->getPriceId() ? $block->getPriceId() : 'old-price-' . $productId,
         'include_container' => false,
-        'skip_adjustments' => true
+        'skip_adjustments' => true,
     ]
 );
 $priceElementIdPrefix = $block->getPriceElementIdPrefix() ? $block->getPriceElementIdPrefix() : 'product-price-';
-
-$addToCartUrl = '';
-if ($product->isSaleable()) {
-    /** @var Magento\Catalog\Block\Product\AbstractProduct $addToCartUrlGenerator */
-    $addToCartUrlGenerator = $block->getLayout()->getBlockSingleton('Magento\Catalog\Block\Product\AbstractProduct');
-    $addToCartUrl = $addToCartUrlGenerator->getAddToCartUrl(
-        $product,
-        ['_query' => [
-            \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED =>
-                $this->helper('Magento\Framework\Url\Helper\Data')->getEncodedUrl(
-                    $addToCartUrlGenerator->getAddToCartUrl($product)
-                ),
-        ]]
-    );
-}
 ?>
-<?php if ($product->getMsrp()): ?>
-    <span class="old-price map-old-price"><?= /* @escapeNotVerified */ $msrpPrice ?></span>
+
+<?php if ($amount) : ?>
+    <span class="old-price map-old-price"><?= /* @noEscape */ $msrpPrice ?></span>
+    <span class="map-fallback-price normal-price"><?= /* @noEscape */ $msrpPrice ?></span>
 <?php endif; ?>
 
-<?php if ($priceType->isShowPriceOnGesture()): ?>
+<?php if ($priceType->isShowPriceOnGesture()) : ?>
     <?php
-        $priceElementId = $priceElementIdPrefix . $productId . $block->getIdSuffix();
-        $popupId = 'msrp-popup-' . $productId . $block->getRandomString(20);
-        $data = ['addToCart' => [
-            'origin'=> 'msrp',
-            'popupId' => '#' . $popupId,
-            'productName' => $block->escapeJs($block->escapeHtml($product->getName())),
-            'productId' => $productId,
-            'productIdInput' => 'input[type="hidden"][name="product"]',
-            'realPrice' => $block->getRealPriceHtml(),
-            'isSaleable' => $product->isSaleable(),
-            'msrpPrice' => $msrpPrice,
-            'priceElementId' => $priceElementId,
-            'closeButtonId' => '#map-popup-close',
-            'addToCartUrl' => $addToCartUrl,
-            'paymentButtons' => '[data-label=or]'
-        ]];
-        if ($block->getRequest()->getFullActionName() === 'catalog_product_view') {
-            $data['addToCart']['addToCartButton'] = '#product_addtocart_form [type=submit]';
-        } else {
-            $data['addToCart']['addToCartButton'] = sprintf(
-                'form:has(input[type="hidden"][name="product"][value="%s"]) button[type="submit"]',
-                (int) $productId
-            );
-        }
+
+    $addToCartUrl = '';
+    if ($product->isSaleable()) {
+        /** @var Magento\Catalog\Block\Product\AbstractProduct $addToCartUrlGenerator */
+        $addToCartUrlGenerator = $block->getLayout()
+            ->getBlockSingleton(\Magento\Catalog\Block\Product\AbstractProduct::class);
+        $addToCartUrl = $addToCartUrlGenerator->getAddToCartUrl(
+            $product,
+            ['_query' => [
+                \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED =>
+                    $this->helper(\Magento\Framework\Url\Helper\Data::class)->getEncodedUrl(
+                        $addToCartUrlGenerator->getAddToCartUrl($product)
+                    ),
+            ]]
+        );
+    }
+
+    $priceElementId = $priceElementIdPrefix . $productId . $block->getIdSuffix();
+    $popupId = 'msrp-popup-' . $productId . $block->getRandomString(20);
+    $data = ['addToCart' => [
+        'origin' => 'msrp',
+        'popupId' => '#' . $popupId,
+        'productName' => $block->escapeJs($block->escapeHtml($product->getName())),
+        'productId' => $productId,
+        'productIdInput' => 'input[type="hidden"][name="product"]',
+        'realPrice' => $block->getRealPriceHtml(),
+        'isSaleable' => $product->isSaleable(),
+        'msrpPrice' => $msrpPrice,
+        'priceElementId' => $priceElementId,
+        'closeButtonId' => '#map-popup-close',
+        'addToCartUrl' => $addToCartUrl,
+        'paymentButtons' => '[data-label=or]'
+    ]];
+    if ($block->getRequest()->getFullActionName() === 'catalog_product_view') {
+        $data['addToCart']['addToCartButton'] = '#product_addtocart_form [type=submit]';
+    } else {
+        $data['addToCart']['addToCartButton'] = sprintf(
+            'form:has(input[type="hidden"][name="product"][value="%s"]) button[type="submit"]',
+            (int)$productId
+        );
+    }
     ?>
-    <span id="<?= /* @escapeNotVerified */ $block->getPriceId() ? $block->getPriceId() : $priceElementId ?>" style="display:none"></span>
+    <span id="<?= $block->escapeHtmlAttr($block->getPriceId() ? $block->getPriceId() : $priceElementId) ?>"
+          style="display:none"></span>
     <a href="javascript:void(0);"
-       id="<?= /* @escapeNotVerified */ ($popupId) ?>"
+       id="<?= /* @noEscape */ ($popupId) ?>"
        class="action map-show-info"
-       data-mage-init='<?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($data) ?>'><?= /* @escapeNotVerified */ __('Click for price') ?>
+       data-mage-init='<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($data) ?>'>
+        <?= $block->escapeHtml(__('Click for price')) ?>
     </a>
-<?php else: ?>
+<?php else : ?>
     <span class="msrp-message">
-     <?= /* @escapeNotVerified */ $priceType->getMsrpPriceMessage() ?>
+        <?= $block->escapeHtml($priceType->getMsrpPriceMessage()) ?>
     </span>
 <?php endif; ?>
 
-<?php if ($block->getZone() == \Magento\Framework\Pricing\Render::ZONE_ITEM_VIEW): ?>
+<?php if ($block->getZone() == \Magento\Framework\Pricing\Render::ZONE_ITEM_VIEW) : ?>
     <?php $helpLinkId = 'msrp-help-' . $productId . $block->getRandomString(20); ?>
     <a href="javascript:void(0);"
-       id="<?= /* @escapeNotVerified */ $helpLinkId ?>"
+       id="<?= /* @noEscape */ $helpLinkId ?>"
        class="action map-show-info"
        data-mage-init='{"addToCart":{"origin": "info",
-                                     "helpLinkId": "#<?= /* @escapeNotVerified */ $helpLinkId ?>",
+                                     "helpLinkId": "#<?= /* @noEscape */ $helpLinkId ?>",
                                      "productName": "<?= $block->escapeJs($block->escapeHtml($product->getName())) ?>",
-                                     "closeButtonId": "#map-popup-close"}}'><span><?= /* @escapeNotVerified */ __("What's this?") ?></span>
+                                     "closeButtonId": "#map-popup-close"}}'>
+        <span><?= $block->escapeHtml(__("What's this?")) ?></span>
     </a>
 <?php endif; ?>
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 deeadd9b55b82..d89c05f0b245f 100644
--- a/app/code/Magento/Msrp/view/base/web/js/msrp.js
+++ b/app/code/Magento/Msrp/view/base/web/js/msrp.js
@@ -4,11 +4,12 @@
  */
 define([
     'jquery',
+    'Magento_Catalog/js/price-utils',
     'underscore',
     'jquery/ui',
     'mage/dropdown',
     'mage/template'
-], function ($) {
+], function ($, priceUtils, _) {
     'use strict';
 
     $.widget('mage.addToCart', {
@@ -24,7 +25,14 @@ define([
             // Selectors
             cartForm: '.form.map.checkout',
             msrpLabelId: '#map-popup-msrp',
+            msrpPriceElement: '#map-popup-msrp .price-wrapper',
             priceLabelId: '#map-popup-price',
+            priceElement: '#map-popup-price .price',
+            mapInfoLinks: '.map-show-info',
+            displayPriceElement: '.old-price.map-old-price .price-wrapper',
+            fallbackPriceElement: '.normal-price.map-fallback-price .price-wrapper',
+            displayPriceContainer: '.old-price.map-old-price',
+            fallbackPriceContainer: '.normal-price.map-fallback-price',
             popUpAttr: '[data-role=msrp-popup-template]',
             popupCartButtonId: '#map-popup-button',
             paypalCheckoutButons: '[data-action=checkout-form-submit]',
@@ -59,9 +67,11 @@ define([
             shadowHinter: 'popup popup-pointer'
         },
         popupOpened: false,
+        wasOpened: false,
 
         /**
-         * Creates widget instance
+         * Creates widget instance.
+         *
          * @private
          */
         _create: function () {
@@ -73,10 +83,13 @@ define([
                 this.initTierPopup();
             }
             $(this.options.cartButtonId).on('click', this._addToCartSubmit.bind(this));
+            $(document).on('updateMsrpPriceBlock', this.onUpdateMsrpPrice.bind(this));
+            $(this.options.cartForm).on('submit', this._onSubmitForm.bind(this));
         },
 
         /**
-         * Init msrp popup
+         * Init msrp popup.
+         *
          * @private
          */
         initMsrpPopup: function () {
@@ -88,8 +101,7 @@ define([
             $msrpPopup.trigger('contentUpdated');
 
             $msrpPopup.find('button')
-                .on('click',
-                this.handleMsrpAddToCart.bind(this))
+                .on('click', this.handleMsrpAddToCart.bind(this))
                 .filter(this.options.popupCartButtonId)
                 .text($(this.options.addToCartButton).text());
 
@@ -103,7 +115,8 @@ define([
         },
 
         /**
-         * Init info popup
+         * Init info popup.
+         *
          * @private
          */
         initInfoPopup: function () {
@@ -122,7 +135,8 @@ define([
         },
 
         /**
-         * Init tier price popup
+         * Init tier price popup.
+         *
          * @private
          */
         initTierPopup: function () {
@@ -149,9 +163,9 @@ define([
         },
 
         /**
-         * handle 'AddToCart' click on Msrp popup
-         * @param {Object} ev
+         * Handle 'AddToCart' click on Msrp popup.
          *
+         * @param {Object} ev
          * @private
          */
         handleMsrpAddToCart: function (ev) {
@@ -164,7 +178,7 @@ define([
         },
 
         /**
-         * handle 'paypal checkout buttons' click on Msrp popup
+         * Handle 'paypal checkout buttons' click on Msrp popup.
          *
          * @private
          */
@@ -173,7 +187,7 @@ define([
         },
 
         /**
-         * handle 'AddToCart' click on Tier popup
+         * Handle 'AddToCart' click on Tier popup.
          *
          * @param {Object} ev
          * @private
@@ -191,7 +205,7 @@ define([
         },
 
         /**
-         * handle 'paypal checkout buttons' click on Tier popup
+         * Handle 'paypal checkout buttons' click on Tier popup.
          *
          * @private
          */
@@ -204,7 +218,7 @@ define([
         },
 
         /**
-         * Open and set up popup
+         * Open and set up popup.
          *
          * @param {Object} event
          */
@@ -212,8 +226,12 @@ define([
             var options = this.tierOptions || this.options;
 
             this.popUpOptions.position.of = $(event.target);
-            this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
-            this.$popup.find(this.options.priceLabelId).html(options.realPrice);
+
+            if (!this.wasOpened) {
+                this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
+                this.$popup.find(this.options.priceLabelId).html(options.realPrice);
+                this.wasOpened = true;
+            }
             this.$popup.dropdownDialog(this.popUpOptions).dropdownDialog('open');
             this._toggle(this.$popup);
 
@@ -223,6 +241,7 @@ define([
         },
 
         /**
+         * Toggle MAP popup visibility.
          *
          * @param {HTMLElement} $elem
          * @private
@@ -239,6 +258,7 @@ define([
         },
 
         /**
+         * Close MAP information popup.
          *
          * @param {HTMLElement} $elem
          */
@@ -248,9 +268,11 @@ define([
         },
 
         /**
-         * Handler for addToCart action
+         * Handler for addToCart action.
+         *
+         * @param {Object} e
          */
-        _addToCartSubmit: function () {
+        _addToCartSubmit: function (e) {
             this.element.trigger('addToCart', this.element);
 
             if (this.element.data('stop-processing')) {
@@ -266,8 +288,104 @@ define([
             if (this.options.addToCartUrl) {
                 $('.mage-dropdown-dialog > .ui-dialog-content').dropdownDialog('close');
             }
+
+            e.preventDefault();
             $(this.options.cartForm).submit();
+        },
+
+        /**
+         * Call on event updatePrice. Proxy to updateMsrpPrice method.
+         *
+         * @param {Event} event
+         * @param {mixed} priceIndex
+         * @param {Object} prices
+         */
+        onUpdateMsrpPrice: function onUpdateMsrpPrice(event, priceIndex, prices) {
+
+            var defaultMsrp,
+                defaultPrice,
+                msrpPrice,
+                finalPrice;
+
+            defaultMsrp = _.chain(prices).map(function (price) {
+                return price.msrpPrice.amount;
+            }).reject(function (p) {
+                return p === null;
+            }).max().value();
+
+            defaultPrice = _.chain(prices).map(function (p) {
+                return p.finalPrice.amount;
+            }).min().value();
+
+            if (typeof priceIndex !== 'undefined') {
+                msrpPrice = prices[priceIndex].msrpPrice.amount;
+                finalPrice = prices[priceIndex].finalPrice.amount;
+
+                if (msrpPrice === null || msrpPrice <= finalPrice) {
+                    this.updateNonMsrpPrice(priceUtils.formatPrice(finalPrice));
+                } else {
+                    this.updateMsrpPrice(
+                        priceUtils.formatPrice(finalPrice),
+                        priceUtils.formatPrice(msrpPrice),
+                        false);
+                }
+            } else {
+                this.updateMsrpPrice(
+                    priceUtils.formatPrice(defaultPrice),
+                    priceUtils.formatPrice(defaultMsrp),
+                    true);
+            }
+        },
 
+        /**
+         * Update prices for configurable product with MSRP enabled.
+         *
+         * @param {String} finalPrice
+         * @param {String} msrpPrice
+         * @param {Boolean} useDefaultPrice
+         */
+        updateMsrpPrice: function (finalPrice, msrpPrice, useDefaultPrice) {
+            var options = this.tierOptions || this.options;
+
+            $(this.options.fallbackPriceContainer).hide();
+            $(this.options.displayPriceContainer).show();
+            $(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);
+                $(this.options.displayPriceElement).html(msrpPrice);
+                this.wasOpened = true;
+            }
+
+            if (!useDefaultPrice) {
+                this.$popup.find(this.options.msrpPriceElement).html(msrpPrice);
+                this.$popup.find(this.options.priceElement).html(finalPrice);
+                $(this.options.displayPriceElement).html(msrpPrice);
+            }
+        },
+
+        /**
+         * Display non MAP price for irrelevant products.
+         *
+         * @param {String} price
+         */
+        updateNonMsrpPrice: function (price) {
+            $(this.options.fallbackPriceElement).html(price);
+            $(this.options.displayPriceContainer).hide();
+            $(this.options.mapInfoLinks).hide();
+            $(this.options.fallbackPriceContainer).show();
+        },
+
+        /**
+         * Handler for submit form.
+         *
+         * @private
+         */
+        _onSubmitForm: function () {
+            if ($(this.options.cartForm).valid()) {
+                $(this.options.cartButtonId).prop('disabled', true);
+            }
         }
     });
 
diff --git a/app/code/Magento/Msrp/view/frontend/templates/cart/subtotal.phtml b/app/code/Magento/Msrp/view/frontend/templates/cart/subtotal.phtml
index 0bfd4589bb79f..0e00a2df8920c 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/cart/subtotal.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/cart/subtotal.phtml
@@ -6,6 +6,6 @@
 ?>
 <div class="subtotal">
     <span class="mark msrp">
-        <?= /* @escapeNotVerified */ __('Order total will be displayed before you submit the order') ?>
+        <?= $block->escapeHtml(__('Order total will be displayed before you submit the order')) ?>
     </span>
 </div>
diff --git a/app/code/Magento/Msrp/view/frontend/templates/cart/totals.phtml b/app/code/Magento/Msrp/view/frontend/templates/cart/totals.phtml
index d632a2fe8c1aa..a0a2f9179dd87 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/cart/totals.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/cart/totals.phtml
@@ -3,9 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
 ?>
 <div class="cart-totals">
-    <div class="msrp totals"><?= /* @escapeNotVerified */ __('You will see the order total before you submit the order.') ?></div>
+    <div class="msrp totals">
+        <?= $block->escapeHtml(__('You will see the order total before you submit the order.')) ?>
+    </div>
 </div>
diff --git a/app/code/Magento/Msrp/view/frontend/templates/popup.phtml b/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
index 7ccd606b8f113..04f201736d373 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
@@ -3,14 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Msrp\Block\Popup $block */
 ?>
-<?php if ($block->isEnabled()): ?>
+<?php if ($block->isEnabled()) : ?>
     <script data-role="msrp-popup-template" type="text/x-magento-template">
     <div id="map-popup-click-for-price" class="map-popup">
         <div class="popup-header">
@@ -20,13 +17,13 @@
             <div class="map-info-price" id="map-popup-content">
                 <div class="price-box">
                     <div class="map-msrp" id="map-popup-msrp-box">
-                        <span class="label"><?= /* @escapeNotVerified */ __('Price') ?></span>
+                        <span class="label"><?= $block->escapeHtml(__('Price')) ?></span>
                         <span class="old-price map-old-price" id="map-popup-msrp">
                             <span class="price"></span>
                         </span>
                     </div>
                     <div class="map-price" id="map-popup-price-box">
-                        <span class="label"><?= /* @escapeNotVerified */ __('Actual Price') ?></span>
+                        <span class="label"><?= $block->escapeHtml(__('Actual Price')) ?></span>
                         <span id="map-popup-price" class="actual-price"></span>
                     </div>
                 </div>
@@ -36,7 +33,7 @@
                             title="<?= $block->escapeHtml(__('Add to Cart')) ?>"
                             class="action tocart primary"
                             id="map-popup-button">
-                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
+                        <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                     </button>
                     <div class="additional-addtocart-box">
                         <?= $block->getChildHtml() ?>
@@ -44,7 +41,7 @@
                 </form>
             </div>
             <div class="map-text" id="map-popup-text">
-                <?= /* @escapeNotVerified */ $block->getExplanationMessage() ?>
+                <?= /* @noEscape */ $block->getExplanationMessage() ?>
             </div>
         </div>
     </div>
@@ -56,7 +53,7 @@
         </div>
         <div class="popup-content">
             <div class="map-help-text" id="map-popup-text-what-this">
-                <?= /* @escapeNotVerified */ $block->getExplanationMessageWhatsThis() ?>
+                <?= /* @noEscape */ $block->getExplanationMessageWhatsThis() ?>
             </div>
         </div>
     </div>
diff --git a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
index 8f697001d30c4..145df32a49c38 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php
@@ -16,40 +13,46 @@
  */
 ?>
 <?php
-    /** @var $pricingHelper \Magento\Framework\Pricing\Helper\Data */
-    $pricingHelper = $this->helper('Magento\Framework\Pricing\Helper\Data');
-    /** @var $_catalogHelper \Magento\Catalog\Helper\Data */
-    $_catalogHelper = $this->helper('Magento\Catalog\Helper\Data');
+    /** @var \Magento\Framework\Pricing\Helper\Data $pricingHelper */
+    $pricingHelper = $this->helper(\Magento\Framework\Pricing\Helper\Data::class);
+    /** @var \Magento\Catalog\Helper\Data $_catalogHelper */
+    $_catalogHelper = $this->helper(\Magento\Catalog\Helper\Data::class);
 
-    /** @var $_product \Magento\Catalog\Model\Product */
+    /** @var \Magento\Catalog\Model\Product $_product */
     $_product = $block->getProduct();
     $_id = $_product->getId();
     $_msrpPrice = '';
 ?>
 <div class="price-box msrp">
-    <?php if ($_product->getMsrp()): ?>
+    <?php if ($_product->getMsrp()) : ?>
         <?php $_msrpPrice = $pricingHelper->currency($_product->getMsrp(), true, false) ?>
-        <span class="old-price"><?= /* @escapeNotVerified */ $_msrpPrice ?></span>
+        <span class="old-price"><?= /* @noEscape */ $_msrpPrice ?></span>
     <?php endif; ?>
-    <?php if ($_catalogHelper->isShowPriceOnGesture($_product)): ?>
+    <?php if ($_catalogHelper->isShowPriceOnGesture($_product)) : ?>
         <?php $priceElementId = 'product-price-' . $_id . $block->getIdSuffix(); ?>
-        <span id="<?= /* @escapeNotVerified */ $priceElementId ?>" style="display: none"></span>
+        <span id="<?= /* @noEscape */ $priceElementId ?>" style="display: none"></span>
         <?php $popupId = 'msrp-popup-' . $_id . $block->getRandomString(20); ?>
         <a href="javascript:void(0);"
-           id="<?= /* @escapeNotVerified */ ($popupId) ?>"
-           data-mage-init='{"addToCart":{"popupId": "#<?= /* @escapeNotVerified */ ($popupId) ?>",
-                                         "productName": "<?= /* @noEscape */ $block->escapeJs($block->escapeHtml($_product->getName())) ?>",
-                                         "realPrice": <?= /* @escapeNotVerified */ $block->getRealPriceJs($_product) ?>,
-                                         "msrpPrice": "<?= /* @escapeNotVerified */ $_msrpPrice ?>",
-                                         "priceElementId":"<?= /* @escapeNotVerified */ $priceElementId ?>",
-                                         "popupCartButtonId": "#map-popup-button",
-                                         "cartForm": "#wishlist-view-form"}}'><?= /* @escapeNotVerified */ __('Click for price') ?>
+           id="<?= /* @noEscape */ ($popupId) ?>"
+           data-mage-init='{"addToCart":{"popupId": "#<?= /* @noEscape */ ($popupId) ?>",
+               "productName": "<?= /* @noEscape */ $block->escapeJs($block->escapeHtml($_product->getName())) ?>",
+                "realPrice": <?= /* @noEscape */ $block->getRealPriceJs($_product) ?>,
+                "msrpPrice": "<?= /* @noEscape */ $_msrpPrice ?>",
+                "priceElementId":"<?= /* @noEscape */ $priceElementId ?>",
+                "popupCartButtonId": "#map-popup-button",
+                "cartForm": "#wishlist-view-form"}}'>
+            <?= $block->escapeHtml(__('Click for price')) ?>
         </a>
-    <?php else: ?>
+    <?php else : ?>
         <span class="msrp-message">
-            <?= /* @escapeNotVerified */ $_catalogHelper->getMsrpPriceMessage($_product) ?>
+            <?= $block->escapeHtml($_catalogHelper->getMsrpPriceMessage($_product)) ?>
         </span>
     <?php endif; ?>
     <?php $helpLinkId = 'msrp-help-' . $_id . $block->getRandomString(20); ?>
-    <a href="javascript:void(0);" id="<?= /* @escapeNotVerified */ ($helpLinkId) ?>" data-mage-init='{"addToCart":{"helpLinkId": "#<?= /* @escapeNotVerified */ ($helpLinkId) ?>", "productName": "<?= /* @noEscape */ $block->escapeJs($block->escapeHtml($_product->getName())) ?>"}}' class="link tip"><?= /* @escapeNotVerified */ __("What's this?") ?></a>
+    <a href="javascript:void(0);" id="<?= /* @noEscape */ ($helpLinkId) ?>"
+       data-mage-init='{"addToCart":{"helpLinkId": "#<?= /* @noEscape */ ($helpLinkId) ?>",
+       "productName": "<?= $block->escapeJs($block->escapeHtml($_product->getName())) ?>"}}'
+       class="link tip">
+        <?= $block->escapeHtml(__("What's this?")) ?>
+    </a>
 </div>
diff --git a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_rss.phtml b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_rss.phtml
index d41bec0d9ebcc..584dea19bef4a 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_rss.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_rss.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /**
@@ -15,7 +12,9 @@
  */
 ?>
 <div class="price-box msrp">
-    <?php if ($this->helper('Magento\Msrp\Helper\Data')->canApplyMsrp($block->getProduct())): ?>
-        <a href="<?= /* @escapeNotVerified */ $block->getProduct()->getProductUrl() ?>"><?= /* @escapeNotVerified */ __('Click for price') ?></a>
+    <?php if ($this->helper(\Magento\Msrp\Helper\Data::class)->canApplyMsrp($block->getProduct())) : ?>
+        <a href="<?= $block->escapeUrl($block->getProduct()->getProductUrl()) ?>">
+            <?= $block->escapeHtml(__('Click for price')) ?>
+        </a>
     <?php endif; ?>
 </div>
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
index ea7838085ddfb..0ea0abc135f9e 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -1168,7 +1168,7 @@ private function removePlacedItemsFromQuote(array $shippingAddresses, array $pla
     {
         foreach ($shippingAddresses as $address) {
             foreach ($address->getAllItems() as $addressItem) {
-                if (in_array($addressItem->getId(), $placedAddressItems)) {
+                if (in_array($addressItem->getQuoteItemId(), $placedAddressItems)) {
                     if ($addressItem->getProduct()->getIsVirtual()) {
                         $addressItem->isDeleted(true);
                     } else {
@@ -1218,7 +1218,7 @@ private function searchQuoteAddressId(OrderInterface $order, array $addresses):
         $item = array_pop($items);
         foreach ($addresses as $address) {
             foreach ($address->getAllItems() as $addressItem) {
-                if ($addressItem->getId() == $item->getQuoteItemId()) {
+                if ($addressItem->getQuoteItemId() == $item->getQuoteItemId()) {
                     return (int)$address->getId();
                 }
             }
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Page/StorefrontMultishippingCheckoutAddressesPage.xml b/app/code/Magento/Multishipping/Test/Mftf/Page/StorefrontMultishippingCheckoutAddressesPage.xml
new file mode 100644
index 0000000000000..b1f665f335f0a
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Mftf/Page/StorefrontMultishippingCheckoutAddressesPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontMultishippingCheckoutAddressesPage" url="/multishipping/checkout/addresses" area="storefront"
+          module="Magento_Multishipping">
+        <section name="StorefrontMultishippingCheckoutSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Page/StorefrontMultishippingCheckoutShippingPage.xml b/app/code/Magento/Multishipping/Test/Mftf/Page/StorefrontMultishippingCheckoutShippingPage.xml
new file mode 100644
index 0000000000000..98dbb7e355f27
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Mftf/Page/StorefrontMultishippingCheckoutShippingPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontMultishippingCheckoutShippingPage" url="/multishipping/checkout/shipping" area="storefront"
+          module="Magento_Multishipping">
+        <section name="StorefrontCheckoutGiftOptionsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Section/StorefrontCheckoutCartSummarySection.xml b/app/code/Magento/Multishipping/Test/Mftf/Section/StorefrontCheckoutCartSummarySection.xml
new file mode 100644
index 0000000000000..6d0707bb46d75
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Mftf/Section/StorefrontCheckoutCartSummarySection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCheckoutCartSummarySection">
+        <element name="checkoutWithMultipleAddresses" type="button" selector=".multicheckout" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Section/StorefrontMultishippingCheckoutSection.xml b/app/code/Magento/Multishipping/Test/Mftf/Section/StorefrontMultishippingCheckoutSection.xml
new file mode 100644
index 0000000000000..6539c17de9e57
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Mftf/Section/StorefrontMultishippingCheckoutSection.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="StorefrontMultishippingCheckoutSection">
+        <element name="goToShippingInformation" type="button" selector="button[title='Go to Shipping Information']"
+                 timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json
index 111204915e4c8..aed4aadbd8ca6 100644
--- a/app/code/Magento/Multishipping/composer.json
+++ b/app/code/Magento/Multishipping/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-multishipping",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-checkout": "100.2.*",
@@ -15,7 +15,7 @@
         "magento/module-theme": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml
index c6bcdeb7b0413..fee3cb790a522 100644
--- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml
@@ -12,6 +12,7 @@
             <block class="Magento\Customer\Block\Address\Edit" name="customer_address_edit" template="Magento_Customer::address/edit.phtml" cacheable="false">
                 <arguments>
                     <argument name="attribute_data" xsi:type="object">Magento\Customer\Block\DataProviders\AddressAttributeData</argument>
+                    <argument name="post_code_config" xsi:type="object">Magento\Customer\Block\DataProviders\PostCodesPatternsAttributeData</argument>
                 </arguments>
             </block>
         </referenceContainer>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml
index 148d207421154..134b80ac18ed8 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml
@@ -4,21 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var \Magento\Multishipping\Block\Checkout\Address\Select $block */
 ?>
 <div class="multicheckout">
     <div class="block block-billing">
-    <?php foreach ($block->getAddress() as $address): ?>
+    <?php foreach ($block->getAddress() as $address) : ?>
         <div class="box box-billing-address">
             <div class="box-content">
                 <address>
                     <?= $block->getAddressAsHtml($address); ?>
-                    <?php if ($block->isAddressDefaultBilling($address)): ?>
+                    <?php if ($block->isAddressDefaultBilling($address)) : ?>
                         <br /><strong><?= $block->escapeHtml(__('Default Billing')); ?></strong>
                     <?php endif; ?>
-                    <?php if ($block->isAddressDefaultShipping($address)): ?>
+                    <?php if ($block->isAddressDefaultShipping($address)) : ?>
                         <br /><strong><?= $block->escapeHtml(__('Default Shipping')); ?></strong>
                     <?php endif; ?>
                 </address>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
index a29013cc71722..faf08f77c02f3 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Files.LineLength
 
 ?>
 <?php
@@ -43,7 +43,7 @@
             </tr>
             </thead>
             <tbody>
-            <?php foreach ($block->getItems() as $_index => $_item): ?>
+            <?php foreach ($block->getItems() as $_index => $_item) : ?>
                 <?php if ($_item->getQuoteItem()) : ?>
                     <tr>
                         <td class="col product" data-th="<?= $block->escapeHtml(__('Product')) ?>">
@@ -68,11 +68,11 @@
                             </div>
                         </td>
                         <td class="col address" data-th="<?= $block->escapeHtml(__('Send To')) ?>">
-                            <?php if ($_item->getProduct()->getIsVirtual()): ?>
+                            <?php if ($_item->getProduct()->getIsVirtual()) : ?>
                                 <div class="applicable">
                                     <?= $block->escapeHtml(__('A shipping selection is not applicable.')) ?>
                                 </div>
-                            <?php else: ?>
+                            <?php else : ?>
                                 <div class="field address">
                                     <label for="ship_<?= $block->escapeHtml($_index) ?>_<?= $block->escapeHtml($_item->getQuoteItemId()) ?>_address"
                                            class="label">
@@ -102,10 +102,10 @@
         <div class="primary">
             <button type="submit"
                     title="<?= $block->escapeHtml(__('Go to Shipping Information')) ?>"
-                    class="action primary continue<?php if ($block->isContinueDisabled()):?> disabled<?php endif; ?>"
+                    class="action primary continue<?= $block->isContinueDisabled() ? ' disabled' : '' ?>"
                     data-role="can-continue"
                     data-flag="1"
-                <?php if ($block->isContinueDisabled()):?>
+                <?php if ($block->isContinueDisabled()) : ?>
                     disabled="disabled"
                 <?php endif; ?>>
                 <span><?= $block->escapeHtml(__('Go to Shipping Information')) ?></span>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
index d8514ca77f9c2..761c1f1a78423 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
@@ -79,36 +79,45 @@
                                 if (isset($methodsForms[$code])) {
                                     $block->setMethodFormTemplate($code, $methodsForms[$code]);
                                 }
-                            ?>
-                            <dt class="item-title">
-                                <?php if ($methodsCount > 1) : ?>
-                                    <input type="radio"
-                                           id="p_method_<?= $block->escapeHtml($code); ?>"
-                                           value="<?= $block->escapeHtml($code); ?>"
-                                           name="payment[method]"
-                                           title="<?= $block->escapeHtml($_method->getTitle()) ?>"
-                                        <?php if ($checked) : ?>
-                                           checked="checked"
+                                ?>
+                                <div data-bind="scope: 'payment_method_<?= $block->escapeHtml($code);?>'">
+                                    <dt class="item-title">
+                                        <?php if ($methodsCount > 1) : ?>
+                                            <input type="radio"
+                                                   id="p_method_<?= $block->escapeHtml($code); ?>"
+                                                   value="<?= $block->escapeHtml($code); ?>"
+                                                   name="payment[method]"
+                                                   title="<?= $block->escapeHtml($_method->getTitle()) ?>"
+                                                   data-bind="
+                                                       value: getCode(),
+                                                       checked: isChecked,
+                                                       click: selectPaymentMethod,
+                                                       visible: isRadioButtonVisible()"
+                                                <?php if ($checked) : ?>
+                                                    checked="checked"
+                                                <?php endif; ?>
+                                                   class="radio"/>
+                                        <?php else : ?>
+                                            <input type="radio"
+                                                   id="p_method_<?= $block->escapeHtml($code); ?>"
+                                                   value="<?= $block->escapeHtml($code); ?>"
+                                                   name="payment[method]"
+                                                   data-bind="
+                                                       value: getCode(),
+                                                       afterRender: selectPaymentMethod"
+                                                   checked="checked"
+                                                   class="radio solo method" />
                                         <?php endif; ?>
-                                           class="radio"/>
-                                <?php else : ?>
-                                    <input type="radio"
-                                           id="p_method_<?= $block->escapeHtml($code); ?>"
-                                           value="<?= $block->escapeHtml($code); ?>"
-                                           name="payment[method]"
-                                           checked="checked"
-                                           class="radio solo method" />
-                                <?php endif; ?>
-                                    <label for="p_method_<?= $block->escapeHtml($code); ?>">
-                                        <?= $block->escapeHtml($_method->getTitle()) ?>
-                                    </label>
-                            </dt>
-                                <?php if ($html = $block->getChildHtml('payment.method.' . $code)) : ?>
-                                    <dd class="item-content <?= $checked ? '' : 'no-display'; ?>"
-                                        data-bind="scope: 'payment_method_<?= $block->escapeHtml($code);?>'">
-                                        <?= /* @noEscape */ $html; ?>
-                                    </dd>
-                                <?php endif; ?>
+                                        <label for="p_method_<?= $block->escapeHtml($code); ?>">
+                                            <?= $block->escapeHtml($_method->getTitle()) ?>
+                                        </label>
+                                    </dt>
+                                    <?php if ($html = $block->getChildHtml('payment.method.' . $code)) : ?>
+                                        <dd class="item-content <?= $checked ? '' : 'no-display'; ?>">
+                                            <?= /* @noEscape */ $html; ?>
+                                        </dd>
+                                    <?php endif; ?>
+                                </div>
                             <?php endforeach; ?>
                         </dl>
                         <?= $block->getChildHtml('payment_methods_after') ?>
@@ -119,7 +128,7 @@
         </div>
     </div>
     <div class="actions-toolbar">
-        <div class="primary">
+        <div class="primary" id="parent-payment-continue">
             <button id="payment-continue"
                     type="button"
                     class="action primary continue">
@@ -152,3 +161,31 @@
         });
     });
 </script>
+
+<script>
+    //<![CDATA[
+    require(
+        [
+            'Magento_Checkout/js/model/quote',
+            'jquery',
+            'domReady!'
+        ], function(quote, $) {
+            quote.billingAddress({
+                    city: '<?= /* @noEscape */ $block->getAddress()->getCity() ?>',
+                    company: '<?= /* @noEscape */ $block->getAddress()->getCompany(); ?>',
+                    countryId: '<?= /* @noEscape */ $block->getAddress()->getCountryId(); ?>',
+                    customerAddressId: '<?= /* @noEscape */ $block->getAddress()->getCustomerAddressId(); ?>',
+                    customerId: '<?= /* @noEscape */ $block->getAddress()->getCustomerId(); ?>',
+                    fax: '<?= /* @noEscape */ $block->getAddress()->getFax(); ?>',
+                    firstname: '<?= /* @noEscape */ $block->getAddress()->getFirstname(); ?>',
+                    lastname: '<?= /* @noEscape */ $block->getAddress()->getLastname(); ?>',
+                    postcode: '<?= /* @noEscape */ $block->getAddress()->getPostcode(); ?>',
+                    regionId: '<?= /* @noEscape */ $block->getAddress()->getRegionId(); ?>',
+                    regionCode: '<?= /* @noEscape */ $block->getAddress()->getRegionCode() ?>',
+                    region: '<?= /* @noEscape */ $block->getAddress()->getRegion(); ?>',
+                    street: <?= /* @noEscape */ json_encode($block->getAddress()->getStreet()); ?>,
+                    telephone: '<?= /* @noEscape */ $block->getAddress()->getTelephone(); ?>'
+            });
+        });
+    //]]>
+</script>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml
index d1c39970518e6..2f89805a2a577 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml
@@ -4,31 +4,29 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
-<?php if ($block->getQuote()->hasVirtualItems()): ?>
+<?php if ($block->getQuote()->hasVirtualItems()) : ?>
 <div class="block block-other">
     <div class="block-title">
-        <strong><?= /* @escapeNotVerified */ __('Other items in your order') ?></strong>
-        <a href="<?= /* @escapeNotVerified */ $block->getVirtualProductEditUrl() ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Edit Items') ?></span></a>
+        <strong><?= $block->escapeHtml(__('Other items in your order')) ?></strong>
+        <a href="<?= $block->escapeUrl($block->getVirtualProductEditUrl()) ?>" class="action edit"><span><?= $block->escapeHtml(__('Edit Items')) ?></span></a>
     </div>
     <div class="block-content">
-        <p><?= /* @escapeNotVerified */ __('Shipping is not applicable.') ?></p>
+        <p><?= $block->escapeHtml(__('Shipping is not applicable.')) ?></p>
         <div class="table-wrapper">
             <table class="items data table" id="unavailable-shipping-table">
-                <caption class="table-caption"><?= /* @escapeNotVerified */ __('Other items in your order') ?></caption>
+                <caption class="table-caption"><?= $block->escapeHtml(__('Other items in your order')) ?></caption>
                 <thead>
                     <tr>
-                        <th class="col item" scope="col"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
-                        <th class="col qty" scope="col"><?= /* @escapeNotVerified */ __('Qty') ?></th>
+                        <th class="col item" scope="col"><?= $block->escapeHtml(__('Product Name')) ?></th>
+                        <th class="col qty" scope="col"><?= $block->escapeHtml(__('Qty')) ?></th>
                     </tr>
                 </thead>
                 <tbody>
-                <?php foreach ($block->getVirtualQuoteItems() as $_item): ?>
+                <?php foreach ($block->getVirtualQuoteItems() as $_item) : ?>
                     <tr>
                         <td class="col item" data-th="<?= $block->escapeHtml(__('Product Name')) ?>"><?= $block->getItemHtml($_item) ?></td>
-                        <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= /* @escapeNotVerified */ $_item->getQty() ?></td>
+                        <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= $block->escapeHtml($_item->getQty()) ?></td>
                     </tr>
                 <?php endforeach; ?>
                 </tbody>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml
index 1de8357db8986..51d964957c4d5 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml
@@ -4,27 +4,26 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Files.LineLength
 ?>
-<strong class="product name product-item-name"><a href="<?= /* @escapeNotVerified */ $block->getProductUrl() ?>"><?= $block->escapeHtml($block->getProductName()) ?></a></strong>
-<?php if ($_options = $block->getOptionList()): ?>
+<strong class="product name product-item-name"><a href="<?= $block->escapeUrl($block->getProductUrl()) ?>"><?= $block->escapeHtml($block->getProductName()) ?></a></strong>
+<?php if ($_options = $block->getOptionList()) : ?>
     <dl class="item-options">
         <?php foreach ($_options as $_option) : ?>
             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-            <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
-                <?php if (isset($_formatedOptionValue['full_view'])): ?>
+            <dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>
+                <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
+                <?php if (isset($_formatedOptionValue['full_view'])) : ?>
                     <dl class="item options tooltip content">
                         <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                        <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
+                        <dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
                     </dl>
                 <?php endif; ?>
             </dd>
         <?php endforeach; ?>
     </dl>
 <?php endif; ?>
-<?php if ($addtInfoBlock = $block->getProductAdditionalInformationBlock()): ?>
+<?php if ($addtInfoBlock = $block->getProductAdditionalInformationBlock()) : ?>
     <?= $addtInfoBlock->setItem($block->getItem())->toHtml() ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml
index ae65caf6983d0..15fe496ddd802 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml
@@ -4,7 +4,5 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
-<a class="action multicheckout" href="<?= /* @escapeNotVerified */ $block->getCheckoutUrl() ?>"><span><?= /* @escapeNotVerified */ __('Check Out with Multiple Addresses') ?></span></a>
+<a class="action multicheckout" href="<?= $block->escapeUrl($block->getCheckoutUrl()) ?>"><span><?= $block->escapeHtml(__('Check Out with Multiple Addresses')) ?></span></a>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
index 4590b7c584085..5fff0d72e8000 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable Magento2.Templates.ThisInTemplate
+
 /** @var \Magento\Multishipping\Block\Checkout\Overview $block */
 ?>
 <?php $errors = $block->getCheckoutData()->getAddressErrors(); ?>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml
index 5424f37efac07..774973be07765 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Files.LineLength, Magento2.Templates.ThisInTemplate
 
 ?>
 <?php
@@ -22,14 +22,14 @@
     </td>
     <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
         <?php /* Including Tax */ ?>
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+            <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayCartPriceInclTax() || $this->helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices()) : ?>
                 <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
                     <?= $block->getUnitPriceInclTaxHtml($_item) ?>
                 </span>
             <?php endif; ?>
         <?php /* end Including Tax */ ?>
         <?php /* Excluding Tax */ ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+        <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayCartPriceExclTax() || $this->helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices()) : ?>
             <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
                 <?= $block->getUnitPriceExclTaxHtml($_item) ?>
             </span>
@@ -37,17 +37,17 @@
         <?php /* end Excluding Tax */ ?>
     </td>
 
-    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
+    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= /* @noEscape */ $_item->getQty() * 1 ?></td>
     <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
     <?php /* Including Tax Subtotal */ ?>
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+        <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayCartPriceInclTax() || $this->helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices()) : ?>
         <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
             <?= $block->getRowTotalInclTaxHtml($_item) ?>
         </span>
         <?php endif; ?>
     <?php /* end Including Tax Subtotal */ ?>
     <?php /* Excluding Tax Subtotal */ ?>
-    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+    <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayCartPriceExclTax() || $this->helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices()) : ?>
         <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
             <?= $block->getRowTotalExclTaxHtml($_item) ?>
         </span>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
index f66a2093b0aff..af67c087ed24d 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Files.LineLength, Magento2.Templates.ThisInTemplate
 
 ?>
 <?php
@@ -14,63 +14,68 @@
  * @var $block \Magento\Multishipping\Block\Checkout\Shipping
  */
 ?>
-<form action="<?= /* @escapeNotVerified */ $block->getPostActionUrl() ?>" method="post" id="shipping_method_form" class="form multicheckout shipping">
-    <?php foreach ($block->getAddresses() as $_index => $_address): ?>
+<form action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>" method="post" id="shipping_method_form" class="form multicheckout shipping">
+    <?php foreach ($block->getAddresses() as $_index => $_address) : ?>
     <div class="block block-shipping">
-        <div class="block-title"><strong><?= /* @escapeNotVerified */ __('Address %1 <span>of %2</span>', ($_index+1), $block->getAddressCount()) ?></strong></div>
+        <div class="block-title"><strong><?= $block->escapeHtml(__('Address %1 <span>of %2</span>', ($_index+1), $block->getAddressCount()), ['span']) ?></strong></div>
         <div class="block-content">
             <div class="box box-shipping-address">
                 <strong class="box-title">
-                    <span><?= /* @escapeNotVerified */ __('Shipping To') ?></span>
-                    <a href="<?= /* @escapeNotVerified */ $block->getAddressEditUrl($_address) ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Change') ?></span></a>
+                    <span><?= $block->escapeHtml(__('Shipping To')) ?></span>
+                    <a href="<?= $block->escapeUrl($block->getAddressEditUrl($_address)) ?>" class="action edit">
+                        <span><?= $block->escapeHtml(__('Change')) ?></span>
+                    </a>
                 </strong>
                 <div class="box-content">
-                    <address><?= /* @escapeNotVerified */ $_address->format('html') ?></address>
+                    <address><?= /* @noEscape */ $_address->format('html') ?></address>
                 </div>
             </div>
             <div class="box box-shipping-method">
                 <strong class="box-title">
-                    <span><?= /* @escapeNotVerified */ __('Shipping Method') ?></span>
+                    <span><?= $block->escapeHtml(__('Shipping Method')) ?></span>
                 </strong>
                 <div class="box-content">
-                    <?php if (!($_shippingRateGroups = $block->getShippingRates($_address))): ?>
-                        <p><?= /* @escapeNotVerified */ __('Sorry, no quotes are available for this order right now.') ?></p>
-                    <?php else: ?>
+                    <?php if (!($_shippingRateGroups = $block->getShippingRates($_address))) : ?>
+                        <p><?= $block->escapeHtml(__('Sorry, no quotes are available for this order right now.')) ?></p>
+                    <?php else : ?>
                     <dl class="items methods-shipping">
-                        <?php $_sole = count($_shippingRateGroups) == 1; foreach ($_shippingRateGroups as $code => $_rates): ?>
+                        <?php $_sole = count($_shippingRateGroups) == 1; foreach ($_shippingRateGroups as $code => $_rates) : ?>
                             <dt class="item-title"><?= $block->escapeHtml($block->getCarrierName($code)) ?></dt>
                             <dd class="item-content">
                                 <fieldset class="fieldset">
                                     <legend class="legend">
                                         <span><?= $block->escapeHtml($block->getCarrierName($code)) ?></span>
                                     </legend><br>
-                                    <?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate): ?>
+                                    <?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate) : ?>
                                     <div class="field choice">
-                                    <?php if ($_rate->getErrorMessage()): ?>
+                                        <?php if ($_rate->getErrorMessage()) : ?>
                                         <strong><?= $block->escapeHtml($_rate->getCarrierTitle()) ?>: <?= $block->escapeHtml($_rate->getErrorMessage()) ?></strong>
-                                    <?php else: ?>
+                                        <?php else : ?>
                                         <div class="control">
                                             <?php if ($_sole) : ?>
-                                                <input type="radio" name="shipping_method[<?= /* @escapeNotVerified */ $_address->getId() ?>]" value="<?= $block->escapeHtml($_rate->getCode()) ?>" id="s_method_<?= /* @escapeNotVerified */ $_address->getId() ?>_<?= /* @escapeNotVerified */ $_rate->getCode() ?>" class="radio solo method" checked="checked"/>
-                                            <?php else: ?>
-                                                <input type="radio" name="shipping_method[<?= /* @escapeNotVerified */ $_address->getId() ?>]" value="<?= /* @escapeNotVerified */ $_rate->getCode() ?>" id="s_method_<?= /* @escapeNotVerified */ $_address->getId() ?>_<?= /* @escapeNotVerified */ $_rate->getCode() ?>"<?php if($_rate->getCode()===$block->getAddressShippingMethod($_address)) echo ' checked="checked"' ?> class="radio" />
+                                                <input type="radio" name="shipping_method[<?= (int) $_address->getId() ?>]" value="<?= $block->escapeHtmlAttr($_rate->getCode()) ?>" id="s_method_<?= (int) $_address->getId() ?>_<?= $block->escapeHtmlAttr($_rate->getCode()) ?>" class="radio solo method" checked="checked"/>
+                                            <?php else : ?>
+                                                <input type="radio" name="shipping_method[<?= (int) $_address->getId() ?>]" value="<?= $block->escapeHtmlAttr($_rate->getCode()) ?>" id="s_method_<?= (int) $_address->getId() ?>_<?= $block->escapeHtmlAttr($_rate->getCode()) ?>" <?= ($_rate->getCode()===$block->getAddressShippingMethod($_address)) ? ' checked="checked"' : '' ?> class="radio" />
                                             <?php endif; ?>
                                         </div>
-                                        <label for="s_method_<?= /* @escapeNotVerified */ $_address->getId() ?>_<?= /* @escapeNotVerified */ $_rate->getCode() ?>"><?= $block->escapeHtml($_rate->getMethodTitle()) ?>
-                                            <?php $_excl = $block->getShippingPrice($_address, $_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
+                                        <label for="s_method_<?= (int) $_address->getId() ?>_<?= $block->escapeHtmlAttr($_rate->getCode()) ?>">
+                                            <?= $block->escapeHtml($_rate->getMethodTitle()) ?>
+                                            <?php $_excl = $block->getShippingPrice($_address, $_rate->getPrice(), $this->helper(Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()); ?>
                                             <?php $_incl = $block->getShippingPrice($_address, $_rate->getPrice(), true); ?>
-                                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                                            <span class="price-including-tax" data-label="<?= /* @escapeNotVerified */ __('Incl. Tax') ?>">
-                                        <?php endif; ?>
-                                            <?= /* @escapeNotVerified */ $_incl ?>
-                                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
+                                            <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
+                                            <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
+                                            <?php endif; ?>
+                                                <?= $block->escapeHtml($_incl, ['span']) ?>
+                                            <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
+                                            </span>
+                                            <?php endif; ?>
+                                            <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
+                                            <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
+                                                <?= $block->escapeHtml($_excl, ['span']) ?>
                                             </span>
-                                        <?php endif; ?>
-                                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                                            <span class="price-excluding-tax" data-label="<?= /* @escapeNotVerified */ __('Excl. Tax') ?>"><?= /* @escapeNotVerified */ $_excl ?></span>
-                                        <?php endif; ?>
+                                            <?php endif; ?>
                                         </label>
-                                    <?php endif ?>
+                                        <?php endif ?>
                                     </div>
                                     <?php endforeach; ?>
                                 </fieldset>
@@ -78,29 +83,29 @@
                         <?php endforeach; ?>
                     </dl>
                     <?php endif; ?>
-                    <?= /* @escapeNotVerified */ $block->getItemsBoxTextAfter($_address) ?>
+                    <?= /* @noEscape */ $block->getItemsBoxTextAfter($_address) ?>
                 </div>
             </div>
             <div class="box box-items">
                 <strong class="box-title">
-                    <span><?= /* @escapeNotVerified */ __('Items') ?></span>
-                    <a href="<?= /* @escapeNotVerified */ $block->getItemsEditUrl($_address) ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Edit Items') ?></span></a>
+                    <span><?= $block->escapeHtml(__('Items')) ?></span>
+                    <a href="<?= $block->escapeUrl($block->getItemsEditUrl($_address)) ?>" class="action edit"><span><?= $block->escapeHtml(__('Edit Items')) ?></span></a>
                 </strong>
                 <div class="box-content">
                     <div class="table-wrapper">
-                        <table class="items data table" id="shipping-table-<?= /* @escapeNotVerified */ $_address->getId() ?>">
-                            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items') ?></caption>
+                        <table class="items data table" id="shipping-table-<?= (int) $_address->getId() ?>">
+                            <caption class="table-caption"><?= $block->escapeHtml(__('Items')) ?></caption>
                             <thead>
                             <tr>
-                                <th class="col item" scope="col"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
-                                <th class="col qty" scope="col"><?= /* @escapeNotVerified */ __('Qty') ?></th>
+                                <th class="col item" scope="col"><?= $block->escapeHtml(__('Product Name')) ?></th>
+                                <th class="col qty" scope="col"><?= $block->escapeHtml(__('Qty')) ?></th>
                             </tr>
                             </thead>
                             <tbody>
-                            <?php foreach ($block->getAddressItems($_address) as $_item): ?>
+                            <?php foreach ($block->getAddressItems($_address) as $_item) : ?>
                                 <tr>
-                                    <td class="col item" data-th="<?= $block->escapeHtml(__('Product Name')) ?>"><?= $block->getItemHtml($_item->getQuoteItem()) ?></td>
-                                    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= /* @escapeNotVerified */ $_item->getQty() ?></td>
+                                    <td class="col item" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>"><?= $block->getItemHtml($_item->getQuoteItem()) ?></td>
+                                    <td class="col qty" data-th="<?= $block->escapeHtmlAttr(__('Qty')) ?>"><?= $block->escapeHtml($_item->getQty()) ?></td>
                                 </tr>
                             <?php endforeach; ?>
                             </tbody>
@@ -114,10 +119,10 @@
     <?= $block->getChildHtml('checkout_billing_items') ?>
     <div class="actions-toolbar">
         <div class="primary">
-            <button class="action primary continue" type="submit"><span><?= /* @escapeNotVerified */ __('Continue to Billing Information') ?></span></button>
+            <button class="action primary continue" type="submit"><span><?= $block->escapeHtml(__('Continue to Billing Information')) ?></span></button>
         </div>
         <div class="secondary">
-            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back"><span><?= /* @escapeNotVerified */ __('Back to Select Addresses') ?></span></a>
+            <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back"><span><?= $block->escapeHtml(__('Back to Select Addresses')) ?></span></a>
         </div>
     </div>
 </form>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml
index bf520d639a58d..4d8b63e605732 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Files.LineLength
 
 ?>
 <?php
@@ -15,7 +15,9 @@
  */
 ?>
 <ol class="block multicheckout progress items" id="checkout-progress-state">
-    <?php foreach ($block->getSteps() as $_step): ?>
-        <li title="<?= /* @escapeNotVerified */ $_step->getLabel() ?>" class="item<?= ($_step->getIsActive()) ? ' active' : '' ?>"><span><?= /* @escapeNotVerified */ $_step->getLabel() ?></span></li>
+    <?php foreach ($block->getSteps() as $_step) : ?>
+        <li title="<?= $block->escapeHtmlAttr($_step->getLabel()) ?>" class="item<?= ($_step->getIsActive()) ? ' active' : '' ?>">
+            <span><?= $block->escapeHtml($_step->getLabel()) ?></span>
+        </li>
     <?php endforeach; ?>
 </ol>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml b/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml
index bad5acc209b5f..13f44b97fc789 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml b/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml
index 79e6d02465847..9245aec92ace5 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml
@@ -4,29 +4,28 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Files.LineLength
 ?>
 <div class="product details">
-    <strong class="product name"><a href="<?= /* @escapeNotVerified */ $block->getProductUrl() ?>"><?= $block->escapeHtml($block->getProductName()) ?></a></strong>
-    <?php if ($_options = $block->getOptionList()): ?>
+    <strong class="product name"><a href="<?= $block->escapeUrl($block->getProductUrl()) ?>"><?= $block->escapeHtml($block->getProductName()) ?></a></strong>
+    <?php if ($_options = $block->getOptionList()) : ?>
         <dl class="item options">
             <?php foreach ($_options as $_option) : ?>
                 <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                 <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                    <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
+                <dd<?= isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '' ?>>
+                    <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
+                    <?php if (isset($_formatedOptionValue['full_view'])) : ?>
                         <dl class="item options tooltip content">
                             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
+                            <dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
                         </dl>
                     <?php endif; ?>
                 </dd>
             <?php endforeach; ?>
         </dl>
     <?php endif; ?>
-    <?php if ($addtInfoBlock = $block->getProductAdditionalInformationBlock()): ?>
+    <?php if ($addtInfoBlock = $block->getProductAdditionalInformationBlock()) : ?>
         <?= $addtInfoBlock->setItem($block->getItem())->toHtml() ?>
     <?php endif; ?>
 </div>
diff --git a/app/code/Magento/Multishipping/view/frontend/web/js/overview.js b/app/code/Magento/Multishipping/view/frontend/web/js/overview.js
index 9b867cd7217b1..3a6d73e304974 100644
--- a/app/code/Magento/Multishipping/view/frontend/web/js/overview.js
+++ b/app/code/Magento/Multishipping/view/frontend/web/js/overview.js
@@ -15,7 +15,7 @@ define([
             opacity: 0.5, // CSS opacity for the 'Place Order' button when it's clicked and then disabled.
             pleaseWaitLoader: 'span.please-wait', // 'Submitting order information...' Ajax loader.
             placeOrderSubmit: 'button[type="submit"]', // The 'Place Order' button.
-            agreements: '#checkout-agreements' // Container for all of the checkout agreements and terms/conditions
+            agreements: '.checkout-agreements' // Container for all of the checkout agreements and terms/conditions
         },
 
         /**
diff --git a/app/code/Magento/NewRelicReporting/composer.json b/app/code/Magento/NewRelicReporting/composer.json
index 18a1a2df57336..a9d0aa9370a6a 100644
--- a/app/code/Magento/NewRelicReporting/composer.json
+++ b/app/code/Magento/NewRelicReporting/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-new-relic-reporting",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-backend": "100.2.*",
         "magento/module-customer": "101.0.*",
@@ -13,7 +13,7 @@
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
index 9905ce25e1664..c9e9e969c7c82 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
@@ -11,6 +11,9 @@
  */
 namespace Magento\Newsletter\Block\Adminhtml\Template\Grid\Renderer;
 
+/**
+ * Class Sender
+ */
 class Sender extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
@@ -23,10 +26,10 @@ public function render(\Magento\Framework\DataObject $row)
     {
         $str = '';
         if ($row->getTemplateSenderName()) {
-            $str .= htmlspecialchars($row->getTemplateSenderName()) . ' ';
+            $str .= $this->escapeHtml($row->getTemplateSenderName()) . ' ';
         }
         if ($row->getTemplateSenderEmail()) {
-            $str .= '[' . htmlspecialchars($row->getTemplateSenderEmail()) . ']';
+            $str .= '[' . $this->escapeHtml($row->getTemplateSenderEmail()) . ']';
         }
         if ($str == '') {
             $str .= '---';
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
index f9474da452cac..437d5f522cd2e 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
@@ -10,6 +10,7 @@
  *
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
  */
 class Preview extends \Magento\Backend\Block\Widget
 {
@@ -84,7 +85,7 @@ protected function _toHtml()
         $template->revertDesign();
 
         if ($template->isPlain()) {
-            $templateProcessed = "<pre>" . htmlspecialchars($templateProcessed) . "</pre>";
+            $templateProcessed = "<pre>" . $this->escapeHtml($templateProcessed) . "</pre>";
         }
 
         \Magento\Framework\Profiler::stop($this->profilerName);
@@ -142,6 +143,8 @@ protected function getStoreId()
     }
 
     /**
+     * Return template
+     *
      * @param \Magento\Newsletter\Model\Template $template
      * @param string $id
      * @return $this
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
index 7293b350fcd01..0f2192dc442db 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
@@ -9,18 +9,25 @@
 
 namespace Magento\Newsletter\Controller\Adminhtml\Queue;
 
+use Magento\Framework\Exception\NotFoundException;
+
 class Save extends \Magento\Newsletter\Controller\Adminhtml\Queue
 {
     /**
-     * Save Newsletter queue
+     * Save newsletter queue.
      *
-     * @throws \Magento\Framework\Exception\LocalizedException
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws NotFoundException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute()
     {
         try {
+            if (!$this->getRequest()->isPost()) {
+                throw new NotFoundException(__('Page not found'));
+            }
+
             /* @var $queue \Magento\Newsletter\Model\Queue */
             $queue = $this->_objectManager->create(\Magento\Newsletter\Model\Queue::class);
 
@@ -30,7 +37,9 @@ public function execute()
                 $template = $this->_objectManager->create(\Magento\Newsletter\Model\Template::class)->load($templateId);
 
                 if (!$template->getId() || $template->getIsSystem()) {
-                    throw new \Magento\Framework\Exception\LocalizedException(__('Please correct the newsletter template and try again.'));
+                    throw new \Magento\Framework\Exception\LocalizedException(
+                        __('Please correct the newsletter template and try again.')
+                    );
                 }
 
                 $queue->setTemplateId(
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php
index 7f02e4ea13445..4794d86faa17a 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php
@@ -6,11 +6,12 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Subscriber;
 
-use Magento\Newsletter\Controller\Adminhtml\Subscriber;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Newsletter\Controller\Adminhtml\Subscriber;
 use Magento\Newsletter\Model\SubscriberFactory;
-use Magento\Framework\App\ObjectManager;
 
 class MassDelete extends Subscriber
 {
@@ -36,12 +37,17 @@ public function __construct(
      * Delete one or more subscribers action
      *
      * @return void
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found.'));
+        }
+
         $subscribersIds = $this->getRequest()->getParam('subscriber');
         if (!is_array($subscribersIds)) {
-            $this->messageManager->addError(__('Please select one or more subscribers.'));
+            $this->messageManager->addErrorMessage(__('Please select one or more subscribers.'));
         } else {
             try {
                 foreach ($subscribersIds as $subscriberId) {
@@ -50,9 +56,11 @@ public function execute()
                     );
                     $subscriber->delete();
                 }
-                $this->messageManager->addSuccess(__('Total of %1 record(s) were deleted.', count($subscribersIds)));
+                $this->messageManager->addSuccessMessage(
+                    __('Total of %1 record(s) were deleted.', count($subscribersIds))
+                );
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             }
         }
 
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
index b61494f795905..3b3ea0d4c67a0 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
@@ -6,6 +6,7 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Subscriber;
 
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Newsletter\Controller\Adminhtml\Subscriber;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\Response\Http\FileFactory;
@@ -37,9 +38,14 @@ public function __construct(
      * Unsubscribe one or more subscribers action
      *
      * @return void
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found.'));
+        }
+
         $subscribersIds = $this->getRequest()->getParam('subscriber');
         if (!is_array($subscribersIds)) {
             $this->messageManager->addError(__('Please select one or more subscribers.'));
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php
index d327d44feceb8..ac47f7e217b36 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -12,9 +11,14 @@ class Delete extends \Magento\Newsletter\Controller\Adminhtml\Template
      * Delete newsletter Template
      *
      * @return void
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         $template = $this->_objectManager->create(
             \Magento\Newsletter\Model\Template::class
         )->load(
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php
index 52d46065ad05b..54a5eb651d99b 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Drop.php
@@ -6,15 +6,22 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Template;
 
+use Magento\Framework\Exception\NotFoundException;
+
 class Drop extends \Magento\Newsletter\Controller\Adminhtml\Template
 {
     /**
      * Drop Newsletter Template
      *
      * @return void
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         $this->_view->loadLayout('newsletter_template_preview_popup');
         $this->_view->renderLayout();
     }
diff --git a/app/code/Magento/Newsletter/Controller/Manage/Save.php b/app/code/Magento/Newsletter/Controller/Manage/Save.php
index 419cbac10ffd1..1aa2a4505d518 100644
--- a/app/code/Magento/Newsletter/Controller/Manage/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Manage/Save.php
@@ -8,8 +8,12 @@
 namespace Magento\Newsletter\Controller\Manage;
 
 use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
+use Magento\Customer\Model\Data\Customer;
 use Magento\Newsletter\Model\Subscriber;
 
+/**
+ * Controller for customer newsletter subscription save.
+ */
 class Save extends \Magento\Newsletter\Controller\Manage
 {
     /**
@@ -58,7 +62,7 @@ public function __construct(
     }
 
     /**
-     * Save newsletter subscription preference action
+     * Save newsletter subscription preference action.
      *
      * @return void|null
      */
@@ -81,6 +85,8 @@ public function execute()
                 $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()
@@ -105,4 +111,15 @@ public function execute()
         }
         $this->_redirect('customer/account/');
     }
+
+    /**
+     * Set ignore_validation_flag to skip unnecessary address and customer validation.
+     *
+     * @param Customer $customer
+     * @return void
+     */
+    private function setIgnoreValidationFlag(Customer $customer)
+    {
+        $customer->setData('ignore_validation_flag', true);
+    }
 }
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
index fd2a61702e909..ab4950b8a3452 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
@@ -77,9 +77,10 @@ public function __construct(
     protected function validateEmailAvailable($email)
     {
         $websiteId = $this->_storeManager->getStore()->getWebsiteId();
-        if ($this->_customerSession->getCustomerDataObject()->getEmail() !== $email
+        if ($this->_customerSession->isLoggedIn()
+            && ($this->_customerSession->getCustomerDataObject()->getEmail() !== $email
             && !$this->customerAccountManagement->isEmailAvailable($email, $websiteId)
-        ) {
+        )) {
             throw new LocalizedException(
                 __('This email address is already assigned to another user.')
             );
diff --git a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
index 792dcf2fbe689..58b51009c205a 100644
--- a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
+++ b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
@@ -6,13 +6,12 @@
 namespace Magento\Newsletter\Model\Plugin;
 
 use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
-use Magento\Customer\Api\Data\CustomerExtensionInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Newsletter\Model\SubscriberFactory;
 use Magento\Framework\Api\ExtensionAttributesFactory;
-use Magento\Framework\App\ObjectManager;
 use Magento\Newsletter\Model\ResourceModel\Subscriber;
-use Magento\Newsletter\Model\SubscriberFactory;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Customer\Api\Data\CustomerExtensionInterface;
+use Magento\Framework\App\ObjectManager;
 
 class CustomerPlugin
 {
@@ -38,30 +37,22 @@ class CustomerPlugin
      */
     private $customerSubscriptionStatus = [];
 
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-
     /**
      * Initialize dependencies.
      *
      * @param SubscriberFactory $subscriberFactory
      * @param ExtensionAttributesFactory|null $extensionFactory
      * @param Subscriber|null $subscriberResource
-     * @param StoreManagerInterface|null $storeManager
      */
     public function __construct(
         SubscriberFactory $subscriberFactory,
         ExtensionAttributesFactory $extensionFactory = null,
-        Subscriber $subscriberResource = null,
-        StoreManagerInterface $storeManager = null
+        Subscriber $subscriberResource = null
     ) {
         $this->subscriberFactory = $subscriberFactory;
         $this->extensionFactory = $extensionFactory
             ?: ObjectManager::getInstance()->get(ExtensionAttributesFactory::class);
         $this->subscriberResource = $subscriberResource ?: ObjectManager::getInstance()->get(Subscriber::class);
-        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
     /**
@@ -158,8 +149,6 @@ public function afterDelete(CustomerRepository $subject, $result, CustomerInterf
     public function afterGetById(CustomerRepository $subject, CustomerInterface $customer)
     {
         $extensionAttributes = $customer->getExtensionAttributes();
-        $storeId = $this->storeManager->getStore()->getId();
-        $customer->setStoreId($storeId);
         if ($extensionAttributes === null) {
             /** @var CustomerExtensionInterface $extensionAttributes */
             $extensionAttributes = $this->extensionFactory->create(CustomerInterface::class);
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
index 131eca5f33487..33e3826e9180b 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
@@ -132,43 +132,34 @@ public function loadByEmail($subscriberEmail)
      */
     public function loadByCustomerData(\Magento\Customer\Api\Data\CustomerInterface $customer)
     {
-        $storeId = (int)$customer->getStoreId() ?: $this->storeManager
-            ->getWebsite($customer->getWebsiteId())->getDefaultStore()->getId();
-
-        $select = $this->connection
-            ->select()
-            ->from($this->getMainTable())
-            ->where('customer_id=:customer_id and store_id=:store_id');
-
-        $result = $this->connection
-            ->fetchRow(
-                $select,
-                [
-                    'customer_id' => $customer->getId(),
-                    'store_id' => $storeId
-                ]
-            );
+        $storeIds = $this->storeManager->getWebsite($customer->getWebsiteId())->getStoreIds();
+
+        if ($customer->getId()) {
+            $select = $this->connection
+                ->select()
+                ->from($this->getMainTable())
+                ->where('customer_id = ?', $customer->getId())
+                ->where('store_id IN (?)', $storeIds);
+
+            $result = $this->connection->fetchRow($select);
 
-        if ($result) {
-            return $result;
+            if ($result) {
+                return $result;
+            }
         }
 
-        $select = $this->connection
-            ->select()
-            ->from($this->getMainTable())
-            ->where('subscriber_email=:subscriber_email and store_id=:store_id');
-
-        $result = $this->connection
-            ->fetchRow(
-                $select,
-                [
-                    'subscriber_email' => $customer->getEmail(),
-                    'store_id' => $storeId
-                ]
-            );
+        if ($customer->getEmail()) {
+            $select = $this->connection
+                ->select()
+                ->from($this->getMainTable())
+                ->where('subscriber_email = ?', $customer->getEmail())
+                ->where('store_id IN (?)', $storeIds);
+
+            $result = $this->connection->fetchRow($select);
 
-        if ($result) {
-            return $result;
+            if ($result) {
+                return $result;
+            }
         }
 
         return [];
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index a1d929d8db7bf..2c6f494053efc 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -389,6 +389,9 @@ public function loadByCustomerId($customerId)
         try {
             $customerData = $this->customerRepository->getById($customerId);
             $customerData->setStoreId($this->_storeManager->getStore()->getId());
+            if ($customerData->getWebsiteId() === null) {
+                $customerData->setWebsiteId($this->_storeManager->getStore()->getWebsiteId());
+            }
             $data = $this->getResource()->loadByCustomerData($customerData);
             $this->addData($data);
             if (!empty($data) && $customerData->getId() && !$this->getCustomerId()) {
@@ -549,7 +552,7 @@ public function updateSubscription($customerId)
     }
 
     /**
-     * Saving customer subscription status
+     * Saving customer subscription status.
      *
      * @param int $customerId
      * @param bool $subscribe indicates whether the customer should be subscribed or unsubscribed
@@ -585,7 +588,12 @@ protected function _updateCustomerSubscription($customerId, $subscribe)
             if (AccountManagementInterface::ACCOUNT_CONFIRMATION_REQUIRED
                 == $this->customerAccountManagement->getConfirmationStatus($customerId)
             ) {
-                $status = self::STATUS_UNCONFIRMED;
+                if ($this->getId() && $this->getStatus() == self::STATUS_SUBSCRIBED) {
+                    // if a customer was already subscribed then keep the subscribed
+                    $status = self::STATUS_SUBSCRIBED;
+                } else {
+                    $status = self::STATUS_UNCONFIRMED;
+                }
             } elseif ($isConfirmNeed) {
                 if ($this->getStatus() != self::STATUS_SUBSCRIBED) {
                     $status = self::STATUS_NOT_ACTIVE;
diff --git a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml
new file mode 100644
index 0000000000000..81b444fb5c1dc
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.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">
+
+    <!--Create an Account. Check Sign Up for Newsletter checkbox -->
+    <actionGroup name="StorefrontCreateNewAccountNewsletterChecked" extends="SignUpNewUserFromStorefrontActionGroup">
+        <checkOption selector="{{StorefrontCustomerCreateFormSection.signUpForNewsletter}}" stepKey="selectSignUpForNewsletterCheckbox" after="fillLastName"/>
+        <see stepKey="seenewsletterDescription" userInput='You are subscribed to "General Subscription".' selector="{{StorefrontCustomerDashboardAccountInformationSection.newsletterDescription}}" />
+    </actionGroup>
+
+    <!--Check Subscribed Newsletter via StoreFront-->
+    <actionGroup name="CheckSubscribedNewsletterActionGroup">
+        <amOnPage url="{{StorefrontNewsletterManagePage.url}}" stepKey="goToNewsletterManage"/>
+        <seeCheckboxIsChecked selector="{{StorefrontNewsletterManageSection.subscriptionCheckbox}}" stepKey="checkSubscribedNewsletter"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Page/StorefrontNewsletterManagePage.xml b/app/code/Magento/Newsletter/Test/Mftf/Page/StorefrontNewsletterManagePage.xml
new file mode 100644
index 0000000000000..81fd3eb7c391c
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Page/StorefrontNewsletterManagePage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontNewsletterManagePage" url="newsletter/manage/" area="storefront" module="Magento_Newsletter">
+        <section name="StorefrontNewsletterManageSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
new file mode 100644
index 0000000000000..36870fbfb0182
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerCreateFormSection">
+        <element name="signUpForNewsletter" type="checkbox" selector="#is_subscribed"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontCustomerDashboardAccountInformationSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontCustomerDashboardAccountInformationSection.xml
new file mode 100644
index 0000000000000..15d6debd7ef25
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontCustomerDashboardAccountInformationSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerDashboardAccountInformationSection">
+        <element name="newsletterDescription" type="text" selector=".box-newsletter p"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterManageSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterManageSection.xml
new file mode 100644
index 0000000000000..96a944a4952ac
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterManageSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontNewsletterManageSection">
+        <element name="subscriptionCheckbox" type="checkbox" selector="#subscription" />
+    </section>
+</sections>
diff --git a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php
index 219f9127d4ad8..b0989569d9d4a 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php
@@ -81,13 +81,17 @@ protected function setUp()
         $queueFactory->expects($this->any())->method('create')->will($this->returnValue($this->queue));
 
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $escaper = $this->objectManager->getObject(\Magento\Framework\Escaper::class);
+        $context->expects($this->once())->method('getEscaper')->willReturn($escaper);
+
         $this->preview = $this->objectManager->getObject(
             \Magento\Newsletter\Block\Adminhtml\Queue\Preview::class,
             [
                 'context' => $context,
                 'templateFactory' => $templateFactory,
                 'subscriberFactory' => $subscriberFactory,
-                'queueFactory' => $queueFactory,
+                'queueFactory' => $queueFactory
             ]
         );
     }
@@ -103,12 +107,12 @@ public function testToHtmlEmpty()
 
     public function testToHtmlWithId()
     {
-        $this->request->expects($this->any())->method('getParam')->will($this->returnValueMap(
+        $this->request->expects($this->any())->method('getParam')->willReturnMap(
             [
                 ['id', null, 1],
                 ['store_id', null, 0]
             ]
-        ));
+        );
         $this->queue->expects($this->once())->method('load')->will($this->returnSelf());
         $this->template->expects($this->any())->method('isPlain')->will($this->returnValue(true));
         /** @var \Magento\Store\Model\Store $store */
diff --git a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php
index baa80759314cb..4de2d5d17c550 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/Grid/Renderer/SenderTest.php
@@ -26,8 +26,14 @@ class SenderTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $escaper = $this->objectManagerHelper->getObject(
+            \Magento\Framework\Escaper::class
+        );
         $this->sender = $this->objectManagerHelper->getObject(
-            \Magento\Newsletter\Block\Adminhtml\Template\Grid\Renderer\Sender::class
+            \Magento\Newsletter\Block\Adminhtml\Template\Grid\Renderer\Sender::class,
+            [
+                'escaper' => $escaper
+            ]
         );
     }
 
@@ -73,8 +79,8 @@ public function rendererDataProvider()
                     'sender_email' => "<br>'email@example.com'</br>",
                 ],
                 [
-                    'sender' => "&lt;br&gt;'Sender'&lt;/br&gt;",
-                    'sender_email' => "&lt;br&gt;'email@example.com'&lt;/br&gt;",
+                    'sender' => "&lt;br&gt;&#039;Sender&#039;&lt;/br&gt;",
+                    'sender_email' => "&lt;br&gt;&#039;email@example.com&#039;&lt;/br&gt;",
                 ],
             ],
             [
diff --git a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/PreviewTest.php b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/PreviewTest.php
index 70407b50cacc0..f4e120b6f0e4d 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/PreviewTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/PreviewTest.php
@@ -7,7 +7,11 @@
 
 use Magento\Framework\App\TemplateTypesInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Escaper;
 
+/**
+ * Test for \Magento\Newsletter\Block\Adminhtml\Template\Preview
+ */
 class PreviewTest extends \PHPUnit\Framework\TestCase
 {
     /** @var \Magento\Newsletter\Block\Adminhtml\Template\Preview */
@@ -36,7 +40,9 @@ protected function setUp()
         $this->request = $this->createMock(\Magento\Framework\App\RequestInterface::class);
         $this->appState = $this->createMock(\Magento\Framework\App\State::class);
         $this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
-        $this->template = $this->createPartialMock(\Magento\Newsletter\Model\Template::class, [
+        $this->template = $this->createPartialMock(
+            \Magento\Newsletter\Model\Template::class,
+            [
                 'setTemplateType',
                 'setTemplateText',
                 'setTemplateStyles',
@@ -45,7 +51,8 @@ protected function setUp()
                 'revertDesign',
                 'getProcessedTemplate',
                 'load'
-            ]);
+            ]
+        );
         $templateFactory = $this->createPartialMock(\Magento\Newsletter\Model\TemplateFactory::class, ['create']);
         $templateFactory->expects($this->once())->method('create')->willReturn($this->template);
         $this->subscriberFactory = $this->createPartialMock(
@@ -54,6 +61,7 @@ protected function setUp()
         );
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $escaper = new Escaper();
         $this->preview = $this->objectManagerHelper->getObject(
             \Magento\Newsletter\Block\Adminhtml\Template\Preview::class,
             [
@@ -61,7 +69,8 @@ protected function setUp()
                 'storeManager' => $this->storeManager,
                 'request' => $this->request,
                 'templateFactory' => $templateFactory,
-                'subscriberFactory' => $this->subscriberFactory
+                'subscriberFactory' => $this->subscriberFactory,
+                'escaper' => $escaper
             ]
         );
     }
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 0bc79244bdf1c..39a9c2a0d95d2 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php
@@ -10,8 +10,6 @@
 use Magento\Customer\Api\Data\CustomerExtensionInterface;
 use Magento\Framework\Api\ExtensionAttributesFactory;
 use Magento\Newsletter\Model\ResourceModel\Subscriber;
-use Magento\Store\Model\Store;
-use Magento\Store\Model\StoreManagerInterface;
 
 class CustomerPluginTest extends \PHPUnit\Framework\TestCase
 {
@@ -55,11 +53,6 @@ class CustomerPluginTest extends \PHPUnit\Framework\TestCase
      */
     private $customerMock;
 
-    /**
-     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $storeManagerMock;
-
     protected function setUp()
     {
         $this->subscriberFactory = $this->getMockBuilder(\Magento\Newsletter\Model\SubscriberFactory::class)
@@ -94,8 +87,6 @@ protected function setUp()
             ->setMethods(["getExtensionAttributes"])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
-
         $this->subscriberFactory->expects($this->any())->method('create')->willReturn($this->subscriber);
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->plugin = $this->objectManager->getObject(
@@ -103,8 +94,7 @@ protected function setUp()
             [
                 'subscriberFactory' => $this->subscriberFactory,
                 'extensionFactory' => $this->extensionFactoryMock,
-                'subscriberResource' => $this->subscriberResourceMock,
-                'storeManager' => $this->storeManagerMock,
+                'subscriberResource' => $this->subscriberResourceMock
             ]
         );
     }
@@ -208,7 +198,6 @@ public function testAfterGetByIdCreatesExtensionAttributesIfItIsNotSet(
     ) {
         $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
         $subscriber = [$subscriberStatusKey => $subscriberStatusValue];
-        $this->prepareStoreData();
         $this->extensionFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($this->customerExtensionMock);
@@ -234,7 +223,6 @@ public function testAfterGetByIdSetsIsSubscribedFlagIfItIsNotSet()
     {
         $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
         $subscriber = ['subscriber_id' => 1, 'subscriber_status' => 1];
-        $this->prepareStoreData();
         $this->customerMock->expects($this->any())
             ->method('getExtensionAttributes')
             ->willReturn($this->customerExtensionMock);
@@ -267,17 +255,4 @@ public function afterGetByIdDataProvider()
             [null, null, false]
         ];
     }
-
-    /**
-     * Prepare store information
-     *
-     * @return void
-     */
-    private function prepareStoreData()
-    {
-        $storeId = 1;
-        $storeMock = $this->createMock(Store::class);
-        $storeMock->expects($this->any())->method('getId')->willReturn($storeId);
-        $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($storeMock);
-    }
 }
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
index 9c543c831ded3..0bf6f24a6b989 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
@@ -209,8 +209,14 @@ public function testSubscribeNotLoggedIn()
         $this->assertEquals(Subscriber::STATUS_NOT_ACTIVE, $this->subscriber->subscribe($email));
     }
 
+    /**
+     * Update status with Confirmation Status - required.
+     *
+     * @return void
+     */
     public function testUpdateSubscription()
     {
+        $websiteId = 1;
         $storeId = 2;
         $customerId = 1;
         $customerDataMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
@@ -224,7 +230,7 @@ public function testUpdateSubscription()
             ->willReturn(
                 [
                     'subscriber_id' => 1,
-                    'subscriber_status' => Subscriber::STATUS_SUBSCRIBED
+                    'subscriber_status' => Subscriber::STATUS_SUBSCRIBED,
                 ]
             );
         $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
@@ -234,15 +240,19 @@ public function testUpdateSubscription()
             ->with($customerId)
             ->willReturn('account_confirmation_required');
         $customerDataMock->expects($this->exactly(2))->method('getStoreId')->willReturn($storeId);
+        $customerDataMock->expects($this->exactly(2))->method('getWebsiteId')->willReturn(null);
+        $customerDataMock->expects($this->exactly(2))->method('setWebsiteId')->with($websiteId)->willReturnSelf();
         $customerDataMock->expects($this->once())->method('getEmail')->willReturn('email');
 
         $storeModel = $this->getMockBuilder(\Magento\Store\Model\Store::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getId'])
+            ->setMethods(['getId', 'getWebsiteId'])
             ->getMock();
         $this->storeManager->expects($this->any())->method('getStore')->willReturn($storeModel);
+        $storeModel->expects($this->exactly(2))->method('getWebsiteId')->willReturn($websiteId);
+        $data = $this->subscriber->updateSubscription($customerId);
 
-        $this->assertEquals($this->subscriber, $this->subscriber->updateSubscription($customerId));
+        $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $data->getSubscriberStatus());
     }
 
     public function testUnsubscribeCustomerById()
diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json
index ef6158960aeee..480ee1b09b3b6 100644
--- a/app/code/Magento/Newsletter/composer.json
+++ b/app/code/Magento/Newsletter/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-newsletter",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-customer": "101.0.*",
         "magento/module-widget": "101.0.*",
@@ -14,7 +14,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.5",
+    "version": "100.2.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Newsletter/etc/adminhtml/system.xml b/app/code/Magento/Newsletter/etc/adminhtml/system.xml
index 1173f64310304..277005240eabc 100644
--- a/app/code/Magento/Newsletter/etc/adminhtml/system.xml
+++ b/app/code/Magento/Newsletter/etc/adminhtml/system.xml
@@ -11,39 +11,39 @@
             <label>Newsletter</label>
             <tab>customer</tab>
             <resource>Magento_Newsletter::newsletter</resource>
-            <group id="subscription" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
+            <group id="subscription" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Subscription Options</label>
-                <field id="allow_guest_subscribe" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="allow_guest_subscribe" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Allow Guest Subscription</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="confirm" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="confirm" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Need to Confirm</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="confirm_email_identity" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="confirm_email_identity" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Confirmation Email Sender</label>
                     <source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
                 </field>
-                <field id="confirm_email_template" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="confirm_email_template" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Confirmation Email Template</label>
                     <comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
                 </field>
-                <field id="success_email_identity" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="success_email_identity" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Success Email Sender</label>
                     <source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
                 </field>
-                <field id="success_email_template" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="success_email_template" translate="label comment" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Success Email Template</label>
                     <comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
                 </field>
-                <field id="un_email_identity" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="un_email_identity" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Unsubscription Email Sender</label>
                     <source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
                 </field>
-                <field id="un_email_template" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="un_email_template" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Unsubscription Email Template</label>
                     <comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
index a64185ce67958..033bc799ba73e 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
@@ -16,7 +16,14 @@
         </div>
         <?php endif;?>
     </div>
-    <iframe name="preview_iframe" id="preview_iframe" frameborder="0" title="<?= $block->escapeHtmlAttr(__('Preview')) ?>" width="100%"></iframe>
+    <iframe
+            name="preview_iframe"
+            id="preview_iframe"
+            frameborder="0"
+            title="<?= $block->escapeHtmlAttr(__('Preview')) ?>"
+            width="100%"
+            sandbox="allow-forms allow-pointer-lock allow-scripts">
+    </iframe>
     <?= $block->getChildHtml('preview_form') ?>
 </div>
 
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 eeca4fabd348d..b2a1c8d8c7208 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
@@ -34,9 +34,10 @@ require([
     'tinymce',
     'Magento_Ui/js/modal/prompt',
     'Magento_Ui/js/modal/confirm',
+    'mage/dataPost',
     'mage/mage',
     'prototype'
-], function(jQuery, tinyMCE, prompt, confirm){
+], function(jQuery, tinyMCE, prompt, confirm, dataPost){
 
 //<![CDATA[
     jQuery('#newsletter_template_edit_form').mage('form').mage('validation');
@@ -203,7 +204,10 @@ require([
                 content: "<?= $block->escapeJs($block->escapeHtml(__('Are you sure you want to delete this template?'))) ?>",
                 actions: {
                     confirm: function() {
-                        window.location.href = '<?= $block->escapeUrl($block->getDeleteUrl()) ?>';
+                        dataPost().postData({
+                            action: '<?= $block->escapeUrl($block->getDeleteUrl()) ?>',
+                            data: {}
+                        });
                     }
                 }
             });
diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json
index b737149d30a94..dcb8e7c02b218 100644
--- a/app/code/Magento/OfflinePayments/composer.json
+++ b/app/code/Magento/OfflinePayments/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-offline-payments",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-checkout": "100.2.*",
         "magento/module-payment": "100.2.*",
         "magento/framework": "101.0.*"
@@ -11,7 +11,7 @@
         "magento/module-config": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml
new file mode 100644
index 0000000000000..4d63577319d5b
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/checkmo.phtml
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+/**
+ * @var $block \Magento\OfflinePayments\Block\Info\Checkmo
+ */
+?>
+<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>
+    {{pdf_row_separator}}
+<?php if ($block->getInfo()->getAdditionalInformation()): ?>
+    {{pdf_row_separator}}
+    <?php if ($block->getPayableTo()): ?>
+        <?= $block->escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>
+        {{pdf_row_separator}}
+    <?php endif; ?>
+    <?php if ($block->getMailingAddress()): ?>
+        <?= $block->escapeHtml(__('Send Check to:')) ?>
+        {{pdf_row_separator}}
+        <?= /* @noEscape */ nl2br($block->escapeHtml($block->getMailingAddress())) ?>
+        {{pdf_row_separator}}
+    <?php endif; ?>
+<?php endif; ?>
diff --git a/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml
new file mode 100644
index 0000000000000..4a6ea1c00b21c
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/view/base/templates/info/pdf/purchaseorder.phtml
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/**
+ * @var $block \Magento\OfflinePayments\Block\Info\Purchaseorder
+ */
+?>
+<?= $block->escapeHtml(__('Purchase Order Number: %1', $block->getInfo()->getPoNumber())) ?>
+    {{pdf_row_separator}}
diff --git a/app/code/Magento/OfflinePayments/view/frontend/layout/multishipping_checkout_billing.xml b/app/code/Magento/OfflinePayments/view/frontend/layout/multishipping_checkout_billing.xml
new file mode 100644
index 0000000000000..32810ecef20da
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/view/frontend/layout/multishipping_checkout_billing.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="checkout_billing">
+            <arguments>
+                <argument name="form_templates" xsi:type="array">
+                    <item name="checkmo" xsi:type="string">Magento_OfflinePayments::multishipping/checkmo_form.phtml</item>
+                </argument>
+            </arguments>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/multishipping/checkmo_form.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/multishipping/checkmo_form.phtml
new file mode 100644
index 0000000000000..b96918243a7a7
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/multishipping/checkmo_form.phtml
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<script>
+    require([
+        'uiLayout',
+        'jquery'
+    ], function (layout, $) {
+        $(function () {
+            var paymentMethodData = {
+                method: 'checkmo'
+            };
+            layout([
+                {
+                    component: 'Magento_Checkout/js/view/payment/default',
+                    name: 'payment_method_checkmo',
+                    method: paymentMethodData.method,
+                    item: paymentMethodData
+                }
+            ]);
+
+            $('body').trigger('contentUpdated');
+        })
+    })
+</script>
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
index 2373b5285ed00..0fc56c7136327 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
@@ -80,9 +80,8 @@ public function collectRates(RateRequest $request)
 
         $this->_updateFreeMethodQuote($request);
 
-        if ($request->getFreeShipping() || $request->getBaseSubtotalInclTax() >= $this->getConfigData(
-            'free_shipping_subtotal'
-        )
+        if ($request->getFreeShipping()
+            || ($request->getPackageValueWithDiscount() >= $this->getConfigData('free_shipping_subtotal'))
         ) {
             /** @var \Magento\Quote\Model\Quote\Address\RateResult\Method $method */
             $method = $this->_rateMethodFactory->create();
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
index cead9f838f4c0..51d42fbc607c8 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
@@ -267,7 +267,7 @@ private function createShippingMethod($shippingPrice, $cost)
         /** @var  \Magento\Quote\Model\Quote\Address\RateResult\Method $method */
         $method = $this->_resultMethodFactory->create();
 
-        $method->setCarrier('tablerate');
+        $method->setCarrier($this->getCarrierCode());
         $method->setCarrierTitle($this->getConfigData('title'));
 
         $method->setMethod('bestway');
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
index 8d75cc32914b4..635d0c636ca36 100644
--- a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
@@ -13,6 +13,11 @@
 
 class ImportTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $escaperMock;
+
     /**
      * @var \Magento\OfflineShipping\Block\Adminhtml\Form\Field\Import
      */
@@ -29,11 +34,16 @@ protected function setUp()
             \Magento\Framework\Data\Form::class,
             ['getFieldNameSuffix', 'addSuffixToName', 'getHtmlIdPrefix', 'getHtmlIdSuffix']
         );
+        $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $this->escaperMock->method('escapeHtml')->willReturnArgument(0);
         $testData = ['name' => 'test_name', 'html_id' => 'test_html_id'];
         $testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->_object = $testHelper->getObject(
             \Magento\OfflineShipping\Block\Adminhtml\Form\Field\Import::class,
-            ['data' => $testData]
+            [
+                'escaper' => $this->escaperMock,
+                'data' => $testData,
+            ]
         );
         $this->_object->setForm($this->_formMock);
     }
diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json
index 24b5f877c1279..c71a39f1716d5 100644
--- a/app/code/Magento/OfflineShipping/composer.json
+++ b/app/code/Magento/OfflineShipping/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-offline-shipping",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-config": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-backend": "100.2.*",
@@ -19,7 +19,7 @@
         "magento/module-offline-shipping-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/PageCache/Model/System/Config/Backend/Ttl.php b/app/code/Magento/PageCache/Model/System/Config/Backend/Ttl.php
index dab8d7be16dd7..95b0ebe72ecd1 100644
--- a/app/code/Magento/PageCache/Model/System/Config/Backend/Ttl.php
+++ b/app/code/Magento/PageCache/Model/System/Config/Backend/Ttl.php
@@ -6,15 +6,49 @@
 
 namespace Magento\PageCache\Model\System\Config\Backend;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Escaper;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\LocalizedException;
+
 /**
- * Backend model for processing Public content cache lifetime settings
+ * Backend model for processing Public content cache lifetime settings.
  *
  * Class Ttl
  */
 class Ttl extends \Magento\Framework\App\Config\Value
 {
     /**
-     * Throw exception if Ttl data is invalid or empty
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @param \Magento\Framework\Model\Context $context
+     * @param \Magento\Framework\Registry $registry
+     * @param ScopeConfigInterface $config
+     * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
+     * @param array $data
+     * @param Escaper|null $escaper
+     */
+    public function __construct(
+        \Magento\Framework\Model\Context $context,
+        \Magento\Framework\Registry $registry,
+        ScopeConfigInterface $config,
+        \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
+        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
+        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
+        array $data = [],
+        Escaper $escaper = null
+    ) {
+        parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
+        $this->escaper = $escaper ?: ObjectManager::getInstance()->create(Escaper::class);
+    }
+
+    /**
+     * Throw exception if Ttl data is invalid or empty.
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -23,10 +57,14 @@ public function beforeSave()
     {
         $value = $this->getValue();
         if ($value < 0 || !preg_match('/^[0-9]+$/', $value)) {
-            throw new \Magento\Framework\Exception\LocalizedException(
-                __('Ttl value "%1" is not valid. Please use only numbers equal or greater than zero.', $value)
+            throw new LocalizedException(
+                __(
+                    'Ttl value "%1" is not valid. Please use only numbers equal or greater than zero.',
+                    $this->escaper->escapeHtml($value)
+                )
             );
         }
+
         return $this;
     }
 }
diff --git a/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance.php b/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance.php
new file mode 100644
index 0000000000000..7a1cc8934c017
--- /dev/null
+++ b/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance.php
@@ -0,0 +1,108 @@
+<?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)
+    {
+        if ($observer->getData('isOn')) {
+            $this->pageCacheStateStorage->save($this->isFullPageCacheEnabled());
+            $this->turnOffFullPageCache();
+        } else {
+            $this->restoreFullPageCacheState();
+        }
+    }
+
+    /**
+     * Turns off Full Page Cache.
+     *
+     * @return void
+     */
+    private function turnOffFullPageCache()
+    {
+        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()
+    {
+        $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
new file mode 100644
index 0000000000000..4180885fcbc54
--- /dev/null
+++ b/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheState.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageCache\Observer\SwitchPageCacheOnMaintenance;
+
+use Magento\Framework\Filesystem;
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * Page Cache state.
+ */
+class PageCacheState
+{
+    /**
+     * Full Page Cache Off state file name.
+     */
+    const PAGE_CACHE_STATE_FILENAME = '.maintenance.fpc.state';
+
+    /**
+     * @var Filesystem\Directory\WriteInterface
+     */
+    private $flagDir;
+
+    /**
+     * @param Filesystem $fileSystem
+     */
+    public function __construct(Filesystem $fileSystem)
+    {
+        $this->flagDir = $fileSystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+    }
+
+    /**
+     * Saves Full Page Cache state.
+     *
+     * Saves FPC state across requests.
+     *
+     * @param bool $state
+     * @return void
+     */
+    public function save(bool $state)
+    {
+        $this->flagDir->writeFile(self::PAGE_CACHE_STATE_FILENAME, (string)$state);
+    }
+
+    /**
+     * Returns stored Full Page Cache state.
+     *
+     * @return bool
+     */
+    public function isEnabled(): bool
+    {
+        if (!$this->flagDir->isExist(self::PAGE_CACHE_STATE_FILENAME)) {
+            return false;
+        }
+
+        return (bool)$this->flagDir->readFile(self::PAGE_CACHE_STATE_FILENAME);
+    }
+
+    /**
+     * Flushes Page Cache state storage.
+     *
+     * @return void
+     */
+    public function flush()
+    {
+        $this->flagDir->delete(self::PAGE_CACHE_STATE_FILENAME);
+    }
+}
diff --git a/app/code/Magento/PageCache/Test/Mftf/Page/AdminCacheManagementPage.xml b/app/code/Magento/PageCache/Test/Mftf/Page/AdminCacheManagementPage.xml
new file mode 100644
index 0000000000000..24fc5ffb04cb7
--- /dev/null
+++ b/app/code/Magento/PageCache/Test/Mftf/Page/AdminCacheManagementPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCacheManagementPage" url="/admin/cache" area="admin" module="PageCache">
+        <section name="AdminCacheManagementSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml b/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
index a553c2e20369a..bf0326f68bc97 100644
--- a/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
+++ b/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
@@ -9,5 +9,9 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCacheManagementSection">
         <element name="FlushMagentoCache" type="button" selector="#flush_magento"/>
+        <element name="configurationCheckbox" type="checkbox" selector="input[value='config']"/>
+        <element name="pageCacheCheckbox" type="checkbox" selector="input[value='full_page']"/>
+        <element name="massActionSelect" type="select" selector="#cache_grid_massaction-form #cache_grid_massaction-select"/>
+        <element name="massActionSubmit" type="button" selector="#cache_grid_massaction-form button"/>
     </section>
 </sections>
diff --git a/app/code/Magento/PageCache/Test/Unit/Model/System/Config/Backend/TtlTest.php b/app/code/Magento/PageCache/Test/Unit/Model/System/Config/Backend/TtlTest.php
new file mode 100644
index 0000000000000..6fd3307de726c
--- /dev/null
+++ b/app/code/Magento/PageCache/Test/Unit/Model/System/Config/Backend/TtlTest.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageCache\Test\Unit\Model\System\Config\Backend;
+
+use Magento\PageCache\Model\System\Config\Backend\Ttl;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Escaper;
+use Magento\Framework\Exception\LocalizedException;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class for tesing backend model for processing Public content cache lifetime settings.
+ */
+class TtlTest extends TestCase
+{
+    /**
+     * @var Ttl
+     */
+    private $ttl;
+
+    /*
+     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $escaperMock;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $configMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
+        $configMock->expects($this->any())
+            ->method('getValue')
+            ->with('system/full_page_cache/default')
+            ->willReturn(['ttl' => 86400]);
+
+        $this->escaperMock = $this->getMockBuilder(Escaper::class)->disableOriginalConstructor()->getMock();
+
+        $this->ttl = $objectManager->getObject(
+            Ttl::class,
+            [
+                'config' => $configMock,
+                'data' => ['field' => 'ttl'],
+                'escaper' => $this->escaperMock,
+            ]
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getValidValues(): array
+    {
+        return [
+            ['3600', '3600'],
+            ['10000', '10000'],
+            ['100000', '100000'],
+            ['1000000', '1000000'],
+        ];
+    }
+
+    /**
+     * @param string $value
+     * @param string $expectedValue
+     * @return void
+     * @dataProvider getValidValues
+     */
+    public function testBeforeSave(string $value, string $expectedValue)
+    {
+        $this->ttl->setValue($value);
+        $this->ttl->beforeSave();
+        $this->assertEquals($expectedValue, $this->ttl->getValue());
+    }
+
+    /**
+     * @return array
+     */
+    public function getInvalidValues(): array
+    {
+        return [
+            ['<script>alert(1)</script>'],
+            ['apple'],
+            ['123 street'],
+            ['-123'],
+        ];
+    }
+
+    /**
+     * @param string $value
+     * @return void
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessageRegExp /Ttl value ".+" is not valid. Please .+ only numbers equal or greater than zero./
+     * @dataProvider getInvalidValues
+     */
+    public function testBeforeSaveInvalid(string $value)
+    {
+        $this->ttl->setValue($value);
+        $this->escaperMock->expects($this->any())->method('escapeHtml')->with($value)->willReturn($value);
+        $this->ttl->beforeSave();
+    }
+}
diff --git a/app/code/Magento/PageCache/Test/Unit/Observer/SwitchPageCacheOnMaintenanceTest.php b/app/code/Magento/PageCache/Test/Unit/Observer/SwitchPageCacheOnMaintenanceTest.php
new file mode 100644
index 0000000000000..8c4661cddd44c
--- /dev/null
+++ b/app/code/Magento/PageCache/Test/Unit/Observer/SwitchPageCacheOnMaintenanceTest.php
@@ -0,0 +1,161 @@
+<?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()
+    {
+        $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)
+    {
+        $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)
+    {
+        $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/composer.json b/app/code/Magento/PageCache/composer.json
index d492f3bc23a5f..e2c323bb9e84c 100644
--- a/app/code/Magento/PageCache/composer.json
+++ b/app/code/Magento/PageCache/composer.json
@@ -2,14 +2,14 @@
     "name": "magento/module-page-cache",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-config": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-backend": "100.2.*",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/PageCache/etc/events.xml b/app/code/Magento/PageCache/etc/events.xml
index 7584f5f36d69c..3f0a2532ae60a 100644
--- a/app/code/Magento/PageCache/etc/events.xml
+++ b/app/code/Magento/PageCache/etc/events.xml
@@ -57,4 +57,7 @@
     <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/etc/varnish4.vcl b/app/code/Magento/PageCache/etc/varnish4.vcl
index 793f8f81a03f9..21f48ef76502f 100644
--- a/app/code/Magento/PageCache/etc/varnish4.vcl
+++ b/app/code/Magento/PageCache/etc/varnish4.vcl
@@ -91,10 +91,11 @@ sub vcl_recv {
         }
     }
 
-    # Remove Google gclid parameters to minimize the cache objects
-    set req.url = regsuball(req.url,"\?gclid=[^&]+$",""); # strips when QS = "?gclid=AAA"
-    set req.url = regsuball(req.url,"\?gclid=[^&]+&","?"); # strips when QS = "?gclid=AAA&foo=bar"
-    set req.url = regsuball(req.url,"&gclid=[^&]+",""); # strips when QS = "?foo=bar&gclid=AAA" or QS = "?foo=bar&gclid=AAA&bar=baz"
+    # Remove all marketing get parameters to minimize the cache objects
+    if (req.url ~ "(\?|&)(gclid|cx|ie|cof|siteurl|zanpid|origin|fbclid|mc_[a-z]+|utm_[a-z]+|_bta_[a-z]+)=") {
+        set req.url = regsuball(req.url, "(gclid|cx|ie|cof|siteurl|zanpid|origin|fbclid|mc_[a-z]+|utm_[a-z]+|_bta_[a-z]+)=[-_A-z0-9+()%.]+&?", "");
+        set req.url = regsub(req.url, "[?|&]+$", "");
+    }
 
     # Static files caching
     if (req.url ~ "^/(pub/)?(media|static)/") {
diff --git a/app/code/Magento/PageCache/etc/varnish5.vcl b/app/code/Magento/PageCache/etc/varnish5.vcl
index 4dce6356d1e73..23df172dd3aa4 100644
--- a/app/code/Magento/PageCache/etc/varnish5.vcl
+++ b/app/code/Magento/PageCache/etc/varnish5.vcl
@@ -92,10 +92,11 @@ sub vcl_recv {
         }
     }
 
-    # Remove Google gclid parameters to minimize the cache objects
-    set req.url = regsuball(req.url,"\?gclid=[^&]+$",""); # strips when QS = "?gclid=AAA"
-    set req.url = regsuball(req.url,"\?gclid=[^&]+&","?"); # strips when QS = "?gclid=AAA&foo=bar"
-    set req.url = regsuball(req.url,"&gclid=[^&]+",""); # strips when QS = "?foo=bar&gclid=AAA" or QS = "?foo=bar&gclid=AAA&bar=baz"
+    # Remove all marketing get parameters to minimize the cache objects
+    if (req.url ~ "(\?|&)(gclid|cx|ie|cof|siteurl|zanpid|origin|fbclid|mc_[a-z]+|utm_[a-z]+|_bta_[a-z]+)=") {
+        set req.url = regsuball(req.url, "(gclid|cx|ie|cof|siteurl|zanpid|origin|fbclid|mc_[a-z]+|utm_[a-z]+|_bta_[a-z]+)=[-_A-z0-9+()%.]+&?", "");
+        set req.url = regsub(req.url, "[?|&]+$", "");
+    }
 
     # Static files caching
     if (req.url ~ "^/(pub/)?(media|static)/") {
diff --git a/app/code/Magento/Payment/Api/Data/PaymentAdditionalInfoInterface.php b/app/code/Magento/Payment/Api/Data/PaymentAdditionalInfoInterface.php
new file mode 100644
index 0000000000000..c658baece7779
--- /dev/null
+++ b/app/code/Magento/Payment/Api/Data/PaymentAdditionalInfoInterface.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Payment\Api\Data;
+
+use Magento\Framework\DataObject\KeyValueObjectInterface;
+
+/**
+ * Payment additional info interface.
+ */
+interface PaymentAdditionalInfoInterface extends KeyValueObjectInterface
+{
+}
diff --git a/app/code/Magento/Payment/Helper/Data.php b/app/code/Magento/Payment/Helper/Data.php
index 5fd23c195f0c4..5a3e76e8d89a1 100644
--- a/app/code/Magento/Payment/Helper/Data.php
+++ b/app/code/Magento/Payment/Helper/Data.php
@@ -147,7 +147,7 @@ public function getStoreMethods($store = null, $quote = null)
             }
             $res[] = $methodInstance;
         }
-
+        // phpcs:ignore Generic.PHP.NoSilencedErrors
         @uasort(
             $res,
             function (MethodInterface $a, MethodInterface $b) {
@@ -267,11 +267,12 @@ public function getPaymentMethodList($sorted = true, $asLabelValue = false, $wit
         $groupRelations = [];
 
         foreach ($this->getPaymentMethods() as $code => $data) {
-            if (isset($data['title'])) {
-                $methods[$code] = $data['title'];
-            } else {
-                $methods[$code] = $this->getMethodInstance($code)->getConfigData('title', $store);
+            $storeId = $store ? (int)$store->getId() : null;
+            $storedTitle = $this->getMethodStoreTitle($code, $storeId);
+            if (!empty($storedTitle)) {
+                $methods[$code] = $storedTitle;
             }
+
             if ($asLabelValue && $withGroups && isset($data['group'])) {
                 $groupRelations[$code] = $data['group'];
             }
@@ -353,4 +354,21 @@ public function getZeroSubTotalPaymentAutomaticInvoice($store = null)
             $store
         );
     }
+
+    /**
+     * Get config title of payment method
+     *
+     * @param string $code
+     * @param int|null $storeId
+     * @return string
+     */
+    private function getMethodStoreTitle(string $code, $storeId = null): string
+    {
+        $configPath = sprintf('%s/%s/title', self::XML_PATH_PAYMENT_METHODS, $code);
+        return (string) $this->scopeConfig->getValue(
+            $configPath,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+    }
 }
diff --git a/app/code/Magento/Payment/Model/CcConfigProvider.php b/app/code/Magento/Payment/Model/CcConfigProvider.php
index 15bdd0072a51a..497ce93c30c71 100644
--- a/app/code/Magento/Payment/Model/CcConfigProvider.php
+++ b/app/code/Magento/Payment/Model/CcConfigProvider.php
@@ -44,7 +44,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConfig()
     {
@@ -69,7 +69,7 @@ public function getIcons()
         }
 
         $types = $this->ccConfig->getCcAvailableTypes();
-        foreach (array_keys($types) as $code) {
+        foreach ($types as $code => $label) {
             if (!array_key_exists($code, $this->icons)) {
                 $asset = $this->ccConfig->createAsset('Magento_Payment::images/cc/' . strtolower($code) . '.png');
                 $placeholder = $this->assetSource->findSource($asset);
@@ -78,7 +78,8 @@ public function getIcons()
                     $this->icons[$code] = [
                         'url' => $asset->getUrl(),
                         'width' => $width,
-                        'height' => $height
+                        'height' => $height,
+                        'title' => __($label),
                     ];
                 }
             }
diff --git a/app/code/Magento/Payment/Model/PaymentAdditionalInfo.php b/app/code/Magento/Payment/Model/PaymentAdditionalInfo.php
new file mode 100644
index 0000000000000..4ce41181a008a
--- /dev/null
+++ b/app/code/Magento/Payment/Model/PaymentAdditionalInfo.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Payment\Model;
+
+use Magento\Payment\Api\Data\PaymentAdditionalInfoInterface;
+
+/**
+ * Payment additional info class.
+ */
+class PaymentAdditionalInfo implements PaymentAdditionalInfoInterface
+{
+    /**
+     * @var string
+     */
+    private $key;
+
+    /**
+     * @var string
+     */
+    private $value;
+
+    /**
+     * @inheritdoc
+     */
+    public function getKey()
+    {
+        return $this->key;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setKey($key)
+    {
+        $this->key = $key;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setValue($value)
+    {
+        $this->value = $value;
+        return $this;
+    }
+}
diff --git a/app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodData.xml b/app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodData.xml
new file mode 100644
index 0000000000000..14c8bd0fecde7
--- /dev/null
+++ b/app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodData.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="PaymentMethodCheckMoneyOrder" type="payment_method">
+        <data key="method">checkmo</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Payment/Test/Unit/Helper/DataTest.php b/app/code/Magento/Payment/Test/Unit/Helper/DataTest.php
index 3752e82fd1e5b..690f67fe28cac 100644
--- a/app/code/Magento/Payment/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Helper/DataTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Payment\Test\Unit\Helper;
 
-use \Magento\Payment\Helper\Data;
-
 use Magento\Framework\TestFramework\Unit\Matcher\MethodInvokedAtIndex;
+use Magento\Payment\Helper\Data;
+use Magento\Store\Model\ScopeInterface;
 
 class DataTest extends \PHPUnit\Framework\TestCase
 {
@@ -18,6 +18,9 @@ class DataTest extends \PHPUnit\Framework\TestCase
     /**  @var \PHPUnit_Framework_MockObject_MockObject */
     private $scopeConfig;
 
+    /**  @var \PHPUnit_Framework_MockObject_MockObject */
+    private $paymentConfig;
+
     /**  @var \PHPUnit_Framework_MockObject_MockObject */
     private $initialConfig;
 
@@ -34,6 +37,9 @@ class DataTest extends \PHPUnit\Framework\TestCase
      */
     private $appEmulation;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -48,11 +54,15 @@ protected function setUp()
 
         $this->methodFactory = $arguments['paymentMethodFactory'];
         $this->appEmulation = $arguments['appEmulation'];
+        $this->paymentConfig = $arguments['paymentConfig'];
         $this->initialConfig = $arguments['initialConfig'];
 
         $this->helper = $objectManagerHelper->getObject($className, $arguments);
     }
 
+    /**
+     * @return void
+     */
     public function testGetMethodInstance()
     {
         list($code, $class, $methodInstance) = ['method_code', 'method_class', 'method_instance'];
@@ -166,6 +176,9 @@ public function testSortMethods(array $methodA, array $methodB)
         );
     }
 
+    /**
+     * @return void
+     */
     public function testGetMethodFormBlock()
     {
         list($blockType, $methodCode) = ['method_block_type', 'method_code'];
@@ -191,6 +204,9 @@ public function testGetMethodFormBlock()
         $this->assertSame($blockMock, $this->helper->getMethodFormBlock($methodMock, $layoutMock));
     }
 
+    /**
+     * @return void`
+     */
     public function testGetInfoBlock()
     {
         $blockType = 'method_block_type';
@@ -216,6 +232,9 @@ public function testGetInfoBlock()
         $this->assertSame($blockMock, $this->helper->getInfoBlock($infoMock));
     }
 
+    /**
+     * @return void
+     */
     public function testGetInfoBlockHtml()
     {
         list($storeId, $blockHtml, $secureMode, $blockType) = [1, 'HTML MARKUP', true, 'method_block_type'];
@@ -269,4 +288,117 @@ public function getSortMethodsDataProvider()
             ]
         ];
     }
+
+    /**
+     * @param bool $sorted
+     * @param bool $asLabelValue
+     * @param bool $withGroups
+     * @param string|null $configTitle
+     * @param array $paymentMethod
+     * @param array $expectedPaymentMethodList
+     * @return void
+     *
+     * @dataProvider paymentMethodListDataProvider
+     */
+    public function testGetPaymentMethodList(
+        bool $sorted,
+        bool $asLabelValue,
+        bool $withGroups,
+        $configTitle,
+        array $paymentMethod,
+        array $expectedPaymentMethodList
+    ) {
+        $groups = ['group' => 'Group Title'];
+
+        $this->initialConfig->method('getData')
+            ->with('default')
+            ->willReturn(
+                [
+                    Data::XML_PATH_PAYMENT_METHODS => [
+                        $paymentMethod['code'] => $paymentMethod['data'],
+                    ],
+                ]
+            );
+
+        $titlePath = sprintf('%s/%s/title', Data::XML_PATH_PAYMENT_METHODS, $paymentMethod['code']);
+        $this->scopeConfig->method('getValue')
+            ->with($titlePath, ScopeInterface::SCOPE_STORE, null)
+            ->willReturn($configTitle);
+
+        $this->paymentConfig->method('getGroups')
+            ->willReturn($groups);
+
+        $paymentMethodList = $this->helper->getPaymentMethodList($sorted, $asLabelValue, $withGroups);
+        $this->assertEquals($expectedPaymentMethodList, $paymentMethodList);
+    }
+
+    /**
+     * @return array
+     */
+    public function paymentMethodListDataProvider(): array
+    {
+        return [
+            'Payment method with changed title' =>
+                [
+                    true,
+                    false,
+                    false,
+                    'Config Payment Title',
+                    [
+                        'code' => 'payment_method',
+                        'data' => [
+                            'active' => 1,
+                            'title' => 'Payment Title',
+                        ],
+                    ],
+                    ['payment_method' => 'Config Payment Title'],
+                ],
+            'Payment method as value => label' =>
+                [
+                    true,
+                    true,
+                    false,
+                    'Payment Title',
+                    [
+                        'code' => 'payment_method',
+                        'data' => [
+                            'active' => 1,
+                            'title' => 'Payment Title',
+                        ],
+                    ],
+                    [
+                        'payment_method' => [
+                            'value' => 'payment_method',
+                            'label' => 'Payment Title',
+                        ],
+                    ],
+                ],
+            'Payment method with group' =>
+                [
+                    true,
+                    true,
+                    true,
+                    'Payment Title',
+                    [
+                        'code' => 'payment_method',
+                        'data' => [
+                            'active' => 1,
+                            'title' => 'Payment Title',
+                            'group' => 'group',
+                        ],
+                    ],
+                    [
+                        'group' => [
+                            'label' => 'Group Title',
+                            'value' => [
+                                'payment_method' => [
+                                    'value' => 'payment_method',
+                                    'label' => 'Payment Title',
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+        ];
+    }
 }
diff --git a/app/code/Magento/Payment/Test/Unit/Model/CcConfigProviderTest.php b/app/code/Magento/Payment/Test/Unit/Model/CcConfigProviderTest.php
index a8856166995fc..ff6aea44645cf 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/CcConfigProviderTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/CcConfigProviderTest.php
@@ -42,12 +42,14 @@ public function testGetConfig()
                         'vi' => [
                             'url' => 'http://cc.card/vi.png',
                             'width' => getimagesize($imagesDirectoryPath . 'vi.png')[0],
-                            'height' => getimagesize($imagesDirectoryPath . 'vi.png')[1]
+                            'height' => getimagesize($imagesDirectoryPath . 'vi.png')[1],
+                            'title' => __('Visa'),
                         ],
                         'ae' => [
                             'url' => 'http://cc.card/ae.png',
                             'width' => getimagesize($imagesDirectoryPath . 'ae.png')[0],
-                            'height' => getimagesize($imagesDirectoryPath . 'ae.png')[1]
+                            'height' => getimagesize($imagesDirectoryPath . 'ae.png')[1],
+                            'title' => __('American Express'),
                         ]
                     ]
                 ]
@@ -56,11 +58,13 @@ public function testGetConfig()
 
         $ccAvailableTypesMock = [
             'vi' => [
+                'title' => 'Visa',
                 'fileId' => 'Magento_Payment::images/cc/vi.png',
                 'path' => $imagesDirectoryPath . 'vi.png',
                 'url' => 'http://cc.card/vi.png'
             ],
             'ae' => [
+                'title' => 'American Express',
                 'fileId' => 'Magento_Payment::images/cc/ae.png',
                 'path' => $imagesDirectoryPath . 'ae.png',
                 'url' => 'http://cc.card/ae.png'
@@ -68,7 +72,11 @@ public function testGetConfig()
         ];
         $assetMock = $this->createMock(\Magento\Framework\View\Asset\File::class);
 
-        $this->ccConfigMock->expects($this->once())->method('getCcAvailableTypes')->willReturn($ccAvailableTypesMock);
+        $this->ccConfigMock->expects($this->once())->method('getCcAvailableTypes')
+            ->willReturn(array_combine(
+                array_keys($ccAvailableTypesMock),
+                array_column($ccAvailableTypesMock, 'title')
+            ));
 
         $this->ccConfigMock->expects($this->atLeastOnce())
             ->method('createAsset')
diff --git a/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php b/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php
index 63ca1b47dc08c..75916dd2ea99b 100644
--- a/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Observer/SalesOrderBeforeSaveObserverTest.php
@@ -160,7 +160,7 @@ public function testSalesOrderBeforeSaveSetForced()
      * The method should check that the payment is available, as this is not always the case.
      *
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @exceptedExceptionMessage Please provide payment for the order.
+     * @expectedExceptionMessage Please provide payment for the order.
      */
     public function testDoesNothingWhenNoPaymentIsAvailable()
     {
diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json
index 678aaa01c2ae8..333c65e806cd9 100644
--- a/app/code/Magento/Payment/composer.json
+++ b/app/code/Magento/Payment/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-payment",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-config": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-sales": "101.0.*",
@@ -12,7 +12,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Payment/etc/di.xml b/app/code/Magento/Payment/etc/di.xml
index 74f553cc64094..b7422bb00d543 100644
--- a/app/code/Magento/Payment/etc/di.xml
+++ b/app/code/Magento/Payment/etc/di.xml
@@ -7,6 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\Payment\Api\Data\PaymentMethodInterface" type="Magento\Payment\Model\PaymentMethod"/>
+    <preference for="Magento\Payment\Api\Data\PaymentAdditionalInfoInterface" type="Magento\Payment\Model\PaymentAdditionalInfo"/>
     <preference for="Magento\Payment\Api\PaymentMethodListInterface" type="Magento\Payment\Model\PaymentMethodList"/>
     <preference for="Magento\Payment\Gateway\Validator\ResultInterface" type="Magento\Payment\Gateway\Validator\Result"/>
     <preference for="Magento\Payment\Gateway\ConfigFactoryInterface" type="Magento\Payment\Gateway\Config\ConfigFactory" />
diff --git a/app/code/Magento/Payment/view/adminhtml/web/transparent.js b/app/code/Magento/Payment/view/adminhtml/web/js/transparent.js
similarity index 100%
rename from app/code/Magento/Payment/view/adminhtml/web/transparent.js
rename to app/code/Magento/Payment/view/adminhtml/web/js/transparent.js
diff --git a/app/code/Magento/Payment/view/base/templates/info/pdf/default.phtml b/app/code/Magento/Payment/view/base/templates/info/pdf/default.phtml
new file mode 100644
index 0000000000000..7acac62f65d38
--- /dev/null
+++ b/app/code/Magento/Payment/view/base/templates/info/pdf/default.phtml
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+/**
+ * @see \Magento\Payment\Block\Info
+ * @var \Magento\Payment\Block\Info $block
+ */
+?>
+<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>{{pdf_row_separator}}
+
+<?php if ($specificInfo = $block->getSpecificInformation()):?>
+    <?php foreach ($specificInfo as $label => $value):?>
+        <?= $block->escapeHtml($label) ?>:
+        <?= $block->escapeHtml(implode(' ', $block->getValueAsArray($value))) ?>
+        {{pdf_row_separator}}
+    <?php endforeach; ?>
+<?php endif;?>
+
+<?= $block->escapeHtml(implode('{{pdf_row_separator}}', $block->getChildPdfAsArray())) ?>
diff --git a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator.js
index 8fb12093e36e4..785b636d5832f 100644
--- a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator.js
+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator.js
@@ -36,7 +36,7 @@ define([
             return resultWrapper(null, false, false);
         }
 
-        value = value.replace(/\-|\s/g, '');
+        value = value.replace(/|\s/g, '');
 
         if (!/^\d*$/.test(value)) {
             return resultWrapper(null, false, false);
diff --git a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js
index c6f1bad31fc07..c41be40cba144 100644
--- a/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js
+++ b/app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/validator.js
@@ -23,6 +23,12 @@
 }(function ($, cvvValidator, creditCardNumberValidator, yearValidator, monthValidator, creditCardData) {
     'use strict';
 
+    $('.payment-method-content input[type="number"]').on('keyup', function () {
+        if ($(this).val() < 0) {
+            $(this).val($(this).val().replace(/^-/, ''));
+        }
+    });
+
     $.each({
         'validate-card-type': [
             function (number, item, allowedTypes) {
diff --git a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
index 163aaf979ec2e..afa71fe591495 100644
--- a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
@@ -40,7 +40,7 @@ $params = $block->getParams();
                     $(parent).trigger('clearTimeout');
                     fullScreenLoader.stopLoader();
                     globalMessageList.addErrorMessage({
-                        message: $t('An error occurred on the server. Please try to place the order again.')
+                        message: $t(<?= /* @escapeNotVerified */ json_encode($params['error_msg'])?>)
                     });
                 }
             );
diff --git a/app/code/Magento/Payment/view/frontend/web/js/view/payment/iframe.js b/app/code/Magento/Payment/view/frontend/web/js/view/payment/iframe.js
index 5eba4fd89d338..089dabac00b0f 100644
--- a/app/code/Magento/Payment/view/frontend/web/js/view/payment/iframe.js
+++ b/app/code/Magento/Payment/view/frontend/web/js/view/payment/iframe.js
@@ -114,26 +114,44 @@ define([
          * @override
          */
         placeOrder: function () {
-            if (this.validateHandler() && additionalValidators.validate()) {
+            var self = this;
 
+            if (this.validateHandler() &&
+                additionalValidators.validate() &&
+                this.isPlaceOrderActionAllowed() === true
+            ) {
                 fullScreenLoader.startLoader();
 
                 this.isPlaceOrderActionAllowed(false);
 
                 $.when(
-                    setPaymentInformationAction(
-                        this.messageContainer,
-                        {
-                            method: this.getCode()
-                        }
-                    )
-                ).done(this.done.bind(this))
-                    .fail(this.fail.bind(this));
+                    this.setPaymentInformation()
+                ).done(
+                    this.done.bind(this)
+                ).fail(
+                    this.fail.bind(this)
+                ).always(
+                    function () {
+                        self.isPlaceOrderActionAllowed(true);
+                    }
+                );
 
                 this.initTimeoutHandler();
             }
         },
 
+        /**
+         * {Function}
+         */
+        setPaymentInformation: function () {
+            setPaymentInformationAction(
+                this.messageContainer,
+                {
+                    method: this.getCode()
+                }
+            );
+        },
+
         /**
          * {Function}
          */
@@ -192,7 +210,6 @@ define([
          */
         fail: function () {
             fullScreenLoader.stopLoader();
-            this.isPlaceOrderActionAllowed(true);
 
             return this;
         },
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php
index 571d73d07b68e..95804ebe45d8c 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php
@@ -137,6 +137,14 @@ protected function _initCheckout()
             $this->getResponse()->setStatusHeader(403, '1.1', 'Forbidden');
             throw new \Magento\Framework\Exception\LocalizedException(__('We can\'t initialize Express Checkout.'));
         }
+        if (!(float)$quote->getGrandTotal()) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __(
+                    'PayPal can\'t process orders with a zero balance due. '
+                    . 'To finish your purchase, please go through the standard checkout process.'
+                )
+            );
+        }
         if (!isset($this->_checkoutTypes[$this->_checkoutType])) {
             $parameters = [
                 'params' => [
@@ -151,6 +159,8 @@ protected function _initCheckout()
     }
 
     /**
+     * Get proper checkout token.
+     *
      * Search for proper checkout token in request or session or (un)set specified one
      * Combined getter/setter
      *
@@ -221,8 +231,7 @@ protected function _getQuote()
     }
 
     /**
-     * Returns before_auth_url redirect parameter for customer session
-     * @return null
+     * @inheritdoc
      */
     public function getCustomerBeforeAuthUrl()
     {
@@ -230,8 +239,7 @@ public function getCustomerBeforeAuthUrl()
     }
 
     /**
-     * Returns a list of action flags [flag_key] => boolean
-     * @return array
+     * @inheritdoc
      */
     public function getActionFlagList()
     {
@@ -240,6 +248,7 @@ public function getActionFlagList()
 
     /**
      * Returns login url parameter for redirect
+     *
      * @return string
      */
     public function getLoginUrl()
@@ -249,6 +258,7 @@ public function getLoginUrl()
 
     /**
      * Returns action name which requires redirect
+     *
      * @return string
      */
     public function getRedirectActionName()
diff --git a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
index 2efae34a96459..fc257e264d680 100644
--- a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
+++ b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
@@ -6,11 +6,14 @@
 namespace Magento\Paypal\Controller\Transparent;
 
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Session\Generic;
 use Magento\Framework\Session\SessionManager;
+use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Paypal\Model\Payflow\Service\Request\SecureToken;
 use Magento\Paypal\Model\Payflow\Transparent;
 use Magento\Quote\Model\Quote;
@@ -39,7 +42,7 @@ class RequestSecureToken extends \Magento\Framework\App\Action\Action
     private $secureTokenService;
 
     /**
-     * @var SessionManager
+     * @var SessionManager|SessionManagerInterface
      */
     private $sessionManager;
 
@@ -48,6 +51,11 @@ class RequestSecureToken extends \Magento\Framework\App\Action\Action
      */
     private $transparent;
 
+    /**
+     * @var Validator
+     */
+    private $formKeyValidator;
+
     /**
      * @param Context $context
      * @param JsonFactory $resultJsonFactory
@@ -55,6 +63,8 @@ class RequestSecureToken extends \Magento\Framework\App\Action\Action
      * @param SecureToken $secureTokenService
      * @param SessionManager $sessionManager
      * @param Transparent $transparent
+     * @param SessionManagerInterface|null $sessionInterface
+     * @param Validator $formKeyValidator
      */
     public function __construct(
         Context $context,
@@ -62,13 +72,17 @@ public function __construct(
         Generic $sessionTransparent,
         SecureToken $secureTokenService,
         SessionManager $sessionManager,
-        Transparent $transparent
+        Transparent $transparent,
+        SessionManagerInterface $sessionInterface = null,
+        Validator $formKeyValidator = null
     ) {
         $this->resultJsonFactory = $resultJsonFactory;
         $this->sessionTransparent = $sessionTransparent;
         $this->secureTokenService = $secureTokenService;
-        $this->sessionManager = $sessionManager;
+        $this->sessionManager = $sessionInterface ?: $sessionManager;
         $this->transparent = $transparent;
+        $this->formKeyValidator = $formKeyValidator ?: ObjectManager::getInstance()->get(Validator::class);
+
         parent::__construct($context);
     }
 
@@ -82,8 +96,9 @@ public function execute()
         /** @var Quote $quote */
         $quote = $this->sessionManager->getQuote();
 
-        if (!$quote or !$quote instanceof Quote) {
-            return $this->getErrorResponse();
+        if (!$quote || !$quote instanceof Quote || !$this->formKeyValidator->validate($this->getRequest())
+            || !$this->getRequest()->isPost()) {
+                return $this->getErrorResponse();
         }
 
         $this->sessionTransparent->setQuoteId($quote->getId());
@@ -106,6 +121,8 @@ public function execute()
     }
 
     /**
+     * Get error response.
+     *
      * @return Json
      */
     private function getErrorResponse()
diff --git a/app/code/Magento/Paypal/Model/Cart.php b/app/code/Magento/Paypal/Model/Cart.php
index b65fcd340d535..c8e4a6acf4649 100644
--- a/app/code/Magento/Paypal/Model/Cart.php
+++ b/app/code/Magento/Paypal/Model/Cart.php
@@ -177,7 +177,7 @@ protected function _applyDiscountTaxCompensationWorkaround(
     ) {
         $dataContainer = $salesEntity->getTaxContainer();
         $this->addTax((double)$dataContainer->getBaseDiscountTaxCompensationAmount());
-        $this->addTax((double)$dataContainer->getBaseShippingDiscountTaxCompensationAmount());
+        $this->addTax((double)$dataContainer->getBaseShippingDiscountTaxCompensationAmnt());
     }
 
     /**
diff --git a/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php b/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php
index c2056aea08c00..5d5db0128b1eb 100644
--- a/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php
+++ b/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Paypal\Model\Config\Structure\Element;
 
-use Magento\Framework\App\RequestInterface;
 use Magento\Config\Model\Config\Structure\Element\Field as FieldConfigStructure;
 use Magento\Paypal\Model\Config\StructurePlugin as ConfigStructurePlugin;
 
@@ -14,19 +13,6 @@
  */
 class FieldPlugin
 {
-    /**
-     * @var RequestInterface
-     */
-    private $request;
-
-    /**
-     * @param RequestInterface $request
-     */
-    public function __construct(RequestInterface $request)
-    {
-        $this->request = $request;
-    }
-
     /**
      * Get original configPath (not changed by PayPal configuration inheritance)
      *
@@ -36,7 +22,7 @@ public function __construct(RequestInterface $request)
      */
     public function afterGetConfigPath(FieldConfigStructure $subject, $result)
     {
-        if (!$result && $this->request->getParam('section') == 'payment') {
+        if (!$result && strpos($subject->getPath(), 'payment_') === 0) {
             $result = preg_replace(
                 '@^(' . implode('|', ConfigStructurePlugin::getPaypalConfigCountries(true)) . ')/@',
                 'payment/',
diff --git a/app/code/Magento/Paypal/Model/Express.php b/app/code/Magento/Paypal/Model/Express.php
index 196e59c6593b9..bae391058810c 100644
--- a/app/code/Magento/Paypal/Model/Express.php
+++ b/app/code/Magento/Paypal/Model/Express.php
@@ -17,10 +17,12 @@
 use Magento\Store\Model\ScopeInterface;
 
 /**
- * PayPal Express Module
+ * PayPal Express Module.
+ *
  * @method \Magento\Quote\Api\Data\PaymentMethodExtensionInterface getExtensionAttributes()
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Express extends \Magento\Payment\Model\Method\AbstractMethod
 {
@@ -44,7 +46,7 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
      *
      * @var bool
      */
-    protected $_isGateway = false;
+    protected $_isGateway = true;
 
     /**
      * Availability option
@@ -179,6 +181,11 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
      */
     protected $transactionBuilder;
 
+    /**
+     * @var string
+     */
+    private static $authorizationExpiredCode = 10601;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -269,6 +276,7 @@ protected function _setApiProcessableErrors()
                 ApiProcessableException::API_MAXIMUM_AMOUNT_FILTER_DECLINE,
                 ApiProcessableException::API_OTHER_FILTER_DECLINE,
                 ApiProcessableException::API_ADDRESS_MATCH_FAIL,
+                self::$authorizationExpiredCode
             ]
         );
     }
@@ -538,7 +546,17 @@ public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
      */
     public function cancel(\Magento\Payment\Model\InfoInterface $payment)
     {
-        $this->void($payment);
+        try {
+            $this->void($payment);
+        } catch (ApiProcessableException $e) {
+            if ((int)$e->getCode() === self::$authorizationExpiredCode) {
+                $payment->setTransactionId(null);
+                $payment->setIsTransactionClosed(true);
+                $payment->setShouldCloseParentTransaction(true);
+            } else {
+                throw $e;
+            }
+        }
 
         return $this;
     }
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index f0b86588f1cfa..69e821910d84c 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -1070,6 +1070,7 @@ protected static function cmpShippingOptions(DataObject $option1, DataObject $op
      */
     protected function _matchShippingMethodCode(Address $address, $selectedCode): string
     {
+        $address->collectShippingRates();
         $options = $this->_prepareShippingOptions($address, false);
         foreach ($options as $option) {
             if ($selectedCode === $option['code'] // the proper case as outlined in documentation
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php b/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php
index 4afd398da2b54..82ccc59a53c8f 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php
@@ -64,6 +64,7 @@ public function requestToken(Quote $quote)
         $request->setTrxtype(Payflowpro::TRXTYPE_AUTH_ONLY);
         $request->setVerbosity('HIGH');
         $request->setAmt(0);
+        $request->setCurrency($quote->getBaseCurrencyCode());
         $request->setCreatesecuretoken('Y');
         $request->setSecuretokenid($this->mathRandom->getUniqueHash());
         $request->setReturnurl($this->url->getUrl('paypal/transparent/response'));
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php
index 06a8a5b680bf4..259f00ec5a9c5 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php
@@ -3,9 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Paypal\Model\Payflow\Service\Response;
 
 use Magento\Framework\DataObject;
+use Magento\Framework\Intl\DateTimeFactory;
 use Magento\Payment\Model\Method\Logger;
 use Magento\Paypal\Model\Payflow\Service\Response\Handler\HandlerInterface;
 use Magento\Framework\Session\Generic;
@@ -18,6 +21,8 @@
 
 /**
  * Class Transaction
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Transaction
 {
@@ -51,6 +56,11 @@ class Transaction
      */
     private $logger;
 
+    /**
+     * @var DateTimeFactory
+     */
+    private $dateTimeFactory;
+
     /**
      * @param Generic $sessionTransparent
      * @param CartRepositoryInterface $quoteRepository
@@ -58,6 +68,7 @@ class Transaction
      * @param PaymentMethodManagementInterface $paymentManagement
      * @param HandlerInterface $errorHandler
      * @param Logger $logger
+     * @param DateTimeFactory $dateTimeFactory
      */
     public function __construct(
         Generic $sessionTransparent,
@@ -65,7 +76,8 @@ public function __construct(
         Transparent $transparent,
         PaymentMethodManagementInterface $paymentManagement,
         HandlerInterface $errorHandler,
-        Logger $logger
+        Logger $logger,
+        DateTimeFactory $dateTimeFactory
     ) {
         $this->sessionTransparent = $sessionTransparent;
         $this->quoteRepository = $quoteRepository;
@@ -73,6 +85,7 @@ public function __construct(
         $this->paymentManagement = $paymentManagement;
         $this->errorHandler = $errorHandler;
         $this->logger = $logger;
+        $this->dateTimeFactory = $dateTimeFactory;
     }
 
     /**
@@ -114,8 +127,45 @@ public function savePaymentInQuote($response)
         $payment->setData(OrderPaymentInterface::CC_TYPE, $response->getData(OrderPaymentInterface::CC_TYPE));
         $payment->setAdditionalInformation(Payflowpro::PNREF, $response->getData(Payflowpro::PNREF));
 
+        $expDate = $response->getData('expdate');
+        $expMonth = $this->getCcExpMonth($expDate);
+        $payment->setCcExpMonth($expMonth);
+        $expYear = $this->getCcExpYear($expDate);
+        $payment->setCcExpYear($expYear);
+
         $this->errorHandler->handle($payment, $response);
 
         $this->paymentManagement->set($quote->getId(), $payment);
     }
+
+    /**
+     * Extracts expiration month from PayPal response expiration date.
+     *
+     * @param string $expDate format {MMYY}
+     * @return int
+     */
+    private function getCcExpMonth(string $expDate): int
+    {
+        return (int)substr($expDate, 0, 2);
+    }
+
+    /**
+     * Extracts expiration year from PayPal response expiration date.
+     *
+     * @param string $expDate format {MMYY}
+     * @return int
+     */
+    private function getCcExpYear(string $expDate): int
+    {
+        $last2YearDigits = (int)substr($expDate, 2, 2);
+        $currentDate = $this->dateTimeFactory->create('now', new \DateTimeZone('UTC'));
+        $first2YearDigits = (int)substr($currentDate->format('Y'), 0, 2);
+
+        // case when credit card expires at next century
+        if ((int)$currentDate->format('y') > $last2YearDigits) {
+            $first2YearDigits++;
+        }
+
+        return 100 * $first2YearDigits + $last2YearDigits;
+    }
 }
diff --git a/app/code/Magento/Paypal/Model/Payflow/Transparent.php b/app/code/Magento/Paypal/Model/Payflow/Transparent.php
index c161580c1b7f1..3676e54624e0a 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Transparent.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Transparent.php
@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Paypal\Model\Payflow;
 
 use Magento\Payment\Helper\Formatter;
 use Magento\Payment\Model\InfoInterface;
 use Magento\Paypal\Model\Payflowpro;
+use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Paypal\Model\Payflow\Service\Gateway;
@@ -58,6 +61,11 @@ class Transparent extends Payflowpro implements TransparentInterface
      */
     private $paymentExtensionFactory;
 
+    /**
+     * @var \Magento\Paypal\Model\CartFactory
+     */
+    private $payPalCartFactory;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -75,6 +83,7 @@ class Transparent extends Payflowpro implements TransparentInterface
      * @param ResponseValidator $responseValidator
      * @param PaymentTokenInterfaceFactory $paymentTokenFactory
      * @param OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory
+     * @param \Magento\Paypal\Model\CartFactory $payPalCartFactory
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
@@ -97,6 +106,7 @@ public function __construct(
         ResponseValidator $responseValidator,
         PaymentTokenInterfaceFactory $paymentTokenFactory,
         OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory,
+        \Magento\Paypal\Model\CartFactory $payPalCartFactory,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = []
@@ -122,9 +132,12 @@ public function __construct(
         $this->responseValidator = $responseValidator;
         $this->paymentTokenFactory = $paymentTokenFactory;
         $this->paymentExtensionFactory = $paymentExtensionFactory;
+        $this->payPalCartFactory = $payPalCartFactory;
     }
 
     /**
+     * Returns Payflow ResponseValidator instance.
+     *
      * @return ResponseValidator
      */
     public function getResponceValidator()
@@ -161,19 +174,25 @@ public function authorize(InfoInterface $payment, $amount)
         $this->addRequestOrderInfo($request, $order);
         $request = $this->fillCustomerContacts($order, $request);
 
+        $payPalCart = $this->payPalCartFactory->create(['salesModel' => $order]);
+        $payPalCart->getAmounts();
+
         $token = $payment->getAdditionalInformation(self::PNREF);
         $request->setData('trxtype', self::TRXTYPE_AUTH_ONLY);
         $request->setData('origid', $token);
         $request->setData('amt', $this->formatPrice($amount));
         $request->setData('currency', $order->getBaseCurrencyCode());
-        $request->setData('taxamt', $this->formatPrice($order->getBaseTaxAmount()));
-        $request->setData('freightamt', $this->formatPrice($order->getBaseShippingAmount()));
+        $request->setData('itemamt', $this->formatPrice($payPalCart->getSubtotal()));
+        $request->setData('taxamt', $this->formatPrice($payPalCart->getTax()));
+        $request->setData('freightamt', $this->formatPrice($payPalCart->getShipping()));
+        $request->setData('discount', $this->formatPrice($payPalCart->getDiscount()));
 
         $response = $this->postRequest($request, $this->getConfig());
         $this->processErrors($response);
 
         try {
             $this->responseValidator->validate($response, $this);
+            // phpcs:ignore Magento2.Exceptions.ThrowCatch
         } catch (LocalizedException $exception) {
             $payment->setParentTransactionId($response->getData(self::PNREF));
             $this->void($payment);
@@ -199,10 +218,12 @@ public function getConfigInterface()
     }
 
     /**
+     * Creates vault payment token.
+     *
      * @param Payment $payment
      * @param string $token
-     * @throws LocalizedException
      * @return void
+     * @throws \Exception
      */
     protected function createPaymentToken(Payment $payment, $token)
     {
@@ -221,8 +242,11 @@ protected function createPaymentToken(Payment $payment, $token)
     }
 
     /**
+     * Generates CC expiration date by year and month provided in payment.
+     *
      * @param Payment $payment
      * @return string
+     * @throws \Exception
      */
     private function getExpirationDate(Payment $payment)
     {
@@ -241,6 +265,8 @@ private function getExpirationDate(Payment $payment)
     }
 
     /**
+     * Returns payment extension attributes instance.
+     *
      * @param Payment $payment
      * @return \Magento\Sales\Api\Data\OrderPaymentExtensionInterface
      */
diff --git a/app/code/Magento/Paypal/Model/Payflowpro.php b/app/code/Magento/Paypal/Model/Payflowpro.php
index f6fb4ae8e078a..855ab88de5038 100644
--- a/app/code/Magento/Paypal/Model/Payflowpro.php
+++ b/app/code/Magento/Paypal/Model/Payflowpro.php
@@ -419,6 +419,7 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
             $request->setTrxtype(self::TRXTYPE_SALE);
             $request->setOrigid($payment->getAdditionalInformation(self::PNREF));
             $payment->unsAdditionalInformation(self::PNREF);
+            $request->setData('currency', $payment->getOrder()->getBaseCurrencyCode());
         } elseif ($payment->getParentTransactionId()) {
             $request = $this->buildBasicRequest();
             $request->setOrigid($payment->getParentTransactionId());
diff --git a/app/code/Magento/Paypal/Model/Pro.php b/app/code/Magento/Paypal/Model/Pro.php
index 698ed87f26c09..c404610590cf8 100644
--- a/app/code/Magento/Paypal/Model/Pro.php
+++ b/app/code/Magento/Paypal/Model/Pro.php
@@ -10,10 +10,10 @@
 
 use Magento\Paypal\Model\Api\AbstractApi;
 use Magento\Sales\Api\TransactionRepositoryInterface;
-use Magento\Paypal\Model\Info;
 
 /**
- * PayPal Website Payments Pro implementation for payment method instances
+ * PayPal Website Payments Pro implementation for payment method instances.
+ *
  * This model was created because right now PayPal Direct and PayPal Express payment methods cannot have same abstract
  */
 class Pro
@@ -149,7 +149,8 @@ public function getConfig()
     }
 
     /**
-     * API instance getter
+     * API instance getter.
+     *
      * Sets current store id to current config instance and passes it to API
      *
      * @return \Magento\Paypal\Model\Api\Nvp
@@ -231,19 +232,22 @@ public function importPaymentInfo(\Magento\Framework\DataObject $from, \Magento\
     public function void(\Magento\Framework\DataObject $payment)
     {
         $authTransactionId = $this->_getParentTransactionId($payment);
-        if ($authTransactionId) {
-            $api = $this->getApi();
-            $api->setPayment($payment)->setAuthorizationId($authTransactionId)->callDoVoid();
-            $this->importPaymentInfo($api, $payment);
-        } else {
+        if (empty($authTransactionId)) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('You need an authorization transaction to void.')
             );
         }
+
+        $api = $this->getApi();
+        $api->setPayment($payment);
+        $api->setAuthorizationId($authTransactionId);
+        $api->callDoVoid();
+        $this->importPaymentInfo($api, $payment);
     }
 
     /**
-     * Attempt to capture payment
+     * Attempt to capture payment.
+     *
      * Will return false if the payment is not supposed to be captured
      *
      * @param \Magento\Framework\DataObject $payment
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
index b33d2f5723961..1aba699aefaad 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field\Enable;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
 /**
  * Class AbstractEnableTest
  *
@@ -31,20 +33,30 @@ class AbstractEnableTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
         $this->elementMock = $this->getMockBuilder(\Magento\Framework\Data\Form\Element\AbstractElement::class)
             ->setMethods(
                 [
                     'getHtmlId',
+                    'getName',
                     'getTooltip',
                     'getForm',
                 ]
             )->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
+        $objectManager = new ObjectManager($this);
+        $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
+        $objectManager->setBackwardCompatibleProperty(
+            $this->elementMock,
+            '_escaper',
+            $escaper
+        );
+
         $this->abstractEnable = $objectManager->getObject(
-            \Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field\Enable\AbstractEnable\Stub::class
+            \Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field\Enable\AbstractEnable\Stub::class,
+            [
+                '_escaper' => $objectManager->getObject(\Magento\Framework\Escaper::class)
+            ]
         );
     }
 
diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php
index 60451a9827097..c404ef54aad1d 100644
--- a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php
@@ -6,13 +6,15 @@
 namespace Magento\Paypal\Test\Unit\Controller\Transparent;
 
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Session\Generic;
 use Magento\Framework\Session\SessionManager;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Paypal\Controller\Transparent\RequestSecureToken;
 use Magento\Paypal\Model\Payflow\Service\Request\SecureToken;
 use Magento\Paypal\Model\Payflow\Transparent;
+use Magento\Quote\Model\Quote;
 
 /**
  * Class RequestSecureTokenTest
@@ -56,6 +58,11 @@ class RequestSecureTokenTest extends \PHPUnit\Framework\TestCase
      */
     protected $sessionManagerMock;
 
+    /**
+     * @var Validator|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $formKeyValidator;
+
     /**
      * Set up
      *
@@ -64,9 +71,16 @@ class RequestSecureTokenTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
 
+        $request = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
+            ->setMethods(['isPost'])
+            ->getMockForAbstractClass();
+        $request->expects($this->any())->method('isPost')->willReturn(true);
         $this->contextMock = $this->getMockBuilder(\Magento\Framework\App\Action\Context::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->contextMock->method('getRequest')
+            ->willReturn($request);
+
         $this->resultJsonFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\JsonFactory::class)
             ->setMethods(['create'])
             ->disableOriginalConstructor()
@@ -90,13 +104,19 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->formKeyValidator = $this->getMockBuilder(Validator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->controller = new \Magento\Paypal\Controller\Transparent\RequestSecureToken(
             $this->contextMock,
             $this->resultJsonFactoryMock,
             $this->sessionTransparentMock,
             $this->secureTokenServiceMock,
             $this->sessionManagerMock,
-            $this->transparentMock
+            $this->transparentMock,
+            null,
+            $this->formKeyValidator
         );
     }
 
@@ -113,16 +133,15 @@ public function testExecuteSuccess()
             'error' => false
         ];
 
-        $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
+        $quoteMock = $this->getMockBuilder(Quote::class)
             ->disableOriginalConstructor()
             ->getMock();
         $tokenMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $jsonMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Json::class)
-            ->disableOriginalConstructor()
-            ->getMock();
 
+        $this->formKeyValidator->method('validate')
+            ->willReturn(true);
         $this->sessionManagerMock->expects($this->atLeastOnce())
             ->method('getQuote')
             ->willReturn($quoteMock);
@@ -147,15 +166,9 @@ public function testExecuteSuccess()
                     ['securetoken', null, $secureToken]
                 ]
             );
-        $this->resultJsonFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($jsonMock);
-        $jsonMock->expects($this->once())
-            ->method('setData')
-            ->with($resultExpectation)
-            ->willReturnSelf();
+        $jsonResult = $this->getJsonResult($resultExpectation);
 
-        $this->assertEquals($jsonMock, $this->controller->execute());
+        $this->assertEquals($jsonResult, $this->controller->execute());
     }
 
     public function testExecuteTokenRequestException()
@@ -167,13 +180,11 @@ public function testExecuteTokenRequestException()
             'error_messages' => __('Your payment has been declined. Please try again.')
         ];
 
-        $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $jsonMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Json::class)
+        $quoteMock = $this->getMockBuilder(Quote::class)
             ->disableOriginalConstructor()
             ->getMock();
-
+        $this->formKeyValidator->method('validate')
+            ->willReturn(true);
         $this->sessionManagerMock->expects($this->atLeastOnce())
             ->method('getQuote')
             ->willReturn($quoteMock);
@@ -187,18 +198,21 @@ public function testExecuteTokenRequestException()
             ->method('requestToken')
             ->with($quoteMock)
             ->willThrowException(new \Exception());
-        $this->resultJsonFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($jsonMock);
-        $jsonMock->expects($this->once())
-            ->method('setData')
-            ->with($resultExpectation)
-            ->willReturnSelf();
 
-        $this->assertEquals($jsonMock, $this->controller->execute());
+        $jsonResult = $this->getJsonResult($resultExpectation);
+
+        $this->assertEquals($jsonResult, $this->controller->execute());
     }
 
-    public function testExecuteEmptyQuoteError()
+    /**
+     * Tests error generation.
+     *
+     * @param Quote|null $quote
+     * @param bool $isValidToken
+     * @return void
+     * @dataProvider executeErrorDataProvider
+     */
+    public function testExecuteError($quote, bool $isValidToken)
     {
         $resultExpectation = [
             'success' => false,
@@ -206,22 +220,51 @@ public function testExecuteEmptyQuoteError()
             'error_messages' => __('Your payment has been declined. Please try again.')
         ];
 
-        $quoteMock = null;
-        $jsonMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Json::class)
+        $this->sessionManagerMock->expects($this->atLeastOnce())
+            ->method('getQuote')
+            ->willReturn($quote);
+        $this->formKeyValidator->method('validate')
+            ->willReturn($isValidToken);
+
+        $jsonResult = $this->getJsonResult($resultExpectation);
+
+        $this->assertEquals($jsonResult, $this->controller->execute());
+    }
+
+    /**
+     * @return array
+     */
+    public function executeErrorDataProvider()
+    {
+        $quote = $this->getMockBuilder(Quote::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->sessionManagerMock->expects($this->atLeastOnce())
-            ->method('getQuote')
-            ->willReturn($quoteMock);
-        $this->resultJsonFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($jsonMock);
+        return [
+            'empty quote' => [null, true],
+            'invalid CSRF token' => [$quote, false]
+        ];
+    }
+
+    /**
+     * Returns json result.
+     *
+     * @param array $result
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getJsonResult(array $result): \PHPUnit_Framework_MockObject_MockObject
+    {
+        $jsonMock = $this->getMockBuilder(Json::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $jsonMock->expects($this->once())
             ->method('setData')
-            ->with($resultExpectation)
+            ->with($result)
             ->willReturnSelf();
+        $this->resultJsonFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($jsonMock);
 
-        $this->assertEquals($jsonMock, $this->controller->execute());
+        return $jsonMock;
     }
 }
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php b/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php
index 28837727533d2..0f787f0f513a1 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php
@@ -70,7 +70,7 @@ protected function setUp()
     public function testInvalidGetAllItems($items)
     {
         $taxContainer = new \Magento\Framework\DataObject(
-            ['base_discount_tax_compensation_amount' => 0.2, 'base_shipping_discount_tax_compensation_amount' => 0.1]
+            ['base_discount_tax_compensation_amount' => 0.2, 'base_shipping_discount_tax_compensation_amnt' => 0.1]
         );
         $this->_salesModel->expects($this->once())->method('getTaxContainer')->will($this->returnValue($taxContainer));
         $this->_salesModel->expects($this->once())->method('getAllItems')->will($this->returnValue($items));
@@ -146,7 +146,7 @@ public function testInvalidTotalsGetAllItems($values, $transferDiscount)
         $this->assertEquals(
             $values['base_tax_amount'] +
             $values['base_discount_tax_compensation_amount'] +
-            $values['base_shipping_discount_tax_compensation_amount'],
+            $values['base_shipping_discount_tax_compensation_amnt'],
             $this->_model->getTax()
         );
         $this->assertEquals($values['base_shipping_amount'], $this->_model->getShipping());
@@ -162,7 +162,7 @@ public function invalidTotalsGetAllItemsDataProvider()
             [
                 [
                     'base_discount_tax_compensation_amount' => 0,
-                    'base_shipping_discount_tax_compensation_amount' => 0,
+                    'base_shipping_discount_tax_compensation_amnt' => 0,
                     'base_subtotal' => 0,
                     'base_tax_amount' => 0,
                     'base_shipping_amount' => 0,
@@ -174,7 +174,7 @@ public function invalidTotalsGetAllItemsDataProvider()
             [
                 [
                     'base_discount_tax_compensation_amount' => 1,
-                    'base_shipping_discount_tax_compensation_amount' => 2,
+                    'base_shipping_discount_tax_compensation_amnt' => 2,
                     'base_subtotal' => 3,
                     'base_tax_amount' => 4,
                     'base_shipping_amount' => 5,
@@ -255,8 +255,8 @@ protected function _prepareInvalidModelData($values, $transferDiscount)
             [
                 'base_discount_tax_compensation_amount' =>
                     $values['base_discount_tax_compensation_amount'],
-                'base_shipping_discount_tax_compensation_amount' =>
-                    $values['base_shipping_discount_tax_compensation_amount'],
+                'base_shipping_discount_tax_compensation_amnt' =>
+                    $values['base_shipping_discount_tax_compensation_amnt'],
             ]
         );
         $expectedSubtotal = $values['base_subtotal'];
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/Element/FieldPluginTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/Element/FieldPluginTest.php
index 8615b91383aaa..72c13c80b31e4 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/Element/FieldPluginTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/Element/FieldPluginTest.php
@@ -7,7 +7,6 @@
 
 use Magento\Paypal\Model\Config\Structure\Element\FieldPlugin as FieldConfigStructurePlugin;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Framework\App\RequestInterface;
 use Magento\Config\Model\Config\Structure\Element\Field as FieldConfigStructureMock;
 
 class FieldPluginTest extends \PHPUnit\Framework\TestCase
@@ -22,11 +21,6 @@ class FieldPluginTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManagerHelper;
 
-    /**
-     * @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $requestMock;
-
     /**
      * @var FieldConfigStructureMock|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -34,16 +28,13 @@ class FieldPluginTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->requestMock = $this->getMockBuilder(RequestInterface::class)
-            ->getMockForAbstractClass();
         $this->subjectMock = $this->getMockBuilder(FieldConfigStructureMock::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->plugin = $this->objectManagerHelper->getObject(
-            FieldConfigStructurePlugin::class,
-            ['request' => $this->requestMock]
+            FieldConfigStructurePlugin::class
         );
     }
 
@@ -56,10 +47,8 @@ public function testAroundGetConfigPathHasResult()
 
     public function testAroundGetConfigPathNonPaymentSection()
     {
-        $this->requestMock->expects(static::once())
-            ->method('getParam')
-            ->with('section')
-            ->willReturn('non-payment');
+        $this->subjectMock->method('getPath')
+            ->willReturn('non-payment/group/field');
 
         $this->assertNull($this->plugin->afterGetConfigPath($this->subjectMock, null));
     }
@@ -72,12 +61,7 @@ public function testAroundGetConfigPathNonPaymentSection()
      */
     public function testAroundGetConfigPath($subjectPath, $expectedConfigPath)
     {
-        $this->requestMock->expects(static::once())
-            ->method('getParam')
-            ->with('section')
-            ->willReturn('payment');
-        $this->subjectMock->expects(static::once())
-            ->method('getPath')
+        $this->subjectMock->method('getPath')
             ->willReturn($subjectPath);
 
         $this->assertEquals($expectedConfigPath, $this->plugin->afterGetConfigPath($this->subjectMock, null));
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php
index 2575408078926..1fd816ecc6799 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php
@@ -12,6 +12,7 @@
 use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
 use Magento\Paypal\Model\Api\Nvp;
+use Magento\Paypal\Model\Api\ProcessableException;
 use Magento\Paypal\Model\Api\ProcessableException as ApiProcessableException;
 use Magento\Paypal\Model\Express;
 use Magento\Paypal\Model\Pro;
@@ -19,7 +20,7 @@
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Class ExpressTest
@@ -27,10 +28,15 @@
  */
 class ExpressTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var string
+     */
+    private static $authorizationExpiredCode = 10601;
+
     /**
      * @var array
      */
-    protected $errorCodes = [
+    private $errorCodes = [
         ApiProcessableException::API_INTERNAL_ERROR,
         ApiProcessableException::API_UNABLE_PROCESS_PAYMENT_ERROR_CODE,
         ApiProcessableException::API_DO_EXPRESS_CHECKOUT_FAIL,
@@ -40,7 +46,7 @@ class ExpressTest extends \PHPUnit\Framework\TestCase
         ApiProcessableException::API_COUNTRY_FILTER_DECLINE,
         ApiProcessableException::API_MAXIMUM_AMOUNT_FILTER_DECLINE,
         ApiProcessableException::API_OTHER_FILTER_DECLINE,
-        ApiProcessableException::API_ADDRESS_MATCH_FAIL
+        ApiProcessableException::API_ADDRESS_MATCH_FAIL,
     ];
 
     /**
@@ -80,6 +86,7 @@ class ExpressTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
+        $this->errorCodes[] = self::$authorizationExpiredCode;
         $this->checkoutSession = $this->createPartialMock(
             Session::class,
             ['getPaypalTransactionData', 'setPaypalTransactionData']
@@ -104,16 +111,20 @@ protected function setUp()
         );
         $this->pro = $this->createPartialMock(
             Pro::class,
-            ['setMethod', 'getApi', 'importPaymentInfo', 'resetApi']
+            ['setMethod', 'getApi', 'importPaymentInfo', 'resetApi', 'void']
         );
         $this->eventManager = $this->getMockBuilder(ManagerInterface::class)
             ->setMethods(['dispatch'])
             ->getMockForAbstractClass();
 
-        $this->pro->expects($this->any())->method('getApi')->will($this->returnValue($this->nvp));
+        $this->pro->method('getApi')
+            ->willReturn($this->nvp);
         $this->helper = new ObjectManager($this);
     }
 
+    /**
+     * Tests setting the list of processable errors.
+     */
     public function testSetApiProcessableErrors()
     {
         $this->nvp->expects($this->once())->method('setProcessableErrors')->with($this->errorCodes);
@@ -128,6 +139,32 @@ public function testSetApiProcessableErrors()
         );
     }
 
+    /**
+     * Tests canceling order payment when expired authorization generates exception on a client.
+     */
+    public function testCancelWithExpiredAuthorizationTransaction()
+    {
+        $this->pro->method('void')
+            ->willThrowException(
+                new ProcessableException(__('PayPal gateway has rejected request.'), null, 10601)
+            );
+
+        $this->model = $this->helper->getObject(Express::class, ['data' => [$this->pro]]);
+        /** @var Payment|MockObject $paymentModel */
+        $paymentModel = $this->createMock(Payment::class);
+        $paymentModel->expects($this->once())
+            ->method('setTransactionId')
+            ->with(null);
+        $paymentModel->expects($this->once())
+            ->method('setIsTransactionClosed')
+            ->with(true);
+        $paymentModel->expects($this->once())
+            ->method('setShouldCloseParentTransaction')
+            ->with(true);
+
+        $this->model->cancel($paymentModel);
+    }
+
     /**
      * Tests order payment action.
      */
@@ -162,6 +199,11 @@ public function testOrder()
         static::assertEquals($this->model, $this->model->order($paymentModel, 12.3));
     }
 
+    /**
+     * Tests data assigning.
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function testAssignData()
     {
         $transportValue = 'something';
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
index 9b67cedb47885..03383e6599961 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
@@ -3,445 +3,292 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Paypal\Test\Unit\Model\Payflow;
 
-use Magento\Paypal\Block\Payment\Info;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Payment\Model\Method\ConfigInterface as PaymentConfigInterface;
+use Magento\Payment\Model\Method\ConfigInterfaceFactory as PaymentConfigInterfaceFactory;
+use Magento\Paypal\Model\Cart as PayPalCart;
+use Magento\Paypal\Model\CartFactory as PayPalCartFactory;
+use Magento\Paypal\Model\Payflow\Service\Gateway as PayPalPayflowGateway;
+use Magento\Paypal\Model\Payflow\Transparent as PayPalPayflowTransparent;
 use Magento\Paypal\Model\Payflowpro;
-use Magento\Paypal\Model\Payflow\Transparent;
+use Magento\Sales\Api\Data\OrderPaymentExtensionInterface;
+use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory as PaymentExtensionInterfaceFactory;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Payment;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
-use Magento\Vault\Model\CreditCardTokenFactory;
+use Magento\Vault\Api\Data\PaymentTokenInterfaceFactory;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
- * Class TransparentTest
- *
- * Test class for \Magento\Paypal\Model\Payflow\Transparent
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class TransparentTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var Transparent|\PHPUnit_Framework_MockObject_MockObject */
-    protected $object;
-
-    /** @var \Magento\Paypal\Model\Payflow\Service\Gateway|\PHPUnit_Framework_MockObject_MockObject */
-    protected $gatewayMock;
-
-    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $storeManagerMock;
-
-    /** @var \Magento\Payment\Model\Method\ConfigInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $configFactoryMock;
-
-    /** @var \Magento\Payment\Model\Method\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $configMock;
-
-    /** @var \Magento\Framework\DataObject */
-    protected $responseMock;
-
-    /** @var \Magento\Sales\Model\Order\Payment\Info|\PHPUnit_Framework_MockObject_MockObject */
-    protected $paymentMock;
-
-    /** @var \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject */
-    protected $orderMock;
-
-    /** @var \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject */
-    protected $addressBillingMock;
-
-    /** @var \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject */
-    protected $addressShippingMock;
+    /**
+     * @var PayPalPayflowTransparent
+     */
+    private $subject;
 
     /**
-     * @var CreditCardTokenFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var PaymentConfigInterface|MockObject
      */
-    protected $paymentTokenFactory;
+    private $paymentConfig;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|
-     * \Magento\Paypal\Model\Payflow\Service\Response\Validator\ResponseValidator
+     * @var PayPalPayflowGateway|MockObject
      */
-    protected $responseValidator;
+    private $payPalPayflowGateway;
 
-    protected function setUp()
-    {
-        $this->paymentMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Payment::class)
-            ->setMethods([])
-            ->disableOriginalConstructor()
-            ->getMock();
+    /**
+     * @var PaymentTokenInterface|MockObject
+     */
+    private $paymentToken;
 
-        $this->paymentTokenFactory = $this->getMockBuilder(CreditCardTokenFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
+    /**
+     * @var PayPalCart|MockObject
+     */
+    private $payPalCart;
 
-        $this->gatewayMock = $this->getMockBuilder(\Magento\Paypal\Model\Payflow\Service\Gateway::class)
-            ->setMethods(['postRequest'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
-            ->setMethods(['getStore', 'getId'])
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $this->storeManagerMock->method('getStore')
-            ->willReturnSelf();
-        $this->configMock = $this->getMockBuilder(\Magento\Paypal\Model\PayflowConfig::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->configFactoryMock = $this->getMockBuilder(\Magento\Payment\Model\Method\ConfigInterfaceFactory::class)
-            ->setMethods(['create'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->configFactoryMock->method('create')
-            ->willReturn($this->configMock);
-        $this->responseMock = new \Magento\Framework\DataObject();
-        $this->responseValidator = $this->getMockBuilder(
-            \Magento\Paypal\Model\Payflow\Service\Response\Validator\ResponseValidator::class
-        )->disableOriginalConstructor()
-            ->setMethods(['validate'])
-            ->getMock();
+    /**
+     * @var ScopeConfigInterface|MockObject
+     */
+    private $scopeConfig;
 
-        $objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->object = $objectHelper->getObject(
-            \Magento\Paypal\Model\Payflow\Transparent::class,
-            [
-                'gateway' => $this->gatewayMock,
-                'storeManager' => $this->storeManagerMock,
-                'configFactory' => $this->configFactoryMock,
-                'responseValidator' => $this->responseValidator,
-                'paymentTokenFactory' => $this->paymentTokenFactory
-            ]
-        );
-    }
+    /**
+     * @var Payment|MockObject
+     */
+    private $payment;
 
     /**
-     * Initializing a collection Mock for Authorize method
-     *
-     * @return void
+     * @var Order|MockObject
      */
-    protected function initializationAuthorizeMock()
+    private $order;
+
+    public function setUp()
     {
-        $this->orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
-            ->setMethods([
-                'getCustomerId', 'getBillingAddress', 'getShippingAddress', 'getCustomerEmail',
-                'getId', 'getIncrementId', 'getBaseCurrencyCode'
-            ])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->addressBillingMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
-            ->setMethods(
-                [
-                    'getFirstname',
-                    'getLastname',
-                    'getStreet',
-                    'getCity',
-                    'getRegionCode',
-                    'getPostcode',
-                    'getCountryId'
-                ]
-            )->disableOriginalConstructor()
-            ->getMock();
-        $this->addressShippingMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
-            ->setMethods(
+        $this->initPayment();
+
+        $this->subject = (new ObjectManagerHelper($this))
+            ->getObject(
+                PayPalPayflowTransparent::class,
                 [
-                    'getFirstname',
-                    'getLastname',
-                    'getStreet',
-                    'getCity',
-                    'getRegionCode',
-                    'getPostcode',
-                    'getCountryId'
+                    'configFactory' => $this->getPaymentConfigInterfaceFactory(),
+                    'paymentExtensionFactory' => $this->getPaymentExtensionInterfaceFactory(),
+                    'storeManager' => $this->getStoreManager(),
+                    'gateway' => $this->getPayPalPayflowGateway(),
+                    'paymentTokenFactory' => $this->getPaymentTokenFactory(),
+                    'payPalCartFactory' => $this->getPayPalCartFactory(),
+                    'scopeConfig' => $this->getScopeConfig(),
                 ]
-            )->disableOriginalConstructor()
-            ->getMock();
+            );
     }
 
     /**
-     * Build data for request for operation Authorize
+     * Asserts that authorize request to Payflow gateway is valid.
      *
-     * @return void
+     * @dataProvider validAuthorizeRequestDataProvider
+     * @param DataObject $validAuthorizeRequest
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\State\InvalidTransitionException
      */
-    protected function buildRequestData()
+    public function testValidAuthorizeRequest(DataObject $validAuthorizeRequest)
     {
-        $this->paymentMock->expects($this->once())
-            ->method('getOrder')
-            ->willReturn($this->orderMock);
-        $this->orderMock->expects($this->once())
-            ->method('getBaseCurrencyCode')
-            ->willReturn('USD');
-        $this->orderMock->expects($this->once())
-            ->method('getBillingAddress')
-            ->willReturn($this->addressBillingMock);
-        $this->orderMock->expects(static::once())
-            ->method('getId')
-            ->willReturn(1);
-        $this->orderMock->expects(static::once())
-            ->method('getIncrementId')
-            ->willReturn('0000001');
-        $this->orderMock->expects($this->once())
-            ->method('getShippingAddress')
-            ->willReturn($this->addressShippingMock);
-        $this->addressBillingMock->expects($this->once())
-            ->method('getFirstname')
-            ->willReturn('Firstname');
-        $this->addressBillingMock->expects($this->once())
-            ->method('getLastname')
-            ->willReturn('Lastname');
-        $this->addressBillingMock->expects($this->once())
-            ->method('getStreet')
-            ->willReturn(['street-1', 'street-2']);
-        $this->addressBillingMock->expects($this->once())
-            ->method('getCity')
-            ->willReturn('City');
-        $this->addressBillingMock->expects($this->once())
-            ->method('getRegionCode')
-            ->willReturn('RegionCode');
-        $this->addressBillingMock->expects($this->once())
-            ->method('getPostcode')
-            ->willReturn('Postcode');
-        $this->addressBillingMock->expects($this->once())
-            ->method('getCountryId')
-            ->willReturn('CountryId');
-        $this->orderMock->expects($this->once())
-            ->method('getCustomerEmail')
-            ->willReturn('customer@email.com');
-        $this->addressShippingMock->expects($this->once())
-            ->method('getFirstname')
-            ->willReturn('Firstname');
-        $this->addressShippingMock->expects($this->once())
-            ->method('getLastname')
-            ->willReturn('Lastname');
-        $this->addressShippingMock->expects($this->once())
-            ->method('getStreet')
-            ->willReturn(['street-1', 'street-2']);
-        $this->addressShippingMock->expects($this->once())
-            ->method('getCity')
-            ->willReturn('City');
-        $this->addressShippingMock->expects($this->once())
-            ->method('getRegionCode')
-            ->willReturn('RegionCode');
-        $this->addressShippingMock->expects($this->once())
-            ->method('getPostcode')
-            ->willReturn('Postcode');
-        $this->addressShippingMock->expects($this->once())
-            ->method('getCountryId')
-            ->willReturn('CountryId');
+        $this->scopeConfig->method('getValue')
+            ->willReturnMap([
+                ['payment/payflowpro/user', ScopeInterface::SCOPE_STORE, null, 'user'],
+                ['payment/payflowpro/vendor', ScopeInterface::SCOPE_STORE, null, 'vendor'],
+                ['payment/payflowpro/partner', ScopeInterface::SCOPE_STORE, null, 'partner'],
+                ['payment/payflowpro/pwd', ScopeInterface::SCOPE_STORE, null, 'pwd'],
+                ['payment/payflowpro/verbosity', ScopeInterface::SCOPE_STORE, null, 'verbosity'],
+            ]);
+        $this->paymentConfig->method('getBuildNotationCode')->willReturn('BUTTONSOURCE');
+        $this->payment->method('getAdditionalInformation')
+            ->willReturnMap([
+                [Payflowpro::PNREF, 'XXXXXXXXXXXX'],
+            ]);
+        $this->order->method('getIncrementId')->willReturn('000000001');
+        $this->order->method('getBaseCurrencyCode')->willReturn('USD');
+        $this->payPalCart->method('getSubtotal')->willReturn(5.00);
+        $this->payPalCart->method('getTax')->willReturn(5.00);
+        $this->payPalCart->method('getShipping')->willReturn(5.00);
+        $this->payPalCart->method('getDiscount')->willReturn(5.00);
+
+        $this->payPalPayflowGateway->expects($this->once())
+            ->method('postRequest')
+            ->with($this->equalTo($validAuthorizeRequest));
+
+        $this->subject->authorize($this->payment, 10);
     }
 
     /**
-     * @return \Magento\Framework\DataObject
+     * @return array
      */
-    protected function crateVoidResponseMock()
+    public function validAuthorizeRequestDataProvider(): array
     {
-        $voidResponseMock = new \Magento\Framework\DataObject(
+        return [
             [
-                'result_code' => Transparent::RESPONSE_CODE_APPROVED,
-                'pnref' => 'test-pnref'
+                new DataObject([
+                    'user' => 'user',
+                    'vendor' => 'vendor',
+                    'partner' => 'partner',
+                    'pwd' => 'pwd',
+                    'verbosity' => 'verbosity',
+                    'BUTTONSOURCE' => 'BUTTONSOURCE',
+                    'tender' => 'C',
+                    'custref' => '000000001',
+                    'invnum' => '000000001',
+                    'comment_1' => '000000001',
+                    'trxtype' => 'A',
+                    'origid' => 'XXXXXXXXXXXX',
+                    'amt' => '10.00',
+                    'currency' => 'USD',
+                    'itemamt' => '5.00',
+                    'taxamt' => '5.00',
+                    'freightamt' => '5.00',
+                    'discount' => '5.00',
+                ]),
             ]
-        );
-
-        $this->responseMock->setData(Transparent::PNREF, 'test-pnref');
-
-        $this->paymentMock->expects($this->once())
-            ->method('setParentTransactionId')
-            ->with('test-pnref');
-        $this->paymentMock->expects($this->once())
-            ->method('getParentTransactionId')
-            ->willReturn('test-pnref');
-        $this->paymentMock->expects($this->once())
-            ->method('setTransactionId')
-            ->with('test-pnref')
-            ->willReturnSelf();
-        $this->paymentMock->expects($this->once())
-            ->method('setIsTransactionClosed')
-            ->with(1)
-            ->willReturnSelf();
-        $this->paymentMock->expects($this->once())
-            ->method('setShouldCloseParentTransaction')
-            ->with(1);
-
-        return $voidResponseMock;
+        ];
     }
 
     /**
-     * @expectedException  \Exception
+     * @return PaymentConfigInterfaceFactory|MockObject
      */
-    public function testAuthorizeException()
+    private function getPaymentConfigInterfaceFactory()
     {
-        $this->initializationAuthorizeMock();
-        $this->buildRequestData();
+        $paymentConfigInterfaceFactory = $this->getMockBuilder(PaymentConfigInterfaceFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->paymentConfig = $this->getMockBuilder(PaymentConfigInterface::class)
+            ->setMethods(['setStoreId', 'setMethodInstance', 'setMethod', 'getBuildNotationCode'])
+            ->getMockForAbstractClass();
 
-        $this->gatewayMock->expects($this->once())
-            ->method('postRequest')
-            ->willThrowException(new \Exception());
+        $paymentConfigInterfaceFactory->method('create')->willReturn($this->paymentConfig);
 
-        $this->object->authorize($this->paymentMock, 33);
+        return $paymentConfigInterfaceFactory;
     }
 
     /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Error processing payment. Please try again later.
+     * @return PaymentExtensionInterfaceFactory|MockObject
      */
-    public function testAuthorizeValidationException()
+    private function getPaymentExtensionInterfaceFactory()
     {
-        $this->initializationAuthorizeMock();
-        $this->buildRequestData();
-        $voidResponseMock = $this->crateVoidResponseMock();
+        $paymentExtensionInterfaceFactory = $this->getMockBuilder(PaymentExtensionInterfaceFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $orderPaymentExtension = $this->getMockBuilder(OrderPaymentExtensionInterface::class)
+            ->setMethods(['setVaultPaymentToken'])
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $this->gatewayMock->expects($this->at(0))
-            ->method('postRequest')
-            ->willReturn($this->responseMock);
+        $paymentExtensionInterfaceFactory->method('create')->willReturn($orderPaymentExtension);
 
-        $this->responseValidator->expects($this->once())
-            ->method('validate')
-            ->with($this->responseMock)
-            ->willThrowException(new \Magento\Framework\Exception\LocalizedException(__('Error')));
+        return $paymentExtensionInterfaceFactory;
+    }
 
-        $this->gatewayMock->expects($this->at(1))
-            ->method('postRequest')
-            ->willReturn($voidResponseMock);
+    /**
+     * @return StoreManagerInterface|MockObject
+     */
+    private function getStoreManager()
+    {
+        $storeManager = $this->getMockBuilder(StoreManagerInterface::class)
+            ->getMockForAbstractClass();
+        $store = $this->getMockBuilder(StoreInterface::class)
+            ->getMockForAbstractClass();
+
+        $storeManager->method('getStore')->willReturn($store);
 
-        $this->paymentMock->expects($this->once())
-            ->method('getAdditionalInformation')
-            ->with(Payflowpro::PNREF)
-            ->willReturn('test-pnref');
+        return $storeManager;
+    }
 
-        $this->responseMock->setData('result_code', Payflowpro::RESPONSE_CODE_FRAUDSERVICE_FILTER);
+    /**
+     * @return PayPalPayflowGateway|MockObject
+     */
+    private function getPayPalPayflowGateway()
+    {
+        $this->payPalPayflowGateway = $this->getMockBuilder(PayPalPayflowGateway::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->payPalPayflowGateway->method('postRequest')
+            ->willReturn(new DataObject());
 
-        $this->object->authorize($this->paymentMock, 33);
+        return $this->payPalPayflowGateway;
     }
 
     /**
-     * @param int $resultCode
-     * @param int $origResult
-     *
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @dataProvider authorizeLocalizedExceptionDataProvider
+     * @return PaymentTokenInterfaceFactory|MockObject
      */
-    public function testAuthorizeLocalizedException(
-        $resultCode,
-        $origResult
-    ) {
-        $this->initializationAuthorizeMock();
-        $this->buildRequestData();
+    private function getPaymentTokenFactory()
+    {
+        $paymentTokenInterfaceFactory = $this->getMockBuilder(PaymentTokenInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->paymentToken = $this->getMockBuilder(PaymentTokenInterface::class)
+            ->getMockForAbstractClass();
 
-        $this->responseMock->setData('result_code', $resultCode);
-        $this->responseMock->setData('origresult', $origResult);
+        $paymentTokenInterfaceFactory->method('create')->willReturn($this->paymentToken);
 
-        $this->gatewayMock->expects($this->exactly(1))
-            ->method('postRequest')
-            ->willReturn($this->responseMock);
-        $this->object->authorize($this->paymentMock, 33);
+        return $paymentTokenInterfaceFactory;
     }
 
     /**
-     * @return array
+     * @return PayPalCartFactory|MockObject
      */
-    public function authorizeLocalizedExceptionDataProvider()
+    private function getPayPalCartFactory()
     {
-        return [
-            [
-                'origResult' => Payflowpro::RESPONSE_CODE_APPROVED,
-                'resultCode' => Payflowpro::RESPONSE_CODE_DECLINED_BY_FILTER
-            ],
-            [
-                'origResult' => Payflowpro::RESPONSE_CODE_DECLINED_BY_FILTER,
-                'resultCode' => Payflowpro::RESPONSE_CODE_FRAUDSERVICE_FILTER
-            ],
-            [
-                'origResult' => Payflowpro::RESPONSE_CODE_DECLINED,
-                'resultCode' => 1111111111
-            ],
-            [
-                'origResult' => 3432432423,
-                'resultCode' => 23233432423
-            ],
-        ];
+        $payPalCartFactory = $this->getMockBuilder(PayPalCartFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->payPalCart = $this->getMockBuilder(PayPalCart::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $payPalCartFactory->method('create')->willReturn($this->payPalCart);
+
+        return $payPalCartFactory;
     }
 
     /**
-     * Test method
-     * with resultCode = RESPONSE_CODE_APPROVED and Origresult != RESPONSE_CODE_FRAUDSERVICE_FILTER
+     * @return ScopeConfigInterface|MockObject
      */
-    public function testAuthorize()
+    private function getScopeConfig()
     {
-        $this->initializationAuthorizeMock();
-        $this->buildRequestData();
-
-        $paymentTokenMock = $this->createMock(PaymentTokenInterface::class);
-        $extensionAttributes = $this->getMockBuilder(\Magento\Sales\Api\Data\OrderPaymentExtensionInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['setVaultPaymentToken'])
+        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
             ->getMockForAbstractClass();
-        $ccDetails = [
-            'cc_type' => 'VI',
-            'cc_number' => '1111'
-        ];
-
-        $this->responseMock->setData('result_code', Payflowpro::RESPONSE_CODE_APPROVED);
-        $this->responseMock->setData('origresult', 0);
-        $this->responseMock->setData('pnref', 'test-pnref');
-
-        $this->gatewayMock->expects($this->once())->method('postRequest')->willReturn($this->responseMock);
-
-        $this->responseValidator->expects($this->once())
-            ->method('validate')
-            ->with($this->responseMock);
-
-        $this->paymentMock->expects($this->once())
-            ->method('setTransactionId')
-            ->with('test-pnref')
-            ->willReturnSelf();
-        $this->paymentMock->expects($this->once())
-            ->method('setIsTransactionClosed')
-            ->with(0);
-        $this->paymentMock->expects($this->once())
-            ->method('getCcExpYear')
-            ->willReturn('2017');
-        $this->paymentMock->expects($this->once())
-            ->method('getCcExpMonth')
-            ->willReturn('12');
-        $this->paymentMock->expects(static::any())
-            ->method('getAdditionalInformation')
-            ->willReturnMap(
-                [
-                    [Transparent::CC_DETAILS, $ccDetails],
-                    [Transparent::PNREF, 'test-pnref']
-                ]
-            );
 
-        $this->paymentTokenFactory->expects(static::once())
-            ->method('create')
-            ->willReturn($paymentTokenMock);
-        $paymentTokenMock->expects(static::once())
-            ->method('setGatewayToken')
-            ->with('test-pnref');
-        $paymentTokenMock->expects(static::once())
-            ->method('setTokenDetails')
-            ->with(json_encode($ccDetails));
-        $paymentTokenMock->expects(static::once())
-            ->method('setExpiresAt')
-            ->with('2018-01-01 00:00:00');
-
-        $this->paymentMock->expects(static::once())
-            ->method('getExtensionAttributes')
-            ->willReturn($extensionAttributes);
-        $extensionAttributes->expects(static::once())
-            ->method('setVaultPaymentToken')
-            ->with($paymentTokenMock);
-
-        $this->paymentMock->expects($this->at(8))
-            ->method('unsAdditionalInformation')
-            ->with(Transparent::CC_DETAILS);
-        $this->paymentMock->expects($this->at(9))
-            ->method('unsAdditionalInformation')
-            ->with(Transparent::PNREF);
-
-        $this->assertSame($this->object, $this->object->authorize($this->paymentMock, 33));
+        return $this->scopeConfig;
     }
 
     /**
-     * @covers \Magento\Paypal\Model\Payflow\Transparent::getInfoBlockType()
+     * @return Payment|MockObject
      */
-    public function testGetInfoBlockType()
+    private function initPayment()
     {
-        static::assertEquals(Info::class, $this->object->getInfoBlockType());
+        $this->payment = $this->getMockBuilder(Payment::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->order = $this->getMockBuilder(Order::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->payment->method('getOrder')->willReturn($this->order);
+        $this->payment->method('setTransactionId')->willReturnSelf();
+        $this->payment->method('setIsTransactionClosed')->willReturnSelf();
+        $this->payment->method('getCcExpYear')->willReturn('2019');
+        $this->payment->method('getCcExpMonth')->willReturn('05');
+
+        return $this->payment;
     }
 }
diff --git a/app/code/Magento/Paypal/composer.json b/app/code/Magento/Paypal/composer.json
index 281b7084e7f1b..8a69d78f5351c 100644
--- a/app/code/Magento/Paypal/composer.json
+++ b/app/code/Magento/Paypal/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-paypal",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-config": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-checkout": "100.2.*",
@@ -26,7 +26,7 @@
         "magento/module-checkout-agreements": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "proprietary"
     ],
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
index 90ffeddbb812e..82874c3c74ff2 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
@@ -6,7 +6,7 @@
  */
 -->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="paypal_payflowpro_with_express_checkout" translate="label comment" extends="payment_all_paypal/paypal_payflowpro">
+    <group id="paypal_payflowpro_with_express_checkout" translate="label" extends="payment_all_paypal/paypal_payflowpro">
         <label>Payflow Pro</label>
         <attribute type="paypal_ec_separate">0</attribute>
         <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
@@ -30,11 +30,11 @@
                     <field id="enable_paypal_payflow"/>
                 </requires>
             </field>
-            <field id="enable_express_checkout_bml_payflow" translate="label" type="select" sortOrder="21" showInWebsite="1" showInDefault="1">
+            <field id="enable_express_checkout_bml_payflow" translate="label comment" type="select" sortOrder="21" showInWebsite="1" showInDefault="1">
                 <label>Enable PayPal Credit</label>
                 <comment><![CDATA[PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                             You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                            <a href="https:/www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
+                            <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
                 </comment>
                 <config_path>payment/payflow_express_bml/active</config_path>
                 <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv
index 2a1a6bbb48ef2..6c22ba09ca7cd 100644
--- a/app/code/Magento/Paypal/i18n/en_US.csv
+++ b/app/code/Magento/Paypal/i18n/en_US.csv
@@ -697,3 +697,8 @@ User,User
                                 The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
                                 or more. <a href=""https:/financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
                 "
+"PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
+                            You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
+                            <a href=""https://www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>","PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
+                            You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
+                            <a href=""https://www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>"
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro-method.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro-method.js
index 786f1a5aa85fd..24d06b7d0f8f2 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro-method.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro-method.js
@@ -79,7 +79,10 @@ define([
         placeOrder: function () {
             var self = this;
 
-            if (this.validateHandler() && additionalValidators.validate()) {
+            if (this.validateHandler() &&
+                additionalValidators.validate() &&
+                this.isPlaceOrderActionAllowed() === true
+            ) {
                 this.isPlaceOrderActionAllowed(false);
                 fullScreenLoader.startLoader();
                 $.when(
diff --git a/app/code/Magento/PaypalCaptcha/LICENSE.txt b/app/code/Magento/PaypalCaptcha/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/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/PaypalCaptcha/LICENSE_AFL.txt b/app/code/Magento/PaypalCaptcha/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/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/PaypalCaptcha/Model/Checkout/ConfigProviderPayPal.php b/app/code/Magento/PaypalCaptcha/Model/Checkout/ConfigProviderPayPal.php
new file mode 100644
index 0000000000000..289a1631ed1f6
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/Model/Checkout/ConfigProviderPayPal.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PaypalCaptcha\Model\Checkout;
+
+use Magento\Captcha\Helper\Data;
+use Magento\Captcha\Model\CaptchaInterface;
+use Magento\Checkout\Model\ConfigProviderInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Configuration provider for Captcha rendering.
+ */
+class ConfigProviderPayPal implements ConfigProviderInterface
+{
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var Data
+     */
+    private $captchaData;
+
+    /**
+     * @var string
+     */
+    private static $formId = 'co-payment-form';
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     * @param Data $captchaData
+     */
+    public function __construct(
+        StoreManagerInterface $storeManager,
+        Data $captchaData
+    ) {
+        $this->storeManager = $storeManager;
+        $this->captchaData = $captchaData;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getConfig(): array
+    {
+        $config['captchaPayments'][self::$formId] = [
+            'isCaseSensitive' => $this->isCaseSensitive(self::$formId),
+            'imageHeight' => $this->getImageHeight(self::$formId),
+            'imageSrc' => $this->getImageSrc(self::$formId),
+            'refreshUrl' => $this->getRefreshUrl(),
+            'isRequired' => $this->isRequired(self::$formId),
+            'timestamp' => time()
+        ];
+
+        return $config;
+    }
+
+    /**
+     * Returns is captcha case sensitive
+     *
+     * @param string $formId
+     * @return bool
+     */
+    private function isCaseSensitive(string $formId): bool
+    {
+        return (bool)$this->getCaptchaModel($formId)->isCaseSensitive();
+    }
+
+    /**
+     * Returns captcha image height
+     *
+     * @param string $formId
+     * @return int
+     */
+    private function getImageHeight(string $formId): int
+    {
+        return (int)$this->getCaptchaModel($formId)->getHeight();
+    }
+
+    /**
+     * Returns captcha image source path
+     *
+     * @param string $formId
+     * @return string
+     */
+    private function getImageSrc(string $formId): string
+    {
+        if ($this->isRequired($formId)) {
+            $captcha = $this->getCaptchaModel($formId);
+            $captcha->generate();
+            return $captcha->getImgSrc();
+        }
+
+        return '';
+    }
+
+    /**
+     * Returns URL to controller action which returns new captcha image
+     *
+     * @return string
+     */
+    private function getRefreshUrl(): string
+    {
+        $store = $this->storeManager->getStore();
+        return $store->getUrl('captcha/refresh', ['_secure' => $store->isCurrentlySecure()]);
+    }
+
+    /**
+     * Whether captcha is required to be inserted to this form
+     *
+     * @param string $formId
+     * @return bool
+     */
+    private function isRequired(string $formId): bool
+    {
+        return (bool)$this->getCaptchaModel($formId)->isRequired();
+    }
+
+    /**
+     * Return captcha model for specified form
+     *
+     * @param string $formId
+     * @return CaptchaInterface
+     */
+    private function getCaptchaModel(string $formId): CaptchaInterface
+    {
+        return $this->captchaData->getCaptcha($formId);
+    }
+}
diff --git a/app/code/Magento/PaypalCaptcha/Observer/CaptchaRequestToken.php b/app/code/Magento/PaypalCaptcha/Observer/CaptchaRequestToken.php
new file mode 100644
index 0000000000000..e7cb282b1799b
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/Observer/CaptchaRequestToken.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PaypalCaptcha\Observer;
+
+use Magento\Captcha\Helper\Data;
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\App\ActionFlag ;
+
+/**
+ * Validates Captcha for Request Token controller
+ */
+class CaptchaRequestToken implements ObserverInterface
+{
+    /**
+     * @var Data
+     */
+    private $helper;
+
+    /**
+     * @var Json
+     */
+    private $jsonSerializer;
+
+    /**
+     * @var ActionFlag
+     */
+    private $actionFlag;
+
+    /**
+     * @param Data $helper
+     * @param Json $jsonSerializer
+     * @param ActionFlag $actionFlag
+     */
+    public function __construct(Data $helper, Json $jsonSerializer, ActionFlag $actionFlag)
+    {
+        $this->helper = $helper;
+        $this->jsonSerializer = $jsonSerializer;
+        $this->actionFlag = $actionFlag;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(Observer $observer)
+    {
+        $formId = 'co-payment-form';
+        $captcha = $this->helper->getCaptcha($formId);
+
+        if (!$captcha->isRequired()) {
+            return;
+        }
+
+        /** @var Action $controller */
+        $controller = $observer->getControllerAction();
+        $word = $controller->getRequest()->getPost('captcha_string');
+        if ($captcha->isCorrect($word)) {
+            return;
+        }
+
+        $data = $this->jsonSerializer->serialize([
+            'success' => false,
+            'error' => true,
+            'error_messages' => __('Incorrect CAPTCHA.')
+        ]);
+        $this->actionFlag->set('', Action::FLAG_NO_DISPATCH, true);
+        $controller->getResponse()->representJson($data);
+    }
+}
diff --git a/app/code/Magento/PaypalCaptcha/README.md b/app/code/Magento/PaypalCaptcha/README.md
new file mode 100644
index 0000000000000..71588599a5ecd
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/README.md
@@ -0,0 +1 @@
+The PayPal Captcha module provides a possibility to enable Captcha validation on Payflow Pro payment form.
\ No newline at end of file
diff --git a/app/code/Magento/PaypalCaptcha/composer.json b/app/code/Magento/PaypalCaptcha/composer.json
new file mode 100644
index 0000000000000..9d6fd95cf8dcb
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/composer.json
@@ -0,0 +1,27 @@
+{
+    "name": "magento/module-paypal-captcha",
+    "description": "N/A",
+    "require": {
+        "php": "~7.0.13|~7.1.0|~7.2.0",
+        "magento/framework": "101.0.*",
+        "magento/module-captcha": "100.2.*",
+        "magento/module-checkout": "100.2.*",
+        "magento/module-store": "100.2.*"
+    },
+    "suggest": {
+        "magento/module-paypal": "100.2.*"
+    },
+    "type": "magento2-module",
+    "version": "100.2.0",
+    "license": [
+        "proprietary"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\PaypalCaptcha\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/PaypalCaptcha/etc/adminhtml/system.xml b/app/code/Magento/PaypalCaptcha/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..12afd8ceda60e
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/etc/adminhtml/system.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_Config:etc/system_file.xsd">
+    <system>
+        <section id="customer">
+            <group id="captcha" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="forms" translate="label comment" type="multiselect" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                    <comment>CAPTCHA for "Create user", "Forgot password", "Payflow Pro" forms is always enabled if chosen.</comment>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/app/code/Magento/PaypalCaptcha/etc/config.xml b/app/code/Magento/PaypalCaptcha/etc/config.xml
new file mode 100644
index 0000000000000..133a78a42f7b4
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/etc/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, 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>
+        <customer>
+            <captcha>
+                <shown_to_logged_in_user>
+                    <co-payment-form>1</co-payment-form>
+                </shown_to_logged_in_user>
+                <always_for>
+                    <co-payment-form>1</co-payment-form>
+                </always_for>
+            </captcha>
+        </customer>
+        <captcha translate="label">
+            <frontend>
+                <areas>
+                    <co-payment-form>
+                        <label>Payflow Pro</label>
+                    </co-payment-form>
+                </areas>
+            </frontend>
+        </captcha>
+    </default>
+</config>
diff --git a/app/code/Magento/PaypalCaptcha/etc/frontend/di.xml b/app/code/Magento/PaypalCaptcha/etc/frontend/di.xml
new file mode 100644
index 0000000000000..c236d5ea04ca0
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/etc/frontend/di.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Checkout\Model\CompositeConfigProvider">
+        <arguments>
+            <argument name="configProviders" xsi:type="array">
+                <item name="paypal_captcha_config_provider" xsi:type="object">Magento\PaypalCaptcha\Model\Checkout\ConfigProviderPayPal</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/PaypalCaptcha/etc/frontend/events.xml b/app/code/Magento/PaypalCaptcha/etc/frontend/events.xml
new file mode 100644
index 0000000000000..ae706c4485d61
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/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_action_predispatch_paypal_transparent_requestsecuretoken">
+        <observer name="captcha_request_token" instance="Magento\PaypalCaptcha\Observer\CaptchaRequestToken"/>
+    </event>
+</config>
diff --git a/app/code/Magento/PaypalCaptcha/etc/module.xml b/app/code/Magento/PaypalCaptcha/etc/module.xml
new file mode 100644
index 0000000000000..a456cb0584fe6
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/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_PaypalCaptcha" setup_version="2.0.0">
+        <sequence>
+            <module name="Magento_Captcha"/>
+            <module name="Magento_Paypal"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/PaypalCaptcha/registration.php b/app/code/Magento/PaypalCaptcha/registration.php
new file mode 100644
index 0000000000000..4dac0582a6d1b
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/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_PaypalCaptcha', __DIR__);
diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/PaypalCaptcha/view/frontend/layout/checkout_index_index.xml
new file mode 100644
index 0000000000000..9837068faab73
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/view/frontend/layout/checkout_index_index.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="checkout.root">
+            <arguments>
+                <argument name="jsLayout" xsi:type="array">
+                    <item name="components" xsi:type="array">
+                        <item name="checkout" xsi:type="array">
+                            <item name="children" xsi:type="array">
+                                <item name="steps" xsi:type="array">
+                                    <item name="children" xsi:type="array">
+                                        <item name="billing-step" xsi:type="array">
+                                            <item name="children" xsi:type="array">
+                                                <item name="payment" xsi:type="array">
+                                                    <item name="children" xsi:type="array">
+                                                        <item name="payments-list" xsi:type="array">
+                                                            <item name="children" xsi:type="array">
+                                                                <item name="paypal-captcha" xsi:type="array">
+                                                                    <item name="component" xsi:type="string">uiComponent</item>
+                                                                    <item name="displayArea" xsi:type="string">paypal-captcha</item>
+                                                                    <item name="dataScope" xsi:type="string">paypal-captcha</item>
+                                                                    <item name="provider" xsi:type="string">checkoutProvider</item>
+                                                                    <item name="config" xsi:type="array">
+                                                                        <item name="template" xsi:type="string">Magento_Checkout/payment/before-place-order</item>
+                                                                    </item>
+                                                                    <item name="children" xsi:type="array">
+                                                                        <item name="captcha" xsi:type="array">
+                                                                            <item name="component" xsi:type="string">Magento_PaypalCaptcha/js/view/checkout/paymentCaptcha</item>
+                                                                            <item name="displayArea" xsi:type="string">paypal-captcha</item>
+                                                                            <item name="formId" xsi:type="string">co-payment-form</item>
+                                                                            <item name="configSource" xsi:type="string">checkoutConfig</item>
+                                                                        </item>
+                                                                    </item>
+                                                                </item>
+                                                            </item>
+                                                        </item>
+                                                    </item>
+                                                </item>
+                                            </item>
+                                        </item>
+                                    </item>
+                                </item>
+                            </item>
+                        </item>
+                    </item>
+                </argument>
+            </arguments>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/requirejs-config.js b/app/code/Magento/PaypalCaptcha/view/frontend/requirejs-config.js
new file mode 100644
index 0000000000000..78e7add4ec690
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/view/frontend/requirejs-config.js
@@ -0,0 +1,14 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+    config: {
+        mixins: {
+            'Magento_Checkout/js/view/payment/list': {
+                'Magento_PaypalCaptcha/js/view/payment/list-mixin': true
+            }
+        }
+    }
+};
diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/checkout/paymentCaptcha.js b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/checkout/paymentCaptcha.js
new file mode 100644
index 0000000000000..f8f119e3b3396
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/checkout/paymentCaptcha.js
@@ -0,0 +1,44 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'Magento_Captcha/js/view/checkout/defaultCaptcha',
+    'Magento_Captcha/js/model/captchaList',
+    'Magento_Captcha/js/model/captcha'
+],
+function ($, defaultCaptcha, captchaList, Captcha) {
+    'use strict';
+
+    return defaultCaptcha.extend({
+
+        /** @inheritdoc */
+        initialize: function () {
+            var captchaConfigPayment,
+                currentCaptcha;
+
+            this._super();
+
+            if (window[this.configSource] && window[this.configSource].captchaPayments) {
+                captchaConfigPayment = window[this.configSource].captchaPayments;
+
+                $.each(captchaConfigPayment, function (formId, captchaData) {
+                    var captcha;
+
+                    captchaData.formId = formId;
+                    captcha = Captcha(captchaData);
+                    captchaList.add(captcha);
+                });
+            }
+
+            currentCaptcha = captchaList.getCaptchaByFormId(this.formId);
+
+            if (currentCaptcha != null) {
+                currentCaptcha.setIsVisible(true);
+                this.setCurrentCaptcha(currentCaptcha);
+            }
+        }
+    });
+});
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
new file mode 100644
index 0000000000000..60172f696e9ed
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js
@@ -0,0 +1,54 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'Magento_Captcha/js/model/captchaList'
+], function ($, captchaList) {
+    'use strict';
+
+    var mixin = {
+
+        formId: 'co-payment-form',
+
+        /**
+         * Sets custom template for Payflow Pro
+         *
+         * @param {Object} payment
+         * @returns {Object}
+         */
+        createComponent: function (payment) {
+
+            var component = this._super(payment);
+
+            if (component.component === 'Magento_Paypal/js/view/payment/method-renderer/payflowpro-method') {
+                component.template = 'Magento_PaypalCaptcha/payment/payflowpro-form';
+                $(window).off('clearTimeout')
+                    .on('clearTimeout', this.clearTimeout.bind(this));
+            }
+
+            return component;
+        },
+
+        /**
+         * Overrides default window.clearTimeout() to catch errors from iframe and reload Captcha.
+         */
+        clearTimeout: function () {
+            var captcha = captchaList.getCaptchaByFormId(this.formId);
+
+            if (captcha !== null) {
+                captcha.refresh();
+            }
+            clearTimeout();
+        }
+    };
+
+    /**
+     * Overrides `Magento_Checkout/js/view/payment/list::createComponent`
+     */
+    return function (target) {
+        return target.extend(mixin);
+    };
+});
diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/web/template/payment/payflowpro-form.html b/app/code/Magento/PaypalCaptcha/view/frontend/web/template/payment/payflowpro-form.html
new file mode 100644
index 0000000000000..fec5cf96b0324
--- /dev/null
+++ b/app/code/Magento/PaypalCaptcha/view/frontend/web/template/payment/payflowpro-form.html
@@ -0,0 +1,90 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+    <div class="payment-method-title field choice">
+        <input type="radio"
+               name="payment[method]"
+               class="radio"
+               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()"/>
+        <label class="label" data-bind="attr: {'for': getCode()}">
+            <span data-bind="text: getTitle()"></span>
+        </label>
+    </div>
+
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+        <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+        <div class="payment-method-billing-address">
+            <!-- ko foreach: $parent.getRegion(getBillingAddressFormName()) -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <iframe width="0"
+                height="0"
+                data-bind="src: getSource(), attr: {id: getCode() + '-transparent-iframe', 'data-container': getCode() + '-transparent-iframe'}"
+                allowtransparency="true"
+                frameborder="0"
+                name="iframeTransparent"
+                class="payment-method-iframe">
+        </iframe>
+        <form class="form" id="co-transparent-form" action="#" method="post" data-bind="mageInit: {
+            'transparent':{
+                'context': context(),
+                'controller': getControllerName(),
+                'gateway': getCode(),
+                'orderSaveUrl':getPlaceOrderUrl(),
+                'cgiUrl': getCgiUrl(),
+                'dateDelim': getDateDelim(),
+                'cardFieldsMap': getCardFieldsMap(),
+                'nativeAction': getSaveOrderUrl()
+            }, 'validation':[]}">
+
+            <!-- ko template: 'Magento_Payment/payment/cc-form' --><!-- /ko -->
+
+            <!-- ko if: (isVaultEnabled())-->
+            <div class="field-tooltip-content">
+                <input type="checkbox"
+                       name="vault[is_enabled]"
+                       class="checkbox-inline"
+                       data-bind="attr: {'id': getCode() + '_enable_vault'}, checked: vaultEnabler.isActivePaymentTokenEnabler"/>
+                <label class="label" data-bind="attr: {'for': getCode() + '_enable_vault'}">
+                    <span><!-- ko i18n: 'Save credit card information for future use.'--><!-- /ko --></span>
+                </label>
+            </div>
+            <!-- /ko -->
+        </form>
+        <fieldset class="fieldset payment items ccard">
+            <!-- ko foreach: $parent.getRegion('paypal-captcha') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!-- /ko -->
+        </fieldset>
+
+
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar">
+            <div class="primary">
+                <button data-role="review-save"
+                        type="submit"
+                        data-bind="
+                        attr: {title: $t('Place Order')},
+                        enable: (getCode() == isChecked()),
+                        click: placeOrder,
+                        css: {disabled: !isPlaceOrderActionAllowed()}
+                        "
+                        class="action primary checkout"
+                        disabled>
+                    <span data-bind="i18n: 'Place Order'"></span>
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/app/code/Magento/Persistent/Block/Header/Additional.php b/app/code/Magento/Persistent/Block/Header/Additional.php
index c740f5a3469fb..28e967f201230 100644
--- a/app/code/Magento/Persistent/Block/Header/Additional.php
+++ b/app/code/Magento/Persistent/Block/Header/Additional.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Persistent\Block\Header;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Persistent\Helper\Data;
+
 /**
  * Remember Me block
  *
@@ -30,20 +34,37 @@ class Additional extends \Magento\Framework\View\Element\Html\Link
     protected $customerRepository;
 
     /**
-     * Constructor
-     *
+     * @var string
+     */
+    protected $_template = 'Magento_Persistent::additional.phtml';
+
+    /**
+     * @var Json
+     */
+    private $jsonSerializer;
+
+    /**
+     * @var Data
+     */
+    private $persistentHelper;
+
+    /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Customer\Helper\View $customerViewHelper
      * @param \Magento\Persistent\Helper\Session $persistentSessionHelper
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param array $data
+     * @param Json|null $jsonSerializer
+     * @param Data|null $persistentHelper
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Customer\Helper\View $customerViewHelper,
         \Magento\Persistent\Helper\Session $persistentSessionHelper,
         \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
-        array $data = []
+        array $data = [],
+        Json $jsonSerializer = null,
+        Data $persistentHelper = null
     ) {
         $this->isScopePrivate = true;
         $this->_customerViewHelper = $customerViewHelper;
@@ -51,6 +72,8 @@ public function __construct(
         $this->customerRepository = $customerRepository;
         parent::__construct($context, $data);
         $this->_isScopePrivate = true;
+        $this->jsonSerializer = $jsonSerializer ?: ObjectManager::getInstance()->get(Json::class);
+        $this->persistentHelper = $persistentHelper ?: ObjectManager::getInstance()->get(Data::class);
     }
 
     /**
@@ -64,17 +87,25 @@ public function getHref()
     }
 
     /**
-     * Render additional header html
+     * @return int
+     */
+    public function getCustomerId()
+    {
+        return $this->_persistentSessionHelper->getSession()->getCustomerId();
+    }
+
+    /**
+     * Get persistent config.
      *
      * @return string
      */
-    protected function _toHtml()
+    public function getConfig()
     {
-        if ($this->_persistentSessionHelper->getSession()->getCustomerId()) {
-            return '<span><a ' . $this->getLinkAttributes() . ' >' . __('Not you?')
-            . '</a></span>';
-        }
-
-        return '';
+        return
+            $this->jsonSerializer->serialize(
+                [
+                    'expirationLifetime' => $this->persistentHelper->getLifeTime(),
+                ]
+            );
     }
 }
diff --git a/app/code/Magento/Persistent/CustomerData/Persistent.php b/app/code/Magento/Persistent/CustomerData/Persistent.php
new file mode 100644
index 0000000000000..98b36b2e36612
--- /dev/null
+++ b/app/code/Magento/Persistent/CustomerData/Persistent.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Persistent\CustomerData;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\CustomerData\SectionSourceInterface;
+use Magento\Customer\Helper\View;
+use Magento\Persistent\Helper\Session;
+
+/**
+ * Customer persistent section
+ */
+class Persistent implements SectionSourceInterface
+{
+    /**
+     * @var Session
+     */
+    private $persistentSession;
+
+    /**
+     * @var View
+     */
+    private $customerViewHelper;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @param Session $persistentSession
+     * @param View $customerViewHelper
+     * @param CustomerRepositoryInterface $customerRepository
+     */
+    public function __construct(
+        Session $persistentSession,
+        View $customerViewHelper,
+        CustomerRepositoryInterface $customerRepository
+    ) {
+        $this->persistentSession = $persistentSession;
+        $this->customerViewHelper = $customerViewHelper;
+        $this->customerRepository = $customerRepository;
+    }
+
+    /**
+     * Get data
+     *
+     * @return array
+     */
+    public function getSectionData()
+    {
+        if (!$this->persistentSession->isPersistent()) {
+            return [];
+        }
+
+        $customerId = $this->persistentSession->getSession()->getCustomerId();
+        if (!$customerId) {
+            return [];
+        }
+
+        $customer = $this->customerRepository->getById($customerId);
+
+        return [
+            'fullname' => $this->customerViewHelper->getCustomerName($customer),
+        ];
+    }
+}
diff --git a/app/code/Magento/Persistent/Model/Checkout/GuestPaymentInformationManagementPlugin.php b/app/code/Magento/Persistent/Model/Checkout/GuestPaymentInformationManagementPlugin.php
index 2c0259bd12b00..2641102ca4d72 100644
--- a/app/code/Magento/Persistent/Model/Checkout/GuestPaymentInformationManagementPlugin.php
+++ b/app/code/Magento/Persistent/Model/Checkout/GuestPaymentInformationManagementPlugin.php
@@ -108,8 +108,8 @@ public function beforeSavePaymentInformationAndPlaceOrder(
             $this->customerSession->setCustomerId(null);
             $this->customerSession->setCustomerGroupId(null);
             $this->quoteManager->convertCustomerCartToGuest();
-            /** @var \Magento\Quote\Api\Data\CartInterface $quote */
-            $quote = $this->cartRepository->get($this->checkoutSession->getQuote()->getId());
+            $quoteId = $this->checkoutSession->getQuoteId();
+            $quote = $this->cartRepository->get($quoteId);
             $quote->setCustomerEmail($email);
             $quote->getAddressesCollection()->walk('setEmail', ['email' => $email]);
             $this->cartRepository->save($quote);
diff --git a/app/code/Magento/Persistent/Model/Observer.php b/app/code/Magento/Persistent/Model/Observer.php
index 53fe5f95531e1..81c2870071a2e 100644
--- a/app/code/Magento/Persistent/Model/Observer.php
+++ b/app/code/Magento/Persistent/Model/Observer.php
@@ -86,13 +86,8 @@ public function __construct(
      */
     public function emulateWelcomeBlock($block)
     {
-        $customerName = $this->_customerViewHelper->getCustomerName(
-            $this->customerRepository->getById($this->_persistentSession->getSession()->getCustomerId())
-        );
+        $block->setWelcome('&nbsp;');
 
-        $this->_applyAccountLinksPersistentData();
-        $welcomeMessage = __('Welcome, %1!', $customerName);
-        $block->setWelcome($welcomeMessage);
         return $this;
     }
 
diff --git a/app/code/Magento/Persistent/Model/Plugin/PersistentCustomerContext.php b/app/code/Magento/Persistent/Model/Plugin/PersistentCustomerContext.php
new file mode 100644
index 0000000000000..04b4450d93cec
--- /dev/null
+++ b/app/code/Magento/Persistent/Model/Plugin/PersistentCustomerContext.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Persistent\Model\Plugin;
+
+/**
+ * Plugin for Magento\Framework\App\Http\Context to create new page cache variation for persistent session.
+ */
+class PersistentCustomerContext
+{
+    /**
+     * Persistent session
+     *
+     * @var \Magento\Persistent\Helper\Session
+     */
+    private $persistentSession;
+
+    /**
+     * @param \Magento\Persistent\Helper\Session $persistentSession
+     */
+    public function __construct(
+        \Magento\Persistent\Helper\Session $persistentSession
+    ) {
+        $this->persistentSession = $persistentSession;
+    }
+
+    /**
+     * @param \Magento\Framework\App\Http\Context $subject
+     * @return mixed
+     */
+    public function beforeGetVaryString(\Magento\Framework\App\Http\Context $subject)
+    {
+        if ($this->persistentSession->isPersistent()) {
+            $subject->setValue('PERSISTENT', 1, 0);
+        }
+    }
+}
diff --git a/app/code/Magento/Persistent/Model/QuoteManager.php b/app/code/Magento/Persistent/Model/QuoteManager.php
index 8937a4920cb23..8ae22e4c26c6f 100644
--- a/app/code/Magento/Persistent/Model/QuoteManager.php
+++ b/app/code/Magento/Persistent/Model/QuoteManager.php
@@ -7,6 +7,8 @@
 
 /**
  * Class QuoteManager
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class QuoteManager
 {
@@ -87,6 +89,7 @@ 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();
@@ -108,8 +111,9 @@ public function setGuest($checkQuote = false)
      */
     public function convertCustomerCartToGuest()
     {
+        $quoteId = $this->checkoutSession->getQuoteId();
         /** @var $quote \Magento\Quote\Model\Quote */
-        $quote = $this->quoteRepository->get($this->checkoutSession->getQuote()->getId());
+        $quote = $this->quoteRepository->get($quoteId);
         if ($quote && $quote->getId()) {
             $this->_setQuotePersistent = false;
             $quote->setIsActive(true)
diff --git a/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php b/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
index 42baf7d692a7c..7e5a5769e00a5 100644
--- a/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
+++ b/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -11,6 +10,11 @@
 
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Observer of expired session
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
 class CheckExpirePersistentQuoteObserver implements ObserverInterface
 {
     /**
@@ -110,8 +114,12 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             !$this->_persistentSession->isPersistent() &&
             !$this->_customerSession->isLoggedIn() &&
             $this->_checkoutSession->getQuoteId() &&
-            !$this->isRequestFromCheckoutPage($this->request)
+            !$this->isRequestFromCheckoutPage($this->request) &&
             // persistent session does not expire on onepage checkout page
+            (
+                $this->_checkoutSession->getQuote()->getIsPersistent() ||
+                $this->_checkoutSession->getQuote()->getCustomerIsGuest()
+            )
         ) {
             $this->_eventManager->dispatch('persistent_session_expired');
             $this->quoteManager->expire();
diff --git a/app/code/Magento/Persistent/Observer/SetCheckoutSessionPersistentDataObserver.php b/app/code/Magento/Persistent/Observer/SetCheckoutSessionPersistentDataObserver.php
new file mode 100644
index 0000000000000..030eca854c801
--- /dev/null
+++ b/app/code/Magento/Persistent/Observer/SetCheckoutSessionPersistentDataObserver.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Persistent\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+
+/**
+ * Observer for a work with persistent data.
+ */
+class SetCheckoutSessionPersistentDataObserver implements ObserverInterface
+{
+    /**
+     * Persistent session.
+     *
+     * @var \Magento\Persistent\Helper\Session
+     */
+    private $persistentSession = null;
+
+    /**
+     * Customer session.
+     *
+     * @var \Magento\Customer\Model\Session
+     */
+    private $customerSession;
+
+    /**
+     * Persistent data.
+     *
+     * @var \Magento\Persistent\Helper\Data
+     */
+    private $persistentData = null;
+
+    /**
+     * Customer Repository.
+     *
+     * @var \Magento\Customer\Api\CustomerRepositoryInterface
+     */
+    private $customerRepository = null;
+
+    /**
+     * @param \Magento\Persistent\Helper\Session $persistentSession
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Persistent\Helper\Data $persistentData
+     * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
+     */
+    public function __construct(
+        \Magento\Persistent\Helper\Session $persistentSession,
+        \Magento\Customer\Model\Session $customerSession,
+        \Magento\Persistent\Helper\Data $persistentData,
+        \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
+    ) {
+        $this->persistentSession = $persistentSession;
+        $this->customerSession = $customerSession;
+        $this->persistentData = $persistentData;
+        $this->customerRepository = $customerRepository;
+    }
+
+    /**
+     * Pass customer data from persistent session to checkout session and set quote to be loaded even if not active.
+     *
+     * @param \Magento\Framework\Event\Observer $observer
+     * @return void
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        /** @var $checkoutSession \Magento\Checkout\Model\Session */
+        $checkoutSession = $observer->getEvent()->getData('checkout_session');
+        if ($this->persistentData->isShoppingCartPersist() && $this->persistentSession->isPersistent()) {
+            $checkoutSession->setCustomerData(
+                $this->customerRepository->getById($this->persistentSession->getSession()->getCustomerId())
+            );
+        }
+        if (!(($this->persistentSession->isPersistent() && !$this->customerSession->isLoggedIn())
+            && !$this->persistentData->isShoppingCartPersist()
+        )) {
+            return;
+        }
+        if ($checkoutSession) {
+            $checkoutSession->setLoadInactive();
+        }
+    }
+}
diff --git a/app/code/Magento/Persistent/Observer/SetLoadPersistentQuoteObserver.php b/app/code/Magento/Persistent/Observer/SetLoadPersistentQuoteObserver.php
deleted file mode 100644
index 6eeab94a91cca..0000000000000
--- a/app/code/Magento/Persistent/Observer/SetLoadPersistentQuoteObserver.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Persistent\Observer;
-
-use Magento\Framework\Event\ObserverInterface;
-
-class SetLoadPersistentQuoteObserver implements ObserverInterface
-{
-    /**
-     * Customer session
-     *
-     * @var \Magento\Customer\Model\Session
-     */
-    protected $_customerSession;
-
-    /**
-     * Checkout session
-     *
-     * @var \Magento\Checkout\Model\Session
-     */
-    protected $_checkoutSession;
-
-    /**
-     * Persistent session
-     *
-     * @var \Magento\Persistent\Helper\Session
-     */
-    protected $_persistentSession = null;
-
-    /**
-     * Persistent data
-     *
-     * @var \Magento\Persistent\Helper\Data
-     */
-    protected $_persistentData = null;
-
-    /**
-     * @param \Magento\Persistent\Helper\Session $persistentSession
-     * @param \Magento\Persistent\Helper\Data $persistentData
-     * @param \Magento\Customer\Model\Session $customerSession
-     * @param \Magento\Checkout\Model\Session $checkoutSession
-     */
-    public function __construct(
-        \Magento\Persistent\Helper\Session $persistentSession,
-        \Magento\Persistent\Helper\Data $persistentData,
-        \Magento\Customer\Model\Session $customerSession,
-        \Magento\Checkout\Model\Session $checkoutSession
-    ) {
-        $this->_persistentSession = $persistentSession;
-        $this->_customerSession = $customerSession;
-        $this->_checkoutSession = $checkoutSession;
-        $this->_persistentData = $persistentData;
-    }
-
-    /**
-     * Set quote to be loaded even if not active
-     *
-     * @param \Magento\Framework\Event\Observer $observer
-     * @return void
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function execute(\Magento\Framework\Event\Observer $observer)
-    {
-        if (!(($this->_persistentSession->isPersistent() && !$this->_customerSession->isLoggedIn())
-            && !$this->_persistentData->isShoppingCartPersist()
-        )) {
-            return;
-        }
-
-        if ($this->_checkoutSession) {
-            $this->_checkoutSession->setLoadInactive();
-        }
-    }
-}
diff --git a/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php b/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
index db6b6d1ee370d..2803bc998dcbe 100644
--- a/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
+++ b/app/code/Magento/Persistent/Observer/SetQuotePersistentDataObserver.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -8,6 +7,11 @@
 
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Observer for setting "is_persistent" value to quote
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
 class SetQuotePersistentDataObserver implements ObserverInterface
 {
     /**
@@ -73,8 +77,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         }
 
         if ((
-                ($this->_persistentSession->isPersistent() && !$this->_customerSession->isLoggedIn())
-                && !$this->_persistentData->isShoppingCartPersist()
+                ($this->_persistentSession->isPersistent())
+                && $this->_persistentData->isShoppingCartPersist()
             )
             && $this->quoteManager->isPersistent()
         ) {
diff --git a/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontAssertPersistentRegistrationPageFieldsActionGroup.xml b/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontAssertPersistentRegistrationPageFieldsActionGroup.xml
new file mode 100644
index 0000000000000..34409480c9ecf
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontAssertPersistentRegistrationPageFieldsActionGroup.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="StorefrontAssertPersistentRegistrationPageFields" extends="StorefrontAssertRegistrationPageFields">
+        <seeCheckboxIsChecked selector="{{StorefrontCustomerSignInFormSection.rememberMe}}" after="seeConfirmPasswordField" stepKey="seeRememberMeChecked"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml b/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
new file mode 100644
index 0000000000000..9e4551cabeb8e
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.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="CustomerLoginOnStorefrontWithRememberMeChecked" extends="CustomerLoginOnStorefront">
+        <checkOption selector="{{StorefrontCustomerSignInFormSection.rememberMe}}"
+                     before="clickSignInAccountButton"
+                     stepKey="checkRememberMe"/>
+    </actionGroup>
+
+    <actionGroup name="CustomerLoginOnStorefrontWithRememberMeUnChecked" extends="CustomerLoginOnStorefront">
+        <uncheckOption selector="{{StorefrontCustomerSignInFormSection.rememberMe}}"
+                     before="clickSignInAccountButton"
+                     stepKey="unCheckRememberMe"/>
+    </actionGroup>
+
+    <actionGroup name="StorefrontRegisterCustomerRememberMe" extends="SignUpNewUserFromStorefrontActionGroup">
+        <!--- Assume we are on customer registration page. -->
+        <remove keyForRemoval="amOnStorefrontPage"/>
+        <remove keyForRemoval="clickOnCreateAccountLink"/>
+        <checkOption  selector="{{StorefrontCustomerSignInFormSection.rememberMe}}" before="clickCreateAccountButton"  stepKey="checkRememberMe"/>
+    </actionGroup>
+
+    <actionGroup name="StorefrontCreateCustomerOnRegisterPageDoNotRememberMe" extends="SignUpNewUserFromStorefrontActionGroup">
+        <!--- Assume we are on customer registration page. -->
+        <remove keyForRemoval="amOnStorefrontPage"/>
+        <remove keyForRemoval="clickOnCreateAccountLink"/>
+        <uncheckOption  selector="{{StorefrontCustomerSignInFormSection.rememberMe}}" before="clickCreateAccountButton"  stepKey="unCheckRememberMe"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontPersistentAssertCustomerWelcomeMessageActionGroup.xml b/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontPersistentAssertCustomerWelcomeMessageActionGroup.xml
new file mode 100644
index 0000000000000..2b2d88248ab8d
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontPersistentAssertCustomerWelcomeMessageActionGroup.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="StorefrontAssertPersistentCustomerWelcomeMessageActionGroup">
+        <arguments>
+            <argument name="customerFullName" type="string" />
+        </arguments>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{StorefrontPanelHeaderSection.welcomeMessageFullText}}" userInput="Welcome, {{customerFullName}}! Not you?"  stepKey="verifyMessage" />
+    </actionGroup>
+
+    <actionGroup name="StorefrontAssertPersistentCustomerWelcomeMessageNotPresentActionGroup" extends="StorefrontAssertPersistentCustomerWelcomeMessageActionGroup">
+        <remove keyForRemoval="verifyMessage"/>
+        <dontSee selector="{{StorefrontPanelHeaderSection.welcomeMessageFullText}}" userInput="Welcome, {{customerFullName}}! Not you?" stepKey="dontSeeWelcomeMessageNotYou"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Persistent/Test/Mftf/Data/PersistentData.xml b/app/code/Magento/Persistent/Test/Mftf/Data/PersistentData.xml
index a23d1169b6865..5e01931a2b8bf 100644
--- a/app/code/Magento/Persistent/Test/Mftf/Data/PersistentData.xml
+++ b/app/code/Magento/Persistent/Test/Mftf/Data/PersistentData.xml
@@ -6,7 +6,7 @@
   */
 -->
 
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="PersistentConfigDefault" type="persistent_config_state">
         <requiredEntity type="persistent_options_enabled">persistentDefaultState</requiredEntity>
     </entity>
@@ -20,4 +20,74 @@
     <entity name="persistentEnabledState" type="persistent_options_enabled">
         <data key="value">1</data>
     </entity>
+
+    <entity name="PersistentLogoutClearEnabled" type="persistent_config_state">
+        <requiredEntity type="persistent_options_logout_clear">LogoutClearActive</requiredEntity>
+    </entity>
+    <entity name="LogoutClearActive" type="logout_clear">
+        <data key="value">1</data>
+    </entity>
+
+    <entity name="PersistentLogoutClearDisabled" type="persistent_config_state">
+        <requiredEntity type="persistent_options_logout_clear">LogoutClearInactive</requiredEntity>
+    </entity>
+    <entity name="LogoutClearInactive" type="logout_clear">
+        <data key="value">0</data>
+    </entity>
+
+    <!-- Persistent Configurations settings -->
+    <entity name="PersistentConfigSettings" type="persistent_config_state">
+        <requiredEntity type="persistent_options_enabled">persistentEnabledState</requiredEntity>
+        <requiredEntity type="persistent_options_lifetime">SecondsOfPersistentLifetime</requiredEntity>
+        <requiredEntity type="persistent_options_remember_enabled">EnablePersistentRememberMe</requiredEntity>
+        <requiredEntity type="persistent_options_remember_default">EnablePersistentRememberMeDefaultValue</requiredEntity>
+        <requiredEntity type="persistent_options_logout_clear">LogoutClearInactive</requiredEntity>
+        <requiredEntity type="persistent_options_shopping_cart">EnablePersistentShoppingCart</requiredEntity>
+    </entity>
+
+    <entity name="SecondsOfPersistentLifetime" type="lifetime">
+        <data key="value">31536000</data>
+    </entity>
+    <entity name="EnablePersistentRememberMe" type="persistent_options_remember_enabled">
+        <data key="value">1</data>
+    </entity>
+    <entity name="EnablePersistentRememberMeDefaultValue" type="persistent_options_remember_default">
+        <data key="value">1</data>
+    </entity>
+    <entity name="EnablePersistentShoppingCart" type="persistent_options_shopping_cart">
+        <data key="value">1</data>
+    </entity>
+
+    <!-- Use System Value settings -->
+    <entity name="PersistentConfigUseSystemValue" type="persistent_config_state">
+        <requiredEntity type="persistent_options_enabled">RestorePersistentOptionsEnabled</requiredEntity>
+        <requiredEntity type="persistent_options_lifetime">RestorePersistentOptionsLifetime</requiredEntity>
+        <requiredEntity type="persistent_options_remember_enabled">RestorePersistentOptionsRememberEnabled</requiredEntity>
+        <requiredEntity type="persistent_options_remember_default">RestorePersistentOptionsRememberDefault</requiredEntity>
+        <requiredEntity type="persistent_options_logout_clear">RestorePersistentOptionsLogout</requiredEntity>
+        <requiredEntity type="persistent_options_shopping_cart">RestorePersistentOptionsShoppingCart</requiredEntity>
+    </entity>
+
+    <entity name="RestorePersistentOptionsEnabled" type="persistent_options_enabled">
+        <requiredEntity type="persistent_options_use_system_value">PersistentOptionsUseInherit</requiredEntity>
+    </entity>
+    <entity name="RestorePersistentOptionsLogout" type="persistent_options_logout_clear">
+        <requiredEntity type="persistent_options_use_system_value">PersistentOptionsUseInherit</requiredEntity>
+    </entity>
+    <entity name="RestorePersistentOptionsLifetime" type="persistent_options_lifetime">
+        <requiredEntity type="persistent_options_use_system_value">PersistentOptionsUseInherit</requiredEntity>
+    </entity>
+    <entity name="RestorePersistentOptionsRememberEnabled" type="persistent_options_remember_enabled">
+        <requiredEntity type="persistent_options_use_system_value">PersistentOptionsUseInherit</requiredEntity>
+    </entity>
+    <entity name="RestorePersistentOptionsRememberDefault" type="persistent_options_remember_default">
+        <requiredEntity type="persistent_options_use_system_value">PersistentOptionsUseInherit</requiredEntity>
+    </entity>
+    <entity name="RestorePersistentOptionsShoppingCart" type="persistent_options_shopping_cart">
+        <requiredEntity type="persistent_options_use_system_value">PersistentOptionsUseInherit</requiredEntity>
+    </entity>
+
+    <entity name="PersistentOptionsUseInherit" type="persistent_options_use_system_value">
+        <data key="value">1</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Persistent/Test/Mftf/Metadata/perstistent_config-meta.xml b/app/code/Magento/Persistent/Test/Mftf/Metadata/perstistent_config-meta.xml
index 7a84b5deba68f..772e68afa314f 100644
--- a/app/code/Magento/Persistent/Test/Mftf/Metadata/perstistent_config-meta.xml
+++ b/app/code/Magento/Persistent/Test/Mftf/Metadata/perstistent_config-meta.xml
@@ -6,13 +6,46 @@
   */
 -->
 
-<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreatePersistentConfigState" dataType="persistent_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/persistent/" method="POST">
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreatePersistentConfigState" dataType="persistent_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/persistent/" method="POST" successRegex="/messages-message-success/">
         <object key="groups" dataType="persistent_config_state">
              <object key="options" dataType="persistent_config_state">
                 <object key="fields" dataType="persistent_config_state">
                     <object key="enabled" dataType="persistent_options_enabled">
                         <field key="value">string</field>
+                        <object key="inherit" dataType="persistent_options_use_system_value">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="logout_clear" dataType="persistent_options_logout_clear">
+                        <field key="value">string</field>
+                        <object key="inherit" dataType="persistent_options_use_system_value">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="lifetime" dataType="persistent_options_lifetime">
+                        <field key="value">string</field>
+                        <object key="inherit" dataType="persistent_options_use_system_value">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="remember_enabled" dataType="persistent_options_remember_enabled">
+                        <field key="value">string</field>
+                        <object key="inherit" dataType="persistent_options_use_system_value">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="remember_default" dataType="persistent_options_remember_default">
+                        <field key="value">string</field>
+                        <object key="inherit" dataType="persistent_options_use_system_value">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="shopping_cart" dataType="persistent_options_shopping_cart">
+                        <field key="value">string</field>
+                        <object key="inherit" dataType="persistent_options_use_system_value">
+                            <field key="value">integer</field>
+                        </object>
                     </object>
                 </object>
             </object>
diff --git a/app/code/Magento/Persistent/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml b/app/code/Magento/Persistent/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
new file mode 100644
index 0000000000000..c2220c33a6052
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerSignInFormSection">
+        <element name="rememberMe" type="checkbox" selector="[name='persistent_remember_me']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCheckShoppingCartBehaviorAfterSessionExpiredTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCheckShoppingCartBehaviorAfterSessionExpiredTest.xml
new file mode 100644
index 0000000000000..de09d4a02fc3e
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCheckShoppingCartBehaviorAfterSessionExpiredTest.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="CheckShoppingCartBehaviorAfterSessionExpiredTest">
+        <annotations>
+            <features value="Persistent"/>
+            <stories value="MAGETWO-86549 - Unusual behavior with the persistent shopping cart after the session is expired"/>
+            <title value="Checking behavior with the persistent shopping cart after the session is expired"/>
+            <description value="Checking behavior with the persistent shopping cart after the session is expired"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-96637"/>
+            <group value="persistent"/>
+        </annotations>
+        <before>
+            <!--Enable Persistence-->
+            <createData entity="PersistentConfigEnabled" stepKey="enablePersistent"/>
+            <!--Create product and customer-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <!--Roll back configuration-->
+            <createData entity="PersistentConfigDefault" stepKey="setDefaultPersistentState"/>
+            <!--Delete product and customer-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+        </after>
+        <!--Login as a Customer-->
+        <actionGroup ref="CustomerLoginOnStorefront" stepKey="loginToStorefrontAccount">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <!-- Add simple product to cart -->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="goToShoppingCartFromMinicart"/>
+        <!--Reset cookies and refresh the page-->
+        <resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>
+        <reloadPage stepKey="reloadPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <!--Check product exists in cart-->
+        <see userInput="$$createProduct.name$$" stepKey="ProductExistsInCart"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml
new file mode 100644
index 0000000000000..963e453e9a460
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.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="StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest">
+        <annotations>
+            <features value="Persistent"/>
+            <stories value="MAGETWO-95850 - Incorrect use of cookies for customer"/>
+            <title value="Checking welcome message for persistent customer after logout"/>
+            <description value="Checking welcome message for persistent customer after logout"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-97095"/>
+            <group value="persistent"/>
+            <group value="customer"/>
+        </annotations>
+        <before>
+            <!--Enable Persistence-->
+            <createData entity="PersistentConfigEnabled" stepKey="enablePersistent"/>
+            <createData entity="PersistentLogoutClearDisabled" stepKey="persistentLogoutClearDisable"/>
+
+            <!--Create customers-->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer" stepKey="createCustomerForPersistent">
+                <field key="firstname">John1</field>
+                <field key="lastname">Doe1</field>
+            </createData>
+        </before>
+        <after>
+            <!--Roll back configuration-->
+            <createData entity="PersistentConfigDefault" stepKey="setDefaultPersistentState"/>
+            <createData entity="PersistentLogoutClearEnabled" stepKey="persistentLogoutClearEnabled"/>
+
+            <!-- Logout customer on Storefront-->
+            <actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="customerLogoutStorefront"/>
+            <!--Delete customers-->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCustomerForPersistent" stepKey="deleteCustomerForPersistent"/>
+        </after>
+        <!--Login as a Customer with remember me unchecked-->
+        <actionGroup ref="CustomerLoginOnStorefrontWithRememberMeUnChecked" stepKey="loginToStorefrontAccountWithRememberMeUnchecked">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <!--Check customer name and last name in welcome message-->
+        <seeCurrentUrlMatches regex="~/customer/account/~" stepKey="seeCustomerAccountPageUrl"/>
+        <see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!"
+             selector="{{StorefrontHeaderSection.welcomeMessage}}"
+             stepKey="seeLoggedInCustomerWelcomeMessage"/>
+        <!--Logout and check default welcome message-->
+        <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="storefrontCustomerLogout"/>
+        <seeCurrentUrlMatches regex="~/customer/account/logoutSuccess/~" stepKey="seeCustomerSignOutPageUrl"/>
+        <see userInput="Default welcome msg!"
+             selector="{{StorefrontHeaderSection.welcomeMessage}}"
+             stepKey="seeDefaultWelcomeMessage"/>
+
+        <!--Login as a Customer with remember me checked-->
+        <actionGroup ref="CustomerLoginOnStorefrontWithRememberMeChecked" stepKey="loginToStorefrontAccountWithRememberMeChecked">
+            <argument name="customer" value="$$createCustomerForPersistent$$"/>
+        </actionGroup>
+        <!--Check customer name and last name in welcome message-->
+        <seeCurrentUrlMatches regex="~/customer/account/~" stepKey="seeCustomerAccountPageUrl1"/>
+        <see userInput="Welcome, $$createCustomerForPersistent.firstname$$ $$createCustomerForPersistent.lastname$$!"
+             selector="{{StorefrontHeaderSection.welcomeMessage}}"
+             stepKey="seeLoggedInCustomerWelcomeMessage1"/>
+
+        <!--Logout and check persistent customer welcome message-->
+        <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="storefrontCustomerLogout1"/>
+        <seeCurrentUrlMatches regex="~/customer/account/logoutSuccess/~" stepKey="seeCustomerSignOutPageUrl1"/>
+        <see userInput="Welcome, $$createCustomerForPersistent.firstname$$ $$createCustomerForPersistent.lastname$$! Not you?"
+             selector="{{StorefrontHeaderSection.welcomeMessage}}"
+             stepKey="seePersistentWelcomeMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontQuoteShippingDataPersistedForGuestTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontQuoteShippingDataPersistedForGuestTest.xml
new file mode 100644
index 0000000000000..908a037ed36a2
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontQuoteShippingDataPersistedForGuestTest.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="StorefrontQuoteShippingDataPersistedForGuestTest">
+        <annotations>
+            <features value="Persistent"/>
+            <stories value="Checkout via Guest Checkout"/>
+            <title value="Estimate Shipping and Tax block sections on shipping cart saving correctly for Guest."/>
+            <description value="Verify that 'Estimate Shipping and Tax' block sections on shipping cart saving correctly for Guest after switching to another page. And check that the shopping cart is cleared after reset persistent cookie."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-99048"/>
+            <useCaseId value="MAGETWO-98569"/>
+            <group value="persistent"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <!--Enabled The Persistent Shopping Cart feature -->
+            <createData entity="PersistentConfigEnabled" stepKey="enablePersistent"/>
+            <createData entity="PersistentLogoutClearDisabled" stepKey="persistentLogoutClearDisable"/>
+            <!--Create category and simple product-->
+            <createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
+            <createData entity="SimpleProduct2" stepKey="createProduct">
+                <requiredEntity createDataKey="createSubCategory"/>
+            </createData>
+            <!--Create customer-->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer">
+                <field key="firstname">John1</field>
+                <field key="lastname">Doe1</field>
+            </createData>
+        </before>
+        <after>
+            <!--Revert persistent configuration to default-->
+            <createData entity="PersistentConfigDefault" stepKey="setDefaultPersistentState"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createSubCategory" stepKey="deleteSubCategory"/>
+        </after>
+        <!--Step 1: Login as a Customer with remember me checked-->
+        <actionGroup ref="CustomerLoginOnStorefrontWithRememberMeChecked" stepKey="loginToStorefrontAccountWithRememberMeChecked">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <!--Step 2: Open the Product Page and add the product to shopping cart-->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToProductPageAsLoggedUser"/>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProductToCartAsLoggedUser">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+        <!--Step 3: Log out, reset persistent cookie and go to homepage-->
+        <actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="customerLogout"/>
+        <resetCookie userInput="persistent_shopping_cart" stepKey="resetPersistentCookie"/>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnHomePageAfterResetPersistentCookie"/>
+        <!--Check that the minicart is empty-->
+        <actionGroup ref="AssertMiniCartEmpty" after="amOnHomePageAfterResetPersistentCookie" stepKey="seeMinicartEmpty"/>
+        <!--Step 4: Add the product to shopping cart and open cart-->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToProductPageAsGuestUser"/>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProductToCartAsGuestUser">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartBeforeChangeShippingAndTaxSection"/>
+        <!--Step 5: Open Estimate Shipping and Tax block and fill the sections-->
+        <conditionalClick  selector="{{StorefrontCheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{StorefrontCheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingAndTax" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <selectOption selector="{{StorefrontCheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country}}" stepKey="selectUSCountry"/>
+        <waitForPageLoad stepKey="waitAfterSelectCountry"/>
+        <selectOption selector="{{StorefrontCheckoutCartSummarySection.region}}" userInput="{{US_Address_CA.state}}" stepKey="selectCaliforniaRegion"/>
+        <waitForPageLoad stepKey="waitAfterSelectRegion"/>
+        <fillField selector="{{StorefrontCheckoutCartSummarySection.postcode}}" userInput="{{US_Address_CA.postcode}}" stepKey="inputPostCode"/>
+        <waitForPageLoad stepKey="waitAfterSelectPostcode"/>
+        <!--Step 6: Go to Homepage-->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePageAfterChangingShippingAndTaxSection"/>
+        <!--Step 7: Go to shopping cart and check "Estimate Shipping and Tax" fields values are saved-->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" after="goToHomePageAfterChangingShippingAndTaxSection" stepKey="goToShoppingCartAfterChangingShippingAndTaxSection"/>
+        <conditionalClick  selector="{{StorefrontCheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{StorefrontCheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingAndTaxAfterChanging" />
+        <waitForLoadingMaskToDisappear stepKey="waitEstimateBlock"/>
+        <seeOptionIsSelected selector="{{StorefrontCheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country}}" stepKey="checkCustomerCountry" />
+        <seeOptionIsSelected selector="{{StorefrontCheckoutCartSummarySection.region}}" userInput="{{US_Address_CA.state}}" stepKey="checkCustomerRegion" />
+        <grabValueFrom  selector="{{StorefrontCheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
+        <assertEquals  message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
+            <expectedResult type="string">{{US_Address_CA.postcode}}</expectedResult>
+            <actualResult type="variable">grabTextPostCode</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceUnderLongTermCookieTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceUnderLongTermCookieTest.xml
new file mode 100644
index 0000000000000..ffc310fcf30d9
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceUnderLongTermCookieTest.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontVerifyShoppingCartPersistenceUnderLongTermCookieTest">
+        <annotations>
+            <features value="Persistent"/>
+            <stories value="Shopping Cart Persistence"/>
+            <title value="Verify Shopping Cart Persistence under long-term cookie"/>
+            <description value="Verify Shopping Cart Persistence under long-term cookie"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-10263"/>
+            <group value="persistent"/>
+            <group value="customer"/>
+        </annotations>
+        <before>
+            <!--Enable Persistence-->
+            <createData entity="PersistentConfigSettings" stepKey="persistentConfigSetting"/>
+            <!--Create Simple Product 1  and Product 2 -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimple1">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="_defaultProduct" stepKey="createSimple2">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <!-- Set Defaults Persistence configuration-->
+            <createData entity="PersistentConfigUseSystemValue" stepKey="persistentDefaultsConfiguration"/>
+            <!--Delete Simple Product 1, Product 2 and Category-->
+            <deleteData createDataKey="createSimple1" stepKey="deleteSimple1"/>
+            <deleteData createDataKey="createSimple2" stepKey="deleteSimple2"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+            <actionGroup ref="RemoveCustomerFromAdminActionGroup" stepKey="deleteJohnSmithCustomer">
+                <argument name="customer" value="John_Smith_Customer"/>
+            </actionGroup>
+            <actionGroup ref="RemoveCustomerFromAdminActionGroup" stepKey="deleteJohnDoeCustomer">
+                <argument name="customer" value="Simple_Customer_Without_Address"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- 1. Go to storefront and click the Create an Account link-->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnHomePage"/>
+        <click selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}" stepKey="clickCreateAnAccountLink" />
+        <actionGroup ref="StorefrontAssertPersistentRegistrationPageFields" stepKey="assertPersistentRegistrationPageFields"/>
+
+        <!-- 2. Fill fields for registration, set password and unselect the Remember Me checkbox-->
+        <actionGroup ref="StorefrontCreateCustomerOnRegisterPageDoNotRememberMe" stepKey="registrationJohnSmithCustomer">
+            <argument name="Customer" value="John_Smith_Customer"/>
+        </actionGroup>
+        <!--Check customer name and last name in welcome message-->
+        <actionGroup ref="StorefrontAssertMessageCustomerCreateAccountActionGroup" stepKey="customerCreatedSuccessMessageForJohnSmith"/>
+        <actionGroup ref="StorefrontAssertCustomerWelcomeMessageActionGroup" stepKey="seeWelcomeMessageForJohnSmithCustomer">
+            <argument name="customerFullName" value="{{John_Smith_Customer.fullname}}"/>
+        </actionGroup>
+
+        <!-- 3. Put Simple Product 1 into Shopping Cart -->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addSimple1ProductToCartForJohnSmithCustomer">
+            <argument name="product" value="$$createSimple1$$"/>
+        </actionGroup>
+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="checkSimple1InMiniCartForJohnSmithCustomer">
+            <argument name="productName" value="$$createSimple1.name$$"/>
+        </actionGroup>
+
+        <!-- 4. Click Sign Out -->
+        <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="logoutJohnSmithCustomer"/>
+        <actionGroup ref="StorefrontWaitCustomerLoggedOut" stepKey="waitJohnSmithCustomerLoggedOut"/>
+        <actionGroup ref="StorefrontAssertPersistentCustomerWelcomeMessageNotPresentActionGroup" stepKey="dontSeeWelcomeJohnSmithCustomerNotYouMessage">
+            <argument name="customerFullName" value="{{John_Smith_Customer.fullname}}"/>
+        </actionGroup>
+        <actionGroup ref="AssertMiniCartEmpty" stepKey="assertMiniCartEmptyAfterJohnSmithSignOut" />
+
+        <!-- 5. Click the Create an Account link again and fill fields for registration of another customer, set password and check the Remember Me checkbox  -->
+        <amOnPage url="{{StorefrontCustomerCreatePage.url}}" stepKey="amOnCustomerAccountCreatePage"/>
+        <actionGroup ref="StorefrontRegisterCustomerRememberMe" stepKey="registrationJohnDoeCustomer">
+            <argument name="Customer" value="Simple_Customer_Without_Address"/>
+        </actionGroup>
+        <!--Check customer name and last name in welcome message-->
+        <actionGroup ref="StorefrontAssertMessageCustomerCreateAccountActionGroup" stepKey="customerCreatedSuccessMessageForJohnDoe"/>
+        <actionGroup ref="StorefrontAssertCustomerWelcomeMessageActionGroup" stepKey="seeWelcomeMessageForJohnDoeCustomer">
+            <argument name="customerFullName" value="{{Simple_Customer_Without_Address.fullname}}"/>
+        </actionGroup>
+        <!-- 6. Add Simple Product 1 to Shopping Cart  -->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addSimple1ProductToCartForJohnDoeCustomer">
+            <argument name="product" value="$$createSimple1$$"/>
+        </actionGroup>
+        <see selector="{{StorefrontMinicartSection.productCount}}" userInput="1" stepKey="miniCartContainsOneProductForJohnDoeCustomer"/>
+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="checkSimple1InMiniCartForJohnDoeCustomer">
+            <argument name="productName" value="$$createSimple1.name$$"/>
+        </actionGroup>
+
+        <!-- 7. Click Log Out  -->
+        <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="logoutJohnDoeCustomer"/>
+        <actionGroup ref="StorefrontWaitCustomerLoggedOut" stepKey="waitJohnDoeCustomerLoggedOut"/>
+        <actionGroup ref="StorefrontAssertPersistentCustomerWelcomeMessageActionGroup" stepKey="seeWelcomeForJohnDoeCustomer">
+            <argument name="customerFullName" value="{{Simple_Customer_Without_Address.fullname}}"/>
+        </actionGroup>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.productCount}}" stepKey="waitForCartCounterVisible"/>
+        <see selector="{{StorefrontMinicartSection.productCount}}" userInput="1" stepKey="miniCartContainsOneProductForGuest"/>
+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="checkSimple1InMiniCartForGuestCustomer">
+            <argument name="productName" value="$$createSimple1.name$$"/>
+        </actionGroup>
+
+        <!-- 8. Go to Shopping Cart and verify Simple Product 1 is present there  -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCart" />
+        <see selector="{{CheckoutCartProductSection.productName}}" userInput="$$createSimple1.name$$" stepKey="checkSimple1InShoppingCart"/>
+
+        <!-- 9. Add Simple Product 2 to Shopping Cart  -->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addSimple2ProductToCartForGuest">
+            <argument name="product" value="$$createSimple2$$"/>
+        </actionGroup>
+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="checkSimple1InMiniCartForGuestCustomerSecondTime">
+            <argument name="productName" value="$$createSimple1.name$$"/>
+        </actionGroup>
+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="checkSimple2InMiniCartForGuestCustomer">
+            <argument name="productName" value="$$createSimple2.name$$"/>
+        </actionGroup>
+        <see selector="{{StorefrontMinicartSection.productCount}}" userInput="2" stepKey="miniCartContainsTwoProductForGuest"/>
+
+        <!-- 10. Go to My Account section  -->
+        <amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="amOnCustomerAccountPage"/>
+        <seeInCurrentUrl url="{{StorefrontCustomerSignInPage.url}}" stepKey="redirectToCustomerAccountLoginPage"/>
+        <seeElement selector="{{StorefrontCustomerSignInFormSection.customerLoginBlock}}" stepKey="checkSystemRequiresToLogIn"/>
+
+        <!-- 11. Log in as John Doe  -->
+        <actionGroup ref="CustomerLoginOnStorefront" stepKey="logInAsJohnDoeCustomer">
+            <argument name="customer" value="Simple_Customer_Without_Address"/>
+        </actionGroup>
+        <see selector="{{StorefrontMinicartSection.productCount}}" userInput="2" stepKey="miniCartContainsTwoProductForJohnDoeCustomer"/>
+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="checkSimple1InMiniCartForJohnDoeCustomerSecondTime">
+            <argument name="productName" value="$$createSimple1.name$$"/>
+        </actionGroup>
+        <actionGroup ref="assertOneProductNameInMiniCart" stepKey="checkSimple2InMiniCartForJohnDoeCustomer">
+            <argument name="productName" value="$$createSimple2.name$$"/>
+        </actionGroup>
+
+        <!-- 12. Sign out and click the Not you? link  -->
+        <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="logoutJohnDoeCustomerSecondTime"/>
+        <actionGroup ref="StorefrontWaitCustomerLoggedOut" stepKey="waitJohnDoeCustomerLoggedOutSecondTime"/>
+        <click selector="{{StorefrontPanelHeaderSection.notYouLink}}" stepKey="clickOnNotYouLink" />
+        <waitForPageLoad stepKey="waitForCustomerLoginPageLoad"/>
+        <actionGroup ref="AssertMiniCartEmpty" stepKey="assertMiniCartEmptyAfterJohnDoeSignOut" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyThatInformationAboutViewingComparisonWishlistIsPersistedUnderLongTermCookieTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyThatInformationAboutViewingComparisonWishlistIsPersistedUnderLongTermCookieTest.xml
new file mode 100644
index 0000000000000..86af061cc26f8
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyThatInformationAboutViewingComparisonWishlistIsPersistedUnderLongTermCookieTest.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontVerifyThatInformationAboutViewingComparisonWishlistIsPersistedUnderLongTermCookieTest">
+        <annotations>
+            <features value="Persistent"/>
+            <stories value="Catalog widget"/>
+            <title value="Verify that information about viewing, comparison, wishlist and last ordered items is persisted under long-term cookie"/>
+            <description value="Verify that information about viewing, comparison, wishlist and last ordered items is persisted under long-term cookie"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-9931"/>
+            <group value="persistent"/>
+            <group value="widget"/>
+            <group value="catalog_widget"/>
+            <skip>
+                <issueId value="MC-15906"/>
+            </skip>
+        </annotations>
+        <before>
+            <createData entity="PersistentConfigEnabled" stepKey="enablePersistent"/>
+            <createData entity="PersistentLogoutClearDisabled" stepKey="persistentLogoutClearDisable"/>
+            <createData entity="EnableSynchronizeWidgetProductsWithBackendStorage" stepKey="enableSynchronizeWidgetProductsWithBackendStorage"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSecondSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <actionGroup ref="AdminCreateRecentlyProductsWidgetActionGroup" stepKey="createRecentlyComparedProductsWidget">
+                <argument name="widget" value="RecentlyComparedProductsWidget"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateRecentlyProductsWidgetActionGroup" stepKey="createRecentlyViewedProductsWidget">
+                <argument name="widget" value="RecentlyViewedProductsWidget"/>
+            </actionGroup>
+        </before>
+        <after>
+            <createData entity="PersistentConfigDefault" stepKey="setDefaultPersistentState"/>
+            <createData entity="PersistentLogoutClearEnabled" stepKey="persistentLogoutClearEnabled"/>
+            <createData entity="DisableSynchronizeWidgetProductsWithBackendStorage" stepKey="disableSynchronizeWidgetProductsWithBackendStorage"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+
+            <actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="logoutFromCustomer"/>
+            <actionGroup ref="AdminDeleteWidgetActionGroup" stepKey="deleteRecentlyComparedProductsWidget">
+                <argument name="widget" value="RecentlyComparedProductsWidget"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteWidgetActionGroup" stepKey="deleteRecentlyViewedProductsWidget">
+                <argument name="widget" value="RecentlyViewedProductsWidget"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Login to storefront from customer-->
+        <actionGroup ref="CustomerLoginOnStorefrontWithRememberMeChecked" stepKey="loginCustomer">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!" selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" stepKey="checkWelcomeMessage"/>
+
+        <!--Open the details page of Simple Product 1, Simple Product 2 and add to cart, get to the category-->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addSimpleProductProductToCart">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addSecondSimpleProductProductToCart">
+            <argument name="product" value="$$createSecondSimpleProduct$$"/>
+        </actionGroup>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.custom_attributes[url_key]$$)}}" stepKey="openCategoryPageAfterAddedProductToCart"/>
+        <!--The Recently Viewed widget displays Simple Product 1 and Simple Product 2-->
+        <actionGroup ref="StorefrontAssertProductInRecentlyViewedWidgetActionGroup" stepKey="seeSimpleProductInRecentlyViewedWidget">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertProductInRecentlyViewedWidgetActionGroup" stepKey="seeSecondSimpleProductInRecentlyViewedWidget">
+            <argument name="product" value="$$createSecondSimpleProduct$$"/>
+        </actionGroup>
+
+        <!--Add Simple Product 1 and Simple Product 2 to Wishlist-->
+        <actionGroup ref="StorefrontCustomerAddCategoryProductToWishlistActionGroup" stepKey="addSimpleProductToWishlist">
+            <argument name="productVar" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.custom_attributes[url_key]$$)}}" stepKey="openCategoryPageAfterProductAddToWishlist"/>
+        <actionGroup ref="StorefrontCustomerAddCategoryProductToWishlistActionGroup" stepKey="addSecondSimpleProductToWishlist">
+            <argument name="productVar" value="$$createSecondSimpleProduct$$"/>
+        </actionGroup>
+        <!--The My Wishlist widget displays Simple Product 1 and Simple Product 2-->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.custom_attributes[url_key]$$)}}" stepKey="openCategoryPageToCheckProductsInWishlistSidebar"/>
+        <actionGroup ref="StorefrontCustomerCheckProductInWishlistSidebar" stepKey="checkSimpleProductInWishlistSidebar">
+            <argument name="productVar" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerCheckProductInWishlistSidebar" stepKey="checkSecondSimpleProductInWishlistSidebar">
+            <argument name="productVar" value="$$createSecondSimpleProduct$$"/>
+        </actionGroup>
+
+        <!--Add to compare Simple Product and Simple Product 2-->
+        <actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="addSimpleProductToCompare" >
+            <argument name="productVar" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="addSecondSimpleProductToCompare" >
+            <argument name="productVar" value="$$createSecondSimpleProduct$$"/>
+        </actionGroup>
+        <!--The Compare Products widget displays Simple Product 1 and Simple Product 2-->
+        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="checkSimpleProductInCompareSidebar">
+            <argument name="productVar" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="checkSecondSimpleProductInCompareSidebar">
+            <argument name="productVar" value="$$createSecondSimpleProduct$$"/>
+        </actionGroup>
+
+        <!--Click Clear all in the Compare Products widget-->
+        <actionGroup ref="StorefrontClearCompareActionGroup" stepKey="clearCompareList"/>
+        <!--The Recently Compared widget displays Simple Product 1 and Simple Product 2-->
+        <actionGroup ref="StorefrontAssertProductInRecentlyComparedWidgetActionGroup" stepKey="checkSimpleProductInRecentlyComparedWidget">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertProductInRecentlyComparedWidgetActionGroup" stepKey="checkSecondSimpleProductInRecentlyComparedWidget">
+            <argument name="product" value="$$createSecondSimpleProduct$$"/>
+        </actionGroup>
+
+        <!--Place the order-->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage"/>
+        <actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeOrder">
+            <argument name="shippingMethod" value="Flat Rate"/>
+        </actionGroup>
+        <!--The Recently Ordered widget displays Simple Product 1 and Simple Product 2-->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.custom_attributes[url_key]$$)}}" stepKey="openCategoryPageToCheckProductsInRecentlyOrderedWidget"/>
+        <actionGroup ref="StorefrontAssertProductInRecentlyOrderedWidgetActionGroup" stepKey="checkSimpleProductInRecentlyOrderedWidget">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertProductInRecentlyOrderedWidgetActionGroup" stepKey="checkSecondSimpleProductInRecentlyOrderedWidget">
+            <argument name="product" value="$$createSecondSimpleProduct$$"/>
+        </actionGroup>
+
+        <!--Sign out and check that widgets persist the information about the items-->
+        <actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="logoutFromCustomerToCheckThatWidgetsPersist"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.custom_attributes[url_key]$$)}}" stepKey="openCategoryPageAfterLogoutFromCustomer"/>
+        <see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!" selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" stepKey="checkWelcomeMessageAfterLogoutFromCustomer"/>
+        <seeElement selector="{{StorefrontPanelHeaderSection.notYouLink}}" stepKey="checkLinkNotYouAfterLogoutFromCustomer"/>
+
+        <actionGroup ref="StorefrontAssertProductInRecentlyViewedWidgetActionGroup" stepKey="checkSimpleProductInRecentlyViewedWidgetAfterLogout">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerCheckProductInWishlistSidebar" stepKey="checkSimpleProductInWishlistSidebarAfterLogout">
+            <argument name="productVar" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertProductInRecentlyComparedWidgetActionGroup" stepKey="checkSimpleProductInRecentlyComparedWidgetAfterLogout">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertProductInRecentlyOrderedWidgetActionGroup" stepKey="checkSimpleProductInRecentlyOrderedWidgetAfterLogout">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+
+        <!--Click the *Not you?* link and check the price for Simple Product-->
+        <click selector="{{StorefrontPanelHeaderSection.notYouLink}}" stepKey="clickLinkNotYou"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterClickLinkNotYou"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.custom_attributes[url_key]$$)}}" stepKey="openCategoryPageAfterClickNotYou"/>
+        <see userInput="Default welcome msg!" selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" stepKey="checkWelcomeMessageAfterClickLinkNotYou"/>
+        <dontSee selector="{{StorefrontWidgetsSection.widgetRecentlyViewedProductsGrid}}" userInput="$$createSimpleProduct.name$$" stepKey="dontSeeProductInRecentlyViewedWidget"/>
+        <dontSee selector="{{StorefrontCustomerWishlistSidebarSection.productTitleByName($$createSimpleProduct.name$$)}}" stepKey="dontSeeProductInWishlistWidget"/>
+        <dontSee selector="{{StorefrontWidgetsSection.widgetRecentlyComparedProductsGrid}}" userInput="$$createSimpleProduct.name$$" stepKey="dontSeeProductInRecentlyComparedWidget"/>
+        <dontSee selector="{{StorefrontWidgetsSection.widgetRecentlyOrderedProductsGrid}}" userInput="$$createSimpleProduct.name$$" stepKey="dontSeeProductInRecentlyOrderedWidget"/>
+
+        <!--Login to storefront from customer again-->
+        <actionGroup ref="CustomerLoginOnStorefrontWithRememberMeChecked" stepKey="logInFromCustomerAfterClearLongTermCookie">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.custom_attributes[url_key]$$)}}" stepKey="openCategoryPageToCheckWidgets"/>
+        <see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!" selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" stepKey="checkWelcomeMessageAfterLogin"/>
+
+        <actionGroup ref="StorefrontCustomerCheckProductInWishlistSidebar" stepKey="checkSimpleProductNameInWishlistSidebarAfterLogin">
+            <argument name="productVar" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertProductInRecentlyViewedWidgetActionGroup" stepKey="checkSimpleProductInRecentlyViewedWidgetAfterLogin">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertProductInRecentlyComparedWidgetActionGroup" stepKey="checkSimpleProductInRecentlyComparedWidgetAfterLogin">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertProductInRecentlyOrderedWidgetActionGroup" stepKey="checkSimpleProductInRecentlyOrderedWidgetAfterLogin">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php b/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php
index b88b02ab4cfb5..a6ad8b1aaab33 100644
--- a/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php
@@ -34,44 +34,14 @@ class AdditionalTest extends \PHPUnit\Framework\TestCase
     protected $contextMock;
 
     /**
-     * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $eventManagerMock;
+    private $jsonSerializerMock;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Persistent\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $scopeConfigMock;
-
-    /**
-     * @var \Magento\Framework\App\Cache\StateInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $cacheStateMock;
-
-    /**
-     * @var \Magento\Framework\App\CacheInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $cacheMock;
-
-    /**
-     * @var \Magento\Framework\Session\SidResolverInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $sidResolverMock;
-
-    /**
-     * @var \Magento\Framework\Session\SessionManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $sessionMock;
-
-    /**
-     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $escaperMock;
-
-    /**
-     * @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $urlBuilderMock;
+    private $persistentHelperMock;
 
     /**
      * @var \Magento\Persistent\Block\Header\Additional
@@ -93,17 +63,7 @@ protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->contextMock = $this->createPartialMock(\Magento\Framework\View\Element\Template\Context::class, [
-                'getEventManager',
-                'getScopeConfig',
-                'getCacheState',
-                'getCache',
-                'getInlineTranslation',
-                'getSidResolver',
-                'getSession',
-                'getEscaper',
-                'getUrlBuilder'
-            ]);
+        $this->contextMock = $this->createPartialMock(\Magento\Framework\View\Element\Template\Context::class, []);
         $this->customerViewHelperMock = $this->createMock(\Magento\Customer\Helper\View::class);
         $this->persistentSessionHelperMock = $this->createPartialMock(
             \Magento\Persistent\Helper\Session::class,
@@ -119,103 +79,14 @@ protected function setUp()
             ['getById']
         );
 
-        $this->eventManagerMock = $this->getMockForAbstractClass(
-            \Magento\Framework\Event\ManagerInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['dispatch']
-        );
-        $this->scopeConfigMock = $this->getMockForAbstractClass(
-            \Magento\Framework\App\Config\ScopeConfigInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['getValue']
-        );
-        $this->cacheStateMock = $this->getMockForAbstractClass(
-            \Magento\Framework\App\Cache\StateInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['isEnabled']
+        $this->jsonSerializerMock = $this->createPartialMock(
+            \Magento\Framework\Serialize\Serializer\Json::class,
+            ['serialize']
         );
-        $this->cacheMock = $this->getMockForAbstractClass(
-            \Magento\Framework\App\CacheInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['load']
+        $this->persistentHelperMock = $this->createPartialMock(
+            \Magento\Persistent\Helper\Data::class,
+            ['getLifeTime']
         );
-        $this->sidResolverMock = $this->getMockForAbstractClass(
-            \Magento\Framework\Session\SidResolverInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['getSessionIdQueryParam']
-        );
-        $this->sessionMock = $this->getMockForAbstractClass(
-            \Magento\Framework\Session\SessionManagerInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['getSessionId']
-        );
-        $this->escaperMock = $this->getMockForAbstractClass(
-            \Magento\Framework\Escaper::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['escapeHtml']
-        );
-        $this->urlBuilderMock = $this->getMockForAbstractClass(
-            \Magento\Framework\UrlInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['getUrl']
-        );
-
-        $this->contextMock->expects($this->once())
-            ->method('getEventManager')
-            ->willReturn($this->eventManagerMock);
-        $this->contextMock->expects($this->once())
-            ->method('getScopeConfig')
-            ->willReturn($this->scopeConfigMock);
-        $this->contextMock->expects($this->once())
-            ->method('getCacheState')
-            ->willReturn($this->cacheStateMock);
-        $this->contextMock->expects($this->once())
-            ->method('getCache')
-            ->willReturn($this->cacheMock);
-        $this->contextMock->expects($this->once())
-            ->method('getSidResolver')
-            ->willReturn($this->sidResolverMock);
-        $this->contextMock->expects($this->once())
-            ->method('getSession')
-            ->willReturn($this->sessionMock);
-        $this->contextMock->expects($this->once())
-            ->method('getEscaper')
-            ->willReturn($this->escaperMock);
-        $this->contextMock->expects($this->once())
-            ->method('getUrlBuilder')
-            ->willReturn($this->urlBuilderMock);
 
         $this->additional = $this->objectManager->getObject(
             \Magento\Persistent\Block\Header\Additional::class,
@@ -224,91 +95,48 @@ protected function setUp()
                 'customerViewHelper' => $this->customerViewHelperMock,
                 'persistentSessionHelper' => $this->persistentSessionHelperMock,
                 'customerRepository' => $this->customerRepositoryMock,
-                'data' => []
+                'data' => [],
+                'jsonSerializer' => $this->jsonSerializerMock,
+                'persistentHelper' => $this->persistentHelperMock,
             ]
         );
     }
 
     /**
-     * Run test toHtml method
-     *
-     * @param bool $customerId
      * @return void
-     *
-     * @dataProvider dataProviderToHtml
      */
-    public function testToHtml($customerId)
+    public function testGetCustomerId()
     {
-        $cacheData = false;
-        $idQueryParam = 'id-query-param';
-        $sessionId = 'session-id';
-
-        $this->additional->setData('cache_lifetime', 789);
-        $this->additional->setData('cache_key', 'cache-key');
-
-        $this->eventManagerMock->expects($this->at(0))
-            ->method('dispatch')
-            ->with('view_block_abstract_to_html_before', ['block' => $this->additional]);
-        $this->eventManagerMock->expects($this->at(1))
-            ->method('dispatch')
-            ->with('view_block_abstract_to_html_after');
-        $this->scopeConfigMock->expects($this->once())
-            ->method('getValue')
-            ->with(
-                'advanced/modules_disable_output/Magento_Persistent',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-            )->willReturn(false);
-
-        // get cache
-        $this->cacheStateMock->expects($this->at(0))
-            ->method('isEnabled')
-            ->with(\Magento\Persistent\Block\Header\Additional::CACHE_GROUP)
-            ->willReturn(true);
-        // save cache
-        $this->cacheStateMock->expects($this->at(1))
-            ->method('isEnabled')
-            ->with(\Magento\Persistent\Block\Header\Additional::CACHE_GROUP)
-            ->willReturn(false);
-
-        $this->cacheMock->expects($this->once())
-            ->method('load')
-            ->willReturn($cacheData);
-        $this->sidResolverMock->expects($this->never())
-            ->method('getSessionIdQueryParam')
-            ->with($this->sessionMock)
-            ->willReturn($idQueryParam);
-        $this->sessionMock->expects($this->never())
-            ->method('getSessionId')
-            ->willReturn($sessionId);
-
-        // call protected _toHtml method
+        $customerId = 1;
+        /** @var \Magento\Persistent\Model\Session|\PHPUnit_Framework_MockObject_MockObject $sessionMock */
         $sessionMock = $this->createPartialMock(\Magento\Persistent\Model\Session::class, ['getCustomerId']);
-
-        $this->persistentSessionHelperMock->expects($this->atLeastOnce())
-            ->method('getSession')
-            ->willReturn($sessionMock);
-
-        $sessionMock->expects($this->atLeastOnce())
+        $sessionMock->expects($this->once())
             ->method('getCustomerId')
             ->willReturn($customerId);
+        $this->persistentSessionHelperMock->expects($this->once())
+            ->method('getSession')
+            ->willReturn($sessionMock);
 
-        if ($customerId) {
-            $this->assertEquals('<span><a  >Not you?</a></span>', $this->additional->toHtml());
-        } else {
-            $this->assertEquals('', $this->additional->toHtml());
-        }
+        $this->assertEquals($customerId, $this->additional->getCustomerId());
     }
 
     /**
-     * Data provider for dataProviderToHtml method
-     *
-     * @return array
+     * @return void
      */
-    public function dataProviderToHtml()
+    public function testGetConfig()
     {
-        return [
-            ['customerId' => 2],
-            ['customerId' => null],
-        ];
+        $lifeTime = 500;
+        $arrayToSerialize = ['expirationLifetime' => $lifeTime];
+        $serializedArray = '{"expirationLifetime":' . $lifeTime . '}';
+
+        $this->persistentHelperMock->expects($this->once())
+            ->method('getLifeTime')
+            ->willReturn($lifeTime);
+        $this->jsonSerializerMock->expects($this->once())
+            ->method('serialize')
+            ->with($arrayToSerialize)
+            ->willReturn($serializedArray);
+
+        $this->assertEquals($serializedArray, $this->additional->getConfig());
     }
 }
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/Checkout/GuestPaymentInformationManagementPluginTest.php b/app/code/Magento/Persistent/Test/Unit/Model/Checkout/GuestPaymentInformationManagementPluginTest.php
index b9285715146a5..c7f84b476fa7e 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/Checkout/GuestPaymentInformationManagementPluginTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/Checkout/GuestPaymentInformationManagementPluginTest.php
@@ -102,8 +102,7 @@ public function testBeforeSavePaymentInformationAndPlaceOrderCartConvertsToGuest
             ['setCustomerEmail', 'getAddressesCollection'],
             false
         );
-        $this->checkoutSessionMock->expects($this->once())->method('getQuote')->willReturn($quoteMock);
-        $quoteMock->expects($this->once())->method('getId')->willReturn($cartId);
+        $this->checkoutSessionMock->method('getQuoteId')->willReturn($cartId);
         $this->cartRepositoryMock->expects($this->once())->method('get')->with($cartId)->willReturn($quoteMock);
         $quoteMock->expects($this->once())->method('setCustomerEmail')->with($email);
         /** @var \Magento\Framework\Data\Collection|\PHPUnit_Framework_MockObject_MockObject $collectionMock */
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php
index 7008a9eb25e5d..dd299fe30d646 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php
@@ -80,31 +80,18 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testEmulateWelcomeBlock()
     {
-        $customerId = 1;
-        $customerName = 'Test Customer Name';
-        $welcomeMessage =  __('Welcome, %1!', $customerName);
-        $customerMock = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
+        $welcomeMessage =  __('&nbsp;');
         $block = $this->getMockBuilder(\Magento\Framework\View\Element\AbstractBlock::class)
             ->disableOriginalConstructor()
             ->setMethods(['setWelcome'])
             ->getMock();
-        $headerAdditionalBlock = $this->getMockBuilder(\Magento\Framework\View\Element\AbstractBlock::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->persistentSessionMock->expects($this->once())->method('getSession')->willReturn($this->sessionMock);
-        $this->sessionMock->expects($this->once())->method('getCustomerId')->willReturn($customerId);
-        $this->customerRepositoryMock
-            ->expects($this->once())
-            ->method('getById')
-            ->with($customerId)->willReturn($customerMock);
-        $this->customerViewHelperMock->expects($this->once())->method('getCustomerName')->willReturn($customerName);
-        $this->layoutMock->expects($this->once())
-            ->method('getBlock')
-            ->with('header.additional')
-            ->willReturn($headerAdditionalBlock);
         $block->expects($this->once())->method('setWelcome')->with($welcomeMessage);
+
         $this->observer->emulateWelcomeBlock($block);
     }
 }
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
index 7d3d1c8487627..86b906f3cb35e 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
@@ -247,8 +247,8 @@ public function testConvertCustomerCartToGuest()
         $emailArgs = ['email' => null];
 
         $this->checkoutSessionMock->expects($this->once())
-            ->method('getQuote')->willReturn($this->quoteMock);
-        $this->quoteMock->expects($this->exactly(2))->method('getId')->willReturn($quoteId);
+            ->method('getQuoteId')->willReturn($quoteId);
+        $this->quoteMock->expects($this->once())->method('getId')->willReturn($quoteId);
         $this->quoteRepositoryMock->expects($this->once())->method('get')->with($quoteId)->willReturn($this->quoteMock);
         $this->quoteMock->expects($this->once())
             ->method('setIsActive')->with(true)->willReturn($this->quoteMock);
@@ -288,18 +288,15 @@ public function testConvertCustomerCartToGuest()
     public function testConvertCustomerCartToGuestWithEmptyQuote()
     {
         $this->checkoutSessionMock->expects($this->once())
-            ->method('getQuote')->willReturn($this->quoteMock);
-        $this->quoteMock->expects($this->once())->method('getId')->willReturn(null);
+            ->method('getQuoteId')->willReturn(null);
         $this->quoteRepositoryMock->expects($this->once())->method('get')->with(null)->willReturn(null);
-
         $this->model->convertCustomerCartToGuest();
     }
 
     public function testConvertCustomerCartToGuestWithEmptyQuoteId()
     {
         $this->checkoutSessionMock->expects($this->once())
-            ->method('getQuote')->willReturn($this->quoteMock);
-        $this->quoteMock->expects($this->once())->method('getId')->willReturn(1);
+            ->method('getQuoteId')->willReturn(1);
         $quoteWithNoId = $this->quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
         $quoteWithNoId->expects($this->once())->method('getId')->willReturn(null);
         $this->quoteRepositoryMock->expects($this->once())->method('get')->with(1)->willReturn($quoteWithNoId);
diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
index 29a3196c5f45e..b6e88d4363b90 100644
--- a/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
@@ -1,12 +1,16 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 namespace Magento\Persistent\Test\Unit\Observer;
 
+use Magento\Quote\Model\Quote;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class CheckExpirePersistentQuoteObserverTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -54,6 +58,11 @@ class CheckExpirePersistentQuoteObserverTest extends \PHPUnit\Framework\TestCase
      */
     private $requestMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Quote
+     */
+    private $quoteMock;
+
     protected function setUp()
     {
         $this->sessionMock = $this->createMock(\Magento\Persistent\Helper\Session::class);
@@ -79,6 +88,10 @@ protected function setUp()
             $this->checkoutSessionMock,
             $this->requestMock
         );
+        $this->quoteMock = $this->getMockBuilder(Quote::class)
+            ->setMethods(['getCustomerIsGuest', 'getIsPersistent'])
+            ->disableOriginalConstructor()
+            ->getMock();
     }
 
     public function testExecuteWhenCanNotApplyPersistentData()
@@ -128,6 +141,11 @@ public function testExecuteWhenPersistentIsEnabled(
             ->will($this->returnValue(true));
         $this->persistentHelperMock->expects($this->once())->method('isEnabled')->will($this->returnValue(true));
         $this->sessionMock->expects($this->once())->method('isPersistent')->will($this->returnValue(false));
+        $this->checkoutSessionMock
+            ->method('getQuote')
+            ->willReturn($this->quoteMock);
+        $this->quoteMock->method('getCustomerIsGuest')->willReturn(true);
+        $this->quoteMock->method('getIsPersistent')->willReturn(true);
         $this->customerSessionMock
             ->expects($this->atLeastOnce())
             ->method('isLoggedIn')
diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/SetCheckoutSessionPersistentDataObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/SetCheckoutSessionPersistentDataObserverTest.php
new file mode 100644
index 0000000000000..2f0e90e330a1e
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Unit/Observer/SetCheckoutSessionPersistentDataObserverTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Persistent\Test\Unit\Observer;
+
+/**
+ * Test for SetCheckoutSessionPersistentDataObserver.
+ */
+class SetCheckoutSessionPersistentDataObserverTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Persistent\Observer\SetCheckoutSessionPersistentDataObserver
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Persistent\Helper\Data| \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $helperMock;
+
+    /**
+     * @var \Magento\Persistent\Helper\Session| \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $sessionHelperMock;
+
+    /**
+     * @var \Magento\Checkout\Model\Session| \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $checkoutSessionMock;
+
+    /**
+     * @var \Magento\Customer\Model\Session| \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerSessionMock;
+
+    /**
+     * @var \Magento\Persistent\Model\Session| \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $persistentSessionMock;
+
+    /**
+     * @var \Magento\Customer\Api\CustomerRepositoryInterface| \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerRepositoryMock;
+
+    /**
+     * @var \Magento\Framework\Event\Observer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $observerMock;
+
+    /**
+     * @var \Magento\Framework\Event|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eventMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->helperMock = $this->createMock(\Magento\Persistent\Helper\Data::class);
+        $this->sessionHelperMock = $this->createMock(\Magento\Persistent\Helper\Session::class);
+        $this->checkoutSessionMock = $this->createMock(\Magento\Checkout\Model\Session::class);
+        $this->customerSessionMock = $this->createMock(\Magento\Customer\Model\Session::class);
+        $this->observerMock = $this->createMock(\Magento\Framework\Event\Observer::class);
+        $this->eventMock = $this->createPartialMock(\Magento\Framework\Event::class, ['getData']);
+        $this->persistentSessionMock = $this->createPartialMock(
+            \Magento\Persistent\Model\Session::class,
+            ['getCustomerId']
+        );
+        $this->customerRepositoryMock = $this->createMock(
+            \Magento\Customer\Api\CustomerRepositoryInterface::class
+        );
+        $this->model = new \Magento\Persistent\Observer\SetCheckoutSessionPersistentDataObserver(
+            $this->sessionHelperMock,
+            $this->customerSessionMock,
+            $this->helperMock,
+            $this->customerRepositoryMock
+        );
+    }
+
+    /**
+     * Test execute method when session is not persistent.
+     *
+     * @return void
+     */
+    public function testExecuteWhenSessionIsNotPersistent()
+    {
+        $this->observerMock->expects($this->once())
+            ->method('getEvent')
+            ->willReturn($this->eventMock);
+        $this->eventMock->expects($this->once())
+            ->method('getData')
+            ->willReturn($this->checkoutSessionMock);
+        $this->sessionHelperMock->expects($this->once())
+            ->method('isPersistent')
+            ->willReturn(false);
+        $this->checkoutSessionMock->expects($this->never())
+            ->method('setLoadInactive');
+        $this->checkoutSessionMock->expects($this->never())
+            ->method('setCustomerData');
+        $this->model->execute($this->observerMock);
+    }
+
+    /**
+     * Test execute method when session is persistent.
+     *
+     * @return void
+     */
+    public function testExecute()
+    {
+        $this->observerMock->expects($this->once())
+            ->method('getEvent')
+            ->willReturn($this->eventMock);
+        $this->eventMock->expects($this->once())
+            ->method('getData')
+            ->willReturn($this->checkoutSessionMock);
+        $this->sessionHelperMock->expects($this->exactly(2))
+            ->method('isPersistent')
+            ->willReturn(true);
+        $this->customerSessionMock->expects($this->once())
+            ->method('isLoggedIn')
+            ->willReturn(false);
+        $this->helperMock->expects($this->exactly(2))
+            ->method('isShoppingCartPersist')
+            ->willReturn(true);
+        $this->persistentSessionMock->expects($this->once())
+            ->method('getCustomerId')
+            ->willReturn(123);
+        $this->sessionHelperMock->expects($this->once())
+            ->method('getSession')
+            ->willReturn($this->persistentSessionMock);
+        $this->customerRepositoryMock->expects($this->once())
+            ->method('getById')
+            ->willReturn(1);
+        $this->checkoutSessionMock->expects($this->never())
+            ->method('setLoadInactive');
+        $this->checkoutSessionMock->expects($this->once())
+            ->method('setCustomerData');
+        $this->model->execute($this->observerMock);
+    }
+}
diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/SetLoadPersistentQuoteObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/SetLoadPersistentQuoteObserverTest.php
deleted file mode 100644
index fd78a6852ea59..0000000000000
--- a/app/code/Magento/Persistent/Test/Unit/Observer/SetLoadPersistentQuoteObserverTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Persistent\Test\Unit\Observer;
-
-class SetLoadPersistentQuoteObserverTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Persistent\Observer\SetLoadPersistentQuoteObserver
-     */
-    protected $model;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $helperMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $sessionHelperMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $checkoutSessionMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $customerSessionMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $observerMock;
-
-    protected function setUp()
-    {
-        $this->helperMock = $this->createMock(\Magento\Persistent\Helper\Data::class);
-        $this->sessionHelperMock = $this->createMock(\Magento\Persistent\Helper\Session::class);
-        $this->checkoutSessionMock = $this->createMock(\Magento\Checkout\Model\Session::class);
-        $this->customerSessionMock = $this->createMock(\Magento\Customer\Model\Session::class);
-        $this->observerMock = $this->createMock(\Magento\Framework\Event\Observer::class);
-
-        $this->model = new \Magento\Persistent\Observer\SetLoadPersistentQuoteObserver(
-            $this->sessionHelperMock,
-            $this->helperMock,
-            $this->customerSessionMock,
-            $this->checkoutSessionMock
-        );
-    }
-
-    public function testExecuteWhenSessionIsNotPersistent()
-    {
-        $this->sessionHelperMock->expects($this->once())->method('isPersistent')->will($this->returnValue(false));
-        $this->checkoutSessionMock->expects($this->never())->method('setLoadInactive');
-        $this->model->execute($this->observerMock);
-    }
-
-    public function testExecute()
-    {
-        $this->sessionHelperMock->expects($this->once())->method('isPersistent')->will($this->returnValue(true));
-        $this->customerSessionMock->expects($this->once())->method('isLoggedIn')->will($this->returnValue(false));
-        $this->helperMock->expects($this->once())->method('isShoppingCartPersist')->will($this->returnValue(true));
-        $this->checkoutSessionMock->expects($this->never())->method('setLoadInactive');
-        $this->model->execute($this->observerMock);
-    }
-}
diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php
index 6724743789cea..ffa829e8456cc 100644
--- a/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Observer/SetQuotePersistentDataObserverTest.php
@@ -7,6 +7,9 @@
 
 namespace Magento\Persistent\Test\Unit\Observer;
 
+/**
+ * Observer test for setting "is_persistent" value to quote
+ */
 class SetQuotePersistentDataObserverTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -83,7 +86,6 @@ public function testExecuteWhenQuoteNotExist()
             ->method('getEvent')
             ->will($this->returnValue($this->eventManagerMock));
         $this->eventManagerMock->expects($this->once())->method('getQuote');
-        $this->customerSessionMock->expects($this->never())->method('isLoggedIn');
         $this->model->execute($this->observerMock);
     }
 
@@ -98,8 +100,7 @@ public function testExecuteWhenSessionIsPersistent()
             ->expects($this->once())
             ->method('getQuote')
             ->will($this->returnValue($this->quoteMock));
-        $this->customerSessionMock->expects($this->once())->method('isLoggedIn')->will($this->returnValue(false));
-        $this->helperMock->expects($this->once())->method('isShoppingCartPersist')->will($this->returnValue(false));
+        $this->helperMock->expects($this->once())->method('isShoppingCartPersist')->will($this->returnValue(true));
         $this->quoteManagerMock->expects($this->once())->method('isPersistent')->will($this->returnValue(true));
         $this->quoteMock->expects($this->once())->method('setIsPersistent')->with(true);
         $this->model->execute($this->observerMock);
diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json
index 9debadd193a9d..883c5ed1a3349 100644
--- a/app/code/Magento/Persistent/composer.json
+++ b/app/code/Magento/Persistent/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-persistent",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-checkout": "100.2.*",
         "magento/module-customer": "101.0.*",
@@ -12,7 +12,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Persistent/etc/di.xml b/app/code/Magento/Persistent/etc/di.xml
index f49d4361acb52..c28426b4f25bf 100644
--- a/app/code/Magento/Persistent/etc/di.xml
+++ b/app/code/Magento/Persistent/etc/di.xml
@@ -12,4 +12,7 @@
     <type name="Magento\Customer\CustomerData\Customer">
         <plugin name="section_data" type="Magento\Persistent\Model\Plugin\CustomerData" />
     </type>
+    <type name="Magento\Framework\App\Http\Context">
+        <plugin name="persistent_page_cache_variation" type="Magento\Persistent\Model\Plugin\PersistentCustomerContext" />
+    </type>
 </config>
diff --git a/app/code/Magento/Persistent/etc/frontend/di.xml b/app/code/Magento/Persistent/etc/frontend/di.xml
index f976f4de79c21..3c33f8a51c418 100644
--- a/app/code/Magento/Persistent/etc/frontend/di.xml
+++ b/app/code/Magento/Persistent/etc/frontend/di.xml
@@ -35,4 +35,18 @@
     <type name="Magento\Checkout\Model\GuestPaymentInformationManagement">
         <plugin name="inject_guest_address_for_nologin" type="Magento\Persistent\Model\Checkout\GuestPaymentInformationManagementPlugin" />
     </type>
+    <type name="Magento\Customer\CustomerData\SectionPoolInterface">
+        <arguments>
+            <argument name="sectionSourceMap" xsi:type="array">
+                <item name="persistent" xsi:type="string">Magento\Persistent\CustomerData\Persistent</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Customer\Block\CustomerData">
+        <arguments>
+            <argument name="expirableSectionNames" xsi:type="array">
+                <item name="persistent" xsi:type="string">persistent</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Persistent/etc/frontend/events.xml b/app/code/Magento/Persistent/etc/frontend/events.xml
index 193b9a10818e4..79720695ea6f6 100644
--- a/app/code/Magento/Persistent/etc/frontend/events.xml
+++ b/app/code/Magento/Persistent/etc/frontend/events.xml
@@ -49,7 +49,7 @@
         <observer name="persistent" instance="Magento\Persistent\Observer\SetQuotePersistentDataObserver" />
     </event>
     <event name="custom_quote_process">
-        <observer name="persistent" instance="Magento\Persistent\Observer\SetLoadPersistentQuoteObserver" />
+        <observer name="persistent" instance="Magento\Persistent\Observer\SetCheckoutSessionPersistentDataObserver" />
     </event>
     <event name="customer_register_success">
         <observer name="persistent" instance="Magento\Persistent\Observer\RemovePersistentCookieOnRegisterObserver" />
diff --git a/app/code/Magento/Persistent/etc/frontend/sections.xml b/app/code/Magento/Persistent/etc/frontend/sections.xml
new file mode 100644
index 0000000000000..16b44c502fc47
--- /dev/null
+++ b/app/code/Magento/Persistent/etc/frontend/sections.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Customer:etc/sections.xsd">
+    <action name="persistent/index/unsetCookie">
+        <section name="persistent"/>
+    </action>
+</config>
diff --git a/app/code/Magento/Persistent/etc/webapi_rest/events.xml b/app/code/Magento/Persistent/etc/webapi_rest/events.xml
index 1eff845386bf4..79dffa1834563 100644
--- a/app/code/Magento/Persistent/etc/webapi_rest/events.xml
+++ b/app/code/Magento/Persistent/etc/webapi_rest/events.xml
@@ -22,7 +22,7 @@
         <observer name="persistent" instance="Magento\Persistent\Observer\SetQuotePersistentDataObserver" />
     </event>
     <event name="custom_quote_process">
-        <observer name="persistent" instance="Magento\Persistent\Observer\SetLoadPersistentQuoteObserver" />
+        <observer name="persistent" instance="Magento\Persistent\Observer\SetCheckoutSessionPersistentDataObserver" />
     </event>
     <event name="customer_register_success">
         <observer name="persistent" instance="Magento\Persistent\Observer\RemovePersistentCookieOnRegisterObserver" />
diff --git a/app/code/Magento/Persistent/etc/webapi_soap/events.xml b/app/code/Magento/Persistent/etc/webapi_soap/events.xml
index 1eff845386bf4..79dffa1834563 100644
--- a/app/code/Magento/Persistent/etc/webapi_soap/events.xml
+++ b/app/code/Magento/Persistent/etc/webapi_soap/events.xml
@@ -22,7 +22,7 @@
         <observer name="persistent" instance="Magento\Persistent\Observer\SetQuotePersistentDataObserver" />
     </event>
     <event name="custom_quote_process">
-        <observer name="persistent" instance="Magento\Persistent\Observer\SetLoadPersistentQuoteObserver" />
+        <observer name="persistent" instance="Magento\Persistent\Observer\SetCheckoutSessionPersistentDataObserver" />
     </event>
     <event name="customer_register_success">
         <observer name="persistent" instance="Magento\Persistent\Observer\RemovePersistentCookieOnRegisterObserver" />
diff --git a/app/code/Magento/Persistent/view/frontend/requirejs-config.js b/app/code/Magento/Persistent/view/frontend/requirejs-config.js
new file mode 100644
index 0000000000000..e30e07c454be5
--- /dev/null
+++ b/app/code/Magento/Persistent/view/frontend/requirejs-config.js
@@ -0,0 +1,14 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+    config: {
+        mixins: {
+            'Magento_Customer/js/customer-data': {
+                'Magento_Persistent/js/view/customer-data-mixin': true
+            }
+        }
+    }
+};
diff --git a/app/code/Magento/Persistent/view/frontend/templates/additional.phtml b/app/code/Magento/Persistent/view/frontend/templates/additional.phtml
new file mode 100644
index 0000000000000..28dce5dc23cc9
--- /dev/null
+++ b/app/code/Magento/Persistent/view/frontend/templates/additional.phtml
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<?php if ($block->getCustomerId()) :?>
+    <span>
+        <a <?= /* @escapeNotVerified */ $block->getLinkAttributes()?>><?= $block->escapeHtml(__('Not you?'));?></a>
+    </span>
+<?php endif;?>
+<script type="application/javascript">
+    window.persistent = <?= /* @noEscape */ $block->getConfig(); ?>;
+</script>
+<script type="text/x-magento-init">
+    {
+        "li.greet.welcome > span.not-logged-in": {
+            "Magento_Persistent/js/view/additional-welcome": {}
+        }
+    }
+</script>
diff --git a/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js b/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js
new file mode 100644
index 0000000000000..47949671fed52
--- /dev/null
+++ b/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js
@@ -0,0 +1,55 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mage/translate',
+    'Magento_Customer/js/customer-data'
+], function ($, $t, customerData) {
+    'use strict';
+
+    return {
+        /**
+         * Init
+         */
+        init: function () {
+            var persistent = customerData.get('persistent');
+
+            if (persistent().fullname === undefined) {
+                customerData.get('persistent').subscribe(this.replacePersistentWelcome);
+            } else {
+                this.replacePersistentWelcome();
+            }
+        },
+
+        /**
+         * Replace welcome message for customer with persistent cookie.
+         */
+        replacePersistentWelcome: function () {
+            var persistent = customerData.get('persistent'),
+                welcomeElems;
+
+            if (persistent().fullname !== undefined) {
+                welcomeElems = $('li.greet.welcome > span.not-logged-in');
+
+                if (welcomeElems.length) {
+                    $(welcomeElems).each(function () {
+                        var html = $t('Welcome, %1!').replace('%1', persistent().fullname);
+
+                        $(this).attr('data-bind', html);
+                        $(this).html(html);
+                    });
+                }
+            }
+        },
+
+        /**
+         * @constructor
+         */
+        'Magento_Persistent/js/view/additional-welcome': function () {
+            this.init();
+        }
+    };
+});
diff --git a/app/code/Magento/Persistent/view/frontend/web/js/view/customer-data-mixin.js b/app/code/Magento/Persistent/view/frontend/web/js/view/customer-data-mixin.js
new file mode 100644
index 0000000000000..855404c6f6f32
--- /dev/null
+++ b/app/code/Magento/Persistent/view/frontend/web/js/view/customer-data-mixin.js
@@ -0,0 +1,51 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'mage/utils/wrapper'
+], function ($, wrapper) {
+    'use strict';
+
+    var mixin = {
+
+        /**
+         * Check if persistent section is expired due to lifetime.
+         *
+         * @param {Function} originFn - Original method.
+         * @return {Array}
+         */
+        getExpiredSectionNames: function (originFn) {
+            var expiredSections = originFn(),
+                storage = $.initNamespaceStorage('mage-cache-storage').localStorage,
+                currentTimestamp = Math.floor(Date.now() / 1000),
+                persistentIndex = expiredSections.indexOf('persistent'),
+                persistentLifeTime = 0,
+                sectionData;
+
+            if (window.persistent !== undefined && window.persistent.expirationLifetime !== undefined) {
+                persistentLifeTime = window.persistent.expirationLifetime;
+            }
+
+            if (persistentIndex !== -1) {
+                sectionData = storage.get('persistent');
+
+                if (typeof sectionData === 'object' &&
+                    sectionData['data_id'] + persistentLifeTime >= currentTimestamp
+                ) {
+                    expiredSections.splice(persistentIndex, 1);
+                }
+            }
+
+            return expiredSections;
+        }
+    };
+
+    /**
+     * Override default customer-data.getExpiredSectionNames().
+     */
+    return function (target) {
+        return wrapper.extend(target, mixin);
+    };
+});
diff --git a/app/code/Magento/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json
index 11dc94edcbcd3..232879052d202 100644
--- a/app/code/Magento/ProductAlert/composer.json
+++ b/app/code/Magento/ProductAlert/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-product-alert",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-backend": "100.2.*",
         "magento/module-store": "100.2.*",
         "magento/module-catalog": "102.0.*",
@@ -13,7 +13,7 @@
         "magento/module-config": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php b/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php
index 9950526182e3e..53705ee9f6e72 100644
--- a/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php
+++ b/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php
@@ -107,6 +107,9 @@ public function execute()
     {
         $baseTmpMediaPath = $this->mediaConfig->getBaseTmpMediaPath();
         try {
+            if (!$this->getRequest()->isPost()) {
+                throw new LocalizedException(__('Invalid request type.'));
+            }
             $remoteFileUrl = $this->getRequest()->getParam('remote_image');
             $this->validateRemoteFile($remoteFileUrl);
             $localFileName = Uploader::getCorrectFileName(basename($remoteFileUrl));
diff --git a/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php b/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
index c56e5e3139517..d554b5dd68db2 100644
--- a/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
+++ b/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
@@ -20,6 +20,8 @@ class CreateHandler extends AbstractHandler
     const ADDITIONAL_STORE_DATA_KEY = 'additional_store_data';
 
     /**
+     * Execute before Plugin
+     *
      * @param \Magento\Catalog\Model\Product\Gallery\CreateHandler $mediaGalleryCreateHandler
      * @param \Magento\Catalog\Model\Product $product
      * @param array $arguments
@@ -45,6 +47,8 @@ public function beforeExecute(
     }
 
     /**
+     * Execute plugin
+     *
      * @param \Magento\Catalog\Model\Product\Gallery\CreateHandler $mediaGalleryCreateHandler
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Catalog\Model\Product
@@ -59,6 +63,9 @@ public function afterExecute(
         );
 
         if (!empty($mediaCollection)) {
+            if ($product->getIsDuplicate() === true) {
+                $mediaCollection = $this->makeAllNewVideos($product->getId(), $mediaCollection);
+            }
             $newVideoCollection = $this->collectNewVideos($mediaCollection);
             $this->saveVideoData($newVideoCollection, 0);
 
@@ -71,6 +78,8 @@ public function afterExecute(
     }
 
     /**
+     * Saves video data
+     *
      * @param array $videoDataCollection
      * @param int $storeId
      * @return void
@@ -84,6 +93,8 @@ protected function saveVideoData(array $videoDataCollection, $storeId)
     }
 
     /**
+     * Saves additioanal video data
+     *
      * @param array $videoDataCollection
      * @return void
      */
@@ -100,6 +111,8 @@ protected function saveAdditionalStoreData(array $videoDataCollection)
     }
 
     /**
+     * Saves video data
+     *
      * @param array $item
      * @return void
      */
@@ -112,6 +125,8 @@ protected function saveVideoValuesItem(array $item)
     }
 
     /**
+     * Excludes current store data
+     *
      * @param array $mediaCollection
      * @param int $currentStoreId
      * @return array
@@ -127,6 +142,8 @@ function ($item) use ($currentStoreId) {
     }
 
     /**
+     * Prepare video data for saving
+     *
      * @param array $rowData
      * @return array
      */
@@ -144,6 +161,8 @@ protected function prepareVideoRowDataForSave(array $rowData)
     }
 
     /**
+     * Loads video data
+     *
      * @param array $mediaCollection
      * @param int $excludedStore
      * @return array
@@ -166,6 +185,8 @@ protected function loadStoreViewVideoData(array $mediaCollection, $excludedStore
     }
 
     /**
+     * Collect video data
+     *
      * @param array $mediaCollection
      * @return array
      */
@@ -183,6 +204,8 @@ protected function collectVideoData(array $mediaCollection)
     }
 
     /**
+     * Extract video data
+     *
      * @param array $rowData
      * @return array
      */
@@ -195,6 +218,8 @@ protected function extractVideoDataFromRowData(array $rowData)
     }
 
     /**
+     * Collect items for additional data adding
+     *
      * @param array $mediaCollection
      * @return array
      */
@@ -210,6 +235,8 @@ protected function collectVideoEntriesIdsToAdditionalLoad(array $mediaCollection
     }
 
     /**
+     * Add additional data
+     *
      * @param array $mediaCollection
      * @param array $data
      * @return array
@@ -230,6 +257,8 @@ protected function addAdditionalStoreData(array $mediaCollection, array $data):
     }
 
     /**
+     * Creates additional video data
+     *
      * @param array $storeData
      * @param int $valueId
      * @return array
@@ -248,6 +277,8 @@ protected function createAdditionalStoreDataCollection(array $storeData, $valueI
     }
 
     /**
+     * Collect new videos
+     *
      * @param array $mediaCollection
      * @return array
      */
@@ -263,6 +294,8 @@ private function collectNewVideos(array $mediaCollection): array
     }
 
     /**
+     * Checks if gallery item is video
+     *
      * @param $item
      * @return bool
      */
@@ -274,6 +307,8 @@ private function isVideoItem($item): bool
     }
 
     /**
+     * Checks if video is new
+     *
      * @param $item
      * @return bool
      */
@@ -283,4 +318,23 @@ private function isNewVideo($item): bool
             || empty($item['video_url_default'])
             || empty($item['video_title_default']);
     }
+
+    /**
+     * Mark all videos as new
+     *
+     * @param int $entityId
+     * @param array $mediaCollection
+     * @return array
+     */
+    private function makeAllNewVideos($entityId, array $mediaCollection): array
+    {
+        foreach ($mediaCollection as $key => $video) {
+            if ($this->isVideoItem($video)) {
+                unset($video['video_url_default'], $video['video_title_default']);
+                $video['entity_id'] = $entityId;
+                $mediaCollection[$key] = $video;
+            }
+        }
+        return $mediaCollection;
+    }
 }
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminProductVideoActionGroup.xml b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminProductVideoActionGroup.xml
new file mode 100644
index 0000000000000..4e14285c8ee56
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminProductVideoActionGroup.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Add video in Admin Product page -->
+    <actionGroup name="addProductVideo">
+        <arguments>
+            <argument name="video" defaultValue="mftfTestProductVideo"/>
+        </arguments>
+
+        <scrollTo selector="{{AdminProductImagesSection.productImagesToggle}}" x="0" y="-100" stepKey="scrollToArea"/>
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}"
+                          dependentSelector="{{AdminProductImagesSection.imageUploadButton}}"
+                          visible="false"
+                          stepKey="openProductVideoSection"/>
+        <waitForElementVisible selector="{{AdminProductImagesSection.addVideoButton}}" stepKey="waitForAddVideoButtonVisible"/>
+        <click selector="{{AdminProductImagesSection.addVideoButton}}" stepKey="addVideo"/>
+        <waitForElementVisible selector="{{AdminProductNewVideoSection.videoUrlTextField}}" stepKey="waitForUrlElementVisible"/>
+        <fillField selector="{{AdminProductNewVideoSection.videoUrlTextField}}" userInput="{{video.videoUrl}}" stepKey="fillFieldVideoUrl"/>
+        <fillField selector="{{AdminProductNewVideoSection.videoTitleTextField}}" userInput="{{video.videoTitle}}" stepKey="fillFieldVideoTitle"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementNotVisible selector="{{AdminProductNewVideoSection.saveButtonDisabled}}" time="30" stepKey="waitForSaveButtonVisible"/>
+        <click selector="{{AdminProductNewVideoSection.saveButton}}" stepKey="saveVideo"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+    </actionGroup>
+
+    <!-- Assert product video in Admin Product page -->
+    <actionGroup name="assertProductVideoAdminProductPage">
+        <arguments>
+            <argument name="video" defaultValue="mftfTestProductVideo"/>
+        </arguments>
+        <scrollTo selector="{{AdminProductImagesSection.productImagesToggle}}" x="0" y="-100" stepKey="scrollToArea"/>
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}"
+                          dependentSelector="{{AdminProductImagesSection.imageUploadButton}}"
+                          visible="false"
+                          stepKey="openProductVideoSection"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeElement selector="{{AdminProductImagesSection.videoTitleText(video.videoShortTitle)}}" stepKey="seeVideoTitle"/>
+        <seeElementInDOM selector="{{AdminProductImagesSection.videoUrlHiddenField(video.videoUrl)}}" stepKey="seeVideoItem"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/StorefrontProductVideoActionGroup.xml b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/StorefrontProductVideoActionGroup.xml
new file mode 100644
index 0000000000000..28634f41deec1
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/StorefrontProductVideoActionGroup.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">
+    <!--Assert product video in Storefront Product page -->
+    <actionGroup name="assertProductVideoStorefrontProductPage">
+        <arguments>
+            <argument name="dataTypeAttribute" defaultValue="'youtube'"/>
+        </arguments>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productVideo(dataTypeAttribute)}}" stepKey="seeProductVideoDataType"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoConfigData.xml b/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoConfigData.xml
new file mode 100644
index 0000000000000..8fe5899e91ef8
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoConfigData.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <!-- mftf test youtube api key configuration -->
+    <entity name="ProductVideoYoutubeApiKeyConfig" type="product_video_config">
+        <requiredEntity type="youtube_api_key_config">YouTubeApiKey</requiredEntity>
+    </entity>
+    <entity name="YouTubeApiKey" type="youtube_api_key_config">
+        <data key="value">AIzaSyDwqDWuw1lra-LnpJL2Mr02DYuFmkuRSns</data>
+    </entity>
+
+    <!-- default configuration used to restore Magento config -->
+    <entity name="DefaultProductVideoConfig" type="product_video_config">
+        <requiredEntity type="youtube_api_key_config">DefaultYouTubeApiKey</requiredEntity>
+    </entity>
+    <entity name="DefaultYouTubeApiKey" type="youtube_api_key_config">
+        <data key="value"/>
+    </entity>
+</entities>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoData.xml b/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoData.xml
new file mode 100644
index 0000000000000..5bc4ad86e0f06
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoData.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="mftfTestProductVideo" type="product_video">
+        <data key="videoUrl">https://youtu.be/bpOSxM0rNPM</data>
+        <data key="videoTitle">Arctic Monkeys - Do I Wanna Know? (Official Video)</data>
+        <data key="videoShortTitle">Arctic Monkeys</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Metadata/product_video_config-meta.xml b/app/code/Magento/ProductVideo/Test/Mftf/Metadata/product_video_config-meta.xml
new file mode 100644
index 0000000000000..dc6d3af1c52c5
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Metadata/product_video_config-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateProductVideoYouTubeApiKeyConfig" dataType="product_video_config" type="create" auth="adminFormKey" url="admin/system_config/save/section/catalog/" method="POST" successRegex="/messages-message-success/">
+        <object key="groups" dataType="product_video_config">
+            <object key="product_video" dataType="product_video_config">
+                <object key="fields" dataType="product_video_config">
+                    <object key="youtube_api_key" dataType="youtube_api_key_config">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/ProductVideo/Test/Mftf/Page/AdminProductCreatePage.xml
new file mode 100644
index 0000000000000..52f13a1da5188
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
+        <section name="AdminProductNewVideoSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductImagesSection.xml b/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductImagesSection.xml
new file mode 100644
index 0000000000000..913ae8c955340
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductImagesSection.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="AdminProductImagesSection">
+        <element name="addVideoButton" type="button" selector="#add_video_button" timeout="60"/>
+        <element name="videoUrlHiddenField" type="text" selector="#media_gallery_content input[value*='{{title}}']" parameterized="true"/>
+        <element name="videoTitleText" type="text" selector="//*[@id='media_gallery_content']//div[contains(text(), '{{title}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductNewVideoSection.xml b/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductNewVideoSection.xml
new file mode 100644
index 0000000000000..8df254aea7c50
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductNewVideoSection.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="AdminProductNewVideoSection">
+        <element name="saveButton" type="button" selector=".action-primary.video-create-button" timeout="30"/>
+        <element name="saveButtonDisabled" type="text" selector="button.action-primary.video-create-button[disabled='disabled']"/>
+        <element name="videoUrlTextField" type="input" selector="#video_url"/>
+        <element name="videoTitleTextField" type="input" selector="#video_title"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/ProductVideo/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
new file mode 100644
index 0000000000000..f33f9d8f23244
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductInfoMainSection">
+        <element name="productVideo" type="text" selector=".product-video[data-type='{{videoType}}']" parameterized="true"/>
+        <element name="clickInVideo" type="button" selector=".fotorama__stage__shaft"/>
+        <element name="videoPausedMode" type="button" selector="[class*='paused-mode']"/>
+        <element name="videoPlayedMode" type="button" selector="[class*='playing-mode']"/>
+        <element name="frameVideo" type="button" selector="widget2"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Test/StorefrontYoutubeVideoWindowOnProductPageTest.xml b/app/code/Magento/ProductVideo/Test/Mftf/Test/StorefrontYoutubeVideoWindowOnProductPageTest.xml
new file mode 100644
index 0000000000000..15888d1af8ee5
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Test/StorefrontYoutubeVideoWindowOnProductPageTest.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="StorefrontYoutubeVideoWindowOnProductPageTest">
+        <annotations>
+            <features value="ProductVideo"/>
+            <stories value="MAGETWO-87734: [Sigma Beauty]Cannot pause Youtube video in IE 11"/>
+            <testCaseId value="MAGETWO-96677"/>
+            <title value="Youtube video window on the product page"/>
+            <description value="Check Youtube video window on the product page"/>
+            <severity value="MAJOR"/>
+            <group value="productVideo"/>
+        </annotations>
+
+        <before>
+            <!--Log In-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create category-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <!--Create product-->
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!-- Set product video Youtube api key configuration -->
+            <createData entity="ProductVideoYoutubeApiKeyConfig" stepKey="setStoreConfig"/>
+        </before>
+
+        <after>
+            <!--Clear all filters on products grid page-->
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductsIndex"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearExistingProductFilters"/>
+            <!--Delete created product and category-->
+            <deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategoryFirst"/>
+            <!-- Set product video configuration to default -->
+            <createData entity="DefaultProductVideoConfig" stepKey="setStoreDefaultConfig"/>
+            <!--Log Out-->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Open simple product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
+        <actionGroup ref="AdminGridFilterSearchResultsByInput" stepKey="filterProductGridBySku">
+            <argument name="inputName" value="sku"/>
+            <argument name="value" value="$$createProduct.sku$$"/>
+        </actionGroup>
+        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="openFirstProductForEdit"/>
+        <waitForPageLoad stepKey="waitProductPageIsLoaded"/>
+
+        <!-- Add product video -->
+        <actionGroup ref="addProductVideo" stepKey="addProductVideo"/>
+        <!-- Assert product video in admin product form -->
+        <actionGroup ref="assertProductVideoAdminProductPage" stepKey="assertProductVideoAdminProductPage"/>
+
+        <!-- Save the product -->
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <waitForPageLoad stepKey="waitForProductSaved"/>
+
+        <!-- Assert product video in storefront product page -->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.name$$)}}" stepKey="goToStorefrontProductPage"/>
+        <actionGroup ref="assertProductVideoStorefrontProductPage" stepKey="assertProductVideoStorefrontProductPage"/>
+
+        <!--Click Play video button-->
+        <click selector="{{StorefrontProductInfoMainSection.clickInVideo}}" stepKey="clickToPlayVideo"/>
+        <wait time="5" stepKey="waitFiveSecondToPlayVideo"/>
+        <switchToIFrame selector="{{StorefrontProductInfoMainSection.frameVideo}}" stepKey="switchToFrame"/>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.videoPlayedMode}}" stepKey="waitForVideoPlayed"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.videoPlayedMode}}" stepKey="assertVideoIsPlayed"/>
+        <switchToIFrame stepKey="switchBack"/>
+
+        <!--Click Pause button-->
+        <click selector="{{StorefrontProductInfoMainSection.clickInVideo}}" stepKey="clickToStopVideo"/>
+        <wait time="5" stepKey="waitFiveSecondToStopVideo"/>
+        <switchToIFrame selector="{{StorefrontProductInfoMainSection.frameVideo}}" stepKey="switchToFrame1"/>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.videoPausedMode}}" stepKey="waitForVideoPaused"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.videoPausedMode}}" stepKey="assertVideoIsPaused"/>
+        <switchToIFrame stepKey="switchBack1"/>
+
+        <!--Click Play video button again. Make sure that Video continued playing-->
+        <click selector="{{StorefrontProductInfoMainSection.clickInVideo}}" stepKey="clickAgainToPlayVideo"/>
+        <wait time="5" stepKey="waitAgainFiveSecondToPlayVideo"/>
+        <switchToIFrame selector="{{StorefrontProductInfoMainSection.frameVideo}}" stepKey="switchToFrame2"/>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.videoPlayedMode}}" stepKey="waitForVideoPlayedAgain"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.videoPlayedMode}}" stepKey="assertVideoIsPlayedAgain"/>
+        <switchToIFrame stepKey="switchBack2"/>
+    </test>
+</tests>
+
diff --git a/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php b/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php
index 28c6db7d31379..cc38e55d26af2 100644
--- a/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php
+++ b/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php
@@ -6,6 +6,7 @@
 namespace Magento\ProductVideo\Test\Unit\Controller\Adminhtml\Product\Gallery;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Request\Http;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -101,14 +102,16 @@ protected function setUp()
         $this->adapterFactoryMock->expects($this->once())->method('create')->willReturn($this->abstractAdapter);
         $this->curlMock = $this->createMock(\Magento\Framework\HTTP\Adapter\Curl::class);
         $this->storageFileMock = $this->createMock(\Magento\MediaStorage\Model\ResourceModel\File\Storage\File::class);
-        $this->request = $this->createMock(\Magento\Framework\App\RequestInterface::class);
+        $this->request = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
+            ->setMethods(['isPost'])
+            ->getMockForAbstractClass();
+        $this->request->expects($this->any())->method('isPost')->willReturn(true);
         $this->fileDriverMock = $this->createMock(\Magento\Framework\Filesystem\DriverInterface::class);
-        $this->contextMock->expects($this->any())->method('getRequest')->will($this->returnValue($this->request));
         $managerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['get'])
             ->getMockForAbstractClass();
-        $this->contextMock->expects($this->any())->method('getRequest')->will($this->returnValue($this->request));
+        $this->contextMock->expects($this->any())->method('getRequest')->willReturn($this->request);
         $this->contextMock->expects($this->any())->method('getObjectManager')->willReturn($managerMock);
 
         $this->image = $objectManager->getObject(
diff --git a/app/code/Magento/ProductVideo/composer.json b/app/code/Magento/ProductVideo/composer.json
index 811422d160d8d..6995a6723fe1a 100644
--- a/app/code/Magento/ProductVideo/composer.json
+++ b/app/code/Magento/ProductVideo/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-product-video",
     "description": "Add Video to Products",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-catalog": "102.0.*",
         "magento/module-backend": "100.2.*",
         "magento/module-eav": "101.0.*",
@@ -16,7 +16,7 @@
         "magento/module-config": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "proprietary"
     ],
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml b/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
index 2ceb9e9c9d4f2..1548770d4032f 100755
--- a/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
+++ b/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
@@ -4,17 +4,18 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Files.LineLength
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
 /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content */
-$elementName = $block->getElement()->getName() . '[images]';
-$formName = $block->getFormName();
+$elementNameEscaped = $block->escapeHtmlAttr($block->getElement()->getName()) . '[images]';
+$formNameEscaped = $block->escapeHtmlAttr($block->getFormName());
 ?>
 
 <div class="row">
     <div class="add-video-button-container">
         <button id="add_video_button"
-                title="<?= $block->escapeHtml(__('Add Video')) ?>"
+                title="<?= $block->escapeHtmlAttr(__('Add Video')) ?>"
                 data-role="add-video-button"
                 type="button"
                 class="action-secondary"
@@ -29,109 +30,94 @@ $formName = $block->getFormName();
 $element = $block->getElement();
 $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'toggleValueElements(this, this.parentNode.parentNode.parentNode)';
 ?>
-
-<div id="<?= $block->getHtmlId() ?>"
+<div id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>"
      class="gallery"
      data-mage-init='{"openVideoModal":{}}'
      data-parent-component="<?= $block->escapeHtml($block->getData('config/parentComponent')) ?>"
      data-images="<?= $block->escapeHtmlAttr($block->getImagesJson()) ?>"
-     data-types="<?= $block->escapeHtml(
-         $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getImageTypes())
-     ) ?>"
+     data-types='<?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getImageTypes()) ?>'
 >
-
-    <?php
-    if (!$block->getElement()->getReadonly()):
-        ?>
+    <?php if (!$block->getElement()->getReadonly()) : ?>
         <div class="image image-placeholder">
-            <?php /* @escapeNotVerified */ echo $block->getUploaderHtml();
-            ?>
+            <?= $block->getUploaderHtml(); ?>
             <div class="product-image-wrapper">
                 <p class="image-placeholder-text">
-                    <?= $block->escapeHtml(
-                        __('Browse to find or drag image here')
-                    ); ?>
+                    <?= $block->escapeHtml(__('Browse to find or drag image here')); ?>
                 </p>
             </div>
         </div>
-        <?= /* @escapeNotVerified */ $block->getChildHtml('additional_buttons') ?>
-        <?php
-    endif;
-    ?>
-    <?php
-    foreach ($block->getImageTypes() as $typeData):
-        ?>
-        <input name="<?= $block->escapeHtml($typeData['name']) ?>"
-               data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
-               class="image-<?= $block->escapeHtml($typeData['code']) ?>"
+        <?= $block->getChildHtml('additional_buttons') ?>
+    <?php endif; ?>
+    <?php foreach ($block->getImageTypes() as $typeData) : ?>
+        <input name="<?= $block->escapeHtmlAttr($typeData['name']) ?>"
+               data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"
+               class="image-<?= $block->escapeHtmlAttr($typeData['code']) ?>"
                type="hidden"
-               value="<?= $block->escapeHtml($typeData['value']) ?>"/>
-        <?php
-    endforeach;
-    ?>
-    <script id="<?= /* @escapeNotVerified */ $block->getHtmlId() ?>-template" data-template="image" type="text/x-magento-template">
+               value="<?= $block->escapeHtmlAttr($typeData['value']) ?>"/>
+    <?php endforeach; ?>
+    <script id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>-template" data-template="image" type="text/x-magento-template">
         <div class="image item <% if (data.disabled == 1) { %>hidden-for-front<% } %>  <% if (data.video_url) { %>video-item<% } %>"
              data-role="image">
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][position]"
+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][position]"
                    value="<%- data.position %>"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"
                    class="position"/>
             <% if (data.media_type !== 'external-video') {%>
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][media_type]"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][media_type]"
+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"
                    value="image"/>
             <% } else { %>
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][media_type]"
+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][media_type]"
                    value="<%- data.media_type %>"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
             <% } %>
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][video_provider]"
+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][video_provider]"
                    value="<%- data.video_provider %>"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][file]"
+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][file]"
                    value="<%- data.file %>"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][value_id]"
+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][value_id]"
                    value="<%- data.value_id %>"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][label]"
+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][label]"
                    value="<%- data.label %>"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][disabled]"
+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][disabled]"
                    value="<%- data.disabled %>"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][removed]"
+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][removed]"
                    value="" class="is-removed"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][video_url]"
+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][video_url]"
                    value="<%- data.video_url %>"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][video_title]"
+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][video_title]"
                    value="<%- data.video_title %>"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][video_description]"
+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][video_description]"
                    value="<%- data.video_description %>"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][video_metadata]"
+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][video_metadata]"
                    value="<%- data.video_metadata %>"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
             <input type="hidden"
-                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][role]"
+                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][role]"
                    value="<%- data.video_description %>"
-                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
+                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"/>
 
             <div class="product-image-wrapper">
                 <img class="product-image"
@@ -142,40 +128,28 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
                 <div class="actions">
                     <div class="tooltip">
                         <span class="delete-tooltiptext">
-                            <?= $block->escapeHtml(
-                                __('Delete image in all store views')
-                            ); ?>
+                            <?= $block->escapeHtml(__('Delete image in all store views')); ?>
                         </span>
                         <button type="button"
                                 class="action-remove"
                                 data-role="delete-button"
                                 title="<% if (data.media_type == 'external-video') {%>
-                                <?= $block->escapeHtml(
-                                    __('Delete video')
-                                ); ?>
+                                <?= $block->escapeHtmlAttr(__('Delete video')); ?>
                             <%} else {%>
-                                <?= $block->escapeHtml(
-                                    __('Delete image')
-                                ); ?>
+                                <?= $block->escapeHtmlAttr(__('Delete image')); ?>
                             <%}%>">
                         <span>
                             <% if (data.media_type == 'external-video') { %>
-                            <?= $block->escapeHtml(
-                                __('Delete video')
-                            ); ?>
+                            <?= $block->escapeHtml(__('Delete video')); ?>
                             <% } else {%>
-                            <?= $block->escapeHtml(
-                                __('Delete image')
-                            ); ?>
+                            <?= $block->escapeHtml(__('Delete image')); ?>
                             <%} %>
                         </span>
                         </button>
                     </div>
                     <div class="draggable-handle"></div>
                 </div>
-                <div class="image-fade"><span><?= $block->escapeHtml(
-                            __('Hidden')
-                        ); ?></span></div>
+                <div class="image-fade"><span><?= $block->escapeHtml(__('Hidden')); ?></span></div>
             </div>
 
             <div class="item-description">
@@ -190,19 +164,11 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
             </div>
 
             <ul class="item-roles" data-role="roles-labels">
-                <?php
-                foreach ($block->getImageTypes() as $typeData):
-                    ?>
-                    <li data-role-code="<?= $block->escapeHtml(
-                        $typeData['code']
-                    ) ?>" class="item-role item-role-<?= $block->escapeHtml(
-                        $typeData['code']
-                    ) ?>">
+                <?php foreach ($block->getImageTypes() as $typeData) : ?>
+                    <li data-role-code="<?= $block->escapeHtmlAttr($typeData['code']) ?>" class="item-role item-role-<?= $block->escapeHtmlAttr($typeData['code']) ?>">
                         <?= $block->escapeHtml($typeData['label']) ?>
                     </li>
-                    <?php
-                endforeach;
-                ?>
+                <?php endforeach; ?>
             </ul>
         </div>
     </script>
@@ -222,24 +188,20 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
             <fieldset class="admin__fieldset fieldset-image-panel">
                 <div class="admin__field field-image-description">
                     <label class="admin__field-label" for="image-description">
-                        <span><?= /* @escapeNotVerified */ __('Alt Text') ?></span>
+                        <span><?= $block->escapeHtml(__('Alt Text')) ?></span>
                     </label>
 
                     <div class="admin__field-control">
                             <textarea data-role="image-description"
                                       rows="3"
                                       class="admin__control-textarea"
-                                      name="<?php /* @escapeNotVerified */
-                                      echo $elementName
-                                      ?>[<%- data.file_id %>][label]"><%- data.label %></textarea>
+                                      name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][label]"><%- data.label %></textarea>
                     </div>
                 </div>
 
                 <div class="admin__field field-image-role">
                     <label class="admin__field-label">
-                            <span><?= $block->escapeHtml(
-                                    __('Role')
-                                ); ?></span>
+                            <span><?= $block->escapeHtml(__('Role')); ?></span>
                     </label>
                     <div class="admin__field-control">
                         <ul class="multiselect-alt">
@@ -250,36 +212,30 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
                                     <label>
                                         <input class="image-type"
                                                data-role="type-selector"
-                                               data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
+                                               data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"
                                                type="checkbox"
-                                               value="<?= $block->escapeHtml(
-                                                   $attribute->getAttributeCode()
-                                               ) ?>"
+                                               value="<?= $block->escapeHtmlAttr($attribute->getAttributeCode()) ?>"
                                         />
-                                        <?php /* @escapeNotVerified */ echo $block->escapeHtml(
-                                            $attribute->getFrontendLabel()
-                                        ) ?>
+                                        <?= $block->escapeHtml($attribute->getFrontendLabel()) ?>
                                     </label>
                                 </li>
-                                <?php
-                            endforeach;
-                            ?>
+                            <?php endforeach; ?>
                         </ul>
                     </div>
                 </div>
 
                 <div class="admin__field admin__field-inline field-image-size" data-role="size">
                     <label class="admin__field-label">
-                        <span><?= /* @escapeNotVerified */ __('Image Size') ?></span>
+                        <span><?= $block->escapeHtml(__('Image Size')) ?></span>
                     </label>
-                    <div class="admin__field-value" data-message="<?= /* @escapeNotVerified */ __('{size}') ?>"></div>
+                    <div class="admin__field-value" data-message="<?= $block->escapeHtmlAttr(__('{size}')) ?>"></div>
                 </div>
 
                 <div class="admin__field admin__field-inline field-image-resolution" data-role="resolution">
                     <label class="admin__field-label">
-                        <span><?= /* @escapeNotVerified */ __('Image Resolution') ?></span>
+                        <span><?= $block->escapeHtml(__('Image Resolution')) ?></span>
                     </label>
-                    <div class="admin__field-value" data-message="<?= /* @escapeNotVerified */ __('{width}^{height} px') ?>"></div>
+                    <div class="admin__field-value" data-message="<?= $block->escapeHtmlAttr(__('{width}^{height} px')) ?>"></div>
                 </div>
 
                 <div class="admin__field field-image-hide">
@@ -288,16 +244,14 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
                             <input type="checkbox"
                                    id="hide-from-product-page"
                                    data-role="visibility-trigger"
-                                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
+                                   data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"
                                    value="1"
                                    class="admin__control-checkbox"
-                                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][disabled]"
+                                   name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][disabled]"
                             <% if (data.disabled == 1) { %>checked="checked"<% } %> />
 
                             <label for="hide-from-product-page" class="admin__field-label">
-                                <?= $block->escapeHtml(
-                                    __('Hide from Product Page')
-                                ); ?>
+                                <?= $block->escapeHtml(__('Hide from Product Page')); ?>
                             </label>
                         </div>
                     </div>
@@ -306,28 +260,20 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
         </div>
     </script>
     <div id="<?= /* @noEscape */ $block->getNewVideoBlockName() ?>" style="display:none">
-        <?= /* @escapeNotVerified */ $block->getFormHtml() ?>
+        <?= $block->getFormHtml() ?>
         <div id="video-player-preview-location" class="video-player-sidebar">
             <div class="video-player-container"></div>
             <div class="video-information title">
-                <label><?= $block->escapeHtml(
-                        __('Title:')
-                    ); ?> </label><span></span>
+                <label><?= $block->escapeHtml(__('Title:')); ?> </label><span></span>
             </div>
             <div class="video-information uploaded">
-                <label><?= $block->escapeHtml(
-                        __('Uploaded:')
-                    ); ?> </label><span></span>
+                <label><?= $block->escapeHtml(__('Uploaded:')); ?> </label><span></span>
             </div>
             <div class="video-information uploader">
-                <label><?= $block->escapeHtml(
-                        __('Uploader:')
-                    ); ?> </label><span></span>
+                <label><?= $block->escapeHtml(__('Uploader:')); ?> </label><span></span>
             </div>
             <div class="video-information duration">
-                <label><?= $block->escapeHtml(
-                        __('Duration:')
-                    ); ?> </label><span></span>
+                <label><?= $block->escapeHtml(__('Duration:')); ?> </label><span></span>
             </div>
         </div>
     </div>
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/base_image.phtml b/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/base_image.phtml
index dc0d8206571dd..e1dcab9e8b2d4 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/base_image.phtml
+++ b/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/base_image.phtml
@@ -8,30 +8,30 @@
     <div class="add-video-button-container">
         <button
             id="add_video_button"
-            title="<?= /* @escapeNotVerified */ $addVideoTitle ?>"
+            title="<?= $block->escapeHtmlAttr($addVideoTitle) ?>"
             type="button"
             class="action-secondary"
             onclick="jQuery('#new-video').modal('openModal'); jQuery('#new_video_form')[0].reset();"
             data-ui-id="widget-button-1">
-            <span><?= /* @escapeNotVerified */ __('Add Video') ?></span>
+            <span><?= $block->escapeHtml(__('Add Video')) ?></span>
         </button>
     </div>
 </div>
-<div id="<?= /* @escapeNotVerified */ $htmlId ?>-container"
+<div id="<?= $block->escapeHtmlAttr($htmlId) ?>-container"
      class="images"
      data-mage-init='{"baseImage":{}}'
-     data-max-file-size="<?= /* @escapeNotVerified */ $fileMaxSize ?>"
+     data-max-file-size="<?= $block->escapeHtmlAttr($fileMaxSize) ?>"
     >
     <div class="image image-placeholder">
-        <input type="file" name="image" data-url="<?= /* @escapeNotVerified */ $uploadUrl ?>" multiple="multiple" />
-        <img class="spacer" src="<?= /* @escapeNotVerified */ $spacerImage ?>"/>
-        <p class="image-placeholder-text"><?= /* @escapeNotVerified */ $imagePlaceholderText ?></p>
+        <input type="file" name="image" data-url="<?= $block->escapeUrl($uploadUrl) ?>" multiple="multiple" />
+        <img class="spacer" src="<?= $block->escapeUrl($spacerImage) ?>"/>
+        <p class="image-placeholder-text"><?= $block->escapeHtml($imagePlaceholderText) ?></p>
     </div>
-    <script id="<?= /* @escapeNotVerified */ $htmlId ?>-template"
+    <script id="<?= $block->escapeHtmlAttr($htmlId) ?>-template"
             data-template="image"
             type="text/x-magento-template">
         <div class="image">
-            <img class="spacer" src="<?= /* @escapeNotVerified */ $spacerImage ?>"/>
+            <img class="spacer" src="<?= $block->escapeUrl($spacerImage) ?>"/>
             <img
                 class="product-image"
                 src="<%- data.url %>"
@@ -42,25 +42,25 @@
                     type="button"
                     class="action-delete"
                     data-role="delete-button"
-                    title="<?= /* @escapeNotVerified */ $deleteImageText ?>">
-                    <span><?= /* @escapeNotVerified */ $deleteImageText ?></span>
+                    title="<?= $block->escapeHtmlAttr($deleteImageText) ?>">
+                    <span><?= $block->escapeHtml($deleteImageText) ?></span>
                 </button>
                 <button
                     type="button"
                     class="action-make-base"
                     data-role="make-base-button"
-                    title="<?= /* @escapeNotVerified */ $makeBaseText ?>">
-                    <span><?= /* @escapeNotVerified */ $makeBaseText ?></span>
+                    title="<?= $block->escapeHtmlAttr($makeBaseText) ?>">
+                    <span><?= $block->escapeHtml($makeBaseText) ?></span>
                 </button>
                 <div class="draggable-handle"></div>
             </div>
             <div class="image-label"></div>
-            <div class="image-fade"><span><?= /* @escapeNotVerified */ $hiddenText ?></span></div>
+            <div class="image-fade"><span><?= $block->escapeHtml($hiddenText) ?></span></div>
         </div>
     </script>
 </div>
 <span class="action-manage-images" data-activate-tab="image-management">
-    <span><?= /* @escapeNotVerified */ $imageManagementText ?></span>
+    <span><?= $block->escapeHtml($imageManagementText) ?></span>
 </span>
 <script>
     require([
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml b/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml
index e9421f8e74a87..7de3042b56ab5 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml
+++ b/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml
@@ -5,23 +5,23 @@
  */
 /* @var Magento\ProductVideo\Block\Adminhtml\Product\Edit\NewVideo $block */
 ?>
-<div id="<?= /* @escapeNotVerified */ $block->getNameInLayout() ?>" style="display:none"
-    data-modal-info='<?= /* @escapeNotVerified */ $block->getWidgetOptions() ?>'
+<div id="<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>" style="display:none"
+    data-modal-info='<?= /* @noEscape */ $block->getWidgetOptions() ?>'
 >
-    <?= /* @escapeNotVerified */ $block->getFormHtml() ?>
+    <?= $block->getFormHtml() ?>
     <div id="video-player-preview-location" class="video-player-sidebar">
         <div class="video-player-container"></div>
         <div class="video-information title">
-            <label><?= /* @escapeNotVerified */ __('Title:') ?> </label><span></span>
+            <label><?= $block->escapeHtml(__('Title:')) ?> </label><span></span>
         </div>
         <div class="video-information uploaded">
-            <label><?= /* @escapeNotVerified */ __('Uploaded:') ?> </label><span></span>
+            <label><?= $block->escapeHtml(__('Uploaded:')) ?> </label><span></span>
         </div>
         <div class="video-information uploader">
-            <label><?= /* @escapeNotVerified */ __('Uploader:') ?> </label><span></span>
+            <label><?= $block->escapeHtml(__('Uploader:')) ?> </label><span></span>
         </div>
         <div class="video-information duration">
-            <label><?= /* @escapeNotVerified */ __('Duration:') ?> </label><span></span>
+            <label><?= $block->escapeHtml(__('Duration:')) ?> </label><span></span>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/ProductVideo/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/ProductVideo/view/frontend/templates/product/view/gallery.phtml
index 55486dbbb0cfe..bfa394b5e7007 100644
--- a/app/code/Magento/ProductVideo/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/ProductVideo/view/frontend/templates/product/view/gallery.phtml
@@ -14,8 +14,8 @@
     {
         "[data-gallery-role=gallery-placeholder]": {
             "Magento_ProductVideo/js/fotorama-add-video-events": {
-                "videoData": <?= /* @escapeNotVerified */ $block->getMediaGalleryDataJson() ?>,
-                "videoSettings": <?= /* @escapeNotVerified */ $block->getVideoSettingsJson() ?>,
+                "videoData": <?= /* @noEscape */ $block->getMediaGalleryDataJson() ?>,
+                "videoSettings": <?= /* @noEscape */ $block->getVideoSettingsJson() ?>,
                 "optionsVideoData": <?= /* @noEscape */ $block->getOptionsMediaGalleryDataJson() ?>
             }
         }
diff --git a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
index 3966321f6072c..b7f4adb857a91 100644
--- a/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
+++ b/app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js
@@ -179,12 +179,14 @@ define([
          * @private
          */
         clearEvents: function () {
-            this.fotoramaItem.off(
-                'fotorama:show.' + this.PV +
-                ' fotorama:showend.' + this.PV +
-                ' fotorama:fullscreenenter.' + this.PV +
-                ' fotorama:fullscreenexit.' + this.PV
-            );
+            if (this.fotoramaItem !== undefined) {
+                this.fotoramaItem.off(
+                    'fotorama:show.' + this.PV +
+                    ' fotorama:showend.' + this.PV +
+                    ' fotorama:fullscreenenter.' + this.PV +
+                    ' fotorama:fullscreenexit.' + this.PV
+                );
+            }
         },
 
         /**
diff --git a/app/code/Magento/Quote/Api/Data/CartInterface.php b/app/code/Magento/Quote/Api/Data/CartInterface.php
index 551833e3effb1..b87869de6b3df 100644
--- a/app/code/Magento/Quote/Api/Data/CartInterface.php
+++ b/app/code/Magento/Quote/Api/Data/CartInterface.php
@@ -223,14 +223,14 @@ public function setBillingAddress(\Magento\Quote\Api\Data\AddressInterface $bill
     /**
      * Returns the reserved order ID for the cart.
      *
-     * @return int|null Reserved order ID. Otherwise, null.
+     * @return string|null Reserved order ID. Otherwise, null.
      */
     public function getReservedOrderId();
 
     /**
      * Sets the reserved order ID for the cart.
      *
-     * @param int $reservedOrderId
+     * @param string $reservedOrderId
      * @return $this
      */
     public function setReservedOrderId($reservedOrderId);
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index 640f89844546e..064b0c60e199c 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -7,6 +7,7 @@
 
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Api\Data\GroupInterface;
+use Magento\Directory\Model\AllowedCountries;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
 use Magento\Framework\Model\AbstractExtensibleModel;
@@ -14,6 +15,7 @@
 use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Model\Quote\Address\Total as AddressTotal;
 use Magento\Sales\Model\Status;
+use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Sales\Model\OrderIncrementIdChecker;
 
@@ -360,6 +362,11 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      */
     private $orderIncrementIdChecker;
 
+    /**
+     * @var AllowedCountries
+     */
+    private $allowedCountriesReader;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -402,6 +409,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
      * @param OrderIncrementIdChecker|null $orderIncrementIdChecker
+     * @param AllowedCountries|null $allowedCountriesReader
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -445,7 +453,8 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        OrderIncrementIdChecker $orderIncrementIdChecker = null
+        OrderIncrementIdChecker $orderIncrementIdChecker = null,
+        AllowedCountries $allowedCountriesReader = null
     ) {
         $this->quoteValidator = $quoteValidator;
         $this->_catalogProduct = $catalogProduct;
@@ -482,6 +491,8 @@ public function __construct(
         $this->shippingAssignmentFactory = $shippingAssignmentFactory;
         $this->orderIncrementIdChecker = $orderIncrementIdChecker ?: ObjectManager::getInstance()
             ->get(OrderIncrementIdChecker::class);
+        $this->allowedCountriesReader = $allowedCountriesReader
+            ?: ObjectManager::getInstance()->get(AllowedCountries::class);
         parent::__construct(
             $context,
             $registry,
@@ -941,7 +952,7 @@ public function assignCustomerWithAddressChange(
                     /** @var \Magento\Quote\Model\Quote\Address $billingAddress */
                     $billingAddress = $this->_quoteAddressFactory->create();
                     $billingAddress->importCustomerAddressData($defaultBillingAddress);
-                    $this->setBillingAddress($billingAddress);
+                    $this->assignAddress($billingAddress);
                 }
             }
 
@@ -959,7 +970,7 @@ public function assignCustomerWithAddressChange(
                     $shippingAddress = $this->_quoteAddressFactory->create();
                 }
             }
-            $this->setShippingAddress($shippingAddress);
+            $this->assignAddress($shippingAddress, false);
         }
 
         return $this;
@@ -1354,7 +1365,7 @@ public function addShippingAddress(\Magento\Quote\Api\Data\AddressInterface $add
     }
 
     /**
-     * Retrieve quote items collection
+     * Retrieve quote items collection.
      *
      * @param bool $useCache
      * @return  \Magento\Eav\Model\Entity\Collection\AbstractCollection
@@ -1362,10 +1373,10 @@ public function addShippingAddress(\Magento\Quote\Api\Data\AddressInterface $add
      */
     public function getItemsCollection($useCache = true)
     {
-        if ($this->hasItemsCollection()) {
+        if ($this->hasItemsCollection() && $useCache) {
             return $this->getData('items_collection');
         }
-        if (null === $this->_items) {
+        if (null === $this->_items || !$useCache) {
             $this->_items = $this->_quoteItemCollectionFactory->create();
             $this->extensionAttributesJoinProcessor->process($this->_items);
             $this->_items->setQuote($this);
@@ -2218,6 +2229,11 @@ public function validateMinimumAmount($multishipping = false)
         if (!$minOrderActive) {
             return true;
         }
+        $includeDiscount = $this->_scopeConfig->getValue(
+            'sales/minimum_order/include_discount_amount',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
         $minOrderMulti = $this->_scopeConfig->isSetFlag(
             'sales/minimum_order/multi_address',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
@@ -2251,7 +2267,10 @@ public function validateMinimumAmount($multishipping = false)
                 $taxes = ($taxInclude) ? $address->getBaseTaxAmount() : 0;
                 foreach ($address->getQuote()->getItemsCollection() as $item) {
                     /** @var \Magento\Quote\Model\Quote\Item $item */
-                    $amount = $item->getBaseRowTotal() - $item->getBaseDiscountAmount() + $taxes;
+                    $amount = $includeDiscount ?
+                        $item->getBaseRowTotal() - $item->getBaseDiscountAmount() + $taxes :
+                        $item->getBaseRowTotal() + $taxes;
+
                     if ($amount < $minAmount) {
                         return false;
                     }
@@ -2261,7 +2280,9 @@ public function validateMinimumAmount($multishipping = false)
             $baseTotal = 0;
             foreach ($addresses as $address) {
                 $taxes = ($taxInclude) ? $address->getBaseTaxAmount() : 0;
-                $baseTotal += $address->getBaseSubtotalWithDiscount() + $taxes;
+                $baseTotal += $includeDiscount ?
+                    $address->getBaseSubtotalWithDiscount() + $taxes :
+                    $address->getBaseSubtotal() + $taxes;
             }
             if ($baseTotal < $minAmount) {
                 return false;
@@ -2560,4 +2581,34 @@ public function setExtensionAttributes(\Magento\Quote\Api\Data\CartExtensionInte
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
+    /**
+     * Check is address allowed for store
+     *
+     * @param Address $address
+     * @param  int|null $storeId
+     * @return bool
+     */
+    private function isAddressAllowedForWebsite(Address $address, $storeId): bool
+    {
+        $allowedCountries = $this->allowedCountriesReader->getAllowedCountries(ScopeInterface::SCOPE_STORE, $storeId);
+
+        return in_array($address->getCountryId(), $allowedCountries);
+    }
+
+    /**
+     * Assign address to quote
+     *
+     * @param Address $address
+     * @param bool $isBillingAddress
+     * @return void
+     */
+    private function assignAddress(Address $address, bool $isBillingAddress = true)
+    {
+        if ($this->isAddressAllowedForWebsite($address, $this->getStoreId())) {
+            $isBillingAddress
+                ? $this->setBillingAddress($address)
+                : $this->setShippingAddress($address);
+        }
+    }
 }
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index f0419c7f96095..38a97783ca012 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -1150,6 +1150,11 @@ public function validateMinimumAmount()
             return true;
         }
 
+        $includeDiscount = $this->_scopeConfig->getValue(
+            'sales/minimum_order/include_discount_amount',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
         $amount = $this->_scopeConfig->getValue(
             'sales/minimum_order/amount',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
@@ -1160,9 +1165,12 @@ public function validateMinimumAmount()
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
+
         $taxes = $taxInclude ? $this->getBaseTaxAmount() : 0;
 
-        return ($this->getBaseSubtotalWithDiscount() + $taxes >= $amount);
+        return $includeDiscount ?
+            ($this->getBaseSubtotalWithDiscount() + $taxes >= $amount) :
+            ($this->getBaseSubtotal() + $taxes >= $amount);
     }
 
     /**
diff --git a/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php b/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
index c5b8dc1c4b124..81b0bed2592ea 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
@@ -12,6 +12,9 @@
 use Magento\Quote\Model\QuoteAddressValidator;
 use Magento\Customer\Api\AddressRepositoryInterface;
 
+/**
+ * Saves billing address for quotes.
+ */
 class BillingAddressPersister
 {
     /**
@@ -37,17 +40,17 @@ public function __construct(
     }
 
     /**
+     * Save address for billing.
+     *
      * @param CartInterface $quote
      * @param AddressInterface $address
      * @param bool $useForShipping
      * @return void
-     * @throws NoSuchEntityException
-     * @throws InputException
      */
     public function save(CartInterface $quote, AddressInterface $address, $useForShipping = false)
     {
         /** @var \Magento\Quote\Model\Quote $quote */
-        $this->addressValidator->validate($address);
+        $this->addressValidator->validateForCart($quote, $address);
         $customerAddressId = $address->getCustomerAddressId();
         $shippingAddress = null;
         $addressData = [];
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total.php b/app/code/Magento/Quote/Model/Quote/Address/Total.php
index 42224c970ed27..00060c15c10d8 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total.php
@@ -6,6 +6,8 @@
 namespace Magento\Quote\Model\Quote\Address;
 
 /**
+ * Class Total
+ *
  * @method string getCode()
  *
  * @api
@@ -54,6 +56,8 @@ public function __construct(
      */
     public function setTotalAmount($code, $amount)
     {
+        $amount = is_float($amount) ? round($amount, 4) : $amount;
+
         $this->totalAmounts[$code] = $amount;
         if ($code != 'subtotal') {
             $code = $code . '_amount';
@@ -72,6 +76,8 @@ public function setTotalAmount($code, $amount)
      */
     public function setBaseTotalAmount($code, $amount)
     {
+        $amount = is_float($amount) ? round($amount, 4) : $amount;
+
         $this->baseTotalAmounts[$code] = $amount;
         if ($code != 'subtotal') {
             $code = $code . '_amount';
@@ -167,6 +173,7 @@ public function getAllBaseTotalAmounts()
 
     /**
      * Set the full info, which is used to capture tax related information.
+     *
      * If a string is used, it is assumed to be serialized.
      *
      * @param array|string $info
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
index 84f1fc1c35adf..e9a63dad6e169 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
@@ -9,6 +9,9 @@
 use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Model\Quote\Address\FreeShippingInterface;
 
+/**
+ * Collect totals for shipping.
+ */
 class Shipping extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
 {
     /**
@@ -111,7 +114,7 @@ public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Qu
     {
         $amount = $total->getShippingAmount();
         $shippingDescription = $total->getShippingDescription();
-        $title = ($amount != 0 && $shippingDescription)
+        $title = ($shippingDescription)
             ? __('Shipping & Handling (%1)', $shippingDescription)
             : __('Shipping & Handling');
 
@@ -227,7 +230,7 @@ private function getAssignmentWeightData(AddressInterface $address, array $items
      * @param bool $addressFreeShipping
      * @param float $itemWeight
      * @param float $itemQty
-     * @param $freeShipping
+     * @param bool $freeShipping
      * @return float
      */
     private function getItemRowWeight(
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Compare.php b/app/code/Magento/Quote/Model/Quote/Item/Compare.php
index ddaa636ef32b3..76ba324518dc1 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Compare.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Compare.php
@@ -50,7 +50,7 @@ protected function getOptionValues($value)
         if (is_string($value) && $this->jsonValidator->isValid($value)) {
             $value = $this->serializer->unserialize($value);
             if (is_array($value)) {
-                unset($value['qty'], $value['uenc']);
+                unset($value['qty'], $value['uenc'], $value['related_product'], $value['item']);
                 $value = array_filter($value, function ($optionValue) {
                     return !empty($optionValue);
                 });
diff --git a/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php b/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
index 32687499274f8..6192d3471ccb0 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
@@ -48,6 +48,8 @@ public function __construct(
     }
 
     /**
+     * Convert quote item(quote address item) into order item.
+     *
      * @param Item|AddressItem $item
      * @param array $data
      * @return OrderItemInterface
@@ -63,6 +65,16 @@ public function convert($item, $data = [])
             'to_order_item',
             $item
         );
+        if ($item instanceof \Magento\Quote\Model\Quote\Address\Item) {
+            $orderItemData = array_merge(
+                $orderItemData,
+                $this->objectCopyService->getDataFromFieldset(
+                    'quote_convert_address_item',
+                    'to_order_item',
+                    $item
+                )
+            );
+        }
         if (!$item->getNoDiscount()) {
             $data = array_merge(
                 $data,
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Updater.php b/app/code/Magento/Quote/Model/Quote/Item/Updater.php
index 6a7a3c1c1839e..05244d4ecc43a 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Updater.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Updater.php
@@ -145,8 +145,8 @@ protected function unsetCustomPrice(Item $item)
             $item->addOption($infoBuyRequest);
         }
 
-        $item->unsetData('custom_price');
-        $item->unsetData('original_custom_price');
+        $item->setData('custom_price', null);
+        $item->setData('original_custom_price', null);
     }
 
     /**
diff --git a/app/code/Magento/Quote/Model/QuoteAddressValidator.php b/app/code/Magento/Quote/Model/QuoteAddressValidator.php
index 9a86829bfc4ce..06f21ee119bd5 100644
--- a/app/code/Magento/Quote/Model/QuoteAddressValidator.php
+++ b/app/code/Magento/Quote/Model/QuoteAddressValidator.php
@@ -6,10 +6,13 @@
 namespace Magento\Quote\Model;
 
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\CartInterface;
 
 /**
  * Quote shipping/billing address validator service.
  *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class QuoteAddressValidator
 {
@@ -28,7 +31,7 @@ class QuoteAddressValidator
     protected $customerRepository;
 
     /**
-     * @var \Magento\Customer\Model\Session
+     * @deprecated This class is not a part of HTML presentation layer and should not use sessions.
      */
     protected $customerSession;
 
@@ -50,44 +53,68 @@ public function __construct(
     }
 
     /**
-     * Validates the fields in a specified address data object.
+     * Validate address.
      *
-     * @param \Magento\Quote\Api\Data\AddressInterface $addressData The address data object.
-     * @return bool
-     * @throws \Magento\Framework\Exception\InputException The specified address belongs to another customer.
-     * @throws \Magento\Framework\Exception\NoSuchEntityException The specified customer ID or address ID is not valid.
+     * @param AddressInterface $address
+     * @param int|null $customerId Cart belongs to
+     * @return void
+     * @throws NoSuchEntityException The specified customer ID or address ID is not valid.
      */
-    public function validate(\Magento\Quote\Api\Data\AddressInterface $addressData)
+    private function doValidate(AddressInterface $address, $customerId)
     {
         //validate customer id
-        if ($addressData->getCustomerId()) {
-            $customer = $this->customerRepository->getById($addressData->getCustomerId());
-            if (!$customer->getId()) {
-                throw new \Magento\Framework\Exception\NoSuchEntityException(
-                    __('Invalid customer id %1', $addressData->getCustomerId())
-                );
+        if ($customerId) {
+            try {
+                $this->customerRepository->getById($customerId);
+            } catch (NoSuchEntityException $exception) {
+                throw new NoSuchEntityException(__('Invalid customer id %1', $customerId));
             }
         }
 
-        if ($addressData->getCustomerAddressId()) {
+        if ($address->getCustomerAddressId()) {
+            //Existing address cannot belong to a guest
+            if (!$customerId) {
+                throw new NoSuchEntityException(__('Invalid customer address id %1', $address->getCustomerAddressId()));
+            }
+            //Validating address ID
             try {
-                $this->addressRepository->getById($addressData->getCustomerAddressId());
+                $this->addressRepository->getById($address->getCustomerAddressId());
             } catch (NoSuchEntityException $e) {
-                throw new \Magento\Framework\Exception\NoSuchEntityException(
-                    __('Invalid address id %1', $addressData->getId())
-                );
+                throw new NoSuchEntityException(__('Invalid address id %1', $address->getId()));
             }
-
+            //Finding available customer's addresses
             $applicableAddressIds = array_map(function ($address) {
                 /** @var \Magento\Customer\Api\Data\AddressInterface $address */
                 return $address->getId();
-            }, $this->customerRepository->getById($addressData->getCustomerId())->getAddresses());
-            if (!in_array($addressData->getCustomerAddressId(), $applicableAddressIds)) {
-                throw new \Magento\Framework\Exception\NoSuchEntityException(
-                    __('Invalid customer address id %1', $addressData->getCustomerAddressId())
-                );
+            }, $this->customerRepository->getById($customerId)->getAddresses());
+            if (!in_array($address->getCustomerAddressId(), $applicableAddressIds)) {
+                throw new NoSuchEntityException(__('Invalid customer address id %1', $address->getCustomerAddressId()));
             }
         }
+    }
+
+    /**
+     * Validates the fields in a specified address data object.
+     *
+     * @param \Magento\Quote\Api\Data\AddressInterface $addressData The address data object.
+     * @return bool
+     */
+    public function validate(AddressInterface $addressData): bool
+    {
+        $this->doValidate($addressData, $addressData->getCustomerId());
+
         return true;
     }
+
+    /**
+     * Validate address to be used for cart.
+     *
+     * @param CartInterface $cart
+     * @param AddressInterface $address
+     * @return void
+     */
+    public function validateForCart(CartInterface $cart, AddressInterface $address)
+    {
+        $this->doValidate($address, $cart->getCustomerIsGuest() ? null : $cart->getCustomer()->getId());
+    }
 }
diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
index e2ee8bbad01b9..79170ad90832c 100644
--- a/app/code/Magento/Quote/Model/QuoteManagement.php
+++ b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -25,6 +25,7 @@
 /**
  * Class QuoteManagement
  *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  */
@@ -36,9 +37,9 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
     protected $eventManager;
 
     /**
-     * @var QuoteValidator
+     * @var SubmitQuoteValidator
      */
-    protected $quoteValidator;
+    private $submitQuoteValidator;
 
     /**
      * @var OrderFactory
@@ -147,7 +148,7 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
 
     /**
      * @param EventManager $eventManager
-     * @param QuoteValidator $quoteValidator
+     * @param SubmitQuoteValidator $submitQuoteValidator
      * @param OrderFactory $orderFactory
      * @param OrderManagement $orderManagement
      * @param CustomerManagement $customerManagement
@@ -172,7 +173,7 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface
      */
     public function __construct(
         EventManager $eventManager,
-        QuoteValidator $quoteValidator,
+        SubmitQuoteValidator $submitQuoteValidator,
         OrderFactory $orderFactory,
         OrderManagement $orderManagement,
         CustomerManagement $customerManagement,
@@ -195,7 +196,7 @@ public function __construct(
         \Magento\Customer\Api\AddressRepositoryInterface $addressRepository = null
     ) {
         $this->eventManager = $eventManager;
-        $this->quoteValidator = $quoteValidator;
+        $this->submitQuoteValidator = $submitQuoteValidator;
         $this->orderFactory = $orderFactory;
         $this->orderManagement = $orderManagement;
         $this->customerManagement = $customerManagement;
@@ -281,6 +282,7 @@ public function assignCustomer($cartId, $customerId, $storeId)
             throw new StateException(
                 __('Cannot assign customer to the given cart. Customer already has active cart.')
             );
+        // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
         }
 
@@ -355,6 +357,13 @@ public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
         if ($quote->getCheckoutMethod() === self::METHOD_GUEST) {
             $quote->setCustomerId(null);
             $quote->setCustomerEmail($quote->getBillingAddress()->getEmail());
+            if ($quote->getCustomerFirstname() === null && $quote->getCustomerLastname() === null) {
+                $quote->setCustomerFirstname($quote->getBillingAddress()->getFirstname());
+                $quote->setCustomerLastname($quote->getBillingAddress()->getLastname());
+                if ($quote->getCustomerMiddlename() === null) {
+                    $quote->setCustomerMiddlename($quote->getBillingAddress()->getMiddlename());
+                }
+            }
             $quote->setCustomerIsGuest(true);
             $quote->setCustomerGroupId(\Magento\Customer\Api\Data\GroupInterface::NOT_LOGGED_IN_ID);
         }
@@ -446,7 +455,7 @@ protected function resolveItems(QuoteEntity $quote)
     protected function submitQuote(QuoteEntity $quote, $orderData = [])
     {
         $order = $this->orderFactory->create();
-        $this->quoteValidator->validateBeforeSubmit($quote);
+        $this->submitQuoteValidator->validateQuote($quote);
         if (!$quote->getCustomerIsGuest()) {
             if ($quote->getCustomerId()) {
                 $this->_prepareCustomerQuote($quote);
@@ -501,6 +510,7 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
         $order->setCustomerFirstname($quote->getCustomerFirstname());
         $order->setCustomerMiddlename($quote->getCustomerMiddlename());
         $order->setCustomerLastname($quote->getCustomerLastname());
+        $this->submitQuoteValidator->validateOrder($order);
 
         $this->eventManager->dispatch(
             'sales_model_service_quote_submit_before',
@@ -521,19 +531,7 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
             );
             $this->quoteRepository->save($quote);
         } catch (\Exception $e) {
-            if (!empty($this->addressesToSync)) {
-                foreach ($this->addressesToSync as $addressId) {
-                    $this->addressRepository->deleteById($addressId);
-                }
-            }
-            $this->eventManager->dispatch(
-                'sales_model_service_quote_submit_failure',
-                [
-                    'order'     => $order,
-                    'quote'     => $quote,
-                    'exception' => $e
-                ]
-            );
+            $this->rollbackAddresses($quote, $order, $e);
             throw $e;
         }
         return $order;
@@ -600,4 +598,43 @@ protected function _prepareCustomerQuote($quote)
             $shipping->setIsDefaultBilling(true);
         }
     }
+
+    /**
+     * Remove related to order and quote addresses and submit exception to further processing.
+     *
+     * @param Quote $quote
+     * @param \Magento\Sales\Api\Data\OrderInterface $order
+     * @param \Exception $e
+     * @throws \Exception
+     * @return void
+     */
+    private function rollbackAddresses(
+        QuoteEntity $quote,
+        \Magento\Sales\Api\Data\OrderInterface $order,
+        \Exception $e
+    ) {
+        try {
+            if (!empty($this->addressesToSync)) {
+                foreach ($this->addressesToSync as $addressId) {
+                    $this->addressRepository->deleteById($addressId);
+                }
+            }
+            $this->eventManager->dispatch(
+                'sales_model_service_quote_submit_failure',
+                [
+                    'order' => $order,
+                    'quote' => $quote,
+                    'exception' => $e,
+                ]
+            );
+        // phpcs:ignore Magento2.Exceptions.ThrowCatch
+        } catch (\Exception $consecutiveException) {
+            $message = sprintf(
+                "An exception occurred on 'sales_model_service_quote_submit_failure' event: %s",
+                $consecutiveException->getMessage()
+            );
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
+            throw new \Exception($message, 0, $e);
+        }
+    }
 }
diff --git a/app/code/Magento/Quote/Model/QuoteRepository.php b/app/code/Magento/Quote/Model/QuoteRepository.php
index 01c21bbbe50a7..30931821ddc7d 100644
--- a/app/code/Magento/Quote/Model/QuoteRepository.php
+++ b/app/code/Magento/Quote/Model/QuoteRepository.php
@@ -3,27 +3,33 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Quote\Model;
 
+use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use Magento\Framework\Api\Search\FilterGroup;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Api\SortOrder;
+use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\Data\CartInterface;
-use Magento\Quote\Model\Quote;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\Api\Search\FilterGroup;
-use Magento\Quote\Model\ResourceModel\Quote\Collection as QuoteCollection;
-use Magento\Quote\Model\ResourceModel\Quote\CollectionFactory as QuoteCollectionFactory;
-use Magento\Framework\Exception\InputException;
-use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use Magento\Quote\Api\Data\CartInterfaceFactory;
+use Magento\Quote\Api\Data\CartSearchResultsInterfaceFactory;
 use Magento\Quote\Model\QuoteRepository\SaveHandler;
 use Magento\Quote\Model\QuoteRepository\LoadHandler;
+use Magento\Quote\Model\ResourceModel\Quote\Collection as QuoteCollection;
+use Magento\Quote\Model\ResourceModel\Quote\CollectionFactory as QuoteCollectionFactory;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
+ * Quote repository.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
+class QuoteRepository implements CartRepositoryInterface
 {
     /**
      * @var Quote[]
@@ -37,6 +43,7 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
 
     /**
      * @var QuoteFactory
+     * @deprecated
      */
     protected $quoteFactory;
 
@@ -46,13 +53,13 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
     protected $storeManager;
 
     /**
-     * @var \Magento\Quote\Model\ResourceModel\Quote\Collection
+     * @var QuoteCollection
      * @deprecated 100.2.0
      */
     protected $quoteCollection;
 
     /**
-     * @var \Magento\Quote\Api\Data\CartSearchResultsInterfaceFactory
+     * @var CartSearchResultsInterfaceFactory
      */
     protected $searchResultsDataFactory;
 
@@ -77,43 +84,51 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
     private $collectionProcessor;
 
     /**
-     * @var \Magento\Quote\Model\ResourceModel\Quote\CollectionFactory
+     * @var QuoteCollectionFactory
      */
     private $quoteCollectionFactory;
 
+    /**
+     * @var CartInterfaceFactory
+     */
+    private $cartFactory;
+
     /**
      * Constructor
      *
      * @param QuoteFactory $quoteFactory
      * @param StoreManagerInterface $storeManager
-     * @param \Magento\Quote\Model\ResourceModel\Quote\Collection $quoteCollection
-     * @param \Magento\Quote\Api\Data\CartSearchResultsInterfaceFactory $searchResultsDataFactory
+     * @param QuoteCollection $quoteCollection
+     * @param CartSearchResultsInterfaceFactory $searchResultsDataFactory
      * @param JoinProcessorInterface $extensionAttributesJoinProcessor
      * @param CollectionProcessorInterface|null $collectionProcessor
-     * @param \Magento\Quote\Model\ResourceModel\Quote\CollectionFactory|null $quoteCollectionFactory
+     * @param QuoteCollectionFactory|null $quoteCollectionFactory
+     * @param CartInterfaceFactory|null $cartFactory
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         QuoteFactory $quoteFactory,
         StoreManagerInterface $storeManager,
-        \Magento\Quote\Model\ResourceModel\Quote\Collection $quoteCollection,
-        \Magento\Quote\Api\Data\CartSearchResultsInterfaceFactory $searchResultsDataFactory,
+        QuoteCollection $quoteCollection,
+        CartSearchResultsInterfaceFactory $searchResultsDataFactory,
         JoinProcessorInterface $extensionAttributesJoinProcessor,
         CollectionProcessorInterface $collectionProcessor = null,
-        \Magento\Quote\Model\ResourceModel\Quote\CollectionFactory $quoteCollectionFactory = null
+        QuoteCollectionFactory $quoteCollectionFactory = null,
+        CartInterfaceFactory $cartFactory = null
     ) {
         $this->quoteFactory = $quoteFactory;
         $this->storeManager = $storeManager;
         $this->searchResultsDataFactory = $searchResultsDataFactory;
         $this->extensionAttributesJoinProcessor = $extensionAttributesJoinProcessor;
-        $this->collectionProcessor = $collectionProcessor ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Framework\Api\SearchCriteria\CollectionProcessor::class);
-        $this->quoteCollectionFactory = $quoteCollectionFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Quote\Model\ResourceModel\Quote\CollectionFactory::class);
+        $this->collectionProcessor = $collectionProcessor ?: ObjectManager::getInstance()
+            ->get(CollectionProcessor::class);
+        $this->quoteCollectionFactory = $quoteCollectionFactory ?: ObjectManager::getInstance()
+            ->get(QuoteCollectionFactory::class);
+        $this->cartFactory = $cartFactory ?: ObjectManager::getInstance()->get(CartInterfaceFactory::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function get($cartId, array $sharedStoreIds = [])
     {
@@ -126,7 +141,7 @@ public function get($cartId, array $sharedStoreIds = [])
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getForCustomer($customerId, array $sharedStoreIds = [])
     {
@@ -140,7 +155,7 @@ public function getForCustomer($customerId, array $sharedStoreIds = [])
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getActive($cartId, array $sharedStoreIds = [])
     {
@@ -152,7 +167,7 @@ public function getActive($cartId, array $sharedStoreIds = [])
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getActiveForCustomer($customerId, array $sharedStoreIds = [])
     {
@@ -164,9 +179,9 @@ public function getActiveForCustomer($customerId, array $sharedStoreIds = [])
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
-    public function save(\Magento\Quote\Api\Data\CartInterface $quote)
+    public function save(CartInterface $quote)
     {
         if ($quote->getId()) {
             $currentQuote = $this->get($quote->getId(), [$quote->getStoreId()]);
@@ -184,9 +199,9 @@ public function save(\Magento\Quote\Api\Data\CartInterface $quote)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
-    public function delete(\Magento\Quote\Api\Data\CartInterface $quote)
+    public function delete(CartInterface $quote)
     {
         $quoteId = $quote->getId();
         $customerId = $quote->getCustomerId();
@@ -203,13 +218,13 @@ public function delete(\Magento\Quote\Api\Data\CartInterface $quote)
      * @param int $identifier
      * @param int[] $sharedStoreIds
      * @throws NoSuchEntityException
-     * @return Quote
+     * @return CartInterface
      */
     protected function loadQuote($loadMethod, $loadField, $identifier, array $sharedStoreIds = [])
     {
-        /** @var Quote $quote */
-        $quote = $this->quoteFactory->create();
-        if ($sharedStoreIds) {
+        /** @var CartInterface $quote */
+        $quote = $this->cartFactory->create();
+        if ($sharedStoreIds && method_exists($quote, 'setSharedStoreIds')) {
             $quote->setSharedStoreIds($sharedStoreIds);
         }
         $quote->setStoreId($this->storeManager->getStore()->getId())->$loadMethod($identifier);
@@ -220,9 +235,9 @@ protected function loadQuote($loadMethod, $loadField, $identifier, array $shared
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
-    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
+    public function getList(SearchCriteriaInterface $searchCriteria)
     {
         $this->quoteCollection = $this->quoteCollectionFactory->create();
         /** @var \Magento\Quote\Api\Data\CartSearchResultsInterface $searchData */
@@ -265,6 +280,7 @@ protected function addFilterGroupToCollection(FilterGroup $filterGroup, QuoteCol
 
     /**
      * Get new SaveHandler dependency for application code.
+     *
      * @return SaveHandler
      * @deprecated 100.1.0
      */
@@ -277,6 +293,8 @@ private function getSaveHandler()
     }
 
     /**
+     * Get load handler instance.
+     *
      * @return LoadHandler
      * @deprecated 100.1.0
      */
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 309c89e3702f5..959604592c848 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
@@ -325,10 +325,10 @@ private function getOptionProductIds(
     /**
      * Check is valid product.
      *
-     * @param ProductInterface $product
+     * @param ProductInterface|null $product
      * @return bool
      */
-    private function isValidProduct(ProductInterface $product): bool
+    private function isValidProduct(ProductInterface $product = null): bool
     {
         $result = ($product && (int)$product->getStatus() !== ProductStatus::STATUS_DISABLED);
 
diff --git a/app/code/Magento/Quote/Model/ShippingAddressManagement.php b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
index 0e2be5c9e3692..71a93e4604200 100644
--- a/app/code/Magento/Quote/Model/ShippingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
@@ -78,7 +78,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $address)
@@ -94,7 +94,7 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
         $saveInAddressBook = $address->getSaveInAddressBook() ? 1 : 0;
         $sameAsBilling = $address->getSameAsBilling() ? 1 : 0;
         $customerAddressId = $address->getCustomerAddressId();
-        $this->addressValidator->validate($address);
+        $this->addressValidator->validateForCart($quote, $address);
         $quote->setShippingAddress($address);
         $address = $quote->getShippingAddress();
 
@@ -122,7 +122,7 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function get($cartId)
     {
diff --git a/app/code/Magento/Quote/Model/SubmitQuoteValidator.php b/app/code/Magento/Quote/Model/SubmitQuoteValidator.php
new file mode 100644
index 0000000000000..76d31f94d2a62
--- /dev/null
+++ b/app/code/Magento/Quote/Model/SubmitQuoteValidator.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Address\Validator as OrderAddressValidator;
+
+/**
+ * Validates quote and order before quote submit.
+ */
+class SubmitQuoteValidator
+{
+    /**
+     * @var QuoteValidator
+     */
+    private $quoteValidator;
+
+    /**
+     * @var OrderAddressValidator
+     */
+    private $orderAddressValidator;
+
+    /**
+     * @param QuoteValidator $quoteValidator
+     * @param OrderAddressValidator $orderAddressValidator
+     */
+    public function __construct(
+        QuoteValidator $quoteValidator,
+        OrderAddressValidator $orderAddressValidator
+    ) {
+        $this->quoteValidator = $quoteValidator;
+        $this->orderAddressValidator = $orderAddressValidator;
+    }
+
+    /**
+     * Validates quote.
+     *
+     * @param Quote $quote
+     * @return void
+     * @throws LocalizedException
+     */
+    public function validateQuote(Quote $quote)
+    {
+        $this->quoteValidator->validateBeforeSubmit($quote);
+    }
+
+    /**
+     * Validates order.
+     *
+     * @param Order $order
+     * @return void
+     * @throws LocalizedException
+     */
+    public function validateOrder(Order $order)
+    {
+        foreach ($order->getAddresses() as $address) {
+            $errors = $this->orderAddressValidator->validate($address);
+            if (!empty($errors)) {
+                throw new LocalizedException(
+                    __("Failed address validation:\n%1", implode("\n", $errors))
+                );
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/Quote/Plugin/UpdateQuoteItemStore.php b/app/code/Magento/Quote/Plugin/UpdateQuoteItemStore.php
new file mode 100644
index 0000000000000..0ac589b11b53b
--- /dev/null
+++ b/app/code/Magento/Quote/Plugin/UpdateQuoteItemStore.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Plugin;
+
+use Magento\Checkout\Model\Session;
+use Magento\Quote\Model\QuoteRepository;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreSwitcherInterface;
+
+/**
+ * Updates quote items store id.
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
+class UpdateQuoteItemStore
+{
+    /**
+     * @var QuoteRepository
+     */
+    private $quoteRepository;
+
+    /**
+     * @var Session
+     */
+    private $checkoutSession;
+
+    /**
+     * @param QuoteRepository $quoteRepository
+     * @param Session $checkoutSession
+     */
+    public function __construct(
+        QuoteRepository $quoteRepository,
+        Session $checkoutSession
+    ) {
+        $this->quoteRepository = $quoteRepository;
+        $this->checkoutSession = $checkoutSession;
+    }
+
+    /**
+     * Update store id in active quote after store view switching.
+     *
+     * @param StoreSwitcherInterface $subject
+     * @param string $result
+     * @param StoreInterface $fromStore store where we came from
+     * @param StoreInterface $targetStore store where to go to
+     * @param string $redirectUrl original url requested for redirect after switching
+     * @return string url to be redirected after switching
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterSwitch(
+        StoreSwitcherInterface $subject,
+        string $result,
+        StoreInterface $fromStore,
+        StoreInterface $targetStore,
+        string $redirectUrl
+    ): string {
+        $quote = $this->checkoutSession->getQuote();
+        if ($quote->getIsActive()) {
+            $quote->setStoreId($targetStore->getId());
+            $quote->getItemsCollection(false);
+            $this->quoteRepository->save($quote);
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml b/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml
new file mode 100644
index 0000000000000..4cc2c4f392419
--- /dev/null
+++ b/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SimpleCartItem" type="CartItem">
+        <data key="qty">1</data>
+        <var key="quote_id" entityKey="return" entityType="GuestCart"/>
+        <var key="sku" entityKey="sku" entityType="product"/>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Quote/Test/Mftf/Data/GuestCartData.xml b/app/code/Magento/Quote/Test/Mftf/Data/GuestCartData.xml
index 47bb41f8714e2..37c9ed0d1c43e 100644
--- a/app/code/Magento/Quote/Test/Mftf/Data/GuestCartData.xml
+++ b/app/code/Magento/Quote/Test/Mftf/Data/GuestCartData.xml
@@ -8,7 +8,21 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="guestCart" type="guestCart">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+
+    <entity name="GuestCart" type="GuestCart">
+    </entity>
+
+    <entity name="GuestAddressInformation" type="AddressInformation">
+        <var key="quote_id" entityKey="return" entityType="GuestCart"/>
+        <requiredEntity type="shipping_address">ShippingAddressTX</requiredEntity>
+        <requiredEntity type="billing_address">BillingAddressTX</requiredEntity>
+        <data key="shipping_method_code">flatrate</data>
+        <data key="shipping_carrier_code">flatrate</data>
+    </entity>
+
+    <entity name="GuestOrderPaymentMethod" type="PaymentInformation">
+        <requiredEntity type="payment_method">PaymentMethodCheckMoneyOrder</requiredEntity>
+        <requiredEntity type="billing_address">BillingAddressTX</requiredEntity>
     </entity>
 </entities>
diff --git a/app/code/Magento/Quote/Test/Mftf/Metadata/billing_address-meta.xml b/app/code/Magento/Quote/Test/Mftf/Metadata/billing_address-meta.xml
new file mode 100644
index 0000000000000..d4a4c4345d738
--- /dev/null
+++ b/app/code/Magento/Quote/Test/Mftf/Metadata/billing_address-meta.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateBillingAddress" dataType="billing_address" type="create">
+        <field key="city">string</field>
+        <field key="region">string</field>
+        <field key="region_code">string</field>
+        <field key="region_id">int</field>
+        <field key="country_id">string</field>
+        <array key="street">
+            <value>string</value>
+        </array>
+        <field key="postcode">string</field>
+        <field key="firstname">string</field>
+        <field key="lastname">string</field>
+        <field key="email">string</field>
+        <field key="telephone">string</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Quote/Test/Mftf/Metadata/guest-cart-meta.xml b/app/code/Magento/Quote/Test/Mftf/Metadata/guest-cart-meta.xml
index b487f0b11b8ea..54b53d6646781 100644
--- a/app/code/Magento/Quote/Test/Mftf/Metadata/guest-cart-meta.xml
+++ b/app/code/Magento/Quote/Test/Mftf/Metadata/guest-cart-meta.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
  /**
   * Copyright © Magento, Inc. All rights reserved.
@@ -8,8 +7,62 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateGuestCart" dataType="guestCart" type="create" auth="anonymous" url="/V1/guest-carts" method="POST">
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateGuestCart" dataType="GuestCart" type="create" auth="anonymous" url="/V1/guest-carts" method="POST">
+        <contentType>application/json</contentType>
+    </operation>
+
+    <operation name="AddProductToGuestCart" dataType="CartItem" type="create" auth="anonymous" url="V1/guest-carts/{return}/items" method="POST">
+        <contentType>application/json</contentType>
+        <object key="cartItem" dataType="CartItem">
+            <field key="quote_id">string</field>
+            <field key="sku" type="string">string</field>
+            <field key="qty">integer</field>
+        </object>
+    </operation>
+
+    <operation name="AddAddressInfoToGuestCart" dataType="AddressInformation" type="create" auth="anonymous" url="/V1/guest-carts/{return}/shipping-information" method="POST">
+        <contentType>application/json</contentType>
+        <object key="addressInformation" dataType="AddressInformation">
+            <object key="shipping_address" dataType="shipping_address">
+                <field key="city">string</field>
+                <field key="region">string</field>
+                <field key="region_code">string</field>
+                <field key="region_id">integer</field>
+                <field key="country_id">string</field>
+                <array key="street">
+                    <value>string</value>
+                </array>
+                <field key="postcode">string</field>
+                <field key="firstname">string</field>
+                <field key="lastname">string</field>
+                <field key="email">string</field>
+                <field key="telephone">string</field>
+            </object>
+            <object key="billing_address" dataType="billing_address">
+                <field key="city">string</field>
+                <field key="region">string</field>
+                <field key="region_code">string</field>
+                <field key="region_id">integer</field>
+                <field key="country_id">string</field>
+                <array key="street">
+                    <value>string</value>
+                </array>
+                <field key="postcode">string</field>
+                <field key="firstname">string</field>
+                <field key="lastname">string</field>
+                <field key="email">string</field>
+                <field key="telephone">string</field>
+            </object>
+            <field key="shipping_method_code">string</field>
+            <field key="shipping_carrier_code">string</field>
+        </object>
+    </operation>
+
+    <operation name="SendGuestPaymentInformation" dataType="PaymentInformation" type="update" auth="anonymous" url="/V1/guest-carts/{return}/order" method="PUT">
         <contentType>application/json</contentType>
+        <object key="paymentMethod" dataType="payment_method">
+            <field key="method">string</field>
+        </object>
     </operation>
 </operations>
diff --git a/app/code/Magento/Quote/Test/Mftf/Metadata/shipping_address-meta.xml b/app/code/Magento/Quote/Test/Mftf/Metadata/shipping_address-meta.xml
new file mode 100644
index 0000000000000..803681252a9e9
--- /dev/null
+++ b/app/code/Magento/Quote/Test/Mftf/Metadata/shipping_address-meta.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateShippingAddress" dataType="shipping_address" type="create">
+        <field key="city">string</field>
+        <field key="region">string</field>
+        <field key="region_code">string</field>
+        <field key="region_id">int</field>
+        <field key="country_id">string</field>
+        <array key="street">
+            <value>string</value>
+        </array>
+        <field key="postcode">string</field>
+        <field key="firstname">string</field>
+        <field key="lastname">string</field>
+        <field key="email">string</field>
+        <field key="telephone">string</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml b/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
index a2f08353a4f3b..e5e7c3834bf7d 100644
--- a/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
+++ b/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
@@ -22,6 +22,9 @@
             <createData entity="_defaultProduct" stepKey="createSimpleProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct2">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
             <!-- Create the configurable product based on the data in the /data folder -->
             <createData entity="BaseConfigurableProduct" stepKey="createConfigProduct">
                 <requiredEntity createDataKey="createCategory"/>
@@ -70,7 +73,10 @@
             </createData>
         </before>
         <after>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductListing"/>
+            <actionGroup ref="AdminResetProductGridToDefaultViewActionGroup" stepKey="resetGridToDefaultKeywordSearch"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createSimpleProduct2" stepKey="deleteProduct2"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
             <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
@@ -79,13 +85,11 @@
         </after>
         <!--  Step 1: Add simple product to shopping cart -->
         <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
         <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddSimpleProductToCart">
             <argument name="product" value="$$createSimpleProduct$$"/>
             <argument name="productCount" value="1"/>
         </actionGroup>
         <amOnPage url="{{StorefrontProductPage.url($$createConfigProduct.custom_attributes[url_key]$$)}}" stepKey="goToConfigProductPage"/>
-        <waitForPageLoad stepKey="waitForStoreFrontLoad"/>
         <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$getConfigAttributeOption1.value$$" stepKey="selectOption"/>
         <click selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="clickAddToCart" />
         <waitForElement selector="{{StorefrontMessagesSection.messageProductAddedToCart($$createConfigProduct.name$$)}}" time="30" stepKey="assertMessage"/>
@@ -94,8 +98,6 @@
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         <!-- Find the first simple product that we just created using the product grid and go to its page-->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad stepKey="waitForAdminProductGridLoad"/>
-        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
         <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct">
             <argument name="product" value="$$createConfigChildProduct1$$"/>
         </actionGroup>
@@ -113,10 +115,37 @@
             <argument name="status" value="Disable"/>
         </actionGroup>
         <closeTab stepKey="closeTab"/>
-        <!--Check cart-->
+        <!-- Check cart -->
         <reloadPage stepKey="reloadPage"/>
-        <waitForPageLoad stepKey="waitForCheckoutPageReload2"/>
+        <waitForPageLoad stepKey="waitForCheckoutPageReload"/>
         <click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickMiniCart"/>
         <dontSeeElement selector="{{StorefrontMiniCartSection.quantity}}" stepKey="dontSeeCartItem"/>
+        <!-- Add simple product to shopping cart -->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct2.name$$)}}" stepKey="amOnSimpleProductPage2"/>
+        <actionGroup ref="StorefrontAddProductToCartQuantityActionGroup" stepKey="addToCart2">
+            <argument name="productName" value="$$createSimpleProduct2.name$$"/>
+            <argument name="quantity" value="1"/>
+        </actionGroup>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckoutCartPage"/>
+        <!-- Disabled via admin panel -->
+        <openNewTab stepKey="openNewTab2"/>
+        <!-- Find the first simple product that we just created using the product grid and go to its page -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct2">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+        </actionGroup>
+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage2"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
+        <!-- Disabled simple product from grid -->
+        <actionGroup ref="ChangeStatusProductUsingProductGridActionGroup" stepKey="disabledProductFromGrid2">
+            <argument name="product" value="$$createSimpleProduct2$$"/>
+            <argument name="status" value="Disable"/>
+        </actionGroup>
+        <closeTab stepKey="closeTab2"/>
+        <!--Check cart-->
+        <reloadPage stepKey="reloadPage2"/>
+        <waitForPageLoad stepKey="waitForCheckoutPageReload2"/>
+        <click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickMiniCart2"/>
+        <dontSeeElement selector="{{StorefrontMiniCartSection.quantity}}" stepKey="dontSeeCartItem2"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php
index e25b770b7a81e..8784310d540bd 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php
@@ -216,6 +216,7 @@ public function testValidateMiniumumAmountVirtual()
         $scopeConfigValues = [
             ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
+            ['sales/minimum_order/include_discount_amount', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
         ];
 
@@ -240,6 +241,31 @@ public function testValidateMiniumumAmount()
         $scopeConfigValues = [
             ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
+            ['sales/minimum_order/include_discount_amount', ScopeInterface::SCOPE_STORE, $storeId, true],
+            ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
+        ];
+
+        $this->quote->expects($this->once())
+            ->method('getStoreId')
+            ->willReturn($storeId);
+        $this->quote->expects($this->once())
+            ->method('getIsVirtual')
+            ->willReturn(false);
+
+        $this->scopeConfig->expects($this->once())
+            ->method('isSetFlag')
+            ->willReturnMap($scopeConfigValues);
+
+        $this->assertTrue($this->address->validateMinimumAmount());
+    }
+
+    public function testValidateMiniumumAmountWithoutDiscount()
+    {
+        $storeId = 1;
+        $scopeConfigValues = [
+            ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
+            ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
+            ['sales/minimum_order/include_discount_amount', ScopeInterface::SCOPE_STORE, $storeId, false],
             ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
         ];
 
@@ -263,6 +289,7 @@ public function testValidateMiniumumAmountNegative()
         $scopeConfigValues = [
             ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
+            ['sales/minimum_order/include_discount_amount', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
         ];
 
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/UpdaterTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/UpdaterTest.php
index 7933da7c5fe37..8e6a3723caa7c 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/UpdaterTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/UpdaterTest.php
@@ -67,7 +67,7 @@ protected function setUp()
                 'addOption',
                 'setCustomPrice',
                 'setOriginalCustomPrice',
-                'unsetData',
+                'setData',
                 'hasData',
                 'setIsQtyDecimal'
             ]);
@@ -301,7 +301,7 @@ public function testUpdateUnsetCustomPrice()
                 'setProduct',
                 'getData',
                 'unsetData',
-                'hasData'
+                'hasData',
             ]);
         $buyRequestMock->expects($this->never())->method('setCustomPrice');
         $buyRequestMock->expects($this->once())->method('getData')->will($this->returnValue([]));
@@ -353,7 +353,11 @@ public function testUpdateUnsetCustomPrice()
             ->will($this->returnValue($buyRequestMock));
 
         $this->itemMock->expects($this->exactly(2))
-            ->method('unsetData');
+            ->method('setData')
+            ->withConsecutive(
+                ['custom_price', null],
+                ['original_custom_price', null]
+            );
 
         $this->itemMock->expects($this->once())
             ->method('hasData')
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php
index 08f5f6a808561..c0ffbc997590e 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php
@@ -67,27 +67,22 @@ public function testValidateInvalidCustomer()
     {
         $customerId = 100;
         $address = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
-        $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
 
         $address->expects($this->atLeastOnce())->method('getCustomerId')->willReturn($customerId);
         $this->customerRepositoryMock->expects($this->once())->method('getById')->with($customerId)
-            ->willReturn($customerMock);
+            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException());
         $this->model->validate($address);
     }
 
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     * @expectedExceptionMessage Invalid address id 101
+     * @expectedExceptionMessage Invalid customer address id 101
      */
     public function testValidateInvalidAddress()
     {
         $address = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
         $this->customerRepositoryMock->expects($this->never())->method('getById');
-        $address->expects($this->atLeastOnce())->method('getCustomerAddressId')->willReturn(101);
-        $address->expects($this->once())->method('getId')->willReturn(101);
-
-        $this->addressRepositoryMock->expects($this->once())->method('getById')
-            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException());
+        $address->expects($this->exactly(2))->method('getCustomerAddressId')->willReturn(101);
 
         $this->model->validate($address);
     }
@@ -115,7 +110,6 @@ public function testValidateWithValidAddress()
         $customerAddress = $this->createMock(\Magento\Quote\Api\Data\AddressInterface::class);
 
         $this->customerRepositoryMock->expects($this->exactly(2))->method('getById')->willReturn($customerMock);
-        $customerMock->expects($this->once())->method('getId')->willReturn($addressCustomer);
 
         $this->addressRepositoryMock->expects($this->once())->method('getById')->willReturn($this->quoteAddressMock);
         $this->quoteAddressMock->expects($this->any())->method('getCustomerId')->willReturn($addressCustomer);
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
index 145a18fb34ca3..aca490ae2b1a1 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
@@ -13,6 +13,8 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.TooManyPublicMethods)
+ * @SuppressWarnings(PHPMD.ExcessiveClassLength)
  */
 class QuoteManagementTest extends \PHPUnit\Framework\TestCase
 {
@@ -22,9 +24,9 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
     protected $model;
 
     /**
-     * @var \Magento\Quote\Model\QuoteValidator|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Quote\Model\SubmitQuoteValidator|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $quoteValidator;
+    protected $submitQuoteValidator;
 
     /**
      * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
@@ -143,7 +145,7 @@ protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->quoteValidator = $this->createMock(\Magento\Quote\Model\QuoteValidator::class);
+        $this->submitQuoteValidator = $this->createMock(\Magento\Quote\Model\SubmitQuoteValidator::class);
         $this->eventManager = $this->getMockForAbstractClass(\Magento\Framework\Event\ManagerInterface::class);
         $this->orderFactory = $this->createPartialMock(
             \Magento\Sales\Api\Data\OrderInterfaceFactory::class,
@@ -210,7 +212,7 @@ protected function setUp()
             \Magento\Quote\Model\QuoteManagement::class,
             [
                 'eventManager' => $this->eventManager,
-                'quoteValidator' => $this->quoteValidator,
+                'submitQuoteValidator' => $this->submitQuoteValidator,
                 'orderFactory' => $this->orderFactory,
                 'orderManagement' => $this->orderManagement,
                 'customerManagement' => $this->customerManagement,
@@ -560,7 +562,9 @@ public function testSubmit()
             $shippingAddress
         );
 
-        $this->quoteValidator->expects($this->once())->method('validateBeforeSubmit')->with($quote);
+        $this->submitQuoteValidator->expects($this->once())
+            ->method('validateQuote')
+            ->with($quote);
         $this->quoteAddressToOrder->expects($this->once())
             ->method('convert')
             ->with($shippingAddress, $orderData)
@@ -642,7 +646,7 @@ public function testPlaceOrderIfCustomerIsGuest()
 
         $addressMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Address::class, ['getEmail']);
         $addressMock->expects($this->once())->method('getEmail')->willReturn($email);
-        $this->quoteMock->expects($this->once())->method('getBillingAddress')->with()->willReturn($addressMock);
+        $this->quoteMock->expects($this->any())->method('getBillingAddress')->with()->willReturn($addressMock);
 
         $this->quoteMock->expects($this->once())->method('setCustomerIsGuest')->with(true)->willReturnSelf();
         $this->quoteMock->expects($this->once())
@@ -655,7 +659,7 @@ public function testPlaceOrderIfCustomerIsGuest()
             ->setConstructorArgs(
                 [
                     'eventManager' => $this->eventManager,
-                    'quoteValidator' => $this->quoteValidator,
+                    'quoteValidator' => $this->submitQuoteValidator,
                     'orderFactory' => $this->orderFactory,
                     'orderManagement' => $this->orderManagement,
                     'customerManagement' => $this->customerManagement,
@@ -712,7 +716,7 @@ public function testPlaceOrder()
             ->setConstructorArgs(
                 [
                 'eventManager' => $this->eventManager,
-                    'quoteValidator' => $this->quoteValidator,
+                    'quoteValidator' => $this->submitQuoteValidator,
                     'orderFactory' => $this->orderFactory,
                     'orderManagement' => $this->orderManagement,
                     'customerManagement' => $this->customerManagement,
@@ -934,6 +938,9 @@ protected function prepareOrderFactory(
         return $order;
     }
 
+    /**
+     * @throws NoSuchEntityException
+     */
     public function testGetCartForCustomer()
     {
         $customerId = 100;
@@ -978,6 +985,9 @@ protected function setPropertyValue(&$object, $property, $value)
         return $object;
     }
 
+    /**
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function testSubmitForCustomer()
     {
         $orderData = [];
@@ -1010,7 +1020,8 @@ public function testSubmitForCustomer()
             $shippingAddress
         );
 
-        $this->quoteValidator->expects($this->once())->method('validateBeforeSubmit')->with($quote);
+        $this->submitQuoteValidator->method('validateQuote')
+            ->with($quote);
         $this->quoteAddressToOrder->expects($this->once())
             ->method('convert')
             ->with($shippingAddress, $orderData)
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php
index 3101c7d0677a9..095e1760df86f 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php
@@ -5,17 +5,31 @@
  */
 namespace Magento\Quote\Test\Unit\Model;
 
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SortOrder;
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Api\Data\CartInterfaceFactory;
+use Magento\Quote\Api\Data\CartSearchResultsInterface;
+use Magento\Quote\Api\Data\CartSearchResultsInterfaceFactory;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteRepository;
 use Magento\Quote\Model\QuoteRepository\LoadHandler;
 use Magento\Quote\Model\QuoteRepository\SaveHandler;
+use Magento\Quote\Model\ResourceModel\Quote\Collection;
 use Magento\Quote\Model\ResourceModel\Quote\CollectionFactory;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyMethods)
  */
-class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
+class QuoteRepositoryTest extends TestCase
 {
     /**
      * @var \Magento\Quote\Api\CartRepositoryInterface
@@ -23,32 +37,32 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
     private $model;
 
     /**
-     * @var \Magento\Quote\Model\QuoteFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var CartInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $quoteFactoryMock;
+    private $cartFactoryMock;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $storeManagerMock;
 
     /**
-     * @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject
+     * @var Store|\PHPUnit_Framework_MockObject_MockObject
      */
     private $storeMock;
 
     /**
-     * @var \Magento\Quote\Model\Quote|\PHPUnit_Framework_MockObject_MockObject
+     * @var Quote|\PHPUnit_Framework_MockObject_MockObject
      */
     private $quoteMock;
 
     /**
-     * @var \Magento\Quote\Api\Data\CartSearchResultsInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var CartSearchResultsInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     private $searchResultsDataFactory;
 
     /**
-     * @var \Magento\Quote\Model\ResourceModel\Quote\Collection|\PHPUnit_Framework_MockObject_MockObject
+     * @var Collection|\PHPUnit_Framework_MockObject_MockObject
      */
     private $quoteCollectionMock;
 
@@ -78,21 +92,21 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
     private $objectManagerMock;
 
     /**
-     * @var \Magento\Quote\Model\ResourceModel\Quote\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     private $quoteCollectionFactoryMock;
 
     protected function setUp()
     {
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $objectManager = new ObjectManager($this);
 
-        $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
+        $this->objectManagerMock = $this->createMock(ObjectManagerInterface::class);
         \Magento\Framework\App\ObjectManager::setInstance($this->objectManagerMock);
 
-        $this->quoteFactoryMock = $this->createPartialMock(\Magento\Quote\Model\QuoteFactory::class, ['create']);
-        $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
+        $this->cartFactoryMock = $this->createPartialMock(CartInterfaceFactory::class, ['create']);
+        $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
         $this->quoteMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote::class,
+            Quote::class,
             [
                 'load',
                 'loadByIdWithoutStore',
@@ -108,35 +122,35 @@ protected function setUp()
                 'getData'
             ]
         );
-        $this->storeMock = $this->createMock(\Magento\Store\Model\Store::class);
+        $this->storeMock = $this->createMock(Store::class);
         $this->searchResultsDataFactory = $this->createPartialMock(
-            \Magento\Quote\Api\Data\CartSearchResultsInterfaceFactory::class,
+            CartSearchResultsInterfaceFactory::class,
             ['create']
         );
 
         $this->quoteCollectionMock =
-            $this->createMock(\Magento\Quote\Model\ResourceModel\Quote\Collection::class);
+            $this->createMock(Collection::class);
 
         $this->extensionAttributesJoinProcessorMock = $this->createMock(
-            \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface::class
+            JoinProcessorInterface::class
         );
         $this->collectionProcessor = $this->createMock(
-            \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface::class
+            CollectionProcessorInterface::class
         );
         $this->quoteCollectionFactoryMock = $this->createPartialMock(
-            \Magento\Quote\Model\ResourceModel\Quote\CollectionFactory::class,
+            CollectionFactory::class,
             ['create']
         );
         $this->model = $objectManager->getObject(
-            \Magento\Quote\Model\QuoteRepository::class,
+            QuoteRepository::class,
             [
-                'quoteFactory' => $this->quoteFactoryMock,
                 'storeManager' => $this->storeManagerMock,
                 'searchResultsDataFactory' => $this->searchResultsDataFactory,
                 'quoteCollection' => $this->quoteCollectionMock,
                 'extensionAttributesJoinProcessor' => $this->extensionAttributesJoinProcessorMock,
                 'collectionProcessor' => $this->collectionProcessor,
-                'quoteCollectionFactory' => $this->quoteCollectionFactoryMock
+                'quoteCollectionFactory' => $this->quoteCollectionFactoryMock,
+                'cartFactory' => $this->cartFactoryMock
             ]
         );
 
@@ -161,7 +175,7 @@ public function testGetWithExceptionById()
     {
         $cartId = 14;
 
-        $this->quoteFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
+        $this->cartFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($this->storeMock);
         $this->storeMock->expects($this->once())->method('getId')->willReturn(1);
         $this->quoteMock->expects($this->never())->method('setSharedStoreIds');
@@ -178,7 +192,7 @@ public function testGet()
     {
         $cartId = 15;
 
-        $this->quoteFactoryMock->expects(static::once())
+        $this->cartFactoryMock->expects(static::once())
             ->method('create')
             ->willReturn($this->quoteMock);
         $this->storeManagerMock->expects(static::once())
@@ -211,7 +225,7 @@ public function testGetForCustomerAfterGet()
         $cartId = 15;
         $customerId = 23;
 
-        $this->quoteFactoryMock->expects(static::exactly(2))
+        $this->cartFactoryMock->expects(static::exactly(2))
             ->method('create')
             ->willReturn($this->quoteMock);
         $this->storeManagerMock->expects(static::exactly(2))
@@ -249,7 +263,7 @@ public function testGetWithSharedStoreIds()
         $cartId = 16;
         $sharedStoreIds = [1, 2];
 
-        $this->quoteFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
+        $this->cartFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($this->storeMock);
         $this->storeMock->expects($this->once())->method('getId')->willReturn(1);
         $this->quoteMock->expects($this->once())
@@ -275,7 +289,7 @@ public function testGetForCustomer()
         $cartId = 17;
         $customerId = 23;
 
-        $this->quoteFactoryMock->expects(static::once())
+        $this->cartFactoryMock->expects(static::once())
             ->method('create')
             ->willReturn($this->quoteMock);
         $this->storeManagerMock->expects(static::once())
@@ -310,7 +324,7 @@ public function testGetActiveWithExceptionById()
     {
         $cartId = 14;
 
-        $this->quoteFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
+        $this->cartFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($this->storeMock);
         $this->storeMock->expects($this->once())->method('getId')->willReturn(1);
         $this->quoteMock->expects($this->never())->method('setSharedStoreIds');
@@ -332,7 +346,7 @@ public function testGetActiveWithExceptionByIsActive()
     {
         $cartId = 15;
 
-        $this->quoteFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
+        $this->cartFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($this->storeMock);
         $this->storeMock->expects($this->once())->method('getId')->willReturn(1);
         $this->quoteMock->expects($this->never())->method('setSharedStoreIds');
@@ -355,7 +369,7 @@ public function testGetActive()
     {
         $cartId = 15;
 
-        $this->quoteFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
+        $this->cartFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($this->storeMock);
         $this->storeMock->expects($this->once())->method('getId')->willReturn(1);
         $this->quoteMock->expects($this->never())->method('setSharedStoreIds');
@@ -379,7 +393,7 @@ public function testGetActiveWithSharedStoreIds()
         $cartId = 16;
         $sharedStoreIds = [1, 2];
 
-        $this->quoteFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
+        $this->cartFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($this->storeMock);
         $this->storeMock->expects($this->once())->method('getId')->willReturn(1);
         $this->quoteMock->expects($this->once())
@@ -406,7 +420,7 @@ public function testGetActiveForCustomer()
         $cartId = 17;
         $customerId = 23;
 
-        $this->quoteFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
+        $this->cartFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($this->storeMock);
         $this->storeMock->expects($this->once())->method('getId')->willReturn(1);
         $this->quoteMock->expects($this->never())->method('setSharedStoreIds');
@@ -430,14 +444,14 @@ public function testSave()
     {
         $cartId = 100;
         $quoteMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote::class,
+            Quote::class,
             ['getId', 'getCustomerId', 'getStoreId', 'hasData', 'setData']
         );
         $quoteMock->expects($this->exactly(3))->method('getId')->willReturn($cartId);
         $quoteMock->expects($this->once())->method('getCustomerId')->willReturn(2);
         $quoteMock->expects($this->once())->method('getStoreId')->willReturn(5);
 
-        $this->quoteFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
+        $this->cartFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteMock);
         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($this->storeMock);
         $this->storeMock->expects($this->once())->method('getId')->willReturn(1);
         $this->quoteMock->expects($this->once())->method('getId')->willReturn($cartId);
@@ -481,8 +495,8 @@ public function testGetList()
             ->method('load')
             ->with($cartMock);
 
-        $searchResult = $this->createMock(\Magento\Quote\Api\Data\CartSearchResultsInterface::class);
-        $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
+        $searchResult = $this->createMock(CartSearchResultsInterface::class);
+        $searchCriteriaMock = $this->createMock(SearchCriteria::class);
         $this->searchResultsDataFactory
             ->expects($this->once())
             ->method('create')
@@ -495,7 +509,7 @@ public function testGetList()
         $this->extensionAttributesJoinProcessorMock->expects($this->once())
             ->method('process')
             ->with(
-                $this->isInstanceOf(\Magento\Quote\Model\ResourceModel\Quote\Collection::class)
+                $this->isInstanceOf(Collection::class)
             );
         $this->quoteCollectionMock->expects($this->atLeastOnce())->method('getItems')->willReturn([$cartMock]);
         $searchResult->expects($this->once())->method('setTotalCount')->with($pageSize);
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
index 6f5e5937a32c8..9e921f744642f 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
@@ -951,6 +951,7 @@ public function testValidateMiniumumAmount()
             ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/multi_address', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
+            ['sales/minimum_order/include_discount_amount', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
         ];
         $this->scopeConfig->expects($this->any())
@@ -977,6 +978,7 @@ public function testValidateMiniumumAmountNegative()
             ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/multi_address', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
+            ['sales/minimum_order/include_discount_amount', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
         ];
         $this->scopeConfig->expects($this->any())
diff --git a/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
index 59445c3999899..cc7cc49e11c81 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
@@ -110,7 +110,7 @@ public function testSetAddressValidationFailed()
             ->with('cart654')
             ->will($this->returnValue($quoteMock));
 
-        $this->validatorMock->expects($this->once())->method('validate')
+        $this->validatorMock->expects($this->once())->method('validateForCart')
             ->will($this->throwException(new \Magento\Framework\Exception\NoSuchEntityException(__('error345'))));
 
         $this->service->assign('cart654', $this->quoteAddressMock);
@@ -143,8 +143,8 @@ public function testSetAddress()
             ->with($customerAddressId)
             ->willReturn($customerAddressMock);
 
-        $this->validatorMock->expects($this->once())->method('validate')
-            ->with($this->quoteAddressMock)
+        $this->validatorMock->expects($this->once())->method('validateForCart')
+            ->with($quoteMock, $this->quoteAddressMock)
             ->willReturn(true);
 
         $quoteMock->expects($this->exactly(3))->method('getShippingAddress')->willReturn($this->quoteAddressMock);
@@ -218,8 +218,8 @@ public function testSetAddressWithInabilityToSaveQuote()
             ->with($customerAddressId)
             ->willReturn($customerAddressMock);
 
-        $this->validatorMock->expects($this->once())->method('validate')
-            ->with($this->quoteAddressMock)
+        $this->validatorMock->expects($this->once())->method('validateForCart')
+            ->with($quoteMock, $this->quoteAddressMock)
             ->willReturn(true);
 
         $this->quoteAddressMock->expects($this->once())->method('getSaveInAddressBook')->willReturn(1);
diff --git a/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php b/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php
index 7bbf24c2b6ef3..36232651c74f9 100644
--- a/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php
@@ -132,15 +132,14 @@ public function testDispatch($isWebsiteScope, $websites)
         $quoteMock = $this->getMockBuilder(
             \Magento\Quote\Model\Quote::class
         )->setMethods(
-                [
-                    'setWebsite',
-                    'setCustomerGroupId',
-                    'getCustomerGroupId',
-                    'collectTotals',
-                    '__wakeup',
-                ]
-            )->disableOriginalConstructor(
-            )->getMock();
+            [
+                'setWebsite',
+                'setCustomerGroupId',
+                'getCustomerGroupId',
+                'collectTotals',
+                '__wakeup',
+            ]
+        )->disableOriginalConstructor()->getMock();
         $websiteCount = count($websites);
         $this->quoteRepositoryMock->expects($this->once())
             ->method('getForCustomer')
@@ -166,8 +165,8 @@ public function testDispatch($isWebsiteScope, $websites)
     public function dispatchDataProvider()
     {
         return [
-            [true, ['website1']],
-            [true, ['website1', 'website2']],
+            [true, [['website1']]],
+            [true, [['website1'], ['website2']]],
             [false, ['website1']],
             [false, ['website1', 'website2']],
         ];
diff --git a/app/code/Magento/Quote/Test/Unit/Plugin/UpdateQuoteItemStoreTest.php b/app/code/Magento/Quote/Test/Unit/Plugin/UpdateQuoteItemStoreTest.php
new file mode 100644
index 0000000000000..f6146c824aabc
--- /dev/null
+++ b/app/code/Magento/Quote/Test/Unit/Plugin/UpdateQuoteItemStoreTest.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Test\Unit\Plugin;
+
+use Magento\Quote\Model\ResourceModel\Quote\Item;
+use Magento\Store\Model\StoreSwitcherInterface;
+use Magento\Quote\Plugin\UpdateQuoteItemStore;
+use Magento\Quote\Model\QuoteRepository;
+use Magento\Checkout\Model\Session;
+use Magento\Store\Model\Store;
+use Magento\Quote\Model\Quote;
+
+/**
+ * Unit test for Magento\Quote\Plugin\UpdateQuoteItemStore.
+ */
+class UpdateQuoteItemStoreTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var UpdateQuoteItemStore
+     */
+    private $model;
+
+    /**
+     * @var StoreSwitcherInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $subjectMock;
+
+    /**
+     * @var QuoteRepository|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $quoteRepositoryMock;
+
+    /**
+     * @var Quote|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $quoteMock;
+
+    /**
+     * @var Session|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $checkoutSessionMock;
+
+    /**
+     * @var Store|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->checkoutSessionMock = $this->createPartialMock(
+            Session::class,
+            ['getQuote']
+        );
+        $this->quoteMock = $this->createPartialMock(
+            Quote::class,
+            ['getIsActive', 'setStoreId', 'getItemsCollection']
+        );
+        $this->storeMock = $this->createPartialMock(
+            Store::class,
+            ['getId']
+        );
+        $this->quoteRepositoryMock = $this->createPartialMock(
+            QuoteRepository::class,
+            ['save']
+        );
+        $this->subjectMock = $this->createMock(StoreSwitcherInterface::class);
+
+        $this->checkoutSessionMock->expects($this->once())->method('getQuote')->willReturn($this->quoteMock);
+
+        $this->model = $objectManager->getObject(
+            UpdateQuoteItemStore::class,
+            [
+                'quoteRepository' => $this->quoteRepositoryMock,
+                'checkoutSession' => $this->checkoutSessionMock,
+            ]
+        );
+    }
+
+    /**
+     * Unit test for afterSwitch method with active quote.
+     *
+     * @return void
+     */
+    public function testWithActiveQuote()
+    {
+        $storeId = 1;
+        $this->quoteMock->expects($this->once())->method('getIsActive')->willReturn(true);
+        $this->storeMock->expects($this->once())->method('getId')->willReturn($storeId);
+        $this->quoteMock->expects($this->once())->method('setStoreId')->with($storeId)->willReturnSelf();
+        $quoteItem = $this->createMock(Item::class);
+        $this->quoteMock->expects($this->once())->method('getItemsCollection')->willReturnSelf($quoteItem);
+
+        $this->model->afterSwitch(
+            $this->subjectMock,
+            'magento2.loc',
+            $this->storeMock,
+            $this->storeMock,
+            'magento2.loc'
+        );
+    }
+
+    /**
+     * Unit test for afterSwitch method without active quote.
+     *
+     * @dataProvider getIsActive
+     * @param bool|null $isActive
+     * @return void
+     */
+    public function testWithoutActiveQuote($isActive)
+    {
+        $this->quoteMock->expects($this->once())->method('getIsActive')->willReturn($isActive);
+        $this->quoteRepositoryMock->expects($this->never())->method('save');
+
+        $this->model->afterSwitch(
+            $this->subjectMock,
+            'magento2.loc',
+            $this->storeMock,
+            $this->storeMock,
+            'magento2.loc'
+        );
+    }
+
+    /**
+     * Data provider for method testWithoutActiveQuote.
+     * @return array
+     */
+    public function getIsActive()
+    {
+        return [
+            [false],
+            [null],
+        ];
+    }
+}
diff --git a/app/code/Magento/Quote/composer.json b/app/code/Magento/Quote/composer.json
index 0d67eaaf6ec74..39017bb64df17 100644
--- a/app/code/Magento/Quote/composer.json
+++ b/app/code/Magento/Quote/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-quote",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-catalog": "102.0.*",
         "magento/module-customer": "101.0.*",
@@ -23,7 +23,7 @@
         "magento/module-webapi": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "101.0.5",
+    "version": "101.0.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Quote/etc/fieldset.xml b/app/code/Magento/Quote/etc/fieldset.xml
index 55ec76a647fcd..85ee20c7f8520 100644
--- a/app/code/Magento/Quote/etc/fieldset.xml
+++ b/app/code/Magento/Quote/etc/fieldset.xml
@@ -186,6 +186,11 @@
                 <aspect name="to_order_address" />
             </field>
         </fieldset>
+        <fieldset id="quote_convert_address_item">
+            <field name="quote_item_id">
+                <aspect name="to_order_item" />
+            </field>
+        </fieldset>
         <fieldset id="quote_convert_item">
             <field name="sku">
                 <aspect name="to_order_item" />
diff --git a/app/code/Magento/Quote/etc/frontend/di.xml b/app/code/Magento/Quote/etc/frontend/di.xml
index 25acd6763ba56..91f4cfbf60aba 100644
--- a/app/code/Magento/Quote/etc/frontend/di.xml
+++ b/app/code/Magento/Quote/etc/frontend/di.xml
@@ -12,6 +12,9 @@
             <argument name="checkoutSession" xsi:type="object">Magento\Checkout\Model\Session\Proxy</argument>
         </arguments>
     </type>
+    <type name="Magento\Store\Model\StoreSwitcherInterface">
+        <plugin name="update_quote_item_store_after_switch_store_view" type="Magento\Quote\Plugin\UpdateQuoteItemStore"/>
+    </type>
     <type name="Magento\Store\Api\StoreCookieManagerInterface">
         <plugin name="update_quote_store_after_switch_store_view" type="Magento\Quote\Plugin\UpdateQuoteStore"/>
     </type>
diff --git a/app/code/Magento/QuoteAnalytics/composer.json b/app/code/Magento/QuoteAnalytics/composer.json
index 65978de6d0785..e3bff4f35a91c 100644
--- a/app/code/Magento/QuoteAnalytics/composer.json
+++ b/app/code/Magento/QuoteAnalytics/composer.json
@@ -2,12 +2,12 @@
     "name": "magento/module-quote-analytics",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*",
         "magento/module-quote": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/ReleaseNotification/composer.json b/app/code/Magento/ReleaseNotification/composer.json
index 45452997757cd..8c61d21882a07 100644
--- a/app/code/Magento/ReleaseNotification/composer.json
+++ b/app/code/Magento/ReleaseNotification/composer.json
@@ -2,13 +2,13 @@
     "name": "magento/module-release-notification",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-user": "101.0.*",
         "magento/module-backend": "100.2.*",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid.php
index a895ef2d75906..5538ad6f53d4e 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid.php
@@ -6,15 +6,32 @@
 
 namespace Magento\Reports\Block\Adminhtml;
 
+use Magento\Backend\Block\Template\Context;
+use Magento\Backend\Helper\Data;
+use Magento\Framework\Url\DecoderInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Stdlib\Parameters;
+
 /**
  * Backend report grid block
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid
 {
+    /**
+     * @var DecoderInterface
+     */
+    private $urlDecoder;
+
+    /**
+     * @var Parameters
+     */
+    private $parameters;
+
     /**
      * Should Store Switcher block be visible
      *
@@ -71,6 +88,31 @@ class Grid extends \Magento\Backend\Block\Widget\Grid
      */
     protected $_filterValues;
 
+    /**
+     * @param Context $context
+     * @param Data $backendHelper
+     * @param array $data
+     * @param DecoderInterface|null $urlDecoder
+     * @param Parameters|null $parameters
+     */
+    public function __construct(
+        Context $context,
+        Data $backendHelper,
+        array $data = [],
+        DecoderInterface $urlDecoder = null,
+        Parameters $parameters = null
+    ) {
+        $this->urlDecoder = $urlDecoder ?? ObjectManager::getInstance()->get(
+            DecoderInterface::class
+        );
+
+        $this->parameters = $parameters ?? ObjectManager::getInstance()->get(
+            Parameters::class
+        );
+
+        parent::__construct($context, $backendHelper, $data);
+    }
+
     /**
      * Apply sorting and filtering to collection
      *
@@ -86,9 +128,12 @@ protected function _prepareCollection()
         }
 
         if (is_string($filter)) {
-            $data = [];
-            $filter = base64_decode($filter);
-            parse_str(urldecode($filter), $data);
+            // this is a replacement for base64_decode()
+            $filter = $this->urlDecoder->decode($filter);
+
+            // this is a replacement for parse_str()
+            $this->parameters->fromString(urldecode($filter));
+            $data = $this->parameters->toArray();
 
             if (!isset($data['report_from'])) {
                 // getting all reports from 2001 year
@@ -113,7 +158,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);
         }
 
@@ -328,7 +373,7 @@ public function getFilter($name)
         if (isset($this->_filters[$name])) {
             return $this->_filters[$name];
         } else {
-            return $this->getRequest()->getParam($name) ? htmlspecialchars($this->getRequest()->getParam($name)) : '';
+            return $this->getRequest()->getParam($name) ? $this->escapeHtml($this->getRequest()->getParam($name)) : '';
         }
     }
 
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
index 1f90309721c23..9c80f6aa423b8 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
@@ -6,23 +6,58 @@
 
 namespace Magento\Reports\Block\Adminhtml\Sales\Sales;
 
+use Magento\Framework\DataObject;
 use Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency;
+use Magento\Framework\App\ObjectManager;
+use Magento\Sales\Model\Order\ConfigFactory;
+use Magento\Sales\Model\Order;
 
 /**
  * Adminhtml sales report grid block
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  */
 class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
 {
     /**
-     * GROUP BY criteria
-     *
      * @var string
      */
     protected $_columnGroupBy = 'period';
 
+    /**
+     * @var ConfigFactory
+     */
+    private $configFactory;
+
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Backend\Helper\Data $backendHelper
+     * @param \Magento\Reports\Model\ResourceModel\Report\Collection\Factory $resourceFactory
+     * @param \Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory
+     * @param \Magento\Reports\Helper\Data $reportsData
+     * @param array $data
+     * @param ConfigFactory|null $configFactory
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Backend\Helper\Data $backendHelper,
+        \Magento\Reports\Model\ResourceModel\Report\Collection\Factory $resourceFactory,
+        \Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory,
+        \Magento\Reports\Helper\Data $reportsData,
+        array $data = [],
+        ConfigFactory $configFactory = null
+    ) {
+        parent::__construct(
+            $context,
+            $backendHelper,
+            $resourceFactory,
+            $collectionFactory,
+            $reportsData,
+            $data
+        );
+        $this->configFactory = $configFactory ?: ObjectManager::getInstance()->get(ConfigFactory::class);
+    }
+
     /**
      * {@inheritdoc}
      * @codeCoverageIgnore
@@ -328,4 +363,31 @@ protected function _prepareColumns()
 
         return parent::_prepareColumns();
     }
+
+    /**
+     * @inheritdoc
+     *
+     * Filter canceled statuses for orders.
+     *
+     * @return Grid
+     */
+    protected function _prepareCollection()
+    {
+        /** @var DataObject $filterData */
+        $filterData = $this->getData('filter_data');
+        if (!$filterData->hasData('order_statuses')) {
+            $orderConfig = $this->configFactory->create();
+            $statusValues = [];
+            $canceledStatuses = $orderConfig->getStateStatuses(Order::STATE_CANCELED);
+            $statusCodes = array_keys($orderConfig->getStatuses());
+            foreach ($statusCodes as $code) {
+                if (!isset($canceledStatuses[$code])) {
+                    $statusValues[] = $code;
+                }
+            }
+            $filterData->setData('order_statuses', $statusValues);
+        }
+
+        return parent::_prepareCollection();
+    }
 }
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
index 79deb27423be5..7ca6b803f5b2b 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
@@ -123,7 +123,6 @@ protected function _prepareColumns()
             [
                 'header' => __('Orders'),
                 'index' => 'orders_count',
-                'total' => 'sum',
                 'type' => 'number',
                 'sortable' => false,
                 'header_css_class' => 'col-qty',
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
index 1ca76cb1cf95f..dd42874b55795 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
@@ -9,6 +9,7 @@
 /**
  * Adminhtml wishlist report page content block
  *
+ * @deprecated
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Wishlist extends \Magento\Backend\Block\Template
@@ -44,7 +45,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _beforeToHtml()
     {
diff --git a/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php b/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php
index 04a402c9ac41e..12959f083d376 100644
--- a/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php
+++ b/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php
@@ -8,6 +8,7 @@
 /**
  * Reports Recently Viewed Products Widget
  *
+ * @deprecated
  * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Item extends \Magento\Catalog\Block\Product\AbstractProduct implements \Magento\Widget\Block\BlockInterface
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
index 68f2722ca6dfb..b1f5628a0b7a3 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
@@ -147,15 +147,19 @@ protected function _showLastExecutionTime($flagCode, $refreshCode)
         }
 
         $refreshStatsLink = $this->getUrl('reports/report_statistics');
-        $directRefreshLink = $this->getUrl('reports/report_statistics/refreshRecent', ['code' => $refreshCode]);
+        $directRefreshLink = $this->getUrl('reports/report_statistics/refreshRecent');
 
         $this->messageManager->addNotice(
             __(
                 'Last updated: %1. To refresh last day\'s <a href="%2">statistics</a>, ' .
-                'click <a href="%3">here</a>.',
+                'click <a href="#2" data-post="%3">here</a>.',
                 $updatedAt,
                 $refreshStatsLink,
-                $directRefreshLink
+                str_replace(
+                    '"',
+                    '&quot;',
+                    json_encode(['action' => $directRefreshLink, 'data' => ['code' => $refreshCode]])
+                )
             )
         );
         return $this;
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php
index 1f0f6e8e40535..957b1160d0281 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php
@@ -6,15 +6,22 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Statistics;
 
+use Magento\Framework\Exception\NotFoundException;
+
 class RefreshRecent extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
 {
     /**
      * Refresh statistics for last 25 hours
      *
      * @return void
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found.'));
+        }
+
         try {
             $collectionsNames = $this->_getCollectionNames();
             /** @var \DateTime $currentDate */
diff --git a/app/code/Magento/Reports/Helper/Data.php b/app/code/Magento/Reports/Helper/Data.php
index 411c7dde14c9d..5b5799807fc1b 100644
--- a/app/code/Magento/Reports/Helper/Data.php
+++ b/app/code/Magento/Reports/Helper/Data.php
@@ -63,22 +63,27 @@ public function getIntervals($from, $to, $period = self::REPORT_PERIOD_TYPE_DAY)
 
         $dateStart = new \DateTime($from);
         $dateEnd = new \DateTime($to);
+        $dateFormat = 'Y-m-d';
+        $dateInterval = new \DateInterval('P1D');
+        switch ($period) {
+            case self::REPORT_PERIOD_TYPE_MONTH:
+                $dateFormat = 'Y-m';
+                $dateInterval = new \DateInterval('P1M');
+                break;
+            case self::REPORT_PERIOD_TYPE_YEAR:
+                $dateFormat = 'Y';
+                $dateInterval = new \DateInterval('P1Y');
+                break;
+        }
         while ($dateStart->diff($dateEnd)->invert == 0) {
-            switch ($period) {
-                case self::REPORT_PERIOD_TYPE_DAY:
-                    $intervals[] = $dateStart->format('Y-m-d');
-                    $dateStart->add(new \DateInterval('P1D'));
-                    break;
-                case self::REPORT_PERIOD_TYPE_MONTH:
-                    $intervals[] = $dateStart->format('Y-m');
-                    $dateStart->add(new \DateInterval('P1M'));
-                    break;
-                case self::REPORT_PERIOD_TYPE_YEAR:
-                    $intervals[] = $dateStart->format('Y');
-                    $dateStart->add(new \DateInterval('P1Y'));
-                    break;
-            }
+            $intervals[] = $dateStart->format($dateFormat);
+            $dateStart->add($dateInterval);
+        }
+
+        if (!in_array($dateEnd->format($dateFormat), $intervals)) {
+            $intervals[] = $dateEnd->format($dateFormat);
         }
+
         return $intervals;
     }
 
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
index 82ebc74a0468e..d89a118bff94b 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Reports\Model\ResourceModel\Order;
 
 use Magento\Framework\DB\Select;
@@ -81,7 +80,7 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Sales\Model\Order\Config $orderConfig
      * @param \Magento\Sales\Model\ResourceModel\Report\OrderFactory $reportOrderFactory
-     * @param null $connection
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -446,7 +445,7 @@ public function getDateRange($range, $customStart, $customEnd, $returnObjects =
                 break;
 
             case 'custom':
-                $dateStart = $customStart ? $customStart : $dateEnd;
+                $dateStart = $customStart ? $customStart : $dateStart;
                 $dateEnd = $customEnd ? $customEnd : $dateEnd;
                 break;
 
@@ -770,11 +769,12 @@ public function addOrdersCount()
      */
     public function addRevenueToSelect($convertCurrency = false)
     {
-        $expr = $this->getTotalsExpression(
+        $expr = $this->getTotalsExpressionWithDiscountRefunded(
             !$convertCurrency,
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_refunded', 0),
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_canceled', 0),
-            $this->getConnection()->getIfNullSql('main_table.base_discount_canceled', 0)
+            $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_refunded)', 0),
+            $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_canceled)', 0)
         );
         $this->getSelect()->columns(['revenue' => $expr]);
 
@@ -792,11 +792,12 @@ public function addSumAvgTotals($storeId = 0)
         /**
          * calculate average and total amount
          */
-        $expr = $this->getTotalsExpression(
+        $expr = $this->getTotalsExpressionWithDiscountRefunded(
             $storeId,
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_refunded', 0),
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_canceled', 0),
-            $this->getConnection()->getIfNullSql('main_table.base_discount_canceled', 0)
+            $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_refunded)', 0),
+            $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_canceled)', 0)
         );
 
         $this->getSelect()->columns(
@@ -809,13 +810,15 @@ public function addSumAvgTotals($storeId = 0)
     }
 
     /**
-     * Get SQL expression for totals
+     * Get SQL expression for totals.
      *
      * @param int $storeId
      * @param string $baseSubtotalRefunded
      * @param string $baseSubtotalCanceled
      * @param string $baseDiscountCanceled
      * @return string
+     * @deprecated
+     * @see getTotalsExpressionWithDiscountRefunded
      */
     protected function getTotalsExpression(
         $storeId,
@@ -825,11 +828,41 @@ protected function getTotalsExpression(
     ) {
         $template = ($storeId != 0)
             ? '(main_table.base_subtotal - %2$s - %1$s - ABS(main_table.base_discount_amount) - %3$s)'
-            : '((main_table.base_subtotal - %1$s - %2$s - ABS(main_table.base_discount_amount) - %3$s) '
-                . ' * main_table.base_to_global_rate)';
+            : '((main_table.base_subtotal - %1$s - %2$s - ABS(main_table.base_discount_amount) + %3$s) '
+            . ' * main_table.base_to_global_rate)';
         return sprintf($template, $baseSubtotalRefunded, $baseSubtotalCanceled, $baseDiscountCanceled);
     }
 
+    /**
+     * Get SQL expression for totals with discount refunded.
+     *
+     * @param int $storeId
+     * @param string $baseSubtotalRefunded
+     * @param string $baseSubtotalCanceled
+     * @param string $baseDiscountRefunded
+     * @param string $baseDiscountCanceled
+     * @return string
+     */
+    private function getTotalsExpressionWithDiscountRefunded(
+        $storeId,
+        $baseSubtotalRefunded,
+        $baseSubtotalCanceled,
+        $baseDiscountRefunded,
+        $baseDiscountCanceled
+    ) {
+        $template = ($storeId != 0)
+            ? '(main_table.base_subtotal - %2$s - %1$s - (ABS(main_table.base_discount_amount) - %3$s - %4$s))'
+            : '((main_table.base_subtotal - %1$s - %2$s - (ABS(main_table.base_discount_amount) - %3$s - %4$s)) '
+                . ' * main_table.base_to_global_rate)';
+        return sprintf(
+            $template,
+            $baseSubtotalRefunded,
+            $baseSubtotalCanceled,
+            $baseDiscountRefunded,
+            $baseDiscountCanceled
+        );
+    }
+
     /**
      * Sort order by total amount
      *
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Downloads/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Downloads/Collection.php
index 1985db0b90e2a..2009cd3ff9d92 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Downloads/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Downloads/Collection.php
@@ -4,16 +4,16 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Reports\Model\ResourceModel\Product\Downloads;
+
 /**
  * Product Downloads Report collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- */
-namespace Magento\Reports\Model\ResourceModel\Product\Downloads;
-
-/**
+ *
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
@@ -97,4 +97,14 @@ public function addFieldToFilter($field, $condition = null)
         }
         return $this;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function getSelectCountSql()
+    {
+        $countSelect = parent::getSelectCountSql();
+        $countSelect->reset(\Zend\Db\Sql\Select::GROUP);
+        return $countSelect;
+    }
 }
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Sold/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Sold/Collection.php
index 61dc77d188438..35a14e09e314f 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Sold/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Sold/Collection.php
@@ -14,6 +14,8 @@
 use Magento\Framework\DB\Select;
 
 /**
+ * Data collection.
+ *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  * @api
  * @since 100.0.2
@@ -21,7 +23,7 @@
 class Collection extends \Magento\Reports\Model\ResourceModel\Order\Collection
 {
     /**
-     * Set Date range to collection
+     * Set Date range to collection.
      *
      * @param int $from
      * @param int $to
@@ -79,6 +81,10 @@ public function addOrderedQty($from = '', $to = '')
         )->having(
             'order_items.qty_ordered > ?',
             0
+        )->columns(
+            'SUM(order_items.qty_ordered) as ordered_qty'
+        )->group(
+            'order_items.product_id'
         );
         return $this;
     }
@@ -116,6 +122,8 @@ public function setOrder($attribute, $dir = self::SORT_ORDER_DESC)
     }
 
     /**
+     * @inheritdoc
+     *
      * @return Select
      * @since 100.2.0
      */
diff --git a/app/code/Magento/Reports/Test/Mftf/ActionGroup/AdminReviewOrderActionGroup.xml b/app/code/Magento/Reports/Test/Mftf/ActionGroup/AdminReviewOrderActionGroup.xml
new file mode 100644
index 0000000000000..90ea72ce9dda9
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/ActionGroup/AdminReviewOrderActionGroup.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="AdminReviewOrderActionGroup">
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <click selector="{{AdminMenuSection.reports}}" stepKey="openReports"/>
+        <waitForPageLoad time="5" stepKey="waitForReports"/>
+        <click selector="{{AdminMenuSection.ordered}}" stepKey="openOrdered"/>
+        <waitForPageLoad time="5" stepKey="waitForOrdersPage"/>
+        <click selector="{{AdminOrderedProductsSection.refresh}}" stepKey="refresh"/>
+        <scrollTo selector="{{AdminOrderedProductsSection.total}}" stepKey="scrollTo"/>
+        <see userInput="{{productName}}" stepKey="seeOrderedProduct"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportActionGroup.xml b/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportActionGroup.xml
new file mode 100644
index 0000000000000..8ddfd4092645f
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportActionGroup.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="GenerateOrderReportActionGroup">
+        <arguments>
+            <argument name="orderFromDate" type="string"/>
+            <argument name="orderToDate" type="string"/>
+        </arguments>
+        <click selector="{{AdminOrderReportMainActionsSection.refreshStatistics}}" stepKey="refreshStatistics"/>
+        <fillField selector="{{AdminOrderReportFilterSection.dateFrom}}" userInput="{{orderFromDate}}" stepKey="fillFromDate"/>
+        <fillField selector="{{AdminOrderReportFilterSection.dateTo}}" userInput="{{orderToDate}}" stepKey="fillToDate"/>
+        <selectOption selector="{{AdminOrderReportFilterSection.orderStatus}}" userInput="Any" stepKey="selectAnyOption"/>
+        <click selector="{{AdminOrderReportMainActionsSection.showReport}}" stepKey="showReport"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Reports/Test/Mftf/Page/AdminOrderedProductsPage.xml b/app/code/Magento/Reports/Test/Mftf/Page/AdminOrderedProductsPage.xml
new file mode 100644
index 0000000000000..fc9784498cbb3
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Page/AdminOrderedProductsPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminOrderedProductsPage" url="admin/reports/report_product/sold" module="Magento_Reports" area="admin">
+        <section name="AdminOrderedProductsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Reports/Test/Mftf/Page/AdminOrdersReportPage.xml b/app/code/Magento/Reports/Test/Mftf/Page/AdminOrdersReportPage.xml
new file mode 100644
index 0000000000000..f0b51f6e39357
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Page/AdminOrdersReportPage.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="AdminOrdersReportPage" url="reports/report_sales/sales/" area="admin" module="Reports">
+        <section name="AdminOrderReportFilterSection"/>
+        <section name="AdminOrderReportMainActionsSection"/>
+        <section name="AdminOrderReportTableSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Reports/Test/Mftf/Page/AdminReportSalesTaxPage.xml b/app/code/Magento/Reports/Test/Mftf/Page/AdminReportSalesTaxPage.xml
new file mode 100644
index 0000000000000..ff90be1ced389
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Page/AdminReportSalesTaxPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminReportSalesTaxPage" url="reports/report_sales/tax/" module="Magento_Reports" area="admin">
+        <section name="AdminReportMainActionSection"/>
+        <section name="AdminReportTaxSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Reports/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Reports/Test/Mftf/Section/AdminMenuSection.xml
new file mode 100644
index 0000000000000..b8f0f0750bbf4
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Section/AdminMenuSection.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="AdminMenuSection">
+        <element name="reports" type="button" selector="#menu-magento-reports-report"/>
+        <element name="ordered" type="button" selector=".item-report-products-sold"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Reports/Test/Mftf/Section/AdminOrderReportFilterSection.xml b/app/code/Magento/Reports/Test/Mftf/Section/AdminOrderReportFilterSection.xml
new file mode 100644
index 0000000000000..33527e1262020
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Section/AdminOrderReportFilterSection.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="AdminOrderReportFilterSection">
+        <element name="dateFrom" type="input" selector="#sales_report_from"/>
+        <element name="dateTo" type="input" selector="#sales_report_to"/>
+        <element name="orderStatus" type="select" selector="#sales_report_show_order_statuses"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Reports/Test/Mftf/Section/AdminOrderReportMainActionsSection.xml b/app/code/Magento/Reports/Test/Mftf/Section/AdminOrderReportMainActionsSection.xml
new file mode 100644
index 0000000000000..3b05c19cd59e9
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Section/AdminOrderReportMainActionsSection.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="AdminOrderReportMainActionsSection">
+        <element name="showReport" type="button" timeout="30" selector="#filter_form_submit"/>
+        <element name="refreshStatistics" type="text" timeout="30" selector="//a[contains(text(), 'here')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Reports/Test/Mftf/Section/AdminOrderReportTableSection.xml b/app/code/Magento/Reports/Test/Mftf/Section/AdminOrderReportTableSection.xml
new file mode 100644
index 0000000000000..e920d28bcf386
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Section/AdminOrderReportTableSection.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="AdminOrderReportTableSection">
+        <element name="ordersCount" type="text" selector=".totals .col-orders.col-orders_count.col-number"/>
+        <element name="canceledOrders" type="text" selector=".totals .col-canceled.col-total_canceled_amount.a-right"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Reports/Test/Mftf/Section/AdminOrderedProductsSection.xml b/app/code/Magento/Reports/Test/Mftf/Section/AdminOrderedProductsSection.xml
new file mode 100644
index 0000000000000..dd4e78f4ee3f9
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Section/AdminOrderedProductsSection.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="AdminOrderedProductsSection">
+        <element name="refresh" type="button" selector="button[title='Refresh']" timeout="30"/>
+        <element name="total" type="text" selector="#gridProductsSold_table tfoot th.col-period"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Reports/Test/Mftf/Section/AdminReportMainActionSection.xml b/app/code/Magento/Reports/Test/Mftf/Section/AdminReportMainActionSection.xml
new file mode 100644
index 0000000000000..207e508b6b020
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Section/AdminReportMainActionSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminReportMainActionSection">
+        <element name="showReport" type="button" selector="#filter_form_submit" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Reports/Test/Mftf/Section/AdminReportTaxSection.xml b/app/code/Magento/Reports/Test/Mftf/Section/AdminReportTaxSection.xml
new file mode 100644
index 0000000000000..a9583d8772688
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Section/AdminReportTaxSection.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="AdminReportTaxSection">
+        <element name="refreshStatistics" type="button" selector="//*[@id='messages']//a[text()='here']" timeout="30"/>
+        <element name="dataPickerFrom" type="button" selector="#sales_report_from + button.ui-datepicker-trigger"/>
+        <element name="dataPickerTo" type="button" selector="#sales_report_to + button.ui-datepicker-trigger"/>
+        <element name="goTodayButton" type="button" selector="#ui-datepicker-div [data-handler='today']"/>
+        <element name="closeButton" type="button" selector="#ui-datepicker-div [data-handler='hide']"/>
+        <element name="row" type="button" selector="//td[contains(text(),'{{var1}}')]/..//td[last()]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminTaxReportGridTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminTaxReportGridTest.xml
new file mode 100644
index 0000000000000..073b4ce6fb90c
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminTaxReportGridTest.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="AdminTaxReportGridTest">
+        <annotations>
+            <stories value="MAGETWO-86649: Reports / Sales / Tax report show incorrect amount"/>
+            <title value="Checking Tax Report grid"/>
+            <description value="Checking Tax Report grid with tax rates and same zip code"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-97018"/>
+            <group value="tax_report"/>
+            <group value="reports"/>
+        </annotations>
+        <before>
+            <!--Log in as Admin-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create Customer-->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <!--Create Product-->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!--Create product Tax Class and Tax Rates-->
+            <createData entity="ProductTaxClass" stepKey="createProductTaxClass"/>
+            <createData entity="TexasTaxRate" stepKey="createStateTaxRate"/>
+            <createData entity="AustinTaxRate" stepKey="createCityTaxRate"/>
+            <!--Get Data from product Tax Class-->
+            <getData entity="ProductTaxClassGetter" stepKey="getProductTaxClass">
+                <requiredEntity createDataKey="createProductTaxClass"/>
+            </getData>
+        </before>
+        <after>
+            <!--Delete Tax Rules-->
+            <actionGroup ref="DeleteTaxRule" stepKey="deleteCityTaxRule">
+                <argument name="taxRuleName" value="CityTaxRule"/>
+            </actionGroup>
+            <actionGroup ref="DeleteTaxRule" stepKey="deleteStateTaxRule">
+                <argument name="taxRuleName" value="StateTaxRule"/>
+            </actionGroup>
+            <!--Delete Customer-->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <!--Delete Product-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <!--Delete Tax Rates and product Tax Class-->
+            <deleteData createDataKey="createStateTaxRate" stepKey="deleteTaxClass1"/>
+            <deleteData createDataKey="createCityTaxRate" stepKey="deleteTaxClass2"/>
+            <deleteData createDataKey="createProductTaxClass" stepKey="deleteProductTaxClass"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Adding Tax Rule with all (*) zip code-->
+        <actionGroup ref="AddTaxRule" stepKey="addStateTaxRule">
+            <argument name="taxRuleName" value="StateTaxRule"/>
+            <argument name="taxRate" value="$$createStateTaxRate$$"/>
+            <argument name="productTaxClass" value="$$getProductTaxClass$$"/>
+        </actionGroup>
+        <!--Adding Tax Rule with zip code-->
+        <actionGroup ref="AddTaxRule" stepKey="addCityTaxRule">
+            <argument name="taxRuleName" value="CityTaxRule"/>
+            <argument name="taxRate" value="$$createCityTaxRate$$"/>
+            <argument name="productTaxClass" value="$$getProductTaxClass$$"/>
+        </actionGroup>
+        <!-- Open Product Edit -->
+        <amOnPage url="{{AdminProductEditPage.url($$createSimpleProduct.id$$)}}" stepKey="goToEditPage"/>
+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="$$getProductTaxClass.class_name$$" stepKey="selectCustomTaxClass"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+        <!--Create new order with existing Customer -->
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="createNewOrder">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <!--Add product to order-->
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrder">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <!--Select shipping-->
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping"/>
+        <!--Select payment-->
+        <actionGroup ref="SelectCheckMoneyPaymentMethod" stepKey="selectCheckMoneyPayment"/>
+        <!--Submit order-->
+        <click selector="{{AdminOrderFormActionSection.submitOrder}}" stepKey="clickSubmitOrder"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You created the order." stepKey="seeOrderSuccessMessage"/>
+        <!--Create and submit Invoice-->
+        <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="createInvoice"/>
+        <actionGroup ref="SubmitInvoice" stepKey="submitInvoice"/>
+        <!--Create and submit Shipment -->
+        <actionGroup ref="StartCreateShipmentFromOrderPage" stepKey="createShipment"/>
+        <actionGroup ref="SubmitShipment" stepKey="submitShipment"/>
+        <!--Go to Report -> Tax -->
+        <amOnPage url="{{AdminReportSalesTaxPage.url}}" stepKey="goToReportTax"/>
+        <click selector="{{AdminReportTaxSection.refreshStatistics}}" stepKey="clickRefreshStatistics"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="Recent statistics have been updated." stepKey="seeReportSuccessMessage"/>
+        <!--Select Date From-->
+        <click selector="{{AdminReportTaxSection.dataPickerFrom}}" stepKey="clickOnDatePickerFrom"/>
+        <waitForElementVisible selector="{{AdminReportTaxSection.goTodayButton}}" stepKey="waitForGoTodayButton1"/>
+        <click selector="{{AdminReportTaxSection.goTodayButton}}" stepKey="selectToday1"/>
+        <click selector="{{AdminReportTaxSection.closeButton}}" stepKey="selectClose1"/>
+        <!--Select Date To-->
+        <click selector="{{AdminReportTaxSection.dataPickerTo}}" stepKey="clickOnDatePickerTo"/>
+        <waitForElementVisible selector="{{AdminReportTaxSection.goTodayButton}}" stepKey="waitForGoTodayButton2"/>
+        <click selector="{{AdminReportTaxSection.goTodayButton}}" stepKey="selectToday2"/>
+        <click selector="{{AdminReportTaxSection.closeButton}}" stepKey="selectClose2"/>
+        <click selector="{{AdminReportMainActionSection.showReport}}" stepKey="clickOnShowReportButton"/>
+        <!--Assert taxes-->
+        <grabTextFrom selector="{{AdminReportTaxSection.row($$createStateTaxRate.code$$)}}" stepKey="grabStateTax"/>
+        <assertEquals stepKey="checkStateTaxForProduct">
+            <expectedResult type="string">$2.00</expectedResult>
+            <actualResult type="variable">$grabStateTax</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{AdminReportTaxSection.row($$createCityTaxRate.code$$)}}" stepKey="grabCityTax"/>
+        <assertEquals stepKey="checkCityTaxForProduct">
+            <expectedResult type="string">$10.00</expectedResult>
+            <actualResult type="variable">$grabCityTax</actualResult>
+        </assertEquals>
+        <!--Assert total-->
+        <grabTextFrom selector="{{AdminReportTaxSection.row('Subtotal')}}" stepKey="grabTotalTax"/>
+        <assertEquals stepKey="checkTotalTaxForProduct">
+            <expectedResult type="string">$12.00</expectedResult>
+            <actualResult type="variable">$grabTotalTax</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml
new file mode 100644
index 0000000000000..009e4b8e5f6f1
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.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="CancelOrdersInOrderSalesReportTest">
+        <annotations>
+            <features value="Reports"/>
+            <stories value="Order Sales Report"/>
+            <group value="reports"/>
+            <title value="Canceled orders in order sales report"/>
+            <description value="Verify canceling of orders in order sales report"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-13838"/>
+            <useCaseId value="MAGETWO-95463"/>
+        </annotations>
+        <before>
+            <!-- create new product -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!-- create new customer-->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <!--login to Admin-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create new order-->
+        <comment userInput="Admin creates order" stepKey="adminCreateOrderComment"/>
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="startToCreateNewOrder">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrderWithUserDefinedQty">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="quantity" value="1"/>
+        </actionGroup>
+        <!-- Select shipping -->
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping"/>
+        <!--Select payment-->
+        <actionGroup ref="SelectCheckMoneyPaymentMethod" stepKey="selectCheckMoneyPayment"/>
+        <!--Submit Order-->
+        <click selector="{{AdminOrderFormActionSection.submitOrder}}" stepKey="clickSubmitOrder"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You created the order." stepKey="seeSuccessMessage"/>
+        <!--Create order invoice-->
+        <comment userInput="Admin creates invoice for order" stepKey="adminCreateInvoiceComment" />
+        <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="createInvoice"/>
+        <actionGroup ref="SubmitInvoice" stepKey="submitInvoice"/>
+        <!--Ship Order-->
+        <comment userInput="Admin creates shipment" stepKey="adminCreatesShipmentComment"/>
+        <actionGroup ref="StartCreateShipmentFromOrderPage" stepKey="createShipment"/>
+        <actionGroup ref="SubmitShipment" stepKey="submitShipment"/>
+
+        <!--Create new order-->
+        <comment userInput="Admin creates order" stepKey="adminCreateOrderComment1"/>
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="startToCreateNewOrder1">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrderWithUserDefinedQty1">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="quantity" value="1"/>
+        </actionGroup>
+        <!-- Select shipping -->
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping1"/>
+        <!--Select payment-->
+        <actionGroup ref="SelectCheckMoneyPaymentMethod" stepKey="selectCheckMoneyPayment1"/>
+        <!--Submit Order-->
+        <click selector="{{AdminOrderFormActionSection.submitOrder}}" stepKey="clickSubmitOrder1"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You created the order." stepKey="seeSuccessMessage1"/>
+        <!-- Cancel order -->
+        <actionGroup ref="cancelPendingOrder" stepKey="cancelOrder"/>
+
+        <!-- Generate Order report -->
+        <amOnPage url="{{AdminOrdersReportPage.url}}" stepKey="goToAdminOrdersReportPage"/>
+        <!-- Get date -->
+        <generateDate date="+0 day" format="m/d/Y" stepKey="generateEndDate"/>
+        <generateDate date="-1 day" format="m/d/Y" stepKey="generateStartDate"/>
+        <actionGroup ref="GenerateOrderReportActionGroup" stepKey="generateReportAfterCancelOrder">
+            <argument name="orderFromDate" value="$generateStartDate"/>
+            <argument name="orderToDate" value="$generateEndDate"/>
+        </actionGroup>
+        <waitForElement selector="{{AdminOrderReportTableSection.ordersCount}}" stepKey="waitForOrdersCount"/>
+        <see selector="{{AdminOrderReportTableSection.canceledOrders}}" userInput="$0.00" stepKey="seeCanceledOrderPrice"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Reports/Test/Unit/Helper/DataTest.php b/app/code/Magento/Reports/Test/Unit/Helper/DataTest.php
index 25981c9d3cfcd..3aee96720c7cb 100644
--- a/app/code/Magento/Reports/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Helper/DataTest.php
@@ -6,34 +6,38 @@
 
 namespace Magento\Reports\Test\Unit\Helper;
 
+use Magento\Framework\App\Helper\Context;
+use Magento\Framework\Data\Collection;
 use Magento\Reports\Helper\Data;
+use Magento\Reports\Model\Item;
+use Magento\Reports\Model\ItemFactory;
 
 class DataTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Reports\Helper\Data
+     * @var Data
      */
     protected $data;
 
     /**
-     * @var \Magento\Framework\App\Helper\Context|\PHPUnit_Framework_MockObject_MockObject
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $contextMock;
 
     /**
-     * @var \Magento\Reports\Model\ItemFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ItemFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $itemFactoryMock;
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     protected function setUp()
     {
-        $this->contextMock = $this->getMockBuilder(\Magento\Framework\App\Helper\Context::class)
+        $this->contextMock = $this->getMockBuilder(Context::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->itemFactoryMock = $this->getMockBuilder(\Magento\Reports\Model\ItemFactory::class)
+        $this->itemFactoryMock = $this->getMockBuilder(ItemFactory::class)
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
@@ -52,7 +56,7 @@ protected function setUp()
      * @dataProvider intervalsDataProvider
      * @return void
      */
-    public function testGetIntervals($from, $to, $period, $results)
+    public function testGetIntervals(string $from, string $to, string $period, array $results)
     {
         $this->assertEquals($this->data->getIntervals($from, $to, $period), $results);
     }
@@ -65,14 +69,14 @@ public function testGetIntervals($from, $to, $period, $results)
      * @dataProvider intervalsDataProvider
      * @return void
      */
-    public function testPrepareIntervalsCollection($from, $to, $period, $results)
+    public function testPrepareIntervalsCollection(string $from, string $to, string $period, array $results)
     {
-        $collection = $this->getMockBuilder(\Magento\Framework\Data\Collection::class)
+        $collection = $this->getMockBuilder(Collection::class)
             ->disableOriginalConstructor()
             ->setMethods(['addItem'])
             ->getMock();
 
-        $item = $this->getMockBuilder(\Magento\Reports\Model\Item::class)
+        $item = $this->getMockBuilder(Item::class)
             ->disableOriginalConstructor()
             ->setMethods(['setPeriod', 'setIsEmpty'])
             ->getMock();
@@ -97,50 +101,56 @@ public function testPrepareIntervalsCollection($from, $to, $period, $results)
     /**
      * @return array
      */
-    public function intervalsDataProvider()
+    public function intervalsDataProvider(): array
     {
         return [
             [
                 'from' => '2000-01-15 10:00:00',
                 'to' => '2000-01-15 11:00:00',
-                'period' => \Magento\Reports\Helper\Data::REPORT_PERIOD_TYPE_DAY,
-                'results' => ['2000-01-15']
+                'period' => Data::REPORT_PERIOD_TYPE_DAY,
+                'results' => ['2000-01-15'],
             ],
             [
                 'from' => '2000-01-15 10:00:00',
                 'to' => '2000-01-17 10:00:00',
-                'period' => \Magento\Reports\Helper\Data::REPORT_PERIOD_TYPE_MONTH,
-                'results' => ['2000-01']
+                'period' => Data::REPORT_PERIOD_TYPE_MONTH,
+                'results' => ['2000-01'],
             ],
             [
                 'from' => '2000-01-15 10:00:00',
                 'to' => '2000-02-15 10:00:00',
-                'period' => \Magento\Reports\Helper\Data::REPORT_PERIOD_TYPE_YEAR,
-                'results' => ['2000']
+                'period' => Data::REPORT_PERIOD_TYPE_YEAR,
+                'results' => ['2000'],
             ],
             [
                 'from' => '2000-01-15 10:00:00',
                 'to' => '2000-01-16 11:00:00',
-                'period' => \Magento\Reports\Helper\Data::REPORT_PERIOD_TYPE_DAY,
-                'results' => ['2000-01-15', '2000-01-16']
+                'period' => Data::REPORT_PERIOD_TYPE_DAY,
+                'results' => ['2000-01-15', '2000-01-16'],
             ],
             [
                 'from' => '2000-01-15 10:00:00',
                 'to' => '2000-02-17 10:00:00',
-                'period' => \Magento\Reports\Helper\Data::REPORT_PERIOD_TYPE_MONTH,
-                'results' => ['2000-01', '2000-02']
+                'period' => Data::REPORT_PERIOD_TYPE_MONTH,
+                'results' => ['2000-01', '2000-02'],
             ],
             [
                 'from' => '2000-01-15 10:00:00',
                 'to' => '2003-02-15 10:00:00',
-                'period' => \Magento\Reports\Helper\Data::REPORT_PERIOD_TYPE_YEAR,
-                'results' => ['2000', '2001', '2002', '2003']
+                'period' => Data::REPORT_PERIOD_TYPE_YEAR,
+                'results' => ['2000', '2001', '2002', '2003'],
+            ],
+            [
+                'from' => '2000-12-31 10:00:00',
+                'to' => '2001-01-01 10:00:00',
+                'period' => Data::REPORT_PERIOD_TYPE_YEAR,
+                'results' => ['2000', '2001'],
             ],
             [
                 'from' => '',
                 'to' => '',
-                'period' => \Magento\Reports\Helper\Data::REPORT_PERIOD_TYPE_YEAR,
-                'results' => []
+                'period' => Data::REPORT_PERIOD_TYPE_YEAR,
+                'results' => [],
             ]
         ];
     }
diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json
index 6b5a43f040109..fbb1ebb54ac7b 100644
--- a/app/code/Magento/Reports/composer.json
+++ b/app/code/Magento/Reports/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-reports",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-config": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-eav": "101.0.*",
@@ -22,7 +22,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.6",
+    "version": "100.2.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
index 00766acac16fd..81453a5a17ad2 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
@@ -3,59 +3,55 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var $block \Magento\Reports\Block\Adminhtml\Grid */
-$numColumns = sizeof($block->getColumns());
 ?>
-<?php if ($block->getCollection()): ?>
-    <?php if ($block->canDisplayContainer()): ?>
-    <div id="<?= /* @escapeNotVerified */ $block->getId() ?>">
-        <?php else: ?>
+<?php if ($block->getCollection()) : ?>
+    <?php if ($block->canDisplayContainer()) : ?>
+    <div id="<?= $block->escapeHtmlAttr($block->getId()) ?>">
+        <?php else : ?>
             <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
         <?php endif; ?>
-        <?php if ($block->getStoreSwitcherVisibility() || $block->getDateFilterVisibility()): ?>
+        <?php if ($block->getStoreSwitcherVisibility() || $block->getDateFilterVisibility()) : ?>
             <div class="admin__data-grid-header admin__data-grid-toolbar">
                 <div class="admin__data-grid-header-row">
-                    <?php if ($block->getDateFilterVisibility()): ?>
-                        <div class="admin__filter-actions" data-role="filter-form" id="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_range') ?>">
+                    <?php if ($block->getDateFilterVisibility()) : ?>
+                        <div class="admin__filter-actions" data-role="filter-form" id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_range')) ?>">
                             <span class="field-row">
-                                <label for="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from') ?>"
+                                <label for="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_from')) ?>"
                                        class="admin__control-support-text">
-                                    <span><?= /* @escapeNotVerified */ __('From') ?>:</span>
+                                    <span><?= $block->escapeHtml(__('From')) ?>:</span>
                                 </label>
                                 <input class="input-text no-changes required-entry admin__control-text"
                                        type="text"
-                                       id="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from') ?>"
+                                       id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_from')) ?>"
                                        name="report_from"
-                                       value="<?= $block->escapeHtml($block->getFilter('report_from')) ?>">
-                                <span id="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from_advice') ?>"></span>
+                                       value="<?= $block->escapeHtmlAttr($block->getFilter('report_from')) ?>">
+                                <span id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_from_advice')) ?>"></span>
                             </span>
 
                             <span class="field-row">
-                                <label for="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to') ?>"
+                                <label for="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_to')) ?>"
                                        class="admin__control-support-text">
-                                    <span><?= /* @escapeNotVerified */ __('To') ?>:</span>
+                                    <span><?= $block->escapeHtml(__('To')) ?>:</span>
                                 </label>
                                 <input class="input-text no-changes required-entry admin__control-text"
                                        type="text"
-                                       id="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to') ?>"
+                                       id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_to')) ?>"
                                        name="report_to"
-                                       value="<?= $block->escapeHtml($block->getFilter('report_to')) ?>"/>
-                                <span id="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to_advice') ?>"></span>
+                                       value="<?= $block->escapeHtmlAttr($block->getFilter('report_to')) ?>"/>
+                                <span id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_to_advice')) ?>"></span>
                             </span>
 
                             <span class="field-row admin__control-filter">
-                                 <label for="<?= /* @escapeNotVerified */ $block->getSuffixId('report_period') ?>"
+                                 <label for="<?= $block->escapeHtmlAttr($block->getSuffixId('report_period')) ?>"
                                         class="admin__control-support-text">
-                                     <span><?= /* @escapeNotVerified */ __('Show By') ?>:</span>
+                                     <span><?= $block->escapeHtml(__('Show By')) ?>:</span>
                                  </label>
-                                <select name="report_period" id="<?= /* @escapeNotVerified */ $block->getSuffixId('report_period') ?>" class="admin__control-select">
-                                    <?php foreach ($block->getPeriods() as $_value => $_label): ?>
-                                        <option value="<?= /* @escapeNotVerified */ $_value ?>" <?php if ($block->getFilter('report_period') == $_value): ?> selected<?php endif; ?>><?= /* @escapeNotVerified */ $_label ?></option>
+                                <select name="report_period" id="<?= $block->escapeHtmlAttr($block->getSuffixId('report_period')) ?>" class="admin__control-select">
+                                    <?php foreach ($block->getPeriods() as $_value => $_label) : ?>
+                                        <option value="<?= $block->escapeHtmlAttr($_value) ?>" <?php if ($block->getFilter('report_period') == $_value) : ?> selected<?php endif; ?>><?= $block->escapeHtml($_label) ?></option>
                                     <?php endforeach; ?>
                                 </select>
                                 <?= $block->getRefreshButtonHtml() ?>
@@ -66,33 +62,33 @@ $numColumns = sizeof($block->getColumns());
                                     "mage/calendar"
                                 ], function($){
 
-                                    $("#<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_range') ?>").dateRange({
-                                        dateFormat:"<?= /* @escapeNotVerified */ $block->getDateFormat() ?>",
-                                        buttonText:"<?= /* @escapeNotVerified */ __('Select Date') ?>",
+                                    $("#<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_range'))) ?>").dateRange({
+                                        dateFormat:"<?= $block->escapeJs($block->escapeHtml($block->getDateFormat())) ?>",
+                                        buttonText:"<?= $block->escapeJs($block->escapeHtml(__('Select Date'))) ?>",
                                         from:{
-                                            id:"<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from') ?>"
+                                            id:"<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_from'))) ?>"
                                         },
                                         to:{
-                                            id:"<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to') ?>"
+                                            id:"<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_to'))) ?>"
                                         }
                                     });
                                 });
                             </script>
                         </div>
                     <?php endif; ?>
-                    <?php if ($block->getChildBlock('grid.export')): ?>
+                    <?php if ($block->getChildBlock('grid.export')) : ?>
                         <?= $block->getChildHtml('grid.export') ?>
                     <?php endif; ?>
                 </div>
             </div>
         <?php endif; ?>
         <div class="admin__data-grid-wrap admin__data-grid-wrap-static">
-            <table class="data-grid" id="<?= /* @escapeNotVerified */ $block->getId() ?>_table">
+            <table class="data-grid" id="<?= $block->escapeHtmlAttr($block->getId()) ?>_table">
                 <?= $block->getChildHtml('grid.columnSet') ?>
             </table>
         </div>
     </div>
-    <?php if ($block->canDisplayContainer()): ?>
+    <?php if ($block->canDisplayContainer()) : ?>
         <script>
             require([
                 "jquery",
@@ -102,29 +98,31 @@ $numColumns = sizeof($block->getColumns());
             ], function(jQuery){
 
                 //<![CDATA[
-                <?= /* @escapeNotVerified */ $block->getJsObjectName() ?> = new varienGrid('<?= /* @escapeNotVerified */ $block->getId() ?>', '<?= /* @escapeNotVerified */ $block->getGridUrl() ?>', '<?= /* @escapeNotVerified */ $block->getVarNamePage() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameSort() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameDir() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameFilter() ?>');
-                <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.useAjax = '<?php if ($block->getUseAjax()): /* @escapeNotVerified */ echo $block->getUseAjax(); endif; ?>';
-                <?php if ($block->getDateFilterVisibility()): ?>
-                <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.doFilterCallback = validateFilterDate;
-                var period_date_from = $('<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from') ?>');
-                var period_date_to = $('<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to') ?>');
-                period_date_from.adviceContainer = $('<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from_advice') ?>');
-                period_date_to.adviceContainer = $('<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to_advice') ?>');
+                <?= $block->escapeJs($block->escapeHtml($block->getJsObjectName())) ?> = new varienGrid('<?= $block->escapeJs($block->escapeHtml($block->getId())) ?>', '<?= $block->escapeJs($block->escapeUrl($block->getGridUrl())) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getVarNamePage())) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getVarNameSort())) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getVarNameDir())) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getVarNameFilter())) ?>');
+                <?= $block->escapeJs($block->escapeHtml($block->getJsObjectName())) ?>.useAjax = '<?php if ($block->getUseAjax()) :
+                        echo $block->escapeJs($block->escapeHtml($block->getUseAjax()));
+                    endif; ?>';
+                <?php if ($block->getDateFilterVisibility()) : ?>
+                    <?= $block->escapeJs($block->escapeHtml($block->getJsObjectName())) ?>.doFilterCallback = validateFilterDate;
+                    var period_date_from = $('<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_from'))) ?>');
+                    var period_date_to = $('<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_to'))) ?>');
+                    period_date_from.adviceContainer = $('<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_from_advice'))) ?>');
+                    period_date_to.adviceContainer = $('<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_to_advice'))) ?>');
 
-                var validateFilterDate = function() {
-                    if (period_date_from && period_date_to) {
-                        var valid = true;
-                        jQuery(period_date_from).add(period_date_to).each(function() {
-                            valid = Validation.validate(this) && valid;
-                        });
-                        return valid;
-                    }
-                    else {
-                        return true;
+                    var validateFilterDate = function() {
+                        if (period_date_from && period_date_to) {
+                            var valid = true;
+                            jQuery(period_date_from).add(period_date_to).each(function() {
+                                valid = Validation.validate(this) && valid;
+                            });
+                            return valid;
+                        }
+                        else {
+                            return true;
+                        }
                     }
-                }
                 <?php endif;?>
-                <?php if ($block->getStoreSwitcherVisibility()): ?>
+                <?php if ($block->getStoreSwitcherVisibility()) : ?>
                 /* Overwrite function from switcher.phtml widget*/
                 switchStore = function(obj) {
                     if (obj.options[obj.selectedIndex].getAttribute('website') == 'true') {
@@ -138,9 +136,9 @@ $numColumns = sizeof($block->getColumns());
                     if (obj.switchParams) {
                         storeParam += obj.switchParams;
                     }
-                    var formParam = new Array('<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from') ?>', '<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to') ?>', '<?= /* @escapeNotVerified */ $block->getSuffixId('report_period') ?>');
+                    var formParam = new Array('<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_from'))) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_to'))) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('report_period'))) ?>');
                     var paramURL = '';
-                    var switchURL = '<?= /* @escapeNotVerified */ $block->getAbsoluteGridUrl(['_current' => false]) ?>'.replace(/(store|group|website)\/\d+\//, '');
+                    var switchURL = '<?= $block->escapeUrl($block->getAbsoluteGridUrl(['_current' => false])) ?>'.replace(/(store|group|website)\/\d+\//, '');
 
                     for (var i = 0; i < formParam.length; i++) {
                         if ($(formParam[i]).value && $(formParam[i]).name) {
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml b/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
index 6f93cd157a4f0..089327f4de99b 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
@@ -32,7 +32,7 @@ require([
         }
 
         if (jQuery('#filter_form').valid()) {
-            setLocation('<?= /* @escapeNotVerified */ $block->getFilterUrl() ?>filter/'+
+            setLocation('<?= $block->escapeJs($block->escapeUrl($block->getFilterUrl())) ?>filter/'+
                 Base64.encode(Form.serializeElements(elements))+'/'
             );
         }
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/report/wishlist.phtml b/app/code/Magento/Reports/view/adminhtml/templates/report/wishlist.phtml
index 16b99744c42e4..9183145a2cab1 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/report/wishlist.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/report/wishlist.phtml
@@ -4,27 +4,20 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/**
+ * @deprecated
+ */
 ?>
 <?= $block->getChildHtml('grid') ?>
 
 <div class="switcher f-left" style="margin: 10px 10px 10px 0px; padding:15px;">
-<?php
-    /* @escapeNotVerified */ echo __('Customers that have Wish List: %1', $block->getCustomerWithWishlist())
-?>
+<?= $block->escapeHtml(__('Customers that have Wish List: %1', $block->getCustomerWithWishlist())) ?>
 </div>
 
 <div class="switcher" style="float: right; margin: 10px 0px 10px 10px; padding:15px;">
-    <?php
-        /* @escapeNotVerified */ echo __('Number of Wish Lists: %1', $block->getWishlistsCount())
-    ?><br />
-    <?php
-        /* @escapeNotVerified */ echo __('Number of items bought from a Wish List: %1', $block->getItemsBought())
-    ?><br />
-    <?php /* @escapeNotVerified */ echo __('Number of times Wish Lists have been shared (emailed): %1', $block->getSharedCount())
-    ?><br />
-    <?php /* @escapeNotVerified */ echo __('Number of Wish List referrals: %1', $block->getReferralsCount())
-    ?><br />
-    <?php /* @escapeNotVerified */ echo __('Number of Wish List conversions: %1', $block->getConversionsCount())
-    ?><br />
+    <?= $block->escapeHtml(__('Number of Wish Lists: %1', $block->getWishlistsCount())) ?><br />
+    <?= $block->escapeHtml(__('Number of items bought from a Wish List: %1', $block->getItemsBought())) ?><br />
+    <?= $block->escapeHtml(__('Number of times Wish Lists have been shared (emailed): %1', $block->getSharedCount())) ?><br />
+    <?= $block->escapeHtml(__('Number of Wish List referrals: %1', $block->getReferralsCount())) ?><br />
+    <?= $block->escapeHtml(__('Number of Wish List conversions: %1', $block->getConversionsCount())) ?><br />
 </div>
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml
index 0a1dc5dacd99d..090bda48a351c 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml
@@ -4,40 +4,40 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/**
+ * @deprecated
+ */
 
-?>
-<?php
 /**
  * @see \Magento\Backend\Block\Store\Switcher
  */
 ?>
-<?php if ($block->isShow()): ?>
+<?php if ($block->isShow()) : ?>
 <div class="field field-store-switcher">
-    <label class="label" for="store_switcher"><?= /* @escapeNotVerified */ __('Show Report For:') ?></label>
+    <label class="label" for="store_switcher"><?= $block->escapeHtml(__('Show Report For:')) ?></label>
     <div class="control">
         <select 
             id="store_switcher"
             class="admin__control-select"
             name="store_switcher"
             onchange="return switchStore(this);">
-            <option value=""><?= /* @escapeNotVerified */ __('All Websites') ?></option>
-            <?php foreach ($block->getWebsiteCollection() as $_website): ?>
+            <option value=""><?= $block->escapeHtml(__('All Websites')) ?></option>
+            <?php foreach ($block->getWebsiteCollection() as $_website) : ?>
                 <?php $showWebsite = false; ?>
-                <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
+                <?php foreach ($block->getGroupCollection($_website) as $_group) : ?>
                     <?php $showGroup = false; ?>
-                    <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
-                        <?php if ($showWebsite == false): ?>
+                    <?php foreach ($block->getStoreCollection($_group) as $_store) : ?>
+                        <?php if ($showWebsite == false) : ?>
                             <?php $showWebsite = true; ?>
-                                <option website="true" value="<?= /* @escapeNotVerified */ $_website->getId() ?>"<?php if ($block->getRequest()->getParam('website') == $_website->getId()): ?> selected<?php endif; ?>>
-                                    <?= /* @escapeNotVerified */ $_website->getName() ?>
+                                <option website="true" value="<?= $block->escapeHtmlAttr($_website->getId()) ?>"<?php if ($block->getRequest()->getParam('website') == $_website->getId()) : ?> selected<?php endif; ?>>
+                                    <?= $block->escapeHtml($_website->getName()) ?>
                                 </option>
                         <?php endif; ?>
-                        <?php if ($showGroup == false): ?>
+                        <?php if ($showGroup == false) : ?>
                             <?php $showGroup = true; ?>
-                            <option group="true" value="<?= /* @escapeNotVerified */ $_group->getId() ?>"<?php if ($block->getRequest()->getParam('group') == $_group->getId()): ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;<?= /* @escapeNotVerified */ $_group->getName() ?></option>
+                            <option group="true" value="<?= $block->escapeHtmlAttr($_group->getId()) ?>"<?php if ($block->getRequest()->getParam('group') == $_group->getId()) : ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_group->getName()) ?></option>
                         <?php endif; ?>
-                        <option value="<?= /* @escapeNotVerified */ $_store->getId() ?>"<?php if ($block->getStoreId() == $_store->getId()): ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?= /* @escapeNotVerified */ $_store->getName() ?></option>
+                        <option value="<?= $block->escapeHtmlAttr($_store->getId()) ?>"<?php if ($block->getStoreId() == $_store->getId()) : ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_store->getName()) ?></option>
                     <?php endforeach; ?>
                 <?php endforeach; ?>
             <?php endforeach; ?>
@@ -60,7 +60,7 @@ require(['prototype'], function(){
         if(obj.switchParams){
             storeParam+= obj.switchParams;
         }
-        setLocation('<?= /* @escapeNotVerified */ $block->getSwitchUrl() ?>'+storeParam);
+        setLocation('<?= $block->escapeUrl($block->getSwitchUrl()) ?>'+storeParam);
     }
 
 });
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/store/switcher/enhanced.phtml b/app/code/Magento/Reports/view/adminhtml/templates/store/switcher/enhanced.phtml
index 7edeee628be4a..e7a712e83e036 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/store/switcher/enhanced.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/store/switcher/enhanced.phtml
@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/**
+ * @deprecated
+ */
 
-?>
-<?php
 /**
  * @see \Magento\Backend\Block\Store\Switcher
  */
@@ -17,32 +17,32 @@
  */
 ?>
 
-<?php if ($block->isShow()): ?>
+<?php if ($block->isShow()) : ?>
 <div class="field field-store-switcher">
-    <label class="label" for="store_switcher"><?= /* @escapeNotVerified */ __('Show Report For:') ?></label>
+    <label class="label" for="store_switcher"><?= $block->escapeHtml(__('Show Report For:')) ?></label>
     <div class="control">
         <select 
             id="store_switcher"
             class="admin__control-select"
             name="store_switcher"
             onchange="return switchStore(this);">
-            <option value=""><?= /* @escapeNotVerified */ __('All Websites') ?></option>
-            <?php foreach ($block->getWebsiteCollection() as $_website): ?>
+            <option value=""><?= $block->escapeHtml(__('All Websites')) ?></option>
+            <?php foreach ($block->getWebsiteCollection() as $_website) : ?>
                 <?php $showWebsite = false; ?>
-                <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
+                <?php foreach ($block->getGroupCollection($_website) as $_group) : ?>
                     <?php $showGroup = false; ?>
-                    <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
-                        <?php if ($showWebsite == false): ?>
+                    <?php foreach ($block->getStoreCollection($_group) as $_store) : ?>
+                        <?php if ($showWebsite == false) : ?>
                             <?php $showWebsite = true; ?>
-                            <option website="true" value="<?= /* @escapeNotVerified */ implode(',', $_website->getStoreIds()) ?>"<?php if ($block->getRequest()->getParam('store_ids') == implode(',', $_website->getStoreIds())): ?> selected<?php endif; ?>><?= $block->escapeHtml($_website->getName()) ?></option>
+                            <option website="true" value="<?= $block->escapeHtmlAttr(implode(',', $_website->getStoreIds())) ?>"<?php if ($block->getRequest()->getParam('store_ids') == implode(',', $_website->getStoreIds())) : ?> selected<?php endif; ?>><?= $block->escapeHtml($_website->getName()) ?></option>
                         <?php endif; ?>
-                        <?php if ($showGroup == false): ?>
+                        <?php if ($showGroup == false) : ?>
                             <?php $showGroup = true; ?>
-                            <option group="true" value="<?= /* @escapeNotVerified */ implode(',', $_group->getStoreIds()) ?>"<?php if ($block->getRequest()->getParam('store_ids') == implode(',', $_group->getStoreIds())): ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_group->getName()) ?></option>
+                            <option group="true" value="<?= $block->escapeHtmlAttr(implode(',', $_group->getStoreIds())) ?>"<?php if ($block->getRequest()->getParam('store_ids') == implode(',', $_group->getStoreIds())) : ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_group->getName()) ?></option>
                         <?php endif; ?>
-                        <option value="<?= /* @escapeNotVerified */ $_store->getId() ?>"<?php if ($block->getStoreId() == $_store->getId()): ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_store->getName()) ?></option>
+                        <option value="<?= $block->escapeHtmlAttr($_store->getId()) ?>"<?php if ($block->getStoreId() == $_store->getId()) : ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_store->getName()) ?></option>
                     <?php endforeach; ?>
-                    <?php if ($showGroup): ?>
+                    <?php if ($showGroup) : ?>
                         </optgroup>
                     <?php endif; ?>
                 <?php endforeach; ?>
@@ -59,7 +59,7 @@ require(['prototype'], function(){
         if(obj.switchParams){
             storeParam+= obj.switchParams;
         }
-        setLocation('<?= /* @escapeNotVerified */ $block->getSwitchUrl() ?>'+storeParam);
+        setLocation('<?= $block->escapeUrl($block->getSwitchUrl()) ?>'+storeParam);
     }
 
 });
diff --git a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml
index a6e2f3dc72261..055a26b3dc308 100644
--- a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml
@@ -4,7 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/**
+ * @deprecated
+ */
 
 /* @var $block \Magento\Reports\Block\Product\Widget\Viewed */
 ?>
@@ -15,12 +17,12 @@ $type = $block->getType() . '-' . $mode;
 $class = 'widget viewed' . ' ' . $mode;
 $title = __('Recently Viewed');
 ?>
-<div class="block <?= /* @escapeNotVerified */ $class ?>" id="recently_viewed_container" data-mage-init='{"recentlyViewedProducts":{}}' data-count="<?= /* @escapeNotVerified */ $block->getCount() ?>" style="display: none;">
+<div class="block <?= $block->escapeHtmlAttr($class) ?>" id="recently_viewed_container" data-mage-init='{"recentlyViewedProducts":{}}' data-count="<?= $block->escapeHtmlAttr($block->getCount()) ?>" style="display: none;">
     <div class="title">
-        <strong><?= /* @escapeNotVerified */ $title ?></strong>
+        <strong><?= $block->escapeHtml($title) ?></strong>
     </div>
     <div class="content">
-        <ol class="products list items <?= /* @escapeNotVerified */ $type ?>">
+        <ol class="products list items <?= $block->escapeHtmlAttr($type) ?>">
         </ol>
     </div>
 </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml
index 579239d63e11e..b76d79a26c040 100644
--- a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml
@@ -4,12 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/**
+ * @deprecated
+ */
+
+/**
+ * @codingStandardsIgnoreFile
+ */
 
 /* @var $block \Magento\Reports\Block\Product\Widget\Viewed\Item */
-?>
 
-<?php
 $type = $block->getType() . '-' . $block->getViewMode();
 
 $item = $block->getProduct();
@@ -17,19 +21,19 @@ $item = $block->getProduct();
 $image = $block->getImageType();
 $rating = 'short';
 ?>
-<div class="block" id="widget_viewed_item" data-sku="<?= /* @escapeNotVerified */ $item->getSku() ?>" style="display: none;">
+<div class="block" id="widget_viewed_item" data-sku="<?= $block->escapeHtmlAttr($item->getSku()) ?>" style="display: none;">
     <li class="item product">
         <div class="product">
-            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
-            <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($item) ?>" class="product photo">
+            <?= '<!-- ' . $block->escapeHtml($image) . '-->' ?>
+            <a href="<?= $block->escapeUrl($block->getProductUrl($item)) ?>" class="product photo">
                 <?= $block->getImage($item, $image)->toHtml() ?>
             </a>
             <div class="product details">
-                <strong class="product name"><a title="<?= $block->escapeHtml($item->getName()) ?>" href="<?= /* @escapeNotVerified */ $block->getProductUrl($item) ?>">
+                <strong class="product name"><a title="<?= $block->escapeHtmlAttr($item->getName()) ?>" href="<?= $block->escapeUrl($block->getProductUrl($item)) ?>">
                     <?= $block->escapeHtml($item->getName()) ?></a>
                 </strong>
 
-                <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
+                <?= /* @noEscape */ $block->getProductPriceHtml(
                     $item,
                     \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
                     \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
@@ -38,51 +42,51 @@ $rating = 'short';
                     ]
                 ) ?>
 
-                <?php if ($rating): ?>
+                <?php if ($rating) : ?>
                     <?= $block->getReviewsSummaryHtml($item, $rating) ?>
                 <?php endif; ?>
 
                 <div class="product actions">
                     <div class="primary">
-                        <?php if ($item->isSaleable()): ?>
-                            <?php if ($item->getTypeInstance()->hasRequiredOptions($item)): ?>
-                                <button class="action tocart" data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($item) ?>"}}' type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
-                                    <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
+                        <?php if ($item->isSaleable()) : ?>
+                            <?php if ($item->getTypeInstance()->hasRequiredOptions($item)) : ?>
+                                <button class="action tocart" 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');
                                 $postData = $postDataHelper->getPostData($block->getAddToCartUrl($item), ['product' => $item->getEntityId()])
                                 ?>
                                 <button class="action tocart"
-                                        data-post='<?= /* @escapeNotVerified */ $postData ?>'
-                                        type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
-                                    <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
+                                        data-post='<?= /* @noEscape */ $postData ?>'
+                                        type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                    <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                                 </button>
                             <?php endif; ?>
-                        <?php else: ?>
-                            <?php if ($item->getIsSalable()): ?>
-                                <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
-                            <?php else: ?>
-                                <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
+                        <?php else : ?>
+                            <?php if ($item->getIsSalable()) : ?>
+                                <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
+                            <?php else : ?>
+                                <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
                             <?php endif; ?>
                         <?php endif; ?>
                     </div>
 
                     <div class="secondary-addto-links" data-role="add-to-links">
-                        <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()): ?>
-                            <a href="#" data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($item) ?>'  class="action towishlist" data-action="add-to-wishlist" title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
-                                <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
+                        <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
+                            <a href="#" data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($item) ?>'  class="action towishlist" data-action="add-to-wishlist" title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
+                                <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
                             </a>
                         <?php endif; ?>
-                        <?php if ($block->getAddToCompareUrl()): ?>
+                        <?php if ($block->getAddToCompareUrl()) : ?>
                             <?php
                             $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');
                             ?>
                             <a href="#" class="action tocompare"
-                               data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($item) ?>'
+                               data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($item) ?>'
                                data-role="add-to-links"
-                               title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
-                                <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
+                               title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
+                                <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
                             </a>
                         <?php endif; ?>
                     </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml
index 999452ebb7cbd..19dec45522c29 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml
@@ -4,7 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/**
+ * @deprecated
+ */
+
+/**
+ * @codingStandardsIgnoreFile
+ */
 
 ?>
 <?php
@@ -25,69 +31,68 @@ if ($exist = $block->getRecentlyComparedProducts()) {
     $description = false;
 }
 ?>
-<?php if ($exist): ?>
-<div class="block widget block-compared-products-<?= /* @escapeNotVerified */ $mode ?>">
+<?php if ($exist) : ?>
+<div class="block widget block-compared-products-<?= $block->escapeHtmlAttr($mode) ?>">
     <div class="block-title">
-        <strong><?= /* @escapeNotVerified */ $title ?></strong>
+        <strong><?= $block->escapeHtml($title) ?></strong>
     </div>
     <div class="block-content">
         <?php $suffix = $block->getNameInLayout(); ?>
-        <ol class="product-items" id="widget-compared-<?= /* @escapeNotVerified */ $suffix ?>">
-            <?php $iterator = 1; ?>
-            <?php foreach ($items as $_product): ?>
-                <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
-                <div class="product-item-info">
-                    <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
-                       title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
-                        <?= $block->getImage($_product, $image)->toHtml() ?>
-                    </a>
-                    <div class="product-item-details">
-                        <strong class="product-item-name">
-                            <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
-                               title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>)">
-                                <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
-                            </a>
-                        </strong>
-                        <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
-                            $_product,
-                            \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                            \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-                            [
-                                'price_id_suffix' => '-widget-compared-' . $suffix
-                            ]
-                        ) ?>
-                        <div class="product-item-actions">
-                        <?php if ($_product->isSaleable()): ?>
-                            <div class="actions-primary">
-                            <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
-                                <button class="action tocart primary"
-                                        data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_product) ?>"}}'
-                                        type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
-                                    <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-                                </button>
-                            <?php else: ?>
-                                <?php
-                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()])
-                                ?>
-                                <button class="action tocart primary"
-                                        data-post='<?= /* @escapeNotVerified */ $postData ?>'
-                                        type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
-                                    <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-                                </button>
+        <ol class="product-items" id="widget-compared-<?= $block->escapeHtmlAttr($suffix) ?>">
+            <?php foreach ($items as $_product) : ?>
+                <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                    <div class="product-item-info">
+                        <a class="product-item-photo" href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
+                           title="<?= $block->escapeHtmlAttr($block->stripTags($_product->getName(), null, true)) ?>">
+                            <?= $block->getImage($_product, $image)->toHtml() ?>
+                        </a>
+                        <div class="product-item-details">
+                            <strong class="product-item-name">
+                                <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
+                                   title="<?= $block->escapeHtmlAttr($block->stripTags($_product->getName(), null, true)) ?>)">
+                                    <?= $block->escapeHtml($this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name')) ?>
+                                </a>
+                            </strong>
+                            <?= /* @noEscape */ $block->getProductPriceHtml(
+                                $_product,
+                                \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
+                                \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
+                                [
+                                    'price_id_suffix' => '-widget-compared-' . $suffix
+                                ]
+                            ) ?>
+                            <div class="product-item-actions">
+                            <?php if ($_product->isSaleable()) : ?>
+                                <div class="actions-primary">
+                                <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)) : ?>
+                                    <button class="action tocart primary"
+                                            data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeUrl($block->getAddToCartUrl($_product)) ?>"}}'
+                                            type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                        <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                    </button>
+                                <?php else : ?>
+                                    <?php
+                                    $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
+                                    $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()])
+                                    ?>
+                                    <button class="action tocart primary"
+                                            data-post='<?= /* @noEscape */ $postData ?>'
+                                            type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                        <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                    </button>
+                                <?php endif; ?>
+                                </div>
+                            <?php else : ?>
+                                <?php if ($_product->getIsSalable()) : ?>
+                                    <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
+                                <?php else : ?>
+                                    <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                <?php endif; ?>
                             <?php endif; ?>
                             </div>
-                        <?php else: ?>
-                            <?php if ($_product->getIsSalable()): ?>
-                                <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
-                            <?php else: ?>
-                                <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
-                            <?php endif; ?>
-                        <?php endif; ?>
                         </div>
                     </div>
-                </div>
-                <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
+                <?= /* @noEscape */ ($iterator == count($items)+1) ? '</li>' : '' ?>
             <?php endforeach; ?>
         </ol>
     </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_images_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_images_list.phtml
index e125467b71f77..c6b6ae73ab039 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_images_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_images_list.phtml
@@ -4,8 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/**
+ * @deprecated
+ */
 ?>
 <?php
 if ($exist = $block->getRecentlyComparedProducts()) {
@@ -22,18 +23,18 @@ if ($exist = $block->getRecentlyComparedProducts()) {
     $description = false;
 }
 ?>
-<?php if ($exist): ?>
+<?php if ($exist) : ?>
 <div class="block widget block-compared-products-images">
     <div class="block-title">
-        <strong><?= /* @escapeNotVerified */ $title ?></strong>
+        <strong><?= $block->escapeHtml($title) ?></strong>
     </div>
     <div class="block-content">
         <?php $suffix = $block->getNameInLayout(); ?>
-        <ol id="widget-compared-<?= /* @escapeNotVerified */ $suffix ?>" class="product-items product-items-images">
-        <?php $i = 0; foreach ($items as $_product): ?>
+        <ol id="widget-compared-<?= $block->escapeHtmlAttr($suffix) ?>" class="product-items product-items-images">
+        <?php $i = 0; foreach ($items as $_product) : ?>
             <li class="product-item">
-                <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
-                    title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
+                <a class="product-item-photo" href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
+                    title="<?= $block->escapeHtmlAttr($block->stripTags($_product->getName(), null, true)) ?>">
                     <?= $block->getImage($_product, $image)->toHtml() ?>
                 </a>
             </li>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_names_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_names_list.phtml
index ee24db7d693bd..02d8d09beec24 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_names_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_names_list.phtml
@@ -4,22 +4,28 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/**
+ * @deprecated
+ */
+
+/**
+ * @codingStandardsIgnoreFile
+ */
 
 ?>
-<?php if ($_products = $block->getRecentlyComparedProducts()): ?>
+<?php if ($_products = $block->getRecentlyComparedProducts()) : ?>
 <div class="block widget block-compared-products-names">
     <div class="block-title">
-        <strong><?= /* @escapeNotVerified */ __('Recently Compared') ?></span></strong>
+        <strong><?= $block->escapeHtml(__('Recently Compared')) ?></span></strong>
     </div>
     <div class="block-content">
         <?php $suffix = $block->getNameInLayout(); ?>
-        <ol id="widget-compared-<?= /* @escapeNotVerified */ $suffix ?>" class="product-items product-items-names">
-        <?php $i = 0; foreach ($_products as $_product): ?>
+        <ol id="widget-compared-<?= $block->escapeHtmlAttr($suffix) ?>" class="product-items product-items-names">
+        <?php $i = 0; foreach ($_products as $_product) : ?>
             <li class="product-item">
                 <strong class="product-item-name">
-                    <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" class="product-item-link">
-                        <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                    <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>" class="product-item-link">
+                        <?= $block->escapeHtml($this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name')) ?>
                     </a>
                 </strong>
             </li>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
index f56448b11db0f..cd9fc34b25cd7 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
@@ -4,11 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/**
+ * @deprecated
+ */
 
-?>
+/**
+ * @codingStandardsIgnoreFile
+ */
 
-<?php
 /** @var \Magento\Catalog\Block\Product\Compare\ListCompare $block */
 if ($exist = $block->getRecentlyComparedProducts()) {
     $type = 'widget-compared';
@@ -28,98 +31,97 @@ if ($exist = $block->getRecentlyComparedProducts()) {
 }
 ?>
 
-<?php if ($exist):?>
-    <div class="block widget block-compared-products-<?= /* @escapeNotVerified */ $mode ?>">
+<?php if ($exist) : ?>
+    <div class="block widget block-compared-products-<?= $block->escapeHtmlAttr($mode) ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
+            <strong role="heading" aria-level="2"><?= $block->escapeHtml($title) ?></strong>
         </div>
         <div class="block-content">
-            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
-            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
-                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
-                    <?php $iterator = 1; ?>
-                    <?php foreach ($items as $_item): ?>
-                        <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
-                        <div class="product-item-info">
-                            <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                <?= $block->getImage($_item, $image)->toHtml() ?>
-                            </a>
-                            <div class="product-item-details">
-                                <strong class="product-item-name">
-                                    <a title="<?= $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-link">
-                                        <?= $block->escapeHtml($_item->getName()) ?>
-                                    </a>
-                                </strong>
-                                <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
-                                    $_item,
-                                    \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                                    \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-                                    [
-                                        'price_id_suffix' => '-' . $type
-                                    ]
-                                ) ?>
-                                <?php if ($rating): ?>
-                                    <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
-                                <?php endif; ?>
-                                <?php if ($showWishlist || $showCompare || $showCart): ?>
-                                    <div class="product-item-actions">
-                                        <?php if ($showCart): ?>
-                                            <div class="actions-primary">
-                                                <?php if ($_item->isSaleable()): ?>
-                                                    <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                        <button class="action tocart primary"
-                                                                data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
-                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-                                                        </button>
-                                                    <?php else: ?>
-                                                        <?php
-                                                            $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                                            $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-                                                        ?>
-                                                        <button class="action tocart primary"
-                                                                data-post='<?= /* @escapeNotVerified */ $postData ?>'
-                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
-                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-                                                        </button>
-                                                    <?php endif; ?>
-                                                <?php else: ?>
-                                                    <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
-                                                    <?php else: ?>
-                                                        <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
+            <?= '<!-- ' . $block->escapeHtml($image) . '-->' ?>
+            <div class="products-<?= $block->escapeHtmlAttr($mode) ?> <?= $block->escapeHtmlAttr($mode) ?>">
+                <ol class="product-items <?= $block->escapeHtmlAttr($type)?>">
+                    <?php foreach ($items as $_item) : ?>
+                        <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                            <div class="product-item-info">
+                                <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
+                                    <?= $block->getImage($_item, $image)->toHtml() ?>
+                                </a>
+                                <div class="product-item-details">
+                                    <strong class="product-item-name">
+                                        <a title="<?= $block->escapeHtmlAttr($_item->getName()) ?>"
+                                           href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-link">
+                                            <?= $block->escapeHtml($_item->getName()) ?>
+                                        </a>
+                                    </strong>
+                                    <?= /* @noEscape */ $block->getProductPriceHtml(
+                                        $_item,
+                                        \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
+                                        \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
+                                        [
+                                            'price_id_suffix' => '-' . $type
+                                        ]
+                                    ) ?>
+                                    <?php if ($rating) : ?>
+                                        <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
+                                    <?php endif; ?>
+                                    <?php if ($showWishlist || $showCompare || $showCart) : ?>
+                                        <div class="product-item-actions">
+                                            <?php if ($showCart) : ?>
+                                                <div class="actions-primary">
+                                                    <?php if ($_item->isSaleable()) : ?>
+                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)) : ?>
+                                                            <button class="action tocart primary"
+                                                                    data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
+                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                            </button>
+                                                        <?php else : ?>
+                                                            <?php
+                                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
+                                                                $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
+                                                            ?>
+                                                            <button class="action tocart primary"
+                                                                    data-post='<?= /* @noEscape */ postData ?>'
+                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                            </button>
+                                                        <?php endif; ?>
+                                                    <?php else : ?>
+                                                        <?php if ($_item->getIsSalable()) : ?>
+                                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
+                                                        <?php else : ?>
+                                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                                        <?php endif; ?>
                                                     <?php endif; ?>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
+                                                </div>
+                                            <?php endif; ?>
 
-                                        <?php if ($showWishlist || $showCompare): ?>
-                                            <div class="actions-secondary" data-role="add-to-links">
-                                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                                    <a href="#"
-                                                       data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
-                                                       data-action="add-to-wishlist"
-                                                       class="action towishlist"
-                                                       title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
-                                                        <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
-                                                    <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare'); ?>
-                                                    <a href="#" class="action tocompare"
-                                                       data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
-                                                       title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
-                                                        <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
-                                    </div>
-                                <?php endif; ?>
+                                            <?php if ($showWishlist || $showCompare) : ?>
+                                                <div class="actions-secondary" data-role="add-to-links">
+                                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist) : ?>
+                                                        <a href="#"
+                                                           data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>'
+                                                           data-action="add-to-wishlist"
+                                                           class="action towishlist"
+                                                           title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
+                                                        </a>
+                                                    <?php endif; ?>
+                                                    <?php if ($block->getAddToCompareUrl() && $showCompare) : ?>
+                                                        <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare'); ?>
+                                                        <a href="#" class="action tocompare"
+                                                           data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>'
+                                                           title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
+                                                        </a>
+                                                    <?php endif; ?>
+                                                </div>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+                                </div>
                             </div>
-                        </div>
-                        <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
+                        <?= /* @noEscape */ ($iterator == count($items)+1) ? '</li>' : '' ?>
                     <?php endforeach ?>
                 </ol>
             </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
index 48463f3baaa5c..2848475a93424 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
@@ -4,11 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/**
+ * @deprecated
+ */
 
-?>
+/**
+ * @codingStandardsIgnoreFile
+ */
 
-<?php
 /** @var \Magento\Catalog\Block\Product\Compare\ListCompare $block */
 if ($exist = $block->getRecentlyComparedProducts()) {
     $type = 'widget-compared';
@@ -29,106 +32,105 @@ if ($exist = $block->getRecentlyComparedProducts()) {
 }
 ?>
 
-<?php if ($exist):?>
-    <div class="block widget block-compared-products-<?= /* @escapeNotVerified */ $mode ?>">
+<?php if ($exist) : ?>
+    <div class="block widget block-compared-products-<?= $block->escapeHtmlAttr($mode) ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
+            <strong role="heading" aria-level="2"><?= $block->escapeHtml($title) ?></strong>
         </div>
         <div class="block-content">
-            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
-            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
-                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
-                    <?php $iterator = 1; ?>
-                    <?php foreach ($items as $_item): ?>
-                        <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
-                        <div class="product-item-info">
-                            <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                <?= $block->getImage($_item, $image)->toHtml() ?>
-                            </a>
-                            <div class="product-item-details">
-                                <strong class="product-item-name">
-                                    <a title="<?= $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-link">
-                                        <?= $block->escapeHtml($_item->getName()) ?>
-                                    </a>
-                                </strong>
-                                <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
-                                    $_item,
-                                    \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                                    \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-                                    [
-                                        'price_id_suffix' => '-' . $type
-                                    ]
-                                ) ?>
-                                <?php if ($rating): ?>
-                                    <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
-                                <?php endif; ?>
-                                <?php if ($showWishlist || $showCompare || $showCart): ?>
-                                    <div class="product-item-actions">
-                                        <?php if ($showCart): ?>
-                                            <div class="actions-primary">
-                                                <?php if ($_item->isSaleable()): ?>
-                                                    <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                        <button class="action tocart primary"
-                                                                data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
-                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-                                                        </button>
-                                                    <?php else: ?>
-                                                        <?php
-                                                            $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                                            $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-                                                        ?>
-                                                        <button class="action tocart primary"
-                                                                data-post='<?= /* @escapeNotVerified */ $postData ?>'
-                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
-                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-                                                        </button>
-                                                    <?php endif; ?>
-                                                <?php else: ?>
-                                                    <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
-                                                    <?php else: ?>
-                                                        <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
+            <?= '<!-- ' . $block->escapeHtml($image) . '-->' ?>
+            <div class="products-<?= $block->escapeHtmlAttr($mode) ?> <?= $block->escapeHtmlAttr($mode) ?>">
+                <ol class="product-items <?= $block->escapeHtmlAttr($type) ?>">
+                    <?php foreach ($items as $_item) : ?>
+                        <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                            <div class="product-item-info">
+                                <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
+                                    <?= $block->getImage($_item, $image)->toHtml() ?>
+                                </a>
+                                <div class="product-item-details">
+                                    <strong class="product-item-name">
+                                        <a title="<?= $block->escapeHtmlAttr($_item->getName()) ?>"
+                                           href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-link">
+                                            <?= $block->escapeHtml($_item->getName()) ?>
+                                        </a>
+                                    </strong>
+                                    <?= /* @noEscape */ $block->getProductPriceHtml(
+                                        $_item,
+                                        \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
+                                        \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
+                                        [
+                                            'price_id_suffix' => '-' . $type
+                                        ]
+                                    ) ?>
+                                    <?php if ($rating) : ?>
+                                        <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
+                                    <?php endif; ?>
+                                    <?php if ($showWishlist || $showCompare || $showCart) : ?>
+                                        <div class="product-item-actions">
+                                            <?php if ($showCart) : ?>
+                                                <div class="actions-primary">
+                                                    <?php if ($_item->isSaleable()) : ?>
+                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)) : ?>
+                                                            <button class="action tocart primary"
+                                                                    data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeHtmlAttr($block->escapeUrl($block->getAddToCartUrl($_item))) ?>"}}'
+                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                            </button>
+                                                        <?php else : ?>
+                                                            <?php
+                                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
+                                                                $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
+                                                            ?>
+                                                            <button class="action tocart primary"
+                                                                    data-post='<?= /* @noEscape */ $postData ?>'
+                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                            </button>
+                                                        <?php endif; ?>
+                                                    <?php else : ?>
+                                                        <?php if ($_item->getIsSalable()) : ?>
+                                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
+                                                        <?php else : ?>
+                                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                                        <?php endif; ?>
                                                     <?php endif; ?>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
+                                                </div>
+                                            <?php endif; ?>
 
-                                        <?php if ($showWishlist || $showCompare): ?>
-                                            <div class="actions-secondary" data-role="add-to-links">
-                                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                                    <a href="#"
-                                                       data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
-                                                       data-action="add-to-wishlist"
-                                                       class="action towishlist"
-                                                       title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
-                                                        <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
-                                                    <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-                                                    <a href="#" class="action tocompare"
-                                                       data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
-                                                       title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
-                                                        <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
-                                    </div>
-                                <?php endif; ?>
-                                <?php if ($description):?>
-                                    <div class="product-item-description">
-                                        <?= /* @escapeNotVerified */ $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
-                                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
-                                           href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
-                                           class="action more"><?= /* @escapeNotVerified */ __('Learn More') ?></a>
-                                    </div>
-                                <?php endif; ?>
+                                            <?php if ($showWishlist || $showCompare) : ?>
+                                                <div class="actions-secondary" data-role="add-to-links">
+                                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist) : ?>
+                                                        <a href="#"
+                                                           data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>'
+                                                           data-action="add-to-wishlist"
+                                                           class="action towishlist"
+                                                           title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
+                                                        </a>
+                                                    <?php endif; ?>
+                                                    <?php if ($block->getAddToCompareUrl() && $showCompare) : ?>
+                                                        <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
+                                                        <a href="#" class="action tocompare"
+                                                           data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>'
+                                                           title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
+                                                        </a>
+                                                    <?php endif; ?>
+                                                </div>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+                                    <?php if ($description) : ?>
+                                        <div class="product-item-description">
+                                            <?= $block->escapeHtml($_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description')) ?>
+                                            <a title="<?= $block->escapeHtmlAttr($_item->getName()) ?>"
+                                               href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
+                                               class="action more"><?= $block->escapeHtml(__('Learn More')) ?></a>
+                                        </div>
+                                    <?php endif; ?>
+                                </div>
                             </div>
-                        </div>
-                        <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
+                        <?= /* @noEscape */ ($iterator == count($items)+1) ? '</li>' : '' ?>
                     <?php endforeach ?>
                 </ol>
             </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
index e26dc7ea31761..2092c5387c0db 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
@@ -4,10 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/**
+ * @deprecated
+ */
+
+/**
+ * @codingStandardsIgnoreFile
+ */
 
-?>
-<?php
 /**
  * @var $block \Magento\Reports\Block\Product\Viewed
  */
@@ -30,68 +34,68 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
     $description = false;
 }
 ?>
-<?php if ($exist): ?>
-<div class="block widget block-viewed-products-<?= /* @escapeNotVerified */ $mode ?>">
+<?php if ($exist) : ?>
+<div class="block widget block-viewed-products-<?= $block->escapeHtmlAttr($mode) ?>">
     <div class="block-title">
-        <strong><?= /* @escapeNotVerified */ $title ?></strong>
+        <strong><?= $block->escapeHtml($title) ?></strong>
     </div>
     <div class="block-content">
         <?php $suffix = $block->getNameInLayout(); ?>
-        <ol class="product-items" id="widget-viewed-<?= /* @escapeNotVerified */ $suffix ?>">
+        <ol class="product-items" id="widget-viewed-<?= $block->escapeHtmlAttr($suffix) ?>">
             <?php $iterator = 1; ?>
-            <?php foreach ($items as $_product): ?>
-                <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
-                <div class="product-item-info">
-                    <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
-                       title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
-                        <?= $block->getImage($_product, $image)->toHtml() ?>
-                    </a>
-                    <div class="product-item-details">
-                        <strong class="product-item-name">
-                            <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
-                               title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>"
-                               class="product-item-link">
-                                <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
-                            </a>
-                        </strong>
-                        <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
-                            $_product,
-                            \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                            \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-                            [
-                                'price_id_suffix' => '-widget-viewed-' . $suffix
-                            ]
-                        ) ?>
-                        <div class="product-item-actions">
-                            <?php if ($_product->isSaleable()): ?>
-                            <div class="actions-primary">
-                                <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
-                                    <button class="action tocart primary"
-                                            data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_product) ?>"}}'
-                                            type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
-                                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-                                    </button>
-                                <?php else: ?>
-                                    <?php
-                                        $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                        $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()]);
-                                    ?>
-                                    <button type="button" class="action tocart primary" data-post='<?= /* @escapeNotVerified */ $postData ?>'>
-                                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-                                    </button>
+            <?php foreach ($items as $_product) : ?>
+                <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                    <div class="product-item-info">
+                        <a class="product-item-photo" href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
+                           title="<?= $block->escapeHtmlAttr($block->stripTags($_product->getName(), null, true)) ?>">
+                            <?= $block->getImage($_product, $image)->toHtml() ?>
+                        </a>
+                        <div class="product-item-details">
+                            <strong class="product-item-name">
+                                <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
+                                   title="<?= $block->escapeHtmlAttr($block->stripTags($_product->getName(), null, true)) ?>"
+                                   class="product-item-link">
+                                    <?= $block->escapeHtml($this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name')) ?>
+                                </a>
+                            </strong>
+                            <?= /* @noEscape */ $block->getProductPriceHtml(
+                                $_product,
+                                \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
+                                \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
+                                [
+                                    'price_id_suffix' => '-widget-viewed-' . $suffix
+                                ]
+                            ) ?>
+                            <div class="product-item-actions">
+                                <?php if ($_product->isSaleable()) : ?>
+                                <div class="actions-primary">
+                                    <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)) : ?>
+                                        <button class="action tocart primary"
+                                                data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeUrl($block->getAddToCartUrl($_product)) ?>"}}'
+                                                type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                        </button>
+                                    <?php else : ?>
+                                        <?php
+                                            $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
+                                            $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()]);
+                                        ?>
+                                        <button type="button" class="action tocart primary" data-post='<?= /* @noEscape */ $postData ?>'>
+                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                        </button>
+                                    <?php endif; ?>
+                                </div>
+                                <?php else : ?>
+                                    <?php if ($_product->getIsSalable()) : ?>
+                                        <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
+                                    <?php else : ?>
+                                        <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                    <?php endif; ?>
                                 <?php endif; ?>
                             </div>
-                            <?php else: ?>
-                                <?php if ($_product->getIsSalable()): ?>
-                                    <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
-                                <?php else: ?>
-                                    <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
-                                <?php endif; ?>
-                            <?php endif; ?>
                         </div>
                     </div>
-                </div>
-                <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
+                <?= /* @noEscape */ ($iterator == count($items)+1) ? '</li>' : '' ?>
             <?php endforeach; ?>
         </ol>
     </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml
index 8a1daebda3049..d5d41f059d0dd 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml
@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/**
+ * @deprecated
+ */
 
-?>
-<?php
 /**
  * @var $block \Magento\Reports\Block\Product\Viewed
  */
@@ -27,22 +27,22 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
     $description = false;
 }
 ?>
-<?php if ($exist): ?>
+<?php if ($exist) : ?>
     <div class="block widget block-viewed-products-images">
         <div class="block-title">
-            <strong><?= /* @escapeNotVerified */ $title ?></strong>
+            <strong><?= $block->escapeHtml($title) ?></strong>
         </div>
         <div class="block-content">
             <?php $suffix = $block->getNameInLayout(); ?>
-            <ol id="widget-viewed-<?= /* @escapeNotVerified */ $suffix ?>" class="product-items product-items-images">
+            <ol id="widget-viewed-<?= $block->escapeHtmlAttr($suffix) ?>" class="product-items product-items-images">
                 <?php $iterator = 1; ?>
-                <?php foreach ($items as $_product): ?>
-                    <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
-                        <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
+                <?php foreach ($items as $_product) : ?>
+                    <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                        <a class="product-item-photo" href="<?= $block->escapeUrl($_product->getProductUrl()) ?>" title="<?= $block->escapeHtmlAttr($block->stripTags($_product->getName(), null, true)) ?>">
                             <?= $block->getImage($_product, $image)->toHtml() ?>
                         </a>
-                    <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
-            <?php endforeach; ?>
+                    <?= /* @noEscape */ ($iterator == count($items)+1) ? '</li>' : '' ?>
+                <?php endforeach; ?>
             </ol>
         </div>
     </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_names_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_names_list.phtml
index 25cc6c3c921d7..076af9125065e 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_names_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_names_list.phtml
@@ -4,27 +4,31 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/**
+ * @deprecated
+ */
+
+/**
+ * @codingStandardsIgnoreFile
+ */
 
-?>
-<?php
 /**
  * @var $block \Magento\Reports\Block\Product\Viewed
  */
 ?>
-<?php if (($_products = $block->getRecentlyViewedProducts()) && $_products->getSize()): ?>
+<?php if (($_products = $block->getRecentlyViewedProducts()) && $_products->getSize()) : ?>
 <div class="block widget block-viewed-products-names">
     <div class="block-title">
-        <strong><?= /* @escapeNotVerified */ __('Recently Viewed') ?></strong>
+        <strong><?= $block->escapeHtml(__('Recently Viewed')) ?></strong>
     </div>
     <div class="block-content">
         <?php $suffix = $block->getNameInLayout(); ?>
-        <ol id="widget-viewed-<?= /* @escapeNotVerified */ $suffix ?>" class="product-items product-items-names">
-        <?php foreach ($_products as $_product): ?>
+        <ol id="widget-viewed-<?= $block->escapeHtmlAttr($suffix) ?>" class="product-items product-items-names">
+        <?php foreach ($_products as $_product) : ?>
             <li class="product-item">
                 <strong class="product-item-name">
-                    <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" class="product-item-link">
-                        <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                    <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>" class="product-item-link">
+                        <?= $block->escapeHtml($this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name')) ?>
                     </a>
                 </strong>
             </li>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
index de1145a26fe2b..a13af11f0807e 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
@@ -4,10 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/**
+ * @deprecated
+ */
+
+/**
+ * @codingStandardsIgnoreFile
+ */
 
-?>
-<?php
 /**
  * @var $block \Magento\Reports\Block\Product\Viewed
  */
@@ -30,96 +34,95 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
     $description = ($mode == 'list') ? true : false;
 }
 ?>
-<?php if ($exist):?>
-    <div class="block widget block-viewed-products-<?= /* @escapeNotVerified */ $mode ?>">
+<?php if ($exist) : ?>
+    <div class="block widget block-viewed-products-<?= $block->escapeHtmlAttr($mode) ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
+            <strong role="heading" aria-level="2"><?= $block->escapeHtml($title) ?></strong>
         </div>
         <div class="block-content">
-            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
-            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
-                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
-                    <?php $iterator = 1; ?>
-                    <?php foreach ($items as $_item): ?>
-                        <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
-                        <div class="product-item-info">
-                            <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                <?= $block->getImage($_item, $image)->toHtml() ?>
-                            </a>
-                            <div class="product-item-details">
-                                <strong class="product-item-name">
-                                    <a title="<?= $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-link">
-                                        <?= $block->escapeHtml($_item->getName()) ?>
-                                    </a>
-                                </strong>
-                                <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
-                                    $_item,
-                                    \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                                    \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-                                    [
-                                        'price_id_suffix' => '-' . $type
-                                    ]
-                                ) ?>
-                                <?php if ($rating): ?>
-                                    <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
-                                <?php endif; ?>
-                                <?php if ($showWishlist || $showCompare || $showCart): ?>
-                                    <div class="product-item-actions">
-                                        <?php if ($showCart): ?>
-                                            <div class="actions-primary">
-                                                <?php if ($_item->isSaleable()): ?>
-                                                    <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                        <button class="action tocart primary"
-                                                                data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
-                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-                                                        </button>
-                                                    <?php else: ?>
-                                                        <?php
-                                                            $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                                            $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-                                                        ?>
-                                                        <button class="action tocart primary"
-                                                                data-post='<?= /* @escapeNotVerified */ $postData ?>'
-                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
-                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-                                                        </button>
+            <?= '<!-- ' . $block->escapeHtml($image) . '-->' ?>
+            <div class="products-<?= $block->escapeHtmlAttr($mode) ?> <?= $block->escapeHtmlAttr($mode) ?>">
+                <ol class="product-items <?= $block->escapeHtmlAttr($type) ?>">
+                    <?php foreach ($items as $_item) : ?>
+                        <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                            <div class="product-item-info">
+                                <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
+                                    <?= $block->getImage($_item, $image)->toHtml() ?>
+                                </a>
+                                <div class="product-item-details">
+                                    <strong class="product-item-name">
+                                        <a title="<?= $block->escapeHtmlAttr($_item->getName()) ?>"
+                                           href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-link">
+                                            <?= $block->escapeHtml($_item->getName()) ?>
+                                        </a>
+                                    </strong>
+                                    <?= /* @noEscape */ $block->getProductPriceHtml(
+                                        $_item,
+                                        \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
+                                        \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
+                                        [
+                                            'price_id_suffix' => '-' . $type
+                                        ]
+                                    ) ?>
+                                    <?php if ($rating) : ?>
+                                        <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
+                                    <?php endif; ?>
+                                    <?php if ($showWishlist || $showCompare || $showCart) : ?>
+                                        <div class="product-item-actions">
+                                            <?php if ($showCart) : ?>
+                                                <div class="actions-primary">
+                                                    <?php if ($_item->isSaleable()) : ?>
+                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)) : ?>
+                                                            <button class="action tocart primary"
+                                                                    data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
+                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                            </button>
+                                                        <?php else : ?>
+                                                            <?php
+                                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
+                                                                $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
+                                                            ?>
+                                                            <button class="action tocart primary"
+                                                                    data-post='<?= /* @noEscape */ $postData ?>'
+                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                            </button>
+                                                        <?php endif; ?>
+                                                    <?php else : ?>
+                                                        <?php if ($_item->getIsSalable()) : ?>
+                                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
+                                                        <?php else : ?>
+                                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                                        <?php endif; ?>
+                                                    <?php endif; ?>
+                                                </div>
+                                            <?php endif; ?>
+                                            <?php if ($showWishlist || $showCompare) : ?>
+                                                <div class="actions-secondary" data-role="add-to-links">
+                                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist) : ?>
+                                                        <a href="#"
+                                                           class="action towishlist" data-action="add-to-wishlist"
+                                                           data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>'
+                                                           title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
+                                                        </a>
                                                     <?php endif; ?>
-                                                <?php else: ?>
-                                                    <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
-                                                    <?php else: ?>
-                                                        <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
+                                                    <?php if ($block->getAddToCompareUrl() && $showCompare) : ?>
+                                                        <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
+                                                        <a href="#" class="action tocompare"
+                                                           data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>'
+                                                           title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
+                                                        </a>
                                                     <?php endif; ?>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
-                                        <?php if ($showWishlist || $showCompare): ?>
-                                            <div class="actions-secondary" data-role="add-to-links">
-                                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                                    <a href="#"
-                                                       class="action towishlist" data-action="add-to-wishlist"
-                                                       data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
-                                                       title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
-                                                        <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
-                                                    <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-                                                    <a href="#" class="action tocompare"
-                                                       data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
-                                                       title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
-                                                        <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
-                                    </div>
-                                <?php endif; ?>
+                                                </div>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+                                </div>
                             </div>
-                        </div>
-                        <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
+                        <?= /* @noEscape */ ($iterator == count($items)+1) ? '</li>' : '' ?>
                     <?php endforeach ?>
                 </ol>
             </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
index 076c715dc4049..ce885f7658b46 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
@@ -4,10 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/**
+ * @deprecated
+ */
+
+/**
+ * @codingStandardsIgnoreFile
+ */
 
-?>
-<?php
 /**
  * @var $block \Magento\Reports\Block\Product\Viewed
  */
@@ -32,105 +36,105 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
 }
 ?>
 
-<?php if ($exist):?>
-    <div class="block widget block-viewed-products-<?= /* @escapeNotVerified */ $mode ?>">
+<?php if ($exist) : ?>
+    <div class="block widget block-viewed-products-<?= $block->escapeHtmlAttr($mode) ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
+            <strong role="heading" aria-level="2"><?= $block->escapeHtml($title) ?></strong>
         </div>
         <div class="block-content">
-            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
-            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
-                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
+            <?= '<!-- ' . $block->escapeHtml($image) . '-->' ?>
+            <div class="products-<?= $block->escapeHtmlAttr($mode) ?> <?= $block->escapeHtmlAttr($mode) ?>">
+                <ol class="product-items <?= $block->escapeHtmlAttr($type) ?>">
                     <?php $iterator = 1; ?>
-                    <?php foreach ($items as $_item): ?>
-                        <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
-                        <div class="product-item-info">
-                            <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                <?= $block->getImage($_item, $image)->toHtml() ?>
-                            </a>
-                            <div class="product-item-details">
-                                <strong class="product-item-name">
-                                    <a title="<?= $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-link">
-                                        <?= $block->escapeHtml($_item->getName()) ?>
-                                    </a>
-                                </strong>
-                                <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
-                                    $_item,
-                                    \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                                    \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-                                    [
-                                        'price_id_suffix' => '-' . $type
-                                    ]
-                                ) ?>
-                                <?php if ($rating): ?>
-                                    <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
-                                <?php endif; ?>
-                                <?php if ($showWishlist || $showCompare || $showCart): ?>
-                                    <div class="product-item-actions">
-                                        <?php if ($showCart): ?>
-                                            <div class="actions-primary">
-                                                <?php if ($_item->isSaleable()): ?>
-                                                    <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                        <button class="action tocart primary"
-                                                                data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
-                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-                                                        </button>
-                                                    <?php else: ?>
-                                                        <?php
-                                                            $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                                            $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()]);
-                                                        ?>
-                                                        <button class="action tocart primary"
-                                                                data-post='<?= /* @escapeNotVerified */ $postData ?>'
-                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
-                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
-                                                        </button>
+                    <?php foreach ($items as $_item) : ?>
+                        <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                            <div class="product-item-info">
+                                <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
+                                    <?= $block->getImage($_item, $image)->toHtml() ?>
+                                </a>
+                                <div class="product-item-details">
+                                    <strong class="product-item-name">
+                                        <a title="<?= $block->escapeHtmlAttr($_item->getName()) ?>"
+                                           href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-link">
+                                            <?= $block->escapeHtml($_item->getName()) ?>
+                                        </a>
+                                    </strong>
+                                    <?= /* @noEscape */ $block->getProductPriceHtml(
+                                        $_item,
+                                        \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
+                                        \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
+                                        [
+                                            'price_id_suffix' => '-' . $type
+                                        ]
+                                    ) ?>
+                                    <?php if ($rating) : ?>
+                                        <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
+                                    <?php endif; ?>
+                                    <?php if ($showWishlist || $showCompare || $showCart) : ?>
+                                        <div class="product-item-actions">
+                                            <?php if ($showCart) : ?>
+                                                <div class="actions-primary">
+                                                    <?php if ($_item->isSaleable()) : ?>
+                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)) : ?>
+                                                            <button class="action tocart primary"
+                                                                    data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
+                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                            </button>
+                                                        <?php else : ?>
+                                                            <?php
+                                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
+                                                                $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()]);
+                                                            ?>
+                                                            <button class="action tocart primary"
+                                                                    data-post='<?= /* @noEscape */ $postData ?>'
+                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                            </button>
+                                                            <?php endif; ?>
+                                                    <?php else : ?>
+                                                        <?php if ($_item->getIsSalable()) : ?>
+                                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
+                                                        <?php else : ?>
+                                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
                                                         <?php endif; ?>
-                                                <?php else: ?>
-                                                    <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
-                                                    <?php else: ?>
-                                                        <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                                     <?php endif; ?>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
+                                                </div>
+                                            <?php endif; ?>
 
-                                        <?php if ($showWishlist || $showCompare): ?>
-                                            <div class="actions-secondary" data-role="add-to-links">
-                                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                                    <a href="#"
-                                                       class="action towishlist" data-action="add-to-wishlist"
-                                                       data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
-                                                       title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
-                                                        <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
-                                                    <?php  $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-                                                    <a href="#" class="action tocompare"
-                                                       data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
-                                                       title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
-                                                        <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
-                                    </div>
-                                <?php endif; ?>
-                                <?php if ($description):?>
-                                    <div class="product-item-description">
-                                        <?= /* @escapeNotVerified */ $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
-                                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
-                                           href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
-                                           class="action more"><?= /* @escapeNotVerified */ __('Learn More') ?></a>
-                                    </div>
-                                <?php endif; ?>
+                                            <?php if ($showWishlist || $showCompare) : ?>
+                                                <div class="actions-secondary" data-role="add-to-links">
+                                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist) : ?>
+                                                        <a href="#"
+                                                           class="action towishlist" data-action="add-to-wishlist"
+                                                           data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>'
+                                                           title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
+                                                        </a>
+                                                    <?php endif; ?>
+                                                    <?php if ($block->getAddToCompareUrl() && $showCompare) : ?>
+                                                        <?php  $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
+                                                        <a href="#" class="action tocompare"
+                                                           data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>'
+                                                           title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
+                                                        </a>
+                                                    <?php endif; ?>
+                                                </div>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+                                    <?php if ($description) : ?>
+                                        <div class="product-item-description">
+                                            <?= $block->escapeHtml($_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description')) ?>
+                                            <a title="<?= $block->escapeHtmlAttr($_item->getName()) ?>"
+                                               href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
+                                               class="action more"><?= $block->escapeHtml(__('Learn More')) ?></a>
+                                        </div>
+                                    <?php endif; ?>
+                                </div>
                             </div>
-                        </div>
-                        <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
+                        <?= /* @noEscape */ ($iterator == count($items)+1) ? '</li>' : '' ?>
                     <?php endforeach ?>
                 </ol>
             </div>
diff --git a/app/code/Magento/RequireJs/composer.json b/app/code/Magento/RequireJs/composer.json
index 4c6afcd77b4fa..d04f8695e881a 100644
--- a/app/code/Magento/RequireJs/composer.json
+++ b/app/code/Magento/RequireJs/composer.json
@@ -2,11 +2,11 @@
     "name": "magento/module-require-js",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Edit.php
index d6868eae6fcbc..5efead952280e 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Edit.php
@@ -3,10 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Review\Block\Adminhtml;
 
 /**
- * Review edit form
+ * Review edit form.
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -56,6 +57,7 @@ public function __construct(
      *
      * @return void
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     protected function _construct()
     {
@@ -77,7 +79,13 @@ protected function _construct()
                 'previous',
                 [
                     'label' => __('Previous'),
-                    'onclick' => 'setLocation(\'' . $this->getUrl('review/*/*', ['id' => $prevId]) . '\')'
+                    'onclick' => 'setLocation(\'' . $this->getUrl(
+                        'review/*/*',
+                        [
+                            'id' => $prevId,
+                            'ret' => $this->getRequest()->getParam('ret'),
+                        ]
+                    ) . '\')'
                 ],
                 3,
                 10
@@ -93,7 +101,10 @@ protected function _construct()
                             'button' => [
                                 'event' => 'save',
                                 'target' => '#edit_form',
-                                'eventData' => ['action' => ['args' => ['next_item' => $prevId]]],
+                                'eventData' => ['action' => ['args' => [
+                                    'next_item' => $prevId,
+                                    'ret' => $this->getRequest()->getParam('ret'),
+                                ]]],
                             ],
                         ],
                     ]
@@ -113,7 +124,10 @@ protected function _construct()
                             'button' => [
                                 'event' => 'save',
                                 'target' => '#edit_form',
-                                'eventData' => ['action' => ['args' => ['next_item' => $nextId]]],
+                                'eventData' => ['action' => ['args' => [
+                                    'next_item' => $nextId,
+                                    'ret' => $this->getRequest()->getParam('ret'),
+                                ]]],
                             ],
                         ],
                     ]
@@ -126,7 +140,13 @@ protected function _construct()
                 'next',
                 [
                     'label' => __('Next'),
-                    'onclick' => 'setLocation(\'' . $this->getUrl('review/*/*', ['id' => $nextId]) . '\')'
+                    'onclick' => 'setLocation(\'' . $this->getUrl(
+                        'review/*/*',
+                        [
+                            'id' => $nextId,
+                            'ret' => $this->getRequest()->getParam('ret'),
+                        ]
+                    ) . '\')'
                 ],
                 3,
                 105
@@ -159,16 +179,16 @@ protected function _construct()
         }
 
         if ($this->getRequest()->getParam('ret', false) == 'pending') {
-            $this->buttonList->update('back', 'onclick', 'setLocation(\'' . $this->getUrl('catalog/*/pending') . '\')');
+            $this->buttonList->update('back', 'onclick', 'setLocation(\'' . $this->getUrl('review/*/pending') . '\')');
             $this->buttonList->update(
                 'delete',
                 'onclick',
                 'deleteConfirm(' . '\'' . __(
                     'Are you sure you want to do this?'
-                ) . '\' ' . '\'' . $this->getUrl(
+                ) . '\', ' . '\'' . $this->getUrl(
                     '*/*/delete',
                     [$this->_objectId => $this->getRequest()->getParam($this->_objectId), 'ret' => 'pending']
-                ) . '\'' . ')'
+                ) . '\'' . ', {data: {}})'
             );
             $this->_coreRegistry->register('ret', 'pending');
         }
diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php b/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
index 8a8395de72b62..c2cbce09a6930 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+
 /**
  * Adminhtml Review Edit Form
  */
@@ -69,12 +70,24 @@ public function __construct(
      *
      * @return $this
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     protected function _prepareForm()
     {
         $review = $this->_coreRegistry->registry('review_data');
         $product = $this->_productFactory->create()->load($review->getEntityPkValue());
 
+        $formActionParams =[
+            'id' => $this->getRequest()->getParam('id'),
+            'ret' => $this->_coreRegistry->registry('ret')
+        ];
+        if ($this->getRequest()->getParam('productId')) {
+            $formActionParams['productId'] = $this->getRequest()->getParam('productId');
+        }
+        if ($this->getRequest()->getParam('customerId')) {
+            $formActionParams['customerId'] = $this->getRequest()->getParam('customerId');
+        }
+
         /** @var \Magento\Framework\Data\Form $form */
         $form = $this->_formFactory->create(
             [
@@ -82,10 +95,7 @@ protected function _prepareForm()
                     'id' => 'edit_form',
                     'action' => $this->getUrl(
                         'review/*/save',
-                        [
-                            'id' => $this->getRequest()->getParam('id'),
-                            'ret' => $this->_coreRegistry->registry('ret')
-                        ]
+                        $formActionParams
                     ),
                     'method' => 'post',
                 ],
diff --git a/app/code/Magento/Review/Block/Product/ReviewRenderer.php b/app/code/Magento/Review/Block/Product/ReviewRenderer.php
index 3cd15aba30420..3183196ebf30c 100644
--- a/app/code/Magento/Review/Block/Product/ReviewRenderer.php
+++ b/app/code/Magento/Review/Block/Product/ReviewRenderer.php
@@ -9,7 +9,11 @@
 
 use Magento\Catalog\Block\Product\ReviewRendererInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Review\Observer\PredispatchReviewObserver;
 
+/**
+ * Class ReviewRenderer
+ */
 class ReviewRenderer extends \Magento\Framework\View\Element\Template implements ReviewRendererInterface
 {
     /**
@@ -43,6 +47,19 @@ public function __construct(
         parent::__construct($context, $data);
     }
 
+    /**
+     * Review module availability
+     *
+     * @return string
+     */
+    public function isReviewEnabled() : string
+    {
+        return $this->_scopeConfig->getValue(
+            PredispatchReviewObserver::XML_PATH_REVIEW_ACTIVE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+
     /**
      * Get review summary html
      *
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product.php b/app/code/Magento/Review/Controller/Adminhtml/Product.php
index 8c4503d8f023e..e694fe0edec6c 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product.php
@@ -12,10 +12,15 @@
 use Magento\Review\Model\RatingFactory;
 
 /**
- * Reviews admin controller
+ * Reviews admin controller.
  */
 abstract class Product extends Action
 {
+    /**
+     * Authorization resource
+     */
+    const ADMIN_RESOURCE = 'Magento_Review::reviews_all';
+
     /**
      * Array of actions which can be processed without secret key validation
      *
@@ -61,19 +66,4 @@ public function __construct(
         $this->ratingFactory = $ratingFactory;
         parent::__construct($context);
     }
-
-    /**
-     * @return bool
-     */
-    protected function _isAllowed()
-    {
-        switch ($this->getRequest()->getActionName()) {
-            case 'pending':
-                return $this->_authorization->isAllowed('Magento_Review::pending');
-                break;
-            default:
-                return $this->_authorization->isAllowed('Magento_Review::reviews_all');
-                break;
-        }
-    }
 }
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php
index 75015d65e1a18..1289299b51eb5 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php
@@ -7,10 +7,21 @@
 
 use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Model\Review;
 
+/**
+ * Delete action.
+ */
 class Delete extends ProductController
 {
     /**
+     * @var Review
+     */
+    private $model;
+
+    /**
+     * Execute action.
+     *
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
@@ -18,22 +29,67 @@ public function execute()
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $reviewId = $this->getRequest()->getParam('id', false);
-        try {
-            $this->reviewFactory->create()->setId($reviewId)->aggregate()->delete();
-
-            $this->messageManager->addSuccess(__('The review has been deleted.'));
-            if ($this->getRequest()->getParam('ret') == 'pending') {
-                $resultRedirect->setPath('review/*/pending');
-            } else {
-                $resultRedirect->setPath('review/*/');
+        if ($this->getRequest()->isPost()) {
+            try {
+                $this->getModel()->aggregate()->delete();
+
+                $this->messageManager->addSuccess(__('The review has been deleted.'));
+                if ($this->getRequest()->getParam('ret') == 'pending') {
+                    $resultRedirect->setPath('review/*/pending');
+                } else {
+                    $resultRedirect->setPath('review/*/');
+                }
+
+                return $resultRedirect;
+            } catch (\Magento\Framework\Exception\LocalizedException $e) {
+                $this->messageManager->addError($e->getMessage());
+            } catch (\Exception $e) {
+                $this->messageManager->addException($e, __('Something went wrong  deleting this review.'));
             }
-            return $resultRedirect;
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
-        } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Something went wrong  deleting this review.'));
         }
 
         return $resultRedirect->setPath('review/*/edit/', ['id' => $reviewId]);
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _isAllowed()
+    {
+        if (parent::_isAllowed()) {
+            return true;
+        }
+
+        if (!$this->_authorization->isAllowed('Magento_Review::pending')) {
+            return  false;
+        }
+
+        if ($this->getModel()->getStatusId() != Review::STATUS_PENDING) {
+            $this->messageManager->addErrorMessage(
+                __(
+                    'You don’t have permission to perform this operation.'
+                    . ' The selected review must be in Pending Status.'
+                )
+            );
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns requested model.
+     *
+     * @return Review
+     */
+    private function getModel(): Review
+    {
+        if ($this->model === null) {
+            $this->model = $this->reviewFactory->create()
+                ->load($this->getRequest()->getParam('id', false));
+        }
+
+        return $this->model;
+    }
 }
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php
index a39b22ec080c6..86964fe38e952 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php
@@ -7,10 +7,21 @@
 
 use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Model\Review;
 
+/**
+ * Edit action.
+ */
 class Edit extends ProductController
 {
     /**
+     * @var Review
+     */
+    private $review;
+
+    /**
+     * Execute action.
+     *
      * @return \Magento\Backend\Model\View\Result\Page
      */
     public function execute()
@@ -23,4 +34,46 @@ public function execute()
         $resultPage->addContent($resultPage->getLayout()->createBlock(\Magento\Review\Block\Adminhtml\Edit::class));
         return $resultPage;
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _isAllowed()
+    {
+        if (parent::_isAllowed()) {
+            return true;
+        }
+
+        if (!$this->_authorization->isAllowed('Magento_Review::pending')) {
+            return  false;
+        }
+
+        if ($this->getModel()->getStatusId() != Review::STATUS_PENDING) {
+            $this->messageManager->addErrorMessage(
+                __(
+                    'You don’t have permission to perform this operation.'
+                    . ' The selected review must be in Pending Status.'
+                )
+            );
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns requested model.
+     *
+     * @return Review
+     */
+    private function getModel(): Review
+    {
+        if ($this->review === null) {
+            $this->review = $this->reviewFactory->create()
+                ->load($this->getRequest()->getParam('id', false));
+        }
+
+        return $this->review;
+    }
 }
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php
index c792540000233..c9d0f5f0259b1 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php
@@ -5,24 +5,68 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
 use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Model\RatingFactory;
+use Magento\Review\Model\Review;
+use Magento\Review\Model\ResourceModel\Review\Collection;
+use Magento\Review\Model\ResourceModel\Review\CollectionFactory;
+use Magento\Review\Model\ReviewFactory;
 
+/**
+ * Mass Delete action.
+ */
 class MassDelete extends ProductController
 {
     /**
+     * @var Collection
+     */
+    private $collection;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param ReviewFactory $reviewFactory
+     * @param RatingFactory $ratingFactory
+     * @param CollectionFactory $collectionFactory
+     */
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry,
+        ReviewFactory $reviewFactory,
+        RatingFactory $ratingFactory,
+        CollectionFactory $collectionFactory
+    ) {
+        parent::__construct($context, $coreRegistry, $reviewFactory, $ratingFactory);
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * Execute action.
+     *
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         $reviewsIds = $this->getRequest()->getParam('reviews');
         if (!is_array($reviewsIds)) {
             $this->messageManager->addError(__('Please select review(s).'));
         } else {
             try {
-                foreach ($reviewsIds as $reviewId) {
-                    $model = $this->reviewFactory->create()->load($reviewId);
+                foreach ($this->getCollection() as $model) {
                     $model->delete();
                 }
                 $this->messageManager->addSuccess(
@@ -39,4 +83,54 @@ public function execute()
         $resultRedirect->setPath('review/*/' . $this->getRequest()->getParam('ret', 'index'));
         return $resultRedirect;
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _isAllowed()
+    {
+        if (parent::_isAllowed()) {
+            return true;
+        }
+
+        if (!$this->_authorization->isAllowed('Magento_Review::pending')) {
+            return false;
+        }
+
+        foreach ($this->getCollection() as $model) {
+            if ($model->getStatusId() != Review::STATUS_PENDING) {
+                $this->messageManager->addErrorMessage(
+                    __(
+                        'You don’t have permission to perform this operation.'
+                        . ' Selected reviews must be in Pending Status only.'
+                    )
+                );
+
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns requested collection.
+     *
+     * @return Collection
+     */
+    private function getCollection(): Collection
+    {
+        if ($this->collection === null) {
+            $collection = $this->collectionFactory->create();
+            $collection->addFieldToFilter(
+                'main_table.' . $collection->getResource()
+                    ->getIdFieldName(),
+                $this->getRequest()->getParam('reviews')
+            );
+
+            $this->collection = $collection;
+        }
+
+        return $this->collection;
+    }
 }
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php
index 2769a35ba9a48..edcef8c8d6653 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php
@@ -5,25 +5,69 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
 use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Model\RatingFactory;
+use Magento\Review\Model\Review;
+use Magento\Review\Model\ResourceModel\Review\Collection;
+use Magento\Review\Model\ResourceModel\Review\CollectionFactory;
+use Magento\Review\Model\ReviewFactory;
 
+/**
+ * Mass Update Status action.
+ */
 class MassUpdateStatus extends ProductController
 {
     /**
+     * @var Collection
+     */
+    private $collection;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param ReviewFactory $reviewFactory
+     * @param RatingFactory $ratingFactory
+     * @param CollectionFactory $collectionFactory
+     */
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry,
+        ReviewFactory $reviewFactory,
+        RatingFactory $ratingFactory,
+        CollectionFactory $collectionFactory
+    ) {
+        parent::__construct($context, $coreRegistry, $reviewFactory, $ratingFactory);
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * Execute action.
+     *
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         $reviewsIds = $this->getRequest()->getParam('reviews');
         if (!is_array($reviewsIds)) {
             $this->messageManager->addError(__('Please select review(s).'));
         } else {
             try {
                 $status = $this->getRequest()->getParam('status');
-                foreach ($reviewsIds as $reviewId) {
-                    $model = $this->reviewFactory->create()->load($reviewId);
+                foreach ($this->getCollection() as $model) {
                     $model->setStatusId($status)->save()->aggregate();
                 }
                 $this->messageManager->addSuccess(
@@ -43,4 +87,54 @@ public function execute()
         $resultRedirect->setPath('review/*/' . $this->getRequest()->getParam('ret', 'index'));
         return $resultRedirect;
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _isAllowed()
+    {
+        if (parent::_isAllowed()) {
+            return true;
+        }
+
+        if (!$this->_authorization->isAllowed('Magento_Review::pending')) {
+            return false;
+        }
+
+        foreach ($this->getCollection() as $model) {
+            if ($model->getStatusId() != Review::STATUS_PENDING) {
+                $this->messageManager->addErrorMessage(
+                    __(
+                        'You don’t have permission to perform this operation. '
+                        . 'Selected reviews must be in Pending Status only.'
+                    )
+                );
+
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns requested collection.
+     *
+     * @return Collection
+     */
+    private function getCollection(): Collection
+    {
+        if ($this->collection === null) {
+            $collection = $this->collectionFactory->create();
+            $collection->addFieldToFilter(
+                'main_table.' . $collection->getResource()
+                    ->getIdFieldName(),
+                $this->getRequest()->getParam('reviews')
+            );
+
+            $this->collection = $collection;
+        }
+
+        return $this->collection;
+    }
 }
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php
index eca37d3fe24da..759ec36b9e834 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php
@@ -13,9 +13,14 @@ class MassVisibleIn extends ProductController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         $reviewsIds = $this->getRequest()->getParam('reviews');
         if (!is_array($reviewsIds)) {
             $this->messageManager->addError(__('Please select review(s).'));
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php
index 75eaaaeeef24e..9c54f22814c15 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php
@@ -8,9 +8,14 @@
 use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
 
+/**
+ * Pending reviews grid.
+ */
 class Pending extends ProductController
 {
     /**
+     * Execute action.
+     *
      * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
@@ -30,4 +35,13 @@ public function execute()
         $resultPage->addContent($resultPage->getLayout()->createBlock(\Magento\Review\Block\Adminhtml\Main::class));
         return $resultPage;
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _isAllowed()
+    {
+        return $this->_authorization->isAllowed('Magento_Review::reviews_all')
+            || $this->_authorization->isAllowed('Magento_Review::pending');
+    }
 }
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php b/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php
index 017fbc95a8b9a..8c2324f35b09c 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php
@@ -13,6 +13,9 @@
 use Magento\Framework\View\LayoutFactory;
 use Magento\Framework\Controller\ResultFactory;
 
+/**
+ * Review grid.
+ */
 class ReviewGrid extends ProductController
 {
     /**
@@ -39,6 +42,8 @@ public function __construct(
     }
 
     /**
+     * Execute action.
+     *
      * @return \Magento\Framework\Controller\Result\Raw
      */
     public function execute()
@@ -49,4 +54,13 @@ public function execute()
         $resultRaw->setContents($layout->createBlock(\Magento\Review\Block\Adminhtml\Grid::class)->toHtml());
         return $resultRaw;
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _isAllowed()
+    {
+        return $this->_authorization->isAllowed('Magento_Review::reviews_all')
+            || $this->_authorization->isAllowed('Magento_Review::pending');
+    }
 }
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
index 7159b1825dc4d..44a6aba172b15 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
@@ -8,10 +8,21 @@
 use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Review\Model\Review;
 
+/**
+ * Save Review action.
+ */
 class Save extends ProductController
 {
     /**
+     * @var Review
+     */
+    private $review;
+
+    /**
+     * Save Review action.
+     *
      * @return \Magento\Backend\Model\View\Result\Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
@@ -20,7 +31,7 @@ public function execute()
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         if (($data = $this->getRequest()->getPostValue()) && ($reviewId = $this->getRequest()->getParam('id'))) {
-            $review = $this->reviewFactory->create()->load($reviewId);
+            $review = $this->getModel();
             if (!$review->getId()) {
                 $this->messageManager->addError(__('The review was removed by another user or does not exist.'));
             } else {
@@ -61,15 +72,72 @@ public function execute()
 
             $nextId = (int)$this->getRequest()->getParam('next_item');
             if ($nextId) {
-                $resultRedirect->setPath('review/*/edit', ['id' => $nextId]);
+                $resultRedirect->setPath(
+                    'review/*/edit',
+                    [
+                        'id' => $nextId,
+                        'ret' => $this->getRequest()
+                            ->getParam('ret'),
+                    ]
+                );
             } elseif ($this->getRequest()->getParam('ret') == 'pending') {
-                $resultRedirect->setPath('*/*/pending');
+                $resultRedirect->setPath('review/*/pending');
             } else {
                 $resultRedirect->setPath('*/*/');
             }
+            $productId = $this->getRequest()->getParam('productId');
+            if ($productId) {
+                $resultRedirect->setPath("catalog/product/edit/id/$productId");
+            }
+            $customerId = (int)$this->getRequest()->getParam('customerId');
+            if ($customerId) {
+                $resultRedirect->setPath("customer/index/edit/id/$customerId");
+            }
             return $resultRedirect;
         }
         $resultRedirect->setPath('review/*/');
         return $resultRedirect;
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _isAllowed()
+    {
+        if (parent::_isAllowed()) {
+            return true;
+        }
+
+        if (!$this->_authorization->isAllowed('Magento_Review::pending')) {
+            return  false;
+        }
+
+        if ($this->getModel()->getStatusId() != Review::STATUS_PENDING) {
+            $this->messageManager->addErrorMessage(
+                __(
+                    'You don’t have permission to perform this operation.'
+                    . ' The selected review must be in Pending Status.'
+                )
+            );
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns requested model.
+     *
+     * @return Review
+     */
+    private function getModel(): Review
+    {
+        if (!$this->review) {
+            $this->review = $this->reviewFactory->create()
+                ->load($this->getRequest()->getParam('id', false));
+        }
+
+        return $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 5535c3de26e43..c5610d135222a 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Rating;
 
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 use Magento\Framework\Controller\ResultFactory;
 
@@ -12,19 +13,25 @@ class Delete extends RatingController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-        if ($this->getRequest()->getParam('id') > 0) {
+        $ratingId = (int)$this->getRequest()->getParam('id');
+        if ($ratingId) {
             try {
                 /** @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.'));
+                $model->load($ratingId)->delete();
+                $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/Product/Post.php b/app/code/Magento/Review/Controller/Product/Post.php
index be18f8fe25bbe..67c38f25d7ce3 100644
--- a/app/code/Magento/Review/Controller/Product/Post.php
+++ b/app/code/Magento/Review/Controller/Product/Post.php
@@ -22,7 +22,7 @@ public function execute()
     {
         /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-        if (!$this->formKeyValidator->validate($this->getRequest())) {
+        if (!$this->getRequest()->isPost() || !$this->formKeyValidator->validate($this->getRequest())) {
             $resultRedirect->setUrl($this->_redirect->getRefererUrl());
             return $resultRedirect;
         }
diff --git a/app/code/Magento/Review/Model/ResourceModel/Rating.php b/app/code/Magento/Review/Model/ResourceModel/Rating.php
index 3f54c17f6ff7c..5567c21ba12ee 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Rating.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Rating.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Review\Model\ResourceModel;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Rating resource model
  *
@@ -12,6 +15,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -34,13 +38,19 @@ class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      */
     protected $_logger;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Review\Model\ResourceModel\Review\Summary $reviewSummary
+     * @param Review\Summary $reviewSummary
      * @param string $connectionName
+     * @param ScopeConfigInterface|null $scopeConfig
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -48,12 +58,14 @@ public function __construct(
         \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Review\Model\ResourceModel\Review\Summary $reviewSummary,
-        $connectionName = null
+        $connectionName = null,
+        ScopeConfigInterface $scopeConfig = null
     ) {
         $this->moduleManager = $moduleManager;
         $this->_storeManager = $storeManager;
         $this->_logger = $logger;
         $this->_reviewSummary = $reviewSummary;
+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
         parent::__construct($context, $connectionName);
     }
 
@@ -178,6 +190,8 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     }
 
     /**
+     * Process rating codes.
+     *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      */
@@ -201,6 +215,8 @@ protected function processRatingCodes(\Magento\Framework\Model\AbstractModel $ob
     }
 
     /**
+     * Process rating stores.
+     *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      */
@@ -224,6 +240,8 @@ protected function processRatingStores(\Magento\Framework\Model\AbstractModel $o
     }
 
     /**
+     * Delete rating data.
+     *
      * @param int $ratingId
      * @param string $table
      * @param array $storeIds
@@ -247,6 +265,8 @@ protected function deleteRatingData($ratingId, $table, array $storeIds)
     }
 
     /**
+     * Insert rating data.
+     *
      * @param string $table
      * @param array $data
      * @return void
@@ -269,6 +289,7 @@ protected function insertRatingData($table, array $data)
 
     /**
      * Perform actions after object delete
+     *
      * Prepare rating data for reaggregate all data for reviews
      *
      * @param \Magento\Framework\Model\AbstractModel $object
@@ -277,7 +298,12 @@ protected function insertRatingData($table, array $data)
     protected function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
     {
         parent::_afterDelete($object);
-        if (!$this->moduleManager->isEnabled('Magento_Review')) {
+        if (!$this->moduleManager->isEnabled('Magento_Review') &&
+            !$this->scopeConfig->getValue(
+                \Magento\Review\Observer\PredispatchReviewObserver::XML_PATH_REVIEW_ACTIVE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            )
+        ) {
             return $this;
         }
         $data = $this->_getEntitySummaryData($object);
@@ -425,9 +451,11 @@ public function getReviewSummary($object, $onlyForCurrentStore = true)
 
         $data = $connection->fetchAll($select, [':review_id' => $object->getReviewId()]);
 
+        $currentStore = $this->_storeManager->isSingleStoreMode() ? $this->_storeManager->getStore()->getId() : null;
+
         if ($onlyForCurrentStore) {
             foreach ($data as $row) {
-                if ($row['store_id'] == $this->_storeManager->getStore()->getId()) {
+                if ($row['store_id'] !== $currentStore) {
                     $object->addData($row);
                 }
             }
diff --git a/app/code/Magento/Review/Observer/PredispatchReviewObserver.php b/app/code/Magento/Review/Observer/PredispatchReviewObserver.php
new file mode 100644
index 0000000000000..bdca0f5ecb1ec
--- /dev/null
+++ b/app/code/Magento/Review/Observer/PredispatchReviewObserver.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento\Review\Observer;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Review\Block\Product\ReviewRenderer;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Class PredispatchReviewObserver
+ */
+class PredispatchReviewObserver implements ObserverInterface
+{
+    /**
+     * Configuration path to review active setting
+     */
+    const XML_PATH_REVIEW_ACTIVE = 'catalog/review/active';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var UrlInterface
+     */
+    private $url;
+
+    /**
+     * PredispatchReviewObserver constructor.
+     *
+     * @param ScopeConfigInterface $scopeConfig
+     * @param UrlInterface $url
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        UrlInterface $url
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->url = $url;
+    }
+    /**
+     * Redirect review routes to 404 when review module is disabled.
+     *
+     * @param Observer $observer
+     */
+    public function execute(Observer $observer)
+    {
+        if (!$this->scopeConfig->getValue(
+            self::XML_PATH_REVIEW_ACTIVE,
+            ScopeInterface::SCOPE_STORE
+        )
+        ) {
+            $defaultNoRouteUrl = $this->scopeConfig->getValue(
+                'web/default/no_route',
+                ScopeInterface::SCOPE_STORE
+            );
+            $redirectUrl = $this->url->getUrl($defaultNoRouteUrl);
+            $observer->getControllerAction()
+                ->getResponse()
+                ->setRedirect($redirectUrl);
+        }
+    }
+}
diff --git a/app/code/Magento/Review/Test/Unit/Controller/Product/PostTest.php b/app/code/Magento/Review/Test/Unit/Controller/Product/PostTest.php
index 1526e80f8190a..73e85a7cdc179 100644
--- a/app/code/Magento/Review/Test/Unit/Controller/Product/PostTest.php
+++ b/app/code/Magento/Review/Test/Unit/Controller/Product/PostTest.php
@@ -105,7 +105,8 @@ class PostTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->redirect = $this->createMock(\Magento\Framework\App\Response\RedirectInterface::class);
-        $this->request = $this->createPartialMock(\Magento\Framework\App\Request\Http::class, ['getParam']);
+        $this->request = $this->createPartialMock(\Magento\Framework\App\Request\Http::class, ['getParam', 'isPost']);
+        $this->request->expects($this->any())->method('isPost')->willReturn(true);
         $this->response = $this->createPartialMock(\Magento\Framework\App\Response\Http::class, ['setRedirect']);
         $this->formKeyValidator = $this->createPartialMock(
             \Magento\Framework\Data\Form\FormKey\Validator::class,
@@ -215,12 +216,12 @@ public function testExecute()
         $this->reviewSession->expects($this->any())->method('getFormData')
             ->with(true)
             ->willReturn($reviewData);
-        $this->request->expects($this->at(0))->method('getParam')
-            ->with('category', false)
-            ->willReturn(false);
-        $this->request->expects($this->at(1))->method('getParam')
-            ->with('id')
-            ->willReturn(1);
+        $this->request->expects($this->any())->method('getParam')->willReturnMap(
+            [
+                ['category', false, false],
+                ['id', null, 1],
+            ]
+        );
         $product = $this->createPartialMock(
             \Magento\Catalog\Model\Product::class,
             ['__wakeup', 'isVisibleInCatalog', 'isVisibleInSiteVisibility', 'getId', 'getWebsiteIds']
diff --git a/app/code/Magento/Review/Test/Unit/Observer/PredispatchReviewObserverTest.php b/app/code/Magento/Review/Test/Unit/Observer/PredispatchReviewObserverTest.php
new file mode 100644
index 0000000000000..2a8f8d8e38a64
--- /dev/null
+++ b/app/code/Magento/Review/Test/Unit/Observer/PredispatchReviewObserverTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento\Review\Test\Unit\Observer;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\UrlInterface;
+use Magento\Review\Observer\PredispatchReviewObserver;
+use Magento\Store\Model\ScopeInterface;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test class for \Magento\Review\Observer\PredispatchReviewObserver
+ */
+class PredispatchReviewObserverTest extends TestCase
+{
+    /**
+     * @var Observer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $mockObject;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var UrlInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $urlMock;
+
+    /**
+     * @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $redirectMock;
+
+    /**
+     * @var ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $responseMock;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->configMock = $this->getMockBuilder(ScopeConfigInterface::class)
+                                 ->disableOriginalConstructor()
+                                 ->getMock();
+        $this->urlMock = $this->getMockBuilder(UrlInterface::class)
+                              ->disableOriginalConstructor()
+                              ->getMock();
+        $this->responseMock = $this->getMockBuilder(ResponseInterface::class)
+                                   ->disableOriginalConstructor()
+                                   ->setMethods(['setRedirect'])
+                                   ->getMockForAbstractClass();
+        $this->redirectMock = $this->getMockBuilder(RedirectInterface::class)
+                                   ->getMock();
+        $this->objectManager = new ObjectManager($this);
+        $this->mockObject = $this->objectManager->getObject(
+            PredispatchReviewObserver::class,
+            [
+                'scopeConfig' => $this->configMock,
+                'url' => $this->urlMock
+            ]
+        );
+    }
+
+    /**
+     * Test with enabled review active config.
+     */
+    public function testReviewEnabled()
+    {
+        $observerMock = $this->getMockBuilder(Observer::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getResponse', 'getData', 'setRedirect'])
+            ->getMockForAbstractClass();
+
+        $this->configMock->method('getValue')
+            ->with(PredispatchReviewObserver::XML_PATH_REVIEW_ACTIVE, ScopeInterface::SCOPE_STORE)
+            ->willReturn(true);
+        $observerMock->expects($this->never())
+            ->method('getData')
+            ->with('controller_action')
+            ->willReturnSelf();
+
+        $observerMock->expects($this->never())
+            ->method('getResponse')
+            ->willReturnSelf();
+
+        $this->assertNull($this->mockObject->execute($observerMock));
+    }
+
+    /**
+     * Test with disabled review active config.
+     */
+    public function testReviewDisabled()
+    {
+        $observerMock = $this->getMockBuilder(Observer::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getControllerAction', 'getResponse'])
+            ->getMockForAbstractClass();
+
+        $this->configMock->expects($this->at(0))
+            ->method('getValue')
+            ->with(PredispatchReviewObserver::XML_PATH_REVIEW_ACTIVE, ScopeInterface::SCOPE_STORE)
+            ->willReturn(false);
+
+        $expectedRedirectUrl = 'https://test.com/index';
+
+        $this->configMock->expects($this->at(1))
+            ->method('getValue')
+            ->with('web/default/no_route', ScopeInterface::SCOPE_STORE)
+            ->willReturn($expectedRedirectUrl);
+
+        $this->urlMock->expects($this->once())
+            ->method('getUrl')
+            ->willReturn($expectedRedirectUrl);
+
+        $observerMock->expects($this->once())
+            ->method('getControllerAction')
+            ->willReturnSelf();
+
+        $observerMock->expects($this->once())
+            ->method('getResponse')
+            ->willReturn($this->responseMock);
+
+        $this->responseMock->expects($this->once())
+            ->method('setRedirect')
+            ->with($expectedRedirectUrl);
+
+        $this->assertNull($this->mockObject->execute($observerMock));
+    }
+}
diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json
index c6c8c920ed138..40aed162e5d8d 100644
--- a/app/code/Magento/Review/composer.json
+++ b/app/code/Magento/Review/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-review",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-catalog": "102.0.*",
         "magento/module-customer": "101.0.*",
@@ -18,7 +18,7 @@
         "magento/module-review-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.6",
+    "version": "100.2.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Review/etc/acl.xml b/app/code/Magento/Review/etc/acl.xml
index 397cc1cce61d6..09b80750da14d 100644
--- a/app/code/Magento/Review/etc/acl.xml
+++ b/app/code/Magento/Review/etc/acl.xml
@@ -17,7 +17,7 @@
                 <resource id="Magento_Backend::marketing">
                     <resource id="Magento_Backend::marketing_user_content">
                         <resource id="Magento_Review::reviews_all" title="Reviews" translate="title" sortOrder="10"/>
-                        <resource id="Magento_Review::pending" title="Reviews" translate="title" sortOrder="20"/>
+                        <resource id="Magento_Review::pending" title="Pending Reviews" translate="title" sortOrder="20"/>
                     </resource>
                 </resource>
             </resource>
diff --git a/app/code/Magento/Review/etc/adminhtml/menu.xml b/app/code/Magento/Review/etc/adminhtml/menu.xml
index e3532483f88af..8b56f36bce68e 100644
--- a/app/code/Magento/Review/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Review/etc/adminhtml/menu.xml
@@ -9,6 +9,7 @@
     <menu>
         <add id="Magento_Review::catalog_reviews_ratings_ratings" title="Rating" translate="title" module="Magento_Review" sortOrder="60" parent="Magento_Backend::stores_attributes" action="review/rating/" resource="Magento_Review::ratings"/>
         <add id="Magento_Review::catalog_reviews_ratings_reviews_all" title="Reviews" translate="title" module="Magento_Review" parent="Magento_Backend::marketing_user_content" sortOrder="10" action="review/product/index" resource="Magento_Review::reviews_all"/>
+        <add id="Magento_Review::catalog_reviews_ratings_pending" title="Pending Reviews" translate="title" module="Magento_Review" parent="Magento_Backend::marketing_user_content" sortOrder="15" action="review/product/pending" resource="Magento_Review::pending"/>
         <add id="Magento_Review::report_review" title="Reviews" translate="title" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report" resource="Magento_Reports::review"/>
         <add id="Magento_Review::report_review_customer" title="By Customers" translate="title" sortOrder="10" module="Magento_Review" parent="Magento_Review::report_review" action="reports/report_review/customer" resource="Magento_Reports::review_customer"/>
         <add id="Magento_Review::report_review_product" title="By Products" translate="title" sortOrder="20" module="Magento_Review" parent="Magento_Review::report_review" action="reports/report_review/product" resource="Magento_Reports::review_product"/>
diff --git a/app/code/Magento/Review/etc/adminhtml/system.xml b/app/code/Magento/Review/etc/adminhtml/system.xml
index c0574e9491782..a24ed29dc2c23 100644
--- a/app/code/Magento/Review/etc/adminhtml/system.xml
+++ b/app/code/Magento/Review/etc/adminhtml/system.xml
@@ -10,7 +10,11 @@
         <section id="catalog">
             <group id="review" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>Product Reviews</label>
-                <field id="allow_guest" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Enabled</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+                <field id="allow_guest" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Allow Guests to Write Reviews</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
diff --git a/app/code/Magento/Review/etc/config.xml b/app/code/Magento/Review/etc/config.xml
index 78dc87960f090..9fd9443be67ef 100644
--- a/app/code/Magento/Review/etc/config.xml
+++ b/app/code/Magento/Review/etc/config.xml
@@ -9,6 +9,7 @@
     <default>
         <catalog>
             <review>
+                <active>1</active>
                 <allow_guest>1</allow_guest>
             </review>
         </catalog>
diff --git a/app/code/Magento/Review/etc/frontend/events.xml b/app/code/Magento/Review/etc/frontend/events.xml
index bc94277d69709..8e883ce328a2c 100644
--- a/app/code/Magento/Review/etc/frontend/events.xml
+++ b/app/code/Magento/Review/etc/frontend/events.xml
@@ -12,4 +12,7 @@
     <event name="catalog_block_product_list_collection">
         <observer name="review" instance="Magento\Review\Observer\CatalogBlockProductCollectionBeforeToHtmlObserver" shared="false" />
     </event>
+    <event name="controller_action_predispatch_review">
+        <observer name="catalog_review_enabled" instance="Magento\Review\Observer\PredispatchReviewObserver" />
+    </event>
 </config>
diff --git a/app/code/Magento/Review/i18n/en_US.csv b/app/code/Magento/Review/i18n/en_US.csv
index b3ea21dfcae90..07b7e8c13bd1f 100644
--- a/app/code/Magento/Review/i18n/en_US.csv
+++ b/app/code/Magento/Review/i18n/en_US.csv
@@ -135,3 +135,5 @@ Inactive,Inactive
 "Please select one of each of the ratings above.","Please select one of each of the ratings above."
 star,star
 stars,stars
+"You don’t have permission to perform this operation. Selected reviews must be in Pending Status only.","You don’t have permission to perform this operation. Selected reviews must be in Pending Status only."
+"You don’t have permission to perform this operation. The selected review must be in Pending Status.","You don’t have permission to perform this operation. The selected review must be in Pending Status."
diff --git a/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml
index d7c5c19d4d813..6fcf5b0c82b4f 100644
--- a/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml
+++ b/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml
@@ -9,7 +9,7 @@
     <update handle="review_product_form_component"/>
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Cookie\Block\RequireCookie" name="require-cookie" template="Magento_Cookie::require_cookie.phtml">
+            <block class="Magento\Cookie\Block\RequireCookie" name="require-cookie" template="Magento_Cookie::require_cookie.phtml" ifconfig="catalog/review/active">
                 <arguments>
                     <argument name="triggers" xsi:type="array">
                         <item name="submitReviewButton" xsi:type="string">.review .action.submit</item>
@@ -18,8 +18,8 @@
             </block>
         </referenceContainer>
         <referenceBlock name="product.info.details">
-            <block class="Magento\Review\Block\Product\Review" name="reviews.tab" as="reviews" template="Magento_Review::review.phtml" group="detailed_info">
-                <block class="Magento\Review\Block\Form" name="product.review.form" as="review_form">
+            <block class="Magento\Review\Block\Product\Review" name="reviews.tab" as="reviews" template="Magento_Review::review.phtml" group="detailed_info" ifconfig="catalog/review/active">
+                <block class="Magento\Review\Block\Form" name="product.review.form" as="review_form" ifconfig="catalog/review/active">
                     <container name="product.review.form.fields.before" as="form_fields_before" label="Review Form Fields Before"/>
                 </block>
             </block>
diff --git a/app/code/Magento/Review/view/frontend/layout/checkout_cart_configure.xml b/app/code/Magento/Review/view/frontend/layout/checkout_cart_configure.xml
index 0a7ddd8b8903d..8a853cdd2e409 100644
--- a/app/code/Magento/Review/view/frontend/layout/checkout_cart_configure.xml
+++ b/app/code/Magento/Review/view/frontend/layout/checkout_cart_configure.xml
@@ -9,7 +9,7 @@
     <update handle="catalog_product_view"/>
     <body>
         <referenceBlock name="reviews.tab">
-            <block class="Magento\Review\Block\Form\Configure" name="product.review.form" as="review_form">
+            <block class="Magento\Review\Block\Form\Configure" name="product.review.form" as="review_form" ifconfig="catalog/review/active">
                 <arguments>
                     <argument name="jsLayout" xsi:type="array">
                         <item name="components" xsi:type="array">
diff --git a/app/code/Magento/Review/view/frontend/layout/customer_account.xml b/app/code/Magento/Review/view/frontend/layout/customer_account.xml
index 54d171cbf1322..9f759dba41782 100644
--- a/app/code/Magento/Review/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Review/view/frontend/layout/customer_account.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="customer_account_navigation">
-            <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-product-reviews-link">
+            <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-product-reviews-link" ifconfig="catalog/review/active">
                 <arguments>
                     <argument name="path" xsi:type="string">review/customer</argument>
                     <argument name="label" xsi:type="string" translate="true">My Product Reviews</argument>
diff --git a/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml b/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml
index 73174f0570e28..2e898a539a954 100644
--- a/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml
+++ b/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Review\Block\Customer\Recent" name="customer_account_dashboard_info1" template="Magento_Review::customer/recent.phtml" after="customer_account_dashboard_address" cacheable="false"/>
+            <block class="Magento\Review\Block\Customer\Recent" name="customer_account_dashboard_info1" template="Magento_Review::customer/recent.phtml" after="customer_account_dashboard_address" cacheable="false" ifconfig="catalog/review/active"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml b/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml
index 2857e859aa06c..b5f7562963314 100644
--- a/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml
+++ b/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml
@@ -9,7 +9,7 @@
     <update handle="customer_account"/>
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Review\Block\Customer\ListCustomer" name="review_customer_list" template="Magento_Review::customer/list.phtml" cacheable="false"/>
+            <block class="Magento\Review\Block\Customer\ListCustomer" name="review_customer_list" template="Magento_Review::customer/list.phtml" cacheable="false" ifconfig="catalog/review/active"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml b/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml
index d51c89a1abe1a..d3adbd7950cf9 100644
--- a/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml
+++ b/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml
@@ -9,7 +9,7 @@
     <update handle="customer_account"/>
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Review\Block\Customer\View" name="customers_review" cacheable="false"/>
+            <block class="Magento\Review\Block\Customer\View" name="customers_review" cacheable="false" ifconfig="catalog/review/active"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Review/view/frontend/layout/review_product_list.xml b/app/code/Magento/Review/view/frontend/layout/review_product_list.xml
index c83cfe95d7964..8c5c1297cdda3 100644
--- a/app/code/Magento/Review/view/frontend/layout/review_product_list.xml
+++ b/app/code/Magento/Review/view/frontend/layout/review_product_list.xml
@@ -9,15 +9,15 @@
     <update handle="catalog_product_view"/>
     <body>
         <referenceContainer name="product.info.main">
-            <block class="Magento\Review\Block\Product\View\Other" name="product.info.other" as="other" template="Magento_Review::product/view/other.phtml" before="product.info.addto"/>
+            <block class="Magento\Review\Block\Product\View\Other" name="product.info.other" as="other" template="Magento_Review::product/view/other.phtml" before="product.info.addto" ifconfig="catalog/review/active"/>
         </referenceContainer>
         <referenceContainer name="content">
             <container name="product.info.details" htmlTag="div" htmlClass="product info detailed" after="product.info.media">
-                <block class="Magento\Review\Block\Form" name="product.review.form" as="review_form">
+                <block class="Magento\Review\Block\Form" name="product.review.form" as="review_form" ifconfig="catalog/review/active">
                     <container name="product.review.form.fields.before" as="form_fields_before" label="Review Form Fields Before" htmlTag="div" htmlClass="rewards"/>
                 </block>
-                <block class="Magento\Review\Block\Product\View\ListView" name="product.info.product_additional_data" as="product_additional_data" template="Magento_Review::product/view/list.phtml"/>
-                <block class="Magento\Theme\Block\Html\Pager" name="product_review_list.toolbar"/>
+                <block class="Magento\Review\Block\Product\View\ListView" name="product.info.product_additional_data" as="product_additional_data" template="Magento_Review::product/view/list.phtml" ifconfig="catalog/review/active"/>
+                <block class="Magento\Theme\Block\Html\Pager" name="product_review_list.toolbar" ifconfig="catalog/review/active"/>
             </container>
         </referenceContainer>
     </body>
diff --git a/app/code/Magento/Review/view/frontend/layout/review_product_listajax.xml b/app/code/Magento/Review/view/frontend/layout/review_product_listajax.xml
index af8d2dc2f506f..36fa71ea5125a 100644
--- a/app/code/Magento/Review/view/frontend/layout/review_product_listajax.xml
+++ b/app/code/Magento/Review/view/frontend/layout/review_product_listajax.xml
@@ -7,8 +7,8 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
     <container name="root">
-        <block class="Magento\Review\Block\Product\View\ListView" name="product.info.product_additional_data" as="product_additional_data" template="Magento_Review::product/view/list.phtml" />
-        <block class="Magento\Theme\Block\Html\Pager" name="product_review_list.toolbar">
+        <block class="Magento\Review\Block\Product\View\ListView" name="product.info.product_additional_data" as="product_additional_data" template="Magento_Review::product/view/list.phtml" ifconfig="catalog/review/active"/>
+        <block class="Magento\Theme\Block\Html\Pager" name="product_review_list.toolbar" ifconfig="catalog/review/active">
             <arguments>
                 <argument name="show_per_page" xsi:type="boolean">false</argument>
                 <argument name="show_amounts" xsi:type="boolean">false</argument>
diff --git a/app/code/Magento/Review/view/frontend/layout/review_product_view.xml b/app/code/Magento/Review/view/frontend/layout/review_product_view.xml
index b70aec3f00b68..3bfc98cad9736 100644
--- a/app/code/Magento/Review/view/frontend/layout/review_product_view.xml
+++ b/app/code/Magento/Review/view/frontend/layout/review_product_view.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Review\Block\View" name="review_view"/>
+            <block class="Magento\Review\Block\View" name="review_view" ifconfig="catalog/review/active"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Review/view/frontend/layout/wishlist_index_configure.xml b/app/code/Magento/Review/view/frontend/layout/wishlist_index_configure.xml
index 0a7ddd8b8903d..8a853cdd2e409 100644
--- a/app/code/Magento/Review/view/frontend/layout/wishlist_index_configure.xml
+++ b/app/code/Magento/Review/view/frontend/layout/wishlist_index_configure.xml
@@ -9,7 +9,7 @@
     <update handle="catalog_product_view"/>
     <body>
         <referenceBlock name="reviews.tab">
-            <block class="Magento\Review\Block\Form\Configure" name="product.review.form" as="review_form">
+            <block class="Magento\Review\Block\Form\Configure" name="product.review.form" as="review_form" ifconfig="catalog/review/active">
                 <arguments>
                     <argument name="jsLayout" xsi:type="array">
                         <item name="components" xsi:type="array">
diff --git a/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml b/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
index da689960dfe54..23cb6699aeb21 100644
--- a/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
@@ -11,7 +11,7 @@
 $url = $block->getReviewsUrl() . '#reviews';
 $urlForm = $block->getReviewsUrl() . '#review-form';
 ?>
-<?php if ($block->getReviewsCount()): ?>
+<?php if ($block->isReviewEnabled() && $block->getReviewsCount()): ?>
 <?php $rating = $block->getRatingSummary(); ?>
 <div class="product-reviews-summary<?= !$rating ? ' no-rating' : '' ?>" itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
     <?php if ($rating):?>
@@ -35,7 +35,7 @@ $urlForm = $block->getReviewsUrl() . '#review-form';
         <a class="action add" href="<?= $block->escapeUrl($urlForm) ?>"><?= $block->escapeHtml(__('Add Your Review')) ?></a>
     </div>
 </div>
-<?php elseif ($block->getDisplayIfEmpty()): ?>
+<?php elseif ($block->isReviewEnabled() && $block->getDisplayIfEmpty()): ?>
 <div class="product-reviews-summary empty">
     <div class="reviews-actions">
         <a class="action add" href="<?= $block->escapeUrl($urlForm) ?>">
diff --git a/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml b/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
index c3eb11f03fd7d..a3ff56505f06f 100644
--- a/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
@@ -11,7 +11,7 @@
 $url = $block->getReviewsUrl() . '#reviews';
 $urlForm = $block->getReviewsUrl() . '#review-form';
 ?>
-<?php if ($block->getReviewsCount()): ?>
+<?php if ($block->isReviewEnabled() && $block->getReviewsCount()): ?>
 <?php $rating = $block->getRatingSummary(); ?>
 <div class="product-reviews-summary short<?= !$rating ? ' no-rating' : '' ?>">
     <?php if ($rating):?>
@@ -26,7 +26,7 @@ $urlForm = $block->getReviewsUrl() . '#review-form';
         <a class="action view" href="<?= $block->escapeUrl($url) ?>"><?= $block->escapeHtml($block->getReviewsCount()) ?>&nbsp;<span><?= ($block->getReviewsCount() == 1) ? $block->escapeHtml(__('Review')) : $block->escapeHtml(__('Reviews')) ?></span></a>
     </div>
 </div>
-<?php elseif ($block->getDisplayIfEmpty()): ?>
+<?php elseif ($block->isReviewEnabled() && $block->getDisplayIfEmpty()): ?>
 <div class="product-reviews-summary short empty">
     <div class="reviews-actions">
         <a class="action add" href="<?= $block->escapeUrl($urlForm) ?>">
diff --git a/app/code/Magento/Review/view/frontend/web/js/process-reviews.js b/app/code/Magento/Review/view/frontend/web/js/process-reviews.js
index d1c40959e3ec2..88c61fa38af34 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
@@ -20,7 +20,7 @@ define([
             showLoader: false,
             loaderContext: $('.product.data.items')
         }).done(function (data) {
-            $('#product-review-container').html(data);
+            $('#product-review-container').html(data).trigger('contentUpdated');
             $('[data-role="product-review"] .pages a').each(function (index, element) {
                 $(element).click(function (event) { //eslint-disable-line max-nested-callbacks
                     processReviews($(element).attr('href'), true);
diff --git a/app/code/Magento/ReviewAnalytics/composer.json b/app/code/Magento/ReviewAnalytics/composer.json
index 229b486e3f8d4..2b75ef9681ee3 100644
--- a/app/code/Magento/ReviewAnalytics/composer.json
+++ b/app/code/Magento/ReviewAnalytics/composer.json
@@ -2,12 +2,12 @@
     "name": "magento/module-review-analytics",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*",
         "magento/module-review": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Robots/Model/Config/Value.php b/app/code/Magento/Robots/Model/Config/Value.php
index 83c21d6602fca..4c80588d814f6 100644
--- a/app/code/Magento/Robots/Model/Config/Value.php
+++ b/app/code/Magento/Robots/Model/Config/Value.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Robots\Model\Config;
 
 use Magento\Framework\App\Cache\TypeListInterface;
@@ -30,12 +31,11 @@ class Value extends ConfigValue implements IdentityInterface
     const CACHE_TAG = 'robots';
 
     /**
-     * Model cache tag for clear cache in after save and after delete
+     * @inheritdoc
      *
-     * @var string
      * @since 100.2.0
      */
-    protected $_cacheTag = true;
+    protected $_cacheTag = [self::CACHE_TAG];
 
     /**
      * @var StoreResolver
diff --git a/app/code/Magento/Robots/composer.json b/app/code/Magento/Robots/composer.json
index ccf8356419581..1b36b13a86090 100644
--- a/app/code/Magento/Robots/composer.json
+++ b/app/code/Magento/Robots/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-robots",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*",
         "magento/module-store": "100.2.*"
     },
@@ -10,7 +10,7 @@
         "magento/module-theme": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Rss/Model/Rss.php b/app/code/Magento/Rss/Model/Rss.php
index 7461c780fb230..c46c2240173f6 100644
--- a/app/code/Magento/Rss/Model/Rss.php
+++ b/app/code/Magento/Rss/Model/Rss.php
@@ -8,6 +8,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Rss\DataProviderInterface;
 use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\App\FeedFactoryInterface;
 
 /**
  * Provides functionality to work with RSS feeds
@@ -27,6 +28,11 @@ class Rss
      */
     protected $cache;
 
+    /**
+     * @var \Magento\Framework\App\FeedFactoryInterface
+     */
+    private $feedFactory;
+
     /**
      * @var SerializerInterface
      */
@@ -37,13 +43,16 @@ class Rss
      *
      * @param \Magento\Framework\App\CacheInterface $cache
      * @param SerializerInterface|null $serializer
+     * @param FeedFactoryInterface|null $feedFactory
      */
     public function __construct(
         \Magento\Framework\App\CacheInterface $cache,
-        SerializerInterface $serializer = null
+        SerializerInterface $serializer = null,
+        FeedFactoryInterface $feedFactory = null
     ) {
         $this->cache = $cache;
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
+        $this->feedFactory = $feedFactory ?: ObjectManager::getInstance()->get(FeedFactoryInterface::class);
     }
 
     /**
@@ -89,10 +98,12 @@ public function setDataProvider(DataProviderInterface $dataProvider)
 
     /**
      * @return string
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\RuntimeException
      */
     public function createRssXml()
     {
-        $rssFeedFromArray = \Zend_Feed::importArray($this->getFeeds(), 'rss');
-        return $rssFeedFromArray->saveXML();
+        $feed = $this->feedFactory->create($this->getFeeds(), FeedFactoryInterface::FORMAT_RSS);
+        return $feed->getFormattedContent();
     }
 }
diff --git a/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php b/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php
index 32aab6ffb92bc..a601f8fb2d1d7 100644
--- a/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php
+++ b/app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Rss\Test\Unit\Controller\Adminhtml\Feed;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Zend\Feed\Writer\Exception\InvalidArgumentException;
 
 /**
  * Class IndexTest
@@ -103,14 +104,22 @@ public function testExecuteWithException()
         $dataProvider = $this->createMock(\Magento\Framework\App\Rss\DataProviderInterface::class);
         $dataProvider->expects($this->once())->method('isAllowed')->will($this->returnValue(true));
 
-        $rssModel = $this->createPartialMock(\Magento\Rss\Model\Rss::class, ['setDataProvider']);
+        $rssModel = $this->createPartialMock(\Magento\Rss\Model\Rss::class, ['setDataProvider', 'createRssXml']);
         $rssModel->expects($this->once())->method('setDataProvider')->will($this->returnSelf());
 
+        $exceptionMock = new \Magento\Framework\Exception\RuntimeException(
+            new \Magento\Framework\Phrase('Any message')
+        );
+
+        $rssModel->expects($this->once())->method('createRssXml')->will(
+            $this->throwException($exceptionMock)
+        );
+
         $this->response->expects($this->once())->method('setHeader')->will($this->returnSelf());
         $this->rssFactory->expects($this->once())->method('create')->will($this->returnValue($rssModel));
         $this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider));
 
-        $this->expectException('\Zend_Feed_Builder_Exception');
+        $this->expectException(\Magento\Framework\Exception\RuntimeException::class);
         $this->controller->execute();
     }
 }
diff --git a/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php b/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php
index 71802deee0a8d..30415155d5f6e 100644
--- a/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php
+++ b/app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Rss\Test\Unit\Controller\Feed;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Zend\Feed\Writer\Exception\InvalidArgumentException;
 
 /**
  * Class IndexTest
@@ -52,6 +53,7 @@ protected function setUp()
             ->disableOriginalConstructor()->getMock();
 
         $objectManagerHelper = new ObjectManagerHelper($this);
+
         $this->controller = $objectManagerHelper->getObject(
             \Magento\Rss\Controller\Feed\Index::class,
             [
@@ -90,14 +92,22 @@ public function testExecuteWithException()
         $dataProvider = $this->createMock(\Magento\Framework\App\Rss\DataProviderInterface::class);
         $dataProvider->expects($this->once())->method('isAllowed')->will($this->returnValue(true));
 
-        $rssModel = $this->createPartialMock(\Magento\Rss\Model\Rss::class, ['setDataProvider']);
+        $rssModel = $this->createPartialMock(\Magento\Rss\Model\Rss::class, ['setDataProvider', 'createRssXml']);
         $rssModel->expects($this->once())->method('setDataProvider')->will($this->returnSelf());
 
+        $exceptionMock = new \Magento\Framework\Exception\RuntimeException(
+            new \Magento\Framework\Phrase('Any message')
+        );
+
+        $rssModel->expects($this->once())->method('createRssXml')->will(
+            $this->throwException($exceptionMock)
+        );
+
         $this->response->expects($this->once())->method('setHeader')->will($this->returnSelf());
         $this->rssFactory->expects($this->once())->method('create')->will($this->returnValue($rssModel));
         $this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider));
 
-        $this->expectException('\Zend_Feed_Builder_Exception');
+        $this->expectException(\Magento\Framework\Exception\RuntimeException::class);
         $this->controller->execute();
     }
 }
diff --git a/app/code/Magento/Rss/Test/Unit/Model/RssManagerTest.php b/app/code/Magento/Rss/Test/Unit/Model/RssManagerTest.php
index 6583e772589c7..d44ccf487d0db 100644
--- a/app/code/Magento/Rss/Test/Unit/Model/RssManagerTest.php
+++ b/app/code/Magento/Rss/Test/Unit/Model/RssManagerTest.php
@@ -45,8 +45,8 @@ public function testGetProvider()
         $this->objectManager->expects($this->once())->method('get')->will($this->returnValue($dataProvider));
 
         $this->assertInstanceOf(
-             \Magento\Framework\App\Rss\DataProviderInterface::class,
-             $this->rssManager->getProvider('rss_feed')
+            \Magento\Framework\App\Rss\DataProviderInterface::class,
+            $this->rssManager->getProvider('rss_feed')
         );
     }
 
diff --git a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php
index 6f98b9f202e30..f2888e4296b40 100644
--- a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php
+++ b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php
@@ -19,7 +19,7 @@ class RssTest extends \PHPUnit\Framework\TestCase
     /**
      * @var array
      */
-    protected $feedData = [
+    private $feedData = [
         'title' => 'Feed Title',
         'link' => 'http://magento.com/rss/link',
         'description' => 'Feed Description',
@@ -33,6 +33,27 @@ class RssTest extends \PHPUnit\Framework\TestCase
         ],
     ];
 
+    /**
+     * @var string
+     */
+    private $feedXml = '<?xml version="1.0" encoding="UTF-8"?>
+<rss xmlns:content="http://purl.org/rss/1.0/modules/content/" version="2.0">
+  <channel>
+    <title><![CDATA[Feed Title]]></title>
+    <link>http://magento.com/rss/link</link>
+    <description><![CDATA[Feed Description]]></description>
+    <pubDate>Sat, 22 Apr 2017 13:21:12 +0200</pubDate>
+    <generator>Zend\Feed</generator>
+    <docs>http://blogs.law.harvard.edu/tech/rss</docs>
+    <item>
+      <title><![CDATA[Feed 1 Title]]></title>
+      <link>http://magento.com/rss/link/id/1</link>
+      <description><![CDATA[Feed 1 Description]]></description>
+      <pubDate>Sat, 22 Apr 2017 13:21:12 +0200</pubDate>
+    </item>
+  </channel>
+</rss>';
+
     /**
      * @var ObjectManagerHelper
      */
@@ -43,6 +64,16 @@ class RssTest extends \PHPUnit\Framework\TestCase
      */
     private $cacheMock;
 
+    /**
+     * @var \Magento\Framework\App\FeedFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $feedFactoryMock;
+
+    /**
+     * @var \Magento\Framework\App\FeedInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $feedMock;
+
     /**
      * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -52,11 +83,15 @@ protected function setUp()
     {
         $this->cacheMock = $this->createMock(\Magento\Framework\App\CacheInterface::class);
         $this->serializerMock = $this->createMock(SerializerInterface::class);
+        $this->feedFactoryMock = $this->createMock(\Magento\Framework\App\FeedFactoryInterface::class);
+        $this->feedMock = $this->createMock(\Magento\Framework\App\FeedInterface::class);
+
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->rss = $this->objectManagerHelper->getObject(
             \Magento\Rss\Model\Rss::class,
             [
                 'cache' => $this->cacheMock,
+                'feedFactory' => $this->feedFactoryMock,
                 'serializer' => $this->serializerMock
             ]
         );
@@ -116,14 +151,16 @@ public function testCreateRssXml()
         $dataProvider->expects($this->any())->method('getCacheLifetime')->will($this->returnValue(100));
         $dataProvider->expects($this->any())->method('getRssData')->will($this->returnValue($this->feedData));
 
+        $this->feedMock->expects($this->once())
+            ->method('getFormattedContent')
+            ->willReturn($this->feedXml);
+
+        $this->feedFactoryMock->expects($this->once())
+            ->method('create')
+            ->with($this->feedData, \Magento\Framework\App\FeedFactoryInterface::FORMAT_RSS)
+            ->will($this->returnValue($this->feedMock));
+
         $this->rss->setDataProvider($dataProvider);
-        $result = $this->rss->createRssXml();
-        $this->assertContains('<?xml version="1.0" encoding="UTF-8"?>', $result);
-        $this->assertContains('<title><![CDATA[Feed Title]]></title>', $result);
-        $this->assertContains('<title><![CDATA[Feed 1 Title]]></title>', $result);
-        $this->assertContains('<link>http://magento.com/rss/link</link>', $result);
-        $this->assertContains('<link>http://magento.com/rss/link/id/1</link>', $result);
-        $this->assertContains('<description><![CDATA[Feed Description]]></description>', $result);
-        $this->assertContains('<description><![CDATA[Feed 1 Description]]></description>', $result);
+        $this->assertNotNull($this->rss->createRssXml());
     }
 }
diff --git a/app/code/Magento/Rss/Test/Unit/Model/UrlBuilderTest.php b/app/code/Magento/Rss/Test/Unit/Model/UrlBuilderTest.php
index df3ff3649d1ab..e5561e309184c 100644
--- a/app/code/Magento/Rss/Test/Unit/Model/UrlBuilderTest.php
+++ b/app/code/Magento/Rss/Test/Unit/Model/UrlBuilderTest.php
@@ -64,6 +64,7 @@ public function testGetUrl()
             ->will($this->returnValue('http://magento.com/rss/feed/index/type/rss_feed'));
         $this->assertEquals(
             'http://magento.com/rss/feed/index/type/rss_feed',
-            $this->urlBuilder->getUrl(['type' => 'rss_feed']));
+            $this->urlBuilder->getUrl(['type' => 'rss_feed'])
+        );
     }
 }
diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json
index d75274856e793..1f5051995ae22 100644
--- a/app/code/Magento/Rss/composer.json
+++ b/app/code/Magento/Rss/composer.json
@@ -2,14 +2,14 @@
     "name": "magento/module-rss",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-backend": "100.2.*",
         "magento/framework": "101.0.*",
         "magento/module-customer": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Rss/etc/di.xml b/app/code/Magento/Rss/etc/di.xml
index 3b00e1893efaf..d9e930482578e 100644
--- a/app/code/Magento/Rss/etc/di.xml
+++ b/app/code/Magento/Rss/etc/di.xml
@@ -8,4 +8,5 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\Framework\App\Rss\RssManagerInterface" type="Magento\Rss\Model\RssManager"/>
     <preference for="Magento\Framework\App\Rss\UrlBuilderInterface" type="Magento\Rss\Model\UrlBuilder"/>
+    <preference for="Magento\Framework\App\FeedFactoryInterface" type="Magento\Framework\App\FeedFactory"/>
 </config>
diff --git a/app/code/Magento/Rule/Block/Editable.php b/app/code/Magento/Rule/Block/Editable.php
index 67e4671236ea0..a2b9d869f364e 100644
--- a/app/code/Magento/Rule/Block/Editable.php
+++ b/app/code/Magento/Rule/Block/Editable.php
@@ -9,6 +9,8 @@
 use Magento\Framework\View\Element\AbstractBlock;
 
 /**
+ * Renderer for Editable sales rules.
+ *
  * @api
  * @since 100.0.2
  */
@@ -52,15 +54,15 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
 
         if ($element->getShowAsText()) {
             $html = ' <input type="hidden" class="hidden" id="' .
-                $element->getHtmlId() .
+                $this->escapeHtmlAttr($element->getHtmlId()) .
                 '" name="' .
-                $element->getName() .
+                $this->escapeHtmlAttr($element->getName()) .
                 '" value="' .
                 $element->getValue() .
                 '" data-form-part="' .
                 $element->getData('data-form-part') .
                 '"/> ' .
-                htmlspecialchars(
+                $this->escapeHtml(
                     $valueName
                 ) . '&nbsp;';
         } else {
diff --git a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
index c02bbd64e7ca3..53ba319d47ef0 100644
--- a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
+++ b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
@@ -95,8 +95,8 @@ abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCon
      * @param \Magento\Catalog\Model\ResourceModel\Product $productResource
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection $attrSetCollection
      * @param \Magento\Framework\Locale\FormatInterface $localeFormat
-     * @param ProductCategoryList|null $categoryList
      * @param array $data
+     * @param ProductCategoryList|null $categoryList
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -137,7 +137,6 @@ public function getDefaultOperatorInputByType()
              */
             $this->_defaultOperatorInputByType['category'] = ['==', '!=', '{}', '!{}', '()', '!()'];
             $this->_arrayInputTypes[] = 'category';
-            $this->_defaultOperatorInputByType['sku'] = ['==', '!=', '{}', '!{}', '()', '!()'];
         }
         return $this->_defaultOperatorInputByType;
     }
@@ -383,9 +382,6 @@ public function getInputType()
         if ($this->getAttributeObject()->getAttributeCode() == 'category_ids') {
             return 'category';
         }
-        if ($this->getAttributeObject()->getAttributeCode() == 'sku') {
-            return 'sku';
-        }
         switch ($this->getAttributeObject()->getFrontendInput()) {
             case 'select':
                 return 'select';
@@ -520,6 +516,10 @@ public function loadArray($arr)
             ) ? $this->_localeFormat->getNumber(
                 $arr['is_value_parsed']
             ) : false;
+        } elseif (!empty($arr['operator']) && $arr['operator'] == '()') {
+            if (isset($arr['value'])) {
+                $arr['value'] = preg_replace('/\s*,\s*/', ',', $arr['value']);
+            }
         }
 
         return parent::loadArray($arr);
@@ -610,10 +610,6 @@ public function getBindArgumentValue()
                     $this->getValueParsed()
                 )->__toString()
             );
-        } elseif ($this->getAttribute() === 'sku') {
-            $value = $this->getData('value');
-            $value = preg_split('#\s*[,;]\s*#', $value, null, PREG_SPLIT_NO_EMPTY);
-            $this->setValueParsed($value);
         }
 
         return parent::getBindArgumentValue();
@@ -706,6 +702,7 @@ protected function _getAttributeSetId($productId)
 
     /**
      * Correct '==' and '!=' operators
+     *
      * Categories can't be equal because product is included categories selected by administrator and in their parents
      *
      * @return string
@@ -713,7 +710,7 @@ protected function _getAttributeSetId($productId)
     public function getOperatorForValidate()
     {
         $operator = $this->getOperator();
-        if (in_array($this->getInputType(), ['category', 'sku'])) {
+        if ('category' === $this->getInputType()) {
             if ($operator == '==') {
                 $operator = '{}';
             } elseif ($operator == '!=') {
diff --git a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
index e2118445b6de7..51d79363cecfe 100644
--- a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
+++ b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
@@ -32,9 +32,13 @@ class Builder
         '=='    => ':field = ?',
         '!='    => ':field <> ?',
         '>='    => ':field >= ?',
+        '&gt;=' => ':field >= ?',
         '>'     => ':field > ?',
+        '&gt;'  => ':field > ?',
         '<='    => ':field <= ?',
+        '&lt;=' => ':field <= ?',
         '<'     => ':field < ?',
+        '&lt;'  => ':field < ?',
         '{}'    => ':field IN (?)',
         '!{}'   => ':field NOT IN (?)',
         '()'    => ':field IN (?)',
diff --git a/app/code/Magento/Rule/Model/ResourceModel/Rule/Collection/AbstractCollection.php b/app/code/Magento/Rule/Model/ResourceModel/Rule/Collection/AbstractCollection.php
index b3d761b378d94..e0468f17e587a 100644
--- a/app/code/Magento/Rule/Model/ResourceModel/Rule/Collection/AbstractCollection.php
+++ b/app/code/Magento/Rule/Model/ResourceModel/Rule/Collection/AbstractCollection.php
@@ -83,11 +83,21 @@ public function addWebsiteFilter($websiteId)
                 if ($website instanceof \Magento\Store\Model\Website) {
                     $websiteIds[$index] = $website->getId();
                 }
+                $websiteIds[$index] = (int) $websiteIds[$index];
             }
+
+            $websiteSelect = $this->getConnection()->select();
+            $websiteSelect->from(
+                $this->getTable($entityInfo['associations_table']),
+                [$entityInfo['rule_id_field']]
+            )->distinct(
+                true
+            )->where(
+                $this->getConnection()->quoteInto($entityInfo['entity_id_field'] . ' IN (?)', $websiteIds)
+            );
             $this->getSelect()->join(
-                ['website' => $this->getTable($entityInfo['associations_table'])],
-                $this->getConnection()->quoteInto('website.' . $entityInfo['entity_id_field'] . ' IN (?)', $websiteIds)
-                . ' AND main_table.' . $entityInfo['rule_id_field'] . ' = website.' . $entityInfo['rule_id_field'],
+                ['website' => $websiteSelect],
+                'main_table.' . $entityInfo['rule_id_field'] . ' = website.' . $entityInfo['rule_id_field'],
                 []
             );
         }
diff --git a/app/code/Magento/Rule/Test/Unit/Model/Condition/Sql/BuilderTest.php b/app/code/Magento/Rule/Test/Unit/Model/Condition/Sql/BuilderTest.php
index 0a2767a94668a..7be94bf690e8b 100644
--- a/app/code/Magento/Rule/Test/Unit/Model/Condition/Sql/BuilderTest.php
+++ b/app/code/Magento/Rule/Test/Unit/Model/Condition/Sql/BuilderTest.php
@@ -72,4 +72,69 @@ public function testAttachConditionToCollection()
 
         $this->_builder->attachConditionToCollection($collection, $combine);
     }
+
+    /**
+     * Test for attach condition to collection with operator in html format.
+     *
+     * @covers \Magento\Rule\Model\Condition\Sql\Builder::attachConditionToCollection()
+     * @return void
+     */
+    public function testAttachConditionAsHtmlToCollection()
+    {
+        $abstractCondition = $this->getMockForAbstractClass(
+            \Magento\Rule\Model\Condition\AbstractCondition::class,
+            [],
+            '',
+            false,
+            false,
+            true,
+            ['getOperatorForValidate', 'getMappedSqlField', 'getAttribute', 'getBindArgumentValue']
+        );
+
+        $abstractCondition->expects($this->once())->method('getMappedSqlField')->will($this->returnValue('argument'));
+        $abstractCondition->expects($this->once())->method('getOperatorForValidate')->will($this->returnValue('&gt;'));
+        $abstractCondition->expects($this->at(1))->method('getAttribute')->will($this->returnValue('attribute'));
+        $abstractCondition->expects($this->at(2))->method('getAttribute')->will($this->returnValue('attribute'));
+        $abstractCondition->expects($this->once())->method('getBindArgumentValue')->will($this->returnValue(10));
+
+        $conditions = [$abstractCondition];
+        $collection = $this->createPartialMock(
+            \Magento\Eav\Model\Entity\Collection\AbstractCollection::class,
+            [
+                'getResource',
+                'getSelect',
+            ]
+        );
+        $combine = $this->createPartialMock(
+            \Magento\Rule\Model\Condition\Combine::class,
+            [
+                'getConditions',
+                'getValue',
+                'getAggregator',
+            ]
+        );
+
+        $resource = $this->createPartialMock(\Magento\Framework\DB\Adapter\Pdo\Mysql::class, ['getConnection']);
+        $select = $this->createPartialMock(\Magento\Framework\DB\Select::class, ['where']);
+        $select->expects($this->never())->method('where');
+
+        $connection = $this->getMockForAbstractClass(
+            \Magento\Framework\DB\Adapter\AdapterInterface::class,
+            ['quoteInto'],
+            '',
+            false
+        );
+
+        $connection->expects($this->once())->method('quoteInto')->with(' > ?', 10)->will($this->returnValue(' > 10'));
+        $collection->expects($this->once())->method('getResource')->will($this->returnValue($resource));
+        $resource->expects($this->once())->method('getConnection')->will($this->returnValue($connection));
+        $combine->expects($this->once())->method('getValue')->willReturn('attribute');
+        $combine->expects($this->once())->method('getAggregator')->willReturn(' AND ');
+        $combine->expects($this->at(0))->method('getConditions')->will($this->returnValue($conditions));
+        $combine->expects($this->at(1))->method('getConditions')->will($this->returnValue($conditions));
+        $combine->expects($this->at(2))->method('getConditions')->will($this->returnValue($conditions));
+        $combine->expects($this->at(3))->method('getConditions')->will($this->returnValue($conditions));
+
+        $this->_builder->attachConditionToCollection($collection, $combine);
+    }
 }
diff --git a/app/code/Magento/Rule/Test/Unit/Model/ResourceModel/Rule/Collection/AbstractCollectionTest.php b/app/code/Magento/Rule/Test/Unit/Model/ResourceModel/Rule/Collection/AbstractCollectionTest.php
deleted file mode 100644
index c4e7a591212c5..0000000000000
--- a/app/code/Magento/Rule/Test/Unit/Model/ResourceModel/Rule/Collection/AbstractCollectionTest.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Rule\Test\Unit\Model\ResourceModel\Rule\Collection;
-
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-
-class AbstractCollectionTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $abstractCollection;
-
-    /**
-     * @var ObjectManagerHelper
-     */
-    protected $objectManagerHelper;
-
-    /**
-     * @var \Magento\Framework\Data\Collection\EntityFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_entityFactoryMock;
-
-    /**
-     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_loggerMock;
-
-    /**
-     * @var \Magento\Framework\Data\Collection\Db\FetchStrategyInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_fetchStrategyMock;
-
-    /**
-     * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_managerMock;
-
-    /**
-     * @var \Magento\Framework\Model\ResourceModel\Db\AbstractDb|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_db;
-
-    /**
-     * @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $connectionMock;
-
-    /**
-     * @var \Magento\Framework\DB\Select|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $selectMock;
-
-    protected function setUp()
-    {
-        $this->_entityFactoryMock = $this->createMock(\Magento\Framework\Data\Collection\EntityFactoryInterface::class);
-        $this->_loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
-        $this->_fetchStrategyMock = $this->createMock(
-            \Magento\Framework\Data\Collection\Db\FetchStrategyInterface::class
-        );
-        $this->_managerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
-        $this->_db = $this->getMockForAbstractClass(
-            \Magento\Framework\Model\ResourceModel\Db\AbstractDb::class,
-            [],
-            '',
-            false,
-            false,
-            true,
-            ['__sleep', '__wakeup', 'getTable']
-        );
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
-        $this->abstractCollection = $this->getMockForAbstractClass(
-            \Magento\Rule\Model\ResourceModel\Rule\Collection\AbstractCollection::class,
-            [
-                'entityFactory' => $this->_entityFactoryMock,
-                'logger' => $this->_loggerMock,
-                'fetchStrategy' => $this->_fetchStrategyMock,
-                'eventManager' => $this->_managerMock,
-                null,
-                $this->_db
-            ],
-            '',
-            false,
-            false,
-            true,
-            ['__sleep', '__wakeup', '_getAssociatedEntityInfo', 'getConnection', 'getSelect', 'getTable']
-        );
-    }
-
-    /**
-     * @return array
-     */
-    public function addWebsitesToResultDataProvider()
-    {
-        return [
-            [null, true],
-            [true, true],
-            [false, false]
-        ];
-    }
-
-    /**
-     * @dataProvider addWebsitesToResultDataProvider
-     */
-    public function testAddWebsitesToResult($flag, $expectedResult)
-    {
-        $this->abstractCollection->addWebsitesToResult($flag);
-        $this->assertEquals($expectedResult, $this->abstractCollection->getFlag('add_websites_to_result'));
-    }
-
-    protected function _prepareAddFilterStubs()
-    {
-        $entityInfo = [];
-        $entityInfo['entity_id_field'] = 'entity_id';
-        $entityInfo['rule_id_field'] = 'rule_id';
-        $entityInfo['associations_table'] = 'assoc_table';
-
-        $connection = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
-        $select = $this->createMock(\Magento\Framework\DB\Select::class);
-        $collectionSelect = $this->createMock(\Magento\Framework\DB\Select::class);
-
-        $connection->expects($this->any())
-            ->method('select')
-            ->will($this->returnValue($select));
-
-        $select->expects($this->any())
-            ->method('from')
-            ->will($this->returnSelf());
-
-        $select->expects($this->any())
-            ->method('where')
-            ->will($this->returnSelf());
-
-        $this->abstractCollection->expects($this->any())
-            ->method('getConnection')
-            ->will($this->returnValue($connection));
-
-        $this->_db->expects($this->any())
-            ->method('getTable')
-            ->will($this->returnArgument(0));
-
-        $this->abstractCollection->expects($this->any())
-            ->method('getSelect')
-            ->will($this->returnValue($collectionSelect));
-
-        $this->abstractCollection->expects($this->any())
-            ->method('_getAssociatedEntityInfo')
-            ->will($this->returnValue($entityInfo));
-    }
-
-    public function testAddWebsiteFilter()
-    {
-        $this->_prepareAddFilterStubs();
-        $website = $this->createPartialMock(\Magento\Store\Model\Website::class, ['getId', '__sleep', '__wakeup']);
-
-        $website->expects($this->any())
-            ->method('getId')
-            ->will($this->returnValue(1));
-
-        $this->assertInstanceOf(
-            \Magento\Rule\Model\ResourceModel\Rule\Collection\AbstractCollection::class,
-            $this->abstractCollection->addWebsiteFilter($website)
-        );
-    }
-
-    public function testAddWebsiteFilterArray()
-    {
-        $this->selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->connectionMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $this->connectionMock->expects($this->atLeastOnce())
-            ->method('quoteInto')
-            ->with($this->equalTo('website. IN (?)'), $this->equalTo(['2', '3']))
-            ->willReturn(true);
-
-        $this->abstractCollection->expects($this->atLeastOnce())->method('getSelect')->willReturn($this->selectMock);
-        $this->abstractCollection->expects($this->atLeastOnce())->method('getConnection')
-            ->willReturn($this->connectionMock);
-
-        $this->assertInstanceOf(
-            \Magento\Rule\Model\ResourceModel\Rule\Collection\AbstractCollection::class,
-            $this->abstractCollection->addWebsiteFilter(['2', '3'])
-        );
-    }
-
-    public function testAddFieldToFilter()
-    {
-        $this->_prepareAddFilterStubs();
-        $result = $this->abstractCollection->addFieldToFilter('website_ids', []);
-        $this->assertNotNull($result);
-    }
-}
diff --git a/app/code/Magento/Rule/composer.json b/app/code/Magento/Rule/composer.json
index 2589db8fe86e6..9777d5f5f6809 100644
--- a/app/code/Magento/Rule/composer.json
+++ b/app/code/Magento/Rule/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-rule",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-eav": "101.0.*",
         "magento/module-catalog": "102.0.*",
@@ -11,7 +11,7 @@
         "lib-libxml": "*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php
index 2175d83c67d07..1897b0bb66b30 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php
@@ -37,7 +37,7 @@ public function truncateString(
         string $value,
         int $length = 80,
         string $etc = '...',
-        string &$remainder = '',
+        &$remainder = '',
         bool $breakWords = true
     ): string {
         $this->truncateResult = $this->filterManager->truncateFilter(
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create.php
index 083055994a282..a26ddc2961765 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create.php
@@ -81,7 +81,7 @@ protected function _construct()
         $this->buttonList->update(
             'reset',
             'onclick',
-            'deleteConfirm(\'' . $confirm . '\', \'' . $this->getCancelUrl() . '\')'
+            'deleteConfirm(\'' . $confirm . '\', \'' . $this->getCancelUrl() . '\', {data: {}})'
         );
     }
 
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
index d15c218a60b47..c1b67e6dcf88a 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
@@ -96,6 +96,11 @@ protected function _prepareLayout()
     public function getForm()
     {
         if ($this->_form === null) {
+            $storeId = $this->getCreateOrderModel()
+                ->getSession()
+                ->getStoreId();
+            $this->_storeManager->setCurrentStore($storeId);
+
             $this->_form = $this->_formFactory->create();
             $this->_prepareForm();
         }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
index 0f92fa2320e89..11f3faa9d042e 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
@@ -135,13 +135,7 @@ protected function _prepareForm()
 
         $this->_form->addFieldNameSuffix('order[account]');
 
-        $formValues = $this->getFormValues();
-        foreach ($attributes as $code => $attribute) {
-            $defaultValue = $attribute->getDefaultValue();
-            if (isset($defaultValue) && !isset($formValues[$code])) {
-                $formValues[$code] = $defaultValue;
-            }
-        }
+        $formValues = $this->extractValuesFromAttributes($attributes);
         $this->_form->setValues($formValues);
 
         return $this;
@@ -189,4 +183,23 @@ public function getFormValues()
 
         return $data;
     }
+
+    /**
+     * Extract the form values from attributes.
+     *
+     * @param array $attributes
+     * @return array
+     */
+    private function extractValuesFromAttributes(array $attributes): array
+    {
+        $formValues = $this->getFormValues();
+        foreach ($attributes as $code => $attribute) {
+            $defaultValue = $attribute->getDefaultValue();
+            if (isset($defaultValue) && !isset($formValues[$code])) {
+                $formValues[$code] = $defaultValue;
+            }
+        }
+
+        return $formValues;
+    }
 }
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 fe1682e2de830..eb90a67ee9cf2 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
@@ -9,6 +9,8 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Eav\Model\AttributeDataFactory;
 
 /**
  * Order create address form
@@ -190,17 +192,19 @@ public function getAddressCollectionJson()
         $emptyAddressForm = $this->_customerFormFactory->create(
             'customer_address',
             'adminhtml_customer_address',
-            [\Magento\Customer\Api\Data\AddressInterface::COUNTRY_ID => $defaultCountryId]
+            [AddressInterface::COUNTRY_ID => $defaultCountryId]
         );
-        $data = [0 => $emptyAddressForm->outputData(\Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON)];
+        $data = [0 => $emptyAddressForm->outputData(AttributeDataFactory::OUTPUT_FORMAT_JSON)];
         foreach ($this->getAddressCollection() as $address) {
             $addressForm = $this->_customerFormFactory->create(
                 'customer_address',
                 'adminhtml_customer_address',
-                $this->addressMapper->toFlatArray($address)
+                $this->addressMapper->toFlatArray($address),
+                false,
+                false
             );
             $data[$address->getId()] = $addressForm->outputData(
-                \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON
+                AttributeDataFactory::OUTPUT_FORMAT_JSON
             );
         }
 
@@ -217,11 +221,6 @@ public function getAddressCollectionJson()
      */
     protected function _prepareForm()
     {
-        $storeId = $this->getCreateOrderModel()
-            ->getSession()
-            ->getStoreId();
-        $this->_storeManager->setCurrentStore($storeId);
-
         $fieldset = $this->_form->addFieldset('main', ['no_container' => true]);
 
         $addressForm = $this->_customerFormFactory->create('customer_address', 'adminhtml_customer_address');
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 4bd2227d4bb1e..3be0df001b1b5 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,12 +5,17 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Search;
 
+use Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\DataProvider\ProductCollection
+    as ProductCollectionDataProvider;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Adminhtml sales order create search products block
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -42,6 +47,11 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      */
     protected $_productFactory;
 
+    /**
+     * @var ProductCollectionDataProvider $productCollectionProvider
+     */
+    private $productCollectionProvider;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Helper\Data $backendHelper
@@ -50,6 +60,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
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -58,12 +69,15 @@ public function __construct(
         \Magento\Catalog\Model\Config $catalogConfig,
         \Magento\Backend\Model\Session\Quote $sessionQuote,
         \Magento\Sales\Model\Config $salesConfig,
-        array $data = []
+        array $data = [],
+        ProductCollectionDataProvider $productCollectionProvider = null
     ) {
         $this->_productFactory = $productFactory;
         $this->_catalogConfig = $catalogConfig;
         $this->_sessionQuote = $sessionQuote;
         $this->_salesConfig = $salesConfig;
+        $this->productCollectionProvider = $productCollectionProvider
+            ?: ObjectManager::getInstance()->get(ProductCollectionDataProvider::class);
         parent::__construct($context, $backendHelper, $data);
     }
 
@@ -71,6 +85,7 @@ public function __construct(
      * Constructor
      *
      * @return void
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     protected function _construct()
     {
@@ -140,20 +155,18 @@ protected function _addColumnFilterToCollection($column)
      */
     protected function _prepareCollection()
     {
+
         $attributes = $this->_catalogConfig->getProductAttributes();
+        $store = $this->getStore();
+
         /* @var $collection \Magento\Catalog\Model\ResourceModel\Product\Collection */
-        $collection = $this->_productFactory->create()->getCollection();
-        $collection->setStore(
-            $this->getStore()
-        )->addAttributeToSelect(
+        $collection = $this->productCollectionProvider->getCollectionForStore($store);
+        $collection->addAttributeToSelect(
             $attributes
-        )->addAttributeToSelect(
-            'sku'
-        )->addStoreFilter()->addAttributeToFilter(
+        );
+        $collection->addAttributeToFilter(
             'type_id',
             $this->_salesConfig->getAvailableProductTypes()
-        )->addAttributeToSelect(
-            'gift_message_available'
         );
 
         $this->setCollection($collection);
@@ -248,6 +261,7 @@ public function getGridUrl()
      * Get selected products
      *
      * @return mixed
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     protected function _getSelectedProducts()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/DataProvider/ProductCollection.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/DataProvider/ProductCollection.php
new file mode 100644
index 0000000000000..733791a2f9549
--- /dev/null
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/DataProvider/ProductCollection.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\DataProvider;
+
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Store\Model\Store;
+
+/**
+ * Prepares product collection for the grid
+ */
+class ProductCollection
+{
+    /**
+     * @var ProductCollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @param ProductCollectionFactory $collectionFactory
+     */
+    public function __construct(
+        ProductCollectionFactory $collectionFactory
+    ) {
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * Provide products collection filtered with store
+     *
+     * @param Store $store
+     * @return Collection
+     */
+    public function getCollectionForStore(Store $store):Collection
+    {
+        /** @var Collection $collection */
+        $collection = $this->collectionFactory->create();
+
+        $collection->setStore($store);
+        $collection->addAttributeToSelect(
+            'gift_message_available'
+        );
+        $collection->addAttributeToSelect(
+            'sku'
+        );
+        $collection->addStoreFilter();
+
+        return $collection;
+    }
+}
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 34d7a3f8ee25e..8179c0e8d282a 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
@@ -3,8 +3,13 @@
  * 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\Catalog\Model\Product;
+use Magento\Catalog\Pricing\Price\FinalPrice;
+
 /**
  * Adminhtml sales order create sidebar cart block
  *
@@ -58,6 +63,17 @@ public function getItemCollection()
         return $collection;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getItemPrice(Product $product)
+    {
+        $customPrice = $this->getCartItemCustomPrice($product);
+        $price = $customPrice ?? $product->getPriceInfo()->getPrice(FinalPrice::PRICE_CODE)->getValue();
+
+        return $this->convertPrice($price);
+    }
+
     /**
      * Retrieve display item qty availability
      *
@@ -111,4 +127,23 @@ protected function _prepareLayout()
 
         return parent::_prepareLayout();
     }
+
+    /**
+     * Returns cart item custom price.
+     *
+     * @param Product $product
+     * @return float|null
+     */
+    private function getCartItemCustomPrice(Product $product)
+    {
+        $items = $this->getItemCollection();
+        foreach ($items as $item) {
+            $productItemId = $this->getProduct($item)->getId();
+            if ($productItemId === $product->getId() && $item->getCustomPrice()) {
+                return (float)$item->getCustomPrice();
+            }
+        }
+
+        return null;
+    }
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php b/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php
index e6e5d6ec3df3f..566ea1214d91f 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php
@@ -41,6 +41,8 @@ public function __construct(
     }
 
     /**
+     * Render actions
+     *
      * @param \Magento\Framework\DataObject $row
      * @return string
      */
@@ -71,7 +73,8 @@ public function render(\Magento\Framework\DataObject $row)
      */
     protected function _getEscapedValue($value)
     {
-        return addcslashes(htmlspecialchars($value), '\\\'');
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        return addcslashes($this->escapeHtml($value), '\\\'');
     }
 
     /**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
index 83b155293c2b9..8172a3c0db4ad 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
@@ -5,6 +5,11 @@
  */
 namespace Magento\Sales\Block\Adminhtml;
 
+use Magento\Sales\Model\Order;
+
+/**
+ * Adminhtml sales totals block
+ */
 class Totals extends \Magento\Sales\Block\Order\Totals
 {
     /**
@@ -67,12 +72,16 @@ protected function _initTotals()
         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());
+            }
             $this->_totals['shipping'] = new \Magento\Framework\DataObject(
                 [
                     'code' => 'shipping',
                     'value' => $this->getSource()->getShippingAmount(),
                     'base_value' => $this->getSource()->getBaseShippingAmount(),
-                    'label' => __('Shipping & Handling'),
+                    'label' => $shippingLabel,
                 ]
             );
         }
@@ -109,4 +118,23 @@ 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 4c6a2b586cfc4..ad6e0082929ac 100644
--- a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
+++ b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
@@ -278,4 +278,21 @@ public function getItemRowTotalAfterDiscountHtml($item = null)
         $block->setItem($item);
         return $block->toHtml();
     }
+
+    /**
+     * Return the base total amount minus discount.
+     *
+     * @param OrderItem|InvoiceItem|CreditmemoItem $item
+     * @return float|null
+     */
+    public function getBaseTotalAmount($item)
+    {
+        $baseTotalAmount = $item->getBaseRowTotal()
+            + $item->getBaseTaxAmount()
+            + $item->getBaseDiscountTaxCompensationAmount()
+            + $item->getBaseWeeeTaxAppliedAmount()
+            - $item->getBaseDiscountAmount();
+
+        return $baseTotalAmount;
+    }
 }
diff --git a/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php b/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php
index b413951d9d4f3..9df515a6c03ba 100644
--- a/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php
+++ b/app/code/Magento/Sales/Block/Status/Grid/Column/Unassign.php
@@ -36,9 +36,16 @@ public function decorateAction($value, $row, $column, $isExport)
         $cell = '';
         $state = $row->getState();
         if (!empty($state)) {
-            $url = $this->getUrl('*/*/unassign', ['status' => $row->getStatus(), 'state' => $row->getState()]);
+            $url = $this->getUrl('*/*/unassign');
             $label = __('Unassign');
-            $cell = '<a href="' . $url . '">' . $label . '</a>';
+            $cell = '<a href="#" data-post="'
+                .$this->escapeHtmlAttr(
+                    \json_encode([
+                        'action' => $url,
+                        'data' => ['status' => $row->getStatus(), 'state' => $row->getState()]
+                    ])
+                )
+                .'">' . $label . '</a>';
         }
         return $cell;
     }
diff --git a/app/code/Magento/Sales/Controller/AbstractController/Reorder.php b/app/code/Magento/Sales/Controller/AbstractController/Reorder.php
index d7ab99377e1b5..619b0828ed33d 100644
--- a/app/code/Magento/Sales/Controller/AbstractController/Reorder.php
+++ b/app/code/Magento/Sales/Controller/AbstractController/Reorder.php
@@ -7,7 +7,11 @@
 namespace Magento\Sales\Controller\AbstractController;
 
 use Magento\Framework\App\Action;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Registry;
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\Controller\ResultFactory;
 
 abstract class Reorder extends Action\Action
 {
@@ -21,18 +25,26 @@ abstract class Reorder extends Action\Action
      */
     protected $_coreRegistry;
 
+    /**
+     * @var Validator
+     */
+    private $formKeyValidator;
+
     /**
      * @param Action\Context $context
      * @param OrderLoaderInterface $orderLoader
      * @param Registry $registry
+     * @param Validator|null $formKeyValidator
      */
     public function __construct(
         Action\Context $context,
         OrderLoaderInterface $orderLoader,
-        Registry $registry
+        Registry $registry,
+        Validator $formKeyValidator = null
     ) {
         $this->orderLoader = $orderLoader;
         $this->_coreRegistry = $registry;
+        $this->formKeyValidator = $formKeyValidator ?: ObjectManager::getInstance()->create(Validator::class);
         parent::__construct($context);
     }
 
@@ -43,6 +55,20 @@ public function __construct(
      */
     public function execute()
     {
+        if ($this->getRequest()->isPost()) {
+            if (!$this->formKeyValidator->validate($this->getRequest())) {
+                $this->messageManager->addErrorMessage(__('Invalid Form Key. Please refresh the page.'));
+
+                /** @var \Magento\Framework\Controller\Result\Redirect $redirect */
+                $redirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+                $redirect->setPath('*/*/history');
+
+                return $redirect;
+            }
+        } else {
+            throw new NotFoundException(__('Page not found.'));
+        }
+
         $result = $this->orderLoader->load($this->_request);
         if ($result instanceof \Magento\Framework\Controller\ResultInterface) {
             return $result;
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php
index 12038ee375059..88e05a80f3797 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php
@@ -9,17 +9,27 @@
 use Magento\Backend\App\Action;
 use Magento\Sales\Model\Order\Email\Sender\OrderCommentSender;
 
+/**
+ * Controller to execute Adding Comments.
+ */
 class AddComment extends \Magento\Sales\Controller\Adminhtml\Order
 {
     /**
-     * Authorization level of a basic admin session
+     * Authorization level of a basic admin session.
      *
      * @see _isAllowed()
      */
     const ADMIN_RESOURCE = 'Magento_Sales::comment';
 
     /**
-     * Add order comment action
+     * ACL resource needed to send comment email notification.
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_SALES_EMAIL_RESOURCE = 'Magento_Sales::emails';
+
+    /**
+     * Add order comment action.
      *
      * @return \Magento\Framework\Controller\ResultInterface
      */
@@ -33,8 +43,12 @@ public function execute()
                     throw new \Magento\Framework\Exception\LocalizedException(__('Please enter a comment.'));
                 }
 
-                $notify = isset($data['is_customer_notified']) ? $data['is_customer_notified'] : false;
-                $visible = isset($data['is_visible_on_front']) ? $data['is_visible_on_front'] : false;
+                $notify = $data['is_customer_notified'] ?? false;
+                $visible = $data['is_visible_on_front'] ?? false;
+
+                if ($notify && !$this->_authorization->isAllowed(self::ADMIN_SALES_EMAIL_RESOURCE)) {
+                    $notify = false;
+                }
 
                 $history = $order->addStatusHistoryComment($data['comment'], $data['status']);
                 $history->setIsVisibleOnFront($visible);
@@ -59,9 +73,11 @@ public function execute()
             if (is_array($response)) {
                 $resultJson = $this->resultJsonFactory->create();
                 $resultJson->setData($response);
+
                 return $resultJson;
             }
         }
+
         return $this->resultRedirectFactory->create()->setPath('sales/*/');
     }
 }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php
index dc994e554b394..53563ccd70061 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php
@@ -9,6 +9,7 @@
 use Magento\Backend\App\Action\Context;
 use Magento\Backend\Model\View\Result\Redirect;
 use Magento\Directory\Model\RegionFactory;
+use Magento\Sales\Api\OrderAddressRepositoryInterface;
 use Magento\Sales\Api\OrderManagementInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Api\Data\OrderAddressInterface;
@@ -24,8 +25,11 @@
 use Magento\Framework\Controller\Result\RawFactory;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
 /**
+ * Sales address save
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AddressSave extends Order
@@ -54,6 +58,7 @@ class AddressSave extends Order
      * @param OrderRepositoryInterface $orderRepository
      * @param LoggerInterface $logger
      * @param RegionFactory|null $regionFactory
+     * @param OrderAddressRepositoryInterface|null $orderAddressRepository
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -69,9 +74,12 @@ public function __construct(
         OrderManagementInterface $orderManagement,
         OrderRepositoryInterface $orderRepository,
         LoggerInterface $logger,
-        RegionFactory $regionFactory = null
+        RegionFactory $regionFactory = null,
+        OrderAddressRepositoryInterface $orderAddressRepository = null
     ) {
         $this->regionFactory = $regionFactory ?: ObjectManager::getInstance()->get(RegionFactory::class);
+        $this->orderAddressRepository = $orderAddressRepository ?: ObjectManager::getInstance()
+            ->get(OrderAddressRepositoryInterface::class);
         parent::__construct(
             $context,
             $coreRegistry,
@@ -87,6 +95,11 @@ public function __construct(
         );
     }
 
+    /**
+     * @var OrderAddressRepositoryInterface
+     */
+    private $orderAddressRepository;
+
     /**
      * Save order address
      *
@@ -105,7 +118,7 @@ public function execute()
         if ($data && $address->getId()) {
             $address->addData($data);
             try {
-                $address->save();
+                $this->orderAddressRepository->save($address);
                 $this->_eventManager->dispatch(
                     'admin_sales_order_address_update',
                     [
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php
index de41c3c737968..7e41c7417b38d 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php
@@ -24,18 +24,18 @@ public function execute()
     {
         $resultRedirect = $this->resultRedirectFactory->create();
         if (!$this->isValidPostRequest()) {
-            $this->messageManager->addError(__('You have not canceled the item.'));
+            $this->messageManager->addErrorMessage(__('You have not canceled the item.'));
             return $resultRedirect->setPath('sales/*/');
         }
         $order = $this->_initOrder();
         if ($order) {
             try {
                 $this->orderManagement->cancel($order->getEntityId());
-                $this->messageManager->addSuccess(__('You canceled the order.'));
+                $this->messageManager->addSuccessMessage(__('You canceled the order.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('You have not canceled the item.'));
+                $this->messageManager->addErrorMessage(__('You have not canceled the item.'));
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
             }
             return $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getId()]);
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php
index ce3a36729de95..48d1201c910be 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php
@@ -15,7 +15,7 @@ class Index extends \Magento\Sales\Controller\Adminhtml\Order\Create
     public function execute()
     {
         $this->_initSession();
-
+        $this->_getOrderCreateModel()->initRuleData();
         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
         $resultPage->setActiveMenu('Magento_Sales::sales_order');
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php
index 2d22c3343c2e7..efe5ed5b7332a 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Sales\Controller\Adminhtml\Order\Create;
 
-use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Exception\PaymentException;
 
 class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create
@@ -15,6 +15,7 @@ class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create
      * Saving quote and create order
      *
      * @return \Magento\Framework\Controller\ResultInterface
+     * @throws NotFoundException
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
@@ -23,6 +24,10 @@ public function execute()
         $path = 'sales/*/';
         $pathParams = [];
 
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         try {
             // check if the creation of a new customer is allowed
             if (!$this->_authorization->isAllowed('Magento_Customer::manage')
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
index 826a2a2a8b6c1..f71f567467bff 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
 
 use Magento\Backend\App\Action;
-use Magento\Sales\Model\Order;
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Sales\Model\Order\Email\Sender\CreditmemoSender;
 
 class Save extends \Magento\Backend\App\Action
@@ -56,12 +56,17 @@ public function __construct(
      * We can save only new creditmemo. Existing creditmemos are not editable
      *
      * @return \Magento\Backend\Model\View\Result\Redirect|\Magento\Backend\Model\View\Result\Forward
+     * @throws NotFoundException
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         $resultRedirect = $this->resultRedirectFactory->create();
         $data = $this->getRequest()->getPost('creditmemo');
         if (!empty($data['comment_text'])) {
@@ -109,7 +114,7 @@ public function execute()
                     $this->creditmemoSender->send($creditmemo);
                 }
 
-                $this->messageManager->addSuccess(__('You created the credit memo.'));
+                $this->messageManager->addSuccessMessage(__('You created the credit memo.'));
                 $this->_getSession()->getCommentText(true);
                 $resultRedirect->setPath('sales/order/view', ['order_id' => $creditmemo->getOrderId()]);
                 return $resultRedirect;
@@ -119,11 +124,11 @@ public function execute()
                 return $resultForward;
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $this->_getSession()->setFormData($data);
         } catch (\Exception $e) {
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
-            $this->messageManager->addError(__('We can\'t save the credit memo right now.'));
+            $this->messageManager->addErrorMessage(__('We can\'t save the credit memo right now.'));
         }
         $resultRedirect->setPath('sales/*/new', ['_current' => true]);
         return $resultRedirect;
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php
index bfd95666e7c48..e445f98c5aa54 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php
@@ -65,6 +65,10 @@ public function __construct(
     public function execute()
     {
         try {
+            if (!$this->getRequest()->isPost()) {
+                throw new \Magento\Framework\Exception\LocalizedException(__('Invalid request type.'));
+            }
+
             $this->creditmemoLoader->setOrderId($this->getRequest()->getParam('order_id'));
             $this->creditmemoLoader->setCreditmemoId($this->getRequest()->getParam('creditmemo_id'));
             $this->creditmemoLoader->setCreditmemo($this->getRequest()->getParam('creditmemo'));
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
index c45a1982784e1..8e2f1e951606d 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
@@ -190,13 +190,7 @@ public function execute()
                 }
             }
             $transactionSave->save();
-
-            if (!empty($data['do_shipment'])) {
-                $this->messageManager->addSuccess(__('You created the invoice and shipment.'));
-            } else {
-                $this->messageManager->addSuccess(__('The invoice has been created.'));
-            }
-
+            
             // send invoice/shipment emails
             try {
                 if (!empty($data['send_email'])) {
@@ -206,6 +200,7 @@ public function execute()
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
                 $this->messageManager->addError(__('We can\'t send the invoice email right now.'));
             }
+            
             if ($shipment) {
                 try {
                     if (!empty($data['send_email'])) {
@@ -216,6 +211,13 @@ public function execute()
                     $this->messageManager->addError(__('We can\'t send the shipment right now.'));
                 }
             }
+            
+            if (!empty($data['do_shipment'])) {
+                $this->messageManager->addSuccess(__('You created the invoice and shipment.'));
+            } else {
+                $this->messageManager->addSuccess(__('The invoice has been created.'));
+            }
+
             $this->_objectManager->get(\Magento\Backend\Model\Session::class)->getCommentText(true);
             return $resultRedirect->setPath('sales/order/view', ['order_id' => $orderId]);
         } catch (LocalizedException $e) {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php
index cdb4114f70976..de853bcb6f591 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php
@@ -7,7 +7,6 @@
 namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
 
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Backend\App\Action;
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\Controller\Result\RawFactory;
@@ -74,27 +73,27 @@ public function __construct(
     public function execute()
     {
         try {
+            if (!$this->getRequest()->isPost()) {
+                throw new LocalizedException(__('Invalid request type.'));
+            }
+
             $orderId = $this->getRequest()->getParam('order_id');
             $invoiceData = $this->getRequest()->getParam('invoice', []);
             $invoiceItems = isset($invoiceData['items']) ? $invoiceData['items'] : [];
             /** @var \Magento\Sales\Model\Order $order */
             $order = $this->_objectManager->create(\Magento\Sales\Model\Order::class)->load($orderId);
             if (!$order->getId()) {
-                throw new \Magento\Framework\Exception\LocalizedException(__('The order no longer exists.'));
+                throw new LocalizedException(__('The order no longer exists.'));
             }
 
             if (!$order->canInvoice()) {
-                throw new \Magento\Framework\Exception\LocalizedException(
-                    __('The order does not allow an invoice to be created.')
-                );
+                throw new LocalizedException(__('The order does not allow an invoice to be created.'));
             }
 
             $invoice = $this->invoiceService->prepareInvoice($order, $invoiceItems);
 
             if (!$invoice->getTotalQty()) {
-                throw new \Magento\Framework\Exception\LocalizedException(
-                    __('You can\'t create an invoice without products.')
-                );
+                throw new LocalizedException(__('You can\'t create an invoice without products.'));
             }
             $this->registry->register('current_invoice', $invoice);
             // Save invoice comment text in current invoice object in order to display it in corresponding view
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php
index 89820b41a68da..3b98d206d5f66 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php
@@ -26,18 +26,18 @@ public function execute()
             if ($status && $status->getStatus()) {
                 try {
                     $status->assignState($state, $isDefault, $visibleOnFront);
-                    $this->messageManager->addSuccess(__('You assigned the order status.'));
+                    $this->messageManager->addSuccessMessage(__('You assigned the order status.'));
                     return $resultRedirect->setPath('sales/*/');
                 } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                    $this->messageManager->addError($e->getMessage());
+                    $this->messageManager->addErrorMessage($e->getMessage());
                 } catch (\Exception $e) {
-                    $this->messageManager->addException(
+                    $this->messageManager->addExceptionMessage(
                         $e,
                         __('Something went wrong while assigning the order status.')
                     );
                 }
             } else {
-                $this->messageManager->addError(__('We can\'t find this order status.'));
+                $this->messageManager->addErrorMessage(__('We can\'t find this order status.'));
             }
             return $resultRedirect->setPath('sales/*/assign');
         }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php
index 849a7e2d0c817..06fa61c3263de 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php
@@ -12,6 +12,7 @@ class Save extends \Magento\Sales\Controller\Adminhtml\Order\Status
      * Save status form processing
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute()
     {
@@ -40,7 +41,9 @@ public function execute()
             $status = $this->_objectManager->create(\Magento\Sales\Model\Order\Status::class)->load($statusCode);
             // check if status exist
             if ($isNew && $status->getStatus()) {
-                $this->messageManager->addError(__('We found another order status with the same order status code.'));
+                $this->messageManager->addErrorMessage(
+                    __('We found another order status with the same order status code.')
+                );
                 $this->_getSession()->setFormData($data);
                 return $resultRedirect->setPath('sales/*/new');
             }
@@ -49,12 +52,12 @@ public function execute()
 
             try {
                 $status->save();
-                $this->messageManager->addSuccess(__('You saved the order status.'));
+                $this->messageManager->addSuccessMessage(__('You saved the order status.'));
                 return $resultRedirect->setPath('sales/*/');
-            } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+            } catch (LocalizedException $e) {
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException(
+                $this->messageManager->addExceptionMessage(
                     $e,
                     __('We can\'t add the order status right now.')
                 );
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php
index 04db430e1ffa4..44238725ef65c 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php
@@ -6,29 +6,36 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Status;
 
+use Magento\Framework\Exception\NotFoundException;
+
 class Unassign extends \Magento\Sales\Controller\Adminhtml\Order\Status
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         $state = $this->getRequest()->getParam('state');
         $status = $this->_initStatus();
         if ($status) {
             try {
                 $status->unassignState($state);
-                $this->messageManager->addSuccess(__('You have unassigned the order status.'));
+                $this->messageManager->addSuccessMessage(__('You have unassigned the order status.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException(
+                $this->messageManager->addExceptionMessage(
                     $e,
                     __('Something went wrong while unassigning the order.')
                 );
             }
         } else {
-            $this->messageManager->addError(__('We can\'t find this order status.'));
+            $this->messageManager->addErrorMessage(__('We can\'t find this order status.'));
         }
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
diff --git a/app/code/Magento/Sales/Helper/Admin.php b/app/code/Magento/Sales/Helper/Admin.php
index 45a6dd1252ba3..818acb2e5953f 100644
--- a/app/code/Magento/Sales/Helper/Admin.php
+++ b/app/code/Magento/Sales/Helper/Admin.php
@@ -3,8 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Helper;
 
+/**
+ * Sales admin helper.
+ */
 class Admin extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
@@ -148,26 +152,19 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)
             $links = [];
             $i = 1;
             $data = str_replace('%', '%%', $data);
-            $regexp = "/<a\s[^>]*href\s*?=\s*?([\"\']??)([^\" >]*?)\\1[^>]*>(.*)<\/a>/siU";
+            $regexp = "#(?J)<a"
+                ."(?:(?:\s+(?:(?:href\s*=\s*(['\"])(?<link>.*?)\\1\s*)|(?:\S+\s*=\s*(['\"])(.*?)\\3)\s*)*)|>)"
+                .">?(?:(?:(?<text>.*?)(?:<\/a\s*>?|(?=<\w))|(?<text>.*)))#si";
             while (preg_match($regexp, $data, $matches)) {
-                //Revert the sprintf escaping
-                $url = str_replace('%%', '%', $matches[2]);
-                $text = str_replace('%%', '%', $matches[3]);
-                //Check for an valid url
-                if ($url) {
-                    $urlScheme = strtolower(parse_url($url, PHP_URL_SCHEME));
-                    if ($urlScheme !== 'http' && $urlScheme !== 'https') {
-                        $url = null;
-                    }
-                }
-                //Use hash tag as fallback
-                if (!$url) {
-                    $url = '#';
+                $text = '';
+                if (!empty($matches['text'])) {
+                    $text = str_replace('%%', '%', $matches['text']);
                 }
+                $url = $this->filterUrl($matches['link'] ?? '');
                 //Recreate a minimalistic secure a tag
                 $links[] = sprintf(
                     '<a href="%s">%s</a>',
-                    htmlspecialchars($url, ENT_QUOTES, 'UTF-8', false),
+                    $this->escaper->escapeHtml($url),
                     $this->escaper->escapeHtml($text)
                 );
                 $data = str_replace($matches[0], '%' . $i . '$s', $data);
@@ -178,4 +175,30 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)
         }
         return $this->escaper->escapeHtml($data, $allowedTags);
     }
+
+    /**
+     * Filter the URL for allowed protocols.
+     *
+     * @param string $url
+     * @return string
+     */
+    private function filterUrl(string $url): string
+    {
+        if ($url) {
+            //Revert the sprintf escaping
+            $url = str_replace('%%', '%', $url);
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            $urlScheme = parse_url($url, PHP_URL_SCHEME);
+            $urlScheme = $urlScheme ? strtolower($urlScheme) : '';
+            if ($urlScheme !== 'http' && $urlScheme !== 'https') {
+                $url = null;
+            }
+        }
+
+        if (!$url) {
+            $url = '#';
+        }
+
+        return $url;
+    }
 }
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index 12d2a5396ddc4..1b3462cfdaac4 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -24,6 +24,7 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @since 100.0.2
  */
 class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\Model\Cart\CartInterface
@@ -398,6 +399,7 @@ protected function _getQuoteItem($item)
      */
     public function initRuleData()
     {
+        $this->_coreRegistry->unregister('rule_data');
         $this->_coreRegistry->register(
             'rule_data',
             new \Magento\Framework\DataObject(
@@ -415,7 +417,8 @@ public function initRuleData()
     /**
      * Set collect totals flag for quote
      *
-     * @param   bool $flag
+     * @param bool $flag
+     *
      * @return $this
      */
     public function setRecollect($flag)
@@ -514,6 +517,9 @@ public function initFromOrder(\Magento\Sales\Model\Order $order)
         /* Check if we edit guest order */
         $session->setCustomerId($order->getCustomerId() ?: false);
         $session->setStoreId($order->getStoreId());
+        if ($session->getData('reordered')) {
+            $this->getQuote()->setCustomerGroupId($order->getCustomerGroupId());
+        }
 
         /* Initialize catalog rule data with new session values */
         $this->initRuleData();
@@ -583,6 +589,7 @@ public function initFromOrder(\Magento\Sales\Model\Order $order)
         }
 
         $quote->getShippingAddress()->unsCachedItemsAll();
+        $quote->getBillingAddress()->unsCachedItemsAll();
         $quote->setTotalsCollectedFlag(false);
 
         $this->quoteRepository->save($quote);
@@ -769,7 +776,7 @@ public function getCustomerCompareList()
     public function getCustomerGroupId()
     {
         $groupId = $this->getQuote()->getCustomerGroupId();
-        if (!$groupId) {
+        if (!isset($groupId)) {
             $groupId = $this->getSession()->getCustomerGroupId();
         }
 
@@ -1125,6 +1132,7 @@ public function updateQuoteItems($items)
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->recollectCart();
             throw $e;
+            // phpcs:ignore Magento2.Exceptions.ThrowCatch
         } catch (\Exception $e) {
             $this->_logger->critical($e);
         }
@@ -1780,7 +1788,7 @@ public function _prepareCustomer()
                 ->setWebsiteId($store->getWebsiteId())
                 ->setCreatedAt(null);
             $customer = $this->_validateCustomerData($customer);
-        } else if (!$customer->getId()) {
+        } elseif (!$customer->getId()) {
             /** Create new customer */
             $customerBillingAddressDataObject = $this->getBillingAddress()->exportCustomerAddress();
             $customer->setSuffix($customerBillingAddressDataObject->getSuffix())
@@ -1852,6 +1860,7 @@ protected function _prepareCustomerAddress($customer, $quoteCustomerAddress)
         } elseif ($addressType == \Magento\Quote\Model\Quote\Address::ADDRESS_TYPE_SHIPPING) {
             try {
                 $billingAddressDataObject = $this->accountManagement->getDefaultBillingAddress($customer->getId());
+                // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
             } catch (\Exception $e) {
                 /** Billing address does not exist. */
             }
@@ -1993,6 +2002,7 @@ protected function _validate()
             } else {
                 try {
                     $method->validate();
+                    // phpcs:ignore Magento2.Exceptions.ThrowCatch
                 } catch (\Magento\Framework\Exception\LocalizedException $e) {
                     $this->_errors[] = $e->getMessage();
                 }
diff --git a/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php b/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
index 8a7bd0260df0f..999bb1786cf83 100644
--- a/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
+++ b/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
@@ -3,11 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\CronJob;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Sales\Api\OrderManagementInterface;
+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
 use Magento\Store\Model\StoresConfig;
 use Magento\Sales\Model\Order;
 
+/**
+ * Class that provides functionality of cleaning expired quotes by cron
+ */
 class CleanExpiredOrders
 {
     /**
@@ -16,20 +24,28 @@ class CleanExpiredOrders
     protected $storesConfig;
 
     /**
-     * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
+     * @var CollectionFactory
      */
     protected $orderCollectionFactory;
 
+    /**
+     * @var OrderManagementInterface
+     */
+    private $orderManagement;
+
     /**
      * @param StoresConfig $storesConfig
-     * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $collectionFactory
+     * @param CollectionFactory $collectionFactory
+     * @param OrderManagementInterface|null $orderManagement
      */
     public function __construct(
         StoresConfig $storesConfig,
-        \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $collectionFactory
+        CollectionFactory $collectionFactory,
+        OrderManagementInterface $orderManagement = null
     ) {
         $this->storesConfig = $storesConfig;
         $this->orderCollectionFactory = $collectionFactory;
+        $this->orderManagement = $orderManagement ?: ObjectManager::getInstance()->get(OrderManagementInterface::class);
     }
 
     /**
@@ -48,8 +64,10 @@ public function execute()
             $orders->getSelect()->where(
                 new \Zend_Db_Expr('TIME_TO_SEC(TIMEDIFF(CURRENT_TIMESTAMP, `updated_at`)) >= ' . $lifetime * 60)
             );
-            $orders->walk('cancel');
-            $orders->walk('save');
+
+            foreach ($orders->getAllIds() as $entityId) {
+                $this->orderManagement->cancel((int) $entityId);
+            }
         }
     }
 }
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index d20493060c3fd..f153e8362e6f9 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Api\Data\OrderStatusHistoryInterface;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Sales\Model\Order\ProductOption;
@@ -665,8 +666,8 @@ private function canCreditmemoForZeroTotalRefunded(float $totalRefunded): bool
         $isRefundZero = abs($totalRefunded) < .0001;
         // Case when Adjustment Fee (adjustment_negative) has been used for first creditmemo
         $hasAdjustmentFee = abs($totalRefunded - $this->getAdjustmentNegative()) < .0001;
-        $hasActinFlag = $this->getActionFlag(self::ACTION_FLAG_EDIT) === false;
-        if ($isRefundZero || $hasAdjustmentFee || $hasActinFlag) {
+        $hasActionFlag = $this->getActionFlag(self::ACTION_FLAG_EDIT) === false;
+        if ($isRefundZero || $hasAdjustmentFee || $hasActionFlag) {
             return false;
         }
 
@@ -682,15 +683,15 @@ private function canCreditmemoForZeroTotalRefunded(float $totalRefunded): bool
     private function canCreditmemoForZeroTotal(float $totalRefunded): bool
     {
         $totalPaid = $this->getTotalPaid();
-        //check if total paid is less than grandtotal
+        //check if total paid is less than grand total
         $checkAmtTotalPaid = $totalPaid <= $this->getGrandTotal();
         //case when amount is due for invoice
-        $dueAmountCondition = $this->canInvoice() && $checkAmtTotalPaid;
+        $hasDueAmount = $this->canInvoice() && $checkAmtTotalPaid;
         //case when paid amount is refunded and order has creditmemo created
         $creditmemos = ($this->getCreditmemosCollection() === false) ?
             true : (count($this->getCreditmemosCollection()) > 0);
         $paidAmtIsRefunded = $this->getTotalRefunded() == $totalPaid && $creditmemos;
-        if (($dueAmountCondition || $paidAmtIsRefunded)
+        if (($hasDueAmount || $paidAmtIsRefunded)
             || (!$checkAmtTotalPaid && abs($totalRefunded - $this->getAdjustmentNegative()) < .0001)
         ) {
             return false;
@@ -750,7 +751,7 @@ public function canComment()
     }
 
     /**
-     * Retrieve order shipment availability
+     * Retrieve order shipment availability.
      *
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -770,13 +771,29 @@ public function canShip()
         }
 
         foreach ($this->getAllItems() as $item) {
-            if ($item->getQtyToShip() > 0 && !$item->getIsVirtual() && !$item->getLockedDoShip()) {
+            if ($item->getQtyToShip() > 0
+                && !$item->getIsVirtual()
+                && !$item->getLockedDoShip()
+                && !$this->isRefunded($item)
+            ) {
                 return true;
             }
         }
+
         return false;
     }
 
+    /**
+     * Check if item is refunded.
+     *
+     * @param OrderItemInterface $item
+     * @return bool
+     */
+    private function isRefunded(OrderItemInterface $item): bool
+    {
+        return $item->getQtyRefunded() == $item->getQtyOrdered();
+    }
+
     /**
      * Retrieve order edit availability
      *
@@ -1281,12 +1298,12 @@ public function getTrackingNumbers()
      * Retrieve shipping method
      *
      * @param bool $asObject return carrier code and shipping method data as object
-     * @return string|\Magento\Framework\DataObject
+     * @return string|null|\Magento\Framework\DataObject
      */
     public function getShippingMethod($asObject = false)
     {
         $shippingMethod = parent::getShippingMethod();
-        if (!$asObject) {
+        if (!$asObject || !$shippingMethod) {
             return $shippingMethod;
         } else {
             list($carrierCode, $method) = explode('_', $shippingMethod, 2);
@@ -1383,7 +1400,7 @@ public function getParentItemsRandomCollection($limit = 1)
     }
 
     /**
-     * Get random items collection with or without related children
+     * Get random items collection with or without related children.
      *
      * @param int $limit
      * @param bool $nonChildrenOnly
@@ -1391,7 +1408,10 @@ public function getParentItemsRandomCollection($limit = 1)
      */
     protected function _getItemsRandomCollection($limit, $nonChildrenOnly = false)
     {
-        $collection = $this->_orderItemCollectionFactory->create()->setOrderFilter($this)->setRandomOrder();
+        $collection = $this->_orderItemCollectionFactory->create()
+            ->setOrderFilter($this)
+            ->setRandomOrder()
+            ->setPageSize($limit);
 
         if ($nonChildrenOnly) {
             $collection->filterByParent();
@@ -1405,9 +1425,7 @@ protected function _getItemsRandomCollection($limit, $nonChildrenOnly = false)
             $products
         )->setVisibility(
             $this->_productVisibility->getVisibleInSiteIds()
-        )->addPriceData()->setPageSize(
-            $limit
-        )->load();
+        )->addPriceData()->load();
 
         foreach ($collection as $item) {
             $product = $productsCollection->getItemById($item->getProductId());
@@ -2130,11 +2148,18 @@ public function getStatusHistories()
     /**
      * @inheritdoc
      *
-     * @return \Magento\Sales\Api\Data\OrderExtensionInterface|null
+     * @return \Magento\Sales\Api\Data\OrderExtensionInterface
      */
     public function getExtensionAttributes()
     {
-        return $this->_getExtensionAttributes();
+        $extensionAttributes = $this->_getExtensionAttributes();
+        if (null === $extensionAttributes) {
+            /** @var \Magento\Sales\Api\Data\OrderExtensionInterface $extensionAttributes */
+            $extensionAttributes = $this->extensionAttributesFactory->create(OrderInterface::class);
+            $this->setExtensionAttributes($extensionAttributes);
+        }
+
+        return $extensionAttributes;
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/Order/Address/Validator.php b/app/code/Magento/Sales/Model/Order/Address/Validator.php
index e6353f7f28899..e970cd66635f9 100644
--- a/app/code/Magento/Sales/Model/Order/Address/Validator.php
+++ b/app/code/Magento/Sales/Model/Order/Address/Validator.php
@@ -48,8 +48,8 @@ class Validator
 
     /**
      * @param DirectoryHelper $directoryHelper
-     * @param CountryFactory  $countryFactory
-     * @param EavConfig       $eavConfig
+     * @param CountryFactory $countryFactory
+     * @param EavConfig $eavConfig
      */
     public function __construct(
         DirectoryHelper $directoryHelper,
@@ -60,6 +60,17 @@ public function __construct(
         $this->countryFactory = $countryFactory;
         $this->eavConfig = $eavConfig ?: ObjectManager::getInstance()
             ->get(EavConfig::class);
+    }
+
+    /**
+     * Validate address.
+     *
+     * @param \Magento\Sales\Model\Order\Address $address
+     * @return array
+     */
+    public function validate(Address $address)
+    {
+        $warnings = [];
 
         if ($this->isTelephoneRequired()) {
             $this->required['telephone'] = 'Phone Number';
@@ -72,16 +83,7 @@ public function __construct(
         if ($this->isFaxRequired()) {
             $this->required['fax'] = 'Fax';
         }
-    }
 
-    /**
-     *
-     * @param \Magento\Sales\Model\Order\Address $address
-     * @return array
-     */
-    public function validate(Address $address)
-    {
-        $warnings = [];
         foreach ($this->required as $code => $label) {
             if (!$address->hasData($code)) {
                 $warnings[] = sprintf('%s is a required field', $label);
@@ -194,7 +196,10 @@ protected function isStateRequired($countryId)
     }
 
     /**
+     * Check whether telephone is required for address.
+     *
      * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function isTelephoneRequired()
     {
@@ -202,7 +207,10 @@ protected function isTelephoneRequired()
     }
 
     /**
+     * Check whether company is required for address.
+     *
      * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function isCompanyRequired()
     {
@@ -210,7 +218,10 @@ protected function isCompanyRequired()
     }
 
     /**
+     * Check whether fax is required for address.
+     *
      * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function isFaxRequired()
     {
diff --git a/app/code/Magento/Sales/Model/Order/AddressRepository.php b/app/code/Magento/Sales/Model/Order/AddressRepository.php
index 96dc531a82bf4..7543a298c3a4a 100644
--- a/app/code/Magento/Sales/Model/Order/AddressRepository.php
+++ b/app/code/Magento/Sales/Model/Order/AddressRepository.php
@@ -5,7 +5,11 @@
  */
 namespace Magento\Sales\Model\Order;
 
+use Magento\Customer\Model\AttributeMetadataDataProvider;
+use Magento\Customer\Model\ResourceModel\Form\Attribute\Collection as AttributeCollection;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Sales\Api\Data\OrderAddressInterface;
 use Magento\Sales\Model\ResourceModel\Metadata;
 use Magento\Sales\Api\Data\OrderAddressSearchResultInterfaceFactory as SearchResultFactory;
 use Magento\Framework\Exception\CouldNotDeleteException;
@@ -40,20 +44,88 @@ class AddressRepository implements \Magento\Sales\Api\OrderAddressRepositoryInte
      */
     private $collectionProcessor;
 
+    /**
+     * @var AttributeMetadataDataProvider
+     */
+    private $attributeMetadataDataProvider;
+
+    /**
+     * @var AttributeCollection|null
+     */
+    private $attributesList = null;
+
     /**
      * AddressRepository constructor.
      * @param Metadata $metadata
      * @param SearchResultFactory $searchResultFactory
      * @param CollectionProcessorInterface|null $collectionProcessor
+     * @param AttributeMetadataDataProvider $attributeMetadataDataProvider
      */
     public function __construct(
         Metadata $metadata,
         SearchResultFactory $searchResultFactory,
-        CollectionProcessorInterface $collectionProcessor = null
+        CollectionProcessorInterface $collectionProcessor = null,
+        AttributeMetadataDataProvider $attributeMetadataDataProvider = null
     ) {
         $this->metadata = $metadata;
         $this->searchResultFactory = $searchResultFactory;
         $this->collectionProcessor = $collectionProcessor ?: $this->getCollectionProcessor();
+        $this->attributeMetadataDataProvider = $attributeMetadataDataProvider ?: ObjectManager::getInstance()
+            ->get(AttributeMetadataDataProvider::class);
+    }
+
+    /**
+     * Format multiline and multiselect attributes
+     *
+     * @param OrderAddressInterface $orderAddress
+     *
+     * @return void
+     */
+    private function formatCustomAddressAttributes(OrderAddressInterface $orderAddress)
+    {
+        $attributesList = $this->getAttributesList();
+
+        foreach ($attributesList as $attribute) {
+            $attributeCode = $attribute->getAttributeCode();
+            if (!$orderAddress->hasData($attributeCode)) {
+                continue;
+            }
+            $attributeValue = $orderAddress->getData($attributeCode);
+            if (is_array($attributeValue)) {
+                $glue = $attribute->getFrontendInput() === 'multiline' ? PHP_EOL : ',';
+                $attributeValue = trim(implode($glue, $attributeValue));
+            }
+            $orderAddress->setData($attributeCode, $attributeValue);
+        }
+    }
+
+    /**
+     * Get list of custom attributes.
+     *
+     * @return AttributeCollection|null
+     */
+    private function getAttributesList()
+    {
+        if (!$this->attributesList) {
+            $attributesList = $this->attributeMetadataDataProvider->loadAttributesCollection(
+                'customer_address',
+                'customer_register_address'
+            );
+            $attributesList->addFieldToFilter('is_user_defined', 1);
+            $attributesList->addFieldToFilter(
+                'frontend_input',
+                [
+                    'in' => [
+                        'multiline',
+                        'multiselect',
+                    ],
+                ]
+            );
+
+            $this->attributesList = $attributesList;
+        }
+
+        return $this->attributesList;
     }
 
     /**
@@ -95,7 +167,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
         $searchResult = $this->searchResultFactory->create();
         $this->collectionProcessor->process($searchCriteria, $searchResult);
         $searchResult->setSearchCriteria($searchCriteria);
-        
+
         return $searchResult;
     }
 
@@ -141,6 +213,7 @@ public function deleteById($id)
      */
     public function save(\Magento\Sales\Api\Data\OrderAddressInterface $entity)
     {
+        $this->formatCustomAddressAttributes($entity);
         try {
             $this->metadata->getMapper()->save($entity);
             $this->registry[$entity->getEntityId()] = $entity;
diff --git a/app/code/Magento/Sales/Model/Order/Config.php b/app/code/Magento/Sales/Model/Order/Config.php
index 8999fca174de9..b972fc8c48eae 100644
--- a/app/code/Magento/Sales/Model/Order/Config.php
+++ b/app/code/Magento/Sales/Model/Order/Config.php
@@ -177,7 +177,7 @@ protected function maskStatusForArea($area, $code)
     /**
      * State label getter
      *
-     * @param   string $state
+     * @param string $state
      * @return \Magento\Framework\Phrase|string
      */
     public function getStateLabel($state)
@@ -209,7 +209,7 @@ public function getStates()
     {
         $states = [];
         foreach ($this->_getCollection() as $item) {
-            if ($item->getState()) {
+            if ($item->getState() && $item->getIsDefault()) {
                 $states[$item->getState()] = __($item->getData('label'));
             }
         }
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
index ecd5670a319e7..3d2c13cbaaaa9 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
@@ -89,6 +89,7 @@ public function __construct(
      * @param bool $forceSyncMode
      *
      * @return bool
+     * @throws \Exception
      */
     public function send(
         \Magento\Sales\Api\Data\OrderInterface $order,
@@ -96,7 +97,7 @@ public function send(
         \Magento\Sales\Api\Data\CreditmemoCommentCreationInterface $comment = null,
         $forceSyncMode = false
     ) {
-        $creditmemo->setSendEmail(true);
+        $creditmemo->setSendEmail($this->identityContainer->isEnabled());
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
             $transport = [
@@ -145,6 +146,7 @@ public function send(
      * @param \Magento\Sales\Api\Data\OrderInterface $order
      *
      * @return string
+     * @throws \Exception
      */
     private function getPaymentHtml(\Magento\Sales\Api\Data\OrderInterface $order)
     {
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 5ab9469441bef..d4c2e7b2d6854 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
@@ -75,10 +75,11 @@ public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
         }
 
         $isPartialShippingRefunded = false;
+        $baseOrderShippingAmount = (float)$order->getBaseShippingAmount();
         if ($invoice = $creditmemo->getInvoice()) {
             //recalculate tax amounts in case if refund shipping value was changed
-            if ($order->getBaseShippingAmount() && $creditmemo->getBaseShippingAmount()) {
-                $taxFactor = $creditmemo->getBaseShippingAmount() / $order->getBaseShippingAmount();
+            if ($baseOrderShippingAmount && $creditmemo->getBaseShippingAmount() !== null) {
+                $taxFactor = $creditmemo->getBaseShippingAmount() / $baseOrderShippingAmount;
                 $shippingTaxAmount = $invoice->getShippingTaxAmount() * $taxFactor;
                 $baseShippingTaxAmount = $invoice->getBaseShippingTaxAmount() * $taxFactor;
                 $totalDiscountTaxCompensation += $invoice->getShippingDiscountTaxCompensationAmount() * $taxFactor;
@@ -96,7 +97,6 @@ public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
             }
         } else {
             $orderShippingAmount = $order->getShippingAmount();
-            $baseOrderShippingAmount = $order->getBaseShippingAmount();
 
             $baseOrderShippingRefundedAmount = $order->getBaseShippingRefunded();
 
diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
index 50523015d87eb..da41f99a65c83 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
@@ -200,6 +200,7 @@ protected function initData($creditmemo, $data)
     {
         if (isset($data['shipping_amount'])) {
             $creditmemo->setBaseShippingAmount((double)$data['shipping_amount']);
+            $creditmemo->setBaseShippingInclTax((double)$data['shipping_amount']);
         }
         if (isset($data['adjustment_positive'])) {
             $creditmemo->setAdjustmentPositive($data['adjustment_positive']);
@@ -210,6 +211,8 @@ protected function initData($creditmemo, $data)
     }
 
     /**
+     * Calculate product options.
+     *
      * @param Item $orderItem
      * @param int $parentQty
      * @return int
diff --git a/app/code/Magento/Sales/Model/Order/CustomerAssignment.php b/app/code/Magento/Sales/Model/Order/CustomerAssignment.php
new file mode 100644
index 0000000000000..8bcfc1dc49de4
--- /dev/null
+++ b/app/code/Magento/Sales/Model/Order/CustomerAssignment.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Order;
+
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Event\ManagerInterface;
+
+class CustomerAssignment
+{
+    /**
+     * @var ManagerInterface
+     */
+    private $eventManager;
+
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * CustomerAssignment constructor.
+     *
+     * @param ManagerInterface $eventManager
+     * @param OrderRepositoryInterface $orderRepository
+     */
+    public function __construct(
+        ManagerInterface $eventManager,
+        OrderRepositoryInterface $orderRepository
+    ) {
+        $this->eventManager = $eventManager;
+        $this->orderRepository = $orderRepository;
+    }
+
+    /**
+     * @param OrderInterface $order
+     * @param CustomerInterface $customer
+     */
+    public function execute(OrderInterface $order, CustomerInterface $customer)/*: void*/
+    {
+        $order->setCustomerId($customer->getId());
+        $order->setCustomerIsGuest(false);
+        $this->orderRepository->save($order);
+
+        $this->eventManager->dispatch(
+            'sales_order_customer_assign_after',
+            [
+                'order'     => $order,
+                'customer'  => $customer
+            ]
+        );
+    }
+}
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 8004483583114..be7fa8296a264 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
@@ -96,10 +96,11 @@ public function __construct(
      * @param Creditmemo $creditmemo
      * @param bool $forceSyncMode
      * @return bool
+     * @throws \Exception
      */
     public function send(Creditmemo $creditmemo, $forceSyncMode = false)
     {
-        $creditmemo->setSendEmail(true);
+        $creditmemo->setSendEmail($this->identityContainer->isEnabled());
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
             $order = $creditmemo->getOrder();
@@ -146,6 +147,7 @@ public function send(Creditmemo $creditmemo, $forceSyncMode = false)
      *
      * @param Order $order
      * @return string
+     * @throws \Exception
      */
     protected function getPaymentHtml(Order $order)
     {
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 994fd79945cfd..bd67de7322a62 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
@@ -96,10 +96,11 @@ public function __construct(
      * @param Invoice $invoice
      * @param bool $forceSyncMode
      * @return bool
+     * @throws \Exception
      */
     public function send(Invoice $invoice, $forceSyncMode = false)
     {
-        $invoice->setSendEmail(true);
+        $invoice->setSendEmail($this->identityContainer->isEnabled());
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
             $order = $invoice->getOrder();
@@ -146,6 +147,7 @@ public function send(Invoice $invoice, $forceSyncMode = false)
      *
      * @param Order $order
      * @return string
+     * @throws \Exception
      */
     protected function getPaymentHtml(Order $order)
     {
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 f06da0de0fd00..7ac11ca073d26 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
@@ -97,7 +97,7 @@ public function __construct(
      */
     public function send(Order $order, $forceSyncMode = false)
     {
-        $order->setSendEmail(true);
+        $order->setSendEmail($this->identityContainer->isEnabled());
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
             if ($this->checkAndSend($order)) {
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 6729c746f5565..2b10d25b87a04 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
@@ -96,10 +96,11 @@ public function __construct(
      * @param Shipment $shipment
      * @param bool $forceSyncMode
      * @return bool
+     * @throws \Exception
      */
     public function send(Shipment $shipment, $forceSyncMode = false)
     {
-        $shipment->setSendEmail(true);
+        $shipment->setSendEmail($this->identityContainer->isEnabled());
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
             $order = $shipment->getOrder();
@@ -146,6 +147,7 @@ public function send(Shipment $shipment, $forceSyncMode = false)
      *
      * @param Order $order
      * @return string
+     * @throws \Exception
      */
     protected function getPaymentHtml(Order $order)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
index 7ec089b882972..5fb89b7855056 100644
--- a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
+++ b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Sales\Model\Order\Email;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Mail\Template\TransportBuilder;
 use Magento\Framework\Mail\Template\TransportBuilderByStore;
 use Magento\Sales\Model\Order\Email\Container\IdentityInterface;
@@ -29,11 +28,8 @@ class SenderBuilder
     protected $transportBuilder;
 
     /**
-     * @var TransportBuilderByStore
-     */
-    private $transportBuilderByStore;
-
-    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     *
      * @param Template $templateContainer
      * @param IdentityInterface $identityContainer
      * @param TransportBuilder $transportBuilder
@@ -48,9 +44,6 @@ public function __construct(
         $this->templateContainer = $templateContainer;
         $this->identityContainer = $identityContainer;
         $this->transportBuilder = $transportBuilder;
-        $this->transportBuilderByStore = $transportBuilderByStore ?: ObjectManager::getInstance()->get(
-            TransportBuilderByStore::class
-        );
     }
 
     /**
@@ -110,7 +103,7 @@ protected function configureEmailTemplate()
         $this->transportBuilder->setTemplateIdentifier($this->templateContainer->getTemplateId());
         $this->transportBuilder->setTemplateOptions($this->templateContainer->getTemplateOptions());
         $this->transportBuilder->setTemplateVars($this->templateContainer->getTemplateVars());
-        $this->transportBuilderByStore->setFromByStore(
+        $this->transportBuilder->setFromByScope(
             $this->identityContainer->getEmailIdentity(),
             $this->identityContainer->getStore()->getId()
         );
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
index aa0687bee504f..5ae3306ddf75b 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
@@ -89,6 +89,7 @@ public function __construct(
      * @param bool $forceSyncMode
      *
      * @return bool
+     * @throws \Exception
      */
     public function send(
         \Magento\Sales\Api\Data\OrderInterface $order,
@@ -96,7 +97,7 @@ public function send(
         \Magento\Sales\Api\Data\InvoiceCommentCreationInterface $comment = null,
         $forceSyncMode = false
     ) {
-        $invoice->setSendEmail(true);
+        $invoice->setSendEmail($this->identityContainer->isEnabled());
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
             $transport = [
@@ -145,6 +146,7 @@ public function send(
      * @param \Magento\Sales\Api\Data\OrderInterface $order
      *
      * @return string
+     * @throws \Exception
      */
     private function getPaymentHtml(\Magento\Sales\Api\Data\OrderInterface $order)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
index 0a393548069f5..3657f84d4445d 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
@@ -89,6 +89,7 @@ public function __construct(
      * @param bool $forceSyncMode
      *
      * @return bool
+     * @throws \Exception
      */
     public function send(
         \Magento\Sales\Api\Data\OrderInterface $order,
@@ -96,7 +97,7 @@ public function send(
         \Magento\Sales\Api\Data\ShipmentCommentCreationInterface $comment = null,
         $forceSyncMode = false
     ) {
-        $shipment->setSendEmail(true);
+        $shipment->setSendEmail($this->identityContainer->isEnabled());
 
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
             $transport = [
@@ -145,6 +146,7 @@ public function send(
      * @param \Magento\Sales\Api\Data\OrderInterface $order
      *
      * @return string
+     * @throws \Exception
      */
     private function getPaymentHtml(\Magento\Sales\Api\Data\OrderInterface $order)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Status/History.php b/app/code/Magento/Sales/Model/Order/Status/History.php
index 37aef2a5a29aa..d563f9f15b94a 100644
--- a/app/code/Magento/Sales/Model/Order/Status/History.php
+++ b/app/code/Magento/Sales/Model/Order/Status/History.php
@@ -142,7 +142,7 @@ public function getOrder()
      */
     public function getStatusLabel()
     {
-        if ($this->getOrder()) {
+        if ($this->getOrder() && $this->getStatus() !== null) {
             return $this->getOrder()->getConfig()->getStatusLabel($this->getStatus());
         }
         return null;
diff --git a/app/code/Magento/Sales/Model/Order/Webapi/ChangeOutputArray.php b/app/code/Magento/Sales/Model/Order/Webapi/ChangeOutputArray.php
new file mode 100644
index 0000000000000..a1015c102b3af
--- /dev/null
+++ b/app/code/Magento/Sales/Model/Order/Webapi/ChangeOutputArray.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Order\Webapi;
+
+use Magento\Sales\Api\Data\OrderItemInterface;
+use Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn;
+use Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer;
+
+/**
+ * Class for changing row total in response.
+ */
+class ChangeOutputArray
+{
+    /**
+     * @var DefaultColumn
+     */
+    private $priceRenderer;
+
+    /**
+     * @var DefaultRenderer
+     */
+    private $defaultRenderer;
+
+    /**
+     * @param DefaultColumn $priceRenderer
+     * @param DefaultRenderer $defaultRenderer
+     */
+    public function __construct(
+        DefaultColumn $priceRenderer,
+        DefaultRenderer $defaultRenderer
+    ) {
+        $this->priceRenderer = $priceRenderer;
+        $this->defaultRenderer = $defaultRenderer;
+    }
+
+    /**
+     * Changing row total for webapi order item response.
+     *
+     * @param OrderItemInterface $dataObject
+     * @param array $result
+     * @return array
+     */
+    public function execute(
+        OrderItemInterface $dataObject,
+        array $result
+    ): array {
+        $result[OrderItemInterface::ROW_TOTAL] = $this->priceRenderer->getTotalAmount($dataObject);
+        $result[OrderItemInterface::BASE_ROW_TOTAL] = $this->priceRenderer->getBaseTotalAmount($dataObject);
+        $result[OrderItemInterface::ROW_TOTAL_INCL_TAX] = $this->defaultRenderer->getTotalAmount($dataObject);
+        $result[OrderItemInterface::BASE_ROW_TOTAL_INCL_TAX] = $this->defaultRenderer->getBaseTotalAmount($dataObject);
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Sales/Model/OrderRepository.php b/app/code/Magento/Sales/Model/OrderRepository.php
index 691b803166050..6b1228ebd52b7 100644
--- a/app/code/Magento/Sales/Model/OrderRepository.php
+++ b/app/code/Magento/Sales/Model/OrderRepository.php
@@ -17,6 +17,10 @@
 use Magento\Sales\Api\Data\ShippingAssignmentInterface;
 use Magento\Sales\Model\Order\ShippingAssignmentBuilder;
 use Magento\Sales\Model\ResourceModel\Metadata;
+use Magento\Tax\Api\OrderTaxManagementInterface;
+use Magento\Payment\Api\Data\PaymentAdditionalInfoInterface;
+use Magento\Payment\Api\Data\PaymentAdditionalInfoInterfaceFactory;
+use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
 
 /**
  * Repository class
@@ -60,6 +64,21 @@ class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface
      */
     private $extensionAttributesJoinProcessor;
 
+    /**
+     * @var OrderTaxManagementInterface
+     */
+    private $orderTaxManagement;
+
+    /**
+     * @var PaymentAdditionalInfoFactory
+     */
+    private $paymentAdditionalInfoFactory;
+
+    /**
+     * @var JsonSerializer
+     */
+    private $serializer;
+
     /**
      * Constructor
      *
@@ -68,13 +87,19 @@ class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface
      * @param CollectionProcessorInterface|null $collectionProcessor
      * @param \Magento\Sales\Api\Data\OrderExtensionFactory|null $orderExtensionFactory
      * @param JoinProcessorInterface $extensionAttributesJoinProcessor
+     * @param OrderTaxManagementInterface|null $orderTaxManagement
+     * @param PaymentAdditionalInfoInterfaceFactory|null $paymentAdditionalInfoFactory
+     * @param JsonSerializer|null $serializer
      */
     public function __construct(
         Metadata $metadata,
         SearchResultFactory $searchResultFactory,
         CollectionProcessorInterface $collectionProcessor = null,
         \Magento\Sales\Api\Data\OrderExtensionFactory $orderExtensionFactory = null,
-        JoinProcessorInterface $extensionAttributesJoinProcessor = null
+        JoinProcessorInterface $extensionAttributesJoinProcessor = null,
+        OrderTaxManagementInterface $orderTaxManagement = null,
+        PaymentAdditionalInfoInterfaceFactory $paymentAdditionalInfoFactory = null,
+        JsonSerializer $serializer = null
     ) {
         $this->metadata = $metadata;
         $this->searchResultFactory = $searchResultFactory;
@@ -84,10 +109,16 @@ public function __construct(
             ->get(\Magento\Sales\Api\Data\OrderExtensionFactory::class);
         $this->extensionAttributesJoinProcessor = $extensionAttributesJoinProcessor
             ?: ObjectManager::getInstance()->get(JoinProcessorInterface::class);
+        $this->orderTaxManagement = $orderTaxManagement ?: ObjectManager::getInstance()
+            ->get(OrderTaxManagementInterface::class);
+        $this->paymentAdditionalInfoFactory = $paymentAdditionalInfoFactory ?: ObjectManager::getInstance()
+            ->get(PaymentAdditionalInfoInterfaceFactory::class);
+        $this->serializer = $serializer ?: ObjectManager::getInstance()
+            ->get(JsonSerializer::class);
     }
 
     /**
-     * load entity
+     * Load entity.
      *
      * @param int $id
      * @return \Magento\Sales\Api\Data\OrderInterface
@@ -105,12 +136,65 @@ public function get($id)
             if (!$entity->getEntityId()) {
                 throw new NoSuchEntityException(__('Requested entity doesn\'t exist'));
             }
+            $this->setOrderTaxDetails($entity);
             $this->setShippingAssignments($entity);
+            $this->setPaymentAdditionalInfo($entity);
             $this->registry[$id] = $entity;
         }
         return $this->registry[$id];
     }
 
+    /**
+     * Set order tax details to extension attributes.
+     *
+     * @param OrderInterface $order
+     * @return void
+     */
+    private function setOrderTaxDetails(OrderInterface $order)
+    {
+        $extensionAttributes = $order->getExtensionAttributes();
+        $orderTaxDetails = $this->orderTaxManagement->getOrderTaxDetails($order->getEntityId());
+        $appliedTaxes = $orderTaxDetails->getAppliedTaxes();
+
+        $extensionAttributes->setAppliedTaxes($appliedTaxes);
+        if (!empty($appliedTaxes)) {
+            $extensionAttributes->setConvertingFromQuote(true);
+        }
+
+        $items = $orderTaxDetails->getItems();
+        $extensionAttributes->setItemAppliedTaxes($items);
+
+        $order->setExtensionAttributes($extensionAttributes);
+    }
+
+    /**
+     * Set payment additional info to the order.
+     *
+     * @param OrderInterface $order
+     * @return void
+     */
+    private function setPaymentAdditionalInfo(OrderInterface $order)
+    {
+        $extensionAttributes = $order->getExtensionAttributes();
+        $paymentAdditionalInformation = $order->getPayment()->getAdditionalInformation();
+
+        $objects = [];
+        foreach ($paymentAdditionalInformation as $key => $value) {
+            /** @var PaymentAdditionalInfoInterface $additionalInformationObject */
+            $additionalInformationObject = $this->paymentAdditionalInfoFactory->create();
+            $additionalInformationObject->setKey($key);
+
+            if (!is_string($value)) {
+                $value = $this->serializer->serialize($value);
+            }
+
+            $additionalInformationObject->setValue($value);
+            $objects[] = $additionalInformationObject;
+        }
+        $extensionAttributes->setPaymentAdditionalInfo($objects);
+        $order->setExtensionAttributes($extensionAttributes);
+    }
+
     /**
      * Find entities by criteria
      *
@@ -126,6 +210,8 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
         $searchResult->setSearchCriteria($searchCriteria);
         foreach ($searchResult->getItems() as $order) {
             $this->setShippingAssignments($order);
+            $this->setOrderTaxDetails($order);
+            $this->setPaymentAdditionalInfo($order);
         }
         return $searchResult;
     }
@@ -179,6 +265,8 @@ public function save(\Magento\Sales\Api\Data\OrderInterface $entity)
     }
 
     /**
+     * Set shipping assignments to extension attributes.
+     *
      * @param OrderInterface $order
      * @return void
      */
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
index 3b127abbda732..820ef71a7ea79 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
@@ -9,12 +9,12 @@
 use Magento\Sales\Model\Order;
 
 /**
- * Class State
+ * Class to check and adjust order state/status.
  */
 class State
 {
     /**
-     * Check order status before save
+     * Check order status and adjust the status before save.
      *
      * @param Order $order
      * @return $this
@@ -23,25 +23,26 @@ class State
      */
     public function check(Order $order)
     {
-        if (!$order->isCanceled() && !$order->canUnhold() && !$order->canInvoice() && !$order->canShip()) {
-            if (0 == $order->getBaseGrandTotal() || $order->canCreditmemo()) {
-                if ($order->getState() !== Order::STATE_COMPLETE) {
-                    $order->setState(Order::STATE_COMPLETE)
-                        ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_COMPLETE));
-                }
-            } elseif ((float)$order->getTotalRefunded()
-                || !$order->getTotalRefunded() && $order->hasForcedCanCreditmemo()
-            ) {
-                if ($order->getState() !== Order::STATE_CLOSED) {
-                    $order->setState(Order::STATE_CLOSED)
-                        ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_CLOSED));
-                }
-            }
-        }
-        if ($order->getState() == Order::STATE_NEW && $order->getIsInProcess()) {
+        $currentState = $order->getState();
+        if ($currentState == Order::STATE_NEW && $order->getIsInProcess()) {
             $order->setState(Order::STATE_PROCESSING)
                 ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_PROCESSING));
+            $currentState = Order::STATE_PROCESSING;
+        }
+
+        if (!$order->isCanceled() && !$order->canUnhold() && !$order->canInvoice()) {
+            if (in_array($currentState, [Order::STATE_PROCESSING, Order::STATE_COMPLETE])
+                && !$order->canCreditmemo()
+                && !$order->canShip()
+            ) {
+                $order->setState(Order::STATE_CLOSED)
+                    ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_CLOSED));
+            } elseif ($currentState === Order::STATE_PROCESSING && !$order->canShip()) {
+                $order->setState(Order::STATE_COMPLETE)
+                    ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_COMPLETE));
+            }
         }
+
         return $this;
     }
 }
diff --git a/app/code/Magento/Sales/Model/Service/InvoiceService.php b/app/code/Magento/Sales/Model/Service/InvoiceService.php
index 718f55c3e551c..b66f59d2a2962 100644
--- a/app/code/Magento/Sales/Model/Service/InvoiceService.php
+++ b/app/code/Magento/Sales/Model/Service/InvoiceService.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Sales\Model\Service;
 
+use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Api\InvoiceManagementInterface;
 use Magento\Sales\Model\Order;
 
@@ -136,14 +137,14 @@ public function prepareInvoice(Order $order, array $qtys = [])
         $totalQty = 0;
         $qtys = $this->prepareItemsQty($order, $qtys);
         foreach ($order->getAllItems() as $orderItem) {
-            if (!$this->_canInvoiceItem($orderItem)) {
+            if (!$this->_canInvoiceItem($orderItem, $qtys)) {
                 continue;
             }
             $item = $this->orderConverter->itemToInvoiceItem($orderItem);
-            if ($orderItem->isDummy()) {
-                $qty = $orderItem->getQtyOrdered() ? $orderItem->getQtyOrdered() : 1;
-            } elseif (isset($qtys[$orderItem->getId()])) {
+            if (isset($qtys[$orderItem->getId()])) {
                 $qty = (double) $qtys[$orderItem->getId()];
+            } elseif ($orderItem->isDummy()) {
+                $qty = $orderItem->getQtyOrdered() ? $orderItem->getQtyOrdered() : 1;
             } elseif (empty($qtys)) {
                 $qty = $orderItem->getQtyToInvoice();
             } else {
@@ -170,38 +171,55 @@ private function prepareItemsQty(Order $order, array $qtys = [])
     {
         foreach ($order->getAllItems() as $orderItem) {
             if (empty($qtys[$orderItem->getId()])) {
-                continue;
-            }
-            if ($orderItem->isDummy()) {
-                if ($orderItem->getHasChildren()) {
-                    foreach ($orderItem->getChildrenItems() as $child) {
-                        if (!isset($qtys[$child->getId()])) {
-                            $qtys[$child->getId()] = $child->getQtyToInvoice();
-                        }
-                    }
-                } elseif ($orderItem->getParentItem()) {
-                    $parent = $orderItem->getParentItem();
-                    if (!isset($qtys[$parent->getId()])) {
-                        $qtys[$parent->getId()] = $parent->getQtyToInvoice();
-                    }
+                $parentId = $orderItem->getParentItemId();
+                if ($parentId && array_key_exists($parentId, $qtys)) {
+                    $qtys[$orderItem->getId()] = $qtys[$parentId];
+                } else {
+                    continue;
                 }
             }
+            $this->prepareItemQty($orderItem, $qtys);
         }
 
         return $qtys;
     }
 
+    /**
+     * Prepare qty to invoice item.
+     *
+     * @param OrderItemInterface $orderItem
+     * @param array $qtys
+     * @return void
+     */
+    private function prepareItemQty(OrderItemInterface $orderItem, array &$qtys)
+    {
+        if ($orderItem->isDummy()) {
+            if ($orderItem->getHasChildren()) {
+                foreach ($orderItem->getChildrenItems() as $child) {
+                    if (!isset($qtys[$child->getId()])) {
+                        $qtys[$child->getId()] = $child->getQtyToInvoice();
+                    }
+                }
+            } elseif ($orderItem->getParentItem()) {
+                $parent = $orderItem->getParentItem();
+                if (!isset($qtys[$parent->getId()])) {
+                    $qtys[$parent->getId()] = $parent->getQtyToInvoice();
+                }
+            }
+        }
+    }
+
     /**
      * Check if order item can be invoiced. Dummy item can be invoiced or with his children or
      * with parent item which is included to invoice
      *
-     * @param \Magento\Sales\Api\Data\OrderItemInterface $item
+     * @param OrderItemInterface $item
+     * @param array $qtys
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    protected function _canInvoiceItem(\Magento\Sales\Api\Data\OrderItemInterface $item)
+    protected function _canInvoiceItem(OrderItemInterface $item, array $qtys = [])
     {
-        $qtys = [];
         if ($item->getLockedDoInvoice()) {
             return false;
         }
diff --git a/app/code/Magento/Sales/Model/Service/OrderService.php b/app/code/Magento/Sales/Model/Service/OrderService.php
index e4a71f028cc82..2e062caca9a24 100644
--- a/app/code/Magento/Sales/Model/Service/OrderService.php
+++ b/app/code/Magento/Sales/Model/Service/OrderService.php
@@ -7,6 +7,7 @@
 
 use Magento\Sales\Api\OrderManagementInterface;
 use Magento\Payment\Gateway\Command\CommandException;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class OrderService
@@ -55,6 +56,11 @@ class OrderService implements OrderManagementInterface
      */
     private $paymentFailures;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * Constructor
      *
@@ -65,7 +71,8 @@ class OrderService implements OrderManagementInterface
      * @param \Magento\Sales\Model\OrderNotifier $notifier
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Sales\Model\Order\Email\Sender\OrderCommentSender $orderCommentSender
-     * @param \Magento\Sales\Api\PaymentFailuresInterface|null $paymentFailures
+     * @param \Magento\Sales\Api\PaymentFailuresInterface $paymentFailures
+     * @param LoggerInterface $logger
      */
     public function __construct(
         \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
@@ -75,7 +82,8 @@ public function __construct(
         \Magento\Sales\Model\OrderNotifier $notifier,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Sales\Model\Order\Email\Sender\OrderCommentSender $orderCommentSender,
-        \Magento\Sales\Api\PaymentFailuresInterface $paymentFailures = null
+        \Magento\Sales\Api\PaymentFailuresInterface $paymentFailures,
+        LoggerInterface $logger
     ) {
         $this->orderRepository = $orderRepository;
         $this->historyRepository = $historyRepository;
@@ -84,8 +92,8 @@ public function __construct(
         $this->notifier = $notifier;
         $this->eventManager = $eventManager;
         $this->orderCommentSender = $orderCommentSender;
-        $this->paymentFailures = $paymentFailures ? : \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Sales\Api\PaymentFailuresInterface::class);
+        $this->paymentFailures = $paymentFailures;
+        $this->logger = $logger;
     }
 
     /**
@@ -189,25 +197,31 @@ public function unHold($id)
     }
 
     /**
+     * Perform place order.
+     *
      * @param \Magento\Sales\Api\Data\OrderInterface $order
      * @return \Magento\Sales\Api\Data\OrderInterface
      * @throws \Exception
      */
     public function place(\Magento\Sales\Api\Data\OrderInterface $order)
     {
-        // transaction will be here
-        //begin transaction
         try {
             $order->place();
-            return $this->orderRepository->save($order);
-            //commit
+        } catch (CommandException $e) {
+            $this->paymentFailures->handle((int)$order->getQuoteId(), __($e->getMessage()));
+            throw $e;
+        }
+
+        try {
+            $order = $this->orderRepository->save($order);
         } catch (\Exception $e) {
-            if ($e instanceof CommandException) {
-                $this->paymentFailures->handle((int)$order->getQuoteId(), __($e->getMessage()));
-            }
+            $this->logger->critical(
+                'Saving order ' . $order->getIncrementId() . ' failed: ' . $e->getMessage()
+            );
             throw $e;
-            //rollback;
         }
+
+        return $order;
     }
 
     /**
diff --git a/app/code/Magento/Sales/Observer/AssignOrderToCustomerObserver.php b/app/code/Magento/Sales/Observer/AssignOrderToCustomerObserver.php
index f41ea6888264f..80e909941c5ce 100644
--- a/app/code/Magento/Sales/Observer/AssignOrderToCustomerObserver.php
+++ b/app/code/Magento/Sales/Observer/AssignOrderToCustomerObserver.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order\CustomerAssignment;
 
 /**
  * Assign order to customer created after issuing guest order.
@@ -24,11 +25,22 @@ class AssignOrderToCustomerObserver implements ObserverInterface
     private $orderRepository;
 
     /**
+     * @var CustomerAssignment
+     */
+    private $assignmentService;
+
+    /**
+     * AssignOrderToCustomerObserver constructor.
+     *
      * @param OrderRepositoryInterface $orderRepository
+     * @param CustomerAssignment $assignmentService
      */
-    public function __construct(OrderRepositoryInterface $orderRepository)
-    {
+    public function __construct(
+        OrderRepositoryInterface $orderRepository,
+        CustomerAssignment $assignmentService
+    ) {
         $this->orderRepository = $orderRepository;
+        $this->assignmentService = $assignmentService;
     }
 
     /**
@@ -44,11 +56,19 @@ public function execute(Observer $observer)
         if (array_key_exists('__sales_assign_order_id', $delegateData)) {
             $orderId = $delegateData['__sales_assign_order_id'];
             $order = $this->orderRepository->get($orderId);
-            if (!$order->getCustomerId()) {
-                //if customer ID wasn't already assigned then assigning.
-                $order->setCustomerId($customer->getId());
-                $order->setCustomerIsGuest(0);
-                $this->orderRepository->save($order);
+            if (!$order->getCustomerId() && $customer->getId()) {
+                // Assign customer info to order after customer creation.
+                $order->setCustomerId($customer->getId())
+                    ->setCustomerIsGuest(0)
+                    ->setCustomerEmail($customer->getEmail())
+                    ->setCustomerFirstname($customer->getFirstname())
+                    ->setCustomerLastname($customer->getLastname())
+                    ->setCustomerMiddlename($customer->getMiddlename())
+                    ->setCustomerPrefix($customer->getPrefix())
+                    ->setCustomerSuffix($customer->getSuffix())
+                    ->setCustomerGroupId($customer->getGroupId());
+
+                $this->assignmentService->execute($order, $customer);
             }
         }
     }
diff --git a/app/code/Magento/Sales/Setup/UpgradeData.php b/app/code/Magento/Sales/Setup/UpgradeData.php
index 77b96791e8cea..2e5a454e62fdd 100644
--- a/app/code/Magento/Sales/Setup/UpgradeData.php
+++ b/app/code/Magento/Sales/Setup/UpgradeData.php
@@ -15,6 +15,7 @@
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Quote\Model\QuoteFactory;
+use Magento\Sales\Model\Order\Address;
 use Magento\Sales\Model\OrderFactory;
 use Magento\Sales\Model\ResourceModel\Order\Address\CollectionFactory as AddressCollectionFactory;
 
@@ -42,27 +43,14 @@ class UpgradeData implements UpgradeDataInterface
      */
     private $aggregatedFieldConverter;
 
-    /**
-     * @var AddressCollectionFactory
-     */
-    private $addressCollectionFactory;
-
-    /**
-     * @var OrderFactory
-     */
-    private $orderFactory;
-
-    /**
-     * @var QuoteFactory
-     */
-    private $quoteFactory;
-
     /**
      * @var State
      */
     private $state;
 
     /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     *
      * @param SalesSetupFactory $salesSetupFactory
      * @param Config $eavConfig
      * @param AggregatedFieldDataConverter $aggregatedFieldConverter
@@ -83,9 +71,6 @@ public function __construct(
         $this->salesSetupFactory = $salesSetupFactory;
         $this->eavConfig = $eavConfig;
         $this->aggregatedFieldConverter = $aggregatedFieldConverter;
-        $this->addressCollectionFactory = $addressCollFactory;
-        $this->orderFactory = $orderFactory;
-        $this->quoteFactory = $quoteFactory;
         $this->state = $state;
     }
 
@@ -125,6 +110,7 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
      * @param string $setupVersion
      * @param SalesSetup $salesSetup
      * @return void
+     * @throws \Magento\Framework\DB\FieldDataConversionException
      */
     private function convertSerializedDataToJson($setupVersion, SalesSetup $salesSetup)
     {
@@ -173,32 +159,95 @@ private function convertSerializedDataToJson($setupVersion, SalesSetup $salesSet
 
     /**
      * Fill quote_address_id in table sales_order_address if it is empty.
-     *
      * @param ModuleDataSetupInterface $setup
      */
     public function fillQuoteAddressIdInSalesOrderAddress(ModuleDataSetupInterface $setup)
     {
-        $addressTable = $setup->getTable('sales_order_address');
-        $updateOrderAddress = $setup->getConnection()
+        $this->fillQuoteAddressIdInSalesOrderAddressByType($setup, Address::TYPE_SHIPPING);
+        $this->fillQuoteAddressIdInSalesOrderAddressByType($setup, Address::TYPE_BILLING);
+    }
+
+    /**
+     * @param ModuleDataSetupInterface $setup
+     * @param string $addressType
+     */
+    private function fillQuoteAddressIdInSalesOrderAddressByType(ModuleDataSetupInterface $setup, $addressType)
+    {
+        $salesConnection = $setup->getConnection('sales');
+
+        $orderTable = $setup->getTable('sales_order', 'sales');
+        $orderAddressTable = $setup->getTable('sales_order_address', 'sales');
+
+        $query = $salesConnection
             ->select()
+            ->from(
+                ['sales_order_address' => $orderAddressTable],
+                ['entity_id', 'address_type']
+            )
             ->joinInner(
-                ['sales_order' => $setup->getTable('sales_order')],
-                $addressTable . '.parent_id = sales_order.entity_id',
-                ['quote_address_id' => 'quote_address.address_id']
+                ['sales_order' => $orderTable],
+                'sales_order_address.parent_id = sales_order.entity_id',
+                ['quote_id' => 'sales_order.quote_id']
+            )
+            ->where('sales_order_address.quote_address_id IS NULL')
+            ->where('sales_order_address.address_type = ?', $addressType)
+            ->order('sales_order_address.entity_id');
+
+        $batchSize = 5000;
+        $result = $salesConnection->query($query);
+        $count = $result->rowCount();
+        $batches = ceil($count / $batchSize);
+
+        for ($batch = $batches; $batch > 0; $batch--) {
+            $query->limitPage($batch, $batchSize);
+            $result = $salesConnection->fetchAssoc($query);
+
+            $this->fillQuoteAddressIdInSalesOrderAddressProcessBatch($setup, $result, $addressType);
+        }
+    }
+
+    /**
+     * @param ModuleDataSetupInterface $setup
+     * @param array $orderAddresses
+     * @param string $addressType
+     */
+    private function fillQuoteAddressIdInSalesOrderAddressProcessBatch(
+        ModuleDataSetupInterface $setup,
+        array $orderAddresses,
+        $addressType
+    ) {
+        $salesConnection = $setup->getConnection('sales');
+        $quoteConnection = $setup->getConnection('checkout');
+
+        $quoteAddressTable = $setup->getTable('quote_address', 'checkout');
+        $quoteTable = $setup->getTable('quote', 'checkout');
+        $salesOrderAddressTable = $setup->getTable('sales_order_address', 'sales');
+
+        $query = $quoteConnection
+            ->select()
+            ->from(
+                ['quote_address' => $quoteAddressTable],
+                ['quote_id', 'address_id']
             )
             ->joinInner(
-                ['quote_address' => $setup->getTable('quote_address')],
-                'sales_order.quote_id = quote_address.quote_id 
-                AND ' . $addressTable . '.address_type = quote_address.address_type',
+                ['quote' => $quoteTable],
+                'quote_address.quote_id = quote.entity_id',
                 []
             )
-            ->where(
-                $addressTable . '.quote_address_id IS NULL'
-            );
-        $updateOrderAddress = $setup->getConnection()->updateFromSelect(
-            $updateOrderAddress,
-            $addressTable
-        );
-        $setup->getConnection()->query($updateOrderAddress);
+            ->where('quote.entity_id in (?)', array_column($orderAddresses, 'quote_id'))
+            ->where('address_type = ?', $addressType);
+
+        $quoteAddresses = $quoteConnection->fetchAssoc($query);
+
+        foreach ($orderAddresses as $orderAddress) {
+            $bind = [
+                'quote_address_id' => $quoteAddresses[$orderAddress['quote_id']]['address_id'] ?? null,
+            ];
+            $where = [
+                'entity_id = ?' => $orderAddress['entity_id']
+            ];
+
+            $salesConnection->update($salesOrderAddressTable, $bind, $where);
+        }
     }
 }
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreditMemoActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreditMemoActionGroup.xml
new file mode 100644
index 0000000000000..de1ed79db81ad
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreditMemoActionGroup.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="StartCreateCreditMemoFromOrderPage">
+        <click selector="{{AdminOrderDetailsMainActionsSection.creditMemo}}" stepKey="clickCreditMemoButton"/>
+        <conditionalClick selector="{{AdminConfirmationModalSection.ok}}" dependentSelector="{{AdminConfirmationModalSection.ok}}"
+                          visible="true" stepKey="acceptModal"/>
+        <waitForPageLoad time="30" stepKey="waitPageLoaded"/>
+        <seeInCurrentUrl url="{{AdminCreditMemoNewPage.url}}" stepKey="seeNewCreditMemoUrl"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Memo" stepKey="seeNewCreditMemoPageTitle"/>
+    </actionGroup>
+
+    <actionGroup name="SubmitCreditMemo">
+        <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"/>
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url('$grabOrderId')}}" stepKey="seeViewOrderPageCreditMemo"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
new file mode 100644
index 0000000000000..033b6e512f63a
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Check customer information is correct in invoice-->
+    <actionGroup name="VerifyBasicInvoiceInformation">
+        <arguments>
+            <argument name="customer"/>
+            <argument name="shippingAddress"/>
+            <argument name="billingAddress"/>
+            <argument name="customerGroup" defaultValue="GeneralCustomerGroup"/>
+        </arguments>
+        <see selector="{{AdminInvoiceOrderAndAccountInformationSection.customerName}}" userInput="{{customer.firstname}}" stepKey="seeCustomerName"/>
+        <see selector="{{AdminInvoiceOrderAndAccountInformationSection.customerEmail}}" userInput="{{customer.email}}" stepKey="seeCustomerEmail"/>
+        <see selector="{{AdminInvoiceOrderAndAccountInformationSection.customerGroup}}" userInput="{{customerGroup.code}}" stepKey="seeCustomerGroup"/>
+
+        <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.street[0]}}" stepKey="seeBillingAddressStreet"/>
+        <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.city}}" stepKey="seeBillingAddressCity"/>
+        <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.country}}" stepKey="seeBillingAddressCountry"/>
+        <see selector="{{AdminInvoiceAddressInformationSection.billingAddress}}" userInput="{{billingAddress.postcode}}" stepKey="seeBillingAddressPostcode"/>
+
+        <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.street[0]}}" stepKey="seeShippingAddressStreet"/>
+        <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.city}}" stepKey="seeShippingAddressCity"/>
+        <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.country}}" stepKey="seeShippingAddressCountry"/>
+        <see selector="{{AdminInvoiceAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.postcode}}" stepKey="seeShippingAddressPostcode"/>
+    </actionGroup>
+
+    <!--Check that product is in invoice items-->
+    <actionGroup name="SeeProductInInvoiceItems">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <seeElement selector="{{AdminInvoiceItemsSection.productColumn(product.name)}}" stepKey="seeProductInInvoiceItemsGrid"/>
+    </actionGroup>
+
+    <actionGroup name="StartCreateInvoiceFromOrderPage">
+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
+        <seeInCurrentUrl url="{{AdminInvoiceNewPage.url}}" stepKey="seeNewInvoiceUrl"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoicePageTitle"/>
+    </actionGroup>
+
+    <actionGroup name="CreatePartialInvoice">
+        <arguments>
+            <argument name="productSku" type="string"/>
+            <argument name="qtyToInvoice" type="string" defaultValue="1"/>
+        </arguments>
+        <fillField selector="{{AdminInvoiceItemsSection.itemQtyToInvoiceBySku(productSku)}}" userInput="{{qtyToInvoice}}" stepKey="changeQtyToInvoice"/>
+        <waitForElementVisible selector="{{AdminInvoiceItemsSection.updateQtyEnabled}}" stepKey="waitForUpdateQtyEnabled"/>
+        <click selector="{{AdminInvoiceItemsSection.updateQty}}" stepKey="updateQty"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForQtyToUpdate"/>
+        <waitForElementVisible selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="waitForSubmitInvoiceButton"/>
+    </actionGroup>
+
+    <actionGroup name="SubmitInvoice">
+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForMessageAppears"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url('$grabOrderId')}}" stepKey="seeViewOrderPageInvoice"/>
+    </actionGroup>
+
+    <!--Filter invoices by order id -->
+    <actionGroup name="filterInvoiceGridByOrderId">
+        <arguments>
+            <argument name="orderId" type="string"/>
+        </arguments>
+        <amOnPage url="{{InvoicesPage.url}}" stepKey="navigateToInvoicesGridPage"/>
+        <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+        <click selector="{{InvoicesGridSection.filter}}" stepKey="clickFilter"/>
+        <fillField selector="{{InvoicesFiltersSection.orderNum}}" userInput="{{orderId}}" stepKey="fillOrderIdForFilter"/>
+        <click selector="{{AdminOrdersGridSection.applyFilters}}" stepKey="clickApplyFilters"/>
+    </actionGroup>
+
+    <!--Filter invoices by order id -->
+    <actionGroup name="openInvoiceByOrderId" extends="filterInvoiceGridByOrderId">
+        <click selector="{{InvoicesGridSection.firstRow}}" stepKey="clickToOpenInvoice"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
index 508b9015f29ed..15d1de779f87e 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
@@ -18,6 +18,12 @@
         <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Canceled" stepKey="seeOrderStatusCanceled"/>
     </actionGroup>
 
+    <!--Cancel order that is in processing status-->
+    <actionGroup name="CancelProcessingOrder" extends="cancelPendingOrder">
+        <remove keyForRemoval="seeOrderStatusCanceled"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" after="seeCancelSuccessMessage" userInput="{{CONST.orderStatusComplete}}" stepKey="seeOrderStatusComplete"/>
+    </actionGroup>
+
     <!--Navigate to create order page (New Order -> Create New Customer)-->
     <actionGroup name="navigateToNewOrderPageNewCustomerSingleStore">
         <arguments>
@@ -60,17 +66,24 @@
     <actionGroup name="navigateToNewOrderPageExistingCustomer">
         <arguments>
             <argument name="customer"/>
+            <argument name="storeView" defaultValue="_defaultStore"/>
         </arguments>
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
         <waitForPageLoad stepKey="waitForIndexPageLoad"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
         <click selector="{{AdminMainActionsSection.add}}" stepKey="clickCreateNewOrder"/>
         <waitForPageLoad stepKey="waitForCustomerGridLoad"/>
+        <!--Clear grid filters-->
+        <conditionalClick selector="{{AdminOrderCustomersGridSection.resetButton}}" dependentSelector="{{AdminOrderCustomersGridSection.resetButton}}" visible="true" stepKey="clearExistingCustomerFilters"/>
+        <waitForPageLoad stepKey="waitPageLoadAfterFilterReset"/>
         <fillField userInput="{{customer.email}}" selector="{{AdminOrderCustomersGridSection.emailFilter}}" stepKey="filterEmail"/>
         <click selector="{{AdminOrderCustomersGridSection.searchButton}}" stepKey="applyFilter"/>
         <waitForPageLoad stepKey="waitForFilteredCustomerGridLoad"/>
         <click selector="{{AdminOrderCustomersGridSection.firstRow}}" stepKey="clickOnCustomer"/>
-        <waitForPageLoad stepKey="waitForCreateOrderPageLoad" />
+        <waitForPageLoad stepKey="waitForCreateOrderPageLoad"/>
+        <!-- Select store view if appears -->
+        <conditionalClick selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" dependentSelector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" visible="true" stepKey="selectStoreViewIfAppears"/>
+        <waitForPageLoad stepKey="waitForCreateOrderPageLoadAfterStoreSelect"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
     </actionGroup>
     <!--Add a simple product to order-->
@@ -79,6 +92,7 @@
             <argument name="product" defaultValue="_defaultProduct"/>
             <argument name="quantity" type="string" defaultValue="1"/>
         </arguments>
+        <waitForElementVisible selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="waitForAddProductVisible"/>
         <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
         <fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillSkuFilter"/>
         <click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearch"/>
@@ -123,6 +137,35 @@
         <fillField selector="{{AdminOrderFormConfigureProductSection.quantity}}" userInput="{{quantity}}" stepKey="fillQuantity"/>
         <click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOkConfigurablePopover"/>
     </actionGroup>
+    <!--Add bundle product to order -->
+    <actionGroup name="addBundleProductToOrder">
+        <arguments>
+            <argument name="product"/>
+            <argument name="quantity" type="string" defaultValue="1"/>
+        </arguments>
+        <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
+        <fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillSkuFilterBundle"/>
+        <click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearchBundle"/>
+        <scrollToTopOfPage stepKey="scrollToTop1"/>
+        <checkOption selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="selectBundleProduct"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForMask"/>
+        <waitForElementVisible selector="{{AdminOrderFormBundleProductSection.quantity}}" stepKey="waitForBundleOptionLoad"/>
+        <fillField selector="{{AdminOrderFormBundleProductSection.quantity}}" userInput="{{quantity}}" stepKey="fillQuantity"/>
+        <click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOk"/>
+        <scrollToTopOfPage stepKey="scrollToTop2"/>
+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
+    </actionGroup>
+    <!--Add bundle product to order and check product price in the grid-->
+    <actionGroup name="addBundleProductToOrderAndCheckPriceInGrid" extends="addBundleProductToOrder">
+        <arguments>
+            <argument name="price" type="string"/>
+        </arguments>
+        <grabTextFrom selector="{{AdminOrderFormItemsSection.rowPrice('1')}}" stepKey="grabProductPriceFromGrid" after="clickOk"/>
+        <assertEquals stepKey="assertProductPriceInGrid" message="Bundle product price in grid should be equal {{price}}" after="grabProductPriceFromGrid">
+            <expectedResult type="string">{{price}}</expectedResult>
+            <actualResult type="variable">grabProductPriceFromGrid</actualResult>
+        </assertEquals>
+    </actionGroup>
     <!--Fill customer billing address-->
     <actionGroup name="fillOrderCustomerInformation">
         <arguments>
@@ -138,6 +181,51 @@
         <fillField selector="{{AdminOrderFormBillingAddressSection.postalCode}}" userInput="{{address.postcode}}" stepKey="fillPostalCode"/>
         <fillField selector="{{AdminOrderFormBillingAddressSection.phone}}" userInput="{{address.telephone}}" stepKey="fillPhone"/>
     </actionGroup>
+    <!--Check customer billing address fields-->
+    <actionGroup name="CheckOrderCustomerBillingInformation">
+        <arguments>
+            <argument name="customer"/>
+            <argument name="address"/>
+        </arguments>
+        <seeInField selector="{{AdminOrderFormBillingAddressSection.firstName}}" userInput="{{customer.firstname}}" stepKey="checkFirstName"/>
+        <seeInField selector="{{AdminOrderFormBillingAddressSection.lastName}}" userInput="{{customer.lastname}}" stepKey="checkLastName"/>
+        <seeInField selector="{{AdminOrderFormBillingAddressSection.streetLine1}}" userInput="{{address.street[0]}}" stepKey="checkStreet"/>
+        <seeInField selector="{{AdminOrderFormBillingAddressSection.city}}" userInput="{{address.city}}" stepKey="checkCity"/>
+        <seeInField selector="{{AdminOrderFormBillingAddressSection.country}}" userInput="{{address.country_id}}" stepKey="checkCountry"/>
+        <seeInField selector="{{AdminOrderFormBillingAddressSection.state}}" userInput="{{address.state}}" stepKey="checkState"/>
+        <seeInField selector="{{AdminOrderFormBillingAddressSection.postalCode}}" userInput="{{address.postcode}}" stepKey="checkPostCode"/>
+        <seeInField selector="{{AdminOrderFormBillingAddressSection.phone}}" userInput="{{address.telephone}}" stepKey="checkTelephone"/>
+    </actionGroup>
+    <!--Fill customer shipping address-->
+    <actionGroup name="FillOrderCustomerShippingInformation">
+        <arguments>
+            <argument name="customer"/>
+            <argument name="address"/>
+        </arguments>
+        <fillField selector="{{AdminOrderFormShippingAddressSection.firstName}}" userInput="{{customer.firstname}}" stepKey="fillFirstName"/>
+        <fillField selector="{{AdminOrderFormShippingAddressSection.lastName}}" userInput="{{customer.lastname}}" stepKey="fillLastName"/>
+        <fillField selector="{{AdminOrderFormShippingAddressSection.streetLine1}}" userInput="{{address.street[0]}}" stepKey="fillStreetLine1"/>
+        <fillField selector="{{AdminOrderFormShippingAddressSection.city}}" userInput="{{address.city}}" stepKey="fillCity"/>
+        <selectOption selector="{{AdminOrderFormShippingAddressSection.country}}" userInput="{{address.country_id}}" stepKey="fillCountry"/>
+        <selectOption selector="{{AdminOrderFormShippingAddressSection.state}}" userInput="{{address.state}}" stepKey="fillState"/>
+        <fillField selector="{{AdminOrderFormShippingAddressSection.postalCode}}" userInput="{{address.postcode}}" stepKey="fillPostalCode"/>
+        <fillField selector="{{AdminOrderFormShippingAddressSection.phone}}" userInput="{{address.telephone}}" stepKey="fillPhone"/>
+    </actionGroup>
+    <!--Check customer shipping address fields-->
+    <actionGroup name="CheckOrderCustomerShippingInformation">
+        <arguments>
+            <argument name="customer"/>
+            <argument name="address"/>
+        </arguments>
+        <seeInField selector="{{AdminOrderFormShippingAddressSection.firstName}}" userInput="{{customer.firstname}}" stepKey="checkFirstName"/>
+        <seeInField selector="{{AdminOrderFormShippingAddressSection.lastName}}" userInput="{{customer.lastname}}" stepKey="checkLastName"/>
+        <seeInField selector="{{AdminOrderFormShippingAddressSection.streetLine1}}" userInput="{{address.street[0]}}" stepKey="checkStreet"/>
+        <seeInField selector="{{AdminOrderFormShippingAddressSection.city}}" userInput="{{address.city}}" stepKey="checkCity"/>
+        <seeInField selector="{{AdminOrderFormShippingAddressSection.country}}" userInput="{{address.country_id}}" stepKey="checkCountry"/>
+        <seeInField selector="{{AdminOrderFormShippingAddressSection.state}}" userInput="{{address.state}}" stepKey="checkState"/>
+        <seeInField selector="{{AdminOrderFormShippingAddressSection.postalCode}}" userInput="{{address.postcode}}" stepKey="checkPostCode"/>
+        <seeInField selector="{{AdminOrderFormShippingAddressSection.phone}}" userInput="{{address.telephone}}" stepKey="checkTelephone"/>
+    </actionGroup>
     <!--Select flat rate shipping method-->
     <actionGroup name="orderSelectFlatRateShipping">
         <click selector="{{AdminOrderFormPaymentSection.header}}" stepKey="unfocus"/>
@@ -203,4 +291,16 @@
         </arguments>
         <see selector="{{AdminOrderItemsOrderedSection.productSkuColumn}}" userInput="{{product.sku}}" stepKey="seeSkuInItemsOrdered"/>
     </actionGroup>
+
+    <!--Select Check Money payment method-->
+    <actionGroup name="SelectCheckMoneyPaymentMethod">
+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
+        <conditionalClick selector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" dependentSelector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" visible="true" stepKey="checkCheckMoneyOption"/>
+    </actionGroup>
+    <!--Submit order-->
+    <actionGroup name="SubmitOrderActionGroup">
+        <click selector="{{AdminOrderFormActionSection.submitOrder}}" stepKey="clickSubmitOrder"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You created the order." stepKey="seeOrderSuccessMessage"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
index 65a4b512394d8..e5646e0a64621 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
@@ -14,7 +14,6 @@
                 <argument name="orderId" type="string"/>
             </arguments>
             <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderGridPage"/>
-            <waitForPageLoad stepKey="waitForOrderGridLoad"/>
             <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
             <click selector="{{AdminOrdersGridSection.filters}}" stepKey="openOrderGridFilters"/>
             <fillField selector="{{AdminOrdersGridSection.idFilter}}" userInput="{{orderId}}" stepKey="fillOrderIdFilter"/>
@@ -22,7 +21,10 @@
         </actionGroup>
         <actionGroup name="AdminOrdersGridClearFiltersActionGroup">
             <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToGridOrdersPage"/>
-            <waitForPageLoad stepKey="waitForPageToLoad"/>
             <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.enabledFilters}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
         </actionGroup>
+        <actionGroup name="OpenOrderById" extends="filterOrderGridById">
+            <click selector="{{AdminDataGridTableSection.firstRow}}" after="clickOrderApplyFilters" stepKey="openOrderViewPage"/>
+            <waitForPageLoad after="openOrderViewPage" stepKey="waitForOrderViewPageOpened"/>
+        </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontSearchGuestOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontSearchGuestOrderActionGroup.xml
new file mode 100644
index 0000000000000..5a5943da91ce6
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontSearchGuestOrderActionGroup.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">
+    <!--Fill order information fields and click continue-->
+    <actionGroup name="StorefrontSearchGuestOrderActionGroup">
+        <arguments>
+            <argument name="orderId" type="string"/>
+            <argument name="orderLastName" type="string"/>
+            <argument name="orderEmail" type="string"/>
+        </arguments>
+        <amOnPage url="{{StorefrontGuestOrderSearchPage.url}}" stepKey="navigateToOrderAndReturnPage"/>
+        <fillField selector="{{StorefrontGuestOrderSearchSection.orderId}}" userInput="{{orderId}}" stepKey="fillOrderId"/>
+        <fillField selector="{{StorefrontGuestOrderSearchSection.billingLastName}}" userInput="{{orderLastName}}" stepKey="fillBillingLastName"/>
+        <fillField selector="{{StorefrontGuestOrderSearchSection.email}}" userInput="{{orderEmail}}" stepKey="fillEmail"/>
+        <click selector="{{StorefrontGuestOrderSearchSection.continue}}" stepKey="clickContinue"/>
+        <waitForPageLoad stepKey="waitForOrderInformationPageLoad"/>
+        <seeInCurrentUrl url="{{StorefrontGuestOrderViewPage.url}}" stepKey="seeOrderInformationUrl"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Sales/Test/Mftf/Data/AddressData.xml
new file mode 100644
index 0000000000000..920618a70dfb8
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Data/AddressData.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ShippingAddressTX" type="shipping_address">
+        <data key="firstname">Joe</data>
+        <data key="lastname">Buyer</data>
+        <data key="fullname">Joe Buyer</data>
+        <array key="street">
+            <item>11501 Domain Dr</item>
+            <item>#150</item>
+        </array>
+        <data key="city">Austin</data>
+        <data key="region">Texas</data>
+        <data key="region_code">TX</data>
+        <data key="region_id">1</data>
+        <data key="country_id">US</data>
+        <data key="postcode">78758</data>
+        <data key="email" unique="prefix">joe.buyer@email.com</data>
+        <data key="telephone">512-345-6789</data>
+    </entity>
+    <entity name="BillingAddressTX" type="billing_address">
+        <data key="firstname">Joe</data>
+        <data key="lastname">Buyer</data>
+        <data key="fullname">Joe Buyer</data>
+        <array key="street">
+            <item>11501 Domain Dr</item>
+            <item>#150</item>
+        </array>
+        <data key="city">Austin</data>
+        <data key="region">Texas</data>
+        <data key="region_code">TX</data>
+        <data key="region_id">1</data>
+        <data key="country_id">US</data>
+        <data key="postcode">78758</data>
+        <data key="email" unique="prefix">joe.buyer@email.com</data>
+        <data key="telephone">512-345-6789</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/ConstData.xml b/app/code/Magento/Sales/Test/Mftf/Data/ConstData.xml
new file mode 100644
index 0000000000000..523b13ae99c38
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Data/ConstData.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="CONST" type="CONST">
+        <data key="orderStatusComplete">Complete</data>
+        <data key="orderStatusClosed">Closed</data>
+        <data key="orderStatusPending">Pending</data>
+        <data key="orderStatusProcessing">Processing</data>
+    </entity>
+</entities>
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/OrderData.xml b/app/code/Magento/Sales/Test/Mftf/Data/OrderData.xml
index b4e0b4f50ff61..33f608231489a 100644
--- a/app/code/Magento/Sales/Test/Mftf/Data/OrderData.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Data/OrderData.xml
@@ -7,10 +7,15 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="AdminOrderSimpleProduct" type="order">
         <data key="subtotal">123.00</data>
         <data key="shipping">5.00</data>
         <data key="grandTotal">128.00</data>
     </entity>
+    <entity name="AdminOrderSimpleProductWithCatalogRule" type="order">
+        <data key="subtotal">110.70</data>
+        <data key="shipping">5.00</data>
+        <data key="grandTotal">115.70</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/SalesConfigData.xml b/app/code/Magento/Sales/Test/Mftf/Data/SalesConfigData.xml
index 035c3949820f6..15f18c2ad2a6c 100644
--- a/app/code/Magento/Sales/Test/Mftf/Data/SalesConfigData.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Data/SalesConfigData.xml
@@ -24,4 +24,23 @@
     <entity name="DisableMinimumOrderCheck" type="active">
         <data key="value">0</data>
     </entity>
+
+    <entity name="CheckoutShippingTotalsSortOrder" type="checkout_totals_sort_order">
+        <requiredEntity type="shipping">ShippingTotalsSortOrder</requiredEntity>
+    </entity>
+    <entity name="ShippingTotalsSortOrder" type="shipping">
+        <data key="value">27</data>
+    </entity>
+
+    <entity name="DefaultTotalsSortOrder" type="checkout_totals_sort_order">
+        <requiredEntity type="shipping">DefaultShippingTotalSortOrder</requiredEntity>
+    </entity>
+
+    <entity name="DefaultShippingTotalSortOrder" type="shipping">
+        <requiredEntity type="shipping_inherit_value">DefaultTotalFlagDisabled</requiredEntity>
+    </entity>
+
+    <entity name="DefaultTotalFlagDisabled" type="shipping_inherit_value">
+        <data key="value">0</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Sales/Test/Mftf/Metadata/sales_config-meta.xml b/app/code/Magento/Sales/Test/Mftf/Metadata/sales_config-meta.xml
index 77c8c8fa1c959..98c9fdb043dd6 100644
--- a/app/code/Magento/Sales/Test/Mftf/Metadata/sales_config-meta.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Metadata/sales_config-meta.xml
@@ -20,4 +20,48 @@
             </object>
         </object>
     </operation>
+    <operation name="SetCheckoutTotalsSortOrder" dataType="checkout_totals_sort_order" type="create" auth="adminFormKey" url="/admin/system_config/save/section/sales/" method="POST" successRegex="/messages-message-success/">
+        <object key="groups" dataType="checkout_totals_sort_order">
+            <object key="totals_sort" dataType="checkout_totals_sort_order">
+                <object key="fields" dataType="checkout_totals_sort_order">
+                    <object key="subtotal" dataType="subtotal">
+                        <field key="value">integer</field>
+                        <object key="inherit" dataType="subtotal_inherit_value">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="discount" dataType="discount">
+                        <field key="value">integer</field>
+                        <object key="inherit" dataType="discount_inherit_value">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="shipping" dataType="shipping">
+                        <field key="value">integer</field>
+                        <object key="inherit" dataType="shipping_inherit_value">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="tax" dataType="tax">
+                        <field key="value">integer</field>
+                        <object key="inherit" dataType="tax_inherit_value">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="weee" dataType="weee">
+                        <field key="value">integer</field>
+                        <object key="inherit" dataType="weee_inherit_value">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="grand_total" dataType="grand_total">
+                        <field key="value">integer</field>
+                        <object key="inherit" dataType="grand_total_inherit_value">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
 </operations>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceNewPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceNewPage.xml
index cfd5c5794a2de..4d01371f1efc5 100644
--- a/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceNewPage.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceNewPage.xml
@@ -11,6 +11,8 @@
     <page name="AdminInvoiceNewPage" url="/sales/order_invoice/new/order_id/" area="admin" module="Magento_Sales">
         <section name="AdminInvoiceNewSection"/>
         <section name="AdminInvoiceMainActionsSection"/>
+        <section name="AdminInvoiceOrderAndAccountInformationSection"/>
+        <section name="AdminInvoiceAddressInformationSection"/>
         <section name="AdminInvoiceTotalSection"/>
         <section name="AdminInvoiceItemsSection"/>
     </page>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderAddressEditPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderAddressEditPage.xml
new file mode 100644
index 0000000000000..603250e8bac7b
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderAddressEditPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminOrderAddressEditPage" url="admin/sales/order/address/address_id/{{var1}}/" parameterized="true"
+          area="admin" module="Magento_Sales">
+        <section name="AdminOrderAddressEditSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderCreatePage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderCreatePage.xml
index 6522dbf3d25ce..ca4239bb060ca 100644
--- a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderCreatePage.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderCreatePage.xml
@@ -7,16 +7,18 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="AdminOrderCreatePage" url="sales/order_create/index" area="admin" module="Magento_Sales">
         <section name="AdminOrderFormSelectWebsiteSection"/>
         <section name="AdminOrderFormActionSection"/>
         <section name="AdminOrderFormAccountSection"/>
         <section name="AdminOrderFormBillingAddressSection"/>
+        <section name="AdminOrderFormShippingAddressSection"/>
         <section name="AdminOrderFormPaymentSection"/>
         <section name="AdminOrderFormItemsSection"/>
         <section name="AdminOrderFormTotalSection"/>
         <section name="AdminOrderCustomersGridSection"/>
         <section name="AdminOrderFormConfigureProductSection"/>
+        <section name="AdminOrderStoreScopeTreeSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderDetailsPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderDetailsPage.xml
index 4280356278a88..c523bd0ed5f52 100644
--- a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderDetailsPage.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderDetailsPage.xml
@@ -7,8 +7,8 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="AdminOrderDetailsPage" url="sales/order/view/order_id/" area="admin" module="Magento_Sales">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminOrderDetailsPage" url="sales/order/view/order_id/{{order_id}}/" area="admin" module="Magento_Sales" parameterized="true">
         <section name="AdminMessagesSection"/>
         <section name="OrderDetailsMainActionsSection"/>
         <section name="OrderDetailsInformationSection"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderInvoiceViewPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderInvoiceViewPage.xml
new file mode 100644
index 0000000000000..9f21245224748
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderInvoiceViewPage.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="AdminOrderInvoiceViewPage" url="/sales/order_invoice/view/invoice_id/{{invoiceId}}" parameterized="true" area="admin" module="Magento_Sales">
+        <section name="AdminOrderInvoiceViewMainActionsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontGuestOrderSearchPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontGuestOrderSearchPage.xml
new file mode 100644
index 0000000000000..d2a4f4f0459c2
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontGuestOrderSearchPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontGuestOrderSearchPage" url="sales/guest/form/" module="Magento_Sales" area="storefront">
+        <section name="StorefrontGuestOrderSearchSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontGuestOrderViewPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontGuestOrderViewPage.xml
new file mode 100644
index 0000000000000..69c7fa76129ea
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontGuestOrderViewPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontGuestOrderViewPage" url="sales/guest/view/" module="Magento_Sales" area="storefront">
+        <section name="StorefrontGuestOrderViewSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoItemsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoItemsSection.xml
index d835bfe069683..15d4df39416f2 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoItemsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoItemsSection.xml
@@ -7,9 +7,9 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCreditMemoItemsSection">
         <element name="itemQtyToRefund" type="input" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-refund .qty-input" parameterized="true"/>
-        <element name="updateQty" type="button" selector=".order-creditmemo-tables tfoot button[data-ui-id='order-items-update-button']" timeout="30"/>
+        <element name="updateQty" type="button" selector=".order-creditmemo-tables tfoot button[data-ui-id='order-items-update-button']:not([class~='disabled'])" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
index 5fa5584fa8824..e087873fe62c2 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
@@ -7,9 +7,12 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCreditMemoTotalSection">
         <element name="total" type="text" selector="//table[contains(@class,'order-subtotal-table')]/tbody/tr/td[contains(text(), '{{total}}')]/following-sibling::td/span/span[contains(@class, 'price')]" parameterized="true"/>
-        <element name="submitRefundOffline" type="button" selector=".order-totals-actions button[data-ui-id='order-items-submit-button']" timeout="30"/>
+        <element name="refundShipping" type="input" selector=".order-subtotal-table tbody input[name='creditmemo[shipping_amount]']"/>
+        <element name="updateTotals" type="button" selector="button[class~='update-totals-button']:not([class~='disabled'])" timeout="30"/>
+        <element name="submitRefundOffline" type="button" selector=".order-totals-actions button[title='Refund Offline']:not([class~='disabled'])" timeout="30"/>
+        <element name="adjustmentRefund" type="input" selector=".order-subtotal-table tbody input[name='creditmemo[adjustment_positive]']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceAddressInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceAddressInformationSection.xml
new file mode 100644
index 0000000000000..a3fca029096ec
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceAddressInformationSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminInvoiceAddressInformationSection">
+        <element name="billingAddress" type="text" selector=".order-billing-address address"/>
+        <element name="billingAddressEdit" type="button" selector=".order-billing-address .actions a"/>
+        <element name="shippingAddress" type="text" selector=".order-shipping-address address"/>
+        <element name="shippingAddressEdit" type="button" selector=".order-shipping-address .actions a"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
index dbae8042b6554..93d1b32f58dc0 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
@@ -7,10 +7,13 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminInvoiceItemsSection">
         <element name="itemQty" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .col-qty .qty-table" parameterized="true"/>
         <element name="itemQtyToInvoice" type="input" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .col-qty-invoice .qty-input" parameterized="true"/>
         <element name="updateQty" type="button" selector=".order-invoice-tables tfoot button[data-ui-id='order-items-update-button']"/>
+        <element name="updateQtyEnabled" type="button" selector=".order-invoice-tables tfoot button[data-ui-id='order-items-update-button'][class='action-default scalable update-button']"/>
+        <element name="productColumn" type="text" selector="//*[contains(@class,'order-invoice-tables')]//td[@class = 'col-product']//div[contains(text(),'{{productName}}')]" parameterized="true"/>
+        <element name="itemQtyToInvoiceBySku" type="input" selector="//div[contains(@class,'product-sku-block') and contains(., '{{productSku}}')]/ancestor::tr//td[contains(@class,'col-qty-invoice')]//input" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
index c1a9718b29b1c..48dc5e5b109fd 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
@@ -7,8 +7,8 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminInvoiceMainActionsSection">
-        <element name="submitInvoice" type="button" selector=".action-default.scalable.save.submit-button.primary"/>
+        <element name="submitInvoice" type="button" selector=".action-default.scalable.save.submit-button.primary" timeout="60"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceOrderAndAccountInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceOrderAndAccountInformationSection.xml
new file mode 100644
index 0000000000000..e549f27155309
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceOrderAndAccountInformationSection.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="AdminInvoiceOrderAndAccountInformationSection">
+        <element name="customerName" type="text" selector=".order-account-information table tr:first-of-type > td span"/>
+        <element name="customerEmail" type="text" selector=".order-account-information table tr:nth-of-type(2) > td a"/>
+        <element name="customerGroup" type="text" selector=".order-account-information table tr:nth-of-type(3) > td"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderAddressEditSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderAddressEditSection.xml
new file mode 100644
index 0000000000000..5f2fbcbdde784
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderAddressEditSection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderAddressEditSection">
+        <element name="customAttribute" type="input" selector="input#{{arg}}" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderAddressInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderAddressInformationSection.xml
index a9755bbbc1b61..2e9c7ee13c848 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderAddressInformationSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderAddressInformationSection.xml
@@ -11,5 +11,6 @@
     <section name="AdminOrderAddressInformationSection">
         <element name="billingAddress" type="text" selector=".order-billing-address address"/>
         <element name="shippingAddress" type="text" selector=".order-shipping-address address"/>
+        <element name="editBillingAddress" type="text" selector="//div[@class='admin__page-section-item order-billing-address']//a[contains(text(),'Edit')]"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
index eac238584b030..3794def0ac77a 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminOrderDetailsMainActionsSection">
         <element name="back" type="button" selector="#back" timeout="30"/>
         <element name="cancel" type="button" selector="#order-view-cancel-button" timeout="30"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormAccountSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormAccountSection.xml
index 49c15345b6714..e0830440e6395 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormAccountSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormAccountSection.xml
@@ -13,5 +13,6 @@
         <element name="email" type="input" selector="#email"/>
         <element name="requiredGroup" type="text" selector=".admin__field.required[data-ui-id='billing-address-fieldset-element-form-field-group-id']"/>
         <element name="requiredEmail" type="text" selector=".admin__field.required[data-ui-id='billing-address-fieldset-element-form-field-email']"/>
+        <element name="emailErrorMessage" type="text" selector="#email-error"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBundleProductSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBundleProductSection.xml
new file mode 100644
index 0000000000000..44a488204f775
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBundleProductSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderFormBundleProductSection">
+        <element name="quantity" type="input" selector="#product_composite_configure_input_qty"/>
+        <element name="ok" type="button" selector=".modal-header .page-actions button[data-role='action']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml
index 83d417f6f8555..efffa48103b93 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml
@@ -9,8 +9,8 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormConfigureProductSection">
-        <element name="optionSelect" type="select" selector="//div[@class='product-options']/div/div/select[../../label[text() = '{{option}}']]" parameterized="true"/>
+        <element name="optionSelect" type="select" selector="//div[contains(@class, 'product-options')]//div//label[.='{{option}}']//following-sibling::*//select" parameterized="true"/>
         <element name="quantity" type="input" selector="#product_composite_configure_input_qty"/>
         <element name="ok" type="button" selector=".modal-header .page-actions button[data-role='action']" timeout="30"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsSection.xml
index c4cf5bd05bb6f..3cc09f6fef40f 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsSection.xml
@@ -14,6 +14,7 @@
         <element name="skuFilter" type="input" selector="#sales_order_create_search_grid_filter_sku"/>
         <element name="rowCheck" type="checkbox" selector="#sales_order_create_search_grid_table > tbody tr:nth-of-type({{row}}) td.col-select [type=checkbox]" parameterized="true"/>
         <element name="rowQty" type="input" selector="#sales_order_create_search_grid_table > tbody tr:nth-of-type({{row}}) td.col-qty [name='qty']" parameterized="true"/>
+        <element name="rowPrice" type="text" selector="#sales_order_create_search_grid_table > tbody tr:nth-of-type({{row}}) td.price" parameterized="true"/>
         <element name="addSelected" type="button" selector="#order-search .admin__page-section-title .actions button.action-add" timeout="30"/>
         <element name="configure" type="button" selector=".product-configure-block button.action-default.scalable" timeout="30"/>
         <element name="selectProduct" type="checkbox" selector="//td[contains(text(), '{{arg}}')]/following-sibling::td[contains(@class, 'col-select col-in_products')]" parameterized="true"/>
@@ -26,5 +27,7 @@
         <element name="removeItems" type="select" selector="//span[text()='{{arg}}']/parent::td/following-sibling::td/select[@class='admin__control-select']" parameterized="true"/>
         <element name="applyCoupon" type="input" selector="#coupons:code"/>
         <element name="customPriceField" type="input" selector="//*[@class='custom-price-block']/following-sibling::input"/>
+        <element name="productRowBySku" type="block" selector="//*[@id='order-items_grid']//tbody//td[contains(@class,'col-product')]/span[starts-with(@id,'order_item_') and text()='{{productName}}']/ancestor::tr" parameterized="true"/>
+        <element name="itemsOrderedSummaryText" type="text" selector="#order-items_grid tfoot tr"/>
     </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 419c7877246b2..22bff9c286d0f 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
@@ -14,5 +14,7 @@
         <element name="flatRateOption" type="radio" selector="#s_method_flatrate_flatrate" timeout="30"/>
         <element name="shippingError" type="text" selector="#order[has_shipping]-error"/>
         <element name="freeShippingOption" type="radio" selector="#s_method_freeshipping_freeshipping" timeout="30"/>
+        <element name="checkMoneyOption" type="radio" selector="#p_method_checkmo" timeout="30"/>
+        <element name="paymentBlock" type="text" selector="#order-billing_method" />
     </section>
 </sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormShippingAddressSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormShippingAddressSection.xml
new file mode 100644
index 0000000000000..aae90589a390f
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormShippingAddressSection.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderFormShippingAddressSection">
+        <element name="firstName" type="input" selector="#order-shipping_address_firstname" timeout="30"/>
+        <element name="lastName" type="input" selector="#order-shipping_address_lastname" timeout="30"/>
+        <element name="streetLine1" type="input" selector="#order-shipping_address_street0" timeout="30"/>
+        <element name="city" type="input" selector="#order-shipping_address_city" timeout="30"/>
+        <element name="country" type="select" selector="#order-shipping_address_country_id" timeout="30"/>
+        <element name="state" type="select" selector="#order-shipping_address_region_id" timeout="30"/>
+        <element name="postalCode" type="input" selector="#order-shipping_address_postcode" timeout="30"/>
+        <element name="phone" type="input" selector="#order-shipping_address_telephone" timeout="30"/>
+        <element name="saveAddress" type="checkbox" selector="#order-shipping_address_save_in_address_book"/>
+        <element name="sameAsBilling" type="checkbox" selector="#order-shipping_same_as_billing"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoiceViewMainActionsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoiceViewMainActionsSection.xml
new file mode 100644
index 0000000000000..56ff0c8182386
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoiceViewMainActionsSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderInvoiceViewMainActionsSection">
+        <element name="creditMemo" type="button" selector=".credit-memo" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml
index 9807d7364c7c6..2315c26414638 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml
@@ -24,6 +24,7 @@
         <element name="productNameColumn" type="text" selector=".edit-order-table .col-product .product-title"/>
         <element name="productNameOptions" type="text" selector=".edit-order-table .col-product .item-options"/>
         <element name="productSkuColumn" type="text" selector=".edit-order-table .col-product .product-sku-block"/>
+        <element name="productPrice" type="text" selector=".order-tables  tbody td:nth-child({{row}}) .price" parameterized="true"/>
         <element name="statusColumn" type="text" selector=".edit-order-table .col-status"/>
         <element name="originalPriceColumn" type="text" selector=".edit-order-table .col-original-price .price"/>
         <element name="priceColumn" type="text" selector=".edit-order-table .col-price .price"/>
@@ -34,4 +35,4 @@
         <element name="discountAmountColumn" type="text" selector=".edit-order-table .col-discont .price"/>
         <element name="totalColumn" type="text" selector=".edit-order-table .col-total .price"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStoreScopeTreeSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStoreScopeTreeSection.xml
new file mode 100644
index 0000000000000..cbe17499319f9
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStoreScopeTreeSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminOrderStoreScopeTreeSection">
+        <element name="storeTree" type="text" selector="div.tree-store-scope"/>
+        <element name="storeOption" type="radio" selector="//div[contains(@class, 'tree-store-scope')]//label[contains(text(), '{{name}}')]/preceding-sibling::input" parameterized="true" timeout="30"/>
+        <element name="storeForOrder" type="radio" selector="//div[contains(@class, 'tree-store-scope')]//label[contains(text(), '{{arg}}')]" parameterized="true" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderViewTabsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderViewTabsSection.xml
index 78d0a45bce460..0037c482fcd72 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderViewTabsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderViewTabsSection.xml
@@ -12,5 +12,6 @@
         <element name="invoices" type="button" selector="#sales_order_view_tabs_order_invoices"/>
         <element name="creditMemos" type="button" selector="#sales_order_view_tabs_order_creditmemos"/>
         <element name="shipments" type="button" selector="#sales_order_view_tabs_order_shipments"/>
+        <element name="commentsHistory" type="button" selector="#sales_order_view_tabs_order_history" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderSearchSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderSearchSection.xml
new file mode 100644
index 0000000000000..b3fd2eeb05c96
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderSearchSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontGuestOrderSearchSection">
+        <element name="orderId" type="input" selector="#oar-order-id"/>
+        <element name="billingLastName" type="input" selector="#oar-billing-lastname"/>
+        <element name="findOrderBy" type="select" selector="#quick-search-type-id"/>
+        <element name="email" type="input" selector="#oar_email"/>
+        <element name="continue" type="button" selector="//span[contains(text(), 'Continue')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderViewSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderViewSection.xml
new file mode 100644
index 0000000000000..31c6b4e95796e
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderViewSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontGuestOrderViewSection">
+        <element name="orderInformationTab" type="text" selector="//*[contains(@class,'nav')]/strong[contains(text(), 'Order Information')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminAbleToShipPartiallyInvoicedItemsTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminAbleToShipPartiallyInvoicedItemsTest.xml
index 66a9709473623..5c0ebe99287b5 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminAbleToShipPartiallyInvoicedItemsTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminAbleToShipPartiallyInvoicedItemsTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminAbleToShipPartiallyInvoicedItemsTest">
         <annotations>
             <title value="Ship Action is available for remaining of the partially invoiced items "/>
@@ -56,8 +56,10 @@
         <click selector="{{AdminOrderFormActionSection.submitOrder}}" after="seeCorrectGrandTotal" stepKey="clickSubmitOrder"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskTodisappear"/>
         <waitForPageLoad stepKey="waitForOrderSubmitted"/>
-        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" after="clickSubmitOrder" stepKey="seeViewOrderPage"/>
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url('$grabOrderId')}}" after="grabOrderId" stepKey="seeViewOrderPage"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You created the order." after="seeViewOrderPage" stepKey="seeSuccessMessage"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.orderStatusPending}}" stepKey="seeOrderPending"/>
         <grabTextFrom selector="|Order # (\d+)|" after="seeSuccessMessage" stepKey="getOrderId"/>
         <scrollTo selector="{{AdminOrderItemsOrderedSection.qtyColumn}}" after="getOrderId" stepKey="scrollToItemsOrdered"/>
         <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Ordered 10" after="scrollToItemsOrdered" stepKey="seeQtyOfItemsOrdered"/>
@@ -69,14 +71,16 @@
         <scrollTo selector="{{AdminInvoiceItemsSection.itemQtyToInvoice('1')}}" stepKey="scrollToItemsInvoiced"/>
         <!--Change invoiced items count-->
         <fillField selector="{{AdminInvoiceItemsSection.itemQtyToInvoice('1')}}" userInput="5" stepKey="invoiceHalfTheItems"/>
+        <waitForElementVisible selector="{{AdminInvoiceItemsSection.updateQtyEnabled}}" stepKey="waitForEnabledQtyToBeInvoicedSubmitButton"/>
         <click selector="{{AdminInvoiceItemsSection.updateQty}}" stepKey="updateQtyToBeInvoiced"/>
         <waitForLoadingMaskToDisappear stepKey="waitForQtyToUpdate"/>
         <waitForElementVisible selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="waitforSubmitInvoiceBtn"/>
         <!--Submit Invoice-->
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="submitInvoice"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForInvoiceToSubmit"/>
+        <waitForPageLoad stepKey="waitForInvoiceToSubmit1"/>
         <!--Invoice created successfully-->
         <see selector="{{AdminMessagesSection.success}}" userInput="The invoice has been created." stepKey="seeInvoiceSuccessMessage"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.orderStatusProcessing}}" stepKey="seeOrderProcessing1"/>
         <scrollTo selector="{{AdminOrderItemsOrderedSection.itemStatus('1')}}" stepKey="scrollToOrderItems"/>
         <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Invoiced 5" stepKey="see5itemsInvoiced"/>
         <scrollTo selector="{{AdminHeaderSection.pageTitle}}" stepKey="scrollToTopOfPage"/>
@@ -96,6 +100,7 @@
         <waitForLoadingMaskToDisappear stepKey="waitForShipmentToSubmit"/>
         <!--Verify shipment created successfully-->
         <see selector="{{AdminMessagesSection.success}}" userInput="The shipment has been created." after="submitShipment" stepKey="successfullShipmentCreation"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.orderStatusProcessing}}" stepKey="seeOrderProcessing2"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="$getOrderId" stepKey="seeOrderIdInPageTitleAfterShip"/>
         <scrollTo selector="{{AdminOrderItemsOrderedSection.itemStatus('1')}}" stepKey="scrollToOrderItems1"/>
         <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Shipped 5" stepKey="see5itemsShipped"/>
@@ -110,13 +115,16 @@
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Memo" stepKey="seeNewMemoInPageTitle"/>
         <!--Submit refund-->
         <scrollTo selector="{{AdminCreditMemoItemsSection.itemQtyToRefund('1')}}" stepKey="scrollToItemsToRefund"/>
-        <fillField selector="{{AdminCreditMemoItemsSection.itemQtyToRefund('1')}}" userInput="5" after="scrollToItemsToRefund" stepKey="fillQtyOfItemsToRefund"/>
-        <click selector="{{AdminCreditMemoItemsSection.updateQty}}" stepKey="updateRefundQty"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForRefundQtyToUpdate"/>
-        <waitForElementVisible selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="seeSubmitRefundBtn"/>
+        <seeInField selector="{{AdminCreditMemoItemsSection.itemQtyToRefund('1')}}" userInput="5" after="scrollToItemsToRefund" stepKey="checkQtyOfItemsToRefund"/>
+        <waitForElementVisible selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="waitForSubmitRefundOfflineEnabled"/>
         <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="submitRefundOffline"/>
         <!--Verify Credit Memo created successfully-->
+        <waitForElementVisible
+                selector="{{AdminMessagesSection.success}}"
+                time="20"
+                stepKey="waitForMessage"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You created the credit memo." after="submitRefundOffline" stepKey="seeCreditMemoSuccessMsg"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.orderStatusProcessing}}" stepKey="seeOrderProcessing3"/>
         <scrollTo selector="{{AdminOrderItemsOrderedSection.itemStatus('1')}}" stepKey="scrollToOrderItems2"/>
         <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Refunded 5" stepKey="see5itemsRefunded"/>
         <scrollTo selector="{{AdminHeaderSection.pageTitle}}" stepKey="scrollToTopOfPage2"/>
@@ -135,8 +143,10 @@
         <see selector="{{AdminInvoiceItemsSection.itemQty('1')}}" userInput="Refunded 5" stepKey="seeQtyOfItemsRefunded"/>
         <!--Submit Invoice-->
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="submitInvoice2" />
+        <waitForPageLoad stepKey="waitForInvoiceToSubmit2"/>
         <!--Invoice created successfully for the rest of the ordered items-->
-        <see selector="{{AdminMessagesSection.success}}" userInput="The invoice has been created." after="submitInvoice2" stepKey="seeInvoiceSuccessMessage2"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The invoice has been created." stepKey="seeInvoiceSuccessMessage2"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.orderStatusProcessing}}" stepKey="seeOrderProcessing4"/>
         <scrollTo selector="{{AdminOrderItemsOrderedSection.itemStatus('1')}}" stepKey="scrollToOrderItems3"/>
         <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Invoiced 10" stepKey="see10itemsInvoiced"/>
         <scrollTo selector="{{AdminHeaderSection.pageTitle}}" stepKey="scrollToTopOfPage3"/>
@@ -155,6 +165,7 @@
         <!--Submit Shipment-->
         <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" after="fillRestOfItemsToShip" stepKey="submitShipment2" />
         <see selector="{{AdminMessagesSection.success}}" userInput="The shipment has been created." after="submitShipment2" stepKey="successfullyCreatedShipment"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.orderStatusComplete}}" stepKey="seeOrderComplete"/>
 
         <!--Verify Items Status and Shipped Qty in the Items Ordered section-->
         <scrollTo selector="{{AdminOrderItemsOrderedSection.itemStatus('1')}}" stepKey="scrollToItemsOrdered2"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
index 379cb67d3e52f..9bd906a8abe08 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
@@ -72,19 +72,14 @@
         <click selector="{{AdminOrderFormActionSection.submitOrder}}" after="selectFreeShippingOption" stepKey="clickSubmitOrder"/>
 
         <!--Click *Invoice* button-->
-        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
-        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" after="clickInvoiceButton" stepKey="seeNewInvoiceInPageTitle"/>
-        <waitForPageLoad stepKey="waitForInvoicePageOpened"/>
-
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <waitForPageLoad stepKey="waitForInvoiceSaved"/>
-        <see userInput="The invoice has been created." stepKey="seeCorrectMessage"/>
+        <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startCreateInvoice"/>
+        <actionGroup ref="SubmitInvoice" stepKey="submitInvoice"/>
 
         <!--Verify that *Credit Memo* button is displayed-->
         <seeElement selector="{{AdminOrderDetailsMainActionsSection.creditMemo}}" stepKey="seeCreditMemo"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.creditMemo}}" stepKey="clickCreditMemoItem"/>
         <waitForPageLoad stepKey="waitForCreditMemoPageLoaded"/>
-        <see userInput="New Memo" stepKey="seeNewMemoPage"/>
-        <seeInCurrentUrl url="{{AdminCreditMemoNewPage.url}}" stepKey="seeUrlOnPage"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Memo" stepKey="seeNewMemoPageTitle"/>
+        <seeInCurrentUrl url="{{AdminCreditMemoNewPage.url}}" stepKey="seeNewMemoUrlOnPage"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCheckingCreditMemoTotalsTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCheckingCreditMemoTotalsTest.xml
new file mode 100644
index 0000000000000..e9fff90bdd632
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCheckingCreditMemoTotalsTest.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="AdminCheckingCreditMemoTotalsTest">
+        <annotations>
+            <features value="CreditMemo"/>
+            <stories value="MAGETWO-82400: Credit Memo - Wrong tax calculation! #10982"/>
+            <title value="Checking Credit Memo Totals"/>
+            <description value="Checking Credit Memo Totals"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-97140"/>
+            <group value="sales"/>
+            <group value="tax"/>
+            <skip>
+                <issueId value="MAGETWO-97826"/>
+            </skip>
+        </annotations>
+        <before>
+            <!--Create category-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <!--Create simple product-->
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="price">100</field>
+            </createData>
+            <!--Create Tax Rule-->
+            <createData entity="SimpleTaxRule" stepKey="createTaxRule"/>
+            <!--Create customer-->
+            <createData entity="Simple_US_CA_Customer" stepKey="createCustomer"/>
+            <!--Configure Tax Class for shipping-->
+            <createData entity="TaxClassForShippingConfig" stepKey="configureTaxClassForShipping"/>
+            <!--Configure Braintree-->
+            <createData entity="SandboxBraintreeConfig" stepKey="configureBraintree"/>
+            <!--Login to admin page-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!--Delete category-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <!--Delete simple product-->
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <!--Delete Tax Rule-->
+            <deleteData createDataKey="createTaxRule" stepKey="deleteTaxRule"/>
+            <!--Delete customer-->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <!--Restore default configuration for Tax Class for shipping-->
+            <createData entity="DefaultTaxClassForShippingConfig" stepKey="restoreTaxClassForShippingConfig"/>
+            <!--Restore default configuration for Braintree-->
+            <createData entity="DefaultBraintreeConfig" stepKey="restoreBraintreeConfig"/>
+            <!--Logout from admin page-->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create new order with existing customer-->
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderPage">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <!--Add simple product to order-->
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrder">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <!--Select Flat Rate shipping method-->
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping"/>
+        <!--Fill Braintree credit card for payment method-->
+        <actionGroup ref="AdminOrderFillBraintreeCreditCardActionGroup" stepKey="fillBraintreeCreditCard"/>
+        <!--Submit order-->
+        <click selector="{{AdminOrderFormActionSection.submitOrder}}" stepKey="submitOrder"/>
+        <waitForPageLoad stepKey="waitForSubmitOrder"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You created the order."
+             stepKey="seeSuccessMessage"/>
+
+        <!--Create invoice-->
+        <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startCreateInvoice"/>
+        <!--Submit invoice-->
+        <actionGroup ref="SubmitInvoice" stepKey="submitInvoice"/>
+
+        <!--Go to invoice page-->
+        <click selector="{{AdminOrderViewTabsSection.invoices}}" stepKey="clickInvoicesTab"/>
+        <waitForPageLoad stepKey="waitForInvoiceGridToLoad"/>
+        <see selector="{{AdminOrderInvoicesTabSection.gridRow('1')}}" userInput="$113.66" stepKey="seeInvoiceInGrid"/>
+        <click selector="{{AdminDataGridTableSection.rowViewAction('1')}}" stepKey="clickViewInvoice"/>
+
+        <!--Create Credit Memo-->
+        <click selector="{{AdminOrderInvoiceViewMainActionsSection.creditMemo}}" stepKey="clickCreditMemo"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Memo" stepKey="seeNewMemoPageTitle"/>
+        <fillField selector="{{AdminCreditMemoTotalSection.refundShipping}}" userInput="0" stepKey="setRefundShipping"/>
+        <waitForElementVisible selector="{{AdminCreditMemoTotalSection.updateTotals}}" time="30" stepKey="waitUpdateTotalsButtonEnabled"/>
+        <click selector="{{AdminCreditMemoTotalSection.updateTotals}}" stepKey="clickUpdateTotals"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForUpdateTotals"/>
+        <actionGroup ref="SubmitCreditMemo" stepKey="submitCreditMemo"/>
+
+        <!--Go to Credit Memo tab-->
+        <click selector="{{AdminOrderViewTabsSection.creditMemos}}" stepKey="clickCreditMemosTab"/>
+        <waitForPageLoad stepKey="waitForCreditMemosGridToLoad"/>
+
+        <!--Check refunded total -->
+        <see selector="{{AdminOrderCreditMemosTabSection.gridRow('1')}}" userInput="$108.25"
+             stepKey="seeCreditMemoInGrid"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWhenCartRuleDeletedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWhenCartRuleDeletedTest.xml
new file mode 100644
index 0000000000000..5386ade5dffd2
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWhenCartRuleDeletedTest.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="AdminCreateCreditMemoWhenCartRuleDeletedTest">
+        <annotations>
+            <stories value="MAGETWO-95722: Cannot create credit memo if the used in the order cart rule is deleted"/>
+            <title value="Checking creating of credit memo"/>
+            <description value="Verify Credit Memo created if the used in the order cart rule is deleted"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-97232"/>
+            <group value="sales"/>
+            <skip>
+                <issueId value="MAGETWO-97825"/>
+            </skip>
+        </annotations>
+        <before>
+            <!--Create product with category-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!--Login as admin-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!--Clear filters-->
+            <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderGridPage"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearOrdersFilters"/>
+            <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceRulePage"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearCartPriceRuleFilters"/>
+            <!--Delete product and category-->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <!--Log Out-->
+            <actionGroup ref="logout" stepKey="logOut"/>
+        </after>
+        <!--Create Cart Price Rule with a specific coupon-->
+        <actionGroup ref="AdminCreateCartPriceRuleSpecificCouponActionGroup" stepKey="createCartPriceRule">
+            <argument name="rule" value="TestSalesRule"/>
+            <argument name="userPerCoupon" value="99"/>
+        </actionGroup>
+        <!--Go to Storefront. Add product to cart-->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.name$$)}}" stepKey="goToProductPage"/>
+        <actionGroup ref="ApplyCartRuleOnStorefrontActionGroup" stepKey="addProductToCardAndApplyCartRule">
+            <argument name="product" value="$$createProduct$$"/>
+            <argument name="couponCode" value="{{_defaultCoupon.code}}"/>
+        </actionGroup>
+        <!--Proceed to checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutPage"/>
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
+            <argument name="customerVar" value="Simple_US_Customer"/>
+            <argument name="customerAddressVar" value="US_Address_TX"/>
+            <argument name="shippingMethod" value="Flat Rate"/>
+        </actionGroup>
+        <!--Select Check/Money payment-->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
+        <!--Place order-->
+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrder"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
+        <!--Open Order-->
+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById1">
+            <argument name="orderId" value="{$grabOrderNumber}"/>
+        </actionGroup>
+        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickOrderRow1"/>
+        <!--Create and Submit Invoice-->
+        <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="createInvoice"/>
+        <actionGroup ref="SubmitInvoice" stepKey="submitInvoice"/>
+        <!--Delete the cart price rule -->
+        <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteCartPriceRule">
+            <argument name="ruleName" value="{{TestSalesRule.name}}"/>
+        </actionGroup>
+        <!--Open Order-->
+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById2">
+            <argument name="orderId" value="{$grabOrderNumber}"/>
+        </actionGroup>
+        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickOrderRow2"/>
+        <!--Create Credit Memo-->
+        <click selector="{{AdminOrderDetailsMainActionsSection.creditMemo}}" stepKey="clickCreateCreditMemo"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Memo" stepKey="seeNewMemoInPageTitle"/>
+        <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickRefundOffline"/>
+        <!--Make sure that Credit memo was created successfully-->
+        <see selector="{{AdminMessagesSection.success}}" userInput="You created the credit memo." stepKey="seeCreditMemoSuccess"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
index 82ac6d9515ce6..951bc68bc100a 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminCreateInvoiceTest">
         <annotations>
             <features value="Invoice Creation"/>
@@ -23,22 +23,23 @@
             <createData entity="_defaultProduct" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="createCategory" stepKey="deleteProduct1"/>
             <deleteData createDataKey="createProduct" stepKey="deleteCategory1"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderGridFilters"/>
+            <amOnPage url="{{InvoicesPage.url}}" stepKey="navigateToInvoicesGridPage"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearInvoicesGridFilters"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
         </after>
 
         <!-- todo: Create an order via the api instead of driving the browser  -->
-        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad1"/>
-        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
-        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
-        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
-        <click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickCart"/>
-        <click selector="{{StorefrontMiniCartSection.goToCheckout}}" stepKey="goToCheckout"/>
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToProductPage"/>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProductToCart">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
         <fillField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
         <fillField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
         <fillField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>
@@ -52,35 +53,30 @@
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
         <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
         <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
         <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
         <!-- end todo -->
 
-        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        <actionGroup ref="OpenOrderById" stepKey="openCreatedOrder">
+            <argument name="orderId" value="{$grabOrderNumber}"/>
+        </actionGroup>
+        <!--Create invoice-->
+        <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startCreateInvoice"/>
+        <!--Submit invoice-->
+        <actionGroup ref="SubmitInvoice" stepKey="submitInvoice"/>
 
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onAdminOrdersPage"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
-        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
-        <fillField selector="{{OrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum"/>
-        <click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
-
-        <click selector="{{OrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
-        <click selector="{{OrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
-        <click selector="{{AdminInvoiceNewSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <see selector="{{OrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
+        <see selector="{{OrderDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus"/>
         <click selector="{{OrderDetailsOrderViewSection.invoices}}" stepKey="clickInvoices"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask5" />
         <see selector="{{OrderDetailsInvoicesSection.content}}" userInput="{$grabOrderNumber}" stepKey="seeInvoice1"/>
-        <see selector="{{OrderDetailsInvoicesSection.content}}" userInput="John Doe" stepKey="seeInvoice2"/>
-        <click selector="{{OrderDetailsOrderViewSection.information}}" stepKey="clickInformation"/>
-        <see selector="{{OrderDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus"/>
-        <amOnPage url="{{InvoicesPage.url}}" stepKey="goToInvoices"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask6" />
-        <click selector="{{InvoicesGridSection.filter}}" stepKey="clickFilters"/>
-        <fillField selector="{{InvoicesFiltersSection.orderNum}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum2"/>
-        <click selector="{{InvoicesGridSection.firstRow}}" stepKey="clickInvoice2"/>
-        <see selector="{{InvoiceDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus2"/>
+        <see selector="{{OrderDetailsInvoicesSection.content}}" userInput="{{CustomerEntityOne.fullname}}" stepKey="seeInvoice2"/>
+
+        <actionGroup ref="openInvoiceByOrderId" stepKey="openAndFilterInvoicesGrid">
+            <argument name="orderId" value="{$grabOrderNumber}"/>
+        </actionGroup>
+        <see selector="{{InvoiceDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeCorrectOrderStatus"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml
new file mode 100644
index 0000000000000..9808782f39f9b
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateOrderWithBundleProductTest">
+        <annotations>
+            <title value="Create Order in Admin and update bundle product configuration"/>
+            <stories value="MAGETWO-96394: Wrong price calculation for bundle product on creating order from the admin panel"/>
+            <description value="Add bundle product with bundle option items with default quantity 2 to order in Admin and check price in product grid"/>
+            <features value="Sales"/>
+            <severity value="AVERAGE"/>
+            <group value="Sales"/>
+        </annotations>
+
+        <before>
+            <!--Set default flat rate shipping method settings-->
+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
+
+            <!--Create simple customer-->
+            <createData entity="Simple_US_CA_Customer" stepKey="simpleCustomer"/>
+
+            <!--Create simple product 1-->
+            <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
+
+            <!--Create simple product 2-->
+            <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
+
+            <!--Create bundle product with checkbox bundle option-->
+            <createData entity="ApiBundleProduct" stepKey="product"/>
+            <createData entity="CheckboxOption" stepKey="checkboxBundleOption">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+
+            <!--Link simple product 1 to bundle option with default quantity 2-->
+            <createData entity="ApiBundleLink" stepKey="createBundleLink1">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="checkboxBundleOption"/>
+                <requiredEntity createDataKey="simple1"/>
+                <field key="qty">2</field>
+                <field key="is_default">1</field>
+            </createData>
+
+            <!--Link simple product 2 to bundle option with default quantity 2-->
+            <createData entity="ApiBundleLink" stepKey="createBundleLink2">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="checkboxBundleOption"/>
+                <requiredEntity createDataKey="simple2"/>
+                <field key="qty">2</field>
+                <field key="is_default">1</field>
+            </createData>
+
+            <!--Add drop-down bundle option-->
+            <createData entity="DropDownBundleOption" stepKey="dropDownBundleOption">
+                <requiredEntity createDataKey="product"/>
+            </createData>
+
+            <!--Link simple product 1 to drop-down bundle option with default quantity 2-->
+            <createData entity="ApiBundleLink" stepKey="createBundleLink3">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="dropDownBundleOption"/>
+                <requiredEntity createDataKey="simple1"/>
+                <field key="qty">2</field>
+                <field key="is_default">1</field>
+            </createData>
+
+            <!--Link simple product 2 to drop-down bundle option with default quantity 2-->
+            <createData entity="ApiBundleLink" stepKey="createBundleLink4">
+                <requiredEntity createDataKey="product"/>
+                <requiredEntity createDataKey="dropDownBundleOption"/>
+                <requiredEntity createDataKey="simple2"/>
+                <field key="qty">2</field>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <!--Create new customer order-->
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
+            <argument name="customer" value="$$simpleCustomer$$"/>
+        </actionGroup>
+
+        <!--Add bundle product to order and check product price in grid-->
+        <actionGroup ref="addBundleProductToOrderAndCheckPriceInGrid" stepKey="addBundleProductToOrder">
+            <argument name="product" value="$$product$$"/>
+            <argument name="quantity" value="1"/>
+            <argument name="price" value="$738.00"/>
+        </actionGroup>
+
+        <!--Select FlatRate shipping method-->
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="orderSelectFlatRateShippingMethod"/>
+
+        <!--Submit order-->
+        <click selector="{{AdminOrderFormActionSection.submitOrder}}" stepKey="submitOrder"/>
+
+        <!--Verify order information-->
+        <actionGroup ref="verifyCreatedOrderInformation" stepKey="verifyCreatedOrderInformation"/>
+
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+
+            <deleteData createDataKey="product" stepKey="delete"/>
+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
+            <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
+            <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml
index e339f8056e96d..70b39a664c0f2 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml
@@ -61,7 +61,8 @@
 
         <!--Submit Order and verify information-->
         <click selector="{{AdminOrderFormActionSection.submitOrder}}" stepKey="clickSubmitOrder"/>
-        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage"/>
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url('$grabOrderId')}}" stepKey="seeViewOrderPage"/>
 
         <see selector="{{AdminMessagesSection.success}}" userInput="You created the order." stepKey="seeSuccessMessage"/>
         <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeOrderPendingStatus"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreditMemoTotalAfterShippingDiscountTest.xml
similarity index 91%
rename from app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
rename to app/code/Magento/Sales/Test/Mftf/Test/AdminCreditMemoTotalAfterShippingDiscountTest.xml
index a703f5e690cfa..2f4271d56038b 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreditMemoTotalAfterShippingDiscountTest.xml
@@ -7,8 +7,8 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <test name="CreditMemoTotalAfterShippingDiscountTest">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreditMemoTotalAfterShippingDiscountTest">
         <annotations>
             <features value="Credit memo"/>
             <title value="Verify credit memo grand total after shipping discount is applied via Cart Price Rule"/>
@@ -26,6 +26,8 @@
             <actionGroup ref="SetTaxClassForShipping" stepKey="setShippingTaxClass"/>
         </before>
         <after>
+            <!--Clear filter in orders grid-->
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="ordersGridClearFilters"/>
             <actionGroup ref="ResetTaxClassForShipping" stepKey="resetTaxClassForShipping"/>
             <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteSalesRule">
                 <argument name="ruleName" value="{{ApiSalesRule.name}}"/>
@@ -89,14 +91,15 @@
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
 
         <!-- Search for Order in the order grid -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
-        <fillField selector="{{OrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum"/>
-        <click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById">
+            <argument name="orderId" value="$grabOrderNumber"/>
+        </actionGroup>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
 
         <!-- Create invoice -->
-        <click selector="{{OrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickOrderRow"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.orderStatusPending}}" stepKey="seeOrderPending"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton"/>
 
@@ -114,6 +117,7 @@
         <grabTextFrom selector="{{AdminInvoiceTotalSection.grandTotal}}" stepKey="grabInvoiceGrandTotal" after="seeCorrectGrandTotal"/>
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
         <see selector="{{OrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage1"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{CONST.orderStatusProcessing}}" stepKey="seeOrderProcessing"/>
 
         <!--Create Credit Memo-->
         <comment userInput="Admin creates credit memo" stepKey="createCreditMemoComment"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml
index 0bba86ae0ed87..e4e2c44887840 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml
@@ -24,7 +24,7 @@
                 <field key="price">100</field>
             </createData>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-            <createData entity="DisableFlatRateShippingMethodConfig" stepKey="disableFlatRate"/>
+            <magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
             <createData entity="FreeShippinMethodConfig" stepKey="enableFreeShippingMethod"/>
             <createData entity="setFreeShippingSubtotal" stepKey="setFreeShippingSubtotal"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -34,7 +34,7 @@
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-            <createData entity="FlatRateShippingMethodConfig" stepKey="enableFlatRate"/>
+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
             <createData entity="FreeShippinMethodDefault" stepKey="disableFreeShippingMethod"/>
             <createData entity="setFreeShippingSubtotalToDefault" stepKey="setFreeShippingSubtotalToDefault"/>
             <actionGroup ref="logout" stepKey="logout"/>
@@ -60,4 +60,4 @@
         <dontSeeElement selector="{{AdminMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
         <seeElement selector="{{AdminMessagesSection.errorMessage}}" 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
new file mode 100644
index 0000000000000..0a2d67ac85bd5
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceTest.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="AdminReorderWithCatalogPriceTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="Admin create order"/>
+            <title value="Reorder doesn't show discount price in Order Totals block"/>
+            <description value="Reorder doesn't show discount price in Order Totals block"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-16768"/>
+            <useCaseId value="MAGETWO-99674"/>
+            <group value="sales"/>
+            <group value="catalogRule"/>
+        </annotations>
+        <before>
+            <!--Create the catalog price rule -->
+            <createData entity="CatalogRuleToPercent" stepKey="createCatalogRule"/>
+            <!--Create product-->
+            <createData entity="SimpleProduct3" stepKey="createSimpleProductApi"/>
+            <!--Create order via API-->
+            <createData entity="GuestCart" stepKey="createGuestCart"/>
+            <createData entity="SimpleCartItem" stepKey="addCartItem">
+                <requiredEntity createDataKey="createGuestCart"/>
+                <requiredEntity createDataKey="createSimpleProductApi"/>
+            </createData>
+            <createData entity="GuestAddressInformation" stepKey="addGuestOrderAddress">
+                <requiredEntity createDataKey="createGuestCart"/>
+            </createData>
+            <updateData createDataKey="createGuestCart" entity="GuestOrderPaymentMethod" stepKey="sendGuestPaymentInformation">
+                <requiredEntity createDataKey="createGuestCart"/>
+            </updateData>
+            <!--END Create order via API-->
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProductApi" stepKey="deleteSimpleProductApi"/>
+            <!-- Delete the rule -->
+            <actionGroup ref="RemoveCatalogPriceRule" stepKey="deletePriceRule">
+                <argument name="ruleName" value="CatalogRuleToPercent.name" />
+            </actionGroup>
+            <!--Clear all filters in grid-->
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="resetCatalogRuleGridFilters"/>
+            <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Login as admin -->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <!--Open order by Id-->
+        <actionGroup ref="OpenOrderById" stepKey="openOrderById">
+            <argument name="orderId" value="$createGuestCart.return$"/>
+        </actionGroup>
+        <!--Reorder-->
+        <click selector="{{AdminOrderDetailsMainActionsSection.reorder}}" stepKey="clickReorder"/>
+        <!--Verify order item row-->
+        <waitForElementVisible selector="{{AdminOrderItemsOrderedSection.productPrice('2')}}" stepKey="waitOrderItemPriceToBeVisible"/>
+        <see selector="{{AdminOrderItemsOrderedSection.productPrice('2')}}" userInput="${{AdminOrderSimpleProductWithCatalogRule.subtotal}}" stepKey="seeOrderItemPrice"/>
+        <!--Verify totals on Order page-->
+        <scrollTo selector="{{AdminOrderFormTotalSection.grandTotal}}" stepKey="scrollToOrderGrandTotal"/>
+        <waitForElementVisible selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" stepKey="waitOrderSubtotalToBeVisible"/>
+        <see selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" userInput="${{AdminOrderSimpleProductWithCatalogRule.subtotal}}" stepKey="seeOrderSubTotal"/>
+        <waitForElementVisible selector="{{AdminOrderFormTotalSection.total('Shipping')}}" stepKey="waitOrderShippingToBeVisible"/>
+        <see selector="{{AdminOrderFormTotalSection.total('Shipping')}}" userInput="${{AdminOrderSimpleProductWithCatalogRule.shipping}}" stepKey="seeOrderShipping"/>
+        <waitForElementVisible selector="{{AdminOrderFormTotalSection.grandTotal}}" stepKey="waitOrderGrandTotalToBeVisible"/>
+        <see selector="{{AdminOrderFormTotalSection.grandTotal}}" userInput="${{AdminOrderSimpleProductWithCatalogRule.grandTotal}}" stepKey="seeCorrectGrandTotal"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
index fcef43c81bb1d..0bc26674e7dc8 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminSubmitsOrderWithAndWithoutEmailTest">
         <annotations>
             <title value="Email is required to create an order from Admin Panel"/>
@@ -69,7 +69,8 @@
 
         <!--Submit Order and verify information-->
         <click selector="{{AdminOrderFormActionSection.submitOrder}}" stepKey="clickSubmitOrder" after="seeCorrectGrandTotal"/>
-        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" after="clickSubmitOrder" stepKey="seeViewOrderPage"/>
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url('$grabOrderId')}}" after="grabOrderId" stepKey="seeViewOrderPage"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You created the order." after="seeViewOrderPage" stepKey="seeSuccessMessage"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CheckXSSVulnerabilityDuringOrderCreationTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CheckXSSVulnerabilityDuringOrderCreationTest.xml
new file mode 100644
index 0000000000000..6990615bde3b6
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CheckXSSVulnerabilityDuringOrderCreationTest.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="CheckXSSVulnerabilityDuringOrderCreationTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="Create order"/>
+            <title value="Check XSS vulnerability during order creation test"/>
+            <description value="Order should not be created with XSS vulnerability in email address"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-7710"/>
+            <group value="sales"/>
+        </annotations>
+        <before>
+            <!-- Create product -->
+            <createData entity="SimpleProduct3" stepKey="createProduct"/>
+        </before>
+        <after>
+            <!-- Delete product -->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="adminLogout"/>
+        </after>
+
+        <!-- Add product to the shopping cart -->
+        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
+            <argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+
+        <!-- Try to create order on Storefront with provided email  -->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <actionGroup ref="StorefrontFillEmailFieldOnCheckoutActionGroup" stepKey="fillIncorrectEmailStorefront">
+            <argument name="email" value="{{Simple_US_Customer_Incorrect_Email.email}}"/>
+        </actionGroup>
+
+        <!-- Order can not be created -->
+        <actionGroup ref="AssertStorefrontEmailValidationMessageOnCheckoutActionGroup" stepKey="assertErrorMessageStorefront"/>
+
+        <!-- Login as admin -->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+        <!-- Try to create order in admin with provided email -->
+        <actionGroup ref="navigateToNewOrderPageNewCustomerSingleStore" stepKey="navigateToNewOrderPage"/>
+        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer_Incorrect_Email.email}}" stepKey="fillEmailAddressAdminPanel"/>
+        <click selector="{{AdminOrderFormActionSection.submitOrder}}" stepKey="clickSubmitOrder"/>
+
+        <!-- Order can not be created -->
+        <actionGroup ref="AssertAdminEmailValidationMessageOnCheckoutActionGroup" stepKey="assertErrorMessageAdminPanel"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml
new file mode 100644
index 0000000000000..5f0a5078734d7
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontFreeShippingRecalculationAfterCouponCodeAddedTest">
+        <annotations>
+            <features value="Sales"/>
+            <title value="Checkout Free Shipping Recalculation after Coupon Code Applied"/>
+            <stories value="Checkout Free Shipping Recalculation after Coupon Code Applied"/>
+            <description value="User should be able to do checkout free shipping recalculation after adding coupon code"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-15412"/>
+            <useCaseId value="MAGETWO-96375"/>
+            <group value="sales"/>
+            <group value="salesRule"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <field key="price">90</field>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createSimpleUsCustomer"/>
+
+            <!-- Enable Free Shipping and set minimum order amount -->
+            <createData entity="FreeShippingMethodWithMinimumOrderAmount90" stepKey="enableFreeShippingAndSetMinimumOrderAmount"/>
+
+            <!-- Create Cart Price Rule -->
+            <createData entity="SalesRuleSpecificCouponWithPercentDiscount" stepKey="createCartPriceRule">
+                <field key="simple_free_shipping">0</field>
+            </createData>
+            <createData entity="SimpleSalesRuleCoupon" stepKey="createCouponForCartPriceRule">
+                <requiredEntity createDataKey="createCartPriceRule"/>
+            </createData>
+            <actionGroup ref="CustomerLoginOnStorefront" stepKey="loginToStorefront">
+                <argument name="customer" value="$$createSimpleUsCustomer$$"/>
+            </actionGroup>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleUsCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCartPriceRule" stepKey="deleteCartPriceRule"/>
+            <createData entity="ResetFreeShippingMethodWithMinimumOrderAmount90" stepKey="resetFreeShippingMethodAndMinimumOrderAmount"/>
+            <actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="logoutFromStorefront"/>
+        </after>
+
+        <!-- Add product to Shopping Cart and apply coupon -->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="navigateToProductPage"/>
+        <actionGroup ref="ApplyCartRuleOnStorefrontActionGroup" stepKey="applyCartRule">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="couponCode" value="$$createCouponForCartPriceRule.code$$"/>
+        </actionGroup>
+
+        <!-- Proceed to Checkout and make sure Free Shipping method isn't displaying -->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <dontSeeElement selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName('Free')}}" stepKey="dontSeeFreeShipping"/>
+
+        <!-- Back to Shopping Cart page and cancel coupon-->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage"/>
+        <actionGroup ref="StorefrontCancelCouponActionGroup" stepKey="cancelCoupon"/>
+
+        <!-- Proceed to Checkout, select Free Shipping method and apply coupon -->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart1"/>
+        <actionGroup ref="CheckoutSelectShippingMethodActionGroup" stepKey="selectFreeShipping">
+            <argument name="shippingMethod" value="Free"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontApplyCouponOnCheckoutActionGroup" stepKey="applyCouponOnCheckout">
+            <argument name="couponCode" value="$$createCouponForCartPriceRule.code$$"/>
+            <argument name="successMessage" value="Your coupon was successfully applied."/>
+        </actionGroup>
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
+
+        <!-- Try to Place Order -->
+        <actionGroup ref="AssertStorefrontErrorMessageOnOrderSubmit" stepKey="tryToPlaceOrder">
+            <argument name="errorMessage" value="The shipping method is missing. Select the shipping method and try again."/>
+        </actionGroup>
+
+        <!-- Go back to Shipping step and select Shipping method -->
+        <amOnPage url="{{CheckoutPage.url}}/#shipping" stepKey="navigateToShippingStep"/>
+        <actionGroup ref="CheckoutSelectShippingMethodActionGroup" stepKey="selectFlatRateShipping">
+            <argument name="shippingMethod" value="Flat Rate"/>
+        </actionGroup>
+
+        <!-- Select Payment method and Place order-->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod1"/>
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="placeOrder">
+            <argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Form/AddressTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Form/AddressTest.php
new file mode 100644
index 0000000000000..5b6d6ded1561a
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Form/AddressTest.php
@@ -0,0 +1,263 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Block\Adminhtml\Order\Create\Form;
+
+use Magento\Backend\Model\Session\Quote as QuoteSession;
+use Magento\Store\Model\Store;
+use Magento\Directory\Helper\Data as DirectoryHelper;
+use Magento\Eav\Model\AttributeDataFactory;
+use Magento\Sales\Block\Adminhtml\Order\Create\Form\Address;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\Data\AddressSearchResultsInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Model\Metadata\Form;
+use Magento\Customer\Model\Metadata\FormFactory;
+use Magento\Customer\Model\Address\Mapper;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class AddressTest extends TestCase
+{
+    /**
+     * @var QuoteSession|MockObject
+     */
+    private $quoteSession;
+
+    /**
+     * @var Store|MockObject
+     */
+    private $store;
+
+    /**
+     * @var DirectoryHelper|MockObject
+     */
+    private $directoryHelper;
+
+    /**
+     * @var int
+     */
+    private $defaultCountryId;
+
+    /**
+     * @var int
+     */
+    private $customerId;
+
+    /**
+     * @var int
+     */
+    private $addressId;
+
+    /**
+     * @var FormFactory|MockObject
+     */
+    private $formFactory;
+
+    /**
+     * @var FilterBuilder|MockObject
+     */
+    private $filterBuilder;
+
+    /**
+     * @var SearchCriteriaBuilder|MockObject
+     */
+    private $criteriaBuilder;
+
+    /**
+     * @var AddressInterface|MockObject
+     */
+    private $addressItem;
+
+    /**
+     * @var AddressRepositoryInterface|MockObject
+     */
+    private $addressService;
+
+    /**
+     * @var Mapper|MockObject
+     */
+    private $addressMapper;
+
+    /**
+     * @var Address
+     */
+    private $address;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $this->defaultCountryId = 1;
+        $this->customerId = 10;
+        $this->addressId = 100;
+
+        $this->quoteSession = $this->getMockBuilder(QuoteSession::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getStore', 'getCustomerId'])
+            ->getMock();
+        $this->store = $this->getMockBuilder(Store::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->quoteSession->expects($this->any())
+            ->method('getStore')
+            ->willReturn($this->store);
+        $this->quoteSession->expects($this->any())
+            ->method('getCustomerId')
+            ->willReturn($this->customerId);
+        $this->directoryHelper = $this->getMockBuilder(DirectoryHelper::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getDefaultCountry'])
+            ->getMock();
+        $this->directoryHelper->expects($this->any())
+            ->method('getDefaultCountry')
+            ->willReturn($this->defaultCountryId);
+        $this->formFactory = $this->getMockBuilder(FormFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->filterBuilder = $this->getMockBuilder(FilterBuilder::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setField', 'setValue', 'setConditionType', 'create'])
+            ->getMock();
+        $this->criteriaBuilder = $this->getMockBuilder(SearchCriteriaBuilder::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create', 'addFilters'])
+            ->getMock();
+        $this->addressService = $this->getMockBuilder(AddressRepositoryInterface::class)
+            ->setMethods(['getList'])
+            ->getMockForAbstractClass();
+        $this->addressItem = $this->getMockBuilder(AddressInterface::class)
+            ->setMethods(['getId'])
+            ->getMockForAbstractClass();
+        $this->addressItem->expects($this->any())
+            ->method('getId')
+            ->willReturn($this->addressId);
+        $this->addressMapper = $this->getMockBuilder(Mapper::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['toFlatArray'])
+            ->getMock();
+
+        $this->address = $this->objectManager->getObject(
+            Address::class,
+            [
+                'directoryHelper' => $this->directoryHelper,
+                'sessionQuote' => $this->quoteSession,
+                'customerFormFactory' => $this->formFactory,
+                'filterBuilder' => $this->filterBuilder,
+                'criteriaBuilder' => $this->criteriaBuilder,
+                'addressService' => $this->addressService,
+                'addressMapper' => $this->addressMapper
+            ]
+        );
+    }
+
+    public function testGetAddressCollectionJson()
+    {
+        /** @var Form|MockObject $emptyForm */
+        $emptyForm = $this->getMockBuilder(Form::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['outputData'])
+            ->getMock();
+        $emptyForm->expects($this->once())
+            ->method('outputData')
+            ->with(AttributeDataFactory::OUTPUT_FORMAT_JSON)
+            ->willReturn('emptyFormData');
+
+        /** @var Filter|MockObject $filter */
+        $filter = $this->getMockBuilder(Filter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->filterBuilder->expects($this->once())
+            ->method('setField')
+            ->with('parent_id')
+            ->willReturnSelf();
+        $this->filterBuilder->expects($this->once())
+            ->method('setValue')
+            ->with($this->customerId)
+            ->willReturnSelf();
+        $this->filterBuilder->expects($this->once())
+            ->method('setConditionType')
+            ->with('eq')
+            ->willReturnSelf();
+        $this->filterBuilder->expects($this->once())
+            ->method('create')
+            ->willReturn($filter);
+
+        /** @var SearchCriteria|MockObject $searchCriteria */
+        $searchCriteria = $this->getMockBuilder(SearchCriteria::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->criteriaBuilder->expects($this->once())
+            ->method('create')
+            ->willReturn($searchCriteria);
+        $this->criteriaBuilder->expects($this->once())
+            ->method('addFilters')
+            ->with([$filter]);
+
+        /** @var AddressSearchResultsInterface|MockObject $result */
+        $result = $this->getMockBuilder(AddressSearchResultsInterface::class)
+            ->setMethods(['getList'])
+            ->getMockForAbstractClass();
+        $result->expects($this->once())
+            ->method('getItems')
+            ->willReturn([$this->addressItem]);
+        $this->addressService->expects($this->once())
+            ->method('getList')
+            ->with($searchCriteria)
+            ->willReturn($result);
+
+        /** @var Form|MockObject $emptyForm */
+        $addressForm = $this->getMockBuilder(Form::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['outputData'])
+            ->getMock();
+        $addressForm->expects($this->once())
+            ->method('outputData')
+            ->with(AttributeDataFactory::OUTPUT_FORMAT_JSON)
+            ->willReturn('addressFormData');
+        $this->addressMapper->expects($this->once())
+            ->method('toFlatArray')
+            ->with($this->addressItem)
+            ->willReturn([]);
+
+        $this->directoryHelper->expects($this->once())
+            ->method('getDefaultCountry')
+            ->with($this->store)
+            ->willReturn($this->defaultCountryId);
+        $this->formFactory->expects($this->at(0))
+            ->method('create')
+            ->with(
+                'customer_address',
+                'adminhtml_customer_address',
+                [AddressInterface::COUNTRY_ID => $this->defaultCountryId]
+            )
+            ->willReturn($emptyForm);
+        $this->formFactory->expects($this->at(1))
+            ->method('create')
+            ->with('customer_address', 'adminhtml_customer_address', [], false, false)
+            ->willReturn($addressForm);
+
+        $this->address->getAddressCollectionJson();
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Order/Item/Renderer/DefaultRendererTest.php b/app/code/Magento/Sales/Test/Unit/Block/Order/Item/Renderer/DefaultRendererTest.php
index 9561baf6bd5f4..7863fc20b7396 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Order/Item/Renderer/DefaultRendererTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Order/Item/Renderer/DefaultRendererTest.php
@@ -60,18 +60,7 @@ protected function setUp()
             ->setMethods(['setItem', 'toHtml'])
             ->getMock();
 
-        $itemMockMethods = [
-            '__wakeup',
-            'getRowTotal',
-            'getTaxAmount',
-            'getDiscountAmount',
-            'getDiscountTaxCompensationAmount',
-            'getWeeeTaxAppliedRowAmount',
-        ];
-        $this->itemMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class)
-            ->disableOriginalConstructor()
-            ->setMethods($itemMockMethods)
-            ->getMock();
+        $this->itemMock = $this->createMock(\Magento\Sales\Model\Order\Item::class);
     }
 
     public function testGetItemPriceHtml()
@@ -161,4 +150,20 @@ public function testGetTotalAmount()
 
         $this->assertEquals($expectedResult, $this->block->getTotalAmount($this->itemMock));
     }
+
+    /**
+     * @return void
+     */
+    public function testGetBaseTotalAmount()
+    {
+        $expectedBaseTotalAmount = 10;
+
+        $this->itemMock->expects($this->once())->method('getBaseRowTotal')->willReturn(8);
+        $this->itemMock->expects($this->once())->method('getBaseTaxAmount')->willReturn(1);
+        $this->itemMock->expects($this->once())->method('getBaseDiscountTaxCompensationAmount')->willReturn(1);
+        $this->itemMock->expects($this->once())->method('getBaseWeeeTaxAppliedAmount')->willReturn(1);
+        $this->itemMock->expects($this->once())->method('getBaseDiscountAmount')->willReturn(1);
+
+        $this->assertEquals($expectedBaseTotalAmount, $this->block->getBaseTotalAmount($this->itemMock));
+    }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/AddCommentTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/AddCommentTest.php
new file mode 100644
index 0000000000000..d72121878e350
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/AddCommentTest.php
@@ -0,0 +1,186 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order;
+
+/**
+ * Test for AddComment.
+ */
+class AddCommentTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Sales\Controller\Adminhtml\Order\AddComment
+     */
+    private $addCommentController;
+
+    /**
+     * @var \Magento\Backend\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var \Magento\Sales\Model\Order|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderMock;
+
+    /**
+     * @var \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultRedirectFactoryMock;
+
+    /**
+     * @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultRedirectMock;
+
+    /**
+     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var \Magento\Sales\Api\OrderRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderRepositoryMock;
+
+    /**
+     * @var \Magento\Framework\AuthorizationInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $authorizationMock;
+
+    /**
+     * @var \Magento\Sales\Model\Order\Status\History|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $statusHistoryCommentMock;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->contextMock = $this->createMock(\Magento\Backend\App\Action\Context::class);
+        $this->requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
+        $this->orderRepositoryMock = $this->createMock(\Magento\Sales\Api\OrderRepositoryInterface::class);
+        $this->orderMock = $this->createMock(\Magento\Sales\Model\Order::class);
+        $this->resultRedirectFactoryMock = $this->createMock(\Magento\Backend\Model\View\Result\RedirectFactory::class);
+        $this->resultRedirectMock = $this->createMock(\Magento\Backend\Model\View\Result\Redirect::class);
+        $this->authorizationMock = $this->createMock(\Magento\Framework\AuthorizationInterface::class);
+        $this->statusHistoryCommentMock = $this->createMock(\Magento\Sales\Model\Order\Status\History::class);
+        $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
+
+        $this->contextMock->expects($this->once())->method('getRequest')->willReturn($this->requestMock);
+
+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->addCommentController = $objectManagerHelper->getObject(
+            \Magento\Sales\Controller\Adminhtml\Order\AddComment::class,
+            [
+                'context' => $this->contextMock,
+                'orderRepository' => $this->orderRepositoryMock,
+                '_authorization' => $this->authorizationMock,
+                '_objectManager' => $this->objectManagerMock,
+            ]
+        );
+    }
+
+    /**
+     * Test for execute method with different data.
+     *
+     * @param array $historyData
+     * @param bool $userHasResource
+     * @param bool $expectedNotify
+     *
+     * @return void
+     * @dataProvider executeWillNotifyCustomerDataProvider
+     */
+    public function testExecuteWillNotifyCustomer(array $historyData, bool $userHasResource, bool $expectedNotify)
+    {
+        $orderId = 30;
+        $this->requestMock->expects($this->once())->method('getParam')->with('order_id')->willReturn($orderId);
+        $this->orderRepositoryMock->expects($this->once())
+            ->method('get')
+            ->willReturn($this->orderMock);
+        $this->requestMock->expects($this->once())->method('getPost')->with('history')->willReturn($historyData);
+        $this->authorizationMock->expects($this->any())->method('isAllowed')->willReturn($userHasResource);
+        $this->orderMock->expects($this->once())
+            ->method('addStatusHistoryComment')
+            ->willReturn($this->statusHistoryCommentMock);
+        $this->statusHistoryCommentMock->expects($this->once())->method('setIsCustomerNotified')->with($expectedNotify);
+        $this->objectManagerMock->expects($this->once())->method('create')->willReturn(
+            $this->createMock(\Magento\Sales\Model\Order\Email\Sender\OrderCommentSender::class)
+        );
+
+        $this->addCommentController->execute();
+    }
+
+    /**
+     * Data provider for testExecuteWillNotifyCustomer method.
+     *
+     * @return array
+     */
+    public function executeWillNotifyCustomerDataProvider(): array
+    {
+        return [
+            'User Has Access - Notify True' => [
+                'postData' => [
+                    'comment' => 'Great Product!',
+                    'is_customer_notified' => true,
+                    'status' => 'Processing',
+                ],
+                'userHasResource' => true,
+                'expectedNotify' => true,
+            ],
+            'User Has Access - Notify False' => [
+                'postData' => [
+                    'comment' => 'Great Product!',
+                    'is_customer_notified' => false,
+                    'status' => 'Processing',
+                ],
+                'userHasResource' => true,
+                'expectedNotify' => false,
+            ],
+            'User Has Access - Notify Unset' => [
+                'postData' => [
+                    'comment' => 'Great Product!',
+                    'status' => 'Processing',
+                ],
+                'userHasResource' => true,
+                'expectedNotify' => false,
+            ],
+            'User No Access - Notify True' => [
+                'postData' => [
+                    'comment' => 'Great Product!',
+                    'is_customer_notified' => true,
+                    'status' => 'Processing',
+                ],
+                'userHasResource' => false,
+                'expectedNotify' => false,
+            ],
+            'User No Access - Notify False' => [
+                'postData' => [
+                    'comment' => 'Great Product!',
+                    'is_customer_notified' => false,
+                    'status' => 'Processing',
+                ],
+                'userHasResource' => false,
+                'expectedNotify' => false,
+            ],
+            'User No Access - Notify Unset' => [
+                'postData' => [
+                    'comment' => 'Great Product!',
+                    'status' => 'Processing',
+                ],
+                'userHasResource' => false,
+                'expectedNotify' => false,
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CancelTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CancelTest.php
index 363f78e738f12..d37b0f6121b37 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CancelTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CancelTest.php
@@ -74,10 +74,12 @@ protected function setUp()
             ['setRedirect', 'sendResponse']
         );
         $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
-            ->disableOriginalConstructor()->getMock();
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->request->expects($this->any())->method('isPost')->willReturn(true);
         $this->messageManager = $this->createPartialMock(
             \Magento\Framework\Message\Manager::class,
-            ['addSuccess', 'addError']
+            ['addSuccessMessage', 'addErrorMessage']
         );
         $this->orderRepositoryMock = $this->getMockBuilder(\Magento\Sales\Api\OrderRepositoryInterface::class)
             ->disableOriginalConstructor()
@@ -101,8 +103,6 @@ protected function setUp()
             \Magento\Sales\Controller\Adminhtml\Order\Cancel::class,
             [
                 'context' => $this->context,
-                'request' => $this->request,
-                'response' => $this->response,
                 'orderRepository' => $this->orderRepositoryMock
             ]
         );
@@ -117,7 +117,7 @@ public function testExecuteNotPost()
             ->method('isPost')
             ->willReturn(false);
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('You have not canceled the item.');
         $this->resultRedirect->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php
index 1fdd9759f5045..8203b4486d193 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php
@@ -118,7 +118,9 @@ protected function setUp()
             ->getMock();
         $this->requestMock = $this->getMockBuilder(RequestInterface::class)->getMockForAbstractClass();
         $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)->getMockForAbstractClass();
-        $this->resultForwardFactoryMock = $this->getMockBuilder(ForwardFactory::class)->getMock();
+        $this->resultForwardFactoryMock = $this->getMockBuilder(ForwardFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->resultRedirectFactoryMock = $this->getMockBuilder(RedirectFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
index cc2bf929f8250..31e5318aba409 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
@@ -77,6 +77,7 @@ protected function setUp()
         $this->_responseMock = $this->createMock(\Magento\Framework\App\Response\Http::class);
         $this->_responseMock->headersSentThrowsException = false;
         $this->_requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
+        $this->_requestMock->expects($this->any())->method('isPost')->willReturn(true);
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $constructArguments = $objectManager->getConstructArguments(\Magento\Backend\Model\Session::class,
             ['storage' => new \Magento\Framework\Session\Storage()]
@@ -230,7 +231,7 @@ public function testSaveActionWithNegativeCreditmemo()
      */
     protected function _setSaveActionExpectationForMageCoreException($data, $errorMessage)
     {
-        $this->_messageManager->expects($this->once())->method('addError')->with($this->equalTo($errorMessage));
+        $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($this->equalTo($errorMessage));
         $this->_sessionMock->expects($this->once())->method('setFormData')->with($this->equalTo($data));
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/UpdateQtyTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/UpdateQtyTest.php
index e2554eefb9b4e..47c6aea844aca 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/UpdateQtyTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/UpdateQtyTest.php
@@ -115,6 +115,7 @@ protected function setUp()
         $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->requestMock->expects($this->any())->method('isPost')->willReturn(true);
         $this->responseMock = $this->getMockBuilder(\Magento\Framework\App\Response\Http::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/UpdateQtyTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/UpdateQtyTest.php
index 899e3defc19a8..90374a2597a02 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/UpdateQtyTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/UpdateQtyTest.php
@@ -89,8 +89,8 @@ protected function setUp()
             ->getMock();
         $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
             ->disableOriginalConstructor()
-            ->setMethods([])
             ->getMock();
+        $this->requestMock->expects($this->any())->method('isPost')->willReturn(true);
         $this->responseMock = $this->getMockBuilder(\Magento\Framework\App\Response\Http::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -191,14 +191,13 @@ public function testExecute()
         $invoiceData = ['comment_text' => 'test'];
         $response = 'test data';
 
-        $this->requestMock->expects($this->at(0))
-            ->method('getParam')
-            ->with('order_id')
-            ->will($this->returnValue($orderId));
-        $this->requestMock->expects($this->at(1))
-            ->method('getParam')
-            ->with('invoice', [])
-            ->will($this->returnValue($invoiceData));
+        $this->requestMock->expects($this->any())->method('getParam')
+            ->willReturnMap(
+                [
+                    ['order_id', null, $orderId],
+                    ['invoice', [], $invoiceData],
+                ]
+            );
 
         $invoiceMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Invoice::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
index fc2341b02e94a..982f060664473 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
@@ -27,6 +27,10 @@
 use Magento\Sales\Model\AdminOrder\Create;
 use Magento\Sales\Model\AdminOrder\Product;
 use Magento\Quote\Model\QuoteFactory;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Item as OrderItem;
+use Magento\Sales\Model\ResourceModel\Order\Item\Collection as ItemCollection;
+use Magento\Store\Api\Data\StoreInterface;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
@@ -87,6 +91,14 @@ class CreateTest extends \PHPUnit\Framework\TestCase
      */
     private $dataObjectHelper;
 
+    /**
+     * @var Order|MockObject
+     */
+    private $orderMock;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->formFactory = $this->createPartialMock(FormFactory::class, ['create']);
@@ -102,9 +114,29 @@ protected function setUp()
 
         $this->sessionQuote = $this->getMockBuilder(\Magento\Backend\Model\Session\Quote::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getQuote', 'getStoreId', 'getCustomerId'])
+            ->setMethods(
+                [
+                    'getQuote',
+                    'getStoreId',
+                    'getCustomerId',
+                    'setData',
+                    'setCurrencyId',
+                    'setCustomerId',
+                    'setStoreId',
+                    'setCustomerGroupId',
+                    'getData',
+                    'getStore',
+                    'getUseOldShippingMethod',
+                ]
+            )
             ->getMock();
 
+        $storeMock = $this->getMockBuilder(StoreInterface::class)
+            ->setMethods(['getId'])
+            ->getMockForAbstractClass();
+        $this->sessionQuote->method('getStore')
+            ->willReturn($storeMock);
+
         $this->customerMapper = $this->getMockBuilder(Mapper::class)
             ->setMethods(['toFlatArray'])
             ->disableOriginalConstructor()
@@ -115,6 +147,24 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->orderMock = $this->getMockBuilder(Order::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'getEntityId',
+                    'getId',
+                    'setReordered',
+                    'getReordered',
+                    'getOrderCurrencyCode',
+                    'getCustomerGroupId',
+                    'getItemsCollection',
+                    'getShippingAddress',
+                    'getBillingAddress',
+                    'getCouponCode',
+                ]
+            )
+            ->getMock();
+
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->adminOrderCreate = $objectManagerHelper->getObject(
             Create::class,
@@ -316,4 +366,85 @@ public function testGetCustomerCart()
 
         $this->assertEquals($cartResult, $this->adminOrderCreate->getCustomerCart());
     }
+
+    public function testInitFromOrder()
+    {
+        $this->sessionQuote->method('getData')
+            ->with('reordered')
+            ->willReturn(true);
+
+        $address = $this->createPartialMock(
+            Address::class,
+            [
+                'setSameAsBilling',
+                'setCustomerAddressId',
+                'getSameAsBilling',
+            ]
+        );
+        $address->method('getSameAsBilling')
+            ->willReturn(true);
+        $address->method('setCustomerAddressId')
+            ->willReturnSelf();
+
+        $quote = $this->getMockBuilder(Quote::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'setCustomerGroupId',
+                    'getBillingAddress',
+                    'getShippingAddress',
+                    'isVirtual',
+                    'collectTotals',
+                ]
+            )
+            ->getMock();
+
+        $quote->method('getBillingAddress')
+            ->willReturn($address);
+        $quote->method('getShippingAddress')
+            ->willReturn($address);
+
+        $this->sessionQuote
+            ->method('getQuote')
+            ->willReturn($quote);
+
+        $orderItem = $this->createPartialMock(
+            OrderItem::class,
+            [
+                'getParentItem',
+                'getQtyOrdered',
+                'getQtyShipped',
+                'getQtyInvoiced',
+            ]
+        );
+        $orderItem->method('getQtyOrdered')
+            ->willReturn(2);
+        $orderItem->method('getParentItem')
+            ->willReturn(false);
+
+        $iterator = new \ArrayIterator([$orderItem]);
+
+        $itemCollectionMock = $this->getMockBuilder(ItemCollection::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getIterator'])
+            ->getMock();
+        $itemCollectionMock->method('getIterator')
+            ->willReturn($iterator);
+
+        $this->orderMock->method('getItemsCollection')
+            ->willReturn($itemCollectionMock);
+        $this->orderMock->method('getReordered')
+            ->willReturn(false);
+        $this->orderMock->method('getShippingAddress')
+            ->willReturn($address);
+        $this->orderMock->method('getBillingAddress')
+            ->willReturn($address);
+        $this->orderMock->method('getCouponCode')
+            ->willReturn(true);
+
+        $quote->expects($this->once())
+            ->method('setCustomerGroupId');
+
+        $this->adminOrderCreate->initFromOrder($this->orderMock);
+    }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/CronJob/CleanExpiredOrdersTest.php b/app/code/Magento/Sales/Test/Unit/Model/CronJob/CleanExpiredOrdersTest.php
index 269ce829e64d3..6844b908ea98d 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/CronJob/CleanExpiredOrdersTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/CronJob/CleanExpiredOrdersTest.php
@@ -26,6 +26,11 @@ class CleanExpiredOrdersTest extends \PHPUnit\Framework\TestCase
      */
     protected $orderCollectionMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderManagementMock;
+
     /**
      * @var ObjectManager
      */
@@ -44,10 +49,12 @@ protected function setUp()
             ['create']
         );
         $this->orderCollectionMock = $this->createMock(\Magento\Sales\Model\ResourceModel\Order\Collection::class);
+        $this->orderManagementMock = $this->createMock(\Magento\Sales\Api\OrderManagementInterface::class);
 
         $this->model = new CleanExpiredOrders(
             $this->storesConfigMock,
-            $this->collectionFactoryMock
+            $this->collectionFactoryMock,
+            $this->orderManagementMock
         );
     }
 
@@ -64,8 +71,11 @@ public function testExecute()
         $this->collectionFactoryMock->expects($this->exactly(2))
             ->method('create')
             ->willReturn($this->orderCollectionMock);
+        $this->orderCollectionMock->expects($this->exactly(2))
+            ->method('getAllIds')
+            ->willReturn([1, 2]);
         $this->orderCollectionMock->expects($this->exactly(4))->method('addFieldToFilter');
-        $this->orderCollectionMock->expects($this->exactly(4))->method('walk');
+        $this->orderManagementMock->expects($this->exactly(4))->method('cancel');
 
         $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
         $selectMock->expects($this->exactly(2))->method('where')->willReturnSelf();
@@ -92,14 +102,18 @@ public function testExecuteWithException()
         $this->collectionFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($this->orderCollectionMock);
+        $this->orderCollectionMock->expects($this->once())
+            ->method('getAllIds')
+            ->willReturn([1]);
         $this->orderCollectionMock->expects($this->exactly(2))->method('addFieldToFilter');
+        $this->orderManagementMock->expects($this->once())->method('cancel');
 
         $selectMock = $this->createMock(\Magento\Framework\DB\Select::class);
         $selectMock->expects($this->once())->method('where')->willReturnSelf();
         $this->orderCollectionMock->expects($this->once())->method('getSelect')->willReturn($selectMock);
 
-        $this->orderCollectionMock->expects($this->once())
-            ->method('walk')
+        $this->orderManagementMock->expects($this->once())
+            ->method('cancel')
             ->willThrowException(new \Exception($exceptionMessage));
 
         $this->model->execute();
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/AddressRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/AddressRepositoryTest.php
index 87f4a9103be6f..e48fea847a743 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/AddressRepositoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/AddressRepositoryTest.php
@@ -3,127 +3,180 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Test\Unit\Model\Order;
 
+use Magento\Customer\Model\AttributeMetadataDataProvider;
+use Magento\Eav\Model\Entity\Attribute;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Sales\Model\Order\Address as OrderAddress;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Sales\Model\Order\AddressRepository;
+use Magento\Sales\Model\ResourceModel\Order\Address\Collection as OrderAddressCollection;
+use Magento\Customer\Model\ResourceModel\Form\Attribute\Collection as FormAttributeCollection;
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Sales\Api\Data\OrderAddressSearchResultInterfaceFactory;
+use Magento\Sales\Model\ResourceModel\Metadata;
+use Magento\Sales\Model\Order\AddressRepository as OrderAddressRepository;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\InputException;
 
 /**
  * Unit test for order address repository class.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
+class AddressRepositoryTest extends TestCase
 {
     /**
      * Subject of testing.
      *
-     * @var \Magento\Sales\Model\Order\AddressRepository
+     * @var OrderAddressRepository
      */
     protected $subject;
 
     /**
      * Sales resource metadata.
      *
-     * @var \Magento\Sales\Model\ResourceModel\Metadata|\PHPUnit_Framework_MockObject_MockObject
+     * @var Metadata|MockObject
      */
     protected $metadata;
 
     /**
-     * @var \Magento\Sales\Api\Data\OrderAddressSearchResultInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var OrderAddressSearchResultInterfaceFactory|MockObject
      */
     protected $searchResultFactory;
 
     /**
-     * @var CollectionProcessorInterface |\PHPUnit_Framework_MockObject_MockObject
+     * @var CollectionProcessorInterface|MockObject
      */
     private $collectionProcessorMock;
 
+    /**
+     * @var Attribute[]
+     */
+    private $attributesList;
+
+    /**
+     * @var AttributeMetadataDataProvider
+     */
+    private $attributeMetadataDataProvider;
+
+    /**
+     * @var OrderAddress|MockObject
+     */
+    private $orderAddress;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $objectManager = new ObjectManager($this);
+        $this->objectManager = new ObjectManager($this);
 
+        $this->orderAddress = $this->createPartialMock(OrderAddress::class, ['getEntityId', 'load']);
         $this->metadata = $this->createPartialMock(
-            \Magento\Sales\Model\ResourceModel\Metadata::class,
+            Metadata::class,
             ['getNewInstance', 'getMapper']
         );
 
+        $this->attributeMetadataDataProvider = $this->getMockBuilder(AttributeMetadataDataProvider::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['loadAttributesCollection'])
+            ->getMock();
+        $collectionAttribute = $this->getMockBuilder(FormAttributeCollection::class)
+            ->setMethods(['addFieldToFilter', 'getIterator'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $collectionAttribute->method('getIterator')
+            ->willReturn(new \ArrayIterator([]));
+        $this->attributeMetadataDataProvider->method('loadAttributesCollection')->willReturn($collectionAttribute);
+
         $this->searchResultFactory = $this->createPartialMock(
-            \Magento\Sales\Api\Data\OrderAddressSearchResultInterfaceFactory::class,
+            OrderAddressSearchResultInterfaceFactory::class,
             ['create']
         );
 
         $this->collectionProcessorMock = $this->getMockBuilder(CollectionProcessorInterface::class)
             ->getMock();
 
-        $this->subject = $objectManager->getObject(
-            \Magento\Sales\Model\Order\AddressRepository::class,
+        $this->subject = $this->objectManager->getObject(
+            OrderAddressRepository::class,
             [
                 'metadata' => $this->metadata,
                 'searchResultFactory' => $this->searchResultFactory,
                 'collectionProcessor' => $this->collectionProcessorMock,
+                'attributeMetadataDataProvider' => $this->attributeMetadataDataProvider
             ]
         );
     }
 
     /**
+     * Test for get order address
+     *
      * @param int|null $id
      * @param int|null $entityId
+     *
+     * @return void
      * @dataProvider getDataProvider
      */
     public function testGet($id, $entityId)
     {
         if (!$id) {
-            $this->expectException(
-                \Magento\Framework\Exception\InputException::class
-            );
-
+            $this->expectException(InputException::class);
             $this->subject->get($id);
         } else {
-            $address = $this->createPartialMock(\Magento\Sales\Model\Order\Address::class, ['load', 'getEntityId']);
-            $address->expects($this->once())
+            $this->orderAddress->expects($this->once())
                 ->method('load')
                 ->with($id)
-                ->willReturn($address);
-            $address->expects($this->once())
+                ->willReturn($this->orderAddress);
+            $this->orderAddress->expects($this->once())
                 ->method('getEntityId')
                 ->willReturn($entityId);
 
             $this->metadata->expects($this->once())
                 ->method('getNewInstance')
-                ->willReturn($address);
+                ->willReturn($this->orderAddress);
 
             if (!$entityId) {
-                $this->expectException(
-                    \Magento\Framework\Exception\NoSuchEntityException::class
-                );
-
+                $this->expectException(NoSuchEntityException::class);
                 $this->subject->get($id);
             } else {
-                $this->assertEquals($address, $this->subject->get($id));
+                $this->assertEquals($this->orderAddress, $this->subject->get($id));
 
-                $address->expects($this->never())
+                $this->orderAddress->expects($this->never())
                     ->method('load')
                     ->with($id)
-                    ->willReturn($address);
-                $address->expects($this->never())
+                    ->willReturn($this->orderAddress);
+                $this->orderAddress->expects($this->never())
                     ->method('getEntityId')
                     ->willReturn($entityId);
 
                 $this->metadata->expects($this->never())
                     ->method('getNewInstance')
-                    ->willReturn($address);
+                    ->willReturn($this->orderAddress);
 
                 // Retrieve Address from registry.
-                $this->assertEquals($address, $this->subject->get($id));
+                $this->assertEquals($this->orderAddress, $this->subject->get($id));
             }
         }
     }
 
     /**
+     * Data for testGet
+     *
      * @return array
      */
-    public function getDataProvider()
+    public function getDataProvider(): array
     {
         return [
             [null, null],
@@ -132,10 +185,15 @@ public function getDataProvider()
         ];
     }
 
+    /**
+     * Test for get list order address
+     *
+     * @return void
+     */
     public function testGetList()
     {
-        $searchCriteria = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
-        $collection = $this->createMock(\Magento\Sales\Model\ResourceModel\Order\Address\Collection::class);
+        $searchCriteria = $this->createMock(SearchCriteria::class);
+        $collection = $this->createMock(OrderAddressCollection::class);
 
         $this->collectionProcessorMock->expects($this->once())
             ->method('process')
@@ -147,15 +205,19 @@ public function testGetList()
         $this->assertEquals($collection, $this->subject->getList($searchCriteria));
     }
 
+    /**
+     * Test for delete order address
+     *
+     * @return void
+     */
     public function testDelete()
     {
-        $address = $this->createPartialMock(\Magento\Sales\Model\Order\Address::class, ['getEntityId']);
-        $address->expects($this->once())
+        $this->orderAddress->expects($this->once())
             ->method('getEntityId')
             ->willReturn(1);
 
         $mapper = $this->getMockForAbstractClass(
-            \Magento\Framework\Model\ResourceModel\Db\AbstractDb::class,
+            AbstractDb::class,
             [],
             '',
             false,
@@ -165,27 +227,29 @@ public function testDelete()
         );
         $mapper->expects($this->once())
             ->method('delete')
-            ->with($address);
+            ->with($this->orderAddress);
 
         $this->metadata->expects($this->any())
             ->method('getMapper')
             ->willReturn($mapper);
 
-        $this->assertTrue($this->subject->delete($address));
+        $this->assertTrue($this->subject->delete($this->orderAddress));
     }
 
     /**
+     * Test for delete order address with exception
+     *
+     * @return void
      * @expectedException \Magento\Framework\Exception\CouldNotDeleteException
      * @expectedExceptionMessage Could not delete order address
      */
     public function testDeleteWithException()
     {
-        $address = $this->createPartialMock(\Magento\Sales\Model\Order\Address::class, ['getEntityId']);
-        $address->expects($this->never())
+        $this->orderAddress->expects($this->never())
             ->method('getEntityId');
 
         $mapper = $this->getMockForAbstractClass(
-            \Magento\Framework\Model\ResourceModel\Db\AbstractDb::class,
+            AbstractDb::class,
             [],
             '',
             false,
@@ -201,18 +265,22 @@ public function testDeleteWithException()
             ->method('getMapper')
             ->willReturn($mapper);
 
-        $this->subject->delete($address);
+        $this->subject->delete($this->orderAddress);
     }
 
+    /**
+     * Test for save order address
+     *
+     * @return void
+     */
     public function testSave()
     {
-        $address = $this->createPartialMock(\Magento\Sales\Model\Order\Address::class, ['getEntityId']);
-        $address->expects($this->any())
+        $this->orderAddress->expects($this->any())
             ->method('getEntityId')
             ->willReturn(1);
 
         $mapper = $this->getMockForAbstractClass(
-            \Magento\Framework\Model\ResourceModel\Db\AbstractDb::class,
+            AbstractDb::class,
             [],
             '',
             false,
@@ -222,27 +290,29 @@ public function testSave()
         );
         $mapper->expects($this->once())
             ->method('save')
-            ->with($address);
+            ->with($this->orderAddress);
 
         $this->metadata->expects($this->any())
             ->method('getMapper')
             ->willReturn($mapper);
 
-        $this->assertEquals($address, $this->subject->save($address));
+        $this->assertEquals($this->orderAddress, $this->subject->save($this->orderAddress));
     }
 
     /**
+     * Test for save order address with exception
+     *
+     * @return void
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
      * @expectedExceptionMessage Could not save order address
      */
     public function testSaveWithException()
     {
-        $address = $this->createPartialMock(\Magento\Sales\Model\Order\Address::class, ['getEntityId']);
-        $address->expects($this->never())
+        $this->orderAddress->expects($this->never())
             ->method('getEntityId');
 
         $mapper = $this->getMockForAbstractClass(
-            \Magento\Framework\Model\ResourceModel\Db\AbstractDb::class,
+            AbstractDb::class,
             [],
             '',
             false,
@@ -258,17 +328,117 @@ public function testSaveWithException()
             ->method('getMapper')
             ->willReturn($mapper);
 
-        $this->assertEquals($address, $this->subject->save($address));
+        $this->assertEquals($this->orderAddress, $this->subject->save($this->orderAddress));
     }
 
+    /**
+     * Tets for create order address
+     *
+     * @return void
+     */
     public function testCreate()
     {
-        $address = $this->createPartialMock(\Magento\Sales\Model\Order\Address::class, ['getEntityId']);
-
         $this->metadata->expects($this->once())
             ->method('getNewInstance')
-            ->willReturn($address);
+            ->willReturn($this->orderAddress);
+
+        $this->assertEquals($this->orderAddress, $this->subject->create());
+    }
+
+    /**
+     * Test for save sales address with multi-attribute.
+     *
+     * @param string $attributeType
+     * @param string $attributeCode
+     * @param array $attributeValue
+     * @param string $expected
+     *
+     * @return void
+     * @dataProvider dataMultiAttribute
+     */
+    public function testSaveWithMultiAttribute(
+        string $attributeType,
+        string $attributeCode,
+        array $attributeValue,
+        string $expected
+    ) {
+        $orderAddress = $this->getMockBuilder(OrderAddress::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getEntityId', 'hasData', 'getData', 'setData'])
+            ->getMock();
+
+        $orderAddress->expects($this->any())
+            ->method('getEntityId')
+            ->willReturn(1);
+
+        $mapper = $this->getMockForAbstractClass(
+            AbstractDb::class,
+            [],
+            '',
+            false,
+            true,
+            true,
+            ['save']
+        );
+        $mapper->method('save')
+            ->with($orderAddress);
+        $this->metadata->method('getMapper')
+            ->willReturn($mapper);
+
+        $attributeModel = $this->getMockBuilder(Attribute::class)
+            ->setMethods(['getFrontendInput', 'getAttributeCode'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $attributeModel->method('getFrontendInput')->willReturn($attributeType);
+        $attributeModel->method('getAttributeCode')->willReturn($attributeCode);
+        $this->attributesList = [$attributeModel];
+
+        $this->subject = $this->objectManager->getObject(
+            AddressRepository::class,
+            [
+                'metadata' => $this->metadata,
+                'searchResultFactory' => $this->searchResultFactory,
+                'collectionProcessor' => $this->collectionProcessorMock,
+                'attributeMetadataDataProvider' => $this->attributeMetadataDataProvider,
+                'attributesList' => $this->attributesList,
+            ]
+        );
+
+        $orderAddress->method('hasData')->with($attributeCode)->willReturn(true);
+        $orderAddress->method('getData')->with($attributeCode)->willReturn($attributeValue);
+        $orderAddress->expects($this->once())->method('setData')->with($attributeCode, $expected);
+
+        $this->assertEquals($orderAddress, $this->subject->save($orderAddress));
+    }
+
+    /**
+     * Data for testSaveWithMultiAttribute
+     *
+     * @return array
+     */
+    public function dataMultiAttribute(): array
+    {
+        $data = [
+            'multiselect' => [
+                'multiselect',
+                'attr_multiselect',
+                [
+                    'opt1',
+                    'opt2',
+                ],
+                'opt1,opt2',
+            ],
+            'multiline' => [
+                'multiline',
+                'attr_multiline',
+                [
+                    'line1',
+                    'line2',
+                ],
+                'line1'.PHP_EOL.'line2',
+            ],
+        ];
 
-        $this->assertEquals($address, $this->subject->create());
+        return $data;
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ConfigTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ConfigTest.php
index 86419c0c905b6..decce409b3331 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/ConfigTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/ConfigTest.php
@@ -47,6 +47,7 @@ protected function setUp()
             'storeManager' => $this->storeManagerMock,
         ]);
         $this->statusFactoryMock = $this->getMockBuilder(\Magento\Sales\Model\Order\StatusFactory::class)
+            ->disableOriginalConstructor()
             ->setMethods(['load', 'create'])
             ->getMock();
         $this->orderStatusCollectionFactoryMock = $this->createPartialMock(
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php
index 9fd2a8b0d929f..859fbde31f5d8 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php
@@ -249,7 +249,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
 
         $this->creditmemoMock->expects($this->once())
             ->method('setSendEmail')
-            ->with(true);
+            ->with($emailSendingResult);
 
         if (!$configValue || $forceSyncMode) {
             $transport = [
@@ -279,7 +279,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
                 ->method('setTemplateVars')
                 ->with($transport->getData());
 
-            $this->identityContainerMock->expects($this->once())
+            $this->identityContainerMock->expects($this->exactly(2))
                 ->method('isEnabled')
                 ->willReturn($emailSendingResult);
 
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 01c0565a557a6..f9a5a428bb554 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
@@ -440,10 +440,10 @@ public function collectDataProvider()
                     ],
                 ],
                 'creditmemo_data' => [
-                    'grand_total' => 64.95,
-                    'base_grand_total' => 64.95,
-                    'tax_amount' => 4.95,
-                    'base_tax_amount' => 4.95,
+                    'grand_total' => 64.94,
+                    'base_grand_total' => 64.94,
+                    'tax_amount' => 4.94,
+                    'base_tax_amount' => 4.94,
                 ],
             ],
         ];
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
index 31bf846689230..02a2bbec72389 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,7 +90,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
 
         $this->creditmemoMock->expects($this->once())
             ->method('setSendEmail')
-            ->with(true);
+            ->with($emailSendingResult);
 
         $this->globalConfig->expects($this->once())
             ->method('getValue')
@@ -130,7 +130,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
                     ]
                 );
 
-            $this->identityContainerMock->expects($this->once())
+            $this->identityContainerMock->expects($this->exactly(2))
                 ->method('isEnabled')
                 ->willReturn($emailSendingResult);
 
@@ -197,6 +197,8 @@ public function sendDataProvider()
      * @param bool $isVirtualOrder
      * @param int $formatCallCount
      * @param string|null $expectedShippingAddress
+     *
+     * @return void
      * @dataProvider sendVirtualOrderDataProvider
      */
     public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expectedShippingAddress)
@@ -207,7 +209,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
 
         $this->creditmemoMock->expects($this->once())
             ->method('setSendEmail')
-            ->with(true);
+            ->with(false);
 
         $this->globalConfig->expects($this->once())
             ->method('getValue')
@@ -242,7 +244,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
                 ]
             );
 
-        $this->identityContainerMock->expects($this->once())
+        $this->identityContainerMock->expects($this->exactly(2))
             ->method('isEnabled')
             ->willReturn(false);
 
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 9c54c716e4207..ba2f1166baf3c 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,7 +90,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
 
         $this->invoiceMock->expects($this->once())
             ->method('setSendEmail')
-            ->with(true);
+            ->with($emailSendingResult);
 
         $this->globalConfig->expects($this->once())
             ->method('getValue')
@@ -136,7 +136,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
                     ]
                 );
 
-            $this->identityContainerMock->expects($this->once())
+            $this->identityContainerMock->expects($this->exactly(2))
                 ->method('isEnabled')
                 ->willReturn($emailSendingResult);
 
@@ -212,7 +212,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
 
         $this->invoiceMock->expects($this->once())
             ->method('setSendEmail')
-            ->with(true);
+            ->with(false);
 
         $this->globalConfig->expects($this->once())
             ->method('getValue')
@@ -247,7 +247,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
                 ]
             );
 
-        $this->identityContainerMock->expects($this->once())
+        $this->identityContainerMock->expects($this->exactly(2))
             ->method('isEnabled')
             ->willReturn(false);
 
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 46c44c03b1514..88053ea684ce8 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
@@ -64,7 +64,7 @@ public function testSend($configValue, $forceSyncMode, $emailSendingResult, $sen
 
         $this->orderMock->expects($this->once())
             ->method('setSendEmail')
-            ->with(true);
+            ->with($emailSendingResult);
 
         $this->globalConfig->expects($this->once())
             ->method('getValue')
@@ -72,7 +72,7 @@ public function testSend($configValue, $forceSyncMode, $emailSendingResult, $sen
             ->willReturn($configValue);
 
         if (!$configValue || $forceSyncMode) {
-            $this->identityContainerMock->expects($this->once())
+            $this->identityContainerMock->expects($this->exactly(2))
                 ->method('isEnabled')
                 ->willReturn($emailSendingResult);
 
@@ -118,7 +118,7 @@ public function testSend($configValue, $forceSyncMode, $emailSendingResult, $sen
 
                     $this->orderMock->expects($this->once())
                         ->method('setEmailSent')
-                        ->with(true);
+                        ->with($emailSendingResult);
 
                     $this->orderResourceMock->expects($this->once())
                         ->method('saveAttribute')
@@ -210,7 +210,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
             ->with('sales_email/general/async_sending')
             ->willReturn(false);
 
-        $this->identityContainerMock->expects($this->once())
+        $this->identityContainerMock->expects($this->exactly(2))
             ->method('isEnabled')
             ->willReturn(true);
 
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 b1b18af63b590..8a71c738e9fbe 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,7 +90,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
 
         $this->shipmentMock->expects($this->once())
             ->method('setSendEmail')
-            ->with(true);
+            ->with($emailSendingResult);
 
         $this->globalConfig->expects($this->once())
             ->method('getValue')
@@ -136,7 +136,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
                     ]
                 );
 
-            $this->identityContainerMock->expects($this->once())
+            $this->identityContainerMock->expects($this->exactly(2))
                 ->method('isEnabled')
                 ->willReturn($emailSendingResult);
 
@@ -212,7 +212,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
 
         $this->shipmentMock->expects($this->once())
             ->method('setSendEmail')
-            ->with(true);
+            ->with(false);
 
         $this->globalConfig->expects($this->once())
             ->method('getValue')
@@ -247,7 +247,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
                 ]
             );
 
-        $this->identityContainerMock->expects($this->once())
+        $this->identityContainerMock->expects($this->exactly(2))
             ->method('isEnabled')
             ->willReturn(false);
         $this->shipmentResourceMock->expects($this->once())
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 38209bb22aef4..24cd54e3a46b3 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
@@ -6,7 +6,6 @@
 
 namespace Magento\Sales\Test\Unit\Model\Order\Email;
 
-use Magento\Framework\Mail\Template\TransportBuilderByStore;
 use Magento\Sales\Model\Order\Email\SenderBuilder;
 
 class SenderBuilderTest extends \PHPUnit\Framework\TestCase
@@ -36,11 +35,6 @@ class SenderBuilderTest extends \PHPUnit\Framework\TestCase
      */
     private $storeMock;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $transportBuilderByStore;
-
     protected function setUp()
     {
         $templateId = 'test_template_id';
@@ -82,11 +76,10 @@ protected function setUp()
                 'setTemplateIdentifier',
                 'setTemplateOptions',
                 'setTemplateVars',
+                'setFromByScope',
             ]
         );
 
-        $this->transportBuilderByStore = $this->createMock(TransportBuilderByStore::class);
-
         $this->templateContainerMock->expects($this->once())
             ->method('getTemplateId')
             ->will($this->returnValue($templateId));
@@ -109,9 +102,9 @@ protected function setUp()
         $this->identityContainerMock->expects($this->once())
             ->method('getEmailIdentity')
             ->will($this->returnValue($emailIdentity));
-        $this->transportBuilderByStore->expects($this->once())
-            ->method('setFromByStore')
-            ->with($this->equalTo($emailIdentity));
+        $this->transportBuilder->expects($this->once())
+            ->method('setFromByScope')
+            ->with($this->equalTo($emailIdentity), 1);
 
         $this->identityContainerMock->expects($this->once())
             ->method('getEmailCopyTo')
@@ -120,8 +113,7 @@ protected function setUp()
         $this->senderBuilder = new SenderBuilder(
             $this->templateContainerMock,
             $this->identityContainerMock,
-            $this->transportBuilder,
-            $this->transportBuilderByStore
+            $this->transportBuilder
         );
     }
 
@@ -129,6 +121,8 @@ public function testSend()
     {
         $customerName = 'test_name';
         $customerEmail = 'test_email';
+        $identity = 'email_identity_test';
+
         $transportMock = $this->createMock(
             \Magento\Sales\Test\Unit\Model\Order\Email\Stub\TransportInterfaceMock::class
         );
@@ -151,6 +145,9 @@ public function testSend()
         $this->storeMock->expects($this->once())
             ->method('getId')
             ->willReturn(1);
+        $this->transportBuilder->expects($this->once())
+            ->method('setFromByScope')
+            ->with($identity, 1);
         $this->transportBuilder->expects($this->once())
             ->method('addTo')
             ->with($this->equalTo($customerEmail), $this->equalTo($customerName));
@@ -164,6 +161,7 @@ public function testSend()
 
     public function testSendCopyTo()
     {
+        $identity = 'email_identity_test';
         $transportMock = $this->createMock(
             \Magento\Sales\Test\Unit\Model\Order\Email\Stub\TransportInterfaceMock::class
         );
@@ -177,6 +175,9 @@ public function testSendCopyTo()
         $this->transportBuilder->expects($this->once())
             ->method('addTo')
             ->with($this->equalTo('example@mail.com'));
+        $this->transportBuilder->expects($this->once())
+            ->method('setFromByScope')
+            ->with($identity, 1);
         $this->identityContainerMock->expects($this->once())
             ->method('getStore')
             ->willReturn($this->storeMock);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php
index 8a4e2920ba207..dcf689cf7d53b 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php
@@ -247,7 +247,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
 
         $this->invoiceMock->expects($this->once())
             ->method('setSendEmail')
-            ->with(true);
+            ->with($emailSendingResult);
 
         if (!$configValue || $forceSyncMode) {
             $transport = [
@@ -277,7 +277,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
                 ->method('setTemplateVars')
                 ->with($transport->getData());
 
-            $this->identityContainerMock->expects($this->once())
+            $this->identityContainerMock->expects($this->exactly(2))
                 ->method('isEnabled')
                 ->willReturn($emailSendingResult);
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php
index 94347e8b32d54..391e99ba6f835 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php
@@ -249,7 +249,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
 
         $this->shipmentMock->expects($this->once())
             ->method('setSendEmail')
-            ->with(true);
+            ->with($emailSendingResult);
 
         if (!$configValue || $forceSyncMode) {
             $transport = [
@@ -279,7 +279,7 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
                 ->method('setTemplateVars')
                 ->with($transport->getData());
 
-            $this->identityContainerMock->expects($this->once())
+            $this->identityContainerMock->expects($this->exactly(2))
                 ->method('isEnabled')
                 ->willReturn($emailSendingResult);
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Status/HistoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Status/HistoryTest.php
index e7187219d56b6..866fef378a1e9 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Status/HistoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Status/HistoryTest.php
@@ -83,6 +83,17 @@ public function testGetStatusLabel()
         $this->assertEquals($status, $this->model->getStatusLabel());
     }
 
+    /**
+     * @return void
+     */
+    public function testGetStatusLabelWithNullStatus()
+    {
+        $this->model->setOrder($this->order);
+        $this->model->setStatus(null);
+
+        $this->assertNull($this->model->getStatusLabel());
+    }
+
     public function testGetStoreFromStoreManager()
     {
         $resultStore = 1;
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Webapi/ChangeOutputArrayTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Webapi/ChangeOutputArrayTest.php
new file mode 100644
index 0000000000000..83c40707c0079
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Webapi/ChangeOutputArrayTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Model\Order\Webapi;
+
+use Magento\Sales\Api\Data\OrderItemInterface;
+use Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer;
+use Magento\Sales\Model\Order\Webapi\ChangeOutputArray;
+
+/**
+ * Test for Magento\Sales\Model\Order\Webapi\ChangeOutputArray class.
+ */
+class ChangeOutputArrayTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DefaultColumn|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $priceRendererMock;
+
+    /**
+     * @var DefaultRenderer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $defaultRendererMock;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ChangeOutputArray
+     */
+    private $model;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $this->priceRendererMock = $this->createMock(DefaultColumn::class);
+        $this->defaultRendererMock = $this->createMock(DefaultRenderer::class);
+
+        $this->model = $this->objectManager->getObject(
+            ChangeOutputArray::class,
+            [
+                'priceRenderer' => $this->priceRendererMock,
+                'defaultRenderer' => $this->defaultRendererMock,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecute()
+    {
+        $expectedResult = [
+            OrderItemInterface::ROW_TOTAL => 10,
+            OrderItemInterface::BASE_ROW_TOTAL => 10,
+            OrderItemInterface::ROW_TOTAL_INCL_TAX => 11,
+            OrderItemInterface::BASE_ROW_TOTAL_INCL_TAX => 11,
+        ];
+        $orderItemInterfaceMock = $this->createMock(OrderItemInterface::class);
+
+        $this->priceRendererMock->expects($this->once())
+            ->method('getTotalAmount')
+            ->with($orderItemInterfaceMock)
+            ->willReturn(10);
+        $this->priceRendererMock->expects($this->once())
+            ->method('getBaseTotalAmount')
+            ->with($orderItemInterfaceMock)
+            ->willReturn(10);
+        $this->defaultRendererMock->expects($this->once())
+            ->method('getTotalAmount')
+            ->with($orderItemInterfaceMock)
+            ->willReturn(11);
+        $this->defaultRendererMock->expects($this->once())
+            ->method('getBaseTotalAmount')
+            ->with($orderItemInterfaceMock)
+            ->willReturn(11);
+
+        $this->assertEquals($expectedResult, $this->model->execute($orderItemInterfaceMock, []));
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php
index 3df667094f2a9..04b774c8a74fd 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php
@@ -9,6 +9,8 @@
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderSearchResultInterfaceFactory as SearchResultFactory;
 use Magento\Sales\Model\ResourceModel\Metadata;
+use Magento\Tax\Api\OrderTaxManagementInterface;
+use Magento\Payment\Api\Data\PaymentAdditionalInfoInterfaceFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -41,7 +43,17 @@ class OrderRepositoryTest extends \PHPUnit\Framework\TestCase
     private $collectionProcessor;
 
     /**
-     * Setup the test
+     * @var OrderTaxManagementInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderTaxManagementMock;
+
+    /**
+     * @var PaymentAdditionalInfoInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $paymentAdditionalInfoFactory;
+
+    /**
+     * @inheritdoc
      */
     protected function setUp()
     {
@@ -58,34 +70,67 @@ protected function setUp()
         $orderExtensionFactoryMock = $this->getMockBuilder(\Magento\Sales\Api\Data\OrderExtensionFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->orderTaxManagementMock = $this->getMockBuilder(OrderTaxManagementInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->paymentAdditionalInfoFactory = $this->getMockBuilder(PaymentAdditionalInfoInterfaceFactory::class)
+            ->disableOriginalConstructor()->setMethods(['create'])->getMockForAbstractClass();
         $this->orderRepository = $this->objectManager->getObject(
             \Magento\Sales\Model\OrderRepository::class,
             [
                 'metadata' => $this->metadata,
                 'searchResultFactory' => $this->searchResultFactory,
                 'collectionProcessor' => $this->collectionProcessor,
-                'orderExtensionFactory' => $orderExtensionFactoryMock
+                'orderExtensionFactory' => $orderExtensionFactoryMock,
+                'orderTaxManagement' => $this->orderTaxManagementMock,
+                'paymentAdditionalInfoFactory' => $this->paymentAdditionalInfoFactory,
             ]
         );
     }
 
+    /**
+     * Test for method getList.
+     *
+     * @return void
+     */
     public function testGetList()
     {
         $searchCriteriaMock = $this->createMock(\Magento\Framework\Api\SearchCriteria::class);
         $collectionMock = $this->createMock(\Magento\Sales\Model\ResourceModel\Order\Collection::class);
-        $itemsMock = $this->getMockBuilder(OrderInterface::class)->disableOriginalConstructor()->getMock();
+        $itemsMock = $this->getMockBuilder(OrderInterface::class)->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $orderTaxDetailsMock = $this->getMockBuilder(\Magento\Tax\Api\Data\OrderTaxDetailsInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAppliedTaxes', 'getItems'])->getMockForAbstractClass();
+        $paymentMock = $this->getMockBuilder(\Magento\Sales\Api\Data\OrderPaymentInterface::class)
+            ->disableOriginalConstructor()->getMockForAbstractClass();
+        $paymentAdditionalInfo = $this->getMockBuilder(\Magento\Payment\Api\Data\PaymentAdditionalInfoInterface::class)
+            ->disableOriginalConstructor()->setMethods(['setKey', 'setValue'])->getMockForAbstractClass();
 
         $extensionAttributes = $this->createPartialMock(
             \Magento\Sales\Api\Data\OrderExtension::class,
-            ['getShippingAssignments']
+            [
+                'getShippingAssignments', 'setShippingAssignments', 'setConvertingFromQuote',
+                'setAppliedTaxes', 'setItemAppliedTaxes', 'setPaymentAdditionalInfo',
+            ]
         );
         $shippingAssignmentBuilder = $this->createMock(
             \Magento\Sales\Model\Order\ShippingAssignmentBuilder::class
         );
+        $itemsMock->expects($this->atLeastOnce())->method('getEntityId')->willReturn(1);
         $this->collectionProcessor->expects($this->once())
             ->method('process')
             ->with($searchCriteriaMock, $collectionMock);
-        $itemsMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extensionAttributes);
+        $itemsMock->expects($this->atLeastOnce())->method('getExtensionAttributes')->willReturn($extensionAttributes);
+        $itemsMock->expects($this->atleastOnce())->method('getPayment')->willReturn($paymentMock);
+        $paymentMock->expects($this->atLeastOnce())->method('getAdditionalInformation')
+            ->willReturn(['method' => 'checkmo']);
+        $this->paymentAdditionalInfoFactory->expects($this->atLeastOnce())->method('create')
+            ->willReturn($paymentAdditionalInfo);
+        $paymentAdditionalInfo->expects($this->atLeastOnce())->method('setKey')->willReturnSelf();
+        $paymentAdditionalInfo->expects($this->atLeastOnce())->method('setValue')->willReturnSelf();
+        $this->orderTaxManagementMock->expects($this->atLeastOnce())->method('getOrderTaxDetails')
+            ->willReturn($orderTaxDetailsMock);
         $extensionAttributes->expects($this->any())
             ->method('getShippingAssignments')
             ->willReturn($shippingAssignmentBuilder);
@@ -96,6 +141,11 @@ public function testGetList()
         $this->assertEquals($collectionMock, $this->orderRepository->getList($searchCriteriaMock));
     }
 
+    /**
+     * Test for method save.
+     *
+     * @return void
+     */
     public function testSave()
     {
         $mapperMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order::class)
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
index e120d613e323c..65313c584454b 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
@@ -8,7 +8,7 @@
 use Magento\Sales\Model\Order;
 
 /**
- * Class StateTest
+ * Tests for State.
  */
 class StateTest extends \PHPUnit\Framework\TestCase
 {
@@ -22,9 +22,14 @@ class StateTest extends \PHPUnit\Framework\TestCase
      */
     protected $orderMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->orderMock = $this->createPartialMock(\Magento\Sales\Model\Order::class, [
+        $this->orderMock = $this->createPartialMock(
+            \Magento\Sales\Model\Order::class,
+            [
                 '__wakeup',
                 'getId',
                 'hasCustomerNoteNotify',
@@ -35,13 +40,12 @@ protected function setUp()
                 'canShip',
                 'getBaseGrandTotal',
                 'canCreditmemo',
-                'getState',
-                'setState',
                 'getTotalRefunded',
                 'hasForcedCanCreditmemo',
                 'getIsInProcess',
                 'getConfig',
-            ]);
+            ]
+        );
         $this->orderMock->expects($this->any())
             ->method('getConfig')
             ->willReturnSelf();
@@ -53,127 +57,96 @@ protected function setUp()
     }
 
     /**
-     * test check order - order without id
+     * Test for check method with different states.
+     *
+     * @param bool $isCanceled
+     * @param bool $canUnhold
+     * @param bool $canInvoice
+     * @param bool $canShip
+     * @param int $callCanSkipNum
+     * @param bool $canCreditmemo
+     * @param int $callCanCreditmemoNum
+     * @param string $currentState
+     * @param string $expectedState
+     * @param int $callSetStateNum
+     * @return void
+     * @dataProvider stateCheckDataProvider
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
-    public function testCheckOrderEmpty()
-    {
-        $this->orderMock->expects($this->once())
-            ->method('getBaseGrandTotal')
-            ->willReturn(100);
-        $this->orderMock->expects($this->never())
-            ->method('setState');
-
-        $this->state->check($this->orderMock);
-    }
-
-    /**
-     * test check order - set state complete
-     */
-    public function testCheckSetStateComplete()
-    {
+    public function testCheck(
+        bool $canCreditmemo,
+        int $callCanCreditmemoNum,
+        bool $canShip,
+        int $callCanSkipNum,
+        string $currentState,
+        string $expectedState = '',
+        bool $isInProcess = false,
+        int $callGetIsInProcessNum = 0,
+        bool $isCanceled = false,
+        bool $canUnhold = false,
+        bool $canInvoice = false
+    ) {
+        $this->orderMock->setState($currentState);
         $this->orderMock->expects($this->any())
-            ->method('getId')
-            ->will($this->returnValue(1));
-        $this->orderMock->expects($this->once())
             ->method('isCanceled')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
-            ->method('canUnhold')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
-            ->method('canInvoice')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
-            ->method('canShip')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
-            ->method('getBaseGrandTotal')
-            ->will($this->returnValue(100));
-        $this->orderMock->expects($this->once())
-            ->method('canCreditmemo')
-            ->will($this->returnValue(true));
-        $this->orderMock->expects($this->exactly(2))
-            ->method('getState')
-            ->will($this->returnValue(Order::STATE_PROCESSING));
-        $this->orderMock->expects($this->once())
-            ->method('setState')
-            ->with(Order::STATE_COMPLETE)
-            ->will($this->returnSelf());
-        $this->assertEquals($this->state, $this->state->check($this->orderMock));
-    }
-
-    /**
-     * test check order - set state closed
-     */
-    public function testCheckSetStateClosed()
-    {
+            ->willReturn($isCanceled);
         $this->orderMock->expects($this->any())
-            ->method('getId')
-            ->will($this->returnValue(1));
-        $this->orderMock->expects($this->once())
-            ->method('isCanceled')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
             ->method('canUnhold')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
+            ->willReturn($canUnhold);
+        $this->orderMock->expects($this->any())
             ->method('canInvoice')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
+            ->willReturn($canInvoice);
+        $this->orderMock->expects($this->exactly($callCanSkipNum))
             ->method('canShip')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
-            ->method('getBaseGrandTotal')
-            ->will($this->returnValue(100));
-        $this->orderMock->expects($this->once())
+            ->willReturn($canShip);
+        $this->orderMock->expects($this->exactly($callCanCreditmemoNum))
             ->method('canCreditmemo')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->exactly(2))
-            ->method('getTotalRefunded')
-            ->will($this->returnValue(null));
-        $this->orderMock->expects($this->once())
-            ->method('hasForcedCanCreditmemo')
-            ->will($this->returnValue(true));
-        $this->orderMock->expects($this->exactly(2))
-            ->method('getState')
-            ->will($this->returnValue(Order::STATE_PROCESSING));
-        $this->orderMock->expects($this->once())
-            ->method('setState')
-            ->with(Order::STATE_CLOSED)
-            ->will($this->returnSelf());
-        $this->assertEquals($this->state, $this->state->check($this->orderMock));
+            ->willReturn($canCreditmemo);
+        $this->orderMock->expects($this->exactly($callGetIsInProcessNum))
+            ->method('getIsInProcess')
+            ->willReturn($isInProcess);
+        $this->state->check($this->orderMock);
+        $this->assertEquals($expectedState, $this->orderMock->getState());
     }
 
     /**
-     * test check order - set state processing
+     * Data provider for testCheck method.
+     *
+     * @return array
      */
-    public function testCheckSetStateProcessing()
+    public function stateCheckDataProvider(): array
     {
-        $this->orderMock->expects($this->any())
-            ->method('getId')
-            ->will($this->returnValue(1));
-        $this->orderMock->expects($this->once())
-            ->method('isCanceled')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
-            ->method('canUnhold')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
-            ->method('canInvoice')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
-            ->method('canShip')
-            ->will($this->returnValue(true));
-        $this->orderMock->expects($this->once())
-            ->method('getState')
-            ->will($this->returnValue(Order::STATE_NEW));
-        $this->orderMock->expects($this->once())
-            ->method('getIsInProcess')
-            ->will($this->returnValue(true));
-        $this->orderMock->expects($this->once())
-            ->method('setState')
-            ->with(Order::STATE_PROCESSING)
-            ->will($this->returnSelf());
-        $this->assertEquals($this->state, $this->state->check($this->orderMock));
+        return [
+            'processing - !canCreditmemo!canShip -> closed' =>
+                [false, 1, false, 1, Order::STATE_PROCESSING, Order::STATE_CLOSED],
+            'complete - !canCreditmemo,!canShip -> closed' =>
+                [false, 1, false, 1, Order::STATE_COMPLETE, Order::STATE_CLOSED],
+            'processing - !canCreditmemo,canShip -> processing' =>
+                [false, 1, true, 2, Order::STATE_PROCESSING, Order::STATE_PROCESSING],
+            'complete - !canCreditmemo,canShip -> complete' =>
+                [false, 1, true, 1, Order::STATE_COMPLETE, Order::STATE_COMPLETE],
+            'processing - canCreditmemo,!canShip -> complete' =>
+                [true, 1, false, 1, Order::STATE_PROCESSING, Order::STATE_COMPLETE],
+            'complete - canCreditmemo,!canShip -> complete' =>
+                [true, 1, false, 0, Order::STATE_COMPLETE, Order::STATE_COMPLETE],
+            'processing - canCreditmemo, canShip -> processing' =>
+                [true, 1, true, 1, Order::STATE_PROCESSING, Order::STATE_PROCESSING],
+            'complete - canCreditmemo, canShip -> complete' =>
+                [true, 1, true, 0, Order::STATE_COMPLETE, Order::STATE_COMPLETE],
+            'new - canCreditmemo, canShip, IsInProcess -> processing' =>
+                [true, 1, true, 1, Order::STATE_NEW, Order::STATE_PROCESSING, true, 1],
+            'new - canCreditmemo, !canShip, IsInProcess -> processing' =>
+                [true, 1, false, 1, Order::STATE_NEW, Order::STATE_COMPLETE, true, 1],
+            'new - canCreditmemo, canShip, !IsInProcess -> new' =>
+                [true, 0, true, 0, Order::STATE_NEW, Order::STATE_NEW, false, 1],
+            'hold - canUnhold -> hold' =>
+                [true, 0, true, 0, Order::STATE_HOLDED, Order::STATE_HOLDED, false, 0, false, true],
+            'payment_review - canUnhold -> payment_review' =>
+                [true, 0, true, 0, Order::STATE_PAYMENT_REVIEW, Order::STATE_PAYMENT_REVIEW, false, 0, false, true],
+            'pending_payment - canUnhold -> pending_payment' =>
+                [true, 0, true, 0, Order::STATE_PENDING_PAYMENT, Order::STATE_PENDING_PAYMENT, false, 0, false, true],
+            'cancelled - isCanceled -> cancelled' =>
+                [true, 0, true, 0, Order::STATE_HOLDED, Order::STATE_HOLDED, false, 0, true],
+        ];
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Service/OrderServiceTest.php b/app/code/Magento/Sales/Test/Unit/Model/Service/OrderServiceTest.php
index 067f83d1e5b32..72fe7380ce8e4 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Service/OrderServiceTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Service/OrderServiceTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Service;
 
+use Magento\Sales\Api\PaymentFailuresInterface;
+use Psr\Log\LoggerInterface;
+
 /**
  * Class OrderUnHoldTest
  *
@@ -140,6 +143,12 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        /** @var PaymentFailuresInterface|\PHPUnit_Framework_MockObject_MockObject  $paymentFailures */
+        $paymentFailures = $this->createMock(PaymentFailuresInterface::class);
+
+        /** @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject $logger */
+        $logger = $this->createMock(LoggerInterface::class);
+
         $this->orderService = new \Magento\Sales\Model\Service\OrderService(
             $this->orderRepositoryMock,
             $this->orderStatusHistoryRepositoryMock,
@@ -147,7 +156,9 @@ protected function setUp()
             $this->filterBuilderMock,
             $this->orderNotifierMock,
             $this->eventManagerMock,
-            $this->orderCommentSender
+            $this->orderCommentSender,
+            $paymentFailures,
+            $logger
         );
     }
 
diff --git a/app/code/Magento/Sales/Test/Unit/Observer/AssignOrderToCustomerObserverTest.php b/app/code/Magento/Sales/Test/Unit/Observer/AssignOrderToCustomerObserverTest.php
index c6e02151b9bc1..8890f01130c82 100644
--- a/app/code/Magento/Sales/Test/Unit/Observer/AssignOrderToCustomerObserverTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Observer/AssignOrderToCustomerObserverTest.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Event\Observer;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order\CustomerAssignment;
 use Magento\Sales\Observer\AssignOrderToCustomerObserver;
 use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject;
@@ -27,6 +28,9 @@ class AssignOrderToCustomerObserverTest extends TestCase
     /** @var OrderRepositoryInterface|PHPUnit_Framework_MockObject_MockObject */
     protected $orderRepositoryMock;
 
+    /** @var CustomerAssignment | PHPUnit_Framework_MockObject_MockObject */
+    protected $assignmentMock;
+
     /**
      * Set Up
      */
@@ -35,7 +39,12 @@ protected function setUp()
         $this->orderRepositoryMock = $this->getMockBuilder(OrderRepositoryInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->sut = new AssignOrderToCustomerObserver($this->orderRepositoryMock);
+
+        $this->assignmentMock =  $this->getMockBuilder(CustomerAssignment::class)
+        ->disableOriginalConstructor()
+        ->getMock();
+
+        $this->sut = new AssignOrderToCustomerObserver($this->orderRepositoryMock, $this->assignmentMock);
     }
 
     /**
@@ -43,9 +52,10 @@ protected function setUp()
      *
      * @dataProvider getCustomerIds
      * @param null|int $customerId
+     * @param null|int $customerOrderId
      * @return void
      */
-    public function testAssignOrderToCustomerAfterGuestOrder($customerId)
+    public function testAssignOrderToCustomerAfterGuestOrder($customerId, $customerOrderId)
     {
         $orderId = 1;
         /** @var Observer|PHPUnit_Framework_MockObject_MockObject $observerMock */
@@ -55,7 +65,12 @@ public function testAssignOrderToCustomerAfterGuestOrder($customerId)
             ->setMethods(['getData'])
             ->getMock();
         /** @var CustomerInterface|PHPUnit_Framework_MockObject_MockObject $customerMock */
-        $customerMock = $this->createMock(CustomerInterface::class);
+        $customerMock = $this->getMockBuilder(CustomerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $customerMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($customerId);
         /** @var OrderInterface|PHPUnit_Framework_MockObject_MockObject $orderMock */
         $orderMock = $this->getMockBuilder(OrderInterface::class)
             ->disableOriginalConstructor()
@@ -66,16 +81,28 @@ public function testAssignOrderToCustomerAfterGuestOrder($customerId)
                 ['delegate_data', null, ['__sales_assign_order_id' => $orderId]],
                 ['customer_data_object', null, $customerMock]
             ]);
-        $orderMock->expects($this->once())->method('getCustomerId')->willReturn($customerId);
+        $orderMock->expects($this->any())->method('getCustomerId')->willReturn($customerOrderId);
         $this->orderRepositoryMock->expects($this->once())->method('get')->with($orderId)
             ->willReturn($orderMock);
-        if (!$customerId) {
-            $this->orderRepositoryMock->expects($this->once())->method('save')->with($orderMock);
+
+        if (!$customerOrderId && $customerId) {
+            $orderMock->expects($this->once())->method('setCustomerId')->willReturn($orderMock);
+            $orderMock->expects($this->once())->method('setCustomerIsGuest')->willReturn($orderMock);
+            $orderMock->expects($this->once())->method('setCustomerEmail')->willReturn($orderMock);
+            $orderMock->expects($this->once())->method('setCustomerFirstname')->willReturn($orderMock);
+            $orderMock->expects($this->once())->method('setCustomerLastname')->willReturn($orderMock);
+            $orderMock->expects($this->once())->method('setCustomerMiddlename')->willReturn($orderMock);
+            $orderMock->expects($this->once())->method('setCustomerPrefix')->willReturn($orderMock);
+            $orderMock->expects($this->once())->method('setCustomerSuffix')->willReturn($orderMock);
+            $orderMock->expects($this->once())->method('setCustomerGroupId')->willReturn($orderMock);
+
+            $this->assignmentMock->expects($this->once())->method('execute')->with($orderMock, $customerMock);
             $this->sut->execute($observerMock);
-            return ;
+
+            return;
         }
 
-        $this->orderRepositoryMock->expects($this->never())->method('save')->with($orderMock);
+        $this->assignmentMock->expects($this->never())->method('execute');
         $this->sut->execute($observerMock);
     }
 
@@ -84,8 +111,12 @@ public function testAssignOrderToCustomerAfterGuestOrder($customerId)
      *
      * @return array
      */
-    public function getCustomerIds()
+    public function getCustomerIds(): array
     {
-        return [[null, 1]];
+        return [
+            [null, null],
+            [1, null],
+            [1, 1],
+        ];
     }
 }
diff --git a/app/code/Magento/Sales/ViewModel/Customer/AddressFormatter.php b/app/code/Magento/Sales/ViewModel/Customer/AddressFormatter.php
new file mode 100644
index 0000000000000..16de1412a2a45
--- /dev/null
+++ b/app/code/Magento/Sales/ViewModel/Customer/AddressFormatter.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\ViewModel\Customer;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * Customer address formatter
+ */
+class AddressFormatter implements ArgumentInterface
+{
+    /**
+     * Customer form factory
+     *
+     * @var \Magento\Customer\Model\Metadata\FormFactory
+     */
+    private $customerFormFactory;
+
+    /**
+     * Address format helper
+     *
+     * @var \Magento\Customer\Helper\Address
+     */
+    private $addressFormatHelper;
+
+    /**
+     * Directory helper
+     *
+     * @var \Magento\Directory\Helper\Data
+     */
+    private $directoryHelper;
+
+    /**
+     * Session quote
+     *
+     * @var \Magento\Backend\Model\Session\Quote
+     */
+    private $session;
+
+    /**
+     * Json encoder
+     *
+     * @var \Magento\Framework\Serialize\Serializer\Json
+     */
+    private $jsonEncoder;
+
+    /**
+     * Customer address
+     *
+     * @param \Magento\Customer\Model\Metadata\FormFactory $customerFormFactory
+     * @param \Magento\Customer\Helper\Address $addressFormatHelper
+     * @param \Magento\Directory\Helper\Data $directoryHelper
+     * @param \Magento\Backend\Model\Session\Quote $session
+     * @param \Magento\Framework\Serialize\Serializer\Json $jsonEncoder
+     */
+    public function __construct(
+        \Magento\Customer\Model\Metadata\FormFactory $customerFormFactory,
+        \Magento\Customer\Helper\Address $addressFormatHelper,
+        \Magento\Directory\Helper\Data $directoryHelper,
+        \Magento\Backend\Model\Session\Quote $session,
+        \Magento\Framework\Serialize\Serializer\Json $jsonEncoder
+    ) {
+        $this->customerFormFactory = $customerFormFactory;
+        $this->addressFormatHelper = $addressFormatHelper;
+        $this->directoryHelper = $directoryHelper;
+        $this->session = $session;
+        $this->jsonEncoder = $jsonEncoder;
+    }
+
+    /**
+     * Return customer address array as JSON
+     *
+     * @param array $addressArray
+     *
+     * @return string
+     */
+    public function getAddressesJson(array $addressArray)
+    {
+        $data = $this->getEmptyAddressForm();
+        foreach ($addressArray as $addressId => $address) {
+            $addressForm = $this->customerFormFactory->create(
+                'customer_address',
+                'adminhtml_customer_address',
+                $address
+            );
+            $data[$addressId] = $addressForm->outputData(
+                \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON
+            );
+        }
+
+        return $this->jsonEncoder->serialize($data);
+    }
+
+    /**
+     * Represent customer address in 'online' format.
+     *
+     * @param array $address
+     * @return string
+     */
+    public function getAddressAsString(array $address)
+    {
+        $formatTypeRenderer = $this->addressFormatHelper->getFormatTypeRenderer('oneline');
+        $result = '';
+        if ($formatTypeRenderer) {
+            $result = $formatTypeRenderer->renderArray($address);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Return empty address address form
+     *
+     * @return array
+     */
+    private function getEmptyAddressForm()
+    {
+        $defaultCountryId = $this->directoryHelper->getDefaultCountry($this->session->getStore());
+        $emptyAddressForm = $this->customerFormFactory->create(
+            'customer_address',
+            'adminhtml_customer_address',
+            [\Magento\Customer\Api\Data\AddressInterface::COUNTRY_ID => $defaultCountryId]
+        );
+
+        return [0 => $emptyAddressForm->outputData(\Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON)];
+    }
+}
diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json
index a0e40d283da68..c746f5dc0b541 100644
--- a/app/code/Magento/Sales/composer.json
+++ b/app/code/Magento/Sales/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-sales",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-catalog": "102.0.*",
         "magento/module-bundle": "100.2.*",
@@ -33,7 +33,7 @@
         "magento/module-sales-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "101.0.5",
+    "version": "101.0.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Sales/etc/adminhtml/system.xml b/app/code/Magento/Sales/etc/adminhtml/system.xml
index 1b2f8b88d7dc3..e437918b683b2 100644
--- a/app/code/Magento/Sales/etc/adminhtml/system.xml
+++ b/app/code/Magento/Sales/etc/adminhtml/system.xml
@@ -27,18 +27,23 @@
                 <label>Checkout Totals Sort Order</label>
                 <field id="discount" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Discount</label>
+                    <validate>required-number validate-number</validate>
                 </field>
                 <field id="grand_total" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Grand Total</label>
+                    <validate>required-number validate-number</validate>
                 </field>
                 <field id="shipping" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Shipping</label>
+                    <validate>required-number validate-number</validate>
                 </field>
                 <field id="subtotal" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Subtotal</label>
+                    <validate>required-number validate-number</validate>
                 </field>
                 <field id="tax" translate="label" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Tax</label>
+                    <validate>required-number validate-number</validate>
                 </field>
             </group>
             <group id="reorder" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -89,6 +94,11 @@
                     <label>Minimum Amount</label>
                     <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>
+                </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>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
diff --git a/app/code/Magento/Sales/etc/config.xml b/app/code/Magento/Sales/etc/config.xml
index 5be06fa3836a7..2480da4ad214b 100644
--- a/app/code/Magento/Sales/etc/config.xml
+++ b/app/code/Magento/Sales/etc/config.xml
@@ -22,6 +22,7 @@
                 <allow_zero_grandtotal>1</allow_zero_grandtotal>
             </zerograndtotal_creditmemo>
             <minimum_order>
+                <include_discount_amount>1</include_discount_amount>
                 <tax_including>1</tax_including>
             </minimum_order>
             <orders>
diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml
index ac7b8def08aa8..6311ed60dafe7 100644
--- a/app/code/Magento/Sales/etc/di.xml
+++ b/app/code/Magento/Sales/etc/di.xml
@@ -746,6 +746,10 @@
     <virtualType name="ShippingAddressAggregator" type="Magento\Framework\DB\Sql\ConcatExpression">
         <arguments>
             <argument name="columns" xsi:type="array">
+                <item name="company" xsi:type="array">
+                    <item name="tableAlias" xsi:type="string">sales_shipping_address</item>
+                    <item name="columnName" xsi:type="string">company</item>
+                </item>
                 <item name="street" xsi:type="array">
                     <item name="tableAlias" xsi:type="string">sales_shipping_address</item>
                     <item name="columnName" xsi:type="string">street</item>
@@ -769,6 +773,10 @@
     <virtualType name="BillingAddressAggregator" type="Magento\Framework\DB\Sql\ConcatExpression">
         <arguments>
             <argument name="columns" xsi:type="array">
+                <item name="company" xsi:type="array">
+                    <item name="tableAlias" xsi:type="string">sales_billing_address</item>
+                    <item name="columnName" xsi:type="string">company</item>
+                </item>
                 <item name="street" xsi:type="array">
                     <item name="tableAlias" xsi:type="string">sales_billing_address</item>
                     <item name="columnName" xsi:type="string">street</item>
@@ -1001,4 +1009,9 @@
     <preference
             for="Magento\Sales\Api\OrderCustomerDelegateInterface"
             type="Magento\Sales\Model\Order\OrderCustomerDelegate" />
+    <type name="Magento\Sales\Model\Order\Reorder\OrderedProductAvailabilityChecker">
+        <arguments>
+            <argument name="productAvailabilityChecks" xsi:type="array" />
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Sales/etc/extension_attributes.xml b/app/code/Magento/Sales/etc/extension_attributes.xml
index 7280a1a071548..222f61cdc7324 100644
--- a/app/code/Magento/Sales/etc/extension_attributes.xml
+++ b/app/code/Magento/Sales/etc/extension_attributes.xml
@@ -10,4 +10,7 @@
     <extension_attributes for="Magento\Sales\Api\Data\OrderInterface">
         <attribute code="shipping_assignments" type="Magento\Sales\Api\Data\ShippingAssignmentInterface[]" />
     </extension_attributes>
+    <extension_attributes for="Magento\Sales\Api\Data\OrderInterface">
+        <attribute code="payment_additional_info" type="Magento\Payment\Api\Data\PaymentAdditionalInfoInterface[]" />
+    </extension_attributes>
 </config>
diff --git a/app/code/Magento/Sales/etc/webapi.xml b/app/code/Magento/Sales/etc/webapi.xml
index cee245e348393..492dff8057039 100644
--- a/app/code/Magento/Sales/etc/webapi.xml
+++ b/app/code/Magento/Sales/etc/webapi.xml
@@ -10,271 +10,271 @@
     <route url="/V1/orders/:id" method="GET">
         <service class="Magento\Sales\Api\OrderRepositoryInterface" method="get"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::actions_view" />
         </resources>
     </route>
     <route url="/V1/orders" method="GET">
         <service class="Magento\Sales\Api\OrderRepositoryInterface" method="getList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::actions_view" />
         </resources>
     </route>
     <route url="/V1/orders/:id/statuses" method="GET">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="getStatus"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::actions_view" />
         </resources>
     </route>
     <route url="/V1/orders/:id/cancel" method="POST">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="cancel"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::cancel" />
         </resources>
     </route>
     <route url="/V1/orders/:id/emails" method="POST">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="notify"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::emails" />
         </resources>
     </route>
     <route url="/V1/orders/:id/hold" method="POST">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="hold"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::hold" />
         </resources>
     </route>
     <route url="/V1/orders/:id/unhold" method="POST">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="unHold"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::unhold" />
         </resources>
     </route>
     <route url="/V1/orders/:id/comments" method="POST">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="addComment"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::comment" />
         </resources>
     </route>
     <route url="/V1/orders/:id/comments" method="GET">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="getCommentsList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::actions_view" />
         </resources>
     </route>
     <route url="/V1/orders/create" method="PUT">
         <service class="Magento\Sales\Api\OrderRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::create" />
         </resources>
     </route>
     <route url="/V1/orders/:parent_id" method="PUT">
         <service class="Magento\Sales\Api\OrderAddressRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::create" />
         </resources>
     </route>
     <route url="/V1/orders/items/:id" method="GET">
         <service class="Magento\Sales\Api\OrderItemRepositoryInterface" method="get"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::actions_view" />
         </resources>
     </route>
     <route url="/V1/orders/items" method="GET">
         <service class="Magento\Sales\Api\OrderItemRepositoryInterface" method="getList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::actions_view" />
         </resources>
     </route>
     <route url="/V1/invoices/:id" method="GET">
         <service class="Magento\Sales\Api\InvoiceRepositoryInterface" method="get"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices" method="GET">
         <service class="Magento\Sales\Api\InvoiceRepositoryInterface" method="getList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices/:id/comments" method="GET">
         <service class="Magento\Sales\Api\InvoiceManagementInterface" method="getCommentsList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices/:id/emails" method="POST">
         <service class="Magento\Sales\Api\InvoiceManagementInterface" method="notify"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices/:id/void" method="POST">
         <service class="Magento\Sales\Api\InvoiceManagementInterface" method="setVoid"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices/:id/capture" method="POST">
         <service class="Magento\Sales\Api\InvoiceManagementInterface" method="setCapture"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices/comments" method="POST">
         <service class="Magento\Sales\Api\InvoiceCommentRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices/" method="POST">
         <service class="Magento\Sales\Api\InvoiceRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoice/:invoiceId/refund" method="POST">
         <service class="Magento\Sales\Api\RefundInvoiceInterface" method="execute"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/creditmemo/:id/comments" method="GET">
         <service class="Magento\Sales\Api\CreditmemoManagementInterface" method="getCommentsList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemos" method="GET">
         <service class="Magento\Sales\Api\CreditmemoRepositoryInterface" method="getList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemo/:id" method="GET">
         <service class="Magento\Sales\Api\CreditmemoRepositoryInterface" method="get"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemo/:id" method="PUT">
         <service class="Magento\Sales\Api\CreditmemoManagementInterface" method="cancel"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemo/:id/emails" method="POST">
         <service class="Magento\Sales\Api\CreditmemoManagementInterface" method="notify"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemo/refund" method="POST">
         <service class="Magento\Sales\Api\CreditmemoManagementInterface" method="refund"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemo/:id/comments" method="POST">
         <service class="Magento\Sales\Api\CreditmemoCommentRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemo" method="POST">
         <service class="Magento\Sales\Api\CreditmemoRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/order/:orderId/refund" method="POST">
         <service class="Magento\Sales\Api\RefundOrderInterface" method="execute"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::creditmemo" />
         </resources>
     </route>
     <route url="/V1/shipment/:id" method="GET">
         <service class="Magento\Sales\Api\ShipmentRepositoryInterface" method="get"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipments" method="GET">
         <service class="Magento\Sales\Api\ShipmentRepositoryInterface" method="getList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/:id/comments" method="GET">
         <service class="Magento\Sales\Api\ShipmentManagementInterface" method="getCommentsList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/:id/comments" method="POST">
         <service class="Magento\Sales\Api\ShipmentCommentRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/:id/emails" method="POST">
         <service class="Magento\Sales\Api\ShipmentManagementInterface" method="notify"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/track" method="POST">
         <service class="Magento\Sales\Api\ShipmentTrackRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/track/:id" method="DELETE">
         <service class="Magento\Sales\Api\ShipmentTrackRepositoryInterface" method="deleteById"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/" method="POST">
         <service class="Magento\Sales\Api\ShipmentRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/:id/label" method="GET">
         <service class="Magento\Sales\Api\ShipmentManagementInterface" method="getLabel"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/order/:orderId/ship" method="POST">
         <service class="Magento\Sales\Api\ShipOrderInterface" method="execute"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::ship" />
         </resources>
     </route>
     <route url="/V1/orders/" method="POST">
         <service class="Magento\Sales\Api\OrderRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::create" />
         </resources>
     </route>
     <route url="/V1/transactions/:id" method="GET">
         <service class="Magento\Sales\Api\TransactionRepositoryInterface" method="get"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::transactions_fetch" />
         </resources>
     </route>
     <route url="/V1/transactions" method="GET">
         <service class="Magento\Sales\Api\TransactionRepositoryInterface" method="getList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::transactions_fetch" />
         </resources>
     </route>
     <route url="/V1/order/:orderId/invoice" method="POST">
         <service class="Magento\Sales\Api\InvoiceOrderInterface" method="execute"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::invoice" />
         </resources>
     </route>
 </routes>
diff --git a/app/code/Magento/Sales/etc/webapi_rest/di.xml b/app/code/Magento/Sales/etc/webapi_rest/di.xml
index 47fb3f188513c..6435445e0ef93 100644
--- a/app/code/Magento/Sales/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Sales/etc/webapi_rest/di.xml
@@ -15,4 +15,11 @@
     <type name="Magento\Sales\Api\ShipmentRepositoryInterface">
         <plugin name="convert_blob_to_string" type="Magento\Sales\Plugin\ShippingLabelConverter" />
     </type>
+    <type name="Magento\Framework\Reflection\DataObjectProcessor">
+        <arguments>
+            <argument name="processors" xsi:type="array">
+                <item name="\Magento\Sales\Model\Order\Item" xsi:type="object">Magento\Sales\Model\Order\Webapi\ChangeOutputArray\Proxy</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Sales/etc/webapi_soap/di.xml b/app/code/Magento/Sales/etc/webapi_soap/di.xml
index 47fb3f188513c..6435445e0ef93 100644
--- a/app/code/Magento/Sales/etc/webapi_soap/di.xml
+++ b/app/code/Magento/Sales/etc/webapi_soap/di.xml
@@ -15,4 +15,11 @@
     <type name="Magento\Sales\Api\ShipmentRepositoryInterface">
         <plugin name="convert_blob_to_string" type="Magento\Sales\Plugin\ShippingLabelConverter" />
     </type>
+    <type name="Magento\Framework\Reflection\DataObjectProcessor">
+        <arguments>
+            <argument name="processors" xsi:type="array">
+                <item name="\Magento\Sales\Model\Order\Item" xsi:type="object">Magento\Sales\Model\Order\Webapi\ChangeOutputArray\Proxy</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Sales/i18n/en_US.csv b/app/code/Magento/Sales/i18n/en_US.csv
index cc18de430edc1..62d8e53e62fa0 100644
--- a/app/code/Magento/Sales/i18n/en_US.csv
+++ b/app/code/Magento/Sales/i18n/en_US.csv
@@ -796,3 +796,5 @@ Created,Created
 "PDF Creditmemos","PDF Creditmemos"
 Refunds,Refunds
 "Shipment with requested ID %1 doesn't correspond with Order with requested ID %2.","Shipment with requested ID %1 doesn't correspond with Order with requested ID %2."
+"Allow Zero GrandTotal for Creditmemo","Allow Zero GrandTotal for Creditmemo"
+"Allow Zero GrandTotal","Allow Zero GrandTotal"
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml
index c321bee460e46..0f5a3559f3008 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml
@@ -80,13 +80,13 @@
                             <argument name="align" xsi:type="string">center</argument>
                         </arguments>
                     </block>
-                </block>
-                <block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.customer.grid.columnSet.website_name" as="website_name">
-                    <arguments>
-                        <argument name="header" xsi:type="string" translate="true">Website</argument>
-                        <argument name="index" xsi:type="string">website_name</argument>
-                        <argument name="align" xsi:type="string">center</argument>
-                    </arguments>
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.customer.grid.columnSet.website_name" as="website_name">
+                        <arguments>
+                            <argument name="header" xsi:type="string" translate="true">Website</argument>
+                            <argument name="index" xsi:type="string">website_name</argument>
+                            <argument name="align" xsi:type="string">center</argument>
+                        </arguments>
+                    </block>
                 </block>
             </block>
         </referenceBlock>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
index eb0a7685e5e22..3832476ff6972 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
@@ -45,8 +45,18 @@
                             <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Pviewed" template="Magento_Sales::order/create/sidebar/items.phtml" name="pviewed"/>
                         </block>
                         <block class="Magento\Sales\Block\Adminhtml\Order\Create\Form\Account" template="Magento_Sales::order/create/form/account.phtml" name="form_account"/>
-                        <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="Magento_Sales::order/create/form/address.phtml" name="shipping_address"/>
-                        <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address"/>
+                        <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="Magento_Sales::order/create/form/address.phtml" name="shipping_address">
+                            <arguments>
+                                <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
+                                <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
+                            </arguments>
+                        </block>
+                        <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address">
+                            <arguments>
+                                <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
+                                <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
+                            </arguments>
+                        </block>
                         <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method" template="Magento_Sales::order/create/abstract.phtml" name="shipping_method">
                             <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method\Form" template="Magento_Sales::order/create/shipping/method/form.phtml" name="order_create_shipping_form" as="form"/>
                         </block>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml
index 6f0cbdb0cd43f..c52f81d5cb56d 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml
@@ -8,7 +8,12 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address"/>
+            <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address">
+                <arguments>
+                    <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
+                    <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
+                </arguments>
+            </block>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml
index 70b5bfc298274..54348ce961c56 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml
@@ -20,8 +20,18 @@
                     <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Pviewed" template="Magento_Sales::order/create/sidebar/items.phtml" name="pviewed"/>
                 </block>
                 <block class="Magento\Sales\Block\Adminhtml\Order\Create\Form\Account" template="Magento_Sales::order/create/form/account.phtml" name="form_account"/>
-                <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="Magento_Sales::order/create/form/address.phtml" name="shipping_address"/>
-                <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address"/>
+                <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="Magento_Sales::order/create/form/address.phtml" name="shipping_address">
+                    <arguments>
+                        <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
+                        <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
+                    </arguments>
+                </block>
+                <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="Magento_Sales::order/create/form/address.phtml" name="billing_address">
+                    <arguments>
+                        <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
+                        <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
+                    </arguments>
+                </block>
                 <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method" template="Magento_Sales::order/create/abstract.phtml" name="shipping_method">
                     <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method\Form" template="Magento_Sales::order/create/shipping/method/form.phtml" name="order.create.shipping.method.form" as="form"/>
                 </block>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml
index 56f6786397df9..559f56dcb845b 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml
@@ -8,7 +8,12 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="Magento_Sales::order/create/form/address.phtml" name="shipping_address"/>
+            <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="Magento_Sales::order/create/form/address.phtml" name="shipping_address">
+                <arguments>
+                    <argument name="customerAddressFormatter" xsi:type="object">Magento\Sales\ViewModel\Customer\AddressFormatter</argument>
+                    <argument name="customerAddressCollection" xsi:type="object">Magento\Customer\Model\ResourceModel\Address\Collection</argument>
+                </arguments>
+            </block>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
index ebdf79fe7f008..aae4b0db648b3 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
@@ -4,35 +4,31 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
-/**
- * @see \Magento\Sales\Block\Adminhtml\Items\Column\Name
- */
+/* @var $block \Magento\Sales\Block\Adminhtml\Items\Column\Name */
 ?>
-
-<?php if ($_item = $block->getItem()): ?>
-    <div id="order_item_<?= $block->escapeHtml($_item->getId()) ?>_title"
+<?php if ($_item = $block->getItem()) : ?>
+    <div id="order_item_<?= (int) $_item->getId() ?>_title"
          class="product-title">
         <?= $block->escapeHtml($_item->getName()) ?>
     </div>
     <div class="product-sku-block">
-        <span><?= $block->escapeHtml(__('SKU'))?>:</span> <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))) ?>
+        <span><?= $block->escapeHtml(__('SKU'))?>:</span> <?= /* @noEscape */ implode('<br />', $this->helper(\Magento\Catalog\Helper\Data::class)->splitSku($block->escapeHtml($block->getSku()))) ?>
     </div>
 
-    <?php if ($block->getOrderOptions()): ?>
+    <?php if ($block->getOrderOptions()) : ?>
         <dl class="item-options">
-            <?php foreach ($block->getOrderOptions() as $_option): ?>
+            <?php foreach ($block->getOrderOptions() as $_option) : ?>
                 <dt><?= $block->escapeHtml($_option['label']) ?>:</dt>
                 <dd>
-                    <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
-                        <?= $block->escapeHtml($block->getCustomizedOptionValue($_option)) ?>
-                    <?php else: ?>
+                    <?php if (isset($_option['custom_view']) && $_option['custom_view']) : ?>
+                        <?= /* @noEscape */ $block->getCustomizedOptionValue($_option) ?>
+                    <?php else : ?>
                         <?php $_option = $block->getFormattedOption($_option['value']); ?>
                         <?= $block->escapeHtml($_option['value']) ?>
-                        <?php if (isset($_option['remainder']) && $_option['remainder']): ?>
+                        <?php if (isset($_option['remainder']) && $_option['remainder']) : ?>
                             <?php $dots = 'dots' . uniqid(); ?>
                             <span id="<?= /* @noEscape */ $dots; ?>"> ...</span>
                             <?php  $id = 'id' . uniqid(); ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
index 9bf4856795197..645cdb9aac624 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
@@ -3,44 +3,41 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<?php if ($item = $block->getItem()): ?>
-<table class="qty-table">
-    <tr>
-        <th><?= $block->escapeHtml(__('Ordered')); ?></th>
-        <td><?= /* @noEscape */  $item->getQtyOrdered()*1 ?></td>
-    </tr>
-
-    <?php if ((float) $item->getQtyInvoiced()): ?>
+<?php if ($item = $block->getItem()) : ?>
+    <table class="qty-table">
         <tr>
-            <th><?= $block->escapeHtml(__('Invoiced')); ?></th>
-            <td><?= /* @noEscape */  $item->getQtyInvoiced()*1 ?></td>
+            <th><?= $block->escapeHtml(__('Ordered')); ?></th>
+            <td><?= (int) $item->getQtyOrdered() ?></td>
         </tr>
-    <?php endif; ?>
 
-    <?php if ((float) $item->getQtyShipped()): ?>
-        <tr>
-            <th><?= $block->escapeHtml(__('Shipped')); ?></th>
-            <td><?= /* @noEscape */  $item->getQtyShipped()*1 ?></td>
-        </tr>
-    <?php endif; ?>
+        <?php if ((float)$item->getQtyInvoiced()) : ?>
+            <tr>
+                <th><?= $block->escapeHtml(__('Invoiced')); ?></th>
+                <td><?= (int) $item->getQtyInvoiced() ?></td>
+            </tr>
+        <?php endif; ?>
 
-    <?php if ((float) $item->getQtyRefunded()): ?>
-        <tr>
-            <th><?= $block->escapeHtml(__('Refunded')); ?></th>
-            <td><?= /* @noEscape */ $item->getQtyRefunded()*1 ?></td>
-        </tr>
-    <?php endif; ?>
+        <?php if ((float)$item->getQtyShipped()) : ?>
+            <tr>
+                <th><?= $block->escapeHtml(__('Shipped')); ?></th>
+                <td><?= (int) $item->getQtyShipped() ?></td>
+            </tr>
+        <?php endif; ?>
 
-    <?php if ((float) $item->getQtyCanceled()): ?>
-        <tr>
-            <th><?= $block->escapeHtml(__('Canceled')); ?></th>
-            <td><?= /* @noEscape */ $item->getQtyCanceled()*1 ?></td>
-        </tr>
-    <?php endif; ?>
+        <?php if ((float)$item->getQtyRefunded()) : ?>
+            <tr>
+                <th><?= $block->escapeHtml(__('Refunded')); ?></th>
+                <td><?= (int) $item->getQtyRefunded() ?></td>
+            </tr>
+        <?php endif; ?>
+
+        <?php if ((float)$item->getQtyCanceled()) : ?>
+            <tr>
+                <th><?= $block->escapeHtml(__('Canceled')); ?></th>
+                <td><?= (int) $item->getQtyCanceled() ?></td>
+            </tr>
+        <?php endif; ?>
 
-</table>
+    </table>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/price/row.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/price/row.phtml
index 54e95876d7626..fba82ce89be58 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/price/row.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/price/row.phtml
@@ -3,16 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn $block */
-
 $_item = $block->getItem();
 ?>
-
 <div class="price-excl-tax">
-    <?= /* @escapeNotVerified */ $block->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
+    <?= /* @noEscape */ $block->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
 </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/price/total.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/price/total.phtml
index 46a0a0926f4c7..0bd5b8d9144de 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/price/total.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/price/total.phtml
@@ -4,13 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?php
 /** @var \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn $block */
-
 $_item = $block->getItem();
 ?>
-
-<?= /* @escapeNotVerified */ $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
+<?= /* @noEscape */ $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/price/unit.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/price/unit.phtml
index 444310c80884a..9146fe6713225 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/price/unit.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/price/unit.phtml
@@ -3,15 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn $block */
-
 $_item = $block->getItem();
 ?>
 <div class="price-excl-tax">
-<?= /* @escapeNotVerified */ $block->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
+<?= /* @noEscape */ $block->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
 </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/renderer/default.phtml
index 09f6ee5d6a49a..0c5b276bf382b 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/renderer/default.phtml
@@ -4,21 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
-
-<?= /* @escapeNotVerified */ $block->getItem()->getName() ?>
-<div><strong><?= /* @escapeNotVerified */ __('SKU') ?>:</strong> <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getItem()->getSku()))) ?></div>
-<?php if ($block->getOrderOptions()): ?>
+<?= $block->escapeHtml($block->getItem()->getName()) ?>
+<div><strong><?= $block->escapeHtml(__('SKU')) ?>:</strong> <?= /* @noEscape */ implode('<br />', $this->helper(\Magento\Catalog\Helper\Data::class)->splitSku($block->escapeHtml($block->getItem()->getSku()))) ?></div>
+<?php if ($block->getOrderOptions()) : ?>
     <ul class="item-options">
-    <?php foreach ($block->getOrderOptions() as $option): ?>
-        <li><strong><?= /* @escapeNotVerified */ $option['label'] ?>:</strong><br />
-        <?php if (is_array($option['value'])): ?>
-        <?php foreach ($option['value'] as $item): ?>
-            <?= $block->getValueHtml($item) ?><br />
-            <?php endforeach; ?>
-        <?php else: ?>
+    <?php foreach ($block->getOrderOptions() as $option) : ?>
+        <li><strong><?= $block->escapeHtml($option['label']) ?>:</strong><br />
+        <?php if (is_array($option['value'])) : ?>
+            <?php foreach ($option['value'] as $item) : ?>
+                <?= $block->getValueHtml($item) ?><br />
+                <?php endforeach; ?>
+            <?php else : ?>
             <?= $block->escapeHtml($option['value']) ?>
         <?php endif; ?>
         </li>
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 ff79e2f89cd20..a7f3b3c1cc8f5 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
@@ -3,19 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <div class="message message-notice">
     <div class="message-inner">
-        <div class="message-content"><?= /* @escapeNotVerified */ __('Changing address information will not recalculate shipping, tax or other order amount.') ?></div>
+        <div class="message-content"><?= $block->escapeHtml(__('Changing address information will not recalculate shipping, tax or other order amount.')) ?></div>
     </div>
 </div>
 
 <fieldset class="fieldset admin__fieldset-wrapper">
     <legend class="legend admin__legend">
-        <span><?= /* @escapeNotVerified */ $block->getHeaderText() ?></span>
+        <span><?= $block->escapeHtml($block->getHeaderText()) ?></span>
     </legend>
     <br>
     <div class="form-inline" data-mage-init='{"Magento_Sales/order/edit/address/form":{}}'>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
index f01e1c274a1de..05e753c78f4a3 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
@@ -3,16 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<?php if ($_entity = $block->getEntity()): ?>
+<?php if ($_entity = $block->getEntity()) : ?>
 <div id="comments_block" class="edit-order-comments">
     <div class="order-history-block">
         <div class="admin__field field-row">
             <label class="admin__field-label"
-                   for="history_comment"><?= /* @escapeNotVerified */ __('Comment Text') ?></label>
+                   for="history_comment"><?= $block->escapeHtml(__('Comment Text')) ?></label>
             <div class="admin__field-control">
                 <textarea name="comment[comment]"
                           class="admin__control-textarea"
@@ -23,7 +20,7 @@
         </div>
         <div class="admin__field">
             <div class="order-history-comments-options">
-                <?php if ($block->canSendCommentEmail()): ?>
+                <?php if ($block->canSendCommentEmail()) : ?>
                     <div class="admin__field admin__field-option">
                         <input name="comment[is_customer_notified]"
                                type="checkbox"
@@ -31,7 +28,7 @@
                                id="history_notify"
                                value="1" />
                         <label class="admin__field-label"
-                               for="history_notify"><?= /* @escapeNotVerified */ __('Notify Customer by Email') ?></label>
+                               for="history_notify"><?= $block->escapeHtml(__('Notify Customer by Email')) ?></label>
                     </div>
                 <?php endif; ?>
                 <div class="admin__field admin__field-option">
@@ -41,7 +38,7 @@
                            class="admin__control-checkbox"
                            value="1" />
                     <label class="admin__field-label"
-                           for="history_visible"> <?= /* @escapeNotVerified */ __('Visible on Storefront') ?></label>
+                           for="history_visible"> <?= $block->escapeHtml(__('Visible on Storefront')) ?></label>
                 </div>
             </div>
             <div class="order-history-comments-actions">
@@ -51,16 +48,16 @@
     </div>
 
     <ul class="note-list">
-        <?php foreach ($_entity->getCommentsCollection(true) as $_comment): ?>
+        <?php foreach ($_entity->getCommentsCollection(true) as $_comment) : ?>
             <li>
                 <span class="note-list-date"><?= /* @noEscape */ $block->formatDate($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
                 <span class="note-list-time"><?= /* @noEscape */ $block->formatTime($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
                 <span class="note-list-customer">
-                    <?= /* @escapeNotVerified */ __('Customer') ?>
-                    <?php if ($_comment->getIsCustomerNotified()): ?>
-                        <span class="note-list-customer-notified"><?= /* @escapeNotVerified */ __('Notified') ?></span>
-                    <?php else: ?>
-                        <span class="note-list-customer-not-notified"><?= /* @escapeNotVerified */ __('Not Notified') ?></span>
+                    <?= $block->escapeHtml(__('Customer')) ?>
+                    <?php if ($_comment->getIsCustomerNotified()) : ?>
+                        <span class="note-list-customer-notified"><?= $block->escapeHtml(__('Notified')) ?></span>
+                    <?php else : ?>
+                        <span class="note-list-customer-not-notified"><?= $block->escapeHtml(__('Not Notified')) ?></span>
                     <?php endif; ?>
                 </span>
                 <div class="note-list-comment"><?= $block->escapeHtml($_comment->getComment(), ['b', 'br', 'strong', 'i', 'u', 'a']) ?></div>
@@ -70,15 +67,12 @@
 </div>
 <script>
 require(['prototype'], function(){
-
-submitComment = function() {
-    submitAndReloadArea($('comments_block').parentNode, '<?= /* @escapeNotVerified */ $block->getSubmitUrl() ?>')
-}
-
-if ($('submit_comment_button')) {
-    $('submit_comment_button').observe('click', submitComment);
-}
-
+    submitComment = function() {
+        submitAndReloadArea($('comments_block').parentNode, '<?= $block->escapeUrl($block->getSubmitUrl()) ?>')
+    };
+    if ($('submit_comment_button')) {
+        $('submit_comment_button').observe('click', submitComment);
+    }
 });
 </script>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml
index 13433846d6ac4..6083a37efeabc 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml
@@ -3,14 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <div class="admin__page-section-title">
-    <span class="title"><?= /* @escapeNotVerified */ $block->getHeaderText() ?></span>
-    <?php if($block->getButtonsHtml()): ?>
+    <span class="title"><?= $block->escapeHtml($block->getHeaderText()) ?></span>
+    <?php if ($block->getButtonsHtml()) : ?>
         <div class="actions"><?= $block->getButtonsHtml() ?></div>
     <?php endif; ?>
 </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
index 2133d7996f470..89cc9df2e8f23 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
@@ -17,30 +17,30 @@
             <?php foreach ($_methods as $_method) :
                 $_code = $_method->getCode();
                 $_counter++;
-            ?>
+                ?>
                 <dt class="admin__field-option">
                     <?php if ($_methodsCount > 1) : ?>
-                        <input id="p_method_<?= $block->escapeHtml($_code); ?>"
-                               value="<?= $block->escapeHtml($_code); ?>"
+                        <input id="p_method_<?= $block->escapeHtmlAttr($_code); ?>"
+                               value="<?= $block->escapeHtmlAttr($_code); ?>"
                                type="radio" name="payment[method]"
-                               title="<?= $block->escapeHtml($_method->getTitle()); ?>"
-                               onclick="payment.switchMethod('<?= $block->escapeHtml($_code); ?>')"
+                               title="<?= $block->escapeHtmlAttr($_method->getTitle()); ?>"
+                               onclick="payment.switchMethod('<?= $block->escapeJs($_code); ?>')"
                             <?php if ($block->getSelectedMethodCode() == $_code) : ?>
                                 checked="checked"
                             <?php endif; ?>
                             <?php $className = ($_counter == $_methodsCount) ? ' validate-one-required-by-name' : ''; ?>
-                               class="admin__control-radio<?= $block->escapeHtml($className); ?>"/>
+                               class="admin__control-radio<?= $block->escapeHtmlAttr($className); ?>"/>
                     <?php else : ?>
                         <span class="no-display">
-                            <input id="p_method_<?= $block->escapeHtml($_code); ?>"
-                                   value="<?= $block->escapeHtml($_code); ?>"
+                            <input id="p_method_<?= $block->escapeHtmlAttr($_code); ?>"
+                                   value="<?= $block->escapeHtmlAttr($_code); ?>"
                                    type="radio"
                                    name="payment[method]" class="admin__control-radio"
                                    checked="checked"/>
                         </span>
                     <?php endif; ?>
 
-                    <label class="admin__field-label" for="p_method_<?= $block->escapeHtml($_code); ?>">
+                    <label class="admin__field-label" for="p_method_<?= $block->escapeHtmlAttr($_code); ?>">
                         <?= $block->escapeHtml($_method->getTitle()) ?>
                     </label>
                 </dt>
@@ -57,9 +57,9 @@
         ], function(mage) {
             mage.apply();
         <?php if ($_methodsCount != 1) : ?>
-            order.setPaymentMethod('<?= $block->escapeHtml($currentSelectedMethod); ?>');
+            order.setPaymentMethod('<?= $block->escapeJs($currentSelectedMethod); ?>');
         <?php else : ?>
-            payment.switchMethod('<?= $block->escapeHtml($currentSelectedMethod); ?>');
+            payment.switchMethod('<?= $block->escapeJs($currentSelectedMethod); ?>');
         <?php endif; ?>
         });
     </script>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml
index 2cf09583bd902..dfa6b5e6fff79 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml
@@ -4,18 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Comment $block */
+?>
 
- ?>
-
-<?php /* <h4 class="icon-head fieldset-legend <?= $block->getHeaderCssClass() ?>"><?= $block->getHeaderText() ?></h4> */ ?>
 <div class="admin__field field-comment">
-    <label for="order-comment" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Order Comments') ?></span></label>
+    <label for="order-comment" class="admin__field-label"><span><?= $block->escapeHtml(__('Order Comments')) ?></span></label>
     <div class="admin__field-control">
         <textarea
             id="order-comment"
             name="order[comment][customer_note]"
-            class="admin__control-textarea"><?= /* @escapeNotVerified */ $block->getCommentNote() ?></textarea>
+            class="admin__control-textarea"><?= $block->escapeHtml($block->getCommentNote()) ?></textarea>
     </div>
 </div>
 <script>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
index d499df585e565..188587588897e 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
@@ -3,35 +3,28 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
-/**
- * \Magento\Sales\Block\Adminhtml\Order\Create\Coupons
- *
- */
+/* @var \Magento\Sales\Block\Adminhtml\Order\Create\Coupons $block */
 ?>
-
 <div class="admin__field field-apply-coupon-code">
-    <label class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Apply Coupon Code') ?></span></label>
+    <label class="admin__field-label"><span><?= $block->escapeHtml(__('Apply Coupon Code')) ?></span></label>
     <div class="admin__field-control">
+        <?php if (!$block->getCouponCode()) : ?>
         <input type="text" class="admin__control-text" id="coupons:code" value="" name="coupon_code" />
         <?= $block->getButtonHtml(__('Apply'), 'order.applyCoupon($F(\'coupons:code\'))') ?>
-        <?php if ($block->getCouponCode()): ?>
+        <?php endif; ?>
+        <?php if ($block->getCouponCode()) : ?>
         <p class="added-coupon-code">
             <span><?= $block->escapeHtml($block->getCouponCode()) ?></span>
-            <a href="#" onclick="order.applyCoupon(''); return false;" title="<?= /* @escapeNotVerified */ __('Remove Coupon Code') ?>"
-               class="action-remove"><span><?= /* @escapeNotVerified */ __('Remove') ?></span></a>
+            <a href="#" onclick="order.applyCoupon(''); return false;" title="<?= $block->escapeHtmlAttr(__('Remove Coupon Code')) ?>"
+               class="action-remove"><span><?= $block->escapeHtml(__('Remove')) ?></span></a>
         </p>
         <?php endif; ?>
         <script>
-            require(["Magento_Sales/order/create/form"], function(){
-
-                order.overlay('shipping-method-overlay', <?php if ($block->getQuote()->isVirtual()): ?>false<?php else: ?>true<?php endif; ?>);
-                order.overlay('address-shipping-overlay', <?php if ($block->getQuote()->isVirtual()): ?>false<?php else: ?>true<?php endif; ?>);
-
+            require(["Magento_Sales/order/create/form"], function() {
+                order.overlay('shipping-method-overlay', <?php if ($block->getQuote()->isVirtual()) : ?>false<?php else : ?>true<?php endif; ?>);
+                order.overlay('address-shipping-overlay', <?php if ($block->getQuote()->isVirtual()) : ?>false<?php else : ?>true<?php endif; ?>);
             });
         </script>
     </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
index 170fea937348d..bd5baf397fcec 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
@@ -4,16 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Data $block */
 ?>
 <div class="page-create-order">
     <script>
     require(["Magento_Sales/order/create/form"], function(){
-        order.setCurrencySymbol('<?= /* @escapeNotVerified */ $block->getCurrencySymbol($block->getCurrentCurrencyCode()) ?>')
+        order.setCurrencySymbol('<?= $block->escapeJs($block->getCurrencySymbol($block->getCurrentCurrencyCode())) ?>')
     });
 </script>
-    <div class="order-details<?php if ($block->getCustomerId()): ?> order-details-existing-customer<?php endif; ?>">
+    <div class="order-details<?php if ($block->getCustomerId()) : ?> order-details-existing-customer<?php endif; ?>">
 
         <div id="order-additional_area" style="display: none" class="admin__page-section order-additional-area">
             <?= $block->getChildHtml('additional_area') ?>
@@ -35,7 +34,7 @@
 
         <section id="order-addresses" class="admin__page-section order-addresses">
             <div class="admin__page-section-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Address Information') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Address Information')) ?></span>
             </div>
             <div class="admin__page-section-content">
                 <div id="order-billing_address" class="admin__page-section-item order-billing-address">
@@ -59,7 +58,7 @@
             </div>
         </section>
 
-        <?php if ($block->getChildBlock('card_validation')): ?>
+        <?php if ($block->getChildBlock('card_validation')) : ?>
         <section id="order-card_validation" class="admin__page-section order-card-validation">
             <?= $block->getChildHtml('card_validation') ?>
         </section>
@@ -69,11 +68,11 @@
 
         <section class="admin__page-section order-summary">
             <div class="admin__page-section-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Order Total') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Order Total')) ?></span>
             </div>
             <div class="admin__page-section-content">
                 <fieldset class="admin__fieldset order-history" id="order-comment">
-                    <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Order History') ?></span></legend>
+                    <legend class="admin__legend"><span><?= $block->escapeHtml(__('Order History')) ?></span></legend>
                     <br>
                     <?= $block->getChildHtml('comment') ?>
                 </fieldset>
@@ -84,19 +83,19 @@
         </section>
     </div>
 
-    <?php if ($block->getCustomerId()): ?>
+    <?php if ($block->getCustomerId()) : ?>
         <div class="order-sidebar">
             <div class="store-switcher order-currency">
                 <label class="admin__field-label" for="currency_switcher">
-                    <?= /* @escapeNotVerified */ __('Order Currency:') ?>
+                    <?= $block->escapeHtml(__('Order Currency:')) ?>
                 </label>
                 <select id="currency_switcher"
                         class="admin__control-select"
                         name="order[currency]"
                         onchange="order.setCurrencyId(this.value); order.setCurrencySymbol(this.options[this.selectedIndex].getAttribute('symbol'));">
-                    <?php foreach ($block->getAvailableCurrencies() as $_code): ?>
-                        <option value="<?= /* @escapeNotVerified */ $_code ?>"<?php if ($_code == $block->getCurrentCurrencyCode()): ?> selected="selected"<?php endif; ?> symbol="<?= /* @escapeNotVerified */ $block->getCurrencySymbol($_code) ?>">
-                            <?= /* @escapeNotVerified */ $block->getCurrencyName($_code) ?>
+                    <?php foreach ($block->getAvailableCurrencies() as $_code) : ?>
+                        <option value="<?= $block->escapeHtmlAttr($_code) ?>"<?php if ($_code == $block->getCurrentCurrencyCode()) : ?> selected="selected"<?php endif; ?> symbol="<?= $block->escapeHtmlAttr($block->getCurrencySymbol($_code)) ?>">
+                            <?= $block->escapeHtml($block->getCurrencyName($_code)) ?>
                         </option>
                     <?php endforeach; ?>
                 </select>
@@ -106,5 +105,4 @@
             </div>
         </div>
     <?php endif; ?>
-
 </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
index f46e1f74ca8d5..c38acb9b79e47 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
@@ -4,22 +4,20 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var \Magento\Sales\Block\Adminhtml\Order\Create\Form $block */
 ?>
-<form id="edit_form" data-order-config='<?= $block->escapeHtml($block->getOrderDataJson()) ?>' data-load-base-url="<?= /* @escapeNotVerified */ $block->getLoadBlockUrl() ?>" action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>" method="post" enctype="multipart/form-data">
+<form id="edit_form" data-order-config='<?= $block->escapeHtml($block->getOrderDataJson()) ?>' data-load-base-url="<?= $block->escapeUrl($block->getLoadBlockUrl()) ?>" action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" enctype="multipart/form-data">
     <?= $block->getBlockHtml('formkey') ?>
     <div id="order-message">
         <?= $block->getChildHtml('message') ?>
     </div>
-    <div id="order-customer-selector" class="fieldset-wrapper order-customer-selector" style="display:<?= /* @escapeNotVerified */ $block->getCustomerSelectorDisplay() ?>">
+    <div id="order-customer-selector" class="fieldset-wrapper order-customer-selector" style="display:<?= /* @noEscape */ $block->getCustomerSelectorDisplay() ?>">
         <?= $block->getChildHtml('customer.grid.container') ?>
     </div>
-    <div id="order-store-selector" class="fieldset-wrapper" style="display:<?= /* @escapeNotVerified */ $block->getStoreSelectorDisplay() ?>">
+    <div id="order-store-selector" class="fieldset-wrapper" style="display:<?= /* @noEscape */ $block->getStoreSelectorDisplay() ?>">
         <?= $block->getChildHtml('store') ?>
     </div>
-    <div id="order-data" style="display:<?= /* @escapeNotVerified */ $block->getDataSelectorDisplay() ?>">
+    <div id="order-data" style="display:<?= /* @noEscape */ $block->getDataSelectorDisplay() ?>">
         <?= $block->getChildHtml('data') ?>
     </div>
 </form>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml
index 0d2ee1f24d5b3..f9611a02c53e4 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml
@@ -3,10 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Form\Account */
 ?>
 
-<div class="admin__page-section-title <?= /* @escapeNotVerified */ $block->getHeaderCssClass() ?>">
-    <span class="title"><?= /* @escapeNotVerified */ $block->getHeaderText() ?></span>
+<div class="admin__page-section-title <?= $block->escapeHtmlAttr($block->getHeaderCssClass()) ?>">
+    <span class="title"><?= $block->escapeHtml($block->getHeaderText()) ?></span>
     <div class="actions"></div>
 </div>
 <div id="customer_account_fieds" class="admin__page-section-content">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
index 686e311292ac7..606c2d00fef79 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
@@ -4,99 +4,105 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address $block */
+
+/**
+ * @var \Magento\Customer\Model\ResourceModel\Address\Collection $addressCollection
+ */
+$addressCollection = $block->getData('customerAddressCollection');
+
+$addressArray = [];
+if ($block->getCustomerId()) :
+    $addressArray = $addressCollection->setCustomerFilter([$block->getCustomerId()])->toArray();
+endif;
+
+/**
+ * @var \Magento\Sales\ViewModel\Customer\AddressFormatter $customerAddressFormatter
+ */
+$customerAddressFormatter = $block->getData('customerAddressFormatter');
 
 /**
  * @var \Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address|\Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address $block
  */
-if ($block->getIsShipping()):
+if ($block->getIsShipping()) :
     $_fieldsContainerId = 'order-shipping_address_fields';
     $_addressChoiceContainerId = 'order-shipping_address_choice';
     ?>
     <script>
     require(["Magento_Sales/order/create/form"], function(){
-
-        order.shippingAddressContainer = '<?= /* @escapeNotVerified */ $_fieldsContainerId ?>';
-        order.setAddresses(<?= /* @escapeNotVerified */ $block->getAddressCollectionJson() ?>);
-
+        order.shippingAddressContainer = '<?= $block->escapeJs($_fieldsContainerId) ?>';
+        order.setAddresses(<?= /* @noEscape */ $block->getAddressCollectionJson() ?>);
     });
     </script>
     <?php
-else:
+else :
     $_fieldsContainerId = 'order-billing_address_fields';
     $_addressChoiceContainerId = 'order-billing_address_choice';
     ?>
     <script>
         require(["Magento_Sales/order/create/form"], function(){
-            order.billingAddressContainer = '<?= /* @escapeNotVerified */ $_fieldsContainerId ?>';
+            order.billingAddressContainer = '<?= $block->escapeJs($_fieldsContainerId) ?>';
         });
     </script>
     <?php
 endif; ?>
 
 <fieldset class="admin__fieldset">
-    <legend class="admin__legend <?= /* @escapeNotVerified */ $block->getHeaderCssClass() ?>">
-        <span><?= /* @escapeNotVerified */ $block->getHeaderText() ?></span>
+    <legend class="admin__legend <?= $block->escapeHtmlAttr($block->getHeaderCssClass()) ?>">
+        <span><?= $block->escapeHtml($block->getHeaderText()) ?></span>
     </legend><br>
 
-    <fieldset id="<?= /* @escapeNotVerified */ $_addressChoiceContainerId ?>" class="admin__fieldset order-choose-address">
-    <?php if ($block->getIsShipping()): ?>
+    <fieldset id="<?= $block->escapeHtmlAttr($_addressChoiceContainerId) ?>" class="admin__fieldset order-choose-address">
+    <?php if ($block->getIsShipping()) : ?>
         <div class="admin__field admin__field-option admin__field-shipping-same-as-billing">
             <input type="checkbox" id="order-shipping_same_as_billing" name="shipping_same_as_billing"
-                   onclick="order.setShippingAsBilling(this.checked)" class="admin__control-checkbox"
-                   <?php if ($block->getIsAsBilling()): ?>checked<?php endif; ?> />
+                   onclick="order.setShippingAsBilling(this.checked)" class="admin__control-checkbox" <?php if ($block->getIsAsBilling()) : ?>checked<?php endif; ?> />
             <label for="order-shipping_same_as_billing" class="admin__field-label">
-                <?= /* @escapeNotVerified */ __('Same As Billing Address') ?>
+                <?= $block->escapeHtml(__('Same As Billing Address')) ?>
             </label>
         </div>
     <?php endif; ?>
         <div class="admin__field admin__field-select-from-existing-address">
-            <label class="admin__field-label"><?= /* @escapeNotVerified */ __('Select from existing customer addresses:') ?></label>
+            <label class="admin__field-label"><?= $block->escapeHtml(__('Select from existing customer addresses:')) ?></label>
             <?php $_id = $block->getForm()->getHtmlIdPrefix() . 'customer_address_id' ?>
             <div class="admin__field-control">
-                <select id="<?= /* @escapeNotVerified */ $_id ?>"
-                        name="<?= $block->getForm()->getHtmlNamePrefix() ?>[customer_address_id]"
-                        onchange="order.selectAddress(this, '<?= /* @escapeNotVerified */ $_fieldsContainerId ?>')"
+                <select id="<?= $block->escapeHtmlAttr($_id) ?>"
+                        name="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlNamePrefix()) ?>[customer_address_id]"
+                        onchange="order.selectAddress(this, '<?= $block->escapeJs($_fieldsContainerId) ?>')"
                         class="admin__control-select">
-                    <option value=""><?= /* @escapeNotVerified */ __('Add New Address') ?></option>
-                    <?php foreach ($block->getAddressCollection() as $_address): ?>
-                        <?php //if($block->getAddressAsString($_address)!=$block->getAddressAsString($block->getAddress())): ?>
+                    <option value=""><?= $block->escapeHtml(__('Add New Address')) ?></option>
+                    <?php foreach ($addressArray as $addressId => $address) : ?>
                         <option
-                            value="<?= /* @escapeNotVerified */ $_address->getId() ?>"<?php if ($_address->getId() == $block->getAddressId()): ?> selected="selected"<?php endif; ?>>
-                            <?= /* @escapeNotVerified */ $block->getAddressAsString($_address) ?>
+                            value="<?= $block->escapeHtmlAttr($addressId) ?>"<?php if ($addressId == $block->getAddressId()) : ?> selected="selected"<?php endif; ?>>
+                            <?= $block->escapeHtml($customerAddressFormatter->getAddressAsString($address)) ?>
                         </option>
-                        <?php //endif; ?>
                     <?php endforeach; ?>
                 </select>
             </div>
         </div>
     </fieldset>
 
-    <div class="order-address admin__fieldset" id="<?= /* @escapeNotVerified */ $_fieldsContainerId ?>">
+    <div class="order-address admin__fieldset" id="<?= $block->escapeHtmlAttr($_fieldsContainerId) ?>">
         <?= $block->getForm()->toHtml() ?>
 
         <div class="admin__field admin__field-option order-save-in-address-book">
-            <input name="<?= $block->getForm()->getHtmlNamePrefix() ?>[save_in_address_book]" type="checkbox"
-                   id="<?= $block->getForm()->getHtmlIdPrefix() ?>save_in_address_book"
-                   value="1"
-                   <?php if (!$block->getDontSaveInAddressBook() && $block->getAddress()->getSaveInAddressBook()): ?> checked="checked"<?php endif; ?>
-                   class="admin__control-checkbox"/>
-            <label for="<?= $block->getForm()->getHtmlIdPrefix() ?>save_in_address_book"
-                   class="admin__field-label"><?= /* @escapeNotVerified */ __('Save in address book') ?></label>
+            <input name="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlNamePrefix()) ?>[save_in_address_book]" type="checkbox" id="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlIdPrefix()) ?>save_in_address_book" value="1"<?php if (!$block->getDontSaveInAddressBook() && $block->getAddress()->getSaveInAddressBook()) : ?> checked="checked"<?php endif; ?> class="admin__control-checkbox"/>
+            <label for="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlIdPrefix()) ?>save_in_address_book"
+                   class="admin__field-label"><?= $block->escapeHtml(__('Save in address book')) ?></label>
         </div>
     </div>
     <?php $hideElement = 'address-' . ($block->getIsShipping() ? 'shipping' : 'billing') . '-overlay'; ?>
-    <div style="display: none;" id="<?= /* @escapeNotVerified */ $hideElement ?>" class="order-methods-overlay">
-        <span><?= /* @escapeNotVerified */ __('You don\'t need to select a shipping address.') ?></span>
+    <div style="display: none;" id="<?= /* @noEscape */ $hideElement ?>" class="order-methods-overlay">
+        <span><?= $block->escapeHtml(__('You don\'t need to select a shipping address.')) ?></span>
     </div>
 
     <script>
         require(["Magento_Sales/order/create/form"], function(){
-                order.bindAddressFields('<?= /* @escapeNotVerified */ $_fieldsContainerId ?>');
-                order.bindAddressFields('<?= /* @escapeNotVerified */ $_addressChoiceContainerId ?>');
-                <?php if ($block->getIsShipping() && $block->getIsAsBilling()): ?>
-                order.disableShippingAddress(true);
-                <?php endif; ?>
+            order.bindAddressFields('<?= $block->escapeJs($_fieldsContainerId) ?>');
+            order.bindAddressFields('<?= $block->escapeJs($_addressChoiceContainerId) ?>');
+            <?php if ($block->getIsShipping() && $block->getIsAsBilling()) : ?>
+            order.disableShippingAddress(true);
+            <?php endif; ?>
         });
     </script>
 </fieldset>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml
index 14d020c4763f5..d27782fd20b15 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml
@@ -4,25 +4,25 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
+/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage $block */
 ?>
-<?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('main', $block->getQuote(), $block->getStoreId())): ?>
-<?php $_items = $block->getItems(); ?>
-<div id="order-giftmessage" class="giftmessage-order-create">
-    <fieldset class="admin__fieldset">
-        <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Gift Message for the Entire Order') ?></span></legend>
-        <br>
-        <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('main', $block->getQuote(), $block->getStoreId())): ?>
-            <p><?= /* @escapeNotVerified */ __('Leave this box blank if you don\'t want to leave a gift message for the entire order.') ?></p>
-            <?= $block->getFormHtml($block->getQuote(), 'main') ?>
-        <?php endif; ?>
-    </fieldset>
-<script>
-require(['Magento_Sales/order/create/form'], function(){
-
-    order.giftmessageFieldsBind('order-giftmessage');
-});
-</script>
-</div>
+<?php if ($this->helper(\Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('main', $block->getQuote(), $block->getStoreId())) : ?>
+    <?php $_items = $block->getItems(); ?>
+    <div id="order-giftmessage" class="giftmessage-order-create">
+        <fieldset class="admin__fieldset">
+            <legend class="admin__legend"><span><?= $block->escapeHtml(__('Gift Message for the Entire Order')) ?></span></legend>
+            <br>
+            <?php if ($this->helper(\Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('main', $block->getQuote(), $block->getStoreId())) : ?>
+                <p><?= $block->escapeHtml(__('Leave this box blank if you don\'t want to leave a gift message for the entire order.')) ?></p>
+                <?= $block->getFormHtml($block->getQuote(), 'main') ?>
+            <?php endif; ?>
+        </fieldset>
+        <script>
+        require(['Magento_Sales/order/create/form'], function(){
+            order.giftmessageFieldsBind('order-giftmessage');
+        });
+        </script>
+    </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml
index de7af269538d9..4c31e34d38654 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml
@@ -4,12 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Items $block */
 ?>
-
 <div class="admin__page-section-title">
-    <strong class="title"><?= /* @escapeNotVerified */ $block->getHeaderText() ?></strong>
+    <strong class="title"><?= $block->escapeHtml($block->getHeaderText()) ?></strong>
     <div class="actions">
         <?= $block->getButtonsHtml() ?>
     </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
index 02cf697b0e74a..d6821303d8c16 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
@@ -4,8 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
 /**
@@ -14,32 +13,32 @@
 ?>
 
 <?php $_items = $block->getItems() ?>
-<?php if (empty($_items)): ?>
+<?php if (empty($_items)) : ?>
     <div id="order-items_grid">
         <div class="admin__table-wrapper">
             <table class="data-table admin__table-primary order-tables">
                 <thead>
                     <tr class="headings">
-                        <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
-                        <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
-                        <th class="col-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
-                        <th class="col-subtotal"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
-                        <th class="col-discount"><span><?= /* @escapeNotVerified */ __('Discount') ?></span></th>
-                        <th class="col-row-total"><span><?= /* @escapeNotVerified */ __('Row Subtotal') ?></span></th>
-                        <th class="col-action"><span><?= /* @escapeNotVerified */ __('Action') ?></span></th>
+                        <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
+                        <th class="col-price"><span><?= $block->escapeHtml(__('Price')) ?></span></th>
+                        <th class="col-qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
+                        <th class="col-subtotal"><span><?= $block->escapeHtml(__('Subtotal')) ?></span></th>
+                        <th class="col-discount"><span><?= $block->escapeHtml(__('Discount')) ?></span></th>
+                        <th class="col-row-total"><span><?= $block->escapeHtml(__('Row Subtotal')) ?></span></th>
+                        <th class="col-action"><span><?= $block->escapeHtml(__('Action')) ?></span></th>
                     </tr>
                 </thead>
                 <tbody>
                     <tr class="even">
-                        <td class="empty-text" colspan="100"><?= /* @escapeNotVerified */ __('No ordered items') ?></td>
+                        <td class="empty-text" colspan="100"><?= $block->escapeHtml(__('No ordered items')) ?></td>
                     </tr>
                 </tbody>
             </table>
         </div>
     </div>
-<?php else: ?>
+<?php else : ?>
     <div class="admin__table-wrapper" id="order-items_grid">
-    <?php if (count($_items)>10): ?>
+    <?php if (count($_items) > 10) : ?>
         <div class="actions update actions-update">
             <?= $block->getButtonHtml(__('Update Items and Quantities'), 'order.itemsUpdate()', 'action-secondary') ?>
         </div>
@@ -47,37 +46,34 @@
         <table class="data-table admin__table-primary order-tables">
             <thead>
                 <tr class="headings">
-                    <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
-                    <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
-                    <th class="col-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
-                    <th class="col-subtotal"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
-                    <th class="col-discount"><span><?= /* @escapeNotVerified */ __('Discount') ?></span></th>
-                    <th class="col-row-total"><span><?= /* @escapeNotVerified */ __('Row Subtotal') ?></span></th>
-                    <th class="col-action"><span><?= /* @escapeNotVerified */ __('Action') ?></span></th>
+                    <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
+                    <th class="col-price"><span><?= $block->escapeHtml(__('Price')) ?></span></th>
+                    <th class="col-qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
+                    <th class="col-subtotal"><span><?= $block->escapeHtml(__('Subtotal')) ?></span></th>
+                    <th class="col-discount"><span><?= $block->escapeHtml(__('Discount')) ?></span></th>
+                    <th class="col-row-total"><span><?= $block->escapeHtml(__('Row Subtotal')) ?></span></th>
+                    <th class="col-action"><span><?= $block->escapeHtml(__('Action')) ?></span></th>
                 </tr>
             </thead>
             <tfoot>
                 <tr>
-                    <td class="col-total"><?= /* @escapeNotVerified */ __('Total %1 product(s)', count($_items)) ?></td>
-                    <td colspan="2" class="col-subtotal"><?= /* @escapeNotVerified */ __('Subtotal:') ?></td>
-                    <td class="col-price"><strong><?= /* @escapeNotVerified */ $block->formatPrice($block->getSubtotal()) ?></strong></td>
-                    <td class="col-price"><strong><?= /* @escapeNotVerified */ $block->formatPrice($block->getDiscountAmount()) ?></strong></td>
-                    <td class="col-price"><strong>
-                    <?php
-                        /* @escapeNotVerified */ echo $block->formatPrice($block->getSubtotalWithDiscount());
-                    ?></strong></td>
+                    <td class="col-total"><?= $block->escapeHtml(__('Total %1 product(s)', count($_items))) ?></td>
+                    <td colspan="2" class="col-subtotal"><?= $block->escapeHtml(__('Subtotal:')) ?></td>
+                    <td class="col-price"><strong><?= /* @noEscape */ $block->formatPrice($block->getSubtotal()) ?></strong></td>
+                    <td class="col-price"><strong><?= /* @noEscape */ $block->formatPrice($block->getDiscountAmount()) ?></strong></td>
+                    <td class="col-price"><strong><?= /* @noEscape */ $block->formatPrice($block->getSubtotalWithDiscount()); ?></strong></td>
                     <td colspan="2">&nbsp;</td>
                 </tr>
             </tfoot>
                 <?php $i = 0 ?>
-                <?php foreach ($_items as $_item):$i++ ?>
-                <tbody class="<?= /* @escapeNotVerified */ ($i%2) ? 'even' : 'odd' ?>">
+                <?php foreach ($_items as $_item) : $i++ ?>
+                <tbody class="<?= /* @noEscape */ ($i%2) ? 'even' : 'odd' ?>">
                     <tr>
                         <td class="col-product">
-                            <span id="order_item_<?= /* @escapeNotVerified */ $_item->getId() ?>_title"><?= $block->escapeHtml($_item->getName()) ?></span>
+                            <span id="order_item_<?= (int) $_item->getId() ?>_title"><?= $block->escapeHtml($_item->getName()) ?></span>
                             <div class="product-sku-block">
-                                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
-                                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
+                                <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
+                                <?= /* @noEscape */ implode('<br />', $this->helper(\Magento\Catalog\Helper\Data::class)->splitSku($block->escapeHtml($_item->getSku()))) ?>
                             </div>
                             <div class="product-configure-block">
                                 <?= $block->getConfigureButtonHtml($_item) ?>
@@ -88,56 +84,56 @@
                             <?= $block->getItemUnitPriceHtml($_item) ?>
 
                             <?php $_isCustomPrice = $block->usedCustomPriceForItem($_item) ?>
-                            <?php if ($_tier = $block->getTierHtml($_item)): ?>
-                            <div id="item_tier_block_<?= /* @escapeNotVerified */ $_item->getId() ?>"<?php if ($_isCustomPrice): ?> style="display:none"<?php endif; ?>>
-                                <a href="#" onclick="$('item_tier_<?= /* @escapeNotVerified */ $_item->getId() ?>').toggle();return false;"><?= /* @escapeNotVerified */ __('Tier Pricing') ?></a>
-                                <div style="display:none" id="item_tier_<?= /* @escapeNotVerified */ $_item->getId() ?>"><?= /* @escapeNotVerified */ $_tier ?></div>
+                            <?php if ($_tier = $block->getTierHtml($_item)) : ?>
+                            <div id="item_tier_block_<?= (int) $_item->getId() ?>"<?php if ($_isCustomPrice) : ?> style="display:none"<?php endif; ?>>
+                                <a href="#" onclick="$('item_tier_<?= (int) $_item->getId() ?>').toggle();return false;"><?= $block->escapeHtml(__('Tier Pricing')) ?></a>
+                                <div style="display:none" id="item_tier_<?= (int) $_item->getId() ?>"><?= /* @noEscape */ $_tier ?></div>
                             </div>
                             <?php endif; ?>
-                            <?php if ($block->canApplyCustomPrice($_item)): ?>
+                            <?php if ($block->canApplyCustomPrice($_item)) : ?>
                                 <div class="custom-price-block">
                                     <input type="checkbox"
-                                           class="admin__control-checkbox"
-                                           id="item_use_custom_price_<?= /* @escapeNotVerified */ $_item->getId() ?>"
-                                           <?php if ($_isCustomPrice): ?> checked="checked"<?php endif; ?>
-                                           onclick="order.toggleCustomPrice(this, 'item_custom_price_<?= /* @escapeNotVerified */ $_item->getId() ?>', 'item_tier_block_<?= /* @escapeNotVerified */ $_item->getId() ?>');"/>
+                                        class="admin__control-checkbox"
+                                        id="item_use_custom_price_<?= (int) $_item->getId() ?>"
+                                        <?php if ($_isCustomPrice) : ?> checked="checked"<?php endif; ?>
+                                        onclick="order.toggleCustomPrice(this, 'item_custom_price_<?= (int) $_item->getId() ?>', 'item_tier_block_<?= (int) $_item->getId() ?>');"/>
                                     <label
                                         class="normal admin__field-label"
-                                        for="item_use_custom_price_<?= /* @escapeNotVerified */ $_item->getId() ?>">
-                                        <span><?= /* @escapeNotVerified */ __('Custom Price') ?>*</span></label>
+                                        for="item_use_custom_price_<?= (int) $_item->getId() ?>">
+                                        <span><?= $block->escapeHtml(__('Custom Price')) ?>*</span></label>
                                 </div>
                             <?php endif; ?>
-                            <input id="item_custom_price_<?= /* @escapeNotVerified */ $_item->getId() ?>"
-                                   name="item[<?= /* @escapeNotVerified */ $_item->getId() ?>][custom_price]"
-                                   value="<?= /* @escapeNotVerified */ sprintf("%.2f", $block->getOriginalEditablePrice($_item)) ?>"
-                                   <?php if (!$_isCustomPrice): ?>
-                                   style="display:none"
-                                   disabled="disabled"
-                                   <?php endif; ?>
-                                   class="input-text item-price admin__control-text"/>
+                            <input id="item_custom_price_<?= (int) $_item->getId() ?>"
+                                name="item[<?= (int) $_item->getId() ?>][custom_price]"
+                                value="<?= /* @noEscape */ sprintf("%.2f", $block->getOriginalEditablePrice($_item)) ?>"
+                                <?php if (!$_isCustomPrice) : ?>
+                                style="display:none"
+                                disabled="disabled"
+                                <?php endif; ?>
+                                class="input-text item-price admin__control-text"/>
                         </td>
                         <td class="col-qty">
-                            <input name="item[<?= /* @escapeNotVerified */ $_item->getId() ?>][qty]"
+                            <input name="item[<?= (int) $_item->getId() ?>][qty]"
                                    class="input-text item-qty admin__control-text"
-                                   value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>"
+                                   value="<?= (int) $_item->getQty() ?>"
                                    maxlength="12" />
                         </td>
                         <td class="col-subtotal col-price">
                             <?= $block->getItemRowTotalHtml($_item) ?>
                         </td>
                         <td class="col-discount col-price">
-                            <?= /* @escapeNotVerified */ $block->formatPrice(-$_item->getTotalDiscountAmount()) ?>
+                            <?= /* @noEscape */ $block->formatPrice(-$_item->getTotalDiscountAmount()) ?>
                             <div class="discount-price-block">
-                                <input id="item_use_discount_<?= /* @escapeNotVerified */ $_item->getId() ?>"
-                                       class="admin__control-checkbox"
-                                       name="item[<?= /* @escapeNotVerified */ $_item->getId() ?>][use_discount]"
-                                       <?php if (!$_item->getNoDiscount()): ?>checked="checked"<?php endif; ?>
-                                       value="1"
-                                       type="checkbox" />
+                                <input id="item_use_discount_<?= (int) $_item->getId() ?>"
+                                    class="admin__control-checkbox"
+                                    name="item[<?= (int) $_item->getId() ?>][use_discount]"
+                                    <?php if (!$_item->getNoDiscount()) : ?>checked="checked"<?php endif; ?>
+                                    value="1"
+                                    type="checkbox" />
                                 <label
-                                    for="item_use_discount_<?= /* @escapeNotVerified */ $_item->getId() ?>"
+                                    for="item_use_discount_<?= (int) $_item->getId() ?>"
                                     class="normal admin__field-label">
-                                    <span><?= /* @escapeNotVerified */ __('Apply') ?></span></label>
+                                    <span><?= $block->escapeHtml(__('Apply')) ?></span></label>
                             </div>
 
                         </td>
@@ -145,19 +141,19 @@
                             <?= $block->getItemRowTotalWithDiscountHtml($_item) ?>
                         </td>
                         <td class="col-actions last">
-                            <select class="admin__control-select" name="item[<?= /* @escapeNotVerified */ $_item->getId() ?>][action]">
-                                <option value=""><?= /* @escapeNotVerified */ __('Please select') ?></option>
-                                <option value="remove"><?= /* @escapeNotVerified */ __('Remove') ?></option>
-                                <?php if ($block->getCustomerId() && $block->getMoveToCustomerStorage()): ?>
-                                    <option value="cart"><?= /* @escapeNotVerified */ __('Move to Shopping Cart') ?></option>
-                                    <?php if ($block->isMoveToWishlistAllowed($_item)): ?>
+                            <select class="admin__control-select" name="item[<?= (int) $_item->getId() ?>][action]">
+                                <option value=""><?= $block->escapeHtml(__('Please select')) ?></option>
+                                <option value="remove"><?= $block->escapeHtml(__('Remove')) ?></option>
+                                <?php if ($block->getCustomerId() && $block->getMoveToCustomerStorage()) : ?>
+                                    <option value="cart"><?= $block->escapeHtml(__('Move to Shopping Cart')) ?></option>
+                                    <?php if ($block->isMoveToWishlistAllowed($_item)) : ?>
                                         <?php $wishlists = $block->getCustomerWishlists();?>
-                                        <?php if (count($wishlists) <= 1):?>
-                                            <option value="wishlist"><?= /* @escapeNotVerified */ __('Move to Wish List') ?></option>
-                                        <?php else: ?>
-                                            <optgroup label="<?= /* @escapeNotVerified */ __('Move to Wish List') ?>">
-                                                <?php foreach ($wishlists as $wishlist):?>
-                                                    <option value="wishlist_<?= /* @escapeNotVerified */ $wishlist->getId() ?>"><?= $block->escapeHtml($wishlist->getName()) ?></option>
+                                        <?php if (count($wishlists) <= 1) : ?>
+                                            <option value="wishlist"><?= $block->escapeHtml(__('Move to Wish List')) ?></option>
+                                        <?php else : ?>
+                                            <optgroup label="<?= $block->escapeHtml(__('Move to Wish List')) ?>">
+                                                <?php foreach ($wishlists as $wishlist) :?>
+                                                    <option value="wishlist_<?= (int) $wishlist->getId() ?>"><?= $block->escapeHtml($wishlist->getName()) ?></option>
                                                 <?php endforeach;?>
                                             </optgroup>
                                         <?php endif; ?>
@@ -168,22 +164,21 @@
                     </tr>
 
                     <?php $hasMessageError = false; ?>
-                    <?php foreach ($_item->getMessage(false) as $messageError):?>
-                        <?php if (!empty($messageError)) {
+                    <?php foreach ($_item->getMessage(false) as $messageError) : ?>
+                        <?php if (!empty($messageError)) :
                             $hasMessageError = true;
-                        }
-                        ?>
+                        endif; ?>
                     <?php endforeach; ?>
 
-                    <?php if ($hasMessageError):?>
+                    <?php if ($hasMessageError) : ?>
                         <tr class="row-messages-error">
                             <td colspan="100"> <!-- ToDo UI: remove the 100 -->
-                                <?php foreach ($_item->getMessage(false) as $message):
+                                <?php foreach ($_item->getMessage(false) as $message) :
                                     if (empty($message)) {
                                         continue;
                                     }
                                     ?>
-                                    <div class="message <?php if ($_item->getHasError()): ?>message-error<?php else: ?>message-notice<?php endif; ?>">
+                                    <div class="message <?php if ($_item->getHasError()) : ?>message-error<?php else : ?>message-notice<?php endif; ?>">
                                         <?= $block->escapeHtml($message) ?>
                                     </div>
                                 <?php endforeach; ?>
@@ -195,7 +190,7 @@
                 </tbody>
                 <?php endforeach; ?>
         </table>
-        <p><small><?= /* @escapeNotVerified */ $block->getInclExclTaxMessage() ?></small></p>
+        <p><small><?= $block->escapeHtml($block->getInclExclTaxMessage()) ?></small></p>
     </div>
 
     <div class="order-discounts">
@@ -210,43 +205,42 @@
             order.itemsOnchangeBind()
         });
     </script>
+    <?php if ($block->isGiftMessagesAvailable()) : ?>
+        <script>
+        require([
+            "prototype",
+            "Magento_Sales/order/giftoptions_tooltip"
+        ], function(){
 
-<?php if ($block->isGiftMessagesAvailable()) : ?>
-<script>
-require([
-    "prototype",
-    "Magento_Sales/order/giftoptions_tooltip"
-], function(){
-
-//<![CDATA[
-    /**
-     * Retrieve gift options tooltip content
-     */
-    function getGiftOptionsTooltipContent(itemId) {
-        var contentLines = [];
-        var headerLine = null;
-        var contentLine = null;
-
-        $$('#gift_options_data_' + itemId + ' .gift-options-tooltip-content').each(function (element) {
-            if (element.down(0)) {
-                headerLine = element.down(0).innerHTML;
-                contentLine = element.down(0).next().innerHTML;
-                if (contentLine.length > 30) {
-                    contentLine = contentLine.slice(0,30) + '...';
-                }
-                contentLines.push(headerLine + ' ' + contentLine);
+        //<![CDATA[
+            /**
+             * Retrieve gift options tooltip content
+             */
+            function getGiftOptionsTooltipContent(itemId) {
+                var contentLines = [];
+                var headerLine = null;
+                var contentLine = null;
+
+                $$('#gift_options_data_' + itemId + ' .gift-options-tooltip-content').each(function (element) {
+                    if (element.down(0)) {
+                        headerLine = element.down(0).innerHTML;
+                        contentLine = element.down(0).next().innerHTML;
+                        if (contentLine.length > 30) {
+                            contentLine = contentLine.slice(0,30) + '...';
+                        }
+                        contentLines.push(headerLine + ' ' + contentLine);
+                    }
+                });
+                return contentLines.join('<br/>');
             }
-        });
-        return contentLines.join('<br/>');
-    }
 
-    giftOptionsTooltip.setTooltipContentLoaderFunction(getGiftOptionsTooltipContent);
+            giftOptionsTooltip.setTooltipContentLoaderFunction(getGiftOptionsTooltipContent);
 
-    window.getGiftOptionsTooltipContent = getGiftOptionsTooltipContent;
+            window.getGiftOptionsTooltipContent = getGiftOptionsTooltipContent;
 
-//]]>
+        //]]>
 
-});
-</script>
-<?php endif; ?>
+        });
+        </script>
+    <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/row.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/row.phtml
index 2e1f058e17128..6a0715a056558 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/row.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/row.phtml
@@ -3,16 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid $block */
-
 $_item = $block->getItem();
 ?>
-
 <div class="price-excl-tax">
-    <?= /* @escapeNotVerified */ $block->formatPrice($_item->getRowTotal()) ?>
+    <?= /* @noEscape */ $block->formatPrice($_item->getRowTotal()) ?>
 </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/total.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/total.phtml
index aafd3afd2783c..ae4bcd26e7c1e 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/total.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/total.phtml
@@ -4,14 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?php
 /** @var \Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid $block */
-
 $_item = $block->getItem();
 ?>
-
 <?php $_rowTotalWithoutDiscount = $_item->getRowTotal() - $_item->getTotalDiscountAmount(); ?>
-<?= /* @escapeNotVerified */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
+<?= /* @noEscape */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/unit.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/unit.phtml
index 0ecefcf5273f1..b5871518cf596 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/unit.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/unit.phtml
@@ -3,15 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid $block */
-
 $_item = $block->getItem();
 ?>
 <div class="price-excl-tax">
-<?= /* @escapeNotVerified */ $block->formatPrice($_item->getCalculationPrice()) ?>
+<?= /* @noEscape */ $block->formatPrice($_item->getCalculationPrice()) ?>
 </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/js.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/js.phtml
index 374684d351b49..eb39f71265cd6 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/js.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/js.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
- ?>
+?>
 <script>
 require([
     "prototype",
@@ -13,16 +11,14 @@ require([
     "Magento_Catalog/catalog/product/composite/configure",
     "domReady!"
 ], function(){
-
     order.sidebarHide();
     if (window.productConfigure) {
         productConfigure.addListType('product_to_add', {
-            urlFetch: '<?= /* @escapeNotVerified */ $block->getUrl('sales/order_create/configureProductToAdd') ?>'
+            urlFetch: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('sales/order_create/configureProductToAdd'))) ?>'
         });
         productConfigure.addListType('quote_items', {
-            urlFetch: '<?= /* @escapeNotVerified */ $block->getUrl('sales/order_create/configureQuoteItems') ?>'
+            urlFetch: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('sales/order_create/configureQuoteItems'))) ?>'
         });
     }
-
 });
 </script>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml
index 973758a66947c..1dcf57d879543 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml
@@ -3,8 +3,5 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<input type="checkbox" name="newsletter:subscribe"> <label for="newsletter:subscribe" style="width: 90%; float: none;"><?= /* @escapeNotVerified */ __('Subscribe to Newsletter') ?></label><br/>
+<input type="checkbox" name="newsletter:subscribe"> <label for="newsletter:subscribe" style="width: 90%; float: none;"><?= $block->escapeHtml(__('Subscribe to Newsletter')) ?></label><br/>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
index 65d3a612e5133..baaf4c078f2c7 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
@@ -4,46 +4,45 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php /** @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method\Form */ ?>
 <?php $_shippingRateGroups = $block->getShippingRates(); ?>
-<?php if ($_shippingRateGroups): ?>
+<?php if ($_shippingRateGroups) : ?>
     <div id="order-shipping-method-choose" class="control" style="display:none">
         <dl class="admin__order-shipment-methods">
-        <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
+        <?php foreach ($_shippingRateGroups as $code => $_rates) : ?>
             <dt class="admin__order-shipment-methods-title"><?= $block->escapeHtml($block->getCarrierName($code)) ?></dt>
             <dd class="admin__order-shipment-methods-options">
                 <ul class="admin__order-shipment-methods-options-list">
-                <?php foreach ($_rates as $_rate): ?>
+                <?php foreach ($_rates as $_rate) : ?>
                     <?php $_radioProperty = 'name="order[shipping_method]" type="radio" onclick="order.setShippingMethod(this.value)"' ?>
                     <?php $_code = $_rate->getCode() ?>
                     <li class="admin__field-option">
-                       <?php if ($_rate->getErrorMessage()): ?>
-                           <div class="messages">
+                        <?php if ($_rate->getErrorMessage()) : ?>
+                            <div class="messages">
                                <div class="message message-error error">
                                    <div><?= $block->escapeHtml($_rate->getErrorMessage()) ?></div>
                                </div>
-                           </div>
-                       <?php else: ?>
+                            </div>
+                        <?php else : ?>
                             <?php $_checked = $block->isMethodActive($_code) ? 'checked="checked"' : '' ?>
-                            <input <?= /* @escapeNotVerified */ $_radioProperty ?> value="<?= /* @escapeNotVerified */ $_code ?>"
-                                                                 id="s_method_<?= /* @escapeNotVerified */ $_code ?>" <?= /* @escapeNotVerified */ $_checked ?>
+                            <input <?= /* @noEscape */ $_radioProperty ?> value="<?= $block->escapeHtmlAttr($_code) ?>"
+                                                                 id="s_method_<?= $block->escapeHtmlAttr($_code) ?>" <?= /* @noEscape */ $_checked ?>
                                                                  class="admin__control-radio required-entry"/>
-                            <label class="admin__field-label" for="s_method_<?= /* @escapeNotVerified */ $_code ?>">
+                            <label class="admin__field-label" for="s_method_<?= $block->escapeHtmlAttr($_code) ?>">
                                 <?= $block->escapeHtml($_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
                                 <strong>
-                                    <?php $_excl = $block->getShippingPrice($_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
+                                    <?php $_excl = $block->getShippingPrice($_rate->getPrice(), $this->helper(\Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()); ?>
                                     <?php $_incl = $block->getShippingPrice($_rate->getPrice(), true); ?>
 
-                                    <?= /* @escapeNotVerified */ $_excl ?>
-                                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                                        (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
+                                    <?= /* @noEscape */ $_excl ?>
+                                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
+                                        (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
                                     <?php endif; ?>
                                 </strong>
                             </label>
-                       <?php endif ?>
+                        <?php endif; ?>
                     </li>
                 <?php endforeach; ?>
                 </ul>
@@ -51,7 +50,7 @@
         <?php endforeach; ?>
         </dl>
     </div>
-    <?php if ($_rate = $block->getActiveMethodRate()): ?>
+    <?php if ($_rate = $block->getActiveMethodRate()) : ?>
         <div id="order-shipping-method-info" class="order-shipping-method-info">
             <dl class="admin__order-shipment-methods">
                 <dt class="admin__order-shipment-methods-title">
@@ -60,12 +59,12 @@
                 <dd class="admin__order-shipment-methods-options">
                     <?= $block->escapeHtml($_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
                     <strong>
-                        <?php $_excl = $block->getShippingPrice($_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
+                        <?php $_excl = $block->getShippingPrice($_rate->getPrice(), $this->helper(\Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()); ?>
                         <?php $_incl = $block->getShippingPrice($_rate->getPrice(), true); ?>
 
-                        <?= /* @escapeNotVerified */ $_excl ?>
-                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                            (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
+                        <?= /* @noEscape */ $_excl ?>
+                        <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
+                            (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
                         <?php endif; ?>
                     </strong>
                 </dd>
@@ -73,35 +72,35 @@
             <a href="#"
                onclick="$('order-shipping-method-info').hide();$('order-shipping-method-choose').show();return false"
                class="action-default">
-                <span><?= /* @escapeNotVerified */ __('Click to change shipping method') ?></span>
+                <span><?= $block->escapeHtml(__('Click to change shipping method')) ?></span>
             </a>
         </div>
-    <?php else: ?>
+    <?php else : ?>
         <script>
 require(['prototype'], function(){
     $('order-shipping-method-choose').show();
 });
 </script>
     <?php endif; ?>
-<?php elseif ($block->getIsRateRequest()): ?>
+<?php elseif ($block->getIsRateRequest()) : ?>
     <div class="order-shipping-method-summary">
-        <strong class="order-shipping-method-not-available"><?= /* @escapeNotVerified */ __('Sorry, no quotes are available for this order.') ?></strong>
+        <strong class="order-shipping-method-not-available"><?= $block->escapeHtml(__('Sorry, no quotes are available for this order.')) ?></strong>
     </div>
-<?php else: ?>
+<?php else : ?>
     <div id="order-shipping-method-summary" class="order-shipping-method-summary">
         <a href="#" onclick="order.loadShippingRates();return false" class="action-default">
-            <span><?= /* @escapeNotVerified */ __('Get shipping methods and rates') ?></span>
+            <span><?= $block->escapeHtml(__('Get shipping methods and rates')) ?></span>
         </a>
         <input type="hidden" name="order[has_shipping]" value="" class="required-entry" />
     </div>
 <?php endif; ?>
 <div style="display: none;" id="shipping-method-overlay" class="order-methods-overlay">
-    <span><?= /* @escapeNotVerified */ __('You don\'t need to select a shipping method.') ?></span>
+    <span><?= $block->escapeHtml(__('You don\'t need to select a shipping method.')) ?></span>
 </div>
 <script>
     require(["Magento_Sales/order/create/form"], function(){
-        order.overlay('shipping-method-overlay', <?php if ($block->getQuote()->isVirtual()): ?>false<?php else: ?>true<?php endif; ?>);
-        order.overlay('address-shipping-overlay', <?php if ($block->getQuote()->isVirtual()): ?>false<?php else: ?>true<?php endif; ?>);
+        order.overlay('shipping-method-overlay', <?php if ($block->getQuote()->isVirtual()) : ?>false<?php else : ?>true<?php endif; ?>);
+        order.overlay('address-shipping-overlay', <?php if ($block->getQuote()->isVirtual()) : ?>false<?php else : ?>true<?php endif; ?>);
         order.isOnlyVirtualProduct = <?= /* @noEscape */ $block->getQuote()->isVirtual() ? 'true' : 'false'; ?>;
     });
 </script>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml
index 48823de3f4db2..d4dea4eb85a57 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml
@@ -4,18 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
-/** @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar */
+/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar $block */
 ?>
 <div class="customer-current-activity-inner">
-    <h4 class="customer-activity-title"><?= /* @escapeNotVerified */ __('Customer\'s Activities') ?></h4>
+    <h4 class="customer-activity-title"><?= $block->escapeHtml(__('Customer\'s Activities')) ?></h4>
     <div class="create-order-sidebar-container">
     <?= $block->getChildHtml('top_button') ?>
-    <?php foreach ($block->getLayout()->getChildBlocks($block->getNameInLayout()) as $_alias => $_child): ?>
-        <?php if ($_alias != 'top_button' && $_alias != 'bottom_button'): ?>
-            <?php if ($block->canDisplay($_child)): ?>
-                <div class="order-sidebar-block" id="order-sidebar_<?= /* @escapeNotVerified */ $_alias ?>">
+    <?php foreach ($block->getLayout()->getChildBlocks($block->getNameInLayout()) as $_alias => $_child) : ?>
+        <?php if ($_alias != 'top_button' && $_alias != 'bottom_button') : ?>
+            <?php if ($block->canDisplay($_child)) : ?>
+                <div class="order-sidebar-block" id="order-sidebar_<?= $block->escapeHtmlAttr($_alias) ?>">
                     <?= $block->getChildHtml($_alias) ?>
                 </div>
             <?php endif; ?>
@@ -32,12 +30,12 @@ require([
 
     function addSidebarCompositeListType() {
         productConfigure.addListType('sidebar', {
-            urlFetch: '<?= /* @escapeNotVerified */ $block->getUrl('sales/order_create/configureProductToAdd') ?>',
-            urlConfirm: '<?= /* @escapeNotVerified */ $block->getUrl('sales/order_create/addConfigured') ?>'
+            urlFetch: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('sales/order_create/configureProductToAdd'))) ?>',
+            urlConfirm: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('sales/order_create/addConfigured'))) ?>'
         });
         productConfigure.addListType('sidebar_wishlist', {
-            urlFetch: '<?= /* @escapeNotVerified */ $block->getUrl('customer/wishlist_product_composite_wishlist/configure') ?>',
-            urlConfirm: '<?= /* @escapeNotVerified */ $block->getUrl('sales/order_create/addConfigured') ?>'
+            urlFetch: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('customer/wishlist_product_composite_wishlist/configure'))) ?>',
+            urlConfirm: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('sales/order_create/addConfigured'))) ?>'
         });
     }
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
index 2dbf717f73439..a323bc9aa5c2f 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
@@ -3,44 +3,41 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /* @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar */ ?>
-<div class="create-order-sidebar-block" id="sidebar_data_<?= /* @escapeNotVerified */ $block->getDataId() ?>">
+<div class="create-order-sidebar-block" id="sidebar_data_<?= $block->escapeHtmlAttr($block->getDataId()) ?>">
     <div class="head sidebar-title-block">
         <a href="#" class="action-refresh"
            title="<?= $block->escapeHtml(__('Refresh')) ?>"
-           onclick="order.loadArea('sidebar_<?= /* @escapeNotVerified */ $block->getDataId() ?>', 'sidebar_data_<?= /* @escapeNotVerified */ $block->getDataId() ?>');return false;">
-            <span><?= /* @escapeNotVerified */ __('Refresh') ?></span>
+           onclick="order.loadArea('sidebar_<?= $block->escapeJs($block->getDataId()) ?>', 'sidebar_data_<?= $block->escapeJs($block->getDataId()) ?>');return false;">
+            <span><?= $block->escapeHtml(__('Refresh')) ?></span>
         </a>
         <h5 class="create-order-sidebar-label">
-            <?= /* @escapeNotVerified */ $block->getHeaderText() ?>
-            <span class="normal">(<?= /* @escapeNotVerified */ $block->getItemCount() ?>)</span>
+            <?= $block->escapeHtml($block->getHeaderText()) ?>
+            <span class="normal">(<?= $block->escapeHtml($block->getItemCount()) ?>)</span>
         </h5>
     </div>
     <div class="content">
         <div class="auto-scroll">
-        <?php if ($block->getItemCount()): ?>
+        <?php if ($block->getItemCount()) : ?>
         <table class="admin__table-primary">
             <thead>
                 <tr>
-                    <th class="col-item"><?= /* @escapeNotVerified */ __('Item') ?></th>
+                    <th class="col-item"><?= $block->escapeHtml(__('Item')) ?></th>
 
-                    <?php if ($block->canDisplayItemQty()): ?>
-                        <th class="col-qty"><?= /* @escapeNotVerified */ __('Qty') ?></th>
+                    <?php if ($block->canDisplayItemQty()) : ?>
+                        <th class="col-qty"><?= $block->escapeHtml(__('Qty')) ?></th>
                     <?php endif; ?>
 
-                    <?php if ($block->canDisplayPrice()): ?>
-                        <th class="col-price"><?= /* @escapeNotVerified */ __('Price') ?></th>
+                    <?php if ($block->canDisplayPrice()) : ?>
+                        <th class="col-price"><?= $block->escapeHtml(__('Price')) ?></th>
                     <?php endif; ?>
 
-                    <?php if ($block->canRemoveItems()): ?>
+                    <?php if ($block->canRemoveItems()) : ?>
                         <th class="col-remove">
                             <span title="<?= $block->escapeHtml(__('Remove')) ?>"
                                   class="icon icon-remove">
-                                <span><?= /* @escapeNotVerified */ __('Remove') ?></span>
+                                <span><?= $block->escapeHtml(__('Remove')) ?></span>
                             </span>
                         </th>
                     <?php endif; ?>
@@ -48,40 +45,40 @@
                     <th class="col-add">
                         <span title="<?= $block->escapeHtml(__('Add To Order')) ?>"
                               class="icon icon-add">
-                            <span><?= /* @escapeNotVerified */ __('Add To Order') ?></span>
+                            <span><?= $block->escapeHtml(__('Add To Order')) ?></span>
                         </span>
                     </th>
                 </tr>
             </thead>
 
             <tbody>
-                <?php foreach ($block->getItems() as $_item): ?>
+                <?php foreach ($block->getItems() as $_item) : ?>
                     <tr>
                         <td class="col-item"><?= $block->escapeHtml($_item->getName()) ?></td>
 
-                        <?php if ($block->canDisplayItemQty()): ?>
+                        <?php if ($block->canDisplayItemQty()) : ?>
                             <td class="col-qty">
-                                <?= /* @escapeNotVerified */ $block->getItemQty($_item) ?>
+                                <?= (int) $block->getItemQty($_item) ?>
                             </td>
                         <?php endif; ?>
 
-                        <?php if ($block->canDisplayPrice()): ?>
+                        <?php if ($block->canDisplayPrice()) : ?>
                             <td class="col-price">
                                 <?= /* @noEscape */ $block->getItemPrice($block->getProduct($_item)) ?>
                             </td>
                         <?php endif; ?>
 
-                        <?php if ($block->canRemoveItems()): ?>
+                        <?php if ($block->canRemoveItems()) : ?>
                             <td class="col-remove">
                                 <div class="admin__field-option">
-                                    <input id="sidebar-remove-<?= /* @escapeNotVerified */ $block->getSidebarStorageAction() ?>-<?= /* @escapeNotVerified */ $block->getItemId($_item) ?>"
+                                    <input id="sidebar-remove-<?= $block->escapeHtmlAttr($block->getSidebarStorageAction()) ?>-<?= (int) $block->getItemId($_item) ?>"
                                            type="checkbox"
                                            class="admin__control-checkbox"
-                                           name="sidebar[remove][<?= /* @escapeNotVerified */ $block->getItemId($_item) ?>]"
-                                           value="<?= /* @escapeNotVerified */ $block->getDataId() ?>"
+                                           name="sidebar[remove][<?= (int) $block->getItemId($_item) ?>]"
+                                           value="<?= $block->escapeHtmlAttr($block->getDataId()) ?>"
                                            title="<?= $block->escapeHtml(__('Remove')) ?>" />
                                     <label class="admin__field-label"
-                                           for="sidebar-remove-<?= /* @escapeNotVerified */ $block->getSidebarStorageAction() ?>-<?= /* @escapeNotVerified */ $block->getItemId($_item) ?>">
+                                           for="sidebar-remove-<?= $block->escapeHtmlAttr($block->getSidebarStorageAction()) ?>-<?= (int) $block->getItemId($_item) ?>">
                                     </label>
                                 </div>
                             </td>
@@ -89,29 +86,29 @@
 
                         <td class="col-add">
                             <div class="admin__field-option">
-                                <?php if ($block->isConfigurationRequired($_item->getTypeId()) && $block->getDataId() == 'wishlist'): ?>
+                                <?php if ($block->isConfigurationRequired($_item->getTypeId()) && $block->getDataId() == 'wishlist') : ?>
                                     <a href="#"
                                        class="icon icon-configure"
                                        title="<?= $block->escapeHtml(__('Configure and Add to Order')) ?>"
-                                       onclick="order.sidebarConfigureProduct('<?= 'sidebar_wishlist' ?>', <?= /* @escapeNotVerified */ $block->getProductId($_item) ?>, <?= /* @escapeNotVerified */ $block->getItemId($_item) ?>); return false;">
-                                        <span><?= /* @escapeNotVerified */ __('Configure and Add to Order') ?></span>
+                                       onclick="order.sidebarConfigureProduct('sidebar_wishlist', <?= (int) $block->getProductId($_item) ?>, <?= (int) $block->getItemId($_item) ?>); return false;">
+                                        <span><?= $block->escapeHtml(__('Configure and Add to Order')) ?></span>
                                     </a>
-                                <?php elseif ($block->isConfigurationRequired($_item->getTypeId())): ?>
+                                <?php elseif ($block->isConfigurationRequired($_item->getTypeId())) : ?>
                                     <a href="#"
                                        class="icon icon-configure"
                                        title="<?= $block->escapeHtml(__('Configure and Add to Order')) ?>"
-                                       onclick="order.sidebarConfigureProduct('<?= 'sidebar' ?>', <?= /* @escapeNotVerified */ $block->getProductId($_item) ?>); return false;">
-                                        <span><?= /* @escapeNotVerified */ __('Configure and Add to Order') ?></span>
+                                       onclick="order.sidebarConfigureProduct('sidebar', <?= (int) $block->getProductId($_item) ?>); return false;">
+                                        <span><?= $block->escapeHtml(__('Configure and Add to Order')) ?></span>
                                     </a>
-                                <?php else: ?>
-                                    <input id="sidebar-<?= /* @escapeNotVerified */ $block->getSidebarStorageAction() ?>-<?= /* @escapeNotVerified */ $block->getIdentifierId($_item) ?>"
+                                <?php else : ?>
+                                    <input id="sidebar-<?= $block->escapeHtmlAttr($block->getSidebarStorageAction()) ?>-<?= (int) $block->getIdentifierId($_item) ?>"
                                            type="checkbox"
                                            class="admin__control-checkbox"
-                                           name="sidebar[<?= /* @escapeNotVerified */ $block->getSidebarStorageAction() ?>][<?= /* @escapeNotVerified */ $block->getIdentifierId($_item) ?>]"
-                                           value="<?= /* @escapeNotVerified */ $block->canDisplayItemQty() ? $_item->getQty()*1 : 1 ?>"
+                                           name="sidebar[<?= $block->escapeHtmlAttr($block->getSidebarStorageAction()) ?>][<?= (int) $block->getIdentifierId($_item) ?>]"
+                                           value="<?= /* @noEscape */ $block->canDisplayItemQty() ? (int) $_item->getQty() : 1 ?>"
                                            title="<?= $block->escapeHtml(__('Add To Order')) ?>"/>
                                     <label class="admin__field-label"
-                                           for="sidebar-<?= /* @escapeNotVerified */ $block->getSidebarStorageAction() ?>-<?= /* @escapeNotVerified */ $block->getIdentifierId($_item) ?>">
+                                           for="sidebar-<?= $block->escapeHtmlAttr($block->getSidebarStorageAction()) ?>-<?= (int) $block->getIdentifierId($_item) ?>">
                                     </label>
                                 <?php endif; ?>
                             </div>
@@ -120,11 +117,11 @@
                 <?php endforeach; ?>
             </tbody>
         </table>
-        <?php else: ?>
-            <span class="no-items"><?= /* @escapeNotVerified */ __('No items') ?></span>
+        <?php else : ?>
+            <span class="no-items"><?= $block->escapeHtml(__('No items')) ?></span>
         <?php endif ?>
         </div>
-        <?php if ($block->getItemCount() && $block->canRemoveItems()): ?>
+        <?php if ($block->getItemCount() && $block->canRemoveItems()) : ?>
             <?= $block->getChildHtml('empty_customer_cart_button') ?>
         <?php endif; ?>
     </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
index 1de681bdb2084..407bd0272e9fd 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
@@ -3,20 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /* @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Store\Select */ ?>
 <div class="store-scope form-inline">
     <div class="admin__fieldset tree-store-scope">
         <?php $showHelpHint = 0; ?>
-        <?php foreach ($block->getWebsiteCollection() as $_website): ?>
+        <?php foreach ($block->getWebsiteCollection() as $_website) : ?>
             <?php $showWebsite = false; ?>
-            <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
+            <?php foreach ($block->getGroupCollection($_website) as $_group) : ?>
                 <?php $showGroup = false; ?>
-                <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
-                    <?php if ($showWebsite == false): ?>
+                <?php foreach ($block->getStoreCollection($_group) as $_store) : ?>
+                    <?php if ($showWebsite == false) : ?>
                         <?php $showWebsite = true; ?>
                         <div class="admin__field field-website_label">
                             <label class="admin__field-label" for="">
@@ -24,7 +21,7 @@
                             </label>
                             <div class="admin__field-control">
                                 <div class="admin__field admin__field-option">
-                                    <?php if ($showHelpHint == 0):
+                                    <?php if ($showHelpHint == 0) :
                                         echo $block->getHintHtml();
                                         $showHelpHint = 1;
                                     endif; ?>
@@ -33,7 +30,7 @@
                         </div>
                     <?php endif; ?>
 
-                    <?php if ($showGroup == false): ?>
+                    <?php if ($showGroup == false) : ?>
                         <?php $showGroup = true; ?>
                         <div class="admin__field field-group_label">
                             <label class="admin__field-label" for=""><span><?= $block->escapeHtml($_group->getName()) ?></span></label>
@@ -46,8 +43,8 @@
                         <div class="admin__field-control">
                             <div class="nested">
                                 <div class="admin__field admin__field-option">
-                                    <input type="radio" id="store_<?= /* @escapeNotVerified */ $_store->getId() ?>" class="admin__control-radio" onclick="order.setStoreId('<?= /* @escapeNotVerified */ $_store->getId() ?>')"/>
-                                    <label class="admin__field-label" for="store_<?= /* @escapeNotVerified */ $_store->getId() ?>">
+                                    <input type="radio" id="store_<?= (int) $_store->getId() ?>" class="admin__control-radio" onclick="order.setStoreId('<?= (int) $_store->getId() ?>')"/>
+                                    <label class="admin__field-label" for="store_<?= (int) $_store->getId() ?>">
                                         <?= $block->escapeHtml($_store->getName()) ?>
                                     </label>
                                 </div>
@@ -55,7 +52,7 @@
                         </div>
                     </div>
                 <?php endforeach; ?>
-                <?php if ($showGroup): ?>
+                <?php if ($showGroup) : ?>
                 <?php endif; ?>
             <?php endforeach; ?>
         <?php endforeach; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
index 02433edf82346..9a901d99ae8f8 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
@@ -4,31 +4,30 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Totals $block */
 ?>
-<legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Order Totals') ?></span></legend>
+<legend class="admin__legend"><span><?= $block->escapeHtml(__('Order Totals')) ?></span></legend>
 <br>
 
 <table class="admin__table-secondary data-table">
     <tbody>
-        <?= /* @escapeNotVerified */ $block->renderTotals() ?>
-        <?= /* @escapeNotVerified */ $block->renderTotals('footer') ?>
+        <?= /* @noEscape */ $block->renderTotals() ?>
+        <?= /* @noEscape */ $block->renderTotals('footer') ?>
     </tbody>
 </table>
 
 <div class="order-totals-actions">
     <div class="admin__field admin__field-option field-append-comments">
         <input type="checkbox" id="notify_customer" name="order[comment][customer_note_notify]"
-               value="1"<?php if ($block->getNoteNotify()): ?> checked="checked"<?php endif; ?>
+               value="1"<?php if ($block->getNoteNotify()) : ?> checked="checked"<?php endif; ?>
                class="admin__control-checkbox"/>
-        <label for="notify_customer" class="admin__field-label"><?= /* @escapeNotVerified */ __('Append Comments') ?></label>
+        <label for="notify_customer" class="admin__field-label"><?= $block->escapeHtml(__('Append Comments')) ?></label>
     </div>
-    <?php if ($block->canSendNewOrderConfirmationEmail()): ?>
+    <?php if ($block->canSendNewOrderConfirmationEmail()) : ?>
     <div class="admin__field admin__field-option field-email-order-confirmation">
         <input type="checkbox" id="send_confirmation" name="order[send_confirmation]" value="1" checked="checked"
                class="admin__control-checkbox"/>
-        <label for="send_confirmation" class="admin__field-label"><?= /* @escapeNotVerified */ __('Email Order Confirmation') ?></label>
+        <label for="send_confirmation" class="admin__field-label"><?= $block->escapeHtml(__('Email Order Confirmation')) ?></label>
     </div>
     <?php endif; ?>
     <div class="actions">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml
index 9ab8a6552539d..4a55eb609924f 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml
@@ -3,19 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<tr class="<?= /* @escapeNotVerified */ $block->getTotal()->getCode() ?> row-totals">
-    <td style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
-        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
+<tr class="<?= $block->escapeHtmlAttr($block->getTotal()->getCode()) ?> row-totals">
+    <td style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) : ?><strong><?php endif; ?>
             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
-        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?></strong><?php endif; ?>
+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) : ?></strong><?php endif; ?>
     </td>
-    <td style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="admin__total-amount">
-        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
-            <?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValue()) ?>
-        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?></strong><?php endif; ?>
+    <td style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>" class="admin__total-amount">
+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) : ?><strong><?php endif; ?>
+            <?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValue()) ?>
+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) : ?></strong><?php endif; ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml
index 7486edd732706..4c4f94b5b3bb1 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml
@@ -4,38 +4,36 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var $block \Magento\Tax\Block\Checkout\Grandtotal
  * @see \Magento\Tax\Block\Checkout\Grandtotal
  */
 ?>
-<?php if ($block->includeTax() && $block->getTotalExclTax() >= 0):?>
-<tr class="row-totals">
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
-        <strong><?= /* @escapeNotVerified */ __('Grand Total Excl. Tax') ?></strong>
-    </td>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
-        <strong><?= /* @escapeNotVerified */ $block->formatPrice($block->getTotalExclTax()) ?></strong>
-    </td>
-</tr>
-<?= /* @escapeNotVerified */ $block->renderTotals('taxes', $block->getColspan()) ?>
-<tr class="row-totals">
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
-        <strong><?= /* @escapeNotVerified */ __('Grand Total Incl. Tax') ?></strong>
-    </td>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
-        <strong><?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValue()) ?></strong>
-    </td>
-</tr>
-<?php else:?>
-<tr class="row-totals">
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
-        <strong><?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?></strong>
-    </td>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
-        <strong><?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValue()) ?></strong>
-    </td>
-</tr>
+<?php if ($block->includeTax() && $block->getTotalExclTax() >= 0) : ?>
+    <tr class="row-totals">
+        <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+            <strong><?= $block->escapeHtml(__('Grand Total Excl. Tax')) ?></strong>
+        </td>
+        <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+            <strong><?= /* @noEscape */ $block->formatPrice($block->getTotalExclTax()) ?></strong>
+        </td>
+    </tr>
+    <?= /* @noEscape */ $block->renderTotals('taxes', $block->getColspan()) ?>
+    <tr class="row-totals">
+        <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+            <strong><?= $block->escapeHtml(__('Grand Total Incl. Tax')) ?></strong>
+        </td>
+        <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+            <strong><?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValue()) ?></strong>
+        </td>
+    </tr>
+    <?php else : ?>
+    <tr class="row-totals">
+        <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+            <strong><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></strong>
+        </td>
+        <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+            <strong><?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValue()) ?></strong>
+        </td>
+    </tr>
 <?php endif;?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml
index 2235a428e1e75..db204a46f1f94 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml
@@ -4,46 +4,44 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var $block \Magento\Tax\Block\Checkout\Shipping
  * @see \Magento\Tax\Block\Checkout\Shipping
  */
 ?>
-<?php if ($block->displayBoth()):?>
+<?php if ($block->displayBoth()) :?>
 <tr class="row-totals">
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
-        <?= /* @escapeNotVerified */ $block->getExcludeTaxLabel() ?>
+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+        <?= $block->escapeHtml($block->getExcludeTaxLabel()) ?>
     </td>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
-        <?= /* @escapeNotVerified */ $block->formatPrice($block->getShippingExcludeTax()) ?>
+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+        <?= /* @noEscape */ $block->formatPrice($block->getShippingExcludeTax()) ?>
     </td>
 </tr>
 <tr class="row-totals">
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
-        <?= /* @escapeNotVerified */ $block->getIncludeTaxLabel() ?>
+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+        <?= $block->escapeHtml($block->getIncludeTaxLabel()) ?>
     </td>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
-        <?= /* @escapeNotVerified */ $block->formatPrice($block->getShippingIncludeTax()) ?>
+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+        <?= /* @noEscape */ $block->formatPrice($block->getShippingIncludeTax()) ?>
     </td>
 </tr>
 <?php elseif ($block->displayIncludeTax()) : ?>
 <tr>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
-        <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+        <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
     </td>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
-        <?= /* @escapeNotVerified */ $block->formatPrice($block->getShippingIncludeTax()) ?>
+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+        <?= /* @noEscape */ $block->formatPrice($block->getShippingIncludeTax()) ?>
     </td>
 </tr>
-<?php else:?>
+<?php else : ?>
 <tr class="row-totals">
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
         <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
     </td>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
-        <?= /* @escapeNotVerified */ $block->formatPrice($block->getShippingExcludeTax()) ?>
+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+        <?= /* @noEscape */ $block->formatPrice($block->getShippingExcludeTax()) ?>
     </td>
 </tr>
 <?php endif;?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml
index 380a7dc6fcbf9..a63458491baea 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml
@@ -4,37 +4,35 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Subtotal
  * @see \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Subtotal
  */
 ?>
-<?php if ($block->displayBoth()):?>
+<?php if ($block->displayBoth()) : ?>
 <tr class="row-totals">
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
-        <?= /* @escapeNotVerified */ __('Subtotal (Excl. Tax)') ?>
+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+        <?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>
     </td>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
-        <?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValueExclTax()) ?>
+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+        <?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValueExclTax()) ?>
     </td>
 </tr>
 <tr class="row-totals">
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
-        <?= /* @escapeNotVerified */ __('Subtotal (Incl. Tax)') ?>
+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+        <?= $block->escapeHtml(__('Subtotal (Incl. Tax)')) ?>
     </td>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
-        <?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValueInclTax()) ?>
+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+        <?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValueInclTax()) ?>
     </td>
 </tr>
 <?php else : ?>
 <tr class="row-totals">
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
-        <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+        <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
     </td>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
-        <?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValue()) ?>
+    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+        <?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValue()) ?>
     </td>
 </tr>
 <?php endif;?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
index 92139896273da..042b2f5113cac 100755
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
@@ -4,56 +4,59 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
+// phpcs:disable Squiz.PHP.GlobalKeyword.NotAllowed
+
+/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Tax $block */
 
 $taxAmount = $block->getTotal()->getValue();
 ?>
-<?php if (($taxAmount == 0 && $this->helper('Magento\Tax\Helper\Data')->displayZeroTax()) || ($taxAmount > 0)): ?>
-<?php global $taxIter; $taxIter++; ?>
-<?php $class = "{$block->getTotal()->getCode()} " . ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() ? 'summary-total' : ''); ?>
-<tr<?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
-    onclick="expandDetails(this, '.summary-details-<?= /* @escapeNotVerified */ $taxIter ?>')"
-<?php endif; ?>
-    class="<?= /* @escapeNotVerified */ $class ?> row-totals">
-    <td style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
-            <div class="summary-collapse"><?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?></div>
-        <?php else: ?>
-            <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
-        <?php endif;?>
-    </td>
-    <td style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="admin__total-amount"><?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValue()) ?></td>
-</tr>
-<?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
+<?php if (($taxAmount == 0 && $this->helper(\Magento\Tax\Helper\Data::class)->displayZeroTax()) || ($taxAmount > 0)) :
+    global $taxIter;
+    $taxIter++;
+    ?>
+    <?php $class = $block->escapeHtmlAttr("{$block->getTotal()->getCode()} " . ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary() ? 'summary-total' : '')); ?>
+    <tr<?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary()) : ?>
+        onclick="expandDetails(this, '.summary-details-<?= $block->escapeJs($taxIter) ?>')"
+    <?php endif; ?>
+        class="<?= /* @noEscape */ $class ?> row-totals">
+        <td style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+            <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary()) : ?>
+                <div class="summary-collapse"><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></div>
+            <?php else : ?>
+                <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
+            <?php endif;?>
+        </td>
+        <td style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>" class="admin__total-amount">
+            <?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValue()) ?>
+        </td>
+    </tr>
+    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary()) : ?>
         <?php $isTop = 1; ?>
-        <?php foreach ($block->getTotal()->getFullInfo() as $info): ?>
-                <?php if (isset($info['hidden']) && $info['hidden']) {
-                    continue;
-                } ?>
-                <?php $percent = $info['percent']; ?>
-                <?php $amount = $info['amount']; ?>
-                <?php $rates = $info['rates']; ?>
-                <?php $isFirst = 1; ?>
+        <?php foreach ($block->getTotal()->getFullInfo() as $info) : ?>
+            <?php if (isset($info['hidden']) && $info['hidden']) :
+                continue;
+            endif; ?>
+            <?php $percent = $info['percent']; ?>
+            <?php $amount = $info['amount']; ?>
+            <?php $rates = $info['rates']; ?>
 
-                <?php foreach ($rates as $rate): ?>
-                <tr class="summary-details-<?= /* @escapeNotVerified */ $taxIter ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
-                    <td class="admin__total-mark" style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
+            <?php foreach ($rates as $rate) : ?>
+                <tr class="summary-details-<?= $block->escapeHtmlAttr($taxIter) ?> summary-details<?= ($isTop ? ' summary-details-first' : '') ?>" style="display:none;">
+                    <td class="admin__total-mark" style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>" colspan="<?= (int) $block->getColspan() ?>">
                         <?= $block->escapeHtml($rate['title']) ?>
-                        <?php if (!is_null($rate['percent'])): ?>
-                            (<?= (float)$rate['percent'] ?>%)
+                        <?php if ($rate['percent'] !== null) : ?>
+                            (<?= (float) $rate['percent'] ?>%)
                         <?php endif; ?>
                         <br />
                     </td>
-                    <?php if ($isFirst): ?>
-                        <td style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="admin__total-amount" rowspan="<?= count($rates) ?>">
-                            <?= /* @escapeNotVerified */ $block->formatPrice($amount) ?>
-                        </td>
-                    <?php endif; ?>
+                    <td style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>" class="admin__total-amount">
+                        <?= /* @noEscape */ $block->formatPrice(($amount*(float)$rate['percent'])/$percent) ?>
+                    </td>
                 </tr>
-                <?php $isFirst = 0; ?>
                 <?php $isTop = 0; ?>
-                <?php endforeach; ?>
+            <?php endforeach; ?>
         <?php endforeach; ?>
-<?php endif;?>
+    <?php endif;?>
 <?php endif;?>
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml
index 2f32483e11a50..050098078b3f3 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml
@@ -4,10 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
+/* @var \Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Form $block */
 ?>
-<form id="edit_form" method="post" action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>">
+<form id="edit_form" method="post" action="<?= $block->escapeUrl($block->getSaveUrl()) ?>">
     <?= $block->getBlockHtml('formkey') ?>
     <?php  $_order = $block->getCreditmemo()->getOrder() ?>
 
@@ -15,23 +16,23 @@
 
     <section class="admin__page-section">
         <div class="admin__page-section-title">
-            <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
+            <span class="title"><?= $block->escapeHtml(__('Payment &amp; Shipping Method')) ?></span>
         </div>
         <div class="admin__page-section-content">
-        <?php if (!$_order->getIsVirtual()): ?>
+        <?php if (!$_order->getIsVirtual()) : ?>
         <div class="admin__page-section-item order-payment-method">
-        <?php else: ?>
+        <?php else : ?>
         <div class="admin__page-section-item order-payment-method order-payment-method-virtual">
         <?php endif; ?>
 
             <?php /* Billing Address */ ?>
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Payment Information')) ?></span>
             </div>
             <div class="admin__page-section-item-content">
                 <div class="order-payment-method-title"><?= $block->getChildHtml('order_payment') ?></div>
                 <div class="order-payment-currency">
-                    <?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?>
+                    <?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?>
                 </div>
                 <div class="order-payment-additional">
                     <?= $block->getChildHtml('order_payment_additional') ?>
@@ -39,27 +40,27 @@
             </div>
         </div>
 
-        <?php if (!$_order->getIsVirtual()): ?>
+        <?php if (!$_order->getIsVirtual()) : ?>
         <div class="admin__page-section-item order-shipping-address">
             <?php /* Shipping Address */ ?>
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Shipping Information') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Shipping Information')) ?></span>
             </div>
             <div class="admin__page-section-item-content shipping-description-wrapper">
                 <div class="shipping-description-title"><?= $block->escapeHtml($_order->getShippingDescription()) ?></div>
                 <div class="shipping-description-content">
-                    <?= /* @escapeNotVerified */ __('Total Shipping Charges') ?>:
+                    <?= $block->escapeHtml(__('Total Shipping Charges')) ?>:
 
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax($block->getSource()->getStoreId())): ?>
+                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displaySalesPriceInclTax($block->getSource()->getStoreId())) : ?>
                         <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
-                    <?php else: ?>
+                    <?php else : ?>
                         <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
                     <?php endif; ?>
                     <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
 
-                    <?= /* @escapeNotVerified */ $_excl ?>
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($block->getSource()->getStoreId()) && $_incl != $_excl): ?>
-                        (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
+                    <?= /* @noEscape */ $_excl ?>
+                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displaySalesBothPrices($block->getSource()->getStoreId()) && $_incl != $_excl) : ?>
+                        (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
                     <?php endif; ?>
                 </div>
             </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 a73740c249b67..893634635f32b 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
@@ -4,17 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * @var Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items $block
- */
-// @codingStandardsIgnoreFile
-
+/* @var \Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items $block */
 ?>
 <?php $_items = $block->getCreditmemo()->getAllItems() ?>
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Items to Refund') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Items to Refund')) ?></span>
     </div>
 
     <?php if (count($_items)) : ?>
@@ -22,20 +18,20 @@
         <table class="data-table admin__table-primary order-creditmemo-tables">
             <thead>
                 <tr class="headings">
-                    <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
-                    <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
-                    <th class="col-ordered-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
+                    <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
+                    <th class="col-price"><span><?= $block->escapeHtml(__('Price')) ?></span></th>
+                    <th class="col-ordered-qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
                     <?php if ($block->canReturnToStock()) : ?>
-                    <th class="col-return-to-stock"><span><?= /* @escapeNotVerified */ __('Return to Stock') ?></span></th>
+                    <th class="col-return-to-stock"><span><?= $block->escapeHtml(__('Return to Stock')) ?></span></th>
                     <?php endif; ?>
-                    <th class="col-refund"><span><?= /* @escapeNotVerified */ __('Qty to Refund') ?></span></th>
-                    <th class="col-subtotal"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
-                    <th class="col-tax-amount"><span><?= /* @escapeNotVerified */ __('Tax Amount') ?></span></th>
-                    <th class="col-discont"><span><?= /* @escapeNotVerified */ __('Discount Amount') ?></span></th>
-                    <th class="col-total last"><span><?= /* @escapeNotVerified */ __('Row Total') ?></span></th>
+                    <th class="col-refund"><span><?= $block->escapeHtml(__('Qty to Refund')) ?></span></th>
+                    <th class="col-subtotal"><span><?= $block->escapeHtml(__('Subtotal')) ?></span></th>
+                    <th class="col-tax-amount"><span><?= $block->escapeHtml(__('Tax Amount')) ?></span></th>
+                    <th class="col-discont"><span><?= $block->escapeHtml(__('Discount Amount')) ?></span></th>
+                    <th class="col-total last"><span><?= $block->escapeHtml(__('Row Total')) ?></span></th>
                 </tr>
             </thead>
-            <?php if ($block->canEditQty()): ?>
+            <?php if ($block->canEditQty()) : ?>
             <tfoot>
                 <tr>
                     <td colspan="3">&nbsp;</td>
@@ -46,13 +42,13 @@
                 </tr>
             </tfoot>
             <?php endif; ?>
-            <?php $i = 0; foreach ($_items as $_item): ?>
-                <?php if ($_item->getOrderItem()->getParentItem()) {
-                continue;
-            } else {
-                $i++;
-            } ?>
-                <tbody class="<?= /* @escapeNotVerified */ $i%2 ? 'even' : 'odd' ?>">
+            <?php $i = 0; foreach ($_items as $_item) : ?>
+                <?php if ($_item->getOrderItem()->getParentItem()) :
+                    continue;
+                else :
+                    $i++;
+                endif; ?>
+                <tbody class="<?= /* @noEscape */ $i%2 ? 'even' : 'odd' ?>">
                     <?= $block->getItemHtml($_item) ?>
                     <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
                 </tbody>
@@ -61,47 +57,47 @@
     </div>
     <?php else : ?>
     <div class="no-items">
-        <?= /* @escapeNotVerified */ __('No Items To Refund') ?>
+        <?= $block->escapeHtml(__('No Items To Refund')) ?>
     </div>
     <?php endif; ?>
 </section>
 
 <?php $orderTotalBar = $block->getChildHtml('order_totalbar'); ?>
 
-<?php if (!empty($orderTotalBar)): ?>
+<?php if (!empty($orderTotalBar)) : ?>
 <section class="fieldset-wrapper">
-    <?= /* @escapeNotVerified */ $orderTotalBar ?>
+    <?= /* @noEscape */ $orderTotalBar ?>
 </section>
 <?php endif; ?>
 
 <section class="admin__page-section">
     <input type="hidden" name="creditmemo[do_offline]" id="creditmemo_do_offline" value="0" />
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Order Total') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Order Total')) ?></span>
     </div>
     <div class="admin__page-section-content">
         <div class="admin__page-section-item order-comments-history">
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Credit Memo Comments') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Credit Memo Comments')) ?></span>
             </div>
             <div id="history_form" class="admin__fieldset-wrapper-content">
                 <div class="admin__field">
                     <label class="normal admin__field-label"
                            for="creditmemo_comment_text">
-                        <span><?= /* @escapeNotVerified */ __('Comment Text') ?></span></label>
+                        <span><?= $block->escapeHtml(__('Comment Text')) ?></span></label>
                     <div class="admin__field-control">
                         <textarea id="creditmemo_comment_text"
                                   class="admin__control-textarea"
                                   name="creditmemo[comment_text]"
                                   rows="3"
-                                  cols="5"><?= /* @escapeNotVerified */ $block->getCreditmemo()->getCommentText() ?></textarea>
+                                  cols="5"><?= $block->escapeHtml($block->getCreditmemo()->getCommentText()) ?></textarea>
                     </div>
                 </div>
             </div>
         </div>
         <div class="admin__page-section-item order-totals creditmemo-totals">
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Refund Totals') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Refund Totals')) ?></span>
             </div>
             <?= $block->getChildHtml('creditmemo_totals') ?>
             <div class="totals-actions"><?= $block->getUpdateTotalsButtonHtml() ?></div>
@@ -113,10 +109,10 @@
                            value="1"
                            type="checkbox" />
                     <label for="notify_customer" class="admin__field-label">
-                        <span><?= /* @escapeNotVerified */ __('Append Comments') ?></span>
+                        <span><?= $block->escapeHtml(__('Append Comments')) ?></span>
                     </label>
                 </div>
-                <?php if ($block->canSendCreditmemoEmail()):?>
+                <?php if ($block->canSendCreditmemoEmail()) :?>
                 <div class="field choice admin__field admin__field-option field-email-copy">
                     <input id="send_email"
                            class="admin__control-checkbox"
@@ -124,7 +120,7 @@
                            value="1"
                            type="checkbox" />
                     <label for="send_email" class="admin__field-label">
-                        <span><?= /* @escapeNotVerified */ __('Email Copy of Credit Memo') ?></span>
+                        <span><?= $block->escapeHtml(__('Email Copy of Credit Memo')) ?></span>
                     </label>
                 </div>
                 <?php endif; ?>
@@ -140,67 +136,76 @@
 </section>
 
 <script>
-require(['jquery', 'prototype'], function(jQuery){
+require(['jquery'], function(jQuery){
 
 //<![CDATA[
-var submitButtons = $$('.submit-button');
-var updateButtons = $$('.update-button,.update-totals-button');
-var fields = $$('.qty-input,.order-subtotal-table input[type="text"]');
+var submitButtons = jQuery('.submit-button');
+var updateButtons = jQuery('.update-button,.update-totals-button');
+var fields = jQuery('.qty-input,.order-subtotal-table input[type="text"]');
 
-updateButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
+function enableButtons(buttons) {
+    buttons.removeClass('disabled').prop('disabled', false);
+};
 
-for(var i=0;i<fields.length;i++){
-    fields[i].observe('change', checkButtonsRelation)
-    fields[i].baseValue = fields[i].value;
-}
+function disableButtons(buttons) {
+    buttons.addClass('disabled').prop('disabled', true);
+};
+
+disableButtons(updateButtons);
+
+fields.on('change', checkButtonsRelation);
+fields.each(function (i, elem) {
+    elem.baseValue = elem.value;
+});
 
 function checkButtonsRelation() {
     var hasChanges = false;
-    fields.each(function (elem) {
+    fields.each(function (i, elem) {
         if (elem.baseValue != elem.value) {
             hasChanges = true;
         }
     }.bind(this));
     if (hasChanges) {
-        submitButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
-        updateButtons.each(function (elem) {elem.disabled=false;elem.removeClassName('disabled');});
+        disableButtons(submitButtons);
+        enableButtons(updateButtons);
     }
     else {
-        submitButtons.each(function (elem) {elem.disabled=false;elem.removeClassName('disabled');});
-        updateButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
+        enableButtons(submitButtons);
+        disableButtons(updateButtons);
     }
 }
 
 submitCreditMemo = function() {
-    if ($('creditmemo_do_offline')) $('creditmemo_do_offline').value=0;
+    var creditMemoOffline = jQuery('#creditmemo_do_offline');
+    if (creditMemoOffline.length) {
+        creditMemoOffline.prop('value', 0);
+    }
     // Temporary solution will be replaced after refactoring order functionality
     jQuery('#edit_form').triggerHandler('save');
 }
 
 submitCreditMemoOffline = function() {
-    if ($('creditmemo_do_offline')) $('creditmemo_do_offline').value=1;
+    var creditMemoOffline = jQuery('#creditmemo_do_offline');
+    if (creditMemoOffline.length) {
+        creditMemoOffline.prop('value', 1);
+    }
     // Temporary solution will be replaced after refactoring order functionality
     jQuery('#edit_form').triggerHandler('save');
 }
 
-var sendEmailCheckbox = $('send_email');
-
-if (sendEmailCheckbox) {
-    var notifyCustomerCheckbox = $('notify_customer');
-    var creditmemoCommentText = $('creditmemo_comment_text');
-    Event.observe(sendEmailCheckbox, 'change', bindSendEmail);
+var sendEmailCheckbox = jQuery('#send_email');
+if (sendEmailCheckbox.length) {
+    var notifyCustomerCheckbox = jQuery('#notify_customer');
+    sendEmailCheckbox.on('change', bindSendEmail);
     bindSendEmail();
 }
 
-function bindSendEmail()
-{
-    if (sendEmailCheckbox.checked == true) {
-        notifyCustomerCheckbox.disabled = false;
-        //creditmemoCommentText.disabled = false;
+function bindSendEmail() {
+    if (sendEmailCheckbox.prop('checked') == true) {
+        notifyCustomerCheckbox.prop('disabled', false);
     }
     else {
-        notifyCustomerCheckbox.disabled = true;
-        //creditmemoCommentText.disabled = true;
+        notifyCustomerCheckbox.prop('disabled', true);
     }
 }
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
index b27a07c4bf824..65c28578b68b3 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer */ ?>
 <?php $_item = $block->getItem() ?>
@@ -21,8 +18,8 @@
         <?php if ($block->canReturnItemToStock($_item)) : ?>
             <input type="checkbox"
                    class="admin__control-checkbox"
-                   name="creditmemo[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>][back_to_stock]"
-                   value="1"<?php if ($_item->getBackToStock()):?> checked<?php endif;?>/>
+                   name="creditmemo[items][<?= (int) $_item->getOrderItemId() ?>][back_to_stock]"
+                   value="1"<?php if ($_item->getBackToStock()) : ?> checked<?php endif; ?>/>
             <label class="admin__field-label"></label>
         <?php endif; ?>
         </td>
@@ -31,17 +28,17 @@
     <?php if ($block->canEditQty()) : ?>
         <input type="text"
                class="input-text admin__control-text qty-input"
-               name="creditmemo[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>][qty]"
-               value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>"/>
+               name="creditmemo[items][<?= (int) $_item->getOrderItemId() ?>][qty]"
+               value="<?= (int) $_item->getQty() ?>"/>
     <?php else : ?>
-        <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
+        <?= (int) $_item->getQty() ?>
     <?php endif; ?>
     </td>
     <td class="col-subtotal">
         <?= $block->getColumnHtml($_item, 'subtotal') ?>
     </td>
-    <td class="col-tax-amount"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?></td>
-    <td class="col-discont"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?></td>
+    <td class="col-tax-amount"><?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?></td>
+    <td class="col-discont"><?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?></td>
     <td class="col-total last">
         <?= $block->getColumnHtml($_item, 'total') ?>
     </td>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
index 0b2a3ef24ae32..fd2d737251c79 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
@@ -4,40 +4,36 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * @var \Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Adjustments $block
- * @codingStandardsIgnoreFile
- */
-
+/* @var \Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Adjustments $block */
 ?>
 <?php $_source  = $block->getSource() ?>
-<?php if ($_source): ?>
+<?php if ($_source) : ?>
     <tr>
-        <td class="label"><?= /* @escapeNotVerified */ $block->getShippingLabel() ?><div id="shipping_amount_adv"></div></td>
+        <td class="label"><?= $block->escapeHtml($block->getShippingLabel()) ?><div id="shipping_amount_adv"></div></td>
         <td>
             <input type="text"
                    name="creditmemo[shipping_amount]"
-                   value="<?= /* @escapeNotVerified */ $block->getShippingAmount() ?>"
+                   value="<?= $block->escapeHtmlAttr($block->getShippingAmount()) ?>"
                    class="input-text admin__control-text not-negative-amount"
                    id="shipping_amount" />
         </td>
     </tr>
     <tr>
-        <td class="label"><?= /* @escapeNotVerified */ __('Adjustment Refund') ?><div id="adjustment_positive_adv"></div></td>
+        <td class="label"><?= $block->escapeHtml(__('Adjustment Refund')) ?><div id="adjustment_positive_adv"></div></td>
         <td>
             <input type="text"
                    name="creditmemo[adjustment_positive]"
-                   value="<?= /* @escapeNotVerified */ $_source->getBaseAdjustmentPositive()*1 ?>"
+                   value="<?= $block->escapeHtmlAttr($_source->getBaseAdjustmentPositive()) ?>"
                    class="input-text admin__control-text not-negative-amount"
                    id="adjustment_positive" />
         </td>
     </tr>
     <tr>
-        <td class="label"><?= /* @escapeNotVerified */ __('Adjustment Fee') ?><div id="adjustment_negative_adv"></div></td>
+        <td class="label"><?= $block->escapeHtml(__('Adjustment Fee')) ?><div id="adjustment_negative_adv"></div></td>
         <td>
             <input type="text"
                    name="creditmemo[adjustment_negative]"
-                   value="<?= /* @escapeNotVerified */ $_source->getBaseAdjustmentNegative()*1 ?>"
+                   value="<?= $block->escapeHtmlAttr($_source->getBaseAdjustmentNegative()) ?>"
                    class="input-text admin__control-text not-negative-amount"
                    id="adjustment_negative"/>
             <script>
@@ -45,7 +41,7 @@
 
                 //<![CDATA[
                 Validation.addAllThese([
-                    ['not-negative-amount', '<?= /* @escapeNotVerified */ __('Please enter a positive number in this field.') ?>', function(v) {
+                    ['not-negative-amount', '<?= $block->escapeJs(__('Please enter a positive number in this field.')) ?>', function(v) {
                         if(v.length)
                             return /^\s*\d+([,.]\d+)*\s*%?\s*$/.test(v);
                         else
@@ -72,6 +68,9 @@
                             enableElements('submit-button');
                         }
                     });
+                    $(id).observe('change', function (event) {
+                        enableElements('submit-button');
+                    });
                 }
                 //]]>
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml
index 7f5c54a3236e0..7e3dc7ea0be0e 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml
@@ -4,54 +4,55 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
+/* @var \Magento\Sales\Block\Adminhtml\Order\Creditmemo\View\Form $block */
 ?>
 <?php  $_order = $block->getCreditmemo()->getOrder() ?>
 <?= $block->getChildHtml('order_info') ?>
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Payment &amp; Shipping Method')) ?></span>
     </div>
     <div class="admin__page-section-content">
 
-        <?php if (!$_order->getIsVirtual()): ?>
+        <?php if (!$_order->getIsVirtual()) : ?>
         <div class="admin__page-section-item order-payment-method">
-        <?php else: ?>
+        <?php else : ?>
         <div class="admin__page-section-item order-payment-method order-payment-method-virtual">
         <?php endif; ?>
             <?php /* Billing Address */?>
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Payment Information')) ?></span>
             </div>
             <div class="admin__page-section-item-content">
                 <div class="order-payment-method-title"><?= $block->getChildHtml('order_payment') ?></div>
-                <div class="order-payment-currency"><?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
+                <div class="order-payment-currency"><?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?></div>
                 <div class="order-payment-additional"><?= $block->getChildHtml('order_payment_additional') ?></div>
             </div>
         </div>
 
-        <?php if (!$_order->getIsVirtual()): ?>
+        <?php if (!$_order->getIsVirtual()) : ?>
         <div class="admin__page-section-item order-shipping-address">
             <?php /* Shipping Address */ ?>
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Shipping Information') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Shipping Information')) ?></span>
             </div>
             <div class="shipping-description-wrapper admin__page-section-item-content">
                 <div class="shipping-description-title"><?= $block->escapeHtml($_order->getShippingDescription()) ?></div>
                 <div class="shipping-description-content">
-                    <?= /* @escapeNotVerified */ __('Total Shipping Charges') ?>:
+                    <?= $block->escapeHtml(__('Total Shipping Charges')) ?>:
 
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
+                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()) : ?>
                         <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
-                    <?php else: ?>
+                    <?php else : ?>
                         <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
                     <?php endif; ?>
                     <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
 
-                    <?= /* @escapeNotVerified */ $_excl ?>
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                        (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
+                    <?= /* @noEscape */ $_excl ?>
+                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
+                        (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
                     <?php endif; ?>
                 </div>
             </div>
@@ -61,33 +62,33 @@
 </section>
 <?php $_items = $block->getCreditmemo()->getAllItems() ?>
 
-<?php if (count($_items)): ?>
+<?php if (count($_items)) : ?>
 <div id="creditmemo_items_container">
     <?= $block->getChildHtml('creditmemo_items') ?>
 </div>
-<?php else: ?>
+<?php else : ?>
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Items Refunded') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Items Refunded')) ?></span>
     </div>
-    <div class="no-items admin__page-section-content"><?= /* @escapeNotVerified */ __('No Items') ?></div>
+    <div class="no-items admin__page-section-content"><?= $block->escapeHtml(__('No Items')) ?></div>
 </section>
 <?php endif; ?>
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Memo Total') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Memo Total')) ?></span>
     </div>
     <div class="admin__page-section-content">
         <div class="admin__page-section-item order-comments-history">
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Credit Memo History') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Credit Memo History')) ?></span>
             </div>
             <div class="admin__page-section-item-content"><?= $block->getChildHtml('order_comments') ?></div>
         </div>
         <div class="admin__page-section-item order-totals" id="history_form">
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Credit Memo Totals') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Credit Memo Totals')) ?></span>
             </div>
             <div class="admin__page-section-content"><?= $block->getChildHtml('creditmemo_totals') ?></div>
         </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
index d77f2fbde22e4..1471197982898 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
@@ -4,35 +4,34 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/* @var \Magento\Sales\Block\Adminhtml\Order\Creditmemo\View\Items $block */
 ?>
 <?php $_items = $block->getCreditmemo()->getAllItems() ?>
 <div class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Items Refunded') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Items Refunded')) ?></span>
     </div>
     <div class="admin__page-section-content">
         <div class="admin__table-wrapper">
             <table class="data-table admin__table-primary order-creditmemo-tables">
                 <thead>
                     <tr class="headings">
-                        <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
-                        <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
-                        <th class="col-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
-                        <th class="col-subtotal"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
-                        <th class="col-tax"><span><?= /* @escapeNotVerified */ __('Tax Amount') ?></span></th>
-                        <th class="col-discount"><span><?= /* @escapeNotVerified */ __('Discount Amount') ?></span></th>
-                        <th class="col-total last"><span><?= /* @escapeNotVerified */ __('Row Total') ?></span></th>
+                        <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
+                        <th class="col-price"><span><?= $block->escapeHtml(__('Price')) ?></span></th>
+                        <th class="col-qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
+                        <th class="col-subtotal"><span><?= $block->escapeHtml(__('Subtotal')) ?></span></th>
+                        <th class="col-tax"><span><?= $block->escapeHtml(__('Tax Amount')) ?></span></th>
+                        <th class="col-discount"><span><?= $block->escapeHtml(__('Discount Amount')) ?></span></th>
+                        <th class="col-total last"><span><?= $block->escapeHtml(__('Row Total')) ?></span></th>
                     </tr>
                 </thead>
-                <?php $i = 0; foreach ($_items as $_item): ?>
-                    <?php if ($_item->getOrderItem()->getParentItem()) {
+                <?php $i = 0; foreach ($_items as $_item) : ?>
+                    <?php if ($_item->getOrderItem()->getParentItem()) :
                         continue;
-                    } else {
+                    else :
                         $i++;
-                    } ?>
-                    <tbody class="<?= /* @escapeNotVerified */ $i%2 ? 'even' : 'odd' ?>">
+                    endif; ?>
+                    <tbody class="<?= /* @noEscape */ $i%2 ? 'even' : 'odd' ?>">
                         <?= $block->getItemHtml($_item) ?>
                         <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
                     </tbody>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml
index d39d41fe9c392..80ad5302392ae 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer */ ?>
 <?php $_item = $block->getItem() ?>
@@ -16,12 +13,12 @@
     <td class="col-price">
         <?= $block->getColumnHtml($_item, 'price') ?>
     </td>
-    <td class="col-qty"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
+    <td class="col-qty"><?= (int) $_item->getQty() ?></td>
     <td class="col-subtotal">
         <?= $block->getColumnHtml($_item, 'subtotal') ?>
     </td>
-    <td class="col-tax"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?></td>
-    <td class="col-discount"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?></td>
+    <td class="col-tax"><?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?></td>
+    <td class="col-discount"><?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?></td>
     <td class="col-total last">
         <?= $block->getColumnHtml($_item, 'total') ?>
     </td>
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 2372087de5d79..961baf5499652 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
@@ -4,18 +4,22 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
 /*
 store view name = $_order->getStore()->getName()
 web site name = $_order->getStore()->getWebsite()->getName()
 store name = $_order->getStore()->getGroup()->getName()
 */
+
+/* @var \Magento\Sales\Block\Adminhtml\Order\Details $block */
 ?>
-<?php $_order = $block->getOrder() ?>
+<?php
+/* @var \Magento\Sales\Model\Order $_order */
+$_order = $block->getOrder() ?>
 <div>
-<?= __('Customer Name: %1', $block->escapeHtml($_order->getCustomerFirstname() ? $_order->getCustomerName() : $_order->getBillingAddress()->getName())) ?><br />
-<?= __('Purchased From: %1', $block->escapeHtml($_order->getStore()->getGroup()->getName())) ?><br />
+<?= $block->escapeHtml(__('Customer Name: %1', $_order->getCustomerFirstname() ? $_order->getCustomerName() : $_order->getBillingAddress()->getName())) ?><br />
+<?= $block->escapeHtml(__('Purchased From: %1', $_order->getStore()->getGroup()->getName())) ?><br />
 </div>
 <table cellpadding="0" border="0" width="100%" style="border:1px solid #bebcb7; background:#f8f7f5;">
     <thead>
@@ -27,58 +31,58 @@ store name = $_order->getStore()->getGroup()->getName()
     </thead>
 
     <tbody>
-<?php $i = 0; foreach ($_order->getAllItems() as $_item): $i++ ?>
+<?php $i = 0; foreach ($_order->getAllItems() as $_item) : $i++ ?>
         <tr <?= $i%2 ? 'bgcolor="#eeeded"' : '' ?>>
             <td align="left" valign="top" style="padding:3px 9px"><strong><?= $block->escapeHtml($_item->getName()) ?></strong>
-            <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_item->getGiftMessageId())): ?>
-            <br /><strong><?= /* @escapeNotVerified */ __('Gift Message') ?></strong>
-            <br /><?= /* @escapeNotVerified */ __('From:') ?> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-            <br /><?= /* @escapeNotVerified */ __('To:') ?> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-            <br /><?= /* @escapeNotVerified */ __('Message:') ?><br /> <?= $block->escapeHtml($_giftMessage->getMessage()) ?>
+            <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper(\Magento\GiftMessage\Helper\Message::class)->getGiftMessage($_item->getGiftMessageId())) : ?>
+            <br /><strong><?= $block->escapeHtml(__('Gift Message')) ?></strong>
+            <br /><?= $block->escapeHtml(__('From:')) ?> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
+            <br /><?= $block->escapeHtml(__('To:')) ?> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
+            <br /><?= $block->escapeHtml(__('Message:')) ?><br /> <?= $block->escapeHtml($_giftMessage->getMessage()) ?>
             <?php endif; ?>
             </td>
-            <td align="center" valign="top" style="padding:3px 9px"><?= /* @escapeNotVerified */ $_item->getQtyOrdered()*1 ?></td>
-            <td align="right" valign="top" style="padding:3px 9px"><?= /* @escapeNotVerified */ $_order->formatPrice($_item->getRowTotal()) ?></td>
+            <td align="center" valign="top" style="padding:3px 9px"><?= (int) $_item->getQtyOrdered() ?></td>
+            <td align="right" valign="top" style="padding:3px 9px"><?= /* @noEscape */ $_order->formatPrice($_item->getRowTotal()) ?></td>
         </tr>
-<?php endforeach ?>
+<?php endforeach; ?>
     </tbody>
 
     <tfoot>
-    <?php if ($_order->getGiftMessageId() && $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_order->getGiftMessageId())): ?>
+    <?php if ($_order->getGiftMessageId() && $_giftMessage = $this->helper(\Magento\GiftMessage\Helper\Message::class)->getGiftMessage($_order->getGiftMessageId())) : ?>
         <tr>
             <td colspan="3" align="left" style="padding:3px 9px">
-            <strong><?= /* @escapeNotVerified */ __('Gift Message') ?></strong>
-            <br /><?= /* @escapeNotVerified */ __('From:') ?> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-            <br /><?= /* @escapeNotVerified */ __('To:') ?> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-            <br /><?= /* @escapeNotVerified */ __('Message:') ?><br /> <?= $block->escapeHtml($_giftMessage->getMessage()) ?>
+            <strong><?= $block->escapeHtml(__('Gift Message')) ?></strong>
+            <br /><?= $block->escapeHtml(__('From:')) ?> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
+            <br /><?= $block->escapeHtml(__('To:')) ?> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
+            <br /><?= $block->escapeHtml(__('Message:')) ?><br /> <?= $block->escapeHtml($_giftMessage->getMessage()) ?>
             </td>
         </tr>
-     <?php endif; ?>
+    <?php endif; ?>
         <tr>
-            <td colspan="2" align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ __('Subtotal') ?></td>
-            <td align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ $_order->formatPrice($_order->getSubtotal()) ?></td>
+            <td colspan="2" align="right" style="padding:3px 9px"><?= $block->escapeHtml(__('Subtotal')) ?></td>
+            <td align="right" style="padding:3px 9px"><?= /* @noEscape */ $_order->formatPrice($_order->getSubtotal()) ?></td>
         </tr>
-        <?php if ($_order->getDiscountAmount() > 0): ?>
+        <?php if ($_order->getDiscountAmount() > 0) : ?>
             <tr>
-                <td colspan="2" align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ (($_order->getCouponCode()) ? __('Discount (%1)', $_order->getCouponCode()) : __('Discount')) ?></td>
-                <td align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ $_order->formatPrice(0.00 - $_order->getDiscountAmount()) ?></td>
+                <td colspan="2" align="right" style="padding:3px 9px"><?= $block->escapeHtml((($_order->getCouponCode()) ? __('Discount (%1)', $_order->getCouponCode()) : __('Discount'))) ?></td>
+                <td align="right" style="padding:3px 9px"><?= /* @noEscape */ $_order->formatPrice(0.00 - $_order->getDiscountAmount()) ?></td>
             </tr>
         <?php endif; ?>
         <?php if ($_order->getShippingAmount() || $_order->getShippingDescription()) : ?>
             <tr>
-                <td colspan="2" align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ __('Shipping &amp; Handling') ?></td>
-                <td align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ $_order->formatPrice($_order->getShippingAmount()) ?></td>
+                <td colspan="2" align="right" style="padding:3px 9px"><?= $block->escapeHtml(__('Shipping &amp; Handling')) ?></td>
+                <td align="right" style="padding:3px 9px"><?= /* @noEscape */ $_order->formatPrice($_order->getShippingAmount()) ?></td>
             </tr>
         <?php endif; ?>
-        <?php if ($_order->getTaxAmount() > 0): ?>
+        <?php if ($_order->getTaxAmount() > 0) : ?>
             <tr>
-                <td colspan="2" align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ __('Tax') ?></td>
-                <td align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ $_order->formatPrice($_order->getTaxAmount()) ?></td>
+                <td colspan="2" align="right" style="padding:3px 9px"><?= $block->escapeHtml(__('Tax')) ?></td>
+                <td align="right" style="padding:3px 9px"><?= /* @noEscape */ $_order->formatPrice($_order->getTaxAmount()) ?></td>
             </tr>
         <?php endif; ?>
         <tr bgcolor="#DEE5E8">
-            <td colspan="2" align="right" style="padding:3px 9px"><strong><big><?= /* @escapeNotVerified */ __('Grand Total') ?></big></strong></td>
-            <td align="right" style="padding:6px 9px"><strong><big><?= /* @escapeNotVerified */ $_order->formatPrice($_order->getGrandTotal()) ?></big></strong></td>
+            <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>
         </tr>
     </tfoot>
 </table>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml
index acce4571be005..1010eb339e26d 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml
@@ -3,13 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<?php if ($block->getChildHtml()): ?>
+<?php if ($block->getChildHtml()) : ?>
 <section class="admin__page-section order-gift-options">
-    <div class="admin__page-section-title"><strong class="title"><?= /* @escapeNotVerified */ __('Gift Options') ?></strong></div>
+    <div class="admin__page-section-title"><strong class="title"><?= $block->escapeHtml(__('Gift Options')) ?></strong></div>
     <?= $block->getChildHtml() ?>
 </section>
-<?php endif ?>
+<?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
index cabbb8df8573c..da9f0d273af24 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
@@ -4,68 +4,69 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
+/* @var \Magento\Sales\Block\Adminhtml\Order\Invoice\Create\Form $block */
 ?>
-<form id="edit_form" class="order-invoice-edit" method="post" action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>">
+<form id="edit_form" class="order-invoice-edit" method="post" action="<?= $block->escapeUrl($block->getSaveUrl()) ?>">
     <?= $block->getBlockHtml('formkey') ?>
     <?php $_order = $block->getInvoice()->getOrder() ?>
     <?= $block->getChildHtml('order_info') ?>
 
     <section class="admin__page-section">
         <div class="admin__page-section-title">
-            <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
+            <span class="title"><?= $block->escapeHtml(__('Payment &amp; Shipping Method')) ?></span>
         </div>
         <div class="admin__page-section-content">
-            <div class="admin__page-section-item order-payment-method<?php if ($_order->getIsVirtual()): ?> order-payment-method-virtual<?php endif; ?>">
+            <div class="admin__page-section-item order-payment-method<?php if ($_order->getIsVirtual()) : ?> order-payment-method-virtual<?php endif; ?>">
                 <div class="admin__page-section-item-title">
-                    <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
+                    <span class="title"><?= $block->escapeHtml(__('Payment Information')) ?></span>
                 </div>
                 <div class="admin__page-section-item-content">
                     <div class="order-payment-method-title"><?= $block->getChildHtml('order_payment') ?></div>
-                    <div class="order-payment-currency"><?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
+                    <div class="order-payment-currency"><?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?></div>
                     <div class="order-payment-additional"><?= $block->getChildHtml('order_payment_additional') ?></div>
                 </div>
             </div>
-            <?php if (!$_order->getIsVirtual()): ?>
-            <div class="admin__page-section-item order-shipping-address">
-                <?php /*Shipping Address */ ?>
-                <div class="admin__page-section-item-title">
-                    <span class="title"><?= /* @escapeNotVerified */ __('Shipping Information') ?></span>
-                </div>
-                <div class="admin__page-section-item-content">
-                    <div class="shipping-description-wrapper">
-                        <div class="shipping-description-title"><?= $block->escapeHtml($_order->getShippingDescription()) ?></div>
-                        <div class="shipping-description-content">
-                            <?= /* @escapeNotVerified */ __('Total Shipping Charges') ?>:
+            <?php if (!$_order->getIsVirtual()) : ?>
+                <div class="admin__page-section-item order-shipping-address">
+                    <?php /*Shipping Address */ ?>
+                    <div class="admin__page-section-item-title">
+                        <span class="title"><?= $block->escapeHtml(__('Shipping Information')) ?></span>
+                    </div>
+                    <div class="admin__page-section-item-content">
+                        <div class="shipping-description-wrapper">
+                            <div class="shipping-description-title"><?= $block->escapeHtml($_order->getShippingDescription()) ?></div>
+                            <div class="shipping-description-content">
+                                <?= $block->escapeHtml(__('Total Shipping Charges')) ?>:
 
-                            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
-                                <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
-                            <?php else: ?>
-                                <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
-                            <?php endif; ?>
-                            <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
+                                <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()) : ?>
+                                    <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
+                                <?php else : ?>
+                                    <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
+                                <?php endif; ?>
+                                <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
 
-                            <?= /* @escapeNotVerified */ $_excl ?>
-                            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                                (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
-                            <?php endif; ?>
+                                <?= /* @noEscape */ $_excl ?>
+                                <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
+                                    (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
+                                <?php endif; ?>
+                            </div>
                         </div>
-                    </div>
-                    <?php if ($block->canCreateShipment() && $block->canShipPartiallyItem()): ?>
-                    <div class="admin__field admin__field-option">
-                        <input type="checkbox" name="invoice[do_shipment]" id="invoice_do_shipment" value="1"
-                               class="admin__control-checkbox" <?= $block->hasInvoiceShipmentTypeMismatch() ? ' disabled="disabled"' : '' ?> />
-                        <label for="invoice_do_shipment"
-                               class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Create Shipment') ?></span></label>
-                    </div>
-                    <?php if ($block->hasInvoiceShipmentTypeMismatch()): ?>
-                        <small><?= /* @escapeNotVerified */ __('Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice.') ?></small>
+                        <?php if ($block->canCreateShipment() && $block->canShipPartiallyItem()) : ?>
+                            <div class="admin__field admin__field-option">
+                                <input type="checkbox" name="invoice[do_shipment]" id="invoice_do_shipment" value="1"
+                                       class="admin__control-checkbox" <?= $block->hasInvoiceShipmentTypeMismatch() ? ' disabled="disabled"' : '' ?> />
+                                <label for="invoice_do_shipment"
+                                       class="admin__field-label"><span><?= $block->escapeHtml(__('Create Shipment')) ?></span></label>
+                            </div>
+                            <?php if ($block->hasInvoiceShipmentTypeMismatch()) : ?>
+                                <small><?= $block->escapeHtml(__('Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice.')) ?></small>
+                            <?php endif; ?>
                         <?php endif; ?>
-                    <?php endif; ?>
-                    <div id="tracking" style="display:none;"><?= $block->getChildHtml('tracking', false) ?></div>
+                        <div id="tracking" style="display:none;"><?= $block->getChildHtml('tracking', false) ?></div>
+                    </div>
                 </div>
-            </div>
             <?php endif; ?>
         </div>
     </section>
@@ -90,7 +91,7 @@ require(['prototype'], function(){
     }
 
     /*forced creating of shipment*/
-    var forcedShipmentCreate = <?= /* @escapeNotVerified */ $block->getForcedShipmentCreate() ?>;
+    var forcedShipmentCreate = <?= (int) $block->getForcedShipmentCreate() ?>;
     var shipmentElement = $('invoice_do_shipment');
     if (forcedShipmentCreate && shipmentElement) {
         shipmentElement.checked = true;
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
index fa5ea0568011b..c54efa43e47e6 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
@@ -3,48 +3,44 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-
 <section class="admin__page-section">
     <div class="admin__page-section-title">
         <?php $_itemsGridLabel = $block->getForcedShipmentCreate() ? 'Items to Invoice and Ship' : 'Items to Invoice'; ?>
-        <span class="title"><?= /* @escapeNotVerified */ __('%1', $_itemsGridLabel) ?></span>
+        <span class="title"><?= $block->escapeHtml(__('%1', $_itemsGridLabel)) ?></span>
     </div>
     <div class="admin__page-section-content grid">
         <div class="admin__table-wrapper">
             <table class="data-table admin__table-primary order-invoice-tables">
                 <thead>
                     <tr class="headings">
-                        <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
-                        <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
-                        <th class="col-ordered-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
-                        <th class="col-qty-invoice"><span><?= /* @escapeNotVerified */ __('Qty to Invoice') ?></span></th>
-                        <th class="col-subtotal"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
-                        <th class="col-tax"><span><?= /* @escapeNotVerified */ __('Tax Amount') ?></span></th>
-                        <th class="col-discount"><span><?= /* @escapeNotVerified */ __('Discount Amount') ?></span></th>
-                        <th class="col-total last"><span><?= /* @escapeNotVerified */ __('Row Total') ?></span></th>
+                        <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
+                        <th class="col-price"><span><?= $block->escapeHtml(__('Price')) ?></span></th>
+                        <th class="col-ordered-qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
+                        <th class="col-qty-invoice"><span><?= $block->escapeHtml(__('Qty to Invoice')) ?></span></th>
+                        <th class="col-subtotal"><span><?= $block->escapeHtml(__('Subtotal')) ?></span></th>
+                        <th class="col-tax"><span><?= $block->escapeHtml(__('Tax Amount')) ?></span></th>
+                        <th class="col-discount"><span><?= $block->escapeHtml(__('Discount Amount')) ?></span></th>
+                        <th class="col-total last"><span><?= $block->escapeHtml(__('Row Total')) ?></span></th>
                     </tr>
                 </thead>
-                <?php if ($block->canEditQty()): ?>
-                <tfoot>
-                    <tr>
-                        <td colspan="2">&nbsp;</td>
-                        <td colspan="3"><?= $block->getUpdateButtonHtml() ?></td>
-                        <td colspan="3">&nbsp;</td>
-                    </tr>
-                </tfoot>
+                <?php if ($block->canEditQty()) : ?>
+                    <tfoot>
+                        <tr>
+                            <td colspan="3">&nbsp;</td>
+                            <td><?= $block->getUpdateButtonHtml() ?></td>
+                            <td colspan="4">&nbsp;</td>
+                        </tr>
+                    </tfoot>
                 <?php endif; ?>
                 <?php $_items = $block->getInvoice()->getAllItems() ?>
-                <?php $_i = 0; foreach ($_items as $_item): ?>
-                <?php if ($_item->getOrderItem()->getParentItem()) {
-                    continue;
-                } else {
-                    $_i++;
-                } ?>
-                    <tbody class="<?= /* @escapeNotVerified */ $_i%2 ? 'even' : 'odd' ?>">
+                <?php $_i = 0; foreach ($_items as $_item) : ?>
+                    <?php if ($_item->getOrderItem()->getParentItem()) :
+                        continue;
+                    else :
+                        $_i++;
+                    endif; ?>
+                    <tbody class="<?= /* @noEscape */ $_i%2 ? 'even' : 'odd' ?>">
                         <?= $block->getItemHtml($_item) ?>
                         <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
                     </tbody>
@@ -56,29 +52,29 @@
 
 <?php $orderTotalBar = $block->getChildHtml('order_totalbar'); ?>
 
-<?php if (!empty($orderTotalBar)): ?>
+<?php if (!empty($orderTotalBar)) : ?>
 <section class="admin__page-section">
-    <?= /* @escapeNotVerified */ $orderTotalBar ?>
+    <?= /* @noEscape */ $orderTotalBar ?>
 </section>
 <?php endif; ?>
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Order Total') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Order Total')) ?></span>
     </div>
     <div class="admin__page-section-content">
         <div class="admin__page-section-item order-comments-history">
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Invoice History') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Invoice History')) ?></span>
             </div>
             <div id="history_form" class="admin__page-section-item-content order-history-form">
                 <div class="admin__field">
                     <label for="invoice_comment_text" class="admin__field-label">
-                        <span><?= /* @escapeNotVerified */ __('Invoice Comments') ?></span>
+                        <span><?= $block->escapeHtml(__('Invoice Comments')) ?></span>
                     </label>
                     <div class="admin__field-control">
                         <textarea id="invoice_comment_text" name="invoice[comment_text]" class="admin__control-textarea"
-                                  rows="3" cols="5"><?= /* @escapeNotVerified */ $block->getInvoice()->getCommentText() ?></textarea>
+                                  rows="3" cols="5"><?= $block->escapeHtml($block->getInvoice()->getCommentText()) ?></textarea>
                     </div>
                 </div>
             </div>
@@ -86,41 +82,41 @@
 
         <div id="invoice_totals" class="admin__page-section-item order-totals">
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Invoice Totals') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Invoice Totals')) ?></span>
             </div>
             <div class="admin__page-section-item-content order-totals-actions">
                 <?= $block->getChildHtml('invoice_totals') ?>
-                <?php if ($block->isCaptureAllowed()): ?>
-                <?php if ($block->canCapture()):?>
-                    <div class="admin__field">
-                        <?php
-                        /*
-                        <label for="invoice_do_capture" class="normal"><?= __('Capture Amount') ?></label>
-                        <input type="checkbox" name="invoice[do_capture]" id="invoice_do_capture" value="1" checked/>
-                        */
-                        ?>
-                      <label for="invoice_do_capture" class="admin__field-label"><?= /* @escapeNotVerified */ __('Amount') ?></label>
-                      <select class="admin__control-select" name="invoice[capture_case]">
-                          <option value="online"><?= /* @escapeNotVerified */ __('Capture Online') ?></option>
-                          <option value="offline"><?= /* @escapeNotVerified */ __('Capture Offline') ?></option>
-                          <option value="not_capture"><?= /* @escapeNotVerified */ __('Not Capture') ?></option>
-                      </select>
-                    </div>
-                <?php elseif ($block->isGatewayUsed()):?>
-                    <input type="hidden" name="invoice[capture_case]" value="offline"/>
-                    <div><?= /* @escapeNotVerified */ __('The invoice will be created offline without the payment gateway.') ?></div>
-                <?php endif?>
+                <?php if ($block->isCaptureAllowed()) : ?>
+                    <?php if ($block->canCapture()) : ?>
+                        <div class="admin__field">
+                            <?php
+                            /*
+                            <label for="invoice_do_capture" class="normal"><?= __('Capture Amount') ?></label>
+                            <input type="checkbox" name="invoice[do_capture]" id="invoice_do_capture" value="1" checked/>
+                            */
+                            ?>
+                          <label for="invoice_do_capture" class="admin__field-label"><?= $block->escapeHtml(__('Amount')) ?></label>
+                          <select class="admin__control-select" name="invoice[capture_case]">
+                              <option value="online"><?= $block->escapeHtml(__('Capture Online')) ?></option>
+                              <option value="offline"><?= $block->escapeHtml(__('Capture Offline')) ?></option>
+                              <option value="not_capture"><?= $block->escapeHtml(__('Not Capture')) ?></option>
+                          </select>
+                        </div>
+                    <?php elseif ($block->isGatewayUsed()) :?>
+                        <input type="hidden" name="invoice[capture_case]" value="offline"/>
+                        <div><?= $block->escapeHtml(__('The invoice will be created offline without the payment gateway.')) ?></div>
+                    <?php endif; ?>
                 <?php endif; ?>
                 <div class="admin__field admin__field-option field-append">
                     <input id="notify_customer" name="invoice[comment_customer_notify]" value="1" type="checkbox"
                            class="admin__control-checkbox" />
-                    <label class="admin__field-label" for="notify_customer"><?= /* @escapeNotVerified */ __('Append Comments') ?></label>
+                    <label class="admin__field-label" for="notify_customer"><?= $block->escapeHtml(__('Append Comments')) ?></label>
                 </div>
-                <?php if ($block->canSendInvoiceEmail()): ?>
+                <?php if ($block->canSendInvoiceEmail()) : ?>
                 <div class="admin__field admin__field-option field-email">
                     <input id="send_email" name="invoice[send_email]" value="1" type="checkbox"
                            class="admin__control-checkbox" />
-                    <label class="admin__field-label" for="send_email"><?= /* @escapeNotVerified */ __('Email Copy of Invoice') ?></label>
+                    <label class="admin__field-label" for="send_email"><?= $block->escapeHtml(__('Email Copy of Invoice')) ?></label>
                 </div>
                 <?php endif; ?>
                 <?= $block->getChildHtml('submit_before') ?>
@@ -134,56 +130,61 @@
 </section>
 
 <script>
-require(['jquery', 'prototype'], function(jQuery){
+require(['jquery'], function(jQuery){
 
 //<![CDATA[
-var submitButtons = $$('.submit-button');
-var updateButtons = $$('.update-button');
+var submitButtons = jQuery('.submit-button');
+var updateButtons = jQuery('.update-button');
 var enableSubmitButtons = <?= (int) !$block->getDisableSubmitButton() ?>;
-var fields = $$('.qty-input');
+var fields = jQuery('.qty-input');
 
-updateButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
+function enableButtons(buttons) {
+    buttons.removeClass('disabled').prop('disabled', false);
+};
 
-for(var i=0;i<fields.length;i++){
-    jQuery(fields[i]).on('keyup', checkButtonsRelation);
-    fields[i].baseValue = fields[i].value;
-}
+function disableButtons(buttons) {
+    buttons.addClass('disabled').prop('disabled', true);
+};
+
+disableButtons(updateButtons);
+
+fields.on('keyup', checkButtonsRelation);
+fields.each(function (i, elem) {
+    elem.baseValue = elem.value;
+});
 
 function checkButtonsRelation() {
     var hasChanges = false;
-    fields.each(function (elem) {
+    fields.each(function (i, elem) {
         if (elem.baseValue != elem.value) {
             hasChanges = true;
         }
     }.bind(this));
     if (hasChanges) {
-        submitButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
-        updateButtons.each(function (elem) {elem.disabled=false;elem.removeClassName('disabled');});
+        disableButtons(submitButtons);
+        enableButtons(updateButtons);
     }
     else {
         if (enableSubmitButtons) {
-            submitButtons.each(function (elem) {elem.disabled=false;elem.removeClassName('disabled');});
+            enableButtons(submitButtons);
         }
-        updateButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
+        disableButtons(updateButtons);
     }
 }
 
-var sendEmailCheckbox = $('send_email');
-if (sendEmailCheckbox) {
-    var notifyCustomerCheckbox = $('notify_customer');
-    var invoiceCommentText = $('invoice_comment_text');
-    Event.observe(sendEmailCheckbox, 'change', bindSendEmail);
+var sendEmailCheckbox = jQuery('#send_email');
+if (sendEmailCheckbox.length) {
+    var notifyCustomerCheckbox = jQuery('#notify_customer');
+    sendEmailCheckbox.on('change', bindSendEmail);
     bindSendEmail();
 }
 function bindSendEmail()
 {
-    if (sendEmailCheckbox.checked == true) {
-        notifyCustomerCheckbox.disabled = false;
-        //invoiceCommentText.disabled = false;
+    if (sendEmailCheckbox.prop('checked') == true) {
+        notifyCustomerCheckbox.prop('disabled', false);
     }
     else {
-        notifyCustomerCheckbox.disabled = true;
-        //invoiceCommentText.disabled = true;
+        notifyCustomerCheckbox.prop('disabled', true);
     }
 }
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
index 5bfb5f130cedb..98ae143e30c0b 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer */ ?>
 <?php $_item = $block->getItem() ?>
@@ -18,17 +15,17 @@
     <td class="col-qty-invoice">
     <?php if ($block->canEditQty()) : ?>
         <input type="text" class="input-text admin__control-text qty-input"
-               name="invoice[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>]"
-               value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>"/>
+               name="invoice[items][<?= (int) $_item->getOrderItemId() ?>]"
+               value="<?= (int) $_item->getQty() ?>"/>
     <?php else : ?>
-        <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
+        <?= (int) $_item->getQty() ?>
     <?php endif; ?>
     </td>
     <td class="col-subtotal">
         <?= $block->getColumnHtml($_item, 'subtotal') ?>
     </td>
-    <td class="col-tax"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?></td>
-    <td class="col-discount"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?></td>
+    <td class="col-tax"><?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?></td>
+    <td class="col-discount"><?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?></td>
     <td class="col-total last">
         <?= $block->getColumnHtml($_item, 'total') ?>
     </td>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml
index e86a87f089897..784d3f892f2c4 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml
@@ -4,8 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
+/* @var \Magento\Sales\Block\Adminhtml\Order\Invoice\View\Form $block */
 ?>
 <?php $_invoice = $block->getInvoice() ?>
 <?php $_order = $_invoice->getOrder() ?>
@@ -13,46 +14,46 @@
 
 <section class="admin__page-section order-view-billing-shipping">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Payment &amp; Shipping Method')) ?></span>
     </div>
     <div class="admin__page-section-content">
-        <div class="admin__page-section-item order-payment-method<?php if ($_order->getIsVirtual()): ?> order-payment-method-virtual<?php endif; ?> admin__fieldset-wrapper">
+        <div class="admin__page-section-item order-payment-method<?php if ($_order->getIsVirtual()) : ?> order-payment-method-virtual<?php endif; ?> admin__fieldset-wrapper">
             <?php /*Billing Address */ ?>
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Payment Information')) ?></span>
             </div>
             <div class="admin__page-section-item-content">
                 <div class="order-payment-method-title"><?= $block->getChildHtml('order_payment') ?></div>
                 <div class="order-payment-currency">
-                    <?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?>
+                    <?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?>
                 </div>
                 <div class="order-payment-additional"><?= $block->getChildHtml('order_payment_additional') ?></div>
             </div>
         </div>
 
-        <?php if (!$_order->getIsVirtual()): ?>
+        <?php if (!$_order->getIsVirtual()) : ?>
             <div class="admin__page-section-item order-shipping-address">
                 <?php /*Shipping Address */ ?>
                 <div class="admin__page-section-item-title">
-                    <span class="title"><?= /* @escapeNotVerified */ __('Shipping Information') ?></span>
+                    <span class="title"><?= $block->escapeHtml(__('Shipping Information')) ?></span>
                 </div>
                 <div class="admin__page-section-item-content shipping-description-wrapper">
                     <div class="shipping-description-title">
                         <?= $block->escapeHtml($_order->getShippingDescription()) ?>
                     </div>
                     <div class="shipping-description-content">
-                        <?= /* @escapeNotVerified */ __('Total Shipping Charges') ?>:
+                        <?= $block->escapeHtml(__('Total Shipping Charges')) ?>:
 
-                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
+                        <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()) : ?>
                             <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
-                        <?php else: ?>
+                        <?php else : ?>
                             <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
                         <?php endif; ?>
                         <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
 
-                        <?= /* @escapeNotVerified */ $_excl ?>
-                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                            (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
+                        <?= /* @noEscape */ $_excl ?>
+                        <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
+                            (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
                         <?php endif; ?>
                         <div><?= $block->getChildHtml('shipment_tracking') ?></div>
                     </div>
@@ -65,7 +66,7 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Items Invoiced') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Items Invoiced')) ?></span>
     </div>
 
     <div id="invoice_item_container" class="admin__page-section-content">
@@ -75,12 +76,12 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Order Total') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Order Total')) ?></span>
     </div>
     <div class="admin__page-section-content">
         <div class="admin__page-section-item order-comments-history">
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Invoice History') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Invoice History')) ?></span>
             </div>
             <div class="admin__page-section-item-content">
                 <?= $block->getChildHtml('order_comments') ?>
@@ -89,7 +90,7 @@
 
         <div id="history_form" class="admin__page-section-item order-totals">
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Invoice Totals') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Invoice Totals')) ?></span>
             </div>
             <?= $block->getChildHtml('invoice_totals') ?>
         </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
index 63f33dbb74bad..6dbfd19e9a2c7 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
@@ -4,30 +4,29 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/* @var \Magento\Sales\Block\Adminhtml\Order\Invoice\View\Items $block */
 ?>
 <div class="admin__table-wrapper">
     <table class="data-table admin__table-primary order-invoice-tables">
         <thead>
             <tr class="headings">
-                <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
-                <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
-                <th class="col-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
-                <th class="col-subtotal"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
-                <th class="col-tax"><span><?= /* @escapeNotVerified */ __('Tax Amount') ?></span></th>
-                <th class="col-discount"><span><?= /* @escapeNotVerified */ __('Discount Amount') ?></span></th>
-                <th class="col-total last"><span><?= /* @escapeNotVerified */ __('Row Total') ?></span></th>
+                <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
+                <th class="col-price"><span><?= $block->escapeHtml(__('Price')) ?></span></th>
+                <th class="col-qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
+                <th class="col-subtotal"><span><?= $block->escapeHtml(__('Subtotal')) ?></span></th>
+                <th class="col-tax"><span><?= $block->escapeHtml(__('Tax Amount')) ?></span></th>
+                <th class="col-discount"><span><?= $block->escapeHtml(__('Discount Amount')) ?></span></th>
+                <th class="col-total last"><span><?= $block->escapeHtml(__('Row Total')) ?></span></th>
             </tr>
         </thead>
         <?php $_items = $block->getInvoice()->getAllItems() ?>
-        <?php $i = 0; foreach ($_items as $_item): ?>
-            <?php if ($_item->getOrderItem()->getParentItem()) {
-            continue;
-        } else {
-            $i++;
-        } ?>
-            <tbody class="<?= /* @escapeNotVerified */ $i%2 ? 'even' : 'odd' ?>">
+        <?php $i = 0; foreach ($_items as $_item) : ?>
+            <?php if ($_item->getOrderItem()->getParentItem()) :
+                continue;
+            else :
+                $i++;
+            endif; ?>
+            <tbody class="<?= /* @noEscape */ $i%2 ? 'even' : 'odd' ?>">
                 <?= $block->getItemHtml($_item) ?>
                 <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
             </tbody>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml
index af9e5b3bb702d..59301931c73c7 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer */ ?>
 <?php $_item = $block->getItem() ?>
@@ -16,12 +13,12 @@
     <td class="col-price">
         <?= $block->getColumnHtml($_item, 'price') ?>
     </td>
-    <td class="col-qty"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
+    <td class="col-qty"><?= (int) $_item->getQty() ?></td>
     <td class="col-subtotal">
         <?= $block->getColumnHtml($_item, 'subtotal') ?>
     </td>
-    <td class="col-tax"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?></td>
-    <td class="col-discount"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?></td>
+    <td class="col-tax"><?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?></td>
+    <td class="col-discount"><?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?></td>
     <td class="col-total last">
         <?= $block->getColumnHtml($_item, 'total') ?>
     </td>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
index 8ff360b9635c3..819718af2dde2 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
@@ -5,16 +5,15 @@
  */
 
 // @deprecated
-// @codingStandardsIgnoreFile
-
+$totals = $block->getTotals();
 ?>
-<?php if (sizeof($block->getTotals()) > 0): ?>
+<?php if (count($block->getTotals()) > 0) : ?>
 <table class="items-to-invoice">
     <tr>
-    <?php foreach ($block->getTotals() as $_total): ?>
-        <td <?php if ($_total['grand']): ?>class="grand-total"<?php endif; ?>>
-            <?= /* @escapeNotVerified */ $_total['label'] ?><br />
-            <?= /* @escapeNotVerified */ $_total['value'] ?>
+    <?php foreach ($block->getTotals() as $_total) : ?>
+        <td <?php if ($_total['grand']) : ?>class="grand-total"<?php endif; ?>>
+            <?= $block->escapeHtml($_total['label']) ?><br />
+            <?= $block->escapeHtml($_total['value']) ?>
         </td>
     <?php endforeach; ?>
     </tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
index 27b82505a11d3..1f495b9c4a573 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
@@ -4,59 +4,58 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/* @var \Magento\Sales\Block\Adminhtml\Order\Totals $block */
 ?>
 <table class="data-table admin__table-secondary order-subtotal-table">
-    <?php $_totals = $block->getTotals('footer')?>
+    <?php $_totals = $block->getTotals('footer') ?>
 
-    <?php if ($_totals):?>
+    <?php if ($_totals) : ?>
         <tfoot>
-            <?php foreach ($block->getTotals('footer') as $_code => $_total): ?>
-                <?php if ($_total->getBlockName()): ?>
+            <?php foreach ($block->getTotals('footer') as $_code => $_total) : ?>
+                <?php if ($_total->getBlockName()) : ?>
                     <?= $block->getChildHtml($_total->getBlockName(), false) ?>
-                <?php else:?>
-                <tr class="col-<?= /* @escapeNotVerified */ $_code ?>">
-                    <td <?= /* @escapeNotVerified */ $block->getLabelProperties() ?> class="label">
+                <?php else : ?>
+                <tr class="col-<?= $block->escapeHtmlAttr($_code) ?>">
+                    <td <?= /* @noEscape */ $block->getLabelProperties() ?> class="label">
                         <strong><?= $block->escapeHtml($_total->getLabel()) ?></strong>
                     </td>
-                    <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?>>
-                        <strong><?= /* @escapeNotVerified */ $block->formatValue($_total) ?></strong>
+                    <td <?= /* @noEscape */ $block->getValueProperties() ?>>
+                        <strong><?= /* @noEscape */ $block->formatValue($_total) ?></strong>
                     </td>
                 </tr>
-                <?php endif?>
-            <?php endforeach?>
+                <?php endif; ?>
+            <?php endforeach; ?>
         </tfoot>
-    <?php endif?>
+    <?php endif; ?>
 
     <?php $_totals = $block->getTotals('')?>
-    <?php if ($_totals):?>
+    <?php if ($_totals) : ?>
         <tbody>
-            <?php foreach ($_totals as $_code => $_total): ?>
-                <?php if ($_total->getBlockName()): ?>
+            <?php foreach ($_totals as $_code => $_total) : ?>
+                <?php if ($_total->getBlockName()) : ?>
                     <?= $block->getChildHtml($_total->getBlockName(), false) ?>
-                <?php else:?>
-                    <tr class="col-<?= /* @escapeNotVerified */ $_code ?>">
-                        <td <?= /* @escapeNotVerified */ $block->getLabelProperties() ?> class="label">
-                            <?php if ($_total->getStrong()):?>
+                <?php else : ?>
+                    <tr class="col-<?= $block->escapeHtmlAttr($_code) ?>">
+                        <td <?= /* @noEscape */ $block->getLabelProperties() ?> class="label">
+                            <?php if ($_total->getStrong()) : ?>
                             <strong><?= $block->escapeHtml($_total->getLabel()) ?></strong>
-                            <?php else:?>
+                            <?php else : ?>
                             <?= $block->escapeHtml($_total->getLabel()) ?>
                             <?php endif?>
                         </td>
 
-                        <?php if ($_total->getStrong()):?>
-                            <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?>>
-                                <strong><?= /* @escapeNotVerified */ $block->formatValue($_total) ?></strong>
+                        <?php if ($_total->getStrong()) : ?>
+                            <td <?= /* @noEscape */ $block->getValueProperties() ?>>
+                                <strong><?= /* @noEscape */ $block->formatValue($_total) ?></strong>
                             </td>
-                        <?php else:?>
-                            <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?>>
-                                <span><?= /* @escapeNotVerified */ $block->formatValue($_total) ?></span>
+                        <?php else : ?>
+                            <td <?= /* @noEscape */ $block->getValueProperties() ?>>
+                                <span><?= /* @noEscape */ $block->formatValue($_total) ?></span>
                             </td>
-                        <?php endif?>
+                        <?php endif; ?>
                     </tr>
-                <?php endif?>
-            <?php endforeach?>
+                <?php endif; ?>
+            <?php endforeach; ?>
         </tbody>
-    <?php endif?>
+    <?php endif; ?>
 </table>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/discount.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/discount.phtml
index db2567a5f3dbf..9ff3a91eab7ce 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/discount.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/discount.phtml
@@ -3,23 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php $_source  = $block->getSource() ?>
 <?php $_order   = $block->getOrder() ?>
 <?php $block->setPriceDataObject($_source) ?>
 
-<?php if ((float) $_source->getDiscountAmount()): ?>
+<?php if ((float) $_source->getDiscountAmount()) : ?>
     <tr>
         <td class="label">
-            <?php if ($_order->getCouponCode()): ?>
-                <?= /* @escapeNotVerified */ __('Discount (%1)', $_order->getCouponCode()) ?>
-            <?php else: ?>
-                <?= /* @escapeNotVerified */ __('Discount') ?>
+            <?php if ($_order->getCouponCode()) : ?>
+                <?= $block->escapeHtml(__('Discount (%1)', $_order->getCouponCode())) ?>
+            <?php else : ?>
+                <?= $block->escapeHtml(__('Discount')) ?>
             <?php endif; ?>
         </td>
-        <td><?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?></td>
+        <td><?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?></td>
     </tr>
 <?php endif; ?>
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 81402e37288ef..87d7c85c2d9ed 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
@@ -3,13 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<?php if ($block->getCanDisplayTotalDue()): ?>
+<?php if ($block->getCanDisplayTotalDue()) : ?>
 <tr>
-    <td class="label"><big><strong><?= /* @escapeNotVerified */ __('Total Due') ?></strong></big></td>
-    <td class="emph"><big><?= /* @escapeNotVerified */ $block->displayPriceAttribute('total_due', true) ?></big></td>
+    <td class="label"><big><strong><?= $block->escapeHtml(__('Total Due')) ?></strong></big></td>
+    <td class="emph"><big><?= /* @noEscape */ $block->displayPriceAttribute('total_due', true) ?></big></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 519aa660fbf12..dc76799251c7a 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
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php $_source  = $block->getSource() ?>
 <?php $block->setPriceDataObject($_source) ?>
@@ -13,12 +10,12 @@
 <tr>
     <td class="label">
         <strong><big>
-        <?php if ($block->getGrandTotalTitle()): ?>
-            <?= /* @escapeNotVerified */ $block->getGrandTotalTitle() ?>
-        <?php else: ?>
-            <?= /* @escapeNotVerified */ __('Grand Total') ?>
+        <?php if ($block->getGrandTotalTitle()) : ?>
+            <?= $block->escapeHtml($block->getGrandTotalTitle()) ?>
+        <?php else : ?>
+            <?= $block->escapeHtml(__('Grand Total')) ?>
         <?php endif; ?>
         </big></strong>
     </td>
-    <td class="emph"><big><?= /* @escapeNotVerified */ $block->displayPriceAttribute('grand_total', true) ?></big></td>
+    <td class="emph"><big><?= /* @noEscape */ $block->displayPriceAttribute('grand_total', true) ?></big></td>
 </tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/item.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/item.phtml
index 6c44e6ec632a7..f3590654181c2 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/item.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/item.phtml
@@ -3,16 +3,25 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<?php $_source  = $block->getSource() ?>
+<?php $_source = $block->getSource() ?>
 <?php $block->setPriceDataObject($_source) ?>
 
-<?php if ((float) $_source->getDataUsingMethod($block->getSourceField())): ?>
+<?php if ((float) $_source->getDataUsingMethod($block->getSourceField())) : ?>
     <tr>
-        <td class="label"><?php if ($block->getStrong()) : ?><strong><?php endif; ?><?= /* @escapeNotVerified */ __($block->getLabel()) ?><?php if ($block->getStrong()) : ?></strong><?php endif; ?></td>
-        <td <?= $block->getHtmlClass() ? ('class="' . $block->getHtmlClass() . '"') : '' ?>><?php if ($block->getStrong()) : ?><strong><?php endif; ?><?= /* @escapeNotVerified */ $block->displayPriceAttribute($block->getSourceField()) ?><?php if ($block->getStrong()) : ?></strong><?php endif; ?></td>
+        <td class="label">
+            <?php if ($block->getStrong()) : ?>
+                <strong>
+            <?php endif; ?>
+            <?= $block->escapeHtml(__($block->getLabel())) ?>
+            <?php if ($block->getStrong()) : ?>
+                </strong>
+            <?php endif; ?>
+        </td>
+        <td <?= $block->getHtmlClass() ? ('class="' . $block->escapeHtmlAttr($block->getHtmlClass()) . '"') : '' ?>>
+            <?php if ($block->getStrong()) : ?><strong><?php endif; ?>
+            <?= /* @noEscape */ $block->displayPriceAttribute($block->getSourceField()) ?>
+            <?php if ($block->getStrong()) : ?></strong><?php endif; ?>
+        </td>
     </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/paid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/paid.phtml
index 8befc7cc0ccb4..9ede6e21e78af 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/paid.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/paid.phtml
@@ -3,14 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<?php if ($block->getCanDisplayTotalPaid()): ?>
+<?php if ($block->getCanDisplayTotalPaid()) : ?>
 <tr>
-    <td class="label"><strong><?= /* @escapeNotVerified */ __('Total Paid') ?></strong></td>
-    <td class="emph"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('total_paid', true) ?>
+    <td class="label"><strong><?= $block->escapeHtml(__('Total Paid')) ?></strong></td>
+    <td class="emph"><?= /* @noEscape */ $block->displayPriceAttribute('total_paid', true) ?>
     </td>
 </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/refunded.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/refunded.phtml
index e579578f711ae..1e7087c7222c3 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/refunded.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/refunded.phtml
@@ -3,13 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<?php if ($block->getCanDisplayTotalRefunded()): ?>
+<?php if ($block->getCanDisplayTotalRefunded()) : ?>
 <tr>
-    <td class="label"><strong><?= /* @escapeNotVerified */ __('Total Refunded') ?></strong></td>
-    <td class="emph"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('total_refunded', true) ?></td>
+    <td class="label"><strong><?= $block->escapeHtml(__('Total Refunded')) ?></strong></td>
+    <td class="emph"><?= /* @noEscape */ $block->displayPriceAttribute('total_refunded', true) ?></td>
 </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/shipping.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/shipping.phtml
index 47304bf7f4a7e..4250dc1d047ba 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/shipping.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/shipping.phtml
@@ -3,16 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php $_source  = $block->getSource() ?>
 <?php $block->setPriceDataObject($_source) ?>
 
-<?php if ((float) $_source->getShippingAmount() || $_source->getShippingDescription()): ?>
+<?php if ((float) $_source->getShippingAmount() || $_source->getShippingDescription()) : ?>
     <tr>
-        <td class="label"><?= /* @escapeNotVerified */ __('Shipping &amp; Handling') ?></td>
-        <td><?= /* @escapeNotVerified */ $block->displayPriceAttribute('shipping_amount') ?></td>
+        <td class="label"><?= $block->escapeHtml(__('Shipping &amp; Handling')) ?></td>
+        <td><?= /* @noEscape */ $block->displayPriceAttribute('shipping_amount') ?></td>
     </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
index 284597027468d..a68fb09fd2058 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
@@ -4,42 +4,41 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
 /** @var $block \Magento\Sales\Block\Adminhtml\Order\Totals\Tax */
-?>
-<?php
+
 /** @var $_source \Magento\Sales\Model\Order\Invoice */
 $_source    = $block->getSource();
 $_order     = $block->getOrder();
 $_fullInfo  = $block->getFullTaxInfo();
 ?>
 
-<?php if ($block->displayFullSummary() && $_fullInfo): ?>
+<?php if ($block->displayFullSummary() && $_fullInfo) : ?>
 <tr class="summary-total" onclick="expandDetails(this, '.summary-details')">
-<?php else: ?>
+<?php else : ?>
 <tr>
     <?php endif; ?>
     <td class="label">
         <div class="summary-collapse" tabindex="0">
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
-                <?= /* @escapeNotVerified */ __('Total Tax') ?>
-            <?php else: ?>
-                <?= /* @escapeNotVerified */ __('Tax') ?>
+            <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary()) : ?>
+                <?= $block->escapeHtml(__('Total Tax')) ?>
+            <?php else : ?>
+                <?= $block->escapeHtml(__('Tax')) ?>
             <?php endif;?>
         </div>
     </td>
     <td>
-        <?= /* @escapeNotVerified */ $block->displayAmount($_source->getTaxAmount(), $_source->getBaseTaxAmount()) ?>
+        <?= /* @noEscape */ $block->displayAmount($_source->getTaxAmount(), $_source->getBaseTaxAmount()) ?>
     </td>
 </tr>
-<?php if ($block->displayFullSummary()): ?>
+<?php if ($block->displayFullSummary()) : ?>
     <?php $isTop = 1; ?>
-    <?php if (isset($_fullInfo[0]['rates'])): ?>
-        <?php foreach ($_fullInfo as $info): ?>
-            <?php if (isset($info['hidden']) && $info['hidden']) {
+    <?php if (isset($_fullInfo[0]['rates'])) : ?>
+        <?php foreach ($_fullInfo as $info) : ?>
+            <?php if (isset($info['hidden']) && $info['hidden']) :
                 continue;
-            } ?>
+            endif; ?>
             <?php
             $percent    = $info['percent'];
             $amount     = $info['amount'];
@@ -48,39 +47,38 @@ $_fullInfo  = $block->getFullTaxInfo();
             $isFirst    = 1;
             ?>
 
-            <?php foreach ($rates as $rate): ?>
-            <tr class="summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
-                <?php if (!is_null($rate['percent'])): ?>
-                    <td class="admin__total-mark"><?= /* @escapeNotVerified */ $rate['title'] ?> (<?= (float)$rate['percent'] ?>%)<br /></td>
-                <?php else: ?>
-                    <td class="admin__total-mark"><?= /* @escapeNotVerified */ $rate['title'] ?><br /></td>
-                <?php endif; ?>
-                <?php if ($isFirst): ?>
-                    <td rowspan="<?= count($rates) ?>"><?= /* @escapeNotVerified */ $block->displayAmount($amount, $baseAmount) ?></td>
-                <?php endif; ?>
-            </tr>
-            <?php
+            <?php foreach ($rates as $rate) : ?>
+                <tr class="summary-details<?= ($isTop ? ' summary-details-first' : '') ?>" style="display:none;">
+                    <?php if ($rate['percent'] !== null) : ?>
+                        <td class="admin__total-mark"><?= $block->escapeHtml($rate['title']) ?> (<?= (float)$rate['percent'] ?>%)<br /></td>
+                    <?php else : ?>
+                        <td class="admin__total-mark"><?= $block->escapeHtml($rate['title']) ?><br /></td>
+                    <?php endif; ?>
+                    <?php if ($isFirst) : ?>
+                        <td rowspan="<?= count($rates) ?>"><?= /* @noEscape */ $block->displayAmount($amount, $baseAmount) ?></td>
+                    <?php endif; ?>
+                </tr>
+                <?php
                 $isFirst = 0;
                 $isTop = 0;
                 ?>
             <?php endforeach; ?>
         <?php endforeach; ?>
-    <?php else: ?>
-        <?php foreach ($_fullInfo as $info): ?>
+    <?php else : ?>
+        <?php foreach ($_fullInfo as $info) : ?>
             <?php
             $percent    = $info['percent'];
             $amount     = $info['tax_amount'];
             $baseAmount = $info['base_tax_amount'];
             $isFirst    = 1;
             ?>
-
-            <tr class="summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
-                <?php if (!is_null($info['percent'])): ?>
+            <tr class="summary-details<?= ($isTop ? ' summary-details-first' : '') ?>" style="display:none;">
+                <?php if ($info['percent'] !== null) : ?>
                     <td class="admin__total-mark"><?= $block->escapeHtml($info['title']) ?> (<?= (float)$info['percent'] ?>%)<br /></td>
-                <?php else: ?>
+                <?php else : ?>
                     <td class="admin__total-mark"><?= $block->escapeHtml($info['title']) ?><br /></td>
                 <?php endif; ?>
-                    <td><?= /* @escapeNotVerified */ $block->displayAmount($amount, $baseAmount) ?></td>
+                    <td><?= /* @noEscape */ $block->displayAmount($amount, $baseAmount) ?></td>
             </tr>
             <?php
             $isFirst = 0;
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml
index 393af3e40d6eb..bf80f5df00b5e 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml
@@ -4,61 +4,60 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var $block \Magento\Sales\Block\Adminhtml\Order\View\Giftmessage */
 ?>
-<?php if ($block->canDisplayGiftmessage()): ?>
-<?php $_required = $block->getMessage()->getMessage() != ''?>
-<div id="<?= $block->getHtmlId() ?>" class="admin__page-section-content giftmessage-whole-order-container">
-    <form class="entry-edit form-inline" id="<?= /* @escapeNotVerified */ $block->getFieldId('form') ?>" action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>">
-        <fieldset class="admin__fieldset">
-            <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Gift Message for the Entire Order') ?></span></legend>
-            <br/>
-
-            <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId('type') ?>"
-                   name="<?= /* @escapeNotVerified */ $block->getFieldName('type') ?>"
-                   value="order"/>
-
-            <div class="admin__field field-from-name<?= $_required ? ' required' : '' ?>">
-                <label class="admin__field-label"
-                       for="<?= /* @escapeNotVerified */ $block->getFieldId('sender') ?>"><span><?= /* @escapeNotVerified */ __('From Name') ?></span></label>
-
-                <div class="admin__field-control">
-                    <input class="admin__control-text <?= $_required ? 'required-entry' : '' ?>" type="text"
-                           id="<?= /* @escapeNotVerified */ $block->getFieldId('sender') ?>"
-                           name="<?= /* @escapeNotVerified */ $block->getFieldName('sender') ?>"
-                           value="<?= $block->escapeHtml($block->getMessage()->getSender()) ?>"/>
+<?php if ($block->canDisplayGiftmessage()) : ?>
+    <?php $_required = $block->getMessage()->getMessage() != '' ?>
+    <div id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>" class="admin__page-section-content giftmessage-whole-order-container">
+        <form class="entry-edit form-inline" id="<?= $block->escapeHtmlAttr($block->getFieldId('form')) ?>" action="<?= $block->escapeUrl($block->getSaveUrl()) ?>">
+            <fieldset class="admin__fieldset">
+                <legend class="admin__legend"><span><?= $block->escapeHtml(__('Gift Message for the Entire Order')) ?></span></legend>
+                <br/>
+
+                <input type="hidden" id="<?= $block->escapeHtmlAttr($block->getFieldId('type')) ?>"
+                       name="<?= $block->escapeHtmlAttr($block->getFieldName('type')) ?>"
+                       value="order"/>
+
+                <div class="admin__field field-from-name<?= $_required ? ' required' : '' ?>">
+                    <label class="admin__field-label"
+                           for="<?= $block->escapeHtmlAttr($block->getFieldId('sender')) ?>"><span><?= $block->escapeHtml(__('From Name')) ?></span></label>
+
+                    <div class="admin__field-control">
+                        <input class="admin__control-text <?= $_required ? 'required-entry' : '' ?>" type="text"
+                               id="<?= $block->escapeHtmlAttr($block->getFieldId('sender')) ?>"
+                               name="<?= $block->escapeHtmlAttr($block->getFieldName('sender')) ?>"
+                               value="<?= $block->escapeHtml($block->getMessage()->getSender()) ?>"/>
+                    </div>
                 </div>
-            </div>
 
-            <div class="admin__field field-to-name<?= $_required ? ' required' : '' ?>">
-                <label class="admin__field-label"
-                       for="<?= /* @escapeNotVerified */ $block->getFieldId('recipient') ?>"><span><?= /* @escapeNotVerified */ __('To Name') ?></span></label>
+                <div class="admin__field field-to-name<?= $_required ? ' required' : '' ?>">
+                    <label class="admin__field-label"
+                           for="<?= $block->escapeHtmlAttr($block->getFieldId('recipient')) ?>"><span><?= $block->escapeHtml(__('To Name')) ?></span></label>
 
-                <div class="admin__field-control">
-                    <input class="admin__control-text <?= $_required ? 'required-entry' : '' ?>" type="text"
-                           id="<?= /* @escapeNotVerified */ $block->getFieldId('recipient') ?>"
-                           name="<?= /* @escapeNotVerified */ $block->getFieldName('recipient') ?>"
-                           value="<?= $block->escapeHtml($block->getMessage()->getRecipient()) ?>"/>
+                    <div class="admin__field-control">
+                        <input class="admin__control-text <?= $_required ? 'required-entry' : '' ?>" type="text"
+                               id="<?= $block->escapeHtmlAttr($block->getFieldId('recipient')) ?>"
+                               name="<?= $block->escapeHtmlAttr($block->getFieldName('recipient')) ?>"
+                               value="<?= $block->escapeHtml($block->getMessage()->getRecipient()) ?>"/>
+                    </div>
                 </div>
-            </div>
 
-            <div class="admin__field field-gift-message">
-                <label class="admin__field-label"
-                       for="<?= /* @escapeNotVerified */ $block->getFieldId('message') ?>"><span><?= /* @escapeNotVerified */ __('Gift Message') ?></span></label>
-                <div class="admin__field-control">
-                    <textarea id="<?= /* @escapeNotVerified */ $block->getFieldId('message') ?>"
-                              name="<?= /* @escapeNotVerified */ $block->getFieldName('message') ?>"
-                              class="admin__control-textarea"
-                              rows="2"
-                              cols="15"><?= $block->escapeHtml($block->getMessage()->getMessage()) ?></textarea>
+                <div class="admin__field field-gift-message">
+                    <label class="admin__field-label"
+                           for="<?= $block->escapeHtmlAttr($block->getFieldId('message')) ?>"><span><?= $block->escapeHtml(__('Gift Message')) ?></span></label>
+                    <div class="admin__field-control">
+                        <textarea id="<?= $block->escapeHtmlAttr($block->getFieldId('message')) ?>"
+                                  name="<?= $block->escapeHtmlAttr($block->getFieldName('message')) ?>"
+                                  class="admin__control-textarea"
+                                  rows="2"
+                                  cols="15"><?= $block->escapeHtml($block->getMessage()->getMessage()) ?></textarea>
+                    </div>
                 </div>
-            </div>
 
-            <div class="actions">
-                <?= $block->getSaveButtonHtml() ?>
-            </div>
-        </fieldset>
-    </form>
-</div>
+                <div class="actions">
+                    <?= $block->getSaveButtonHtml() ?>
+                </div>
+            </fieldset>
+        </form>
+    </div>
 <?php endif ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
index 6ac6e13a873ed..16643a29a7fbe 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
@@ -4,19 +4,18 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
 /** @var \Magento\Sales\Block\Adminhtml\Order\View\History $block */
 ?>
 <div id="order_history_block" class="edit-order-comments">
-    <?php if ($block->canAddComment()):?>
+    <?php if ($block->canAddComment()) : ?>
         <div class="order-history-block" id="history_form">
 
             <div class="admin__field">
-                <label for="history_status" class="admin__field-label"><?= /* @noEscape */ __('Status') ?></label>
+                <label for="history_status" class="admin__field-label"><?= $block->escapeHtml(__('Status')) ?></label>
                 <div class="admin__field-control">
                     <select name="history[status]" id="history_status" class="admin__control-select">
-                        <?php foreach ($block->getStatuses() as $_code => $_label): ?>
-                            <option value="<?= $block->escapeHtml($_code) ?>"<?php if ($_code == $block->getOrder()->getStatus()): ?> selected="selected"<?php endif; ?>><?= $block->escapeHtml($_label) ?></option>
+                        <?php foreach ($block->getStatuses() as $_code => $_label) : ?>
+                            <option value="<?= $block->escapeHtmlAttr($_code) ?>"<?php if ($_code == $block->getOrder()->getStatus()) : ?> selected="selected"<?php endif; ?>><?= $block->escapeHtml($_label) ?></option>
                         <?php endforeach; ?>
                     </select>
                 </div>
@@ -24,7 +23,7 @@
 
             <div class="admin__field">
                 <label for="history_comment" class="admin__field-label">
-                    <?= /* @noEscape */ __('Comment') ?>
+                    <?= $block->escapeHtml(__('Comment')) ?>
                 </label>
                 <div class="admin__field-control">
                     <textarea name="history[comment]"
@@ -38,14 +37,14 @@
             <div class="admin__field">
                 <div class="order-history-comments-options">
                     <div class="admin__field admin__field-option">
-                        <?php if ($block->canSendCommentEmail()): ?>
+                        <?php if ($block->canSendCommentEmail()) : ?>
                             <input name="history[is_customer_notified]"
                                    type="checkbox"
                                    id="history_notify"
                                    class="admin__control-checkbox"
                                    value="1" />
                             <label class="admin__field-label" for="history_notify">
-                                <?= /* @noEscape */ __('Notify Customer by Email') ?>
+                                <?= $block->escapeHtml(__('Notify Customer by Email')) ?>
                             </label>
                         <?php endif; ?>
                     </div>
@@ -57,7 +56,7 @@
                                class="admin__control-checkbox"
                                value="1" />
                         <label class="admin__field-label" for="history_visible">
-                            <?= /* @noEscape */ __('Visible on Storefront') ?>
+                            <?= $block->escapeHtml(__('Visible on Storefront')) ?>
                         </label>
                     </div>
                 </div>
@@ -70,32 +69,30 @@
     <?php endif;?>
 
     <ul class="note-list">
-    <?php foreach ($block->getOrder()->getStatusHistoryCollection(true) as $_item): ?>
+    <?php foreach ($block->getOrder()->getStatusHistoryCollection(true) as $_item) : ?>
         <li class="note-list-item">
             <span class="note-list-date"><?= /* @noEscape */ $block->formatDate($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
             <span class="note-list-time"><?= /* @noEscape */ $block->formatTime($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
             <span class="note-list-status"><?= $block->escapeHtml($_item->getStatusLabel()) ?></span>
             <span class="note-list-customer">
-                <?= /* @noEscape */ __('Customer') ?>
-                <?php if ($block->isCustomerNotificationNotApplicable($_item)): ?>
-                    <span class="note-list-customer-notapplicable"><?= /* @noEscape */ __('Notification Not Applicable') ?></span>
-                <?php elseif ($_item->getIsCustomerNotified()): ?>
-                    <span class="note-list-customer-notified"><?= /* @noEscape */ __('Notified') ?></span>
-                <?php else: ?>
-                    <span class="note-list-customer-not-notified"><?= /* @noEscape */ __('Not Notified') ?></span>
+                <?= $block->escapeHtml(__('Customer')) ?>
+                <?php if ($block->isCustomerNotificationNotApplicable($_item)) : ?>
+                    <span class="note-list-customer-notapplicable"><?= $block->escapeHtml(__('Notification Not Applicable')) ?></span>
+                <?php elseif ($_item->getIsCustomerNotified()) : ?>
+                    <span class="note-list-customer-notified"><?= $block->escapeHtml(__('Notified')) ?></span>
+                <?php else : ?>
+                    <span class="note-list-customer-not-notified"><?= $block->escapeHtml(__('Not Notified')) ?></span>
                 <?php endif; ?>
             </span>
-            <?php if ($_item->getComment()): ?>
+            <?php if ($_item->getComment()) : ?>
                 <div class="note-list-comment"><?= $block->escapeHtml($_item->getComment(), ['b', 'br', 'strong', 'i', 'u', 'a']) ?></div>
             <?php endif; ?>
         </li>
     <?php endforeach; ?>
     </ul>
     <script>
-require(['prototype'], function(){
-
-        if($('order_status'))$('order_status').update('<?= $block->escapeJs($block->escapeHtml($block->getOrder()->getStatusLabel())) ?>');
-
-});
-</script>
+        require(['prototype'], function(){
+            if($('order_status'))$('order_status').update('<?= $block->escapeJs($block->escapeHtml($block->getOrder()->getStatusLabel())) ?>');
+        });
+    </script>
 </div>
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 5384a00dc894d..508ac7c252de5 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
@@ -7,9 +7,6 @@
 /**
  * @var \Magento\Sales\Block\Adminhtml\Order\View\Info $block
  */
-
-// @codingStandardsIgnoreFile
-
 $order = $block->getOrder();
 
 $orderAdminDate = $block->formatDate(
@@ -38,10 +35,10 @@ $customerUrl = $block->getCustomerViewUrl();
             <?php $confirmationEmailStatusMessage = $order->getEmailSent() ? __('The order confirmation email was sent') : __('The order confirmation email is not sent'); ?>
             <div class="admin__page-section-item-title">
                 <span class="title">
-                    <?php if ($block->getNoUseOrderLink()): ?>
+                    <?php if ($block->getNoUseOrderLink()) : ?>
                         <?= $block->escapeHtml(__('Order # %1', $order->getRealOrderId())) ?> (<span><?= $block->escapeHtml($confirmationEmailStatusMessage) ?></span>)
-                    <?php else: ?>
-                        <a href="<?= $block->escapeHtml($block->getViewUrl($order->getId())) ?>"><?= $block->escapeHtml(__('Order # %1', $order->getRealOrderId())) ?></a>
+                    <?php else : ?>
+                        <a href="<?= $block->escapeUrl($block->getViewUrl($order->getId())) ?>"><?= $block->escapeHtml(__('Order # %1', $order->getRealOrderId())) ?></a>
                         <span>(<?= $block->escapeHtml($confirmationEmailStatusMessage) ?>)</span>
                     <?php endif; ?>
                 </span>
@@ -52,7 +49,7 @@ $customerUrl = $block->getCustomerViewUrl();
                     <th><?= $block->escapeHtml(__('Order Date')) ?></th>
                     <td><?= $block->escapeHtml($orderAdminDate) ?></td>
                 </tr>
-                <?php if ($orderAdminDate != $orderStoreDate):?>
+                <?php if ($orderAdminDate != $orderStoreDate) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Order Date (%1)', $block->getTimezoneForStore($order->getStore()))) ?></th>
                         <td><?= $block->escapeHtml($orderStoreDate) ?></td>
@@ -63,48 +60,48 @@ $customerUrl = $block->getCustomerViewUrl();
                     <td><span id="order_status"><?= $block->escapeHtml($order->getStatusLabel()) ?></span></td>
                 </tr>
                 <?= $block->getChildHtml() ?>
-                <?php if ($block->isSingleStoreMode() == false):?>
+                <?php if ($block->isSingleStoreMode() == false) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Purchased From')) ?></th>
                         <td><?= $block->escapeHtml($block->getOrderStoreName(), ['br']) ?></td>
                     </tr>
                 <?php endif; ?>
-                <?php if ($order->getRelationChildId()): ?>
+                <?php if ($order->getRelationChildId()) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Link to the New Order')) ?></th>
                         <td>
-                            <a href="<?= $block->escapeHtml($block->getViewUrl($order->getRelationChildId())) ?>">
+                            <a href="<?= $block->escapeUrl($block->getViewUrl($order->getRelationChildId())) ?>">
                                 <?= $block->escapeHtml($order->getRelationChildRealId()) ?>
                             </a>
                         </td>
                     </tr>
                 <?php endif; ?>
-                <?php if ($order->getRelationParentId()): ?>
+                <?php if ($order->getRelationParentId()) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Link to the Previous Order')) ?></th>
                         <td>
-                            <a href="<?= $block->escapeHtml($block->getViewUrl($order->getRelationParentId())) ?>">
+                            <a href="<?= $block->escapeUrl($block->getViewUrl($order->getRelationParentId())) ?>">
                                 <?= $block->escapeHtml($order->getRelationParentRealId()) ?>
                             </a>
                         </td>
                     </tr>
                 <?php endif; ?>
-                <?php if ($order->getRemoteIp() && $block->shouldDisplayCustomerIp()): ?>
+                <?php if ($order->getRemoteIp() && $block->shouldDisplayCustomerIp()) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Placed from IP')) ?></th>
-                        <td><?= $block->escapeHtml($order->getRemoteIp()); echo $order->getXForwardedFor() ? ' (' . $block->escapeHtml($order->getXForwardedFor()) . ')' : ''; ?></td>
+                        <td><?= $block->escapeHtml($order->getRemoteIp()); ?><?= $order->getXForwardedFor() ? ' (' . $block->escapeHtml($order->getXForwardedFor()) . ')' : ''; ?></td>
                     </tr>
                 <?php endif; ?>
-                <?php if ($order->getGlobalCurrencyCode() != $order->getBaseCurrencyCode()): ?>
+                <?php if ($order->getGlobalCurrencyCode() != $order->getBaseCurrencyCode()) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('%1 / %2 rate:', $order->getGlobalCurrencyCode(), $order->getBaseCurrencyCode())) ?></th>
                         <td><?= $block->escapeHtml($order->getBaseToGlobalRate()) ?></td>
                     </tr>
                 <?php endif; ?>
-                <?php if ($order->getBaseCurrencyCode() != $order->getOrderCurrencyCode()): ?>
+                <?php if ($order->getBaseCurrencyCode() != $order->getOrderCurrencyCode()) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('%1 / %2 rate:', $order->getOrderCurrencyCode(), $order->getBaseCurrencyCode())) ?></th>
-                        <th><?= $block->escapeHtml($order->getBaseToOrderRate()) ?></th>
+                        <td><?= $block->escapeHtml($order->getBaseToOrderRate()) ?></td>
                     </tr>
                 <?php endif; ?>
             </table>
@@ -128,18 +125,18 @@ $customerUrl = $block->getCustomerViewUrl();
                     <tr>
                         <th><?= $block->escapeHtml(__('Customer Name')) ?></th>
                         <td>
-                            <?php if ($customerUrl): ?>
+                            <?php if ($customerUrl) : ?>
                                 <a href="<?= $block->escapeUrl($customerUrl) ?>" target="_blank">
                                     <span><?= $block->escapeHtml($order->getCustomerName()) ?></span>
                                 </a>
-                            <?php else: ?>
+                            <?php else : ?>
                                 <?= $block->escapeHtml($order->getCustomerName()) ?>
                             <?php endif; ?>
                         </td>
                     </tr>
                     <tr>
                         <th><?= $block->escapeHtml(__('Email')) ?></th>
-                        <td><a href="mailto:<?php echo $block->escapeHtml($order->getCustomerEmail()) ?>"><?php echo $block->escapeHtml($order->getCustomerEmail()) ?></a></td>
+                        <td><a href="mailto:<?= $block->escapeHtmlAttr($order->getCustomerEmail()) ?>"><?= $block->escapeHtml($order->getCustomerEmail()) ?></a></td>
                     </tr>
                     <?php if ($groupName = $block->getCustomerGroupName()) : ?>
                         <tr>
@@ -147,7 +144,7 @@ $customerUrl = $block->getCustomerViewUrl();
                             <td><?= $block->escapeHtml($groupName) ?></td>
                         </tr>
                     <?php endif; ?>
-                    <?php foreach ($block->getCustomerAccountData() as $data):?>
+                    <?php foreach ($block->getCustomerAccountData() as $data) : ?>
                         <tr>
                             <th><?= $block->escapeHtml($data['label']) ?></th>
                             <td><?= $block->escapeHtml($data['value'], ['br']) ?></td>
@@ -173,7 +170,7 @@ $customerUrl = $block->getCustomerViewUrl();
             </div>
             <address class="admin__page-section-item-content"><?= /* @noEscape */ $block->getFormattedAddress($order->getBillingAddress()); ?></address>
         </div>
-        <?php if (!$block->getOrder()->getIsVirtual()): ?>
+        <?php if (!$block->getOrder()->getIsVirtual()) : ?>
             <div class="admin__page-section-item order-shipping-address">
                 <?php /* Shipping Address */ ?>
                 <div class="admin__page-section-item-title">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml
index dc62bce78ea1e..734ad24b02fcf 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml
@@ -4,9 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-?>
-<?php
 /**
  * @var \Magento\Sales\Block\Adminhtml\Order\View\Items $block
  */
@@ -18,19 +15,19 @@ $_order = $block->getOrder() ?>
                 <?php $i = 0;
                 $columns = $block->getColumns();
                 $lastItemNumber = count($columns) ?>
-                <?php foreach ($columns as $columnName => $columnTitle):?>
+                <?php foreach ($columns as $columnName => $columnTitle) : ?>
                     <?php $i++; ?>
-                    <th class="col-<?= /* @noEscape */ $columnName ?><?= /* @noEscape */ ($i === $lastItemNumber ? ' last' : '') ?>"><span><?= /* @noEscape */ $columnTitle ?></span></th>
+                    <th class="col-<?= $block->escapeHtmlAttr($columnName) ?><?= /* @noEscape */ ($i === $lastItemNumber ? ' last' : '') ?>"><span><?= $block->escapeHtml($columnTitle) ?></span></th>
                 <?php endforeach; ?>
             </tr>
         </thead>
         <?php $_items = $block->getItemsCollection();?>
-        <?php $i = 0; foreach ($_items as $_item):?>
-            <?php if ($_item->getParentItem()) {
+        <?php $i = 0; foreach ($_items as $_item) : ?>
+            <?php if ($_item->getParentItem()) :
                 continue;
-            } else {
+            else :
                 $i++;
-            }?>
+            endif; ?>
             <tbody class="<?= /* @noEscape */ $i%2 ? 'even' : 'odd' ?>">
                 <?= $block->getItemHtml($_item) ?>
                 <?= $block->getItemExtraInfoHtml($_item) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml
index 387aab3d9616f..c54e23d141e0d 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var \Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\DefaultRenderer $block */ ?>
 <?php $_item = $block->getItem() ?>
@@ -14,8 +11,10 @@
     <?php $i = 0;
     $columns = $block->getColumns();
     $lastItemNumber = count($columns) ?>
-    <?php foreach ($columns as $columnName => $columnClass):?>
+    <?php foreach ($columns as $columnName => $columnClass) : ?>
         <?php $i++; ?>
-        <td class="<?= /* @noEscape */ $columnClass ?><?= /* @noEscape */ ($i === $lastItemNumber ? ' last' : '') ?>"><?= /* @escapeNotVerified */ $block->getColumnHtml($_item, $columnName) ?></td>
+        <td class="<?= /* @noEscape */ $columnClass ?><?= /* @noEscape */ ($i === $lastItemNumber ? ' last' : '') ?>">
+            <?= $block->getColumnHtml($_item, $columnName) ?>
+        </td>
     <?php endforeach; ?>
 </tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml
index 87feaa857ef0e..0a93d25a7a021 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml
@@ -4,25 +4,24 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var \Magento\Sales\Block\Adminhtml\Order\View\Tab\History $block */
 ?>
 <section class="admin__page-section edit-order-comments">
     <ul class="note-list">
-    <?php foreach ($block->getFullHistory() as $_item): ?>
+    <?php foreach ($block->getFullHistory() as $_item) : ?>
         <li class="note-list-item">
-            <span class="note-list-date"><?= /* @escapeNotVerified */ $block->getItemCreatedAt($_item) ?></span>
-            <span class="note-list-time"><?= /* @escapeNotVerified */ $block->getItemCreatedAt($_item, 'time') ?></span>
-            <span class="note-list-status"><?= /* @escapeNotVerified */ $block->getItemTitle($_item) ?></span>
-            <?php if ($block->isItemNotified($_item, false)): ?>
+            <span class="note-list-date"><?= /* @noEscape */ $block->getItemCreatedAt($_item) ?></span>
+            <span class="note-list-time"><?= /* @noEscape */ $block->getItemCreatedAt($_item, 'time') ?></span>
+            <span class="note-list-status"><?= /* @noEscape */ $block->getItemTitle($_item) ?></span>
+            <?php if ($block->isItemNotified($_item, false)) : ?>
                 <span class="note-list-customer">
-                    <?= /* @escapeNotVerified */ __('Customer') ?>
-                    <?php if ($block->isCustomerNotificationNotApplicable($_item)): ?>
-                        <span class="note-list-customer-notapplicable"><?= /* @escapeNotVerified */ __('Notification Not Applicable') ?></span>
-                    <?php elseif ($block->isItemNotified($_item)): ?>
-                        <span class="note-list-customer-notified"><?= /* @escapeNotVerified */ __('Notified') ?></span>
-                    <?php else: ?>
-                        <span class="note-list-customer-not-notified"><?= /* @escapeNotVerified */ __('Not Notified') ?></span>
+                    <?= $block->escapeHtml(__('Customer')) ?>
+                    <?php if ($block->isCustomerNotificationNotApplicable($_item)) : ?>
+                        <span class="note-list-customer-notapplicable"><?= $block->escapeHtml(__('Notification Not Applicable')) ?></span>
+                    <?php elseif ($block->isItemNotified($_item)) : ?>
+                        <span class="note-list-customer-notified"><?= $block->escapeHtml(__('Notified')) ?></span>
+                    <?php else : ?>
+                        <span class="note-list-customer-not-notified"><?= $block->escapeHtml(__('Not Notified')) ?></span>
                     <?php endif; ?>
                 </span>
             <?php endif; ?>
@@ -31,18 +30,18 @@
     </ul>
     <div class="edit-order-comments-block">
         <div class="edit-order-comments-block-title">
-            <?= /* @escapeNotVerified */ __('Notes for this Order') ?>
+            <?= $block->escapeHtml(__('Notes for this Order')) ?>
         </div>
-        <?php foreach ($block->getFullHistory() as $_item): ?>
-            <?php if ($_comment = $block->getItemComment($_item)): ?>
+        <?php foreach ($block->getFullHistory() as $_item) : ?>
+            <?php if ($_comment = $block->getItemComment($_item)) : ?>
                 <div class="comments-block-item">
                     <div class="comments-block-item-comment">
-                        <?= /* @escapeNotVerified */ $_comment ?>
+                        <?= /* @noEscape */ $_comment ?>
                     </div>
                     <span class="comments-block-item-date-time">
-                        <?= /* @escapeNotVerified */ __('Comment added') ?>
-                        <?= /* @escapeNotVerified */ $block->getItemCreatedAt($_item) ?>
-                        <?= /* @escapeNotVerified */ $block->getItemCreatedAt($_item, 'time') ?>
+                        <?= $block->escapeHtml(__('Comment added')) ?>
+                        <?= /* @noEscape */ $block->getItemCreatedAt($_item) ?>
+                        <?= /* @noEscape */ $block->getItemCreatedAt($_item, 'time') ?>
                     </span>
                 </div>
             <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
index 434ca127832a1..390adb7d5cfce 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
@@ -4,10 +4,8 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var $block \Magento\Sales\Block\Adminhtml\Order\View\Tab\Info */
 ?>
-<?php /** @var $block \Magento\Sales\Block\Adminhtml\Order\View\Tab\Info */ ?>
 <?php $_order = $block->getOrder() ?>
 
 <div id="order-messages">
@@ -15,21 +13,21 @@
 </div>
 
 <?= $block->getChildHtml('order_info') ?>
-<input type="hidden" name="order_id" value="<?= /* @escapeNotVerified */ $_order->getId() ?>"/>
+<input type="hidden" name="order_id" value="<?= (int) $_order->getId() ?>"/>
 
 <section class="admin__page-section order-view-billing-shipping">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Payment &amp; Shipping Method')) ?></span>
     </div>
     <div class="admin__page-section-content">
-        <div class="admin__page-section-item order-payment-method<?php if ($_order->getIsVirtual()): ?> order-payment-method-virtual<?php endif; ?>">
+        <div class="admin__page-section-item order-payment-method<?= ($_order->getIsVirtual() ? ' order-payment-method-virtual' : '') ?>">
             <?php /* Payment Method */ ?>
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Payment Information')) ?></span>
             </div>
             <div class="admin__page-section-item-content">
                 <div class="order-payment-method-title"><?= $block->getPaymentHtml() ?></div>
-                <div class="order-payment-currency"><?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
+                <div class="order-payment-currency"><?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?></div>
                 <div class="order-payment-additional">
                     <?= $block->getChildHtml('order_payment_additional') ?>
                     <?= $block->getChildHtml('payment_additional_info') ?>
@@ -46,26 +44,26 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Items Ordered') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Items Ordered')) ?></span>
     </div>
     <?= $block->getItemsHtml() ?>
 </section>
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Order Total') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Order Total')) ?></span>
     </div>
     <div class="admin__page-section-content">
         <div class="admin__page-section-item order-comments-history">
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Notes for this Order') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Notes for this Order')) ?></span>
             </div>
             <?= $block->getChildHtml('order_history') ?>
         </div>
 
         <div class="admin__page-section-item order-totals">
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Order Totals') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Order Totals')) ?></span>
             </div>
             <?= $block->getChildHtml('order_totals') ?>
         </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/page/js/components.phtml b/app/code/Magento/Sales/view/adminhtml/templates/page/js/components.phtml
index 1194e72e27c62..13f44b97fc789 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/page/js/components.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/page/js/components.phtml
@@ -1,12 +1,9 @@
 <?php
 /**
- * @category    design
- * @package     default_default
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml b/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml
index 872f70d1d693a..231eb274290cf 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml
@@ -4,10 +4,8 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Sales\Block\Adminhtml\Rss\Order\Grid\Link */
 ?>
-<?php if ($block->isRssAllowed() && $block->getLink()): ?>
-<a href="<?= /* @escapeNotVerified */ $block->getLink() ?>" class="link-feed"><?= /* @escapeNotVerified */ $block->getLabel() ?></a>
+<?php if ($block->isRssAllowed() && $block->getLink()) : ?>
+<a href="<?= $block->escapeUrl($block->getLink()) ?>" class="link-feed"><?= $block->escapeHtml($block->getLabel()) ?></a>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml b/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
index c46ff775f6f9a..01b7548be15cd 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
@@ -4,35 +4,34 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/* @var \Magento\Sales\Block\Adminhtml\Transactions\Detail $block */
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?= $block->getButtonsHtml() ?></div>
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Transaction Data') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Transaction Data')) ?></span>
     </div>
     <div id="log_details_fieldset" class="admin__page-section-content log-details">
         <table class="log-info data-table admin__table-secondary">
             <tbody>
             <tr>
-                <th><?= /* @escapeNotVerified */ __('Transaction ID') ?></th>
+                <th><?= $block->escapeHtml(__('Transaction ID')) ?></th>
                 <td><?= $block->getTxnIdHtml() ?></td>
             </tr>
             <tr>
-                <th><?= /* @escapeNotVerified */ __('Parent Transaction ID') ?></th>
+                <th><?= $block->escapeHtml(__('Parent Transaction ID')) ?></th>
                 <td>
-                    <?php if ($block->getParentTxnIdHtml()): ?>
+                    <?php if ($block->getParentTxnIdHtml()) : ?>
                     <a href="<?= $block->getParentTxnIdUrlHtml() ?>">
                         <?= $block->getParentTxnIdHtml() ?>
                     </a>
                     <?php else : ?>
-                    <?= /* @escapeNotVerified */ __('N/A') ?>
+                    <?= $block->escapeHtml(__('N/A')) ?>
                     <?php endif; ?>
                 </td>
             </tr>
             <tr>
-                <th><?= /* @escapeNotVerified */ __('Order ID') ?></th>
+                <th><?= $block->escapeHtml(__('Order ID')) ?></th>
                 <td>
                     <a href="<?= $block->getOrderIdUrlHtml() ?>">
                         <?= $block->getOrderIncrementIdHtml() ?>
@@ -40,15 +39,15 @@
                 </td>
             </tr>
             <tr>
-                <th><?= /* @escapeNotVerified */ __('Transaction Type') ?></th>
+                <th><?= $block->escapeHtml(__('Transaction Type')) ?></th>
                 <td><?= $block->getTxnTypeHtml() ?></td>
             </tr>
             <tr>
-                <th><?= /* @escapeNotVerified */ __('Is Closed') ?></th>
+                <th><?= $block->escapeHtml(__('Is Closed')) ?></th>
                 <td><?= $block->getIsClosedHtml() ?></td>
             </tr>
             <tr>
-                <th><?= /* @escapeNotVerified */ __('Created At') ?></th>
+                <th><?= $block->escapeHtml(__('Created At')) ?></th>
                 <td><?= $block->getCreatedAtHtml() ?></td>
             </tr>
             </tbody>
@@ -58,7 +57,7 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Child Transactions') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Child Transactions')) ?></span>
     </div>
     <div class="admin__page-section-content log-details-grid">
         <?= $block->getChildHtml('child_grid') ?>
@@ -67,7 +66,7 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Transaction Details') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Transaction Details')) ?></span>
     </div>
     <div class="admin__page-section-content log-details-grid">
         <?= $block->getChildHtml('detail_grid') ?>
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 05449c478152f..efc946077c1aa 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
@@ -14,7 +14,7 @@ define([
     'prototype',
     'Magento_Catalog/catalog/product/composite/configure',
     'Magento_Ui/js/lib/view/utils/async'
-], function(jQuery, confirm, alert, template, shippingTemplate, paymentTemplate){
+], function (jQuery, confirm, alert, template, shippingTemplate, paymentTemplate) {
 
     window.AdminOrder = new Class.create();
 
@@ -42,7 +42,7 @@ define([
             this.isOnlyVirtualProduct = false;
             this.excludedPaymentMethods = [];
             this.summarizePrice = true;
-            this.timerId = null;
+            this.selectAddressEvent = false;
             this.shippingTemplate = template(shippingTemplate, {
                 data: {
                     title: jQuery.mage.__('Shipping Method'),
@@ -170,17 +170,19 @@ define([
         },
 
         selectAddress : function(el, container){
+
             id = el.value;
             if (id.length == 0) {
                 id = '0';
             }
-            if(this.addresses[id]){
-                this.fillAddressFields(container, this.addresses[id]);
 
-            }
-            else{
+            this.selectAddressEvent = true;
+            if (this.addresses[id]) {
+                this.fillAddressFields(container, this.addresses[id]);
+            } else {
                 this.fillAddressFields(container, {});
             }
+            this.selectAddressEvent = false;
 
             var data = this.serializeData(container);
             data[el.name] = id;
@@ -191,37 +193,45 @@ define([
             } else{
                 this.saveData(data);
             }
+
         },
 
-        isShippingField : function(fieldId){
-            if(this.shippingAsBilling){
+        /**
+         * Checks if the field belongs to the shipping address.
+         *
+         * @param {String} fieldId
+         * @return {Boolean}
+         */
+        isShippingField: function (fieldId) {
+            if (this.shippingAsBilling) {
                 return fieldId.include('billing');
             }
+
             return fieldId.include('shipping');
         },
 
-        isBillingField : function(fieldId){
+        /**
+         * Checks if the field belongs to the billing address.
+         *
+         * @param {String} fieldId
+         * @return {Boolean}
+         */
+        isBillingField: function (fieldId) {
             return fieldId.include('billing');
         },
 
-        bindAddressFields : function(container) {
-            var fields = $(container).select('input', 'select', 'textarea');
-            for(var i=0;i<fields.length;i++){
-                Event.observe(fields[i], 'change', this.triggerChangeEvent.bind(this));
-            }
-        },
-
         /**
-         * Calls changing address field handler after timeout to prevent multiple simultaneous calls.
+         * Binds events on container form fields.
          *
-         * @param {Event} event
+         * @param {String} container
          */
-        triggerChangeEvent: function (event) {
-            if (this.timerId) {
-                window.clearTimeout(this.timerId);
-            }
+        bindAddressFields: function (container) {
+            var fields = $(container).select('input', 'select', 'textarea'),
+                i;
 
-            this.timerId = window.setTimeout(this.changeAddressField.bind(this), 500, event);
+            for (i = 0; i < fields.length; i++) {
+                jQuery(fields[i]).change(this.changeAddressField.bind(this));
+            }
         },
 
         /**
@@ -235,7 +245,8 @@ define([
                 matchRes = field.name.match(re),
                 type,
                 name,
-                data;
+                data,
+                resetShipping = false;
 
             if (!matchRes) {
                 return;
@@ -251,21 +262,35 @@ define([
             }
             data = data.toObject();
 
-            if (type === 'billing' && this.shippingAsBilling || type === 'shipping' && !this.shippingAsBilling) {
+            if (type === 'billing' && this.shippingAsBilling) {
+                this.syncAddressField(this.shippingAddressContainer, field.name, field.value);
+                resetShipping = true;
+            }
+
+            if (type === 'shipping' && !this.shippingAsBilling) {
+                resetShipping = true;
+            }
+
+            if (resetShipping) {
                 data['reset_shipping'] = true;
             }
 
             data['order[' + type + '_address][customer_address_id]'] = null;
-            data['shipping_as_billing'] = +this.isShippingAsBilling();
+            data['shipping_as_billing'] = +this.shippingAsBilling;
 
             if (name === 'customer_address_id') {
                 data['order[' + type + '_address][customer_address_id]'] =
                     $('order-' + type + '_address_customer_address_id').value;
             }
 
+            if (name === 'country_id' && this.selectAddressEvent === false) {
+                $('order-' + type + '_address_customer_address_id').value = '';
+            }
+
             this.resetPaymentMethod();
+
             if (data['reset_shipping']) {
-                this.resetShippingMethod(data);
+                this.resetShippingMethod();
             } else {
                 this.saveData(data);
 
@@ -275,7 +300,28 @@ define([
             }
         },
 
-        fillAddressFields : function(container, data){
+        /**
+         * Set address container form field value.
+         *
+         * @param {String} container - container ID
+         * @param {String} fieldName - form field name
+         * @param {*} fieldValue - form field value
+         */
+        syncAddressField: function (container, fieldName, fieldValue) {
+            var syncName;
+
+            if (this.isBillingField(fieldName)) {
+                syncName = fieldName.replace('billing', 'shipping');
+            }
+
+            $(container).select('[name="' + syncName + '"]').each(function (element) {
+                if (~['input', 'textarea', 'select'].indexOf(element.tagName.toLowerCase())) {
+                    element.value = fieldValue;
+                }
+            });
+        },
+
+        fillAddressFields: function(container, data){
             var regionIdElem = false;
             var regionIdElemValue = false;
 
@@ -316,10 +362,15 @@ define([
                     fields[i].setValue(data[name] ? data[name] : '');
                 }
 
-                if (fields[i].changeUpdater) fields[i].changeUpdater();
+                if (fields[i].changeUpdater) {
+                    fields[i].changeUpdater();
+                }
+
                 if (name == 'region' && data['region_id'] && !data['region']){
                     fields[i].value = data['region_id'];
                 }
+
+                jQuery(fields[i]).trigger('change');
             }
         },
 
@@ -350,16 +401,17 @@ define([
             }
         },
 
-        setShippingAsBilling : function(flag){
-            var data;
-            var areasToLoad = ['billing_method', 'shipping_address', 'totals', 'giftmessage'];
+        /**
+         * Equals shipping and billing addresses.
+         *
+         * @param {Boolean} flag
+         */
+        setShippingAsBilling: function (flag) {
+            var data,
+                areasToLoad = ['billing_method', 'shipping_address', 'shipping_method', 'totals', 'giftmessage'];
+
             this.disableShippingAddress(flag);
-            if(flag){
-                data = this.serializeData(this.billingAddressContainer);
-            } else {
-                data = this.serializeData(this.shippingAddressContainer);
-            }
-            areasToLoad.push('shipping_method');
+            data = this.serializeData(flag ? this.billingAddressContainer : this.shippingAddressContainer);
             data = data.toObject();
             data['shipping_as_billing'] = flag ? 1 : 0;
             data['reset_shipping'] = 1;
@@ -367,21 +419,18 @@ define([
         },
 
         /**
-         * Checks if shipping address is corresponds to billing address.
-         *
-         * @return {Boolean}
+         * Replace shipping method area.
          */
-        isShippingAsBilling: function () {
-            return jQuery('[name="shipping_same_as_billing"]').is(':checked');
-        },
-
-        resetShippingMethod: function() {
+        resetShippingMethod: function () {
             if (!this.isOnlyVirtualProduct) {
                 $(this.getAreaId('shipping_method')).update(this.shippingTemplate);
             }
         },
 
-        resetPaymentMethod: function() {
+        /**
+         * Replace payment method area.
+         */
+        resetPaymentMethod: function () {
             $(this.getAreaId('billing_method')).update(this.paymentTemplate);
         },
 
@@ -391,7 +440,7 @@ define([
          * @return {Boolean}
          */
         loadShippingRates: function () {
-            var addressContainer = this.isShippingAsBilling() ?
+            var addressContainer = this.shippingAsBilling ?
                     'billingAddressContainer' :
                     'shippingAddressContainer',
                 data = this.serializeData(this[addressContainer]).toObject();
@@ -520,6 +569,9 @@ define([
         applyCoupon : function(code){
             this.loadArea(['items', 'shipping_method', 'totals', 'billing_method'], true, {'order[coupon][code]':code, reset_shipping: 0});
             this.orderItemChanged = false;
+            jQuery('html, body').animate({
+                scrollTop: 0
+            });
         },
 
         addProduct : function(id){
@@ -1505,6 +1557,4 @@ define([
             return this._label;
         }
     };
-
 });
-
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 8af49f322c682..84f5acb29ea3b 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_new.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_new.html
@@ -53,7 +53,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
                 </tr>
             </table>
             {{/depend}}
-            {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
             <table class="order-details">
                 <tr>
                     <td class="address-details">
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 df1677f56a500..bb181126724da 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
@@ -51,7 +51,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
                 </tr>
             </table>
             {{/depend}}
-            {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
             <table class="order-details">
                 <tr>
                     <td class="address-details">
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml
new file mode 100644
index 0000000000000..91414663951d3
--- /dev/null
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="sales_email_order_shipment_renderers"/>
+    <body>
+        <block class="Magento\Framework\View\Element\Template" name="sales.order.email.shipment.track" template="Magento_Sales::email/shipment/track.phtml"/>
+    </body>
+</page>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml
index 8cef5d57664a9..90c3ddeee5a30 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml
@@ -4,28 +4,26 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
 <?php $_creditmemo = $block->getCreditmemo() ?>
 <?php $_order      = $block->getOrder() ?>
-<?php if ($_creditmemo && $_order): ?>
+<?php if ($_creditmemo && $_order) : ?>
     <table class="email-items">
         <thead>
             <tr>
                 <th class="item-info">
-                    <?= /* @escapeNotVerified */  __('Items') ?>
+                    <?= $block->escapeHtml(__('Items')) ?>
                 </th>
                 <th class="item-qty">
-                    <?= /* @escapeNotVerified */  __('Qty') ?>
+                    <?= $block->escapeHtml(__('Qty')) ?>
                 </th>
                 <th class="item-subtotal">
-                    <?= /* @escapeNotVerified */  __('Subtotal') ?>
+                    <?= $block->escapeHtml(__('Subtotal')) ?>
                 </th>
             </tr>
         </thead>
-        <?php foreach ($_creditmemo->getAllItems() as $_item): ?>
-            <?php if (!$_item->getOrderItem()->getParentItem())  : ?>
+        <?php foreach ($_creditmemo->getAllItems() as $_item) : ?>
+            <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
                 <tbody>
                     <?= $block->getItemHtml($_item) ?>
                 </tbody>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml
index 4c377dea47da2..e2efd650295d4 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml
@@ -4,27 +4,25 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
 <?php $_invoice = $block->getInvoice() ?>
 <?php $_order   = $block->getOrder() ?>
-<?php if ($_invoice && $_order): ?>
+<?php if ($_invoice && $_order) : ?>
     <table class="email-items">
         <thead>
             <tr>
                 <th class="item-info">
-                    <?= /* @escapeNotVerified */  __('Items') ?>
+                    <?= $block->escapeHtml(__('Items')) ?>
                 </th>
                 <th class="item-qty">
-                    <?= /* @escapeNotVerified */  __('Qty') ?>
+                    <?= $block->escapeHtml(__('Qty')) ?>
                 </th>
                 <th class="item-subtotal">
-                    <?= /* @escapeNotVerified */  __('Subtotal') ?>
+                    <?= $block->escapeHtml(__('Subtotal')) ?>
                 </th>
             </tr>
         </thead>
-        <?php foreach ($_invoice->getAllItems() as $_item): ?>
+        <?php foreach ($_invoice->getAllItems() as $_item) : ?>
             <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
                 <tbody>
                     <?= $block->getItemHtml($_item) ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
index 37469582865dc..1bba8166762c7 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
@@ -4,27 +4,28 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
+/** @var $block \Magento\Sales\Block\Order\Email\Items */
 ?>
 <?php $_order = $block->getOrder() ?>
-<?php if ($_order): ?>
+<?php if ($_order) : ?>
     <?php $_items = $_order->getAllItems(); ?>
     <table class="email-items">
         <thead>
             <tr>
                 <th class="item-info">
-                    <?= /* @escapeNotVerified */  __('Items') ?>
+                    <?= $block->escapeHtml(__('Items')) ?>
                 </th>
                 <th class="item-qty">
-                    <?= /* @escapeNotVerified */  __('Qty') ?>
+                    <?= $block->escapeHtml(__('Qty')) ?>
                 </th>
                 <th class="item-price">
-                    <?= /* @escapeNotVerified */  __('Price') ?>
+                    <?= $block->escapeHtml(__('Price')) ?>
                 </th>
             </tr>
         </thead>
-        <?php foreach ($_items as $_item): ?>
+        <?php foreach ($_items as $_item) : ?>
             <?php if (!$_item->getParentItem()) : ?>
                 <tbody>
                     <?= $block->getItemHtml($_item) ?>
@@ -35,17 +36,21 @@
             <?= $block->getChildHtml('order_totals') ?>
         </tfoot>
     </table>
-    <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order', $_order, $_order->getStore()) && $_order->getGiftMessageId()): ?>
-        <?php $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_order->getGiftMessageId()); ?>
-        <?php if ($_giftMessage): ?>
+    <?php if ($this->helper(\Magento\GiftMessage\Helper\Message::class)
+            ->isMessagesAllowed('order', $_order, $_order->getStore())
+        && $_order->getGiftMessageId()
+    ) : ?>
+        <?php $_giftMessage = $this->helper(\Magento\GiftMessage\Helper\Message::class)
+            ->getGiftMessage($_order->getGiftMessageId()); ?>
+        <?php if ($_giftMessage) : ?>
             <br />
             <table class="message-gift">
                 <tr>
                     <td>
-                        <h3><?= /* @escapeNotVerified */  __('Gift Message for this Order') ?></h3>
-                        <strong><?= /* @escapeNotVerified */  __('From:') ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-                        <br /><strong><?= /* @escapeNotVerified */  __('To:') ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-                        <br /><strong><?= /* @escapeNotVerified */  __('Message:') ?></strong>
+                        <h3><?= $block->escapeHtml(__('Gift Message for this Order')) ?></h3>
+                        <strong><?= $block->escapeHtml(__('From:')) ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
+                        <br /><strong><?= $block->escapeHtml(__('To:')) ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
+                        <br /><strong><?= $block->escapeHtml(__('Message:')) ?></strong>
                         <br /><?= $block->escapeHtml($_giftMessage->getMessage()) ?>
                     </td>
                 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
index 1fca65932b0b0..1066a8dc9b1be 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
@@ -4,21 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrder(); ?>
 <tr>
-    <td class="item-info<?php if ($block->getItemOptions()): ?> has-extra<?php endif; ?>">
+    <td class="item-info<?= ($block->getItemOptions() ? ' has-extra' : '') ?>">
         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-        <?php if ($block->getItemOptions()): ?>
+        <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+        <?php if ($block->getItemOptions()) : ?>
             <dl>
-                <?php foreach ($block->getItemOptions() as $option): ?>
-                    <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
+                <?php foreach ($block->getItemOptions() as $option) : ?>
+                    <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
                     <dd>
-                        <?= /* @escapeNotVerified */  nl2br($option['value']) ?>
+                        <?= /* @noEscape */  nl2br($block->escapeHtml($option['value'])) ?>
                     </dd>
                 <?php endforeach; ?>
             </dl>
@@ -29,8 +27,8 @@
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
+    <td class="item-qty"><?= (int) $_item->getQty() ?></td>
     <td class="item-price">
-        <?= /* @escapeNotVerified */  $block->getItemPrice($_item->getOrderItem()) ?>
+        <?= /* @noEscape */  $block->getItemPrice($_item) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml
index 1fca65932b0b0..e0a25ce52068d 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml
@@ -3,34 +3,31 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrder(); ?>
 <tr>
-    <td class="item-info<?php if ($block->getItemOptions()): ?> has-extra<?php endif; ?>">
+    <td class="item-info<?= ($block->getItemOptions() ? ' has-extra' : '') ?>">
         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-        <?php if ($block->getItemOptions()): ?>
+        <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+        <?php if ($block->getItemOptions()) : ?>
             <dl>
-                <?php foreach ($block->getItemOptions() as $option): ?>
-                    <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
+                <?php foreach ($block->getItemOptions() as $option) : ?>
+                    <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
                     <dd>
-                        <?= /* @escapeNotVerified */  nl2br($option['value']) ?>
+                        <?= /* @noEscape */  nl2br($block->escapeHtml($option['value'])) ?>
                     </dd>
                 <?php endforeach; ?>
             </dl>
         <?php endif; ?>
         <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addInfoBlock) :?>
+        <?php if ($addInfoBlock) : ?>
             <?= $addInfoBlock->setItem($_item->getOrderItem())->toHtml() ?>
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
+    <td class="item-qty"><?= (int) $_item->getQty() ?></td>
     <td class="item-price">
-        <?= /* @escapeNotVerified */  $block->getItemPrice($_item->getOrderItem()) ?>
+        <?= /* @noEscape */ $block->getItemPrice($_item->getOrderItem()) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml
index 2974e4cd7ad80..a39442136e2f0 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
 /** @var $block \Magento\Sales\Block\Order\Email\Items\DefaultItems */
 
@@ -13,15 +13,15 @@ $_item = $block->getItem();
 $_order = $_item->getOrder();
 ?>
 <tr>
-    <td class="item-info<?php if ($block->getItemOptions()): ?> has-extra<?php endif; ?>">
+    <td class="item-info<?= ($block->getItemOptions() ? ' has-extra' : '') ?>">
         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-        <?php if ($block->getItemOptions()): ?>
+        <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+        <?php if ($block->getItemOptions()) : ?>
             <dl class="item-options">
-            <?php foreach ($block->getItemOptions() as $option): ?>
-                <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
+            <?php foreach ($block->getItemOptions() as $option) : ?>
+                <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
                 <dd>
-                    <?= /* @escapeNotVerified */  nl2br($option['value']) ?>
+                    <?= /* @noEscape */  nl2br($block->escapeHtml($option['value'])) ?>
                 </dd>
             <?php endforeach; ?>
             </dl>
@@ -32,21 +32,24 @@ $_order = $_item->getOrder();
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQtyOrdered() * 1 ?></td>
+    <td class="item-qty"><?= (int) $_item->getQtyOrdered() ?></td>
     <td class="item-price">
-        <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
+        <?= /* @noEscape */ $block->getItemPrice($_item) ?>
     </td>
 </tr>
-<?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_item->getGiftMessageId())): ?>
-<tr>
+<?php if ($_item->getGiftMessageId()
+    && $_giftMessage = $this->helper(\Magento\GiftMessage\Helper\Message::class)
+        ->getGiftMessage($_item->getGiftMessageId())
+) : ?>
+    <tr>
     <td colspan="3" class="item-extra">
         <table class="message-gift">
             <tr>
                 <td>
-                    <h3><?= /* @escapeNotVerified */  __('Gift Message') ?></h3>
-                    <strong><?= /* @escapeNotVerified */  __('From:') ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-                    <br /><strong><?= /* @escapeNotVerified */  __('To:') ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-                    <br /><strong><?= /* @escapeNotVerified */  __('Message:') ?></strong>
+                    <h3><?= $block->escapeHtml(__('Gift Message')) ?></h3>
+                    <strong><?= $block->escapeHtml(__('From:')) ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
+                    <br /><strong><?= $block->escapeHtml(__('To:')) ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
+                    <br /><strong><?= $block->escapeHtml(__('Message:')) ?></strong>
                     <br /><?= $block->escapeHtml($_giftMessage->getMessage()) ?>
                 </td>
             </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/price/row.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/price/row.phtml
index 106aeb16c2897..bafae71ba75b4 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/price/row.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/price/row.phtml
@@ -4,8 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?php
 /** @var \Magento\Sales\Block\Order\Email\Items\DefaultItems $block */
@@ -16,4 +15,4 @@ $_item = $block->getItem();
 $_order = $_item->getOrder();
 ?>
 
-<?= /* @escapeNotVerified */  $_order->formatPrice($_item->getRowTotal()) ?>
+<?= /* @noEscape */ $_order->formatPrice($_item->getRowTotal()) ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml
index f41a09f5da0f3..3cab6ae1ed993 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml
@@ -4,29 +4,27 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $_item \Magento\Sales\Model\Order\Item */
 $_item = $block->getItem() ?>
 <tr>
-    <td class="item-info<?php if ($block->getItemOptions()): ?> has-extra<?php endif; ?>">
+    <td class="item-info<?= ($block->getItemOptions() ? ' has-extra' : '') ?>">
         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
-        <?php if ($block->getItemOptions()): ?>
+        <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+        <?php if ($block->getItemOptions()) : ?>
             <dl class="item-options">
-                <?php foreach ($block->getItemOptions() as $option): ?>
-                    <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
+                <?php foreach ($block->getItemOptions() as $option) : ?>
+                    <dt><strong><em><?= $block->escapeHtml($option['label']) ?></em></strong></dt>
                     <dd>
-                        <?= /* @escapeNotVerified */  nl2br($option['value']) ?>
+                        <?= /* @noEscape */  nl2br($option['value']) ?>
                     </dd>
                 <?php endforeach; ?>
             </dl>
         <?php endif; ?>
         <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addInfoBlock) :?>
+        <?php if ($addInfoBlock) : ?>
             <?= $addInfoBlock->setItem($_item->getOrderItem())->toHtml() ?>
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
+    <td class="item-qty"><?= (int) $_item->getQty() ?></td>
 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
index 022511ae3cfd0..956705fb7b55d 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
@@ -4,24 +4,22 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
 <?php $_shipment = $block->getShipment() ?>
 <?php $_order    = $block->getOrder() ?>
-<?php if ($_shipment && $_order): ?>
+<?php if ($_shipment && $_order) : ?>
     <table class="email-items">
         <thead>
             <tr>
                 <th class="item-info">
-                    <?= /* @escapeNotVerified */  __('Items') ?>
+                    <?= $block->escapeHtml(__('Items')) ?>
                 </th>
                 <th class="item-qty">
-                    <?= /* @escapeNotVerified */  __('Qty') ?>
+                    <?= $block->escapeHtml(__('Qty')) ?>
                 </th>
             </tr>
         </thead>
-        <?php foreach ($_shipment->getAllItems() as $_item): ?>
+        <?php foreach ($_shipment->getAllItems() as $_item) : ?>
             <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
                 <tbody>
                     <?= $block->getItemHtml($_item) ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
index 9f7146ab084df..7b3769b2971e5 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
@@ -4,27 +4,30 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
 <?php $_shipment = $block->getShipment() ?>
-<?php $_order = $block->getOrder() ?>
-<?php if ($_shipment && $_order && $_shipment->getAllTracks()): ?>
-<br />
-<table class="shipment-track">
-    <thead>
-        <tr>
-            <th><?= /* @escapeNotVerified */  __('Shipped By') ?></th>
-            <th><?= /* @escapeNotVerified */  __('Tracking Number') ?></th>
-        </tr>
-    </thead>
-    <tbody>
-    <?php foreach ($_shipment->getAllTracks() as $_item): ?>
-        <tr>
-            <td><?= $block->escapeHtml($_item->getTitle()) ?>:</td>
-            <td><?= $block->escapeHtml($_item->getNumber()) ?></td>
-        </tr>
-    <?php endforeach ?>
-    </tbody>
-</table>
+<?php
+/* @var \Magento\Sales\Model\Order $_order */
+$_order = $block->getOrder() ?>
+<?php if ($_shipment && $_order) : ?>
+    <?php $trackCollection = $_order->getTracksCollection($_shipment->getId()) ?>
+    <?php if ($trackCollection) : ?>
+        <br />
+        <table class="shipment-track">
+            <thead>
+            <tr>
+                <th><?= $block->escapeHtml(__('Shipped By')) ?></th>
+                <th><?= $block->escapeHtml(__('Tracking Number')) ?></th>
+            </tr>
+            </thead>
+            <tbody>
+            <?php foreach ($trackCollection as $_item) : ?>
+                <tr>
+                    <td><?= $block->escapeHtml($_item->getTitle()) ?>:</td>
+                    <td><?= $block->escapeHtml($_item->getNumber()) ?></td>
+                </tr>
+            <?php endforeach ?>
+            </tbody>
+        </table>
+    <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml b/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
index 3ebca4d08b349..a8dd694f13e60 100644
--- a/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
@@ -4,17 +4,18 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
-<form class="form form-orders-search" id="oar-widget-orders-and-returns-form" data-mage-init='{"ordersReturns":{}, "validation":{}}' action="<?= /* @escapeNotVerified */ $block->getActionUrl() ?>"
+<form class="form form-orders-search"
+      id="oar-widget-orders-and-returns-form"
+      data-mage-init='{"ordersReturns":{}, "validation":{}}'
+      action="<?= $block->escapeUrl($block->getActionUrl()) ?>"
       method="post" name="guest_post">
     <fieldset class="fieldset">
-        <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Order Information') ?></span></legend>
+        <legend class="legend"><span><?= $block->escapeHtml(__('Order Information')) ?></span></legend>
         <br>
 
         <div class="field id required">
-            <label class="label" for="oar-order-id"><span><?= /* @escapeNotVerified */ __('Order ID') ?></span></label>
+            <label class="label" for="oar-order-id"><span><?= $block->escapeHtml(__('Order ID')) ?></span></label>
 
             <div class="control">
                 <input type="text" class="input-text" id="oar-order-id" name="oar_order_id"
@@ -22,7 +23,7 @@
             </div>
         </div>
         <div class="field lastname required">
-            <label class="label" for="oar-billing-lastname"><span><?= /* @escapeNotVerified */ __('Billing Last Name') ?></span></label>
+            <label class="label" for="oar-billing-lastname"><span><?= $block->escapeHtml(__('Billing Last Name')) ?></span></label>
 
             <div class="control">
                 <input type="text" class="input-text" id="oar-billing-lastname" name="oar_billing_lastname"
@@ -30,17 +31,17 @@
             </div>
         </div>
         <div class="field find required">
-            <label class="label" for="quick-search-type-id"><span><?= /* @escapeNotVerified */ __('Find Order By') ?></span></label>
+            <label class="label" for="quick-search-type-id"><span><?= $block->escapeHtml(__('Find Order By')) ?></span></label>
 
             <div class="control">
                 <select name="oar_type" id="quick-search-type-id" class="select">
-                    <option value="email"><?= /* @escapeNotVerified */ __('Email') ?></option>
-                    <option value="zip"><?= /* @escapeNotVerified */ __('ZIP Code') ?></option>
+                    <option value="email"><?= $block->escapeHtml(__('Email')) ?></option>
+                    <option value="zip"><?= $block->escapeHtml(__('ZIP Code')) ?></option>
                 </select>
             </div>
         </div>
         <div id="oar-email" class="field email required">
-            <label class="label" for="oar_email"><span><?= /* @escapeNotVerified */ __('Email') ?></span></label>
+            <label class="label" for="oar_email"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
 
             <div class="control">
                 <input type="email" class="input-text" id="oar_email" name="oar_email"
@@ -48,7 +49,7 @@
             </div>
         </div>
         <div id="oar-zip" class="field zip required">
-            <label class="label" for="oar_zip"><span><?= /* @escapeNotVerified */ __('Billing ZIP Code') ?></span></label>
+            <label class="label" for="oar_zip"><span><?= $block->escapeHtml(__('Billing ZIP Code')) ?></span></label>
 
             <div class="control">
                 <input type="text" class="input-text" id="oar_zip" name="oar_zip" data-validate="{required:true}"/>
@@ -57,8 +58,8 @@
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" title="<?= /* @escapeNotVerified */ __('Continue') ?>" class="action submit primary">
-                <span><?= /* @escapeNotVerified */ __('Continue') ?></span>
+            <button type="submit" title="<?= $block->escapeHtml(__('Continue')) ?>" class="action submit primary">
+                <span><?= $block->escapeHtml(__('Continue')) ?></span>
             </button>
         </div>
     </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/items/price/row.phtml b/app/code/Magento/Sales/view/frontend/templates/items/price/row.phtml
index bcf740307af15..73350c5b0c47f 100644
--- a/app/code/Magento/Sales/view/frontend/templates/items/price/row.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/items/price/row.phtml
@@ -4,13 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer $block */
 $_item = $block->getItem();
 ?>
 <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
     <span class="cart-price">
-        <?= /* @escapeNotVerified */ $block->getOrder()->formatPrice($block->getItem()->getRowTotal()) ?>
+        <?= /* @noEscape */ $block->getOrder()->formatPrice($block->getItem()->getRowTotal()) ?>
     </span>
 </span>
diff --git a/app/code/Magento/Sales/view/frontend/templates/items/price/total_after_discount.phtml b/app/code/Magento/Sales/view/frontend/templates/items/price/total_after_discount.phtml
index dfb476ee381c1..458c6d1e32fa8 100644
--- a/app/code/Magento/Sales/view/frontend/templates/items/price/total_after_discount.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/items/price/total_after_discount.phtml
@@ -4,10 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable PSR2.Files.ClosingTag
 
 /** @var \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer $block */
 $_item = $block->getItem();
 ?>
-<?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<?= /* @escapeNotVerified */ $_order->formatPrice($block->getTotalAmount($_item)) ?>
+<?php
+/** @var \Magento\Sales\Model\Order $_order */
+$_order = $block->getItem()->getOrderItem()->getOrder() ?>
+<?= /* @noEscape */ $_order->formatPrice($block->getTotalAmount($_item)) ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/items/price/unit.phtml b/app/code/Magento/Sales/view/frontend/templates/items/price/unit.phtml
index 7a484fed719f8..1b2f15133da8c 100644
--- a/app/code/Magento/Sales/view/frontend/templates/items/price/unit.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/items/price/unit.phtml
@@ -4,13 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer $block */
 $_item = $block->getItem();
 ?>
 <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
     <span class="cart-price">
-        <?= /* @escapeNotVerified */ $block->getOrder()->formatPrice($block->getItem()->getPrice()) ?>
+        <?= /* @noEscape */ $block->getOrder()->formatPrice($block->getItem()->getPrice()) ?>
     </span>
 </span>
diff --git a/app/code/Magento/Sales/view/frontend/templates/js/components.phtml b/app/code/Magento/Sales/view/frontend/templates/js/components.phtml
index bad5acc209b5f..13f44b97fc789 100644
--- a/app/code/Magento/Sales/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/js/components.phtml
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/comments.phtml b/app/code/Magento/Sales/view/frontend/templates/order/comments.phtml
index 589b857239971..448ced1d35f8f 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/comments.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/comments.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /**
@@ -13,12 +10,15 @@
  * @see \Magento\Sales\Block\Order\Comments
  */
 ?>
-<?php if ($block->hasComments()):?>
+<?php if ($block->hasComments()) : ?>
     <div class="order additional details comments">
-        <h3 class="subtitle"><?= /* @escapeNotVerified */ $block->getTitle() ?></h3>
+        <h3 class="subtitle"><?= $block->escapeHtml($block->getTitle()) ?></h3>
         <dl class="order comments">
-            <?php foreach ($block->getComments() as $_commentItem): ?>
-                <dt class="comment date"><?= /* @escapeNotVerified */ $block->formatDate($_commentItem->getCreatedAt(), \IntlDateFormatter::MEDIUM, true) ?></dt>
+            <?php foreach ($block->getComments() as $_commentItem) : ?>
+                <dt class="comment date">
+                    <?= /* @noEscape */
+                    $block->formatDate($_commentItem->getCreatedAt(), \IntlDateFormatter::MEDIUM, true) ?>
+                </dt>
                 <dd class="comment text"><?= $block->escapeHtml($_commentItem->getComment()) ?></dd>
             <?php endforeach; ?>
         </dl>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml
index a6a9b64d2c784..3d8853bbe0366 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml
@@ -3,13 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/* @var $block \Magento\Sales\Block\Order\Creditmemo */
 ?>
 <div class="order-details-items creditmemo">
     <?= $block->getChildHtml('creditmemo_items') ?>
     <div class="actions-toolbar">
         <div class="secondary">
-            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back">
-                <span><?= /* @escapeNotVerified */ $block->getBackTitle() ?></span>
+            <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
+                <span><?= $block->escapeHtml($block->getBackTitle()) ?></span>
             </a>
         </div>
     </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
index dc2cf2433ac8d..019baeea54e23 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
@@ -3,54 +3,51 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php $_order = $block->getOrder() ?>
 <div class="actions-toolbar">
-    <a href="<?= /* @escapeNotVerified */ $block->getPrintAllCreditmemosUrl($_order) ?>"
+    <a href="<?= $block->escapeUrl($block->getPrintAllCreditmemosUrl($_order)) ?>"
        onclick="this.target='_blank'"
        class="action print">
-        <span><?= /* @escapeNotVerified */ __('Print All Refunds') ?></span>
-    </a>
-</div>
-<?php foreach ($_order->getCreditmemosCollection() as $_creditmemo): ?>
-<div class="order-title">
-    <strong><?= /* @escapeNotVerified */ __('Refund #') ?><?= /* @escapeNotVerified */ $_creditmemo->getIncrementId() ?> </strong>
-    <a href="<?= /* @escapeNotVerified */ $block->getPrintCreditmemoUrl($_creditmemo) ?>"
-       onclick="this.target='_blank'"
-       class="action print">
-        <span><?= /* @escapeNotVerified */ __('Print Refund') ?></span>
+        <span><?= $block->escapeHtml(__('Print All Refunds')) ?></span>
     </a>
 </div>
+<?php foreach ($_order->getCreditmemosCollection() as $_creditmemo) : ?>
+    <div class="order-title">
+        <strong><?= $block->escapeHtml(__('Refund #')) ?><?= $block->escapeHtml($_creditmemo->getIncrementId()) ?> </strong>
+        <a href="<?= $block->escapeUrl($block->getPrintCreditmemoUrl($_creditmemo)) ?>"
+           onclick="this.target='_blank'"
+           class="action print">
+            <span><?= $block->escapeHtml(__('Print Refund')) ?></span>
+        </a>
+    </div>
 
-<div class="table-wrapper order-items-creditmemo">
-    <table class="data table table-order-items creditmemo" id="my-refund-table-<?= /* @escapeNotVerified */ $_creditmemo->getId() ?>">
-        <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Refunded') ?></caption>
-        <thead>
-            <tr>
-                <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
-                <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
-                <th class="col price"><?= /* @escapeNotVerified */ __('Price') ?></th>
-                <th class="col qty"><?= /* @escapeNotVerified */ __('Qty') ?></th>
-                <th class="col subtotal"><?= /* @escapeNotVerified */ __('Subtotal') ?></th>
-                <th class="col discount"><?= /* @escapeNotVerified */ __('Discount Amount') ?></th>
-                <th class="col total"><?= /* @escapeNotVerified */ __('Row Total') ?></th>
-            </tr>
-        </thead>
-        <?php $_items = $_creditmemo->getAllItems(); ?>
-        <?php foreach ($_items as $_item): ?>
-            <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-                <tbody>
-                    <?= $block->getItemHtml($_item) ?>
-                </tbody>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        <tfoot>
-            <?= $block->getTotalsHtml($_creditmemo) ?>
-        </tfoot>
-    </table>
-</div>
-<?= $block->getCommentsHtml($_creditmemo) ?>
+    <div class="table-wrapper order-items-creditmemo">
+        <table class="data table table-order-items creditmemo" id="my-refund-table-<?= (int) $_creditmemo->getId() ?>">
+            <caption class="table-caption"><?= $block->escapeHtml(__('Items Refunded')) ?></caption>
+            <thead>
+                <tr>
+                    <th class="col name"><?= $block->escapeHtml(__('Product Name')) ?></th>
+                    <th class="col sku"><?= $block->escapeHtml(__('SKU')) ?></th>
+                    <th class="col price"><?= $block->escapeHtml(__('Price')) ?></th>
+                    <th class="col qty"><?= $block->escapeHtml(__('Qty')) ?></th>
+                    <th class="col subtotal"><?= $block->escapeHtml(__('Subtotal')) ?></th>
+                    <th class="col discount"><?= $block->escapeHtml(__('Discount Amount')) ?></th>
+                    <th class="col total"><?= $block->escapeHtml(__('Row Total')) ?></th>
+                </tr>
+            </thead>
+            <?php $_items = $_creditmemo->getAllItems(); ?>
+            <?php foreach ($_items as $_item) : ?>
+                <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
+                    <tbody>
+                        <?= $block->getItemHtml($_item) ?>
+                    </tbody>
+                <?php endif; ?>
+            <?php endforeach; ?>
+            <tfoot>
+                <?= $block->getTotalsHtml($_creditmemo) ?>
+            </tfoot>
+        </table>
+    </div>
+    <?= $block->getCommentsHtml($_creditmemo) ?>
 <?php endforeach; ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml
index 5542439da17fd..27e7715c2dc33 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
@@ -3,45 +3,44 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var  $block \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer */ ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
-    <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+<tr id="order-item-row-<?= (int) $_item->getId() ?>">
+    <td class="col name" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>">
         <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
-        <?php if ($_options = $block->getItemOptions()): ?>
-        <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$block->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                    <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="tooltip content">
-                        <dl class="item options">
-                            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
-                    <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
+        <?php if ($_options = $block->getItemOptions()) : ?>
+            <dl class="item-options">
+            <?php foreach ($_options as $_option) : ?>
+                <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                <?php if (!$block->getPrintStatus()) : ?>
+                    <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
+                    <dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
+                        <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
+                        <?php if (isset($_formatedOptionValue['full_view'])) : ?>
+                        <div class="tooltip content">
+                            <dl class="item options">
+                                <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                                <dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
+                            </dl>
+                        </div>
+                        <?php endif; ?>
+                    </dd>
+                <?php else : ?>
+                    <dd>
+                        <?= $block->escapeHtml($_option['print_value'] ?? $_option['value']) ?>
+                    </dd>
+                <?php endif; ?>
+            <?php endforeach; ?>
+            </dl>
         <?php endif; ?>
 
         <?php /* downloadable */ ?>
-        <?php if ($links = $block->getLinks()): ?>
+        <?php if ($links = $block->getLinks()) : ?>
             <dl class="item options">
-                <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></dt>
-                <?php foreach ($links->getPurchasedItems() as $link): ?>
+                <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
+                <?php foreach ($links->getPurchasedItems() as $link) : ?>
                     <dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
                 <?php endforeach; ?>
             </dl>
@@ -49,20 +48,20 @@
         <?php /* EOF downloadable */ ?>
 
         <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addInfoBlock) :?>
+        <?php if ($addInfoBlock) : ?>
             <?= $addInfoBlock->setItem($_item->getOrderItem())->toHtml() ?>
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
+    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
     <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
         <?= $block->getItemPriceHtml() ?>
     </td>
-    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
+    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= (int) $_item->getQty() ?></td>
     <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
         <?= $block->getItemRowTotalHtml() ?>
     </td>
-    <td class="col discount" data-th="<?= $block->escapeHtml(__('Discount Amount')) ?>"><?= /* @escapeNotVerified */ $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
+    <td class="col discount" data-th="<?= $block->escapeHtml(__('Discount Amount')) ?>"><?= /* @noEscape */ $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
     <td class="col total" data-th="<?= $block->escapeHtml(__('Row Total')) ?>">
         <?= $block->getItemRowTotalAfterDiscountHtml() ?>
     </td>
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 1c02a5c31ea6b..ef56ad69dcb1b 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
@@ -4,49 +4,50 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
+/** @var \Magento\Sales\Block\Order\History $block */
 ?>
 <?php $_orders = $block->getOrders(); ?>
 <?= $block->getChildHtml('info') ?>
-<?php if ($_orders && count($_orders)): ?>
+<?php if ($_orders && count($_orders)) : ?>
     <div class="table-wrapper orders-history">
         <table class="data table table-order-items history" id="my-orders-table">
-            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Orders') ?></caption>
+            <caption class="table-caption"><?= $block->escapeHtml(__('Orders')) ?></caption>
             <thead>
                 <tr>
-                    <th scope="col" class="col id"><?= /* @escapeNotVerified */ __('Order #') ?></th>
-                    <th scope="col" class="col date"><?= /* @escapeNotVerified */ __('Date') ?></th>
-                    <?= /* @noEscape */ $block->getChildHtml('extra.column.header') ?>
-                    <th scope="col" class="col shipping"><?= /* @escapeNotVerified */ __('Ship To') ?></th>
-                    <th scope="col" class="col total"><?= /* @escapeNotVerified */ __('Order Total') ?></th>
-                    <th scope="col" class="col status"><?= /* @escapeNotVerified */ __('Status') ?></th>
-                    <th scope="col" class="col actions"><?= /* @escapeNotVerified */ __('Action') ?></th>
+                    <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>
                 </tr>
             </thead>
             <tbody>
-                <?php foreach ($_orders as $_order): ?>
+                <?php foreach ($_orders as $_order) : ?>
                     <tr>
-                        <td data-th="<?= $block->escapeHtml(__('Order #')) ?>" class="col id"><?= /* @escapeNotVerified */ $_order->getRealOrderId() ?></td>
-                        <td data-th="<?= $block->escapeHtml(__('Date')) ?>" class="col date"><?= /* @escapeNotVerified */ $block->formatDate($_order->getCreatedAt()) ?></td>
+                        <td data-th="<?= $block->escapeHtml(__('Order #')) ?>" class="col id"><?= $block->escapeHtml($_order->getRealOrderId()) ?></td>
+                        <td data-th="<?= $block->escapeHtml(__('Date')) ?>" class="col date"><?= /* @noEscape */ $block->formatDate($_order->getCreatedAt()) ?></td>
                         <?php $extra = $block->getChildBlock('extra.container'); ?>
-                        <?php if ($extra): ?>
+                        <?php if ($extra) : ?>
                             <?php $extra->setOrder($_order); ?>
-                            <?= /* @noEscape */ $extra->getChildHtml() ?>
+                            <?= $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"><?= /* @escapeNotVerified */ $_order->formatPrice($_order->getGrandTotal()) ?></td>
-                        <td data-th="<?= $block->escapeHtml(__('Status')) ?>" class="col status"><?= /* @escapeNotVerified */ $_order->getStatusLabel() ?></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">
-                            <a href="<?= /* @escapeNotVerified */ $block->getViewUrl($_order) ?>" class="action view">
-                                <span><?= /* @escapeNotVerified */ __('View Order') ?></span>
+                            <a href="<?= $block->escapeUrl($block->getViewUrl($_order)) ?>" class="action view">
+                                <span><?= $block->escapeHtml(__('View Order')) ?></span>
                             </a>
-                            <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order->getEntityId())) : ?>
-                                <a href="#" data-post='<?php /* @escapeNotVerified */ echo
+                            <?php if ($this->helper(\Magento\Sales\Helper\Reorder::class)->canReorder($_order->getEntityId())) : ?>
+                                <a href="#" data-post='<?= /* @noEscape */
                                 $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
                                     ->getPostData($block->getReorderUrl($_order))
                                 ?>' class="action order">
-                                    <span><?= /* @escapeNotVerified */ __('Reorder') ?></span>
+                                    <span><?= $block->escapeHtml(__('Reorder')) ?></span>
                                 </a>
                             <?php endif ?>
                         </td>
@@ -55,9 +56,9 @@
             </tbody>
         </table>
     </div>
-    <?php if ($block->getPagerHtml()): ?>
+    <?php if ($block->getPagerHtml()) : ?>
         <div class="order-products-toolbar toolbar bottom"><?= $block->getPagerHtml() ?></div>
     <?php endif ?>
-<?php else: ?>
-    <div class="message info empty"><span><?= /* @escapeNotVerified */ __('You have placed no orders.') ?></span></div>
+<?php else : ?>
+    <div class="message info empty"><span><?= $block->escapeHtml(__('You have placed no orders.')) ?></span></div>
 <?php endif ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/info.phtml b/app/code/Magento/Sales/view/frontend/templates/order/info.phtml
index 2a31814d9a054..1bf05f4fed7f7 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/info.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/info.phtml
@@ -3,50 +3,47 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block \Magento\Sales\Block\Order\Info */ ?>
 <?php $_order = $block->getOrder() ?>
 <div class="block block-order-details-view">
     <div class="block-title">
-        <strong><?= /* @escapeNotVerified */ __('Order Information') ?></strong>
+        <strong><?= $block->escapeHtml(__('Order Information')) ?></strong>
     </div>
     <div class="block-content">
-    <?php if (!$_order->getIsVirtual()): ?>
-        <div class="box box-order-shipping-address">
-            <strong class="box-title"><span><?= /* @escapeNotVerified */ __('Shipping Address') ?></span></strong>
-            <div class="box-content">
-                <address><?= /* @escapeNotVerified */ $block->getFormattedAddress($_order->getShippingAddress()) ?></address>
+        <?php if (!$_order->getIsVirtual()) : ?>
+            <div class="box box-order-shipping-address">
+                <strong class="box-title"><span><?= $block->escapeHtml(__('Shipping Address')) ?></span></strong>
+                <div class="box-content">
+                    <address><?= /* @noEscape */ $block->getFormattedAddress($_order->getShippingAddress()) ?></address>
+                </div>
             </div>
-        </div>
 
-        <div class="box box-order-shipping-method">
-            <strong class="box-title">
-                <span><?= /* @escapeNotVerified */ __('Shipping Method') ?></span>
-            </strong>
-            <div class="box-content">
-            <?php if ($_order->getShippingDescription()): ?>
-                <?= $block->escapeHtml($_order->getShippingDescription()) ?>
-            <?php else: ?>
-                <?= /* @escapeNotVerified */ __('No shipping information available') ?>
-            <?php endif; ?>
+            <div class="box box-order-shipping-method">
+                <strong class="box-title">
+                    <span><?= $block->escapeHtml(__('Shipping Method')) ?></span>
+                </strong>
+                <div class="box-content">
+                <?php if ($_order->getShippingDescription()) : ?>
+                    <?= $block->escapeHtml($_order->getShippingDescription()) ?>
+                <?php else : ?>
+                    <?= $block->escapeHtml(__('No shipping information available')) ?>
+                <?php endif; ?>
+                </div>
             </div>
-        </div>
-    <?php endif; ?>
+        <?php endif; ?>
 
         <div class="box box-order-billing-address">
             <strong class="box-title">
-                <span><?= /* @escapeNotVerified */ __('Billing Address') ?></span>
+                <span><?= $block->escapeHtml(__('Billing Address')) ?></span>
             </strong>
             <div class="box-content">
-                <address><?= /* @escapeNotVerified */ $block->getFormattedAddress($_order->getBillingAddress()) ?></address>
+                <address><?= /* @noEscape */ $block->getFormattedAddress($_order->getBillingAddress()) ?></address>
             </div>
         </div>
         <div class="box box-order-billing-method">
             <strong class="box-title">
-                <span><?= /* @escapeNotVerified */ __('Payment Method') ?></span>
+                <span><?= $block->escapeHtml(__('Payment Method')) ?></span>
             </strong>
             <div class="box-content">
                 <?= $block->getPaymentInfoHtml() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml
index fa3f63b61cd07..6b87d3c22331c 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml
@@ -4,23 +4,22 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <div class="actions">
-    <?php  $_order = $block->getOrder() ?>
-    <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order->getEntityId())) : ?>
-        <a href="#" data-post='<?php /* @escapeNotVerified */ echo
-        $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
+    <?php $_order = $block->getOrder() ?>
+    <?php if ($this->helper(\Magento\Sales\Helper\Reorder::class)->canReorder($_order->getEntityId())) : ?>
+        <a href="#" data-post='<?=
+        /* @noEscape */ $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
             ->getPostData($block->getReorderUrl($_order))
         ?>' class="action order">
-            <span><?= /* @escapeNotVerified */ __('Reorder') ?></span>
+            <span><?= $block->escapeHtml(__('Reorder')) ?></span>
         </a>
     <?php endif ?>
     <a class="action print"
-       href="<?= /* @escapeNotVerified */ $block->getPrintUrl($_order) ?>"
+       href="<?= $block->escapeUrl($block->getPrintUrl($_order)) ?>"
        onclick="this.target='_blank';">
-        <span><?= /* @escapeNotVerified */ __('Print Order') ?></span>
+        <span><?= $block->escapeHtml(__('Print Order')) ?></span>
     </a>
     <?= $block->getChildHtml() ?>
 </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml
index 3ea1bf6452c03..e29d1aa1f849f 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml
@@ -4,12 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Sales\Block\Order\Info\Buttons\Rss */
 ?>
-<?php if ($block->isRssAllowed() && $block->getLink()): ?>
-<a href="<?= /* @escapeNotVerified */ $block->getLink() ?>" class="action rss">
-    <span><?= /* @escapeNotVerified */ $block->getLabel() ?></span>
-</a>
+<?php if ($block->isRssAllowed() && $block->getLink()) : ?>
+    <a href="<?= $block->escapeHtmlAttr($block->getLink()) ?>" class="action rss">
+        <span><?= $block->escapeHtml($block->getLabel()) ?></span>
+    </a>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml b/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml
index 699067dc9612c..017331ad72b76 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml
@@ -3,13 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/* @var $block \Magento\Sales\Block\Order\Invoice */
 ?>
 <div class="order-details-items invoice">
     <?= $block->getChildHtml('invoice_items') ?>
     <div class="actions-toolbar">
         <div class="secondary">
-            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back">
-                <span><?= /* @escapeNotVerified */ $block->getBackTitle() ?></span>
+            <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
+                <span><?= $block->escapeHtml($block->getBackTitle()) ?></span>
             </a>
         </div>
     </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
index 0f3236ec25bc3..419060bfba713 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
@@ -3,51 +3,48 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php $_order = $block->getOrder() ?>
 <div class="actions-toolbar">
-    <a href="<?= /* @escapeNotVerified */ $block->getPrintAllInvoicesUrl($_order) ?>"
+    <a href="<?= $block->escapeUrl($block->getPrintAllInvoicesUrl($_order)) ?>"
        target="_blank"
        class="action print">
-        <span><?= /* @escapeNotVerified */ __('Print All Invoices') ?></span>
+        <span><?= $block->escapeHtml(__('Print All Invoices')) ?></span>
     </a>
 </div>
-<?php foreach ($_order->getInvoiceCollection() as $_invoice): ?>
-<div class="order-title">
-    <strong><?= /* @escapeNotVerified */ __('Invoice #') ?><?= /* @escapeNotVerified */ $_invoice->getIncrementId() ?></strong>
-    <a href="<?= /* @escapeNotVerified */ $block->getPrintInvoiceUrl($_invoice) ?>"
-       onclick="this.target='_blank'"
-       class="action print">
-        <span><?= /* @escapeNotVerified */ __('Print Invoice') ?></span>
-    </a>
-</div>
-<div class="table-wrapper table-order-items invoice">
-    <table class="data table table-order-items invoice" id="my-invoice-table-<?= /* @escapeNotVerified */ $_invoice->getId() ?>">
-        <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Invoiced') ?></caption>
-        <thead>
-            <tr>
-                <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
-                <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
-                <th class="col price"><?= /* @escapeNotVerified */ __('Price') ?></th>
-                <th class="col qty"><?= /* @escapeNotVerified */ __('Qty Invoiced') ?></th>
-                <th class="col subtotal"><?= /* @escapeNotVerified */ __('Subtotal') ?></th>
-            </tr>
-        </thead>
-        <?php $_items = $_invoice->getAllItems(); ?>
-        <?php foreach ($_items as $_item): ?>
-            <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
-                <tbody>
-                    <?= $block->getItemHtml($_item) ?>
-                </tbody>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        <tfoot>
-            <?= $block->getInvoiceTotalsHtml($_invoice) ?>
-        </tfoot>
-    </table>
-</div>
-<?= $block->getInvoiceCommentsHtml($_invoice) ?>
+<?php foreach ($_order->getInvoiceCollection() as $_invoice) : ?>
+    <div class="order-title">
+        <strong><?= $block->escapeHtml(__('Invoice #')) ?><?= $block->escapeHtml($_invoice->getIncrementId()) ?></strong>
+        <a href="<?= $block->escapeUrl($block->getPrintInvoiceUrl($_invoice)) ?>"
+           onclick="this.target='_blank'"
+           class="action print">
+            <span><?= $block->escapeHtml(__('Print Invoice')) ?></span>
+        </a>
+    </div>
+    <div class="table-wrapper table-order-items invoice">
+        <table class="data table table-order-items invoice" id="my-invoice-table-<?= (int) $_invoice->getId() ?>">
+            <caption class="table-caption"><?= $block->escapeHtml(__('Items Invoiced')) ?></caption>
+            <thead>
+                <tr>
+                    <th class="col name"><?= $block->escapeHtml(__('Product Name')) ?></th>
+                    <th class="col sku"><?= $block->escapeHtml(__('SKU')) ?></th>
+                    <th class="col price"><?= $block->escapeHtml(__('Price')) ?></th>
+                    <th class="col qty"><?= $block->escapeHtml(__('Qty Invoiced')) ?></th>
+                    <th class="col subtotal"><?= $block->escapeHtml(__('Subtotal')) ?></th>
+                </tr>
+            </thead>
+            <?php $_items = $_invoice->getAllItems(); ?>
+            <?php foreach ($_items as $_item) : ?>
+                <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
+                    <tbody>
+                        <?= $block->getItemHtml($_item) ?>
+                    </tbody>
+                <?php endif; ?>
+            <?php endforeach; ?>
+            <tfoot>
+                <?= $block->getInvoiceTotalsHtml($_invoice) ?>
+            </tfoot>
+        </table>
+    </div>
+    <?= $block->getInvoiceCommentsHtml($_invoice) ?>
 <?php endforeach; ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml
index 4f95f3d93e2c2..ece72e9119d1e 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
@@ -3,38 +3,35 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var  $block \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer */ ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
+<tr id="order-item-row-<?= (int) $_item->getId() ?>">
     <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
         <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
-        <?php if ($_options = $block->getItemOptions()): ?>
-        <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$block->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                    <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="tooltip content">
-                        <dl class="item options">
-                            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
-                    <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
+        <?php if ($_options = $block->getItemOptions()) : ?>
+            <dl class="item-options">
+            <?php foreach ($_options as $_option) : ?>
+                <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                <?php if (!$block->getPrintStatus()) : ?>
+                    <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
+                    <dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
+                        <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
+                        <?php if (isset($_formatedOptionValue['full_view'])) : ?>
+                            <div class="tooltip content">
+                                <dl class="item options">
+                                    <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                                    <dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
+                                </dl>
+                            </div>
+                        <?php endif; ?>
+                    </dd>
+                <?php else : ?>
+                    <dd><?= $block->escapeHtml($_option['print_value'] ?? $_option['value']) ?></dd>
+                <?php endif; ?>
+            <?php endforeach; ?>
+            </dl>
         <?php endif; ?>
         <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
         <?php if ($addInfoBlock) :?>
@@ -42,12 +39,12 @@
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
+    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
     <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
         <?= $block->getItemPriceHtml() ?>
     </td>
     <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Invoiced')) ?>">
-        <span class="qty summary"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></span>
+        <span class="qty summary"><?= (int) $_item->getQty() ?></span>
     </td>
     <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
         <?= $block->getItemRowTotalHtml() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
index dc179b6ee4ac1..a99d90c8c310d 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
@@ -4,15 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
 /** @var \Magento\Sales\Block\Order\Items $block */
 ?>
 <div class="table-wrapper order-items">
-    <table class="data table table-order-items" id="my-orders-table" summary="<?= /* @escapeNotVerified */ __('Items Ordered') ?>">
-        <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Ordered') ?></caption>
+    <table class="data table table-order-items" id="my-orders-table" summary="<?= $block->escapeHtmlAttr(__('Items Ordered')) ?>">
+        <caption class="table-caption"><?= $block->escapeHtml(__('Items Ordered')) ?></caption>
         <thead>
-            <?php if($block->isPagerDisplayed()): ?>
+            <?php if ($block->isPagerDisplayed()) : ?>
                 <tr>
                     <td colspan="5" data-block="order-items-pager-top" class="order-pager-wrapper order-pager-wrapper-top">
                         <?= $block->getPagerHtml() ?>
@@ -20,44 +20,46 @@
                 </tr>
             <?php endif ?>
             <tr>
-                <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
-                <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
-                <th class="col price"><?= /* @escapeNotVerified */ __('Price') ?></th>
-                <th class="col qty"><?= /* @escapeNotVerified */ __('Qty') ?></th>
-                <th class="col subtotal"><?= /* @escapeNotVerified */ __('Subtotal') ?></th>
+                <th class="col name"><?= $block->escapeHtml(__('Product Name')) ?></th>
+                <th class="col sku"><?= $block->escapeHtml(__('SKU')) ?></th>
+                <th class="col price"><?= $block->escapeHtml(__('Price')) ?></th>
+                <th class="col qty"><?= $block->escapeHtml(__('Qty')) ?></th>
+                <th class="col subtotal"><?= $block->escapeHtml(__('Subtotal')) ?></th>
             </tr>
         </thead>
         <?php $items = $block->getItems(); ?>
         <?php $giftMessage = ''?>
         <tbody>
-        <?php foreach ($items as $item): ?>
-            <?php if ($item->getParentItem()) continue; ?>
-
+        <?php foreach ($items as $item) :
+            if ($item->getParentItem()) :
+                continue;
+            endif;
+            ?>
                 <?= $block->getItemHtml($item) ?>
-                <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $item) && $item->getGiftMessageId()): ?>
-                    <?php $giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessageForEntity($item); ?>
+                <?php if ($this->helper(\Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order_item', $item) && $item->getGiftMessageId()) : ?>
+                    <?php $giftMessage = $this->helper(\Magento\GiftMessage\Helper\Message::class)->getGiftMessageForEntity($item); ?>
                     <tr>
                         <td class="col options" colspan="5">
                             <a href="#"
-                               id="order-item-gift-message-link-<?= /* @escapeNotVerified */ $item->getId() ?>"
+                               id="order-item-gift-message-link-<?= (int) $item->getId() ?>"
                                class="action show"
-                               aria-controls="order-item-gift-message-<?= /* @escapeNotVerified */ $item->getId() ?>"
-                               data-item-id="<?= /* @escapeNotVerified */ $item->getId() ?>">
-                                <?= /* @escapeNotVerified */ __('Gift Message') ?>
+                               aria-controls="order-item-gift-message-<?= (int) $item->getId() ?>"
+                               data-item-id="<?= (int) $item->getId() ?>">
+                                <?= $block->escapeHtml(__('Gift Message')) ?>
                             </a>
-                            <?php $giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessageForEntity($item); ?>
-                            <div class="order-gift-message" id="order-item-gift-message-<?= /* @escapeNotVerified */ $item->getId() ?>" role="region" aria-expanded="false" tabindex="-1">
+                            <?php $giftMessage = $this->helper(\Magento\GiftMessage\Helper\Message::class)->getGiftMessageForEntity($item); ?>
+                            <div class="order-gift-message" id="order-item-gift-message-<?= (int) $item->getId() ?>" role="region" aria-expanded="false" tabindex="-1">
                                 <a href="#"
-                                   title="<?= /* @escapeNotVerified */ __('Close') ?>"
-                                   aria-controls="order-item-gift-message-<?= /* @escapeNotVerified */ $item->getId() ?>"
-                                   data-item-id="<?= /* @escapeNotVerified */ $item->getId() ?>"
+                                   title="<?= $block->escapeHtml(__('Close')) ?>"
+                                   aria-controls="order-item-gift-message-<?= (int) $item->getId() ?>"
+                                   data-item-id="<?= (int) $item->getId() ?>"
                                    class="action close">
-                                    <?= /* @escapeNotVerified */ __('Close') ?>
+                                    <?= $block->escapeHtml(__('Close')) ?>
                                 </a>
                                 <dl class="item-options">
-                                    <dt class="item-sender"><strong class="label"><?= /* @escapeNotVerified */ __('From') ?></strong><?= $block->escapeHtml($giftMessage->getSender()) ?></dt>
-                                    <dt class="item-recipient"><strong class="label"><?= /* @escapeNotVerified */ __('To') ?></strong><?= $block->escapeHtml($giftMessage->getRecipient()) ?></dt>
-                                    <dd class="item-message"><?= /* @escapeNotVerified */ $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($item) ?></dd>
+                                    <dt class="item-sender"><strong class="label"><?= $block->escapeHtml(__('From')) ?></strong><?= $block->escapeHtml($giftMessage->getSender()) ?></dt>
+                                    <dt class="item-recipient"><strong class="label"><?= $block->escapeHtml(__('To')) ?></strong><?= $block->escapeHtml($giftMessage->getRecipient()) ?></dt>
+                                    <dd class="item-message"><?= /* @noEscape */ $this->helper(\Magento\GiftMessage\Helper\Message::class)->getEscapedGiftMessage($item) ?></dd>
                                 </dl>
                             </div>
                         </td>
@@ -66,7 +68,7 @@
         <?php endforeach; ?>
         </tbody>
         <tfoot>
-            <?php if($block->isPagerDisplayed()): ?>
+            <?php if ($block->isPagerDisplayed()) : ?>
                 <tr>
                     <td colspan="5" data-block="order-items-pager-bottom" class="order-pager-wrapper order-pager-wrapper-bottom">
                         <?= $block->getPagerHtml() ?>
@@ -77,7 +79,7 @@
         </tfoot>
     </table>
 </div>
-<?php if ($giftMessage): ?>
+<?php if ($giftMessage) : ?>
 <script type="text/x-magento-init">
     {
         "a.action.show, a.action.close": {
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml
index d4550dd4f01c3..aec0ec6b4fe2d 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
@@ -4,69 +4,67 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var  $block \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer */
 $_item = $block->getItem();
 ?>
-<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
+<tr id="order-item-row-<?= (int) $_item->getId() ?>">
     <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
         <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
-        <?php if ($_options = $block->getItemOptions()): ?>
-        <dl class="item-options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$block->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                <dd>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                        <?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?>
-                    <?php else: ?>
-                        <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
-                    <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd>
-                    <?= nl2br($block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value']))) ?>
-                </dd>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
+        <?php if ($_options = $block->getItemOptions()) : ?>
+            <dl class="item-options">
+            <?php foreach ($_options as $_option) : ?>
+                <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                <?php if (!$block->getPrintStatus()) : ?>
+                    <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
+                    <dd>
+                        <?php if (isset($_formatedOptionValue['full_view'])) : ?>
+                            <?= $block->escapeHtml($_formatedOptionValue['full_view'], ['a']) ?>
+                        <?php else : ?>
+                            <?=$block->escapeHtml($_formatedOptionValue['value'], ['a']) ?>
+                        <?php endif; ?>
+                    </dd>
+                <?php else : ?>
+                    <dd>
+                        <?= /* @noEscape */ nl2br($block->escapeHtml($_option['print_value'] ?? $_option['value'])) ?>
+                    </dd>
+                <?php endif; ?>
+            <?php endforeach; ?>
+            </dl>
         <?php endif; ?>
         <?php $addtInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addtInfoBlock) :?>
+        <?php if ($addtInfoBlock) : ?>
             <?= $addtInfoBlock->setItem($_item)->toHtml() ?>
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
+    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
     <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
         <?= $block->getItemPriceHtml() ?>
     </td>
     <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>">
         <ul class="items-qty">
-        <?php if ($block->getItem()->getQtyOrdered() > 0): ?>
+        <?php if ($block->getItem()->getQtyOrdered() > 0) : ?>
             <li class="item">
-                <span class="title"><?= /* @escapeNotVerified */ __('Ordered') ?></span>
-                <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyOrdered()*1 ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Ordered')) ?></span>
+                <span class="content"><?= (int) $block->getItem()->getQtyOrdered() ?></span>
             </li>
         <?php endif; ?>
-        <?php if ($block->getItem()->getQtyShipped() > 0): ?>
+        <?php if ($block->getItem()->getQtyShipped() > 0) : ?>
             <li class="item">
-                <span class="title"><?= /* @escapeNotVerified */ __('Shipped') ?></span>
-                <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyShipped()*1 ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Shipped')) ?></span>
+                <span class="content"><?= (int) $block->getItem()->getQtyShipped() ?></span>
             </li>
         <?php endif; ?>
-        <?php if ($block->getItem()->getQtyCanceled() > 0): ?>
+        <?php if ($block->getItem()->getQtyCanceled() > 0) : ?>
             <li class="item">
-                <span class="title"><?= /* @escapeNotVerified */ __('Canceled') ?></span>
-                <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyCanceled()*1 ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Canceled')) ?></span>
+                <span class="content"><?= (int) $block->getItem()->getQtyCanceled() ?></span>
             </li>
         <?php endif; ?>
-        <?php if ($block->getItem()->getQtyRefunded() > 0): ?>
+        <?php if ($block->getItem()->getQtyRefunded() > 0) : ?>
             <li class="item">
-                <span class="title"><?= /* @escapeNotVerified */ __('Refunded') ?></span>
-                <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyRefunded()*1 ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Refunded')) ?></span>
+                <span class="content"><?= (int) $block->getItem()->getQtyRefunded() ?></span>
             </li>
         <?php endif; ?>
         </ul>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml b/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml
index 8a8e7b1194caa..6f2d8d87ade86 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml
@@ -3,24 +3,23 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var  $block \Magento\Sales\Block\Order\View*/?>
 
 <?php $_history = $block->getOrder()->getVisibleStatusHistory() ?>
-<?php if (count($_history)): ?>
+<?php if (!empty($_history)) : ?>
     <div class="block block-order-details-comments">
-        <div class="block-title"><strong><?= /* @escapeNotVerified */ __('About Your Order') ?></strong></div>
+        <div class="block-title"><strong><?= $block->escapeHtml(__('About Your Order')) ?></strong></div>
         <div class="block-content">
             <dl class="order-comments">
-                <?php foreach ($_history as $_historyItem): ?>
-                    <dt class="comment-date"><?= /* @escapeNotVerified */ $block->formatDate($_historyItem->getCreatedAt(), \IntlDateFormatter::MEDIUM, true) ?></dt>
+                <?php foreach ($_history as $_historyItem) : ?>
+                    <dt class="comment-date">
+                        <?= /* @noEscape */
+                        $block->formatDate($_historyItem->getCreatedAt(), \IntlDateFormatter::MEDIUM, true) ?>
+                    </dt>
                     <dd class="comment-content"><?= $block->escapeHtml($_historyItem->getComment()) ?></dd>
                 <?php endforeach; ?>
             </dl>
-
         </div>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml b/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml
index bcd7cc6e0260d..80a0ea02499cc 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml
@@ -3,11 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-
 <div class="order-date">
-    <?= /* @escapeNotVerified */ __('<span class="label">Order Date:</span> %1', '<date>' . $block->formatDate($block->getOrder()->getCreatedAt(), \IntlDateFormatter::LONG) . '</date>') ?>
+    <?= $block->escapeHtml(__('<span class="label">Order Date:</span> %1', '<date>' . $block->formatDate($block->getOrder()->getCreatedAt(), \IntlDateFormatter::LONG) . '</date>'), ['span', 'date']) ?>
 </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/order_status.phtml b/app/code/Magento/Sales/view/frontend/templates/order/order_status.phtml
index c77014d1bf8c9..7a3ff4398d983 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/order_status.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/order_status.phtml
@@ -6,4 +6,4 @@
 ?>
 <?php /** @var $block \Magento\Sales\Block\Order\Info */ ?>
 
-<span class="order-status"><?= /* @escapeNotVerified */ $block->getOrder()->getStatusLabel() ?></span>
+<span class="order-status"><?= $block->escapeHtml($block->getOrder()->getStatusLabel()) ?></span>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
index 567dfc20f2de2..05c6048ee15ae 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
@@ -3,39 +3,36 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php $_order = $block->getOrder() ?>
 <?php $_creditmemo = $block->getCreditmemo() ?>
-<?php if ($_creditmemo): ?>
+<?php if ($_creditmemo) : ?>
     <?php $_creditmemos = [$_creditmemo]; ?>
-<?php else: ?>
+<?php else : ?>
     <?php $_creditmemos = $_order->getCreditmemosCollection() ?>
 <?php endif; ?>
-<?php foreach ($_creditmemos as $_creditmemo): ?>
+<?php foreach ($_creditmemos as $_creditmemo) : ?>
 <div class="order-details-items creditmemo">
     <div class="order-title">
-        <strong><?= /* @escapeNotVerified */ __('Refund #%1', $_creditmemo->getIncrementId()) ?></strong>
+        <strong><?= $block->escapeHtml(__('Refund #%1', $_creditmemo->getIncrementId())) ?></strong>
     </div>
     <div class="table-wrapper order-items-creditmemo">
-        <table class="data table table-order-items creditmemo" id="my-refund-table-<?= /* @escapeNotVerified */ $_creditmemo->getId() ?>">
-            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Refunded') ?></caption>
+        <table class="data table table-order-items creditmemo" id="my-refund-table-<?= (int) $_creditmemo->getId() ?>">
+            <caption class="table-caption"><?= $block->escapeHtml(__('Items Refunded')) ?></caption>
             <thead>
                 <tr>
-                    <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
-                    <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
-                    <th class="col price"><?= /* @escapeNotVerified */ __('Price') ?></th>
-                    <th class="col qty"><?= /* @escapeNotVerified */ __('Qty') ?></th>
-                    <th class="col subtotal"><?= /* @escapeNotVerified */ __('Subtotal') ?></th>
-                    <th class="col discount"><?= /* @escapeNotVerified */ __('Discount Amount') ?></th>
-                    <th class="col rowtotal"><?= /* @escapeNotVerified */ __('Row Total') ?></th>
+                    <th class="col name"><?= $block->escapeHtml(__('Product Name')) ?></th>
+                    <th class="col sku"><?= $block->escapeHtml(__('SKU')) ?></th>
+                    <th class="col price"><?= $block->escapeHtml(__('Price')) ?></th>
+                    <th class="col qty"><?= $block->escapeHtml(__('Qty')) ?></th>
+                    <th class="col subtotal"><?= $block->escapeHtml(__('Subtotal')) ?></th>
+                    <th class="col discount"><?= $block->escapeHtml(__('Discount Amount')) ?></th>
+                    <th class="col rowtotal"><?= $block->escapeHtml(__('Row Total')) ?></th>
                 </tr>
             </thead>
             <?php $_items = $_creditmemo->getAllItems(); ?>
-            <?php foreach ($_items as $_item): ?>
-                <?php if (!$_item->getOrderItem()->getParentItem()): ?>
+            <?php foreach ($_items as $_item) : ?>
+                <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
                     <tbody>
                         <?= $block->getItemHtml($_item) ?>
                     </tbody>
@@ -48,22 +45,22 @@
     </div>
     <div class="block block-order-details-view">
         <div class="block-title">
-            <strong><?= /* @escapeNotVerified */ __('Order Information') ?></strong>
+            <strong><?= $block->escapeHtml(__('Order Information')) ?></strong>
         </div>
         <div class="block-content">
-        <?php if (!$_order->getIsVirtual()): ?>
+        <?php if (!$_order->getIsVirtual()) : ?>
             <div class="box box-order-shipping-address">
                 <div class="box-title">
-                    <strong><?= /* @escapeNotVerified */ __('Shipping Address') ?></strong>
+                    <strong><?= $block->escapeHtml(__('Shipping Address')) ?></strong>
                 </div>
                 <div class="box-content">
                     <?php $_shipping = $_creditmemo->getShippingAddress() ?>
-                    <address><?= /* @escapeNotVerified */ $block->formatAddress($_shipping, 'html') ?></address>
+                    <address><?= /* @noEscape */ $block->formatAddress($_shipping, 'html') ?></address>
                 </div>
             </div>
             <div class="box box-order-shipping-method">
                 <div class="box-title">
-                    <strong><?= /* @escapeNotVerified */ __('Shipping Method') ?></strong>
+                    <strong><?= $block->escapeHtml(__('Shipping Method')) ?></strong>
                 </div>
                 <div class="box-content">
                     <?= $block->escapeHtml($_order->getShippingDescription()) ?>
@@ -72,16 +69,16 @@
         <?php endif; ?>
             <div class="box box-order-billing-address">
                 <div class="box-title">
-                    <strong><?= /* @escapeNotVerified */ __('Billing Address') ?></strong>
+                    <strong><?= $block->escapeHtml(__('Billing Address')) ?></strong>
                 </div>
                 <div class="box-content">
                     <?php $_billing = $_creditmemo->getbillingAddress() ?>
-                    <address><?= /* @escapeNotVerified */ $block->formatAddress($_order->getBillingAddress(), 'html') ?></address>
+                    <address><?= /* @noEscape */ $block->formatAddress($_order->getBillingAddress(), 'html') ?></address>
                 </div>
             </div>
             <div class="box box-order-billing-method">
                 <div class="box-title">
-                    <strong><?= /* @escapeNotVerified */ __('Payment Method') ?></strong>
+                    <strong><?= $block->escapeHtml(__('Payment Method')) ?></strong>
                 </div>
                 <div class="box-content">
                     <?= $block->getPaymentInfoHtml() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
index 6fe6da9e75209..3c0196d59329c 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
@@ -3,37 +3,34 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php $_order = $block->getOrder() ?>
 <?php $_invoice = $block->getInvoice() ?>
-<?php if ($_invoice): ?>
-<?php $_invoices = [$_invoice]; ?>
-<?php else: ?>
-<?php $_invoices = $_order->getInvoiceCollection() ?>
+<?php if ($_invoice) : ?>
+    <?php $_invoices = [$_invoice]; ?>
+<?php else : ?>
+    <?php $_invoices = $_order->getInvoiceCollection() ?>
 <?php endif; ?>
-<?php foreach ($_invoices as $_invoice): ?>
+<?php foreach ($_invoices as $_invoice) : ?>
 <div class="order-details-items invoice">
     <div class="order-title">
-        <strong><?= /* @escapeNotVerified */ __('Invoice #') ?><?= /* @escapeNotVerified */ $_invoice->getIncrementId() ?></strong>
+        <strong><?= $block->escapeHtml(__('Invoice #')) ?><?= (int) $_invoice->getIncrementId() ?></strong>
     </div>
     <div class="table-wrapper table-order-items invoice">
-        <table class="data table table-order-items invoice" id="my-invoice-table-<?= /* @escapeNotVerified */ $_invoice->getId() ?>">
-            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Invoiced') ?></caption>
+        <table class="data table table-order-items invoice" id="my-invoice-table-<?= (int) $_invoice->getId() ?>">
+            <caption class="table-caption"><?= $block->escapeHtml(__('Items Invoiced')) ?></caption>
             <thead>
             <tr>
-                <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
-                <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
-                <th class="col price"><?= /* @escapeNotVerified */ __('Price') ?></th>
-                <th class="col qty"><?= /* @escapeNotVerified */ __('Qty Invoiced') ?></th>
-                <th class="col subtotal"><?= /* @escapeNotVerified */ __('Subtotal') ?></th>
+                <th class="col name"><?= $block->escapeHtml(__('Product Name')) ?></th>
+                <th class="col sku"><?= $block->escapeHtml(__('SKU')) ?></th>
+                <th class="col price"><?= $block->escapeHtml(__('Price')) ?></th>
+                <th class="col qty"><?= $block->escapeHtml(__('Qty Invoiced')) ?></th>
+                <th class="col subtotal"><?= $block->escapeHtml(__('Subtotal')) ?></th>
             </tr>
             </thead>
             <?php $_items = $_invoice->getItemsCollection(); ?>
-            <?php foreach ($_items as $_item): ?>
-                <?php if (!$_item->getOrderItem()->getParentItem()): ?>
+            <?php foreach ($_items as $_item) : ?>
+                <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
                     <tbody>
                         <?= $block->getItemHtml($_item) ?>
                     </tbody>
@@ -46,46 +43,46 @@
     </div>
     <div class="block block-order-details-view">
         <div class="block-title">
-            <strong><?= /* @escapeNotVerified */ __('Order Information') ?></strong>
+            <strong><?= $block->escapeHtml(__('Order Information')) ?></strong>
         </div>
         <div class="block-content">
-        <?php if (!$_order->getIsVirtual()): ?>
+        <?php if (!$_order->getIsVirtual()) : ?>
             <div class="box box-order-shipping-address">
                 <div class="box-title">
-                    <strong><?= /* @escapeNotVerified */ __('Shipping Address') ?></strong>
+                    <strong><?= $block->escapeHtml(__('Shipping Address')) ?></strong>
                 </div>
                 <div class="box-content">
                     <?php $_shipping = $_invoice->getShippingAddress() ?>
-                    <address><?= /* @escapeNotVerified */ $block->formatAddress($_shipping, 'html') ?></address>
+                    <address><?= /* @noEscape */ $block->formatAddress($_shipping, 'html') ?></address>
                 </div>
             </div>
 
             <div class="box box-order-shipping-method">
                 <div class="box-title">
-                    <strong><?= /* @escapeNotVerified */ __('Shipping Method') ?></strong>
+                    <strong><?= $block->escapeHtml(__('Shipping Method')) ?></strong>
                 </div>
                 <div class="box-content">
-                    <?php if ($_order->getShippingDescription()): ?>
+                    <?php if ($_order->getShippingDescription()) : ?>
                         <?= $block->escapeHtml($_order->getShippingDescription()) ?>
-                    <?php else: ?>
-                        <?= /* @escapeNotVerified */ __('No shipping information available') ?>
+                    <?php else : ?>
+                        <?= $block->escapeHtml(__('No shipping information available')) ?>
                     <?php endif; ?>
                 </div>
             </div>
         <?php endif; ?>
             <div class="box box-order-billing-address">
                 <div class="box-title">
-                    <strong><?= /* @escapeNotVerified */ __('Billing Address') ?></strong>
+                    <strong><?= $block->escapeHtml(__('Billing Address')) ?></strong>
                 </div>
                 <div class="box-content">
                     <?php $_billing = $_invoice->getbillingAddress() ?>
-                    <address><?= /* @escapeNotVerified */ $block->formatAddress($_order->getBillingAddress(), 'html') ?></address>
+                    <address><?= /* @noEscape */ $block->formatAddress($_order->getBillingAddress(), 'html') ?></address>
                 </div>
             </div>
 
             <div class="box box-order-billing-method">
                 <div class="box-title">
-                    <strong><?= /* @escapeNotVerified */ __('Payment Method') ?></strong>
+                    <strong><?= $block->escapeHtml(__('Payment Method')) ?></strong>
                 </div>
                 <div class="box-content">
                     <?= $block->getPaymentInfoHtml() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
index d1110d1a8d380..3f12ca1f7b270 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
@@ -3,86 +3,83 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /* @var $block \Magento\Sales\Block\Order\PrintOrder\Shipment */ ?>
 <?php $order = $block->getOrder(); ?>
-<?php if (!$block->getObjectData($order, 'is_virtual')): ?>
-<?php foreach ($block->getShipmentsCollection() as $shipment): ?>
-    <div class="order-details-items shipments">
-        <div class="order-title">
-            <strong><?= /* @escapeNotVerified */ __('Shipment #%1', $block->getObjectData($shipment, 'increment_id')) ?></strong>
-        </div>
-        <div class="table-wrapper order-items-shipment">
-            <table class="data table table-order-items shipment" id="my-shipment-table-<?= /* @escapeNotVerified */ $block->getObjectData($shipment, 'id') ?>">
-                <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Invoiced') ?></caption>
-                <thead>
-                <tr>
-                    <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
-                    <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
-                    <th class="col price"><?= /* @escapeNotVerified */ __('Qty Shipped') ?></th>
-                </tr>
-                </thead>
-                <?php foreach ($block->getShipmentItems($shipment) as $item): ?>
-                <tbody>
-                    <?= $block->getItemHtml($item) ?>
-                </tbody>
-                <?php endforeach; ?>
-            </table>
-        </div>
-        <div class="block block-order-details-view">
-            <div class="block-title">
-                <strong><?= /* @escapeNotVerified */ __('Order Information') ?></strong>
+<?php if (!$block->getObjectData($order, 'is_virtual')) : ?>
+    <?php foreach ($block->getShipmentsCollection() as $shipment) : ?>
+        <div class="order-details-items shipments">
+            <div class="order-title">
+                <strong><?= $block->escapeHtml(__('Shipment #%1', $block->getObjectData($shipment, 'increment_id'))) ?></strong>
             </div>
-            <div class="block-content">
-                <div class="box box-order-shipping-address">
-                    <div class="box-title">
-                        <strong><?= /* @escapeNotVerified */ __('Shipping Address') ?></strong>
-                    </div>
-                    <div class="box-content">
-                        <address><?= $block->getShipmentAddressFormattedHtml($shipment) ?></address>
-                    </div>
+            <div class="table-wrapper order-items-shipment">
+                <table class="data table table-order-items shipment" id="my-shipment-table-<?= (int) $block->getObjectData($shipment, 'id') ?>">
+                    <caption class="table-caption"><?= $block->escapeHtml(__('Items Invoiced')) ?></caption>
+                    <thead>
+                    <tr>
+                        <th class="col name"><?= $block->escapeHtml(__('Product Name')) ?></th>
+                        <th class="col sku"><?= $block->escapeHtml(__('SKU')) ?></th>
+                        <th class="col price"><?= $block->escapeHtml(__('Qty Shipped')) ?></th>
+                    </tr>
+                    </thead>
+                    <?php foreach ($block->getShipmentItems($shipment) as $item) : ?>
+                        <tbody>
+                            <?= $block->getItemHtml($item) ?>
+                        </tbody>
+                    <?php endforeach; ?>
+                </table>
+            </div>
+            <div class="block block-order-details-view">
+                <div class="block-title">
+                    <strong><?= $block->escapeHtml(__('Order Information')) ?></strong>
                 </div>
-
-                <div class="box box-order-shipping-method">
-                    <div class="box-title">
-                        <strong><?= /* @escapeNotVerified */ __('Shipping Method') ?></strong>
+                <div class="block-content">
+                    <div class="box box-order-shipping-address">
+                        <div class="box-title">
+                            <strong><?= $block->escapeHtml(__('Shipping Address')) ?></strong>
+                        </div>
+                        <div class="box-content">
+                            <address><?= $block->getShipmentAddressFormattedHtml($shipment) ?></address>
+                        </div>
                     </div>
-                    <div class="box-content">
-                    <?= $block->escapeHtml($block->getObjectData($order, 'shipping_description')) ?>
-                    <?php $tracks = $block->getShipmentTracks($shipment);
-                    if ($tracks): ?>
-                        <dl class="order-tracking">
-                        <?php foreach ($tracks as $track): ?>
-                            <dt class="tracking-title"><?= $block->escapeHtml($block->getObjectData($track, 'title')) ?></dt>
-                            <dd class="tracking-content"><?= $block->escapeHtml($block->getObjectData($track, 'number')) ?></dd>
+
+                    <div class="box box-order-shipping-method">
+                        <div class="box-title">
+                            <strong><?= $block->escapeHtml(__('Shipping Method')) ?></strong>
+                        </div>
+                        <div class="box-content">
+                        <?= $block->escapeHtml($block->getObjectData($order, 'shipping_description')) ?>
+                        <?php $tracks = $block->getShipmentTracks($shipment);
+                        if ($tracks) : ?>
+                            <dl class="order-tracking">
+                            <?php foreach ($tracks as $track) : ?>
+                                <dt class="tracking-title"><?= $block->escapeHtml($block->getObjectData($track, 'title')) ?></dt>
+                                <dd class="tracking-content"><?= $block->escapeHtml($block->getObjectData($track, 'number')) ?></dd>
                             <?php endforeach; ?>
-                        </dl>
-                    <?php endif; ?>
+                            </dl>
+                        <?php endif; ?>
+                        </div>
                     </div>
-                </div>
 
-                <div class="box box-order-billing-method">
-                    <div class="box-title">
-                        <strong><?= /* @escapeNotVerified */ __('Billing Address') ?></strong>
+                    <div class="box box-order-billing-method">
+                        <div class="box-title">
+                            <strong><?= $block->escapeHtml(__('Billing Address')) ?></strong>
+                        </div>
+                        <div class="box-content">
+                            <address><?= $block->getBillingAddressFormattedHtml($order) ?></address>
+                        </div>
                     </div>
-                    <div class="box-content">
-                        <address><?= $block->getBillingAddressFormattedHtml($order) ?></address>
-                    </div>
-                </div>
 
-                <div class="box box-order-billing-method">
-                    <div class="box-title">
-                        <strong><?= /* @escapeNotVerified */ __('Payment Method') ?></strong>
-                    </div>
-                    <div class="box-content">
-                        <?= $block->getPaymentInfoHtml() ?>
+                    <div class="box box-order-billing-method">
+                        <div class="box-title">
+                            <strong><?= $block->escapeHtml(__('Payment Method')) ?></strong>
+                        </div>
+                        <div class="box-content">
+                            <?= $block->getPaymentInfoHtml() ?>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
     <?php endforeach; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml b/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
index bb354e920c529..e87b33b39da2f 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
@@ -4,8 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 
+/** @var $block \Magento\Sales\Block\Order\Recent */
 ?>
 <div class="block block-dashboard-orders">
 <?php
@@ -13,47 +14,49 @@
     $count = count($_orders);
 ?>
     <div class="block-title order">
-        <strong><?= /* @escapeNotVerified */ __('Recent Orders') ?></strong>
-        <?php if ($count > 0): ?>
-            <a class="action view" href="<?= /* @escapeNotVerified */ $block->getUrl('sales/order/history') ?>">
-                <span><?= /* @escapeNotVerified */ __('View All') ?></span>
+        <strong><?= $block->escapeHtml(__('Recent Orders')) ?></strong>
+        <?php if ($count > 0) : ?>
+            <a class="action view" href="<?= $block->escapeUrl($block->getUrl('sales/order/history')) ?>">
+                <span><?= $block->escapeHtml(__('View All')) ?></span>
             </a>
         <?php endif; ?>
     </div>
     <div class="block-content">
     <?= $block->getChildHtml() ?>
-    <?php if ($count > 0): ?>
+    <?php if ($count > 0) : ?>
         <div class="table-wrapper orders-recent">
             <table class="data table table-order-items recent" id="my-orders-table">
-                <caption class="table-caption"><?= /* @escapeNotVerified */ __('Recent Orders') ?></caption>
+                <caption class="table-caption"><?= $block->escapeHtml(__('Recent Orders')) ?></caption>
                 <thead>
                     <tr>
-                        <th scope="col" class="col id"><?= /* @escapeNotVerified */ __('Order #') ?></th>
-                        <th scope="col" class="col date"><?= /* @escapeNotVerified */ __('Date') ?></th>
-                        <th scope="col" class="col shipping"><?= /* @escapeNotVerified */ __('Ship To') ?></th>
-                        <th scope="col" class="col total"><?= /* @escapeNotVerified */ __('Order Total') ?></th>
-                        <th scope="col" class="col status"><?= /* @escapeNotVerified */ __('Status') ?></th>
-                        <th scope="col" class="col actions"><?= /* @escapeNotVerified */ __('Action') ?></th>
+                        <th scope="col" class="col id"><?= $block->escapeHtml(__('Order #')) ?></th>
+                        <th scope="col" class="col date"><?= $block->escapeHtml(__('Date')) ?></th>
+                        <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>
                     </tr>
                 </thead>
                 <tbody>
-                    <?php foreach ($_orders as $_order): ?>
+                    <?php foreach ($_orders as $_order) : ?>
                         <tr>
-                            <td data-th="<?= $block->escapeHtml(__('Order #')) ?>" class="col id"><?= /* @escapeNotVerified */ $_order->getRealOrderId() ?></td>
-                            <td data-th="<?= $block->escapeHtml(__('Date')) ?>" class="col date"><?= /* @escapeNotVerified */ $block->formatDate($_order->getCreatedAt()) ?></td>
-                            <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"><?= /* @escapeNotVerified */ $_order->formatPrice($_order->getGrandTotal()) ?></td>
-                            <td data-th="<?= $block->escapeHtml(__('Status')) ?>" class="col status"><?= /* @escapeNotVerified */ $_order->getStatusLabel() ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Order #')) ?>" class="col id"><?= $block->escapeHtml($_order->getRealOrderId()) ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Date')) ?>" class="col date"><?= /* @noEscape */ $block->formatDate($_order->getCreatedAt()) ?></td>
+                            <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">
-                                <a href="<?= /* @escapeNotVerified */ $block->getViewUrl($_order) ?>" class="action view">
-                                    <span><?= /* @escapeNotVerified */ __('View Order') ?></span>
+                                <a href="<?= $block->escapeUrl($block->getViewUrl($_order)) ?>" class="action view">
+                                    <span><?= $block->escapeHtml(__('View Order')) ?></span>
                                 </a>
-                                <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order->getEntityId())) : ?>
-                                    <a href="#" data-post='<?php /* @escapeNotVerified */ echo
+                                <?php if ($this->helper(\Magento\Sales\Helper\Reorder::class)
+                                    ->canReorder($_order->getEntityId())
+                                ) : ?>
+                                    <a href="#" data-post='<?= /* @noEscape */
                                     $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
                                         ->getPostData($block->getReorderUrl($_order))
                                     ?>' class="action order">
-                                        <span><?= /* @escapeNotVerified */ __('Reorder') ?></span>
+                                        <span><?= $block->escapeHtml(__('Reorder')) ?></span>
                                     </a>
                                 <?php endif ?>
                             </td>
@@ -62,8 +65,8 @@
                 </tbody>
             </table>
         </div>
-    <?php else: ?>
-        <div class="message info empty"><span><?= /* @escapeNotVerified */ __('You have placed no orders.') ?></span></div>
+    <?php else : ?>
+        <div class="message info empty"><span><?= $block->escapeHtml(__('You have placed no orders.')) ?></span></div>
     <?php endif; ?>
     </div>
 </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml
index b46e8d115480e..57aeffb26f823 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
@@ -3,44 +3,41 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
+<tr id="order-item-row-<?= (int) $_item->getId() ?>">
     <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
         <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
-        <?php if ($_options = $block->getItemOptions()): ?>
-        <dl class="item options">
-        <?php foreach ($_options as $_option) : ?>
-            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-            <?php if (!$block->getPrintStatus()): ?>
-                <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                    <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
-                    <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                    <div class="tooltip content">
-                        <dl class="item options">
-                            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
-                        </dl>
-                    </div>
-                    <?php endif; ?>
-                </dd>
-            <?php else: ?>
-                <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        </dl>
+        <?php if ($_options = $block->getItemOptions()) : ?>
+            <dl class="item options">
+            <?php foreach ($_options as $_option) : ?>
+                <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                <?php if (!$block->getPrintStatus()) : ?>
+                    <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
+                    <dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
+                        <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
+                        <?php if (isset($_formatedOptionValue['full_view'])) : ?>
+                        <div class="tooltip content">
+                            <dl class="item options">
+                                <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                                <dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
+                            </dl>
+                        </div>
+                        <?php endif; ?>
+                    </dd>
+                <?php else : ?>
+                    <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
+                <?php endif; ?>
+            <?php endforeach; ?>
+            </dl>
         <?php endif; ?>
         <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
-        <?php if ($addInfoBlock) :?>
+        <?php if ($addInfoBlock) : ?>
             <?= $addInfoBlock->setItem($_item->getOrderItem())->toHtml() ?>
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
-    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Shipped')) ?>"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
+    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
+    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Shipped')) ?>"><?= (int) $_item->getQty() ?></td>
 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/totals.phtml b/app/code/Magento/Sales/view/frontend/templates/order/totals.phtml
index 8f0e884a22953..7a88f14eb0715 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/totals.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/totals.phtml
@@ -4,32 +4,30 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var $block \Magento\Sales\Block\Order\Totals
  * @see \Magento\Sales\Block\Order\Totals
  */
 ?>
-<?php foreach ($block->getTotals() as $_code => $_total): ?>
-    <?php if ($_total->getBlockName()): ?>
+<?php foreach ($block->getTotals() as $_code => $_total) : ?>
+    <?php if ($_total->getBlockName()) : ?>
         <?= $block->getChildHtml($_total->getBlockName(), false) ?>
-    <?php else:?>
-    <tr class="<?= /* @escapeNotVerified */ $_code ?>">
-        <th <?= /* @escapeNotVerified */ $block->getLabelProperties() ?> scope="row">
-            <?php if ($_total->getStrong()):?>
-            <strong><?= $block->escapeHtml($_total->getLabel()) ?></strong>
-            <?php else:?>
-            <?= $block->escapeHtml($_total->getLabel()) ?>
-            <?php endif?>
+    <?php else :?>
+    <tr class="<?= $block->escapeHtmlAttr($_code) ?>">
+        <th <?= /* @noEscape */ $block->getLabelProperties() ?> scope="row">
+            <?php if ($_total->getStrong()) : ?>
+                <strong><?= $block->escapeHtml($_total->getLabel()) ?></strong>
+            <?php else : ?>
+                <?= $block->escapeHtml($_total->getLabel()) ?>
+            <?php endif ?>
         </th>
-        <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?> data-th="<?= $block->escapeHtml($_total->getLabel()) ?>">
-            <?php if ($_total->getStrong()):?>
-            <strong><?= /* @escapeNotVerified */ $block->formatValue($_total) ?></strong>
-            <?php else:?>
-            <?= /* @escapeNotVerified */ $block->formatValue($_total) ?>
+        <td <?= /* @noEscape */ $block->getValueProperties() ?> data-th="<?= $block->escapeHtmlAttr($_total->getLabel()) ?>">
+            <?php if ($_total->getStrong()) : ?>
+                <strong><?= /* @noEscape */ $block->formatValue($_total) ?></strong>
+            <?php else : ?>
+                <?= /* @noEscape */ $block->formatValue($_total) ?>
             <?php endif?>
         </td>
     </tr>
-    <?php endif?>
+    <?php endif; ?>
 <?php endforeach?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/view.phtml b/app/code/Magento/Sales/view/frontend/templates/order/view.phtml
index 1cb8533763759..273554667ffe4 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/view.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/view.phtml
@@ -4,31 +4,37 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php /** @var  $block \Magento\Sales\Block\Order\View*/?>
 <div class="order-details-items ordered">
     <?php $_order = $block->getOrder() ?>
 
     <div class="order-title">
-        <strong><?= /* @escapeNotVerified */ __('Items Ordered') ?></strong>
-        <?php if ($_order->getTracksCollection()->count()) : ?>
+        <strong><?= $block->escapeHtml(__('Items Ordered')) ?></strong>
+        <?php if (!empty($_order->getTracksCollection()->getItems())) : ?>
             <?= $block->getChildHtml('tracking-info-link') ?>
         <?php endif; ?>
     </div>
 
     <?= $block->getChildHtml('order_items') ?>
 
-    <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order', $_order) && $_order->getGiftMessageId()): ?>
+    <?php if ($this->helper(\Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('order', $_order)
+        && $_order->getGiftMessageId()
+    ) : ?>
     <div class="block block-order-details-gift-message">
-        <div class="block-title"><strong><?= /* @escapeNotVerified */ __('Gift Message for This Order') ?></strong></div>
-        <?php $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessageForEntity($_order); ?>
+        <div class="block-title"><strong><?= $block->escapeHtml(__('Gift Message for This Order')) ?></strong></div>
+        <?php
+        $_giftMessage = $this->helper(\Magento\GiftMessage\Helper\Message::class)->getGiftMessageForEntity($_order);
+        ?>
         <div class="block-content">
             <dl class="item-options">
-                <dt class="item-sender"><strong class="label"><?= /* @escapeNotVerified */ __('From') ?></strong><?= $block->escapeHtml($_giftMessage->getSender()) ?></dt>
-                <dt class="item-recipient"><strong class="label"><?= /* @escapeNotVerified */ __('To') ?></strong><?= $block->escapeHtml($_giftMessage->getRecipient()) ?></dt>
-                <dd class="item-message"><?= /* @escapeNotVerified */ $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($_order) ?></dd>
+                <dt class="item-sender"><strong class="label"><?= $block->escapeHtml(__('From')) ?></strong><?= $block->escapeHtml($_giftMessage->getSender()) ?></dt>
+                <dt class="item-recipient"><strong class="label"><?= $block->escapeHtml(__('To')) ?></strong><?= $block->escapeHtml($_giftMessage->getRecipient()) ?></dt>
+                <dd class="item-message">
+                    <?= /* @noEscape */
+                    $this->helper(\Magento\GiftMessage\Helper\Message::class)->getEscapedGiftMessage($_order) ?>
+                </dd>
             </dl>
         </div>
     </div>
@@ -36,8 +42,8 @@
 
     <div class="actions-toolbar">
         <div class="secondary">
-            <a class="action back" href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>">
-                <span><?= /* @escapeNotVerified */ $block->getBackTitle() ?></span>
+            <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>">
+                <span><?= $block->escapeHtml($block->getBackTitle()) ?></span>
             </a>
         </div>
     </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml b/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
index 9b3633fde60b4..ba1204fac8ec5 100644
--- a/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * Last ordered items sidebar
  *
@@ -15,27 +13,27 @@
 <div class="block block-reorder" data-bind="scope: 'lastOrderedItems'">
     <div class="block-title no-display"
          data-bind="css: {'no-display': !lastOrderedItems().items || lastOrderedItems().items.length === 0}">
-        <strong id="block-reorder-heading" role="heading" aria-level="2"><?= /* @escapeNotVerified */ __('Recently Ordered') ?></strong>
+        <strong id="block-reorder-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Recently Ordered')) ?></strong>
     </div>
     <div class="block-content no-display"
          data-bind="css: {'no-display': !lastOrderedItems().items || lastOrderedItems().items.length === 0}"
          aria-labelledby="block-reorder-heading">
         <form method="post" class="form reorder"
-              action="<?= /* @escapeNotVerified */ $block->getFormActionUrl() ?>" id="reorder-validate-detail">
-            <strong class="subtitle"><?= /* @escapeNotVerified */ __('Last Ordered Items') ?></strong>
+              action="<?= $block->escapeUrl($block->getFormActionUrl()) ?>" id="reorder-validate-detail">
+            <strong class="subtitle"><?= $block->escapeHtml(__('Last Ordered Items')) ?></strong>
             <ol id="cart-sidebar-reorder" class="product-items product-items-names"
                 data-bind="foreach: lastOrderedItems().items">
                 <li class="product-item">
                     <div class="field item choice">
                         <label class="label" data-bind="attr: {'for': 'reorder-item-' + id}">
-                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
+                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                         </label>
                         <div class="control">
                             <input type="checkbox" name="order_items[]"
                                    data-bind="attr: {
                                         id: 'reorder-item-' + id,
                                         value: id,
-                                        title: is_saleable ? '<?= /* @escapeNotVerified */ __('Add to Cart') ?>' : '<?= /* @escapeNotVerified */ __('Product is not salable.') ?>'
+                                        title: is_saleable ? '<?= $block->escapeHtml(__('Add to Cart')) ?>' : '<?= $block->escapeHtml(__('Product is not salable.')) ?>'
                                    },
                                    disable: !is_saleable"
                                    class="checkbox" data-validate='{"validate-one-checkbox-required-by-name": true}'/>
@@ -52,13 +50,13 @@
             <div class="actions-toolbar">
                 <div class="primary"
                      data-bind="visible: isShowAddToCart">
-                    <button type="submit" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>" class="action tocart primary">
-                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
+                    <button type="submit" title="<?= $block->escapeHtml(__('Add to Cart')) ?>" class="action tocart primary">
+                        <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                     </button>
                 </div>
                 <div class="secondary">
-                    <a class="action view" href="<?= /* @escapeNotVerified */ $block->getUrl('customer/account') ?>">
-                        <span><?= /* @escapeNotVerified */ __('View All') ?></span>
+                    <a class="action view" href="<?= $block->escapeUrl($block->getUrl('customer/account')) ?>#my-orders-table">
+                        <span><?= $block->escapeHtml(__('View All')) ?></span>
                     </a>
                 </div>
             </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml b/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml
index ac428283dfcb0..25926688c6f47 100644
--- a/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml
@@ -4,31 +4,29 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Sales\Block\Widget\Guest\Form */
 ?>
-<?php if ($block->isEnable()): ?>
+<?php if ($block->isEnable()) : ?>
     <div class="widget block block-orders-returns">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ __('Orders and Returns') ?></strong>
+            <strong role="heading" aria-level="2"><?= $block->escapeHtml(__('Orders and Returns')) ?></strong>
         </div>
         <div class="block-content">
-            <form id="oar-widget-orders-and-returns-form" data-mage-init='{"ordersReturns":{},"validation":{}}' action="<?= /* @escapeNotVerified */ $block->getActionUrl() ?>" method="post"
+            <form id="oar-widget-orders-and-returns-form" data-mage-init='{"ordersReturns":{},"validation":{}}' action="<?= $block->escapeUrl($block->getActionUrl()) ?>" method="post"
                   class="form form-orders-search" name="guest_post">
                 <fieldset class="fieldset">
                     <div class="field find required">
-                        <label class="label"><span><?= /* @escapeNotVerified */ __('Find Order By') ?></span></label>
+                        <label class="label"><span><?= $block->escapeHtml(__('Find Order By')) ?></span></label>
 
                         <div class="control">
                             <select name="oar_type" id="quick-search-type-id" class="select" title="">
-                                <option value="email"><?= /* @escapeNotVerified */ __('Email') ?></option>
-                                <option value="zip"><?= /* @escapeNotVerified */ __('ZIP Code') ?></option>
+                                <option value="email"><?= $block->escapeHtml(__('Email')) ?></option>
+                                <option value="zip"><?= $block->escapeHtml(__('ZIP Code')) ?></option>
                             </select>
                         </div>
                     </div>
                     <div class="field id required">
-                        <label for="oar-order-id" class="label"><span><?= /* @escapeNotVerified */ __('Order ID') ?></span></label>
+                        <label for="oar-order-id" class="label"><span><?= $block->escapeHtml(__('Order ID')) ?></span></label>
 
                         <div class="control">
                             <input type="text" class="input-text" id="oar-order-id" name="oar_order_id" autocomplete="off"
@@ -37,7 +35,7 @@
                     </div>
                     <div class="field lastname required">
                         <label for="oar-billing-lastname"
-                               class="label"><span><?= /* @escapeNotVerified */ __('Billing Last Name') ?></span></label>
+                               class="label"><span><?= $block->escapeHtml(__('Billing Last Name')) ?></span></label>
 
                         <div class="control">
                             <input type="text" class="input-text" id="oar-billing-lastname" name="oar_billing_lastname"
@@ -45,7 +43,7 @@
                         </div>
                     </div>
                     <div id="oar-email" class="field email required">
-                        <label for="oar_email" class="label"><span><?= /* @escapeNotVerified */ __('Email') ?></span></label>
+                        <label for="oar_email" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
 
                         <div class="control">
                             <input type="email" class="input-text" id="oar_email" name="oar_email" autocomplete="off"
@@ -53,7 +51,7 @@
                         </div>
                     </div>
                     <div id="oar-zip" style="display: none;" class="field zip required">
-                        <label for="oar_zip" class="label"><span><?= /* @escapeNotVerified */ __('Billing ZIP Code') ?></span></label>
+                        <label for="oar_zip" class="label"><span><?= $block->escapeHtml(__('Billing ZIP Code')) ?></span></label>
 
                         <div class="control">
                             <input type="text" class="input-text" id="oar_zip" name="oar_zip"
@@ -64,7 +62,7 @@
                 <div class="actions-toolbar">
                     <div class="primary">
                         <button type="submit" title="<?= $block->escapeHtml(__('Search')) ?>" class="action search">
-                            <span><?= /* @escapeNotVerified */ __('Search') ?></span>
+                            <span><?= $block->escapeHtml(__('Search')) ?></span>
                         </button>
                     </div>
                 </div>
diff --git a/app/code/Magento/SalesAnalytics/composer.json b/app/code/Magento/SalesAnalytics/composer.json
index 242e2d811a718..6d19d885114b2 100644
--- a/app/code/Magento/SalesAnalytics/composer.json
+++ b/app/code/Magento/SalesAnalytics/composer.json
@@ -2,12 +2,12 @@
     "name": "magento/module-sales-analytics",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*",
         "magento/module-sales": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/SalesInventory/composer.json b/app/code/Magento/SalesInventory/composer.json
index 4dc2c7b9445b5..44cb440a97385 100644
--- a/app/code/Magento/SalesInventory/composer.json
+++ b/app/code/Magento/SalesInventory/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-sales-inventory",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-catalog-inventory": "100.2.*",
         "magento/module-sales": "101.0.*",
         "magento/module-store": "100.2.*",
@@ -10,7 +10,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/DeleteButton.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/DeleteButton.php
index 0cb286056d825..bee7573c1fe2a 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/DeleteButton.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/DeleteButton.php
@@ -26,7 +26,7 @@ public function getButtonData()
                 'class' => 'delete',
                 'on_click' => 'deleteConfirm(\'' . __(
                     'Are you sure you want to delete this?'
-                ) . '\', \'' . $this->urlBuilder->getUrl('*/*/delete', ['id' => $ruleId]) . '\')',
+                ) . '\', \'' . $this->urlBuilder->getUrl('*/*/delete', ['id' => $ruleId]) . '\', {data: {}})',
                 'sort_order' => 20,
             ];
         }
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsMassDelete.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsMassDelete.php
index dcbc290f98579..a55d4c86cfef7 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsMassDelete.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/CouponsMassDelete.php
@@ -12,9 +12,14 @@ class CouponsMassDelete extends \Magento\SalesRule\Controller\Adminhtml\Promo\Qu
      * Coupons mass delete action
      *
      * @return void
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
+        }
+
         $this->_initRule();
         $rule = $this->_coreRegistry->registry(\Magento\SalesRule\Model\RegistryConstants::CURRENT_SALES_RULE);
 
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php
index 9adb62583985d..b505fd1d6a0fb 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php
@@ -6,28 +6,35 @@
  */
 namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
 
+use Magento\Framework\Exception\NotFoundException;
+
 class Delete extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
 {
     /**
      * Delete promo quote action
      *
      * @return void
+     * @throws NotFoundException
      */
     public function execute()
     {
-        $id = $this->getRequest()->getParam('id');
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
+        $id = (int)$this->getRequest()->getParam('id');
         if ($id) {
             try {
                 $model = $this->_objectManager->create(\Magento\SalesRule\Model\Rule::class);
                 $model->load($id);
                 $model->delete();
-                $this->messageManager->addSuccess(__('You deleted the rule.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the rule.'));
                 $this->_redirect('sales_rule/*/');
                 return;
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addError(
+                $this->messageManager->addErrorMessage(
                     __('We can\'t delete the rule right now. Please review the log and try again.')
                 );
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
@@ -35,7 +42,7 @@ public function execute()
                 return;
             }
         }
-        $this->messageManager->addError(__('We can\'t find a rule to delete.'));
+        $this->messageManager->addErrorMessage(__('We can\'t find a rule to delete.'));
         $this->_redirect('sales_rule/*/');
     }
 }
diff --git a/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php b/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php
index 453a022d31397..b9cac227be127 100644
--- a/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php
+++ b/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php
@@ -168,16 +168,10 @@ public function generatePool()
                 ++$attempt;
             } while ($this->getResource()->exists($code));
 
-            $expirationDate = $this->getToDate();
-            if ($expirationDate instanceof \DateTimeInterface) {
-                $expirationDate = $expirationDate->format('Y-m-d H:i:s');
-            }
-
             $coupon->setId(null)
                 ->setRuleId($this->getRuleId())
                 ->setUsageLimit($this->getUsesPerCoupon())
                 ->setUsagePerCustomer($this->getUsagePerCustomer())
-                ->setExpirationDate($expirationDate)
                 ->setCreatedAt($nowTimestamp)
                 ->setType(\Magento\SalesRule\Helper\Coupon::COUPON_TYPE_SPECIFIC_AUTOGENERATED)
                 ->setCode($code)
diff --git a/app/code/Magento/SalesRule/Model/CouponRepository.php b/app/code/Magento/SalesRule/Model/CouponRepository.php
index 99d6727a8be29..5aa66dd1e8ac5 100644
--- a/app/code/Magento/SalesRule/Model/CouponRepository.php
+++ b/app/code/Magento/SalesRule/Model/CouponRepository.php
@@ -119,7 +119,6 @@ public function save(\Magento\SalesRule\Api\Data\CouponInterface $coupon)
                     __('Specified rule does not allow auto generated coupons')
                 );
             }
-            $coupon->setExpirationDate($rule->getToDate());
             $coupon->setUsageLimit($rule->getUsesPerCoupon());
             $coupon->setUsagePerCustomer($rule->getUsesPerCustomer());
         } catch (\Exception $e) {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php
index 3907261cad1b9..a544355536d6f 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php
@@ -34,14 +34,6 @@ protected function _construct()
      */
     public function _beforeSave(AbstractModel $object)
     {
-        if (!$object->getExpirationDate()) {
-            $object->setExpirationDate(null);
-        } elseif ($object->getExpirationDate() instanceof \DateTimeInterface) {
-            $object->setExpirationDate(
-                $object->getExpirationDate()->format('Y-m-d H:i:s')
-            );
-        }
-
         // maintain single primary coupon per rule
         $object->setIsPrimary($object->getIsPrimary() ? 1 : null);
 
@@ -126,13 +118,6 @@ public function updateSpecificCoupons(\Magento\SalesRule\Model\Rule $rule)
             $updateArray['usage_per_customer'] = $rule->getUsesPerCustomer();
         }
 
-        $ruleNewDate = new \DateTime($rule->getToDate());
-        $ruleOldDate = new \DateTime($rule->getOrigData('to_date'));
-
-        if ($ruleNewDate != $ruleOldDate) {
-            $updateArray['expiration_date'] = $rule->getToDate();
-        }
-
         if (!empty($updateArray)) {
             $this->getConnection()->update(
                 $this->getTable('salesrule_coupon'),
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php
index d8fe830718ce1..8680a91a9acc4 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php
@@ -74,11 +74,11 @@ public function loadByCustomerCoupon(\Magento\Framework\DataObject $object, $cus
             $select = $connection->select()->from(
                 $this->getMainTable()
             )->where(
-                'customer_id =:customet_id'
+                'customer_id =:customer_id'
             )->where(
                 'coupon_id = :coupon_id'
             );
-            $data = $connection->fetchRow($select, [':coupon_id' => $couponId, ':customet_id' => $customerId]);
+            $data = $connection->fetchRow($select, [':coupon_id' => $couponId, ':customer_id' => $customerId]);
             if ($data) {
                 $object->setData($data);
             }
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
index 59f24fa8b6e03..637828c993fa0 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
@@ -9,6 +9,9 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Quote\Model\Quote\Address;
+use Magento\SalesRule\Api\Data\CouponInterface;
+use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\Rule;
 
 /**
  * Sales Rules resource collection model.
@@ -80,6 +83,8 @@ protected function _construct()
     }
 
     /**
+     * Map data for associated entities
+     *
      * @param string $entityType
      * @param string $objectField
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -105,15 +110,20 @@ protected function mapAssociatedEntities($entityType, $objectField)
 
         $associatedEntities = $this->getConnection()->fetchAll($select);
 
-        array_map(function ($associatedEntity) use ($entityInfo, $ruleIdField, $objectField) {
-            $item = $this->getItemByColumnValue($ruleIdField, $associatedEntity[$ruleIdField]);
-            $itemAssociatedValue = $item->getData($objectField) === null ? [] : $item->getData($objectField);
-            $itemAssociatedValue[] = $associatedEntity[$entityInfo['entity_id_field']];
-            $item->setData($objectField, $itemAssociatedValue);
-        }, $associatedEntities);
+        array_map(
+            function ($associatedEntity) use ($entityInfo, $ruleIdField, $objectField) {
+                $item = $this->getItemByColumnValue($ruleIdField, $associatedEntity[$ruleIdField]);
+                $itemAssociatedValue = $item->getData($objectField) === null ? [] : $item->getData($objectField);
+                $itemAssociatedValue[] = $associatedEntity[$entityInfo['entity_id_field']];
+                $item->setData($objectField, $itemAssociatedValue);
+            },
+            $associatedEntities
+        );
     }
 
     /**
+     *  Add website ids and customer group ids to rules data
+     *
      * @return $this
      * @throws \Exception
      * @since 100.1.0
@@ -137,6 +147,7 @@ protected function _afterLoad()
      * @param string $couponCode
      * @param string|null $now
      * @param Address $address allow extensions to further filter out rules based on quote address
+     * @throws \Zend_Db_Select_Exception
      * @use $this->addWebsiteGroupDateFilter()
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @return $this
@@ -149,77 +160,24 @@ public function setValidationFilter(
         Address $address = null
     ) {
         if (!$this->getFlag('validation_filter')) {
-            /* We need to overwrite joinLeft if coupon is applied */
-            $this->getSelect()->reset();
-            parent::_initSelect();
+            $this->prepareSelect($websiteId, $customerGroupId, $now);
 
-            $this->addWebsiteGroupDateFilter($websiteId, $customerGroupId, $now);
-            $select = $this->getSelect();
+            $noCouponRules = $this->getNoCouponCodeSelect();
 
-            $connection = $this->getConnection();
-            if (strlen($couponCode)) {
-                $select->joinLeft(
-                    ['rule_coupons' => $this->getTable('salesrule_coupon')],
-                    $connection->quoteInto(
-                        'main_table.rule_id = rule_coupons.rule_id AND main_table.coupon_type != ?',
-                        \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON
-                    ),
-                    ['code']
-                );
-
-                $noCouponWhereCondition = $connection->quoteInto(
-                    'main_table.coupon_type = ? ',
-                    \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON
-                );
-
-                $autoGeneratedCouponCondition = [
-                    $connection->quoteInto(
-                        "main_table.coupon_type = ?",
-                        \Magento\SalesRule\Model\Rule::COUPON_TYPE_AUTO
-                    ),
-                    $connection->quoteInto(
-                        "rule_coupons.type = ?",
-                        \Magento\SalesRule\Api\Data\CouponInterface::TYPE_GENERATED
-                    ),
-                ];
-
-                $orWhereConditions = [
-                    "(" . implode($autoGeneratedCouponCondition, " AND ") . ")",
-                    $connection->quoteInto(
-                        '(main_table.coupon_type = ? AND main_table.use_auto_generation = 1 AND rule_coupons.type = 1)',
-                        \Magento\SalesRule\Model\Rule::COUPON_TYPE_SPECIFIC
-                    ),
-                    $connection->quoteInto(
-                        '(main_table.coupon_type = ? AND main_table.use_auto_generation = 0 AND rule_coupons.type = 0)',
-                        \Magento\SalesRule\Model\Rule::COUPON_TYPE_SPECIFIC
-                    ),
-                ];
-
-                $andWhereConditions = [
-                    $connection->quoteInto(
-                        'rule_coupons.code = ?',
-                        $couponCode
-                    ),
-                    $connection->quoteInto(
-                        '(rule_coupons.expiration_date IS NULL OR rule_coupons.expiration_date >= ?)',
-                        $this->_date->date()->format('Y-m-d')
-                    ),
-                ];
-
-                $orWhereCondition = implode(' OR ', $orWhereConditions);
-                $andWhereCondition = implode(' AND ', $andWhereConditions);
-
-                $select->where(
-                    $noCouponWhereCondition . ' OR ((' . $orWhereCondition . ') AND ' . $andWhereCondition . ')',
-                    null,
-                    Select::TYPE_CONDITION
-                );
+            if ($couponCode) {
+                $couponRules = $this->getCouponCodeSelect($couponCode);
+
+                $allAllowedRules = $this->getConnection()->select();
+                $allAllowedRules->union([$noCouponRules, $couponRules], Select::SQL_UNION_ALL);
+
+                $wrapper = $this->getConnection()->select();
+                $wrapper->from($allAllowedRules);
+
+                $this->_select = $wrapper;
             } else {
-                $this->addFieldToFilter(
-                    'main_table.coupon_type',
-                    \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON
-                );
+                $this->_select = $noCouponRules;
             }
+
             $this->setOrder('sort_order', self::SORT_ORDER_ASC);
             $this->setFlag('validation_filter', true);
         }
@@ -227,6 +185,96 @@ public function setValidationFilter(
         return $this;
     }
 
+    /**
+     * Recreate the default select object for specific needs of salesrule evaluation with coupon codes.
+     *
+     * @param int $websiteId
+     * @param int $customerGroupId
+     * @param string $now
+     */
+    private function prepareSelect($websiteId, $customerGroupId, $now)
+    {
+        $this->getSelect()->reset();
+        parent::_initSelect();
+
+        $this->addWebsiteGroupDateFilter($websiteId, $customerGroupId, $now);
+    }
+
+    /**
+     * Return select object to determine all active rules not needing a coupon code.
+     *
+     * @return Select
+     */
+    private function getNoCouponCodeSelect()
+    {
+        $noCouponSelect = clone $this->getSelect();
+
+        $noCouponSelect->where(
+            'main_table.coupon_type = ?',
+            Rule::COUPON_TYPE_NO_COUPON
+        );
+
+        $noCouponSelect->columns([Coupon::KEY_CODE => new \Zend_Db_Expr('NULL')]);
+
+        return $noCouponSelect;
+    }
+
+    /**
+     * Determine all active rules that are valid for the given coupon code.
+     *
+     * @param string $couponCode
+     * @return Select
+     */
+    private function getCouponCodeSelect($couponCode)
+    {
+        $couponSelect = clone $this->getSelect();
+
+        $this->joinCouponTable($couponCode, $couponSelect);
+
+        $isAutogenerated =
+            $this->getConnection()->quoteInto('main_table.coupon_type = ?', Rule::COUPON_TYPE_AUTO)
+            . ' AND ' .
+            $this->getConnection()->quoteInto('rule_coupons.type = ?', CouponInterface::TYPE_GENERATED);
+
+        $isValidSpecific =
+            $this->getConnection()->quoteInto('(main_table.coupon_type = ?)', Rule::COUPON_TYPE_SPECIFIC)
+            . ' AND (' .
+            '(main_table.use_auto_generation = 1 AND rule_coupons.type = 1)'
+            . ' OR ' .
+            '(main_table.use_auto_generation = 0 AND rule_coupons.type = 0)'
+            . ')';
+
+        $couponSelect->where(
+            "$isAutogenerated OR $isValidSpecific",
+            null,
+            Select::TYPE_CONDITION
+        );
+
+        return $couponSelect;
+    }
+
+    /**
+     * Join coupon table to select.
+     *
+     * @param string $couponCode
+     * @param Select $couponSelect
+     */
+    private function joinCouponTable($couponCode, Select $couponSelect)
+    {
+        $couponJoinCondition =
+            'main_table.rule_id = rule_coupons.rule_id'
+            . ' AND ' .
+            $this->getConnection()->quoteInto('main_table.coupon_type <> ?', Rule::COUPON_TYPE_NO_COUPON)
+            . ' AND ' .
+            $this->getConnection()->quoteInto('rule_coupons.code = ?', $couponCode);
+
+        $couponSelect->joinInner(
+            ['rule_coupons' => $this->getTable('salesrule_coupon')],
+            $couponJoinCondition,
+            [Coupon::KEY_CODE]
+        );
+    }
+
     /**
      * Filter collection by website(s), customer group(s) and date.
      * Filter collection to only active rules.
@@ -366,6 +414,8 @@ public function addCustomerGroupFilter($customerGroupId)
     }
 
     /**
+     * Getter for _associatedEntitiesMap property
+     *
      * @return array
      * @deprecated 100.1.0
      */
@@ -380,6 +430,8 @@ private function getAssociatedEntitiesMap()
     }
 
     /**
+     * Getter for dateApplier property
+     *
      * @return DateApplier
      * @deprecated 100.1.0
      */
diff --git a/app/code/Magento/SalesRule/Model/Rule.php b/app/code/Magento/SalesRule/Model/Rule.php
index 640398342bb5a..b9342fe7b35b7 100644
--- a/app/code/Magento/SalesRule/Model/Rule.php
+++ b/app/code/Magento/SalesRule/Model/Rule.php
@@ -296,8 +296,6 @@ public function afterSave()
                 $this->getUsesPerCoupon() ? $this->getUsesPerCoupon() : null
             )->setUsagePerCustomer(
                 $this->getUsesPerCustomer() ? $this->getUsesPerCustomer() : null
-            )->setExpirationDate(
-                $this->getToDate()
             )->save();
         } else {
             $this->getPrimaryCoupon()->delete();
@@ -499,8 +497,6 @@ public function acquireCoupon($saveNewlyCreated = true, $saveAttemptCount = 10)
             $this->getUsesPerCoupon() ? $this->getUsesPerCoupon() : null
         )->setUsagePerCustomer(
             $this->getUsesPerCustomer() ? $this->getUsesPerCustomer() : null
-        )->setExpirationDate(
-            $this->getToDate()
         )->setType(
             \Magento\SalesRule\Api\Data\CouponInterface::TYPE_GENERATED
         );
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
index fd5953697c7db..96867222d170a 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
@@ -58,6 +58,7 @@ public function __construct(
     public function loadAttributeOptions()
     {
         $attributes = [
+            'base_subtotal_with_discount' => __('Subtotal (Excl. Tax)'),
             'base_subtotal' => __('Subtotal'),
             'total_qty' => __('Total Items Quantity'),
             'weight' => __('Total Weight'),
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
index 1e8fbf43ec3bc..b3a44fcc56011 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\SalesRule\Model\Rule\Condition\Product;
 
+/**
+ * Subselect conditions for product.
+ */
 class Subselect extends \Magento\SalesRule\Model\Rule\Condition\Product\Combine
 {
     /**
@@ -161,9 +164,12 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
                 }
             }
             if ($hasValidChild || parent::validate($item)) {
-                $total += (($hasValidChild && $useChildrenTotal) ? $childrenAttrTotal : $item->getData($attr));
+                $total += ($hasValidChild && $useChildrenTotal)
+                    ? $childrenAttrTotal * $item->getQty()
+                    : $item->getData($attr);
             }
         }
+
         return $this->validateAttribute($total);
     }
 }
diff --git a/app/code/Magento/SalesRule/Model/Utility.php b/app/code/Magento/SalesRule/Model/Utility.php
index a3876a9d7e046..45c5dc3da0ebd 100644
--- a/app/code/Magento/SalesRule/Model/Utility.php
+++ b/app/code/Magento/SalesRule/Model/Utility.php
@@ -189,6 +189,8 @@ public function deltaRoundingFix(
     ) {
         $discountAmount = $discountData->getAmount();
         $baseDiscountAmount = $discountData->getBaseAmount();
+        $rowTotalInclTax = $item->getRowTotalInclTax();
+        $baseRowTotalInclTax = $item->getBaseRowTotalInclTax();
 
         //TODO Seems \Magento\Quote\Model\Quote\Item\AbstractItem::getDiscountPercent() returns float value
         //that can not be used as array index
@@ -205,6 +207,23 @@ public function deltaRoundingFix(
                 - $this->priceCurrency->round($baseDiscountAmount);
         }
 
+        /**
+         * When we have 100% discount check if totals will not be negative
+         */
+
+        if ($percentKey == 100) {
+            $discountDelta = $rowTotalInclTax - $discountAmount;
+            $baseDiscountDelta = $baseRowTotalInclTax - $baseDiscountAmount;
+
+            if ($discountDelta < 0) {
+                $discountAmount += $discountDelta;
+            }
+
+            if ($baseDiscountDelta < 0) {
+                $baseDiscountAmount += $baseDiscountDelta;
+            }
+        }
+
         $discountData->setAmount($this->priceCurrency->round($discountAmount));
         $discountData->setBaseAmount($this->priceCurrency->round($baseDiscountAmount));
 
diff --git a/app/code/Magento/SalesRule/Model/Validator.php b/app/code/Magento/SalesRule/Model/Validator.php
index 201df99aa5187..64e170580a449 100644
--- a/app/code/Magento/SalesRule/Model/Validator.php
+++ b/app/code/Magento/SalesRule/Model/Validator.php
@@ -184,6 +184,8 @@ protected function _getRules(Address $address = null)
     }
 
     /**
+     * Address id getter.
+     *
      * @param Address $address
      * @return string
      */
@@ -329,21 +331,7 @@ public function processShippingAmount(Address $address)
                     $baseDiscountAmount = $rule->getDiscountAmount();
                     break;
                 case \Magento\SalesRule\Model\Rule::CART_FIXED_ACTION:
-                    $cartRules = $address->getCartFixedRules();
-                    if (!isset($cartRules[$rule->getId()])) {
-                        $cartRules[$rule->getId()] = $rule->getDiscountAmount();
-                    }
-                    if ($cartRules[$rule->getId()] > 0) {
-                        $quoteAmount = $this->priceCurrency->convert($cartRules[$rule->getId()], $quote->getStore());
-                        $discountAmount = min($shippingAmount - $address->getShippingDiscountAmount(), $quoteAmount);
-                        $baseDiscountAmount = min(
-                            $baseShippingAmount - $address->getBaseShippingDiscountAmount(),
-                            $cartRules[$rule->getId()]
-                        );
-                        $cartRules[$rule->getId()] -= $baseDiscountAmount;
-                    }
-
-                    $address->setCartFixedRules($cartRules);
+                    // Shouldn't be proceed according to MAGETWO-96403
                     break;
             }
 
@@ -521,6 +509,8 @@ public function sortItemsByPriority($items, Address $address = null)
     }
 
     /**
+     * Rule total items getter.
+     *
      * @param int $key
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -535,6 +525,8 @@ public function getRuleItemTotalsInfo($key)
     }
 
     /**
+     * Decrease rule items count.
+     *
      * @param int $key
      * @return $this
      */
diff --git a/app/code/Magento/SalesRule/Observer/AssignCouponDataAfterOrderCustomerAssignObserver.php b/app/code/Magento/SalesRule/Observer/AssignCouponDataAfterOrderCustomerAssignObserver.php
new file mode 100644
index 0000000000000..d9699d334ff6a
--- /dev/null
+++ b/app/code/Magento/SalesRule/Observer/AssignCouponDataAfterOrderCustomerAssignObserver.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Observer;
+
+use Magento\Framework\Event\Observer;
+use Magento\SalesRule\Model\Coupon\UpdateCouponUsages;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Framework\Event\ObserverInterface;
+
+class AssignCouponDataAfterOrderCustomerAssignObserver implements ObserverInterface
+{
+    const EVENT_KEY_CUSTOMER = 'customer';
+
+    const EVENT_KEY_ORDER    = 'order';
+
+    /**
+     * @var UpdateCouponUsages
+     */
+    private $updateCouponUsages;
+
+    /**
+     * AssignCouponDataAfterOrderCustomerAssign constructor.
+     *
+     * @param UpdateCouponUsages $updateCouponUsages
+     */
+    public function __construct(
+        UpdateCouponUsages $updateCouponUsages
+    ) {
+        $this->updateCouponUsages = $updateCouponUsages;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute(Observer $observer)
+    {
+        $event = $observer->getEvent();
+        /** @var OrderInterface $order */
+        $order = $event->getData(self::EVENT_KEY_ORDER);
+
+        if ($order->getCustomerId()) {
+            $this->updateCouponUsages->execute($order, true);
+        }
+    }
+}
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
index b9efe4e51a51c..fe91f75e0448e 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
@@ -6,13 +6,13 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="DeleteCartPriceRuleByName">
         <arguments>
             <argument name="ruleName" type="string"/>
         </arguments>
         <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
-        <waitForPageLoad stepKey="waitForPriceList"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearFilters"/>
         <fillField selector="{{AdminCartPriceRulesSection.filterByNameInput}}" userInput="{{ruleName}}" stepKey="filterByName"/>
         <click selector="{{AdminCartPriceRulesSection.searchButton}}" stepKey="doFilter"/>
         <click selector="{{AdminCartPriceRulesSection.rowByIndex('1')}}" stepKey="goToEditRulePage"/>
@@ -23,4 +23,49 @@
         <!-- This actionGroup was created to be merged from B2B because B2B has a very different form control here -->
         <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/>
     </actionGroup>
+
+    <!--Set Subtotal condition for Customer Segment-->
+    <actionGroup name="SetCartAttributeConditionForCartPriceRuleActionGroup">
+        <arguments>
+            <argument name="attributeName" type="string"/>
+            <argument name="operatorType" defaultValue="is" type="string"/>
+            <argument name="value" type="string"/>
+        </arguments>
+        <scrollTo selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" stepKey="scrollToActionTab"/>
+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.conditionsHeaderOpen}}"
+                          visible="false" stepKey="openActionTab"/>
+        <click selector="{{AdminCartPriceRulesFormSection.conditions}}" stepKey="applyRuleForConditions"/>
+        <waitForPageLoad stepKey="waitForDropDownOpened"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.childAttribute}}" userInput="{{attributeName}}" stepKey="selectAttribute"/>
+        <waitForPageLoad stepKey="waitForOperatorOpened"/>
+        <click selector="{{AdminCartPriceRulesFormSection.condition('is')}}" stepKey="clickToChooseOption"/>
+        <selectOption userInput="{{operatorType}}" selector="{{AdminCartPriceRulesFormSection.conditionsOperator}}" stepKey="setOperatorType"/>
+        <click selector="{{AdminCartPriceRulesFormSection.condition('...')}}" stepKey="clickToChooseOption1"/>
+        <fillField userInput="{{value}}" selector="{{AdminCartPriceRulesFormSection.conditionsValue}}" stepKey="fillActionValue"/>
+        <click selector="{{AdminMainActionsSection.saveAndContinue}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+
+    <actionGroup name="SetConditionForActionsInCartPriceRuleActionGroup">
+        <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"/>
+        </arguments>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickOnActionTab"/>
+        <click selector="{{AdminCartPriceRulesFormSection.condition('ALL')}}" stepKey="clickToChooseOption"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.actionsAggregator}}" userInput="{{actionsAggregator}}" stepKey="selectCondition"/>
+        <click selector="{{AdminCartPriceRulesFormSection.condition('TRUE')}}" stepKey="clickToChooseOption2"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.actionsValue}}" userInput="{{actionsValue}}" stepKey="selectCondition2"/>
+        <click selector="{{AdminCartPriceRulesFormSection.conditions}}" stepKey="selectActionConditions"/>
+        <waitForPageLoad stepKey="waitForDropDownOpened"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.childAttribute}}" userInput="{{childAttribute}}" stepKey="selectAttribute"/>
+        <waitForPageLoad stepKey="waitForOperatorOpened"/>
+        <click selector="{{AdminCartPriceRulesFormSection.condition('...')}}" stepKey="clickToChooseOption3"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.actionValue}}" userInput="{{actionValue}}" stepKey="fillActionValue"/>
+        <click selector="{{AdminCartPriceRulesFormSection.applyAction}}" stepKey="applyAction"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
index 26a71e4167ffa..c5f35aef6f480 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
@@ -23,4 +23,31 @@
         <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
     </actionGroup>
+
+    <actionGroup name="AdminCreateCartPriceRuleWithProductSubselectionCondition" extends="AdminCreateCartPriceRuleActionGroup">
+        <arguments>
+            <argument name="condition" type="string" defaultValue="Category" />
+            <argument name="operation" type="string" defaultValue="equals or greater than" />
+            <argument name="totalQuantity" type="string" defaultValue="2" />
+            <argument name="value" type="string" defaultValue="_defaultCategory.name" />
+        </arguments>
+        <!--Go to Conditions section-->
+        <click selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" after="selectActionType" stepKey="openConditionsSection"/>
+        <click selector="{{AdminCartPriceRulesFormSection.addCondition('1')}}" after="openConditionsSection" stepKey="addFirstCondition"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.ruleCondition('1')}}" userInput="Products subselection" after="addFirstCondition" stepKey="selectRule"/>
+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.ruleParameter('is')}}" after="selectRule" stepKey="waitForFirstRuleElement"/>
+        <click selector="{{AdminCartPriceRulesFormSection.ruleParameter('is')}}" after="waitForFirstRuleElement" stepKey="clickToChangeRule"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.ruleOperatorSelect('1--1')}}" userInput="{{operation}}" after="clickToChangeRule" stepKey="selectRule1"/>
+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.ruleParameter('...')}}" after="selectRule1" stepKey="waitForSecondRuleElement"/>
+        <click selector="{{AdminCartPriceRulesFormSection.ruleParameter('...')}}" after="waitForSecondRuleElement" stepKey="clickToChangeRule1"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleValueInput('1--1')}}" userInput="{{totalQuantity}}" after="clickToChangeRule1" stepKey="fillRule"/>
+        <click selector="{{AdminCartPriceRulesFormSection.addCondition('1--1')}}" after="fillRule" stepKey="addSecondCondition"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.ruleCondition('1--1')}}" userInput="{{condition}}" after="addSecondCondition" stepKey="selectSecondCondition"/>
+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.ruleParameter('...')}}" after="selectSecondCondition" stepKey="waitForThirdRuleElement"/>
+        <click selector="{{AdminCartPriceRulesFormSection.ruleParameter('...')}}" after="waitForThirdRuleElement" stepKey="addThirdCondition"/>
+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.chooseValue('1--1--1')}}" after="addThirdCondition" stepKey="waitForForthRuleElement"/>
+        <click selector="{{AdminCartPriceRulesFormSection.chooseValue('1--1--1')}}" after="waitForForthRuleElement" stepKey="chooseValue"/>
+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.categoryCheckbox(value)}}" after="chooseValue" stepKey="waitForCategoryVisible"/>
+        <checkOption selector="{{AdminCartPriceRulesFormSection.categoryCheckbox(value)}}" after="waitForCategoryVisible" stepKey="checkCategoryName"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminEditCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminEditCartPriceRuleActionGroup.xml
new file mode 100644
index 0000000000000..0f18819e3ed1e
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminEditCartPriceRuleActionGroup.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="ChangeCartPriceRuleWebsiteActionGroup">
+        <arguments>
+            <argument name="websiteLabel" type="string"/>
+        </arguments>
+        <waitForPageLoad stepKey="waitForPriceList"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="{{websiteLabel}}" stepKey="selectWebsites"/>
+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminFilterCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminFilterCartPriceRuleActionGroup.xml
new file mode 100644
index 0000000000000..2c44fdf3e900f
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminFilterCartPriceRuleActionGroup.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">
+    <!--Search grid with keyword search-->
+    <actionGroup name="AdminFilterCartPriceRuleActionGroup">
+        <arguments>
+            <argument name="ruleName"/>
+        </arguments>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <fillField selector="{{AdminCartPriceRulesSection.filterByNameInput}}" userInput="{{ruleName}}" stepKey="filterByName"/>
+        <click selector="{{AdminCartPriceRulesSection.searchButton}}" stepKey="doFilter"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/ApplyCartRuleOnStorefrontActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/ApplyCartRuleOnStorefrontActionGroup.xml
index d3930a2767b0d..4cd0637e83b77 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/ApplyCartRuleOnStorefrontActionGroup.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/ApplyCartRuleOnStorefrontActionGroup.xml
@@ -22,4 +22,47 @@
         <click selector="{{AdminCartPriceRuleDiscountSection.applyCodeBtn}}" stepKey="applyCode"/>
         <waitForPageLoad stepKey="waitForApplyCode"/>
     </actionGroup>
+
+    <!-- Apply Sales Rule Coupon to the cart -->
+    <actionGroup name="StorefrontApplyCouponActionGroup">
+        <arguments>
+            <argument name="couponCode" type="string"/>
+        </arguments>
+        <waitForElementVisible selector="{{StorefrontDiscountSection.discountTab}}" time="30" stepKey="waitForCouponHeader" />
+        <conditionalClick selector="{{StorefrontDiscountSection.discountTab}}" dependentSelector="{{StorefrontDiscountSection.discountBlockActive}}" visible="false" stepKey="clickCouponHeader" />
+        <waitForElementVisible selector="{{StorefrontDiscountSection.couponInput}}" stepKey="waitForCouponField" />
+        <fillField userInput="{{couponCode}}" selector="{{StorefrontDiscountSection.couponInput}}" stepKey="fillCouponField"/>
+        <click selector="{{StorefrontDiscountSection.applyCodeBtn}}" stepKey="clickApplyButton"/>
+        <waitForElementVisible selector="{{StorefrontMessagesSection.successMessage}}" stepKey="waitForSuccessMessage" />
+        <see userInput='You used coupon code "{{couponCode}}".' selector="{{StorefrontMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
+    </actionGroup>
+
+    <!-- Apply Sales Rule Coupon to the cart -->
+    <actionGroup name="StorefrontTryingToApplyCouponActionGroup" extends="StorefrontApplyCouponActionGroup">
+        <remove keyForRemoval="waitForSuccessMessage"/>
+        <remove keyForRemoval="seeSuccessMessage"/>
+        <waitForElementVisible selector="{{StorefrontMessagesSection.error}}" stepKey="waitError"/>
+        <see selector="{{StorefrontMessagesSection.error}}" userInput='The coupon code "{{couponCode}}" is not valid.'
+             stepKey="seeErrorMessages"/>
+    </actionGroup>
+
+    <!-- Cancel Sales Rule Coupon applied to the cart -->
+    <actionGroup name="StorefrontCancelCouponActionGroup">
+        <waitForElementVisible selector="{{StorefrontDiscountSection.discountTab}}" time="30" stepKey="waitForCouponHeader" />
+        <conditionalClick selector="{{StorefrontDiscountSection.discountTab}}" dependentSelector="{{AdminCartPriceRuleDiscountSection.discountBlockActive}}" visible="false" stepKey="clickCouponHeader" />
+        <waitForElementVisible selector="{{StorefrontDiscountSection.couponInput}}" stepKey="waitForCouponField" />
+        <click selector="{{StorefrontDiscountSection.cancelCoupon}}" stepKey="clickCancelButton"/>
+        <waitForElementVisible selector="{{StorefrontMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
+        <see userInput="You canceled the coupon code." selector="{{StorefrontMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
+    </actionGroup>
+
+    <actionGroup name="StorefrontApplyCouponOnCheckoutActionGroup" extends="StorefrontApplyCouponActionGroup">
+        <arguments>
+            <argument name="successMessage" type="string"/>
+        </arguments>
+        <waitForElementVisible selector="{{StorefrontDiscountSection.discountInput}}" stepKey="waitForCouponField"/>
+        <fillField userInput="{{couponCode}}" selector="{{StorefrontDiscountSection.discountInput}}" stepKey="fillCouponField"/>
+        <waitForElementVisible selector="{{StorefrontMessagesSection.successMessage}}" stepKey="waitForSuccessMessage" />
+        <see userInput='{{successMessage}}' selector="{{StorefrontMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontApplyDiscountCodeActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontApplyDiscountCodeActionGroup.xml
new file mode 100644
index 0000000000000..87f50ed0e92cb
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontApplyDiscountCodeActionGroup.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">
+    <!-- Apply discount code during checkout -->
+    <actionGroup name="StorefrontApplyDiscountCodeActionGroup">
+        <arguments>
+            <argument name="discountCode" type="string"/>
+        </arguments>
+        <click selector="{{StorefrontDiscountSection.discountTab}}" stepKey="clickToAddDiscount"/>
+        <fillField selector="{{StorefrontDiscountSection.discountInput}}" userInput="{{discountCode}}" stepKey="fillFieldDiscountCode"/>
+        <click selector="{{StorefrontDiscountSection.applyCodeBtn}}" stepKey="clickToApplyDiscount"/>
+        <waitForPageLoad stepKey="waitForDiscountToBeAdded"/>
+        <see selector="{{StorefrontDiscountSection.discountVerificationMsg}}" userInput="Your coupon was successfully applied" stepKey="assertDiscountApplyMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml
new file mode 100644
index 0000000000000..35feabc8d9fbe
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.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="VerifyDiscountAmount">
+        <arguments>
+            <argument name="expectedDiscount" type="string"/>
+        </arguments>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
+        <waitForElementVisible selector="{{StorefrontCheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>
+        <see selector="{{StorefrontCheckoutCartSummarySection.discountAmount}}" userInput="{{expectedDiscount}}" stepKey="seeDiscountTotal"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/CouponData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/CouponData.xml
index d06903d5fd5d9..8810157092d97 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Data/CouponData.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/CouponData.xml
@@ -15,4 +15,11 @@
         <data key="times_used">0</data>
         <data key="is_primary">false</data>
     </entity>
+
+    <entity name="SimpleSalesRuleCoupon" type="coupon">
+        <var key="rule_id" entityKey="rule_id" entityType="SalesRule"/>
+        <data key="code" unique="suffix">couponCode</data>
+        <data key="is_primary">1</data>
+        <data key="times_used">0</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesCouponData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesCouponData.xml
new file mode 100644
index 0000000000000..2e56367fe9d56
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesCouponData.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ApiSalesRuleCoupon" type="SalesRuleCoupon">
+        <data key="code" unique="suffix">salesCoupon</data>
+        <data key="times_used">0</data>
+        <data key="is_primary">1</data>
+        <data key="type">0</data>
+        <var key="rule_id" entityType="SalesRule" entityKey="rule_id"/>
+    </entity>
+    <entity name="SimpleSalesRuleCoupon" type="coupon">
+        <var key="rule_id" entityKey="rule_id" entityType="SalesRule"/>
+        <data key="code" unique="suffix">Code</data>
+        <data key="is_primary">1</data>
+        <data key="times_used">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleAddressConditionsData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleAddressConditionsData.xml
new file mode 100644
index 0000000000000..cc695b347c4fb
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleAddressConditionsData.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SalesRuleAddressConditions" type="SalesRuleConditionAttribute">
+        <data key="subtotal">Magento\SalesRule\Model\Rule\Condition\Address|base_subtotal</data>
+        <data key="totalItemsQty">Magento\SalesRule\Model\Rule\Condition\Address|total_qty</data>
+        <data key="totalWeight">Magento\SalesRule\Model\Rule\Condition\Address|weight</data>
+        <data key="shippingMethod">Magento\SalesRule\Model\Rule\Condition\Address|shipping_method</data>
+        <data key="shippingPostCode">Magento\SalesRule\Model\Rule\Condition\Address|postcode</data>
+        <data key="shippingRegion">Magento\SalesRule\Model\Rule\Condition\Address|region</data>
+        <data key="shippingState">Magento\SalesRule\Model\Rule\Condition\Address|region_id</data>
+        <data key="shippingCountry">Magento\SalesRule\Model\Rule\Condition\Address|country_id</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
index 28d61e34339ef..8637b79421fde 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="ApiSalesRule" type="SalesRule">
         <data key="name" unique="suffix">salesRule</data>
         <data key="description">Sales Rule Descritpion</data>
@@ -56,7 +56,7 @@
     </entity>
     <entity name="SalesRuleSpecificCoupon" type="SalesRule">
         <data key="name" unique="suffix">SimpleSalesRule</data>
-        <data key="description">Sales Rule Descritpion</data>
+        <data key="description">Sales Rule Description</data>
         <array key="website_ids">
             <item>1</item>
         </array>
@@ -85,4 +85,184 @@
     <entity name="SalesRule100PercentDiscount" extends="TestSalesRule" type="SalesRule">
         <data key="discountAmount">100</data>
     </entity>
+    <entity name="SaleRule50PercentDiscountNoCoupon" type="SalesRule">
+        <data key="name" unique="suffix">salesRule</data>
+        <data key="description">Sales Rule Descritpion</data>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <array key="customer_group_ids">
+            <item>0</item>
+            <item>1</item>
+            <item>3</item>
+        </array>
+        <data key="uses_per_customer">0</data>
+        <data key="is_active">true</data>
+        <data key="stop_rules_processing">true</data>
+        <data key="is_advanced">true</data>
+        <data key="sort_order">0</data>
+        <data key="simple_action">by_percent</data>
+        <data key="discount_amount">50</data>
+        <data key="discount_qty">0</data>
+        <data key="discount_step">0</data>
+        <data key="apply_to_shipping">false</data>
+        <data key="times_used">0</data>
+        <data key="is_rss">true</data>
+        <data key="coupon_type">NO_COUPON</data>
+        <data key="use_auto_generation">false</data>
+        <data key="uses_per_coupon">0</data>
+        <data key="simple_free_shipping">0</data>
+    </entity>
+    <entity name="ApiCartRule" type="SalesRule">
+        <data key="name" unique="suffix">salesRule</data>
+        <data key="description">Sales Rule Descritpion</data>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <array key="customer_group_ids">
+            <item>0</item>
+            <item>1</item>
+            <item>3</item>
+        </array>
+        <data key="uses_per_customer">0</data>
+        <data key="is_active">true</data>
+        <data key="stop_rules_processing">true</data>
+        <data key="is_advanced">true</data>
+        <data key="sort_order">0</data>
+        <data key="simple_action">by_percent</data>
+        <data key="discount_amount">50</data>
+        <data key="discount_qty">0</data>
+        <data key="discount_step">0</data>
+        <data key="apply_to_shipping">false</data>
+        <data key="times_used">0</data>
+        <data key="is_rss">true</data>
+        <data key="coupon_type">NO_COUPON</data>
+        <data key="use_auto_generation">false</data>
+        <data key="uses_per_coupon">0</data>
+        <data key="simple_free_shipping">0</data>
+    </entity>
+    <entity name="SalesRuleSpecificCouponWithFixedDiscount" type="SalesRule">
+        <data key="name" unique="suffix">SimpleSalesRule</data>
+        <data key="description">Sales Rule Description</data>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <array key="customer_group_ids">
+            <item>1</item>
+        </array>
+        <data key="uses_per_customer">10</data>
+        <data key="is_active">true</data>
+        <data key="stop_rules_processing">false</data>
+        <data key="is_advanced">true</data>
+        <data key="sort_order">1</data>
+        <data key="simple_action">cart_fixed</data>
+        <data key="discount_amount">10</data>
+        <data key="discount_qty">10</data>
+        <data key="discount_step">0</data>
+        <data key="apply_to_shipping">false</data>
+        <data key="times_used">0</data>
+        <data key="is_rss">false</data>
+        <data key="coupon_type">SPECIFIC_COUPON</data>
+        <data key="use_auto_generation">false</data>
+        <data key="uses_per_coupon">10</data>
+        <data key="simple_free_shipping">1</data>
+    </entity>
+    <entity name="CartPriceRuleWithRewardPointsOnly" type="SalesRule">
+        <data key="name" unique="suffix">SalesRuleReward</data>
+        <data key="description">Sales Rule with Reward Point</data>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <array key="customer_group_ids">
+            <item>0</item>
+            <item>1</item>
+            <item>2</item>
+            <item>3</item>
+        </array>
+        <data key="uses_per_customer">10</data>
+        <data key="is_active">true</data>
+        <data key="stop_rules_processing">true</data>
+        <data key="is_advanced">true</data>
+        <data key="sort_order">0</data>
+        <data key="simple_action">by_percent</data>
+        <data key="discount_amount">0</data>
+        <data key="discount_qty">0</data>
+        <data key="discount_step">0</data>
+        <data key="apply_to_shipping">false</data>
+        <data key="times_used">0</data>
+        <data key="is_rss">true</data>
+        <data key="coupon_type">NO_COUPON</data>
+        <data key="use_auto_generation">false</data>
+        <data key="uses_per_coupon">10</data>
+        <data key="simple_free_shipping">0</data>
+        <requiredEntity type="sales-rule-extension-attribute">SalesRuleExtensionAttribute</requiredEntity>
+    </entity>
+
+    <entity name="PriceRuleWithCondition" type="SalesRule">
+        <data key="name" unique="suffix">SalesRule</data>
+        <data key="websites">Main Website</data>
+        <data key="customerGroups">'NOT LOGGED IN', 'General', 'Wholesale', 'Retailer'</data>
+        <data key="apply">Fixed amount discount for whole cart</data>
+        <data key="discountAmount">0</data>
+    </entity>
+
+    <entity name="SalesRuleNoCouponWithFixedDiscount" extends="ApiCartRule">
+        <data key="simple_action">by_fixed</data>
+    </entity>
+
+    <entity name="SalesRuleSpecificCouponWithPercentDiscount" type="SalesRule">
+        <data key="name" unique="suffix">SimpleSalesRule</data>
+        <data key="description">Sales Rule Description</data>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <array key="customer_group_ids">
+            <item>1</item>
+        </array>
+        <data key="uses_per_customer">10</data>
+        <data key="is_active">true</data>
+        <data key="stop_rules_processing">false</data>
+        <data key="is_advanced">true</data>
+        <data key="sort_order">1</data>
+        <data key="simple_action">by_percent</data>
+        <data key="discount_amount">10</data>
+        <data key="discount_qty">10</data>
+        <data key="discount_step">0</data>
+        <data key="apply_to_shipping">false</data>
+        <data key="times_used">0</data>
+        <data key="is_rss">false</data>
+        <data key="coupon_type">SPECIFIC_COUPON</data>
+        <data key="use_auto_generation">false</data>
+        <data key="uses_per_coupon">10</data>
+        <data key="simple_free_shipping">1</data>
+    </entity>
+
+    <entity name="ActiveSalesRuleForNotLoggedIn" type="SalesRule">
+        <data key="name" unique="suffix">SimpleSalesRule</data>
+        <data key="description">Sales Rule Description</data>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <array key="customer_group_ids">
+            <item>0</item>
+        </array>
+        <data key="uses_per_customer">0</data>
+        <data key="is_active">true</data>
+        <data key="stop_rules_processing">true</data>
+        <data key="is_advanced">true</data>
+        <data key="sort_order">0</data>
+        <data key="simple_action">by_percent</data>
+        <data key="discount_amount">50</data>
+        <data key="discount_qty">0</data>
+        <data key="discount_step">0</data>
+        <data key="apply_to_shipping">false</data>
+        <data key="times_used">0</data>
+        <data key="is_rss">false</data>
+        <data key="coupon_type">SPECIFIC_COUPON</data>
+        <data key="use_auto_generation">false</data>
+        <data key="uses_per_coupon">0</data>
+        <data key="simple_free_shipping">0</data>
+        <requiredEntity type="SalesRuleLabel">SalesRuleLabelDefault</requiredEntity>
+        <requiredEntity type="SalesRuleLabel">SalesRuleLabelStore1</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleExtensionAttributeData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleExtensionAttributeData.xml
new file mode 100644
index 0000000000000..43ff4d897c143
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleExtensionAttributeData.xml
@@ -0,0 +1,13 @@
+<?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="SalesRuleExtensionAttribute" type="sales-rule-extension-attribute">
+        <data key="reward_points_delta">200</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleProductConditionsData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleProductConditionsData.xml
new file mode 100644
index 0000000000000..8af7ac0fdd99a
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleProductConditionsData.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SalesRuleProductConditions" type="SalesRuleConditionAttribute">
+        <data key="priceInCart" >Magento\SalesRule\Model\Rule\Condition\Product|quote_item_price</data>
+        <data key="quantityInCart">Magento\SalesRule\Model\Rule\Condition\Product|quote_item_qty</data>
+        <data key="rowTotalInCart">Magento\SalesRule\Model\Rule\Condition\Product|quote_item_row_total</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Metadata/coupon-meta.xml b/app/code/Magento/SalesRule/Test/Mftf/Metadata/coupon-meta.xml
index dda402ed6436d..9bec2ecd006cf 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Metadata/coupon-meta.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Metadata/coupon-meta.xml
@@ -9,7 +9,7 @@
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateCoupon" dataType="coupon" type="create" auth="adminOauth" url="/rest/V1/coupons" method="POST">
+    <operation name="CreateCoupon" dataType="coupon" type="create" auth="adminOauth" url="/V1/coupons" method="POST">
         <contentType>application/json</contentType>
         <object key="coupon" dataType="coupon">
             <field key="rule_id" required="true">integer</field>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales-rule-extension-attribute-meta.xml b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales-rule-extension-attribute-meta.xml
new file mode 100644
index 0000000000000..51c4ac24a7426
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales-rule-extension-attribute-meta.xml
@@ -0,0 +1,12 @@
+<!--
+  /**
+   * Copyright © Magento, Inc. All rights reserved.
+   * See COPYING.txt for license details.
+   */
+ -->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="SetSalesRuleExtensionAttribute" dataType="sales-rule-extension-attribute" type="create">
+        <field key="reward_points_delta">integer</field>
+    </operation>
+</operations>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-meta.xml b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-meta.xml
index 0d4c4356a20a7..38009c510d2be 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-meta.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-meta.xml
@@ -6,7 +6,7 @@
   */
 -->
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateSalesRule" dataType="SalesRule" type="create" auth="adminOauth" url="/V1/salesRules" method="POST">
         <contentType>application/json</contentType>
         <object key="rule" dataType="SalesRule">
@@ -30,6 +30,7 @@
             <field key="simple_free_shipping">string</field>
             <field key="stop_rules_processing">boolean</field>
             <field key="is_advanced">boolean</field>
+            <field key="extension_attributes">sales-rule-extension-attribute</field>
             <array key="store_labels">
                 <!-- specify object name as array value -->
                 <value>SalesRuleStoreLabel</value>
@@ -67,9 +68,6 @@
                 <field key="value">string</field>
                 <field key="extension_attributes">empty_extension_attribute</field>
             </object>
-            <object dataType="ExtensionAttribute" key="extension_attributes">
-                <field key="reward_points_delta">integer</field>
-            </object>
         </object>
     </operation>
     <operation name="DeleteSalesRule" dataType="SalesRule" type="delete" auth="adminOauth" url="/V1/salesRules/{rule_id}" method="DELETE">
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRuleEditPage.xml b/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRuleEditPage.xml
new file mode 100644
index 0000000000000..faed9d42bcdec
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRuleEditPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCartPriceRuleEditPage" area="admin" url="sales_rule/promo_quote/edit/id/{{salesRuleId}}" module="Magento_SalesRule" parameterized="true">
+        <section name="AdminCartPriceRulesFormSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRulesLimitPage.xml b/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRulesLimitPage.xml
new file mode 100644
index 0000000000000..3cd2563ddf183
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRulesLimitPage.xml
@@ -0,0 +1,10 @@
+<?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:Test/etc/PageObject.xsd">
+    <page name="AdminCartPriceRulesLimitPage" url="sales_rule/promo_quote/index/limit/{{count}}" area="admin" module="Magento_SalesRule" parameterized="true"/>
+</pages>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRuleDiscountSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRuleDiscountSection.xml
index d0aaa8e15f9ca..d388cc4b61628 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRuleDiscountSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRuleDiscountSection.xml
@@ -6,10 +6,12 @@
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCartPriceRuleDiscountSection">
-        <element name="discountTab" type="button" selector="//strong[text()='Apply Discount Code']"/>
+        <element name="discountTab" type="button" selector="#block-discount-heading"/>
         <element name="couponInput" type="input" selector="#coupon_code"/>
-        <element name="applyCodeBtn" type="button" selector="//span[text()='Apply Discount']"/>
+        <element name="applyCodeBtn" type="button" selector="#discount-coupon-form button[class*='apply']" timeout="30"/>
+        <element name="discountBlockActive" type="text" selector=".block.discount.active"/>
+        <element name="cancelButton" type="text" selector="#discount-form .action-cancel" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
index 14584acd03376..e1dd048e4a9e4 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
@@ -24,8 +24,22 @@
         <element name="userPerCustomer" type="input" selector="//input[@name='uses_per_customer']"/>
         <element name="priority" type="input" selector="//*[@name='sort_order']"/>
 
+        <!-- Conditions sub-form -->
+        <element name="conditionsHeader" type="button" selector="div[data-index='conditions']" timeout="30"/>
+        <element name="conditionsHeaderOpen" type="button" selector="div[data-index='conditions'] div[data-state-collapsible='open']" timeout="30"/>
+        <element name="addCondition" type="button" selector="//*[@id='conditions__{{arg}}__children']//span" parameterized="true"/>
+        <element name="ruleCondition" type="select" selector="rule[conditions][{{arg}}][new_child]" parameterized="true"/>
+        <element name="ruleParameter" type="text" selector="//span[@class='rule-param']/a[contains(text(), '{{arg}}')]" parameterized="true"/>
+        <element name="ruleOperatorSelect" type="select" selector="rule[conditions][{{arg}}][operator]" parameterized="true"/>
+        <element name="ruleValueInput" type="input" selector="rule[conditions][{{arg}}][value]" parameterized="true"/>
+        <element name="chooseValue" type="button" selector="label[for='conditions__{{arg}}__value']" parameterized="true"/>
+        <element name="categoryCheckbox" type="checkbox" selector="//span[contains(text(), '{{arg}}')]/parent::a/preceding-sibling::input[@type='checkbox']" parameterized="true"/>
+        <element name="conditionsValue" type="input" selector=".rule-param-edit input"/>
+        <element name="conditionsOperator" type="select" selector=".rule-param-edit select"/>
+
         <!-- Actions sub-form -->
         <element name="actionsHeader" type="button" selector="div[data-index='actions']" timeout="30"/>
+        <element name="actionsHeaderOpen" type="button" selector="div[data-index='actions'] div[data-state-collapsible='open']" timeout="30"/>
         <element name="apply" type="select" selector="select[name='simple_action']"/>
         <element name="applyDiscountToShipping" type="checkbox" selector="input[name='apply_to_shipping']"/>
         <element name="applyDiscountToShippingLabel" type="checkbox" selector="input[name='apply_to_shipping']+label"/>
@@ -34,9 +48,14 @@
         <element name="freeShipping" type="select" selector="select[name='simple_free_shipping']"/>
         <element name="conditions" type="button" selector=".rule-param.rule-param-new-child > a"/>
         <element name="condition" type="text" selector="//span[@class='rule-param']/a[text()='{{arg}}']" parameterized="true"/>
+        <element name="actionsAggregator" type="select" selector="#actions__1__aggregator"/>
+        <element name="actionsValue" type="select" selector="#actions__1__value"/>
         <element name="operator" type="select" selector="select[name*='[operator]']"/>
         <element name="childAttribute" type="select" selector="select[name*='new_child']"/>
         <element name="optionInput" type="input" selector="ul[class*='rule-param-children'] input[name*='[value]']"/>
+        <element name="actionValue" type="input" selector=".rule-param-edit input"/>
+        <element name="applyAction" type="text" selector=".rule-param-apply" timeout="30"/>
+        <element name="actionOperator" type="select" selector=".rule-param-edit select"/>
 
         <!-- Manage Coupon Codes sub-form -->
         <element name="manageCouponCodesHeader" type="button" selector="div[data-index='manage_coupon_codes']" timeout="30"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
index a341c4a3bf769..0aa01e06c44c7 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
@@ -6,7 +6,7 @@
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/SectionObject.xsd">
     <section name="AdminCartPriceRulesSection">
         <element name="addNewRuleButton" type="button" selector="#add" timeout="30"/>
         <element name="messages" type="text" selector=".messages"/>
@@ -15,5 +15,9 @@
         <element name="rowByIndex" type="text" selector="tr[data-role='row']:nth-of-type({{var1}})" parameterized="true" timeout="30"/>
         <element name="nameColumns" type="text" selector="td[data-column='name']"/>
         <element name="rowContainingText" type="text" selector="//*[@id='promo_quote_grid_table']/tbody/tr[td//text()[contains(., '{{var1}}')]]" parameterized="true" timeout="30"/>
+        <element name="rulesRow" type="text" selector="//tr[@data-role='row']"/>
+        <element name="pageCurrent" type="text" selector="//label[@for='promo_quote_grid_page-current']"/>
+        <element name="countPages" type="text" selector="//label[@for='promo_quote_grid_page-current']//span"/>
+        <element name="totalCount" type="text" selector="span[data-ui-id*='grid-total-count']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/StorefrontCheckoutCartSummarySection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/StorefrontCheckoutCartSummarySection.xml
new file mode 100644
index 0000000000000..26b52d4610c37
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/StorefrontCheckoutCartSummarySection.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="StorefrontCheckoutCartSummarySection">
+        <element name="discountLabel" type="text" selector="//*[@id='cart-totals']//tr[.//th//span[contains(@class, 'discount coupon')]]"/>
+        <element name="discountTotal" type="text" selector="//*[@id='cart-totals']//tr[.//th//span[contains(@class, 'discount coupon')]]//td//span//span[@class='price']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/StorefrontDiscountSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/StorefrontDiscountSection.xml
index 2ae50489b6d12..108b845008d1a 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/StorefrontDiscountSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/StorefrontDiscountSection.xml
@@ -6,10 +6,15 @@
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontDiscountSection">
-        <element name="discountTab" type="button" selector="#block-discount"/>
+        <element name="discountTab" type="button" selector="#block-discount-heading"/>
         <element name="couponInput" type="input" selector="#coupon_code"/>
-        <element name="applyCodeBtn" type="button" selector="//span[text()='Apply Discount']"/>
+        <element name="applyCodeBtn" type="button" selector="button[value='Apply Discount']"/>
+        <element name="cancelCoupon" type="button" selector="button[value='Cancel Coupon']"/>
+        <element name="discountInput" type="input" selector="#discount-code"/>
+        <element name="discountBlockActive" type="text" selector=".block.discount.active"/>
+        <element name="discountVerificationMsg" type="button" selector=".message-success div"/>
+        <element name="CancelCouponBtn" type="button" selector="#discount-form .action-cancel"/>
     </section>
 </sections>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml
new file mode 100644
index 0000000000000..327a126b8dc78
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCartRulesAppliedForProductInCartTest">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="Create cart price rule"/>
+            <title value="Check that cart rules applied for product in cart"/>
+            <description value="Check that cart rules applied for product in cart"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-13629"/>
+            <useCaseId value="MAGETWO-94348"/>
+            <group value="salesRule"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!--Create category and product-->
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct">
+                <field key="price">200</field>
+                <field key="quantity">500</field>
+                <requiredEntity createDataKey="createPreReqCategory"/>
+            </createData>
+        </before>
+        <after>
+            <!--Delete created data-->
+            <deleteData createDataKey="createPreReqCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
+
+            <actionGroup ref="DeleteProductOnProductsGridPageByName" stepKey="deleteProductOnProductsGridPageByName">
+                <argument name="product" value="BundleProduct"/>
+            </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFilters"/>
+
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteCartPriceRule">
+                <argument name="ruleName" value="{{PriceRuleWithCondition.name}}"/>
+            </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFilters1"/>
+
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Start creating a bundle product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <!--Off dynamic price and set value-->
+        <scrollToTopOfPage stepKey="scrollToTopOfThePageToSeePriceTypeElement"/>
+        <click selector="{{AdminProductFormBundleSection.priceTypeSwitcher}}" stepKey="offDynamicPrice"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="0" stepKey="setProductPrice"/>
+
+        <!-- Add option, a "Radio Buttons" type option, with one product and set fixed price 200-->
+        <actionGroup ref="CreateBundleProductForOneSimpleProductsWithRadioTypeOption" stepKey="createBundleProductWithRadioTypeOption">
+            <argument name="bundleProduct" value="BundleProduct"/>
+            <argument name="simpleProductFirst" value="$$simpleProduct$$"/>
+            <argument name="simpleProductSecond"/>
+        </actionGroup>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleSelectionPriceType}}" userInput="Fixed" stepKey="selectPriceType"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleSelectionPriceValue}}" userInput="200" stepKey="fillPriceValue"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!--Create cart price rule-->
+        <actionGroup ref="AdminCreateCartPriceRuleWithProductSubselectionCondition" stepKey="createRule">
+            <argument name="rule" value="PriceRuleWithCondition"/>
+            <argument name="condition" value="Category"/>
+            <argument name="operation" value="equals or greater than"/>
+            <argument name="totalQuantity" value="2"/>
+            <argument name="value" value="{{_defaultCategory.name}}"/>
+        </actionGroup>
+
+        <!--Go to Storefront and add product to cart and checkout from cart-->
+        <amOnPage url="{{StorefrontProductPage.url($$simpleProduct.name$$)}}" stepKey="goToProduct"/>
+        <actionGroup ref="StorefrontAddProductToCartQuantityActionGroup" stepKey="addToCart">
+            <argument name="productName" value="$$simpleProduct.name$$"/>
+            <argument name="quantity" value="2"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShipping"/>
+
+        <!--Check totals-->
+        <grabTextFrom selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" stepKey="grabSubtotal"/>
+        <grabTextFrom selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}" stepKey="grabShippingTotal"/>
+        <grabTextFrom selector="{{CheckoutPaymentSection.orderSummaryTotal}}" stepKey="grabTotal"/>
+        <assertEquals stepKey="assertSubtotal">
+            <expectedResult type="string">$400.00</expectedResult>
+            <actualResult type="variable">$grabSubtotal</actualResult>
+        </assertEquals>
+        <assertEquals stepKey="assertShippingTotal">
+            <expectedResult type="string">$10.00</expectedResult>
+            <actualResult type="variable">$grabShippingTotal</actualResult>
+        </assertEquals>
+        <assertEquals stepKey="assertTotal">
+            <expectedResult type="string">$410.00</expectedResult>
+            <actualResult type="variable">$grabTotal</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToComplexProductsTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToComplexProductsTest.xml
new file mode 100644
index 0000000000000..047b64c68e7e3
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToComplexProductsTest.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCategoryRulesShouldApplyToComplexProductsTest">
+        <annotations>
+            <features value="CatalogRule"/>
+            <stories value="Create cart price rule"/>
+            <title value="Category rules should apply to complex products"/>
+            <description value="Sales rules filtering on category should apply to all products, including complex products."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-76029"/>
+            <group value="catalogRule"/>
+        </annotations>
+        <before>
+            <!-- Create two Categories: CAT1 and CAT2 -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleSubCategory" stepKey="createCategory2"/>
+            <!--Create config1 and config2-->
+            <actionGroup ref="AdminCreateApiConfigurableProductWithHiddenChildActionGroup" stepKey="createConfigurableProduct1">
+                <argument name="productName" value="config1"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateApiConfigurableProductWithHiddenChildActionGroup" stepKey="createConfigurableProduct2">
+                <argument name="productName" value="config2"/>
+            </actionGroup>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--  Assign config1 and the associated  child products to CAT1 -->
+            <actionGroup ref="AdminAssignProductToCategory" stepKey="assignConfigurableProduct1ToCategory">
+                <argument name="productId" value="$$createConfigProductCreateConfigurableProduct1.id$$"/>
+                <argument name="categoryName" value="$$createCategory.name$$"/>
+            </actionGroup>
+            <actionGroup ref="AdminAssignProductToCategory" stepKey="assignConfig1ChildProduct1ToCategory">
+                <argument name="productId" value="$$createConfigChildProduct1CreateConfigurableProduct1.id$$"/>
+                <argument name="categoryName" value="$$createCategory.name$$"/>
+            </actionGroup>
+            <actionGroup ref="AdminAssignProductToCategory" stepKey="assignConfig1ChildProduct2ToCategory">
+                <argument name="productId" value="$$createConfigChildProduct2CreateConfigurableProduct1.id$$"/>
+                <argument name="categoryName" value="$$createCategory.name$$"/>
+            </actionGroup>
+            <!--  Assign config12 and the associated  child products to CAT2 -->
+            <actionGroup ref="AdminAssignProductToCategory" stepKey="assignConfigurableProduct2ToCategory2">
+                <argument name="productId" value="$$createConfigProductCreateConfigurableProduct2.id$$"/>
+                <argument name="categoryName" value="$$createCategory2.name$$"/>
+            </actionGroup>
+            <actionGroup ref="AdminAssignProductToCategory" stepKey="assignConfig2ChildProduct1ToCategory2">
+                <argument name="productId" value="$$createConfigChildProduct1CreateConfigurableProduct2.id$$"/>
+                <argument name="categoryName" value="$$createCategory2.name$$"/>
+            </actionGroup>
+            <actionGroup ref="AdminAssignProductToCategory" stepKey="assignConfig2ChildProduct2ToCategory2">
+                <argument name="productId" value="$$createConfigChildProduct2CreateConfigurableProduct2.id$$"/>
+                <argument name="categoryName" value="$$createCategory2.name$$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!--Delete configurable product 1-->
+            <deleteData createDataKey="createConfigProductCreateConfigurableProduct1" stepKey="deleteConfigProduct1"/>
+            <deleteData createDataKey="createCategory"  stepKey="deleteCategory1"/>
+            <deleteData createDataKey="createConfigChildProduct1CreateConfigurableProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2CreateConfigurableProduct1" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProductAttributeCreateConfigurableProduct1" stepKey="deleteConfigProductAttribute1"/>
+            <!--Delete configurable product 2-->
+            <deleteData createDataKey="createConfigProductCreateConfigurableProduct2" stepKey="deleteConfigProduct2"/>
+            <deleteData createDataKey="createCategory2"  stepKey="deleteCategory2"/>
+            <deleteData createDataKey="createConfigChildProduct1CreateConfigurableProduct2" stepKey="deleteConfigChildProduct3"/>
+            <deleteData createDataKey="createConfigChildProduct2CreateConfigurableProduct2" stepKey="deleteConfigChildProduct4"/>
+            <deleteData createDataKey="createConfigProductAttributeCreateConfigurableProduct2" stepKey="deleteConfigProductAttribute2"/>
+            <!--Delete Cart Price Rule -->
+            <deleteData  createDataKey="createCartPriceRule" stepKey="deleteCartPriceRule"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- 1: Create a cart price rule applying to CAT1 with discount -->
+        <createData entity="SalesRuleNoCouponWithFixedDiscount" stepKey="createCartPriceRule"/>
+        <amOnPage url="{{AdminCartPriceRuleEditPage.url($$createCartPriceRule.rule_id$$)}}" stepKey="goToCartPriceRuleEditPage"/>
+        <actionGroup ref="SetConditionForActionsInCartPriceRuleActionGroup" stepKey="setConditionForActionsInCartPriceRuleActionGroup">
+            <argument name="actionValue" value="$$createCategory.id$$"/>
+        </actionGroup>
+        <!-- 2: Go to frontend and add an item from both CAT1 and CAT2 to your cart -->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontend"/>
+        <!-- 3: Open configurable product 1 and add all his child products to cart -->
+        <amOnPage url="{{StorefrontProductPage.url($$createConfigProductCreateConfigurableProduct1.custom_attributes[url_key]$$)}}" stepKey="amOnConfigurableProductPage"/>
+        <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect('$$createConfigProductAttributeCreateConfigurableProduct1.attribute[frontend_labels][0][label]$$')}}"  userInput="$$createConfigProductAttributeOption1CreateConfigurableProduct1.option[store_labels][0][label]$$" stepKey="selectOption"/>
+        <waitForPageLoad stepKey="waitForProductDataChange"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddConfigurableProductToCart">
+            <argument name="product" value="$$createConfigProductCreateConfigurableProduct1$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect('$$createConfigProductAttributeCreateConfigurableProduct1.attribute[frontend_labels][0][label]$$')}}"  userInput="$$createConfigProductAttributeOption2CreateConfigurableProduct1.option[store_labels][0][label]$$" stepKey="selectOption2"/>
+        <waitForPageLoad stepKey="waitForProductDataChange2"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddConfigurableProductToCart2">
+            <argument name="product" value="$$createConfigProductCreateConfigurableProduct1$$"/>
+            <argument name="productCount" value="2"/>
+        </actionGroup>
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToCart"/>
+        <waitForElementVisible selector="{{StorefrontCheckoutCartSummarySection.tableTotals}}" stepKey="waitForCartTotalsBlockLoad"/>
+        <!-- Discount amount is not applied -->
+        <dontSee selector="{{StorefrontCheckoutCartSummarySection.discountLabel}}" stepKey="discountIsNotApply"/>
+        <!-- 3: Open configurable product 2 and add all his child products to cart -->
+        <amOnPage url="{{StorefrontProductPage.url($$createConfigProductCreateConfigurableProduct2.custom_attributes[url_key]$$)}}" stepKey="amOnConfigurableProductPage2"/>
+        <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect('$$createConfigProductAttributeCreateConfigurableProduct2.attribute[frontend_labels][0][label]$$')}}"  userInput="$$createConfigProductAttributeOption1CreateConfigurableProduct2.option[store_labels][0][label]$$" stepKey="selectOption3"/>
+        <waitForPageLoad stepKey="waitForProductDataChange3"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddConfigurableProductToCart3">
+            <argument name="product" value="$$createConfigProductCreateConfigurableProduct2$$"/>
+            <argument name="productCount" value="3"/>
+        </actionGroup>
+        <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect('$$createConfigProductAttributeCreateConfigurableProduct2.attribute[frontend_labels][0][label]$$')}}"  userInput="$$createConfigProductAttributeOption2CreateConfigurableProduct2.option[store_labels][0][label]$$" stepKey="selectOption4"/>
+        <waitForPageLoad stepKey="waitForProductDataChange4"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddConfigurableProductToCart4">
+            <argument name="product" value="$$createConfigProductCreateConfigurableProduct2$$"/>
+            <argument name="productCount" value="4"/>
+        </actionGroup>
+        <!-- Discount  amount is applied -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToCart2"/>
+        <waitForElementVisible selector="{{StorefrontCheckoutCartSummarySection.tableTotals}}" stepKey="waitForCartTotalsBlockLoad2"/>
+        <see selector="{{StorefrontCheckoutCartSummarySection.discountTotal}}" userInput="-$100.00" stepKey="discountIsApply"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php b/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php
index fb01476ed6b34..a19de4ff2ef90 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php
@@ -62,7 +62,7 @@ public function testGetButtonData()
             'class' => 'delete',
             'on_click' => 'deleteConfirm(\'' . __(
                 'Are you sure you want to delete this?'
-            ) . '\', \'' . $deleteUrl . '\')',
+            ) . '\', \'' . $deleteUrl . '\', {data: {}})',
             'sort_order' => 20,
         ];
 
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Coupon/MassgeneratorTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Coupon/MassgeneratorTest.php
index 8408636ae2669..1a6ebff3e61bc 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/Coupon/MassgeneratorTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Coupon/MassgeneratorTest.php
@@ -109,7 +109,6 @@ public function testGeneratePool()
                 'setRuleId',
                 'setUsageLimit',
                 'setUsagePerCustomer',
-                'setExpirationDate',
                 'setCreatedAt',
                 'setType',
                 'setCode',
@@ -120,7 +119,6 @@ public function testGeneratePool()
         $couponMock->expects($this->any())->method('setRuleId')->will($this->returnSelf());
         $couponMock->expects($this->any())->method('setUsageLimit')->will($this->returnSelf());
         $couponMock->expects($this->any())->method('setUsagePerCustomer')->will($this->returnSelf());
-        $couponMock->expects($this->any())->method('setExpirationDate')->will($this->returnSelf());
         $couponMock->expects($this->any())->method('setCreatedAt')->will($this->returnSelf());
         $couponMock->expects($this->any())->method('setType')->will($this->returnSelf());
         $couponMock->expects($this->any())->method('setCode')->will($this->returnSelf());
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php
index 42448565791c5..a4b45813a10bc 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/ValidatorTest.php
@@ -5,6 +5,13 @@
  */
 namespace Magento\SalesRule\Test\Unit\Model;
 
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Quote\Model\Quote;
+use Magento\SalesRule\Model\Rule;
+use Magento\SalesRule\Model\Validator;
+use Magento\Store\Model\Store;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
 /**
  * Class ValidatorTest
  * @@SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -17,50 +24,55 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
     protected $helper;
 
     /**
-     * @var \Magento\SalesRule\Model\Validator
+     * @var Validator
      */
     protected $model;
 
     /**
-     * @var \Magento\Quote\Model\Quote\Item|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Quote\Model\Quote\Item|MockObject
      */
     protected $item;
 
     /**
-     * @var \Magento\Quote\Model\Quote\Address|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Quote\Model\Quote\Address|MockObject
      */
     protected $addressMock;
 
     /**
-     * @var \Magento\SalesRule\Model\RulesApplier|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\SalesRule\Model\RulesApplier|MockObject
      */
     protected $rulesApplier;
 
     /**
-     * @var \Magento\SalesRule\Model\Validator\Pool|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\SalesRule\Model\Validator\Pool|MockObject
      */
     protected $validators;
 
     /**
-     * @var \Magento\SalesRule\Model\Utility|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\SalesRule\Model\Utility|MockObject
      */
     protected $utility;
 
     /**
-     * @var \Magento\SalesRule\Model\ResourceModel\Rule\Collection|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\SalesRule\Model\ResourceModel\Rule\Collection|MockObject
      */
     protected $ruleCollection;
 
     /**
-     * @var \Magento\Catalog\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Catalog\Helper\Data|MockObject
      */
     protected $catalogData;
 
     /**
-     * @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Message\ManagerInterface|MockObject
      */
     protected $messageManager;
 
+    /**
+     * @var PriceCurrencyInterface|MockObject
+     */
+    private $priceCurrency;
+
     protected function setUp()
     {
         $this->helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -74,6 +86,7 @@ protected function setUp()
             ->setMethods(
                 [
                     'getShippingAmountForDiscount',
+                    'getBaseShippingAmountForDiscount',
                     'getQuote',
                     'getCustomAttributesCodes',
                     'setCartFixedRules'
@@ -81,7 +94,7 @@ protected function setUp()
             )
             ->getMock();
 
-        /** @var \Magento\Quote\Model\Quote\Item\AbstractItem|\PHPUnit_Framework_MockObject_MockObject $item */
+        /** @var \Magento\Quote\Model\Quote\Item\AbstractItem|MockObject $item */
         $this->item = $this->createPartialMock(
             \Magento\Quote\Model\Quote\Item::class,
             ['__wakeup', 'getAddress', 'getParentItemId']
@@ -100,10 +113,13 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $ruleCollectionFactoryMock = $this->prepareRuleCollectionMock($this->ruleCollection);
+        $this->priceCurrency = $this->getMockBuilder(PriceCurrencyInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        /** @var \Magento\SalesRule\Model\Validator|\PHPUnit_Framework_MockObject_MockObject $validator */
+        /** @var Validator|MockObject $validator */
         $this->model = $this->helper->getObject(
-            \Magento\SalesRule\Model\Validator::class,
+            Validator::class,
             [
                 'context' => $context,
                 'registry' => $registry,
@@ -112,7 +128,8 @@ protected function setUp()
                 'utility' => $this->utility,
                 'rulesApplier' => $this->rulesApplier,
                 'validators' => $this->validators,
-                'messageManager' => $this->messageManager
+                'messageManager' => $this->messageManager,
+                'priceCurrency' => $this->priceCurrency
             ]
         );
         $this->model->setWebsiteId(1);
@@ -131,7 +148,7 @@ protected function setUp()
     }
 
     /**
-     * @return \Magento\Quote\Model\Quote\Item|\PHPUnit_Framework_MockObject_MockObject
+     * @return \Magento\Quote\Model\Quote\Item|MockObject
      */
     protected function getQuoteItemMock()
     {
@@ -145,8 +162,8 @@ protected function getQuoteItemMock()
         $itemSimple = $this->createPartialMock(\Magento\Quote\Model\Quote\Item::class, ['getAddress', '__wakeup']);
         $itemSimple->expects($this->any())->method('getAddress')->will($this->returnValue($this->addressMock));
 
-        /** @var $quote \Magento\Quote\Model\Quote */
-        $quote = $this->createPartialMock(\Magento\Quote\Model\Quote::class, ['getStoreId', '__wakeup']);
+        /** @var $quote Quote */
+        $quote = $this->createPartialMock(Quote::class, ['getStoreId', '__wakeup']);
         $quote->expects($this->any())->method('getStoreId')->will($this->returnValue(1));
 
         $itemData = include $fixturePath . 'quote_item_downloadable.php';
@@ -168,7 +185,7 @@ public function testCanApplyRules()
             $this->model->getCouponCode()
         );
         $item = $this->getQuoteItemMock();
-        $rule = $this->createMock(\Magento\SalesRule\Model\Rule::class);
+        $rule = $this->createMock(Rule::class);
         $actionsCollection = $this->createPartialMock(\Magento\Rule\Model\Action\Collection::class, ['validate']);
         $actionsCollection->expects($this->any())
             ->method('validate')
@@ -278,7 +295,7 @@ public function testApplyRulesThatAppliedRuleIdsAreCollected()
     public function testInit()
     {
         $this->assertInstanceOf(
-            \Magento\SalesRule\Model\Validator::class,
+            Validator::class,
             $this->model->init(
                 $this->model->getWebsiteId(),
                 $this->model->getCustomerGroupId(),
@@ -314,7 +331,7 @@ public function testCanApplyDiscount()
     public function testInitTotalsCanApplyDiscount()
     {
         $rule = $this->createPartialMock(
-            \Magento\SalesRule\Model\Rule::class,
+            Rule::class,
             ['getSimpleAction', 'getActions', 'getId']
         );
         $item1 = $this->getMockForAbstractClass(
@@ -337,7 +354,7 @@ public function testInitTotalsCanApplyDiscount()
 
         $rule->expects($this->any())
             ->method('getSimpleAction')
-            ->willReturn(\Magento\SalesRule\Model\Rule::CART_FIXED_ACTION);
+            ->willReturn(Rule::CART_FIXED_ACTION);
         $iterator = new \ArrayIterator([$rule]);
         $this->ruleCollection->expects($this->once())->method('getIterator')->willReturn($iterator);
         $validator = $this->getMockBuilder(\Magento\Framework\Validator\AbstractValidator::class)
@@ -392,7 +409,7 @@ public function testInitTotalsNoItems()
 
     /**
      * @param $ruleCollection
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return MockObject
      */
     protected function prepareRuleCollectionMock($ruleCollection)
     {
@@ -427,14 +444,14 @@ public function testProcessShippingAmountNoRules()
             $this->model->getCouponCode()
         );
         $this->assertInstanceOf(
-            \Magento\SalesRule\Model\Validator::class,
+            Validator::class,
             $this->model->processShippingAmount($this->setupAddressMock())
         );
     }
 
     public function testProcessShippingAmountProcessDisabled()
     {
-        $ruleMock = $this->getMockBuilder(\Magento\SalesRule\Model\Rule::class)
+        $ruleMock = $this->getMockBuilder(Rule::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
@@ -448,51 +465,54 @@ public function testProcessShippingAmountProcessDisabled()
             $this->model->getCouponCode()
         );
         $this->assertInstanceOf(
-            \Magento\SalesRule\Model\Validator::class,
+            Validator::class,
             $this->model->processShippingAmount($this->setupAddressMock())
         );
     }
 
     /**
+     * Tests shipping amounts according to rule simple action.
+     *
      * @param string $action
+     * @param int $ruleDiscount
+     * @param int $shippingDiscount
      * @dataProvider dataProviderActions
      */
-    public function testProcessShippingAmountActions($action)
+    public function testProcessShippingAmountActions($action, $ruleDiscount, $shippingDiscount)
     {
-        $discountAmount = 50;
+        $shippingAmount = 5;
 
-        $ruleMock = $this->getMockBuilder(\Magento\SalesRule\Model\Rule::class)
+        $ruleMock = $this->getMockBuilder(Rule::class)
             ->disableOriginalConstructor()
             ->setMethods(['getApplyToShipping', 'getSimpleAction', 'getDiscountAmount'])
             ->getMock();
-        $ruleMock->expects($this->any())
-            ->method('getApplyToShipping')
+        $ruleMock->method('getApplyToShipping')
             ->willReturn(true);
-        $ruleMock->expects($this->any())
-            ->method('getDiscountAmount')
-            ->willReturn($discountAmount);
-        $ruleMock->expects($this->any())
-            ->method('getSimpleAction')
+        $ruleMock->method('getDiscountAmount')
+            ->willReturn($ruleDiscount);
+        $ruleMock->method('getSimpleAction')
             ->willReturn($action);
 
         $iterator = new \ArrayIterator([$ruleMock]);
-        $this->ruleCollection->expects($this->any())
-            ->method('getIterator')
+        $this->ruleCollection->method('getIterator')
             ->willReturn($iterator);
 
-        $this->utility->expects($this->any())
-            ->method('canProcessRule')
+        $this->utility->method('canProcessRule')
             ->willReturn(true);
 
+        $this->priceCurrency->method('convert')
+            ->willReturn($ruleDiscount);
+
         $this->model->init(
             $this->model->getWebsiteId(),
             $this->model->getCustomerGroupId(),
             $this->model->getCouponCode()
         );
-        $this->assertInstanceOf(
-            \Magento\SalesRule\Model\Validator::class,
-            $this->model->processShippingAmount($this->setupAddressMock(5))
-        );
+
+        $addressMock = $this->setupAddressMock($shippingAmount);
+
+        self::assertInstanceOf(Validator::class, $this->model->processShippingAmount($addressMock));
+        self::assertEquals($shippingDiscount, $addressMock->getShippingDiscountAmount());
     }
 
     /**
@@ -501,44 +521,48 @@ public function testProcessShippingAmountActions($action)
     public static function dataProviderActions()
     {
         return [
-            [\Magento\SalesRule\Model\Rule::TO_PERCENT_ACTION],
-            [\Magento\SalesRule\Model\Rule::BY_PERCENT_ACTION],
-            [\Magento\SalesRule\Model\Rule::TO_FIXED_ACTION],
-            [\Magento\SalesRule\Model\Rule::BY_FIXED_ACTION],
-            [\Magento\SalesRule\Model\Rule::CART_FIXED_ACTION],
+            [Rule::TO_PERCENT_ACTION, 50, 2.5],
+            [Rule::BY_PERCENT_ACTION, 50, 2.5],
+            [Rule::TO_FIXED_ACTION, 5, 0],
+            [Rule::BY_FIXED_ACTION, 5, 5],
+            [Rule::CART_FIXED_ACTION, 5, 0],
         ];
     }
 
     /**
      * @param null|int $shippingAmount
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return MockObject
      */
     protected function setupAddressMock($shippingAmount = null)
     {
-        $storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+        $storeMock = $this->getMockBuilder(Store::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
-        $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
+
+        $quoteMock = $this->getMockBuilder(Quote::class)
             ->disableOriginalConstructor()
             ->setMethods(['setAppliedRuleIds', 'getStore'])
             ->getMock();
-        $quoteMock->expects($this->any())
-            ->method('getStore')
+
+        $quoteMock->method('getStore')
             ->willReturn($storeMock);
-        $quoteMock->expects($this->any())
-            ->method('setAppliedRuleIds')
+
+        $quoteMock->method('setAppliedRuleIds')
             ->willReturnSelf();
 
-        $this->addressMock->expects($this->any())
-            ->method('getShippingAmountForDiscount')
+        $this->addressMock->method('getShippingAmountForDiscount')
             ->willReturn($shippingAmount);
-        $this->addressMock->expects($this->any())
-            ->method('getQuote')
+
+        $this->addressMock->method('getBaseShippingAmountForDiscount')
+            ->willReturn($shippingAmount);
+
+        $this->addressMock->method('getQuote')
             ->willReturn($quoteMock);
-        $this->addressMock->expects($this->any())
-            ->method('getCustomAttributesCodes')
+
+        $this->addressMock->method('getCustomAttributesCodes')
             ->willReturn([]);
+
         return $this->addressMock;
     }
 
@@ -546,7 +570,7 @@ public function testReset()
     {
         $this->utility->expects($this->once())
             ->method('resetRoundingDeltas');
-        $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
+        $quoteMock = $this->getMockBuilder(Quote::class)
             ->disableOriginalConstructor()
             ->getMock();
         $addressMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address::class)
@@ -560,6 +584,6 @@ public function testReset()
             $this->model->getCustomerGroupId(),
             $this->model->getCouponCode()
         );
-        $this->assertInstanceOf(\Magento\SalesRule\Model\Validator::class, $this->model->reset($addressMock));
+        $this->assertInstanceOf(Validator::class, $this->model->reset($addressMock));
     }
 }
diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json
index 3751aca28aef2..f77696c2a6f0e 100644
--- a/app/code/Magento/SalesRule/composer.json
+++ b/app/code/Magento/SalesRule/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-sales-rule",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-config": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-rule": "100.2.*",
@@ -25,7 +25,7 @@
         "magento/module-sales-rule-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "101.0.4",
+    "version": "101.0.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/SalesRule/etc/events.xml b/app/code/Magento/SalesRule/etc/events.xml
index 8261860bbb7ce..eec0da74f619e 100644
--- a/app/code/Magento/SalesRule/etc/events.xml
+++ b/app/code/Magento/SalesRule/etc/events.xml
@@ -24,4 +24,7 @@
     <event name="magento_salesrule_api_data_ruleinterface_load_after">
         <observer name="legacy_model_load" instance="Magento\Framework\EntityManager\Observer\AfterEntityLoad" />
     </event>
+    <event name="sales_order_customer_assign_after">
+        <observer name="sales_order_assign_customer_after" instance="Magento\SalesRule\Observer\AssignCouponDataAfterOrderCustomerAssignObserver" />
+    </event>
 </config>
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 9b579f47759a6..570eb0bf151f0 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
@@ -452,7 +452,7 @@
                 <dataScope>discount_step</dataScope>
             </settings>
         </field>
-        <field name="apply_to_shipping" component="Magento_Ui/js/form/element/single-checkbox-toggle-notice" formElement="checkbox">
+        <field name="apply_to_shipping" component="Magento_SalesRule/js/form/element/apply_to_shipping" formElement="checkbox">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="source" xsi:type="string">sales_rule</item>
diff --git a/app/code/Magento/SalesRule/view/adminhtml/web/js/form/element/apply_to_shipping.js b/app/code/Magento/SalesRule/view/adminhtml/web/js/form/element/apply_to_shipping.js
new file mode 100644
index 0000000000000..dfb3f909345b3
--- /dev/null
+++ b/app/code/Magento/SalesRule/view/adminhtml/web/js/form/element/apply_to_shipping.js
@@ -0,0 +1,37 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/element/single-checkbox-toggle-notice'
+], function (Checkbox) {
+    'use strict';
+
+    return Checkbox.extend({
+        defaults: {
+            imports: {
+                toggleDisabled: '${ $.parentName }.simple_action:value'
+            }
+        },
+
+        /**
+         * Toggle element disabled state according to simple action value.
+         *
+         * @param {String} action
+         */
+        toggleDisabled: function (action) {
+            switch (action) {
+                case 'cart_fixed':
+                    this.disabled(true);
+                    break;
+                default:
+                    this.disabled(false);
+            }
+
+            if (this.disabled()) {
+                this.checked(false);
+            }
+        }
+    });
+});
diff --git a/app/code/Magento/SalesRule/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/SalesRule/view/frontend/layout/checkout_cart_index.xml
index 022403579b237..375324ed4cde6 100644
--- a/app/code/Magento/SalesRule/view/frontend/layout/checkout_cart_index.xml
+++ b/app/code/Magento/SalesRule/view/frontend/layout/checkout_cart_index.xml
@@ -13,14 +13,10 @@
                     <item name="components" xsi:type="array">
                         <item name="block-totals" xsi:type="array">
                             <item name="children" xsi:type="array">
-                                <item name="before_grandtotal" xsi:type="array">
-                                    <item name="children" xsi:type="array">
-                                        <item name="discount" xsi:type="array">
-                                            <item name="component"  xsi:type="string">Magento_SalesRule/js/view/cart/totals/discount</item>
-                                            <item name="config" xsi:type="array">
-                                                <item name="title" xsi:type="string" translate="true">Discount</item>
-                                            </item>
-                                        </item>
+                                <item name="discount" xsi:type="array">
+                                    <item name="component"  xsi:type="string">Magento_SalesRule/js/view/cart/totals/discount</item>
+                                    <item name="config" xsi:type="array">
+                                        <item name="title" xsi:type="string" translate="true">Discount</item>
                                     </item>
                                 </item>
                             </item>
diff --git a/app/code/Magento/SalesSequence/composer.json b/app/code/Magento/SalesSequence/composer.json
index 8c4993966d4bb..40a04df8f0530 100644
--- a/app/code/Magento/SalesSequence/composer.json
+++ b/app/code/Magento/SalesSequence/composer.json
@@ -2,11 +2,11 @@
     "name": "magento/module-sales-sequence",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/SampleData/composer.json b/app/code/Magento/SampleData/composer.json
index 7d9e64740f240..3dadf9d2183e4 100644
--- a/app/code/Magento/SampleData/composer.json
+++ b/app/code/Magento/SampleData/composer.json
@@ -2,14 +2,14 @@
     "name": "magento/module-sample-data",
     "description": "Sample Data fixtures",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*"
     },
     "suggest": {
         "magento/sample-data-media": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Search/Block/Adminhtml/Synonyms/Edit/DeleteButton.php b/app/code/Magento/Search/Block/Adminhtml/Synonyms/Edit/DeleteButton.php
index a73edcce99760..6c54d80a61319 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Synonyms/Edit/DeleteButton.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Synonyms/Edit/DeleteButton.php
@@ -24,7 +24,7 @@ public function getButtonData()
                 'class' => 'delete',
                 'on_click' => 'deleteConfirm(\''
                     . __('Are you sure you want to delete this synonym group?')
-                    . '\', \'' . $this->getDeleteUrl() . '\')',
+                    . '\', \'' . $this->getDeleteUrl() . '\', {data: {}})',
                 'sort_order' => 20,
             ];
         }
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Delete.php b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Delete.php
index 9d8b612cefadf..e531e947a5ab5 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Delete.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Delete.php
@@ -55,7 +55,7 @@ public function execute()
         $id = $this->getRequest()->getParam('group_id');
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultRedirectFactory->create();
-        if ($id) {
+        if ($this->getRequest()->isPost() && $id) {
             try {
                 /** @var \Magento\Search\Model\SynonymGroup $synGroupModel */
                 $synGroupModel = $this->synGroupRepository->get($id);
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/MassDelete.php b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/MassDelete.php
index f2770f77cc533..2f3d574e21485 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/MassDelete.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/MassDelete.php
@@ -6,8 +6,10 @@
 
 namespace Magento\Search\Controller\Adminhtml\Synonyms;
 
+use Magento\Framework\Exception\NotFoundException;
+
 /**
- * Mass-Delete Controller
+ * Mass-Delete Controller.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -56,13 +58,17 @@ public function __construct(
     }
 
     /**
-     * Execute action
+     * Execute action.
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
-     * @throws \Magento\Framework\Exception\LocalizedException|\Exception
+     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found.'));
+        }
+
         $collection = $this->filter->getCollection($this->collectionFactory->create());
         $collectionSize = $collection->getSize();
 
@@ -88,6 +94,7 @@ public function execute()
         }
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT);
+
         return $resultRedirect->setPath('*/*/');
     }
 }
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php
index c7adf32da0fb0..52ff4a0388634 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Search\Controller\Adminhtml\Term;
 
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Search\Controller\Adminhtml\Term as TermController;
 use Magento\Framework\Controller\ResultFactory;
 
@@ -12,10 +13,15 @@ class Delete extends TermController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws NotFoundException
      */
     public function execute()
     {
-        $id = $this->getRequest()->getParam('id');
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
+        $id = (int)$this->getRequest()->getParam('id');
         /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         if ($id) {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php b/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php
index f6874078f2f64..449450eeb8fd7 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Search\Controller\Adminhtml\Term;
 
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Search\Controller\Adminhtml\Term as TermController;
 use Magento\Framework\Controller\ResultFactory;
 
@@ -12,9 +13,14 @@ class MassDelete extends TermController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         $searchIds = $this->getRequest()->getParam('search');
         if (!is_array($searchIds)) {
             $this->messageManager->addErrorMessage(__('Please select searches.'));
diff --git a/app/code/Magento/Search/Model/ResourceModel/Query.php b/app/code/Magento/Search/Model/ResourceModel/Query.php
index 54849ffec5558..055c10eacf85b 100644
--- a/app/code/Magento/Search/Model/ResourceModel/Query.php
+++ b/app/code/Magento/Search/Model/ResourceModel/Query.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Search\Model\ResourceModel;
 
 use Magento\Framework\DB\Select;
diff --git a/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php b/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php
index 46e794a1954cf..1ac1547eb8d0a 100644
--- a/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php
+++ b/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php
@@ -87,7 +87,7 @@ private function queryByPhrase($phrase)
     {
         $matchQuery = $this->fullTextSelect->getMatchQuery(
             ['synonyms' => 'synonyms'],
-            $phrase,
+            $this->escapePhrase($phrase),
             Fulltext::FULLTEXT_MODE_BOOLEAN
         );
         $query = $this->getConnection()->select()->from(
@@ -97,6 +97,18 @@ private function queryByPhrase($phrase)
         return $this->getConnection()->fetchAll($query);
     }
 
+    /**
+     * Cut trailing plus or minus sign, and @ symbol, using of which causes InnoDB to report a syntax error.
+     *
+     * @see https://dev.mysql.com/doc/refman/5.7/en/fulltext-boolean.html
+     * @param string $phrase
+     * @return string
+     */
+    private function escapePhrase(string $phrase): string
+    {
+        return preg_replace('/@+|[@+-]+$|[<>]/', '', $phrase);
+    }
+
     /**
      * A private helper function to retrieve matching synonym groups per scope
      *
diff --git a/app/code/Magento/Search/Test/Mftf/ActionGroup/StorefrontQuickSearchActionGroup.xml b/app/code/Magento/Search/Test/Mftf/ActionGroup/StorefrontQuickSearchActionGroup.xml
new file mode 100644
index 0000000000000..bf5ca6db4ce5c
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/ActionGroup/StorefrontQuickSearchActionGroup.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="StorefrontQuickSearchActionGroup">
+        <arguments>
+            <argument name="searchPhrase" type="string"/>
+        </arguments>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
+        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="{{searchPhrase}}" stepKey="fillSearchField"/>
+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Synonyms/DeleteTest.php b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Synonyms/DeleteTest.php
index 38c78b986faf4..164f82da02f6f 100644
--- a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Synonyms/DeleteTest.php
+++ b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Synonyms/DeleteTest.php
@@ -55,8 +55,9 @@ protected function setUp()
             false,
             true,
             true,
-            ['getParam']
+            ['getParam', 'isPost']
         );
+        $this->requestMock->expects($this->any())->method('isPost')->willReturn(true);
 
         $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManager\ObjectManager::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Synonyms/MassDeleteTest.php b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Synonyms/MassDeleteTest.php
new file mode 100644
index 0000000000000..8b98959225528
--- /dev/null
+++ b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Synonyms/MassDeleteTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Search\Test\Unit\Controller\Adminhtml\Synonyms;
+
+/**
+ * Unit tests for Magento\Search\Controller\Adminhtml\Synonyms\MassDelete controller.
+ */
+class MassDeleteTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Search\Controller\Adminhtml\Synonyms\MassDelete
+     */
+    private $controller;
+
+    /**
+     * @var \Magento\Backend\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var \Magento\Ui\Component\MassAction\Filter|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $filterMock;
+
+    /**
+     * @var \Magento\Search\Model\ResourceModel\SynonymGroup\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $collectionFactoryMock;
+
+    /**
+     * @var \Magento\Search\Api\SynonymGroupRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $synGroupRepositoryMock;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->requestMock = $this->getMockForAbstractClass(
+            \Magento\Framework\App\RequestInterface::class,
+            [],
+            '',
+            false,
+            true,
+            true,
+            ['isPost']
+        );
+        $this->contextMock = $this->createMock(\Magento\Backend\App\Action\Context::class);
+        $this->filterMock = $this->createMock(\Magento\Ui\Component\MassAction\Filter::class);
+        $this->collectionFactoryMock = $this->createMock(
+            \Magento\Search\Model\ResourceModel\SynonymGroup\CollectionFactory::class
+        );
+        $this->synGroupRepositoryMock = $this->createMock(\Magento\Search\Api\SynonymGroupRepositoryInterface::class);
+
+        $this->contextMock->expects($this->once())->method('getRequest')->willReturn($this->requestMock);
+
+        $this->controller = $objectManagerHelper->getObject(
+            \Magento\Search\Controller\Adminhtml\Synonyms\MassDelete::class,
+            [
+                'context' => $this->contextMock,
+                'filter' => $this->filterMock,
+                'collectionFactory' => $this->collectionFactoryMock,
+                'synGroupRepository' => $this->synGroupRepositoryMock,
+            ]
+        );
+    }
+
+    /**
+     * Check that error throws when request is not POST.
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\NotFoundException
+     */
+    public function testExecuteWithNotPostRequest()
+    {
+        $this->requestMock->expects($this->once())->method('isPost')->willReturn(false);
+
+        $this->controller->execute();
+    }
+}
diff --git a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php
index 60cc958a6187c..a9a705b74a8bb 100644
--- a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php
+++ b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php
@@ -46,7 +46,7 @@ protected function setUp()
     {
         $this->request = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
             ->disableOriginalConstructor()
-            ->setMethods([])
+            ->setMethods(['isPost'])
             ->getMockForAbstractClass();
         $this->objectManager = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
             ->disableOriginalConstructor()
@@ -85,6 +85,7 @@ protected function setUp()
         $this->context->expects($this->any())
             ->method('getResultFactory')
             ->willReturn($this->resultFactoryMock);
+        $this->request->expects($this->any())->method('isPost')->willReturn(true);
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->controller = $this->objectManagerHelper->getObject(
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..5495b93a0828e 100644
--- a/app/code/Magento/Search/Ui/Component/Listing/Column/SynonymActions.php
+++ b/app/code/Magento/Search/Ui/Component/Listing/Column/SynonymActions.php
@@ -63,7 +63,8 @@ public function prepareDataSource(array $dataSource)
                     'confirm' => [
                         'title' => __('Delete'),
                         'message' => __('Are you sure you want to delete synonym group with id: %1?', $item['group_id'])
-                    ]
+                    ],
+                    'post' => true,
                 ];
                 $item[$name]['edit'] = [
                     'href' => $this->urlBuilder->getUrl(self::SYNONYM_URL_PATH_EDIT, ['group_id' => $item['group_id']]),
diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json
index 2b474fdba93dc..4ffe9bf0008c6 100644
--- a/app/code/Magento/Search/composer.json
+++ b/app/code/Magento/Search/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-search",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*",
         "magento/module-backend": "100.2.*",
         "magento/module-catalog-search": "100.2.*",
@@ -11,7 +11,7 @@
         "magento/module-ui": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.5",
+    "version": "100.2.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
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 2ea87be13d5e3..888d5b678569f 100644
--- a/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
+++ b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
 /** @var $block \Magento\Framework\View\Element\Template */
@@ -12,30 +12,31 @@
 $helper = $this->helper(\Magento\Search\Helper\Data::class);
 ?>
 <div class="block block-search">
-    <div class="block block-title"><strong><?= /* @escapeNotVerified */ __('Search') ?></strong></div>
+    <div class="block block-title"><strong><?= $block->escapeHtml(__('Search')) ?></strong></div>
     <div class="block block-content">
-        <form class="form minisearch" id="search_mini_form" action="<?= /* @escapeNotVerified */ $helper->getResultUrl() ?>" method="get">
+        <form class="form minisearch" id="search_mini_form" action="<?= $block->escapeUrl($helper->getResultUrl()) ?>" method="get">
             <div class="field search">
                 <label class="label" for="search" data-role="minisearch-label">
-                    <span><?= /* @escapeNotVerified */ __('Search') ?></span>
+                    <span><?= $block->escapeHtml(__('Search')) ?></span>
                 </label>
                 <div class="control">
                     <input id="search"
                            data-mage-init='{"quickSearch":{
                                 "formSelector":"#search_mini_form",
-                                "url":"<?= /* @escapeNotVerified */ $helper->getSuggestUrl()?>",
+                                "url":"<?= $block->escapeUrl($helper->getSuggestUrl()) ?>",
                                 "destinationSelector":"#search_autocomplete"}
                            }'
                            type="text"
-                           name="<?= /* @escapeNotVerified */ $helper->getQueryParamName() ?>"
-                           value="<?= /* @escapeNotVerified */ $helper->getEscapedQueryText() ?>"
-                           placeholder="<?= /* @escapeNotVerified */ __('Search entire store here...') ?>"
+                           name="<?= $block->escapeHtmlAttr($helper->getQueryParamName()) ?>"
+                           value="<?= $block->escapeHtmlAttr($helper->getEscapedQueryText()) ?>"
+                           placeholder="<?= $block->escapeHtmlAttr(__('Search entire store here...')) ?>"
                            class="input-text"
-                           maxlength="<?= /* @escapeNotVerified */ $helper->getMaxQueryLength() ?>"
+                           maxlength="<?= /* @noEscape */ (int)$helper->getMaxQueryLength() ?>"
                            role="combobox"
                            aria-haspopup="false"
                            aria-autocomplete="both"
-                           autocomplete="off"/>
+                           autocomplete="off"
+                           aria-expanded="false"/>
                     <div id="search_autocomplete" class="search-autocomplete"></div>
                     <?= $block->getChildHtml() ?>
                 </div>
@@ -44,7 +45,7 @@ $helper = $this->helper(\Magento\Search\Helper\Data::class);
                 <button type="submit"
                         title="<?= $block->escapeHtml(__('Search')) ?>"
                         class="action search">
-                    <span><?= /* @escapeNotVerified */ __('Search') ?></span>
+                    <span><?= $block->escapeHtml(__('Search')) ?></span>
                 </button>
             </div>
         </form>
diff --git a/app/code/Magento/Search/view/frontend/templates/term.phtml b/app/code/Magento/Search/view/frontend/templates/term.phtml
index 8acee0cf3d408..e152acacaa53d 100644
--- a/app/code/Magento/Search/view/frontend/templates/term.phtml
+++ b/app/code/Magento/Search/view/frontend/templates/term.phtml
@@ -3,23 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<?php if (sizeof($block->getTerms()) > 0): ?>
+<?php if (count($block->getTerms()) > 0) : ?>
     <ul class="search-terms">
-        <?php foreach ($block->getTerms() as $_term): ?>
+        <?php foreach ($block->getTerms() as $_term) : ?>
             <li class="item">
-                <a href="<?= /* @escapeNotVerified */ $block->getSearchUrl($_term) ?>"
-                   style="font-size:<?= /* @escapeNotVerified */ $_term->getRatio()*70+75 ?>%;">
+                <a href="<?= $block->escapeUrl($block->getSearchUrl($_term)) ?>"
+                   style="font-size:<?= /* @noEscape */ $_term->getRatio()*70+75 ?>%;">
                     <?= $block->escapeHtml($_term->getData('query_text')) ?>
                 </a>
             </li>
         <?php endforeach; ?>
     </ul>
-<?php else: ?>
+<?php else : ?>
     <div class="message notice">
-        <div><?= /* @escapeNotVerified */ __('There are no search terms available.') ?></div>
+        <div><?= $block->escapeHtml(__('There are no search terms available.')) ?></div>
     </div>
 <?php endif; ?>
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 15bcf2e73393e..3f3e64738d46f 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
@@ -71,8 +71,7 @@ define([
                     this.isExpandable = true;
                 }.bind(this),
                 exit: function () {
-                    this.isExpandable = false;
-                    this.element.removeAttr('aria-expanded');
+                    this.isExpandable = true;
                 }.bind(this)
             });
 
@@ -129,11 +128,16 @@ define([
          * @param {Boolean} isActive
          */
         setActiveState: function (isActive) {
+            var searchValue;
+
             this.searchForm.toggleClass('active', isActive);
             this.searchLabel.toggleClass('active', isActive);
 
             if (this.isExpandable) {
                 this.element.attr('aria-expanded', isActive);
+                searchValue = this.element.val();
+                this.element.val('');
+                this.element.val(searchValue);
             }
         },
 
diff --git a/app/code/Magento/Security/Model/SecurityChecker/Quantity.php b/app/code/Magento/Security/Model/SecurityChecker/Quantity.php
index 7f1d85abeb74b..cbf41980c51d3 100644
--- a/app/code/Magento/Security/Model/SecurityChecker/Quantity.php
+++ b/app/code/Magento/Security/Model/SecurityChecker/Quantity.php
@@ -47,13 +47,13 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function check($securityEventType, $accountReference = null, $longIp = null)
     {
         $isEnabled = $this->securityConfig->getPasswordResetProtectionType() != ResetMethod::OPTION_NONE;
         $allowedAttemptsNumber = $this->securityConfig->getMaxNumberPasswordResetRequests();
-        if ($isEnabled and $allowedAttemptsNumber) {
+        if ($isEnabled && $allowedAttemptsNumber) {
             $collection = $this->prepareCollection($securityEventType, $accountReference, $longIp);
             if ($collection->count() >= $allowedAttemptsNumber) {
                 throw new SecurityViolationException(
diff --git a/app/code/Magento/Security/composer.json b/app/code/Magento/Security/composer.json
index 5422b6d606551..7f8c809bd72cd 100644
--- a/app/code/Magento/Security/composer.json
+++ b/app/code/Magento/Security/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-security",
     "description": "Security management module",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-backend": "100.2.*",
         "magento/module-store": "100.2.*",
         "magento/framework": "101.0.*"
@@ -11,7 +11,7 @@
         "magento/module-customer": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/SendFriend/Block/Send.php b/app/code/Magento/SendFriend/Block/Send.php
index 43e95ebe43d48..1c4b550361359 100644
--- a/app/code/Magento/SendFriend/Block/Send.php
+++ b/app/code/Magento/SendFriend/Block/Send.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\SendFriend\Block;
 
+use Magento\Captcha\Block\Captcha;
 use Magento\Customer\Model\Context;
 
 /**
@@ -170,6 +171,7 @@ public function setFormData($data)
     /**
      * Retrieve Current Product Id
      *
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      * @return int
      */
     public function getProductId()
@@ -180,6 +182,7 @@ public function getProductId()
     /**
      * Retrieve current category id for product
      *
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      * @return int
      */
     public function getCategoryId()
@@ -222,4 +225,24 @@ public function canSend()
     {
         return !$this->sendfriend->isExceedLimit();
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _prepareLayout()
+    {
+        if (!$this->getChildBlock('captcha')) {
+            $this->addChild(
+                'captcha',
+                Captcha::class,
+                [
+                    'cacheable' => false,
+                    'after' => '-',
+                    'form_id' => 'product_sendtofriend_form',
+                    'image_width' => 230,
+                    'image_height' => 230
+                ]
+            );
+        }
+    }
 }
diff --git a/app/code/Magento/SendFriend/Controller/Product.php b/app/code/Magento/SendFriend/Controller/Product.php
index 732bcef8b957a..388fcd23c2e0a 100644
--- a/app/code/Magento/SendFriend/Controller/Product.php
+++ b/app/code/Magento/SendFriend/Controller/Product.php
@@ -102,7 +102,7 @@ protected function _initProduct()
         }
         try {
             $product = $this->productRepository->getById($productId);
-            if (!$product->isVisibleInCatalog()) {
+            if (!$product->isVisibleInSiteVisibility() || !$product->isVisibleInCatalog()) {
                 return false;
             }
         } catch (NoSuchEntityException $noEntityException) {
diff --git a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
index 72dcf00d17c7d..36365ddfb44e5 100644
--- a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
+++ b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
@@ -4,13 +4,18 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\SendFriend\Controller\Product;
 
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\SendFriend\Model\CaptchaValidator;
 
+/**
+ * Controller class Sendmail. Represents send-mail action request flow
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class Sendmail extends \Magento\SendFriend\Controller\Product
 {
     /**
@@ -23,6 +28,11 @@ class Sendmail extends \Magento\SendFriend\Controller\Product
      */
     protected $catalogSession;
 
+    /**
+     * @var CaptchaValidator
+     */
+    private $captchaValidator;
+
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
@@ -31,6 +41,9 @@ class Sendmail extends \Magento\SendFriend\Controller\Product
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
      * @param \Magento\Catalog\Model\Session $catalogSession
+     * @param CaptchaValidator|null $captchaValidator
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -39,11 +52,13 @@ public function __construct(
         \Magento\SendFriend\Model\SendFriend $sendFriend,
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
         \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository,
-        \Magento\Catalog\Model\Session $catalogSession
+        \Magento\Catalog\Model\Session $catalogSession,
+        CaptchaValidator $captchaValidator = null
     ) {
         parent::__construct($context, $coreRegistry, $formKeyValidator, $sendFriend, $productRepository);
         $this->categoryRepository = $categoryRepository;
         $this->catalogSession = $catalogSession;
+        $this->captchaValidator = $captchaValidator ?: ObjectManager::getInstance()->create(CaptchaValidator::class);
     }
 
     /**
@@ -91,6 +106,7 @@ public function execute()
 
         try {
             $validate = $this->sendFriend->validate();
+            $this->captchaValidator->validateSending($this->getRequest());
             if ($validate === true) {
                 $this->sendFriend->send();
                 $this->messageManager->addSuccess(__('The link to a friend was sent.'));
diff --git a/app/code/Magento/SendFriend/Model/CaptchaValidator.php b/app/code/Magento/SendFriend/Model/CaptchaValidator.php
new file mode 100644
index 0000000000000..20082e4880b4c
--- /dev/null
+++ b/app/code/Magento/SendFriend/Model/CaptchaValidator.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\SendFriend\Model;
+
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Captcha\Helper\Data;
+use Magento\Captcha\Model\DefaultModel;
+use Magento\Captcha\Observer\CaptchaStringResolver;
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+
+/**
+ * Class CaptchaValidator. Performs captcha validation
+ */
+class CaptchaValidator
+{
+    /**
+     * @var Data
+     */
+    private $captchaHelper;
+
+    /**
+     * @var CaptchaStringResolver
+     */
+    private $captchaStringResolver;
+
+    /**
+     * @var UserContextInterface
+     */
+    private $currentUser;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * CaptchaValidator constructor.
+     *
+     * @param Data $captchaHelper
+     * @param CaptchaStringResolver $captchaStringResolver
+     * @param UserContextInterface $currentUser
+     * @param CustomerRepositoryInterface $customerRepository
+     */
+    public function __construct(
+        Data $captchaHelper,
+        CaptchaStringResolver $captchaStringResolver,
+        UserContextInterface $currentUser,
+        CustomerRepositoryInterface $customerRepository
+    ) {
+        $this->captchaHelper = $captchaHelper;
+        $this->captchaStringResolver = $captchaStringResolver;
+        $this->currentUser = $currentUser;
+        $this->customerRepository = $customerRepository;
+    }
+
+    /**
+     * Entry point for captcha validation
+     *
+     * @param RequestInterface $request
+     * @throws LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function validateSending(RequestInterface $request)
+    {
+        $this->validateCaptcha($request);
+    }
+
+    /**
+     * Validates captcha and triggers log attempt
+     *
+     * @param RequestInterface $request
+     * @throws LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function validateCaptcha(RequestInterface $request)
+    {
+        $captchaTargetFormName = 'product_sendtofriend_form';
+        /** @var DefaultModel $captchaModel */
+        $captchaModel = $this->captchaHelper->getCaptcha($captchaTargetFormName);
+
+        if ($captchaModel->isRequired()) {
+            $word = $this->captchaStringResolver->resolve(
+                $request,
+                $captchaTargetFormName
+            );
+
+            $isCorrectCaptcha = $captchaModel->isCorrect($word);
+
+            if (!$isCorrectCaptcha) {
+                $this->logCaptchaAttempt($captchaModel);
+                throw new LocalizedException(__('Incorrect CAPTCHA'));
+            }
+        }
+
+        $this->logCaptchaAttempt($captchaModel);
+    }
+
+    /**
+     * Log captcha attempts
+     *
+     * @param DefaultModel $captchaModel
+     * @throws LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function logCaptchaAttempt(DefaultModel $captchaModel)
+    {
+        $email = '';
+
+        if ($this->currentUser->getUserType() == UserContextInterface::USER_TYPE_CUSTOMER) {
+            $email = $this->customerRepository->getById($this->currentUser->getUserId())->getEmail();
+        }
+
+        $captchaModel->logAttempt($email);
+    }
+}
diff --git a/app/code/Magento/SendFriend/Model/SendFriend.php b/app/code/Magento/SendFriend/Model/SendFriend.php
index c69d6342b4892..2502db9891241 100644
--- a/app/code/Magento/SendFriend/Model/SendFriend.php
+++ b/app/code/Magento/SendFriend/Model/SendFriend.php
@@ -16,6 +16,7 @@
  * @method \Magento\SendFriend\Model\SendFriend setTime(int $value)
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
@@ -162,6 +163,8 @@ protected function _construct()
     }
 
     /**
+     * Send email.
+     *
      * @return $this
      * @throws CoreException
      */
@@ -175,7 +178,7 @@ public function send()
 
         $this->inlineTranslation->suspend();
 
-        $message = nl2br(htmlspecialchars($this->getSender()->getMessage()));
+        $message = nl2br($this->_escaper->escapeHtml($this->getSender()->getMessage()));
         $sender = [
             'name' => $this->_escaper->escapeHtml($this->getSender()->getName()),
             'email' => $this->_escaper->escapeHtml($this->getSender()->getEmail()),
@@ -236,7 +239,7 @@ public function validate()
         }
 
         $email = $this->getSender()->getEmail();
-        if (empty($email) or !\Zend_Validate::is($email, \Magento\Framework\Validator\EmailAddress::class)) {
+        if (empty($email) || !\Zend_Validate::is($email, \Magento\Framework\Validator\EmailAddress::class)) {
             $errors[] = __('Invalid Sender Email');
         }
 
@@ -281,13 +284,13 @@ public function setRecipients($recipients)
         // validate array
         if (!is_array(
             $recipients
-        ) or !isset(
+        ) || !isset(
             $recipients['email']
-        ) or !isset(
+        ) || !isset(
             $recipients['name']
-        ) or !is_array(
+        ) || !is_array(
             $recipients['email']
-        ) or !is_array(
+        ) || !is_array(
             $recipients['name']
         )
         ) {
@@ -487,7 +490,7 @@ protected function _sentCountByCookies($increment = false)
             $oldTimes = explode(',', $oldTimes);
             foreach ($oldTimes as $oldTime) {
                 $periodTime = $time - $this->_sendfriendData->getPeriod();
-                if (is_numeric($oldTime) and $oldTime >= $periodTime) {
+                if (is_numeric($oldTime) && $oldTime >= $periodTime) {
                     $newTimes[] = $oldTime;
                 }
             }
diff --git a/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendTest.php b/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendTest.php
index 9d48133c1d500..7657f1d3d61e3 100644
--- a/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendTest.php
+++ b/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendTest.php
@@ -104,7 +104,7 @@ public function testExecute()
 
         /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
         $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog'])
+            ->setMethods(['isVisibleInCatalog', 'isVisibleInSiteVisibility'])
             ->getMockForAbstractClass();
 
         $this->productRepositoryMock->expects($this->once())
@@ -116,6 +116,10 @@ public function testExecute()
             ->method('isVisibleInCatalog')
             ->willReturn(true);
 
+        $productMock->expects($this->once())
+            ->method('isVisibleInSiteVisibility')
+            ->willReturn(true);
+
         $this->registryMock->expects($this->once())
             ->method('register')
             ->with('product', $productMock, false);
@@ -193,7 +197,7 @@ public function testExecuteWithoutBlock()
 
         /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
         $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog'])
+            ->setMethods(['isVisibleInCatalog', 'isVisibleInSiteVisibility'])
             ->getMockForAbstractClass();
 
         $this->productRepositoryMock->expects($this->once())
@@ -205,6 +209,10 @@ public function testExecuteWithoutBlock()
             ->method('isVisibleInCatalog')
             ->willReturn(true);
 
+        $productMock->expects($this->once())
+            ->method('isVisibleInSiteVisibility')
+            ->willReturn(true);
+
         $this->registryMock->expects($this->once())
             ->method('register')
             ->with('product', $productMock, false);
@@ -269,7 +277,7 @@ public function testExecuteWithNoticeAndNoData()
 
         /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
         $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog'])
+            ->setMethods(['isVisibleInCatalog', 'isVisibleInSiteVisibility'])
             ->getMockForAbstractClass();
 
         $this->productRepositoryMock->expects($this->once())
@@ -281,6 +289,10 @@ public function testExecuteWithNoticeAndNoData()
             ->method('isVisibleInCatalog')
             ->willReturn(true);
 
+        $productMock->expects($this->once())
+            ->method('isVisibleInSiteVisibility')
+            ->willReturn(true);
+
         $this->registryMock->expects($this->once())
             ->method('register')
             ->with('product', $productMock, false);
@@ -391,7 +403,7 @@ public function testExecuteWithNonVisibleProduct()
 
         /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
         $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog'])
+            ->setMethods(['isVisibleInCatalog', 'isVisibleInSiteVisibility'])
             ->getMockForAbstractClass();
 
         $this->productRepositoryMock->expects($this->once())
@@ -403,6 +415,10 @@ public function testExecuteWithNonVisibleProduct()
             ->method('isVisibleInCatalog')
             ->willReturn(false);
 
+        $productMock->expects($this->once())
+            ->method('isVisibleInSiteVisibility')
+            ->willReturn(true);
+
         /** @var \Magento\Framework\Controller\Result\Forward|\PHPUnit_Framework_MockObject_MockObject $forwardMock */
         $forwardMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Forward::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendmailTest.php b/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendmailTest.php
deleted file mode 100644
index c7881f366f520..0000000000000
--- a/app/code/Magento/SendFriend/Test/Unit/Controller/Product/SendmailTest.php
+++ /dev/null
@@ -1,906 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\SendFriend\Test\Unit\Controller\Product;
-
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class SendmailTest extends \PHPUnit\Framework\TestCase
-{
-    /** @var \Magento\SendFriend\Controller\Product\Sendmail */
-    protected $model;
-
-    /** @var ObjectManagerHelper */
-    protected $objectManagerHelper;
-
-    /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $requestMock;
-
-    /** @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject */
-    protected $registryMock;
-
-    /** @var \Magento\Framework\Data\Form\FormKey\Validator|\PHPUnit_Framework_MockObject_MockObject */
-    protected $validatorMock;
-
-    /** @var \Magento\SendFriend\Model\SendFriend|\PHPUnit_Framework_MockObject_MockObject */
-    protected $sendFriendMock;
-
-    /** @var \Magento\Catalog\Api\ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $productRepositoryMock;
-
-    /** @var \Magento\Catalog\Api\CategoryRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $categoryRepositoryMock;
-
-    /** @var \Magento\Catalog\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
-    protected $catalogSessionMock;
-
-    /** @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $messageManagerMock;
-
-    /** @var \Magento\Framework\Controller\ResultFactory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $resultFactoryMock;
-
-    /** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $eventManagerMock;
-
-    /** @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $redirectMock;
-
-    /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $urlBuilderMock;
-
-    protected function setUp()
-    {
-        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
-            ->setMethods(['getPost', 'getPostValue', 'getParam'])
-            ->getMockForAbstractClass();
-        $this->registryMock = $this->getMockBuilder(\Magento\Framework\Registry::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->validatorMock = $this->getMockBuilder(\Magento\Framework\Data\Form\FormKey\Validator::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->sendFriendMock = $this->getMockBuilder(\Magento\SendFriend\Model\SendFriend::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->productRepositoryMock = $this->getMockBuilder(\Magento\Catalog\Api\ProductRepositoryInterface::class)
-            ->getMockForAbstractClass();
-        $this->categoryRepositoryMock = $this->getMockBuilder(\Magento\Catalog\Api\CategoryRepositoryInterface::class)
-            ->getMockForAbstractClass();
-        $this->catalogSessionMock = $this->getMockBuilder(\Magento\Catalog\Model\Session::class)
-            ->setMethods(['getSendfriendFormData', 'setSendfriendFormData'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->messageManagerMock = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
-            ->getMock();
-        $this->resultFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->eventManagerMock = $this->getMockBuilder(\Magento\Framework\Event\ManagerInterface::class)
-            ->getMock();
-        $this->redirectMock = $this->getMockBuilder(\Magento\Framework\App\Response\RedirectInterface::class)
-            ->getMock();
-        $this->urlBuilderMock = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
-            ->getMock();
-
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
-        $this->model = $this->objectManagerHelper->getObject(
-            \Magento\SendFriend\Controller\Product\Sendmail::class,
-            [
-                'request' => $this->requestMock,
-                'coreRegistry' => $this->registryMock,
-                'formKeyValidator' => $this->validatorMock,
-                'sendFriend' => $this->sendFriendMock,
-                'productRepository' => $this->productRepositoryMock,
-                'categoryRepository' => $this->categoryRepositoryMock,
-                'catalogSession' => $this->catalogSessionMock,
-                'messageManager' => $this->messageManagerMock,
-                'resultFactory' => $this->resultFactoryMock,
-                'eventManager' => $this->eventManagerMock,
-                'redirect' => $this->redirectMock,
-                'url' => $this->urlBuilderMock,
-            ]
-        );
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecute()
-    {
-        $productId = 11;
-        $categoryId = 5;
-        $sender = 'sender';
-        $recipients = 'recipients';
-        $formData = [
-            'sender' => $sender,
-            'recipients' => $recipients,
-        ];
-        $productUrl = 'product_url';
-
-        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [])
-            ->willReturn($redirectMock);
-
-        $this->validatorMock->expects($this->once())
-            ->method('validate')
-            ->with($this->requestMock)
-            ->willReturn(true);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getParam')
-            ->willReturnMap(
-                [
-                    ['id', null, $productId],
-                    ['cat_id', null, $categoryId],
-                ]
-            );
-
-        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog', 'setCategory', 'getProductUrl'])
-            ->getMockForAbstractClass();
-
-        $this->productRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($productId, false, null, false)
-            ->willReturn($productMock);
-
-        $productMock->expects($this->once())
-            ->method('isVisibleInCatalog')
-            ->willReturn(true);
-
-        /** @var \Magento\Catalog\Api\Data\CategoryInterface|\PHPUnit_Framework_MockObject_MockObject $categoryMock */
-        $categoryMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\CategoryInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->categoryRepositoryMock->expects($this->once())
-            ->method('get')
-            ->with($categoryId, null)
-            ->willReturn($categoryMock);
-
-        $productMock->expects($this->once())
-            ->method('setCategory')
-            ->with($categoryMock);
-
-        $this->registryMock->expects($this->exactly(2))
-            ->method('register')
-            ->willReturnMap(
-                [
-                    ['product', $productMock, false, null],
-                    ['current_category', $categoryMock, false, null],
-                ]
-            );
-
-        $this->requestMock->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn($formData);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap(
-                [
-                    ['sender', $sender],
-                    ['recipients', $recipients],
-                ]
-            );
-
-        $this->sendFriendMock->expects($this->once())
-            ->method('setSender')
-            ->with($sender)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setRecipients')
-            ->with($recipients)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setProduct')
-            ->with($productMock)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('validate')
-            ->willReturn(true);
-        $this->sendFriendMock->expects($this->once())
-            ->method('send')
-            ->willReturnSelf();
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
-            ->with(__('The link to a friend was sent.'))
-            ->willReturnSelf();
-
-        $productMock->expects($this->once())
-            ->method('getProductUrl')
-            ->willReturn($productUrl);
-
-        $this->redirectMock->expects($this->once())
-            ->method('success')
-            ->with($productUrl)
-            ->willReturnArgument(0);
-
-        $redirectMock->expects($this->once())
-            ->method('setUrl')
-            ->with($productUrl)
-            ->willReturnSelf();
-
-        $this->assertEquals($redirectMock, $this->model->execute());
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecuteWithoutValidationAndCategory()
-    {
-        $productId = 11;
-        $categoryId = 5;
-        $sender = 'sender';
-        $recipients = 'recipients';
-        $formData = [
-            'sender' => $sender,
-            'recipients' => $recipients,
-        ];
-        $redirectUrl = 'redirect_url';
-
-        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [])
-            ->willReturn($redirectMock);
-
-        $this->validatorMock->expects($this->once())
-            ->method('validate')
-            ->with($this->requestMock)
-            ->willReturn(true);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getParam')
-            ->willReturnMap(
-                [
-                    ['id', null, $productId],
-                    ['cat_id', null, $categoryId],
-                ]
-            );
-
-        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog', 'setCategory', 'getProductUrl'])
-            ->getMockForAbstractClass();
-
-        $this->productRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($productId, false, null, false)
-            ->willReturn($productMock);
-
-        $productMock->expects($this->once())
-            ->method('isVisibleInCatalog')
-            ->willReturn(true);
-
-        $this->categoryRepositoryMock->expects($this->once())
-            ->method('get')
-            ->with($categoryId, null)
-            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException(__('No Category Exception.')));
-
-        $productMock->expects($this->never())
-            ->method('setCategory');
-
-        $this->registryMock->expects($this->once())
-            ->method('register')
-            ->willReturnMap(
-                [
-                    ['product', $productMock, false, null],
-                ]
-            );
-
-        $this->requestMock->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn($formData);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap(
-                [
-                    ['sender', $sender],
-                    ['recipients', $recipients],
-                ]
-            );
-
-        $this->sendFriendMock->expects($this->once())
-            ->method('setSender')
-            ->with($sender)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setRecipients')
-            ->with($recipients)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setProduct')
-            ->with($productMock)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('validate')
-            ->willReturn(['Some error']);
-        $this->sendFriendMock->expects($this->never())
-            ->method('send');
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with(__('Some error'))
-            ->willReturnSelf();
-
-        $this->catalogSessionMock->expects($this->once())
-            ->method('setSendfriendFormData')
-            ->with($formData);
-
-        $this->urlBuilderMock->expects($this->once())
-            ->method('getUrl')
-            ->with('sendfriend/product/send', ['_current' => true])
-            ->willReturn($redirectUrl);
-
-        $this->redirectMock->expects($this->once())
-            ->method('error')
-            ->with($redirectUrl)
-            ->willReturnArgument(0);
-
-        $redirectMock->expects($this->once())
-            ->method('setUrl')
-            ->with($redirectUrl)
-            ->willReturnSelf();
-
-        $this->assertEquals($redirectMock, $this->model->execute());
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecuteWithoutValidationAndCategoryWithProblems()
-    {
-        $productId = 11;
-        $categoryId = 5;
-        $sender = 'sender';
-        $recipients = 'recipients';
-        $formData = [
-            'sender' => $sender,
-            'recipients' => $recipients,
-        ];
-        $redirectUrl = 'redirect_url';
-
-        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [])
-            ->willReturn($redirectMock);
-
-        $this->validatorMock->expects($this->once())
-            ->method('validate')
-            ->with($this->requestMock)
-            ->willReturn(true);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getParam')
-            ->willReturnMap(
-                [
-                    ['id', null, $productId],
-                    ['cat_id', null, $categoryId],
-                ]
-            );
-
-        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog', 'setCategory', 'getProductUrl'])
-            ->getMockForAbstractClass();
-
-        $this->productRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($productId, false, null, false)
-            ->willReturn($productMock);
-
-        $productMock->expects($this->once())
-            ->method('isVisibleInCatalog')
-            ->willReturn(true);
-
-        $this->categoryRepositoryMock->expects($this->once())
-            ->method('get')
-            ->with($categoryId, null)
-            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException(__('No Category Exception.')));
-
-        $productMock->expects($this->never())
-            ->method('setCategory');
-
-        $this->registryMock->expects($this->once())
-            ->method('register')
-            ->willReturnMap(
-                [
-                    ['product', $productMock, false, null],
-                ]
-            );
-
-        $this->requestMock->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn($formData);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap(
-                [
-                    ['sender', $sender],
-                    ['recipients', $recipients],
-                ]
-            );
-
-        $this->sendFriendMock->expects($this->once())
-            ->method('setSender')
-            ->with($sender)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setRecipients')
-            ->with($recipients)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setProduct')
-            ->with($productMock)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('validate')
-            ->willReturn('Some error');
-        $this->sendFriendMock->expects($this->never())
-            ->method('send');
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with(__('We found some problems with the data.'))
-            ->willReturnSelf();
-
-        $this->catalogSessionMock->expects($this->once())
-            ->method('setSendfriendFormData')
-            ->with($formData);
-
-        $this->urlBuilderMock->expects($this->once())
-            ->method('getUrl')
-            ->with('sendfriend/product/send', ['_current' => true])
-            ->willReturn($redirectUrl);
-
-        $this->redirectMock->expects($this->once())
-            ->method('error')
-            ->with($redirectUrl)
-            ->willReturnArgument(0);
-
-        $redirectMock->expects($this->once())
-            ->method('setUrl')
-            ->with($redirectUrl)
-            ->willReturnSelf();
-
-        $this->assertEquals($redirectMock, $this->model->execute());
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecuteWithLocalizedException()
-    {
-        $productId = 11;
-        $categoryId = 5;
-        $sender = 'sender';
-        $recipients = 'recipients';
-        $formData = [
-            'sender' => $sender,
-            'recipients' => $recipients,
-        ];
-        $redirectUrl = 'redirect_url';
-
-        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [])
-            ->willReturn($redirectMock);
-
-        $this->validatorMock->expects($this->once())
-            ->method('validate')
-            ->with($this->requestMock)
-            ->willReturn(true);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getParam')
-            ->willReturnMap(
-                [
-                    ['id', null, $productId],
-                    ['cat_id', null, $categoryId],
-                ]
-            );
-
-        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog', 'setCategory', 'getProductUrl'])
-            ->getMockForAbstractClass();
-
-        $this->productRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($productId, false, null, false)
-            ->willReturn($productMock);
-
-        $productMock->expects($this->once())
-            ->method('isVisibleInCatalog')
-            ->willReturn(true);
-
-        $this->categoryRepositoryMock->expects($this->once())
-            ->method('get')
-            ->with($categoryId, null)
-            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException(__('No Category Exception.')));
-
-        $productMock->expects($this->never())
-            ->method('setCategory');
-
-        $this->registryMock->expects($this->once())
-            ->method('register')
-            ->willReturnMap(
-                [
-                    ['product', $productMock, false, null],
-                ]
-            );
-
-        $this->requestMock->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn($formData);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap(
-                [
-                    ['sender', $sender],
-                    ['recipients', $recipients],
-                ]
-            );
-
-        $this->sendFriendMock->expects($this->once())
-            ->method('setSender')
-            ->with($sender)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setRecipients')
-            ->with($recipients)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setProduct')
-            ->with($productMock)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('validate')
-            ->willThrowException(new \Magento\Framework\Exception\LocalizedException(__('Localized Exception.')));
-        $this->sendFriendMock->expects($this->never())
-            ->method('send');
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addError')
-            ->with(__('Localized Exception.'))
-            ->willReturnSelf();
-
-        $this->catalogSessionMock->expects($this->once())
-            ->method('setSendfriendFormData')
-            ->with($formData);
-
-        $this->urlBuilderMock->expects($this->once())
-            ->method('getUrl')
-            ->with('sendfriend/product/send', ['_current' => true])
-            ->willReturn($redirectUrl);
-
-        $this->redirectMock->expects($this->once())
-            ->method('error')
-            ->with($redirectUrl)
-            ->willReturnArgument(0);
-
-        $redirectMock->expects($this->once())
-            ->method('setUrl')
-            ->with($redirectUrl)
-            ->willReturnSelf();
-
-        $this->assertEquals($redirectMock, $this->model->execute());
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecuteWithException()
-    {
-        $productId = 11;
-        $categoryId = 5;
-        $sender = 'sender';
-        $recipients = 'recipients';
-        $formData = [
-            'sender' => $sender,
-            'recipients' => $recipients,
-        ];
-        $redirectUrl = 'redirect_url';
-
-        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [])
-            ->willReturn($redirectMock);
-
-        $this->validatorMock->expects($this->once())
-            ->method('validate')
-            ->with($this->requestMock)
-            ->willReturn(true);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getParam')
-            ->willReturnMap(
-                [
-                    ['id', null, $productId],
-                    ['cat_id', null, $categoryId],
-                ]
-            );
-
-        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog', 'setCategory', 'getProductUrl'])
-            ->getMockForAbstractClass();
-
-        $this->productRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($productId, false, null, false)
-            ->willReturn($productMock);
-
-        $productMock->expects($this->once())
-            ->method('isVisibleInCatalog')
-            ->willReturn(true);
-
-        $this->categoryRepositoryMock->expects($this->once())
-            ->method('get')
-            ->with($categoryId, null)
-            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException(__('No Category Exception.')));
-
-        $productMock->expects($this->never())
-            ->method('setCategory');
-
-        $this->registryMock->expects($this->once())
-            ->method('register')
-            ->willReturnMap(
-                [
-                    ['product', $productMock, false, null],
-                ]
-            );
-
-        $this->requestMock->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn($formData);
-
-        $this->requestMock->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap(
-                [
-                    ['sender', $sender],
-                    ['recipients', $recipients],
-                ]
-            );
-
-        $this->sendFriendMock->expects($this->once())
-            ->method('setSender')
-            ->with($sender)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setRecipients')
-            ->with($recipients)
-            ->willReturnSelf();
-        $this->sendFriendMock->expects($this->once())
-            ->method('setProduct')
-            ->with($productMock)
-            ->willReturnSelf();
-        $exception = new \Exception(__('Exception.'));
-        $this->sendFriendMock->expects($this->once())
-            ->method('validate')
-            ->willThrowException($exception);
-        $this->sendFriendMock->expects($this->never())
-            ->method('send');
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addException')
-            ->with($exception, __('Some emails were not sent.'))
-            ->willReturnSelf();
-
-        $this->catalogSessionMock->expects($this->once())
-            ->method('setSendfriendFormData')
-            ->with($formData);
-
-        $this->urlBuilderMock->expects($this->once())
-            ->method('getUrl')
-            ->with('sendfriend/product/send', ['_current' => true])
-            ->willReturn($redirectUrl);
-
-        $this->redirectMock->expects($this->once())
-            ->method('error')
-            ->with($redirectUrl)
-            ->willReturnArgument(0);
-
-        $redirectMock->expects($this->once())
-            ->method('setUrl')
-            ->with($redirectUrl)
-            ->willReturnSelf();
-
-        $this->assertEquals($redirectMock, $this->model->execute());
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecuteWithoutProduct()
-    {
-        $sender = 'sender';
-        $recipients = 'recipients';
-        $formData = [
-            'sender' => $sender,
-            'recipients' => $recipients,
-        ];
-
-        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /** @var \Magento\Framework\Controller\Result\Forward|\PHPUnit_Framework_MockObject_MockObject $forwardMock */
-        $forwardMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Forward::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->exactly(2))
-            ->method('create')
-            ->willReturnMap(
-                [
-                    [\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [], $redirectMock],
-                    [\Magento\Framework\Controller\ResultFactory::TYPE_FORWARD, [], $forwardMock],
-                ]
-            );
-
-        $this->validatorMock->expects($this->once())
-            ->method('validate')
-            ->with($this->requestMock)
-            ->willReturn(true);
-
-        $this->requestMock->expects($this->once())
-            ->method('getParam')
-            ->willReturnMap(
-                [
-                    ['id', null, null],
-                ]
-            );
-
-        $this->requestMock->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn($formData);
-
-        $forwardMock->expects($this->once())
-            ->method('forward')
-            ->with('noroute')
-            ->willReturnSelf();
-
-        $this->assertEquals($forwardMock, $this->model->execute());
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecuteWithoutData()
-    {
-        $productId = 11;
-        $formData = '';
-
-        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        /** @var \Magento\Framework\Controller\Result\Forward|\PHPUnit_Framework_MockObject_MockObject $forwardMock */
-        $forwardMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Forward::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->exactly(2))
-            ->method('create')
-            ->willReturnMap(
-                [
-                    [\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [], $redirectMock],
-                    [\Magento\Framework\Controller\ResultFactory::TYPE_FORWARD, [], $forwardMock],
-                ]
-            );
-
-        $this->validatorMock->expects($this->once())
-            ->method('validate')
-            ->with($this->requestMock)
-            ->willReturn(true);
-
-        $this->requestMock->expects($this->once())
-            ->method('getParam')
-            ->willReturnMap(
-                [
-                    ['id', null, $productId],
-                ]
-            );
-
-        /** @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject $productMock */
-        $productMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->setMethods(['isVisibleInCatalog', 'setCategory', 'getProductUrl'])
-            ->getMockForAbstractClass();
-
-        $this->productRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($productId, false, null, false)
-            ->willReturn($productMock);
-
-        $productMock->expects($this->once())
-            ->method('isVisibleInCatalog')
-            ->willReturn(true);
-
-        $this->registryMock->expects($this->once())
-            ->method('register')
-            ->willReturnMap(
-                [
-                    ['product', $productMock, false, null],
-                ]
-            );
-
-        $this->requestMock->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn($formData);
-
-        $forwardMock->expects($this->once())
-            ->method('forward')
-            ->with('noroute')
-            ->willReturnSelf();
-
-        $this->assertEquals($forwardMock, $this->model->execute());
-    }
-
-    public function testExecuteWithoutFormKey()
-    {
-        /** @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturnMap(
-                [
-                    [\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT, [], $redirectMock],
-                ]
-            );
-
-        $this->validatorMock->expects($this->once())
-            ->method('validate')
-            ->with($this->requestMock)
-            ->willReturn(false);
-
-        $redirectMock->expects($this->once())
-            ->method('setPath')
-            ->with('sendfriend/product/send', ['_current' => true])
-            ->willReturnSelf();
-
-        $this->assertEquals($redirectMock, $this->model->execute());
-    }
-}
diff --git a/app/code/Magento/SendFriend/composer.json b/app/code/Magento/SendFriend/composer.json
index 324465885f82f..d0da89fdba3fb 100644
--- a/app/code/Magento/SendFriend/composer.json
+++ b/app/code/Magento/SendFriend/composer.json
@@ -2,14 +2,16 @@
     "name": "magento/module-send-friend",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-catalog": "102.0.*",
         "magento/module-customer": "101.0.*",
-        "magento/framework": "101.0.*"
+        "magento/framework": "101.0.*",
+        "magento/module-captcha": "100.2.*",
+        "magento/module-authorization": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/SendFriend/etc/config.xml b/app/code/Magento/SendFriend/etc/config.xml
index 9fa005dcd2fd4..d65e5a4a073dd 100644
--- a/app/code/Magento/SendFriend/etc/config.xml
+++ b/app/code/Magento/SendFriend/etc/config.xml
@@ -17,5 +17,21 @@
                 <check_by>0</check_by>
             </email>
         </sendfriend>
+        <captcha translate="label">
+            <frontend>
+                <areas>
+                    <product_sendtofriend_form>
+                        <label>Send To Friend Form</label>
+                    </product_sendtofriend_form>
+                </areas>
+            </frontend>
+        </captcha>
+        <customer>
+            <captcha>
+                <shown_to_logged_in_user>
+                    <product_sendtofriend_form>1</product_sendtofriend_form>
+                </shown_to_logged_in_user>
+            </captcha>
+        </customer>
     </default>
 </config>
diff --git a/app/code/Magento/SendFriend/etc/module.xml b/app/code/Magento/SendFriend/etc/module.xml
index fae2b90f710a3..c874c54cbc672 100644
--- a/app/code/Magento/SendFriend/etc/module.xml
+++ b/app/code/Magento/SendFriend/etc/module.xml
@@ -10,6 +10,7 @@
     <module name="Magento_SendFriend" setup_version="2.0.0">
         <sequence>
             <module name="Magento_Catalog"/>
+            <module name="Magento_Captcha"/>
         </sequence>
     </module>
 </config>
diff --git a/app/code/Magento/SendFriend/view/frontend/layout/sendfriend_product_send.xml b/app/code/Magento/SendFriend/view/frontend/layout/sendfriend_product_send.xml
index 8065b7e236132..4d6f3d8c628b2 100644
--- a/app/code/Magento/SendFriend/view/frontend/layout/sendfriend_product_send.xml
+++ b/app/code/Magento/SendFriend/view/frontend/layout/sendfriend_product_send.xml
@@ -13,7 +13,7 @@
             </action>
         </referenceBlock>
         <referenceContainer name="content">
-            <block class="Magento\SendFriend\Block\Send" name="sendfriend.send" template="Magento_SendFriend::send.phtml">
+            <block class="Magento\SendFriend\Block\Send" name="sendfriend.send" cacheable="false" template="Magento_SendFriend::send.phtml">
                 <container name="form.additional.info" as="form_additional_info"/>
             </block>
         </referenceContainer>
diff --git a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
index 4922a9f365ced..3e00353a9157d 100644
--- a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
+++ b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
@@ -108,6 +108,7 @@
         </div>
         <?= $block->getChildHtml('form_additional_info') ?>
     </fieldset>
+    <?= $block->getChildHtml('captcha'); ?>
     <div class="actions-toolbar">
         <div class="primary">
             <button type="submit"
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
index b4ff445c63f4e..e5e419328eea4 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
@@ -74,6 +74,7 @@ public function getShipment()
      * Configuration for popup window for packaging
      *
      * @return string
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getConfigDataJson()
     {
@@ -86,7 +87,7 @@ public function getConfigDataJson()
         $itemsName = [];
         $itemsWeight = [];
         $itemsProductId = [];
-
+        $itemsOrderItemId = [];
         if ($shipmentId) {
             $urlParams['shipment_id'] = $shipmentId;
             $createLabelUrl = $this->getUrl('adminhtml/order_shipment/createLabel', $urlParams);
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/View.php b/app/code/Magento/Shipping/Block/Adminhtml/View.php
index 04df7f6e35e24..711dd2f46c1c6 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/View.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/View.php
@@ -58,7 +58,7 @@ protected function _construct()
                 'onclick',
                 "deleteConfirm('" . __(
                     'Are you sure you want to send a Shipment email to customer?'
-                ) . "', '" . $this->getEmailUrl() . "')"
+                ) . "', '" . $this->getEmailUrl() . "', {data: {}})"
             );
         }
 
diff --git a/app/code/Magento/Shipping/Block/DataProviders/Tracking/DeliveryDateTitle.php b/app/code/Magento/Shipping/Block/DataProviders/Tracking/DeliveryDateTitle.php
new file mode 100644
index 0000000000000..661068d42c35d
--- /dev/null
+++ b/app/code/Magento/Shipping/Block/DataProviders/Tracking/DeliveryDateTitle.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Shipping\Block\DataProviders\Tracking;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Shipping\Model\Tracking\Result\Status;
+
+/**
+ * Extension point to provide ability to change tracking details titles
+ */
+class DeliveryDateTitle implements ArgumentInterface
+{
+    /**
+     * Return title if carrier is defined
+     *
+     * @param Status $trackingStatus
+     * @return \Magento\Framework\Phrase|string
+     */
+    public function getTitle(Status $trackingStatus)
+    {
+        return $trackingStatus->getCarrier() ? __('Delivered on:') : '';
+    }
+}
diff --git a/app/code/Magento/Shipping/Block/Tracking/Popup.php b/app/code/Magento/Shipping/Block/Tracking/Popup.php
index 3e1be0ce37ef3..0b5c7240ec0d5 100644
--- a/app/code/Magento/Shipping/Block/Tracking/Popup.php
+++ b/app/code/Magento/Shipping/Block/Tracking/Popup.php
@@ -11,6 +11,8 @@
 use Magento\Framework\Stdlib\DateTime\DateTimeFormatterInterface;
 
 /**
+ * Tracking popup
+ *
  * @api
  * @since 100.0.2
  */
@@ -107,13 +109,15 @@ public function formatDeliveryTime($time, $date = null)
      */
     public function getContactUsEnabled()
     {
-        return (bool)$this->_scopeConfig->getValue(
-            'contacts/contacts/enabled',
+        return $this->_scopeConfig->isSetFlag(
+            'contact/contact/enabled',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
     /**
+     * Get support email
+     *
      * @return string
      */
     public function getStoreSupportEmail()
@@ -125,6 +129,8 @@ public function getStoreSupportEmail()
     }
 
     /**
+     * Get contact us url
+     *
      * @return string
      */
     public function getContactUs()
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
index 5eca94bce562b..5a81bdb3cf32f 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
@@ -6,7 +6,6 @@
  */
 namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
 
-use Magento\Backend\App\Action;
 use Magento\Sales\Model\Order\Shipment\Validation\QuantityValidator;
 
 /**
@@ -97,7 +96,7 @@ public function execute()
         $formKeyIsValid = $this->_formKeyValidator->validate($this->getRequest());
         $isPost = $this->getRequest()->isPost();
         if (!$formKeyIsValid || !$isPost) {
-            $this->messageManager->addError(__('We can\'t save the shipment right now.'));
+            $this->messageManager->addErrorMessage(__('We can\'t save the shipment right now.'));
             return $resultRedirect->setPath('sales/order/index');
         }
 
@@ -108,7 +107,6 @@ public function execute()
         }
 
         $isNeedCreateLabel = isset($data['create_shipping_label']) && $data['create_shipping_label'];
-
         $responseAjax = new \Magento\Framework\DataObject();
 
         try {
@@ -136,7 +134,7 @@ public function execute()
                 ->validate($shipment, [QuantityValidator::class]);
 
             if ($validationResult->hasMessages()) {
-                $this->messageManager->addError(
+                $this->messageManager->addErrorMessage(
                     __("Shipment Document Validation Error(s):\n" . implode("\n", $validationResult->getMessages()))
                 );
                 $this->_redirect('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
@@ -160,7 +158,7 @@ public function execute()
             $shipmentCreatedMessage = __('The shipment has been created.');
             $labelCreatedMessage = __('You created the shipping label.');
 
-            $this->messageManager->addSuccess(
+            $this->messageManager->addSuccessMessage(
                 $isNeedCreateLabel ? $shipmentCreatedMessage . ' ' . $labelCreatedMessage : $shipmentCreatedMessage
             );
             $this->_objectManager->get(\Magento\Backend\Model\Session::class)->getCommentText(true);
@@ -169,7 +167,7 @@ public function execute()
                 $responseAjax->setError(true);
                 $responseAjax->setMessage($e->getMessage());
             } else {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 $this->_redirect('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
             }
         } catch (\Exception $e) {
@@ -178,7 +176,7 @@ public function execute()
                 $responseAjax->setError(true);
                 $responseAjax->setMessage(__('An error occurred while creating shipping label.'));
             } else {
-                $this->messageManager->addError(__('Cannot save shipment.'));
+                $this->messageManager->addErrorMessage(__('Cannot save shipment.'));
                 $this->_redirect('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
             }
         }
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
index 762ffed75fc34..019baeef062c5 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
@@ -28,6 +28,14 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
 
     const GUAM_REGION_CODE = 'GU';
 
+    const SPAIN_COUNTRY_ID = 'ES';
+
+    const CANARY_ISLANDS_COUNTRY_ID = 'IC';
+
+    const SANTA_CRUZ_DE_TENERIFE_REGION_ID = 'Santa Cruz de Tenerife';
+
+    const LAS_PALMAS_REGION_ID = 'Las Palmas';
+
     /**
      * Array of quotes
      *
diff --git a/app/code/Magento/Shipping/Model/Shipping.php b/app/code/Magento/Shipping/Model/Shipping.php
index dc98a9d5a78d1..b0a5282080520 100644
--- a/app/code/Magento/Shipping/Model/Shipping.php
+++ b/app/code/Magento/Shipping/Model/Shipping.php
@@ -251,8 +251,7 @@ public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $req
      */
     public function collectCarrierRates($carrierCode, $request)
     {
-        /* @var $carrier \Magento\Shipping\Model\Carrier\AbstractCarrier */
-        $carrier = $this->_carrierFactory->createIfActive($carrierCode, $request->getQuoteStoreId());
+        $carrier = $this->_carrierFactory->create($carrierCode, $request->getQuoteStoreId());
         if (!$carrier) {
             return $this;
         }
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminChangeFlatRateShippingMethodStatusActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminChangeFlatRateShippingMethodStatusActionGroup.xml
new file mode 100644
index 0000000000000..977ee065a8fb1
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminChangeFlatRateShippingMethodStatusActionGroup.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="AdminChangeFlatRateShippingMethodStatusActionGroup">
+        <arguments>
+            <argument name="status" type="string" defaultValue="1"/>
+        </arguments>
+        <conditionalClick selector="{{AdminShippingMethodFlatRateSection.carriersFlatRateTab}}" dependentSelector="{{AdminShippingMethodFlatRateSection.carriersFlatRateActive}}" visible="false" stepKey="expandTab"/>
+        <selectOption selector="{{AdminShippingMethodFlatRateSection.carriersFlatRateActive}}" userInput="{{status}}" stepKey="changeFlatRateMethodStatus"/>
+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfigs"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminChangeTableRatesShippingMethodStatusActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminChangeTableRatesShippingMethodStatusActionGroup.xml
new file mode 100644
index 0000000000000..e506ca3a7662f
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminChangeTableRatesShippingMethodStatusActionGroup.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">
+    <!-- Enable/Disable Table Rates shipping method -->
+    <actionGroup name="AdminChangeTableRatesShippingMethodStatusActionGroup">
+        <arguments>
+            <argument name="status" type="string" defaultValue="1"/>
+        </arguments>
+        <conditionalClick selector="{{AdminShippingMethodTableRatesSection.carriersTableRateTab}}" dependentSelector="{{AdminShippingMethodTableRatesSection.carriersTableRateActive}}" visible="false" stepKey="expandTab"/>
+        <uncheckOption selector="{{AdminShippingMethodTableRatesSection.enabledUseSystemValue}}" stepKey="uncheckUseSystemValue"/>
+        <selectOption selector="{{AdminShippingMethodTableRatesSection.carriersTableRateActive}}" userInput="{{status}}" stepKey="changeTableRatesMethodStatus"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminOpenShippingMethodsConfigPageActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminOpenShippingMethodsConfigPageActionGroup.xml
new file mode 100644
index 0000000000000..a1fefcf13afa4
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminOpenShippingMethodsConfigPageActionGroup.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="AdminOpenShippingMethodsConfigPageActionGroup">
+        <amOnPage url="{{AdminShippingMethodsConfigPage.url}}" stepKey="navigateToAdminShippingMethodsPage"/>
+        <waitForPageLoad stepKey="waitForAdminShippingMethodsPageToLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminShipmentActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminShipmentActionGroup.xml
new file mode 100644
index 0000000000000..1d90867b110dd
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminShipmentActionGroup.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="VerifyBasicShipmentInformation">
+        <arguments>
+            <argument name="customer"/>
+            <argument name="shippingAddress"/>
+            <argument name="billingAddress"/>
+            <argument name="customerGroup" defaultValue="GeneralCustomerGroup"/>
+        </arguments>
+        <see selector="{{AdminShipmentOrderAndAccountInformationSection.customerName}}" userInput="{{customer.firstname}}" stepKey="seeCustomerName"/>
+        <see selector="{{AdminShipmentOrderAndAccountInformationSection.customerEmail}}" userInput="{{customer.email}}" stepKey="seeCustomerEmail"/>
+        <see selector="{{AdminShipmentOrderAndAccountInformationSection.customerGroup}}" userInput="{{customerGroup.code}}" stepKey="seeCustomerGroup"/>
+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{billingAddress.street[0]}}" stepKey="seeBillingAddressStreet"/>
+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{billingAddress.city}}" stepKey="seeBillingAddressCity"/>
+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{billingAddress.country}}" stepKey="seeBillingAddressCountry"/>
+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{billingAddress.postcode}}" stepKey="seeBillingAddressPostcode"/>
+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.street[0]}}" stepKey="seeShippingAddressStreet"/>
+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.city}}" stepKey="seeShippingAddressCity"/>
+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.country}}" stepKey="seeShippingAddressCountry"/>
+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{shippingAddress.postcode}}" stepKey="seeShippingAddressPostcode"/>
+    </actionGroup>
+
+    <actionGroup name="SeeProductInShipmentItems">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <seeElement selector="{{AdminShipmentItemsSection.productColumn(product.name)}}" stepKey="seeProductInShipmentItemsGrid"/>
+    </actionGroup>
+
+    <actionGroup name="StartCreateShipmentFromOrderPage">
+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
+        <seeInCurrentUrl url="{{AdminShipmentNewPage.url}}" stepKey="seeNewShipmentUrl"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Shipment" stepKey="seeNewShipmentPageTitle"/>
+    </actionGroup>
+
+    <actionGroup name="SubmitShipment">
+        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url('$grabOrderId')}}" stepKey="seeViewOrderPageShipping"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The shipment has been created." stepKey="seeShipmentCreateSuccess"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertStoreFrontNoQuotesMessageActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertStoreFrontNoQuotesMessageActionGroup.xml
new file mode 100644
index 0000000000000..060e8a4f2e21e
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertStoreFrontNoQuotesMessageActionGroup.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="AssertStoreFrontNoQuotesMessageActionGroup">
+        <waitForElementVisible selector="{{CheckoutShippingMethodsSection.noQuotesMsg}}" stepKey="waitForNoQuotesMsgVisible"/>
+        <see selector="{{CheckoutShippingMethodsSection.noQuotesMsg}}" userInput="Sorry, no quotes are available for this order at this time" stepKey="assertNoQuotesMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertStoreFrontShippingMethodAvailableActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertStoreFrontShippingMethodAvailableActionGroup.xml
new file mode 100644
index 0000000000000..9892bc7cbc9ea
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertStoreFrontShippingMethodAvailableActionGroup.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="AssertStoreFrontShippingMethodAvailableActionGroup">
+        <arguments>
+            <argument name="shippingMethodName" type="string" defaultValue="Flat Rate"/>
+        </arguments>
+        <waitForElementVisible selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName(shippingMethodName)}}" stepKey="waitForShippingMethodLoad"/>
+        <seeElement selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName(shippingMethodName)}}" stepKey="seeShippingMethod"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertStoreFrontShippingMethodUnavailableActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertStoreFrontShippingMethodUnavailableActionGroup.xml
new file mode 100644
index 0000000000000..d425a6d93a1df
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertStoreFrontShippingMethodUnavailableActionGroup.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="AssertStoreFrontShippingMethodUnavailableActionGroup">
+        <arguments>
+            <argument name="shippingMethodName" type="string" defaultValue="Free Shipping"/>
+        </arguments>
+        <waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName(shippingMethodName)}}" stepKey="waitForShippingMethodNotVisible"/>
+        <dontSeeElement selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName(shippingMethodName)}}" stepKey="dontSeeShippingMethod"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Data/TableRatesShippingMethodData.xml b/app/code/Magento/Shipping/Test/Mftf/Data/TableRatesShippingMethodData.xml
new file mode 100644
index 0000000000000..47ef68cc9d765
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Data/TableRatesShippingMethodData.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">
+    <!-- Prices from file "table_rate_30895.csv" -->
+    <entity name="TableRatesWeightVSDestination" type="shipping_method">
+        <data key="condition">Weight vs. Destination</data>
+        <data key="priceCA">5.00</data>
+        <data key="price">10.00</data>
+        <data key="title">Best Way</data>
+        <data key="methodName">Table Rate</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml b/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml
index d7b91f68d21a2..bd311d3390043 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml
@@ -10,6 +10,8 @@
        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminShipmentNewPage" url="order_shipment/new/order_id/" area="admin" module="Magento_Shipping">
         <section name="AdminShipmentMainActionsSection"/>
+        <section name="AdminShipmentOrderAndAccountInformationSection"/>
+        <section name="AdminShipmentAddressInformationSection"/>
         <section name="AdminShipmentItemsSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml
new file mode 100644
index 0000000000000..39035868c4b65
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.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="AdminShipmentAddressInformationSection">
+        <element name="billingAddress" type="text" selector=".order-billing-address address"/>
+        <element name="billingAddressEdit" type="button" selector=".order-billing-address .actions a"/>
+        <element name="shippingAddress" type="text" selector=".order-shipping-address address"/>
+        <element name="shippingAddressEdit" type="button" selector=".order-shipping-address .actions a"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentItemsSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentItemsSection.xml
index 740cae14f8bc5..55d26d729090c 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentItemsSection.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentItemsSection.xml
@@ -7,9 +7,10 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminShipmentItemsSection">
         <element name="itemQty" type="text" selector=".order-shipment-table tbody:nth-of-type({{var1}}) .col-ordered-qty .qty-table" parameterized="true"/>
         <element name="itemQtyToShip" type="input" selector=".order-shipment-table tbody:nth-of-type({{row}}) .col-qty input.qty-item" parameterized="true"/>
+        <element name="productColumn" type="text" selector="//*[contains(@class,'order-shipment-table')]//td[@class = 'col-product']//div[contains(text(),'{{productName}}')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentMainActionsSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentMainActionsSection.xml
index d79748d1e20cc..a21c3229e3549 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentMainActionsSection.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentMainActionsSection.xml
@@ -7,8 +7,8 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminShipmentMainActionsSection">
-        <element name="submitShipment" type="button" selector="button.action-default.save.submit-button"/>
+        <element name="submitShipment" type="button" selector="button.action-default.save.submit-button" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentOrderAndAccountInformationSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentOrderAndAccountInformationSection.xml
new file mode 100644
index 0000000000000..2a83995cf3bbc
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentOrderAndAccountInformationSection.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="AdminShipmentOrderAndAccountInformationSection">
+        <element name="customerName" type="text" selector=".order-account-information table tr:first-of-type > td span"/>
+        <element name="customerEmail" type="text" selector=".order-account-information table tr:nth-of-type(2) > td a"/>
+        <element name="customerGroup" type="text" selector=".order-account-information table tr:nth-of-type(3) > td"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShippingMethodFlatRateSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShippingMethodFlatRateSection.xml
new file mode 100644
index 0000000000000..a7ed0ab498bea
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShippingMethodFlatRateSection.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="AdminShippingMethodFlatRateSection">
+        <element name="carriersFlatRateTab" type="button" selector="#carriers_flatrate-head"/>
+        <element name="carriersFlatRateActive" type="select" selector="#carriers_flatrate_active"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShippingMethodTableRatesSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShippingMethodTableRatesSection.xml
new file mode 100644
index 0000000000000..3c570201c9970
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShippingMethodTableRatesSection.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="AdminShippingMethodTableRatesSection">
+        <element name="carriersTableRateTab" type="button" selector="#carriers_tablerate-head"/>
+        <element name="enabledUseSystemValue" type="checkbox" selector="#carriers_tablerate_active_inherit"/>
+        <element name="carriersTableRateActive" type="select" selector="#carriers_tablerate_active"/>
+        <element name="condition" type="select" selector="#carriers_tablerate_condition_name"/>
+        <element name="importFile" type="input" selector="#carriers_tablerate_import"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Test/TableRatesShippingMethodForDifferentStatesTest.xml b/app/code/Magento/Shipping/Test/Mftf/Test/TableRatesShippingMethodForDifferentStatesTest.xml
new file mode 100644
index 0000000000000..22b10a16da3cc
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Test/TableRatesShippingMethodForDifferentStatesTest.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="TableRatesShippingMethodForDifferentStatesTest">
+        <annotations>
+            <features value="Shipping"/>
+            <stories value="Table Rates"/>
+            <title value="Table rates shipping method for different states test"/>
+            <description value="Checkout with Table Rates for different states of the USA"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-7438"/>
+            <group value="shipping"/>
+        </annotations>
+        <before>
+            <!-- Create product -->
+            <createData entity="SimpleProduct3" stepKey="createProduct"/>
+
+            <!-- Create customer -->
+            <createData entity="Simple_US_CA_Customer" stepKey="createCustomer"/>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Delete product -->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+
+            <!-- Delete customer -->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+
+            <!-- Rollback config -->
+            <actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodSystemConfigPage"/>
+            <actionGroup ref="AdminSwitchWebsiteByNameActionGroup" stepKey="AdminSwitchStoreViewToMainWebsite">
+                <argument name="website" value="_defaultWebsite"/>
+            </actionGroup>
+            <actionGroup ref="AdminChangeTableRatesShippingMethodStatusActionGroup" stepKey="disableTableRatesShippingMethod">
+                <argument name="status" value="0"/>
+            </actionGroup>
+            <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveSystemConfig"/>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go to Stores > Configuration > Sales > Shipping Methods -->
+        <actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPage"/>
+
+        <!-- Switch to Website scope -->
+        <actionGroup ref="AdminSwitchWebsiteByNameActionGroup" stepKey="AdminSwitchStoreView">
+            <argument name="website" value="_defaultWebsite"/>
+        </actionGroup>
+
+        <!-- Enable Table Rate method and save config -->
+        <actionGroup ref="AdminChangeTableRatesShippingMethodStatusActionGroup" stepKey="enableTableRatesShippingMethod"/>
+        <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfig"/>
+
+        <!-- Make sure you have Condition Weight vs. Destination -->
+        <see selector="{{AdminShippingMethodTableRatesSection.condition}}" userInput="{{TableRatesWeightVSDestination.condition}}" stepKey="seeDefaultCondition"/>
+
+        <!-- Import file and save config -->
+        <attachFile selector="{{AdminShippingMethodTableRatesSection.importFile}}" userInput="table_rate_30895.csv" stepKey="attachFileForImport"/>
+        <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfigs"/>
+
+        <!-- Login as customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <!-- Add product to the shopping cart -->
+        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
+            <argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+
+        <!-- Open the shopping cart page -->
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openShoppingCart"/>
+
+        <!-- Expand Estimate Shipping and Tax section in Summary -->
+        <conditionalClick  selector="{{StorefrontCheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{StorefrontCheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingAndTax"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+
+        <!-- See available Table Rate option -->
+        <actionGroup ref="StorefrontAssertShippingMethodPresentInCartActionGroup" stepKey="assertShippingMethodLabel">
+            <argument name="shippingMethod" value="{{TableRatesWeightVSDestination.title}}"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertShippingMethodOptionPresentInCartActionGroup" stepKey="assertShippingMethodOption">
+            <argument name="methodName" value="{{TableRatesWeightVSDestination.methodName}}"/>
+            <argument name="price" value="{{TableRatesWeightVSDestination.priceCA}}"/>
+        </actionGroup>
+
+        <!-- Change State to New York -->
+        <selectOption selector="{{StorefrontCheckoutCartSummarySection.region}}" userInput="{{US_Address_NY.state}}" stepKey="selectAnotherState"/>
+        <waitForPageLoad stepKey="waitForShippingMethodLoad"/>
+
+        <!-- See available Table Rate option for another state -->
+        <actionGroup ref="StorefrontAssertShippingMethodPresentInCartActionGroup" stepKey="assertShippingMethodLabelForAnotherState">
+            <argument name="shippingMethod" value="{{TableRatesWeightVSDestination.title}}"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertShippingMethodOptionPresentInCartActionGroup" stepKey="assertShippingMethodOptionForAnotherState">
+            <argument name="methodName" value="{{TableRatesWeightVSDestination.methodName}}"/>
+            <argument name="price" value="{{TableRatesWeightVSDestination.price}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php
index 491a1e01f1720..730088c76eada 100644
--- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php
@@ -135,7 +135,7 @@ protected function setUp()
         $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
             ->disableOriginalConstructor()->getMock();
         $this->objectManager = $this->createPartialMock(\Magento\Framework\ObjectManager\ObjectManager::class, ['create', 'get']);
-        $this->messageManager = $this->createPartialMock(\Magento\Framework\Message\Manager::class, ['addSuccess', 'addError']);
+        $this->messageManager = $this->createPartialMock(\Magento\Framework\Message\Manager::class, ['addSuccessMessage', 'addErrorMessage']);
         $this->session = $this->createPartialMock(\Magento\Backend\Model\Session::class, ['setIsUrlNotice', 'getCommentText']);
         $this->actionFlag = $this->createPartialMock(\Magento\Framework\App\ActionFlag::class, ['get']);
         $this->helper = $this->createPartialMock(\Magento\Backend\Helper\Data::class, ['getUrl']);
@@ -216,7 +216,7 @@ public function testExecute($formKeyIsValid, $isPost)
 
         if (!$formKeyIsValid || !$isPost) {
             $this->messageManager->expects($this->once())
-                ->method('addError');
+                ->method('addErrorMessage');
 
             $this->resultRedirect->expects($this->once())
                 ->method('setPath')
diff --git a/app/code/Magento/Shipping/Test/Unit/Model/ShippingTest.php b/app/code/Magento/Shipping/Test/Unit/Model/ShippingTest.php
index 727675407b8a0..812751a4f3c5f 100644
--- a/app/code/Magento/Shipping/Test/Unit/Model/ShippingTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Model/ShippingTest.php
@@ -5,10 +5,20 @@
  */
 namespace Magento\Shipping\Test\Unit\Model;
 
-use \Magento\Shipping\Model\Shipping;
-
+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\Quote\Model\Quote\Item as QuoteItem;
+use Magento\Shipping\Model\Carrier\AbstractCarrier;
+use Magento\Shipping\Model\Carrier\AbstractCarrierInterface;
+use Magento\Shipping\Model\Carrier\CarrierInterface;
+use Magento\Shipping\Model\CarrierFactory;
+use Magento\Shipping\Model\Shipping;
 use Magento\Quote\Model\Quote\Address\RateRequest;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Store\Model\Store;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class ShippingTest extends \PHPUnit\Framework\TestCase
 {
@@ -25,71 +35,69 @@ class ShippingTest extends \PHPUnit\Framework\TestCase
     protected $shipping;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Shipping\Model\Carrier\AbstractCarrier
+     * @var MockObject|StockRegistry
      */
-    protected $carrier;
+    protected $stockRegistry;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject|StockItem
      */
-    protected $stockRegistry;
+    protected $stockItemData;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject|AbstractCarrierInterface
      */
-    protected $stockItemData;
+    private $carrier;
 
     protected function setUp()
     {
-        $this->carrier = $this->createMock(\Magento\Shipping\Model\Carrier\AbstractCarrier::class);
-        $this->carrier->expects($this->any())->method('getConfigData')->will($this->returnCallback(function ($key) {
-            $configData = [
-                'max_package_weight' => 10,
-            ];
-            return isset($configData[$key]) ? $configData[$key] : 0;
-        }));
-        $this->stockRegistry = $this->createMock(\Magento\CatalogInventory\Model\StockRegistry::class);
-        $this->stockItemData = $this->createMock(\Magento\CatalogInventory\Model\Stock\Item::class);
-
-        $objectManagerHelper = new ObjectManagerHelper($this);
-        $this->shipping = $objectManagerHelper->getObject(
-            \Magento\Shipping\Model\Shipping::class,
-            ['stockRegistry' => $this->stockRegistry]
+        $this->stockRegistry = $this->createMock(StockRegistry::class);
+        $this->stockItemData = $this->createMock(StockItem::class);
+
+        $this->shipping = (new ObjectManagerHelper($this))->getObject(
+            Shipping::class,
+            [
+                'stockRegistry' => $this->stockRegistry,
+                'carrierFactory' => $this->getCarrierFactory(),
+            ]
         );
     }
 
     /**
-     * @covers \Magento\Shipping\Model\Shipping::composePackagesForCarrier
+     *
      */
     public function testComposePackages()
     {
         $request = new RateRequest();
-        /** \Magento\Catalog\Model\Product\Configuration\Item\ItemInterface */
-        $item = $this->getMockBuilder(\Magento\Quote\Model\Quote\Item::class)
+        $item = $this->getMockBuilder(QuoteItem::class)
             ->disableOriginalConstructor()
-            ->setMethods([
-                'getQty', 'getIsQtyDecimal', 'getProductType', 'getProduct', 'getWeight', '__wakeup', 'getStore',
-            ])
-            ->getMock();
-        $product = $this->createMock(\Magento\Catalog\Model\Product::class);
-
-        $item->expects($this->any())->method('getQty')->will($this->returnValue(1));
-        $item->expects($this->any())->method('getWeight')->will($this->returnValue(10));
-        $item->expects($this->any())->method('getIsQtyDecimal')->will($this->returnValue(true));
-        $item->expects($this->any())->method('getProductType')
-            ->will($this->returnValue(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE));
-        $item->expects($this->any())->method('getProduct')->will($this->returnValue($product));
-
-        $store = $this->createPartialMock(\Magento\Store\Model\Store::class, ['getWebsiteId']);
-        $store->expects($this->any())
-            ->method('getWebsiteId')
-            ->will($this->returnValue(10));
-        $item->expects($this->any())->method('getStore')->will($this->returnValue($store));
-
-        $product->expects($this->any())->method('getId')->will($this->returnValue($this->productId));
+            ->setMethods(
+                [
+                    'getQty',
+                    'getIsQtyDecimal',
+                    'getProductType',
+                    'getProduct',
+                    'getWeight',
+                    '__wakeup',
+                    'getStore',
+                ]
+            )->getMock();
+        $product = $this->createMock(Product::class);
+
+        $item->method('getQty')->will($this->returnValue(1));
+        $item->method('getWeight')->will($this->returnValue(10));
+        $item->method('getIsQtyDecimal')->will($this->returnValue(true));
+        $item->method('getProductType')->will($this->returnValue(ProductType::TYPE_SIMPLE));
+        $item->method('getProduct')->will($this->returnValue($product));
+
+        $store = $this->createPartialMock(Store::class, ['getWebsiteId']);
+        $store->method('getWebsiteId')->will($this->returnValue(10));
+        $item->method('getStore')->will($this->returnValue($store));
+
+        $product->method('getId')->will($this->returnValue($this->productId));
         $request->setData('all_items', [$item]);
 
-        $this->stockItemData->expects($this->any())->method('getIsDecimalDivided')->will($this->returnValue(true));
+        $this->stockItemData->method('getIsDecimalDivided')->will($this->returnValue(true));
 
         /** Testable service calls to CatalogInventory module */
         $this->stockRegistry->expects($this->atLeastOnce())->method('getStockItem')
@@ -101,7 +109,51 @@ public function testComposePackages()
             ->will($this->returnValue(true));
         $this->stockItemData->expects($this->atLeastOnce())->method('getQtyIncrements')
             ->will($this->returnValue(0.5));
+        $this->carrier->method('getConfigData')
+            ->willReturnCallback(function ($key) {
+                $configData = [
+                    'max_package_weight' => 10,
+                ];
+                return isset($configData[$key]) ? $configData[$key] : 0;
+            });
 
         $this->shipping->composePackagesForCarrier($this->carrier, $request);
     }
+
+    /**
+     * Active flag should be set before collecting carrier rates.
+     */
+    public function testCollectCarrierRatesSetActiveFlag()
+    {
+        $this->carrier->expects($this->atLeastOnce())
+            ->method('setActiveFlag')
+            ->with('active');
+
+        $this->shipping->collectCarrierRates('carrier', new RateRequest());
+    }
+
+    /**
+     * @return CarrierFactory|MockObject
+     */
+    private function getCarrierFactory()
+    {
+        $carrierFactory = $this->getMockBuilder(CarrierFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->carrier = $this->getMockBuilder(AbstractCarrierInterface::class)
+            ->setMethods(
+                [
+                    'setActiveFlag',
+                    'checkAvailableShipCountries',
+                    'processAdditionalValidation',
+                    'getConfigData',
+                    'collectRates',
+                ]
+            )
+            ->getMockForAbstractClass();
+        $carrierFactory->method('create')->willReturn($this->carrier);
+
+        return $carrierFactory;
+    }
 }
diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json
index b4e77dfdeb2d9..d2653c5514077 100644
--- a/app/code/Magento/Shipping/composer.json
+++ b/app/code/Magento/Shipping/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-shipping",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-catalog": "102.0.*",
         "magento/module-sales": "101.0.*",
@@ -25,7 +25,7 @@
         "magento/module-config": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.6",
+    "version": "100.2.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
index 0b40bf40e97a3..83ee75463ffb6 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
@@ -3,48 +3,50 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+//phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+//phpcs:disable Magento2.Files.LineLength.MaxExceeded
 ?>
-<form id="edit_form" method="post" action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>">
+<form id="edit_form" method="post" action="<?= $block->escapeUrl($block->getSaveUrl()) ?>">
     <?= $block->getBlockHtml('formkey') ?>
     <?php  $_order = $block->getShipment()->getOrder() ?>
     <?= $block->getChildHtml('order_info') ?>
     <div class="admin__page-section">
         <div class="admin__page-section-title">
-            <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
+            <span class="title"><?= $block->escapeHtml(__('Payment &amp; Shipping Method')) ?></span>
         </div>
         <div class="admin__page-section-content">
             <div class="admin__page-section-item order-payment-method">
                 <?php /* Billing Address */ ?>
                 <div class="admin__page-section-item-title">
-                    <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
+                    <span class="title"><?=$block->escapeHtml(__('Payment Information')) ?></span>
                 </div>
                 <div class="admin__page-section-item-content">
                     <div><?= $block->getPaymentHtml() ?></div>
-                    <div class="order-payment-currency"><?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
+                    <div class="order-payment-currency"><?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?></div>
                 </div>
             </div>
             <div class="admin__page-section-item order-shipping-address">
                 <?php /* Shipping Address */ ?>
                 <div class="admin__page-section-item-title">
-                    <span class="title"><?= /* @escapeNotVerified */ __('Shipping Information') ?></span>
+                    <span class="title"><?= $block->escapeHtml(__('Shipping Information')) ?></span>
                 </div>
                 <div class="admin__page-section-item-content shipping-description-wrapper">
-                    <div class="shipping-description-title"><?= $block->escapeHtml($_order->getShippingDescription()) ?></div>
+                    <div class="shipping-description-title">
+                        <?= $block->escapeHtml($_order->getShippingDescription()) ?>
+                    </div>
                     <div class="shipping-description-content">
-                        <?= /* @escapeNotVerified */ __('Total Shipping Charges') ?>:
+                        <?= $block->escapeHtml(__('Total Shipping Charges')) ?>:
 
-                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
+                        <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()) : ?>
                             <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
-                        <?php else: ?>
+                        <?php else : ?>
                             <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
                         <?php endif; ?>
                         <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
-                        <?= /* @escapeNotVerified */ $_excl ?>
-                        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                        (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
+                        <?= /* @noEscape */ $_excl ?>
+                        <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices()
+                            && $_incl != $_excl) : ?>
+                        (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
                         <?php endif; ?>
                     </div>
                 </div>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
index 35e36aa5584c9..c19aa66b5b7f0 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
@@ -3,32 +3,35 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+//phpcs:disable Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace
+//phpcs:disable Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore
 ?>
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Items to Ship') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Items to Ship')) ?></span>
     </div>
     <div class="admin__table-wrapper">
         <table class="data-table admin__table-primary order-shipment-table">
             <thead>
                 <tr class="headings">
-                    <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
-                    <th class="col-ordered-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
-                    <th class="col-qty<?php if ($block->isShipmentRegular()): ?> last<?php endif; ?>">
-                        <span><?= /* @escapeNotVerified */ __('Qty to Ship') ?></span>
+                    <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
+                    <th class="col-ordered-qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
+                    <th class="col-qty<?php if ($block->isShipmentRegular()) : ?> last<?php endif; ?>">
+                        <span><?= $block->escapeHtml(__('Qty to Ship')) ?></span>
                     </th>
-                    <?php if (!$block->canShipPartiallyItem()): ?>
-                    <th class="col-ship last"><span><?= /* @escapeNotVerified */ __('Ship') ?></span></th>
+                    <?php if (!$block->canShipPartiallyItem()) : ?>
+                    <th class="col-ship last"><span><?= $block->escapeHtml(__('Ship')) ?></span></th>
                     <?php endif; ?>
                 </tr>
             </thead>
             <?php $_items = $block->getShipment()->getAllItems() ?>
-            <?php $_i = 0; foreach ($_items as $_item): if ($_item->getOrderItem()->getParentItem()): continue; endif; $_i++ ?>
-                <tbody class="<?= /* @escapeNotVerified */ $_i%2 ? 'odd' : 'even' ?>">
+            <?php $_i = 0; foreach ($_items as $_item) :
+                if ($_item->getOrderItem()->getParentItem()) :
+                    continue;
+                endif;
+                $_i++ ?>
+                <tbody class="<?= /* @noEscape */ $_i%2 ? 'odd' : 'even' ?>">
                     <?= $block->getItemHtml($_item) ?>
                     <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
                 </tbody>
@@ -39,24 +42,24 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Shipment Total') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Shipment Total')) ?></span>
     </div>
     <div class="admin__page-section-content order-comments-history">
         <div class="admin__page-section-item">
             <div class="admin__page-section-item-title">
-                <span class="title"><?= /* @escapeNotVerified */ __('Shipment Comments') ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Shipment Comments')) ?></span>
             </div>
             <div class="admin__page-section-item-content">
                 <div id="order-history_form" class="admin__field">
                     <label class="admin__field-label"
                            for="shipment_comment_text">
-                        <span><?= /* @escapeNotVerified */ __('Comment Text') ?></span></label>
+                        <span><?= $block->escapeHtml(__('Comment Text')) ?></span></label>
                     <div class="admin__field-control">
                         <textarea id="shipment_comment_text"
                                   class="admin__control-textarea"
                                   name="shipment[comment_text]"
                                   rows="3"
-                                  cols="5"><?= /* @escapeNotVerified */ $block->getShipment()->getCommentText() ?></textarea>
+                                  cols="5"><?= $block->escapeHtml($block->getShipment()->getCommentText()) ?></textarea>
                     </div>
                 </div>
             </div>
@@ -64,10 +67,10 @@
     </div>
     <div class="admin__page-section-item order-totals order-totals-actions">
         <div class="admin__page-section-item-title">
-            <span class="title"><?= /* @escapeNotVerified */ __('Shipment Options') ?></span>
+            <span class="title"><?= $block->escapeHtml(__('Shipment Options')) ?></span>
         </div>
         <div class="admin__page-section-item-content">
-            <?php if ($block->canCreateShippingLabel()): ?>
+            <?php if ($block->canCreateShippingLabel()) : ?>
                 <div class="field choice admin__field admin__field-option field-create">
                     <input id="create_shipping_label"
                            class="admin__control-checkbox"
@@ -77,7 +80,7 @@
                            onclick="toggleCreateLabelCheckbox();"/>
                     <label class="admin__field-label"
                            for="create_shipping_label">
-                        <span><?= /* @escapeNotVerified */ __('Create Shipping Label') ?></span></label>
+                        <span><?= $block->escapeHtml(__('Create Shipping Label')) ?></span></label>
                 </div>
             <?php endif ?>
 
@@ -89,10 +92,10 @@
                        type="checkbox"/>
                 <label class="admin__field-label"
                        for="notify_customer">
-                    <span><?= /* @escapeNotVerified */ __('Append Comments') ?></span></label>
+                    <span><?=$block->escapeHtml(__('Append Comments')) ?></span></label>
             </div>
 
-            <?php if ($block->canSendShipmentEmail()): ?>
+            <?php if ($block->canSendShipmentEmail()) : ?>
                 <div class="field choice admin__field admin__field-option field-email">
                     <input id="send_email"
                            class="admin__control-checkbox"
@@ -101,7 +104,7 @@
                            type="checkbox"/>
                     <label class="admin__field-label"
                            for="send_email">
-                        <span><?= /* @escapeNotVerified */ __('Email Copy of Shipment') ?></span></label>
+                        <span><?= $block->escapeHtml(__('Email Copy of Shipment')) ?></span></label>
                 </div>
             <?php endif; ?>
             <?= $block->getChildHtml('submit_before') ?>
@@ -147,7 +150,7 @@ window.toggleCreateLabelCheckbox = function() {
 window.submitShipment = function(btn) {
     if (!validQtyItems()) {
         alert({
-            content: '<?= /* @escapeNotVerified */ __('Invalid value(s) for Qty to Ship') ?>'
+            content: '<?= $block->escapeJs($block->escapeHtml(__('Invalid value(s) for Qty to Ship'))) ?>'
         });
         return;
     }
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml
index b5d2aafe18ea6..caea091eacb95 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml
@@ -3,28 +3,29 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+//phpcs:disable Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace
+//phpcs:disable Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore
 ?>
 <?php $_item = $block->getItem() ?>
 <tr>
     <td class="col-product"><?= $block->getColumnHtml($_item, 'name') ?></td>
     <td class="col-ordered-qty"><?= $block->getColumnHtml($_item, 'qty') ?></td>
-    <td class="col-qty <?php if ($block->isShipmentRegular()): ?>last<?php endif; ?>">
-        <?php if ($block->canShipPartiallyItem()): ?>
+    <td class="col-qty <?php if ($block->isShipmentRegular()) : ?>last<?php endif; ?>">
+        <?php if ($block->canShipPartiallyItem()) : ?>
             <input type="text"
                    class="input-text admin__control-text qty-item"
-                   name="shipment[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>]"
-                   value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>" />
-        <?php else: ?>
-            <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
+                   name="shipment[items][<?= (int) $_item->getOrderItemId() ?>]"
+                   value="<?= /* @noEscape */ $_item->getQty()*1 ?>" />
+        <?php else : ?>
+            <?= /* @noEscape */ $_item->getQty()*1 ?>
         <?php endif; ?>
     </td>
-    <?php if (!$block->canShipPartiallyItem()): ?>
+    <?php if (!$block->canShipPartiallyItem()) : ?>
     <td class="col-ship last">
-        <input type="hidden" name="shipment[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>]" value="0" />
-        <input type="checkbox" name="shipment[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>]" value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>" checked />
+        <input type="hidden" name="shipment[items][<?= (int) $_item->getOrderItemId() ?>]" value="0" />
+        <input type="checkbox"
+               name="shipment[items][<?= (int) $_item->getOrderItemId() ?>]"
+               value="<?= /* @noEscape */ $_item->getQty()*1 ?>" checked />
     </td>
     <?php endif; ?>
 </tr>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
index 1a9d44c19db40..22d546f4fb474 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
@@ -3,9 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+//phpcs:disable Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace
+//phpcs:disable Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore
+//phpcs:disable Squiz.Operators.IncrementDecrementUsage.NotAllowed
+//phpcs:disable Squiz.PHP.NonExecutableCode.Unreachable
 ?>
 <div class="grid">
     <?php $randomId = rand(); ?>
@@ -19,29 +20,31 @@
                                    id="select-items-<?= /* @noEscape */ $randomId ?>"
                                    onchange="packaging.checkAllItems(this);"
                                    class="checkbox admin__control-checkbox"
-                                   title="<?= /* @escapeNotVerified */ __('Select All') ?>">
+                                   title="<?= $block->escapeHtmlAttr(__('Select All')) ?>">
                             <label for="select-items-<?= /* @noEscape */ $randomId ?>"></label>
                         </label>
                     </th>
-                    <th class="data-grid-th"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
-                    <th class="data-grid-th"><?= /* @escapeNotVerified */ __('Weight') ?></th>
+                    <th class="data-grid-th"><?= $block->escapeHtml(__('Product Name')) ?></th>
+                    <th class="data-grid-th"><?= $block->escapeHtml(__('Weight')) ?></th>
                     <th class="data-grid-th" <?= $block->displayCustomsValue() ? '' : 'style="display: none;"' ?>>
-                        <?= /* @escapeNotVerified */ __('Customs Value') ?>
+                        <?= $block->escapeHtml(__('Customs Value')) ?>
                     </th>
-                    <th class="data-grid-th"><?= /* @escapeNotVerified */ __('Qty Ordered') ?></th>
-                    <th class="data-grid-th"><?= /* @escapeNotVerified */ __('Qty') ?></th>
+                    <th class="data-grid-th"><?= $block->escapeHtml(__('Qty Ordered')) ?></th>
+                    <th class="data-grid-th"><?= $block->escapeHtml(__('Qty')) ?></th>
                 </tr>
             </thead>
             <tbody>
             <?php $i=0; ?>
-            <?php foreach ($block->getCollection() as $item): ?>
+            <?php foreach ($block->getCollection() as $item) : ?>
                 <?php
                     $_order = $block->getShipment()->getOrder();
                     $_orderItem = $_order->getItemById($item->getOrderItemId());
                 ?>
                 <?php if ($item->getIsVirtual()
-                    || ($_orderItem->isShipSeparately() && !($_orderItem->getParentItemId() || $_orderItem->getParentItem()))
-                    || (!$_orderItem->isShipSeparately() && ($_orderItem->getParentItemId() || $_orderItem->getParentItem()))): ?>
+                    || ($_orderItem->isShipSeparately()
+                        && !($_orderItem->getParentItemId() || $_orderItem->getParentItem()))
+                    || (!$_orderItem->isShipSeparately()
+                        && ($_orderItem->getParentItemId() || $_orderItem->getParentItem()))) : ?>
                     <?php continue; ?>
                 <?php endif; ?>
                 <tr class="data-grid-controls-row data-row <?= ($i++ % 2 != 0) ? '_odd-row' : '' ?>">
@@ -51,16 +54,16 @@
                             <input type="checkbox"
                                    name=""
                                    id="select-item-<?= /* @noEscape */ $randomId . '-' . $id ?>"
-                                   value="<?= /* @escapeNotVerified */ $id ?>"
+                                   value="<?= (int) $id ?>"
                                    class="checkbox admin__control-checkbox">
                             <label for="select-item-<?= /* @noEscape */ $randomId . '-' . $id ?>"></label>
                         </label>
                     </td>
                     <td>
-                        <?= /* @escapeNotVerified */ $item->getName() ?>
+                        <?= $block->escapeHtml($item->getName()) ?>
                     </td>
                     <td data-role="item-weight">
-                        <?= /* @escapeNotVerified */ $item->getWeight() ?>
+                        <?= $block->escapeHtml($item->getWeight()) ?>
                     </td>
                     <?php
                     if ($block->displayCustomsValue()) {
@@ -72,25 +75,32 @@
                     }
 
                     ?>
-                    <td <?= /* @escapeNotVerified */ $customsValueDisplay ?>>
+                    <td <?= /* @noEscape */ $customsValueDisplay ?>>
                         <input type="text"
                                name="customs_value"
-                               class="input-text admin__control-text <?= /* @escapeNotVerified */ $customsValueValidation ?>"
-                               value="<?= /* @escapeNotVerified */ $block->formatPrice($item->getPrice()) ?>"
+                               class="input-text admin__control-text <?= /* @noEscape */ $customsValueValidation ?>"
+                               value="<?= $block->escapeHtmlAttr($block->formatPrice($item->getPrice())) ?>"
                                size="10"
                                onblur="packaging.recalcContainerWeightAndCustomsValue(this);">
                     </td>
                     <td>
-                        <?= /* @escapeNotVerified */ $item->getOrderItem()->getQtyOrdered()*1 ?>
+                        <?= /* @noEscape */ $item->getOrderItem()->getQtyOrdered()*1 ?>
                     </td>
                     <td>
-                        <input type="hidden" name="price" value="<?= /* @escapeNotVerified */ $item->getPrice() ?>">
+                        <input type="hidden" name="price" value="<?= $block->escapeHtml($item->getPrice()) ?>">
                         <input type="text"
                                name="qty"
-                               value="<?= /* @escapeNotVerified */ $item->getQty()*1 ?>"
-                               class="input-text admin__control-text qty<?php if ($item->getOrderItem()->getIsQtyDecimal()): ?> qty-decimal<?php endif ?>">&nbsp;
-                        <button type="button" class="action-delete" data-action="package-delete-item" onclick="packaging.deleteItem(this);" style="display:none;">
-                            <span><?= /* @escapeNotVerified */ __('Delete') ?></span>
+                               value="<?= /* @noEscape */ $item->getQty()*1 ?>"
+                               class="input-text admin__control-text qty
+                            <?php if ($item->getOrderItem()->getIsQtyDecimal()) : ?>
+                               qty-decimal
+                            <?php endif ?>">&nbsp;
+                        <button type="button"
+                                class="action-delete"
+                                data-action="package-delete-item"
+                                onclick="packaging.deleteItem(this);"
+                                style="display:none;">
+                            <span><?= $block->escapeHtml(__('Delete')) ?></span>
                         </button>
                     </td>
                 </tr>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
index 1d9cf5688be2d..8d47f533449a7 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
@@ -3,18 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+//phpcs:disable Magento2.Files.LineLength.MaxExceeded
+//phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 
 <div id="packed_window">
-<?php foreach ($block->getPackages() as $packageId => $package): ?>
+<?php foreach ($block->getPackages() as $packageId => $package) : ?>
     <?php $package = new \Magento\Framework\DataObject($package) ?>
     <?php $params = new \Magento\Framework\DataObject($package->getParams()) ?>
     <section class="admin__page-section">
         <div class="admin__page-section-title">
-            <span class="title"><?= /* @escapeNotVerified */ __('Package') . ' ' . $packageId ?></span>
+            <span class="title"><?= $block->escapeHtml(__('Package') . ' ' . $packageId) ?></span>
         </div>
         <div class="admin__page-section-content">
             <div class="row row-gutter">
@@ -22,22 +21,24 @@
                     <table class="admin__table-secondary">
                         <tbody>
                             <tr>
-                                <th><?= /* @escapeNotVerified */ __('Type') ?></th>
-                                <td><?= /* @escapeNotVerified */ $block->getContainerTypeByCode($params->getContainer()) ?></td>
+                                <th><?= $block->escapeHtml(__('Type')) ?></th>
+                                <td>
+                                    <?= $block->escapeHtml($block->getContainerTypeByCode($params->getContainer())) ?>
+                                </td>
                             </tr>
                             <tr>
-                            <?php if ($block->displayCustomsValue()): ?>
-                                <th><?= /* @escapeNotVerified */ __('Customs Value') ?></th>
-                                <td><?= /* @escapeNotVerified */ $block->displayCustomsPrice($params->getCustomsValue()) ?></td>
-                            <?php else: ?>
-                                <th><?= /* @escapeNotVerified */ __('Total Weight') ?></th>
-                                <td><?= /* @escapeNotVerified */ $params->getWeight() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureWeightName($params->getWeightUnits()) ?></td>
+                            <?php if ($block->displayCustomsValue()) : ?>
+                                <th><?= $block->escapeHtml(__('Customs Value')) ?></th>
+                                <td><?= $block->escapeHtml($block->displayCustomsPrice($params->getCustomsValue())) ?></td>
+                            <?php else : ?>
+                                <th><?= $block->escapeHtml(__('Total Weight')) ?></th>
+                                <td><?= $block->escapeHtml($params->getWeight() . ' ' . $this->helper(Magento\Shipping\Helper\Carrier::class)->getMeasureWeightName($params->getWeightUnits())) ?></td>
                             <?php endif; ?>
                             </tr>
-                        <?php if ($params->getSize()): ?>
+                        <?php if ($params->getSize()) : ?>
                             <tr>
-                                <th><?= /* @escapeNotVerified */ __('Size') ?></th>
-                                <td><?= /* @escapeNotVerified */ ucfirst(strtolower($params->getSize())) ?></td>
+                                <th><?= $block->escapeHtml(__('Size')) ?></th>
+                                <td><?= $block->escapeHtml(ucfirst(strtolower($params->getSize()))) ?></td>
                             </tr>
                         <?php endif; ?>
                         </tbody>
@@ -47,31 +48,31 @@
                     <table class="admin__table-secondary">
                         <tbody>
                             <tr>
-                                <th><?= /* @escapeNotVerified */ __('Length') ?></th>
+                                <th><?= $block->escapeHtml(__('Length')) ?></th>
                                 <td>
-                                <?php if ($params->getLength() != null): ?>
-                                    <?= /* @escapeNotVerified */ $params->getLength() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getDimensionUnits()) ?>
-                                <?php else: ?>
+                                <?php if ($params->getLength() != null) : ?>
+                                    <?= $block->escapeHtml($params->getLength() . ' ' . $this->helper(Magento\Shipping\Helper\Carrier::class)->getMeasureDimensionName($params->getDimensionUnits())) ?>
+                                <?php else : ?>
                                     --
                                 <?php endif; ?>
                                 </td>
                             </tr>
                             <tr>
-                                <th><?= /* @escapeNotVerified */ __('Width') ?></th>
+                                <th><?= $block->escapeHtml(__('Width')) ?></th>
                                 <td>
-                                <?php if ($params->getWidth() != null): ?>
-                                    <?= /* @escapeNotVerified */ $params->getWidth() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getDimensionUnits()) ?>
-                                <?php else: ?>
+                                <?php if ($params->getWidth() != null) : ?>
+                                    <?= $block->escapeHtml($params->getWidth() . ' ' . $this->helper(Magento\Shipping\Helper\Carrier::class)->getMeasureDimensionName($params->getDimensionUnits())) ?>
+                                <?php else : ?>
                                     --
                                 <?php endif; ?>
                                 </td>
                             </tr>
                             <tr>
-                                <th><?= /* @escapeNotVerified */ __('Height') ?></th>
+                                <th><?= $block->escapeHtml(__('Height')) ?></th>
                                 <td>
-                                <?php if ($params->getHeight() != null): ?>
-                                    <?= /* @escapeNotVerified */ $params->getHeight() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getDimensionUnits()) ?>
-                                <?php else: ?>
+                                <?php if ($params->getHeight() != null) : ?>
+                                    <?= $block->escapeHtml($params->getHeight() . ' ' . $this->helper(Magento\Shipping\Helper\Carrier::class)->getMeasureDimensionName($params->getDimensionUnits())) ?>
+                                <?php else : ?>
                                     --
                                 <?php endif; ?>
                                 </td>
@@ -82,26 +83,26 @@
                 <div class="col-m-4">
                     <table class="admin__table-secondary">
                         <tbody>
-                        <?php if ($params->getDeliveryConfirmation() != null): ?>
+                        <?php if ($params->getDeliveryConfirmation() != null) : ?>
                             <tr>
-                                <th><?= /* @escapeNotVerified */ __('Signature Confirmation') ?></th>
-                                <td><?= /* @escapeNotVerified */ $block->getDeliveryConfirmationTypeByCode($params->getDeliveryConfirmation()) ?></td>
+                                <th><?= $block->escapeHtml(__('Signature Confirmation')) ?></th>
+                                <td><?= $block->escapeHtml($block->getDeliveryConfirmationTypeByCode($params->getDeliveryConfirmation())) ?></td>
                             </tr>
                         <?php endif; ?>
-                        <?php if ($params->getContentType() != null): ?>
+                        <?php if ($params->getContentType() != null) : ?>
                             <tr>
-                                <th><?= /* @escapeNotVerified */ __('Contents') ?></th>
-                                <?php if ($params->getContentType() == 'OTHER'): ?>
+                                <th><?= $block->escapeHtml(__('Contents')) ?></th>
+                                <?php if ($params->getContentType() == 'OTHER') : ?>
                                     <td><?= $block->escapeHtml($params->getContentTypeOther()) ?></td>
-                                <?php else: ?>
-                                    <td><?= /* @escapeNotVerified */ $block->getContentTypeByCode($params->getContentType()) ?></td>
+                                <?php else : ?>
+                                    <td><?= $block->escapeHtml($block->getContentTypeByCode($params->getContentType())) ?></td>
                                 <?php endif; ?>
                             </tr>
                         <?php endif; ?>
-                        <?php if ($params->getGirth()): ?>
+                        <?php if ($params->getGirth()) : ?>
                             <tr>
-                                <th><?= /* @escapeNotVerified */ __('Girth') ?></th>
-                                <td><?= /* @escapeNotVerified */ $params->getGirth() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getGirthDimensionUnits()) ?></td>
+                                <th><?= $block->escapeHtml(__('Girth')) ?></th>
+                                <td><?= $block->escapeHtml($params->getGirth() . ' ' . $this->helper(Magento\Shipping\Helper\Carrier::class)->getMeasureDimensionName($params->getGirthDimensionUnits())) ?></td>
                             </tr>
                         <?php endif; ?>
                         </tbody>
@@ -110,19 +111,19 @@
             </div>
         </div>
         <div class="admin__page-section-item-title">
-            <span class="title"><?= /* @escapeNotVerified */ __('Items in the Package') ?></span>
+            <span class="title"><?= $block->escapeHtml(__('Items in the Package')) ?></span>
         </div>
         <div class="admin__table-wrapper">
             <table class="data-table admin__table-primary">
                 <thead>
                 <tr class="headings">
-                    <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
-                    <th class="col-weight"><span><?= /* @escapeNotVerified */ __('Weight') ?></span></th>
-                    <?php if ($block->displayCustomsValue()): ?>
-                        <th class="col-custom"><span><?= /* @escapeNotVerified */ __('Customs Value') ?></span></th>
+                    <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
+                    <th class="col-weight"><span><?= $block->escapeHtml(__('Weight')) ?></span></th>
+                    <?php if ($block->displayCustomsValue()) : ?>
+                        <th class="col-custom"><span><?= $block->escapeHtml(__('Customs Value')) ?></span></th>
                     <?php endif; ?>
-                    <th class="col-qty"><span><?= /* @escapeNotVerified */ __('Qty Ordered') ?></span></th>
-                    <th class="col-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
+                    <th class="col-qty"><span><?= $block->escapeHtml(__('Qty Ordered')) ?></span></th>
+                    <th class="col-qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
                 </tr>
                 </thead>
                 <tbody id="">
@@ -130,19 +131,21 @@
                     <?php $item = new \Magento\Framework\DataObject($item) ?>
                     <tr title="#" id="">
                         <td class="col-product">
-                            <?= /* @escapeNotVerified */ $item->getName() ?>
+                            <?= $block->escapeHtml($item->getName()) ?>
                         </td>
                         <td class="col-weight">
-                            <?= /* @escapeNotVerified */ $item->getWeight() ?>
+                            <?= $block->escapeHtml($item->getWeight()) ?>
                         </td>
-                        <?php if ($block->displayCustomsValue()): ?>
-                            <td class="col-custom"><?= /* @escapeNotVerified */ $block->displayCustomsPrice($item->getCustomsValue()) ?></td>
+                        <?php if ($block->displayCustomsValue()) : ?>
+                            <td class="col-custom">
+                                <?= $block->escapeHtml($block->displayCustomsPrice($item->getCustomsValue())) ?>
+                            </td>
                         <?php endif; ?>
                         <td class="col-qty">
-                            <?= /* @escapeNotVerified */ $block->getQtyOrderedItem($item->getOrderItemId()) ?>
+                            <?= $block->escapeHtml($block->getQtyOrderedItem($item->getOrderItemId())) ?>
                         </td>
                         <td class="col-qty">
-                            <?= /* @escapeNotVerified */ $item->getQty()*1 ?>
+                            <?= /* @noEscape */ $item->getQty()*1 ?>
                         </td>
                     </tr>
                 <?php endforeach; ?>
@@ -163,8 +166,8 @@
         "#packed_window": {
             "Magento_Shipping/js/packages":{
                 "type":"slide",
-                "title":"<?= /* @escapeNotVerified */  __('Packages') ?>",
-                "url": "<?= /* @escapeNotVerified */ $block->getPrintButton() ?>"
+                "title":"<?= $block->escapeHtml(__('Packages')) ?>",
+                "url": "<?= $block->escapeUrl($block->getPrintButton()) ?>"
             }
         }
     }
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 a1f2d2741839b..cd25cb919adb5 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
@@ -3,9 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+//phpcs:disable PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
+//phpcs:disable Magento2.Security.IncludeFile.FoundIncludeFile
 ?>
 <?php /** @var $block \Magento\Shipping\Block\Adminhtml\Order\Packaging */ ?>
 <?php
@@ -21,21 +20,21 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
         "Magento_Ui/js/modal/modal"
     ], function(jQuery){
 
-        window.packaging = new Packaging(<?= /* @escapeNotVerified */ $block->getConfigDataJson() ?>);
+        window.packaging = new Packaging(<?= /* @noEscape */ $block->getConfigDataJson() ?>);
         packaging.changeContainerType($$('select[name=package_container]')[0]);
         packaging.checkSizeAndGirthParameter(
             $$('select[name=package_container]')[0],
-            <?= /* @escapeNotVerified */ $girthEnabled ?>
+            <?= /* @noEscape */ $girthEnabled ?>
         );
         packaging.setConfirmPackagingCallback(function(){
             packaging.setParamsCreateLabelRequest($('edit_form').serialize(true));
             packaging.sendCreateLabelRequest();
         });
         packaging.setLabelCreatedCallback(function(response){
-            setLocation("<?php /* @escapeNotVerified */ echo $block->getUrl(
+            setLocation("<?php $block->escapeJs($block->escapeUrl($block->getUrl(
                 'sales/order/view',
                 ['order_id' => $block->getShipment()->getOrderId()]
-            ); ?>");
+            ))); ?>");
         });
         packaging.setCancelCallback(function() {
             if ($('create_shipping_label')) {
@@ -52,23 +51,23 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
         });
         jQuery('#packaging_window').modal({
             type: 'slide',
-            title: '<?= /* @escapeNotVerified */ __('Create Packages') ?>',
+            title: '<?= $block->escapeJs($block->escapeHtml(__('Create Packages'))) ?>',
             buttons: [{
-                text: '<?= /* @escapeNotVerified */ __('Cancel') ?>',
+                text: '<?= $block->escapeJs($block->escapeHtml(__('Cancel'))) ?>',
                 'class': 'action-secondary',
                 click: function () {
                     packaging.cancelPackaging();
                     this.closeModal();
                     }
                 }, {
-                text: '<?= /* @escapeNotVerified */ __('Save') ?>',
+                text: '<?= $block->escapeJs($block->escapeHtml(__('Save'))) ?>',
                 'attr': {'disabled':'disabled', 'data-action':'save-packages'},
                 'class': 'action-primary _disabled',
                 click: function () {
                     packaging.confirmPackaging();
                     }
                 }, {
-                    text: '<?= /* @escapeNotVerified */ __('Add Package') ?>',
+                    text: '<?= $block->escapeJs($block->escapeHtml(__('Add Package'))) ?>',
                     'attr': {'data-action':'add-packages'},
                     'class': 'action-secondary',
                     click: function () {
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml
index c32b63bddab56..f91741f439d46 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+//phpcs:disable Magento2.Files.LineLength.MaxExceeded
 ?>
 <?php /** @var $block \Magento\Shipping\Block\Adminhtml\Order\Packaging */ ?>
 <div id="packaging_window">
@@ -13,14 +11,20 @@
     <section class="admin__page-section" id="package_template" style="display:none;">
         <div class="admin__page-section-title">
             <span class="title">
-                <?= /* @escapeNotVerified */ __('Package') ?> <span data-role="package-number"></span>
+                <?= $block->escapeHtml(__('Package')) ?> <span data-role="package-number"></span>
             </span>
             <div class="actions _primary">
-                <button type="button" class="action-secondary" data-action="package-save-items" onclick="packaging.packItems(this);">
-                    <span><?= /* @escapeNotVerified */ __('Add Selected Product(s) to Package') ?></span>
+                <button type="button"
+                        class="action-secondary"
+                        data-action="package-save-items"
+                        onclick="packaging.packItems(this);">
+                    <span><?= $block->escapeHtml(__('Add Selected Product(s) to Package')) ?></span>
                 </button>
-                <button type="button" class="action-secondary" data-action="package-add-items" onclick="packaging.getItemsForPack(this);">
-                    <span><?= /* @escapeNotVerified */ __('Add Products to Package') ?></span>
+                <button type="button"
+                        class="action-secondary"
+                        data-action="package-add-items"
+                        onclick="packaging.getItemsForPack(this);">
+                    <span><?= $block->escapeHtml(__('Add Products to Package')) ?></span>
                 </button>
             </div>
         </div>
@@ -28,23 +32,23 @@
             <table class="data-table admin__control-table">
                 <thead>
                     <tr>
-                        <th class="col-type"><?= /* @escapeNotVerified */ __('Type') ?></th>
-                        <?php if ($girthEnabled == 1): ?>
-                        <th class="col-size"><?= /* @escapeNotVerified */ __('Size') ?></th>
-                        <th class="col-girth"><?= /* @escapeNotVerified */ __('Girth') ?></th>
+                        <th class="col-type"><?= $block->escapeHtml(__('Type')) ?></th>
+                        <?php if ($girthEnabled == 1) : ?>
+                        <th class="col-size"><?= $block->escapeHtml(__('Size')) ?></th>
+                        <th class="col-girth"><?= $block->escapeHtml(__('Girth')) ?></th>
                         <th>&nbsp;</th>
                         <?php endif; ?>
                         <th class="col-custom" <?= $block->displayCustomsValue() ? '' : 'style="display: none;"' ?>>
-                            <?= /* @escapeNotVerified */ __('Customs Value') ?>
+                            <?= $block->escapeHtml(__('Customs Value')) ?>
                         </th>
-                        <th class="col-total-weight"><?= /* @escapeNotVerified */ __('Total Weight') ?></th>
-                        <th class="col-length"><?= /* @escapeNotVerified */ __('Length') ?></th>
-                        <th class="col-width"><?= /* @escapeNotVerified */ __('Width') ?></th>
-                        <th class="col-height"><?= /* @escapeNotVerified */ __('Height') ?></th>
+                        <th class="col-total-weight"><?= $block->escapeHtml(__('Total Weight')) ?></th>
+                        <th class="col-length"><?= $block->escapeHtml(__('Length')) ?></th>
+                        <th class="col-width"><?= $block->escapeHtml(__('Width')) ?></th>
+                        <th class="col-height"><?= $block->escapeHtml(__('Height')) ?></th>
                         <th>&nbsp;</th>
-                        <?php if ($block->getDeliveryConfirmationTypes()): ?>
-                        <th class="col-signature"><?= /* @escapeNotVerified */ __('Signature Confirmation') ?></th>
-                            <?php endif; ?>
+                        <?php if ($block->getDeliveryConfirmationTypes()) : ?>
+                        <th class="col-signature"><?= $block->escapeHtml(__('Signature Confirmation')) ?></th>
+                        <?php endif; ?>
                         <th class="col-actions">&nbsp;</th>
                     </tr>
                 </thead>
@@ -53,29 +57,29 @@
                         <td class="col-type">
                             <?php $containers = $block->getContainers(); ?>
                             <select name="package_container"
-                                    onchange="packaging.changeContainerType(this);packaging.checkSizeAndGirthParameter(this, <?= /* @escapeNotVerified */ $girthEnabled ?>);"
-                                    <?php if (empty($containers)):?>
-                                        title="<?= /* @escapeNotVerified */ __('USPS domestic shipments don\'t use package types.') ?>"
+                                    onchange="packaging.changeContainerType(this);packaging.checkSizeAndGirthParameter(this, <?= $block->escapeJs($girthEnabled) ?>);"
+                                    <?php if (empty($containers)) : ?>
+                                        title="<?= $block->escapeHtmlAttr(__('USPS domestic shipments don\'t use package types.')) ?>"
                                         disabled=""
                                         class="admin__control-select disabled"
-                                    <?php else: ?>
+                                    <?php else : ?>
                                         class="admin__control-select"
                                     <?php endif; ?>>
-                                <?php foreach ($block->getContainers() as $key => $value): ?>
-                                    <option value="<?= /* @escapeNotVerified */ $key ?>" >
-                                        <?= /* @escapeNotVerified */ $value ?>
+                                <?php foreach ($containers as $key => $value) : ?>
+                                    <option value="<?= $block->escapeHtmlAttr($key) ?>" >
+                                        <?= $block->escapeHtml($value) ?>
                                     </option>
                                 <?php endforeach; ?>
                             </select>
                         </td>
-                        <?php if ($girthEnabled == 1 && !empty($sizeSource)): ?>
+                        <?php if ($girthEnabled == 1 && !empty($sizeSource)) : ?>
                         <td>
                             <select name="package_size"
                                     class="admin__control-select"
-                                    onchange="packaging.checkSizeAndGirthParameter(this, <?= /* @escapeNotVerified */ $girthEnabled ?>);">
-                                <?php foreach ($sizeSource as $key => $value): ?>
-                                <option value="<?= /* @escapeNotVerified */ $sizeSource[$key]['value'] ?>">
-                                    <?= /* @escapeNotVerified */ $sizeSource[$key]['label'] ?>
+                                    onchange="packaging.checkSizeAndGirthParameter(this, <?= $block->escapeJs($girthEnabled) ?>);">
+                                <?php foreach ($sizeSource as $key => $value) : ?>
+                                <option value="<?= $block->escapeHtmlAttr($sizeSource[$key]['value']) ?>">
+                                    <?= $block->escapeHtml($sizeSource[$key]['label']) ?>
                                 </option>
                                 <?php endforeach; ?>
                             </select>
@@ -89,11 +93,11 @@
                             <select name="container_girth_dimension_units"
                                     class="options-units-dimensions measures admin__control-select"
                                     onchange="packaging.changeMeasures(this);">
-                                <option value="<?= /* @escapeNotVerified */ Zend_Measure_Length::INCH ?>" selected="selected" ><?= /* @escapeNotVerified */ __('in') ?></option>
-                                <option value="<?= /* @escapeNotVerified */ Zend_Measure_Length::CENTIMETER ?>" ><?= /* @escapeNotVerified */ __('cm') ?></option>
+                                <option value="<?= /* @noEscape */ Zend_Measure_Length::INCH ?>" selected="selected" ><?= $block->escapeHtml(__('in')) ?></option>
+                                <option value="<?= /* @noEscape */ Zend_Measure_Length::CENTIMETER ?>" ><?= $block->escapeHtml(__('cm')) ?></option>
                             </select>
                         </td>
-                            <?php endif; ?>
+                        <?php endif; ?>
                         <?php
                         if ($block->displayCustomsValue()) {
                             $customsValueDisplay = '';
@@ -103,13 +107,15 @@
                             $customsValueValidation = '';
                         }
                         ?>
-                        <td class="col-custom" <?= /* @escapeNotVerified */ $customsValueDisplay ?>>
+                        <td class="col-custom" <?= /* @noEscape */ $customsValueDisplay ?>>
                             <div class="admin__control-addon">
                                 <input type="text"
-                                       class="customs-value input-text admin__control-text <?= /* @escapeNotVerified */ $customsValueValidation ?>"
+                                       class="customs-value input-text admin__control-text <?= /* @noEscape */ $customsValueValidation ?>"
                                        name="package_customs_value" />
                                 <span class="admin__addon-suffix">
-                                    <span class="customs-value-currency"><?= /* @escapeNotVerified */ $block->getCustomValueCurrencyCode() ?></span>
+                                    <span class="customs-value-currency">
+                                        <?= $block->escapeHtml($block->getCustomValueCurrencyCode()) ?>
+                                    </span>
                                 </span>
                             </div>
                         </td>
@@ -121,8 +127,8 @@
                                     <select name="container_weight_units"
                                             class="options-units-weight measures admin__control-select"
                                             onchange="packaging.changeMeasures(this);">
-                                        <option value="<?= /* @escapeNotVerified */ Zend_Measure_Weight::POUND ?>" selected="selected"  ><?= /* @escapeNotVerified */ __('lb') ?></option>
-                                        <option value="<?= /* @escapeNotVerified */ Zend_Measure_Weight::KILOGRAM ?>" ><?= /* @escapeNotVerified */ __('kg') ?></option>
+                                        <option value="<?= /* @noEscape */ Zend_Measure_Weight::POUND ?>" selected="selected"  ><?= $block->escapeHtml(__('lb')) ?></option>
+                                        <option value="<?= /* @noEscape */ Zend_Measure_Weight::KILOGRAM ?>" ><?= $block->escapeHtml(__('kg')) ?></option>
                                     </select>
                                 <span class="admin__addon-prefix"></span>
                             </div>
@@ -146,35 +152,37 @@
                             <select name="container_dimension_units"
                                     class="options-units-dimensions measures admin__control-select"
                                     onchange="packaging.changeMeasures(this);">
-                                <option value="<?= /* @escapeNotVerified */ Zend_Measure_Length::INCH ?>" selected="selected" ><?= /* @escapeNotVerified */ __('in') ?></option>
-                                <option value="<?= /* @escapeNotVerified */ Zend_Measure_Length::CENTIMETER ?>" ><?= /* @escapeNotVerified */ __('cm') ?></option>
+                                <option value="<?= /* @noEscape */ Zend_Measure_Length::INCH ?>" selected="selected" ><?= $block->escapeHtml(__('in')) ?></option>
+                                <option value="<?= /* @noEscape */ Zend_Measure_Length::CENTIMETER ?>" ><?= $block->escapeHtml(__('cm')) ?></option>
                             </select>
                         </td>
-                        <?php if ($block->getDeliveryConfirmationTypes()): ?>
+                        <?php if ($block->getDeliveryConfirmationTypes()) : ?>
                         <td>
                             <select name="delivery_confirmation_types" class="admin__control-select">
-                                <?php foreach ($block->getDeliveryConfirmationTypes() as $key => $value): ?>
-                                <option value="<?= /* @escapeNotVerified */ $key ?>" >
-                                    <?= /* @escapeNotVerified */ $value ?>
+                                <?php foreach ($block->getDeliveryConfirmationTypes() as $key => $value) : ?>
+                                <option value="<?= $block->escapeHtmlAttr($key) ?>" >
+                                    <?= $block->escapeHtml($value) ?>
                                 </option>
                                 <?php endforeach; ?>
                             </select>
                         </td>
-                            <?php endif; ?>
+                        <?php endif; ?>
                         <td class="col-actions">
-                            <button type="button" class="action-delete DeletePackageBtn" onclick="packaging.deletePackage(this);">
-                                <span><?= /* @escapeNotVerified */ __('Delete Package') ?></span>
+                            <button type="button"
+                                    class="action-delete DeletePackageBtn"
+                                    onclick="packaging.deletePackage(this);">
+                                <span><?= $block->escapeHtml(__('Delete Package')) ?></span>
                             </button>
                         </td>
                     </tr>
                 </tbody>
             </table>
-            <?php if ($block->getContentTypes()): ?>
+            <?php if ($block->getContentTypes()) : ?>
                 <table class="data-table admin__control-table" cellspacing="0">
                     <thead>
                         <tr>
-                            <th><?= /* @escapeNotVerified */ __('Contents') ?></th>
-                            <th><?= /* @escapeNotVerified */ __('Explanation') ?></th>
+                            <th><?= $block->escapeHtml(__('Contents')) ?></th>
+                            <th><?= $block->escapeHtml(__('Explanation')) ?></th>
                         </tr>
                     </thead>
                     <tbody>
@@ -183,9 +191,9 @@
                             <select name="content_type"
                                     class="admin__control-select"
                                     onchange="packaging.changeContentTypes(this);">
-                                <?php foreach ($block->getContentTypes() as $key => $value): ?>
-                                    <option value="<?= /* @escapeNotVerified */ $key ?>" >
-                                        <?= /* @escapeNotVerified */ $value ?>
+                                <?php foreach ($block->getContentTypes() as $key => $value) : ?>
+                                    <option value="<?= $block->escapeHtmlAttr($key) ?>" >
+                                        <?= $block->escapeHtml($value) ?>
                                     </option>
                                 <?php endforeach; ?>
                             </select>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
index 02cdca120fdbc..d65fa819eaeed 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block Magento\Shipping\Block\Adminhtml\Order\Tracking */?>
 <script>
@@ -68,8 +65,8 @@ require(['prototype'], function(){
                     id="trackingC<%- data.index %>"
                     class="select admin__control-select carrier"
                     disabled="disabled">
-                <?php foreach ($block->getCarriers() as $_code => $_name): ?>
-                    <option value="<?= /* @escapeNotVerified */ $_code ?>"><?= $block->escapeHtml($_name) ?></option>
+                <?php foreach ($block->getCarriers() as $_code => $_name) : ?>
+                    <option value="<?= $block->escapeHtmlAttr($_code) ?>"><?= $block->escapeHtml($_name) ?></option>
                 <?php endforeach; ?>
             </select>
         </td>
@@ -94,7 +91,7 @@ require(['prototype'], function(){
                 type="button"
                 class="action-default action-delete"
                 onclick="trackingControl.deleteRow(event);return false">
-                <span><?= /* @escapeNotVerified */ __('Delete') ?></span>
+                <span><?= $block->escapeHtml(__('Delete')) ?></span>
             </button>
         </td>
     </tr>
@@ -104,10 +101,10 @@ require(['prototype'], function(){
     <table class="data-table admin__control-table" id="tracking_numbers_table">
         <thead>
         <tr class="headings">
-            <th class="col-carrier"><?= /* @escapeNotVerified */ __('Carrier') ?></th>
-            <th class="col-title"><?= /* @escapeNotVerified */ __('Title') ?></th>
-            <th class="col-number"><?= /* @escapeNotVerified */ __('Number') ?></th>
-            <th class="col-delete"><?= /* @escapeNotVerified */ __('Action') ?></th>
+            <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"><?= $block->escapeHtml(__('Action')) ?></th>
         </tr>
         </thead>
         <tfoot>
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 0587d5eabe681..67587f19774c4 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
@@ -3,19 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+//phpcs:disable Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace
+//phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+//phpcs:disable Magento2.Files.LineLength.MaxExceeded
 ?>
 <?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"><?= /* @escapeNotVerified */ __('Carrier') ?></th>
-                <th class="col-title"><?= /* @escapeNotVerified */ __('Title') ?></th>
-                <th class="col-number"><?= /* @escapeNotVerified */ __('Number') ?></th>
-                <th class="col-delete last"><?= /* @escapeNotVerified */ __('Action') ?></th>
+                <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>
@@ -24,8 +24,8 @@
                     <select name="carrier"
                             class="select admin__control-select"
                             onchange="selectCarrier(this)">
-                        <?php foreach ($block->getCarriers() as $_code => $_name): ?>
-                        <option value="<?= /* @escapeNotVerified */ $_code ?>"><?= $block->escapeHtml($_name) ?></option>
+                        <?php foreach ($block->getCarriers() as $_code => $_name) : ?>
+                        <option value="<?= $block->escapeHtmlAttr($_code) ?>"><?= $block->escapeHtml($_name) ?></option>
                         <?php endforeach; ?>
                     </select>
                 </td>
@@ -46,21 +46,23 @@
                 <td class="col-delete last"><?= $block->getSaveButtonHtml() ?></td>
             </tr>
         </tfoot>
-    <?php if ($_tracks = $block->getShipment()->getAllTracks()): ?>
+    <?php if ($_tracks = $block->getShipment()->getAllTracks()) : ?>
         <tbody>
-        <?php $i = 0; foreach ($_tracks as $_track):$i++ ?>
-            <tr class="<?= /* @escapeNotVerified */ ($i%2 == 0) ? 'even' : 'odd' ?>">
-                <td class="col-carrier"><?= $block->escapeHtml($block->getCarrierTitle($_track->getCarrierCode())) ?></td>
+        <?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('<?= /* @escapeNotVerified */ $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_track) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')"><?= $block->escapeHtml($_track->getNumber()) ?></a>
-                    <div id="shipment_tracking_info_response_<?= /* @escapeNotVerified */ $_track->getId() ?>"></div>
+                    <?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('<?= /* @escapeNotVerified */ $block->getRemoveUrl($_track) ?>'); return false;"><span><?= /* @escapeNotVerified */ __('Delete') ?></span></button></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>
@@ -78,7 +80,7 @@ function selectCarrier(elem) {
 }
 
 function deleteTrackingNumber(url) {
-    if (confirm('<?= /* @escapeNotVerified */ __('Are you sure?') ?>')) {
+    if (confirm('<?= $block->escapeJs($block->escapeHtml(__('Are you sure?'))) ?>')) {
         submitAndReloadArea($('shipment_tracking_info').parentNode, url)
     }
 }
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml
index b7281f16cd353..551a86532252e 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml
@@ -3,39 +3,40 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+//phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php /** @var $block \Magento\Shipping\Block\Adminhtml\View */ ?>
 <?php $order = $block->getOrder() ?>
-<?php if ($order->getIsVirtual()) : return '';endif; ?>
+<?php if ($order->getIsVirtual()) :
+    return '';
+endif; ?>
 
 <?php /* Shipping Method */ ?>
 <div class="admin__page-section-item order-shipping-method">
     <div class="admin__page-section-item-title">
-        <span class="title"><?= /* @escapeNotVerified */ __('Shipping &amp; Handling Information') ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Shipping &amp; Handling Information')) ?></span>
     </div>
     <div class="admin__page-section-item-content">
         <?php  if ($order->getTracksCollection()->count()) : ?>
-            <p><a href="#" id="linkId" onclick="popWin('<?= /* @escapeNotVerified */ $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($order) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?= /* @escapeNotVerified */ __('Track Order') ?>"><?= /* @escapeNotVerified */ __('Track Order') ?></a></p>
+            <p><a href="#" id="linkId" onclick="popWin('<?= $block->escapeJs($block->escapeUrl($this->helper(Magento\Shipping\Helper\Data::class)->getTrackingPopupUrlBySalesModel($order))) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?= $block->escapeHtmlAttr(__('Track Order')) ?>"><?= $block->escapeHtml(__('Track Order')) ?></a></p>
         <?php endif; ?>
-        <?php if ($order->getShippingDescription()): ?>
+        <?php if ($order->getShippingDescription()) : ?>
             <strong><?= $block->escapeHtml($order->getShippingDescription()) ?></strong>
 
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
+            <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()) : ?>
                 <?php $_excl = $block->displayShippingPriceInclTax($order); ?>
-            <?php else: ?>
+            <?php else : ?>
                 <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
             <?php endif; ?>
             <?php $_incl = $block->displayShippingPriceInclTax($order); ?>
 
-            <?= /* @escapeNotVerified */ $_excl ?>
-            <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
+            <?= /* @noEscape */ $_excl ?>
+            <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices()
+                && $_incl != $_excl) : ?>
+                (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
             <?php endif; ?>
-        <?php else: ?>
-            <?= /* @escapeNotVerified */ __('No shipping information available') ?>
+        <?php else : ?>
+            <?= $block->escapeHtml(__('No shipping information available')) ?>
         <?php endif; ?>
     </div>
 </div>
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 86ebc439ae0d5..dcf7759be9983 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
@@ -3,11 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
 /**
  * @var \Magento\Shipping\Block\Adminhtml\View\Form $block
  */
+//phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+//phpcs:disable Magento2.Files.LineLength.MaxExceeded
 $order = $block->getShipment()->getOrder();
 ?>
 <?= $block->getChildHtml('order_info'); ?>
@@ -34,9 +34,9 @@ $order = $block->getShipment()->getOrder();
             </div>
             <div class="admin__page-section-item-content">
                 <div class="shipping-description-wrapper">
-                    <?php if ($block->getShipment()->getTracksCollection()->count()): ?>
+                    <?php if ($block->getShipment()->getTracksCollection()->count()) : ?>
                         <p>
-                            <a href="#" id="linkId" onclick="popWin('<?= $block->escapeUrl($this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($block->getShipment())); ?>','trackshipment','width=800,height=600,resizable=yes,scrollbars=yes')"
+                            <a href="#" id="linkId" onclick="popWin('<?= $block->escapeUrl($this->helper(\Magento\Shipping\Helper\Data::class)->getTrackingPopupUrlBySalesModel($block->getShipment())); ?>','trackshipment','width=800,height=600,resizable=yes,scrollbars=yes')"
                                title="<?= $block->escapeHtml(__('Track this shipment')); ?>">
                                 <?= $block->escapeHtml(__('Track this shipment')); ?>
                             </a>
@@ -48,27 +48,27 @@ $order = $block->getShipment()->getOrder();
 
                     <?= $block->escapeHtml(__('Total Shipping Charges')); ?>:
 
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
+                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()) : ?>
                         <?php $excl = $block->displayShippingPriceInclTax($order); ?>
-                    <?php else: ?>
+                    <?php else : ?>
                         <?php $excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
                     <?php endif; ?>
                     <?php $incl = $block->displayShippingPriceInclTax($order); ?>
 
                     <?= /* @noEscape */ $excl; ?>
-                    <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $incl != $excl): ?>
+                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $incl != $excl) : ?>
                         (<?= $block->escapeHtml(__('Incl. Tax')); ?> <?= /* @noEscape */ $incl; ?>)
                     <?php endif; ?>
                 </div>
 
                 <p>
-                    <?php if ($block->canCreateShippingLabel()): ?>
+                    <?php if ($block->canCreateShippingLabel()) : ?>
                         <?= /* @noEscape */ $block->getCreateLabelButton(); ?>
                     <?php endif ?>
-                    <?php if ($block->getShipment()->getShippingLabel()): ?>
+                    <?php if ($block->getShipment()->getShippingLabel()) : ?>
                         <?= /* @noEscape */ $block->getPrintLabelButton(); ?>
                     <?php endif ?>
-                    <?php if ($block->getShipment()->getPackages()): ?>
+                    <?php if ($block->getShipment()->getPackages()) : ?>
                         <?= /* @noEscape */ $block->getShowPackagesButton(); ?>
                     <?php endif ?>
                 </p>
@@ -85,10 +85,7 @@ $order = $block->getShipment()->getOrder();
                                 window.packaging.sendCreateLabelRequest();
                             });
                             window.packaging.setLabelCreatedCallback(function () {
-                                setLocation("<?php echo $block->escapeUrl($block->getUrl(
-                                    'adminhtml/order_shipment/view',
-                                    ['shipment_id' => $block->getShipment()->getId()])
-                                ); ?>");
+                                setLocation("<?php $block->escapeUrl($block->getUrl('adminhtml/order_shipment/view', ['shipment_id' => $block->getShipment()->getId()])); ?>");
                             });
                         };
 
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
index 8dddfaedda4e5..fa9fe7a84221b 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
@@ -3,24 +3,27 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <div class="admin__table-wrapper">
     <table class="data-table admin__table-primary order-shipment-table">
         <thead>
             <tr class="headings">
-                <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
-                <th class="col-qty last"><span><?= /* @escapeNotVerified */ __('Qty Shipped') ?></span></th>
+                <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
+                <th class="col-qty last"><span><?= $block->escapeHtml(__('Qty Shipped')) ?></span></th>
             </tr>
         </thead>
         <?php $_items = $block->getShipment()->getAllItems() ?>
-        <?php $_i = 0; foreach ($_items as $_item): if ($_item->getOrderItem()->getParentItem()): continue; endif; $_i++ ?>
-            <tbody class="<?= /* @escapeNotVerified */ $_i%2 ? 'odd' : 'even' ?>">
-                <?= $block->getItemHtml($_item) ?>
-                <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
-            </tbody>
+        <?php $_i = 0; foreach ($_items as $_item) :
+            if (!empty($_item->getOrderItem())) :
+                if ($_item->getOrderItem()->getParentItem()) :
+                    continue;
+                endif;
+                $_i++ ?>
+                <tbody class="<?= /* @noEscape */ $_i%2 ? 'odd' : 'even' ?>">
+                    <?= $block->getItemHtml($_item) ?>
+                    <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
+                </tbody>
+            <?php endif; ?>
         <?php endforeach; ?>
     </table>
 </div>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/view/items/renderer/default.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/view/items/renderer/default.phtml
index c035295f77d45..3a41eabd20c08 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/items/renderer/default.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/items/renderer/default.phtml
@@ -3,12 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php $_item = $block->getItem() ?>
 <tr class="border">
     <td class="col-product"><?= $block->getColumnHtml($_item, 'name') ?></td>
-    <td class="col-qty last"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
+    <td class="col-qty last"><?= /* @noEscape */ $_item->getQty()*1 ?></td>
 </tr>
diff --git a/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml b/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml
index 1f5b0ae4630ad..67d03da2599bf 100644
--- a/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml
+++ b/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml
@@ -8,7 +8,11 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="empty" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Shipping\Block\Tracking\Popup" name="shipping.tracking.popup" template="Magento_Shipping::tracking/popup.phtml" cacheable="false" />
+            <block class="Magento\Shipping\Block\Tracking\Popup" name="shipping.tracking.popup" template="Magento_Shipping::tracking/popup.phtml" cacheable="false">
+                <arguments>
+                    <argument name="delivery_date_title" xsi:type="object">Magento\Shipping\Block\DataProviders\Tracking\DeliveryDateTitle</argument>
+                </arguments>
+            </block>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/items.phtml b/app/code/Magento/Shipping/view/frontend/templates/items.phtml
index ebc6163a7bd06..f0f1423ed47a2 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/items.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/items.phtml
@@ -3,9 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+//phpcs:disable Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace
+//phpcs:disable Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore
+//phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+//phpcs:disable Magento2.Files.LineLength.MaxExceeded
 ?>
 <?php /** @var  $block \Magento\Shipping\Block\Items */ ?>
 <?php  $_order = $block->getOrder() ?>
@@ -13,67 +14,71 @@
     <?php if ($_order->getTracksCollection()->count()) : ?>
         <?= $block->getChildHtml('track-all-link') ?>
     <?php endif; ?>
-    <a href="<?= /* @escapeNotVerified */ $block->getPrintAllShipmentsUrl($_order) ?>"
+    <a href="<?= $block->escapeUrl($block->getPrintAllShipmentsUrl($_order)) ?>"
        onclick="this.target='_blank'"
        class="action print">
-        <span><?= /* @escapeNotVerified */ __('Print All Shipments') ?></span>
+        <span><?= $block->escapeHtml(__('Print All Shipments')) ?></span>
     </a>
 </div>
-<?php foreach ($_order->getShipmentsCollection() as $_shipment): ?>
-<div class="order-title">
-    <strong><?= /* @escapeNotVerified */ __('Shipment #') ?><?= /* @escapeNotVerified */ $_shipment->getIncrementId() ?></strong>
-    <a href="<?= /* @escapeNotVerified */ $block->getPrintShipmentUrl($_shipment) ?>"
-       onclick="this.target='_blank'"
-       class="action print">
-        <span><?= /* @escapeNotVerified */ __('Print Shipment') ?></span>
-    </a>
-    <a href="#"
-       data-mage-init='{"popupWindow": {"windowURL":"<?= /* @escapeNotVerified */ $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_shipment) ?>","windowName":"trackshipment","width":800,"height":600,"top":0,"left":0,"resizable":1,"scrollbars":1}}'
-       title="<?= /* @escapeNotVerified */ __('Track this shipment') ?>"
-       class="action track">
-        <span><?= /* @escapeNotVerified */ __('Track this shipment') ?></span>
-    </a>
-</div>
-<?php $tracks = $_shipment->getTracksCollection(); ?>
-<?php  if ($tracks->count()): ?>
-    <dl class="order-tracking" id="my-tracking-table-<?= /* @escapeNotVerified */ $_shipment->getId() ?>">
-        <dt class="tracking-title">
-            <?= /* @escapeNotVerified */ __('Tracking Number(s):') ?>
-        </dt>
-        <dd class="tracking-content">
-            <?php
-            $i = 1;
-            $_size = $tracks->count();
-            foreach ($tracks as $track): ?>
-                <?php if ($track->isCustom()): ?><?= $block->escapeHtml($track->getNumber()) ?><?php else: ?><a
-                    href="#"
-                    data-mage-init='{"popupWindow": {"windowURL":"<?= /* @escapeNotVerified */ $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($track) ?>","windowName":"trackorder","width":800,"height":600,"left":0,"top":0,"resizable":1,"scrollbars":1}}'
-                    class="action track"><span><?= $block->escapeHtml($track->getNumber()) ?></span>
-                    </a><?php endif; ?><?php if ($i != $_size): ?>, <?php endif; ?>
-                <?php $i++;
-            endforeach; ?>
-        </dd>
-    </dl>
-<?php  endif; ?>
-<div class="table-wrapper order-items-shipment">
-    <table class="data table table-order-items shipment" id="my-shipment-table-<?= /* @escapeNotVerified */ $_shipment->getId() ?>">
-        <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Shipped') ?></caption>
-        <thead>
-            <tr>
-                <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
-                <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
-                <th class="col qty"><?= /* @escapeNotVerified */ __('Qty Shipped') ?></th>
-            </tr>
-        </thead>
-        <?php $_items = $_shipment->getAllItems(); ?>
-        <?php foreach ($_items as $_item): ?>
-            <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
-                <tbody>
-                    <?= $block->getItemHtml($_item) ?>
-                </tbody>
-            <?php endif; ?>
-        <?php endforeach; ?>
-    </table>
-</div>
-<?= $block->getCommentsHtml($_shipment) ?>
+<?php foreach ($_order->getShipmentsCollection() as $_shipment) : ?>
+    <div class="order-title">
+        <strong><?= $block->escapeHtml(__('Shipment #')) ?><?= $block->escapeHtml($_shipment->getIncrementId()) ?></strong>
+        <a href="<?= $block->escapeUrl($block->getPrintShipmentUrl($_shipment)) ?>"
+           onclick="this.target='_blank'"
+           class="action print">
+            <span><?= $block->escapeHtml(__('Print Shipment')) ?></span>
+        </a>
+        <a href="#"
+           data-mage-init='{"popupWindow": {"windowURL":"<?= $block->escapeUrl($this->helper(Magento\Shipping\Helper\Data::class)->getTrackingPopupUrlBySalesModel($_shipment)) ?>","windowName":"trackshipment","width":800,"height":600,"top":0,"left":0,"resizable":1,"scrollbars":1}}'
+           title="<?= $block->escapeHtml(__('Track this shipment')) ?>"
+           class="action track">
+            <span><?= $block->escapeHtml(__('Track this shipment')) ?></span>
+        </a>
+    </div>
+    <?php $tracks = $_shipment->getTracksCollection(); ?>
+    <?php  if ($tracks->count()) : ?>
+        <dl class="order-tracking" id="my-tracking-table-<?= (int) $_shipment->getId() ?>">
+            <dt class="tracking-title">
+                <?= $block->escapeHtml(__('Tracking Number(s):')) ?>
+            </dt>
+            <dd class="tracking-content">
+                <?php
+                $i = 1;
+                $_size = $tracks->count();
+                foreach ($tracks as $track) : ?>
+                    <?php if ($track->isCustom()) : ?>
+                        <?= $block->escapeHtml($track->getNumber()) ?>
+                    <?php else : ?>
+                        <a href="#"
+                            data-mage-init='{"popupWindow": {"windowURL":"<?= $block->escapeUrl($this->helper(Magento\Shipping\Helper\Data::class)->getTrackingPopupUrlBySalesModel($track)) ?>","windowName":"trackorder","width":800,"height":600,"left":0,"top":0,"resizable":1,"scrollbars":1}}'
+                            class="action track"><span><?= $block->escapeHtml($track->getNumber()) ?></span>
+                            </a>
+                    <?php endif; ?>
+                    <?php if ($i != $_size) : ?>, <?php endif; ?>
+                    <?php $i++;
+                endforeach; ?>
+            </dd>
+        </dl>
+    <?php  endif; ?>
+    <div class="table-wrapper order-items-shipment">
+        <table class="data table table-order-items shipment" id="my-shipment-table-<?= (int) $_shipment->getId() ?>">
+            <caption class="table-caption"><?= $block->escapeHtml(__('Items Shipped')) ?></caption>
+            <thead>
+                <tr>
+                    <th class="col name"><?= $block->escapeHtml(__('Product Name')) ?></th>
+                    <th class="col sku"><?= $block->escapeHtml(__('SKU')) ?></th>
+                    <th class="col qty"><?= $block->escapeHtml(__('Qty Shipped')) ?></th>
+                </tr>
+            </thead>
+            <?php $_items = $_shipment->getAllItems(); ?>
+            <?php foreach ($_items as $_item) : ?>
+                <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
+                    <tbody>
+                        <?= $block->getItemHtml($_item) ?>
+                    </tbody>
+                <?php endif; ?>
+            <?php endforeach; ?>
+        </table>
+    </div>
+    <?= $block->getCommentsHtml($_shipment) ?>
 <?php endforeach; ?>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/order/shipment.phtml b/app/code/Magento/Shipping/view/frontend/templates/order/shipment.phtml
index 512c06626d758..da251da3d35d4 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/order/shipment.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/order/shipment.phtml
@@ -8,8 +8,8 @@
     <?= $block->getChildHtml('shipment_items') ?>
     <div class="actions-toolbar">
         <div class="secondary">
-            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back">
-                <span><?= /* @escapeNotVerified */ $block->getBackTitle() ?></span>
+            <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
+                <span><?= $block->escapeHtml($block->getBackTitle()) ?></span>
             </a>
         </div>
     </div>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
index 9253b47f82f5d..7dca84565e674 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
@@ -4,9 +4,8 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Framework\View\Element\Template */
+//phpcs:disable Magento2.Files.LineLength.MaxExceeded
 
 $parentBlock = $block->getParentBlock();
 $track = $block->getData('track');
@@ -24,18 +23,18 @@ $number = is_object($track) ? $track->getTracking() : $track['number'];
 <table class="data table order tracking" id="tracking-table-popup-<?= $block->escapeHtml($number) ?>">
     <caption class="table-caption"><?= $block->escapeHtml(__('Order tracking')) ?></caption>
     <tbody>
-    <?php if (is_object($track)): ?>
+    <?php if (is_object($track)) : ?>
         <tr>
             <th class="col label" scope="row"><?= $block->escapeHtml(__('Tracking Number:')) ?></th>
             <td class="col value"><?= $block->escapeHtml($number) ?></td>
         </tr>
-        <?php if ($track->getCarrierTitle()): ?>
+        <?php if ($track->getCarrierTitle()) : ?>
             <tr>
                 <th class="col label" scope="row"><?= $block->escapeHtml(__('Carrier:')) ?></th>
                 <td class="col value"><?= $block->escapeHtml($track->getCarrierTitle()) ?></td>
             </tr>
         <?php endif; ?>
-        <?php if ($track->getErrorMessage()): ?>
+        <?php if ($track->getErrorMessage()) : ?>
             <tr>
                 <th class="col label" scope="row"><?= $block->escapeHtml(__('Error:')) ?></th>
                 <td class="col error">
@@ -51,12 +50,12 @@ $number = is_object($track) ? $track->getTracking() : $track['number'];
                     <a href="mailto:<?= /* @noEscape */ $email ?>"><?= /* @noEscape */ $email ?></a>
                 </td>
             </tr>
-        <?php elseif ($track->getTrackSummary()): ?>
+        <?php elseif ($track->getTrackSummary()) : ?>
             <tr>
                 <th class="col label" scope="row"><?= $block->escapeHtml(__('Info:')) ?></th>
                 <td class="col value"><?= $block->escapeHtml($track->getTrackSummary()) ?></td>
             </tr>
-        <?php elseif ($track->getUrl()): ?>
+        <?php elseif ($track->getUrl()) : ?>
             <tr>
                 <th class="col label" scope="row"><?= $block->escapeHtml(__('Track:')) ?></th>
                 <td class="col value">
@@ -65,9 +64,9 @@ $number = is_object($track) ? $track->getTracking() : $track['number'];
                     </a>
                 </td>
             </tr>
-        <?php else: ?>
-            <?php foreach ($fields as $title => $property): ?>
-                <?php if (!empty($track->$property())): ?>
+        <?php else : ?>
+            <?php foreach ($fields as $title => $property) : ?>
+                <?php if (!empty($track->$property())) : ?>
                     <tr>
                         <th class="col label" scope="row"><?= /* @noEscape */ $block->escapeHtml(__($title . ':')) ?></th>
                         <td class="col value"><?= $block->escapeHtml($track->$property()) ?></td>
@@ -75,16 +74,16 @@ $number = is_object($track) ? $track->getTracking() : $track['number'];
                 <?php endif;?>
             <?php endforeach; ?>
 
-            <?php if ($track->getDeliverydate()): ?>
+            <?php if ($track->getDeliverydate()) : ?>
                 <tr>
-                    <th class="col label" scope="row"><?= $block->escapeHtml(__('Delivered on:')) ?></th>
+                    <th class="col label" scope="row"><?= $block->escapeHtml($parentBlock->getDeliveryDateTitle()->getTitle($track)) ?></th>
                     <td class="col value">
                         <?= /* @noEscape */ $parentBlock->formatDeliveryDateTime($track->getDeliverydate(), $track->getDeliverytime()) ?>
                     </td>
                 </tr>
             <?php endif; ?>
         <?php endif; ?>
-    <?php elseif (isset($track['title']) && isset($track['number']) && $track['number']): ?>
+    <?php elseif (isset($track['title']) && isset($track['number']) && $track['number']) : ?>
         <?php /* if the tracking is custom value */ ?>
         <tr>
             <th class="col label" scope="row">
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml
index 188e24ee11515..24658649d0a0c 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml
@@ -3,13 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block \Magento\Shipping\Block\Tracking\Link */ ?>
 <?php $order = $block->getOrder() ?>
-<a href="#" class="action track" title="<?= /* @escapeNotVerified */ $block->getLabel() ?>"
-   data-mage-init='{"popupWindow": {"windowURL":"<?= /* @escapeNotVerified */ $block->getWindowUrl($order) ?>","windowName":"trackorder","width":800,"height":600,"left":0,"top":0,"resizable":1,"scrollbars":1}}'>
-    <span><?= /* @escapeNotVerified */ $block->getLabel() ?></span>
+<a href="#" class="action track" title="<?= $block->escapeHtmlAttr($block->getLabel()) ?>"
+   data-mage-init='{"popupWindow": {
+        "windowURL":"<?= $block->escapeUrl($block->getWindowUrl($order)) ?>",
+        "windowName":"trackorder",
+        "width":800,
+        "height":600,
+        "left":0,
+        "top":0,
+        "resizable":1,
+        "scrollbars":1
+    }}'>
+    <span><?= $block->escapeHtml($block->getLabel()) ?></span>
 </a>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
index eb888595c7f97..ee8a834044aa7 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
@@ -6,20 +6,19 @@
 
 use Magento\Framework\View\Element\Template;
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Shipping\Block\Tracking\Popup */
+//phpcs:disable Magento2.Files.LineLength.MaxExceeded
 
 $results = $block->getTrackingInfo();
 ?>
 <div class="page tracking">
-    <?php if (!empty($results)): ?>
-        <?php foreach ($results as $shipId => $result): ?>
-            <?php if ($shipId): ?>
+    <?php if (!empty($results)) : ?>
+        <?php foreach ($results as $shipId => $result) : ?>
+            <?php if ($shipId) : ?>
                 <div class="order subtitle caption"><?= /* @noEscape */ $block->escapeHtml(__('Shipment #')) . $shipId ?></div>
             <?php endif; ?>
-            <?php if (!empty($result)): ?>
-                <?php foreach ($result as $counter => $track): ?>
+            <?php if (!empty($result)) : ?>
+                <?php foreach ($result as $counter => $track) : ?>
                     <div class="table-wrapper">
                         <?php
                             $shipmentBlockIdentifier = $shipId . '.' . $counter;
@@ -27,12 +26,11 @@ $results = $block->getTrackingInfo();
                                 'track' => $track,
                                 'template' => 'Magento_Shipping::tracking/details.phtml',
                                 'storeSupportEmail' => $block->getStoreSupportEmail()
-                            ]
-                        );
+                            ]);
                         ?>
                         <?= /* @noEscape */ $block->getChildHtml('shipping.tracking.details.' . $shipmentBlockIdentifier) ?>
                     </div>
-                    <?php if (is_object($track) && !empty($track->getProgressdetail())): ?>
+                    <?php if (is_object($track) && !empty($track->getProgressdetail())) : ?>
                         <?php
                             $block->addChild('shipping.tracking.progress.' . $shipmentBlockIdentifier, Template::class, [
                                 'track' => $track,
@@ -42,13 +40,13 @@ $results = $block->getTrackingInfo();
                         <?= /* @noEscape */ $block->getChildHtml('shipping.tracking.progress.' . $shipmentBlockIdentifier) ?>
                     <?php endif; ?>
                 <?php endforeach; ?>
-            <?php else: ?>
+            <?php else : ?>
                 <div class="message info empty">
                     <div><?= $block->escapeHtml(__('There is no tracking available for this shipment.')) ?></div>
                 </div>
             <?php endif; ?>
         <?php endforeach; ?>
-    <?php else: ?>
+    <?php else : ?>
         <div class="message info empty">
             <div><?= $block->escapeHtml(__('There is no tracking available.')) ?></div>
         </div>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
index 237eba09ff802..e15c39367529f 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
@@ -1,10 +1,8 @@
 <?php
 /**
-* Copyright © Magento, Inc. All rights reserved.
-* See COPYING.txt for license details.
-*/
-
-// @codingStandardsIgnoreFile
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 
 /** @var $block \Magento\Framework\View\Element\Template */
 $parentBlock = $block->getParentBlock();
@@ -22,9 +20,13 @@ $track = $block->getData('track');
         </tr>
         </thead>
         <tbody>
-        <?php foreach ($track->getProgressdetail() as $detail): ?>
-            <?php $detailDate = (!empty($detail['deliverydate']) ? $parentBlock->formatDeliveryDate($detail['deliverydate'] . ' ' . $detail['deliverytime']) : ''); ?>
-            <?php $detailTime = (!empty($detail['deliverytime']) ? $parentBlock->formatDeliveryTime($detail['deliverytime'], $detail['deliverydate']) : ''); ?>
+        <?php foreach ($track->getProgressdetail() as $detail) : ?>
+            <?php $detailDate = (!empty($detail['deliverydate']) ?
+                $parentBlock->formatDeliveryDate($detail['deliverydate'] . ' ' . $detail['deliverytime']) :
+                ''); ?>
+            <?php $detailTime = (!empty($detail['deliverytime']) ?
+                $parentBlock->formatDeliveryTime($detail['deliverytime'], $detail['deliverydate']) :
+                ''); ?>
             <tr>
                 <td data-th="<?= $block->escapeHtml(__('Location')) ?>" class="col location">
                     <?= (!empty($detail['deliverylocation']) ? $block->escapeHtml($detail['deliverylocation']) : '') ?>
diff --git a/app/code/Magento/Signifyd/composer.json b/app/code/Magento/Signifyd/composer.json
index 51e290957ec9a..699e51c58d697 100644
--- a/app/code/Magento/Signifyd/composer.json
+++ b/app/code/Magento/Signifyd/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-signifyd",
     "description": "Submitting Case Entry to Signifyd on Order Creation",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-config": "101.0.*",
         "magento/framework": "101.0.*",
         "magento/module-sales": "101.0.*",
@@ -17,7 +17,7 @@
         "magento/module-config": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.5",
     "license": [
         "proprietary"
     ],
diff --git a/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php b/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php
index d1b5fd1df45c4..ff3334dc38531 100644
--- a/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Sitemap\Block\Adminhtml;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Helper\PostHelper;
+
 /**
  * Sitemap edit form container
  *
@@ -19,18 +22,26 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
      */
     protected $_coreRegistry = null;
 
+    /**
+     * @var PostHelper
+     */
+    private $postHelper;
+
     /**
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
+     * @param PostHelper|null $postHelper
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
         \Magento\Framework\Registry $registry,
-        array $data = []
+        array $data = [],
+        PostHelper $postHelper = null
     ) {
         $this->_coreRegistry = $registry;
         parent::__construct($context, $data);
+        $this->postHelper = $postHelper ?: ObjectManager::getInstance()->create(PostHelper::class);
     }
 
     /**
@@ -64,6 +75,30 @@ protected function _construct()
         );
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected function _prepareLayout()
+    {
+        $this->buttonList->update(
+            'delete',
+            '',
+            [
+                'label' => __('Delete'),
+                'class' => 'delete',
+                'onclick' => 'deleteConfirm(\'Are you sure you want to do this?\', \'' .
+                    $this->getDeleteUrl() . '\','.$this->postHelper->getPostData($this->getDeleteUrl()).')',
+                'id' => 'delete',
+                'button_key' => 'delete_button',
+                'region' => 'toolbar',
+                'level' => 0,
+                'sort_order' => 10
+            ]
+        );
+
+        parent::_prepareLayout();
+    }
+
     /**
      * Get edit form container header text
      *
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php
index a885aa30dae5e..fe2b9d5a846a6 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NotFoundException;
 
 class Delete extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
 {
@@ -39,9 +40,15 @@ public function __construct(
      * Delete action
      *
      * @return void
+     * @throws NotFoundException
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         $directory = $this->getFilesystem()->getDirectoryWrite(DirectoryList::ROOT);
         // check if we know what should be deleted
         $id = $this->getRequest()->getParam('sitemap_id');
@@ -53,6 +60,9 @@ public function execute()
                 $sitemap->load($id);
                 // delete file
                 $sitemapPath = $sitemap->getSitemapPath();
+                if ($sitemapPath && $sitemapPath[0] === DIRECTORY_SEPARATOR) {
+                    $sitemapPath = mb_substr($sitemapPath, 1);
+                }
                 $sitemapFilename = $sitemap->getSitemapFilename();
 
                 $path = $directory->getRelativePath($sitemapPath . $sitemapFilename);
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php
index 1e0d1cb248f00..55a04d52aac93 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Save.php
@@ -8,6 +8,7 @@
 use Magento\Backend\App\Action;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Controller;
+use Magento\Framework\Exception\NotFoundException;
 
 class Save extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
 {
@@ -132,9 +133,14 @@ protected function getResult($id)
      * Save action
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         // check if data sent
         $data = $this->getRequest()->getPostValue();
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
index dda1697da7fdf..de2ba3963c61f 100644
--- a/app/code/Magento/Sitemap/Model/Sitemap.php
+++ b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -155,12 +156,11 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
     protected $dateTime;
 
     /**
-     * Model cache tag for clear cache in after save and after delete
+     * @inheritdoc
      *
-     * @var string
      * @since 100.2.0
      */
-    protected $_cacheTag = true;
+    protected $_cacheTag = [Value::CACHE_TAG];
 
     /**
      * Last mode min timestamp value
@@ -275,29 +275,35 @@ public function collectSitemapItems()
         $storeId = $this->getStoreId();
         $this->_storeManager->setCurrentStore($storeId);
 
-        $this->addSitemapItem(new DataObject(
-            [
-                'changefreq' => $helper->getCategoryChangefreq($storeId),
-                'priority' => $helper->getCategoryPriority($storeId),
-                'collection' => $this->_categoryFactory->create()->getCollection($storeId),
-            ]
-        ));
-
-        $this->addSitemapItem(new DataObject(
-            [
-                'changefreq' => $helper->getProductChangefreq($storeId),
-                'priority' => $helper->getProductPriority($storeId),
-                'collection' => $this->_productFactory->create()->getCollection($storeId),
-            ]
-        ));
-
-        $this->addSitemapItem(new DataObject(
-            [
-                'changefreq' => $helper->getPageChangefreq($storeId),
-                'priority' => $helper->getPagePriority($storeId),
-                'collection' => $this->_cmsFactory->create()->getCollection($storeId),
-            ]
-        ));
+        $this->addSitemapItem(
+            new DataObject(
+                [
+                    'changefreq' => $helper->getCategoryChangefreq($storeId),
+                    'priority' => $helper->getCategoryPriority($storeId),
+                    'collection' => $this->_categoryFactory->create()->getCollection($storeId),
+                ]
+            )
+        );
+
+        $this->addSitemapItem(
+            new DataObject(
+                [
+                    'changefreq' => $helper->getProductChangefreq($storeId),
+                    'priority' => $helper->getProductPriority($storeId),
+                    'collection' => $this->_productFactory->create()->getCollection($storeId),
+                ]
+            )
+        );
+
+        $this->addSitemapItem(
+            new DataObject(
+                [
+                    'changefreq' => $helper->getPageChangefreq($storeId),
+                    'priority' => $helper->getPagePriority($storeId),
+                    'collection' => $this->_cmsFactory->create()->getCollection($storeId),
+                ]
+            )
+        );
     }
 
     /**
@@ -505,7 +511,7 @@ protected function _isSplitRequired($row)
     protected function _getSitemapRow($url, $lastmod = null, $changefreq = null, $priority = null, $images = null)
     {
         $url = $this->_getUrl($url);
-        $row = '<loc>' . htmlspecialchars($url) . '</loc>';
+        $row = '<loc>' . $this->_escaper->escapeUrl($url) . '</loc>';
         if ($lastmod) {
             $row .= '<lastmod>' . $this->_getFormattedLastmodDate($lastmod) . '</lastmod>';
         }
@@ -519,17 +525,17 @@ protected function _getSitemapRow($url, $lastmod = null, $changefreq = null, $pr
             // Add Images to sitemap
             foreach ($images->getCollection() as $image) {
                 $row .= '<image:image>';
-                $row .= '<image:loc>' . htmlspecialchars($image->getUrl()) . '</image:loc>';
-                $row .= '<image:title>' . htmlspecialchars($images->getTitle()) . '</image:title>';
+                $row .= '<image:loc>' . $this->_escaper->escapeUrl($image->getUrl()) . '</image:loc>';
+                $row .= '<image:title>' . $this->_escaper->escapeHtml($images->getTitle()) . '</image:title>';
                 if ($image->getCaption()) {
-                    $row .= '<image:caption>' . htmlspecialchars($image->getCaption()) . '</image:caption>';
+                    $row .= '<image:caption>' . $this->_escaper->escapeHtml($image->getCaption()) . '</image:caption>';
                 }
                 $row .= '</image:image>';
             }
             // Add PageMap image for Google web search
             $row .= '<PageMap xmlns="http://www.google.com/schemas/sitemap-pagemap/1.0"><DataObject type="thumbnail">';
-            $row .= '<Attribute name="name" value="' . htmlspecialchars($images->getTitle()) . '"/>';
-            $row .= '<Attribute name="src" value="' . htmlspecialchars($images->getThumbnail()) . '"/>';
+            $row .= '<Attribute name="name" value="' . $this->_escaper->escapeHtml($images->getTitle()) . '"/>';
+            $row .= '<Attribute name="src" value="' . $this->_escaper->escapeUrl($images->getThumbnail()) . '"/>';
             $row .= '</DataObject></PageMap>';
         }
 
@@ -546,7 +552,7 @@ protected function _getSitemapRow($url, $lastmod = null, $changefreq = null, $pr
     protected function _getSitemapIndexRow($sitemapFilename, $lastmod = null)
     {
         $url = $this->getSitemapUrl($this->getSitemapPath(), $sitemapFilename);
-        $row = '<loc>' . htmlspecialchars($url) . '</loc>';
+        $row = '<loc>' . $this->_escaper->escapeUrl($url) . '</loc>';
         if ($lastmod) {
             $row .= '<lastmod>' . $this->_getFormattedLastmodDate($lastmod) . '</lastmod>';
         }
@@ -688,6 +694,7 @@ protected function _getFormattedLastmodDate($date)
      */
     protected function _getDocumentRoot()
     {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         return realpath($this->_request->getServer('DOCUMENT_ROOT'));
     }
 
@@ -698,6 +705,7 @@ protected function _getDocumentRoot()
      */
     protected function _getStoreBaseDomain()
     {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $storeParsedUrl = parse_url($this->_getStoreBaseUrl());
         $url = $storeParsedUrl['scheme'] . '://' . $storeParsedUrl['host'];
 
diff --git a/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/DeleteTest.php b/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/DeleteTest.php
index ed004fe88b318..6ac9ba2d91af9 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/DeleteTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/DeleteTest.php
@@ -49,7 +49,7 @@ protected function setUp()
             ->getMock();
         $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
             ->disableOriginalConstructor()
-            ->setMethods([])
+            ->setMethods(['isPost'])
             ->getMockForAbstractClass();
         $this->responseMock = $this->getMockBuilder(\Magento\Framework\App\ResponseInterface::class)
             ->disableOriginalConstructor()
@@ -81,6 +81,7 @@ public function testExecuteWithoutSitemapId()
             ->getMockForAbstractClass();
         $this->filesystemMock->expects($this->any())->method('getDirectoryWrite')->willReturn($writeDirectoryMock);
         $this->requestMock->expects($this->any())->method('getParam')->with('sitemap_id')->willReturn(0);
+        $this->requestMock->expects($this->any())->method('isPost')->willReturn(true);
         $this->responseMock->expects($this->once())->method('setRedirect');
         $this->messageManagerMock->expects($this->any())
             ->method('addError')
@@ -97,6 +98,7 @@ public function testExecuteCannotFindSitemap()
             ->getMockForAbstractClass();
         $this->filesystemMock->expects($this->any())->method('getDirectoryWrite')->willReturn($writeDirectoryMock);
         $this->requestMock->expects($this->any())->method('getParam')->with('sitemap_id')->willReturn($id);
+        $this->requestMock->expects($this->any())->method('isPost')->willReturn(true);
 
         $sitemapMock = $this->getMockBuilder(\Magento\Sitemap\Model\Sitemap::class)
             ->disableOriginalConstructor()
@@ -123,6 +125,7 @@ public function testExecute()
             ->getMockForAbstractClass();
         $this->filesystemMock->expects($this->any())->method('getDirectoryWrite')->willReturn($writeDirectoryMock);
         $this->requestMock->expects($this->any())->method('getParam')->with('sitemap_id')->willReturn($id);
+        $this->requestMock->expects($this->any())->method('isPost')->willReturn(true);
 
         $sitemapMock = $this->getMockBuilder(\Magento\Sitemap\Model\Sitemap::class)
             ->disableOriginalConstructor()
@@ -135,7 +138,7 @@ public function testExecute()
         $this->sitemapFactoryMock->expects($this->once())->method('create')->willReturn($sitemapMock);
         $writeDirectoryMock->expects($this->any())
             ->method('getRelativePath')
-            ->with($sitemapPath . $sitemapFilename)
+            ->with($sitemapFilename)
             ->willReturn($relativePath);
         $writeDirectoryMock->expects($this->once())->method('isFile')->with($relativePath)->willReturn(true);
         $writeDirectoryMock->expects($this->once())->method('delete')->with($relativePath)->willReturn(true);
diff --git a/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php b/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php
index f77954101df7c..e540f5a9c382f 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php
@@ -54,7 +54,7 @@ protected function setUp()
     {
         $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getPostValue'])
+            ->setMethods(['getPostValue', 'isPost'])
             ->getMockForAbstractClass();
         $this->resultRedirectMock = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
             ->disableOriginalConstructor()
@@ -95,6 +95,8 @@ public function testSaveEmptyDataShouldRedirectToDefault()
         $this->requestMock->expects($this->once())
             ->method('getPostValue')
             ->willReturn([]);
+        $this->requestMock->expects($this->any())
+            ->method('isPost')->willReturn(true);
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
             ->with('adminhtml/*/')
@@ -116,6 +118,8 @@ public function testTryToSaveInvalidDataShouldFailWithErrors()
         $this->requestMock->expects($this->once())
             ->method('getPostValue')
             ->willReturn($data);
+        $this->requestMock->expects($this->any())
+            ->method('isPost')->willReturn(true);
         $this->requestMock->expects($this->once())
             ->method('getParam')
             ->with('sitemap_id')
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
index 5036c63fd87fe..e6676511b8882 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
@@ -160,7 +160,7 @@ public function testNotAllowedPath()
      * Check not exists sitemap path validation
      *
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Please create the specified folder "" before saving the sitemap.
+     * @expectedExceptionMessage Please create the specified folder "/" before saving the sitemap.
      */
     public function testPathNotExists()
     {
@@ -637,6 +637,9 @@ protected function _getModelConstructorArgs()
             ->getMockForAbstractClass();
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $escaper = $objectManager->getObject(
+            \Magento\Framework\Escaper::class
+        );
         $constructArguments = $objectManager->getConstructArguments(
             \Magento\Sitemap\Model\Sitemap::class,
             [
@@ -645,7 +648,8 @@ protected function _getModelConstructorArgs()
                 'cmsFactory' => $cmsFactory,
                 'storeManager' => $this->storeManagerMock,
                 'sitemapData' => $this->_helperMockSitemap,
-                'filesystem' => $this->_filesystemMock
+                'filesystem' => $this->_filesystemMock,
+                'escaper' => $escaper
             ]
         );
         $constructArguments['resource'] = null;
diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json
index cda61e63e35cf..e3dfbe7c12173 100644
--- a/app/code/Magento/Sitemap/composer.json
+++ b/app/code/Magento/Sitemap/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-sitemap",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-catalog": "102.0.*",
         "magento/module-eav": "101.0.*",
@@ -18,7 +18,7 @@
         "magento/module-config": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.5",
+    "version": "100.2.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Store/Api/Data/WebsiteInterface.php b/app/code/Magento/Store/Api/Data/WebsiteInterface.php
index 176e82f5905b5..fae9fa368d3d1 100644
--- a/app/code/Magento/Store/Api/Data/WebsiteInterface.php
+++ b/app/code/Magento/Store/Api/Data/WebsiteInterface.php
@@ -13,6 +13,11 @@
  */
 interface WebsiteInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
+    /**
+     * Contains code of admin website
+     */
+    const ADMIN_CODE = 'admin';
+
     /**
      * @return int
      */
diff --git a/app/code/Magento/Store/Model/ResourceModel/Website/Grid/Collection.php b/app/code/Magento/Store/Model/ResourceModel/Website/Grid/Collection.php
index e42b226653b44..259d41381170d 100644
--- a/app/code/Magento/Store/Model/ResourceModel/Website/Grid/Collection.php
+++ b/app/code/Magento/Store/Model/ResourceModel/Website/Grid/Collection.php
@@ -10,6 +10,18 @@
  */
 class Collection extends \Magento\Store\Model\ResourceModel\Website\Collection
 {
+    /**
+     * @inheritdoc
+     */
+    protected function _construct()
+    {
+        parent::_construct();
+
+        $this->_map['fields']['store_title'] = 'store_table.name';
+        $this->_map['fields']['group_title'] = 'group_table.name';
+        $this->_map['fields']['name'] = 'main_table.name';
+    }
+
     /**
      * Join website and store names
      *
@@ -21,4 +33,37 @@ protected function _initSelect()
         $this->joinGroupAndStore();
         return $this;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function load($printQuery = false, $logQuery = false)
+    {
+        if ($this->isLoaded()) {
+            return $this;
+        }
+
+        return $this->loadWithFilter($printQuery, $logQuery);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function joinGroupAndStore()
+    {
+        if (!$this->getFlag('groups_and_stores_joined')) {
+            $this->_idFieldName = 'website_group_store';
+            $this->getSelect()->joinLeft(
+                ['group_table' => $this->getTable('store_group')],
+                'main_table.website_id = group_table.website_id',
+                ['group_id' => 'group_id', 'group_title' => 'name', 'group_code' => 'code']
+            )->joinLeft(
+                ['store_table' => $this->getTable('store')],
+                'group_table.group_id = store_table.group_id',
+                ['store_id' => 'store_id', 'store_title' => 'name', 'store_code' => 'code']
+            );
+        }
+
+        return $this;
+    }
 }
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index 1203f748c0615..6807ca8311822 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -888,7 +888,10 @@ public function setCurrentCurrencyCode($code)
         if (in_array($code, $this->getAvailableCurrencyCodes())) {
             $this->_getSession()->setCurrencyCode($code);
 
-            $defaultCode = $this->_storeManager->getWebsite()->getDefaultStore()->getDefaultCurrency()->getCode();
+            $defaultCode = ($this->_storeManager->getStore() !== null)
+                ? $this->_storeManager->getStore()->getDefaultCurrency()->getCode()
+                : $this->_storeManager->getWebsite()->getDefaultStore()->getDefaultCurrency()->getCode();
+
             $this->_httpContext->setValue(Context::CONTEXT_CURRENCY, $code, $defaultCode);
         }
         return $this;
@@ -1328,12 +1331,14 @@ public function getIdentities()
     }
 
     /**
+     * Return Store Path
+     *
      * @return string
      */
     public function getStorePath()
     {
         $parsedUrl = parse_url($this->getBaseUrl());
-        return isset($parsedUrl['path']) ? $parsedUrl['path'] : '/';
+        return $parsedUrl['path'] ?? '/';
     }
 
     /**
diff --git a/app/code/Magento/Store/Model/StoreResolver/Website.php b/app/code/Magento/Store/Model/StoreResolver/Website.php
index 29f85716fea29..d4bb990307f1e 100644
--- a/app/code/Magento/Store/Model/StoreResolver/Website.php
+++ b/app/code/Magento/Store/Model/StoreResolver/Website.php
@@ -45,8 +45,10 @@ public function getAllowedStoreIds($scopeCode)
         $stores = [];
         $website = $scopeCode ? $this->websiteRepository->get($scopeCode) : $this->websiteRepository->getDefault();
         foreach ($this->storeRepository->getList() as $store) {
-            if ($store->isActive() && $store->getWebsiteId() == $website->getId()) {
-                $stores[] = $store->getId();
+            if ($store->isActive()) {
+                if (!$scopeCode || ($store->getWebsiteId() === $website->getId())) {
+                    $stores[] = $store->getId();
+                }
             }
         }
         return $stores;
diff --git a/app/code/Magento/Store/Model/WebsiteRepository.php b/app/code/Magento/Store/Model/WebsiteRepository.php
index 94fd59c7634df..1b12164e42cee 100644
--- a/app/code/Magento/Store/Model/WebsiteRepository.php
+++ b/app/code/Magento/Store/Model/WebsiteRepository.php
@@ -77,7 +77,14 @@ public function get($code)
         ]);
 
         if ($website->getId() === null) {
-            throw new NoSuchEntityException();
+            throw new NoSuchEntityException(
+                __(
+                    sprintf(
+                        "The website with code %s that was requested wasn't found. Verify the website and try again.",
+                        $code
+                    )
+                )
+            );
         }
         $this->entities[$code] = $website;
         $this->entitiesById[$website->getId()] = $website;
@@ -99,7 +106,14 @@ public function getById($id)
         ]);
 
         if ($website->getId() === null) {
-            throw new NoSuchEntityException();
+            throw new NoSuchEntityException(
+                __(
+                    sprintf(
+                        "The website with id %s that was requested wasn't found. Verify the website and try again.",
+                        $id
+                    )
+                )
+            );
         }
         $this->entities[$website->getCode()] = $website;
         $this->entitiesById[$id] = $website;
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
index f241531f61ffd..0b9676b14b776 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
@@ -22,7 +22,7 @@
         <fillField selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" userInput="{{storeGroupCode}}" stepKey="enterStoreGroupCode" />
         <selectOption selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="Default Category" stepKey="chooseRootCategory" />
         <click selector="{{AdminStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
-        <waitForElementVisible selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="waitForStoreGridReload"/>
+        <waitForElementVisible selector="{{AdminStoresGridFilterSection.filters}}" stepKey="waitForStoreGridReload"/>
         <see userInput="You saved the store." stepKey="seeSavedMessage" />
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
index 6fdfb2566fee9..2f541feacd9c2 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 <!-- Test XML Example -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminCreateStoreViewActionGroup">
         <arguments>
             <argument name="storeGroup" defaultValue="_defaultStoreGroup"/>
@@ -24,7 +24,17 @@
         <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
         <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning" />
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal" />
-        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReolad"/>
-        <see userInput="You saved the store view." stepKey="seeSavedMessage" />
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForPageReolad"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the store view." stepKey="seeSavedMessage" />
+    </actionGroup>
+    <actionGroup name="AdminCreateStoreViewUseStringArgumentsActionGroup" extends="AdminCreateStoreViewActionGroup">
+        <arguments>
+            <argument name="storeGroupName" type="string"/>
+            <argument name="customStoreName" type="string"/>
+            <argument name="customStoreCode" type="string"/>
+        </arguments>
+        <selectOption selector="{{AdminNewStoreSection.storeGrpDropdown}}" userInput="{{storeGroupName}}" stepKey="selectStore" />
+        <fillField selector="{{AdminNewStoreSection.storeNameTextField}}" userInput="{{customStoreName}}" stepKey="enterStoreViewName" />
+        <fillField selector="{{AdminNewStoreSection.storeCodeTextField}}" userInput="{{customStoreCode}}" stepKey="enterStoreViewCode" />
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
index 9361c7d942c67..10303684e19d5 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
@@ -20,7 +20,21 @@
         <fillField selector="{{AdminNewWebsiteSection.name}}" userInput="{{newWebsiteName}}" stepKey="enterWebsiteName" />
         <fillField selector="{{AdminNewWebsiteSection.code}}" userInput="{{websiteCode}}" stepKey="enterWebsiteCode" />
         <click selector="{{AdminNewWebsiteActionsSection.saveWebsite}}" stepKey="clickSaveWebsite" />
-        <waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload"/>
+        <waitForElementVisible selector="{{AdminStoresGridFilterSection.filters}}" stepKey="waitForStoreGridToReload"/>
         <see userInput="You saved the website." stepKey="seeSavedMessage" />
     </actionGroup>
+
+    <!--Get Website_id-->
+    <actionGroup name="AdminGetWebsiteIdActionGroup">
+        <arguments>
+            <argument name="website"/>
+        </arguments>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnTheStorePage"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
+        <fillField selector="{{AdminStoresGridSection.websiteFilterTextField}}" userInput="{{website.name}}" stepKey="fillSearchWebsiteField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton" />
+        <see selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" userInput="{{website.name}}" stepKey="verifyThatCorrectWebsiteFound"/>
+        <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingWebsite"/>
+        <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabFromCurrentUrl"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
index c32953540a77a..77473ae235c4a 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
@@ -7,16 +7,19 @@
 -->
 <!-- Test XML Example -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminDeleteStoreViewActionGroup">
         <arguments>
             <argument name="customStore" defaultValue="customStore"/>
         </arguments>
         <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToStoresIndex"/>
         <waitForPageLoad stepKey="waitStoreIndexPageLoad" />
-        <fillField selector="{{AdminStoresGridSection.storeFilterTextField}}" userInput="{{customStore.name}}" stepKey="fillStoreViewFilterField"/>
-        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearch"/>
-        <click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickStoreViewInGrid"/>
+        <conditionalClick selector="{{AdminStoresGridFilterSection.clearFilters}}" dependentSelector="{{AdminStoresGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminStoresGridFilterSection.filters}}" stepKey="openStoresFilters"/>
+        <fillField selector="{{AdminStoresGridFilterSection.storeViewFilter}}" userInput="{{customStore.name}}" stepKey="fillStoreViewFilterField"/>
+        <click selector="{{AdminStoresGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
+        <click selector="{{AdminStoresGridSection.storeViewInFirstRow}}" stepKey="clickStoreViewInGrid"/>
         <waitForPageLoad stepKey="waitForStoreViewPage"/>
         <click selector="{{AdminNewStoreViewActionsSection.delete}}" stepKey="clickDeleteStoreView"/>
         <selectOption selector="{{AdminStoreBackupOptionsSection.createBackupSelect}}" userInput="No" stepKey="dontCreateDbBackup"/>
@@ -25,4 +28,10 @@
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreDelete"/>
         <see userInput="You deleted the store view." stepKey="seeDeleteMessage"/>
     </actionGroup>
+    <actionGroup name="AdminDeleteStoreViewUseStringArgumentsActionGroup" extends="AdminDeleteStoreViewActionGroup">
+        <arguments>
+            <argument name="customStoreName" type="string"/>
+        </arguments>
+        <fillField selector="{{AdminStoresGridFilterSection.storeViewFilter}}" userInput="{{customStoreName}}" stepKey="fillStoreViewFilterField"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml
index 558205bbc8071..e809f09565fd6 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml
@@ -12,16 +12,19 @@
             <argument name="websiteName" type="string"/>
         </arguments>
         <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
-        <fillField userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillSearchWebsiteField"/>
-        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
-        <see userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="verifyThatCorrectWebsiteFound"/>
-        <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
+        <conditionalClick selector="{{AdminStoresGridFilterSection.clearFilters}}" dependentSelector="{{AdminStoresGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminStoresGridFilterSection.filters}}" stepKey="openStoresFilters"/>
+        <fillField selector="{{AdminStoresGridFilterSection.websiteFilter}}" userInput="{{websiteName}}" stepKey="fillWebsiteFilter"/>
+        <click selector="{{AdminStoresGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
+        <see userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteInFirstRow}}" stepKey="verifyThatCorrectWebsiteFound"/>
+        <click selector="{{AdminStoresGridSection.websiteInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
         <waitForPageLoad stepKey="waitForStoreToLoad"/>
         <click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteWebsiteButtonOnEditWebsitePage"/>
         <selectOption userInput="No" selector="{{AdminStoresDeleteStoreGroupSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
         <click selector="{{AdminStoresDeleteStoreGroupSection.deleteStoreGroupButton}}" stepKey="clickDeleteWebsiteButton"/>
-        <waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload"/>
+        <waitForElementVisible selector="{{AdminStoresGridFilterSection.filters}}" stepKey="waitForStoreGridToReload"/>
         <see userInput="You deleted the website." stepKey="seeSavedMessage"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoresFilterGridActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoresFilterGridActionGroup.xml
new file mode 100644
index 0000000000000..2ccfc0dcc1277
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoresFilterGridActionGroup.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="filterStoresGridByWebsite">
+        <arguments>
+            <argument name="website" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{AdminStoresGridFilterSection.clearFilters}}" dependentSelector="{{AdminStoresGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminStoresGridFilterSection.filters}}" stepKey="openStoresFilters"/>
+        <fillField selector="{{AdminStoresGridFilterSection.websiteFilter}}" userInput="{{website}}" stepKey="fillWebsiteFilter"/>
+        <click selector="{{AdminStoresGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
+    </actionGroup>
+
+    <actionGroup name="filterStoresGridByStore">
+        <arguments>
+            <argument name="store" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{AdminStoresGridFilterSection.clearFilters}}" dependentSelector="{{AdminStoresGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminStoresGridFilterSection.filters}}" stepKey="openStoresFilters"/>
+        <fillField selector="{{AdminStoresGridFilterSection.storeFilter}}" userInput="{{store}}" stepKey="fillStoreFilter"/>
+        <click selector="{{AdminStoresGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
+    </actionGroup>
+
+    <actionGroup name="filterStoresGridByStoreView">
+        <arguments>
+            <argument name="storeView" type="string"/>
+        </arguments>
+        <conditionalClick selector="{{AdminStoresGridFilterSection.clearFilters}}" dependentSelector="{{AdminStoresGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminStoresGridFilterSection.filters}}" stepKey="openStoresFilters"/>
+        <fillField selector="{{AdminStoresGridFilterSection.storeViewFilter}}" userInput="{{storeView}}" stepKey="fillStoreViewFilter"/>
+        <click selector="{{AdminStoresGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoresOpenByNameActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoresOpenByNameActionGroup.xml
new file mode 100644
index 0000000000000..2d94aff9e117c
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoresOpenByNameActionGroup.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Test XML Example -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminOpenStoreViewByNameActionGroup" extends="filterStoresGridByStoreView">
+        <amOnPage url="{{AdminSystemStorePage.url}}" before="clickClearFilters" stepKey="amOnAdminSystemStorePage"/>
+        <!--Open store view page-->
+        <see selector="{{AdminStoresGridSection.storeViewInFirstRow}}" userInput="{{storeView}}" after="waitForGridLoad" stepKey="seeAssertStoreViewInGridMessage"/>
+        <click selector="{{AdminStoresGridSection.storeViewInFirstRow}}" stepKey="clickStoreViewFirstRowInGrid"/>
+        <waitForPageLoad stepKey="waitForAdminSystemStoreViewPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml
new file mode 100644
index 0000000000000..3ca45a5a378fd
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminSwitchBaseActionGroup">
+        <arguments>
+            <argument name="scopeName" defaultValue="customStore.name"/>
+        </arguments>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click selector="{{AdminMainActionsSection.storeViewDropdown}}" stepKey="clickScopeSwitchDropdown"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitingForInformationModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmScopeSwitch"/>
+        <waitForPageLoad stepKey="waitForScopeSwitched"/>
+        <scrollToTopOfPage stepKey="scrollToStoreSwitcher"/>
+        <see userInput="{{scopeName}}" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewScopeName"/>
+    </actionGroup>
+
+    <actionGroup name="AdminSwitchStoreViewActionGroup" extends="AdminSwitchBaseActionGroup">
+        <waitForElementVisible selector="{{AdminMainActionsSection.storeViewByName(scopeName)}}" after="clickScopeSwitchDropdown" stepKey="waitForStoreViewNameIsVisible"/>
+        <click selector="{{AdminMainActionsSection.storeViewByName(scopeName)}}" after="waitForStoreViewNameIsVisible" stepKey="clickStoreViewByName"/>
+    </actionGroup>
+
+    <actionGroup name="AdminSwitchWebsiteActionGroup" extends="AdminSwitchBaseActionGroup">
+        <waitForElementVisible selector="{{AdminMainActionsSection.websiteByName(scopeName)}}" after="clickScopeSwitchDropdown" stepKey="waitForWebsiteNameIsVisible"/>
+        <click selector="{{AdminMainActionsSection.websiteByName(scopeName)}}" after="waitForWebsiteNameIsVisible" stepKey="clickStoreViewByName"/>
+    </actionGroup>
+
+    <actionGroup name="AdminSwitchToAllStoreViewActionGroup" extends="AdminSwitchBaseActionGroup">
+        <click selector="{{AdminMainActionsSection.allStoreViews}}" after="clickScopeSwitchDropdown" stepKey="clickStoreViewByName"/>
+        <see selector="{{AdminMainActionsSection.storeSwitcher}}" userInput="{{scopeName}}" after="clickStoreViewByName" stepKey="seeNewStoreViewName"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchWebsiteByNameActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchWebsiteByNameActionGroup.xml
new file mode 100644
index 0000000000000..6f560a3e84451
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchWebsiteByNameActionGroup.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="AdminSwitchWebsiteByNameActionGroup">
+        <arguments>
+            <argument name="website"/>
+        </arguments>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click selector="{{AdminMainActionsSection.storeViewDropdown}}" stepKey="clickWebsiteSwitchDropdown"/>
+        <waitForElementVisible selector="{{AdminMainActionsSection.websiteByName('Main Website')}}" stepKey="waitForWebsiteAreVisible"/>
+        <click selector="{{AdminMainActionsSection.websiteByName(website.name)}}" stepKey="clickWebsiteByName"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitingForInformationModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreSwitch"/>
+        <see userInput="{{website.name}}" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewWebsiteName"/>
+    </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 7c18ca5375c93..d35cf13890114 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml
@@ -13,11 +13,12 @@
             <argument name="storeGroupName" defaultValue="customStoreGroup.name"/>
         </arguments>
         <amOnPage stepKey="amOnAdminSystemStorePage"  url="{{AdminSystemStorePage.url}}"/>
-        <click stepKey="resetSearchFilter" selector="{{AdminStoresGridSection.resetButton}}"/>
-        <fillField stepKey="fillSearchStoreGroupField" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="{{storeGroupName}}"/>
-        <click stepKey="clickSearchButton" selector="{{AdminStoresGridSection.searchButton}}"/>
-        <see stepKey="verifyThatCorrectStoreGroupFound" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" userInput="{{storeGroupName}}"/>
-        <click stepKey="clickEditExistingStoreRow" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}"/>
+        <conditionalClick stepKey="resetSearchFilter" selector="{{AdminStoresGridFilterSection.clearAll}}" dependentSelector="{{AdminStoresGridFilterSection.clearAll}}" visible="true"/>
+        <click selector="{{AdminStoresGridFilterSection.filters}}" stepKey="openStoresFilters"/>
+        <fillField stepKey="fillSearchStoreGroupField" selector="{{AdminStoresGridFilterSection.storeFilter}}" userInput="{{storeGroupName}}"/>
+        <click stepKey="clickSearchButton" selector="{{AdminStoresGridFilterSection.applyFilters}}"/>
+        <see stepKey="verifyThatCorrectStoreGroupFound" selector="{{AdminStoresGridSection.storeInFirstRow}}" userInput="{{storeGroupName}}"/>
+        <click stepKey="clickEditExistingStoreRow" selector="{{AdminStoresGridSection.storeInFirstRow}}"/>
         <waitForPageLoad stepKey="waitForStoreToLoad"/>
         <click stepKey="clickDeleteStoreGroupButtonOnEditStorePage" selector="{{AdminStoresMainActionsSection.deleteButton}}"/>
         <selectOption stepKey="setCreateDbBackupToNo" selector="{{AdminStoresDeleteStoreGroupSection.createDbBackup}}" userInput="No"/>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
new file mode 100644
index 0000000000000..c62ed55c7df49
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.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="StorefrontSwitchStoreViewActionGroup">
+        <arguments>
+            <argument name="storeView" defaultValue="customStore"/>
+        </arguments>
+        <click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher"/>
+        <waitForElementVisible selector="{{StorefrontHeaderSection.storeViewDropdown}}" stepKey="waitForStoreViewDropdown"/>
+        <click selector="{{StorefrontHeaderSection.storeViewOption(storeView.code)}}" stepKey="clickSelectStoreView"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/ProductWebsiteLinkData.xml b/app/code/Magento/Store/Test/Mftf/Data/ProductWebsiteLinkData.xml
new file mode 100644
index 0000000000000..8e84b84c8aa49
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Data/ProductWebsiteLinkData.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ProductAssignToWebsite" type="product_website_link">
+        <var key="sku" entityKey="sku" entityType="product"/>
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
index f85125bcf3291..61146f186923e 100644
--- a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="_defaultStore" type="store">
         <data key="name">Default Store View</data>
         <data key="code">default</data>
@@ -39,6 +39,42 @@
         <data key="store_type">store</data>
         <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
     </entity>
+    <entity name="CustomStoreENNotUnique" type="store">
+        <data key="name">EN</data>
+        <data key="code">en</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_action">add</data>
+        <data key="store_type">store</data>
+        <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
+    </entity>
+    <entity name="CustomStoreNLNotUnique" type="store">
+        <data key="name">NL</data>
+        <data key="code">nl</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_action">add</data>
+        <data key="store_type">store</data>
+        <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
+    </entity>
+    <entity name="CustomStoreENNotUnique" type="store">
+        <data key="name">EN</data>
+        <data key="code">en</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_action">add</data>
+        <data key="store_type">store</data>
+        <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
+    </entity>
+    <entity name="CustomStoreNLNotUnique" type="store">
+        <data key="name">NL</data>
+        <data key="code">nl</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_action">add</data>
+        <data key="store_type">store</data>
+        <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
+    </entity>
     <entity name="secondStore" type="store">
         <data key="name">Second Store View</data>
         <data key="code">second_store_view</data>
@@ -66,4 +102,9 @@
         <data key="store_type">group</data>
         <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
     </entity>
+    <entity name="AllStoreViews" type="store">
+        <data key="name">All Store Views</data>
+        <data key="code">allstoreviews</data>
+        <data key="is_active">1</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreShippingMethodsData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreShippingMethodsData.xml
new file mode 100644
index 0000000000000..413540a8f4c12
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreShippingMethodsData.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="FreeShippingMethodWithMinimumOrderAmount90" type="free_shipping_config_state">
+        <requiredEntity type="active">Active</requiredEntity>
+        <requiredEntity type="free_shipping_subtotal">Price</requiredEntity>
+    </entity>
+    <entity name="Active" type="active">
+        <data key="value">1</data>
+    </entity>
+    <entity name="Price" type="free_shipping_subtotal">
+        <data key="value">90</data>
+    </entity>
+
+    <entity name="ResetFreeShippingMethodWithMinimumOrderAmount90" type="free_shipping_config_state">
+        <requiredEntity type="free_shipping_subtotal">DefaultPrice</requiredEntity>
+        <requiredEntity type="active">DefaultActive</requiredEntity>
+    </entity>
+    <entity name="DefaultPrice" type="free_shipping_subtotal">
+        <data key="value">0</data>
+    </entity>
+    <entity name="DefaultActive" type="active">
+        <requiredEntity type="active_inherit">DefaultFreeShipping</requiredEntity>
+    </entity>
+    <entity name="DefaultFreeShipping" type="active_inherit">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml b/app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml
index 22c5d747748cd..1403175dcb7f1 100644
--- a/app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml
+++ b/app/code/Magento/Store/Test/Mftf/Data/WebsiteData.xml
@@ -16,6 +16,9 @@
         <data key="name" unique="suffix">website</data>
         <data key="code" unique="suffix">website</data>
         <data key="sort_order">2</data>
+        <data key="store_action">add</data>
+        <data key="store_type">website</data>
+        <data key="website_id">null</data>
     </entity>
     <entity name="SecondWebsite" type="website">
         <data key="name" unique="suffix">Second Website </data>
diff --git a/app/code/Magento/Store/Test/Mftf/Metadata/product_website_link-meta.xml b/app/code/Magento/Store/Test/Mftf/Metadata/product_website_link-meta.xml
new file mode 100644
index 0000000000000..ca0725f86c289
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Metadata/product_website_link-meta.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="ProductWebsiteLink" dataType="product_website_link" type="create" auth="adminOauth" url="/V1/products/{sku}/websites" method="POST">
+        <contentType>application/json</contentType>
+        <object dataType="product_website_link" key="productWebsiteLink">
+            <field key="sku">string</field>
+            <field key="websiteId">integer</field>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Store/Test/Mftf/Metadata/store_shipping_methods-meta.xml b/app/code/Magento/Store/Test/Mftf/Metadata/store_shipping_methods-meta.xml
new file mode 100644
index 0000000000000..32aa22fecf9cd
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Metadata/store_shipping_methods-meta.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="ChangeFreeShippingConfiguration" dataType="free_shipping_config_state" type="create" auth="adminFormKey"
+               url="/admin/system_config/save/section/carriers/" method="POST" successRegex="/messages-message-success/">
+        <object key="groups" dataType="free_shipping_config_state">
+            <object key="freeshipping" dataType="free_shipping_config_state">
+                <object key="fields" dataType="free_shipping_config_state">
+                    <object key="active" dataType="active">
+                        <field key="value">string</field>
+                        <object key="inherit" dataType="active_inherit">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="free_shipping_subtotal" dataType="free_shipping_subtotal">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Store/Test/Mftf/Page/StorefrontStoreHomePage.xml b/app/code/Magento/Store/Test/Mftf/Page/StorefrontStoreHomePage.xml
new file mode 100644
index 0000000000000..0cf1cffceac71
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Page/StorefrontStoreHomePage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontStoreHomePage" url="/{{store_view}}/" area="storefront" module="Magento_Store" parameterized="true">
+        <section name="StorefrontHeaderSection"/>
+    </page>
+</pages>
\ No newline at end of file
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
index 14429c298b5e5..14160835af3e1 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
@@ -7,10 +7,12 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminMainActionsSection">
         <element name="storeSwitcher" type="text" selector=".store-switcher"/>
         <element name="storeViewDropdown" type="button" selector="#store-change-button"/>
-        <element name="storeViewByName" type="button" selector="//*[@class='store-switcher-store-view  ']/a[contains(text(), '{{storeViewName}}')]" timeout="30" parameterized="true"/>
+        <element name="storeViewByName" type="button" selector="//*[contains(@class,'store-switcher-store-view')]/*[contains(text(), '{{storeViewName}}')]" timeout="30" parameterized="true"/>
+        <element name="websiteByName" type="button" selector="//*[@class='store-switcher-website  ']/a[contains(text(), '{{websiteName}}')]" timeout="30" parameterized="true"/>
+        <element name="allStoreViews" type="button" selector=".store-switcher .store-switcher-all" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
index a3b5d1e616319..faffc69dc6975 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminNewStoreViewActionsSection">
         <element name="backButton" type="button" selector="#back" timeout="30"/>
         <element name="delete" type="button" selector="#delete" timeout="30"/>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridFilterSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridFilterSection.xml
new file mode 100644
index 0000000000000..45028b3af1ade
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridFilterSection.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminStoresGridFilterSection">
+        <element name="filters" type="button" selector="button[data-action='grid-filter-expand']"/>
+        <element name="clearAll" type="button" selector=".admin__data-grid-header .admin__data-grid-filters-current._show .action-clear" timeout="30"/>
+        <element name="columnsDropdown" type="button" selector=".admin__data-grid-action-columns button.admin__action-dropdown"/>
+        <element name="viewColumnOption" type="checkbox" selector="//div[contains(@class, '_active')]//div[contains(@class, 'admin__data-grid-action-columns-menu')]//div[@class='admin__field-option']//label[text()='{{col}}']/preceding-sibling::input" parameterized="true"/>
+        <element name="clearFilters" type="button" selector=".admin__data-grid-header button[data-action='grid-filter-reset']" timeout="30"/>
+        <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
+        <element name="websiteFilter" type="input" selector="input.admin__control-text[name='name']"/>
+        <element name="storeFilter" type="input" selector="input.admin__control-text[name='group_title']"/>
+        <element name="storeViewFilter" type="input" selector="input.admin__control-text[name='store_title']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
index d0a67b18f6cd5..5e2128a4231a4 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
@@ -7,13 +7,8 @@
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminStoresGridSection">
-        <element name="storeGrpFilterTextField" type="input" selector="#storeGrid_filter_group_title"/>
-        <element name="websiteFilterTextField" type="input" selector="#storeGrid_filter_website_title"/>
-        <element name="storeFilterTextField" type="input" selector="#storeGrid_filter_store_title"/>
-        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
-        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
-        <element name="websiteNameInFirstRow" type="text" selector=".col-website_title>a"/>
-        <element name="storeGrpNameInFirstRow" type="text" selector=".col-group_title>a"/>
-        <element name="storeNameInFirstRow" type="text" selector=".col-store_title>a"/>
+        <element name="websiteInFirstRow" type="text" selector=".data-row[data-repeat-index='0'] td:nth-of-type(1) a"/>
+        <element name="storeInFirstRow" type="text" selector=".data-row[data-repeat-index='0'] td:nth-of-type(2) a"/>
+        <element name="storeViewInFirstRow" type="text" selector=".data-row[data-repeat-index='0'] td:nth-of-type(3) a"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupTest.xml
index 860fb4a6a9327..bb1dbb3559d74 100644
--- a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupTest.xml
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupTest.xml
@@ -38,19 +38,14 @@
 
         <amOnPage stepKey="openAdminSystemStorePage" url="{{AdminSystemStorePage.url}}"/>
 
-        <click stepKey="clickResetButton" selector="{{AdminStoresGridSection.resetButton}}"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterReset" time="10"/>
+        <actionGroup ref="filterStoresGridByStore" stepKey="enterStoreGroup1Name">
+            <argument name="store" value="$$createCustomStoreGroup1.group[name]$$"/>
+        </actionGroup>
+        <see stepKey="seeStoreGroup1NameAfterSearch" selector="{{AdminStoresGridSection.storeInFirstRow}}" userInput="$$createCustomStoreGroup1.group[name]$$"/>
 
-        <fillField stepKey="enterStoreGroup1Name" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="$$createCustomStoreGroup1.group[name]$$"/>
-        <click stepKey="searchStoreGroup1Name" selector="{{AdminStoresGridSection.searchButton}}"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterSearch" time="10"/>
-        <see stepKey="seeStoreGroup1NameAfterSearch" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" userInput="$$createCustomStoreGroup1.group[name]$$"/>
-
-        <click stepKey="clickResetButton2" selector="{{AdminStoresGridSection.resetButton}}"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterReset2" time="10"/>
-        <fillField stepKey="enterStoreGroup2Name2" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="$$createCustomStoreGroup2.group[name]$$"/>
-        <click stepKey="searchStoreGroup2Name" selector="{{AdminStoresGridSection.searchButton}}"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterSearch2" time="10"/>
-        <see stepKey="seeStoreGroup1NameAfterSearch2" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" userInput="$$createCustomStoreGroup2.group[name]$$"/>
+        <actionGroup ref="filterStoresGridByStore" stepKey="enterStoreGroup2Name">
+            <argument name="store" value="$$createCustomStoreGroup2.group[name]$$"/>
+        </actionGroup>
+        <see stepKey="seeStoreGroup1NameAfterSearch2" selector="{{AdminStoresGridSection.storeInFirstRow}}" userInput="$$createCustomStoreGroup2.group[name]$$"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Store/Test/Unit/Model/WebsiteRepositoryTest.php b/app/code/Magento/Store/Test/Unit/Model/WebsiteRepositoryTest.php
index 80e4973bbe7fe..6ebc7ebd4bbd9 100644
--- a/app/code/Magento/Store/Test/Unit/Model/WebsiteRepositoryTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/WebsiteRepositoryTest.php
@@ -34,7 +34,7 @@ protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->websiteFactoryMock =
-            $this->getMockBuilder('Magento\Store\Model\WebsiteFactory')
+            $this->getMockBuilder(\Magento\Store\Model\WebsiteFactory::class)
                 ->disableOriginalConstructor()
                 ->setMethods(['create'])
                 ->getMock();
diff --git a/app/code/Magento/Store/Test/Unit/Ui/Component/Listing/Column/GroupTitleTest.php b/app/code/Magento/Store/Test/Unit/Ui/Component/Listing/Column/GroupTitleTest.php
new file mode 100644
index 0000000000000..7c01a33a1db32
--- /dev/null
+++ b/app/code/Magento/Store/Test/Unit/Ui/Component/Listing/Column/GroupTitleTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Store\Test\Unit\Ui\Component\Listing\Column;
+
+use Magento\Store\Ui\Component\Listing\Column\GroupTitle;
+
+/**
+ * GroupTitleTest contains unit test for \Magento\Store\Ui\Component\Listing\Column\GroupTitle
+ */
+class GroupTitleTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var GroupTitle
+     */
+    private $component;
+
+    /**
+     * @var \Magento\Framework\View\Element\UiComponent\ContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
+    /**
+     * @var \Magento\Framework\View\Element\UiComponentFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $uiComponentFactory;
+
+    public function setUp()
+    {
+        $this->context = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\ContextInterface::class)
+            ->getMockForAbstractClass();
+        $processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context->expects($this->never())->method('getProcessor')->willReturn($processor);
+        $this->uiComponentFactory = $this->createMock(\Magento\Framework\View\Element\UiComponentFactory::class);
+        $this->component = new GroupTitle(
+            $this->context,
+            $this->uiComponentFactory
+        );
+
+        $this->component->setData('name', 'name');
+    }
+
+    /**
+     * @covers \Magento\Store\Ui\Component\Listing\Column\GroupTitle::prepareDataSource
+     */
+    public function testPrepareDataSource()
+    {
+        $dataSource = [
+            'data' => [
+                'items' => [
+                    [
+                        'name' => 'Main Website Store',
+                        'group_id' => 1,
+                        'group_code' => 'main_website_store',
+                    ]
+                ]
+            ]
+        ];
+
+        $title = sprintf(
+            '<a title="Edit Store" href="%s">Main Website Store</a><br />(Code: main_website_store)',
+            'http://magento-2-1.dev/admin/system_store/editGroup'
+        );
+
+        $expectedDataSource = [
+            'data' => [
+                'items' => [
+                    [
+                        'name' => $title,
+                        'group_id' => 1,
+                        'group_code' => 'main_website_store',
+                    ]
+                ]
+            ]
+        ];
+
+        $this->context->expects($this->once())
+            ->method('getUrl')
+            ->with(
+                'adminhtml/system_store/editGroup',
+                ['group_id' => 1]
+            )
+            ->willReturn('http://magento-2-1.dev/admin/system_store/editGroup');
+
+        $dataSource = $this->component->prepareDataSource($dataSource);
+        $this->assertEquals($expectedDataSource, $dataSource);
+    }
+}
diff --git a/app/code/Magento/Store/Test/Unit/Ui/Component/Listing/Column/StoreTitleTest.php b/app/code/Magento/Store/Test/Unit/Ui/Component/Listing/Column/StoreTitleTest.php
new file mode 100644
index 0000000000000..d1b50acf3b80f
--- /dev/null
+++ b/app/code/Magento/Store/Test/Unit/Ui/Component/Listing/Column/StoreTitleTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Store\Test\Unit\Ui\Component\Listing\Column;
+
+use Magento\Store\Ui\Component\Listing\Column\StoreTitle;
+
+/**
+ * Class StoreTitleTest contains unit test for \Magento\Store\Ui\Component\Listing\Column\StoreTitle
+ */
+class StoreTitleTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var StoreTitle
+     */
+    private $component;
+
+    /**
+     * @var \Magento\Framework\View\Element\UiComponent\ContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
+    /**
+     * @var \Magento\Framework\View\Element\UiComponentFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $uiComponentFactory;
+
+    public function setUp()
+    {
+        $this->context = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\ContextInterface::class)
+            ->getMockForAbstractClass();
+        $processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context->expects($this->never())->method('getProcessor')->willReturn($processor);
+        $this->uiComponentFactory = $this->createMock(\Magento\Framework\View\Element\UiComponentFactory::class);
+        $this->component = new StoreTitle(
+            $this->context,
+            $this->uiComponentFactory
+        );
+
+        $this->component->setData('name', 'name');
+    }
+
+    /**
+     * @covers \Magento\Store\Ui\Component\Listing\Column\StoreTitle::prepareDataSource
+     */
+    public function testPrepareDataSource()
+    {
+        $dataSource = [
+            'data' => [
+                'items' => [
+                    [
+                        'name' => 'Default Store View',
+                        'store_id' => 1,
+                        'store_code' => 'default',
+                    ]
+                ]
+            ]
+        ];
+
+        $title = sprintf(
+            '<a title="Edit Store View" href="%s">Default Store View</a><br />(Code: default)',
+            'http://magento-2-1.dev/admin/system_store/editStore'
+        );
+
+        $expectedDataSource = [
+            'data' => [
+                'items' => [
+                    [
+                        'name' => $title,
+                        'store_id' => 1,
+                        'store_code' => 'default',
+                    ]
+                ]
+            ]
+        ];
+
+        $this->context->expects($this->once())
+            ->method('getUrl')
+            ->with(
+                'adminhtml/system_store/editStore',
+                ['store_id' => 1]
+            )
+            ->willReturn('http://magento-2-1.dev/admin/system_store/editStore');
+
+        $dataSource = $this->component->prepareDataSource($dataSource);
+        $this->assertEquals($expectedDataSource, $dataSource);
+    }
+}
diff --git a/app/code/Magento/Store/Test/Unit/Ui/Component/Listing/Column/WebsiteNameTest.php b/app/code/Magento/Store/Test/Unit/Ui/Component/Listing/Column/WebsiteNameTest.php
new file mode 100644
index 0000000000000..da9f57e09f28d
--- /dev/null
+++ b/app/code/Magento/Store/Test/Unit/Ui/Component/Listing/Column/WebsiteNameTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Store\Test\Unit\Ui\Component\Listing\Column;
+
+use Magento\Store\Ui\Component\Listing\Column\WebsiteName;
+
+/**
+ * Class WebsiteNameTest contains unit tests for \Magento\Store\Ui\Component\Listing\Column\WebsiteName
+ */
+class WebsiteNameTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var WebsiteName
+     */
+    private $component;
+
+    /**
+     * @var \Magento\Framework\View\Element\UiComponent\ContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
+    /**
+     * @var \Magento\Framework\View\Element\UiComponentFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $uiComponentFactory;
+
+    public function setUp()
+    {
+        $this->context = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\ContextInterface::class)
+            ->getMockForAbstractClass();
+        $processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context->expects($this->never())->method('getProcessor')->willReturn($processor);
+        $this->uiComponentFactory = $this->createMock(\Magento\Framework\View\Element\UiComponentFactory::class);
+        $this->component = new WebsiteName(
+            $this->context,
+            $this->uiComponentFactory
+        );
+
+        $this->component->setData('name', 'name');
+    }
+
+    /**
+     * @covers \Magento\Store\Ui\Component\Listing\Column\WebsiteName::prepareDataSource
+     */
+    public function testPrepareDataSource()
+    {
+        $dataSource = [
+            'data' => [
+                'items' => [
+                    [
+                        'name' => 'Main Website',
+                        'website_id' => 1,
+                        'code' => 'base',
+                    ]
+                ]
+            ]
+        ];
+
+        $title = sprintf(
+            '<a title="Edit Store" href="%s">Main Website</a><br />(Code: base)',
+            'http://magento-2-1.dev/admin/system_store/editWebsite'
+        );
+
+        $expectedDataSource = [
+            'data' => [
+                'items' => [
+                    [
+                        'name' => $title,
+                        'website_id' => 1,
+                        'code' => 'base',
+                    ]
+                ]
+            ]
+        ];
+
+        $this->context->expects($this->once())
+            ->method('getUrl')
+            ->with(
+                'adminhtml/system_store/editWebsite',
+                ['website_id' => 1]
+            )
+            ->willReturn('http://magento-2-1.dev/admin/system_store/editWebsite');
+
+        $dataSource = $this->component->prepareDataSource($dataSource);
+        $this->assertEquals($expectedDataSource, $dataSource);
+    }
+}
diff --git a/app/code/Magento/Store/Test/Unit/Url/Plugin/RouteParamsResolverTest.php b/app/code/Magento/Store/Test/Unit/Url/Plugin/RouteParamsResolverTest.php
index f31acd40a2e69..9b83714166b12 100644
--- a/app/code/Magento/Store/Test/Unit/Url/Plugin/RouteParamsResolverTest.php
+++ b/app/code/Magento/Store/Test/Unit/Url/Plugin/RouteParamsResolverTest.php
@@ -80,7 +80,7 @@ public function testBeforeSetRouteParamsScopeInParams()
         $routeParamsResolverMock->expects($this->once())->method('setScope')->with($storeCode);
         $routeParamsResolverMock->expects($this->once())->method('getScope')->willReturn($storeCode);
 
-        $this->queryParamsResolverMock->expects($this->never())->method('setQueryParam');
+        $this->queryParamsResolverMock->expects($this->any())->method('setQueryParam');
 
         $this->model->beforeSetRouteParams(
             $routeParamsResolverMock,
@@ -113,7 +113,7 @@ public function testBeforeSetRouteParamsScopeUseStoreInUrl()
         $routeParamsResolverMock->expects($this->once())->method('setScope')->with($storeCode);
         $routeParamsResolverMock->expects($this->once())->method('getScope')->willReturn($storeCode);
 
-        $this->queryParamsResolverMock->expects($this->once())->method('setQueryParam')->with('___store', $storeCode);
+        $this->queryParamsResolverMock->expects($this->never())->method('setQueryParam')->with('___store', $storeCode);
 
         $this->model->beforeSetRouteParams(
             $routeParamsResolverMock,
@@ -178,7 +178,7 @@ public function testBeforeSetRouteParamsNoScopeInParams()
         $routeParamsResolverMock->expects($this->never())->method('setScope');
         $routeParamsResolverMock->expects($this->once())->method('getScope')->willReturn(false);
 
-        $this->queryParamsResolverMock->expects($this->once())->method('setQueryParam')->with('___store', $storeCode);
+        $this->queryParamsResolverMock->expects($this->never())->method('setQueryParam')->with('___store', $storeCode);
 
         $this->model->beforeSetRouteParams(
             $routeParamsResolverMock,
diff --git a/app/code/Magento/Store/Ui/Component/Listing/Column/AbstractNameColumn.php b/app/code/Magento/Store/Ui/Component/Listing/Column/AbstractNameColumn.php
new file mode 100644
index 0000000000000..1cf0534ea9c6e
--- /dev/null
+++ b/app/code/Magento/Store/Ui/Component/Listing/Column/AbstractNameColumn.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Store\Ui\Component\Listing\Column;
+
+/**
+ * Class AbstractNameColumn
+ */
+abstract class AbstractNameColumn extends \Magento\Ui\Component\Listing\Columns\Column
+{
+    /**
+     * @inheritdoc
+     */
+    public function prepareDataSource(array $dataSource)
+    {
+        if (isset($dataSource['data']['items'])) {
+            $fieldName = $this->getData('name');
+
+            foreach ($dataSource['data']['items'] as & $item) {
+                if (isset($item[$fieldName])) {
+                    $item[$fieldName] = $this->prepareTitle($item);
+                }
+            }
+        }
+
+        return $dataSource;
+    }
+
+    abstract public function prepareTitle(array $item);
+}
diff --git a/app/code/Magento/Store/Ui/Component/Listing/Column/GroupTitle.php b/app/code/Magento/Store/Ui/Component/Listing/Column/GroupTitle.php
new file mode 100644
index 0000000000000..c4af27d888fc2
--- /dev/null
+++ b/app/code/Magento/Store/Ui/Component/Listing/Column/GroupTitle.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Store\Ui\Component\Listing\Column;
+
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+
+/**
+ * Class GroupTitle
+ */
+class GroupTitle extends AbstractNameColumn
+{
+    /**
+     * @inheritdoc
+     */
+    public function prepareTitle(array $item)
+    {
+        $fieldName = $this->getData('name');
+        $url = $this->context->getUrl(
+            'adminhtml/system_store/editGroup',
+            ['group_id' => $item['group_id']]
+        );
+
+        $html =  '<a title="' . __('Edit Store') . '" href="' . $url . '">' .
+            $item[$fieldName]. '</a><br />' . '(' . __('Code') . ': ' . $item['group_code'] . ')';
+
+        return $html;
+    }
+}
diff --git a/app/code/Magento/Store/Ui/Component/Listing/Column/StoreTitle.php b/app/code/Magento/Store/Ui/Component/Listing/Column/StoreTitle.php
new file mode 100644
index 0000000000000..1133b98032bf3
--- /dev/null
+++ b/app/code/Magento/Store/Ui/Component/Listing/Column/StoreTitle.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Store\Ui\Component\Listing\Column;
+
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+
+/**
+ * Class StoreView
+ */
+class StoreTitle extends AbstractNameColumn
+{
+    /**
+     * @inheritdoc
+     */
+    public function prepareTitle(array $item)
+    {
+        $fieldName = $this->getData('name');
+        $url = $this->context->getUrl(
+            'adminhtml/system_store/editStore',
+            ['store_id' => $item['store_id']]
+        );
+
+        $html =  '<a title="' . __('Edit Store View') . '" href="' . $url . '">' .
+            $item[$fieldName]. '</a><br />' . '(' . __('Code') . ': ' . $item['store_code'] . ')';
+
+        return $html;
+    }
+}
diff --git a/app/code/Magento/Store/Ui/Component/Listing/Column/WebsiteName.php b/app/code/Magento/Store/Ui/Component/Listing/Column/WebsiteName.php
new file mode 100644
index 0000000000000..e95c556541943
--- /dev/null
+++ b/app/code/Magento/Store/Ui/Component/Listing/Column/WebsiteName.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Store\Ui\Component\Listing\Column;
+
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+
+/**
+ * Class WebsiteName
+ */
+class WebsiteName extends AbstractNameColumn
+{
+    /**
+     * @inheritdoc
+     */
+    public function prepareTitle(array $item)
+    {
+        $fieldName = $this->getData('name');
+        $url = $this->context->getUrl(
+            'adminhtml/system_store/editWebsite',
+            ['website_id' => $item['website_id']]
+        );
+
+        $html =  '<a title="' . __('Edit Store') . '" href="' . $url . '">' .
+            $item[$fieldName]. '</a><br />' . '(' . __('Code') . ': ' . $item['code'] . ')';
+
+        return $html;
+    }
+}
diff --git a/app/code/Magento/Store/Ui/DataProvider/WebsiteDataProvider.php b/app/code/Magento/Store/Ui/DataProvider/WebsiteDataProvider.php
new file mode 100644
index 0000000000000..bae17a7eeb632
--- /dev/null
+++ b/app/code/Magento/Store/Ui/DataProvider/WebsiteDataProvider.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Store\Ui\DataProvider;
+
+use Magento\Store\Model\ResourceModel\Website\Grid\CollectionFactory as WebsiteCollectionFactory;
+
+/**
+ * Class WebsiteDataProvider
+ */
+class WebsiteDataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
+{
+    /**
+     * WebsiteDataProvider constructor.
+     *
+     * @param string $name
+     * @param string $primaryFieldName
+     * @param string $requestFieldName
+     * @param WebsiteCollectionFactory $collectionFactory
+     * @param array $meta
+     * @param array $data
+     */
+    public function __construct(
+        $name,
+        $primaryFieldName,
+        $requestFieldName,
+        WebsiteCollectionFactory $collectionFactory,
+        array $meta = [],
+        array $data = []
+    ) {
+        parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
+
+        $this->collection = $collectionFactory->create();
+    }
+}
diff --git a/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php b/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
index 468352af78cbc..9c9d1e6023af0 100644
--- a/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
+++ b/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
@@ -78,7 +78,7 @@ public function beforeSetRouteParams(
                 $storeCode
             );
 
-            if ($useStoreInUrl && !$this->storeManager->hasSingleStore()) {
+            if (!$useStoreInUrl && !$this->storeManager->hasSingleStore()) {
                 $this->queryParamsResolver->setQueryParam('___store', $storeCode);
             }
         }
diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json
index 6f2d88d6f6fcb..b5d61ac833cda 100644
--- a/app/code/Magento/Store/composer.json
+++ b/app/code/Magento/Store/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-store",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-catalog": "102.0.*",
         "magento/module-directory": "100.2.*",
         "magento/module-ui": "101.0.*",
@@ -14,7 +14,7 @@
         "magento/module-deploy": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.5",
+    "version": "100.2.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Store/etc/config.xml b/app/code/Magento/Store/etc/config.xml
index bb5b23620df4b..42ca893f5bd71 100644
--- a/app/code/Magento/Store/etc/config.xml
+++ b/app/code/Magento/Store/etc/config.xml
@@ -130,6 +130,8 @@
                     <html>html</html>
                     <phtml>phtml</phtml>
                     <shtml>shtml</shtml>
+                    <phpt>phpt</phpt>
+                    <pht>pht</pht>
                 </protected_extensions>
                 <public_files_valid_paths>
                     <protected>
diff --git a/app/code/Magento/Store/etc/di.xml b/app/code/Magento/Store/etc/di.xml
index 3d740bfee2093..83f891d06647d 100644
--- a/app/code/Magento/Store/etc/di.xml
+++ b/app/code/Magento/Store/etc/di.xml
@@ -232,6 +232,7 @@
     <type name="Magento\Framework\App\ScopeResolverPool">
         <arguments>
             <argument name="scopeResolvers" xsi:type="array">
+                <item name="default" xsi:type="object">Magento\Framework\App\ScopeResolver</item>
                 <item name="store" xsi:type="object">Magento\Store\Model\Resolver\Store</item>
                 <item name="stores" xsi:type="object">Magento\Store\Model\Resolver\Store</item>
                 <item name="group" xsi:type="object">Magento\Store\Model\Resolver\Group</item>
diff --git a/app/code/Magento/Store/etc/frontend/di.xml b/app/code/Magento/Store/etc/frontend/di.xml
index c39d5df863939..917aedad3d960 100644
--- a/app/code/Magento/Store/etc/frontend/di.xml
+++ b/app/code/Magento/Store/etc/frontend/di.xml
@@ -9,7 +9,7 @@
     <type name="Magento\Framework\App\FrontController">
         <plugin name="requestPreprocessor" type="Magento\Store\App\FrontController\Plugin\RequestPreprocessor" sortOrder="50"/>
     </type>
-    <type name="Magento\Framework\App\Action\Action">
+    <type name="Magento\Framework\App\Action\AbstractAction">
         <plugin name="contextPlugin" type="Magento\Store\App\Action\Plugin\Context" sortOrder="10"/>
     </type>
     <type name="Magento\Framework\App\RouterList" shared="true">
diff --git a/app/code/Magento/Store/view/adminhtml/ui_component/store_listing.xml b/app/code/Magento/Store/view/adminhtml/ui_component/store_listing.xml
new file mode 100644
index 0000000000000..4e797b5edf7b6
--- /dev/null
+++ b/app/code/Magento/Store/view/adminhtml/ui_component/store_listing.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">store_listing.store_listing_data_source</item>
+        </item>
+    </argument>
+    <settings>
+        <buttons>
+            <button name="add">
+                <url path="adminhtml/*/newWebsite"/>
+                <class>primary</class>
+                <label translate="true">Create Website</label>
+            </button>
+            <button name="add_store">
+                <url path="adminhtml/*/newStore"/>
+                <class>add add-store-view</class>
+                <label translate="true">Create Store View</label>
+            </button>
+            <button name="add_group">
+                <url path="adminhtml/*/newGroup"/>
+                <class>add add-store</class>
+                <label translate="true">Create Store</label>
+            </button>
+        </buttons>
+        <spinner>store_columns</spinner>
+        <deps>
+            <dep>store_listing.store_listing_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="store_listing_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <storageConfig>
+                <param name="indexField" xsi:type="string">store_id</param>
+            </storageConfig>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Magento_Backend::store</aclResource>
+        <dataProvider class="Magento\Store\Ui\DataProvider\WebsiteDataProvider" name="store_listing_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>website_id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <listingToolbar name="listing_top">
+        <settings>
+            <sticky>true</sticky>
+        </settings>
+        <columnsControls name="columns_controls"/>
+        <filters name="listing_filters"/>
+        <paging name="listing_paging"/>
+    </listingToolbar>
+    <columns name="store_columns">
+        <settings>
+        </settings>
+        <column name="name" sortOrder="10" class="Magento\Store\Ui\Component\Listing\Column\WebsiteName">
+            <settings>
+                <filter>text</filter>
+                <bodyTmpl>ui/grid/cells/html</bodyTmpl>
+                <label translate="true">Web Site</label>
+            </settings>
+        </column>
+        <column name="group_title" sortOrder="20" class="Magento\Store\Ui\Component\Listing\Column\GroupTitle">
+            <settings>
+                <filter>text</filter>
+                <bodyTmpl>ui/grid/cells/html</bodyTmpl>
+                <label translate="true">Store</label>
+            </settings>
+        </column>
+        <column name="store_title" sortOrder="30" class="Magento\Store\Ui\Component\Listing\Column\StoreTitle">
+            <settings>
+                <filter>text</filter>
+                <bodyTmpl>ui/grid/cells/html</bodyTmpl>
+                <label translate="true">Store View</label>
+            </settings>
+        </column>
+    </columns>
+</listing>
diff --git a/app/code/Magento/Swagger/composer.json b/app/code/Magento/Swagger/composer.json
index 0cdf3dadb2b8a..c3a5d174a0d8e 100644
--- a/app/code/Magento/Swagger/composer.json
+++ b/app/code/Magento/Swagger/composer.json
@@ -2,11 +2,11 @@
     "name": "magento/module-swagger",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml b/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml
index b20da68734579..26ef4847a1267 100644
--- a/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml
+++ b/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml
@@ -58,7 +58,7 @@ $schemaUrl = $block->getSchemaUrl();
     <div class="swagger-ui-wrap">
         <a id="logo" href="http://swagger.io">swagger</a>
         <form id='api_selector'>
-            <input id="input_baseUrl" type="hidden" value="<?= /* @escapeNotVerified */ $schemaUrl ?>"/>
+            <input id="input_baseUrl" type="hidden" value="<?= $block->escapeUrl($schemaUrl) ?>"/>
             <div class='input'><input placeholder="api_key" id="input_apiKey" name="apiKey" type="text"/></div>
             <div class='input'><a id="explore" href="#" data-sw-translate>apply</a></div>
         </form>
diff --git a/app/code/Magento/SwaggerWebapi/composer.json b/app/code/Magento/SwaggerWebapi/composer.json
index 5a72cb88c4f3a..803233d434401 100644
--- a/app/code/Magento/SwaggerWebapi/composer.json
+++ b/app/code/Magento/SwaggerWebapi/composer.json
@@ -2,12 +2,12 @@
     "name": "magento/module-swagger-webapi",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*",
         "magento/module-swagger": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.0",
+    "version": "100.2.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
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 85633475205ed..3df47ee749587 100644
--- a/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
+++ b/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
@@ -8,6 +8,8 @@
 use Magento\Catalog\Block\Product\Context;
 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;
@@ -39,6 +41,12 @@ class Configurable extends \Magento\Swatches\Block\Product\Renderer\Configurable
     private $variationPrices;
 
     /**
+     * @var \Magento\Catalog\Model\Layer\Resolver
+     */
+    private $layerResolver;
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @param Context $context
      * @param ArrayUtils $arrayUtils
      * @param EncoderInterface $jsonEncoder
@@ -49,11 +57,11 @@ class Configurable extends \Magento\Swatches\Block\Product\Renderer\Configurable
      * @param ConfigurableAttributeData $configurableAttributeData
      * @param SwatchData $swatchHelper
      * @param Media $swatchMediaHelper
-     * @param array $data other data
-     * @param SwatchAttributesProvider $swatchAttributesProvider
+     * @param array $data
+     * @param SwatchAttributesProvider|null $swatchAttributesProvider
      * @param \Magento\Framework\Locale\Format|null $localeFormat
      * @param \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices|null $variationPrices
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @param Resolver $layerResolver
      */
     public function __construct(
         Context $context,
@@ -69,7 +77,8 @@ public function __construct(
         array $data = [],
         SwatchAttributesProvider $swatchAttributesProvider = null,
         \Magento\Framework\Locale\Format $localeFormat = null,
-        \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices $variationPrices = null
+        \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices $variationPrices = null,
+        Resolver $layerResolver = null
     ) {
         parent::__construct(
             $context,
@@ -91,10 +100,11 @@ public function __construct(
         $this->variationPrices = $variationPrices ?: ObjectManager::getInstance()->get(
             \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices::class
         );
+        $this->layerResolver = $layerResolver ?: ObjectManager::getInstance()->get(Resolver::class);
     }
 
     /**
-     * @return string
+     * @inheritdoc
      */
     protected function getRendererTemplate()
     {
@@ -120,7 +130,7 @@ protected function _toHtml()
     }
 
     /**
-     * @return array
+     * @inheritdoc
      */
     protected function getSwatchAttributesData()
     {
@@ -182,6 +192,7 @@ protected function getOptionImages()
      * Add images to result json config in case of Layered Navigation is used
      *
      * @return array
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      * @since 100.2.0
      */
     protected function _getAdditionalConfig()
@@ -246,4 +257,17 @@ 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/Controller/Adminhtml/Product/Attribute/Plugin/Save.php b/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php
index 383c97a166d34..72d27152d639a 100644
--- a/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php
+++ b/app/code/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php
@@ -16,6 +16,8 @@
 class Save
 {
     /**
+     * Performs the conversion of the frontend input value.
+     *
      * @param Attribute\Save $subject
      * @param RequestInterface $request
      * @return array
@@ -26,15 +28,6 @@ public function beforeDispatch(Attribute\Save $subject, RequestInterface $reques
         $data = $request->getPostValue();
 
         if (isset($data['frontend_input'])) {
-            //Data is serialized to overcome issues caused by max_input_vars value if it's modification is unavailable.
-            //See subject controller code and comments for more info.
-            if (isset($data['serialized_swatch_values'])
-                && in_array($data['frontend_input'], ['swatch_visual', 'swatch_text'])
-            ) {
-                $data['serialized_options'] = $data['serialized_swatch_values'];
-                unset($data['serialized_swatch_values']);
-            }
-
             switch ($data['frontend_input']) {
                 case 'swatch_visual':
                     $data[Swatch::SWATCH_INPUT_TYPE_KEY] = Swatch::SWATCH_INPUT_TYPE_VISUAL;
diff --git a/app/code/Magento/Swatches/Controller/Ajax/Media.php b/app/code/Magento/Swatches/Controller/Ajax/Media.php
index 079ba8f897127..2aaf158064947 100644
--- a/app/code/Magento/Swatches/Controller/Ajax/Media.php
+++ b/app/code/Magento/Swatches/Controller/Ajax/Media.php
@@ -24,18 +24,26 @@ class Media extends \Magento\Framework\App\Action\Action
      */
     private $swatchHelper;
 
+    /**
+     * @var \Magento\PageCache\Model\Config
+     */
+    protected $config;
+
     /**
      * @param Context $context
      * @param \Magento\Catalog\Model\ProductFactory $productModelFactory
      * @param \Magento\Swatches\Helper\Data $swatchHelper
+     * @param \Magento\PageCache\Model\Config $config
      */
     public function __construct(
         Context $context,
         \Magento\Catalog\Model\ProductFactory $productModelFactory,
-        \Magento\Swatches\Helper\Data $swatchHelper
+        \Magento\Swatches\Helper\Data $swatchHelper,
+        \Magento\PageCache\Model\Config $config
     ) {
         $this->productModelFactory = $productModelFactory;
         $this->swatchHelper = $swatchHelper;
+        $this->config = $config;
 
         parent::__construct($context);
     }
@@ -44,18 +52,28 @@ public function __construct(
      * Get product media for specified configurable product variation
      *
      * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute()
     {
         $productMedia = [];
+
+        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+
+        /** @var \Magento\Framework\App\ResponseInterface $response */
+        $response = $this->getResponse();
+
         if ($productId = (int)$this->getRequest()->getParam('product_id')) {
+            $product = $this->productModelFactory->create()->load($productId);
             $productMedia = $this->swatchHelper->getProductMediaGallery(
-                $this->productModelFactory->create()->load($productId)
+                $product
             );
+            $resultJson->setHeader('X-Magento-Tags', implode(',', $product->getIdentities()));
+
+            $response->setPublicHeaders($this->config->getTtl());
         }
 
-        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
-        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
         $resultJson->setData($productMedia);
         return $resultJson;
     }
diff --git a/app/code/Magento/Swatches/Helper/Data.php b/app/code/Magento/Swatches/Helper/Data.php
index 6f751068d543a..06e47496e172d 100644
--- a/app/code/Magento/Swatches/Helper/Data.php
+++ b/app/code/Magento/Swatches/Helper/Data.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Swatches\Helper;
 
+use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
 use Magento\Catalog\Api\Data\ProductInterface as Product;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Helper\Image;
@@ -248,18 +249,15 @@ public function loadVariationByFallback(Product $parentProduct, array $attribute
         $this->addFilterByParent($productCollection, $parentId);
 
         $configurableAttributes = $this->getAttributesFromConfigurable($parentProduct);
-        $allAttributesArray = [];
+
+        $resultAttributesToFilter = [];
         foreach ($configurableAttributes as $attribute) {
-            if (!empty($attribute['default_value'])) {
-                $allAttributesArray[$attribute['attribute_code']] = $attribute['default_value'];
+            $attributeCode = $attribute->getData('attribute_code');
+            if (array_key_exists($attributeCode, $attributes)) {
+                $resultAttributesToFilter[$attributeCode] = $attributes[$attributeCode];
             }
         }
 
-        $resultAttributesToFilter = array_merge(
-            $attributes,
-            array_diff_key($allAttributesArray, $attributes)
-        );
-
         $this->addFilterByAttributes($productCollection, $resultAttributesToFilter);
 
         $variationProduct = $productCollection->getFirstItem();
@@ -301,6 +299,7 @@ private function addFilterByParent(ProductCollection $productCollection, $parent
 
     /**
      * Method getting full media gallery for current Product
+     *
      * Array structure: [
      *  ['image'] => 'http://url/pub/media/catalog/product/2/0/blabla.jpg',
      *  ['mediaGallery'] => [
@@ -309,39 +308,71 @@ private function addFilterByParent(ProductCollection $productCollection, $parent
      *      ...,
      *      ]
      * ]
+     *
      * @param ModelProduct $product
+     *
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function getProductMediaGallery(ModelProduct $product)
+    public function getProductMediaGallery(ModelProduct $product): array
     {
         $baseImage = null;
         $gallery = [];
 
         $mediaGallery = $product->getMediaGalleryEntries();
+        /** @var ProductAttributeMediaGalleryEntryInterface $mediaEntry */
         foreach ($mediaGallery as $mediaEntry) {
             if ($mediaEntry->isDisabled()) {
                 continue;
             }
 
-            if (in_array('image', $mediaEntry->getTypes(), true)) {
-                $baseImage = $mediaEntry->getFile();
+            if (!$baseImage || $this->isMainImage($mediaEntry)) {
+                $baseImage = $mediaEntry;
             } elseif (!$baseImage) {
                 $baseImage = $mediaEntry->getFile();
             }
 
-            $gallery[$mediaEntry->getId()] = $this->getAllSizeImages($product, $mediaEntry->getFile());
+            $gallery[$mediaEntry->getId()] = $this->collectImageData($product, $mediaEntry);
         }
 
         if (!$baseImage) {
             return [];
         }
 
-        $resultGallery = $this->getAllSizeImages($product, $baseImage);
+        $resultGallery = $this->collectImageData($product, $baseImage);
         $resultGallery['gallery'] = $gallery;
 
         return $resultGallery;
     }
 
+    /**
+     * Checks if image is main image in gallery
+     *
+     * @param ProductAttributeMediaGalleryEntryInterface $mediaEntry
+     * @return bool
+     */
+    private function isMainImage(ProductAttributeMediaGalleryEntryInterface $mediaEntry): bool
+    {
+        return in_array('image', $mediaEntry->getTypes(), true);
+    }
+
+    /**
+     * Returns image data for swatches
+     *
+     * @param ModelProduct $product
+     * @param ProductAttributeMediaGalleryEntryInterface $mediaEntry
+     * @return array
+     */
+    private function collectImageData(
+        ModelProduct $product,
+        ProductAttributeMediaGalleryEntryInterface $mediaEntry
+    ): array {
+        $image = $this->getAllSizeImages($product, $mediaEntry->getFile());
+        $image[ProductAttributeMediaGalleryEntryInterface::POSITION] = $mediaEntry->getPosition();
+        $image['isMain'] = $this->isMainImage($mediaEntry);
+        return $image;
+    }
+
     /**
      * @param ModelProduct $product
      * @param string $imageFile
@@ -517,8 +548,7 @@ private function addFallbackOptions(array $fallbackValues, array $swatches)
      */
     public function isProductHasSwatch(Product $product)
     {
-        $swatchAttributes = $this->getSwatchAttributes($product);
-        return count($swatchAttributes) > 0;
+        return !empty($this->getSwatchAttributes($product));
     }
 
     /**
diff --git a/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php b/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
index 76bf5782d3922..7ba9ba30dbd31 100644
--- a/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
+++ b/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
@@ -167,7 +167,8 @@ protected function convertSwatchToDropdown(Attribute $attribute)
             if (!empty($additionalData)) {
                 $additionalData = $this->serializer->unserialize($additionalData);
                 if (is_array($additionalData) && isset($additionalData[Swatch::SWATCH_INPUT_TYPE_KEY])) {
-                    $this->cleanEavAttributeOptionSwatchValues($attribute->getOption());
+                    $option = $attribute->getOption() ?: [];
+                    $this->cleanEavAttributeOptionSwatchValues($option);
                     unset($additionalData[Swatch::SWATCH_INPUT_TYPE_KEY]);
                     $attribute->setData('additional_data', $this->serializer->serialize($additionalData));
                 }
@@ -246,7 +247,8 @@ protected function saveSwatchParams(Attribute $attribute)
     {
         if ($this->swatchHelper->isVisualSwatch($attribute)) {
             $this->processVisualSwatch($attribute);
-            $this->cleanTextSwatchValuesAfterSwitch($attribute->getOptiontext());
+            $attributeOptions = $attribute->getOptiontext() ?: [];
+            $this->cleanTextSwatchValuesAfterSwitch($attributeOptions);
         } elseif ($this->swatchHelper->isTextSwatch($attribute)) {
             $this->processTextualSwatch($attribute);
         }
@@ -283,10 +285,10 @@ protected function processVisualSwatch(Attribute $attribute)
      * Clean swatch option values after switching to the dropdown type.
      *
      * @param array $attributeOptions
-     * @param null  $swatchType
+     * @param int|null  $swatchType
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    private function cleanEavAttributeOptionSwatchValues($attributeOptions, $swatchType = null)
+    private function cleanEavAttributeOptionSwatchValues(array $attributeOptions, int $swatchType = null)
     {
         if (count($attributeOptions) && isset($attributeOptions['value'])) {
             $optionsIDs = array_keys($attributeOptions['value']);
@@ -301,7 +303,7 @@ private function cleanEavAttributeOptionSwatchValues($attributeOptions, $swatchT
      * @param array $attributeOptions
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    private function cleanTextSwatchValuesAfterSwitch($attributeOptions)
+    private function cleanTextSwatchValuesAfterSwitch(array $attributeOptions)
     {
         $this->cleanEavAttributeOptionSwatchValues($attributeOptions, Swatch::SWATCH_TYPE_TEXTUAL);
     }
diff --git a/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php b/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
index 8ca694725511d..39245941df948 100644
--- a/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
+++ b/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
@@ -7,8 +7,9 @@
 namespace Magento\Swatches\Model\ResourceModel;
 
 /**
- * @codeCoverageIgnore
  * Swatch Resource Model
+ *
+ * @codeCoverageIgnore
  * @api
  * @since 100.0.2
  */
@@ -25,8 +26,10 @@ protected function _construct()
     }
 
     /**
-     * @param string $defaultValue
+     * Update default swatch option value.
+     *
      * @param integer $id
+     * @param string $defaultValue
      * @return void
      */
     public function saveDefaultSwatchOption($id, $defaultValue)
@@ -49,7 +52,7 @@ public function clearSwatchOptionByOptionIdAndType($optionIDs, $type = null)
     {
         if (count($optionIDs)) {
             foreach ($optionIDs as $optionId) {
-                $where = ['option_id' => $optionId];
+                $where = ['option_id = ?' => $optionId];
                 if ($type !== null) {
                     $where['type = ?'] = $type;
                 }
diff --git a/app/code/Magento/Swatches/Test/Mftf/ActionGroup/ColorPickerActionGroup.xml b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/ColorPickerActionGroup.xml
new file mode 100644
index 0000000000000..bde93ea0ebcd7
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/ColorPickerActionGroup.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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="setColorPickerValueByHex">
+        <arguments>
+            <argument name="nthColorPicker" type="string" defaultValue="1"/>
+            <argument name="hexColor" type="string" defaultValue="e74c3c"/>
+        </arguments>
+        <!-- This 6x backspace stuff is some magic that is necessary to interact with this field correctly -->
+        <pressKey selector="{{AdminColorPickerSection.hexByIndex(nthColorPicker)}}"
+                  parameterArray="[\Facebook\WebDriver\WebDriverKeys::BACKSPACE,\Facebook\WebDriver\WebDriverKeys::BACKSPACE,
+                  \Facebook\WebDriver\WebDriverKeys::BACKSPACE,\Facebook\WebDriver\WebDriverKeys::BACKSPACE,
+                  \Facebook\WebDriver\WebDriverKeys::BACKSPACE,\Facebook\WebDriver\WebDriverKeys::BACKSPACE,'{{hexColor}}']" stepKey="fillHex"/>
+        <click selector="{{AdminColorPickerSection.submitByIndex(nthColorPicker)}}" stepKey="submitColor"/>
+    </actionGroup>
+    <actionGroup name="openSwatchMenuByIndex">
+        <arguments>
+            <argument name="index" type="string" defaultValue="0"/>
+        </arguments>
+        <!-- I had to use executeJS to perform the click to get around the use of CSS ::before and ::after -->
+        <executeJS function="jQuery('#swatch_window_option_option_{{index}}').click()" stepKey="clickSwatch"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Swatches/Test/Mftf/ActionGroup/CreateConfigurationsWithVisualSwatchActionGroup.xml b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/CreateConfigurationsWithVisualSwatchActionGroup.xml
index 4eb4ca0b1327b..4d6896086f91b 100644
--- a/app/code/Magento/Swatches/Test/Mftf/ActionGroup/CreateConfigurationsWithVisualSwatchActionGroup.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/CreateConfigurationsWithVisualSwatchActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="CreateConfigurationsWithVisualSwatch">
         <arguments>
             <argument name="attribute" defaultValue="VisualSwatchAttribute"/>
@@ -59,4 +59,13 @@
         <click selector="{{AdminChooseAffectedAttributeSetSection.confirm}}" stepKey="clickOnConfirmInPopup"/>
         <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSaveProductMessage"/>
     </actionGroup>
+    <actionGroup name="CreateConfigurationsWithVisualSwatchVisibleOnStorefront" extends="CreateConfigurationsWithVisualSwatch">
+        <click selector="{{AdminNewAttributePanelSection.storefrontPropertiesTab}}" after="fillDefaultStoreLabel2" stepKey="expandStorefrontPropertiesTab"/>
+        <selectOption selector="{{AdminNewAttributePanelSection.useInSearch}}" userInput="1" after="expandStorefrontPropertiesTab" stepKey="enableUseInSearch"/>
+        <selectOption selector="{{AdminNewAttributePanelSection.visibleInAdvancedSearch}}" userInput="1" after="enableUseInSearch" stepKey="enableVisibleInAdvancedSearch"/>
+        <selectOption selector="{{AdminNewAttributePanelSection.comparableOnStorefront}}" userInput="1" after="enableVisibleInAdvancedSearch" stepKey="enableComparableOnStorefront"/>
+        <selectOption selector="{{AdminNewAttributePanelSection.useInLayeredNavigation}}" userInput="1" after="enableComparableOnStorefront" stepKey="enableUseInLayeredNavigation"/>
+        <selectOption selector="{{AdminNewAttributePanelSection.visibleOnCatalogPagesOnStorefront}}" userInput="1" after="enableUseInLayeredNavigation" stepKey="enableVisibleOnCatalogPagesOnStorefront"/>
+        <selectOption selector="{{AdminNewAttributePanelSection.useInProductListing}}" userInput="1" after="enableVisibleOnCatalogPagesOnStorefront" stepKey="enableUseInProductListing"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Data/SwatchAttributeData.xml b/app/code/Magento/Swatches/Test/Mftf/Data/SwatchAttributeData.xml
index 7822120337e1d..c2e0cce712889 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Data/SwatchAttributeData.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Data/SwatchAttributeData.xml
@@ -11,5 +11,6 @@
     <entity name="VisualSwatchAttribute" type="SwatchAttribute">
         <data key="default_label" unique="suffix">VisualSwatchAttr</data>
         <data key="input_type">Visual Swatch</data>
+        <data key="attribute_code" unique="suffix">visual_swatch</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Page/AdminProductAttributeFormPage.xml b/app/code/Magento/Swatches/Test/Mftf/Page/AdminProductAttributeFormPage.xml
new file mode 100644
index 0000000000000..efad7e7b3578b
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Page/AdminProductAttributeFormPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="ProductAttributePage" url="catalog/product_attribute/new/" area="admin" module="Magento_Catalog">
+        <section name="AdminColorPickerSection"/>
+        <section name="AdminManageSwatchImageSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Section/AdminColorPickerSection.xml b/app/code/Magento/Swatches/Test/Mftf/Section/AdminColorPickerSection.xml
new file mode 100644
index 0000000000000..772b724b6648d
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Section/AdminColorPickerSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminColorPickerSection">
+        <element name="hexByIndex" type="input" selector="//div[@class='colorpicker'][{{var}}]/div[@class='colorpicker_hex']/input" parameterized="true"/>
+        <element name="submitByIndex" type="button" selector="//div[@class='colorpicker'][{{var}}]/div[@class='colorpicker_submit']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Section/AdminManageSwatchSection.xml b/app/code/Magento/Swatches/Test/Mftf/Section/AdminManageSwatchSection.xml
new file mode 100644
index 0000000000000..65eb32aee103a
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Section/AdminManageSwatchSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminManageSwatchSection">
+        <element name="adminInputByIndex" type="input" selector="optionvisual[value][option_{{var}}][0]" parameterized="true"/>
+        <element name="addSwatch" type="button" selector="#add_new_swatch_visual_option_button" timeout="30"/>
+        <element name="chooseColorRow" type="button" selector="#swatch-visual-options-panel table tbody tr:nth-of-type({{var}}) .swatch_row_name.colorpicker_handler" parameterized="true"/>
+        <element name="nthIsDefault" type="input" selector="(//input[@name='defaultvisual[]'])[{{var}}]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml
new file mode 100644
index 0000000000000..c64ba0e89de18
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAttributeTextSwatchesCanBeFiledTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Create/configure swatches product attribute"/>
+            <title value="Check that attribute text swatches can be filed"/>
+            <description value="Check that attribute text swatches can be filed"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-13771"/>
+            <group value="swatches"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!-- Create 10 store views -->
+            <actionGroup ref="AdminCreateStoreViewUseStringArgumentsActionGroup" stepKey="createStoreView">
+                <argument name="storeGroupName" value="{{_defaultStoreGroup.name}}" />
+                <argument name="customStoreName" value="{{customStore.name}}" />
+                <argument name="customStoreCode" value="{{customStore.code}}" />
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewUseStringArgumentsActionGroup" stepKey="createStoreView1">
+                <argument name="storeGroupName" value="{{_defaultStoreGroup.name}}" />
+                <argument name="customStoreName" value="{{customStore.name}}1" />
+                <argument name="customStoreCode" value="{{customStore.code}}1" />
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewUseStringArgumentsActionGroup" stepKey="createStoreView2">
+                <argument name="storeGroupName" value="{{_defaultStoreGroup.name}}" />
+                <argument name="customStoreName" value="{{customStore.name}}2" />
+                <argument name="customStoreCode" value="{{customStore.code}}2" />
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewUseStringArgumentsActionGroup" stepKey="createStoreView3">
+                <argument name="storeGroupName" value="{{_defaultStoreGroup.name}}" />
+                <argument name="customStoreName" value="{{customStore.name}}3" />
+                <argument name="customStoreCode" value="{{customStore.code}}3" />
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewUseStringArgumentsActionGroup" stepKey="createStoreView4">
+                <argument name="storeGroupName" value="{{_defaultStoreGroup.name}}" />
+                <argument name="customStoreName" value="{{customStore.name}}4" />
+                <argument name="customStoreCode" value="{{customStore.code}}4" />
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewUseStringArgumentsActionGroup" stepKey="createStoreView5">
+                <argument name="storeGroupName" value="{{_defaultStoreGroup.name}}" />
+                <argument name="customStoreName" value="{{customStore.name}}5" />
+                <argument name="customStoreCode" value="{{customStore.code}}5" />
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewUseStringArgumentsActionGroup" stepKey="createStoreView6">
+                <argument name="storeGroupName" value="{{_defaultStoreGroup.name}}" />
+                <argument name="customStoreName" value="{{customStore.name}}6" />
+                <argument name="customStoreCode" value="{{customStore.code}}6" />
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewUseStringArgumentsActionGroup" stepKey="createStoreView7">
+                <argument name="storeGroupName" value="{{_defaultStoreGroup.name}}" />
+                <argument name="customStoreName" value="{{customStore.name}}7" />
+                <argument name="customStoreCode" value="{{customStore.code}}7" />
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewUseStringArgumentsActionGroup" stepKey="createStoreView8">
+                <argument name="storeGroupName" value="{{_defaultStoreGroup.name}}" />
+                <argument name="customStoreName" value="{{customStore.name}}8" />
+                <argument name="customStoreCode" value="{{customStore.code}}8" />
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewUseStringArgumentsActionGroup" stepKey="createStoreView9">
+                <argument name="storeGroupName" value="{{_defaultStoreGroup.name}}" />
+                <argument name="customStoreName" value="{{customStore.name}}9" />
+                <argument name="customStoreCode" value="{{customStore.code}}9" />
+            </actionGroup>
+        </before>
+        <after>
+            <!-- Delete all 10 store views -->
+            <actionGroup ref="AdminDeleteStoreViewUseStringArgumentsActionGroup" stepKey="deleteStoreView">
+                <argument name="customStoreName" value="{{customStore.name}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewUseStringArgumentsActionGroup" stepKey="deleteStoreView1">
+                <argument name="customStoreName" value="{{customStore.name}}1"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewUseStringArgumentsActionGroup" stepKey="deleteStoreView2">
+                <argument name="customStoreName" value="{{customStore.name}}2"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewUseStringArgumentsActionGroup" stepKey="deleteStoreView3">
+                <argument name="customStoreName" value="{{customStore.name}}3"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewUseStringArgumentsActionGroup" stepKey="deleteStoreView4">
+                <argument name="customStoreName" value="{{customStore.name}}4"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewUseStringArgumentsActionGroup" stepKey="deleteStoreView5">
+                <argument name="customStoreName" value="{{customStore.name}}5"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewUseStringArgumentsActionGroup" stepKey="deleteStoreView6">
+                <argument name="customStoreName" value="{{customStore.name}}6"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewUseStringArgumentsActionGroup" stepKey="deleteStoreView7">
+                <argument name="customStoreName" value="{{customStore.name}}7"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewUseStringArgumentsActionGroup" stepKey="deleteStoreView8">
+                <argument name="customStoreName" value="{{customStore.name}}8"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewUseStringArgumentsActionGroup" stepKey="deleteStoreView9">
+                <argument name="customStoreName" value="{{customStore.name}}9"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Navigate to Product attribute page-->
+        <amOnPage url="{{ProductAttributePage.url}}" stepKey="navigateToNewProductAttributePage"/>
+        <fillField userInput="test_label" selector="{{AttributePropertiesSection.defaultLabel}}" stepKey="fillDefaultLabel"/>
+        <selectOption selector="{{AttributePropertiesSection.inputType}}" userInput="Text Swatch" stepKey="selectInputType"/>
+        <click selector="{{AdvancedAttributePropertiesSection.addSwatch}}" stepKey="clickAddSwatch"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+
+        <!-- Get field outer width -->
+        <executeJS function="return jQuery(&quot;{{AttributeManageSwatchSection.descriptionField('0','0')}}&quot;).outerWidth();" stepKey="getElementWidth"/>
+        <assertGreaterThanOrEqual stepKey="assertElementsWidthIsGreaterOrEqual">
+            <expectedResult type="int">30</expectedResult>
+            <actualResult type="variable">getElementWidth</actualResult>
+        </assertGreaterThanOrEqual>
+
+        <!-- Fill Swatch and Description fields for Admin -->
+        <fillField selector="{{AttributeManageSwatchSection.swatchField('0','0')}}" userInput="test" stepKey="fillSwatchForAdmin"/>
+        <fillField selector="{{AttributeManageSwatchSection.descriptionField('0','0')}}" userInput="test" stepKey="fillDescriptionForAdmin"/>
+
+        <!-- Grab value Swatch and Description fields for Admin -->
+        <grabValueFrom selector="{{AttributeManageSwatchSection.swatchField('0','0')}}" stepKey="grabSwatchForAdmin"/>
+        <grabValueFrom selector="{{AttributeManageSwatchSection.descriptionField('0','0'')}}" stepKey="grabDescriptionForAdmin"/>
+
+        <!-- Check that Swatch and Description fields for Admin are not empty-->
+        <assertNotEmpty actual="$grabSwatchForAdmin" stepKey="checkSwatchFieldForAdmin"/>
+        <assertNotEmpty actual="$grabDescriptionForAdmin" stepKey="checkDescriptionFieldForAdmin"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchWithNonValidOptionsTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchWithNonValidOptionsTest.xml
new file mode 100644
index 0000000000000..c36369bab424f
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchWithNonValidOptionsTest.xml
@@ -0,0 +1,109 @@
+<?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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminCreateVisualSwatchWithNonValidOptionsTest">
+        <annotations>
+            <features value="Swatches"/>
+            <stories value="Create/configure swatches product attribute"/>
+            <title value="Admin should be able to create swatch product attribute"/>
+            <description value="Admin should be able to create swatch product attribute"/>
+            <severity value="BLOCKER"/>
+            <testCaseId value="MAGETWO-95487"/>
+            <group value="swatches"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <!-- Remove attribute -->
+            <actionGroup ref="deleteProductAttribute" stepKey="deleteProductAttribute">
+                <argument name="ProductAttribute" value="VisualSwatchAttribute"/>
+            </actionGroup>
+
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <amOnPage url="{{ProductAttributePage.url}}" stepKey="navigateToNewProductAttributePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+
+        <!-- Set attribute properties -->
+        <fillField selector="{{AttributePropertiesSection.defaultLabel}}"
+                   userInput="{{VisualSwatchAttribute.default_label}}" stepKey="fillDefaultLabel"/>
+        <selectOption selector="{{AttributePropertiesSection.inputType}}"
+                      userInput="{{VisualSwatchAttribute.input_type}}" stepKey="fillInputType"/>
+
+        <!-- Set advanced attribute properties -->
+        <click selector="{{AdvancedAttributePropertiesSection.advancedAttributePropertiesSectionToggle}}"
+               stepKey="showAdvancedAttributePropertiesSection"/>
+        <waitForElementVisible selector="{{AdvancedAttributePropertiesSection.attributeCode}}"
+                               stepKey="waitForSlideOut"/>
+        <fillField selector="{{AdvancedAttributePropertiesSection.attributeCode}}"
+                   userInput="{{VisualSwatchAttribute.attribute_code}}"
+                   stepKey="fillAttributeCode"/>
+
+        <!-- Add new swatch option without label -->
+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch"/>
+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch">
+            <argument name="index" value="0"/>
+        </actionGroup>
+        <click selector="{{AdminManageSwatchSection.chooseColorRow('1')}}" stepKey="clickChooseColor"/>
+        <actionGroup ref="setColorPickerValueByHex" stepKey="fillHex">
+            <argument name="hexColor" value="ff0000"/>
+        </actionGroup>
+
+        <!-- Scroll to top of the page -->
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+
+        <!-- Save the new product attribute -->
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave1"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.error}}" stepKey="waitForError"/>
+
+        <!-- Fill options data -->
+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('0')}}"
+                   userInput="red" stepKey="fillAdmin"/>
+
+        <!-- Add 2 additional new swatch options -->
+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch1"/>
+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch1">
+            <argument name="index" value="1"/>
+        </actionGroup>
+        <click selector="{{AdminManageSwatchSection.chooseColorRow('2')}}" stepKey="clickChooseColor1"/>
+        <actionGroup ref="setColorPickerValueByHex" stepKey="fillHex1">
+            <argument name="nthColorPicker" value="2"/>
+            <argument name="hexColor" value="00ff00"/>
+        </actionGroup>
+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('1')}}"
+                   userInput="green" stepKey="fillAdmin1"/>
+
+        <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch2"/>
+        <actionGroup ref="openSwatchMenuByIndex" stepKey="clickSwatch2">
+            <argument name="index" value="2"/>
+        </actionGroup>
+        <click selector="{{AdminManageSwatchSection.chooseColorRow('3')}}" stepKey="clickChooseColor2"/>
+        <actionGroup ref="setColorPickerValueByHex" stepKey="fillHex2">
+            <argument name="nthColorPicker" value="3"/>
+            <argument name="hexColor" value="0000ff"/>
+        </actionGroup>
+        <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('2')}}"
+                   userInput="blue" stepKey="fillAdmin2"/>
+
+        <!-- Mark second option as default -->
+        <click selector="{{AdminManageSwatchSection.nthIsDefault('2')}}" stepKey="setSecondOptionAsDefault"/>
+
+        <!-- Save the new product attribute -->
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave2"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}"
+                               stepKey="waitForSuccessMessage"/>
+
+        <actionGroup ref="navigateToCreatedProductAttribute" stepKey="navigateToAttribute">
+            <argument name="productAttribute" value="VisualSwatchAttribute"/>
+        </actionGroup>
+        <!-- Check attribute data -->
+        <seeCheckboxIsChecked selector="{{AdminManageSwatchSection.nthIsDefault('2')}}" stepKey="checkDefaultOption"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
new file mode 100644
index 0000000000000..f5bb9372266e0
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.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="StorefrontSwatchAttributesDisplayInWidgetCMSTest">
+        <annotations>
+            <features value="Swatches"/>
+            <stories value="Create/configure swatches product attribute"/>
+            <title value="Swatch Attribute is not displayed in the Widget CMS"/>
+            <description value="Swatch Attribute is not displayed in the Widget CMS"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14844"/>
+            <useCaseId value="MAGETWO-94147"/>
+            <group value="configurableProduct"/>
+            <group value="swatches"/>
+            <group value="cms"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+
+        <before>
+            <!--create category-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <!--Login-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdmin"/>
+            <!--Create a configurable swatch product via the UI -->
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
+            <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
+                <argument name="product" value="BaseConfigurableProduct"/>
+            </actionGroup>
+            <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
+                <argument name="product" value="BaseConfigurableProduct"/>
+            </actionGroup>
+            <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="searchAndSelectCategory"/>
+            <!--Add swatch attribute to configurable product-->
+            <actionGroup ref="CreateConfigurationsWithVisualSwatchVisibleOnStorefront" stepKey="addSwatchToProduct"/>
+            <!--Create CMS page-->
+            <actionGroup ref="CreateNewPageWithWidgetWithCategoryCondition" stepKey="createCMSPageWithWidget">
+                <argument name="categoryId" value="$$createCategory.id$$"/>
+                <argument name="conditionOperator" value="contains"/>
+            </actionGroup>
+        </before>
+
+        <after>
+            <!--delete created category-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <!--delete created configurable product-->
+            <actionGroup ref="DeleteAllProductsOnProductsGridPageFilteredByName" stepKey="deleteAllCreatedProducts">
+                <argument name="product" value="BaseConfigurableProduct"/>
+            </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
+            <!--delete created attribute product-->
+            <actionGroup ref="DeleteProductAttribute" stepKey="deleteAttribute">
+                <argument name="productAttribute" value="VisualSwatchAttribute"/>
+            </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter1"/>
+            <!--delete created page product-->
+            <actionGroup ref="DeletePageByUrlKeyActionGroup" stepKey="deletePage">
+                <argument name="urlKey" value="{{_defaultCmsPage.identifier}}"/>
+            </actionGroup>
+            <!--logout-->
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+        <!--Open Storefront page for the new created page-->
+        <amOnPage url="{{StorefrontCmsPage.url(_defaultCmsPage.identifier)}}" stepKey="goToCreatedCmsPage"/>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.swatchOptionByLabel(VisualSwatchOption1.default_label)}}" stepKey="waitForSwatchOptionsAppear"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.swatchOptionByLabel(VisualSwatchOption1.default_label)}}" stepKey="assertAddedWidgetS"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.swatchOptionByLabel(VisualSwatchOption2.default_label)}}" stepKey="assertAddedWidgetM"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml
index 1786b9bad236d..6f51bcf33bd7e 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontSwatchProductWithFileCustomOptionTest">
         <annotations>
             <features value="ConfigurableProduct"/>
@@ -50,7 +50,9 @@
         <!--Add swatch attribute to configurable product-->
         <actionGroup ref="CreateConfigurationsWithVisualSwatch" stepKey="createConfigurationsWithVisualSwatch"/>
         <!--Add custom option to configurable product-->
-        <actionGroup ref="AddProductCustomOptionFile" stepKey="addCustomOptionToProduct"/>
+        <actionGroup ref="AddProductCustomOptionFile" stepKey="addCustomOptionToProduct">
+            <argument name="option" value="ProductOptionFile"/>
+        </actionGroup>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
 
         <!--Go to storefront-->
@@ -70,7 +72,6 @@
         <!--Try invalid file-->
         <attachFile selector="{{StorefrontProductInfoMainSection.addLinkFileUploadFile(ProductOptionFile.title)}}" userInput="lorem_ipsum.docx" stepKey="attachInvalidFile"/>
         <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="addToCartInvalidFile"/>
-        <waitForPageLoad time="30" stepKey="waitForAddToCartWithError"/>
         <waitForElementVisible selector="{{StorefrontProductPageSection.alertMessage}}" stepKey="waitForErrorMessageInvalidFile"/>
         <see selector="{{StorefrontProductPageSection.messagesBlock}}" userInput="The file 'lorem_ipsum.docx' for '{{ProductOptionFile.title}}' has an invalid extension." stepKey="seeMessageInvalidFile"/>
         <!--Swatch remains selected-->
diff --git a/app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/Listing/ConfigurableTest.php b/app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/Listing/ConfigurableTest.php
index 6b72422d05014..a876a4dcc85c1 100644
--- a/app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/Listing/ConfigurableTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/Listing/ConfigurableTest.php
@@ -61,6 +61,21 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject */
     private $variationPricesMock;
 
+    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    private $layerResolverMock;
+
+    /** @var ObjectManagerHelper */
+    private $objectManagerHelper;
+
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $storeManagerMock;
+
+    /** @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
+    private $customerSessionMock;
+
+    /**
+     * @inheritdoc
+     */
     public function setUp()
     {
         $this->arrayUtils = $this->createMock(\Magento\Framework\Stdlib\ArrayUtils::class);
@@ -82,9 +97,35 @@ public function setUp()
         $this->variationPricesMock = $this->createMock(
             \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices::class
         );
+        $this->layerResolverMock = $this->createMock(\Magento\Catalog\Model\Layer\Resolver::class);
+
+        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+            ->setMethods(['getStore'])
+            ->getMockForAbstractClass();
+        $this->customerSessionMock = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCustomerGroupId'])
+            ->getMock();
+
+        $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->prepareObjectManager([
+            [
+                \Magento\Framework\Locale\Format::class,
+                $this->createMock(\Magento\Framework\Locale\Format::class),
+            ],
+            [
+                \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices::class,
+                $this->createMock(
+                    \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices::class
+                ),
+            ],
+            [
+                \Magento\Customer\Model\Session::class,
+                $this->customerSessionMock,
+            ],
+        ]);
 
-        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->configurable = $objectManagerHelper->getObject(
+        $this->configurable = $this->objectManagerHelper->getObject(
             \Magento\Swatches\Block\Product\Renderer\Listing\Configurable::class,
             [
                 'scopeConfig' => $this->scopeConfig,
@@ -100,9 +141,15 @@ public function setUp()
                 'priceCurrency' => $this->priceCurrency,
                 'configurableAttributeData' => $this->configurableAttributeData,
                 'data' => [],
-                'variationPrices' => $this->variationPricesMock
+                'variationPrices' => $this->variationPricesMock,
+                'layerResolver' => $this->layerResolverMock,
             ]
         );
+        $this->objectManagerHelper->setBackwardCompatibleProperty(
+            $this->configurable,
+            '_storeManager',
+            $this->storeManagerMock
+        );
     }
 
     /**
@@ -235,4 +282,54 @@ public function testGetPricesJson()
         $this->jsonEncoder->expects($this->once())->method('encode')->with($expectedPrices);
         $this->configurable->getPricesJson();
     }
+
+    /**
+     * @param $map
+     */
+    private function prepareObjectManager($map)
+    {
+        $objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
+            ->setMethods(['getInstance'])
+            ->getMockForAbstractClass();
+        $objectManagerMock->expects($this->any())->method('getInstance')->willReturnSelf();
+        $objectManagerMock->expects($this->any())
+            ->method('get')
+            ->will($this->returnValueMap($map));
+        $reflectionClass = new \ReflectionClass(\Magento\Framework\App\ObjectManager::class);
+        $reflectionProperty = $reflectionClass->getProperty('_instance');
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($objectManagerMock);
+    }
+
+    /**
+     * Test receiving cache key info.
+     */
+    public function testGetCacheKeyInfo()
+    {
+        $expected = [
+                0 => 'BLOCK_TPL',
+                1 => 'default',
+                2 => null,
+                'base_url' => null,
+                'template' => null,
+                3 => 'USD',
+                4 => null,
+                5 => 'STORE_1_CAT_25_CUSTGROUP_0_color_53',
+            ];
+        $stateKey = 'STORE_1_CAT_25_CUSTGROUP_0_color_53';
+
+        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)->getMockForAbstractClass();
+        $storeMock->expects($this->any())->method('getCode')->willReturn('default');
+        $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($storeMock);
+        $currency = $this->getMockBuilder(\Magento\Directory\Model\Currency::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->priceCurrency->expects($this->once())->method('getCurrency')->willReturn($currency);
+        $currency->expects($this->once())->method('getCode')->willReturn('USD');
+        $layer = $this->createMock(\Magento\Catalog\Model\Layer::class);
+        $this->layerResolverMock->expects($this->once())->method('get')->willReturn($layer);
+        $layer->expects($this->once())->method('getStateKey')->willReturn($stateKey);
+
+        $this->assertEquals($this->configurable->getCacheKeyInfo(), $expected);
+    }
 }
diff --git a/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php b/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php
index 7a110c63da79e..5a11e2787bc69 100644
--- a/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php
@@ -20,6 +20,9 @@ class MediaTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Catalog\Model\ProductFactory|\PHPUnit_Framework_MockObject_MockObject */
     private $productModelFactoryMock;
 
+    /** @var \Magento\PageCache\Model\Config|\PHPUnit_Framework_MockObject_MockObject */
+    private $config;
+
     /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject */
     private $productMock;
 
@@ -29,6 +32,9 @@ class MediaTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
     private $requestMock;
 
+    /** @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $responseMock;
+
     /** @var \Magento\Framework\Controller\ResultFactory|\PHPUnit_Framework_MockObject_MockObject */
     private $resultFactory;
 
@@ -57,11 +63,20 @@ protected function setUp()
             \Magento\Catalog\Model\ProductFactory::class,
             ['create']
         );
+        $this->config = $this->createMock(\Magento\PageCache\Model\Config::class);
+        $this->config->method('getTtl')->willReturn(1);
+
         $this->productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
         $this->contextMock = $this->createMock(\Magento\Framework\App\Action\Context::class);
 
         $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
         $this->contextMock->method('getRequest')->willReturn($this->requestMock);
+        $this->responseMock = $this->getMockBuilder(\Magento\Framework\App\ResponseInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setPublicHeaders'])
+            ->getMockForAbstractClass();
+        $this->responseMock->method('setPublicHeaders')->willReturnSelf();
+        $this->contextMock->method('getResponse')->willReturn($this->responseMock);
         $this->resultFactory = $this->createPartialMock(\Magento\Framework\Controller\ResultFactory::class, ['create']);
         $this->contextMock->method('getResultFactory')->willReturn($this->resultFactory);
 
@@ -73,7 +88,8 @@ protected function setUp()
             [
                 'context' => $this->contextMock,
                 'swatchHelper' => $this->swatchHelperMock,
-                'productModelFactory' => $this->productModelFactoryMock
+                'productModelFactory' => $this->productModelFactoryMock,
+                'config' => $this->config
             ]
         );
     }
@@ -86,6 +102,10 @@ public function testExecute()
             ->method('load')
             ->with(59)
             ->willReturn($this->productMock);
+        $this->productMock
+            ->expects($this->once())
+            ->method('getIdentities')
+            ->willReturn(['tags']);
 
         $this->productModelFactoryMock
             ->expects($this->once())
diff --git a/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php b/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
index 5732018f7615f..58f9ea821f0b4 100644
--- a/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
@@ -278,6 +278,8 @@ public function testLoadVariationByFallback($product)
         $metadataMock = $this->createMock(\Magento\Framework\EntityManager\EntityMetadataInterface::class);
         $this->metaDataPoolMock->expects($this->once())->method('getMetadata')->willReturn($metadataMock);
         $metadataMock->expects($this->once())->method('getLinkField')->willReturn('id');
+        $this->productMock->expects($this->once())->method('getTypeInstance')->willReturn($this->configurableMock);
+        $this->attributeMock->method('getData')->with('attribute_code')->willReturn('color');
 
         $this->getSwatchAttributes($product);
 
diff --git a/app/code/Magento/Swatches/composer.json b/app/code/Magento/Swatches/composer.json
index 26d6325447b2e..a97fed5a8dc6b 100644
--- a/app/code/Magento/Swatches/composer.json
+++ b/app/code/Magento/Swatches/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-swatches",
     "description": "Add Swatches to Products",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-catalog": "102.0.*",
         "magento/module-configurable-product": "100.2.*",
         "magento/module-eav": "101.0.*",
@@ -12,6 +12,7 @@
         "magento/module-media-storage": "100.2.*",
         "magento/module-config": "101.0.*",
         "magento/module-theme": "100.2.*",
+        "magento/module-page-cache": "100.2.*",
         "magento/framework": "101.0.*"
     },
     "suggest": {
@@ -19,7 +20,7 @@
         "magento/module-swatches-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "proprietary"
     ],
diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/js.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/js.phtml
index 13037e3aeea8e..dc390af00c62c 100644
--- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/js.phtml
+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/js.phtml
@@ -4,14 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <script type="text/x-magento-init">
     {
         "*": {
             "swatchesProductAttributes": {
-                "hiddenFields": <?= /* @escapeNotVerified */ json_encode($this->helper('Magento\Catalog\Helper\Data')->getAttributeHiddenFields()) ?>
+                "hiddenFields": <?= /* @noEscape */ json_encode($this->helper(Magento\Catalog\Helper\Data::class)->getAttributeHiddenFields()) ?>
             },
             "swatchesTypeChange": { }
         }
diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
index 8d4400b3d0477..d436dc8d1ef3a 100644
--- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Swatches\Block\Adminhtml\Attribute\Edit\Options\Text */
 
 $stores = $block->getStoresSortedBySortOrder();
@@ -20,9 +18,8 @@ $stores = $block->getStoresSortedBySortOrder();
             <tr id="swatch-text-options-table">
                 <th class="col-draggable"></th>
                 <th class="col-default"><span><?= $block->escapeHtml(__('Is Default')) ?></span></th>
-                <?php foreach ($stores as $_store): ?>
-                    <th class="col-swatch col-<%- data.id %>
-                        <?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> _required<?php endif; ?>"
+                <?php foreach ($stores as $_store) : ?>
+                    <th class="col-swatch col-swatch-min-width col-<%- data.id %><?= ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID) ? ' _required' : '' ?>"
                         colspan="2">
                         <span><?= $block->escapeHtml($_store->getName()) ?></span>
                     </th>
@@ -41,7 +38,7 @@ $stores = $block->getStoresSortedBySortOrder();
             </tr>
             <tr>
                 <th colspan="<?= (int)$colTotal ?>" class="col-actions-add">
-                    <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
+                    <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) : ?>
                         <button id="add_new_swatch_text_option_button"
                                 title="<?= $block->escapeHtml(__('Add Swatch')) ?>"
                                 type="button" class="action- scalable add">
@@ -57,44 +54,44 @@ $stores = $block->getStoresSortedBySortOrder();
     <script id="swatch-text-row-template" type="text/x-magento-template">
         <tr>
             <td class="col-draggable">
-                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()): ?>
+                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) : ?>
                     <div data-role="draggable-handle"
                          class="draggable-handle"
-                         title="<?= $block->escapeHtml(__('Sort Option')) ?>"></div>
+                         title="<?= $block->escapeHtmlAttr(__('Sort Option')) ?>"></div>
                 <?php endif; ?>
                 <input data-role="order" type="hidden" name="optiontext[order][<%- data.id %>]"
                        value="<%- data.sort_order %>"
-                    <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()): ?> disabled="disabled"<?php endif; ?>
+                    <?= ($block->getReadOnly() || $block->canManageOptionDefaultOnly()) ? ' disabled="disabled"' : '' ?>
                 />
             </td>
             <td class="col-default">
                 <input class="input-radio"
                        type="<%- data.intype %>"
                        name="defaulttext[]"
-                       value="<%- data.id %>" <%- data.checked %><?php if ($block->getReadOnly()):?>disabled="disabled"<?php endif;?>/>
+                       value="<%- data.id %>" <%- data.checked %><?= ($block->getReadOnly()) ? ' disabled="disabled"' : '' ?>/>
             </td>
-            <?php foreach ($stores as $_store): ?>
+            <?php foreach ($stores as $_store) : ?>
                 <?php $storeId = (int)$_store->getId(); ?>
-                <td class="col-swatch col-<%- data.id %>">
+                <td class="col-swatch col-swatch-min-width col-<%- data.id %>">
                     <input class="input-text
                         swatch-text-field-<?= /* @noEscape */ $storeId ?>
-                        <?php if ($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option required-unique<?php endif; ?>"
+                        <?= ($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID) ? ' required-option required-unique' : '' ?>"
                            name="swatchtext[value][<%- data.id %>][<?= /* @noEscape */ $storeId ?>]"
                            type="text" value="<%- data.swatch<?= /* @noEscape */ $storeId ?> %>"
-                           placeholder="<?= $block->escapeHtml(__("Swatch")) ?>"/>
+                           placeholder="<?= $block->escapeHtmlAttr(__("Swatch")) ?>"/>
                 </td>
-                <td class="swatch-col-<%- data.id %>">
+                <td class="col-swatch-min-width swatch-col-<%- data.id %>">
                     <input name="optiontext[value][<%- data.id %>][<?= /* @noEscape */ $storeId ?>]"
                            value="<%- data.store<?= /* @noEscape */ $storeId ?> %>"
-                           class="input-text<?php if ($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>"
-                           type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>
-                           placeholder="<?= $block->escapeHtml(__("Description")) ?>"/>
+                           class="input-text<?= ($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID) ? ' required-option' : '' ?>"
+                           type="text" <?= ($block->getReadOnly() || $block->canManageOptionDefaultOnly()) ? ' disabled="disabled"' : ''?>
+                           placeholder="<?= $block->escapeHtmlAttr(__("Description")) ?>"/>
                 </td>
             <?php endforeach; ?>
             <td id="delete_button_swatch_container_<%- data.id %>" class="col-delete">
                 <input type="hidden" class="delete-flag" name="optiontext[delete][<%- data.id %>]" value="" />
-                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
-                    <button title="<?= $block->escapeHtml(__('Delete')) ?>" type="button"
+                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) : ?>
+                    <button title="<?= $block->escapeHtmlAttr(__('Delete')) ?>" type="button"
                             class="action- scalable delete delete-option">
                         <span><?= $block->escapeHtml(__('Delete')) ?></span>
                     </button>
@@ -105,10 +102,10 @@ $stores = $block->getStoresSortedBySortOrder();
     <script type="text/x-magento-init">
         {
             "*": {
-                "Magento_Swatches/js/text": <?= /* @escapeNotVerified */ $block->getJsonConfig() ?> ,
+                "Magento_Swatches/js/text": <?= /* @noEscape */ $block->getJsonConfig() ?> ,
                 "Magento_Catalog/catalog/product/attribute/unique-validate": {
                     "element": "required-text-swatch-unique",
-                    "message": "<?= $block->escapeHtml(__("The value of Admin must be unique.")) ?>"
+                    "message": "<?= $block->escapeJs($block->escapeHtml(__("The value of Admin must be unique."))) ?>"
                 }
             }
         }
diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
index 5b971d9a99a3b..b7b1ab5fc5323 100644
--- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
@@ -4,15 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Swatches\Block\Adminhtml\Attribute\Edit\Options\Visual */
 
 $stores = $block->getStoresSortedBySortOrder();
 ?>
 <fieldset class="admin__fieldset fieldset">
     <legend class="legend">
-        <span><?= $block->escapeHtml( __('Manage Swatch (Values of Your Attribute)')) ?></span>
+        <span><?= $block->escapeHtml(__('Manage Swatch (Values of Your Attribute)')) ?></span>
     </legend><br />
     <div class="admin__control-table-wrapper" id="swatch-visual-options-panel">
         <table class="data-table clearfix" cellspacing="0">
@@ -21,13 +19,12 @@ $stores = $block->getStoresSortedBySortOrder();
                 <th class="col-draggable"></th>
                 <th class="col-default"><span><?= $block->escapeHtml(__('Is Default')) ?></span></th>
                 <th><span><?= $block->escapeHtml(__('Swatch')) ?></span></th>
-                <?php foreach ($stores as $_store): ?>
-                    <th<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> class="_required"<?php endif; ?>>
+                <?php foreach ($stores as $_store) : ?>
+                    <th<?= ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID) ? ' class="_required"' : '' ?>
                         <span><?= $block->escapeHtml($_store->getName()) ?></span>
                     </th>
-                <?php endforeach;
-                $colTotal = count($stores) * 2 + 3;
-                ?>
+                <?php endforeach; ?>
+                <?php $colTotal = count($stores) * 2 + 3; ?>
                 <th class="col-delete">&nbsp;</th>
             </tr>
             </thead>
@@ -41,7 +38,7 @@ $stores = $block->getStoresSortedBySortOrder();
             </tr>
             <tr>
                 <th colspan="<?= (int)$colTotal ?>" class="col-actions-add">
-                    <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()): ?>
+                    <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) : ?>
                         <button id="add_new_swatch_visual_option_button"
                                 title="<?= $block->escapeHtml(__('Add Swatch')) ?>"
                                 type="button" class="action- scalable add">
@@ -57,14 +54,14 @@ $stores = $block->getStoresSortedBySortOrder();
     <script id="swatch-visual-row-template" type="text/x-magento-template">
         <tr>
             <td class="col-draggable">
-                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()): ?>
+                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) : ?>
                     <div data-role="draggable-handle" class="draggable-handle"
                          title="<?= $block->escapeHtml(__('Sort Option')) ?>"></div>
                 <?php endif; ?>
-                <input data-role="order" type="hidden" name="optionvisual[order][<%- data.id %>]"  value="<%- data.sort_order %>" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()): ?> disabled="disabled"<?php endif; ?>/>
+                <input data-role="order" type="hidden" name="optionvisual[order][<%- data.id %>]"  value="<%- data.sort_order %>" <?= ($block->getReadOnly() || $block->canManageOptionDefaultOnly()) ? ' disabled="disabled"' : '' ?>/>
             </td>
             <td class="col-default">
-                <input class="input-radio" type="<%- data.intype %>" name="defaultvisual[]" value="<%- data.id %>" <%- data.checked %><?php if ($block->getReadOnly()):?>disabled="disabled"<?php endif;?>/>
+                <input class="input-radio" type="<%- data.intype %>" name="defaultvisual[]" value="<%- data.id %>" <%- data.checked %><?= ($block->getReadOnly()) ? ' disabled="disabled"' : '' ?>/>
             </td>
             <td class="swatches-visual-col col-default <%- data.empty_class %>">
                 <?php //@todo add logic getting swatch value from db */ ?>
@@ -88,17 +85,17 @@ $stores = $block->getStoresSortedBySortOrder();
                     </div>
                 </div>
             </td>
-            <?php foreach ($stores as $_store): ?>
+            <?php foreach ($stores as $_store) : ?>
                 <td class="swatch-col-<%- data.id %>">
                     <input name="optionvisual[value][<%- data.id %>][<?= (int)$_store->getId() ?>]"
                            value="<%- data.store<?= (int) $_store->getId() ?> %>"
-                           class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option required-unique<?php endif; ?>"
-                           type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()): ?> disabled="disabled"<?php endif; ?>/>
+                           class="input-text<?= ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID) ? ' required-option required-unique' : '' ?>"
+                           type="text" <?= ($block->getReadOnly() || $block->canManageOptionDefaultOnly()) ? ' disabled="disabled"' : '' ?>/>
                 </td>
             <?php endforeach; ?>
             <td id="delete_button_swatch_container_<%- data.id %>" class="col-delete">
                 <input type="hidden" class="delete-flag" name="optionvisual[delete][<%- data.id %>]" value="" />
-                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
+                <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) : ?>
                     <button title="<?= $block->escapeHtml(__('Delete')) ?>" type="button"
                             class="action- scalable delete delete-option">
                         <span><?= $block->escapeHtml(__('Delete')) ?></span>
diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
index 9cbda396b2624..adb13e7f24c34 100644
--- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
@@ -4,12 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\AttributeValues */
 ?>
-<div data-bind="scope: '<?= /* @escapeNotVerified */  $block->getComponentName() ?>'">
-    <h2 class="steps-wizard-title"><?= /* @escapeNotVerified */  __('Step 2: Attribute Values') ?></h2>
+<div data-bind="scope: '<?= $block->escapeHtmlAttr($block->getComponentName()) ?>'">
+    <h2 class="steps-wizard-title"><?= $block->escapeHtml(__('Step 2: Attribute Values')) ?></h2>
     <div class="steps-wizard-info">
         <span><?= $block->escapeHtml(__('Select from the following attribute values for this product. Each unique combination of values creates a unique product SKU.')) ?></span>
     </div>
@@ -25,7 +23,7 @@
                     <div class="attribute-entity-title" data-bind="text: label"></div>
                     <div class="attribute-options-block">
                         (<span class="attribute-length" data-bind="text: $data.options().length"></span>
-                        <?= /* @escapeNotVerified */  __('Options') ?>)
+                        <?= $block->escapeHtml(__('Options')) ?>)
                     </div>
                 </div>
 
@@ -34,19 +32,19 @@
                             class="action-select-all action-tertiary"
                             data-bind="click: $parent.selectAllAttributes"
                             title="<?= $block->escapeHtml(__('Select All')) ?>">
-                        <span><?= /* @escapeNotVerified */  __('Select All') ?></span>
+                        <span><?= $block->escapeHtml(__('Select All')) ?></span>
                     </button>
                     <button type="button"
                             class="action-deselect-all action-tertiary"
                             data-bind="click: $parent.deSelectAllAttributes"
                             title="<?= $block->escapeHtml(__('Deselect All')) ?>">
-                        <span><?= /* @escapeNotVerified */  __('Deselect All') ?></span>
+                        <span><?=$block->escapeHtml(__('Deselect All')) ?></span>
                     </button>
                     <button type="button"
                             class="action-remove-all action-tertiary"
                             data-bind="click: $parent.removeAttribute.bind($parent)"
                             title="<?= $block->escapeHtml(__('Remove Attribute')) ?>">
-                        <span><?= /* @escapeNotVerified */  __('Remove Attribute') ?></span>
+                        <span><?= $block->escapeHtml(__('Remove Attribute')) ?></span>
                     </button>
                 </div>
             </div>
@@ -74,14 +72,14 @@
                                     title="<?= $block->escapeHtml(__('Save Option')) ?>"
                                     data-action="save"
                                     data-bind="click: $parents[1].saveOption.bind($parent)">
-                                <span><?= /* @escapeNotVerified */  __('Save Option') ?></span>
+                                <span><?= $block->escapeHtml(__('Save Option')) ?></span>
                             </button>
                             <button type="button"
                                     class="action-remove"
                                     title="<?= $block->escapeHtml(__('Remove Option')) ?>"
                                     data-action="remove"
                                     data-bind="click: $parents[1].removeOption.bind($parent)">
-                                <span><?= /* @escapeNotVerified */  __('Remove Option') ?></span>
+                                <span><?= $block->escapeHtml(__('Remove Option')) ?></span>
                             </button>
                         </div>
                     </li>
@@ -91,7 +89,7 @@
                     type="button"
                     data-action="addOption"
                     data-bind="click: $parent.createOption, visible: canCreateOption">
-                <span><?= /* @escapeNotVerified */  __('Create New Value') ?></span>
+                <span><?= $block->escapeHtml(__('Create New Value')) ?></span>
             </button>
         </div>
     </div>
@@ -101,11 +99,11 @@
         "*": {
             "Magento_Ui/js/core/app": {
                 "components": {
-                    "<?= /* @escapeNotVerified */  $block->getComponentName() ?>": {
+                    "<?= $block->escapeJs($block->getComponentName()) ?>": {
                         "component": "Magento_ConfigurableProduct/js/variations/steps/attributes_values",
-                        "appendTo": "<?= /* @escapeNotVerified */  $block->getParentComponentName() ?>",
-                        "optionsUrl": "<?= /* @escapeNotVerified */  $block->getUrl('catalog/product_attribute/getAttributes') ?>",
-                        "createOptionsUrl": "<?= /* @escapeNotVerified */  $block->getUrl('catalog/product_attribute/createOptions') ?>"
+                        "appendTo": "<?= $block->escapeJs($block->getParentComponentName()) ?>",
+                        "optionsUrl": "<?= $block->escapeJs($block->escapeUrl($block->getUrl('catalog/product_attribute/getAttributes'))) ?>",
+                        "createOptionsUrl": "<?= $block->escapeJs($block->escapeUrl($block->getUrl('catalog/product_attribute/createOptions'))) ?>"
                     }
                 }
             }
diff --git a/app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css b/app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css
index 495b234edf40e..67a5537e3274f 100644
--- a/app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css
+++ b/app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css
@@ -149,6 +149,22 @@
     width: 50px;
 }
 
+.col-swatch-min-width {
+    min-width: 65px;
+}
+
+[class^=swatch-col],
+[class^=col-]:not(.col-draggable):not(.col-default) {
+    min-width: 150px;
+}
+
+#swatch-visual-options-panel,
+#swatch-text-options-panel,
+#manage-options-panel {
+    overflow: auto;
+    width: 100%;
+}
+
 .swatches-visual-col.unavailable:after {
     position: absolute;
     width: 35px;
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 9534e039380d4..02760ecd02f57 100644
--- a/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js
+++ b/app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js
@@ -16,7 +16,8 @@ define([
     'use strict';
 
     return function (optionConfig) {
-        var swatchProductAttributes = {
+        var activePanelClass = 'selected-type-options',
+            swatchProductAttributes = {
                 frontendInput: $('#frontend_input'),
                 isFilterable: $('#is_filterable'),
                 isFilterableInSearch: $('#is_filterable_in_search'),
@@ -337,6 +338,7 @@ define([
                  */
                 _showPanel: function (el) {
                     el.closest('.fieldset').show();
+                    el.addClass(activePanelClass);
                     this._render(el.attr('id'));
                 },
 
@@ -346,6 +348,7 @@ define([
                  */
                 _hidePanel: function (el) {
                     el.closest('.fieldset').hide();
+                    el.removeClass(activePanelClass);
                 },
 
                 /**
@@ -413,7 +416,11 @@ define([
             };
 
         $(function () {
-            var editForm = $('#edit_form');
+            var editForm = $('#edit_form'),
+                swatchVisualPanel = $('#swatch-visual-options-panel'),
+                swatchTextPanel = $('#swatch-text-options-panel'),
+                tableBody = $(),
+                activePanel = $();
 
             $('#frontend_input').bind('change', function () {
                 swatchProductAttributes.bindAttributeInputType();
@@ -429,33 +436,35 @@ define([
                 .collapsable()
                 .collapse('hide');
 
-            editForm.on('submit', function () {
-                var activePanel,
-                    swatchValues = [],
-                    swatchVisualPanel = $('#swatch-visual-options-panel'),
-                    swatchTextPanel = $('#swatch-text-options-panel');
+            editForm.on('beforeSubmit', function () {
+                var optionContainer, optionsValues;
 
-                activePanel = swatchTextPanel.is(':visible') ? swatchTextPanel : swatchVisualPanel;
+                activePanel = swatchTextPanel.hasClass(activePanelClass) ? swatchTextPanel : swatchVisualPanel;
+                optionContainer = activePanel.find('table tbody');
 
-                activePanel.find('table input')
-                    .each(function () {
-                        if ($(this).is(':radio') && !$(this).prop('checked')) {
-                            return;
+                if (activePanel.hasClass(activePanelClass)) {
+                    optionsValues = $.map(
+                        optionContainer.find('tr'),
+                        function (row) {
+                            return $(row).find('input, select, textarea').serialize();
                         }
-                        swatchValues.push(this.name + '=' + $(this).val());
-                    });
+                    );
+                    $('<input>')
+                        .attr({
+                            type: 'hidden',
+                            name: 'serialized_options'
+                        })
+                        .val(JSON.stringify(optionsValues))
+                        .prependTo(editForm);
+                }
 
-                $('<input>').attr({
-                        type: 'hidden',
-                        name: 'serialized_swatch_values'
-                    })
-                    .val(JSON.stringify(swatchValues))
-                    .prependTo(editForm);
-
-                [swatchVisualPanel, swatchTextPanel].forEach(function (el) {
-                    $(el).find('table')
-                        .replaceWith($('<div>').text($.mage.__('Sending swatch values as package.')));
-                });
+                tableBody = optionContainer.detach();
+            });
+            editForm.on('afterValidate.error highlight.validate', function () {
+                if (activePanel.hasClass(activePanelClass)) {
+                    activePanel.find('table').append(tableBody);
+                    $('input[name="serialized_options"]').remove();
+                }
             });
         });
 
diff --git a/app/code/Magento/Swatches/view/frontend/layout/catalog_widget_product_list.xml b/app/code/Magento/Swatches/view/frontend/layout/catalog_widget_product_list.xml
new file mode 100644
index 0000000000000..fce81408cd14d
--- /dev/null
+++ b/app/code/Magento/Swatches/view/frontend/layout/catalog_widget_product_list.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="category.product.type.widget.details.renderers">
+            <block class="Magento\Swatches\Block\Product\Renderer\Listing\Configurable" name="category.product.type.details.renderers.configurable" as="configurable" template="Magento_Swatches::product/listing/renderer.phtml" ifconfig="catalog/frontend/show_swatches_in_product_list"/>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/app/code/Magento/Swatches/view/frontend/layout/cms_page_view.xml b/app/code/Magento/Swatches/view/frontend/layout/cms_page_view.xml
new file mode 100644
index 0000000000000..2ef1e2fb2e803
--- /dev/null
+++ b/app/code/Magento/Swatches/view/frontend/layout/cms_page_view.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <css src="Magento_Swatches::css/swatches.css"/>
+    </head>
+</page>
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
index 3492f83fd1828..93c19c8068f7b 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
@@ -4,72 +4,71 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable PSR2.ControlStructures.SwitchDeclaration
+// phpcs:disable Generic.WhiteSpace.ScopeIndent
 
 /** @var $block \Magento\Swatches\Block\LayeredNavigation\RenderLayered */
 ?>
 <?php $swatchData = $block->getSwatchData(); ?>
-<div class="swatch-attribute swatch-layered <?= /* @escapeNotVerified */ $swatchData['attribute_code'] ?>"
-     attribute-code="<?= /* @escapeNotVerified */ $swatchData['attribute_code'] ?>"
-     attribute-id="<?= /* @escapeNotVerified */ $swatchData['attribute_id'] ?>">
+<div class="swatch-attribute swatch-layered <?= $block->escapeHtmlAttr($swatchData['attribute_code']) ?>"
+     attribute-code="<?= $block->escapeHtmlAttr($swatchData['attribute_code']) ?>"
+     attribute-id="<?= $block->escapeHtmlAttr($swatchData['attribute_id']) ?>">
     <div class="swatch-attribute-options clearfix">
-        <?php foreach ($swatchData['options'] as $option => $label): ?>
-            <a href="<?= /* @escapeNotVerified */ $label['link'] ?>"
-               aria-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
+        <?php foreach ($swatchData['options'] as $option => $label) : ?>
+            <a href="<?= $block->escapeUrl($label['link']) ?>"
+               aria-label="<?= $block->escapeHtmlAttr($label['label']) ?>"
                class="swatch-option-link-layered">
-                <?php if (isset($swatchData['swatches'][$option]['type'])) { ?>
+                <?php if (isset($swatchData['swatches'][$option]['type'])) : ?>
                     <?php switch ($swatchData['swatches'][$option]['type']) {
                         case '3':
                             ?>
-                            <div class="swatch-option <?= /* @escapeNotVerified */ $label['custom_style'] ?>"
+                            <div class="swatch-option <?= $block->escapeHtmlAttr($label['custom_style']) ?>"
                                  tabindex="-1"
                                  option-type="3"
-                                 option-id="<?= /* @escapeNotVerified */ $option ?>"
-                                 option-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
+                                 option-id="<?= $block->escapeHtmlAttr($option) ?>"
+                                 option-label="<?= $block->escapeHtmlAttr($label['label']) ?>"
                                  option-tooltip-thumb=""
                                  option-tooltip-value=""
                                 ></div>
-                            <?php    break;
+                            <?php break;
                         case '2':
                             ?>
-                            <?php $swatchThumbPath = $block->getSwatchPath('swatch_thumb',
-                            $swatchData['swatches'][$option]['value']); ?>
-                            <?php $swatchImagePath = $block->getSwatchPath('swatch_image',
-                            $swatchData['swatches'][$option]['value']); ?>
-                            <div class="swatch-option image <?= /* @escapeNotVerified */ $label['custom_style'] ?>"
+                            <?php $swatchThumbPath = $block->getSwatchPath('swatch_thumb', $swatchData['swatches'][$option]['value']); ?>
+                            <?php $swatchImagePath = $block->getSwatchPath('swatch_image', $swatchData['swatches'][$option]['value']); ?>
+                            <div class="swatch-option image <?= $block->escapeHtmlAttr($label['custom_style']) ?>"
                                  tabindex="-1"
                                  option-type="2"
-                                 option-id="<?= /* @escapeNotVerified */ $option ?>"
-                                 option-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
-                                 option-tooltip-thumb="<?= /* @escapeNotVerified */ $swatchThumbPath ?>"
+                                 option-id="<?= $block->escapeHtmlAttr($option) ?>"
+                                 option-label="<?= $block->escapeHtmlAttr($label['label']) ?>"
+                                 option-tooltip-thumb="<?= $block->escapeUrl($swatchThumbPath) ?>"
                                  option-tooltip-value=""
-                                 style="background: url(<?= /* @escapeNotVerified */ $swatchImagePath ?>) no-repeat center; background-size: initial;"></div>
-                            <?php    break;
+                                 style="background: url(<?= $block->escapeUrl($swatchImagePath) ?>) no-repeat center; background-size: initial;"></div>
+                            <?php break;
                         case '1':
                             ?>
-                            <div class="swatch-option color <?= /* @escapeNotVerified */ $label['custom_style'] ?>"
+                            <div class="swatch-option color <?= $block->escapeHtmlAttr($label['custom_style']) ?>"
                                  tabindex="-1"
                                  option-type="1"
-                                 option-id="<?= /* @escapeNotVerified */ $option ?>"
-                                 option-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
+                                 option-id="<?= $block->escapeHtmlAttr($option) ?>"
+                                 option-label="<?= $block->escapeHtmlAttr($label['label']) ?>"
                                  option-tooltip-thumb=""
-                                 option-tooltip-value="<?= /* @escapeNotVerified */ $swatchData['swatches'][$option]['value'] ?>"
-                                 style="background: <?= /* @escapeNotVerified */ $swatchData['swatches'][$option]['value'] ?> no-repeat center; background-size: initial;"></div>
-                            <?php    break;
+                                 option-tooltip-value="<?= $block->escapeHtmlAttr($swatchData['swatches'][$option]['value']) ?>"
+                                 style="background: <?= $block->escapeHtmlAttr($swatchData['swatches'][$option]['value']) ?> no-repeat center; background-size: initial;"></div>
+                            <?php break;
                         case '0':
                         default:
                             ?>
-                                <div class="swatch-option text <?= /* @escapeNotVerified */ $label['custom_style'] ?>"
-                                     tabindex="-1"
-                                     option-type="0"
-                                     option-id="<?= /* @escapeNotVerified */ $option ?>"
-                                     option-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
-                                     option-tooltip-thumb=""
-                                     option-tooltip-value=""
-                                    ><?= /* @escapeNotVerified */ $swatchData['swatches'][$option]['value'] ?></div>
-                            <?php    break;
+                            <div class="swatch-option text <?= $block->escapeHtmlAttr($label['custom_style']) ?>"
+                                 tabindex="-1"
+                                 option-type="0"
+                                 option-id="<?= $block->escapeHtmlAttr($option) ?>"
+                                 option-label="<?= $block->escapeHtmlAttr($label['label']) ?>"
+                                 option-tooltip-thumb=""
+                                 option-tooltip-value=""
+                                ><?= $block->escapeHtml($swatchData['swatches'][$option]['value']) ?></div>
+                        <?php break;
                     } ?>
-                <?php } ?>
+                <?php endif; ?>
             </a>
         <?php endforeach; ?>
     </div>
@@ -77,7 +76,7 @@
 
 <script>
     require(["jquery", "jquery/ui", "Magento_Swatches/js/swatch-renderer"], function ($) {
-        $('.swatch-layered.<?= /* @escapeNotVerified */ $swatchData['attribute_code'] ?>')
+        $('.swatch-layered.<?= $block->escapeJs($swatchData['attribute_code']) ?>')
             .find('[option-type="1"], [option-type="2"], [option-type="0"], [option-type="3"]')
             .SwatchRendererTooltip();
     });
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
index f19da436a60c4..777277a15d8cd 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
@@ -5,23 +5,23 @@
  */
 ?>
 <?php
-    /** @var $block \Magento\Swatches\Block\Product\Renderer\Listing\Configurable */
-    $productId = $block->getProduct()->getId();
+/** @var $block \Magento\Swatches\Block\Product\Renderer\Listing\Configurable */
+$productId = $block->getProduct()->getId();
 ?>
-<div class="swatch-opt-<?= /* @escapeNotVerified */ $productId ?>" 
-     data-role="swatch-option-<?= /* @escapeNotVerified */ $productId ?>"></div>
+<div class="swatch-opt-<?= $block->escapeHtmlAttr($productId) ?>"
+     data-role="swatch-option-<?= $block->escapeHtmlAttr($productId) ?>"></div>
 
 <script type="text/x-magento-init">
     {
-        "[data-role=swatch-option-<?= /* @escapeNotVerified */ $productId ?>]": {
+        "[data-role=swatch-option-<?= $block->escapeJs($productId) ?>]": {
             "Magento_Swatches/js/swatch-renderer": {
                 "selectorProduct": ".product-item-details",
                 "onlySwatches": true,
                 "enableControlLabel": false,
-                "numberToShow": <?= /* @escapeNotVerified */ $block->getNumberSwatchesPerProduct(); ?>,
-                "jsonConfig": <?= /* @escapeNotVerified */ $block->getJsonConfig(); ?>,
-                "jsonSwatchConfig": <?= /* @escapeNotVerified */ $block->getJsonSwatchConfig(); ?>,
-                "mediaCallback": "<?= /* @escapeNotVerified */ $block->getMediaCallback() ?>",
+                "numberToShow": <?=  $block->escapeJs($block->getNumberSwatchesPerProduct()) ?>,
+                "jsonConfig": <?= /* @noEscape */ $block->getJsonConfig() ?>,
+                "jsonSwatchConfig": <?= /* @noEscape */ $block->getJsonSwatchConfig() ?>,
+                "mediaCallback": "<?= $block->escapeJs($block->escapeUrl($block->getMediaCallback())) ?>",
                 "jsonSwatchImageSizeConfig": <?= /* @noEscape */ $block->getJsonSwatchSizeConfig() ?>
             }
         }
@@ -30,13 +30,13 @@
 
 <script type="text/x-magento-init">
     {
-        "[data-role=priceBox][data-price-box=product-id-<?= /* @escapeNotVerified */ $productId ?>]": {
+        "[data-role=priceBox][data-price-box=product-id-<?= $block->escapeJs($productId) ?>]": {
             "priceBox": {
                 "priceConfig": {
-                    "priceFormat": <?= /* @escapeNotVerified */ $block->getPriceFormatJson(); ?>,
-                    "prices": <?= /* @escapeNotVerified */ $block->getPricesJson(); ?>
+                    "priceFormat": <?= /* @noEscape */ $block->getPriceFormatJson(); ?>,
+                    "prices": <?= /* @noEscape */ $block->getPricesJson(); ?>
                 }
             }
         }
     }
-</script>
+</script>
\ No newline at end of file
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
index 3ed87baacef4b..e6ac96c91cc02 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
@@ -3,8 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// @codingStandardsIgnoreFile
-//"swatchRenderer": {
 ?>
 <?php /** @var $block \Magento\Swatches\Block\Product\Renderer\Configurable */ ?>
 <div class="swatch-opt" data-role="swatch-options"></div>
@@ -13,15 +11,14 @@
     {
         "[data-role=swatch-options]": {
             "Magento_Swatches/js/swatch-renderer": {
-                "jsonConfig": <?= /* @escapeNotVerified */ $swatchOptions = $block->getJsonConfig() ?>,
-                "jsonSwatchConfig": <?php /* @noEscape */ echo $block->getJsonSwatchConfig(); ?>,
-                "mediaCallback": "<?= /* @escapeNotVerified */ $block->getMediaCallback() ?>",
-                "gallerySwitchStrategy": "<?php /* @escapeNotVerified */ echo $block->getVar('gallery_switch_strategy',
-                    'Magento_ConfigurableProduct') ?: 'replace'; ?>",
-                "jsonSwatchImageSizeConfig": <?php /* @noEscape */ echo $block->getJsonSwatchSizeConfig() ?>
+                "jsonConfig": <?= /* @noEscape */ $swatchOptions = $block->getJsonConfig() ?>,
+                "jsonSwatchConfig": <?= /* @noEscape */ $swatchOptions = $block->getJsonSwatchConfig() ?>,
+                "mediaCallback": "<?= $block->escapeJs($block->escapeUrl($block->getMediaCallback())) ?>",
+                "gallerySwitchStrategy": "<?= $block->escapeJs($block->getVar('gallery_switch_strategy', 'Magento_ConfigurableProduct')) ?: 'replace'; ?>",
+                "jsonSwatchImageSizeConfig": <?= /* @noEscape */ $block->getJsonSwatchSizeConfig() ?>
             },
             "Magento_Swatches/js/configurable-customer-data": {
-                    "swatchOptions": <?php /* @noEscape */ echo $swatchOptions ?>
+                    "swatchOptions": <?= /* @noEscape */ $swatchOptions ?>
             }
         },
         "*" : {
diff --git a/app/code/Magento/Swatches/view/frontend/web/css/swatches.css b/app/code/Magento/Swatches/view/frontend/web/css/swatches.css
index 67b9fffcf1282..fb1dcff2ecfb0 100644
--- a/app/code/Magento/Swatches/view/frontend/web/css/swatches.css
+++ b/app/code/Magento/Swatches/view/frontend/web/css/swatches.css
@@ -31,6 +31,10 @@
     margin-top: 10px;
 }
 
+.swatch-attribute-options:focus {
+    box-shadow: none;
+}
+
 .swatch-option {
     /*width: 30px;*/
     padding: 1px 2px;
@@ -47,6 +51,10 @@
     text-overflow: ellipsis;
 }
 
+.swatch-option:focus {
+    box-shadow: 0 0 3px 1px #68a8e0;
+}
+
 .swatch-option.text {
     background: #F0F0F0;
     color: #686868;
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
index 5e4c0a2c84f14..9abbd2b9cbf3e 100644
--- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
+++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
@@ -396,7 +396,10 @@ define([
                     select = $widget._RenderSwatchSelect(item, chooseText),
                     input = $widget._RenderFormInput(item),
                     listLabel = '',
-                    label = '';
+                    firstSpan = '',
+                    div = '',
+                    subDiv = '',
+                    secondSpan = '';
 
                 // Show only swatch controls
                 if ($widget.options.onlySwatches && !$widget.options.jsonSwatchConfig.hasOwnProperty(item.id)) {
@@ -404,37 +407,48 @@ define([
                 }
 
                 if ($widget.options.enableControlLabel) {
-                    label +=
-                        '<span id="' + controlLabelId + '" class="' + classes.attributeLabelClass + '">' +
-                            item.label +
-                        '</span>' +
-                        '<span class="' + classes.attributeSelectedOptionLabelClass + '"></span>';
+                    firstSpan = document.createElement('span');
+                    secondSpan = document.createElement('span');
+                    firstSpan.setAttribute('id', controlLabelId);
+                    firstSpan.setAttribute('class', classes.attributeLabelClass);
+                    firstSpan.textContent = item.label;
+                    secondSpan.setAttribute('class', classes.attributeSelectedOptionLabelClass);
                 }
 
                 if ($widget.inProductList) {
                     $widget.productForm.append(input);
                     input = '';
-                    listLabel = 'aria-label="' + item.label + '"';
+                    listLabel = document.createAttribute('aria-label');
+                    listLabel.value = item.label;
                 } else {
-                    listLabel = 'aria-labelledby="' + controlLabelId + '"';
+                    listLabel = document.createAttribute('aria-labelledby');
+                    listLabel.value = controlLabelId;
                 }
 
+                div = document.createElement('div');
+                subDiv = document.createElement('div');
+                div.setAttribute('class', classes.attributeClass + ' ' + item.code);
+                div.setAttribute('attribute-code', item.code);
+                div.setAttribute('attribute-id', item.id);
+                div.innerHTML = input;
+                subDiv.setAttribute('aria-activedescendant', '');
+                subDiv.setAttribute('tabindex', 0);
+                subDiv.setAttribute('aria-invalid', false);
+                subDiv.setAttribute('aria-required', true);
+                subDiv.setAttribute('role', 'listbox');
+                subDiv.setAttributeNode(listLabel);
+                subDiv.setAttribute('class', classes.attributeOptionsWrapper + ' clearfix');
+                subDiv.innerHTML = options + select;
+
+                if ($widget.options.enableControlLabel) {
+                    div.appendChild(firstSpan);
+                    div.appendChild(secondSpan);
+                }
+
+                div.appendChild(subDiv);
+
                 // Create new control
-                container.append(
-                    '<div class="' + classes.attributeClass + ' ' + item.code + '" ' +
-                         'attribute-code="' + item.code + '" ' +
-                         'attribute-id="' + item.id + '">' +
-                        label +
-                        '<div aria-activedescendant="" ' +
-                             'tabindex="0" ' +
-                             'aria-invalid="false" ' +
-                             'aria-required="true" ' +
-                             'role="listbox" ' + listLabel +
-                             'class="' + classes.attributeOptionsWrapper + ' clearfix">' +
-                            options + select +
-                        '</div>' + input +
-                    '</div>'
-                );
+                container.append(div.outerHTML);
 
                 $widget.optionsMap[item.id] = {};
 
@@ -493,7 +507,7 @@ define([
                 return '';
             }
 
-            $.each(config.options, function () {
+            $.each(config.options, function (index) {
                 var id,
                     type,
                     value,
@@ -501,7 +515,8 @@ define([
                     label,
                     width,
                     height,
-                    attr;
+                    link,
+                    div;
 
                 if (!optionConfig.hasOwnProperty(this.id)) {
                     return '';
@@ -509,7 +524,12 @@ define([
 
                 // Add more button
                 if (moreLimit === countAttributes++) {
-                    html += '<a href="#" class="' + moreClass + '">' + moreText + '</a>';
+                    link = document.createElement('a');
+                    link.setAttribute('class', moreClass);
+                    link.setAttribute('href', '#');
+                    link.textContent = moreText;
+
+                    html += link.outerHTML;
                 }
 
                 id = this.id;
@@ -519,48 +539,55 @@ define([
                 width = _.has(sizeConfig, 'swatchThumb') ? sizeConfig.swatchThumb.width : 110;
                 height = _.has(sizeConfig, 'swatchThumb') ? sizeConfig.swatchThumb.height : 90;
                 label = this.label ? this.label : '';
-                attr =
-                    ' id="' + controlId + '-item-' + id + '"' +
-                    ' aria-checked="false"' +
-                    ' aria-describedby="' + controlId + '"' +
-                    ' tabindex="0"' +
-                    ' option-type="' + type + '"' +
-                    ' option-id="' + id + '"' +
-                    ' option-label="' + label + '"' +
-                    ' aria-label="' + label + '"' +
-                    ' option-tooltip-thumb="' + thumb + '"' +
-                    ' option-tooltip-value="' + value + '"' +
-                    ' role="option"' +
-                    ' thumb-width="' + width + '"' +
-                    ' thumb-height="' + height + '"';
+
+                div = document.createElement('div');
+
+                div.setAttribute('id', controlId + '-item-' + id);
+                div.setAttribute('index', index);
+                div.setAttribute('aria-checked', false);
+                div.setAttribute('aria-describedby', controlId);
+                div.setAttribute('tabindex', 0);
+                div.setAttribute('option-type', type);
+                div.setAttribute('option-id', id);
+                div.setAttribute('option-label', label);
+                div.setAttribute('aria-label', label);
+                div.setAttribute('option-tooltip-thumb', thumb);
+                div.setAttribute('option-tooltip-value', value);
+                div.setAttribute('role', 'option');
+                div.setAttribute('thumb-width', width);
+                div.setAttribute('thumb-height', height);
 
                 if (!this.hasOwnProperty('products') || this.products.length <= 0) {
-                    attr += ' option-empty="true"';
+                    div.setAttribute('option-empty', true);
                 }
 
                 if (type === 0) {
                     // Text
-                    html += '<div class="' + optionClass + ' text" ' + attr + '>' + (value ? value : label) +
-                        '</div>';
+                    div.setAttribute('class', optionClass + ' text');
+                    div.textContent = value ? value : label;
                 } else if (type === 1) {
                     // Color
-                    html += '<div class="' + optionClass + ' color" ' + attr +
-                        ' style="background: ' + value +
-                        ' no-repeat center; background-size: initial;">' + '' +
-                        '</div>';
+                    div.setAttribute('class', optionClass + ' color');
+                    div.setAttribute('style', 'background: ' + value + ' no-repeat center; background-size: initial;');
+
                 } else if (type === 2) {
                     // Image
-                    html += '<div class="' + optionClass + ' image" ' + attr +
-                        ' style="background: url(' + value + ') no-repeat center; background-size: initial;width:' +
-                        sizeConfig.swatchImage.width + 'px; height:' + sizeConfig.swatchImage.height + 'px">' + '' +
-                        '</div>';
+                    div.setAttribute('class', optionClass + ' image');
+                    div.setAttribute('style',
+                        'background: url(' + value +
+                        ') no-repeat center;' +
+                        ' background-size: initial;' +
+                        ' width:' + sizeConfig.swatchImage.width + 'px;' +
+                        ' height:' + sizeConfig.swatchImage.height + 'px;');
                 } else if (type === 3) {
                     // Clear
-                    html += '<div class="' + optionClass + '" ' + attr + '></div>';
+                    div.setAttribute('class', optionClass);
                 } else {
                     // Default
-                    html += '<div class="' + optionClass + '" ' + attr + '>' + label + '</div>';
+                    div.setAttribute('class', optionClass);
+                    div.textContent = label;
                 }
+                html += div.outerHTML;
             });
 
             return html;
@@ -575,30 +602,36 @@ define([
          * @private
          */
         _RenderSwatchSelect: function (config, chooseText) {
-            var html;
+            var select,
+                firstOption,
+                otherOption;
 
             if (this.options.jsonSwatchConfig.hasOwnProperty(config.id)) {
                 return '';
             }
 
-            html =
-                '<select class="' + this.options.classes.selectClass + ' ' + config.code + '">' +
-                '<option value="0" option-id="0">' + chooseText + '</option>';
+            select = document.createElement('select');
+            $(select).attr('class', this.options.classes.selectClass);
+            firstOption = document.createElement('option');
+            $(firstOption).attr('value', 0);
+            $(firstOption).attr('option-id', 0);
+            $(firstOption).text(chooseText);
+            select.appendChild(firstOption);
 
             $.each(config.options, function () {
-                var label = this.label,
-                    attr = ' value="' + this.id + '" option-id="' + this.id + '"';
+                otherOption = document.createElement('option');
+                $(otherOption).attr('value', this.id);
+                $(otherOption).attr('option-id', this.id);
+                $(otherOption).text(this.label);
 
                 if (!this.hasOwnProperty('products') || this.products.length <= 0) {
-                    attr += ' option-empty="true"';
+                    $(otherOption).attr('option-empty', true);
                 }
 
-                html += '<option ' + attr + '>' + label + '</option>';
+                select.appendChild(otherOption);
             });
 
-            html += '</select>';
-
-            return html;
+            return select.outerHTML;
         },
 
         /**
@@ -667,10 +700,9 @@ define([
         /**
          * Load media gallery using ajax or json config.
          *
-         * @param {String|undefined} eventName
          * @private
          */
-        _loadMedia: function (eventName) {
+        _loadMedia: function () {
             var $main = this.inProductList ?
                     this.element.parents('.product-item-info') :
                     this.element.parents('.column.main'),
@@ -685,10 +717,21 @@ define([
                     images = this.options.mediaGalleryInitial;
                 }
 
-                this.updateBaseImage(images, $main, !this.inProductList, eventName);
+                this.updateBaseImage(this._sortImages(images), $main, !this.inProductList);
             }
         },
 
+        /**
+         * Sorting images array
+         *
+         * @private
+         */
+        _sortImages: function (images) {
+            return _.sortBy(images, function (image) {
+                return parseInt(image.position, 10);
+            });
+        },
+
         /**
          * Event for swatch options
          *
@@ -736,6 +779,12 @@ define([
                 $widget._UpdatePrice();
             }
 
+            $(document).trigger('updateMsrpPriceBlock',
+                [
+                    parseInt($this.attr('index'), 10) + 1,
+                    $widget.options.jsonConfig.optionPrices
+                ]);
+
             $widget._loadMedia(eventName);
             $input.trigger('change');
         },
@@ -908,7 +957,8 @@ define([
                 $productPrice = $product.find(this.options.selectorProductPrice),
                 options = _.object(_.keys($widget.optionsMap), {}),
                 result,
-                tierPriceHtml;
+                tierPriceHtml,
+                isShow;
 
             $widget.element.find('.' + $widget.options.classes.attributeClass + '[option-selected]').each(function () {
                 var attributeId = $(this).attr('attribute-id');
@@ -925,11 +975,9 @@ define([
                 }
             );
 
-            if (typeof result != 'undefined' && result.oldPrice.amount !== result.finalPrice.amount) {
-                $(this.options.slyOldPriceSelector).show();
-            } else {
-                $(this.options.slyOldPriceSelector).hide();
-            }
+            isShow = typeof result != 'undefined' && result.oldPrice.amount !== result.finalPrice.amount;
+
+            $product.find(this.options.slyOldPriceSelector)[isShow ? 'show' : 'hide']();
 
             if (typeof result != 'undefined' && result.tierPrices.length) {
                 if (this.options.tierPriceTemplate) {
@@ -1020,14 +1068,10 @@ define([
             _.each(allowedProducts, function (allowedProduct) {
                 optionFinalPrice = parseFloat(optionPrices[allowedProduct].finalPrice.amount);
 
-                if (_.isEmpty(product)) {
+                if (_.isEmpty(product) || optionFinalPrice < optionMinPrice) {
                     optionMinPrice = optionFinalPrice;
                     product = allowedProduct;
                 }
-
-                if (optionFinalPrice < optionMinPrice) {
-                    product = allowedProduct;
-                }
             }, this);
 
             return product;
@@ -1079,12 +1123,14 @@ define([
                 mediaCallData.isAjax = true;
                 $widget._XhrKiller();
                 $widget._EnableProductMediaLoader($this);
-                $widget.xhr = $.get(
-                    $widget.options.mediaCallback,
-                    mediaCallData,
-                    mediaSuccessCallback,
-                    'json'
-                ).done(function () {
+                $widget.xhr = $.ajax({
+                    url: $widget.options.mediaCallback,
+                    cache: true,
+                    type: 'GET',
+                    dataType: 'json',
+                    data: mediaCallData,
+                    success: mediaSuccessCallback
+                }).done(function () {
                     $widget._XhrKiller();
                 });
             }
@@ -1242,7 +1288,10 @@ define([
                 }
 
                 imagesToUpdate = this._setImageIndex(imagesToUpdate);
-                gallery.updateData(imagesToUpdate);
+
+                if (!_.isUndefined(gallery)) {
+                    gallery.updateData(imagesToUpdate);
+                }
 
                 if (isInitial) {
                     $(this.options.mediaGallerySelector).AddFotoramaVideoEvents();
@@ -1252,9 +1301,6 @@ define([
                         dataMergeStrategy: this.options.gallerySwitchStrategy
                     });
                 }
-
-                gallery.first();
-
             } else if (justAnImage && justAnImage.img) {
                 context.find('.product-image-photo').attr('src', justAnImage.img);
             }
diff --git a/app/code/Magento/SwatchesLayeredNavigation/composer.json b/app/code/Magento/SwatchesLayeredNavigation/composer.json
index d3d4cba7af291..35b3ebe9bf61a 100644
--- a/app/code/Magento/SwatchesLayeredNavigation/composer.json
+++ b/app/code/Magento/SwatchesLayeredNavigation/composer.json
@@ -2,12 +2,12 @@
     "name": "magento/module-swatches-layered-navigation",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
index c4c4f28e8a7d1..790d19ceaeaa7 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
@@ -17,6 +17,8 @@
 use Magento\Tax\Controller\RegistryConstants;
 
 /**
+ * Tax rate form.
+ *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
@@ -110,7 +112,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -119,6 +121,8 @@ protected function _construct()
     }
 
     /**
+     * Prepare form before rendering HTML.
+     *
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -132,8 +136,9 @@ protected function _prepareForm()
             if ($taxRateId) {
                 $taxRateDataObject = $this->_taxRateRepository->get($taxRateId);
             }
+            // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
         } catch (NoSuchEntityException $e) {
-            /* tax rate not found */
+            //tax rate not found//
         }
 
         $sessionFormValues = (array)$this->_coreRegistry->registry(RegistryConstants::CURRENT_TAX_RATE_FORM_DATA);
@@ -176,7 +181,10 @@ protected function _prepareForm()
         }
 
         $legend = $this->getShowLegend() ? __('Tax Rate Information') : '';
-        $fieldset = $form->addFieldset('base_fieldset', ['legend' => $legend, 'class' => 'form-inline']);
+        $fieldset = $form->addFieldset(
+            'base_fieldset',
+            ['legend' => $legend, 'class' => 'admin__scope-old form-inline']
+        );
 
         if (isset($formData['tax_calculation_rate_id']) && $formData['tax_calculation_rate_id'] > 0) {
             $fieldset->addField(
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
index 50e7437396b0c..7bb7d70f70229 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
@@ -126,7 +126,7 @@ protected function _prepareLayout()
                     ) . '\', \'' . $this->getUrl(
                         'tax/*/delete',
                         ['rate' => $rate]
-                    ) . '\')',
+                    ) . '\', {data: {}})',
                     'class' => 'delete'
                 ]
             );
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxSave.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxSave.php
index f6cd0fff9c9b0..465f66357802b 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxSave.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxSave.php
@@ -6,10 +6,41 @@
  */
 namespace Magento\Tax\Controller\Adminhtml\Rate;
 
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
+use Magento\Tax\Model\Calculation\Rate\Converter;
+use Magento\Tax\Api\TaxRateRepositoryInterface;
+use Magento\Framework\Escaper;
 use Magento\Framework\Controller\ResultFactory;
 
+/**
+ * Tax Rate AjaxSave Controller
+ */
 class AjaxSave extends \Magento\Tax\Controller\Adminhtml\Rate
 {
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param Converter $taxRateConverter
+     * @param TaxRateRepositoryInterface $taxRateRepository
+     * @param Escaper $escaper
+     */
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry,
+        Converter $taxRateConverter,
+        TaxRateRepositoryInterface $taxRateRepository,
+        Escaper $escaper
+    ) {
+        $this->escaper = $escaper;
+        parent::__construct($context, $coreRegistry, $taxRateConverter, $taxRateRepository);
+    }
+
     /**
      * Save Tax Rate via AJAX
      *
@@ -27,7 +58,7 @@ public function execute()
                 'success' => true,
                 'error_message' => '',
                 'tax_calculation_rate_id' => $taxRate->getId(),
-                'code' =>  htmlspecialchars($taxRate->getCode()),
+                'code' =>  $this->escaper->escapeHtml($taxRate->getCode()),
             ];
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $responseContent = [
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php
index 71b6d7bf39396..45ad5acb7f033 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php
@@ -7,28 +7,34 @@
 namespace Magento\Tax\Controller\Adminhtml\Rule;
 
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\NotFoundException;
 
 class Delete extends \Magento\Tax\Controller\Adminhtml\Rule
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $ruleId = (int)$this->getRequest()->getParam('rule');
         try {
             $this->ruleService->deleteById($ruleId);
-            $this->messageManager->addSuccess(__('The tax rule has been deleted.'));
+            $this->messageManager->addSuccessMessage(__('The tax rule has been deleted.'));
             return $resultRedirect->setPath('tax/*/');
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-            $this->messageManager->addError(__('This rule no longer exists.'));
+            $this->messageManager->addErrorMessage(__('This rule no longer exists.'));
             return $resultRedirect->setPath('tax/*/');
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('Something went wrong deleting this tax rule.'));
+            $this->messageManager->addErrorMessage(__('Something went wrong deleting this tax rule.'));
         }
 
         return $resultRedirect->setUrl($this->_redirect->getRedirectUrl($this->getUrl('*')));
diff --git a/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php b/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php
index afcfa1bbebcb0..c543648d19ade 100644
--- a/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php
+++ b/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php
@@ -7,6 +7,9 @@
 
 use Magento\Tax\Api\Data\QuoteDetailsItemInterface;
 
+/**
+ * Abstract aggregate calculator.
+ */
 abstract class AbstractAggregateCalculator extends AbstractCalculator
 {
     /**
@@ -106,11 +109,12 @@ protected function calculateWithTaxNotInPrice(QuoteDetailsItemInterface $item, $
         $rowTaxes = [];
         $rowTaxesBeforeDiscount = [];
         $appliedTaxes = [];
+        $rowTotalForTaxCalculation = $this->getPriceForTaxCalculation($item, $price) * $quantity;
         //Apply each tax rate separately
         foreach ($appliedRates as $appliedRate) {
             $taxId = $appliedRate['id'];
             $taxRate = $appliedRate['percent'];
-            $rowTaxPerRate = $this->calculationTool->calcTaxAmount($rowTotal, $taxRate, false, false);
+            $rowTaxPerRate = $this->calculationTool->calcTaxAmount($rowTotalForTaxCalculation, $taxRate, false, false);
             $deltaRoundingType = self::KEY_REGULAR_DELTA_ROUNDING;
             if ($applyTaxAfterDiscount) {
                 $deltaRoundingType = self::KEY_TAX_BEFORE_DISCOUNT_DELTA_ROUNDING;
@@ -121,7 +125,10 @@ protected function calculateWithTaxNotInPrice(QuoteDetailsItemInterface $item, $
             //Handle discount
             if ($applyTaxAfterDiscount) {
                 //TODO: handle originalDiscountAmount
-                $taxableAmount = max($rowTotal - $discountAmount, 0);
+                $taxableAmount = max($rowTotalForTaxCalculation - $discountAmount, 0);
+                if ($taxableAmount && !$applyTaxAfterDiscount) {
+                    $taxableAmount = $rowTotalForTaxCalculation;
+                }
                 $rowTaxAfterDiscount = $this->calculationTool->calcTaxAmount(
                     $taxableAmount,
                     $taxRate,
@@ -149,6 +156,7 @@ protected function calculateWithTaxNotInPrice(QuoteDetailsItemInterface $item, $
         $rowTaxBeforeDiscount = array_sum($rowTaxesBeforeDiscount);
         $rowTotalInclTax = $rowTotal + $rowTaxBeforeDiscount;
         $priceInclTax = $rowTotalInclTax / $quantity;
+
         if ($round) {
             $priceInclTax = $this->calculationTool->round($priceInclTax);
         }
@@ -167,6 +175,26 @@ protected function calculateWithTaxNotInPrice(QuoteDetailsItemInterface $item, $
             ->setAppliedTaxes($appliedTaxes);
     }
 
+    /**
+     * Get price for tax calculation.
+     *
+     * @param QuoteDetailsItemInterface $item
+     * @param float $price
+     * @return float
+     */
+    private function getPriceForTaxCalculation(QuoteDetailsItemInterface $item, float $price)
+    {
+        if ($item->getExtensionAttributes() && $item->getExtensionAttributes()->getPriceForTaxCalculation()) {
+            $priceForTaxCalculation = $this->calculationTool->round(
+                $item->getExtensionAttributes()->getPriceForTaxCalculation()
+            );
+        } else {
+            $priceForTaxCalculation = $price;
+        }
+
+        return $priceForTaxCalculation;
+    }
+
     /**
      * Round amount
      *
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Createdat.php b/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Createdat.php
index ebf699db552d6..67477d7056bae 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Createdat.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Report/Tax/Createdat.php
@@ -11,6 +11,9 @@
  */
 namespace Magento\Tax\Model\ResourceModel\Report\Tax;
 
+/**
+ * Class for tax report resource model with aggregation by created at.
+ */
 class Createdat extends \Magento\Reports\Model\ResourceModel\Report\AbstractReport
 {
     /**
@@ -84,7 +87,7 @@ protected function _aggregateByOrder($aggregationField, $from, $to)
                 'order_status' => 'e.status',
                 'percent' => 'MAX(tax.' . $connection->quoteIdentifier('percent') . ')',
                 'orders_count' => 'COUNT(DISTINCT e.entity_id)',
-                'tax_base_amount_sum' => 'SUM(tax.base_amount * e.base_to_global_rate)',
+                'tax_base_amount_sum' => 'SUM(tax.base_real_amount * e.base_to_global_rate)',
             ];
 
             $select = $connection->select()->from(
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
index ff31aa4ba90cb..65af4d7863830 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
@@ -17,12 +17,17 @@
 use Magento\Quote\Model\Quote\Item\AbstractItem;
 use Magento\Store\Model\Store;
 use Magento\Tax\Api\Data\QuoteDetailsInterfaceFactory;
+use Magento\Tax\Api\Data\QuoteDetailsItemInterface;
 use Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory;
 use Magento\Tax\Api\Data\TaxClassKeyInterface;
 use Magento\Tax\Api\Data\TaxDetailsInterface;
 use Magento\Tax\Api\Data\TaxDetailsItemInterface;
 use Magento\Tax\Api\Data\QuoteDetailsInterface;
 use Magento\Quote\Api\Data\ShippingAssignmentInterface;
+use Magento\Tax\Helper\Data as TaxHelper;
+use Magento\Framework\App\ObjectManager;
+use Magento\Tax\Api\Data\QuoteDetailsItemExtensionInterface;
+use Magento\Tax\Api\Data\QuoteDetailsItemExtensionInterfaceFactory;
 
 /**
  * Tax totals calculation model
@@ -131,6 +136,16 @@ class CommonTaxCollector extends AbstractTotal
      */
     protected $quoteDetailsItemDataObjectFactory;
 
+    /**
+     * @var TaxHelper
+     */
+    private $taxHelper;
+
+    /**
+     * @var QuoteDetailsItemExtensionInterfaceFactory
+     */
+    private $quoteDetailsItemExtensionFactory;
+
     /**
      * Class constructor
      *
@@ -141,6 +156,8 @@ class CommonTaxCollector extends AbstractTotal
      * @param \Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory $taxClassKeyDataObjectFactory
      * @param CustomerAddressFactory $customerAddressFactory
      * @param CustomerAddressRegionFactory $customerAddressRegionFactory
+     * @param TaxHelper|null $taxHelper
+     * @param QuoteDetailsItemExtensionInterfaceFactory|null $quoteDetailsItemExtensionInterfaceFactory
      */
     public function __construct(
         \Magento\Tax\Model\Config $taxConfig,
@@ -149,7 +166,9 @@ public function __construct(
         \Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory $quoteDetailsItemDataObjectFactory,
         \Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory $taxClassKeyDataObjectFactory,
         CustomerAddressFactory $customerAddressFactory,
-        CustomerAddressRegionFactory $customerAddressRegionFactory
+        CustomerAddressRegionFactory $customerAddressRegionFactory,
+        TaxHelper $taxHelper = null,
+        QuoteDetailsItemExtensionInterfaceFactory $quoteDetailsItemExtensionInterfaceFactory = null
     ) {
         $this->taxCalculationService = $taxCalculationService;
         $this->quoteDetailsDataObjectFactory = $quoteDetailsDataObjectFactory;
@@ -158,6 +177,9 @@ public function __construct(
         $this->quoteDetailsItemDataObjectFactory = $quoteDetailsItemDataObjectFactory;
         $this->customerAddressFactory = $customerAddressFactory;
         $this->customerAddressRegionFactory = $customerAddressRegionFactory;
+        $this->taxHelper = $taxHelper ?: ObjectManager::getInstance()->get(TaxHelper::class);
+        $this->quoteDetailsItemExtensionFactory = $quoteDetailsItemExtensionInterfaceFactory ?:
+            ObjectManager::getInstance()->get(QuoteDetailsItemExtensionInterfaceFactory::class);
     }
 
     /**
@@ -188,7 +210,7 @@ public function mapAddress(QuoteAddress $address)
      * @param bool $priceIncludesTax
      * @param bool $useBaseCurrency
      * @param string $parentCode
-     * @return \Magento\Tax\Api\Data\QuoteDetailsItemInterface
+     * @return QuoteDetailsItemInterface
      */
     public function mapItem(
         \Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory $itemDataObjectFactory,
@@ -201,7 +223,7 @@ public function mapItem(
             $sequence = 'sequence-' . $this->getNextIncrement();
             $item->setTaxCalculationItemId($sequence);
         }
-        /** @var \Magento\Tax\Api\Data\QuoteDetailsItemInterface $itemDataObject */
+        /** @var QuoteDetailsItemInterface $itemDataObject */
         $itemDataObject = $itemDataObjectFactory->create();
         $itemDataObject->setCode($item->getTaxCalculationItemId())
             ->setQuantity($item->getQty())
@@ -217,12 +239,28 @@ public function mapItem(
             if (!$item->getBaseTaxCalculationPrice()) {
                 $item->setBaseTaxCalculationPrice($item->getBaseCalculationPriceOriginal());
             }
+
+            if ($this->taxHelper->applyTaxOnOriginalPrice()) {
+                $baseTaxCalculationPrice = $item->getBaseOriginalPrice();
+            } else {
+                $baseTaxCalculationPrice = $item->getBaseCalculationPriceOriginal();
+            }
+            $this->setPriceForTaxCalculation($itemDataObject, (float)$baseTaxCalculationPrice);
+
             $itemDataObject->setUnitPrice($item->getBaseTaxCalculationPrice())
                 ->setDiscountAmount($item->getBaseDiscountAmount());
         } else {
             if (!$item->getTaxCalculationPrice()) {
                 $item->setTaxCalculationPrice($item->getCalculationPriceOriginal());
             }
+
+            if ($this->taxHelper->applyTaxOnOriginalPrice()) {
+                $taxCalculationPrice = $item->getOriginalPrice();
+            } else {
+                $taxCalculationPrice = $item->getCalculationPriceOriginal();
+            }
+            $this->setPriceForTaxCalculation($itemDataObject, (float)$taxCalculationPrice);
+
             $itemDataObject->setUnitPrice($item->getTaxCalculationPrice())
                 ->setDiscountAmount($item->getDiscountAmount());
         }
@@ -232,6 +270,23 @@ public function mapItem(
         return $itemDataObject;
     }
 
+    /**
+     * Set price for tax calculation.
+     *
+     * @param QuoteDetailsItemInterface $quoteDetailsItem
+     * @param float $taxCalculationPrice
+     * @return void
+     */
+    private function setPriceForTaxCalculation(QuoteDetailsItemInterface $quoteDetailsItem, float $taxCalculationPrice)
+    {
+        $extensionAttributes = $quoteDetailsItem->getExtensionAttributes();
+        if (!$extensionAttributes) {
+            $extensionAttributes = $this->quoteDetailsItemExtensionFactory->create();
+        }
+        $extensionAttributes->setPriceForTaxCalculation($taxCalculationPrice);
+        $quoteDetailsItem->setExtensionAttributes($extensionAttributes);
+    }
+
     /**
      * Map item extra taxables
      *
@@ -239,7 +294,7 @@ public function mapItem(
      * @param AbstractItem $item
      * @param bool $priceIncludesTax
      * @param bool $useBaseCurrency
-     * @return \Magento\Tax\Api\Data\QuoteDetailsItemInterface[]
+     * @return QuoteDetailsItemInterface[]
      */
     public function mapItemExtraTaxables(
         \Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory $itemDataObjectFactory,
@@ -262,7 +317,7 @@ public function mapItemExtraTaxables(
             } else {
                 $unitPrice = $extraTaxable[self::KEY_ASSOCIATED_TAXABLE_UNIT_PRICE];
             }
-            /** @var \Magento\Tax\Api\Data\QuoteDetailsItemInterface $itemDataObject */
+            /** @var QuoteDetailsItemInterface $itemDataObject */
             $itemDataObject = $itemDataObjectFactory->create();
             $itemDataObject->setCode($extraTaxable[self::KEY_ASSOCIATED_TAXABLE_CODE])
                 ->setType($extraTaxable[self::KEY_ASSOCIATED_TAXABLE_TYPE])
@@ -285,9 +340,9 @@ public function mapItemExtraTaxables(
      * Add quote items
      *
      * @param ShippingAssignmentInterface $shippingAssignment
-     * @param bool $useBaseCurrency
      * @param bool $priceIncludesTax
-     * @return \Magento\Tax\Api\Data\QuoteDetailsItemInterface[]
+     * @param bool $useBaseCurrency
+     * @return QuoteDetailsItemInterface[]
      */
     public function mapItems(
         ShippingAssignmentInterface $shippingAssignment,
@@ -295,7 +350,7 @@ public function mapItems(
         $useBaseCurrency
     ) {
         $items = $shippingAssignment->getItems();
-        if (!count($items)) {
+        if (empty($items)) {
             return [];
         }
 
@@ -358,10 +413,12 @@ public function populateAddressData(QuoteDetailsInterface $quoteDetails, QuoteAd
     }
 
     /**
+     * Get shipping data object.
+     *
      * @param ShippingAssignmentInterface $shippingAssignment
      * @param QuoteAddress\Total $total
      * @param bool $useBaseCurrency
-     * @return \Magento\Tax\Api\Data\QuoteDetailsItemInterface
+     * @return QuoteDetailsItemInterface
      */
     public function getShippingDataObject(
         ShippingAssignmentInterface $shippingAssignment,
@@ -376,7 +433,7 @@ public function getShippingDataObject(
             $total->setBaseShippingTaxCalculationAmount($total->getBaseShippingAmount());
         }
         if ($total->getShippingTaxCalculationAmount() !== null) {
-            /** @var \Magento\Tax\Api\Data\QuoteDetailsItemInterface $itemDataObject */
+            /** @var QuoteDetailsItemInterface $itemDataObject */
             $itemDataObject = $this->quoteDetailsItemDataObjectFactory->create()
                 ->setType(self::ITEM_TYPE_SHIPPING)
                 ->setCode(self::ITEM_CODE_SHIPPING)
@@ -411,14 +468,14 @@ public function getShippingDataObject(
      * Populate QuoteDetails object from quote address object
      *
      * @param ShippingAssignmentInterface $shippingAssignment
-     * @param \Magento\Tax\Api\Data\QuoteDetailsItemInterface[] $itemDataObjects
+     * @param QuoteDetailsItemInterface[] $itemDataObjects
      * @return \Magento\Tax\Api\Data\QuoteDetailsInterface
      */
     protected function prepareQuoteDetails(ShippingAssignmentInterface $shippingAssignment, $itemDataObjects)
     {
         $items = $shippingAssignment->getItems();
         $address = $shippingAssignment->getShipping()->getAddress();
-        if (!count($items)) {
+        if (empty($items)) {
             return $this->quoteDetailsDataObjectFactory->create();
         }
 
@@ -540,6 +597,7 @@ protected function processProductItems(
      * Process applied taxes for items and quote
      *
      * @param QuoteAddress\Total $total
+     * @param ShippingAssignmentInterface $shippingAssignment
      * @param array $itemsByType
      * @return $this
      */
@@ -627,6 +685,9 @@ public function updateItemTaxInfo($quoteItem, $itemTaxDetails, $baseItemTaxDetai
     {
         //The price should be base price
         $quoteItem->setPrice($baseItemTaxDetails->getPrice());
+        if ($quoteItem->getCustomPrice() && $this->taxHelper->applyTaxOnCustomPrice()) {
+            $quoteItem->setCustomPrice($baseItemTaxDetails->getPrice());
+        }
         $quoteItem->setConvertedPrice($itemTaxDetails->getPrice());
         $quoteItem->setPriceInclTax($itemTaxDetails->getPriceInclTax());
         $quoteItem->setRowTotal($itemTaxDetails->getRowTotal());
@@ -837,8 +898,9 @@ protected function saveAppliedTaxes()
     }
 
     /**
-     * Increment and return counter. This function is intended to be used to generate temporary
-     * id for an item.
+     * Increment and return counter.
+     *
+     * This function is intended to be used to generate temporary id for an item.
      *
      * @return int
      */
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
index 82e2048283a9b..865b656918cc1 100755
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
@@ -264,7 +264,7 @@ protected function processExtraTaxables(Address\Total $total, array $itemsByType
     {
         $extraTaxableDetails = [];
         foreach ($itemsByType as $itemType => $itemTaxDetails) {
-            if ($itemType != self::ITEM_TYPE_PRODUCT and $itemType != self::ITEM_TYPE_SHIPPING) {
+            if ($itemType != self::ITEM_TYPE_PRODUCT && $itemType != self::ITEM_TYPE_SHIPPING) {
                 foreach ($itemTaxDetails as $itemCode => $itemTaxDetail) {
                     /** @var \Magento\Tax\Api\Data\TaxDetailsInterface $taxDetails */
                     $taxDetails = $itemTaxDetail[self::KEY_ITEM];
@@ -407,6 +407,7 @@ protected function enhanceTotalData(
 
     /**
      * Process model configuration array.
+     *
      * This method can be used for changing totals collect sort order
      *
      * @param   array $config
diff --git a/app/code/Magento/Tax/Model/System/Config/Source/Tax/Country.php b/app/code/Magento/Tax/Model/System/Config/Source/Tax/Country.php
index 19731403ae74b..efb822813e77c 100644
--- a/app/code/Magento/Tax/Model/System/Config/Source/Tax/Country.php
+++ b/app/code/Magento/Tax/Model/System/Config/Source/Tax/Country.php
@@ -13,14 +13,13 @@ class Country extends \Magento\Directory\Model\Config\Source\Country
     protected $_options;
 
     /**
-     * @param bool $noEmpty
-     * @return array
+     * @inheritDoc
      */
-    public function toOptionArray($noEmpty = false)
+    public function toOptionArray($isMultiselect = false, $foregroundCountries = '')
     {
-        $options = parent::toOptionArray($noEmpty);
+        $options = parent::toOptionArray($isMultiselect);
 
-        if (!$noEmpty) {
+        if (!$isMultiselect) {
             if ($options) {
                 $options[0]['label'] = __('None');
             } else {
diff --git a/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php b/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php
index 87f65ef311ac2..208833733ae3f 100644
--- a/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php
+++ b/app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php
@@ -6,6 +6,10 @@
 
 namespace Magento\Tax\Plugin\Checkout\CustomerData;
 
+/**
+ * Process quote items price, considering tax configuration.
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
 class Cart
 {
     /**
@@ -68,6 +72,16 @@ public function afterGetSectionData(\Magento\Checkout\CustomerData\Cart $subject
                     $this->itemPriceRenderer->setItem($item);
                     $this->itemPriceRenderer->setTemplate('checkout/cart/item/price/sidebar.phtml');
                     $result['items'][$key]['product_price']=$this->itemPriceRenderer->toHtml();
+                    if ($this->itemPriceRenderer->displayPriceExclTax()) {
+                        $result['items'][$key]['product_price_value'] = $item->getCalculationPrice();
+                    } elseif ($this->itemPriceRenderer->displayPriceInclTax()) {
+                        $result['items'][$key]['product_price_value'] = $item->getPriceInclTax();
+                    } elseif ($this->itemPriceRenderer->displayBothPrices()) {
+                        //unset product price value in case price already has been set as scalar value.
+                        unset($result['items'][$key]['product_price_value']);
+                        $result['items'][$key]['product_price_value']['incl_tax'] = $item->getPriceInclTax();
+                        $result['items'][$key]['product_price_value']['excl_tax'] = $item->getCalculationPrice();
+                    }
                 }
             }
         }
diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
new file mode 100644
index 0000000000000..adb120c78126b
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Add new Tax Rule with custom tax Rate and product Tax Class -->
+    <actionGroup name="AddTaxRule">
+        <arguments>
+            <argument name="taxRuleName" type="string"/>
+            <argument name="taxRate"/>
+            <argument name="productTaxClass"/>
+        </arguments>
+        <amOnPage url="{{AdminTaxRuleNewPage.url}}" stepKey="goToTaxRulePage"/>
+        <fillField selector="{{AdminTaxRuleEditFormSection.ruleName}}" userInput="{{taxRuleName}}" stepKey="fillTaxRuleName"/>
+        <click selector="{{AdminTaxRuleEditFormSection.selectTaxRate(taxRate.code)}}" stepKey="selectTaxRate"/>
+        <conditionalClick selector="{{AdminTaxRuleEditFormSection.additionalSettings}}" dependentSelector="{{AdminTaxRuleEditFormSection.additionalSettings}}" visible="true" stepKey="clickAdditionalSettings"/>
+        <scrollTo selector="{{AdminTaxRuleEditFormSection.selectProductTaxClass(productTaxClass.class_name)}}" stepKey="scrollToProductTaxClass"/>
+        <click selector="{{AdminTaxRuleEditFormSection.selectProductTaxClass(productTaxClass.class_name)}}" stepKey="selectProductTaxClass"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveTaxRule"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rule." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+
+    <actionGroup name="DeleteTaxRule">
+        <arguments>
+            <argument name="taxRuleName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminTaxRulesGridPage.url}}" stepKey="loadTaxRulePage"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clearFilterBefore"/>
+        <fillField selector="{{AdminTaxRulesGridHeaderSection.taxRuleCodeFilter}}" userInput="{{taxRuleName}}" stepKey="fillTaxRuleName"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton"/>
+        <click selector="{{AdminGridTableSection.row('1')}}" stepKey="openTaxRule"/>
+        <waitForPageLoad stepKey="waitForTaxRulePage"/>
+        <click selector="{{AdminMainActionsSection.delete}}" stepKey="clickDeleteTaxRule"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForPageLoadAfterClickingDelete"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptDelete"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The tax rule has been deleted." stepKey="seeDeleteSuccessMessage"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clearFilterAfter"/>
+    </actionGroup>
+
+</actionGroups>
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxClassData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxClassData.xml
new file mode 100644
index 0000000000000..b588b4176b6e8
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxClassData.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="ProductTaxClass" type="taxClass">
+        <data key="class_name" unique="suffix">TaxClass</data>
+        <data key="class_type">PRODUCT</data>
+    </entity>
+    <entity name="ProductTaxClassGetter" type="taxClass">
+        <var key="class_id" entityKey="return" entityType="taxClass"/>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxConfigData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxConfigData.xml
index 5edabc0826ddc..534c575f90e1a 100644
--- a/app/code/Magento/Tax/Test/Mftf/Data/TaxConfigData.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxConfigData.xml
@@ -142,4 +142,17 @@
     <entity name="EmptyField" type="taxPostCodeEmpty">
         <data key="value"/>
     </entity>
+    <!--Tax Class for Shipping-->
+    <entity name="TaxClassForShippingConfig" type="tax_config_state">
+        <requiredEntity type="shipping_tax_class">ShippingTaxClassTaxableGoods</requiredEntity>
+    </entity>
+    <entity name="DefaultTaxClassForShippingConfig" type="tax_config_state">
+        <requiredEntity type="shipping_tax_class">ShippingTaxClassNone</requiredEntity>
+    </entity>
+    <entity name="ShippingTaxClassNone" type="shipping_tax_class">
+        <data key="value">0</data>
+    </entity>
+    <entity name="ShippingTaxClassTaxableGoods" type="shipping_tax_class">
+        <data key="value">2</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxRateData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxRateData.xml
new file mode 100644
index 0000000000000..a99c51ea6e5f1
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxRateData.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="TexasTaxRate" type="taxRate">
+        <data key="code" unique="suffix">USTEXAS</data>
+        <data key="tax_country_id">US</data>
+        <data key="tax_region_id">57</data>
+        <data key="region_name">TX</data>
+        <data key="tax_postcode">*</data>
+        <data key="rate">1</data>
+    </entity>
+    <entity name="AustinTaxRate" type="taxRate">
+        <data key="code" unique="suffix">USTEXASAUSTIN</data>
+        <data key="tax_country_id">US</data>
+        <data key="tax_region_id">57</data>
+        <data key="region_name">TX</data>
+        <data key="tax_postcode">78729</data>
+        <data key="rate">5</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Tax/Test/Mftf/Metadata/tax_class-meta.xml b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_class-meta.xml
new file mode 100644
index 0000000000000..b514c3feb6fe3
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_class-meta.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateTaxClass" dataType="taxClass" type="create" auth="adminOauth" url="/V1/taxClasses" method="POST">
+        <contentType>application/json</contentType>
+        <object key="taxClass" dataType="taxClass">
+            <field key="class_name" required="true">string</field>
+            <field key="class_type" required="true">string</field>
+        </object>
+    </operation>
+    <operation name="GetTaxClass" dataType="taxClass" type="get" auth="adminOauth" url="/V1/taxClasses/{return}" method="GET">
+        <contentType>application/json</contentType>
+    </operation>
+    <operation name="DeleteTaxClass" dataType="taxClass" type="delete" auth="adminOauth" url="/V1/taxClasses/{return}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Tax/Test/Mftf/Metadata/tax_config-meta.xml b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_config-meta.xml
index af7c0dc5e16a7..ebe4790543fdc 100644
--- a/app/code/Magento/Tax/Test/Mftf/Metadata/tax_config-meta.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_config-meta.xml
@@ -7,8 +7,15 @@
 -->
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="CreateTaxConfigDefaultsTaxDestination" dataType="tax_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/tax/" method="POST">
+    <operation name="CreateTaxConfigDefaultsTaxDestination" dataType="tax_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/tax/" method="POST" successRegex="/messages-message-success/">
         <object key="groups" dataType="tax_config_state">
+            <object key="classes" dataType="tax_config_state">
+                <object key="fields" dataType="tax_config_state">
+                    <object key="shipping_tax_class" dataType="shipping_tax_class">
+                        <field key="value">integer</field>
+                    </object>
+                </object>
+            </object>
             <object key="calculation" dataType="tax_config_state">
               <object key="fields" dataType="tax_config_state">
                 <object key="algorithm" dataType="algorithm">
diff --git a/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rate-meta.xml b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rate-meta.xml
new file mode 100644
index 0000000000000..1357aa9c831d1
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Metadata/tax_rate-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CreateTaxRate" dataType="taxRate" type="create" auth="adminOauth" url="/V1/taxRates" method="POST">
+        <contentType>application/json</contentType>
+        <object key="taxRate" dataType="taxRate">
+            <field key="code" required="true">string</field>
+            <field key="tax_country_id" required="true">string</field>
+            <field key="tax_region_id" required="true">integer</field>
+            <field key="region_name" required="true">string</field>
+            <field key="tax_postcode" required="true">string</field>
+            <field key="rate" required="true">number</field>
+        </object>
+    </operation>
+    <operation name="DeleteTaxRate" dataType="taxRate" type="delete" auth="adminOauth" url="/V1/taxRates/{id}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRuleNewPage.xml b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRuleNewPage.xml
new file mode 100644
index 0000000000000..a97567a438108
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRuleNewPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminTaxRuleNewPage" url="tax/rule/new/" area="admin" module="Magento_Tax">
+        <section name="AdminTaxRuleEditFormSection"/>
+    </page>
+</pages>
+
diff --git a/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRulesGridPage.xml b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRulesGridPage.xml
new file mode 100644
index 0000000000000..0672c74c3d358
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRulesGridPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminTaxRulesGridPage" url="tax/rule/" area="admin" module="Magento_Tax">
+        <section name="AdminTaxRulesGridHeaderSection"/>
+    </page>
+</pages>
+
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRuleEditFormSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRuleEditFormSection.xml
new file mode 100644
index 0000000000000..de93d74e31111
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRuleEditFormSection.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="AdminTaxRuleEditFormSection">
+        <element name="ruleName" type="input" selector="#edit_form #code"/>
+        <element name="selectTaxRate" type="select" selector="//*[@id='tax_rate']/following-sibling::section[contains(@class, 'mselect-list')]//span[text()='{{taxRate}}']" parameterized="true" timeout="30"/>
+        <element name="additionalSettings" type="button" selector="#details-summarybase_fieldset"/>
+        <element name="selectProductTaxClass" type="select" selector="//*[@id='tax_product_class']/following-sibling::section[contains(@class, 'mselect-list')]//span[text()='{{taxClass}}']" parameterized="true" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRulesGridSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRulesGridSection.xml
new file mode 100644
index 0000000000000..5988965b64cad
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRulesGridSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminTaxRulesGridHeaderSection">
+        <element name="taxRuleCodeFilter" type="input" selector="#taxRuleGrid_filter_code"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml
index 3c6953f08e8d7..3fd06016624d1 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest">
         <annotations>
             <features value="Tax information in shopping cart for Customer with default addresses (physical quote)"/>
@@ -62,6 +62,7 @@
             <actionGroup ref="AdminResetProductGridToDefaultViewActionGroup" stepKey="resetGridToDefaultKeywordSearch"/>
         </before>
         <after>
+            <actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="customerLogout"/>
             <deleteData createDataKey="createTaxRule" stepKey="deleteTaxRule"/>
             <deleteData createDataKey="createProductFPTAttribute" stepKey="deleteProductFPTAttribute"/>
             <createData entity="DefaultTaxConfig" stepKey="defaultTaxConfiguration"/>
@@ -87,9 +88,13 @@
         <actionGroup ref="StorefrontViewAndEditCartFromMiniCartActionGroup" stepKey="goToShoppingCartFromMinicart"/>
         <!--  Step 4: Open Estimate Shipping and Tax section -->
         <conditionalClick  selector="{{StorefrontCheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{StorefrontCheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
-        <see selector="{{StorefrontCheckoutCartSummarySection.country}}" userInput="$$createCustomer.country_id$$" stepKey="checkCustomerCountry" />
-        <see selector="{{StorefrontCheckoutCartSummarySection.region}}" userInput="$$createCustomer.state$$" stepKey="checkCustomerRegion" />
-        <see selector="{{StorefrontCheckoutCartSummarySection.postcode}}" userInput="$$createCustomer.postcode$$" stepKey="checkCustomerPostcode" />
+        <seeOptionIsSelected selector="{{StorefrontCheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country}}" stepKey="checkCustomerCountry" />
+        <seeOptionIsSelected selector="{{StorefrontCheckoutCartSummarySection.region}}" userInput="{{US_Address_CA.state}}" stepKey="checkCustomerRegion" />
+        <grabValueFrom  selector="{{StorefrontCheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
+        <assertEquals message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
+            <expectedResult type="string">{{US_Address_CA.postcode}}</expectedResult>
+            <actualResult type="variable">grabTextPostCode</actualResult>
+        </assertEquals>
         <see selector="{{StorefrontCheckoutCartSummarySection.amountFPT}}" userInput="$10" stepKey="checkAmountFPTCA" />
         <see selector="{{StorefrontCheckoutCartSummarySection.taxAmount}}" userInput="$0.83" stepKey="checkTaxAmountCA" />
         <scrollTo selector="{{StorefrontCheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary" />
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml
index fbb44807c8b14..f26b6d2747e09 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest">
         <annotations>
             <features value="Tax information in shopping cart for Customer with default addresses (virtual quote)"/>
@@ -37,6 +37,7 @@
             <createData entity="Simple_US_NY_Customer" stepKey="createCustomer"/>
         </before>
         <after>
+            <actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="customerLogout"/>
             <deleteData createDataKey="createTaxRule" stepKey="deleteTaxRule"/>
             <deleteData createDataKey="createProductFPTAttribute" stepKey="deleteProductFPTAttribute"/>
             <createData entity="DefaultTaxConfig" stepKey="defaultTaxConfiguration"/>
@@ -59,9 +60,13 @@
         <actionGroup ref="StorefrontViewAndEditCartFromMiniCartActionGroup" stepKey="goToShoppingCartFromMinicart"/>
         <!--  Step 4: Open Estimate Shipping and Tax section -->
         <conditionalClick  selector="{{StorefrontCheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{StorefrontCheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
-        <see selector="{{StorefrontCheckoutCartSummarySection.country}}" userInput="$$createCustomer.country_id$$" stepKey="checkCustomerCountry" />
-        <see selector="{{StorefrontCheckoutCartSummarySection.region}}" userInput="$$createCustomer.state$$" stepKey="checkCustomerRegion" />
-        <see selector="{{StorefrontCheckoutCartSummarySection.postcode}}" userInput="$$createCustomer.postcode$$" stepKey="checkCustomerPostcode" />
+        <seeOptionIsSelected selector="{{StorefrontCheckoutCartSummarySection.country}}" userInput="{{US_Address_NY.country}}" stepKey="checkCustomerCountry" />
+        <seeOptionIsSelected selector="{{StorefrontCheckoutCartSummarySection.region}}" userInput="{{US_Address_NY.state}}" stepKey="checkCustomerRegion" />
+        <grabValueFrom  selector="{{StorefrontCheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
+        <assertEquals message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
+            <expectedResult type="string">{{US_Address_NY.postcode}}</expectedResult>
+            <actualResult type="variable">grabTextPostCode</actualResult>
+        </assertEquals>
         <scrollTo selector="{{StorefrontCheckoutCartSummarySection.taxSummary}}" stepKey="scrollToTaxSummary" />
         <click selector="{{StorefrontCheckoutCartSummarySection.taxSummary}}" stepKey="expandTaxSummary"/>
         <see selector="{{StorefrontCheckoutCartSummarySection.rate}}" userInput="US-NY-*-Rate 1 (8.375%)" stepKey="checkRateNY" />
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php
index 89800e3be872e..2a7eeb27ee07e 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php
@@ -4,13 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Tax\Test\Unit\Model\Calculation;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Tax\Model\Calculation\RowBaseCalculator;
 use Magento\Tax\Model\Calculation\TotalBaseCalculator;
+use Magento\Tax\Api\Data\QuoteDetailsItemExtensionInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -68,6 +67,11 @@ class RowBaseAndTotalBaseCalculatorTestCase extends \PHPUnit\Framework\TestCase
      */
     protected $taxDetailsItem;
 
+    /**
+     * @var \Magento\Tax\Api\Data\QuoteDetailsItemExtensionInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $quoteDetailsItemExtension;
+
     /**
      * initialize all mocks
      *
@@ -84,7 +88,10 @@ public function initMocks($isTaxIncluded)
     protected function setUp()
     {
         $this->objectManager = new ObjectManager($this);
-        $this->taxItemDetailsDataObjectFactory = $this->createPartialMock(\Magento\Tax\Api\Data\TaxDetailsItemInterfaceFactory::class, ['create']);
+        $this->taxItemDetailsDataObjectFactory = $this->createPartialMock(
+            \Magento\Tax\Api\Data\TaxDetailsItemInterfaceFactory::class,
+            ['create']
+        );
         $this->taxDetailsItem = $this->objectManager->getObject(\Magento\Tax\Model\TaxDetails\ItemDetails::class);
         $this->taxItemDetailsDataObjectFactory->expects($this->any())
             ->method('create')
@@ -100,11 +107,24 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->mockItem = $this->getMockBuilder(\Magento\Tax\Api\Data\QuoteDetailsItemInterface::class)->getMock();
-
-        $this->appliedTaxDataObjectFactory = $this->createPartialMock(\Magento\Tax\Api\Data\AppliedTaxInterfaceFactory::class, ['create']);
+        $this->mockItem = $this->getMockBuilder(\Magento\Tax\Api\Data\QuoteDetailsItemInterface::class)
+            ->disableOriginalConstructor()->setMethods(['getExtensionAttributes', 'getUnitPrice'])
+            ->getMockForAbstractClass();
+        $this->quoteDetailsItemExtension = $this->getMockBuilder(QuoteDetailsItemExtensionInterface::class)
+            ->disableOriginalConstructor()->setMethods(['getPriceForTaxCalculation'])
+            ->getMockForAbstractClass();
+        $this->mockItem->expects($this->any())->method('getExtensionAttributes')
+            ->willReturn($this->quoteDetailsItemExtension);
+
+        $this->appliedTaxDataObjectFactory = $this->createPartialMock(
+            \Magento\Tax\Api\Data\AppliedTaxInterfaceFactory::class,
+            ['create']
+        );
 
-        $this->appliedTaxRateDataObjectFactory = $this->createPartialMock(\Magento\Tax\Api\Data\AppliedTaxRateInterfaceFactory::class, ['create']);
+        $this->appliedTaxRateDataObjectFactory = $this->createPartialMock(
+            \Magento\Tax\Api\Data\AppliedTaxRateInterfaceFactory::class,
+            ['create']
+        );
         $this->appliedTaxRate = $this->objectManager->getObject(\Magento\Tax\Model\TaxDetails\AppliedTaxRate::class);
         $this->appliedTaxRateDataObjectFactory->expects($this->any())
             ->method('create')
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
index 9b963434e321d..8e0f9b8226f42 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
@@ -3,81 +3,108 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 // @codingStandardsIgnoreFile
 
 namespace Magento\Tax\Test\Unit\Model\Sales\Total\Quote;
 
-/**
- * Test class for \Magento\Tax\Model\Sales\Total\Quote\Tax
- */
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Tax\Helper\Data as TaxHelper;
+use Magento\Tax\Api\Data\TaxDetailsItemInterface;
+use Magento\Quote\Model\Quote\Item as QuoteItem;
+use Magento\Store\Model\Store;
+use Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector;
+use Magento\Tax\Model\Config;
+use Magento\Quote\Model\Quote\Address as QuoteAddress;
+use Magento\Quote\Model\Quote;
+use Magento\Tax\Api\Data\QuoteDetailsItemInterface;
+use Magento\Tax\Api\Data\TaxClassKeyInterface;
+use Magento\Tax\Model\Sales\Quote\ItemDetails;
+use Magento\Tax\Model\TaxClass\Key as TaxClassKey;
+use Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory;
+use Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory;
+use Magento\Quote\Api\Data\ShippingAssignmentInterface;
+use Magento\Quote\Api\Data\ShippingInterface;
+use Magento\Quote\Model\Quote\Address\Total as QuoteAddressTotal;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
+ * Common tax collector test
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class CommonTaxCollectorTest extends \PHPUnit\Framework\TestCase
+class CommonTaxCollectorTest extends TestCase
 {
     /**
-     * @var \Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector
+     * @var CommonTaxCollector
      */
     private $commonTaxCollector;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Tax\Model\Config
+     * @var MockObject|Config
      */
     private $taxConfig;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Quote\Model\Quote\Address
+     * @var MockObject|QuoteAddress
      */
     private $address;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Quote\Model\Quote
+     * @var MockObject|Quote
      */
     private $quote;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\Store
+     * @var MockObject|Store
      */
     private $store;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|
+     * @var MockObject
      */
     protected $taxClassKeyDataObjectFactoryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|
+     * @var MockObject
      */
     protected $quoteDetailsItemDataObjectFactoryMock;
 
     /**
-     * @var \Magento\Tax\Api\Data\QuoteDetailsItemInterface
+     * @var QuoteDetailsItemInterface
      */
     protected $quoteDetailsItemDataObject;
 
     /**
-     * @var \Magento\Tax\Api\Data\TaxClassKeyInterface
+     * @var TaxClassKeyInterface
      */
     protected $taxClassKeyDataObject;
 
+    /**
+     * @var TaxHelper
+     */
+    private $taxHelper;
+
+    /**
+     * {@inheritdoc}
+     */
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
 
-        $this->taxConfig = $this->getMockBuilder(\Magento\Tax\Model\Config::class)
+        $this->taxConfig = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getShippingTaxClass', 'shippingPriceIncludesTax'])
+            ->setMethods(['getShippingTaxClass', 'shippingPriceIncludesTax', 'discountTax'])
             ->getMock();
 
-        $this->store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+        $this->store = $this->getMockBuilder(Store::class)
             ->disableOriginalConstructor()
             ->setMethods(['__wakeup'])
             ->getMock();
 
-        $this->quote = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
+        $this->quote = $this->getMockBuilder(Quote::class)
             ->disableOriginalConstructor()
             ->setMethods(['__wakeup', 'getStore'])
             ->getMock();
@@ -86,7 +113,7 @@ protected function setUp()
             ->method('getStore')
             ->will($this->returnValue($this->store));
 
-        $this->address = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address::class)
+        $this->address = $this->getMockBuilder(QuoteAddress::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -94,35 +121,41 @@ protected function setUp()
             ->method('getQuote')
             ->will($this->returnValue($this->quote));
         $methods = ['create'];
-        $this->quoteDetailsItemDataObject = $objectManager->getObject(
-            \Magento\Tax\Model\Sales\Quote\ItemDetails::class
-        );
-        $this->taxClassKeyDataObject = $objectManager->getObject(\Magento\Tax\Model\TaxClass\Key::class);
+        $this->quoteDetailsItemDataObject = $objectManager->getObject(ItemDetails::class);
+        $this->taxClassKeyDataObject = $objectManager->getObject(TaxClassKey::class);
         $this->quoteDetailsItemDataObjectFactoryMock
-            = $this->createPartialMock(\Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory::class, $methods);
+            = $this->createPartialMock(QuoteDetailsItemInterfaceFactory::class, $methods);
         $this->quoteDetailsItemDataObjectFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($this->quoteDetailsItemDataObject);
         $this->taxClassKeyDataObjectFactoryMock =
-            $this->createPartialMock(\Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory::class, $methods);
+            $this->createPartialMock(TaxClassKeyInterfaceFactory::class, $methods);
         $this->taxClassKeyDataObjectFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($this->taxClassKeyDataObject);
+        $this->taxHelper = $this->getMockBuilder(TaxHelper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->commonTaxCollector = $objectManager->getObject(
-            \Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector::class,
+            CommonTaxCollector::class,
             [
                 'taxConfig' => $this->taxConfig,
                 'quoteDetailsItemDataObjectFactory' => $this->quoteDetailsItemDataObjectFactoryMock,
-                'taxClassKeyDataObjectFactory' => $this->taxClassKeyDataObjectFactoryMock
+                'taxClassKeyDataObjectFactory' => $this->taxClassKeyDataObjectFactoryMock,
+                'taxHelper' => $this->taxHelper,
             ]
         );
     }
 
     /**
+     * Test for GetShippingDataObject
+     *
      * @param array $addressData
      * @param bool $useBaseCurrency
      * @param string $shippingTaxClass
      * @param bool $shippingPriceInclTax
+     *
+     * @return void
      * @dataProvider getShippingDataObjectDataProvider
      */
     public function testGetShippingDataObject(
@@ -131,7 +164,7 @@ public function testGetShippingDataObject(
         $shippingTaxClass,
         $shippingPriceInclTax
     ) {
-        $shippingAssignmentMock = $this->createMock(\Magento\Quote\Api\Data\ShippingAssignmentInterface::class);
+        $shippingAssignmentMock = $this->createMock(ShippingAssignmentInterface::class);
         $methods = [
             'getShippingDiscountAmount',
             'getShippingTaxCalculationAmount',
@@ -141,8 +174,10 @@ public function testGetShippingDataObject(
             'getBaseShippingAmount',
             'getBaseShippingDiscountAmount'
         ];
-        $totalsMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Address\Total::class, $methods);
-        $shippingMock = $this->createMock(\Magento\Quote\Api\Data\ShippingInterface::class);
+        /** @var MockObject|QuoteAddressTotal $totalsMock */
+        $totalsMock = $this->createPartialMock(QuoteAddressTotal::class, $methods);
+        $shippingMock = $this->createMock(ShippingInterface::class);
+        /** @var MockObject|ShippingAssignmentInterface $shippingAssignmentMock */
         $shippingAssignmentMock->expects($this->once())->method('getShipping')->willReturn($shippingMock);
         $shippingMock->expects($this->once())->method('getAddress')->willReturn($this->address);
         $baseShippingAmount = $addressData['base_shipping_amount'];
@@ -184,9 +219,44 @@ public function testGetShippingDataObject(
     }
 
     /**
+     * Update item tax info
+     *
+     * @return void
+     */
+    public function testUpdateItemTaxInfo()
+    {
+        /** @var MockObject|QuoteItem $quoteItem */
+        $quoteItem = $this->getMockBuilder(QuoteItem::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getPrice', 'setPrice', 'getCustomPrice', 'setCustomPrice'])
+            ->getMock();
+        $this->taxHelper->method('applyTaxOnCustomPrice')->willReturn(true);
+        $quoteItem->method('getCustomPrice')->willReturn(true);
+        /** @var MockObject|TaxDetailsItemInterface $itemTaxDetails */
+        $itemTaxDetails = $this->getMockBuilder(TaxDetailsItemInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var MockObject|TaxDetailsItemInterface $baseItemTaxDetails */
+        $baseItemTaxDetails = $this->getMockBuilder(TaxDetailsItemInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $quoteItem->expects($this->once())->method('setCustomPrice');
+
+        $this->commonTaxCollector->updateItemTaxInfo(
+            $quoteItem,
+            $itemTaxDetails,
+            $baseItemTaxDetails,
+            $this->store
+        );
+    }
+
+    /**
+     * Data for testGetShippingDataObject
+     *
      * @return array
      */
-    public function getShippingDataObjectDataProvider()
+    public function getShippingDataObjectDataProvider(): array
     {
         $data = [
             'free_shipping' => [
diff --git a/app/code/Magento/Tax/Test/Unit/Plugin/Checkout/CustomerData/CartTest.php b/app/code/Magento/Tax/Test/Unit/Plugin/Checkout/CustomerData/CartTest.php
index effc54b84ac04..d4218e6491837 100644
--- a/app/code/Magento/Tax/Test/Unit/Plugin/Checkout/CustomerData/CartTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Plugin/Checkout/CustomerData/CartTest.php
@@ -119,7 +119,7 @@ public function testAfterGetSectionData()
         $this->assertArrayHasKey('items', $result);
         $this->assertTrue(is_array($result['items']));
         $this->assertEquals(2, count($result['items']));
-        $this->assertEquals(1, count($result['items'][0]['product_price']));
-        $this->assertEquals(1, count($result['items'][1]['product_price']));
+        $this->assertEquals(1, $result['items'][0]['product_price']);
+        $this->assertEquals(1, $result['items'][1]['product_price']);
     }
 }
diff --git a/app/code/Magento/Tax/Test/Unit/Ui/DataProvider/Product/Listing/Collector/TaxTest.php b/app/code/Magento/Tax/Test/Unit/Ui/DataProvider/Product/Listing/Collector/TaxTest.php
index 4cf3f4d339e18..908aeb5e3f405 100644
--- a/app/code/Magento/Tax/Test/Unit/Ui/DataProvider/Product/Listing/Collector/TaxTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Ui/DataProvider/Product/Listing/Collector/TaxTest.php
@@ -68,10 +68,12 @@ protected function setUp()
             ->getMockForAbstractClass();
 
         $this->priceInfoFactory = $this->getMockBuilder(PriceInfoInterfaceFactory::class)
+            ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
 
         $this->priceInfoExtensionFactory = $this->getMockBuilder(PriceInfoExtensionInterfaceFactory::class)
+            ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
         $this->formattedPriceInfoBuilder = $this->getMockBuilder(FormattedPriceInfoBuilder::class)
diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json
index 34c3ec567467a..9dc30f19f1474 100644
--- a/app/code/Magento/Tax/composer.json
+++ b/app/code/Magento/Tax/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-tax",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-config": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-catalog": "102.0.*",
@@ -22,7 +22,7 @@
         "magento/module-tax-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.6",
+    "version": "100.2.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Tax/etc/di.xml b/app/code/Magento/Tax/etc/di.xml
index 096f8359fadd3..3b46b0f9e258c 100644
--- a/app/code/Magento/Tax/etc/di.xml
+++ b/app/code/Magento/Tax/etc/di.xml
@@ -143,6 +143,7 @@
         <arguments>
             <argument name="fieldMapping" xsi:type="array">
                 <item name="id" xsi:type="string">tax_calculation_rule_id</item>
+                <item name="code" xsi:type="string">main_table.code</item>
                 <item name="tax_rate_ids" xsi:type="string">tax_calculation_rate_id</item>
                 <item name="customer_tax_class_ids" xsi:type="string">cd.customer_tax_class_id</item>
                 <item name="product_tax_class_ids" xsi:type="string">cd.product_tax_class_id</item>
@@ -154,6 +155,7 @@
         <arguments>
             <argument name="fieldMapping" xsi:type="array">
                 <item name="id" xsi:type="string">tax_calculation_rule_id</item>
+                <item name="code" xsi:type="string">main_table.code</item>
                 <item name="tax_rate_ids" xsi:type="string">tax_calculation_rate_id</item>
                 <item name="customer_tax_class_ids" xsi:type="string">cd.customer_tax_class_id</item>
                 <item name="product_tax_class_ids" xsi:type="string">cd.product_tax_class_id</item>
diff --git a/app/code/Magento/Tax/etc/extension_attributes.xml b/app/code/Magento/Tax/etc/extension_attributes.xml
index 90a5e6d2ecee3..41af1df836d6f 100644
--- a/app/code/Magento/Tax/etc/extension_attributes.xml
+++ b/app/code/Magento/Tax/etc/extension_attributes.xml
@@ -20,4 +20,7 @@
     <extension_attributes for="Magento\Catalog\Api\Data\ProductRender\PriceInfoInterface">
         <attribute code="tax_adjustments" type="Magento\Catalog\Api\Data\ProductRender\PriceInfoInterface" />
     </extension_attributes>
+    <extension_attributes for="Magento\Tax\Api\Data\QuoteDetailsItemInterface">
+        <attribute code="price_for_tax_calculation" type="float" />
+    </extension_attributes>
 </config>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml
deleted file mode 100644
index 18e86549a1ff9..0000000000000
--- a/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-?>
-<div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-    <?= $block->getBackButtonHtml() ?>
-    <?= $block->getResetButtonHtml() ?>
-    <?= $block->getDeleteButtonHtml() ?>
-    <?= $block->getSaveButtonHtml() ?>
-</div>
-<?= $block->getRenameFormHtml() ?>
-<script type="text/x-magento-init">
-    {
-        "#<?= /* @escapeNotVerified */ $block->getRenameFormId() ?>": {
-            "Magento_Tax/js/page/validate": {}
-        }
-    }
-</script>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml b/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
index 5e914fdc5a558..ef680e20efe7d 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
@@ -3,31 +3,27 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
 
 $_item = $block->getItem();
 ?>
-
-<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()): ?>
+<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()) : ?>
     <div class="price-excl-tax">
-        <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+        <?php if ($block->displayBothPrices()) : ?>
+            <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
         <?php endif; ?>
-        <?= /* @escapeNotVerified */ $block->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
+        <?= /* @noEscape */ $block->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
     </div>
 <?php endif; ?>
-<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()): ?>
+<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()) : ?>
     <div class="price-incl-tax">
-        <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+        <?php if ($block->displayBothPrices()) : ?>
+            <span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
         <?php endif; ?>
-        <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-        <?php $_baseIncl = $this->helper('Magento\Checkout\Helper\Data')->getBaseSubtotalInclTax($_item); ?>
-        <?= /* @escapeNotVerified */ $block->displayPrices($_baseIncl, $_incl) ?>
+        <?php $_incl = $this->helper(\Magento\Checkout\Helper\Data::class)->getSubtotalInclTax($_item); ?>
+        <?php $_baseIncl = $this->helper(\Magento\Checkout\Helper\Data::class)->getBaseSubtotalInclTax($_item); ?>
+        <?= /* @noEscape */ $block->displayPrices($_baseIncl, $_incl) ?>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml b/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml
index 501ec61d34815..ee02937d72cbb 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?php
 /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
@@ -13,4 +11,4 @@
 $_item = $block->getItem();
 ?>
 
-<?= /* @escapeNotVerified */ $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
+<?= /* @noEscape */ $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml
index 82d82192d45e4..ff5698f4df375 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
@@ -13,24 +10,24 @@
 $_item = $block->getItem();
 ?>
 
-<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
+<?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displaySalesBothPrices() || $this->helper(\Magento\Tax\Helper\Data::class)->displaySalesPriceExclTax()) : ?>
     <div class="price-excl-tax">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-            <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+        <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displaySalesBothPrices()) : ?>
+            <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
         <?php endif; ?>
 
-        <?= /* @escapeNotVerified */ $block->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
+        <?= /* @noEscape */ $block->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
     </div>
 <?php endif; ?>
-<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
+<?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displaySalesBothPrices() || $this->helper(\Magento\Tax\Helper\Data::class)->displaySalesPriceInclTax()) : ?>
     <div class="price-incl-tax">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-            <span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+        <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displaySalesBothPrices()) : ?>
+            <span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
         <?php endif; ?>
-        <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
-        <?php $_baseIncl = $this->helper('Magento\Checkout\Helper\Data')->getBasePriceInclTax($_item); ?>
+        <?php $_incl = $this->helper(\Magento\Checkout\Helper\Data::class)->getPriceInclTax($_item); ?>
+        <?php $_baseIncl = $this->helper(\Magento\Checkout\Helper\Data::class)->getBasePriceInclTax($_item); ?>
 
-        <?= /* @escapeNotVerified */ $block->displayPrices($_baseIncl, $_incl) ?>
+        <?= /* @noEscape */ $block->displayPrices($_baseIncl, $_incl) ?>
 
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml
index 17f7f39529a74..ca7c81c6d4bdd 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
@@ -13,17 +10,17 @@
 $_item = $block->getItem();
 ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices($block->getStore())): ?>
-        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices($block->getStore())) : ?>
+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice($_item->getRowTotal()) ?>
+    <?= /* @noEscape */ $block->formatPrice($_item->getRowTotal()) ?>
 <?php endif; ?>
 
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice($_incl) ?>
+    <?php $_incl = $this->helper(\Magento\Checkout\Helper\Data::class)->getSubtotalInclTax($_item); ?>
+    <?= /* @noEscape */ $block->formatPrice($_incl) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml
index 860b4662fd369..462a1a65f97c3 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
@@ -13,19 +10,19 @@
 $_item = $block->getItem();
 ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
     <?php $_rowTotalWithoutDiscount = $_item->getRowTotal() - $_item->getTotalDiscountAmount(); ?>
-    <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+    <?php if ($block->displayBothPrices()) : ?>
+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
+    <?= /* @noEscape */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
 <?php endif; ?>
 
 
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices($block->getStore())): ?>
-        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices($block->getStore())) : ?>
+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
     <?php $_incl = $block->getTotalAmount($_item); ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice($_incl) ?>
+    <?= /* @noEscape */ $block->formatPrice($_incl) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml
index 2846307979df0..f36d9ebac8f48 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Tax\Block\Adminhtml\Items\Price\Renderer $block */
@@ -13,18 +10,18 @@
 $_item = $block->getItem();
 ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice($_item->getCalculationPrice()) ?>
+    <?= /* @noEscape */ $block->formatPrice($_item->getCalculationPrice()) ?>
 <?php endif; ?>
 
 
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice($_incl) ?>
+    <?php $_incl = $this->helper(\Magento\Checkout\Helper\Data::class)->getPriceInclTax($_item); ?>
+    <?= /* @noEscape */ $block->formatPrice($_incl) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml
index 30b5e954da5d2..304020c3af279 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <div class="entry-edit form-inline">
     <?= $block->getFormHtml() ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
index 16c23624c38e6..d133e2927905b 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <script>
 require([
@@ -13,7 +10,7 @@ require([
     "mage/adminhtml/form"
 ], function(jQuery){
 
-    var updater = new RegionUpdater('tax_country_id', 'tax_region', 'tax_region_id', <?= /* @escapeNotVerified */ $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>, 'disable');
+    var updater = new RegionUpdater('tax_country_id', 'tax_region', 'tax_region_id', <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson() ?>, 'disable');
     updater.disableRegionValidation();
 
     (function ($) {
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
index 682968e34479b..7dd6f6cee8c63 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
@@ -3,21 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <fieldset id="tax-rate-titles-table" class="admin__fieldset">
     <?php $_labels = $block->getTitles() ?>
-    <?php foreach ($block->getStores() as $_store): ?>
+    <?php foreach ($block->getStores() as $_store) : ?>
         <div class="admin__field">
-            <label class="admin__field-label"><span><?= /* @escapeNotVerified */ $_store->getName() ?></span></label>
+            <label class="admin__field-label">
+                <span><?= $block->escapeHtml($_store->getName()) ?></span>
+            </label>
             <div class="admin__field-control">
                 <input
-                    class="admin__control-text<?php if ($_store->getId() == 0): ?> required-entry<?php endif; ?>"
+                    class="admin__control-text<?php if ($_store->getId() == 0) : ?> required-entry<?php endif; ?>"
                     type="text"
-                    name="title[<?= /* @escapeNotVerified */ $_store->getId() ?>]"
-                    value="<?= /* @escapeNotVerified */ $_labels[$_store->getId()] ?>" />
+                    name="title[<?= (int) $_store->getId() ?>]"
+                    value="<?= $block->escapeHtmlAttr($_labels[(int) $_store->getId()]) ?>" />
             </div>
         </div>
     <?php endforeach; ?>
@@ -25,8 +24,8 @@
     <div class="messages">
         <div class="message message-notice">
             <div>
-                <strong><?= /* @escapeNotVerified */ __('Note:') ?></strong>
-                <?= /* @escapeNotVerified */ __('Leave this field empty if you wish to use the tax identifier.') ?>
+                <strong><?= $block->escapeHtml(__('Note:')) ?></strong>
+                <?= $block->escapeHtml(__('Leave this field empty if you wish to use the tax identifier.')) ?>
             </div>
         </div>
     </div>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
index fced077015f4e..81bdd874ead6c 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Tax\Block\Adminhtml\Rule\Edit\Form */
 ?>
 <script>
@@ -78,7 +76,7 @@ require([
             $.ajax({
                 type: "POST",
                 data: {id:id},
-                url: '<?= /* @escapeNotVerified */ $block->getTaxRateLoadUrl() ?>',
+                url: '<?= $block->escapeJs($block->escapeUrl($block->getTaxRateLoadUrl())) ?>',
                 success: function(result, status) {
                     $('body').trigger('processStop');
                     if (result.success) {
@@ -95,14 +93,14 @@ require([
                             });
                         else
                             alert({
-                                content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
+                                content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
                             });
                     }
                 },
                 error: function () {
                     $('body').trigger('processStop');
                     alert({
-                        content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
+                        content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
                     });
                 },
                 dataType: "json"
@@ -113,9 +111,9 @@ require([
             var options = {
                 mselectContainer: '#tax_rate + section.mselect-list',
                 toggleAddButton:false,
-                addText: '<?= /* @escapeNotVerified */ __('Add New Tax Rate') ?>',
+                addText: '<?= $block->escapeJs($block->escapeHtml(__('Add New Tax Rate'))) ?>',
                 parse: null,
-                nextPageUrl: '<?php echo $block->escapeHtml($block->getTaxRatesPageUrl())?>',
+                nextPageUrl: '<?= $block->escapeHtml($block->getTaxRatesPageUrl()) ?>',
                 selectedValues: this.settings.selected_values,
                 mselectInputSubmitCallback: function (value, options) {
                     var select = $('#tax_rate');
@@ -138,7 +136,7 @@ require([
             var taxRate = $('#tax_rate'),
                 taxRateField = taxRate.parent(),
                 taxRateForm = $('#tax-rate-form'),
-                taxRateFormElement = $('#<?= /* @escapeNotVerified */ \Magento\Tax\Block\Adminhtml\Rate\Form::FORM_ELEMENT_ID ?>');
+                taxRateFormElement = $('#<?= /* @noEscape */ \Magento\Tax\Block\Adminhtml\Rate\Form::FORM_ELEMENT_ID ?>');
 
             if (!this.isEntityEditable) {
                 // Override default layout of editable multiselect
@@ -162,7 +160,7 @@ require([
             taxRateField.find('.mselect-list')
                     .on('click.mselect-edit', '.mselect-edit', this.edit)
                     .on("click.mselect-delete", ".mselect-delete", function () {
-                        if (!confirm('<?= /* @escapeNotVerified */ __('Do you really want to delete this tax rate?') ?>')) {
+                        if (!confirm('<?= $block->escapeJs(__('Do you really want to delete this tax rate?')) ?>')) {
                             return;
                         }
 
@@ -178,7 +176,7 @@ require([
                                 form_key: $('input[name="form_key"]').val()
                             },
                             dataType: 'json',
-                            url: '<?= /* @escapeNotVerified */ $block->getTaxRateDeleteUrl() ?>',
+                            url: '<?= $block->escapeJs($block->escapeUrl($block->getTaxRateDeleteUrl())) ?>',
                             success: function(result, status) {
                                 $('body').trigger('processStop');
                                 if (result.success) {
@@ -196,14 +194,14 @@ require([
                                         });
                                     else
                                         alert({
-                                            content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
+                                            content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
                                         });
                                 }
                             },
                             error: function () {
                                 $('body').trigger('processStop');
                                 alert({
-                                    content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
+                                    content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
                                 });
                             }
                         };
@@ -224,15 +222,15 @@ require([
             taxRateFormElement.mage('form').mage('validation');
 
             taxRateForm.dialogRates({
-                title: '<?= /* @escapeNotVerified */ __('Tax Rate') ?>',
+                title: '<?= $block->escapeJs($block->escapeHtml(__('Tax Rate'))) ?>',
                 type: 'slide',
-                id: '<?= /* @escapeNotVerified */ $block->getJsId() ?>',
+                id: '<?= /* @noEscape */ $block->getJsId() ?>',
                 modalClass: 'tax-rate-popup',
                 closed: function () {
                     taxRateFormElement.data('validation').clearError();
                 },
                 buttons: [{
-                    text: '<?= /* @escapeNotVerified */ __('Save') ?>',
+                    text: '<?= $block->escapeJs($block->escapeHtml(__('Save'))) ?>',
                     'class': 'action-save action-primary',
                     click: function() {
                         this.updateItemRate();
@@ -252,7 +250,7 @@ require([
                             type: 'POST',
                             data: itemRateData,
                             dataType: 'json',
-                            url: '<?= /* @escapeNotVerified */ $block->getTaxRateSaveUrl() ?>',
+                            url: '<?= $block->escapeJs($block->escapeUrl($block->getTaxRateSaveUrl())) ?>',
                             success: function(result, status) {
                                 $('body').trigger('processStop');
                                 if (result.success) {
@@ -277,14 +275,14 @@ require([
                                         });
                                     else
                                         alert({
-                                            content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
+                                            content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
                                         });
                                 }
                             },
                             error: function () {
                                 $('body').trigger('processStop');
                                 alert({
-                                    content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
+                                    content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
                                 });
                             }
                         };
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
index c0d185c36b0d6..f09af05303f36 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
@@ -10,8 +10,7 @@
     <div class="grid-loader"></div>
 </div>
 
-<div class="form-inline" id="<?= /* @escapeNotVerified */ $block->getNameInLayout() ?>" style="display:none">
+<div class="form-inline" id="<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>" style="display:none">
     <?= $block->getFormHtml() ?>
     <?= $block->getChildHtml('form_after') ?>
 </div>
-
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
index ed7e543989e78..a674424f723ca 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
@@ -3,9 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// @deprecated
+// @codingStandardsIgnoreFile
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-    <button type="button" onclick="window.location.href='<?= /* @escapeNotVerified */ $createUrl ?>'">
-        <?= /* @escapeNotVerified */ __('Add New Class') ?>
+    <button type="button" onclick="window.location.href='<?= $block->escapeUrl($createUrl) ?>'">
+        <?= $block->escapeHtml(__('Add New Class')) ?>
     </button>
 </div>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
index e0255d52e4dc3..cfe5a7d14785a 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
@@ -3,22 +3,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
+// @deprecated
 // @codingStandardsIgnoreFile
-
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
     <?= $block->getBackButtonHtml() ?>
     <?= $block->getResetButtonHtml() ?>
     <?= $block->getSaveButtonHtml() ?>
 </div>
-<?php if ($form): ?>
-<?= $form->toHtml() ?>
-<script>
-require(['jquery', "mage/mage"], function(jQuery){
+<?php if ($form) : ?>
+    <?= $form->toHtml() ?>
+    <script>
+    require(['jquery', "mage/mage"], function(jQuery){
 
-    jQuery('#<?= /* @escapeNotVerified */ $form->getForm()->getId() ?>').mage('form').mage('validation');
+        jQuery('#<?= $block->escapeJs($form->getForm()->getId()) ?>').mage('form').mage('validation');
 
-});
-</script>
+    });
+    </script>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml
index 902c6932f0ae1..ab8a734763fb4 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml
@@ -3,8 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?= $block->getChildHtml('grid') ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
index 3128b82b69e60..58c79bbfe9715 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
@@ -3,48 +3,44 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<?php if ($form): ?>
-<?= $form->toHtml() ?>
-
-<script>
-require([
-    "jquery",
-    "mage/mage"
-], function($){
+<?php if ($form) : ?>
+    <?= $form->toHtml() ?>
+    <script>
+    require([
+        "jquery",
+        "mage/mage"
+    ], function($){
 
-    $('#<?= /* @escapeNotVerified */ $form->getForm()->getId() ?>').mage('form').mage('validation');
+        $('#<?= $block->escapeJs($form->getForm()->getId()) ?>').mage('form').mage('validation');
 
-    $(document).ready(function () {
-        'use strict';
+        $(document).ready(function () {
+            'use strict';
 
-        $('.field-zip_from').addClass('ignore-validate');
-        $('.field-zip_to').addClass('ignore-validate');
+            $('.field-zip_from').addClass('ignore-validate');
+            $('.field-zip_to').addClass('ignore-validate');
 
-        $('#zip_is_range').on('change.zipRange', function(){
+            $('#zip_is_range').on('change.zipRange', function(){
 
-            var elem = $(this),
-                zipFrom =$('.field-zip_from'),
-                zipTo =$('.field-zip_to'),
-                zipCode =$('.field-tax_postcode');
+                var elem = $(this),
+                    zipFrom =$('.field-zip_from'),
+                    zipTo =$('.field-zip_to'),
+                    zipCode =$('.field-tax_postcode');
 
-            if (elem.is(':checked')) {
-                zipCode.addClass('hidden').addClass('ignore-validate');
-                zipFrom.removeClass('hidden').removeClass('ignore-validate');
-                zipTo.removeClass('hidden').removeClass('ignore-validate');
+                if (elem.is(':checked')) {
+                    zipCode.addClass('hidden').addClass('ignore-validate');
+                    zipFrom.removeClass('hidden').removeClass('ignore-validate');
+                    zipTo.removeClass('hidden').removeClass('ignore-validate');
 
-            } else {
-                zipCode.removeClass('hidden').removeClass('ignore-validate');
-                zipFrom.addClass('hidden').addClass('ignore-validate');
-                zipTo.addClass('hidden').addClass('ignore-validate');
-            }
+                } else {
+                    zipCode.removeClass('hidden').removeClass('ignore-validate');
+                    zipFrom.addClass('hidden').addClass('ignore-validate');
+                    zipTo.addClass('hidden').addClass('ignore-validate');
+                }
 
+            });
         });
-    });
 
-});
-</script>
+    });
+    </script>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
index b3d8a01e1eff1..b0ad610272f80 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
@@ -3,9 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// @deprecated
+// @codingStandardsIgnoreFile
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-    <button type="button" onclick="window.location.href='<?= /* @escapeNotVerified */ $createUrl ?>'">
-        <?= /* @escapeNotVerified */ __('Add New Tax Rule') ?>
+    <button type="button" onclick="window.location.href='<?= $block->escapeUrl($createUrl) ?>'">
+        <?= $block->escapeHtml(__('Add New Tax Rule')) ?>
     </button>
 </div>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml
index 10c0e796ea4f1..7c5de950469ab 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml
@@ -3,9 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
+// @deprecated
 // @codingStandardsIgnoreFile
-
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
     <?= $block->getBackButtonHtml() ?>
@@ -13,13 +12,13 @@
     <?= $block->getSaveButtonHtml() ?>
     <?= $block->getDeleteButtonHtml() ?>
 </div>
-<?php if ($form): ?>
-<?= $form->toHtml() ?>
-<script>
-require(['jquery', "mage/mage"], function(jQuery){
+<?php if ($form) : ?>
+    <?= $form->toHtml() ?>
+    <script>
+    require(['jquery', "mage/mage"], function(jQuery){
 
-    jQuery('#<?= /* @escapeNotVerified */ $form->getForm()->getId() ?>').mage('form').mage('validation');
+        jQuery('#<?= $block->escapeJs($form->getForm()->getId()) ?>').mage('form').mage('validation');
 
-});
-</script>
+    });
+    </script>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js b/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js
deleted file mode 100644
index a49f199ba56b6..0000000000000
--- a/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-define([
-    'jquery',
-    'mage/mage'
-], function (jQuery) {
-    'use strict';
-
-    return function (data, element) {
-        jQuery(element).mage('form').mage('validation');
-    };
-});
diff --git a/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml b/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
index c6d3d51ff22a8..e87d1c9eb96aa 100644
--- a/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
+++ b/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
@@ -3,18 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php /** @var \Magento\Tax\Pricing\Render\Adjustment $block */ ?>
 
-<?php if ($block->displayBothPrices()): ?>
-    <span id="<?= /* @escapeNotVerified */ $block->buildIdWithPrefix('price-excluding-tax-') ?>"
-          data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>"
-          data-price-amount="<?= /* @escapeNotVerified */ $block->getRawAmount() ?>"
+<?php if ($block->displayBothPrices()) : ?>
+    <span id="<?= $block->escapeHtmlAttr($block->buildIdWithPrefix('price-excluding-tax-')) ?>"
+          data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>"
+          data-price-amount="<?= /* @noEscape */ $block->getRawAmount() ?>"
           data-price-type="basePrice"
           class="price-wrapper price-excluding-tax">
-        <span class="price"><?= /* @escapeNotVerified */ $block->getDisplayAmountExclTax() ?></span></span>
+        <span class="price"><?= /* @noEscape */ $block->getDisplayAmountExclTax() ?></span></span>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml b/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
index 999af81186fae..41430c0fbcfa8 100644
--- a/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
+++ b/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
@@ -3,19 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php /** @var \Magento\Tax\Pricing\Render\Adjustment $block */ ?>
-<?php if ($block->displayPriceIncludingTax()): ?>
-    <?= /* @escapeNotVerified */ $block->getDisplayAmount() ?>
-<?php elseif ($block->displayPriceExcludingTax()): ?>
-    <?= /* @escapeNotVerified */ $block->getDisplayAmountExclTax() ?>
-<?php elseif ($block->displayBothPrices()): ?>
-    <?= /* @escapeNotVerified */ $block->getDisplayAmount() ?>
-    <?php if ($block->getDisplayAmountExclTax() !== $block->getDisplayAmount()): ?>
-        (+<?= /* @escapeNotVerified */ $block->getDisplayAmountExclTax() ?> Excl. Tax)
+<?php if ($block->displayPriceIncludingTax()) : ?>
+    <?= /* @noEscape */ $block->getDisplayAmount() ?>
+<?php elseif ($block->displayPriceExcludingTax()) : ?>
+    <?= /* @noEscape */ $block->getDisplayAmountExclTax() ?>
+<?php elseif ($block->displayBothPrices()) : ?>
+    <?= /* @noEscape */ $block->getDisplayAmount() ?>
+    <?php if ($block->getDisplayAmountExclTax() !== $block->getDisplayAmount()) : ?>
+        (+<?= /* @noEscape */ $block->getDisplayAmountExclTax() ?> <?= $block->escapeHtml(__('Excl. Tax')) ?>)
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/base/web/js/price/adjustment.js b/app/code/Magento/Tax/view/base/web/js/price/adjustment.js
index 9af15f84562f4..a17d130d9282a 100644
--- a/app/code/Magento/Tax/view/base/web/js/price/adjustment.js
+++ b/app/code/Magento/Tax/view/base/web/js/price/adjustment.js
@@ -62,7 +62,7 @@ define([
         },
 
         /**
-         * Set price taax type.
+         * Set price tax type.
          *
          * @param {String} priceType
          * @return {Object}
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
index 9395bd47ca3e7..d71668712d857 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
@@ -4,19 +4,17 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Tax\Block\Item\Price\Renderer */
 ?>
 <?php $_item = $block->getItem() ?>
-    <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-        <span class="price-wrapper price-including-tax" data-label="<?= /* @escapeNotVerified */ __('Incl. Tax') ?>">
+    <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+        <span class="price-wrapper price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
             <?php $_incl = $_item->getPriceInclTax(); ?>
-            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
+            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($_incl) ?>
         </span>
     <?php endif; ?>
-    <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-        <span class="price-wrapper price-excluding-tax" data-label="<?= /* @escapeNotVerified */ __('Excl. Tax') ?>">
-            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
+    <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
+        <span class="price-wrapper price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
+            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice()) ?>
         </span>
     <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
index 5bcbde0e24c4e..8b866a19945f2 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
@@ -4,37 +4,39 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var $block \Magento\Tax\Block\Checkout\Grandtotal
  */
 ?>
-<?php if ($block->includeTax() && $block->getTotalExclTax() >= 0):?>
-<tr class="grand totals excl">
-    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-        <strong><?= /* @escapeNotVerified */ __('Grand Total Excl. Tax') ?></strong>
-    </th>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Grand Total Excl. Tax')) ?>">
-        <strong><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotalExclTax()) ?></strong>
-    </td>
-</tr>
-<?= /* @escapeNotVerified */ $block->renderTotals('taxes', $block->getColspan()) ?>
-<tr class="grand totals incl">
-    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-        <strong><?= /* @escapeNotVerified */ __('Grand Total Incl. Tax') ?></strong>
-    </th>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Grand Total Incl. Tax')) ?>">
-        <strong><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></strong>
-    </td>
-</tr>
-<?php else:?>
-<tr class="grand totals">
-    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-        <strong><?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?></strong>
-    </th>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
-        <strong><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></strong>
-    </td>
-</tr>
-<?php endif;?>
+<?php
+$style = $block->escapeHtmlAttr($block->getStyle());
+$colspan = (int) $block->getColspan();
+?>
+<?php if ($block->includeTax() && $block->getTotalExclTax() >= 0) : ?>
+    <tr class="grand totals excl">
+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+            <strong><?= $block->escapeHtml(__('Grand Total Excl. Tax')) ?></strong>
+        </th>
+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Grand Total Excl. Tax')) ?>">
+            <strong><?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotalExclTax()) ?></strong>
+        </td>
+    </tr>
+    <?= /* @noEscape */ $block->renderTotals('taxes', $colspan) ?>
+    <tr class="grand totals incl">
+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+            <strong><?= $block->escapeHtml(__('Grand Total Incl. Tax')) ?></strong>
+        </th>
+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Grand Total Incl. Tax')) ?>">
+            <strong><?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue()) ?></strong>
+        </td>
+    </tr>
+<?php else : ?>
+    <tr class="grand totals">
+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+            <strong><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></strong>
+        </th>
+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
+            <strong><?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue()) ?></strong>
+        </td>
+    </tr>
+<?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
index 203dd72041296..79165396c4cf6 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
@@ -4,48 +4,50 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var $block \Magento\Tax\Block\Checkout\Shipping
  * @see \Magento\Tax\Block\Checkout\Shipping
  */
 ?>
-<?php if ($block->displayShipping()):?>
-    <?php if ($block->displayBoth()):?>
+<?php if ($block->displayShipping()) : ?>
+    <?php
+        $style = $block->escapeHtmlAttr($block->getStyle());
+        $colspan = (int) $block->getColspan();
+    ?>
+    <?php if ($block->displayBoth()) : ?>
     <tr class="totals shipping excl">
-        <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-            <?= /* @escapeNotVerified */ $block->getExcludeTaxLabel() ?>
+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+            <?= $block->escapeHtml($block->getExcludeTaxLabel()) ?>
         </th>
-        <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getExcludeTaxLabel()) ?>">
-            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingExcludeTax()) ?>
+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getExcludeTaxLabel()) ?>">
+            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getShippingExcludeTax()) ?>
         </td>
     </tr>
     <tr class="totals shipping incl">
-        <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-            <?= /* @escapeNotVerified */ $block->getIncludeTaxLabel() ?>
+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+            <?= $block->escapeHtml($block->getIncludeTaxLabel()) ?>
         </th>
-        <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getIncludeTaxLabel()) ?>">
-            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingIncludeTax()) ?>
+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getIncludeTaxLabel()) ?>">
+            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getShippingIncludeTax()) ?>
         </td>
     </tr>
     <?php elseif ($block->displayIncludeTax()) : ?>
     <tr class="totals shipping incl">
-        <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-            <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+            <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         </th>
-        <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
-            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingIncludeTax()) ?>
+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
+            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getShippingIncludeTax()) ?>
         </td>
     </tr>
-    <?php else:?>
+    <?php else : ?>
     <tr class="totals shipping excl">
-        <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
+        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         </th>
-        <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
-            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingExcludeTax()) ?>
+        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
+            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getShippingExcludeTax()) ?>
         </td>
     </tr>
-    <?php endif;?>
+    <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
index 2aedc85221344..6c91f8cec2dce 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
@@ -3,25 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php /** @var $block \Magento\Tax\Block\Checkout\Shipping\Price */ ?>
 
 <?php $_excl = $block->getShippingPriceExclTax(); ?>
 <?php $_incl = $block->getShippingPriceInclTax(); ?>
-<?php if ($block->displayShippingPriceExclTax()): ?>
-    <span class="price"><?= /* @escapeNotVerified */ $_excl ?></span>
-<?php else: ?>
-<?php if ($block->displayShippingBothPrices() && $_incl != $_excl): ?>
-    <span class="price-including-tax" data-label="<?= /* @escapeNotVerified */ __('Incl. Tax') ?>">
-<?php endif; ?>
-    <span class="price"><?= /* @escapeNotVerified */ $_incl ?></span>
-<?php if ($block->displayShippingBothPrices() && $_incl != $_excl): ?>
-    </span>
-<?php endif; ?>
+<?php if ($block->displayShippingPriceExclTax()) : ?>
+    <span class="price"><?= /* @noEscape */ $_excl ?></span>
+<?php else : ?>
+    <?php if ($block->displayShippingBothPrices() && $_incl != $_excl) : ?>
+        <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
+    <?php endif; ?>
+    <span class="price"><?= /* @noEscape */ $_incl ?></span>
+    <?php if ($block->displayShippingBothPrices() && $_incl != $_excl) : ?>
+        </span>
+    <?php endif; ?>
 <?php endif; ?>
-<?php if ($block->displayShippingBothPrices() && $_incl != $_excl): ?>
-    <span class="price-excluding-tax" data-label="<?= /* @escapeNotVerified */ __('Excl. Tax') ?>"><span class="price"><?= /* @escapeNotVerified */ $_excl ?></span></span>
+<?php if ($block->displayShippingBothPrices() && $_incl != $_excl) : ?>
+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>"><span class="price"><?= /* @noEscape */ $_excl ?></span></span>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
index d295ba7bc7bbc..4bfb8166848fc 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
@@ -4,37 +4,39 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var $block \Magento\Tax\Block\Checkout\Subtotal
  * @see \Magento\Tax\Block\Checkout\Subtotal
  */
 ?>
-<?php if ($block->displayBoth()):?>
+<?php
+$style = $block->escapeHtmlAttr($block->getStyle());
+$colspan = (int) $block->getColspan();
+?>
+<?php if ($block->displayBoth()) : ?>
 <tr class="totals sub excl">
-    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-        <?= /* @escapeNotVerified */ __('Subtotal (Excl. Tax)') ?>
+    <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+        <?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>
     </th>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>">
-        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValueExclTax()) ?>
+    <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Excl. Tax)')) ?>">
+        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValueExclTax()) ?>
     </td>
 </tr>
 <tr class="totals sub incl">
-    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-        <?= /* @escapeNotVerified */ __('Subtotal (Incl. Tax)') ?>
+    <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+        <?= $block->escapeHtml(__('Subtotal (Incl. Tax)')) ?>
     </th>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Subtotal (Incl. Tax)')) ?>">
-        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValueInclTax()) ?>
+    <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Incl. Tax)')) ?>">
+        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValueInclTax()) ?>
     </td>
 </tr>
 <?php else : ?>
 <tr class="totals sub">
-    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-        <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
+    <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+        <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
     </th>
-    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
-        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?>
+    <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
+        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue()) ?>
     </td>
 </tr>
-<?php endif;?>
+<?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
index 50fa6c425c223..b2f229f639b65 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var $block \Magento\Tax\Block\Checkout\Tax
  * @see \Magento\Tax\Block\Checkout\Tax
@@ -13,56 +11,52 @@
 ?>
 <?php
     $_value = $block->getTotal()->getValue();
-    $_style = $block->getTotal()->getStyle();
-?>
-<?php global $taxIter; $taxIter++; ?>
+    $_style = $block->escapeHtmlAttr($block->getTotal()->getStyle());
 
-<?php
     $attributes = 'class="totals-tax"';
-    if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() && $_value != 0) {
-        $attributes = 'class="totals-tax-summary" data-mage-init=\'{"toggleAdvanced": {"selectorsToggleClass": "shown", "baseToggleClass": "expanded", "toggleContainers": ".totals-tax-details"}}\'';
-    }
+
+if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary() && $_value != 0) {
+    $attributes = 'class="totals-tax-summary" data-mage-init=\'{"toggleAdvanced": {"selectorsToggleClass": "shown", "baseToggleClass": "expanded", "toggleContainers": ".totals-tax-details"}}\'';
+}
 ?>
 
-<tr <?= /* @escapeNotVerified */ $attributes ?>>
-    <th style="<?= /* @escapeNotVerified */ $_style ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
-        <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
-            <span class="detailed"><?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?></span>
-        <?php else: ?>
-            <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
-        <?php endif;?>
+<tr <?= /* @noEscape */ $attributes ?>>
+    <th style="<?= /* @noEscape */ $_style ?>" class="mark" colspan="<?= (int) $block->getColspan() ?>" scope="row">
+        <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary()) : ?>
+            <span class="detailed"><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></span>
+        <?php else : ?>
+            <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
+        <?php endif; ?>
     </th>
-    <td style="<?= /* @escapeNotVerified */ $_style ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
-        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_value) ?>
+    <td style="<?= /* @noEscape */ $_style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
+        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($_value) ?>
     </td>
 </tr>
 
-<?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() && $_value != 0): ?>
-    <?php foreach ($block->getTotal()->getFullInfo() as $info): ?>
-        <?php if (isset($info['hidden']) && $info['hidden']) {
-            continue;
-        } ?>
+<?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary() && $_value != 0) : ?>
+    <?php foreach ($block->getTotal()->getFullInfo() as $info) : ?>
+        <?php if (isset($info['hidden']) && $info['hidden']) { continue; } ?>
         <?php $percent = $info['percent']; ?>
         <?php $amount = $info['amount']; ?>
         <?php $rates = $info['rates']; ?>
         <?php $isFirst = 1; ?>
 
-        <?php foreach ($rates as $rate): ?>
-            <tr class="totals-tax-details details-<?= /* @escapeNotVerified */ $taxIter ?>">
-                <th class="mark" style="<?= /* @escapeNotVerified */ $_style ?>" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
+        <?php foreach ($rates as $rate) : ?>
+            <tr class="totals-tax-details">
+                <th class="mark" style="<?= /* @noEscape */ $_style ?>" colspan="<?= (int) $block->getColspan() ?>" scope="row">
                     <?= $block->escapeHtml($rate['title']) ?>
-                    <?php if (!is_null($rate['percent'])): ?>
-                        (<?= (float)$rate['percent'] ?>%)
+                    <?php if ($rate['percent'] !== null) : ?>
+                        (<?= (float) $rate['percent'] ?>%)
                     <?php endif; ?>
                 </th>
-                <?php if ($isFirst): ?>
-                    <td style="<?= /* @escapeNotVerified */ $_style ?>" class="amount" rowspan="<?= count($rates) ?>"
-                       data-th="<?= $block->escapeHtml($rate['title']) ?><?php if (!is_null($rate['percent'])): ?>(<?= (float)$rate['percent'] ?>%)<?php endif; ?>">
-                        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($amount) ?>
+                <?php if ($isFirst) : ?>
+                    <td style="<?= /* @noEscape */ $_style ?>" class="amount" rowspan="<?= count($rates) ?>"
+                       data-th="<?= $block->escapeHtmlAttr($rate['title']) ?><?php if ($rate['percent'] !== null) : ?>(<?= (float) $rate['percent'] ?>%)<?php endif; ?>">
+                        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($amount) ?>
                     </td>
                 <?php endif; ?>
             </tr>
             <?php $isFirst = 0; ?>
         <?php endforeach; ?>
     <?php endforeach; ?>
-<?php endif;?>
+<?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml b/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml
index bd6841268d509..922c1b488c93c 100644
--- a/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Tax\Block\Item\Price\Renderer $block */
@@ -15,18 +12,18 @@ $_item = $block->getItem();
 $_order = $_item->getOrder();
 ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?= /* @escapeNotVerified */  __('Excl. Tax') ?>:</span>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */  $_order->formatPrice($_item->getRowTotal()) ?>
+    <?= /* @noEscape */ $_order->formatPrice($_item->getRowTotal()) ?>
 <?php endif; ?>
 
 
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?= /* @escapeNotVerified */  __('Incl. Tax') ?>:</span>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-    <?= /* @escapeNotVerified */  $_order->formatPrice($_incl) ?>
+    <?php $_incl = $this->helper(\Magento\Checkout\Helper\Data::class)->getSubtotalInclTax($_item); ?>
+    <?= /* @noEscape */ $_order->formatPrice($_incl) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
index 856909cbb4240..12aa494f74e7a 100644
--- a/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
@@ -4,24 +4,22 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Tax\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
 ?>
-<?php if (($block->displayPriceInclTax() || $block->displayBothPrices()) && !$_item->getNoSubtotal()): ?>
-    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
+<?php if (($block->displayPriceInclTax() || $block->displayBothPrices()) && !$_item->getNoSubtotal()) : ?>
+    <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
         <span class="cart-price">
-            <?= /* @escapeNotVerified */ $block->formatPrice($_item->getRowTotalInclTax()) ?>
+            <?= /* @noEscape */ $block->formatPrice($_item->getRowTotalInclTax()) ?>
         </span>
     </span>
 <?php endif; ?>
 
-<?php if (($block->displayPriceExclTax() || $block->displayBothPrices()) && !$_item->getNoSubtotal()): ?>
-    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
+<?php if (($block->displayPriceExclTax() || $block->displayBothPrices()) && !$_item->getNoSubtotal()) : ?>
+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
         <span class="cart-price">
-            <?= /* @escapeNotVerified */ $block->formatPrice($_item->getRowTotal()) ?>
+            <?= /* @noEscape */ $block->formatPrice($_item->getRowTotal()) ?>
         </span>
     </span>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml
index f0066d9024139..8e30d1e82a5b1 100644
--- a/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml
@@ -3,11 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable PSR2.Files.ClosingTag
 /** @var \Magento\Tax\Block\Item\Price\Renderer $block */
 $_item = $block->getItem();
 ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<?= /* @escapeNotVerified */ $_order->formatPrice($block->getTotalAmount($_item)) ?>
+<?= /* @noEscape */ $_order->formatPrice($block->getTotalAmount($_item)) ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
index 5fd1fed49c33c..e5fd756e2f373 100644
--- a/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
@@ -4,26 +4,23 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Tax\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
 ?>
-
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+    <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
         <?php $_incl = $_item->getPriceInclTax(); ?>
         <span class="cart-price">
-            <?= /* @escapeNotVerified */ $block->formatPrice($_incl) ?>
+            <?= /* @noEscape */ $block->formatPrice($_incl) ?>
         </span>
     </span>
 <?php endif; ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
         <span class="cart-price">
-            <?= /* @escapeNotVerified */ $block->formatPrice($block->getItemDisplayPriceExclTax()) ?>
+            <?= /* @noEscape */ $block->formatPrice($block->getItemDisplayPriceExclTax()) ?>
         </span>
     </span>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
index b329f00973b5a..12ac3f928eff9 100644
--- a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
@@ -3,55 +3,53 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
     $_order  = $block->getOrder();
     $_source = $block->getSource();
-    $_fullInfo = $this->helper('Magento\Tax\Helper\Data')->getCalculatedTaxes($_source);
-    global $taxIter; $taxIter++;
+    $_fullInfo = $this->helper(\Magento\Tax\Helper\Data::class)->getCalculatedTaxes($_source);
+    global $taxIter;
+    $taxIter++;
 ?>
 
-<?php if ($_fullInfo && $block->displayFullSummary()): ?>
-        <?php foreach ($_fullInfo as $info): ?>
+<?php if ($_fullInfo && $block->displayFullSummary()) : ?>
+        <?php foreach ($_fullInfo as $info) : ?>
             <?php
                 $percent    = $info['percent'];
                 $amount     = $info['tax_amount'];
                 $baseAmount = $info['base_tax_amount'];
                 $title      = $info['title'];
             ?>
-            <tr class="totals tax details details-<?= /* @escapeNotVerified */ $taxIter ?> <?= ($block->getIsPlaneMode()) ? ' plane' : '' ?>">
-                <td <?= /* @escapeNotVerified */ $block->getLabelProperties() ?>>
+            <tr class="totals tax details details-<?= (int) $taxIter ?><?= ($block->getIsPlaneMode()) ? ' plane' : '' ?>">
+                <td <?= /* @noEscape */ $block->getLabelProperties() ?>>
                     <?= $block->escapeHtml($title) ?>
-                    <?php if (!is_null($percent)): ?>
-                        (<?= (float)$percent ?>%)
+                    <?php if ($percent !== null) : ?>
+                        (<?= (float) $percent ?>%)
                     <?php endif; ?>
                     <br />
                 </td>
-                <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?> rowspan="1">
-                    <?= /* @escapeNotVerified */ $_order->formatPrice($amount) ?>
+                <td <?= /* @noEscape */ $block->getValueProperties() ?> rowspan="1">
+                    <?= /* @noEscape */ $_order->formatPrice($amount) ?>
                 </td>
             </tr>
         <?php endforeach; ?>
-<?php endif;?>
+<?php endif; ?>
 
-<?php if ($block->displayFullSummary() && $_fullInfo && !$block->getIsPlaneMode()): ?>
+<?php if ($block->displayFullSummary() && $_fullInfo && !$block->getIsPlaneMode()) : ?>
 <tr class="totals-tax-summary">
-<?php elseif ($block->displayFullSummary() && $_fullInfo && $block->getIsPlaneMode()): ?>
+<?php elseif ($block->displayFullSummary() && $_fullInfo && $block->getIsPlaneMode()) : ?>
 <tr class="totals-tax-summary plane">
-<?php else: ?>
+<?php else : ?>
 <tr class="totals-tax">
 <?php endif; ?>
-    <th <?= /* @escapeNotVerified */ $block->getLabelProperties() ?> scope="row">
-        <?php if ($block->displayFullSummary()): ?>
-            <div class="detailed"><?= /* @escapeNotVerified */ __('Tax') ?></div>
-        <?php else: ?>
-            <?= /* @escapeNotVerified */ __('Tax') ?>
-        <?php endif;?>
+    <th <?= /* @noEscape */ $block->getLabelProperties() ?> scope="row">
+        <?php if ($block->displayFullSummary()) : ?>
+            <div class="detailed"><?= $block->escapeHtml(__('Tax')) ?></div>
+        <?php else : ?>
+            <?= $block->escapeHtml(__('Tax')) ?>
+        <?php endif; ?>
     </th>
-    <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?> data-th="<?= $block->escapeHtml(__('Tax')) ?>">
-        <?= /* @escapeNotVerified */ $_order->formatPrice($_source->getTaxAmount()) ?>
+    <td <?= /* @noEscape */ $block->getValueProperties() ?> data-th="<?= $block->escapeHtmlAttr(__('Tax')) ?>">
+        <?= /* @noEscape */ $_order->formatPrice($_source->getTaxAmount()) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js b/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js
index 39220ae0fac66..2b1f387f5c8c4 100644
--- a/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js
+++ b/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js
@@ -12,14 +12,16 @@ define([
     'Magento_Checkout/js/view/summary/abstract-total',
     'Magento_Checkout/js/model/quote',
     'Magento_Checkout/js/model/totals',
-    'jquery',
-    'mage/translate'
-], function (ko, Component, quote, totals, $, $t) {
+    'mage/translate',
+    'underscore'
+], function (ko, Component, quote, totals, $t, _) {
     'use strict';
 
     var isTaxDisplayedInGrandTotal = window.checkoutConfig.includeTaxInGrandTotal,
         isFullTaxSummaryDisplayed = window.checkoutConfig.isFullTaxSummaryDisplayed,
-        isZeroTaxDisplayed = window.checkoutConfig.isZeroTaxDisplayed;
+        isZeroTaxDisplayed = window.checkoutConfig.isZeroTaxDisplayed,
+        taxAmount = 0,
+        rates = 0;
 
     return Component.extend({
         defaults: {
@@ -67,7 +69,7 @@ define([
                 }
             }
 
-            return parseFloat(amount);
+            return amount;
         },
 
         /**
@@ -99,6 +101,33 @@ define([
             return this.getFormattedPrice(amount);
         },
 
+        /**
+         * @param {*} parent
+         * @param {*} percentage
+         * @return {*|String}
+         */
+        getTaxAmount: function (parent, percentage) {
+            var totalPercentage = 0;
+
+            taxAmount = parent.amount;
+            rates = parent.rates;
+            _.each(rates, function (rate) {
+                totalPercentage += parseFloat(rate.percent);
+            });
+
+            return this.getFormattedPrice(this.getPercentAmount(taxAmount, totalPercentage, percentage));
+        },
+
+        /**
+         * @param {*} amount
+         * @param {*} totalPercentage
+         * @param {*} percentage
+         * @return {*|String}
+         */
+        getPercentAmount: function (amount, totalPercentage, percentage) {
+            return parseFloat(amount * percentage / totalPercentage);
+        },
+
         /**
          * @return {Array}
          */
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/tax.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/tax.html
index 9c45e73db6fa4..45c468096abe1 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/tax.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/tax.html
@@ -32,18 +32,16 @@
             <!-- ko if: !percent -->
                 <th class="mark" scope="row" colspan="1" data-bind="text: title"></th>
             <!-- /ko -->
-            <!-- ko if: $index() == 0 -->
-                <td class="amount" rowspan="1">
-                    <!-- ko if: $parents[1].isCalculated() -->
-                    <span class="price"
-                          data-bind="text: $parents[1].formatPrice($parents[0].amount), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
-                    <!-- /ko -->
-                    <!-- ko ifnot: $parents[1].isCalculated() -->
-                    <span class="not-calculated"
-                          data-bind="text: $parents[1].formatPrice($parents[0].amount), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
-                    <!-- /ko -->
-                </td>
-            <!-- /ko -->
+            <td class="amount" rowspan="1">
+                <!-- ko if: $parents[1].isCalculated() -->
+                <span class="price"
+                      data-bind="text: $parents[1].getTaxAmount($parents[0], percent), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
+                <!-- /ko -->
+                <!-- ko ifnot: $parents[1].isCalculated() -->
+                <span class="not-calculated"
+                      data-bind="text: $parents[1].getTaxAmount($parents[0], percent), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
+                <!-- /ko -->
+            </td>
         </tr>
         <!-- /ko -->
     <!-- /ko -->
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
index 0f2e3251bcfdb..5f1ac86e38ffd 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
@@ -43,18 +43,16 @@
             <!-- ko if: !percent -->
                 <th class="mark" scope="row" data-bind="text: title"></th>
             <!-- /ko -->
-            <!-- ko if: $index() == 0 -->
-                <td class="amount">
-                    <!-- ko if: $parents[1].isCalculated() -->
-                    <span class="price"
-                          data-bind="text: $parents[1].formatPrice($parents[0].amount), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
-                    <!-- /ko -->
-                    <!-- ko ifnot: $parents[1].isCalculated() -->
-                    <span class="not-calculated"
-                          data-bind="text: $parents[1].formatPrice($parents[0].amount), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
-                    <!-- /ko -->
-                </td>
-            <!-- /ko -->
+            <td class="amount">
+                <!-- ko if: $parents[1].isCalculated() -->
+                <span class="price"
+                      data-bind="text: $parents[1].getTaxAmount($parents[0], percent), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
+                <!-- /ko -->
+                <!-- ko ifnot: $parents[1].isCalculated() -->
+                <span class="not-calculated"
+                      data-bind="text: $parents[1].getTaxAmount($parents[0], percent), attr: {'data-th': title, 'rowspan': $parents[0].rates.length }"></span>
+                <!-- /ko -->
+            </td>
         </tr>
         <!-- /ko -->
     <!-- /ko -->
diff --git a/app/code/Magento/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json
index 927aac1e59501..929239846c1ac 100644
--- a/app/code/Magento/TaxImportExport/composer.json
+++ b/app/code/Magento/TaxImportExport/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-tax-import-export",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-tax": "100.2.*",
         "magento/module-backend": "100.2.*",
         "magento/module-directory": "100.2.*",
@@ -10,7 +10,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
index f1d41e0c969a2..1e8759404e07c 100644
--- a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
+++ b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
@@ -4,24 +4,30 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var $block \Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExport */
 ?>
 <div class="import-export-tax-rates">
-    <?php if (!$block->getIsReadonly()): ?>
+    <?php if (!$block->getIsReadonly()) :?>
     <div class="import-tax-rates">
-        <?php if ($block->getUseContainer()): ?>
-        <form id="import-form" class="admin__fieldset" action="<?= /* @escapeNotVerified */ $block->getUrl('tax/rate/importPost') ?>" method="post" enctype="multipart/form-data">
+        <?php if ($block->getUseContainer()) :?>
+        <form id="import-form"
+              class="admin__fieldset"
+              action="<?= $block->escapeUrl($block->getUrl('tax/rate/importPost')) ?>"
+              method="post"
+              enctype="multipart/form-data">
         <?php endif; ?>
             <?= $block->getBlockHtml('formkey') ?>
             <div class="fieldset admin__field">
-                <label for="import_rates_file" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Import Tax Rates') ?></span></label>
+                <label for="import_rates_file" class="admin__field-label"><span><?= $block->escapeHtml(__('Import Tax Rates')) ?></span></label>
                 <div class="admin__field-control">
-                    <input type="file" id="import_rates_file" name="import_rates_file" class="input-file required-entry"/>
+                    <input type="file"
+                           id="import_rates_file"
+                           name="import_rates_file"
+                           class="input-file required-entry"/>
                     <?= $block->getButtonHtml(__('Import Tax Rates'), '', 'import-submit') ?>
                 </div>
             </div>
-        <?php if ($block->getUseContainer()): ?>
+        <?php if ($block->getUseContainer()) :?>
         </form>
         <?php endif; ?>
         <script>
@@ -44,18 +50,22 @@ require(['jquery', "mage/mage", "loadingPopup"], function(jQuery){
 </script>
     </div>
     <?php endif; ?>
-    <div class="export-tax-rates <?php if ($block->getIsReadonly()): ?>box-left<?php else: ?>box-right<?php endif; ?>">
-        <?php if ($block->getUseContainer()): ?>
-        <form id="export_form" class="admin__fieldset" action="<?= /* @escapeNotVerified */ $block->getUrl('tax/rate/exportPost') ?>" method="post" enctype="multipart/form-data">
+    <div class="export-tax-rates <?= /* @noEscape */ ($block->getIsReadonly()) ? 'box-left' : 'box-right' ?>">
+        <?php if ($block->getUseContainer()) :?>
+        <form id="export_form"
+              class="admin__fieldset"
+              action="<?= $block->escapeUrl($block->getUrl('tax/rate/exportPost')) ?>"
+              method="post"
+              enctype="multipart/form-data">
         <?php endif; ?>
             <?= $block->getBlockHtml('formkey') ?>
             <div class="fieldset admin__field">
-                <span class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Export Tax Rates') ?></span></span>
+                <span class="admin__field-label"><span><?= $block->escapeHtml(__('Export Tax Rates')) ?></span></span>
                 <div class="admin__field-control">
                     <?= $block->getButtonHtml(__('Export Tax Rates'), "this.form.submit()") ?>
                 </div>
             </div>
-        <?php if ($block->getUseContainer()): ?>
+        <?php if ($block->getUseContainer()) :?>
         </form>
         <?php endif; ?>
     </div>
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php
index 749a9f8dafac5..0ebbc794b7acd 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php
@@ -77,7 +77,7 @@ protected function _prepareLayout()
                 if ($theme->hasChildThemes()) {
                     $message = __('Are you sure you want to delete this theme?');
                     $onClick = sprintf(
-                        "deleteConfirm('%s', '%s')",
+                        "deleteConfirm('%s', '%s', {data: {}})",
                         $message,
                         $this->getUrl('adminhtml/*/delete', ['id' => $theme->getId()])
                     );
diff --git a/app/code/Magento/Theme/Block/Html/Header/CriticalCss.php b/app/code/Magento/Theme/Block/Html/Header/CriticalCss.php
new file mode 100644
index 0000000000000..6ac1ba344469c
--- /dev/null
+++ b/app/code/Magento/Theme/Block/Html/Header/CriticalCss.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Theme\Block\Html\Header;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Framework\View\Asset\Repository;
+use Magento\Framework\View\Asset\File\NotFoundException;
+
+/**
+ * This ViewModel will add inline critical css in case dev/css/use_css_critical_path is enabled.
+ */
+class CriticalCss implements ArgumentInterface
+{
+    /**
+     * @var Repository
+     */
+    private $assetRepo;
+
+    /**
+     * @var string
+     */
+    private $filePath;
+
+    /**
+     * @param Repository $assetRepo
+     * @param string $filePath
+     */
+    public function __construct(
+        Repository $assetRepo,
+        string $filePath = ''
+    ) {
+        $this->assetRepo = $assetRepo;
+        $this->filePath = $filePath;
+    }
+
+    /**
+     * Returns critical css data as string.
+     *
+     * @return bool|string
+     */
+    public function getCriticalCssData()
+    {
+        try {
+            $asset = $this->assetRepo->createAsset($this->filePath, ['_secure' => 'false']);
+            $content = $asset->getContent();
+        } catch (NotFoundException $e) {
+            $content = '';
+        }
+
+        return $content;
+    }
+}
diff --git a/app/code/Magento/Theme/Block/Html/Header/Logo.php b/app/code/Magento/Theme/Block/Html/Header/Logo.php
index 0a0e71f44ba32..b51f624c20339 100644
--- a/app/code/Magento/Theme/Block/Html/Header/Logo.php
+++ b/app/code/Magento/Theme/Block/Html/Header/Logo.php
@@ -43,6 +43,10 @@ public function __construct(
     /**
      * Check if current url is url for home page
      *
+     * @deprecated This function is no longer used. It was previously used by
+     * Magento/Theme/view/frontend/templates/html/header/logo.phtml
+     * to check if the logo should be clickable on the homepage.
+     *
      * @return bool
      */
     public function isHomePage()
diff --git a/app/code/Magento/Theme/Block/Html/Topmenu.php b/app/code/Magento/Theme/Block/Html/Topmenu.php
index 47f88c65acb80..1a25550d93937 100644
--- a/app/code/Magento/Theme/Block/Html/Topmenu.php
+++ b/app/code/Magento/Theme/Block/Html/Topmenu.php
@@ -78,6 +78,7 @@ protected function getCacheLifetime()
      * @param string $childrenWrapClass
      * @param int $limit
      * @return string
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getHtml($outermostClass = '', $childrenWrapClass = '', $limit = 0)
     {
@@ -177,7 +178,7 @@ protected function _addSubMenu($child, $childLevel, $childrenWrapClass, $limit)
             return $html;
         }
 
-        $colStops = null;
+        $colStops = [];
         if ($childLevel == 0 && $limit) {
             $colStops = $this->_columnBrake($child->getChildren(), $limit);
         }
@@ -244,7 +245,7 @@ protected function _getHtml(
                 }
             }
 
-            if (count($colBrakes) && $colBrakes[$counter]['colbrake']) {
+            if (is_array($colBrakes) && count($colBrakes) && $colBrakes[$counter]['colbrake']) {
                 $html .= '</ul></li><li class="column"><ul>';
             }
 
@@ -261,7 +262,7 @@ protected function _getHtml(
             $counter++;
         }
 
-        if (count($colBrakes) && $limit) {
+        if (is_array($colBrakes) && count($colBrakes) && $limit) {
             $html = '<li class="column"><ul>' . $html . '</ul></li>';
         }
 
@@ -361,19 +362,6 @@ public function getIdentities()
         return $this->identities;
     }
 
-    /**
-     * Get cache key informative items
-     *
-     * @return array
-     * @since 100.1.0
-     */
-    public function getCacheKeyInfo()
-    {
-        $keyInfo = parent::getCacheKeyInfo();
-        $keyInfo[] = $this->getUrl('*/*/*', ['_current' => true, '_query' => '']);
-        return $keyInfo;
-    }
-
     /**
      * Get tags array for saving cache
      *
diff --git a/app/code/Magento/Theme/Controller/Result/AsyncCssPlugin.php b/app/code/Magento/Theme/Controller/Result/AsyncCssPlugin.php
new file mode 100644
index 0000000000000..d15e5e69b1759
--- /dev/null
+++ b/app/code/Magento/Theme/Controller/Result/AsyncCssPlugin.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Theme\Controller\Result;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\Response\Http;
+
+/**
+ * Plugin for asynchronous CSS loading.
+ */
+class AsyncCssPlugin
+{
+    const XML_PATH_USE_CSS_CRITICAL_PATH = 'dev/css/use_css_critical_path';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(ScopeConfigInterface $scopeConfig)
+    {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Load CSS asynchronously if it is enabled in configuration.
+     *
+     * @param Http $subject
+     * @return void
+     */
+    public function beforeSendResponse(Http $subject)
+    {
+        $content = $subject->getContent();
+
+        if (\is_string($content) && strpos($content, '</body') !== false && $this->scopeConfig->isSetFlag(
+            self::XML_PATH_USE_CSS_CRITICAL_PATH,
+            ScopeInterface::SCOPE_STORE
+        )) {
+            $cssMatches = [];
+            // add link rel preload to style sheets
+            $content = preg_replace_callback(
+                '@<link\b.*?rel=("|\')stylesheet\1.*?/>@',
+                function ($matches) use (&$cssMatches) {
+                    $cssMatches[] = $matches[0];
+                    preg_match('@href=("|\')(.*?)\1@', $matches[0], $hrefAttribute);
+                    $href = $hrefAttribute[2];
+                    if (preg_match('@media=("|\')(.*?)\1@', $matches[0], $mediaAttribute)) {
+                        $media = $mediaAttribute[2];
+                    }
+                    $media = $media ?? 'all';
+                    $loadCssAsync = sprintf(
+                        '<link rel="preload" as="style" media="%s" .
+                         onload="this.onload=null;this.rel=\'stylesheet\'"' .
+                        'href="%s">',
+                        $media,
+                        $href
+                    );
+
+                    return $loadCssAsync;
+                },
+                $content
+            );
+
+            if (!empty($cssMatches)) {
+                $content = str_replace('</body', implode("\n", $cssMatches) . "\n</body", $content);
+                $subject->setContent($content);
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
index b37628e54aa30..54c69cf86682d 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/File.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/File.php
@@ -20,6 +20,7 @@
 use Magento\Framework\UrlInterface;
 use Magento\MediaStorage\Model\File\UploaderFactory;
 use Magento\Theme\Model\Design\Config\FileUploader\FileProcessor;
+use Magento\MediaStorage\Helper\File\Storage\Database;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -36,6 +37,11 @@ class File extends BackendFile
      */
     private $mime;
 
+    /**
+     * @var Database
+     */
+    private $databaseHelper;
+
     /**
      * @param Context $context
      * @param Registry $registry
@@ -48,6 +54,7 @@ class File extends BackendFile
      * @param AbstractResource|null $resource
      * @param AbstractDb|null $resourceCollection
      * @param array $data
+     * @param Database $databaseHelper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -61,7 +68,8 @@ public function __construct(
         UrlInterface $urlBuilder,
         AbstractResource $resource = null,
         AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        Database $databaseHelper = null
     ) {
         parent::__construct(
             $context,
@@ -76,6 +84,7 @@ public function __construct(
             $data
         );
         $this->urlBuilder = $urlBuilder;
+        $this->databaseHelper = $databaseHelper ?: ObjectManager::getInstance()->get(Database::class);
     }
 
     /**
@@ -103,6 +112,10 @@ public function beforeSave()
             $this->getTmpMediaPath($filename),
             $this->_getUploadDir() . '/' . $filename
         );
+        $this->databaseHelper->renameFile(
+            $this->getTmpMediaPath($filename),
+            $this->_getUploadDir() . '/' . $filename
+        );
         if ($result) {
             $this->_mediaDirectory->delete($this->getTmpMediaPath($filename));
             if ($this->_addWhetherScopeInfo()) {
diff --git a/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
index 98fa12ab987b6..13b8aa23073ce 100644
--- a/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
+++ b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
@@ -27,6 +27,11 @@ class Builder implements \Magento\Framework\View\Model\PageLayout\Config\Builder
      */
     protected $themeCollection;
 
+    /**
+     * @var array
+     */
+    private $configFiles = [];
+
     /**
      * @param \Magento\Framework\View\PageLayout\ConfigFactory $configFactory
      * @param \Magento\Framework\View\PageLayout\File\Collector\Aggregated $fileCollector
@@ -44,7 +49,7 @@ public function __construct(
     }
 
     /**
-     * @return \Magento\Framework\View\PageLayout\Config
+     * @inheritdoc
      */
     public function getPageLayoutsConfig()
     {
@@ -52,15 +57,20 @@ public function getPageLayoutsConfig()
     }
 
     /**
+     * Retrieve configuration files.
+     *
      * @return array
      */
     protected function getConfigFiles()
     {
-        $configFiles = [];
-        foreach ($this->themeCollection->loadRegisteredThemes() as $theme) {
-            $configFiles = array_merge($configFiles, $this->fileCollector->getFilesContent($theme, 'layouts.xml'));
+        if (!$this->configFiles) {
+            $configFiles = [];
+            foreach ($this->themeCollection->loadRegisteredThemes() as $theme) {
+                $configFiles[] = $this->fileCollector->getFilesContent($theme, 'layouts.xml');
+            }
+            $this->configFiles = array_merge(...$configFiles);
         }
 
-        return $configFiles;
+        return $this->configFiles;
     }
 }
diff --git a/app/code/Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml
new file mode 100644
index 0000000000000..a4088c7a4a0b7
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontHeaderSection">
+        <element name="welcomeMessage" type="text" selector=".greet.welcome"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php b/app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php
index 91c3ce47fc8b8..023c741492752 100644
--- a/app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php
@@ -189,7 +189,6 @@ public function testGetCacheKeyInfo()
         $treeFactory = $this->createMock(\Magento\Framework\Data\TreeFactory::class);
 
         $topmenu =  new Topmenu($this->context, $nodeFactory, $treeFactory);
-        $this->urlBuilder->expects($this->once())->method('getUrl')->with('*/*/*')->willReturn('123');
         $this->urlBuilder->expects($this->once())->method('getBaseUrl')->willReturn('baseUrl');
         $store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
             ->disableOriginalConstructor()
@@ -199,7 +198,7 @@ public function testGetCacheKeyInfo()
         $this->storeManager->expects($this->once())->method('getStore')->willReturn($store);
 
         $this->assertEquals(
-            ['BLOCK_TPL', '321', null, 'base_url' => 'baseUrl', 'template' => null, '123'],
+            ['BLOCK_TPL', '321', null, 'base_url' => 'baseUrl', 'template' => null],
             $topmenu->getCacheKeyInfo()
         );
     }
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
index b49b3cb797651..94a6ab0ec565e 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
@@ -28,6 +28,11 @@ class FileTest extends \PHPUnit\Framework\TestCase
      */
     private $mime;
 
+    /**
+     * @var \Magento\MediaStorage\Helper\File\Storage\Database|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $databaseHelper;
+
     public function setUp()
     {
         $context = $this->getMockObject(\Magento\Framework\Model\Context::class);
@@ -55,6 +60,17 @@ public function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->databaseHelper = $this->getMockBuilder(\Magento\MediaStorage\Helper\File\Storage\Database::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $abstractResource = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\AbstractResource::class)
+            ->getMockForAbstractClass();
+
+        $abstractDb = $this->getMockBuilder(\Magento\Framework\Data\Collection\AbstractDb::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
         $this->fileBackend = new File(
             $context,
             $registry,
@@ -63,7 +79,11 @@ public function setUp()
             $uploaderFactory,
             $requestData,
             $filesystem,
-            $this->urlBuilder
+            $this->urlBuilder,
+            $abstractResource,
+            $abstractDb,
+            [],
+            $this->databaseHelper
         );
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -196,6 +216,11 @@ public function testBeforeSave($fileName)
             ]
         );
 
+        $this->databaseHelper->expects($this->once())
+            ->method('renameFile')
+            ->with($expectedTmpMediaPath, '/' . $expectedFileName)
+            ->willReturn(true);
+
         $this->mediaDirectory->expects($this->once())
             ->method('copyFile')
             ->with($expectedTmpMediaPath, '/' . $expectedFileName)
diff --git a/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php b/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php
index e5d69cbc820a1..8429be84cae44 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php
@@ -83,7 +83,7 @@ public function testGetPageLayoutsConfig()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->themeCollection->expects($this->any())
+        $this->themeCollection->expects($this->once())
             ->method('loadRegisteredThemes')
             ->willReturn([$theme1, $theme2]);
 
diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json
index d2ac3a95d923d..0a7c57c94a5b4 100644
--- a/app/code/Magento/Theme/composer.json
+++ b/app/code/Magento/Theme/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-theme",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-customer": "101.0.*",
         "magento/module-backend": "100.2.*",
@@ -22,7 +22,7 @@
         "magento/module-directory": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.6",
+    "version": "100.2.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Theme/etc/adminhtml/system.xml b/app/code/Magento/Theme/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..c581e09fe1e25
--- /dev/null
+++ b/app/code/Magento/Theme/etc/adminhtml/system.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <section id="dev">
+            <group id="css">
+                <field id="use_css_critical_path" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Use CSS critical path</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>CSS files are loading synchronously by default.</comment>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/app/code/Magento/Theme/etc/config.xml b/app/code/Magento/Theme/etc/config.xml
index b44691c0df963..40064acdf1f43 100644
--- a/app/code/Magento/Theme/etc/config.xml
+++ b/app/code/Magento/Theme/etc/config.xml
@@ -66,6 +66,9 @@ Disallow: /*SID=
             <static>
                 <sign>1</sign>
             </static>
+            <css>
+                <use_css_critical_path>0</use_css_critical_path>
+            </css>
         </dev>
     </default>
 </config>
diff --git a/app/code/Magento/Theme/etc/frontend/di.xml b/app/code/Magento/Theme/etc/frontend/di.xml
index 7db2783cd8dfa..41b0032e1fffc 100644
--- a/app/code/Magento/Theme/etc/frontend/di.xml
+++ b/app/code/Magento/Theme/etc/frontend/di.xml
@@ -26,4 +26,12 @@
     <type name="Magento\Framework\Controller\ResultInterface">
         <plugin name="result-messages" type="Magento\Theme\Controller\Result\MessagePlugin"/>
     </type>
+    <type name="Magento\Framework\App\Response\Http">
+        <plugin name="asyncCssLoad" type="Magento\Theme\Controller\Result\AsyncCssPlugin"/>
+    </type>
+    <type name="Magento\Theme\Block\Html\Header\CriticalCss">
+        <arguments>
+            <argument name="filePath" xsi:type="string">css/critical.css</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Theme/i18n/en_US.csv b/app/code/Magento/Theme/i18n/en_US.csv
index e18798f4bf165..24f720c193a0c 100644
--- a/app/code/Magento/Theme/i18n/en_US.csv
+++ b/app/code/Magento/Theme/i18n/en_US.csv
@@ -96,6 +96,7 @@ Phrase,Phrase
 testMessage,testMessage
 Edit,Edit
 "We found no files.","We found no files."
+"thumbnail","thumbnail"
 "Browse Files","Browse Files"
 Scope:,Scope:
 Remove,Remove
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/browser/content.phtml b/app/code/Magento/Theme/view/adminhtml/templates/browser/content.phtml
index 4ce0d766ee3f3..b129498d0d42b 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/browser/content.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/browser/content.phtml
@@ -3,8 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
+
 /**
  * Wysiwyg Images content template
  *
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml
index e5f0efd7917be..804b2fa348280 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml
@@ -3,26 +3,24 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php
 /** @var $block \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Files */
 ?>
 
-<?php if ($block->getFilesCount() > 0): ?>
-    <?php foreach ($block->getFiles() as $file): ?>
-        <div class="filecnt file-font" id="<?= /* @escapeNotVerified */ $file['id'] ?>">
+<?php if ($block->getFilesCount() > 0) : ?>
+    <?php foreach ($block->getFiles() as $file) : ?>
+        <div class="filecnt file-font" id="<?= $block->escapeHtmlAttr($file['id']) ?>">
             <p class="nm">
-                <?= /* @escapeNotVerified */ $file['text'] ?>
-                <?php if (isset($file['thumbnailParams'])): ?>
-                    <img src="<?= /* @escapeNotVerified */ $block->getUrl('*/*/previewImage', $file['thumbnailParams']) ?>">
+                <?= $block->escapeHtml($file['text']) ?>
+                <?php if (isset($file['thumbnailParams'])) : ?>
+                    <img src="<?= $block->escapeUrl($block->getUrl('*/*/previewImage', $file['thumbnailParams'])) ?>"
+                         alt="<?= $block->escapeHtmlAttr(__('thumbnail')) ?>">
                 <?php endif; ?>
             </p>
         </div>
     <?php endforeach; ?>
-<?php else: ?>
-    <?= /* @escapeNotVerified */ __('We found no files.') ?>
+<?php else : ?>
+    <?= $block->escapeHtml(__('We found no files.')) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml
index 722ade94d97fd..8dfa1ff8c83cb 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml
@@ -4,17 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-?>
-<?php
 /** @var $block \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Uploader */
 ?>
 
 <div id="<?= $block->getHtmlId() ?>" class="uploader">
     <span class="fileinput-button form-buttons">
-        <span><?= /* @escapeNotVerified */ __('Browse Files') ?></span>
-        <input id="fileupload" type="file" name="<?= /* @escapeNotVerified */ $block->getConfig()->getFileField() ?>"
-            data-url="<?= /* @escapeNotVerified */ $block->getConfig()->getUrl() ?>" multiple>
+        <span><?= $block->escapeHtml(__('Browse Files')) ?></span>
+        <input id="fileupload" type="file" name="<?= $block->escapeHtmlAttr($block->getConfig()->getFileField()) ?>"
+            data-url="<?= $block->escapeHtmlAttr($block->getConfig()->getUrl()) ?>" multiple>
     </span>
     <div class="clear"></div>
     <script id="<?= $block->getHtmlId() ?>-template" type="text/x-magento-template">
@@ -44,7 +41,7 @@ require([
             form_key: FORM_KEY
         },
         sequentialUploads: true,
-        maxFileSize: <?= /* @escapeNotVerified */ $block->getFileSizeService()->getMaxFileSize() ?> ,
+        maxFileSize: <?= $block->escapeJs($block->getFileSizeService()->getMaxFileSize()) ?> ,
         add: function (e, data) {
             var progressTmpl = mageTemplate('#<?= $block->getHtmlId() ?>-template'),
                 fileSize,
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml b/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml
index 7bd5c70f0bfda..639eb749d3e71 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml
@@ -4,12 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /* @var $block \Magento\Theme\Block\Adminhtml\Design\Config\Edit\Scope */
 ?>
 
 <div class="store-view">
-    <span class="store-switcher-label"><?= /* @escapeNotVerified */ __('Scope:') ?></span>
-    <span class="store-switcher-value"><?= /* @escapeNotVerified */ $block->getScopeTitle() ?></span>
+    <span class="store-switcher-label"><?= $block->escapeHtml(__('Scope:')) ?></span>
+    <span class="store-switcher-value"><?= $block->escapeHtml($block->getScopeTitle()) ?></span>
 </div>
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml b/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml
index 1c1a7ea204b2b..edb768f450d1d 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml
@@ -3,9 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
 
-<?php /** @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css */ ?>
+/** @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css */
+?>
 
 <?= $block->getFormHtml() ?>
 
@@ -20,7 +20,7 @@ require([
     $( '#css_file_uploader' ).fileupload({
         dataType: 'json',
         replaceFileInput: false,
-        url : '<?= /* @escapeNotVerified */ $block->getUrl('*/system_design_theme/uploadcss') ?>',
+        url : '<?= $block->escapeJs($block->escapeUrl($block->getUrl('*/system_design_theme/uploadcss'))) ?>',
         acceptFileTypes: /(.|\/)(css)$/i,
 
         /**
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml b/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml
index 992bd73bf0b4a..b50f68cd9353b 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+/** @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset */
 ?>
-<?php /** @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset */ ?>
 
 <div id="js-file-uploader" class="uploader">
 </div>
@@ -32,7 +32,7 @@
                 id="remove_js_files_<%- data.id %>"
                 name="js_removed_files[]"
                 value="<%- data.id %>" />
-            <label for="remove_js_files_<%- data.id %>"><?= /* @escapeNotVerified */ __('Remove') ?></label>
+            <label for="remove_js_files_<%- data.id %>"><?= $block->escapeHtml(__('Remove')) ?></label>
         </div>
     </div>
 
@@ -60,7 +60,9 @@ jQuery(function($) {
     });
     $('body').trigger(
         'refreshJsList',
-        {jsList: <?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getJsFiles()) ?>}
+        {
+            jsList: <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getJsFiles()) ?>
+        }
     );
 });
 
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml b/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml
index b13e1320d0bd3..1b4633d0965f3 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml
@@ -3,8 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Js */
 ?>
-<?php /** @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Js */ ?>
 <?= $block->getFormHtml() ?>
 
 <script>
@@ -21,7 +22,7 @@ require([
         dataType: 'json',
         replaceFileInput: false,
         sequentialUploads: true,
-        url: '<?= /* @escapeNotVerified */ $block->getJsUploadUrl() ?>',
+        url: '<?= $block->escapeJs($block->escapeUrl($block->getJsUploadUrl())) ?>',
 
         /**
          * Add data
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/title.phtml b/app/code/Magento/Theme/view/adminhtml/templates/title.phtml
index e3a85b64586d0..13045170f7292 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/title.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/title.phtml
@@ -4,17 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var $block \Magento\Theme\Block\Html\Title
  */
-$titleId = ($block->getTitleId()) ? ' id="' . $block->getTitleId() . '"' : '';
+$titleIdHtml = ($block->getTitleId()) ? ' id="' . $block->escapeHtmlAttr($block->getTitleId()) . '"' : '';
 $titleClass = ($block->getTitleClass()) ? ' ' . $block->getTitleClass() : '';
 $title = $block->escapeHtml($block->getPageTitle());
 ?>
 
-<div class="page-title-wrapper<?= /* @escapeNotVerified */ $titleClass ?>">
-    <h1 class="page-title"<?= /* @escapeNotVerified */ $titleId ?>><?= /* @escapeNotVerified */ $title ?></h1>
+<div class="page-title-wrapper<?= $block->escapeHtmlAttr($titleClass) ?>">
+    <h1 class="page-title"<?= /* @noEscape */ $titleIdHtml ?>><?= $block->escapeHtml($title) ?></h1>
     <?= $block->getChildHtml() ?>
 </div>
diff --git a/app/code/Magento/Theme/view/base/requirejs-config.js b/app/code/Magento/Theme/view/base/requirejs-config.js
index 3b5be208ffc4a..3fab589c8a44f 100644
--- a/app/code/Magento/Theme/view/base/requirejs-config.js
+++ b/app/code/Magento/Theme/view/base/requirejs-config.js
@@ -56,6 +56,9 @@ var config = {
         'mixins': {
             'jquery/jstree/jquery.jstree': {
                 'mage/backend/jstree-mixin': true
+            },
+            'jquery': {
+                'jquery/patches/jquery': true
             }
         },
         'text': {
@@ -65,9 +68,3 @@ var config = {
         }
     }
 };
-
-require(['jquery'], function ($) {
-    'use strict';
-
-    $.noConflict();
-});
diff --git a/app/code/Magento/Theme/view/base/templates/root.phtml b/app/code/Magento/Theme/view/base/templates/root.phtml
index 4923ce9ded7df..16948d097ab97 100644
--- a/app/code/Magento/Theme/view/base/templates/root.phtml
+++ b/app/code/Magento/Theme/view/base/templates/root.phtml
@@ -3,18 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <!doctype html>
-<html <?= /* @escapeNotVerified */ $htmlAttributes ?>>
-    <head <?= /* @escapeNotVerified */ $headAttributes ?>>
-        <?= /* @escapeNotVerified */ $requireJs ?>
-        <?= /* @escapeNotVerified */ $headContent ?>
-        <?= /* @escapeNotVerified */ $headAdditional ?>
+<html <?= /* @noEscape */ $htmlAttributes ?>>
+    <head <?= /* @noEscape */ $headAttributes ?>>
+        <?= /* @noEscape */ $requireJs ?>
+        <?= /* @noEscape */ $headContent ?>
+        <?= /* @noEscape */ $headAdditional ?>
     </head>
-    <body data-container="body" data-mage-init='{"loaderAjax": {}, "loader": { "icon": "<?= /* @escapeNotVerified */ $loaderIcon ?>"}}' <?= /* @escapeNotVerified */ $bodyAttributes ?>>
-        <?= /* @escapeNotVerified */ $layoutContent ?>
+    <body data-container="body"
+          data-mage-init='{"loaderAjax": {}, "loader": { "icon": "<?= /* @noEscape */ $loaderIcon ?>"}}'
+        <?= /* @noEscape */ $bodyAttributes ?>>
+        <?= /* @noEscape */ $layoutContent ?>
     </body>
 </html>
diff --git a/app/code/Magento/Theme/view/frontend/layout/default.xml b/app/code/Magento/Theme/view/frontend/layout/default.xml
index c84222be19c3c..4da46ec41da54 100644
--- a/app/code/Magento/Theme/view/frontend/layout/default.xml
+++ b/app/code/Magento/Theme/view/frontend/layout/default.xml
@@ -102,7 +102,9 @@
             </container>
         </referenceContainer>
         <referenceContainer name="main">
-            <container name="content.top" label="Main Content Top"/>
+            <container name="content.top" label="Main Content Top">
+                <block name="main_css_preloader" as="main_css_preloader" template="Magento_Theme::html/main_css_preloader.phtml" ifconfig="dev/css/use_css_critical_path"/>
+            </container>
             <container name="content" label="Main Content Area"/>
             <container name="content.aside" label="Main Content Aside"/>
             <container name="content.bottom" label="Main Content Bottom"/>
diff --git a/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml b/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml
index 38ab9c29402e9..6a1e655786098 100644
--- a/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml
+++ b/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml
@@ -12,6 +12,14 @@
         <script src="requirejs/require.js"/>
     </head>
     <body>
+        <referenceBlock name="head.additional">
+            <block name="critical_css_block" as="critical_css" template="Magento_Theme::html/header/criticalCss.phtml" ifconfig="dev/css/use_css_critical_path">
+                <arguments>
+                    <argument name="criticalCssViewModel" xsi:type="object">Magento\Theme\Block\Html\Header\CriticalCss</argument>
+                </arguments>
+            </block>
+            <block name="css_rel_preload_script" ifconfig="dev/css/use_css_critical_path" template="Magento_Theme::js/css_rel_preload.phtml"/>
+        </referenceBlock>
         <referenceContainer name="after.body.start">
             <block class="Magento\Framework\View\Element\Template" name="head.polyfill" as="polyfill" template="Magento_Theme::js/polyfill.phtml" before="-"/>
             <block class="Magento\Framework\View\Element\Js\Components" name="head.components" as="components" template="Magento_Theme::js/components.phtml" before="-"/>
diff --git a/app/code/Magento/Theme/view/frontend/requirejs-config.js b/app/code/Magento/Theme/view/frontend/requirejs-config.js
index bf38d3cbaae00..aacec30edf188 100644
--- a/app/code/Magento/Theme/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Theme/view/frontend/requirejs-config.js
@@ -28,7 +28,8 @@ var config = {
             'popupWindow':            'mage/popup-window',
             'validation':             'mage/validation/validation',
             'welcome':                'Magento_Theme/js/view/welcome',
-            'breadcrumbs':            'Magento_Theme/js/view/breadcrumbs'
+            'breadcrumbs':            'Magento_Theme/js/view/breadcrumbs',
+            'criticalCssLoader':      'Magento_Theme/js/view/critical-css-loader'
         }
     },
     paths: {
@@ -44,6 +45,9 @@ var config = {
         mixins: {
             'Magento_Theme/js/view/breadcrumbs': {
                 'Magento_Theme/js/view/add-home-breadcrumb': true
+            },
+            'jquery/jquery-ui': {
+                'jquery/patches/jquery-ui': true
             }
         }
     }
diff --git a/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml b/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml
index 0df0fcfbc5e83..fb11be34a618f 100644
--- a/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml
@@ -3,19 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <div class="block block-banner">
     <div class="block-content">
-        <?php if (strtolower(substr($block->getLinkUrl(), 0, 4)) === 'http'): ?>
-            <a href="<?= /* @escapeNotVerified */ $block->getLinkUrl() ?>" title="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>">
-        <?php elseif ($block->getLinkUrl()): ?>
-            <a href="<?= /* @escapeNotVerified */ $block->getUrl($block->getLinkUrl()) ?>" title="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>">
+        <?php if (strtolower(substr($block->getLinkUrl(), 0, 4)) === 'http') : ?>
+            <a href="<?= $block->escapeUrl($block->getLinkUrl()) ?>"
+               title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>">
+        <?php elseif ($block->getLinkUrl()) : ?>
+            <a href="<?= $block->escapeUrl($block->getUrl($block->getLinkUrl())) ?>"
+               title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>">
         <?php endif; ?>
-            <img src="<?= /* @escapeNotVerified */ $block->getViewFileUrl($block->getImgSrc()) ?>"<?php if (!$block->getLinkUrl()): ?> title="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>"<?php endif; ?> alt="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>" />
-        <?php if ($block->getLinkUrl()): ?>
+            <img src="<?= $block->escapeUrl($block->getViewFileUrl($block->getImgSrc())) ?>"
+                <?php if (!$block->getLinkUrl()) : ?>
+                    title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>"
+                <?php endif; ?>
+                 alt="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>" />
+        <?php if ($block->getLinkUrl()) : ?>
         </a>
         <?php endif ?>
     </div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml b/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml
index 0df0fcfbc5e83..fb11be34a618f 100644
--- a/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml
@@ -3,19 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <div class="block block-banner">
     <div class="block-content">
-        <?php if (strtolower(substr($block->getLinkUrl(), 0, 4)) === 'http'): ?>
-            <a href="<?= /* @escapeNotVerified */ $block->getLinkUrl() ?>" title="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>">
-        <?php elseif ($block->getLinkUrl()): ?>
-            <a href="<?= /* @escapeNotVerified */ $block->getUrl($block->getLinkUrl()) ?>" title="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>">
+        <?php if (strtolower(substr($block->getLinkUrl(), 0, 4)) === 'http') : ?>
+            <a href="<?= $block->escapeUrl($block->getLinkUrl()) ?>"
+               title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>">
+        <?php elseif ($block->getLinkUrl()) : ?>
+            <a href="<?= $block->escapeUrl($block->getUrl($block->getLinkUrl())) ?>"
+               title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>">
         <?php endif; ?>
-            <img src="<?= /* @escapeNotVerified */ $block->getViewFileUrl($block->getImgSrc()) ?>"<?php if (!$block->getLinkUrl()): ?> title="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>"<?php endif; ?> alt="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>" />
-        <?php if ($block->getLinkUrl()): ?>
+            <img src="<?= $block->escapeUrl($block->getViewFileUrl($block->getImgSrc())) ?>"
+                <?php if (!$block->getLinkUrl()) : ?>
+                    title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>"
+                <?php endif; ?>
+                 alt="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>" />
+        <?php if ($block->getLinkUrl()) : ?>
         </a>
         <?php endif ?>
     </div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/absolute_footer.phtml b/app/code/Magento/Theme/view/frontend/templates/html/absolute_footer.phtml
index 708f0e0ef19f2..76f237064a904 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/absolute_footer.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/absolute_footer.phtml
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?= /* @escapeNotVerified */ $block->getMiscellaneousHtml();
+<?= /* @noEscape */ $block->getMiscellaneousHtml();
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/block.phtml b/app/code/Magento/Theme/view/frontend/templates/html/block.phtml
index 8b28a8cd4e32d..e8021e2defe0b 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/block.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/block.phtml
@@ -3,13 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<div class="block <?= /* @escapeNotVerified */ $block->getBlockCss() ?>">
-    <div class="block-title <?= /* @escapeNotVerified */ $block->getBlockCss() ?>-title"><strong><?= /* @escapeNotVerified */ $block->getBlockTitle() ?></strong></div>
-    <div class="block-content <?= /* @escapeNotVerified */ $block->getBlockCss() ?>-content">
+<div class="block <?= $block->escapeHtmlAttr($block->getBlockCss()) ?>">
+    <div class="block-title <?= $block->escapeHtmlAttr($block->getBlockCss()) ?>-title">
+        <strong><?= $block->escapeHtml($block->getBlockTitle()) ?></strong>
+    </div>
+    <div class="block-content <?= $block->escapeHtmlAttr($block->getBlockCss()) ?>-content">
         <?= $block->getChildHtml() ?>
     </div>
 </div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml b/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml
index 710c622ce26c4..ce8e0fd75097f 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml
@@ -3,20 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php if ($crumbs && is_array($crumbs)) : ?>
 <div class="breadcrumbs">
     <ul class="items">
         <?php foreach ($crumbs as $crumbName => $crumbInfo) : ?>
-            <li class="item <?= /* @escapeNotVerified */ $crumbName ?>">
+            <li class="item <?= $block->escapeHtmlAttr($crumbName) ?>">
             <?php if ($crumbInfo['link']) : ?>
-                <a href="<?= /* @escapeNotVerified */ $crumbInfo['link'] ?>" title="<?= $block->escapeHtml($crumbInfo['title']) ?>"><?= $block->escapeHtml($crumbInfo['label']) ?></a>
+                <a href="<?= $block->escapeUrl($crumbInfo['link']) ?>"
+                   title="<?= $block->escapeHtml($crumbInfo['title']) ?>">
+                    <?= $block->escapeHtml($crumbInfo['label']) ?>
+                </a>
             <?php elseif ($crumbInfo['last']) : ?>
                 <strong><?= $block->escapeHtml($crumbInfo['label']) ?></strong>
-            <?php else: ?>
+            <?php else : ?>
                 <?= $block->escapeHtml($crumbInfo['label']) ?>
             <?php endif; ?>
             </li>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml b/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
index f147b7085945f..2adbb28b9c59a 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
@@ -5,9 +5,9 @@
  */
 ?>
 <small class="bugs">
-    <span><?= /* @escapeNotVerified */ __('Help Us Keep Magento Healthy') ?></span>
+    <span><?= $block->escapeHtml(__('Help Us Keep Magento Healthy')) ?></span>
     <a href="http://www.magentocommerce.com/bug-tracking"
-       target="_blank" title="<?= /* @escapeNotVerified */ __('Report All Bugs') ?>">
-        <?= /* @escapeNotVerified */ __('Report All Bugs') ?>
+       target="_blank" title="<?= $block->escapeHtmlAttr(__('Report All Bugs')) ?>">
+        <?= $block->escapeHtml(__('Report All Bugs')) ?>
     </a>
 </small>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml b/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml
index 318bcc8f2cc7c..1976870a57492 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml
@@ -3,16 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
-<div class="block <?= /* @escapeNotVerified */ $block->getBlockCss() ?>">
-    <div class="title <?= /* @escapeNotVerified */ $block->getBlockCss() ?>-title" data-mage-init='{"toggleAdvanced": {"toggleContainers": "#<?= /* @escapeNotVerified */ $block->getBlockCss() ?>", "selectorsToggleClass": "active"}}'>
-        <strong><?= /* @escapeNotVerified */ $block->getBlockTitle() ?></strong>
+<div class="block <?= $block->escapeHtmlAttr($block->getBlockCss()) ?>">
+    <div class="title <?= $block->escapeHtmlAttr($block->getBlockCss()) ?>-title"
+         data-mage-init='{"toggleAdvanced": {"toggleContainers": "#<?= $block->escapeHtmlAttr($block->getBlockCss()) ?>", "selectorsToggleClass": "active"}}'>
+        <strong>
+            <?= $block->escapeHtml(__($block->getBlockTitle())) ?>
+        </strong>
     </div>
-    <div class="content <?= /* @escapeNotVerified */ $block->getBlockCss() ?>-content" id="<?= /* @escapeNotVerified */ $block->getBlockCss() ?>">
+    <div class="content <?= $block->escapeHtmlAttr($block->getBlockCss()) ?>-content"
+         id="<?= $block->escapeHtmlAttr($block->getBlockCss()) ?>">
         <?= $block->getChildHtml() ?>
     </div>
 </div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/container.phtml b/app/code/Magento/Theme/view/frontend/templates/html/container.phtml
index bad5acc209b5f..4ca5983081a6f 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/container.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/container.phtml
@@ -3,8 +3,5 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<?= $block->getChildHtml() ?>
+<?= $block->getChildHtml();
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/copyright.phtml b/app/code/Magento/Theme/view/frontend/templates/html/copyright.phtml
index af2e43d51fa58..672ff32734f40 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/copyright.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/copyright.phtml
@@ -5,5 +5,5 @@
  */
 ?>
 <small class="copyright">
-    <span><?= /* @escapeNotVerified */ $block->getCopyright() ?></span>
+    <span><?= $block->escapeHtml($block->getCopyright()) ?></span>
 </small>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml b/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml
index 093663e3bb71b..2256e942e5e99 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml
@@ -3,17 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <div class="footer-container">
     <div class="footer">
         <?= $block->getChildHtml() ?>
-        <p class="bugs"><?= /* @escapeNotVerified */ __('Help Us Keep Magento Healthy') ?> - <a
-            href="http://www.magentocommerce.com/bug-tracking"
-            target="_blank"><strong><?= /* @escapeNotVerified */ __('Report All Bugs') ?></strong></a>
+        <p class="bugs"><?= $block->escapeHtml(__('Help Us Keep Magento Healthy')) ?> - <a
+                    href="http://www.magentocommerce.com/bug-tracking"
+                    target="_blank"><strong><?= $block->escapeHtml(__('Report All Bugs')) ?></strong></a>
         </p>
-        <address><?= /* @escapeNotVerified */ $block->getCopyright() ?></address>
+        <address><?= $block->escapeHtml($block->getCopyright()) ?></address>
     </div>
 </div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
index 4395cab651de1..cbefb82f23e33 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
@@ -4,42 +4,37 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var \Magento\Theme\Block\Html\Header $block
  */
 $welcomeMessage = $block->getWelcome();
 ?>
-<?php switch ($block->getShowPart()):
-    case 'welcome': ?>
-        <li class="greet welcome" data-bind="scope: 'customer'">
-            <!-- ko if: customer().fullname  -->
-            <span data-bind="text: new String('<?= $block->escapeHtml(__('Welcome, %1!', '%1')) ?>').replace('%1', customer().fullname)">
-            </span>
-            <!-- /ko -->
-            <!-- ko ifnot: customer().fullname  -->
-            <span data-bind='html:"<?= $block->escapeHtml($welcomeMessage) ?>"'></span>
-            <?= $block->getBlockHtml('header.additional') ?>
-            <!-- /ko -->
-        </li>
-        <script type="text/x-magento-init">
-        {
-            "*": {
-                "Magento_Ui/js/core/app": {
-                    "components": {
-                        "customer": {
-                            "component": "Magento_Customer/js/view/customer"
-                        }
+<?php if ($block->getShowPart() == 'welcome') : ?>
+    <li class="greet welcome" data-bind="scope: 'customer'">
+        <!-- ko if: customer().fullname  -->
+        <span class="logged-in"
+              data-bind="text: new String('<?= $block->escapeHtml(__('Welcome, %1!', '%1')) ?>').replace('%1', customer().fullname)">
+        </span>
+        <!-- /ko -->
+        <!-- ko ifnot: customer().fullname  -->
+        <span class="not-logged-in"
+              data-bind='html:"<?= $block->escapeHtml($welcomeMessage) ?>"'></span>
+        <?= $block->getBlockHtml('header.additional') ?>
+        <!-- /ko -->
+    </li>
+    <script type="text/x-magento-init">
+    {
+        "*": {
+            "Magento_Ui/js/core/app": {
+                "components": {
+                    "customer": {
+                        "component": "Magento_Customer/js/view/customer"
                     }
                 }
             }
         }
-        </script>
-    <?php break; ?>
-
-    <?php case 'other': ?>
-        <?= $block->getChildHtml() ?>
-    <?php break; ?>
-
-<?php endswitch; ?>
+    }
+    </script>
+<?php elseif ($block->getShowPart() == 'other') :?>
+    <?= $block->getChildHtml() ?>
+<?php endif ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header/criticalCss.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header/criticalCss.phtml
new file mode 100644
index 0000000000000..7d59438fdbf46
--- /dev/null
+++ b/app/code/Magento/Theme/view/frontend/templates/html/header/criticalCss.phtml
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @var \Magento\Theme\Block\Html\Header\CriticalCss $criticalCssViewModel
+ */
+?>
+<?php $criticalCssViewModel = $block->getData('criticalCssViewModel'); ?>
+
+<style type="text/css" data-type="criticalCss">
+    <?= /* @noEscape */ $criticalCssViewModel->getCriticalCssData() ?>
+</style>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
index 17f8d7c70f574..e46a479fe65e6 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
@@ -4,27 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var \Magento\Theme\Block\Html\Header\Logo $block
  */
 ?>
 <?php $storeName = $block->getThemeName() ? $block->getThemeName() : $block->getLogoAlt();?>
-<span data-action="toggle-nav" class="action nav-toggle"><span><?= /* @escapeNotVerified */ __('Toggle Nav') ?></span></span>
-<?php if ($block->isHomePage()):?>
-    <strong class="logo">
-<?php else: ?>
-    <a class="logo" href="<?= $block->getUrl('') ?>" title="<?= /* @escapeNotVerified */ $storeName ?>">
-<?php endif ?>
-        <img src="<?= /* @escapeNotVerified */ $block->getLogoSrc() ?>"
-             title="<?= /* @escapeNotVerified */ $block->getLogoAlt() ?>"
-             alt="<?= /* @escapeNotVerified */ $block->getLogoAlt() ?>"
-             <?= $block->getLogoWidth() ? 'width="' . $block->getLogoWidth() . '"' : '' ?>
-             <?= $block->getLogoHeight() ? 'height="' . $block->getLogoHeight() . '"' : '' ?>
-        />
-<?php if ($block->isHomePage()):?>
-    </strong>
-<?php else:?>
-    </a>
-<?php endif?>
+<span data-action="toggle-nav" class="action nav-toggle"><span><?= $block->escapeHtml(__('Toggle Nav')) ?></span></span>
+<a class="logo"
+   href="<?= $block->escapeUrl($block->getUrl('')) ?>"
+   title="<?= $block->escapeHtmlAttr($storeName) ?>">
+    <img src="<?= $block->escapeUrl($block->getLogoSrc()) ?>"
+         title="<?= $block->escapeHtmlAttr($block->getLogoAlt()) ?>"
+         alt="<?= $block->escapeHtmlAttr($block->getLogoAlt()) ?>"
+            <?= $block->getLogoWidth() ? 'width="' . $block->escapeHtmlAttr($block->getLogoWidth()) . '"' : '' ?>
+            <?= $block->getLogoHeight() ? 'height="' . $block->escapeHtmlAttr($block->getLogoHeight()) . '"' : '' ?>
+    />
+</a>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/main_css_preloader.phtml b/app/code/Magento/Theme/view/frontend/templates/html/main_css_preloader.phtml
new file mode 100644
index 0000000000000..2c1c7db75b111
--- /dev/null
+++ b/app/code/Magento/Theme/view/frontend/templates/html/main_css_preloader.phtml
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<div data-role="main-css-loader" class="loading-mask">
+    <div class="loader">
+        <img src="<?= $block->escapeUrl($block->getViewFileUrl('images/loader-1.gif')); ?>"
+             alt="<?= $block->escapeHtml(__('Loading...')); ?>"
+             style="position: absolute;">
+    </div>
+</div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml b/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
index 3e74362851cfe..9e0151ce926a6 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
@@ -4,32 +4,28 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
-?>
-<?php
 /**
  * @var $block \Magento\Theme\Block\Html\Notices
  */
 ?>
-<?php if ($block->displayNoscriptNotice()): ?>
+<?php if ($block->displayNoscriptNotice()) : ?>
     <noscript>
         <div class="message global noscript">
             <div class="content">
                 <p>
-                    <strong><?= /* @escapeNotVerified */ __('JavaScript seems to be disabled in your browser.') ?></strong>
-                    <span><?= /* @escapeNotVerified */ __('For the best experience on our site, be sure to turn on Javascript in your browser.') ?></span>
+                    <strong><?= $block->escapeHtml(__('JavaScript seems to be disabled in your browser.')) ?></strong>
+                    <span><?= $block->escapeHtml(__('For the best experience on our site, be sure to turn on Javascript in your browser.')) ?></span>
                 </p>
             </div>
         </div>
     </noscript>
 <?php endif; ?>
-<?php if ($block->displayNoLocalStorageNotice()): ?>
+<?php if ($block->displayNoLocalStorageNotice()) : ?>
     <div class="notice global site local_storage" style="display: none;">
         <div class="content">
             <p>
-                <strong><?= /* @escapeNotVerified */ __('Local Storage seems to be disabled in your browser.') ?></strong><br />
-                <?= /* @escapeNotVerified */ __('For the best experience on our site, be sure to turn on Local Storage in your browser.') ?>
+                <strong><?= $block->escapeHtml(__('Local Storage seems to be disabled in your browser.')) ?></strong><br />
+                <?= $block->escapeHtml(__('For the best experience on our site, be sure to turn on Local Storage in your browser.')) ?>
             </p>
         </div>
     </div>
@@ -51,10 +47,10 @@ require(['jquery'], function(jQuery){
 });
 </script>
 <?php endif; ?>
-<?php if ($block->displayDemoNotice()): ?>
+<?php if ($block->displayDemoNotice()) : ?>
     <div class="message global demo">
         <div class="content">
-            <p><?= /* @escapeNotVerified */ __('This is demo store. No orders will be fulfilled.') ?></p>
+            <p><?= $block->escapeHtml(__('This is demo store. No orders will be fulfilled.')) ?></p>
         </div>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml b/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
index 69edfa081df65..52f5459544a61 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
@@ -4,108 +4,103 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
-?>
-<?php
 /**
  * Pager template
  *
  * @see \Magento\Theme\Block\Html\Pager
  */
 ?>
-<?php if ($block->getCollection()->getSize()): ?>
-
-    <?php if ($block->getUseContainer()): ?>
+<?php if ($block->getCollection()->getSize()) : ?>
+    <?php if ($block->getUseContainer()) : ?>
     <div class="pager">
     <?php endif ?>
 
-        <?php if ($block->getShowAmounts()): ?>
+        <?php if ($block->getShowAmounts()) : ?>
         <p class="toolbar-amount">
             <span class="toolbar-number">
-            <?php if ($block->getLastPageNum()>1): ?>
-                <?= /* @escapeNotVerified */ __('Items %1 to %2 of %3 total', $block->getFirstNum(), $block->getLastNum(), $block->getTotalNum()) ?>
-            <?php elseif ($block->getTotalNum() == 1): ?>
-                <?= /* @escapeNotVerified */ __('%1 Item', $block->getTotalNum()) ?>
-            <?php else: ?>
-                <?= /* @escapeNotVerified */ __('%1 Item(s)', $block->getTotalNum()) ?>
+            <?php if ($block->getLastPageNum()>1) : ?>
+                <?= $block->escapeHtml(__('Items %1 to %2 of %3 total', $block->getFirstNum(), $block->getLastNum(), $block->getTotalNum())) ?>
+            <?php elseif ($block->getTotalNum() == 1) : ?>
+                <?= $block->escapeHtml(__('%1 Item', $block->getTotalNum())) ?>
+            <?php else : ?>
+                <?= $block->escapeHtml(__('%1 Item(s)', $block->getTotalNum())) ?>
             <?php endif; ?>
             </span>
         </p>
         <?php endif ?>
 
-        <?php if ($block->getLastPageNum()>1): ?>
+        <?php if ($block->getLastPageNum()>1) : ?>
         <div class="pages">
-            <strong class="label pages-label" id="paging-label"><?= /* @escapeNotVerified */ __('Page') ?></strong>
+            <strong class="label pages-label" id="paging-label"><?= $block->escapeHtml(__('Page')) ?></strong>
             <ul class="items pages-items" aria-labelledby="paging-label">
-            <?php if (!$block->isFirstPage()): ?>
+            <?php if (!$block->isFirstPage()) : ?>
                 <li class="item pages-item-previous">
                     <?php $text = $block->getAnchorTextForPrevious() ? $block->getAnchorTextForPrevious() : '';?>
-                    <a class="<?= /* @escapeNotVerified */ $text ? 'link ' : 'action ' ?> previous" href="<?= /* @escapeNotVerified */ $block->getPreviousPageUrl() ?>" title="<?= /* @escapeNotVerified */ $text ? $text : __('Previous') ?>">
-                        <span class="label"><?= /* @escapeNotVerified */ __('Page') ?></span>
-                        <span><?= /* @escapeNotVerified */ $text ? $text : __('Previous') ?></span>
+                    <a class="<?= $block->escapeHtmlAttr($text ? 'link ' : 'action ') ?> previous" href="<?= $block->escapeUrl($block->getPreviousPageUrl()) ?>" title="<?= $block->escapeHtmlAttr($text ? $text : __('Previous')) ?>">
+                        <span class="label"><?= $block->escapeHtml(__('Page')) ?></span>
+                        <span><?= $block->escapeHtml($text ? $text : __('Previous')) ?></span>
                     </a>
                 </li>
             <?php endif;?>
 
-            <?php if ($block->canShowFirst()): ?>
+            <?php if ($block->canShowFirst()) : ?>
                 <li class="item">
-                    <a class="page first" href="<?= /* @escapeNotVerified */ $block->getFirstPageUrl() ?>">
-                        <span class="label"><?= /* @escapeNotVerified */ __('Page') ?></span>
+                    <a class="page first" href="<?= $block->escapeUrl($block->getFirstPageUrl()) ?>">
+                        <span class="label"><?= $block->escapeHtml(__('Page')) ?></span>
                         <span>1</span>
                     </a>
                 </li>
             <?php endif;?>
 
-            <?php if ($block->canShowPreviousJump()): ?>
+            <?php if ($block->canShowPreviousJump()) : ?>
                 <li class="item">
-                    <a class="page previous jump" title="" href="<?= /* @escapeNotVerified */ $block->getPreviousJumpUrl() ?>">
+                    <a class="page previous jump" title="" href="<?= $block->escapeUrl($block->getPreviousJumpUrl()) ?>">
                         <span>...</span>
                     </a>
                 </li>
             <?php endif;?>
 
-            <?php foreach ($block->getFramePages() as $_page): ?>
-                <?php if ($block->isPageCurrent($_page)): ?>
+            <?php foreach ($block->getFramePages() as $_page) : ?>
+                <?php if ($block->isPageCurrent($_page)) : ?>
                     <li class="item current">
                         <strong class="page">
-                            <span class="label"><?= /* @escapeNotVerified */ __('You\'re currently reading page') ?></span>
-                            <span><?= /* @escapeNotVerified */ $_page ?></span>
+                            <span class="label"><?= $block->escapeHtml(__('You\'re currently reading page')) ?></span>
+                            <span><?= $block->escapeHtml($_page) ?></span>
                         </strong>
                     </li>
-                <?php else: ?>
+                <?php else : ?>
                     <li class="item">
-                        <a href="<?= /* @escapeNotVerified */ $block->getPageUrl($_page) ?>" class="page">
-                            <span class="label"><?= /* @escapeNotVerified */ __('Page') ?></span>
-                            <span><?= /* @escapeNotVerified */ $_page ?></span>
+                        <a href="<?= $block->escapeUrl($block->getPageUrl($_page)) ?>" class="page">
+                            <span class="label"><?= $block->escapeHtml(__('Page')) ?></span>
+                            <span><?= $block->escapeHtml($_page) ?></span>
                         </a>
                     </li>
                 <?php endif;?>
             <?php endforeach;?>
 
-            <?php if ($block->canShowNextJump()): ?>
+            <?php if ($block->canShowNextJump()) : ?>
                 <li class="item">
-                    <a class="page next jump" title="" href="<?= /* @escapeNotVerified */ $block->getNextJumpUrl() ?>">
+                    <a class="page next jump" title="" href="<?= $block->escapeUrl($block->getNextJumpUrl()) ?>">
                         <span>...</span>
                     </a>
                 </li>
             <?php endif;?>
 
-            <?php if ($block->canShowLast()): ?>
+            <?php if ($block->canShowLast()) : ?>
               <li class="item">
-                  <a class="page last" href="<?= /* @escapeNotVerified */ $block->getLastPageUrl() ?>">
-                      <span class="label"><?= /* @escapeNotVerified */ __('Page') ?></span>
-                      <span><?= /* @escapeNotVerified */ $block->getLastPageNum() ?></span>
+                  <a class="page last" href="<?= $block->escapeUrl($block->getLastPageUrl()) ?>">
+                      <span class="label"><?= $block->escapeHtml(__('Page')) ?></span>
+                      <span><?= $block->escapeHtml($block->getLastPageNum()) ?></span>
                   </a>
               </li>
             <?php endif;?>
 
-            <?php if (!$block->isLastPage()): ?>
+            <?php if (!$block->isLastPage()) : ?>
                 <li class="item pages-item-next">
                     <?php $text = $block->getAnchorTextForNext() ? $block->getAnchorTextForNext() : '';?>
-                    <a class="<?= /* @escapeNotVerified */ $text ? 'link ' : 'action ' ?> next" href="<?= /* @escapeNotVerified */ $block->getNextPageUrl() ?>" title="<?= /* @escapeNotVerified */ $text ? $text : __('Next') ?>">
-                        <span class="label"><?= /* @escapeNotVerified */ __('Page') ?></span>
-                        <span><?= /* @escapeNotVerified */ $text ? $text : __('Next') ?></span>
+                    <a class="<?= $block->escapeHtmlAttr($text ? 'link ' : 'action ') ?> next" href="<?= $block->escapeUrl($block->getNextPageUrl()) ?>" title="<?= $block->escapeHtmlAttr($text ? $text : __('Next')) ?>">
+                        <span class="label"><?= $block->escapeHtml(__('Page')) ?></span>
+                        <span><?= $block->escapeHtml($text ? $text : __('Next')) ?></span>
                     </a>
                 </li>
             <?php endif;?>
@@ -113,22 +108,22 @@
         </div>
         <?php endif; ?>
 
-    <?php if ($block->isShowPerPage()): ?>
+    <?php if ($block->isShowPerPage()) : ?>
         <div class="limiter">
-            <strong class="limiter-label"><?= /* @escapeNotVerified */ __('Show') ?></strong>
+            <strong class="limiter-label"><?= $block->escapeHtml(__('Show')) ?></strong>
             <select id="limiter" data-mage-init='{"redirectUrl": {"event":"change"}}' class="limiter-options">
-                <?php foreach ($block->getAvailableLimit() as $_key => $_limit): ?>
-                    <option value="<?= /* @escapeNotVerified */ $block->getLimitUrl($_key) ?>"<?php if ($block->isLimitCurrent($_key)): ?>
+                <?php foreach ($block->getAvailableLimit() as $_key => $_limit) : ?>
+                    <option value="<?= $block->escapeHtmlAttr($block->getLimitUrl($_key)) ?>"<?php if ($block->isLimitCurrent($_key)) : ?>
                         selected="selected"<?php endif ?>>
-                        <?= /* @escapeNotVerified */ $_limit ?>
+                        <?= $block->escapeHtml($_limit) ?>
                     </option>
                 <?php endforeach; ?>
             </select>
-            <span class="limiter-text"><?= /* @escapeNotVerified */ __('per page') ?></span>
+            <span class="limiter-text"><?= $block->escapeHtml(__('per page')) ?></span>
         </div>
     <?php endif ?>
 
-    <?php if ($block->getUseContainer()): ?>
+    <?php if ($block->getUseContainer()) : ?>
     </div>
     <?php endif ?>
 
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml b/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
index 0c31164f4459e..96d0ba6c94715 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
@@ -4,36 +4,40 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
-?>
-<?php
-
 /**
-*  General template for displaying group of blocks devided into sections
-*/
+ *  General template for displaying group of blocks divided into sections
+ */
 
 $group = $block->getGroupName();
 $groupCss = $block->getGroupCss();
 $groupBehavior = $block->getGroupBehaviour() ? $block->getGroupBehaviour() : '{"tabs":{"openedState":"active"}}';
 ?>
-<?php if ($detailedInfoGroup = $block->getGroupChildNames($group, 'getChildHtml')):?>
-    <div class="sections <?= /* @escapeNotVerified */ $groupCss ?>">
+<?php if ($detailedInfoGroup = $block->getGroupChildNames($group, 'getChildHtml')) : ?>
+    <div class="sections <?= $block->escapeHtmlAttr($groupCss) ?>">
         <?php $layout = $block->getLayout(); ?>
-        <div class="section-items <?= /* @escapeNotVerified */ $groupCss ?>-items" data-mage-init='<?= /* @escapeNotVerified */ $groupBehavior ?>'>
-            <?php foreach ($detailedInfoGroup as $name):?>
+        <div class="section-items <?= $block->escapeHtmlAttr($groupCss) ?>-items"
+             data-mage-init='<?= $block->escapeHtmlAttr($groupBehavior) ?>'>
+            <?php foreach ($detailedInfoGroup as $name) : ?>
                 <?php
-                    $html = $layout->renderElement($name);
-                    if (!trim($html) && ($block->getUseForce() != true)) {
-                        continue;
-                    }
-                    $alias = $layout->getElementAlias($name);
-                    $label = $block->getChildData($alias, 'title');
+                $html = $layout->renderElement($name);
+                if (!trim($html) && ($block->getUseForce() != true)) {
+                    continue;
+                }
+                $alias = $layout->getElementAlias($name);
+                $label = $block->getChildData($alias, 'title');
                 ?>
-                <div class="section-item-title <?= /* @escapeNotVerified */ $groupCss ?>-item-title" data-role="collapsible">
-                    <a class="<?= /* @escapeNotVerified */ $groupCss ?>-item-switch" data-toggle="switch" href="#<?= /* @escapeNotVerified */ $alias ?>"><?= /* @escapeNotVerified */ $label ?></a>
+                <div class="section-item-title <?= $block->escapeHtmlAttr($groupCss) ?>-item-title"
+                     data-role="collapsible">
+                    <a class="<?= $block->escapeHtmlAttr($groupCss) ?>-item-switch"
+                       data-toggle="switch" href="#<?= $block->escapeHtmlAttr($alias) ?>">
+                        <?= /* @noEscape */ $label ?>
+                    </a>
+                </div>
+                <div class="section-item-content <?= $block->escapeHtmlAttr($groupCss) ?>-item-content"
+                     id="<?= $block->escapeHtmlAttr($alias) ?>"
+                     data-role="content">
+                    <?= /* @noEscape */ $html ?>
                 </div>
-                <div class="section-item-content <?= /* @escapeNotVerified */ $groupCss ?>-item-content" id="<?= /* @escapeNotVerified */ $alias ?>" data-role="content"><?= /* @escapeNotVerified */ $html ?></div>
             <?php endforeach;?>
         </div>
     </div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/skip.phtml b/app/code/Magento/Theme/view/frontend/templates/html/skip.phtml
index 198943530f9bb..82ea40ef3424d 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/skip.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/skip.phtml
@@ -4,8 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
 $target = $block->getTarget();
 $label = $block->getLabel();
 ?>
-<a class="action skip <?= /* @escapeNotVerified */ $target ?>" href="#<?= /* @escapeNotVerified */ $target ?>"><span><?= /* @escapeNotVerified */ $label ?></span></a>
+<a class="action skip <?= $block->escapeHtmlAttr($target) ?>"
+   href="#<?= $block->escapeHtmlAttr($target) ?>">
+    <span>
+        <?= $block->escapeHtml($label) ?>
+    </span>
+</a>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml b/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml
index 8a7f35183f3e7..9c85e06afdc10 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 $target_id = $block->getTargetId();
 ?>
-<a id="<?= /* @escapeNotVerified */ $target_id ?>" tabindex="-1"></a>
+<a id="<?= $block->escapeHtmlAttr($target_id) ?>" tabindex="-1"></a>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/title.phtml b/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
index 69ff4c8909f8c..b8d0ec1918708 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
@@ -4,27 +4,28 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var $block \Magento\Theme\Block\Html\Title
  */
 $cssClass = $block->getCssClass() ? ' ' . $block->getCssClass() : '';
-$title = '';
+$titleHtml = '';
 if (trim($block->getPageHeading())) {
-    $title = '<span class="base" data-ui-id="page-title-wrapper" ' .  $block->getAddBaseAttribute() . '>'
-        . $block->escapeHtml($block->getPageHeading()) . '</span>';
+    $titleHtml = '<span class="base" data-ui-id="page-title-wrapper" '
+        . $block->getAddBaseAttribute()
+        . '>'
+        . $block->escapeHtml($block->getPageHeading())
+        . '</span>';
 }
 ?>
-<?php if ($title): ?>
-<div class="page-title-wrapper<?= /* @escapeNotVerified */ $cssClass ?>">
-    <h1 class="page-title"
-        <?php if ($block->getId()): ?> id="<?= /* @escapeNotVerified */ $block->getId() ?>" <?php endif; ?>
-        <?php if ($block->getAddBaseAttributeAria()): ?>
-            aria-labelledby="<?= /* @escapeNotVerified */ $block->getAddBaseAttributeAria() ?>"
-        <?php endif; ?>>
-        <?= /* @escapeNotVerified */ $title ?>
-    </h1>
-    <?= $block->getChildHtml() ?>
-</div>
+<?php if ($titleHtml) : ?>
+    <div class="page-title-wrapper<?= $block->escapeHtmlAttr($cssClass) ?>">
+        <h1 class="page-title"
+            <?php if ($block->getId()) : ?> id="<?= $block->escapeHtmlAttr($block->getId()) ?>" <?php endif; ?>
+            <?php if ($block->getAddBaseAttributeAria()) : ?>
+                aria-labelledby="<?= $block->escapeHtmlAttr($block->getAddBaseAttributeAria()) ?>"
+            <?php endif; ?>>
+            <?= /* @noEscape */ $titleHtml ?>
+        </h1>
+        <?= $block->getChildHtml() ?>
+    </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml b/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml
index 129fd755637ac..5c9748deeeabe 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml
@@ -4,22 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
-?>
-<?php
 /**
  * Top menu for store
  *
  * @var $block \Magento\Theme\Block\Html\Topmenu
  */
+
+$columnsLimit = $block->getColumnsLimit() ?: 0;
+$_menuHtml = $block->getHtml('level-top', 'submenu', $columnsLimit)
 ?>
-<?php $columnsLimit = $block->getColumnsLimit() ?: 0; ?>
-<?php $_menu = $block->getHtml('level-top', 'submenu', $columnsLimit) ?>
 
 <nav class="navigation" data-action="navigation">
     <ul data-mage-init='{"menu":{"responsive":true, "expanded":true, "position":{"my":"left top","at":"left bottom"}}}'>
-        <?= /* @escapeNotVerified */ $_menu ?>
-        <?= /* @escapeNotVerified */ $block->getChildHtml() ?>
+        <?= /* @noEscape */ $_menuHtml?>
+        <?= $block->getChildHtml() ?>
     </ul>
 </nav>
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml b/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml
index 7d18ed17303b9..5393475627bbe 100644
--- a/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml
@@ -21,20 +21,20 @@ require([
 //<![CDATA[
     $.extend(true, $, {
         calendarConfig: {
-            dayNames: <?= /* @escapeNotVerified */ $days['wide'] ?>,
-            dayNamesMin: <?= /* @escapeNotVerified */ $days['abbreviated'] ?>,
-            monthNames: <?= /* @escapeNotVerified */ $months['wide'] ?>,
-            monthNamesShort: <?= /* @escapeNotVerified */ $months['abbreviated'] ?>,
-            infoTitle: "<?= /* @escapeNotVerified */ __('About the calendar') ?>",
-            firstDay: <?= /* @escapeNotVerified */ $firstDay ?>,
-            closeText: "<?= /* @escapeNotVerified */ __('Close') ?>",
-            currentText: "<?= /* @escapeNotVerified */ __('Go Today') ?>",
-            prevText: "<?= /* @escapeNotVerified */ __('Previous') ?>",
-            nextText: "<?= /* @escapeNotVerified */ __('Next') ?>",
-            weekHeader: "<?= /* @escapeNotVerified */ __('WK') ?>",
-            timeText: "<?= /* @escapeNotVerified */ __('Time') ?>",
-            hourText: "<?= /* @escapeNotVerified */ __('Hour') ?>",
-            minuteText: "<?= /* @escapeNotVerified */ __('Minute') ?>",
+            dayNames: <?= /* @noEscape */ $days['wide'] ?>,
+            dayNamesMin: <?= /* @noEscape */ $days['abbreviated'] ?>,
+            monthNames: <?= /* @noEscape */ $months['wide'] ?>,
+            monthNamesShort: <?= /* @noEscape */ $months['abbreviated'] ?>,
+            infoTitle: "<?= $block->escapeJs(__('About the calendar')) ?>",
+            firstDay: <?= (int)$firstDay ?>,
+            closeText: "<?= $block->escapeJs(__('Close')) ?>",
+            currentText: "<?= $block->escapeJs(__('Go Today')) ?>",
+            prevText: "<?= $block->escapeJs(__('Previous')) ?>",
+            nextText: "<?= $block->escapeJs(__('Next')) ?>",
+            weekHeader: "<?= $block->escapeJs(__('WK')) ?>",
+            timeText: "<?= $block->escapeJs(__('Time')) ?>",
+            hourText: "<?= $block->escapeJs(__('Hour')) ?>",
+            minuteText: "<?= $block->escapeJs(__('Minute')) ?>",
             dateFormat: $.datepicker.RFC_2822,
             showOn: "button",
             showAnim: "",
@@ -51,7 +51,7 @@ require([
         }
     });
 
-    enUS = <?= /* @escapeNotVerified */ $enUS ?>; // en_US locale reference
+    enUS = <?= /* @noEscape */ $enUS ?>; // en_US locale reference
 //]]>
 
 });
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/components.phtml b/app/code/Magento/Theme/view/frontend/templates/js/components.phtml
index bad5acc209b5f..4ca5983081a6f 100644
--- a/app/code/Magento/Theme/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/js/components.phtml
@@ -3,8 +3,5 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
-<?= $block->getChildHtml() ?>
+<?= $block->getChildHtml();
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml b/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml
index 72d93003c1ae7..d04fb801aa644 100644
--- a/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml
@@ -3,8 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
+
 /**
  * Cookie settings initialization script
  *
@@ -17,10 +16,10 @@
         "*": {
             "mage/cookies": {
                 "expires": null,
-                "path": "<?= /* @escapeNotVerified */ $block->getPath() ?>",
-                "domain": "<?= /* @escapeNotVerified */ $block->getDomain() ?>",
+                "path": "<?= /* @noEscape */ $block->getPath() ?>",
+                "domain": "<?= /* @noEscape */ $block->getDomain() ?>",
                 "secure": false,
-                "lifetime": "<?= /* @escapeNotVerified */ $block->getLifetime() ?>"
+                "lifetime": "<?= /* @noEscape */ $block->getLifetime() ?>"
             }
         }
     }
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/css_rel_preload.phtml b/app/code/Magento/Theme/view/frontend/templates/js/css_rel_preload.phtml
new file mode 100644
index 0000000000000..d90d528ffc6f8
--- /dev/null
+++ b/app/code/Magento/Theme/view/frontend/templates/js/css_rel_preload.phtml
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<script>
+    /*! loadCSS rel=preload polyfill. [c]2017 Filament Group, Inc. MIT License */
+    !function(t){"use strict";t.loadCSS||(t.loadCSS=function(){});var e=loadCSS.relpreload={};if(e.support=function(){var e;try{e=t.document.createElement("link").relList.supports("preload")}catch(t){e=!1}return function(){return e}}(),e.bindMediaToggle=function(t){var e=t.media||"all";function a(){t.media=e}t.addEventListener?t.addEventListener("load",a):t.attachEvent&&t.attachEvent("onload",a),setTimeout(function(){t.rel="stylesheet",t.media="only x"}),setTimeout(a,3e3)},e.poly=function(){if(!e.support())for(var a=t.document.getElementsByTagName("link"),n=0;n<a.length;n++){var o=a[n];"preload"!==o.rel||"style"!==o.getAttribute("as")||o.getAttribute("data-loadcss")||(o.setAttribute("data-loadcss",!0),e.bindMediaToggle(o))}},!e.support()){e.poly();var a=t.setInterval(e.poly,500);t.addEventListener?t.addEventListener("load",function(){e.poly(),t.clearInterval(a)}):t.attachEvent&&t.attachEvent("onload",function(){e.poly(),t.clearInterval(a)})}"undefined"!=typeof exports?exports.loadCSS=loadCSS:t.loadCSS=loadCSS}("undefined"!=typeof global?global:this);
+</script>
diff --git a/app/code/Magento/Theme/view/frontend/templates/link.phtml b/app/code/Magento/Theme/view/frontend/templates/link.phtml
index 9fdcbcb367056..81a0909b7f973 100644
--- a/app/code/Magento/Theme/view/frontend/templates/link.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/link.phtml
@@ -4,17 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * @var $block \Magento\Framework\View\Element\Html\Link
  */
 ?>
-<?php if (!$block->getIsDisabled()): ?>
-<li>
-    <a href="<?= $block->escapeHtml($block->getHref()) ?>"
-        <?php if ($title = $block->getTitle()):?> title="<?= $block->escapeHtml(__($title)) ?>"<?php endif;?>>
-        <?= $block->escapeHtml(__($block->getLabel())) ?>
-    </a>
-</li>
+<?php if (!$block->getIsDisabled()) : ?>
+    <li>
+        <a href="<?= $block->escapeHtml($block->getHref()) ?>"
+            <?php if ($title = $block->getTitle()) : ?> title="<?= $block->escapeHtml(__($title)) ?>"<?php endif;?>>
+            <?= $block->escapeHtml(__($block->getLabel())) ?>
+        </a>
+    </li>
 <?php endif; ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml b/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
index 2a4b07ee6396f..5c004eca9a17c 100644
--- a/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
@@ -5,8 +5,8 @@
  */
 ?>
 <script>
-    var BASE_URL = '<?= $block->escapeUrl($block->getBaseUrl()) ?>';
+    var BASE_URL = '<?= $block->escapeJs($block->escapeUrl($block->getBaseUrl())) ?>';
     var require = {
-        "baseUrl": "<?= /* @escapeNotVerified */ $block->getViewFileUrl('/') ?>"
+        "baseUrl": "<?= $block->escapeJs($block->escapeUrl($block->getViewFileUrl('/'))) ?>"
     };
 </script>
diff --git a/app/code/Magento/Theme/view/frontend/templates/template.phtml b/app/code/Magento/Theme/view/frontend/templates/template.phtml
index ba3d1c939cb02..7884c3e08f5d2 100644
--- a/app/code/Magento/Theme/view/frontend/templates/template.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/template.phtml
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 /** @var $block \Magento\Framework\View\Element\Template */
 ?>
 <?= $block->getChildHtml('', false);
diff --git a/app/code/Magento/Theme/view/frontend/templates/text.phtml b/app/code/Magento/Theme/view/frontend/templates/text.phtml
index 4c4b38132c880..f5b4d0093756c 100644
--- a/app/code/Magento/Theme/view/frontend/templates/text.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/text.phtml
@@ -4,12 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-$attributes = $block->getCssClass() ? ' class="' . $block->getCssClass() . '"' : '';
+$attributes = $block->getCssClass() ? ' class="' . $block->escapeHtmlAttr($block->getCssClass()) . '"' : '';
 $attr = $block->getAttributes();
+$textHtml = '<'
+    . $block->escapeHtml($block->getTag())
+    . $attributes
+    . '>'
+    . $block->escapeHtml($block->getText())
+    . '</'
+    . $block->escapeHtml($block->getTag())
+    . '>';
 if (!empty($attr)) {
     foreach ($block->getAttributes() as $attribute => $value) {
-        $attributes .= ' ' . $attribute . '="' . $value . '"';
+        $attributes .= ' ' . $block->escapeHtml($attribute) . '="' . $block->escapeHtmlAttr($value) . '"';
     }
-};
-echo
-    '<' . $block->getTag() . $attributes . '>' . $block->getText() . '</' . $block->getTag() . '>';
+}
+echo /* @noEscape */ $textHtml;
diff --git a/app/code/Magento/Translation/Model/Inline/Parser.php b/app/code/Magento/Translation/Model/Inline/Parser.php
index e0b2ce40405d1..e984fc9ee1a1a 100644
--- a/app/code/Magento/Translation/Model/Inline/Parser.php
+++ b/app/code/Magento/Translation/Model/Inline/Parser.php
@@ -7,8 +7,7 @@
 namespace Magento\Translation\Model\Inline;
 
 /**
- * This class is responsible for parsing content and applying necessary html element
- * wrapping and client scripts for inline translation.
+ * Parse content, applying necessary html element wrapping and client scripts for inline translation.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -19,6 +18,11 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
      */
     const DATA_TRANSLATE = 'data-translate';
 
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
     /**
      * Response body or JSON content string
      *
@@ -132,6 +136,8 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
     private $relatedCacheTypes;
 
     /**
+     * Return cache manager
+     *
      * @return \Magento\Translation\Model\Inline\CacheManager
      *
      * @deprecated 100.1.0
@@ -149,13 +155,14 @@ private function getCacheManger()
     /**
      * Initialize base inline translation model
      *
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Translation\Model\ResourceModel\StringUtilsFactory $resource
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Zend_Filter_Interface $inputFilter
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\App\Cache\TypeListInterface $appCache
      * @param \Magento\Framework\Translate\InlineInterface $translateInline
      * @param array $relatedCacheTypes
+     * @param \Magento\Framework\Escaper|null $escaper
      */
     public function __construct(
         \Magento\Translation\Model\ResourceModel\StringUtilsFactory $resource,
@@ -164,7 +171,8 @@ public function __construct(
         \Magento\Framework\App\State $appState,
         \Magento\Framework\App\Cache\TypeListInterface $appCache,
         \Magento\Framework\Translate\InlineInterface $translateInline,
-        array $relatedCacheTypes = []
+        array $relatedCacheTypes = [],
+        \Magento\Framework\Escaper $escaper = null
     ) {
         $this->_resourceFactory = $resource;
         $this->_storeManager = $storeManager;
@@ -173,6 +181,9 @@ public function __construct(
         $this->_appCache = $appCache;
         $this->_translateInline = $translateInline;
         $this->relatedCacheTypes = $relatedCacheTypes;
+        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\Escaper::class
+        );
     }
 
     /**
@@ -236,8 +247,8 @@ protected function _validateTranslationParams(array $translateParams)
     /**
      * Apply input filter to values of translation parameters
      *
-     * @param array &$translateParams
-     * @param array $fieldNames Names of fields values of which are to be filtered
+     * @param array $translateParams
+     * @param array $fieldNames
      * @return void
      */
     protected function _filterTranslationParams(array &$translateParams, array $fieldNames)
@@ -344,7 +355,7 @@ protected function _applySpecialTagsFormat($tagHtml, $tagName, $trArr)
     {
         $specialTags = $tagHtml . '<span class="translate-inline-' . $tagName . '" ' . $this->_getHtmlAttribute(
             self::DATA_TRANSLATE,
-            '[' . htmlspecialchars(join(',', $trArr)) . ']'
+            '[' . $this->escaper->escapeHtml(join(',', $trArr)) . ']'
         );
         $additionalAttr = $this->_getAdditionalHtmlAttribute($tagName);
         if ($additionalAttr !== null) {
@@ -360,7 +371,7 @@ protected function _applySpecialTagsFormat($tagHtml, $tagName, $trArr)
      * Format translation for simple tags.  Added translate mode attribute for vde requests.
      *
      * @param string $tagHtml
-     * @param string  $tagName
+     * @param string $tagName
      * @param array $trArr
      * @return string
      */
@@ -372,7 +383,7 @@ protected function _applySimpleTagsFormat($tagHtml, $tagName, $trArr)
             strlen($tagName) + 1
         ) . ' ' . $this->_getHtmlAttribute(
             self::DATA_TRANSLATE,
-            htmlspecialchars('[' . join(',', $trArr) . ']')
+            $this->escaper->escapeHtml('[' . join(',', $trArr) . ']')
         );
         $additionalAttr = $this->_getAdditionalHtmlAttribute($tagName);
         if ($additionalAttr !== null) {
@@ -386,12 +397,12 @@ protected function _applySimpleTagsFormat($tagHtml, $tagName, $trArr)
      * Get translate data by regexp
      *
      * @param string $regexp
-     * @param string &$text
-     * @param string|array $locationCallback
+     * @param string $text
+     * @param callable $locationCallback
      * @param array $options
      * @return array
      */
-    private function _getTranslateData($regexp, &$text, $locationCallback, $options = [])
+    private function _getTranslateData(string $regexp, string &$text, callable $locationCallback, array $options = [])
     {
         $trArr = [];
         $next = 0;
@@ -401,7 +412,7 @@ private function _getTranslateData($regexp, &$text, $locationCallback, $options
                     'shown' => htmlspecialchars_decode($matches[1][0]),
                     'translated' => htmlspecialchars_decode($matches[2][0]),
                     'original' => htmlspecialchars_decode($matches[3][0]),
-                    'location' => htmlspecialchars_decode(call_user_func($locationCallback, $matches, $options)),
+                    'location' => htmlspecialchars_decode($locationCallback($matches, $options)),
                 ]
             );
             $text = substr_replace($text, $matches[1][0], $matches[0][1], strlen($matches[0][0]));
@@ -446,7 +457,8 @@ private function _prepareTagAttributesForContent(&$content)
                     $tagHtml = str_replace($matches[0], '', $tagHtml);
                     $trAttr = ' ' . $this->_getHtmlAttribute(
                         self::DATA_TRANSLATE,
-                        '[' . htmlspecialchars($matches[1]) . ',' . str_replace("\"", "'", join(',', $trArr)) . ']'
+                        '[' . $this->escaper->escapeHtml($matches[1]) . ',' .
+                        str_replace("\"", "'", join(',', $trArr)) . ']'
                     );
                 } else {
                     $trAttr = ' ' . $this->_getHtmlAttribute(
@@ -512,19 +524,31 @@ private function _getHtmlQuote()
      */
     private function _specialTags()
     {
-        $this->_translateTags($this->_content, $this->_allowedTagsGlobal, '_applySpecialTagsFormat');
-        $this->_translateTags($this->_content, $this->_allowedTagsSimple, '_applySimpleTagsFormat');
+        $this->_translateTags(
+            $this->_content,
+            $this->_allowedTagsGlobal,
+            function ($tagHtml, $tagName, $trArr) {
+                return $this->_applySpecialTagsFormat($tagHtml, $tagName, $trArr);
+            }
+        );
+        $this->_translateTags(
+            $this->_content,
+            $this->_allowedTagsSimple,
+            function ($tagHtml, $tagName, $trArr) {
+                return $this->_applySimpleTagsFormat($tagHtml, $tagName, $trArr);
+            }
+        );
     }
 
     /**
      * Prepare simple tags
      *
-     * @param string &$content
+     * @param string $content
      * @param array $tagsList
-     * @param string|array $formatCallback
+     * @param callable $formatCallback
      * @return void
      */
-    private function _translateTags(&$content, $tagsList, $formatCallback)
+    private function _translateTags(string &$content, array $tagsList, callable $formatCallback)
     {
         $nextTag = 0;
         $tagRegExpBody = '#<(body)(/?>| \s*[^>]*+/?>)#iSU';
@@ -575,10 +599,10 @@ private function _translateTags(&$content, $tagsList, $formatCallback)
                     if (array_key_exists($tagName, $this->_allowedTagsGlobal)
                         && $tagBodyOpenStartPosition > $tagMatch[0][1]
                     ) {
-                        $tagHtmlHead = call_user_func([$this, $formatCallback], $tagHtml, $tagName, $trArr);
+                        $tagHtmlHead = $formatCallback($tagHtml, $tagName, $trArr);
                         $headTranslateTags .= substr($tagHtmlHead, strlen($tagHtml));
                     } else {
-                        $tagHtml = call_user_func([$this, $formatCallback], $tagHtml, $tagName, $trArr);
+                        $tagHtml = $formatCallback($tagHtml, $tagName, $trArr);
                     }
                 }
 
@@ -649,7 +673,7 @@ private function _otherText()
             );
 
             $spanHtml = $this->_getDataTranslateSpan(
-                '[' . htmlspecialchars($translateProperties) . ']',
+                '[' . $this->escaper->escapeHtmlAttr($translateProperties) . ']',
                 $matches[1][0]
             );
             $this->_content = substr_replace($this->_content, $spanHtml, $matches[0][1], strlen($matches[0][0]));
diff --git a/app/code/Magento/Translation/Model/Js/PreProcessor.php b/app/code/Magento/Translation/Model/Js/PreProcessor.php
index e85d022627621..e2ff5a9ce78dc 100644
--- a/app/code/Magento/Translation/Model/Js/PreProcessor.php
+++ b/app/code/Magento/Translation/Model/Js/PreProcessor.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Translation\Model\Js;
 
 use Magento\Framework\App\AreaList;
@@ -85,13 +86,13 @@ public function translate($content)
     }
 
     /**
-     * Replace callback for preg_replace_callback function
+     * Replace callback for preg_replace_callback function.
      *
      * @param array $matches
      * @return string
      */
     protected function replaceCallback($matches)
     {
-        return '"' . __($matches[1]) . '"';
+        return '\'' . __($matches['translate']) . '\'';
     }
 }
diff --git a/app/code/Magento/Translation/Model/ResourceModel/StringUtils.php b/app/code/Magento/Translation/Model/ResourceModel/StringUtils.php
index 4be4e055a7d83..769336419d89b 100644
--- a/app/code/Magento/Translation/Model/ResourceModel/StringUtils.php
+++ b/app/code/Magento/Translation/Model/ResourceModel/StringUtils.php
@@ -5,8 +5,16 @@
  */
 namespace Magento\Translation\Model\ResourceModel;
 
+/**
+ * String translation utilities
+ */
 class StringUtils extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
      */
@@ -28,17 +36,22 @@ class StringUtils extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
      * @param string $connectionName
      * @param string|null $scope
+     * @param \Magento\Framework\Escaper|null $escaper
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
         \Magento\Framework\App\ScopeResolverInterface $scopeResolver,
         $connectionName = null,
-        $scope = null
+        $scope = null,
+        \Magento\Framework\Escaper $escaper = null
     ) {
         $this->_localeResolver = $localeResolver;
         $this->scopeResolver = $scopeResolver;
         $this->scope = $scope;
+        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\Escaper::class
+        );
         parent::__construct($context, $connectionName);
     }
 
@@ -211,7 +224,7 @@ public function saveTranslate($string, $translate, $locale = null, $storeId = nu
         $string = htmlspecialchars_decode($string);
         $connection = $this->getConnection();
         $table = $this->getMainTable();
-        $translate = htmlspecialchars($translate, ENT_QUOTES);
+        $translate = $this->escaper->escapeHtml($translate);
 
         if ($locale === null) {
             $locale = $this->_localeResolver->getLocale();
diff --git a/app/code/Magento/Translation/Test/Unit/Model/Js/PreProcessorTest.php b/app/code/Magento/Translation/Test/Unit/Model/Js/PreProcessorTest.php
deleted file mode 100644
index 713086f298806..0000000000000
--- a/app/code/Magento/Translation/Test/Unit/Model/Js/PreProcessorTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Translation\Test\Unit\Model\Js;
-
-use Magento\Translation\Model\Js\PreProcessor;
-use Magento\Translation\Model\Js\Config;
-use Magento\Framework\App\AreaList;
-use Magento\Framework\TranslateInterface;
-
-class PreProcessorTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var PreProcessor
-     */
-    protected $model;
-
-    /**
-     * @var Config|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $configMock;
-
-    /**
-     * @var AreaList|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $areaListMock;
-
-    /**
-     * @var TranslateInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $translateMock;
-
-    protected function setUp()
-    {
-        $this->configMock = $this->createMock(\Magento\Translation\Model\Js\Config::class);
-        $this->areaListMock = $this->createMock(\Magento\Framework\App\AreaList::class);
-        $this->translateMock = $this->getMockForAbstractClass(\Magento\Framework\TranslateInterface::class);
-        $this->model = new PreProcessor($this->configMock, $this->areaListMock, $this->translateMock);
-    }
-
-    public function testGetData()
-    {
-        $asset = $this->createMock(\Magento\Framework\View\Asset\File::class);
-        $chain = $this->createMock(\Magento\Framework\View\Asset\PreProcessor\Chain::class);
-        $context = $this->createMock(\Magento\Framework\View\Asset\File\FallbackContext::class);
-        $originalContent = 'content$.mage.__("hello1")content';
-        $translatedContent = 'content"hello1"content';
-        $patterns = ['~\$\.mage\.__\([\'|\"](.+?)[\'|\"]\)~'];
-        $areaCode = 'adminhtml';
-        $area = $this->createMock(\Magento\Framework\App\Area::class);
-
-        $chain->expects($this->once())
-            ->method('getAsset')
-            ->willReturn($asset);
-        $asset->expects($this->once())
-            ->method('getContext')
-            ->willReturn($context);
-        $context->expects($this->once())
-            ->method('getAreaCode')
-            ->willReturn($areaCode);
-
-        $this->configMock->expects($this->once())
-            ->method('isEmbeddedStrategy')
-            ->willReturn(true);
-        $chain->expects($this->once())
-            ->method('getContent')
-            ->willReturn($originalContent);
-        $this->configMock->expects($this->once())
-            ->method('getPatterns')
-            ->willReturn($patterns);
-
-        $this->areaListMock->expects($this->once())
-            ->method('getArea')
-            ->with($areaCode)
-            ->willReturn($area);
-
-        $chain->expects($this->once())
-            ->method('setContent')
-            ->with($translatedContent);
-
-        $this->model->process($chain);
-    }
-}
diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json
index 3a39f30a03e50..dd87050753c6b 100644
--- a/app/code/Magento/Translation/composer.json
+++ b/app/code/Magento/Translation/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-translation",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-backend": "100.2.*",
         "magento/module-developer": "100.2.*",
         "magento/module-store": "100.2.*",
@@ -12,7 +12,7 @@
         "magento/module-deploy": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.5",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Translation/etc/di.xml b/app/code/Magento/Translation/etc/di.xml
index 6d3ca03953cf9..93ca7c7b6b736 100644
--- a/app/code/Magento/Translation/etc/di.xml
+++ b/app/code/Magento/Translation/etc/di.xml
@@ -65,8 +65,8 @@
             <argument name="patterns" xsi:type="array">
                 <item name="i18n_translation" xsi:type="string"><![CDATA[~i18n\:\s*(["'])(.*?)(?<!\\)\1~]]></item>
                 <item name="translate_wrapping" xsi:type="string"><![CDATA[~translate\=("')([^\'].*?)\'\"~]]></item>
-                <item name="mage_translation_widget" xsi:type="string"><![CDATA[~(?:\$|jQuery)\.mage\.__\((?s)[^'"]*?(['"])(.+?)(?<!\\)\1(?s).*?\)~]]></item>
-                <item name="mage_translation_static" xsi:type="string"><![CDATA[~\$t\((?s)[^'"]*?(["'])(.+?)\1(?s).*?\)~]]></item>
+                <item name="mage_translation_widget" xsi:type="string"><![CDATA[~(?s)(?:\$|jQuery)\.mage\.__\(\s*(['"])(?<translate>.+?)(?<!\\)\1\s*(*SKIP)\)\s*(?s)~]]></item>
+                <item name="mage_translation_static" xsi:type="string"><![CDATA[~(?s)\$t\(\s*(['"])(?<translate>.+?)(?<!\\)\1\s*(*SKIP)\)(?s)~]]></item>
                 <item name="translate_args" xsi:type="string"><![CDATA[~translate args\=("|'|"')([^\'].*?)('"|'|")~]]></item>
             </argument>
         </arguments>
diff --git a/app/code/Magento/Ui/Component/Listing/Columns/Date.php b/app/code/Magento/Ui/Component/Listing/Columns/Date.php
index 75cb9dfbc52f7..acdce73572173 100644
--- a/app/code/Magento/Ui/Component/Listing/Columns/Date.php
+++ b/app/code/Magento/Ui/Component/Listing/Columns/Date.php
@@ -11,6 +11,8 @@
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 /**
+ * Date format column.
+ *
  * @api
  * @since 100.0.2
  */
@@ -47,6 +49,28 @@ public function __construct(
         parent::__construct($context, $uiComponentFactory, $components, $data);
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function prepare()
+    {
+        $config = $this->getData('config');
+        $config['filter'] = [
+            'filterType' => 'dateRange',
+            'templates' => [
+                'date' => [
+                    'options' => [
+                        'dateFormat' => $this->timezone->getDateFormatWithLongYear(),
+                    ],
+                ],
+            ],
+        ];
+
+        $this->setData('config', $config);
+
+        parent::prepare();
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/app/code/Magento/Ui/Component/Paging.php b/app/code/Magento/Ui/Component/Paging.php
index ae83bfc3916cc..57d0ec53777e2 100644
--- a/app/code/Magento/Ui/Component/Paging.php
+++ b/app/code/Magento/Ui/Component/Paging.php
@@ -3,9 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Ui\Component;
 
 /**
+ * Class Paging
+ *
  * @api
  * @since 100.0.2
  */
@@ -13,6 +16,41 @@ class Paging extends AbstractComponent
 {
     const NAME = 'paging';
 
+    /**
+     * Default paging options
+     *
+     * @var array
+     */
+    private $defaultOptions = [
+        '20' => [
+            'value' => 20,
+            'label' => 20
+        ],
+        '30' => [
+            'value' => 30,
+            'label' => 30
+        ],
+        '50' => [
+            'value' => 50,
+            'label' => 50
+        ],
+        '100' => [
+            'value' => 100,
+            'label' => 100
+        ],
+        '200' => [
+            'value' => 200,
+            'label' => 200
+        ],
+    ];
+
+    /**
+     * Default page size
+     *
+     * @var int
+     */
+    private $defaultPageSize = 20;
+
     /**
      * Default component data
      *
@@ -20,29 +58,6 @@ class Paging extends AbstractComponent
      */
     protected $_data = [
         'config' => [
-            'options' => [
-                '20' => [
-                    'value' => 20,
-                    'label' => 20
-                ],
-                '30' => [
-                    'value' => 30,
-                    'label' => 30
-                ],
-                '50' => [
-                    'value' => 50,
-                    'label' => 50
-                ],
-                '100' => [
-                    'value' => 100,
-                    'label' => 100
-                ],
-                '200' => [
-                    'value' => 200,
-                    'label' => 200
-                ],
-            ],
-            'pageSize' => 20,
             'current' => 1
         ]
     ];
@@ -65,13 +80,13 @@ public function getComponentName()
     public function prepare()
     {
         $this->prepareOptions();
+        $this->preparePageSize();
         $paging = $this->getContext()->getRequestParam('paging');
         if (!isset($paging['notLimits'])) {
             $this->getContext()
                 ->getDataProvider()
                 ->setLimit($this->getOffset($paging), $this->getSize($paging));
         }
-
         parent::prepare();
     }
 
@@ -83,12 +98,26 @@ public function prepare()
     protected function prepareOptions()
     {
         $config = $this->getData('config');
-        if (isset($config['options'])) {
-            $config['options'] = array_values($config['options']);
-            foreach ($config['options'] as &$item) {
-                $item['value'] = (int) $item['value'];
-            }
-            unset($item);
+        if (!isset($config['options'])) {
+            $config['options'] = $this->defaultOptions;
+        }
+        foreach ($config['options'] as &$item) {
+            $item['value'] = (int)$item['value'];
+        }
+        unset($item);
+        $this->setData('config', $config);
+    }
+
+    /**
+     * Prepare page size
+     *
+     * @return void
+     */
+    private function preparePageSize()
+    {
+        $config = $this->getData('config');
+        if (!isset($config['pageSize'])) {
+            $config['pageSize'] = $this->defaultPageSize;
             $this->setData('config', $config);
         }
     }
@@ -102,7 +131,7 @@ protected function prepareOptions()
     protected function getOffset($paging)
     {
         $defaultPage = $this->getData('config/current') ?: 1;
-        return (int) (isset($paging['current']) ? $paging['current'] : $defaultPage);
+        return (int)(isset($paging['current']) ? $paging['current'] : $defaultPage);
     }
 
     /**
@@ -113,7 +142,6 @@ protected function getOffset($paging)
      */
     protected function getSize($paging)
     {
-        $defaultLimit = $this->getData('config/pageSize') ?: 20;
-        return (int) (isset($paging['pageSize']) ? $paging['pageSize'] : $defaultLimit);
+        return (int)(isset($paging['pageSize']) ? $paging['pageSize'] : $this->getData('config/pageSize'));
     }
 }
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php
index 9e43f1d11bed0..f7a1396c5e8c9 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php
@@ -7,6 +7,7 @@
 
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Json\DecoderInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Ui\Api\BookmarkManagementInterface;
@@ -86,11 +87,16 @@ public function __construct(
      * Action for AJAX request
      *
      * @return void
+     * @throws NotFoundException
+     * @throws \InvalidArgumentException
      */
     public function execute()
     {
         $bookmark = $this->bookmarkFactory->create();
         $jsonData = $this->_request->getParam('data');
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found.'));
+        }
         if (!$jsonData) {
             throw new \InvalidArgumentException('Invalid parameter "data"');
         }
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render/Handle.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render/Handle.php
index cc028a455456d..a7615c5996c10 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render/Handle.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render/Handle.php
@@ -9,12 +9,36 @@
 use Magento\Ui\Component\Control\ActionPool;
 use Magento\Ui\Component\Wrapper\UiComponent;
 use Magento\Ui\Controller\Adminhtml\AbstractAction;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Framework\View\Element\UiComponent\ContextFactory;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class Handle
  */
 class Handle extends AbstractAction
 {
+    /**
+     * @var ContextFactory
+     */
+    private $contextFactory;
+
+    /**
+     * @param Context $context
+     * @param UiComponentFactory $factory
+     * @param ContextFactory|null $contextFactory
+     */
+    public function __construct(
+        Context $context,
+        UiComponentFactory $factory,
+        ContextFactory $contextFactory = null
+    ) {
+        parent::__construct($context, $factory);
+        $this->contextFactory = $contextFactory
+            ?: ObjectManager::getInstance()->get(ContextFactory::class);
+    }
+
     /**
      * Render UI component by namespace in handle context
      *
@@ -22,20 +46,51 @@ class Handle extends AbstractAction
      */
     public function execute()
     {
+        $response = '';
         $handle = $this->_request->getParam('handle');
         $namespace = $this->_request->getParam('namespace');
         $buttons = $this->_request->getParam('buttons', false);
-
         $this->_view->loadLayout(['default', $handle], true, true, false);
+        $layout = $this->_view->getLayout();
+        $context = $this->contextFactory->create(
+            [
+                'namespace' => $namespace,
+                'pageLayout' => $layout,
+            ]
+        );
 
-        $uiComponent = $this->_view->getLayout()->getBlock($namespace);
-        $response = $uiComponent instanceof UiComponent ? $uiComponent->toHtml() : '';
+        $component = $this->factory->create($namespace, null, ['context' => $context]);
+        if ($this->validateAclResource($component->getContext()->getDataProvider()->getConfigData())) {
+            $uiComponent = $layout->getBlock($namespace);
+            $response = $uiComponent instanceof UiComponent ? $uiComponent->toHtml() : '';
+        }
 
         if ($buttons) {
-            $actionsToolbar = $this->_view->getLayout()->getBlock(ActionPool::ACTIONS_PAGE_TOOLBAR);
+            $actionsToolbar = $layout->getBlock(ActionPool::ACTIONS_PAGE_TOOLBAR);
             $response .= $actionsToolbar instanceof Template ? $actionsToolbar->toHtml() : '';
         }
 
         $this->_response->appendBody($response);
     }
+
+    /**
+     * Optionally validate ACL resource of components with a DataSource/DataProvider
+     *
+     * @param mixed $dataProviderConfigData
+     * @return bool
+     */
+    private function validateAclResource($dataProviderConfigData): bool
+    {
+        if (isset($dataProviderConfigData['aclResource'])
+            && !$this->_authorization->isAllowed($dataProviderConfigData['aclResource'])
+        ) {
+            if (!$this->_request->isAjax()) {
+                $this->_redirect('admin/denied');
+            }
+
+            return false;
+        }
+
+        return true;
+    }
 }
diff --git a/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php b/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php
index efe4a1b8f0859..578ebe4d441d9 100644
--- a/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php
+++ b/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php
@@ -12,7 +12,7 @@
  * @api
  * @since 100.0.2
  */
-abstract class AbstractDataProvider implements DataProviderInterface
+abstract class AbstractDataProvider implements DataProviderInterface, \Countable
 {
     /**
      * Data Provider name
diff --git a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
index 066b4494e51d0..14283a8899e50 100644
--- a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
+++ b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Ui\TemplateEngine\Xhtml;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\JsonHexTag;
 use Magento\Framework\View\Layout\Generator\Structure;
 use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Framework\View\TemplateEngine\Xhtml\Template;
@@ -42,25 +44,33 @@ class Result implements ResultInterface
      */
     protected $logger;
 
+    /**
+     * @var JsonHexTag
+     */
+    private $jsonSerializer;
+
     /**
      * @param Template $template
      * @param CompilerInterface $compiler
      * @param UiComponentInterface $component
      * @param Structure $structure
      * @param LoggerInterface $logger
+     * @param JsonHexTag $jsonSerializer
      */
     public function __construct(
         Template $template,
         CompilerInterface $compiler,
         UiComponentInterface $component,
         Structure $structure,
-        LoggerInterface $logger
+        LoggerInterface $logger,
+        JsonHexTag $jsonSerializer = null
     ) {
         $this->template = $template;
         $this->compiler = $compiler;
         $this->component = $component;
         $this->structure = $structure;
         $this->logger = $logger;
+        $this->jsonSerializer = $jsonSerializer ?? ObjectManager::getInstance()->get(JsonHexTag::class);
     }
 
     /**
@@ -81,7 +91,7 @@ public function getDocumentElement()
     public function appendLayoutConfiguration()
     {
         $layoutConfiguration = $this->wrapContent(
-            json_encode($this->structure->generate($this->component), JSON_HEX_TAG)
+            $this->jsonSerializer->serialize($this->structure->generate($this->component))
         );
         $this->template->append($layoutConfiguration);
     }
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminClickSearchInGridActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminClickSearchInGridActionGroup.xml
new file mode 100644
index 0000000000000..b7fce8efcb0f6
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminClickSearchInGridActionGroup.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="AdminClickSearchInGridActionGroup">
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearch"/>
+        <waitForPageLoad stepKey="waitForSearchResult"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridFilterActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridFilterActionGroup.xml
index 8fbd5342b24c4..c1379b9fce575 100644
--- a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridFilterActionGroup.xml
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridFilterActionGroup.xml
@@ -30,7 +30,7 @@
     <!--Clear all filters in grid-->
     <actionGroup name="clearFiltersAdminDataGrid">
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
     </actionGroup>
 
     <actionGroup name="AdminGridFilterSearchResultsByInput">
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml
new file mode 100644
index 0000000000000..e4f6bd0c60546
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.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="AdminDataGridSelectCustomPageSize">
+        <arguments>
+            <argument name="pageSize" type="string"/>
+        </arguments>
+        <click selector="{{AdminDataGridPaginationSection.pageSizeDropdown}}" stepKey="clickPageSizeDropdown"/>
+        <waitForElementVisible selector="{{AdminDataGridPaginationSection.pageSizeOption('Custom')}}" stepKey="waitCustomPageSizeOptionAppear"/>
+        <click selector="{{AdminDataGridPaginationSection.pageSizeOption('Custom')}}" stepKey="selectCustomPageSize"/>
+        <waitForElementVisible selector="{{AdminDataGridPaginationSection.pageSizeInput}}" stepKey="waitForInputVisible"/>
+        <fillField selector="{{AdminDataGridPaginationSection.pageSizeInput}}" userInput="{{pageSize}}" stepKey="fillCustomPageSize"/>
+        <click selector="{{AdminDataGridPaginationSection.pageSizeApplyInput}}" stepKey="applyCustomPageSize"/>
+        <seeInField selector="{{AdminDataGridPaginationSection.pageSizeDropDownValue}}" userInput="{{pageSize}}" stepKey="seePageSizeValueInDropDown"/>
+    </actionGroup>
+
+    <actionGroup name="AdminDataGridDeleteCustomPageSize">
+        <arguments>
+            <argument name="pageSize" type="string"/>
+        </arguments>
+        <click selector="{{AdminDataGridPaginationSection.pageSizeDropdown}}" stepKey="clickPageSizeDropdown"/>
+        <click selector="{{AdminDataGridPaginationSection.pageSizeEditCustomValue(pageSize)}}" stepKey="clickToEditCustomPageSize"/>
+        <waitForElementVisible selector="{{AdminDataGridPaginationSection.pageSizeDeleteCustomValue(pageSize)}}" stepKey="waitForDeleteButtonVisible"/>
+        <click selector="{{AdminDataGridPaginationSection.pageSizeDeleteCustomValue(pageSize)}}" stepKey="clickToDeleteCustomPageSize"/>
+        <click selector="{{AdminDataGridPaginationSection.pageSizeDropdown}}" stepKey="clickPageSizeDropdownAfterCustomPageSizeDeleted"/>
+        <dontSeeElement selector="{{AdminDataGridPaginationSection.pageSizeDropDownItem(pageSize)}}" stepKey="dontSeeDropDownItem"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminFillInputFilterFieldActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminFillInputFilterFieldActionGroup.xml
new file mode 100644
index 0000000000000..cc63e5ac73069
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminFillInputFilterFieldActionGroup.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="AdminFillInputFilterFieldActionGroup">
+        <arguments>
+            <argument name="filterInputName" type="string"/>
+            <argument name="filterValue" type="string"/>
+        </arguments>
+        <fillField selector="{{AdminDataGridFilterSection.inputFieldByNameAttrInGrid(filterInputName)}}" userInput="{{filterValue}}" stepKey="fillFilterInputField" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridFilterSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridFilterSection.xml
new file mode 100644
index 0000000000000..97ec1859e1ef7
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridFilterSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminDataGridFilterSection">
+        <element name="inputFieldByNameAttrInGrid" type="input" selector="//*[@data-role='filter-form']//input[@name='{{inputNameAttr}}']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
new file mode 100644
index 0000000000000..ca1ec145c3e0d
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminDataGridPaginationSection">
+        <element name="pageSizeDropdown" type="select" selector=".admin__data-grid-pager-wrap .selectmenu"/>
+        <element name="pageSizeOption" type="button" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//button[text()='{{var1}}']" parameterized="true"/>
+        <element name="pageSizeInput" type="input" selector="div.admin__data-grid-pager-wrap div.selectmenu-items._active li._edit div.selectmenu-item-edit input"/>
+        <element name="pageSizeApplyInput" type="button" selector="div.admin__data-grid-pager-wrap div.selectmenu-items._active li._edit div.selectmenu-item-edit button" timeout="30"/>
+        <element name="pageSizeDropDownItem" type="button" selector="//*[contains(@class, 'selectmenu-items _active')]//button[contains(@class, 'selectmenu-item-action') and text()='{{dropDownItem}}']" parameterized="true"/>
+        <element name="pageSizeEditCustomValue" type="button" selector="//div[contains(@class, 'selectmenu-items _active')]//div[contains(@class, 'selectmenu-item')]//button[text()='{{perPageCustomValue}}']/following-sibling::button[contains(@class, 'action-edit')]" parameterized="true"/>
+        <element name="pageSizeDeleteCustomValue" type="button" selector="//div[contains(@class, 'selectmenu-items _active')]//div[contains(@class, 'selectmenu-item')]//button[text()='{{perPageCustomValue}}']/parent::div/preceding-sibling::div/button[contains(@class, 'action-delete')]" parameterized="true" timeout="30"/>
+        <element name="nextPage" type="button" selector="div.admin__data-grid-pager > button.action-next" timeout="30"/>
+        <element name="previousPage" type="button" selector=".admin__data-grid-header:nth-of-type(2) div.admin__data-grid-pager > button.action-previous:not(disabled)" timeout="30"/>
+        <element name="currentPage" type="input" selector="div.admin__data-grid-pager > input[data-ui-id='current-page-input']"/>
+        <element name="pageSizeDropDownValue" type="input" selector=".admin__data-grid-pager-wrap .selectmenu-value input" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
index ea0f7e64a8448..5dc5798c2c06b 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminDataGridTableSection">
         <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
         <element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
@@ -18,5 +18,10 @@
         <!--Specific cell e.g. {{Section.gridCell('1', 'Name')}}-->
         <element name="gridCell" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
         <element name="rowViewAction" type="button" selector=".data-grid tbody > tr:nth-of-type({{row}}) .action-menu-item" parameterized="true" timeout="30"/>
+        <element name="rowActionSelect" type="button" selector="[data-role='grid'] tbody tr .action-select-wrap"/>
+        <element name="rowEditAction" type="button" selector="[data-role='grid'] tbody tr .action-select-wrap._active [data-action='item-edit']" timeout="30"/>
+        <element name="dataGridEmpty" type="block" selector=".data-grid-tr-no-data td"/>
+        <element name="dataGridWrap" type="block" selector=".admin__data-grid-wrap"/>
+        <element name="rowTemplate" type="block" selector="//tbody/tr[td[*[contains(.,normalize-space('{{text}}'))]]]" parameterized="true" />
     </section>
 </sections>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminMessagesSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminMessagesSection.xml
index d3e94eb24dfd2..3d4efa13ce3a0 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminMessagesSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminMessagesSection.xml
@@ -7,9 +7,11 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          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"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/StorefrontMessagesSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/StorefrontMessagesSection.xml
new file mode 100644
index 0000000000000..2834c367f136c
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/Section/StorefrontMessagesSection.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="StorefrontMessagesSection">
+        <element name="successMessage" type="text" selector=".message-success"/>
+        <element name="errorMessage" type="text" selector=".message-error"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/StorefrontModalConfirmationSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/StorefrontModalConfirmationSection.xml
new file mode 100644
index 0000000000000..9539d64537748
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/Section/StorefrontModalConfirmationSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontModalConfirmationSection">
+        <element name="okButton" type="button" selector="aside.confirm .modal-footer button.action-accept" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Control/ButtonTest.php b/app/code/Magento/Ui/Test/Unit/Component/Control/ButtonTest.php
index bc7c3ac677e10..97c77c158c147 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Control/ButtonTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Control/ButtonTest.php
@@ -10,6 +10,9 @@
 use Magento\Framework\View\Element\Template\Context;
 use Magento\Ui\Component\Control\Button;
 
+/**
+ * Class ButtonTest
+ */
 class ButtonTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -55,7 +58,7 @@ public function testGetType()
     public function testGetAttributesHtml()
     {
         $expected = 'type="button" class="action- scalable classValue disabled" '
-            . 'onclick="location.href = \'url2\';" disabled="disabled" data-attributeKey="attributeValue" ';
+            . 'onclick="location.href = &#039;url2&#039;;" disabled="disabled" data-attributeKey="attributeValue" ';
         $this->button->setDisabled(true);
         $this->button->setData('url', 'url2');
         $this->button->setData('class', 'classValue');
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/DateTest.php b/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/DateTest.php
index 0bfb2a7dc0f34..414290efdd637 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/DateTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/DateTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Ui\Test\Unit\Component\Listing\Columns;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Class DateTest
@@ -14,18 +15,33 @@ class DateTest extends \PHPUnit\Framework\TestCase
 {
     const TEST_TIME = '2000-04-12 16:34:12';
 
+    private $data = [
+        'js_config' => [
+            'extends' => 'test_config_extends',
+        ],
+        'config' => [
+            'dataType' => 'testType',
+        ],
+        'name' => 'field_name',
+    ];
+
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\View\Element\UiComponent\ContextInterface|MockObject
      */
     protected $contextMock;
 
+    /**
+     * @var \Magento\Framework\View\Element\UiComponentFactory|MockObject
+     */
+    private $uiComponentFactoryMock;
+
     /**
      * @var \Magento\Ui\Component\Listing\Columns\Date
      */
     protected $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface|MockObject
      */
     protected $timezoneMock;
 
@@ -50,11 +66,7 @@ protected function setUp()
             true,
             []
         );
-        $processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->contextMock->expects($this->never())->method('getProcessor')->willReturn($processor);
-
+        $this->uiComponentFactoryMock = $this->createMock(\Magento\Framework\View\Element\UiComponentFactory::class);
         $this->timezoneMock = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -63,18 +75,63 @@ protected function setUp()
             \Magento\Ui\Component\Listing\Columns\Date::class,
             [
                 'context' => $this->contextMock,
-                'data' => [
-                    'js_config' => [
-                        'extends' => 'test_config_extends'
-                    ],
-                    'config' => [
-                        'dataType' => 'testType'
+                'uiComponentFactory' => $this->uiComponentFactoryMock,
+                'data' => $this->data,
+                'timezone' => $this->timezoneMock,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testPrepare()
+    {
+        $dateFormat = 'M/d/Y';
+
+        $this->data['config']['filter'] = [
+            'filterType' => 'dateRange',
+            'templates' => [
+                'date' => [
+                    'options' => [
+                        'dateFormat' => $dateFormat,
                     ],
-                    'name' => 'field_name',
                 ],
-                'timezone' => $this->timezoneMock
-            ]
+            ],
+        ];
+
+        $this->timezoneMock->expects($this->once())
+            ->method('getDateFormatWithLongYear')
+            ->willReturn($dateFormat);
+
+        /** @var \Magento\Framework\View\Element\UiComponent\Processor|MockObject $processor */
+        $processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->contextMock->expects($this->atLeastOnce())->method('getProcessor')->willReturn($processor);
+
+        /** @var \Magento\Framework\View\Element\UiComponentInterface|MockObject $wrappedComponentMock */
+        $wrappedComponentMock = $this->getMockForAbstractClass(
+            \Magento\Framework\View\Element\UiComponentInterface::class,
+            [],
+            '',
+            false
         );
+
+        $wrappedComponentMock->expects($this->once())
+            ->method('getContext')
+            ->willReturn($this->contextMock);
+
+        $this->uiComponentFactoryMock->expects($this->once())
+            ->method('create')
+            ->with(
+                $this->data['name'],
+                $this->data['config']['dataType'],
+                array_merge(['context' => $this->contextMock], $this->data)
+            )
+            ->willReturn($wrappedComponentMock);
+
+        $this->model->prepare();
     }
 
     public function testPrepareDataSource()
diff --git a/app/code/Magento/Ui/Test/Unit/Component/PagingTest.php b/app/code/Magento/Ui/Test/Unit/Component/PagingTest.php
index 44dca689eef99..97df719ef14cb 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/PagingTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/PagingTest.php
@@ -81,31 +81,11 @@ public function testPrepare()
             ],
             'config' => [
                 'options' => [
-                    [
-                        'value' => 20,
-                        'label' => 20
-                    ],
-                    [
-                        'value' => 30,
-                        'label' => 30
-                    ],
-                    [
-                        'value' => 50,
-                        'label' => 50
-                    ],
-                    [
-                        'value' => 100,
-                        'label' => 100
-                    ],
-                    [
-                        'value' => 200,
-                        'label' => 200
-                    ],
-                    [
+                    'options1' => [
                         'value' => 20,
                         'label' => 'options1'
                     ],
-                    [
+                    'options2' => [
                         'value' => 40,
                         'label' => 'options2'
                     ],
diff --git a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/Render/HandleTest.php b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/Render/HandleTest.php
index 31d5b421013f6..8f7641e117cdd 100644
--- a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/Render/HandleTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/Render/HandleTest.php
@@ -6,7 +6,13 @@
 namespace Magento\Ui\Test\Unit\Controller\Adminhtml\Index\Render;
 
 use Magento\Ui\Controller\Adminhtml\Index\Render\Handle;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
 
+/**
+ * Tests \Magento\Ui\Controller\Adminhtml\Index\Render\Handle.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class HandleTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -27,22 +33,42 @@ class HandleTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $componentFactoryMock;
+    protected $viewMock;
+
+    /**
+     * @var Handle
+     */
+    protected $controller;
+
+    /**
+     * @var \Magento\Framework\AuthorizationInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $authorizationMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $viewMock;
+    private $uiComponentContextMock;
 
     /**
-     * @var Handle
+     * @var \Magento\Framework\View\Element\UiComponentInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $controller;
+    private $uiComponentMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $uiFactoryMock;
+
+    /**
+     * @var \Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface|
+     *      \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dataProviderMock;
 
     public function setUp()
     {
         $this->contextMock = $this->createMock(\Magento\Backend\App\Action\Context::class);
-        $this->componentFactoryMock = $this->createMock(\Magento\Framework\View\Element\UiComponentFactory::class);
 
         $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
         $this->contextMock->expects($this->atLeastOnce())->method('getRequest')->willReturn($this->requestMock);
@@ -52,8 +78,34 @@ public function setUp()
 
         $this->viewMock = $this->createMock(\Magento\Framework\App\ViewInterface::class);
         $this->contextMock->expects($this->atLeastOnce())->method('getView')->willReturn($this->viewMock);
-
-        $this->controller = new Handle($this->contextMock, $this->componentFactoryMock);
+        $this->authorizationMock = $this->getMockForAbstractClass(\Magento\Framework\AuthorizationInterface::class);
+        $this->authorizationMock->expects($this->any())
+            ->method('isAllowed')
+            ->willReturn(true);
+        $this->uiComponentContextMock = $this->getMockForAbstractClass(ContextInterface::class);
+        $this->uiComponentMock = $this->getMockForAbstractClass(
+            \Magento\Framework\View\Element\UiComponentInterface::class
+        );
+        $this->dataProviderMock = $this->getMockForAbstractClass(
+            \Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface::class
+        );
+        $this->uiComponentContextMock->expects($this->once())
+            ->method('getDataProvider')
+            ->willReturn($this->dataProviderMock);
+        $this->uiFactoryMock = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->uiComponentMock->expects($this->any())
+            ->method('getContext')
+            ->willReturn($this->uiComponentContextMock);
+        $this->uiFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->uiComponentMock);
+        $this->dataProviderMock->expects($this->once())
+            ->method('getConfigData')
+            ->willReturn([]);
+        $contextMock = $this->createMock(\Magento\Framework\View\Element\UiComponent\ContextFactory::class);
+        $this->controller = new Handle($this->contextMock, $this->uiFactoryMock, $contextMock);
     }
 
     public function testExecuteNoButtons()
@@ -83,7 +135,7 @@ public function testExecute()
             ->with(['default', $result], true, true, false);
 
         $layoutMock = $this->createMock(\Magento\Framework\View\LayoutInterface::class);
-        $this->viewMock->expects($this->exactly(2))->method('getLayout')->willReturn($layoutMock);
+        $this->viewMock->expects($this->once())->method('getLayout')->willReturn($layoutMock);
 
         $layoutMock->expects($this->exactly(2))->method('getBlock');
 
diff --git a/app/code/Magento/Ui/Test/Unit/TemplateEngine/Xhtml/ResultTest.php b/app/code/Magento/Ui/Test/Unit/TemplateEngine/Xhtml/ResultTest.php
index 30a8e8005bbe8..9babfefd87f76 100644
--- a/app/code/Magento/Ui/Test/Unit/TemplateEngine/Xhtml/ResultTest.php
+++ b/app/code/Magento/Ui/Test/Unit/TemplateEngine/Xhtml/ResultTest.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Ui\Test\Unit\TemplateEngine\Xhtml;
 
+use Magento\Framework\Serialize\Serializer\JsonHexTag;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Layout\Generator\Structure;
 use Magento\Framework\View\Element\UiComponentInterface;
@@ -58,6 +59,11 @@ class ResultTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManager;
 
+    /**
+     * @var JsonHexTag|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializer;
+
     protected function setUp()
     {
         $this->template = $this->createPartialMock(Template::class, ['append']);
@@ -65,6 +71,9 @@ protected function setUp()
         $this->component = $this->createMock(UiComponentInterface::class);
         $this->structure = $this->createPartialMock(Structure::class, ['generate']);
         $this->logger = $this->createMock(LoggerInterface::class);
+        $this->serializer = $this->getMockBuilder(JsonHexTag::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->objectManager = new ObjectManager($this);
         $this->testModel = $this->objectManager->getObject(Result::class, [
@@ -73,6 +82,7 @@ protected function setUp()
             'component' => $this->component,
             'structure' => $this->structure,
             'logger' => $this->logger,
+            'jsonSerializer' => $this->serializer
         ]);
     }
 
@@ -82,6 +92,10 @@ protected function setUp()
     public function testAppendLayoutConfiguration()
     {
         $configWithCdata = 'text before <![CDATA[cdata text]]>';
+        $this->serializer->expects($this->once())
+            ->method('serialize')
+            ->with([$configWithCdata])
+            ->willReturn('["text before \u003C![CDATA[cdata text]]\u003E"]');
         $this->structure->expects($this->once())
             ->method('generate')
             ->with($this->component)
diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json
index e259c7d8b0639..48d97c22a4fe1 100644
--- a/app/code/Magento/Ui/composer.json
+++ b/app/code/Magento/Ui/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-ui",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-backend": "100.2.*",
         "magento/framework": "101.0.*",
         "magento/module-eav": "101.0.*",
@@ -13,7 +13,7 @@
         "magento/module-config": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "101.0.6",
+    "version": "101.0.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Ui/i18n/en_US.csv b/app/code/Magento/Ui/i18n/en_US.csv
index 981d444b31d53..040ec32cf0b74 100644
--- a/app/code/Magento/Ui/i18n/en_US.csv
+++ b/app/code/Magento/Ui/i18n/en_US.csv
@@ -202,3 +202,4 @@ CSV,CSV
 "Please enter at least {0} characters.","Please enter at least {0} characters."
 "Please enter a value between {0} and {1} characters long.","Please enter a value between {0} and {1} characters long."
 "Please enter a value between {0} and {1}.","Please enter a value between {0} and {1}."
+"The file upload field is disabled.","The file upload field is disabled."
diff --git a/app/code/Magento/Ui/view/base/templates/control/button/default.phtml b/app/code/Magento/Ui/view/base/templates/control/button/default.phtml
index 0307af4f749d4..856bdd67a5bc6 100644
--- a/app/code/Magento/Ui/view/base/templates/control/button/default.phtml
+++ b/app/code/Magento/Ui/view/base/templates/control/button/default.phtml
@@ -4,16 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
-?>
-<?php
 /**
  * @var $block \Magento\Ui\Component\Control\Button
  */
 ?>
 <?= $block->getBeforeHtml() ?>
-<button <?= /* @escapeNotVerified */ $block->getAttributesHtml(), $block->getUiId() ?>>
-    <span><?= /* @escapeNotVerified */ $block->getLabel() ?></span>
+<button <?= /* @noEscape */ $block->getAttributesHtml(), /* @noEscape */ $block->getUiId() ?>>
+    <span><?= $block->escapeHtml($block->getLabel()) ?></span>
 </button>
 <?= $block->getAfterHtml() ?>
diff --git a/app/code/Magento/Ui/view/base/templates/control/button/split.phtml b/app/code/Magento/Ui/view/base/templates/control/button/split.phtml
index 757b1d3a4e425..a986f2f1c0ec2 100644
--- a/app/code/Magento/Ui/view/base/templates/control/button/split.phtml
+++ b/app/code/Magento/Ui/view/base/templates/control/button/split.phtml
@@ -4,10 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
-?>
-<?php
 /** @var $block \Magento\Ui\Component\Control\SplitButton */
 ?>
 
@@ -15,26 +11,26 @@
     <button <?= $block->getButtonAttributesHtml() ?>>
         <span><?= $block->escapeHtml($block->getLabel()) ?></span>
     </button>
-    <?php if ($block->hasSplit()): ?>
+    <?php if ($block->hasSplit()) : ?>
         <button <?= $block->getToggleAttributesHtml() ?>>
-            <span><?= /* @escapeNotVerified */ __('Select'); ?></span>
+            <span><?= $block->escapeHtml(__('Select')) ?></span>
         </button>
 
-        <?php if (!$block->getDisabled()): ?>
-            <ul class="dropdown-menu" <?= /* @escapeNotVerified */ $block->getUiId("dropdown-menu") ?>>
-                <?php foreach ($block->getOptions() as $key => $option): ?>
-                <li>
+        <?php if (!$block->getDisabled()) : ?>
+            <ul class="dropdown-menu" <?= /* @noEscape */ $block->getUiId("dropdown-menu") ?>>
+                <?php foreach ($block->getOptions() as $key => $option) : ?>
+                    <li>
                     <span <?= $block->getOptionAttributesHtml($key, $option) ?>>
                         <?= $block->escapeHtml($option['label']) ?>
                     </span>
-                    <?php if (isset($option['hint'])): ?>
-                    <div class="tooltip" <?= /* @escapeNotVerified */ $block->getUiId('item', $key, 'tooltip') ?>>
-                        <a href="<?= $block->escapeHtml($option['hint']['href']) ?>" class="help">
-                            <?= $block->escapeHtml($option['hint']['label']) ?>
-                        </a>
-                    </div>
-                    <?php endif; ?>
-                </li>
+                        <?php if (isset($option['hint'])) : ?>
+                            <div class="tooltip" <?= /* @noEscape */ $block->getUiId('item', $key, 'tooltip') ?>>
+                                <a href="<?= $block->escapeUrl($option['hint']['href']) ?>" class="help">
+                                    <?= $block->escapeHtml($option['hint']['label']) ?>
+                                </a>
+                            </div>
+                        <?php endif; ?>
+                    </li>
                 <?php endforeach; ?>
             </ul>
         <?php endif; ?>
@@ -46,4 +42,4 @@
             "Magento_Ui/js/grid/controls/button/split": {}
         }
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/app/code/Magento/Ui/view/base/templates/form/default.phtml b/app/code/Magento/Ui/view/base/templates/form/default.phtml
index 97f8ec52ca0d0..68f3a91969c51 100644
--- a/app/code/Magento/Ui/view/base/templates/form/default.phtml
+++ b/app/code/Magento/Ui/view/base/templates/form/default.phtml
@@ -4,17 +4,18 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
 /**
  * @var \Magento\Ui\Component\Form $block
  */
-/* @escapeNotVerified */ echo $block->renderChildComponent('before_form');
 ?>
-<div data-role="spinner" data-component="<?= /* @escapeNotVerified */ $block->getName() ?>.areas" class="admin__data-grid-loading-mask">
+<?= /* @noEscape */ $block->renderChildComponent('before_form') ?>
+<div data-role="spinner"
+     data-component="<?= $block->escapeHtmlAttr($block->getName()) ?>.areas"
+     class="admin__data-grid-loading-mask">
     <div class="grid-loader"></div>
 </div>
-<div data-bind="scope: '<?= /* @escapeNotVerified */ $block->getName() ?>.areas'" class="entry-edit form-inline">
+<div data-bind="scope: '<?= $block->escapeHtmlAttr($block->getName()) ?>.areas'"
+     class="entry-edit form-inline">
     <!-- ko template: getTemplate() --><!-- /ko -->
 </div>
-<?php
-echo $block->renderChildComponent('after_form');
+<?= /* @noEscape */ $block->renderChildComponent('after_form') ?>
diff --git a/app/code/Magento/Ui/view/base/templates/label/default.phtml b/app/code/Magento/Ui/view/base/templates/label/default.phtml
index db434adf92ee9..cb334a3e3f385 100644
--- a/app/code/Magento/Ui/view/base/templates/label/default.phtml
+++ b/app/code/Magento/Ui/view/base/templates/label/default.phtml
@@ -5,5 +5,5 @@
  */
 ?>
 <span>
-    <?= /* @escapeNotVerified */ $block->getData('label') ?>
+    <?= $block->escapeHtml($block->getData('label')) ?>
 </span>
diff --git a/app/code/Magento/Ui/view/base/templates/layout/tabs/default.phtml b/app/code/Magento/Ui/view/base/templates/layout/tabs/default.phtml
index 58e9ed5d0508f..9192c86847c4b 100644
--- a/app/code/Magento/Ui/view/base/templates/layout/tabs/default.phtml
+++ b/app/code/Magento/Ui/view/base/templates/layout/tabs/default.phtml
@@ -3,10 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 /**
  * @var \Magento\Ui\Component\Layout\Tabs $block
  */
 ?>
-<div data-bind="scope: '<?= /* @escapeNotVerified */ $block->getDataScope() ?>.sections' " class="ui-tabs">
+<div data-bind="scope: '<?= $block->escapeHtmlAttr($block->getDataScope()) ?>.sections' " class="ui-tabs">
     <!-- ko template: getTemplate() --><!-- /ko -->
 </div>
diff --git a/app/code/Magento/Ui/view/base/templates/layout/tabs/nav/default.phtml b/app/code/Magento/Ui/view/base/templates/layout/tabs/nav/default.phtml
index b81e0bcc8f2a4..202834c83124c 100644
--- a/app/code/Magento/Ui/view/base/templates/layout/tabs/nav/default.phtml
+++ b/app/code/Magento/Ui/view/base/templates/layout/tabs/nav/default.phtml
@@ -3,10 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 /**
  * @var \Magento\Ui\Component\Layout\Tabs\Nav $block
  */
 ?>
-<div data-bind="scope: '<?= /* @escapeNotVerified */ $block->getDataScope() ?>.sections' " class="ui-tabs">
+<div data-bind="scope: '<?= $block->escapeHtmlAttr($block->getDataScope()) ?>.sections' " class="ui-tabs">
     <!-- ko template: getTemplate() --><!-- /ko -->
 </div>
diff --git a/app/code/Magento/Ui/view/base/templates/logger.phtml b/app/code/Magento/Ui/view/base/templates/logger.phtml
index d064704ab6aed..7466781a606f1 100644
--- a/app/code/Magento/Ui/view/base/templates/logger.phtml
+++ b/app/code/Magento/Ui/view/base/templates/logger.phtml
@@ -3,13 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// @codingStandardsIgnoreFile
+
+/** @var $block \Magento\Ui\Block\Logger */
 ?>
-<?php /** @var $block \Magento\Ui\Block\Logger */ ?>
-<?php if ($block->isLoggingEnabled()): ?>
+<?php if ($block->isLoggingEnabled()) : ?>
     <script>
         window.onerror = function(msg, url, line) {
-            var key = "<?= /* @escapeNotVerified */ $block->getSessionStorageKey() ?>";
+            var key = "<?= $block->escapeJs($block->getSessionStorageKey()) ?>";
             var errors = {};
             if (sessionStorage.getItem(key)) {
                 errors = JSON.parse(sessionStorage.getItem(key));
diff --git a/app/code/Magento/Ui/view/base/templates/stepswizard.phtml b/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
index 05a537b9a6559..52a5c7d713cc4 100644
--- a/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
+++ b/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
@@ -4,20 +4,23 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 /** @var $block \Magento\Ui\Block\Component\StepsWizard */
 ?>
-<div data-role="steps-wizard-main" class="steps-wizard <?= /* @noEscape */ $block->getData('config/dataScope') ?>" data-bind="scope: '<?= /* @escapeNotVerified */  $block->getComponentName() ?>'">
+<div data-role="steps-wizard-main"
+     class="steps-wizard <?= /* @noEscape */ $block->getData('config/dataScope') ?>"
+     data-bind="scope: '<?= $block->escapeHtmlAttr($block->getComponentName()) ?>'">
     <div data-role="messages" class="messages"></div>
 
-    <div data-role="steps-wizard-controls" class="steps-wizard-navigation">
+    <div data-role="steps-wizard-controls"
+         class="steps-wizard-navigation">
         <ul class="nav-bar">
             <?php foreach ($block->getSteps() as $step) { ?>
-                <li data-role="collapsible" data-bind="css: { 'active': selectedStep() == '<?= /* @escapeNotVerified */  $step->getComponentName() ?>'}">
-                    <a href="#<?= /* @escapeNotVerified */  $step->getComponentName() ?>"
+                <li data-role="collapsible"
+                    data-bind="css: { 'active': selectedStep() == '<?= $block->escapeHtmlAttr($step->getComponentName()) ?>'}">
+                    <a href="#<?= $block->escapeHtmlAttr($step->getComponentName()) ?>"
                        data-bind="click: showSpecificStep">
-                        <?= /* @escapeNotVerified */  $step->getCaption() ?>
+                        <?= $block->escapeHtml($step->getCaption()) ?>
                     </a>
                 </li>
             <?php } ?>
@@ -26,20 +29,20 @@
             <div class="action-wrap" data-role="closeBtn">
                 <button type="button"
                         class="action-cancel action-tertiary" data-bind="click: close">
-                    <span><?= /* @escapeNotVerified */  __('Cancel') ?></span>
+                    <span><?= $block->escapeHtml(__('Cancel')) ?></span>
                 </button>
             </div>
             <div class="action-wrap action-wrap-prev" data-role="step-wizard-prev">
                 <button type="button"
                         class="action-default action-back-step"
                         data-bind="click: back, css: { 'disabled': disabled}">
-                    <span><?= /* @escapeNotVerified */  __('Back') ?></span>
+                    <span><?= $block->escapeHtml(__('Back')) ?></span>
                 </button>
             </div>
             <div class="action-wrap action-wrap-next" data-role="step-wizard-next">
                 <button type="button"
                         class="action-default action-primary action-next-step" data-bind="click: next">
-                    <span><?= /* @escapeNotVerified */  __('Next') ?></span>
+                    <span><?= $block->escapeHtml(__('Next')) ?></span>
                 </button>
             </div>
         </div>
@@ -47,9 +50,10 @@
     <div data-role="steps-wizard-tab">
         <?php foreach ($block->getSteps() as $step) { ?>
             <div data-bind="visible: selectedStep() == $element.id, css: {'no-display':false}"
-                 class="content no-display" id="<?= /* @escapeNotVerified */ $step->getComponentName() ?>"
+                 class="content no-display"
+                 id="<?= $block->escapeHtmlAttr($step->getComponentName()) ?>"
                  data-role="content">
-                <?= /* @escapeNotVerified */  $step->getContent() ?>
+                <?= /* @noEscape */ $step->getContent() ?>
             </div>
         <?php } ?>
     </div>
@@ -60,10 +64,10 @@
         "*": {
             "Magento_Ui/js/core/app": {
                 "components": {
-                        "<?= /* @escapeNotVerified */  $block->getComponentName() ?>": {
+                        "<?= $block->escapeJs($block->getComponentName()) ?>": {
                             "component": "Magento_Ui/js/lib/step-wizard",
-                            "initData": <?= /* @escapeNotVerified */  $this->helper("Magento\Framework\Json\Helper\Data")->jsonEncode($block->getInitData()) ?>,
-                            "stepsNames": <?= /* @escapeNotVerified */  $this->helper("Magento\Framework\Json\Helper\Data")->jsonEncode($block->getStepComponents()) ?>,
+                            "initData": <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getInitData()) ?>,
+                            "stepsNames": <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getStepComponents()) ?>,
                             "modalClass": "<?= /* @noEscape */ $block->getData('config/dataScope') ?>"
                         }
                     }
diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js
index dee9ba7acc172..583e97b7e9449 100644
--- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js
+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js
@@ -15,8 +15,7 @@ define([
 ], function (ko, $, _, Element) {
     'use strict';
 
-    var transformProp,
-        isTouchDevice = typeof document.ontouchstart !== 'undefined';
+    var transformProp;
 
     /**
      * Get element context
@@ -110,11 +109,7 @@ define([
          * @param {Object} data - element data
          */
         initListeners: function (elem, data) {
-            if (isTouchDevice) {
-                $(elem).on('touchstart', this.mousedownHandler.bind(this, data, elem));
-            } else {
-                $(elem).on('mousedown', this.mousedownHandler.bind(this, data, elem));
-            }
+            $(elem).on('mousedown touchstart', this.mousedownHandler.bind(this, data, elem));
         },
 
         /**
@@ -131,26 +126,20 @@ define([
                 $table = $(elem).parents('table').eq(0),
                 $tableWrapper = $table.parent();
 
+            this.disableScroll();
             $(recordNode).addClass(this.draggableElementClass);
             $(originRecord).addClass(this.draggableElementClass);
             this.step = this.step === 'auto' ? originRecord.height() / 2 : this.step;
             drEl.originRow = originRecord;
             drEl.instance = recordNode = this.processingStyles(recordNode, elem);
             drEl.instanceCtx = this.getRecord(originRecord[0]);
-            drEl.eventMousedownY = isTouchDevice ? event.originalEvent.touches[0].pageY : event.pageY;
+            drEl.eventMousedownY = this.getPageY(event);
             drEl.minYpos =
                 $table.offset().top - originRecord.offset().top + $table.children('thead').outerHeight();
             drEl.maxYpos = drEl.minYpos + $table.children('tbody').outerHeight() - originRecord.outerHeight();
             $tableWrapper.append(recordNode);
-
-            if (isTouchDevice) {
-                this.body.bind('touchmove', this.mousemoveHandler);
-                this.body.bind('touchend', this.mouseupHandler);
-            } else {
-                this.body.bind('mousemove', this.mousemoveHandler);
-                this.body.bind('mouseup', this.mouseupHandler);
-            }
-
+            this.body.bind('mousemove touchmove', this.mousemoveHandler);
+            this.body.bind('mouseup touchend', this.mouseupHandler);
         },
 
         /**
@@ -160,16 +149,13 @@ define([
          */
         mousemoveHandler: function (event) {
             var depEl = this.draggableElement,
-                pageY = isTouchDevice ? event.originalEvent.touches[0].pageY : event.pageY,
+                pageY = this.getPageY(event),
                 positionY = pageY - depEl.eventMousedownY,
                 processingPositionY = positionY + 'px',
                 processingMaxYpos = depEl.maxYpos + 'px',
                 processingMinYpos = depEl.minYpos + 'px',
                 depElement = this.getDepElement(depEl.instance, positionY, depEl.originRow);
 
-            event.stopPropagation();
-            event.preventDefault();
-
             if (depElement) {
                 depEl.depElement ? depEl.depElement.elem.removeClass(depEl.depElement.className) : false;
                 depEl.depElement = depElement;
@@ -194,9 +180,10 @@ define([
         mouseupHandler: function (event) {
             var depElementCtx,
                 drEl = this.draggableElement,
-                pageY = isTouchDevice ? event.originalEvent.touches[0].pageY : event.pageY,
+                pageY = this.getPageY(event),
                 positionY = pageY - drEl.eventMousedownY;
 
+            this.enableScroll();
             drEl.depElement = this.getDepElement(drEl.instance, positionY, this.draggableElement.originRow);
 
             drEl.instance.remove();
@@ -212,13 +199,8 @@ define([
 
             drEl.originRow.removeClass(this.draggableElementClass);
 
-            if (isTouchDevice) {
-                this.body.unbind('touchmove', this.mousemoveHandler);
-                this.body.unbind('touchend', this.mouseupHandler);
-            } else {
-                this.body.unbind('mousemove', this.mousemoveHandler);
-                this.body.unbind('mouseup', this.mouseupHandler);
-            }
+            this.body.unbind('mousemove touchmove', this.mousemoveHandler);
+            this.body.unbind('mouseup touchend', this.mouseupHandler);
 
             this.draggableElement = {};
         },
@@ -402,6 +384,55 @@ define([
                 index = _.isFunction(ctx.$index) ? ctx.$index() : ctx.$index;
 
             return this.recordsCache()[index];
+        },
+
+        /**
+         * Get correct page Y
+         *
+         * @param {Object} event - current event
+         * @returns {integer}
+         */
+        getPageY: function (event) {
+            var pageY;
+
+            if (event.type.indexOf('touch') >= 0) {
+                if (event.originalEvent.touches[0]) {
+                    pageY = event.originalEvent.touches[0].pageY;
+                } else {
+                    pageY = event.originalEvent.changedTouches[0].pageY;
+                }
+            } else {
+                pageY = event.pageY;
+            }
+
+            return pageY;
+        },
+
+        /**
+         * Disable page scrolling
+         */
+        disableScroll: function () {
+            document.body.addEventListener('touchmove', this.preventDefault, {
+                passive: false
+            });
+        },
+
+        /**
+         * Enable page scrolling
+         */
+        enableScroll: function () {
+            document.body.removeEventListener('touchmove', this.preventDefault, {
+                passive: false
+            });
+        },
+
+        /**
+         * Prevent default function
+         *
+         * @param {Object} event - event object
+         */
+        preventDefault: function (event) {
+            event.preventDefault();
         }
 
     });
diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js
index 27a32b04a7e1c..7e53bdd04cda7 100644
--- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js
+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js
@@ -33,6 +33,15 @@ define([
             }
         },
 
+        /**
+         * @inheritdoc
+         */
+        initialize: function () {
+            this.setToInsertData = _.debounce(this.setToInsertData, 200);
+
+            return this._super();
+        },
+
         /**
          * Calls 'initObservable' of parent
          *
diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js
index 54309ca068513..3987507ece54f 100644
--- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js
+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js
@@ -25,7 +25,7 @@ define([
             },
             listens: {
                 position: 'initPosition',
-                elems: 'setColumnVisibileListener'
+                elems: 'setColumnVisibleListener'
             },
             links: {
                 position: '${ $.name }.${ $.positionProvider }:value'
@@ -123,7 +123,7 @@ define([
         /**
          * Set column visibility listener
          */
-        setColumnVisibileListener: function () {
+        setColumnVisibleListener: function () {
             var elem = _.find(this.elems(), function (curElem) {
                 return !curElem.hasOwnProperty('visibleListener');
             });
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js b/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
index 6d33386fa1f1c..5f2fda830f5ba 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
@@ -162,6 +162,10 @@ define([
             }
 
             this.error(hasErrors || message);
+
+            if (hasErrors || message) {
+                this.open();
+            }
         },
 
         /**
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
index 3b1026e1d7fd4..beb9b339ff55c 100755
--- a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
@@ -57,6 +57,9 @@ define([
                 '${ $.provider }:${ $.customScope ? $.customScope + "." : ""}data.validate': 'validate',
                 'isUseDefault': 'toggleUseDefault'
             },
+            ignoreTmpls: {
+                value: true
+            },
 
             links: {
                 value: '${ $.provider }:${ $.dataScope }'
@@ -293,7 +296,7 @@ define([
                 this.validation[rule] = options;
             }
 
-            changed = utils.compare(rules, this.validation).equal;
+            changed = !utils.compare(rules, this.validation).equal;
 
             if (changed) {
                 this.required(!!rules['required-entry']);
@@ -405,6 +408,7 @@ define([
                 isValid = this.disabled() || !this.visible() || result.passed;
 
             this.error(message);
+            this.error.valueHasMutated();
             this.bubble('error', message);
 
             //TODO: Implement proper result propagation for form
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/country.js b/app/code/Magento/Ui/view/base/web/js/form/element/country.js
index f64a80bf535ec..c75301018e190 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/country.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/country.js
@@ -49,7 +49,7 @@ define([
 
             if (!this.value()) {
                 defaultCountry = _.filter(result, function (item) {
-                    return item['is_default'] && item['is_default'].includes(value);
+                    return item['is_default'] && _.contains(item['is_default'], value);
                 });
 
                 if (defaultCountry.length) {
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 586cc28b3abf1..802b0176cada2 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
@@ -167,12 +167,10 @@ define([
                 }
 
                 shiftedValue = shiftedValue.format(this.pickerDateTimeFormat);
-            } else {
-                shiftedValue = '';
-            }
 
-            if (shiftedValue !== this.shiftedValue()) {
-                this.shiftedValue(shiftedValue);
+                if (shiftedValue !== this.shiftedValue()) {
+                    this.shiftedValue(shiftedValue);
+                }
             }
         },
 
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 b81119f2bd5f3..1fbde3601cc18 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
@@ -13,8 +13,10 @@ define([
     'Magento_Ui/js/modal/alert',
     'Magento_Ui/js/lib/validation/validator',
     'Magento_Ui/js/form/element/abstract',
-    'jquery/file-uploader'
-], function ($, _, utils, uiAlert, validator, Element) {
+    'mage/translate',
+    'jquery/file-uploader',
+    'mage/adminhtml/tools'
+], function ($, _, utils, uiAlert, validator, Element, $t) {
     'use strict';
 
     return Element.extend({
@@ -328,6 +330,12 @@ define([
                 allowed  = this.isFileAllowed(file),
                 target   = $(e.target);
 
+            if (this.disabled()) {
+                this.notifyError($t('The file upload field is disabled.'));
+
+                return;
+            }
+
             if (allowed.passed) {
                 target.on('fileuploadsend', function (event, postData) {
                     postData.data.append('param_name', this.paramName);
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 911574a0fb438..1b6dd9f1c57ec 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
@@ -26,7 +26,7 @@ define([
         update: function (value) {
             var country = registry.get(this.parentName + '.' + 'country_id'),
                 options = country.indexedOptions,
-                option;
+                option = null;
 
             if (!value) {
                 return;
@@ -34,6 +34,10 @@ define([
 
             option = options[value];
 
+            if (!option) {
+                return;
+            }
+
             if (option['is_zipcode_optional']) {
                 this.error(false);
                 this.validation = _.omit(this.validation, 'required-entry');
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js b/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
index b8cd4a0f2c892..c3b9982c4972e 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js
@@ -18,16 +18,16 @@ define([
     return Abstract.extend({
         defaults: {
             elementSelector: 'textarea',
-            value: '',
+            suffixRegExpPattern: '${ $.wysiwygUniqueSuffix }',
             $wysiwygEditorButton: '',
             links: {
                 value: '${ $.provider }:${ $.dataScope }'
             },
             template: 'ui/form/field',
             elementTmpl: 'ui/form/element/wysiwyg',
-            content:        '',
-            showSpinner:    false,
-            loading:        false,
+            content: '',
+            showSpinner: false,
+            loading: false,
             listens: {
                 disabled: 'setDisabled'
             }
@@ -52,6 +52,26 @@ define([
             return this;
         },
 
+        /** @inheritdoc */
+        initConfig: function (config) {
+            var pattern = config.suffixRegExpPattern || this.constructor.defaults.suffixRegExpPattern;
+
+            pattern = pattern.replace(/\$/g, '\\$&');
+            config.content = config.content.replace(new RegExp(pattern, 'g'), this.getUniqueSuffix(config));
+            this._super();
+
+            return this;
+        },
+
+        /**
+         * Build unique id based on name, underscore separated.
+         *
+         * @param {Object} config
+         */
+        getUniqueSuffix: function (config) {
+            return config.name.replace(/(\.|-)/g, '_');
+        },
+
         /**
          *
          * @returns {exports}
@@ -92,7 +112,9 @@ define([
          * @param {Boolean} status
          */
         setDisabled: function (status) {
-            this.$wysiwygEditorButton.attr('disabled', status);
+            if (this.$wysiwygEditorButton) {
+                this.$wysiwygEditorButton.attr('disabled', status);
+            }
 
             /* eslint-disable no-undef */
             if (tinyMCE && tinyMCE.activeEditor) {
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js
index be7a1a13fbd61..c75f7797cf0f3 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js
@@ -11,8 +11,9 @@ define([
     'mageUtils',
     'uiRegistry',
     './column',
-    'Magento_Ui/js/modal/confirm'
-], function (_, utils, registry, Column, confirm) {
+    'Magento_Ui/js/modal/confirm',
+    'mage/dataPost'
+], function (_, utils, registry, Column, confirm, dataPost) {
     'use strict';
 
     return Column.extend({
@@ -267,7 +268,14 @@ define([
          * @param {Object} action - Action's data.
          */
         defaultCallback: function (actionIndex, recordId, action) {
-            window.location.href = action.href;
+            if (action.post) {
+                dataPost().postData({
+                    action: action.href,
+                    data: {}
+                });
+            } else {
+                window.location.href = action.href;
+            }
         },
 
         /**
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
index 18b3836113141..390aedf193b91 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
@@ -50,6 +50,9 @@ define([
                     }
                 }
             },
+            ignoreTmpls: {
+                data: true
+            },
             listens: {
                 elems: 'updateFields',
                 data: 'updateState'
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
index abd79e797e413..534d292809ed1 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/paging/paging.js
@@ -19,7 +19,8 @@ define([
         defaults: {
             template: 'ui/grid/paging/paging',
             totalTmpl: 'ui/grid/paging-total',
-            pageSize: 20,
+            totalRecords: 0,
+            pages: 1,
             current: 1,
             selectProvider: 'ns = ${ $.ns }, index = ids',
 
@@ -33,9 +34,9 @@ define([
             },
 
             imports: {
-                pageSize: '${ $.sizesConfig.name }:value',
                 totalSelected: '${ $.selectProvider }:totalSelected',
-                totalRecords: '${ $.provider }:data.totalRecords'
+                totalRecords: '${ $.provider }:data.totalRecords',
+                filters: '${ $.provider }:params.filters'
             },
 
             exports: {
@@ -43,6 +44,16 @@ define([
                 current: '${ $.provider }:params.paging.current'
             },
 
+            links: {
+                options: '${ $.sizesConfig.name }:options',
+                pageSize: '${ $.sizesConfig.name }:value'
+            },
+
+            statefull: {
+                pageSize: true,
+                current: true
+            },
+
             listens: {
                 'pages': 'onPagesChange',
                 'pageSize': 'onPageSizeChange',
@@ -173,7 +184,9 @@ define([
          * @returns {Paging} Chainable.
          */
         goFirst: function () {
-            this.current = 1;
+            if (!_.isUndefined(this.filters)) {
+                this.current = 1;
+            }
 
             return this;
         },
@@ -219,14 +232,12 @@ define([
         /**
          * Calculates new page cursor based on the
          * previous and current page size values.
-         *
-         * @returns {Number} Updated cursor value.
          */
         updateCursor: function () {
-            var cursor  = this.current - 1,
-                size    = this.pageSize,
-                oldSize = this.previousSize,
-                delta   = cursor * (oldSize  - size) / size;
+            var cursor = this.current - 1,
+                size = this.pageSize,
+                oldSize = _.isUndefined(this.previousSize) ? this.pageSize : this.previousSize,
+                delta = cursor * (oldSize - size) / size;
 
             delta = size > oldSize ?
                 Math.ceil(delta) :
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/paging/sizes.js b/app/code/Magento/Ui/view/base/web/js/grid/paging/sizes.js
index 4941eabbc4ee6..3af5c196173b8 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/paging/sizes.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/paging/sizes.js
@@ -17,31 +17,8 @@ define([
     return Element.extend({
         defaults: {
             template: 'ui/grid/paging/sizes',
-            value: 20,
             minSize: 1,
             maxSize: 999,
-            options: {
-                '20': {
-                    value: 20,
-                    label: 20
-                },
-                '30': {
-                    value: 30,
-                    label: 30
-                },
-                '50': {
-                    value: 50,
-                    label: 50
-                },
-                '100': {
-                    value: 100,
-                    label: 100
-                },
-                '200': {
-                    value: 200,
-                    label: 200
-                }
-            },
             statefull: {
                 options: true,
                 value: true
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/search/search.js b/app/code/Magento/Ui/view/base/web/js/grid/search/search.js
index fa445a2577adb..bb74b84541a57 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/search/search.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/search/search.js
@@ -11,14 +11,15 @@ define([
     'uiLayout',
     'mage/translate',
     'mageUtils',
-    'uiElement'
-], function (_, layout, $t, utils, Element) {
+    'uiElement',
+    'jquery'
+], function (_, layout, $t, utils, Element, $) {
     'use strict';
 
     return Element.extend({
         defaults: {
             template: 'ui/grid/search/search',
-            placeholder: $t('Search by keyword'),
+            placeholder: 'Search by keyword',
             label: $t('Keyword'),
             value: '',
             previews: [],
@@ -29,11 +30,13 @@ define([
             tracks: {
                 value: true,
                 previews: true,
-                inputValue: true
+                inputValue: true,
+                focused: true
             },
             imports: {
                 inputValue: 'value',
-                updatePreview: 'value'
+                updatePreview: 'value',
+                focused: false
             },
             exports: {
                 value: '${ $.provider }:params.search'
@@ -88,6 +91,18 @@ define([
             return this;
         },
 
+        /**
+         * Click To ScrollTop.
+         */
+        scrollTo: function ($data) {
+            $('html, body').animate({
+                scrollTop: 0
+            }, 'slow', function () {
+                $data.focused = false;
+                $data.focused = true;
+            });
+        },
+
         /**
          * Resets input value to the last applied state.
          *
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/bootstrap.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/bootstrap.js
index b29d10a143117..a266e282eac66 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/bootstrap.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/bootstrap.js
@@ -26,7 +26,7 @@ define(function (require) {
         mageInit:       require('./mage-init'),
         keyboard:       require('./keyboard'),
         optgroup:       require('./optgroup'),
-        aferRender:     require('./after-render'),
+        afterRender:     require('./after-render'),
         autoselect:     require('./autoselect'),
         datepicker:     require('./datepicker'),
         outerClick:     require('./outer_click'),
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/extender/bound-nodes.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/extender/bound-nodes.js
index a332b595bdf3c..6b3c437b90508 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/knockout/extender/bound-nodes.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/extender/bound-nodes.js
@@ -109,7 +109,7 @@ define([
     wrapper.extend(ko, {
 
         /**
-         * Extends kncokouts' 'applyBindings'
+         * Extends knockouts' 'applyBindings'
          * to track nodes associated with model.
          *
          * @param {Function} orig - Original 'applyBindings' method.
@@ -136,7 +136,7 @@ define([
         },
 
         /**
-         * Extends kncokouts' cleanNode
+         * Extends knockouts' cleanNode
          * to track nodes associated with model.
          *
          * @param {Function} orig - Original 'cleanNode' method.
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
index 8e59f9d290906..583df4742ecb9 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
@@ -691,6 +691,24 @@ define([
             },
             $.mage.__('The value is not within the specified range.')
         ],
+        'validate-positive-percent-decimal': [
+            function (value) {
+                var numValue;
+
+                if (utils.isEmptyNoTrim(value) || !/^\s*-?\d*(\.\d*)?\s*$/.test(value)) {
+                    return false;
+                }
+
+                numValue = utils.parseNumber(value);
+
+                if (isNaN(numValue)) {
+                    return false;
+                }
+
+                return utils.isBetween(numValue, 0.01, 100);
+            },
+            $.mage.__('Please enter a valid percentage discount value greater than 0.')
+        ],
         'validate-digits': [
             function (value) {
                 return utils.isEmptyNoTrim(value) || !/[^\d]/.test(value);
@@ -784,6 +802,14 @@ define([
             },
             $.mage.__('Please enter a valid date.')
         ],
+        'validate-date-range': [
+            function (value, params) {
+                var fromDate = $('input[name*="' + params + '"]').val();
+
+                return moment.utc(value).unix() >= moment.utc(fromDate).unix() || isNaN(moment.utc(value).unix());
+            },
+            $.mage.__('Make sure the To Date is later than or the same as the From Date.')
+        ],
         'validate-identifier': [
             function (value) {
                 return utils.isEmptyNoTrim(value) || /^[a-z0-9][a-z0-9_\/-]+(\.[a-z0-9_-]+)?$/.test(value);
@@ -901,12 +927,12 @@ define([
         ],
         'validate-per-page-value-list': [
             function (value) {
-                var isValid = utils.isEmpty(value),
+                var isValid = true,
                     values = value.split(','),
                     i;
 
-                if (isValid) {
-                    return true;
+                if (utils.isEmpty(value)) {
+                    return isValid;
                 }
 
                 for (i = 0; i < values.length; i++) {
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
index 31362644d415a..b7488cf994028 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js
@@ -48,6 +48,10 @@ define([
                 params :
                 [params];
 
+            if (typeof message === 'function') {
+                message = message.call(rule);
+            }
+
             message = params.reduce(function (msg, param, idx) {
                 return msg.replace(new RegExp('\\{' + idx + '\\}', 'g'), param);
             }, message);
diff --git a/app/code/Magento/Ui/view/base/web/js/modal/alert.js b/app/code/Magento/Ui/view/base/web/js/modal/alert.js
index 911d0e02578d2..b63294e3d8750 100644
--- a/app/code/Magento/Ui/view/base/web/js/modal/alert.js
+++ b/app/code/Magento/Ui/view/base/web/js/modal/alert.js
@@ -39,11 +39,18 @@ define([
             }]
         },
 
+        /**
+         * Create widget.
+         */
+        _create: function () {
+            this.options.actions.always();
+            this._super();
+        },
+
         /**
          * Close modal window.
          */
         closeModal: function () {
-            this.options.actions.always();
             this.element.bind('alertclosed', _.bind(this._remove, this));
 
             return this._super();
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/field.html b/app/code/Magento/Ui/view/base/web/templates/form/field.html
index ed84e158819a2..376f165279f5d 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/field.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/field.html
@@ -8,8 +8,8 @@
      visible="visible"
      css="$data.additionalClasses"
      attr="'data-index': index">
-    <div class="admin__field-label">
-        <label if="$data.label" visible="$data.labelVisible"  attr="for: uid">
+    <div class="admin__field-label" if="$data.label" visible="$data.labelVisible" >
+        <label attr="for: uid">
             <span translate="label" attr="'data-config-scope': $data.scopeLabel" />
         </label>
     </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html
index 3ef64fd4b5371..36a3232c3e61a 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html
@@ -6,7 +6,7 @@
 -->
 <div class="admin__action-dropdown-wrap admin__data-grid-action-bookmarks" collapsible>
     <button class="admin__action-dropdown" type="button" toggleCollapsible>
-        <span class="admin__action-dropdown-text" text="activeView.label"/>
+        <span class="admin__action-dropdown-text" translate="activeView.label"/>
     </button>
     <ul class="admin__action-dropdown-menu">
         <repeat args="foreach: viewsArray, item: '$view'">
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html
index b52669e2cd28d..521ce9fc806ac 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html
@@ -30,7 +30,7 @@
 </div>
 
 <div class="action-dropdown-menu-item">
-    <a href="" class="action-dropdown-menu-link" text="$view().label" click="applyView.bind($data, $view().index)" closeCollapsible/>
+    <a href="" class="action-dropdown-menu-link" translate="$view().label" click="applyView.bind($data, $view().index)" closeCollapsible/>
 
     <div class="action-dropdown-menu-item-actions" if="$view().editable">
         <button class="action-edit" type="button" attr="title: $t('Edit bookmark')" click="editView.bind($data, $view().index)">
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select-optgroup.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select-optgroup.html
index 56244422a6b43..1ad0e7505ec9d 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select-optgroup.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select-optgroup.html
@@ -19,7 +19,7 @@
                 css: {
                     _selected: $parent.root.isSelected(option.value),
                     _hover: $parent.root.isHovered(option, $element),
-                    _expended: $parent.root.getLevelVisibility($data),
+                    _expended: $parent.root.getLevelVisibility($data) || $data.visible,
                     _unclickable: $parent.root.isLabelDecoration($data),
                     _last: $parent.root.addLastElement($data),
                     '_with-checkbox': $parent.root.showCheckbox
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html
index 4038f65738041..0411063c11512 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html
@@ -36,7 +36,7 @@
             class="action-select admin__action-multiselect"
             data-role="advanced-select"
             data-bind="
-            css: {_active: multiselectFocus},
+            css: {_active: listVisible},
             click: function(data, event) {
                 toggleListVisible(data, event)
             }
@@ -52,7 +52,7 @@
             class="action-select admin__action-multiselect"
             data-role="advanced-select"
             data-bind="
-            css: {_active: multiselectFocus},
+            css: {_active: listVisible},
             click: function(data, event) {
                 toggleListVisible(data, event)
             }
@@ -125,12 +125,13 @@
                         css: {
                             _selected: $parent.isSelected(option.value),
                             _hover: $parent.isHovered(option, $element),
-                            _expended: $parent.getLevelVisibility($data),
+                            _expended: $parent.getLevelVisibility($data) && $parent.showLevels($data),
                             _unclickable: $parent.isLabelDecoration($data),
                             _last: $parent.addLastElement($data),
                             '_with-checkbox': $parent.showCheckbox
                         },
                         click: function(data, event){
+                            $parent.showLevels($data);
                             $parent.toggleOptionSelected($data, $index(), event);
                         },
                         clickBubble: false
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html b/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html
index 39d996e05c3a6..fcad729a95fbb 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html
@@ -5,16 +5,18 @@
  */
 -->
 <div class="data-grid-search-control-wrap">
-    <label class="data-grid-search-label" attr="title: $t('Search'), for: index">
+    <label class="data-grid-search-label" attr="title: $t('Search'), for: index" data-bind="click: scrollTo">
         <span translate="'Search'"/>
     </label>
     <input class="admin__control-text data-grid-search-control" type="text"
             data-bind="
+                i18n: placeholder,
                 attr: {
                     id: index,
-                    placeholder: placeholder
+                    placeholder: $t(placeholder)
                 },
                 textInput: inputValue,
+                hasFocus: focused,
                 keyboard: {
                     13: apply.bind($data, false),
                     27: cancel
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html b/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
index c5d87a4b16c4e..610d78e00b81d 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
@@ -6,7 +6,7 @@
 -->
 <ul class="action-submenu" each="data: action.actions, as: 'action'" css="_active: action.visible">
     <li css="_visible: $data.visible">
-        <span class="action-menu-item" text="label" click="$parent.applyAction.bind($parent, type)"/>
+        <span class="action-menu-item" translate="label" click="$parent.applyAction.bind($parent, type)"/>
         <render args="name: $parent.submenuTemplate, data: $parent" if="$data.actions"/>
     </li>
 </ul>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html b/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
index 1aeb48b7c7698..d11d4aa243737 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
@@ -11,7 +11,7 @@
     <div class="action-menu-items">
         <ul class="action-menu" each="data: actions, as: 'action'" css="_active: opened">
             <li css="_visible: $data.visible, _parent: $data.actions">
-                <span class="action-menu-item" text="label" click="$parent.applyAction.bind($parent, type)"/>
+                <span class="action-menu-item" translate="label" click="$parent.applyAction.bind($parent, type)"/>
                 <render args="name: $parent.submenuTemplate, data: $parent" if="$data.actions"/>
             </li>
         </ul>
diff --git a/app/code/Magento/Ui/view/base/web/templates/group/group.html b/app/code/Magento/Ui/view/base/web/templates/group/group.html
index e30ac7a377542..6d6e61b805d62 100644
--- a/app/code/Magento/Ui/view/base/web/templates/group/group.html
+++ b/app/code/Magento/Ui/view/base/web/templates/group/group.html
@@ -8,10 +8,11 @@
           visible="visible"
           css="_required: required"
           attr="'data-index': index">
-    <legend class="admin__field-label" if="showLabel">
-        <span translate="label" attr="'data-config-scope': $data.scopeLabel"/>
-    </legend>
-
+    <div if="showLabel" class="admin__field-label">
+        <legend>
+            <span translate="label" attr="'data-config-scope': $data.scopeLabel"/>
+        </legend>
+    </div>
     <div class="admin__field-control" css="$data.additionalClasses">
         <each args="elems">
             <if args="visible()" if="!$data.additionalForGroup">
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index 018302bd51fc2..89ba9721ba1f2 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 namespace Magento\Ups\Model;
 
 use Magento\Framework\HTTP\ClientFactory;
@@ -79,7 +76,7 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
      *
      * @var string
      */
-    protected $_defaultCgiGatewayUrl = 'http://www.ups.com:80/using/services/rave/qcostcgi.cgi';
+    protected $_defaultCgiGatewayUrl = 'https://www.ups.com/using/services/rave/qcostcgi.cgi';
 
     /**
      * Test urls for shipment
@@ -323,8 +320,9 @@ public function setRequest(RateRequest $request)
         }
 
         //for UPS, puero rico state for US will assume as puerto rico country
-        if ($destCountry == self::USA_COUNTRY_ID && ($request->getDestPostcode() == '00912' ||
-                $request->getDestRegionCode() == self::PUERTORICO_COUNTRY_ID)
+        if ($destCountry == self::USA_COUNTRY_ID
+            && ($request->getDestPostcode() == '00912'
+                || $request->getDestRegionCode() == self::PUERTORICO_COUNTRY_ID)
         ) {
             $destCountry = self::PUERTORICO_COUNTRY_ID;
         }
@@ -334,6 +332,14 @@ public function setRequest(RateRequest $request)
             $destCountry = self::GUAM_COUNTRY_ID;
         }
 
+        // For UPS, Las Palmas and Santa Cruz de Tenerife will be represented by Canary Islands country
+        if ($destCountry == self::SPAIN_COUNTRY_ID
+            && ($request->getDestRegionCode() == self::LAS_PALMAS_REGION_ID
+                || $request->getDestRegionCode() == self::SANTA_CRUZ_DE_TENERIFE_REGION_ID)
+        ) {
+            $destCountry = self::CANARY_ISLANDS_COUNTRY_ID;
+        }
+
         $country = $this->_countryFactory->create()->load($destCountry);
         $rowRequest->setDestCountry($country->getData('iso2_code') ?: $destCountry);
 
@@ -448,7 +454,7 @@ protected function _getCgiQuotes()
     {
         $rowRequest = $this->_rawRequest;
         if (self::USA_COUNTRY_ID == $rowRequest->getDestCountry()) {
-            $destPostal = substr($rowRequest->getDestPostal(), 0, 5);
+            $destPostal = substr((string)$rowRequest->getDestPostal(), 0, 5);
         } else {
             $destPostal = $rowRequest->getDestPostal();
         }
@@ -466,7 +472,7 @@ protected function _getCgiQuotes()
             '47_rate_chart' => $rowRequest->getPickup(),
             '48_container' => $rowRequest->getContainer(),
             '49_residential' => $rowRequest->getDestType(),
-            'weight_std' => strtolower($rowRequest->getUnitMeasure()),
+            'weight_std' => strtolower((string)$rowRequest->getUnitMeasure()),
         ];
         $params['47_rate_chart'] = $params['47_rate_chart']['label'];
 
@@ -480,14 +486,14 @@ protected function _getCgiQuotes()
                 }
                 $client = new \Zend_Http_Client();
                 $client->setUri($url);
-                $client->setConfig(['maxredirects' => 0, 'timeout' => 30]);
+                $client->setConfig(['maxredirects' => 2, 'timeout' => 30]);
                 $client->setParameterGet($params);
                 $response = $client->request();
                 $responseBody = $response->getBody();
 
                 $debugData['result'] = $responseBody;
                 $this->_setCachedQuotes($params, $responseBody);
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
                 $responseBody = '';
             }
@@ -530,7 +536,7 @@ protected function _parseCgiResponse($response)
         $priceArr = [];
         if (strlen(trim($response)) > 0) {
             $rRows = explode("\n", $response);
-            $allowedMethods = explode(",", $this->getConfigData('allowed_methods'));
+            $allowedMethods = explode(",", (string)$this->getConfigData('allowed_methods'));
             foreach ($rRows as $rRow) {
                 $row = explode('%', $rRow);
                 switch (substr($row[0], -1)) {
@@ -606,7 +612,7 @@ protected function _getXmlQuotes()
 
         $rowRequest = $this->_rawRequest;
         if (self::USA_COUNTRY_ID == $rowRequest->getDestCountry()) {
-            $destPostal = substr($rowRequest->getDestPostal(), 0, 5);
+            $destPostal = substr((string)$rowRequest->getDestPostal(), 0, 5);
         } else {
             $destPostal = $rowRequest->getDestPostal();
         }
@@ -632,7 +638,7 @@ protected function _getXmlQuotes()
             $serviceCode = null;
         } else {
             $params['10_action'] = 'Rate';
-            $serviceCode = $rowRequest->getProduct() ? $rowRequest->getProduct() : '';
+            $serviceCode = $rowRequest->getProduct() ? $rowRequest->getProduct() : null;
         }
         $serviceDescription = $serviceCode ? $this->getShipmentByCode($serviceCode) : '';
 
@@ -666,8 +672,8 @@ protected function _getXmlQuotes()
       <Shipper>
 XMLRequest;
 
-        if ($this->getConfigFlag('negotiated_active') && ($shipper = $this->getConfigData('shipper_number'))) {
-            $xmlParams .= "<ShipperNumber>{$shipper}</ShipperNumber>";
+        if ($this->getConfigFlag('negotiated_active') && ($shipperNumber = $this->getConfigData('shipper_number'))) {
+            $xmlParams .= "<ShipperNumber>{$shipperNumber}</ShipperNumber>";
         }
 
         if ($rowRequest->getIsReturn()) {
@@ -690,6 +696,7 @@ protected function _getXmlQuotes()
           <StateProvinceCode>{$shipperStateProvince}</StateProvinceCode>
       </Address>
     </Shipper>
+    
     <ShipTo>
       <Address>
           <PostalCode>{$params['19_destPostal']}</PostalCode>
@@ -705,8 +712,7 @@ protected function _getXmlQuotes()
         $xmlParams .= <<<XMLRequest
       </Address>
     </ShipTo>
-
-
+    
     <ShipFrom>
       <Address>
           <PostalCode>{$params['15_origPostal']}</PostalCode>
@@ -716,9 +722,13 @@ protected function _getXmlQuotes()
     </ShipFrom>
 
     <Package>
-      <PackagingType><Code>{$params['48_container']}</Code></PackagingType>
+      <PackagingType>
+        <Code>{$params['48_container']}</Code>
+      </PackagingType>
       <PackageWeight>
-         <UnitOfMeasurement><Code>{$rowRequest->getUnitMeasure()}</Code></UnitOfMeasurement>
+        <UnitOfMeasurement>
+          <Code>{$rowRequest->getUnitMeasure()}</Code>
+        </UnitOfMeasurement>
         <Weight>{$params['23_weight']}</Weight>
       </PackageWeight>
     </Package>
@@ -732,8 +742,8 @@ protected function _getXmlQuotes()
         }
 
         $xmlParams .= <<<XMLRequest
-  </Shipment>
-</RatingServiceSelectionRequest>
+      </Shipment>
+    </RatingServiceSelectionRequest>
 XMLRequest;
 
         $xmlRequest .= $xmlParams;
@@ -747,7 +757,7 @@ protected function _getXmlQuotes()
                 $xmlResponse = $client->getBody();
                 $debugData['result'] = $xmlResponse;
                 $this->_setCachedQuotes($xmlRequest, $xmlResponse);
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
                 $xmlResponse = '';
             }
@@ -812,81 +822,30 @@ protected function _parseXmlResponse($xmlResponse)
             $success = (int)$arr[0];
             if ($success === 1) {
                 $arr = $xml->getXpath("//RatingServiceSelectionResponse/RatedShipment");
-                $allowedMethods = explode(",", $this->getConfigData('allowed_methods'));
+                $allowedMethods = explode(",", (string)$this->getConfigData('allowed_methods'));
 
                 // Negotiated rates
                 $negotiatedArr = $xml->getXpath("//RatingServiceSelectionResponse/RatedShipment/NegotiatedRates");
-                $negotiatedActive = $this->getConfigFlag(
-                        'negotiated_active'
-                    ) && $this->getConfigData(
-                        'shipper_number'
-                    ) && !empty($negotiatedArr);
+                $negotiatedActive = $this->getConfigFlag('negotiated_active')
+                    && $this->getConfigData('shipper_number')
+                    && !empty($negotiatedArr);
 
                 $allowedCurrencies = $this->_currencyFactory->create()->getConfigAllowCurrencies();
+                $errorTitle = '';
                 foreach ($arr as $shipElement) {
-                    $code = (string)$shipElement->Service->Code;
-                    if (in_array($code, $allowedMethods)) {
-                        //The location of tax information is in a different place depending on whether we are using negotiated rates or not
-                        if ($negotiatedActive) {
-                            $includeTaxesArr = $xml->getXpath("//RatingServiceSelectionResponse/RatedShipment/NegotiatedRates/NetSummaryCharges/TotalChargesWithTaxes");
-                            $includeTaxesActive = $this->getConfigFlag(
-                                    'include_taxes'
-                                ) && !empty($includeTaxesArr);
-                            if ($includeTaxesActive) {
-                                $cost = $shipElement->NegotiatedRates->NetSummaryCharges->TotalChargesWithTaxes->MonetaryValue;
-                                $responseCurrencyCode = $this->mapCurrencyCode(
-                                    (string)$shipElement->NegotiatedRates->NetSummaryCharges->TotalChargesWithTaxes->CurrencyCode
-                                );
-                            }
-                            else {
-                                $cost = $shipElement->NegotiatedRates->NetSummaryCharges->GrandTotal->MonetaryValue;                            
-                                $responseCurrencyCode = $this->mapCurrencyCode(
-                                    (string)$shipElement->NegotiatedRates->NetSummaryCharges->GrandTotal->CurrencyCode
-                                );
-                            }
-                        } else {
-                            $includeTaxesArr = $xml->getXpath("//RatingServiceSelectionResponse/RatedShipment/TotalChargesWithTaxes");
-                            $includeTaxesActive = $this->getConfigFlag(
-                                    'include_taxes'
-                                ) && !empty($includeTaxesArr);                              
-                            if ($includeTaxesActive) {
-                                $cost = $shipElement->TotalChargesWithTaxes->MonetaryValue;
-                                $responseCurrencyCode = $this->mapCurrencyCode(
-                                    (string)$shipElement->TotalChargesWithTaxes->CurrencyCode
-                                );
-                            }
-                            else {
-                                $cost = $shipElement->TotalCharges->MonetaryValue;                            
-                                $responseCurrencyCode = $this->mapCurrencyCode(
-                                    (string)$shipElement->TotalCharges->CurrencyCode
-                                );
-                            }
-                        }
-
-                        //convert price with Origin country currency code to base currency code
-                        $successConversion = true;
-                        if ($responseCurrencyCode) {
-                            if (in_array($responseCurrencyCode, $allowedCurrencies)) {
-                                $cost = (double)$cost * $this->_getBaseCurrencyRate($responseCurrencyCode);
-                            } else {
-                                $errorTitle = __(
-                                    'We can\'t convert a rate from "%1-%2".',
-                                    $responseCurrencyCode,
-                                    $this->_request->getPackageCurrency()->getCode()
-                                );
-                                $error = $this->_rateErrorFactory->create();
-                                $error->setCarrier('ups');
-                                $error->setCarrierTitle($this->getConfigData('title'));
-                                $error->setErrorMessage($errorTitle);
-                                $successConversion = false;
-                            }
-                        }
-
-                        if ($successConversion) {
-                            $costArr[$code] = $cost;
-                            $priceArr[$code] = $this->getMethodPrice((float)$cost, $code);
-                        }
-                    }
+                    $this->processShippingRateForItem(
+                        $shipElement,
+                        $allowedMethods,
+                        $allowedCurrencies,
+                        $costArr,
+                        $priceArr,
+                        $negotiatedActive,
+                        $xml,
+                        $errorTitle
+                    );
+                }
+                if (empty($errorTitle)) {
+                    unset($errorTitle);
                 }
             } else {
                 $arr = $xml->getXpath("//RatingServiceSelectionResponse/Response/Error/ErrorDescription/text()");
@@ -904,10 +863,13 @@ protected function _parseXmlResponse($xmlResponse)
             $error = $this->_rateErrorFactory->create();
             $error->setCarrier('ups');
             $error->setCarrierTitle($this->getConfigData('title'));
+            if (!empty($this->getConfigData('specificerrmsg'))) {
+                $errorTitle = $this->getConfigData('specificerrmsg');
+            }
             if (!isset($errorTitle)) {
                 $errorTitle = __('Cannot retrieve shipping rates');
             }
-            $error->setErrorMessage($this->getConfigData('specificerrmsg'));
+            $error->setErrorMessage($errorTitle);
             $result->append($error);
         } else {
             foreach ($priceArr as $method => $price) {
@@ -926,6 +888,102 @@ protected function _parseXmlResponse($xmlResponse)
         return $result;
     }
 
+    /**
+     * Processing rate for ship element
+     *
+     * @param \Magento\Framework\Simplexml\Element $shipElement
+     * @param array $allowedMethods
+     * @param array $allowedCurrencies
+     * @param array $costArr
+     * @param array $priceArr
+     * @param bool $negotiatedActive
+     * @param \Magento\Framework\Simplexml\Config $xml
+     * @param string $errorTitle
+     * @return void
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    private function processShippingRateForItem(
+        \Magento\Framework\Simplexml\Element $shipElement,
+        array $allowedMethods,
+        array $allowedCurrencies,
+        array &$costArr,
+        array &$priceArr,
+        bool $negotiatedActive,
+        \Magento\Framework\Simplexml\Config $xml,
+        string &$errorTitle
+    ) {
+        $code = (string)$shipElement->Service->Code;
+        if (in_array($code, $allowedMethods)) {
+            //The location of tax information is in a different place
+            // depending on whether we are using negotiated rates or not
+            if ($negotiatedActive) {
+                $includeTaxesArr = $xml->getXpath(
+                    "//RatingServiceSelectionResponse/RatedShipment/NegotiatedRates"
+                    . "/NetSummaryCharges/TotalChargesWithTaxes"
+                );
+                $includeTaxesActive = $this->getConfigFlag('include_taxes') && !empty($includeTaxesArr);
+                if ($includeTaxesActive) {
+                    $cost = $shipElement->NegotiatedRates
+                        ->NetSummaryCharges
+                        ->TotalChargesWithTaxes
+                        ->MonetaryValue;
+
+                    $responseCurrencyCode = $this->mapCurrencyCode(
+                        (string)$shipElement->NegotiatedRates
+                            ->NetSummaryCharges
+                            ->TotalChargesWithTaxes
+                            ->CurrencyCode
+                    );
+                } else {
+                    $cost = $shipElement->NegotiatedRates->NetSummaryCharges->GrandTotal->MonetaryValue;
+                    $responseCurrencyCode = $this->mapCurrencyCode(
+                        (string)$shipElement->NegotiatedRates->NetSummaryCharges->GrandTotal->CurrencyCode
+                    );
+                }
+            } else {
+                $includeTaxesArr = $xml->getXpath(
+                    "//RatingServiceSelectionResponse/RatedShipment/TotalChargesWithTaxes"
+                );
+                $includeTaxesActive = $this->getConfigFlag('include_taxes') && !empty($includeTaxesArr);
+                if ($includeTaxesActive) {
+                    $cost = $shipElement->TotalChargesWithTaxes->MonetaryValue;
+                    $responseCurrencyCode = $this->mapCurrencyCode(
+                        (string)$shipElement->TotalChargesWithTaxes->CurrencyCode
+                    );
+                } else {
+                    $cost = $shipElement->TotalCharges->MonetaryValue;
+                    $responseCurrencyCode = $this->mapCurrencyCode(
+                        (string)$shipElement->TotalCharges->CurrencyCode
+                    );
+                }
+            }
+
+            //convert price with Origin country currency code to base currency code
+            $successConversion = true;
+            if ($responseCurrencyCode) {
+                if (in_array($responseCurrencyCode, $allowedCurrencies)) {
+                    $cost = (double)$cost * $this->_getBaseCurrencyRate($responseCurrencyCode);
+                } else {
+                    $errorTitle = __(
+                        'We can\'t convert a rate from "%1-%2".',
+                        $responseCurrencyCode,
+                        $this->_request->getPackageCurrency()->getCode()
+                    );
+                    $error = $this->_rateErrorFactory->create();
+                    $error->setCarrier('ups');
+                    $error->setCarrierTitle($this->getConfigData('title'));
+                    $error->setErrorMessage($errorTitle);
+                    $successConversion = false;
+                }
+            }
+
+            if ($successConversion) {
+                $costArr[$code] = $cost;
+                $priceArr[$code] = $this->getMethodPrice((float)$cost, $code);
+            }
+        }
+    }
+
     /**
      * Get tracking
      *
@@ -1010,28 +1068,27 @@ protected function _getXmlTracking($trackings)
         $url = $this->getConfigData('tracking_xml_url');
 
         foreach ($trackings as $tracking) {
-
             /**
-             * RequestOption==>'activity' or '1' to request all activities
+             * RequestOption==>'1' to request all activities
              */
             $xmlRequest = <<<XMLAuth
 <?xml version="1.0" ?>
 <TrackRequest xml:lang="en-US">
     <Request>
         <RequestAction>Track</RequestAction>
-        <RequestOption>activity</RequestOption>
+        <RequestOption>1</RequestOption>
     </Request>
     <TrackingNumber>$tracking</TrackingNumber>
     <IncludeFreight>01</IncludeFreight>
 </TrackRequest>
 XMLAuth;
-            $debugData['request'] = parent::filterDebugData($this->_xmlAccessRequest) . $xmlRequest;
+            $debugData['request'] = $this->filterDebugData($this->_xmlAccessRequest) . $xmlRequest;
             try {
                 $client = $this->httpClientFactory->create();
                 $client->post($url, $this->_xmlAccessRequest . $xmlRequest);
                 $xmlResponse = $client->getBody();
                 $debugData['result'] = $xmlResponse;
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
                 $xmlResponse = '';
             }
@@ -1056,7 +1113,6 @@ protected function _parseXmlTrackingResponse($trackingValue, $xmlResponse)
     {
         $errorTitle = 'For some reason we can\'t retrieve tracking info right now.';
         $resultArr = [];
-        $packageProgress = [];
 
         if ($xmlResponse) {
             $xml = new \Magento\Framework\Simplexml\Config();
@@ -1082,57 +1138,11 @@ protected function _parseXmlTrackingResponse($trackingValue, $xmlResponse)
                 $activityTags = $xml->getXpath("//TrackResponse/Shipment/Package/Activity");
                 if ($activityTags) {
                     $index = 1;
+                    $resultArr['progressdetail'] = [];
                     foreach ($activityTags as $activityTag) {
-                        $addArr = [];
-                        if (isset($activityTag->ActivityLocation->Address->City)) {
-                            $addArr[] = (string)$activityTag->ActivityLocation->Address->City;
-                        }
-                        if (isset($activityTag->ActivityLocation->Address->StateProvinceCode)) {
-                            $addArr[] = (string)$activityTag->ActivityLocation->Address->StateProvinceCode;
-                        }
-                        if (isset($activityTag->ActivityLocation->Address->CountryCode)) {
-                            $addArr[] = (string)$activityTag->ActivityLocation->Address->CountryCode;
-                        }
-                        $dateArr = [];
-                        $date = (string)$activityTag->Date;
-                        //YYYYMMDD
-                        $dateArr[] = substr($date, 0, 4);
-                        $dateArr[] = substr($date, 4, 2);
-                        $dateArr[] = substr($date, -2, 2);
-
-                        $timeArr = [];
-                        $time = (string)$activityTag->Time;
-                        //HHMMSS
-                        $timeArr[] = substr($time, 0, 2);
-                        $timeArr[] = substr($time, 2, 2);
-                        $timeArr[] = substr($time, -2, 2);
-
-                        if ($index === 1) {
-                            $resultArr['status'] = (string)$activityTag->Status->StatusType->Description;
-                            $resultArr['deliverydate'] = implode('-', $dateArr);
-                            //YYYY-MM-DD
-                            $resultArr['deliverytime'] = implode(':', $timeArr);
-                            //HH:MM:SS
-                            $resultArr['deliverylocation'] = (string)$activityTag->ActivityLocation->Description;
-                            $resultArr['signedby'] = (string)$activityTag->ActivityLocation->SignedForByName;
-                            if ($addArr) {
-                                $resultArr['deliveryto'] = implode(', ', $addArr);
-                            }
-                        } else {
-                            $tempArr = [];
-                            $tempArr['activity'] = (string)$activityTag->Status->StatusType->Description;
-                            $tempArr['deliverydate'] = implode('-', $dateArr);
-                            //YYYY-MM-DD
-                            $tempArr['deliverytime'] = implode(':', $timeArr);
-                            //HH:MM:SS
-                            if ($addArr) {
-                                $tempArr['deliverylocation'] = implode(', ', $addArr);
-                            }
-                            $packageProgress[] = $tempArr;
-                        }
+                        $this->processActivityTagInfo($activityTag, $index, $resultArr);
                         $index++;
                     }
-                    $resultArr['progressdetail'] = $packageProgress;
                 }
             } else {
                 $arr = $xml->getXpath("//TrackResponse/Response/Error/ErrorDescription/text()");
@@ -1163,6 +1173,68 @@ protected function _parseXmlTrackingResponse($trackingValue, $xmlResponse)
         return $this->_result;
     }
 
+    /**
+     * Process tracking info from activity tag
+     *
+     * @param \Magento\Framework\Simplexml\Element $activityTag
+     * @param int $index
+     * @param array $resultArr
+     * @return void
+     */
+    private function processActivityTagInfo(
+        \Magento\Framework\Simplexml\Element $activityTag,
+        int $index,
+        array &$resultArr
+    ) {
+        $addressArr = [];
+        if (isset($activityTag->ActivityLocation->Address->City)) {
+            $addressArr[] = (string)$activityTag->ActivityLocation->Address->City;
+        }
+        if (isset($activityTag->ActivityLocation->Address->StateProvinceCode)) {
+            $addressArr[] = (string)$activityTag->ActivityLocation->Address->StateProvinceCode;
+        }
+        if (isset($activityTag->ActivityLocation->Address->CountryCode)) {
+            $addressArr[] = (string)$activityTag->ActivityLocation->Address->CountryCode;
+        }
+        $dateArr = [];
+        $date = (string)$activityTag->Date;
+        //YYYYMMDD
+        $dateArr[] = substr($date, 0, 4);
+        $dateArr[] = substr($date, 4, 2);
+        $dateArr[] = substr($date, -2, 2);
+
+        $timeArr = [];
+        $time = (string)$activityTag->Time;
+        //HHMMSS
+        $timeArr[] = substr($time, 0, 2);
+        $timeArr[] = substr($time, 2, 2);
+        $timeArr[] = substr($time, -2, 2);
+
+        if ($index === 1) {
+            $resultArr['status'] = (string)$activityTag->Status->StatusType->Description;
+            $resultArr['deliverydate'] = implode('-', $dateArr);
+            //YYYY-MM-DD
+            $resultArr['deliverytime'] = implode(':', $timeArr);
+            //HH:MM:SS
+            $resultArr['deliverylocation'] = (string)$activityTag->ActivityLocation->Description;
+            $resultArr['signedby'] = (string)$activityTag->ActivityLocation->SignedForByName;
+            if ($addressArr) {
+                $resultArr['deliveryto'] = implode(', ', $addressArr);
+            }
+        } else {
+            $tempArr = [];
+            $tempArr['activity'] = (string)$activityTag->Status->StatusType->Description;
+            $tempArr['deliverydate'] = implode('-', $dateArr);
+            //YYYY-MM-DD
+            $tempArr['deliverytime'] = implode(':', $timeArr);
+            //HH:MM:SS
+            if ($addressArr) {
+                $tempArr['deliverylocation'] = implode(', ', $addressArr);
+            }
+            $resultArr['progressdetail'][] = $tempArr;
+        }
+    }
+
     /**
      * Get tracking response
      *
@@ -1200,7 +1272,7 @@ public function getResponse()
      */
     public function getAllowedMethods()
     {
-        $allowed = explode(',', $this->getConfigData('allowed_methods'));
+        $allowed = explode(',', (string)$this->getConfigData('allowed_methods'));
         $arr = [];
         $isByCode = $this->getConfigData('type') == 'UPS_XML';
         foreach ($allowed as $code) {
@@ -1359,11 +1431,8 @@ protected function _formShipmentRequest(\Magento\Framework\DataObject $request)
         }
 
         // ups support reference number only for domestic service
-        if ($this->_isUSCountry(
-                $request->getRecipientAddressCountryCode()
-            ) && $this->_isUSCountry(
-                $request->getShipperAddressCountryCode()
-            )
+        if ($this->_isUSCountry($request->getRecipientAddressCountryCode())
+            && $this->_isUSCountry($request->getShipperAddressCountryCode())
         ) {
             if ($request->getReferenceData()) {
                 $referenceData = $request->getReferenceData() . $request->getPackageId();
@@ -1392,7 +1461,7 @@ protected function _formShipmentRequest(\Magento\Framework\DataObject $request)
                 default:
                     break;
             }
-            if (!is_null($serviceOptionsNode)) {
+            if ($serviceOptionsNode !== null) {
                 $serviceOptionsNode->addChild(
                     'DeliveryConfirmation'
                 )->addChild(
@@ -1407,10 +1476,10 @@ protected function _formShipmentRequest(\Magento\Framework\DataObject $request)
             ->addChild('BillShipper')
             ->addChild('AccountNumber', $this->getConfigData('shipper_number'));
 
-        if ($request->getPackagingType() != $this->configHelper->getCode('container', 'ULE') &&
-            $request->getShipperAddressCountryCode() == self::USA_COUNTRY_ID &&
-            ($request->getRecipientAddressCountryCode() == 'CA' ||
-                $request->getRecipientAddressCountryCode() == 'PR')
+        if ($request->getPackagingType() != $this->configHelper->getCode('container', 'ULE')
+            && $request->getShipperAddressCountryCode() == self::USA_COUNTRY_ID
+            && ($request->getRecipientAddressCountryCode() == 'CA'
+                || $request->getRecipientAddressCountryCode() == 'PR')
         ) {
             $invoiceLineTotalPart = $shipmentPart->addChild('InvoiceLineTotal');
             $invoiceLineTotalPart->addChild('CurrencyCode', $request->getBaseCurrencyCode());
@@ -1438,7 +1507,7 @@ protected function _sendShipmentAcceptRequest(Element $shipmentConfirmResponse)
         $request = $xmlRequest->addChild('Request');
         $request->addChild('RequestAction', 'ShipAccept');
         $xmlRequest->addChild('ShipmentDigest', $shipmentConfirmResponse->ShipmentDigest);
-        $debugData = ['request' => parent::filterDebugData($this->_xmlAccessRequest) . $xmlRequest->asXML()];
+        $debugData = ['request' => $this->filterDebugData($this->_xmlAccessRequest) . $xmlRequest->asXML()];
 
         try {
             $client = $this->httpClientFactory->create();
@@ -1446,14 +1515,14 @@ protected function _sendShipmentAcceptRequest(Element $shipmentConfirmResponse)
             $xmlResponse = $client->getBody();
             $debugData['result'] = $xmlResponse;
             $this->_setCachedQuotes($xmlRequest, $xmlResponse);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
             $xmlResponse = '';
         }
 
         try {
             $response = $this->_xmlElFactory->create(['data' => $xmlResponse]);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
         }
 
@@ -1464,6 +1533,7 @@ protected function _sendShipmentAcceptRequest(Element $shipmentConfirmResponse)
             $shippingLabelContent = (string)$response->ShipmentResults->PackageResults->LabelImage->GraphicImage;
             $trackingNumber = (string)$response->ShipmentResults->PackageResults->TrackingNumber;
 
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $result->setShippingLabelContent(base64_decode($shippingLabelContent));
             $result->setTrackingNumber($trackingNumber);
         }
@@ -1494,7 +1564,6 @@ public function getShipAcceptUrl()
      *
      * @param \Magento\Framework\DataObject $request
      * @return \Magento\Framework\DataObject
-     * @throws \Exception
      */
     protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
     {
@@ -1506,7 +1575,7 @@ protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
         $xmlResponse = $this->_getCachedQuotes($xmlRequest);
 
         if ($xmlResponse === null) {
-            $debugData['request'] = parent::filterDebugData($this->_xmlAccessRequest) . $rawXmlRequest;
+            $debugData['request'] = $this->filterDebugData($this->_xmlAccessRequest) . $rawXmlRequest;
             $url = $this->getShipConfirmUrl();
             $client = $this->httpClientFactory->create();
             try {
@@ -1514,23 +1583,20 @@ protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
                 $xmlResponse = $client->getBody();
                 $debugData['result'] = $xmlResponse;
                 $this->_setCachedQuotes($xmlRequest, $xmlResponse);
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 $debugData['result'] = ['code' => $e->getCode(), 'error' => $e->getMessage()];
             }
         }
 
         try {
             $response = $this->_xmlElFactory->create(['data' => $xmlResponse]);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
             $result->setErrors($e->getMessage());
         }
 
         if (isset($response->Response->Error)
-            && in_array(
-                $response->Response->Error->ErrorSeverity,
-                ['Hard', 'Transient']
-            )
+            && in_array($response->Response->Error->ErrorSeverity, ['Hard', 'Transient'])
         ) {
             $result->setErrors((string)$response->Response->Error->ErrorDescription);
         }
@@ -1598,20 +1664,20 @@ public function getContainerTypes(\Magento\Framework\DataObject $params = null)
                     ];
                 }
                 $containerTypes = $containerTypes + [
-                        '03' => __('UPS Tube'),
-                        '04' => __('PAK'),
-                        '2a' => __('Small Express Box'),
-                        '2b' => __('Medium Express Box'),
-                        '2c' => __('Large Express Box'),
-                    ];
+                    '03' => __('UPS Tube'),
+                    '04' => __('PAK'),
+                    '2a' => __('Small Express Box'),
+                    '2b' => __('Medium Express Box'),
+                    '2c' => __('Large Express Box'),
+                ];
             }
 
             return ['00' => __('Customer Packaging')] + $containerTypes;
-        } elseif ($countryShipper == self::USA_COUNTRY_ID &&
-            $countryRecipient == self::PUERTORICO_COUNTRY_ID &&
-            ($method == '03' ||
-                $method == '02' ||
-                $method == '01')
+        } elseif ($countryShipper == self::USA_COUNTRY_ID
+            && $countryRecipient == self::PUERTORICO_COUNTRY_ID
+            && ($method == '03'
+                || $method == '02'
+                || $method == '01')
         ) {
             // Container types should be the same as for domestic
             $params->setCountryRecipient(self::USA_COUNTRY_ID);
@@ -1698,6 +1764,7 @@ public function getCustomizableContainerTypes()
 
     /**
      * Get delivery confirmation level based on origin/destination
+     *
      * Return null if delivery confirmation is not acceptable
      *
      * @param string|null $countyDestination
@@ -1705,7 +1772,7 @@ public function getCustomizableContainerTypes()
      */
     protected function _getDeliveryConfirmationLevel($countyDestination = null)
     {
-        if (is_null($countyDestination)) {
+        if ($countyDestination === null) {
             return null;
         }
 
diff --git a/app/code/Magento/Ups/Test/Mftf/Page/AdminShippingMethodsConfigPage.xml b/app/code/Magento/Ups/Test/Mftf/Page/AdminShippingMethodsConfigPage.xml
new file mode 100644
index 0000000000000..d884be709d208
--- /dev/null
+++ b/app/code/Magento/Ups/Test/Mftf/Page/AdminShippingMethodsConfigPage.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="AdminShippingMethodsConfigPage" url="admin/system_config/edit/section/carriers/" area="admin" module="Magento_Ups">
+        <section name="AdminShippingMethodsUpsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Ups/composer.json b/app/code/Magento/Ups/composer.json
index 8e262c2a82d09..1b0ff56c3853a 100644
--- a/app/code/Magento/Ups/composer.json
+++ b/app/code/Magento/Ups/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-ups",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-backend": "100.2.*",
         "magento/module-sales": "101.0.*",
@@ -16,7 +16,7 @@
         "magento/module-config": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Ups/etc/adminhtml/system.xml b/app/code/Magento/Ups/etc/adminhtml/system.xml
index f427c5960123f..8b9dc30a0188b 100644
--- a/app/code/Magento/Ups/etc/adminhtml/system.xml
+++ b/app/code/Magento/Ups/etc/adminhtml/system.xml
@@ -13,6 +13,9 @@
                 <field id="access_license_number" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Access License Number</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                    <depends>
+                        <field id="carriers/ups/active">1</field>
+                    </depends>
                 </field>
                 <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Enabled for Checkout</label>
@@ -84,6 +87,9 @@
                 <field id="password" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Password</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                    <depends>
+                        <field id="carriers/ups/active">1</field>
+                    </depends>
                 </field>
                 <field id="pickup" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Pickup Method</label>
@@ -113,6 +119,9 @@
                 <field id="username" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>User ID</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                    <depends>
+                        <field id="carriers/ups/active">1</field>
+                    </depends>
                 </field>
                 <field id="negotiated_active" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Enable Negotiated Rates</label>
diff --git a/app/code/Magento/Ups/etc/config.xml b/app/code/Magento/Ups/etc/config.xml
index 0f92ae4dad195..73b10dd5ff41b 100644
--- a/app/code/Magento/Ups/etc/config.xml
+++ b/app/code/Magento/Ups/etc/config.xml
@@ -19,13 +19,13 @@
                 <cutoff_cost />
                 <dest_type>RES</dest_type>
                 <free_method>GND</free_method>
-                <gateway_url>http://www.ups.com/using/services/rave/qcostcgi.cgi</gateway_url>
+                <gateway_url>https://www.ups.com/using/services/rave/qcostcgi.cgi</gateway_url>
                 <gateway_xml_url>https://onlinetools.ups.com/ups.app/xml/Rate</gateway_xml_url>
                 <handling>0</handling>
                 <model>Magento\Ups\Model\Carrier</model>
                 <pickup>CC</pickup>
                 <title>United Parcel Service</title>
-                <tracking_xml_url>https://www.ups.com/ups.app/xml/Track</tracking_xml_url>
+                <tracking_xml_url>https://onlinetools.ups.com/ups.app/xml/Track</tracking_xml_url>
                 <unit_of_measure>LBS</unit_of_measure>
                 <username backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <password backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
@@ -37,7 +37,7 @@
                 <negotiated_active>0</negotiated_active>
                 <include_taxes>0</include_taxes>
                 <mode_xml>1</mode_xml>
-                <type>UPS</type>
+                <type>UPS_XML</type>
                 <is_account_live>0</is_account_live>
                 <active_rma>0</active_rma>
                 <is_online>1</is_online>
diff --git a/app/code/Magento/UrlRewrite/Block/Edit.php b/app/code/Magento/UrlRewrite/Block/Edit.php
index baee8af893083..3c823fb56e1d7 100644
--- a/app/code/Magento/UrlRewrite/Block/Edit.php
+++ b/app/code/Magento/UrlRewrite/Block/Edit.php
@@ -65,7 +65,7 @@ public function __construct(
      */
     protected function _prepareLayout()
     {
-        $this->setTemplate('edit.phtml');
+        $this->setTemplate('Magento_UrlRewrite::edit.phtml');
 
         $this->_addBackButton();
         $this->_prepareLayoutFeatures();
@@ -173,7 +173,7 @@ protected function _addDeleteButton()
                             ['id' => $this->getUrlRewrite()->getId()]
                         )
                     )
-                    . ')',
+                    . ', {data: {}})',
                 'class' => 'scalable delete',
                 'level' => -1
             ]
diff --git a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php
index f8f7b145e2806..8a558d70e84fa 100644
--- a/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php
+++ b/app/code/Magento/UrlRewrite/Controller/Adminhtml/Url/Rewrite/Delete.php
@@ -6,21 +6,29 @@
  */
 namespace Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
 
+use Magento\Framework\Exception\NotFoundException;
+
 class Delete extends \Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite
 {
     /**
      * URL rewrite delete action
      *
      * @return void
+     * @throws NotFoundException
      */
     public function execute()
     {
-        if ($this->_getUrlRewrite()->getId()) {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
+
+        $id = (int)$this->_getUrlRewrite()->getId();
+        if ($id) {
             try {
                 $this->_getUrlRewrite()->delete();
-                $this->messageManager->addSuccess(__('You deleted the URL rewrite.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the URL rewrite.'));
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __('We can\'t delete URL Rewrite right now.'));
+                $this->messageManager->addExceptionMessage($e, __('We can\'t delete URL Rewrite right now.'));
                 $this->_redirect('adminhtml/*/edit/', ['id' => $this->_getUrlRewrite()->getId()]);
                 return;
             }
diff --git a/app/code/Magento/UrlRewrite/Controller/Router.php b/app/code/Magento/UrlRewrite/Controller/Router.php
index ed2a56d9b5229..a9ac991b428e7 100644
--- a/app/code/Magento/UrlRewrite/Controller/Router.php
+++ b/app/code/Magento/UrlRewrite/Controller/Router.php
@@ -6,6 +6,7 @@
 namespace Magento\UrlRewrite\Controller;
 
 use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\Response\Http as HttpResponse;
 use Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
@@ -70,13 +71,13 @@ public function __construct(
     /**
      * Match corresponding URL Rewrite and modify request
      *
-     * @param \Magento\Framework\App\RequestInterface|HttpRequest $request
+     * @param RequestInterface|HttpRequest $request
      * @return ActionInterface|null
      */
-    public function match(\Magento\Framework\App\RequestInterface $request)
+    public function match(RequestInterface $request)
     {
         $rewrite = $this->getRewrite(
-            $request->getPathInfo(),
+            $this->getNormalizedPathInfo($request),
             $this->storeManager->getStore()->getId()
         );
         if ($rewrite === null) {
@@ -101,7 +102,7 @@ public function match(\Magento\Framework\App\RequestInterface $request)
     }
 
     /**
-     * @param \Magento\Framework\App\RequestInterface $request
+     * @param RequestInterface $request
      * @param UrlRewrite $rewrite
      * @return ActionInterface|null
      */
@@ -117,7 +118,7 @@ protected function processRedirect($request, $rewrite)
     }
 
     /**
-     * @param \Magento\Framework\App\RequestInterface|HttpRequest $request
+     * @param RequestInterface|HttpRequest $request
      * @param string $url
      * @param int $code
      * @return ActionInterface
@@ -142,4 +143,30 @@ protected function getRewrite($requestPath, $storeId)
             UrlRewrite::STORE_ID => $storeId,
         ]);
     }
+
+    /**
+     * Get normalized request path
+     *
+     * @param RequestInterface|HttpRequest $request
+     * @return string
+     */
+    private function getNormalizedPathInfo(RequestInterface $request): string
+    {
+        $path = (string)$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 $path;
+    }
 }
diff --git a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
index 499fb9925a54a..f98801c266109 100644
--- a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
+++ b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
@@ -14,6 +14,9 @@
 use Psr\Log\LoggerInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite as UrlRewriteData;
 
+/**
+ * DB storage implementation for url rewrites
+ */
 class DbStorage extends AbstractStorage
 {
     /**
@@ -37,7 +40,7 @@ class DbStorage extends AbstractStorage
     protected $resource;
 
     /**
-     * @var \Psr\Log\LoggerInterface
+     * @var LoggerInterface
      */
     private $logger;
 
@@ -45,7 +48,7 @@ class DbStorage extends AbstractStorage
      * @param \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory $urlRewriteFactory
      * @param DataObjectHelper $dataObjectHelper
      * @param \Magento\Framework\App\ResourceConnection $resource
-     * @param \Psr\Log\LoggerInterface|null $logger
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
         UrlRewriteFactory $urlRewriteFactory,
@@ -56,7 +59,7 @@ public function __construct(
         $this->connection = $resource->getConnection();
         $this->resource = $resource;
         $this->logger = $logger ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Psr\Log\LoggerInterface::class);
+            ->get(LoggerInterface::class);
 
         parent::__construct($urlRewriteFactory, $dataObjectHelper);
     }
@@ -79,7 +82,7 @@ protected function prepareSelect(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function doFindAllByData(array $data)
     {
@@ -87,7 +90,7 @@ protected function doFindAllByData(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function doFindOneByData(array $data)
     {
@@ -97,42 +100,18 @@ protected function doFindOneByData(array $data)
             $result = null;
 
             $requestPath = $data[UrlRewrite::REQUEST_PATH];
-
-            $data[UrlRewrite::REQUEST_PATH] = [
+            $decodedRequestPath = urldecode($requestPath);
+            $data[UrlRewrite::REQUEST_PATH] = array_unique([
                 rtrim($requestPath, '/'),
                 rtrim($requestPath, '/') . '/',
-            ];
+                rtrim($decodedRequestPath, '/'),
+                rtrim($decodedRequestPath, '/') . '/',
+            ]);
 
             $resultsFromDb = $this->connection->fetchAll($this->prepareSelect($data));
-
-            if (count($resultsFromDb) === 1) {
-                $resultFromDb = current($resultsFromDb);
-                $redirectTypes = [OptionProvider::TEMPORARY, OptionProvider::PERMANENT];
-
-                // If request path matches the DB value or it's redirect - we can return result from DB
-                $canReturnResultFromDb = ($resultFromDb[UrlRewrite::REQUEST_PATH] === $requestPath
-                    || in_array((int)$resultFromDb[UrlRewrite::REDIRECT_TYPE], $redirectTypes, true));
-
-                // Otherwise return 301 redirect to request path from DB results
-                $result = $canReturnResultFromDb ? $resultFromDb : [
-                    UrlRewrite::ENTITY_TYPE => 'custom',
-                    UrlRewrite::ENTITY_ID => '0',
-                    UrlRewrite::REQUEST_PATH => $requestPath,
-                    UrlRewrite::TARGET_PATH => $resultFromDb[UrlRewrite::REQUEST_PATH],
-                    UrlRewrite::REDIRECT_TYPE => OptionProvider::PERMANENT,
-                    UrlRewrite::STORE_ID => $resultFromDb[UrlRewrite::STORE_ID],
-                    UrlRewrite::DESCRIPTION => null,
-                    UrlRewrite::IS_AUTOGENERATED => '0',
-                    UrlRewrite::METADATA => null,
-                ];
-            } else {
-                // If we have 2 results - return the row that matches request path
-                foreach ($resultsFromDb as $resultFromDb) {
-                    if ($resultFromDb[UrlRewrite::REQUEST_PATH] === $requestPath) {
-                        $result = $resultFromDb;
-                        break;
-                    }
-                }
+            if ($resultsFromDb) {
+                $urlRewrite = $this->extractMostRelevantUrlRewrite($requestPath, $resultsFromDb);
+                $result = $this->prepareUrlRewrite($requestPath, $urlRewrite);
             }
 
             return $result;
@@ -142,8 +121,78 @@ protected function doFindOneByData(array $data)
     }
 
     /**
-     * @param UrlRewrite[] $urls
+     * Extract most relevant url rewrite from url rewrites list
+     *
+     * @param string $requestPath
+     * @param array $urlRewrites
+     * @return array|null
+     */
+    private function extractMostRelevantUrlRewrite(string $requestPath, array $urlRewrites)
+    {
+        $prioritizedUrlRewrites = [];
+        foreach ($urlRewrites as $urlRewrite) {
+            switch (true) {
+                case $urlRewrite[UrlRewrite::REQUEST_PATH] === $requestPath:
+                    $priority = 1;
+                    break;
+                case $urlRewrite[UrlRewrite::REQUEST_PATH] === urldecode($requestPath):
+                    $priority = 2;
+                    break;
+                case rtrim($urlRewrite[UrlRewrite::REQUEST_PATH], '/') === rtrim($requestPath, '/'):
+                    $priority = 3;
+                    break;
+                case rtrim($urlRewrite[UrlRewrite::REQUEST_PATH], '/') === rtrim(urldecode($requestPath), '/'):
+                    $priority = 4;
+                    break;
+                default:
+                    $priority = 5;
+                    break;
+            }
+            $prioritizedUrlRewrites[$priority] = $urlRewrite;
+        }
+        ksort($prioritizedUrlRewrites);
+
+        return array_shift($prioritizedUrlRewrites);
+    }
+
+    /**
+     * Prepare url rewrite
      *
+     * If request path matches the DB value or it's redirect - we can return result from DB
+     * Otherwise return 301 redirect to request path from DB results
+     *
+     * @param string $requestPath
+     * @param array $urlRewrite
+     * @return array
+     */
+    private function prepareUrlRewrite(string $requestPath, array $urlRewrite): array
+    {
+        $redirectTypes = [OptionProvider::TEMPORARY, OptionProvider::PERMANENT];
+        $canReturnResultFromDb = (
+            in_array($urlRewrite[UrlRewrite::REQUEST_PATH], [$requestPath, urldecode($requestPath)], true)
+            || in_array((int) $urlRewrite[UrlRewrite::REDIRECT_TYPE], $redirectTypes, true)
+        );
+        if (!$canReturnResultFromDb) {
+            $urlRewrite = [
+                UrlRewrite::ENTITY_TYPE => 'custom',
+                UrlRewrite::ENTITY_ID => '0',
+                UrlRewrite::REQUEST_PATH => $requestPath,
+                UrlRewrite::TARGET_PATH => $urlRewrite[UrlRewrite::REQUEST_PATH],
+                UrlRewrite::REDIRECT_TYPE => OptionProvider::PERMANENT,
+                UrlRewrite::STORE_ID => $urlRewrite[UrlRewrite::STORE_ID],
+                UrlRewrite::DESCRIPTION => null,
+                UrlRewrite::IS_AUTOGENERATED => '0',
+                UrlRewrite::METADATA => null,
+            ];
+        }
+
+        return $urlRewrite;
+    }
+
+    /**
+     * Delete old url rewrites
+     *
+     * @param UrlRewrite[] $urls
      * @return void
      */
     private function deleteOldUrls(array $urls)
@@ -152,26 +201,22 @@ private function deleteOldUrls(array $urls)
         $oldUrlsSelect->from(
             $this->resource->getTableName(self::TABLE_NAME)
         );
-        /** @var UrlRewrite $url */
-        foreach ($urls as $url) {
-            $oldUrlsSelect->orWhere(
-                $this->connection->quoteIdentifier(
-                    UrlRewrite::ENTITY_TYPE
-                ) . ' = ?',
-                $url->getEntityType()
-            );
-            $oldUrlsSelect->where(
-                $this->connection->quoteIdentifier(
-                    UrlRewrite::ENTITY_ID
-                ) . ' = ?',
-                $url->getEntityId()
-            );
-            $oldUrlsSelect->where(
-                $this->connection->quoteIdentifier(
-                    UrlRewrite::STORE_ID
-                ) . ' = ?',
-                $url->getStoreId()
-            );
+
+        $uniqueEntities = $this->prepareUniqueEntities($urls);
+        foreach ($uniqueEntities as $storeId => $entityTypes) {
+            foreach ($entityTypes as $entityType => $entities) {
+                $oldUrlsSelect->orWhere(
+                    $this->connection->quoteIdentifier(
+                        UrlRewrite::STORE_ID
+                    ) . ' = ' . $this->connection->quote($storeId, 'INTEGER') .
+                    ' AND ' . $this->connection->quoteIdentifier(
+                        UrlRewrite::ENTITY_ID
+                    ) . ' IN (' . $this->connection->quote($entities, 'INTEGER') . ')' .
+                    ' AND ' . $this->connection->quoteIdentifier(
+                        UrlRewrite::ENTITY_TYPE
+                    ) . ' = ' . $this->connection->quote($entityType)
+                );
+            }
         }
 
         // prevent query locking in a case when nothing to delete
@@ -189,6 +234,28 @@ private function deleteOldUrls(array $urls)
         }
     }
 
+    /**
+     * Prepare array with unique entities
+     *
+     * @param UrlRewrite[] $urls
+     * @return array
+     */
+    private function prepareUniqueEntities(array $urls): array
+    {
+        $uniqueEntities = [];
+        /** @var UrlRewrite $url */
+        foreach ($urls as $url) {
+            $entityIds = (!empty($uniqueEntities[$url->getStoreId()][$url->getEntityType()])) ?
+                $uniqueEntities[$url->getStoreId()][$url->getEntityType()] : [];
+
+            if (!\in_array($url->getEntityId(), $entityIds)) {
+                $entityIds[] = $url->getEntityId();
+            }
+            $uniqueEntities[$url->getStoreId()][$url->getEntityType()] = $entityIds;
+        }
+        return $uniqueEntities;
+    }
+
     /**
      * @inheritDoc
      */
@@ -279,7 +346,7 @@ protected function createFilterDataBasedOnUrls($urls)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function deleteByData(array $data)
     {
diff --git a/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php b/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
index 2b6f9e87e3de2..a6cb4081965dd 100644
--- a/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
+++ b/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
@@ -65,17 +65,16 @@ public function switch(StoreInterface $fromStore, StoreInterface $targetStore, s
             UrlRewrite::STORE_ID => $oldStoreId,
         ]);
         if ($oldRewrite) {
+            $targetUrl = $targetStore->getBaseUrl();
             // look for url rewrite match on the target store
             $currentRewrite = $this->urlFinder->findOneByData([
-                UrlRewrite::REQUEST_PATH => $urlPath,
+                UrlRewrite::TARGET_PATH => $oldRewrite->getTargetPath(),
                 UrlRewrite::STORE_ID => $targetStore->getId(),
             ]);
-            if (null === $currentRewrite) {
-                /** @var \Magento\Framework\App\Response\Http $response */
-                $targetUrl = $targetStore->getBaseUrl();
+            if ($currentRewrite) {
+                $targetUrl .= $currentRewrite->getRequestPath();
             }
         }
-
         return $targetUrl;
     }
 }
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Page/AdminUrlRewriteEditPage.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Page/AdminUrlRewriteEditPage.xml
new file mode 100644
index 0000000000000..f51b9321e6911
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Page/AdminUrlRewriteEditPage.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="AdminUrlRewriteEditPage" url="admin/url_rewrite/edit/id/{{url_rewrite_id}}/" area="admin" module="Magento_UrlRewrite" parameterized="true">
+        <section name="AdminUrlRewriteEditSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteEditSection.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteEditSection.xml
new file mode 100644
index 0000000000000..7095214e72c43
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteEditSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminUrlRewriteEditSection">
+        <element name="requestPathField" type="input" selector="#request_path"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
index 455748a0da534..ab847f924b5cf 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
@@ -7,9 +7,10 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminUrlRewriteIndexSection">
         <element name="requestPathFilter" type="input" selector="#urlrewriteGrid_filter_request_path"/>
         <element name="requestPathColumnValue" type="text" selector="//*[@id='urlrewriteGrid']//tbody//td[@data-column='request_path' and normalize-space(.)='{{columnValue}}']" parameterized="true"/>
+        <element name="targetPathColumnValue" type="text" selector="//*[@id='urlrewriteGrid']//tbody//td[@data-column='target_path' and normalize-space(.)='{{columnValue}}']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml
new file mode 100644
index 0000000000000..cfe96fc1c33f7
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest">
+        <annotations>
+            <features value="Url Rewrite"/>
+            <stories value="Url Rewrites for Multiple Storeviews"/>
+            <title value="Url Rewrites Correctly Generated for Multiple Storeviews During Product Import"/>
+            <description value="Check Url Rewrites Correctly Generated for Multiple Storeviews During Product Import."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-76287"/>
+            <group value="urlRewrite"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!-- Create Store View EN -->
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewEn">
+                <argument name="customStore" value="CustomStoreENNotUnique"/>
+            </actionGroup>
+            <!-- Create Store View NL -->
+            <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="DeleteProductByName" stepKey="deleteImportedProduct">
+                <argument name="product" value="productformagetwo76287"/>
+            </actionGroup>
+            <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">
+            <argument name="store" value="CustomStoreENNotUnique.name"/>
+            <argument name="catName" value="$$createCategory.name$$"/>
+        </actionGroup>
+        <uncheckOption selector="{{AdminCategoryBasicFieldSection.categoryNameUseDefault}}" stepKey="uncheckUseDefaultValueENStoreView"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="category-english" stepKey="changeNameField"/>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="clickOnSectionHeader"/>
+        <actionGroup ref="ChangeSeoUrlKeyForSubCategory" stepKey="changeSeoUrlKeyENStoreView">
+            <argument name="value" value="category-english"/>
+        </actionGroup>
+        <actionGroup ref="switchCategoryStoreView" stepKey="switchToStoreViewNl">
+            <argument name="store" value="CustomStoreNLNotUnique.name"/>
+            <argument name="catName" value="$$createCategory.name$$"/>
+        </actionGroup>
+        <uncheckOption selector="{{AdminCategoryBasicFieldSection.categoryNameUseDefault}}" stepKey="uncheckUseDefaultValue1"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="category-dutch" stepKey="changeNameFieldNLStoreView"/>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="clickOnSectionHeader2"/>
+        <actionGroup ref="ChangeSeoUrlKeyForSubCategory" stepKey="changeSeoUrlKeyNLStoreView">
+            <argument name="value" value="category-dutch"/>
+        </actionGroup>
+        <amOnPage url="{{AdminImportIndexPage.url}}" stepKey="navigateToSystemImport"/>
+        <selectOption selector="{{AdminImportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
+        <waitForElementVisible selector="{{AdminImportMainSection.importBehavior}}" stepKey="waitForImportBehaviorElementVisible"/>
+        <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"/>
+        <click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Import successfully done" stepKey="assertSuccessMessage1"/>
+        <actionGroup ref="SearchForProductOnBackendByNameActionGroup" stepKey="searchForProductOnBackend">
+            <argument name="productName" value="productformagetwo76287"/>
+        </actionGroup>
+        <click selector="{{AdminProductGridSection.productRowBySku('productformagetwo76287')}}" stepKey="clickOnProductRow"/>
+        <grabFromCurrentUrl regex="~/id/(\d+)/~" stepKey="grabProductIdFromUrl"/>
+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="goToUrlRewritesIndexPage"/>
+
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-english.html" stepKey="inputCategoryUrlForENStoreView"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-english.html')}}" stepKey="seeUrlInRequestPathColumn"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/category/view/id/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn"/>
+
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-dutch.html" stepKey="inputCategoryUrlForNLStoreView"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton1"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-dutch.html')}}" stepKey="seeUrlInRequestPathColumn1"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/category/view/id/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn1"/>
+
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="productformagetwo76287-english.html" stepKey="inputProductUrlForENStoreView"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton2"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('productformagetwo76287-english.html')}}" stepKey="seeUrlInRequestPathColumn2"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue('catalog/product/view/id/$grabProductIdFromUrl')}}" stepKey="seeUrlInTargetPathColumn2"/>
+
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="productformagetwo76287-dutch.html" stepKey="inputProductUrlForENStoreView1"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton3"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('productformagetwo76287-dutch.html')}}" stepKey="seeUrlInRequestPathColumn3"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue('catalog/product/view/id/$grabProductIdFromUrl')}}" stepKey="seeUrlInTargetPathColumn3"/>
+
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-english/productformagetwo76287-english.html" stepKey="inputProductUrlForENStoreView2"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton4"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-english/productformagetwo76287-english.html')}}" stepKey="seeUrlInRequestPathColumn4"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn4"/>
+
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-dutch/productformagetwo76287-dutch.html" stepKey="inputProductUrlForENStoreView3"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton5"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-dutch/productformagetwo76287-dutch.html')}}" stepKey="seeUrlInRequestPathColumn5"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn5"/>
+    </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 60b371ae9a893..c6691f6e370d1 100644
--- a/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
+++ b/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
@@ -3,57 +3,87 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\UrlRewrite\Test\Unit\Controller;
 
 use Magento\Framework\App\Action\Forward;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\UrlInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Magento\Store\Model\Store;
+use PHPUnit\Framework\MockObject\MockObject;
+use Zend\Stdlib\ParametersInterface;
 
 /**
+ * Test class for UrlRewrite Controller Router
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class RouterTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\UrlRewrite\Controller\Router */
-    protected $router;
+    /**
+     * @var \Magento\UrlRewrite\Controller\Router
+     */
+    private $router;
+
+    /**
+     * @var \Magento\Framework\App\ActionFactory|MockObject
+     */
+    private $actionFactory;
 
-    /** @var \Magento\Framework\App\ActionFactory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $actionFactory;
+    /**
+     * @var UrlInterface|MockObject
+     */
+    private $url;
 
-    /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $url;
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|MockObject
+     */
+    private $storeManager;
 
-    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $storeManager;
+    /**
+     * @var Store|MockObject
+     */
+    private $store;
 
-    /** @var Store|\PHPUnit_Framework_MockObject_MockObject */
-    protected $store;
+    /**
+     * @var \Magento\Framework\App\ResponseInterface|MockObject
+     */
+    private $response;
 
-    /** @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $response;
+    /**
+     * @var \Magento\Framework\App\RequestInterface|MockObject
+     */
+    private $request;
 
-    /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $request;
+    /**
+     * @var ParametersInterface|MockObject
+     */
+    private $requestQuery;
 
-    /** @var \Magento\UrlRewrite\Model\UrlFinderInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $urlFinder;
+    /**
+     * @var \Magento\UrlRewrite\Model\UrlFinderInterface|MockObject
+     */
+    private $urlFinder;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         $this->actionFactory = $this->createMock(\Magento\Framework\App\ActionFactory::class);
-        $this->url = $this->createMock(\Magento\Framework\UrlInterface::class);
+        $this->url = $this->createMock(UrlInterface::class);
         $this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
         $this->response = $this->createPartialMock(
             \Magento\Framework\App\ResponseInterface::class,
             ['setRedirect', 'sendResponse']
         );
+        $this->requestQuery = $this->createMock(ParametersInterface::class);
         $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
             ->disableOriginalConstructor()->getMock();
+        $this->request->method('getQuery')->willReturn($this->requestQuery);
         $this->urlFinder = $this->createMock(\Magento\UrlRewrite\Model\UrlFinderInterface::class);
         $this->store = $this->getMockBuilder(
-            \Magento\Store\Model\Store::class
+            Store::class
         )->disableOriginalConstructor()->getMock();
 
         $this->router = (new ObjectManager($this))->getObject(
@@ -158,17 +188,17 @@ public function testNoRewriteAfterStoreSwitcherWhenNoOldRewrite()
         $this->request->expects($this->any())->method('getPathInfo')->will($this->returnValue('request-path'));
         $this->request->expects($this->any())->method('getParam')->with('___from_store')
             ->will($this->returnValue('old-store'));
-        $oldStore = $this->getMockBuilder(\Magento\Store\Model\Store::class)->disableOriginalConstructor()->getMock();
+        $oldStore = $this->getMockBuilder(Store::class)->disableOriginalConstructor()->getMock();
         $this->storeManager->expects($this->any())->method('getStore')
             ->will($this->returnValueMap([['old-store', $oldStore], [null, $this->store]]));
         $oldStore->expects($this->any())->method('getId')->will($this->returnValue('old-store-id'));
         $this->store->expects($this->any())->method('getId')->will($this->returnValue('current-store-id'));
-        $oldUrlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
+        $oldUrlRewrite = $this->getMockBuilder(UrlRewrite::class)
             ->disableOriginalConstructor()->getMock();
         $oldUrlRewrite->expects($this->any())->method('getEntityType')->will($this->returnValue('entity-type'));
         $oldUrlRewrite->expects($this->any())->method('getEntityId')->will($this->returnValue('entity-id'));
         $oldUrlRewrite->expects($this->any())->method('getRequestPath')->will($this->returnValue('request-path'));
-        $urlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
+        $urlRewrite = $this->getMockBuilder(UrlRewrite::class)
             ->disableOriginalConstructor()->getMock();
         $urlRewrite->expects($this->any())->method('getRequestPath')->will($this->returnValue('request-path'));
 
@@ -180,17 +210,17 @@ public function testNoRewriteAfterStoreSwitcherWhenOldRewriteEqualsToNewOne()
         $this->request->expects($this->any())->method('getPathInfo')->will($this->returnValue('request-path'));
         $this->request->expects($this->any())->method('getParam')->with('___from_store')
             ->will($this->returnValue('old-store'));
-        $oldStore = $this->getMockBuilder(\Magento\Store\Model\Store::class)->disableOriginalConstructor()->getMock();
+        $oldStore = $this->getMockBuilder(Store::class)->disableOriginalConstructor()->getMock();
         $this->storeManager->expects($this->any())->method('getStore')
             ->will($this->returnValueMap([['old-store', $oldStore], [null, $this->store]]));
         $oldStore->expects($this->any())->method('getId')->will($this->returnValue('old-store-id'));
         $this->store->expects($this->any())->method('getId')->will($this->returnValue('current-store-id'));
-        $oldUrlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
+        $oldUrlRewrite = $this->getMockBuilder(UrlRewrite::class)
             ->disableOriginalConstructor()->getMock();
         $oldUrlRewrite->expects($this->any())->method('getEntityType')->will($this->returnValue('entity-type'));
         $oldUrlRewrite->expects($this->any())->method('getEntityId')->will($this->returnValue('entity-id'));
         $oldUrlRewrite->expects($this->any())->method('getRequestPath')->will($this->returnValue('old-request-path'));
-        $urlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
+        $urlRewrite = $this->getMockBuilder(UrlRewrite::class)
             ->disableOriginalConstructor()->getMock();
         $urlRewrite->expects($this->any())->method('getRequestPath')->will($this->returnValue('old-request-path'));
 
@@ -218,7 +248,7 @@ public function testNoRewriteAfterStoreSwitcherWhenOldRewriteEqualsToNewOne()
     public function testMatchWithRedirect()
     {
         $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
-        $urlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
+        $urlRewrite = $this->getMockBuilder(UrlRewrite::class)
             ->disableOriginalConstructor()->getMock();
         $urlRewrite->expects($this->any())->method('getRedirectType')->will($this->returnValue('redirect-code'));
         $urlRewrite->expects($this->any())->method('getTargetPath')->will($this->returnValue('target-path'));
@@ -237,7 +267,7 @@ public function testMatchWithRedirect()
     public function testMatchWithCustomInternalRedirect()
     {
         $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
-        $urlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
+        $urlRewrite = $this->getMockBuilder(UrlRewrite::class)
             ->disableOriginalConstructor()->getMock();
         $urlRewrite->expects($this->any())->method('getEntityType')->will($this->returnValue('custom'));
         $urlRewrite->expects($this->any())->method('getRedirectType')->will($this->returnValue('redirect-code'));
@@ -259,7 +289,7 @@ public function testMatchWithCustomInternalRedirect()
     public function testMatchWithCustomExternalRedirect($targetPath)
     {
         $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
-        $urlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
+        $urlRewrite = $this->getMockBuilder(UrlRewrite::class)
             ->disableOriginalConstructor()->getMock();
         $urlRewrite->expects($this->any())->method('getEntityType')->will($this->returnValue('custom'));
         $urlRewrite->expects($this->any())->method('getRedirectType')->will($this->returnValue('redirect-code'));
@@ -288,7 +318,7 @@ public function externalRedirectTargetPathDataProvider()
     public function testMatch()
     {
         $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
-        $urlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
+        $urlRewrite = $this->getMockBuilder(UrlRewrite::class)
             ->disableOriginalConstructor()->getMock();
         $urlRewrite->expects($this->any())->method('getRedirectType')->will($this->returnValue(0));
         $urlRewrite->expects($this->any())->method('getTargetPath')->will($this->returnValue('target-path'));
@@ -296,10 +326,60 @@ public function testMatch()
         $this->urlFinder->expects($this->any())->method('findOneByData')->will($this->returnValue($urlRewrite));
         $this->request->expects($this->once())->method('setPathInfo')->with('/target-path');
         $this->request->expects($this->once())->method('setAlias')
-            ->with(\Magento\Framework\UrlInterface::REWRITE_REQUEST_PATH_ALIAS, 'request-path');
+            ->with(UrlInterface::REWRITE_REQUEST_PATH_ALIAS, 'request-path');
         $this->actionFactory->expects($this->once())->method('create')
-            ->with(\Magento\Framework\App\Action\Forward::class);
+            ->with(Forward::class);
+
+        $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/Test/Unit/Model/Storage/DbStorageTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
index 408bcaf7a489e..08fe9a6375b24 100644
--- a/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
+++ b/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
@@ -478,10 +478,6 @@ public function testReplace()
             ->with(DbStorage::TABLE_NAME)
             ->will($this->returnValue('table_name'));
 
-        $this->connectionMock->expects($this->any())
-            ->method('query')
-            ->with('sql delete query');
-
         // insert
 
         $urlFirst->expects($this->any())
@@ -496,10 +492,6 @@ public function testReplace()
             ->with(DbStorage::TABLE_NAME)
             ->will($this->returnValue('table_name'));
 
-        $this->connectionMock->expects($this->once())
-            ->method('insertMultiple')
-            ->with('table_name', [['row1'], ['row2']]);
-
         $this->storage->replace([$urlFirst, $urlSecond]);
     }
 
diff --git a/app/code/Magento/UrlRewrite/composer.json b/app/code/Magento/UrlRewrite/composer.json
index 8f8b819d1a62a..59f1d0b623850 100644
--- a/app/code/Magento/UrlRewrite/composer.json
+++ b/app/code/Magento/UrlRewrite/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-url-rewrite",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-catalog": "102.0.*",
         "magento/module-store": "100.2.*",
         "magento/framework": "101.0.*",
@@ -12,7 +12,7 @@
         "magento/module-cms-url-rewrite": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "101.0.5",
+    "version": "101.0.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml b/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml
index 7d8151d270308..de8575178d06d 100644
--- a/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/layout/adminhtml_url_rewrite_index.xml
@@ -14,6 +14,8 @@
                         <argument name="id" xsi:type="string">urlrewriteGrid</argument>
                         <argument name="dataSource" xsi:type="object">Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection</argument>
                         <argument name="default_sort" xsi:type="string">url_rewrite_id</argument>
+                        <!-- Add below argument to save session parameter in URL rewrite grid -->
+                        <argument name="save_parameters_in_session" xsi:type="string">1</argument>
                     </arguments>
                     <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="adminhtml.url_rewrite.grid.columnSet">
                         <arguments>
diff --git a/app/code/Magento/User/Block/Buttons.php b/app/code/Magento/User/Block/Buttons.php
index bb7375ae83277..60cdf3341d8a6 100644
--- a/app/code/Magento/User/Block/Buttons.php
+++ b/app/code/Magento/User/Block/Buttons.php
@@ -34,6 +34,7 @@ public function __construct(
 
     /**
      * @return $this
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     protected function _prepareLayout()
     {
@@ -64,7 +65,7 @@ protected function _prepareLayout()
                     ) . '\', \'' . $this->getUrl(
                         '*/*/delete',
                         ['rid' => $this->getRequest()->getParam('rid')]
-                    ) . '\')',
+                    ) . '\', {data: {}})',
                     'class' => 'delete'
                 ]
             );
@@ -110,6 +111,7 @@ public function getSaveButtonHtml()
 
     /**
      * @return string|void
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getDeleteButtonHtml()
     {
diff --git a/app/code/Magento/User/Block/User/Edit.php b/app/code/Magento/User/Block/User/Edit.php
index 6e036cf20fa25..7f435829df30f 100644
--- a/app/code/Magento/User/Block/User/Edit.php
+++ b/app/code/Magento/User/Block/User/Edit.php
@@ -73,7 +73,7 @@ protected function _construct()
                     'label' => __('Force Sign-In'),
                     'class' => 'invalidate-token',
                     'onclick' => "deleteConfirm('" . $this->escapeJs($this->escapeHtml($deleteConfirmMsg)) .
-                        "', '" . $this->getInvalidateUrl() . "')",
+                        "', '" . $this->getInvalidateUrl() . "', {data: {}})",
                 ]
             );
         }
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
index 7aa0d2368f67b..9019f4b3c7009 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
@@ -9,6 +9,7 @@
 use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Exception\State\UserLockedException;
 use Magento\Security\Model\SecurityCookie;
 use Magento\Framework\Exception\LocalizedException;
@@ -68,9 +69,13 @@ private function getSecurityCookie()
      * Role form submit action to save or create new role
      *
      * @return \Magento\Backend\Model\View\Result\Redirect
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
 
@@ -86,7 +91,7 @@ public function execute()
 
         $role = $this->_initRole('role_id');
         if (!$role->getId() && $rid) {
-            $this->messageManager->addError(__('This role no longer exists.'));
+            $this->messageManager->addErrorMessage(__('This role no longer exists.'));
             return $resultRedirect->setPath('adminhtml/*/');
         }
 
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Save.php b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
index d7d1c8b0e22a6..ebba96904aff5 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Save.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
@@ -44,6 +44,9 @@ public function execute()
     {
         $userId = (int)$this->getRequest()->getParam('user_id');
         $data = $this->getRequest()->getPostValue();
+        if (array_key_exists('form_key', $data)) {
+            unset($data['form_key']);
+        }
         if (!$data) {
             $this->_redirect('adminhtml/*/');
             return;
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminAssignUserRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminAssignUserRoleActionGroup.xml
index 3da939b5fa2c6..c154bc89bb893 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminAssignUserRoleActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminAssignUserRoleActionGroup.xml
@@ -20,7 +20,7 @@
         <see selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="{{user_restricted.username}}" stepKey="seeFoundUsername"/>
         <click selector="{{AdminUserGridSection.searchResultFirstRow}}" stepKey="clickFoundUsername"/>
         <waitForPageLoad time="30" stepKey="waitUserEditPage"/>
-        <seeInField selector="{{AdminEditUserSection.usernameTextField}}" userInput="{{user_restricted.username}}" stepKey="seeUsernameInField"/>
+        <seeInField selector="{{AdminEditUserSection.username}}" userInput="{{user_restricted.username}}" stepKey="seeUsernameInField"/>
         <fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillCurrentPassword"/>
         <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
         <click selector="{{AdminEditUserSection.userRoleTab}}" stepKey="clickUserRoleTab"/>
@@ -30,8 +30,7 @@
         <waitForPageLoad time="10" stepKey="waitForRoleGrid"/>
         <see selector="{{AdminEditUserSection.roleNameInFirstRow}}" userInput="{{roleName}}" stepKey="seeFoundRoleName"/>
         <click selector="{{AdminEditUserSection.searchResultFirstRow}}" stepKey="clickFoundRoleName"/>
-        <click selector="{{AdminEditUserSection.saveButton}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad time="10" stepKey="waitUserSaved"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveButton"/>
         <see selector="{{AdminUserGridSection.successMessage}}" userInput="You saved the user." stepKey="saveUserSuccessMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminClickSaveButtonOnUserFormActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminClickSaveButtonOnUserFormActionGroup.xml
new file mode 100644
index 0000000000000..e1edb16aba6ea
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminClickSaveButtonOnUserFormActionGroup.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="AdminClickSaveButtonOnUserFormActionGroup">
+        <click selector="{{AdminNewUserFormSection.save}}" stepKey="saveNewUser"/>
+        <waitForPageLoad stepKey="waitForSaveResultLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
new file mode 100644
index 0000000000000..00634c34dd080
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.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="AdminCreateUserActionGroup">
+        <arguments>
+            <argument name="role"/>
+            <argument name="user" defaultValue="restrictedWebUser"/>
+        </arguments>
+        <amOnPage url="{{AdminNewUserPage.url}}" stepKey="navigateToNewUser"/>
+        <fillField selector="{{AdminEditUserSection.username}}" userInput="{{user.username}}" stepKey="enterUserName" />
+        <fillField selector="{{AdminEditUserSection.firstName}}" userInput="{{user.firstName}}" stepKey="enterFirstName" />
+        <fillField selector="{{AdminEditUserSection.lastName}}" userInput="{{user.lastName}}" stepKey="enterLastName" />
+        <fillField selector="{{AdminEditUserSection.email}}" userInput="{{user.username}}@magento.com" stepKey="enterEmail" />
+        <fillField selector="{{AdminEditUserSection.password}}" userInput="{{user.password}}" stepKey="enterPassword" />
+        <fillField selector="{{AdminEditUserSection.confirmation}}" userInput="{{user.password}}" stepKey="confirmPassword" />
+        <fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterCurrentPassword" />
+        <scrollToTopOfPage stepKey="scrollToTopOfPage" />
+        <click selector="{{AdminEditUserSection.userRoleTab}}" stepKey="clickUserRole" />
+        <fillField selector="{{AdminEditUserSection.roleNameFilterTextField}}" userInput="{{role.name}}" stepKey="filterRole" />
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearch" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear1"/>
+        <click selector="{{AdminRoleGridSection.searchResultFirstRow}}" stepKey="selectRole" />
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveUser" />
+        <see userInput="You saved the user." stepKey="seeSuccessMessage" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml
index 492bad166b61a..30a9985436c0e 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml
@@ -20,10 +20,9 @@
         <click selector="{{AdminUserGridSection.searchResultFirstRow}}" stepKey="openUserEdit"/>
         <waitForPageLoad stepKey="waitForUserEditPageLoad"/>
         <fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterThePassword" />
-        <click selector="{{AdminEditUserSection.deleteButton}}" stepKey="deleteUser"/>
+        <click selector="{{AdminMainActionsSection.delete}}" stepKey="deleteUser"/>
         <waitForElementVisible selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForConfirmModal"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
-        <waitForPageLoad stepKey="waitForSave" />
         <see userInput="You deleted the user." stepKey="seeUserDeleteMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminFillNewUserFormRequiredFieldsActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminFillNewUserFormRequiredFieldsActionGroup.xml
new file mode 100644
index 0000000000000..6554c8cc172bd
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminFillNewUserFormRequiredFieldsActionGroup.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminFillNewUserFormRequiredFieldsActionGroup">
+        <arguments>
+            <argument name="user" type="entity"/>
+        </arguments>
+        <fillField selector="{{AdminNewUserFormSection.username}}" userInput="{{user.username}}" stepKey="fillUser"/>
+        <fillField selector="{{AdminNewUserFormSection.firstname}}" userInput="{{user.firstname}}" stepKey="fillFirstName"/>
+        <fillField selector="{{AdminNewUserFormSection.lastname}}" userInput="{{user.lastname}}" stepKey="fillLastName"/>
+        <fillField selector="{{AdminNewUserFormSection.email}}" userInput="{{user.email}}" stepKey="fillEmail"/>
+        <fillField selector="{{AdminNewUserFormSection.password}}" userInput="{{user.password}}" stepKey="fillPassword"/>
+        <fillField selector="{{AdminNewUserFormSection.passwordConfirmation}}" userInput="{{user.password_confirmation}}" stepKey="fillPasswordConfirmation"/>
+        <fillField selector="{{AdminNewUserFormSection.currentPassword}}" userInput="{{user.current_password}}" stepKey="fillCurrentUserPassword"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+        <click selector="{{AdminNewUserFormSection.userRoleTab}}" stepKey="openUserRoleTab"/>
+        <waitForPageLoad stepKey="waitForUserRoleTabOpened" />
+        <click selector="{{AdminNewUserFormSection.resetFilter}}" stepKey="resetGridFilter" />
+        <waitForPageLoad stepKey="waitForFiltersReset" />
+        <fillField userInput="{{user.role}}" selector="{{AdminNewUserFormSection.roleFilterField}}" stepKey="fillRoleFilterField" />
+        <click selector="{{AdminNewUserFormSection.search}}" stepKey="clickSearchButton" />
+        <waitForPageLoad stepKey="waitForFiltersApplied" />
+        <checkOption selector="{{AdminNewUserFormSection.roleRadiobutton(user.role)}}" stepKey="assignRole"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminOpenNewUserPageActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminOpenNewUserPageActionGroup.xml
new file mode 100644
index 0000000000000..67aef9379faa8
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminOpenNewUserPageActionGroup.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="AdminOpenNewUserPageActionGroup">
+        <amOnPage url="{{AdminNewUserPage.url}}" stepKey="amOnNewAdminUserPage"/>
+        <waitForPageLoad stepKey="waitForNewAdminUserPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AssertAdminUserSaveMessageActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AssertAdminUserSaveMessageActionGroup.xml
new file mode 100644
index 0000000000000..db4f0a89348a9
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AssertAdminUserSaveMessageActionGroup.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="AssertAdminUserSaveMessageActionGroup">
+        <arguments>
+            <argument name="message" type="string" defaultValue="You saved the user." />
+            <argument name="messageType" type="string" defaultValue="success" />
+        </arguments>
+        <waitForElementVisible selector="{{AdminUserFormMessagesSection.messageByType(messageType)}}" stepKey="waitForMessage" />
+        <see userInput="{{message}}" selector="{{AdminUserFormMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage" />
+    </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 751378da6c15d..96e2f92dfece0 100644
--- a/app/code/Magento/User/Test/Mftf/Data/UserData.xml
+++ b/app/code/Magento/User/Test/Mftf/Data/UserData.xml
@@ -7,11 +7,15 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="admin" type="user">
         <data key="email">admin@magento.com</data>
         <data key="password">admin123</data>
     </entity>
+    <entity name="DefaultAdminUser" type="user">
+        <data key="username">{{_ENV.MAGENTO_ADMIN_USERNAME}}</data>
+        <data key="password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
+    </entity>
     <entity name="restrictedWebUser" type="user">
         <data key="username" unique="suffix">restrictedWebUser</data>
         <data key="firstname">restricted</data>
@@ -23,4 +27,35 @@
         <data key="is_active">true</data>
         <data key="current_password">123123q</data>
     </entity>
+    <entity name="Admin3" type="user">
+        <data key="username" unique="suffix">admin3</data>
+        <data key="firstname">admin3</data>
+        <data key="lastname">admin3</data>
+        <data key="email" unique="prefix">admin3WebUser@example.com</data>
+        <data key="password">123123q</data>
+        <data key="password_confirmation">123123q</data>
+        <data key="interface_local">en_US</data>
+        <data key="is_active">true</data>
+        <data key="current_password">123123q</data>
+        <array key="roles">
+            <item>1</item>
+        </array>
+    </entity>
+    <entity name="NewAdminUser" type="user">
+        <data key="username" unique="suffix">admin</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>
 </entities>
diff --git a/app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml b/app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml
index 64f64aeb5a1b2..f03cb1b81ced9 100644
--- a/app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml
+++ b/app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/dataProfileSchema.xsd">
     <entity name="adminProductInWebsiteRole" type="user_role">
         <data key="rolename" unique="suffix">restrictedWebsiteRole</data>
         <data key="current_password">123123q</data>
@@ -28,10 +28,23 @@
             <item>Magento_Catalog::catalog</item>
             <item>Magento_Catalog::catalog_inventory</item>
             <item>Magento_Catalog::products</item>
+            <item>Magento_Catalog::update_attributes</item>
         </array>
     </entity>
     <entity name="RoleTest" type="user_role">
         <data key="rolename" unique="suffix">RoleTest</data>
         <data key="current_password">123123q</data>
     </entity>
+    <entity name="adminMarketingInWebsiteRole" type="user_role">
+        <data key="rolename" unique="suffix">restrictedWebsiteRole</data>
+        <data key="current_password">123123q</data>
+        <data key="gws_is_all">0</data>
+        <array key="gws_websites">
+            <item>1</item>
+        </array>
+        <array key="resource">
+            <item>Magento_Backend::marketing</item>
+            <item>Magento_SalesRule::quote</item>
+        </array>
+    </entity>
 </entities>
diff --git a/app/code/Magento/User/Test/Mftf/Metadata/user-meta.xml b/app/code/Magento/User/Test/Mftf/Metadata/user-meta.xml
index 9f8050983b215..1ee29be6b3d76 100644
--- a/app/code/Magento/User/Test/Mftf/Metadata/user-meta.xml
+++ b/app/code/Magento/User/Test/Mftf/Metadata/user-meta.xml
@@ -6,7 +6,7 @@
   */
 -->
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateUser" dataType="user" type="create"
                auth="adminFormKey" url="/admin/user/save/" method="POST" successRegex="/messages-message-success/" returnRegex="" >
         <contentType>application/x-www-form-urlencoded</contentType>
@@ -19,5 +19,8 @@
         <field key="interface_locale">string</field>
         <field key="is_active">boolean</field>
         <field key="current_password">string</field>
+        <array key="roles">
+            <value>string</value>
+        </array>
     </operation>
 </operations>
diff --git a/app/code/Magento/User/Test/Mftf/Page/AdminNewUserPage.xml b/app/code/Magento/User/Test/Mftf/Page/AdminNewUserPage.xml
new file mode 100644
index 0000000000000..ad4e3edc7cfe6
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Page/AdminNewUserPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminNewUserPage" url="admin/user/new" area="admin" module="Magento_User">
+        <section name="AdminEditUserSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
index 2ba9e96ab2d29..d7bd2034fb0d0 100644
--- a/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
@@ -5,9 +5,14 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminEditUserSection">
-        <element name="usernameTextField" type="input" selector="#user_username"/>
+        <element name="username" type="input" selector="#user_username"/>
+        <element name="firstName" type="input" selector="#user_firstname"/>
+        <element name="lastName" type="input" selector="#user_lastname"/>
+        <element name="email" type="input" selector="#user_email"/>
+        <element name="password" type="input" selector="#user_password"/>
+        <element name="confirmation" type="input" selector="#user_confirmation"/>
         <element name="currentPasswordField" type="input" selector="#user_current_password"/>
         <element name="userRoleTab" type="button" selector="#page_tabs_roles_section"/>
         <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
@@ -15,7 +20,5 @@
         <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
         <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
         <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-        <element name="saveButton" type="button" selector="#save"/>
-        <element name="deleteButton" type="button" selector="#delete"/>
     </section>
 </sections>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminNewUserFormSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminNewUserFormSection.xml
new file mode 100644
index 0000000000000..c8c510c4019d2
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminNewUserFormSection.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminNewUserFormSection">
+        <element name="save" type="button" selector=".page-main-actions #save"/>
+        <element name="username" type="input" selector="#page_tabs_main_section_content input[name='username']"/>
+        <element name="firstname" type="input" selector="#page_tabs_main_section_content input[name='firstname']"/>
+        <element name="lastname" type="input" selector="#page_tabs_main_section_content input[name='lastname']"/>
+        <element name="email" type="input" selector="#page_tabs_main_section_content input[name='email']"/>
+        <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="currentPassword" type="input" selector="#page_tabs_main_section_content input[name='current_password']"/>
+        <element name="userRoleTab" type="button" selector="#page_tabs_roles_section"/>
+        <element name="search" type="button" selector="#page_tabs_roles_section_content #permissionsUserRolesGrid [data-action='grid-filter-apply']" />
+        <element name="resetFilter" type="button" selector="#page_tabs_roles_section_content #permissionsUserRolesGrid [data-action='grid-filter-reset']" />
+        <element name="roleFilterField" type="input" selector="#page_tabs_roles_section_content #permissionsUserRolesGrid input[name='role_name']" />
+        <element name="roleRadiobutton" type="radio" selector="//table[@id='permissionsUserRolesGrid_table']//tr[./td[contains(@class, 'col-role_name') and contains(., '{{roleName}}')]]//input[@name='roles[]']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminUserFormMessagesSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminUserFormMessagesSection.xml
new file mode 100644
index 0000000000000..ec4f4d8bf3ad7
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminUserFormMessagesSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminUserFormMessagesSection">
+        <element name="messageByType" type="block" selector="#messages .message-{{messageType}}" parameterized="true" />
+    </section>
+</sections>
diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json
index 4ff87f2a704a3..60e5778c0c431 100644
--- a/app/code/Magento/User/composer.json
+++ b/app/code/Magento/User/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-user",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-authorization": "100.2.*",
         "magento/module-backend": "100.2.*",
@@ -12,7 +12,7 @@
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "101.0.4",
+    "version": "101.0.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml
index bc37eb57a12ab..eae0e2e2cc3f0 100644
--- a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml
@@ -3,17 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <form method="post" action="" id="login-form" data-mage-init='{"form": {}, "validation": {}}'>
     <fieldset class="admin__fieldset">
-        <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Password Help') ?></span></legend><br/>
-        <input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
-        <p class="admin__field-info"><?= /* @escapeNotVerified */ __('Enter your email address.  You will receive an email with a link to reset your password.') ?></p>
+        <legend class="admin__legend"><span><?= $block->escapeHtml(__('Password Help')) ?></span></legend><br/>
+        <input name="form_key" type="hidden" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" />
+        <p class="admin__field-info"><?= $block->escapeHtml(__('Enter your email address.  You will receive an email with a link to reset your password.')) ?></p>
         <div class="admin__field _required field-email">
-            <label for="email" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Email address') ?></span></label>
+            <label for="email" class="admin__field-label"><span><?= $block->escapeHtml(__('Email address')) ?></span></label>
             <div class="admin__field-control">
                 <input type="text" id="email" name="email" value="" data-validate="{required:true, 'validate-email':true}" class="admin__control-text" />
             </div>
@@ -21,11 +18,11 @@
         <?= $block->getChildHtml('form.additional.info') ?>
         <div class="form-actions">
             <div class="actions">
-                <button class="action-retrieve action-primary" type="submit"><span><?= /* @escapeNotVerified */ __('Retrieve Password') ?></span></button>
+                <button class="action-retrieve action-primary" type="submit"><span><?= $block->escapeHtml(__('Retrieve Password')) ?></span></button>
             </div>
             <div class="links">
-                <a class="action-back" href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml', ['_nosecret' => true]) ?>">
-                    <?= /* @escapeNotVerified */ __('Back to Sign in') ?>
+                <a class="action-back" href="<?= $block->escapeUrl($block->getUrl('adminhtml', ['_nosecret' => true])) ?>">
+                    <?= $block->escapeHtml(__('Back to Sign in')) ?>
                 </a>
             </div>
         </div>
diff --git a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword_url.phtml b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword_url.phtml
index 9015ccc75d5a5..b8a150349b54b 100644
--- a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword_url.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword_url.phtml
@@ -3,10 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <div class="links">
-<a class="action-forgotpassword" href="<?= /* @escapeNotVerified */ $this->helper('Magento\Backend\Helper\Data')->getUrl('adminhtml/auth/forgotpassword', ['_nosecret' => true]) ?>"><?= /* @escapeNotVerified */ __('Forgot your password?') ?></a>
+<a class="action-forgotpassword" href="<?= $block->escapeUrl($block->getUrl('adminhtml/auth/forgotpassword', ['_nosecret' => true])) ?>"><?= $block->escapeHtml(__('Forgot your password?')) ?></a>
 </div>
diff --git a/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml b/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml
index cd5abcbc1fecf..596bfb4d9878a 100644
--- a/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml
@@ -3,33 +3,30 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
-<form method="post" data-mage-init='{"form": {}, "validation": {}}' action="<?= /* @escapeNotVerified */ $block->getUrl('*/auth/resetpasswordpost', ['_query' => ['id' => $block->getUserId(), 'token' => $block->getResetPasswordLinkToken()]]) ?>" id="reset-password-form" autocomplete="off">
+<form method="post" data-mage-init='{"form": {}, "validation": {}}' action="<?= $block->escapeUrl($block->getUrl('*/auth/resetpasswordpost', ['_query' => ['id' => $block->getUserId(), 'token' => $block->getResetPasswordLinkToken()]])) ?>" id="reset-password-form" autocomplete="off">
     <fieldset class="admin__fieldset">
-        <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Reset a Password') ?></span></legend><br />
-        <input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
+        <legend class="admin__legend"><span><?= $block->escapeHtml(__('Reset a Password')) ?></span></legend><br />
+        <input name="form_key" type="hidden" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" />
         <div class="admin__field _required field-password">
-            <label class="admin__field-label" for="password"><span><?= /* @escapeNotVerified */ __('New Password') ?></span></label>
+            <label class="admin__field-label" for="password"><span><?= $block->escapeHtml(__('New Password')) ?></span></label>
             <div class="admin__field-control">
                 <input type="password" class="admin__control-text" data-validate="{required:true, 'validate-admin-password':true}" name="password" id="password" placeholder="new password" autocomplete="off" />
             </div>
         </div>
         <div class="admin__field _required field-confirmation">
-            <label class="admin__field-label" for="confirmation"><span><?= /* @escapeNotVerified */ __('Confirm New Password') ?></span></label>
+            <label class="admin__field-label" for="confirmation"><span><?= $block->escapeHtml(__('Confirm New Password')) ?></span></label>
             <div class="admin__field-control">
                 <input type="password" class="admin__control-text" data-validate="{required:true, 'validate-cpassword':true}" name="confirmation" id="confirmation" placeholder="confirm new password" autocomplete="off" />
             </div>
         </div>
         <div class="form-actions">
             <div class="actions">
-                <button type="submit" title="<?= /* @escapeNotVerified */ __('Reset Password') ?>" class="action-reset action-primary"><span><?= /* @escapeNotVerified */ __('Reset Password') ?></span></button>
+                <button type="submit" title="<?= $block->escapeHtml(__('Reset Password')) ?>" class="action-reset action-primary"><span><?= $block->escapeHtml(__('Reset Password')) ?></span></button>
             </div>
             <div class="links">
-                <a class="action-back" href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml', ['_nosecret' => true]) ?>"><?= /* @escapeNotVerified */ __('Back to Sign in') ?></a>
+                <a class="action-back" href="<?= $block->escapeUrl($block->getUrl('adminhtml', ['_nosecret' => true])) ?>"><?= $block->escapeHtml(__('Back to Sign in')) ?></a>
             </div>
         </div>
     </fieldset>
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 25d8e4331a30d..796e43628dbc7 100644
--- a/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php
@@ -16,26 +13,26 @@
 
 <fieldset class="fieldset form-inline entry-edit">
     <legend class="legend">
-        <span><?= /* @escapeNotVerified */ __('Roles Resources') ?></span>
+        <span><?= $block->escapeHtml(__('Roles Resources')) ?></span>
     </legend><br />
 
     <div class="field">
-        <label class="label" for="all"><span><?= /* @escapeNotVerified */ __('Resource Access') ?></span></label>
+        <label class="label" for="all"><span><?= $block->escapeHtml(__('Resource Access')) ?></span></label>
 
         <div class="control">
             <select id="all" name="all" onchange="jQuery('[data-role=tree-resources-container]').toggle()" class="select">
-                <option value="0" <?= ($block->isEverythingAllowed() ? '' : 'selected="selected"') ?>><?= /* @escapeNotVerified */ __('Custom') ?></option>
-                <option value="1" <?= ($block->isEverythingAllowed() ? 'selected="selected"' : '') ?>><?= /* @escapeNotVerified */ __('All') ?></option>
+                <option value="0" <?= ($block->isEverythingAllowed() ? '' : 'selected="selected"') ?>><?= $block->escapeHtml(__('Custom')) ?></option>
+                <option value="1" <?= ($block->isEverythingAllowed() ? 'selected="selected"' : '') ?>><?= $block->escapeHtml(__('All')) ?></option>
             </select>
         </div>
     </div>
 
-    <div class="field<?php if ($block->isEverythingAllowed()):?> no-display<?php endif?>" data-role="tree-resources-container">
-        <label class="label"><span><?= /* @escapeNotVerified */ __('Resources') ?></span></label>
+    <div class="field<?php if ($block->isEverythingAllowed()) : ?> no-display<?php endif?>" data-role="tree-resources-container">
+        <label class="label"><span><?= $block->escapeHtml(__('Resources')) ?></span></label>
 
         <div class="control">
-            <div class="tree x-tree" data-role="resource-tree" data-mage-init='<?php
-            echo $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode([
+            <div class="tree x-tree" data-role="resource-tree" data-mage-init='<?=
+            $block->escapeHtml($this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([
                 'rolesTree' => [
                     "treeInitData" => $block->getTree(),
                     "treeInitSelectedData" => $block->getSelectedResources(),
diff --git a/app/code/Magento/User/view/adminhtml/templates/role/info.phtml b/app/code/Magento/User/view/adminhtml/templates/role/info.phtml
index 69f2627cd563f..6cf1bb373541d 100644
--- a/app/code/Magento/User/view/adminhtml/templates/role/info.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/role/info.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<form action="<?= /* @escapeNotVerified */ $block->getUrl('*/*/saverole') ?>" method="post" id="role-edit-form">
+<form action="<?= $block->escapeUrl($block->getUrl('*/*/saverole')) ?>" method="post" id="role-edit-form">
     <?= $block->getBlockHtml('formkey') ?>
 </form>
 <script>
diff --git a/app/code/Magento/User/view/adminhtml/templates/role/users.phtml b/app/code/Magento/User/view/adminhtml/templates/role/users.phtml
index d30e658512fc8..a62570d4e8cd7 100644
--- a/app/code/Magento/User/view/adminhtml/templates/role/users.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/role/users.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 <fieldset class="fieldset">
-    <legend class="legend"><span><?= /* @escapeNotVerified */ __('Role Users') ?></span></legend>
+    <legend class="legend"><span><?= $block->escapeHtml(__('Role Users')) ?></span></legend>
     <br />
     <?= $block->getGridHtml() ?>
 </fieldset>
diff --git a/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml b/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
index 964d925a5f2fd..f044e3ab41544 100644
--- a/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
@@ -3,8 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
 ?>
 <script>
 require([
@@ -16,8 +14,8 @@ require([
 ], function(jQuery, confirm, _){
 <!--
 <?php $myBlock = $block->getLayout()->getBlock('roleUsersGrid'); ?>
-<?php if (is_object($myBlock) && $myBlock->getJsObjectName()): ?>
-    var checkBoxes = $H(<?= /* @escapeNotVerified */ $myBlock->getUsers(true) ?>);
+<?php if (is_object($myBlock) && $myBlock->getJsObjectName()) : ?>
+    var checkBoxes = $H(<?= /* @noEscape */ $myBlock->getUsers(true) ?>);
     var warning = false;
     if (checkBoxes.size() > 0) {
         warning = true;
@@ -46,7 +44,7 @@ require([
 
                 if (checked) {
                     confirm({
-                        content: "<?= /* @escapeNotVerified */ __('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>",
+                        content: "<?= $block->escapeHtml(__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?')) ?>",
                         actions: {
                             confirm: function () {
                                 checkbox[0].checked = false;
@@ -95,7 +93,7 @@ require([
         if (!allCheckbox.checked && _.size(checkBoxes._object) > 0) {
             allCheckbox.checked = true;
             confirm({
-                content: "<?= /* @escapeNotVerified */ __('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?') ?>",
+                content: "<?= $block->escapeHtml(__('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?')) ?>",
                 actions: {
                     confirm: function () {
                         allCheckbox.checked = false;
@@ -108,25 +106,25 @@ require([
         }
     }
     function markCheckboxes(value) {
-        <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.rows.each(function(row)
+        <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.rows.each(function(row)
         {
             $(row).getElementsByClassName('checkbox')[0].checked = value;
-            roleUsersRowInit(<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>, row);
+            roleUsersRowInit(<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>, row);
         });
     }
     function onLoad() {
-        if (typeof <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?> !== 'undefined') {
-            <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.
+        if (typeof <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?> !== 'undefined') {
+            <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.
             rowClickCallback = roleUsersRowClick;
-            <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.
+            <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.
             initRowCallback = roleUsersRowInit;
-            <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.
+            <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.
             checkboxCheckCallback = registerUserRole;
-            <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.
+            <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.
             checkCheckboxes = massSelectUsers;
-            <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.
+            <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.
             rows.each(function (row) {
-                roleUsersRowInit(<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>, row)
+                roleUsersRowInit(<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>, row)
             });
             $('in_role_user_old').value = $('in_role_user').value;
         } else {
diff --git a/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml b/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
index 11ac72e6e382c..da5651a862cf1 100644
--- a/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <script>
 require([
@@ -14,10 +11,10 @@ require([
 ], function(){
 
 <?php $myBlock = $block->getLayout()->getBlock('user.roles.grid'); ?>
-<?php if (is_object($myBlock) && $myBlock->getJsObjectName()): ?>
+<?php if (is_object($myBlock) && $myBlock->getJsObjectName()) : ?>
     var radioBoxes = $H({});
     var warning = false;
-    var userRoles = $H(<?= /* @escapeNotVerified */ $myBlock->getSelectedRoles(true) ?>);
+    var userRoles = $H(<?= /* @noEscape */ $myBlock->getSelectedRoles(true) ?>);
     if (userRoles.size() > 0) warning = true;
     $('user_user_roles').value = userRoles.toQueryString();
 
@@ -40,7 +37,7 @@ require([
             if(checkbox[0] && !checkbox[0].checked){
                 var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
                 if (checked && warning && radioBoxes.size() > 0) {
-                    if ( !confirm("<?= /* @escapeNotVerified */ __('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>") ) {
+                    if ( !confirm("<?= $block->escapeHtml(__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?')) ?>") ) {
                         checkbox[0].checked = false;
                         for(i in radioBoxes) {
                             if( radioBoxes[i].status == 1) {
@@ -51,7 +48,7 @@ require([
                     }
                     warning = false;
                 }
-                <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.setCheckboxChecked(checkbox[0], checked);
+                <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.setCheckboxChecked(checkbox[0], checked);
             }
         }
     }
@@ -63,17 +60,17 @@ require([
         }
     }
 
-<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.rowClickCallback = roleRowClick;
-<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.initRowCallback = rolesRowInit;
-<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.checkboxCheckCallback = registerUserRole;
-<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.rows.each(function(row){rolesRowInit(<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>, row)});
+<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.rowClickCallback = roleRowClick;
+<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.initRowCallback = rolesRowInit;
+<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.checkboxCheckCallback = registerUserRole;
+<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.rows.each(function(row){rolesRowInit(<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>, row)});
 <?php endif; ?>
 
 });
 </script>
 
 <?php $editBlock = $block->getLayout()->getBlock('adminhtml.user.edit'); ?>
-<?php if (is_object($editBlock)): ?>
+<?php if (is_object($editBlock)) : ?>
     <script type="text/x-magento-init">
         {
             "[data-role=delete-user]" : {
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index 1e8faf3cc9614..afe34cac575ac 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -1246,7 +1246,7 @@ protected function _getCountryName($countryId)
             'FO' => 'Faroe Islands',
             'FR' => 'France',
             'GA' => 'Gabon',
-            'GB' => 'Great Britain and Northern Ireland',
+            'GB' => 'United Kingdom of Great Britain and Northern Ireland',
             'GD' => 'Grenada',
             'GE' => 'Georgia, Republic of',
             'GF' => 'French Guiana',
@@ -1364,7 +1364,7 @@ protected function _getCountryName($countryId)
             'ST' => 'Sao Tome and Principe',
             'SV' => 'El Salvador',
             'SY' => 'Syrian Arab Republic',
-            'SZ' => 'Swaziland',
+            'SZ' => 'Eswatini',
             'TC' => 'Turks and Caicos Islands',
             'TD' => 'Chad',
             'TG' => 'Togo',
diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json
index dd4231457a774..69ef9caa67220 100644
--- a/app/code/Magento/Usps/composer.json
+++ b/app/code/Magento/Usps/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-usps",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-shipping": "100.2.*",
         "magento/module-directory": "100.2.*",
@@ -15,7 +15,7 @@
         "lib-libxml": "*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Variable/composer.json b/app/code/Magento/Variable/composer.json
index 473df42feae8b..c1c577934b23f 100644
--- a/app/code/Magento/Variable/composer.json
+++ b/app/code/Magento/Variable/composer.json
@@ -2,14 +2,14 @@
     "name": "magento/module-variable",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-backend": "100.2.*",
         "magento/module-email": "100.2.*",
         "magento/module-store": "100.2.*",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.5",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Variable/view/adminhtml/web/variables.js b/app/code/Magento/Variable/view/adminhtml/web/variables.js
index d519053b5265a..e91f172f59fe7 100644
--- a/app/code/Magento/Variable/view/adminhtml/web/variables.js
+++ b/app/code/Magento/Variable/view/adminhtml/web/variables.js
@@ -9,7 +9,8 @@ define([
     'mage/translate',
     'Magento_Ui/js/modal/modal',
     'jquery/ui',
-    'prototype'
+    'prototype',
+    'mage/adminhtml/tools'
 ], function (jQuery, $t) {
     'use strict';
 
diff --git a/app/code/Magento/Vault/Api/PaymentTokenManagementInterface.php b/app/code/Magento/Vault/Api/PaymentTokenManagementInterface.php
index 045ba3efac12b..ef654ffa11fd4 100644
--- a/app/code/Magento/Vault/Api/PaymentTokenManagementInterface.php
+++ b/app/code/Magento/Vault/Api/PaymentTokenManagementInterface.php
@@ -20,7 +20,7 @@ interface PaymentTokenManagementInterface
      * Lists payment tokens that match specified search criteria.
      *
      * @param int $customerId Customer ID.
-     * @return \Magento\Vault\Api\Data\PaymentTokenSearchResultsInterface Payment token search result interface.
+     * @return \Magento\Vault\Api\Data\PaymentTokenSearchResultsInterface[] Payment token search result interface.
      * @since 100.1.0
      */
     public function getListByCustomerId($customerId);
@@ -56,6 +56,8 @@ public function getByGatewayToken($token, $paymentMethodCode, $customerId);
     public function getByPublicHash($hash, $customerId);
 
     /**
+     * Save token with payment link
+     *
      * @param PaymentTokenInterface $token
      * @param OrderPaymentInterface $payment
      * @return bool
diff --git a/app/code/Magento/Vault/composer.json b/app/code/Magento/Vault/composer.json
index b285718b22b50..78b524ac04ef1 100644
--- a/app/code/Magento/Vault/composer.json
+++ b/app/code/Magento/Vault/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-vault",
     "description": "",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*",
         "magento/module-sales": "101.0.*",
         "magento/module-store": "100.2.*",
@@ -12,7 +12,7 @@
         "magento/module-quote": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "101.0.4",
+    "version": "101.0.5",
     "license": [
         "proprietary"
     ],
diff --git a/app/code/Magento/Vault/view/frontend/web/template/payment/form.html b/app/code/Magento/Vault/view/frontend/web/template/payment/form.html
index 0ef330cd3014e..49cc488060120 100644
--- a/app/code/Magento/Vault/view/frontend/web/template/payment/form.html
+++ b/app/code/Magento/Vault/view/frontend/web/template/payment/form.html
@@ -19,7 +19,8 @@
             <img data-bind="attr: {
             'src': getIcons(getCardType()).url,
             'width': getIcons(getCardType()).width,
-            'height': getIcons(getCardType()).height
+            'height': getIcons(getCardType()).height,
+            'alt': getIcons(getCardType()).title
             }" class="payment-icon">
             <span translate="'ending'"></span>
             <span text="getMaskedCard()"></span>
diff --git a/app/code/Magento/Version/composer.json b/app/code/Magento/Version/composer.json
index 7f015cacb728c..8af6cbc770af2 100644
--- a/app/code/Magento/Version/composer.json
+++ b/app/code/Magento/Version/composer.json
@@ -2,11 +2,11 @@
     "name": "magento/module-version",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Webapi/Model/Soap/Fault.php b/app/code/Magento/Webapi/Model/Soap/Fault.php
index 74b1b41ee1bf5..7214f37d04468 100644
--- a/app/code/Magento/Webapi/Model/Soap/Fault.php
+++ b/app/code/Magento/Webapi/Model/Soap/Fault.php
@@ -9,6 +9,9 @@
 
 use Magento\Framework\App\State;
 
+/**
+ * Webapi Fault Model for Soap.
+ */
 class Fault
 {
     const FAULT_REASON_INTERNAL = 'Internal Error.';
@@ -39,6 +42,11 @@ class Fault
     const NODE_DETAIL_WRAPPER = 'GenericFault';
     /**#@-*/
 
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
     /**
      * @var string
      */
@@ -108,13 +116,15 @@ class Fault
      * @param \Magento\Framework\Webapi\Exception $exception
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param State $appState
+     * @param \Magento\Framework\Escaper|null $escaper
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
         Server $soapServer,
         \Magento\Framework\Webapi\Exception $exception,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
-        State $appState
+        State $appState,
+        \Magento\Framework\Escaper $escaper = null
     ) {
         $this->_soapFaultCode = $exception->getOriginator();
         $this->_parameters = $exception->getDetails();
@@ -125,6 +135,9 @@ public function __construct(
         $this->_soapServer = $soapServer;
         $this->_localeResolver = $localeResolver;
         $this->appState = $appState;
+        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\Escaper::class
+        );
     }
 
     /**
@@ -210,6 +223,8 @@ public function getLanguage()
     }
 
     /**
+     * Retrieve message
+     *
      * @return string
      */
     public function getMessage()
@@ -286,14 +301,15 @@ protected function _convertDetailsToXml($details)
     {
         $detailsXml = '';
         foreach ($details as $detailNode => $detailValue) {
-            $detailNode = htmlspecialchars($detailNode);
+            $detailNode = $this->escaper->escapeHtml($detailNode);
             if (is_numeric($detailNode)) {
                 continue;
             }
             switch ($detailNode) {
                 case self::NODE_DETAIL_TRACE:
                     if (is_string($detailValue) || is_numeric($detailValue)) {
-                        $detailsXml .= "<m:{$detailNode}>" . htmlspecialchars($detailValue) . "</m:{$detailNode}>";
+                        $detailsXml .= "<m:{$detailNode}>" . $this->escaper->escapeHtml($detailValue) .
+                            "</m:{$detailNode}>";
                     }
                     break;
                 case self::NODE_DETAIL_PARAMETERS:
@@ -331,7 +347,7 @@ protected function _getParametersXml($parameters)
                     $parameterName++;
                 }
                 $paramsXml .= "<m:$parameterNode><m:$keyNode>$parameterName</m:$keyNode><m:$valueNode>"
-                    . htmlspecialchars($parameterValue) . "</m:$valueNode></m:$parameterNode>";
+                    . $this->escaper->escapeHtml($parameterValue) . "</m:$valueNode></m:$parameterNode>";
             }
         }
         if (!empty($paramsXml)) {
diff --git a/app/code/Magento/Webapi/composer.json b/app/code/Magento/Webapi/composer.json
index 8a0dd448c22e0..9f6de6d1f118a 100644
--- a/app/code/Magento/Webapi/composer.json
+++ b/app/code/Magento/Webapi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-webapi",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-authorization": "100.2.*",
         "magento/module-integration": "100.2.*",
@@ -14,7 +14,7 @@
         "magento/module-customer": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/WebapiSecurity/composer.json b/app/code/Magento/WebapiSecurity/composer.json
index 24647ea1f980f..7a8005f702e5e 100644
--- a/app/code/Magento/WebapiSecurity/composer.json
+++ b/app/code/Magento/WebapiSecurity/composer.json
@@ -2,12 +2,12 @@
     "name": "magento/module-webapi-security",
     "description": "WebapiSecurity module provides option to loosen security on some webapi resources.",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-webapi": "100.2.*",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Weee/Model/Tax.php b/app/code/Magento/Weee/Model/Tax.php
index b7b4f815124cc..941faed0498f4 100644
--- a/app/code/Magento/Weee/Model/Tax.php
+++ b/app/code/Magento/Weee/Model/Tax.php
@@ -336,7 +336,7 @@ public function getProductWeeeAttributes(
                         $amountExclTax = $amountInclTax - $taxAmount;
                     } else {
                         $appliedRates = $this->_calculationFactory->create()->getAppliedRates($rateRequest);
-                        if (count($appliedRates) > 1) {
+                        if (is_array($appliedRates) && count($appliedRates) > 1) {
                             $taxAmount = 0;
                             foreach ($appliedRates as $appliedRate) {
                                 $taxRate = $appliedRate['percent'];
diff --git a/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Listing/Collector/WeeeTest.php b/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Listing/Collector/WeeeTest.php
index 6be1713c99004..6ba83ed7ce229 100644
--- a/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Listing/Collector/WeeeTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Listing/Collector/WeeeTest.php
@@ -50,6 +50,7 @@ protected function setUp()
             ->getMockForAbstractClass();
 
         $this->weeeAdjustmentAttributeFactory = $this->getMockBuilder(WeeeAdjustmentAttributeInterfaceFactory::class)
+            ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
 
@@ -58,6 +59,7 @@ protected function setUp()
             ->getMock();
 
         $this->priceInfoExtensionFactory = $this->getMockBuilder(PriceInfoExtensionInterfaceFactory::class)
+            ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
 
diff --git a/app/code/Magento/Weee/composer.json b/app/code/Magento/Weee/composer.json
index 206af1f6d150a..e5e56e2449059 100644
--- a/app/code/Magento/Weee/composer.json
+++ b/app/code/Magento/Weee/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-weee",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-catalog": "102.0.*",
         "magento/module-tax": "100.2.*",
@@ -21,7 +21,7 @@
         "magento/module-bundle": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.2.3",
+    "version": "100.2.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Weee/etc/adminhtml/system.xml b/app/code/Magento/Weee/etc/adminhtml/system.xml
index ae02b27d10c72..d3e9efb8f0b46 100644
--- a/app/code/Magento/Weee/etc/adminhtml/system.xml
+++ b/app/code/Magento/Weee/etc/adminhtml/system.xml
@@ -44,6 +44,7 @@
             <group id="totals_sort">
                 <field id="weee" translate="label" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Fixed Product Tax</label>
+                    <validate>required-number validate-number</validate>
                 </field>
             </group>
         </section>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
index ea35eff438c0d..467e61e2f97be 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
@@ -3,65 +3,62 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $block */
 
 /** @var $_weeeHelper \Magento\Weee\Helper\Data */
-$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
+$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
 
 $_item = $block->getItem();
 ?>
 
-<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()): ?>
+<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()) : ?>
     <div class="price-excl-tax">
-        <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+        <?php if ($block->displayBothPrices()) : ?>
+            <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
         <?php endif; ?>
 
         <?= $block->getRowPriceExclTaxHtml() ?>
 
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-            <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
+            <?php if ($block->displayPriceWithWeeeDetails()) : ?>
                 <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->displayPrices($tax['base_row_amount'], $tax['row_amount']) ?></span>
+                    <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
+                        <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->displayPrices($tax['base_row_amount'], $tax['row_amount']) ?></span>
                     <?php endforeach; ?>
                 </small>
             <?php endif; ?>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <br />
-                <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
+                <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
                     <?= $block->getFinalRowPriceExclTaxHtml() ?>
                 </span>
             <?php endif; ?>
         <?php endif; ?>
     </div>
 <?php endif; ?>
-<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()): ?>
+<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()) : ?>
     <div class="price-incl-tax">
-        <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+        <?php if ($block->displayBothPrices()) : ?>
+            <span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
         <?php endif; ?>
         <?= $block->getRowPriceInclTaxHtml() ?>
 
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
             <br />
-            <?php if ($block->displayPriceWithWeeeDetails()): ?>
+            <?php if ($block->displayPriceWithWeeeDetails()) : ?>
                 <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']) ?></span>
+                    <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
+                        <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']) ?></span>
                     <?php endforeach; ?>
                 </small>
             <?php endif; ?>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <br />
-                <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
+                <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
                     <?= $block->getFinalRowPriceInclTaxHtml() ?>
                 </span>
             <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml
index fa55009fb5b6f..33dfaf6376bd4 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?php
 /** @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $block */
@@ -13,4 +11,4 @@
 $_item = $block->getItem();
 ?>
 
-<?= /* @escapeNotVerified */ $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
+<?= /* @noEscape */ $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
index 13eca4afd2e8e..b23226a78119e 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
@@ -3,66 +3,63 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Weee\Block\Adminhtml\Items\Price\Renderer $block */
 
 /** @var $_weeeHelper \Magento\Weee\Helper\Data */
-$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
+$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
 
 $_item = $block->getItem();
 ?>
 
-<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()): ?>
+<?php if ($block->displayBothPrices() || $block->displayPriceExclTax()) : ?>
     <div class="price-excl-tax">
-        <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+        <?php if ($block->displayBothPrices()) : ?>
+            <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
         <?php endif; ?>
 
         <?= $block->getUnitPriceExclTaxHtml() ?>
 
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
             <br />
-            <?php if ($block->displayPriceWithWeeeDetails()): ?>
+            <?php if ($block->displayPriceWithWeeeDetails()) : ?>
                 <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->displayPrices($tax['base_amount'], $tax['amount']) ?></span>
+                    <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
+                        <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->displayPrices($tax['base_amount'], $tax['amount']) ?></span>
                     <?php endforeach; ?>
                 </small>
             <?php endif; ?>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <br />
-                <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
+                <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
                     <?= $block->getFinalUnitPriceExclTaxHtml() ?>
                 </span>
             <?php endif; ?>
         <?php endif; ?>
     </div>
 <?php endif; ?>
-<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()): ?>
+<?php if ($block->displayBothPrices() || $block->displayPriceInclTax()) : ?>
     <div class="price-incl-tax">
-        <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+        <?php if ($block->displayBothPrices()) : ?>
+            <span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
         <?php endif; ?>
         <?= $block->getUnitPriceInclTaxHtml() ?>
 
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
             <br />
-            <?php if ($block->displayPriceWithWeeeDetails()): ?>
+            <?php if ($block->displayPriceWithWeeeDetails()) : ?>
                 <small>
-                    <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']) ?></span>
+                    <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
+                        <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']) ?></span>
                     <?php endforeach; ?>
                 </small>
             <?php endif; ?>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <br />
-                <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
+                <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
                     <?= $block->getFinalUnitPriceInclTaxHtml() ?>
                 </span>
             <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
index d9bd79e65a153..402646fadb1a6 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
@@ -13,50 +10,50 @@
 $_item = $block->getItem();
 ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
+    <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
 
 
-    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
         <br />
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount'], true, true) ?></span><br />
+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
+                    <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
-        <?php if ($block->displayFinalPrice()): ?>
+        <?php if ($block->displayFinalPrice()) : ?>
             <br />
-            <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
+            <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
             </span>
         <?php endif; ?>
     <?php endif; ?>
 <?php endif; ?>
 
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
-    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+    <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
         <br />
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
+                    <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
-        <?php if ($block->displayFinalPrice()): ?>
-            <span class="nobr"><?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>:<br />
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
+        <?php if ($block->displayFinalPrice()) : ?>
+            <span class="nobr"><?= $block->escapeHtml(__('Total Incl. Tax')) ?>:<br />
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
             </span>
         <?php endif; ?>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml
index bda7b807c6094..a66641777351e 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml
@@ -3,64 +3,60 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Weee\Block\Item\Price\Renderer $block */
-
-$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
+$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
 $_item = $block->getItem();
 ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
     <?php $_rowTotalWithoutDiscount = $block->getRowDisplayPriceExclTax() - $_item->getTotalDiscountAmount(); ?>
-    <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+    <?php if ($block->displayBothPrices()) : ?>
+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
+    <?= /* @noEscape */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
 
 
-    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
         <br />
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount'], true, true) ?></span><br />
+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
+                    <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
-        <?php if ($block->displayFinalPrice()): ?>
+        <?php if ($block->displayFinalPrice()) : ?>
             <br />
-            <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax() - $_item->getTotalDiscountAmount()) ?>
+            <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax() - $_item->getTotalDiscountAmount()) ?>
             </span>
         <?php endif; ?>
     <?php endif; ?>
 <?php endif; ?>
 
 
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
     <?php $_incl = $block->getTotalAmount($_item); ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice(max(0, $_incl)) ?>
-    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+    <?= /* @noEscape */ $block->formatPrice(max(0, $_incl)) ?>
+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
         <br />
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
+                    <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
-        <?php if ($block->displayFinalPrice()): ?>
-            <span class="nobr"><?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>:<br />
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax() - $_item->getTotalDiscountAmount()) ?>
+        <?php if ($block->displayFinalPrice()) : ?>
+            <span class="nobr"><?= $block->escapeHtml(__('Total Incl. Tax')) ?>:<br />
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax() - $_item->getTotalDiscountAmount()) ?>
             </span>
         <?php endif; ?>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml
index d56e0fc3ebb3f..9bcfc71d066eb 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Weee\Block\Item\Price\Renderer $block */
@@ -13,51 +10,51 @@
 $_item = $block->getItem();
 ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
+        <span class="label"><?= $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
+    <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
 
-    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
         <br />
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount'], true, true) ?></span><br />
+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
+                    <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
-        <?php if ($block->displayFinalPrice()): ?>
+        <?php if ($block->displayFinalPrice()) : ?>
             <br />
-            <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
+            <span class="nobr"><?= $block->escapeHtml(__('Total')) ?>:<br />
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
             </span>
         <?php endif; ?>
     <?php endif; ?>
 <?php endif; ?>
 
 
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
+        <br /><span class="label"><?= $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
+    <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
 
-    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
         <br />
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span><br />
+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
+                    <span class="nobr"><?= $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
-        <?php if ($block->displayFinalPrice()): ?>
-            <span class="nobr"><?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>:<br />
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
+        <?php if ($block->displayFinalPrice()) : ?>
+            <span class="nobr"><?= $block->escapeHtml(__('Total Incl. Tax')) ?>:<br />
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
             </span>
         <?php endif; ?>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
index 01ecaca435d15..e3d26162d68e2 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
@@ -3,33 +3,30 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var $block \Magento\Weee\Block\Renderer\Weee\Tax */
 $data = ['fptAttribute' => [
-    'region' => $this->helper('Magento\Framework\Json\Helper\Data')->jsonDecode(
-        $this->helper('Magento\Directory\Helper\Data')->getRegionJson()
+    'region' => $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonDecode(
+        $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson()
     ),
     'itemsData' => $block->getValues(),
     'bundlePriceType' => '#price_type',
 ]];
 ?>
-<div id="attribute-<?= $block->getElement()->getHtmlId() ?>-container" class="field"
-     data-attribute-code="<?= $block->getElement()->getHtmlId() ?>"
-     data-mage-init="<?= $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($data)) ?>">
-    <label class="label"><span><?= /* @escapeNotVerified */ $block->getElement()->getLabel() ?></span></label>
+<div id="attribute-<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>-container" class="field"
+     data-attribute-code="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>"
+     data-mage-init="<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($data) ?>">
+    <label class="label"><span><?= $block->escapeHtml($block->getElement()->getLabel()) ?></span></label>
 
     <div class="control">
         <table class="data-table">
             <thead>
                 <tr>
-                    <th class="col-website" <?php if (!$block->isMultiWebsites()): ?>style="display: none;"<?php endif; ?>><?= /* @escapeNotVerified */ __('Website') ?></th>
-                    <th class="col-country required"><?= /* @escapeNotVerified */ __('Country/State') ?></th>
-                    <th class="col-tax required"><?= /* @escapeNotVerified */ __('Tax') ?></th>
-                    <th class="col-action"><?= /* @escapeNotVerified */ __('Action') ?></th>
+                    <th class="col-website" <?php if (!$block->isMultiWebsites()) : ?>style="display: none;"<?php endif; ?>><?= $block->escapeHtml(__('Website')) ?></th>
+                    <th class="col-country required"><?= $block->escapeHtml(__('Country/State')) ?></th>
+                    <th class="col-tax required"><?= $block->escapeHtml(__('Tax')) ?></th>
+                    <th class="col-action"><?= $block->escapeHtml(__('Action')) ?></th>
                 </tr>
             </thead>
             <tfoot>
@@ -44,41 +41,45 @@ $data = ['fptAttribute' => [
             Hidden field below with attribute code id is necessary for jQuery validation plugin.
             Validation message will be displayed after this field.
         -->
-        <input type="hidden" name="<?= $block->getElement()->getHtmlId() ?>" id="<?= $block->getElement()->getHtmlId() ?>" disabled="disabled">
+        <input type="hidden" name="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>" id="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>" disabled="disabled">
     </div>
 
     <script data-role="row-template" type="text/x-magento-template">
-        <tr id="<?= $block->getElement()->getHtmlId() ?>_weee_tax_row_<%- data.index %>" data-role="fpt-item-row">
-            <td class="col-website" <?php if (!$block->isMultiWebsites()): ?>style="display: none"<?php endif; ?>>
-                <select id="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_weee_tax_row_<%- data.index %>_website"
-                        name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][website_id]"
-                        class="<?= /* @escapeNotVerified */ $block->getElement()->getClass() ?> website required-entry" data-role="select-website">
-                    <?php foreach ($block->getWebsites() as $_websiteId => $_info): ?>
-                    <option value="<?= /* @escapeNotVerified */ $_websiteId ?>"><?= /* @escapeNotVerified */ $_info['name'] ?><?php if (!empty($_info['currency'])): ?>[<?= /* @escapeNotVerified */ $_info['currency'] ?>]<?php endif; ?></option>
+        <?php
+            $elementName = $block->escapeHtmlAttr($block->getElement()->getName());
+            $elementClass = $block->escapeHtmlAttr($block->getElement()->getClass());
+        ?>
+        <tr id="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>_weee_tax_row_<%- data.index %>" data-role="fpt-item-row">
+            <td class="col-website" <?php if (!$block->isMultiWebsites()) : ?>style="display: none"<?php endif; ?>>
+                <select id="<?= /* @noEscape */ $elementName ?>_weee_tax_row_<%- data.index %>_website"
+                        name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][website_id]"
+                        class="<?= /* @noEscape */ $elementClass ?> website required-entry" data-role="select-website">
+                    <?php foreach ($block->getWebsites() as $_websiteId => $_info) : ?>
+                    <option value="<?= /* @noEscape */ $_websiteId ?>"><?= $block->escapeHtml($_info['name']) ?><?php if (!empty($_info['currency'])) : ?>[<?= /* @noEscape */ $_info['currency'] ?>]<?php endif; ?></option>
                     <?php endforeach ?>
                 </select>
             </td>
             <td class="col-country">
-                <select id="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_weee_tax_row_<%- data.index %>_country"
-                        name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][country]"
-                        class="<?= /* @escapeNotVerified */ $block->getElement()->getClass() ?> country required-entry" data-role="select-country">
-                    <?php foreach ($block->getCountries() as $_country): ?>
-                    <option value="<?= /* @escapeNotVerified */ $_country['value'] ?>"><?= /* @escapeNotVerified */ htmlspecialchars($_country['label']) ?></option>
+                <select id="<?= /* @noEscape */ $elementName ?>_weee_tax_row_<%- data.index %>_country"
+                        name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][country]"
+                        class="<?= /* @noEscape */ $elementClass ?> country required-entry" data-role="select-country">
+                    <?php foreach ($block->getCountries() as $_country) : ?>
+                    <option value="<?= $block->escapeHtmlAttr($_country['value']) ?>"><?= $block->escapeHtml($_country['label']) ?></option>
                     <?php endforeach ?>
                 </select>
-                <select id="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_weee_tax_row_<%- data.index %>_state"
-                        name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][state]"
-                        class="<?= /* @escapeNotVerified */ $block->getElement()->getClass() ?> state" disabled="" data-role="select-state">
+                <select id="<?= /* @noEscape */ $elementName ?>_weee_tax_row_<%- data.index %>_state"
+                        name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][state]"
+                        class="<?= /* @noEscape */ $elementClass ?> state" disabled="" data-role="select-state">
                     <option value="0">*</option>
                 </select>
             </td>
             <td class="col-tax">
-                <input name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][price]"
-                       class="<?= /* @escapeNotVerified */ $block->getElement()->getClass() ?> required-entry validate-greater-than-zero"
+                <input name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][price]"
+                       class="<?= /* @noEscape */ $elementClass ?> required-entry validate-greater-than-zero"
                        type="text" value="<%- data.value %>"/>
             </td>
             <td class="col-action">
-                <input name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][delete]" class="delete" type="hidden" value="" data-role="delete-fpt-item"/>
+                <input name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][delete]" class="delete" type="hidden" value="" data-role="delete-fpt-item"/>
                 <?= $block->getChildHtml('delete_button') ?>
             </td>
         </tr>
diff --git a/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml b/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
index c05d48cab6a43..a2b5ad4f196e8 100644
--- a/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
+++ b/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 
 <?php
@@ -18,34 +15,37 @@ $taxDisplay = $block->getTaxDisplayConfig();
 $priceDisplay = $block->isPriceIncludesTax();
 ?>
 
-<?php if ($block->showInclDescr() || $block->showExclDescrIncl()): // incl. + weee ||  excl. + weee + final ?>
-    <?php foreach ($block->getWeeeTaxAttributes() as $weeeTaxAttribute): ?>
-        <?php if ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_INCLUDING_TAX): ?>
+<?php if ($block->showInclDescr() || $block->showExclDescrIncl()) : // incl. + weee ||  excl. + weee + final ?>
+    <?php foreach ($block->getWeeeTaxAttributes() as $weeeTaxAttribute) : ?>
+        <?php
+            $attributeName = $block->escapeHtmlAttr($block->renderWeeeTaxAttributeName($weeeTaxAttribute));
+        ?>
+        <?php if ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_INCLUDING_TAX) : ?>
             <span class="weee"
                   data-price-type="weee"
-                  data-label="<?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeName($weeeTaxAttribute) ?>">
-                            <?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeWithTax($weeeTaxAttribute) ?></span>
-        <?php elseif ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_EXCLUDING_TAX): ?>
+                  data-label="<?= /* @noEscape */ $attributeName ?>">
+                            <?= /* @noEscape */ $block->renderWeeeTaxAttributeWithTax($weeeTaxAttribute) ?></span>
+        <?php elseif ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_EXCLUDING_TAX) : ?>
             <span class="weee"
                   data-price-type="weee"
-                  data-label="<?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeName($weeeTaxAttribute) ?>">
-                            <?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeWithoutTax($weeeTaxAttribute) ?></span>
-        <?php elseif ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_BOTH): ?>
+                  data-label="<?= /* @noEscape */ $attributeName ?>">
+                            <?= /* @noEscape */ $block->renderWeeeTaxAttributeWithoutTax($weeeTaxAttribute) ?></span>
+        <?php elseif ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_BOTH) : ?>
             <span class="weee"
                   data-price-type="weee"
-                  data-label="<?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeName($weeeTaxAttribute) . ' Incl. Tax' ?>">
-                            <?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeWithTax($weeeTaxAttribute) ?></span>
+                  data-label="<?= /* @noEscape */ $attributeName . ' ' . $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
+                            <?= /* @noEscape */ $block->renderWeeeTaxAttributeWithTax($weeeTaxAttribute) ?></span>
             <span class="weee"
                   data-price-type="weee"
-                  data-label="<?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeName($weeeTaxAttribute) . ' Excl. Tax' ?>">
-                            <?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeWithoutTax($weeeTaxAttribute) ?></span>
+                  data-label="<?= /* @noEscape */ $attributeName . ' ' . $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
+                            <?= /* @noEscape */ $block->renderWeeeTaxAttributeWithoutTax($weeeTaxAttribute) ?></span>
         <?php endif; ?>
     <?php endforeach; ?>
 <?php endif; ?>
 
-<?php if ($block->showExclDescrIncl()): // excl. + weee + final ?>
+<?php if ($block->showExclDescrIncl()) : // excl. + weee + final ?>
     <span class="price-final price-final_price"
           data-price-type="weeePrice"
-          data-price-amount="<?= /* @escapeNotVerified */ $block->getRawFinalAmount() ?>"
-          data-label="<?= /* @escapeNotVerified */ __('Final Price') ?>"><?= /* @escapeNotVerified */ $block->getFinalAmount() ?></span>
+          data-price-amount="<?= /* @noEscape */ $block->getRawFinalAmount() ?>"
+          data-label="<?= $block->escapeHtmlAttr(__('Final Price')) ?>"><?= /* @noEscape */ $block->getFinalAmount() ?></span>
 <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
index 9c7a77c54a373..440b8784e9161 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $item = $block->getItem();
@@ -15,30 +13,30 @@ $originalZone = $block->getZone();
 $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART);
 ?>
 
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
-    <?php if ($block->displayPriceWithWeeeDetails()): ?>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+    <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
+    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
         <span class="minicart-tax-total">
-    <?php else: ?>
+    <?php else : ?>
         <span class="minicart-price">
     <?php endif; ?>
-        <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
+        <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
         </span>
 
-    <?php if ($block->displayPriceWithWeeeDetails()): ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
+    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
             <span class="minicart-tax-info">
-            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
-                    <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
+            <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
+                <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
+                    <?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
                 </span>
             <?php endforeach; ?>
             </span>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <span class="minicart-tax-total">
-                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
+                        <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
                     </span>
                 </span>
             <?php endif; ?>
@@ -47,30 +45,30 @@ $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART);
     </span>
 <?php endif; ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
-    <?php if ($block->displayPriceWithWeeeDetails()): ?>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
+    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
         <span class="minicart-tax-total">
-    <?php else: ?>
+    <?php else : ?>
         <span class="minicart-price">
     <?php endif; ?>
-        <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
+        <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
         </span>
 
-    <?php if ($block->displayPriceWithWeeeDetails()): ?>
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
+    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
             <span class="minicart-tax-info">
-            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
-                    <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount'], true, true) ?>
+            <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
+                <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
+                    <?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?>
                 </span>
             <?php endforeach; ?>
             </span>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <span class="minicart-tax-total">
-                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
+                        <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
                     </span>
                 </span>
             <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
index bc63a5eff642b..b4a2c5d853527 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
@@ -4,33 +4,31 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
 ?>
-<?php if ($block->displayPriceWithWeeeDetails()): ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
-<?php else: ?>
+<?php if ($block->displayPriceWithWeeeDetails()) : ?>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
+<?php else : ?>
     <span class="cart-price">
 <?php endif; ?>
-<?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
+<?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
     </span>
 
-<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="esubtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>" style="display: none;">
-    <?php if ($block->displayPriceWithWeeeDetails()): ?>
-        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-            <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>"><?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount'], true, true) ?></span>
+<?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
+    <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int) $_item->getId() ?>" style="display: none;">
+    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
+        <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
+            <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?></span>
         <?php endforeach; ?>
     <?php endif; ?>
     </span>
 
-    <?php if ($block->displayFinalPrice()): ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
-            <span class="weee" data-label="<?= /* @escapeNotVerified */ __('Total') ?>">
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
+    <?php if ($block->displayFinalPrice()) : ?>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
+            <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
             </span>
         </span>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
index a85904e197bfb..4dfe07d5b062d 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
@@ -4,36 +4,34 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
 /** @var $_weeeHelper \Magento\Weee\Helper\Data */
-$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
+$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
 ?>
 <?php $_incl = $_item->getRowTotalInclTax(); ?>
-<?php if ($block->displayPriceWithWeeeDetails()): ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
-<?php else: ?>
+<?php if ($block->displayPriceWithWeeeDetails()) : ?>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
+<?php else : ?>
     <span class="cart-price">
 <?php endif; ?>
-<?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
+<?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
     </span>
 
-<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="subtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>" style="display: none;">
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
-            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>"><?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span>
+<?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
+    <span class="cart-tax-info" id="subtotal-item-tax-details<?= (int) $_item->getId() ?>" style="display: none;">
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
+            <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
+                <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span>
             <?php endforeach; ?>
         <?php endif; ?>
     </span>
 
-    <?php if ($block->displayFinalPrice()): ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
-            <span class="weee" data-label="<?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>">
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
+    <?php if ($block->displayFinalPrice()) : ?>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
+            <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
             </span>
         </span>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
index dc1d22ff3b0dd..429695b43840a 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
@@ -4,34 +4,31 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
 ?>
-<?php if ($block->displayPriceWithWeeeDetails()): ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
-<?php else: ?>
+<?php if ($block->displayPriceWithWeeeDetails()) : ?>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
+<?php else : ?>
     <span class="cart-price">
 <?php endif; ?>
 
-<?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
+<?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
     </span>
-
-<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="eunit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>" style="display:none;">
-    <?php if ($block->displayPriceWithWeeeDetails()): ?>
-        <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-            <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>"><?= /* @escapeNotVerified */ $block->formatPrice($tax['amount'], true, true) ?></span>
+<?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
+    <span class="cart-tax-info" id="eunit-item-tax-details<?= (int) $_item->getId() ?>" style="display:none;">
+    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
+        <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
+            <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?></span>
         <?php endforeach; ?>
     <?php endif; ?>
     </span>
 
-    <?php if ($block->displayFinalPrice()): ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
-            <span class="weee" data-label="<?= /* @escapeNotVerified */ __('Total') ?>">
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
+    <?php if ($block->displayFinalPrice()) : ?>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
+            <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
             </span>
         </span>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
index 3b7c2f530d3be..2aa480b83983d 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
@@ -4,37 +4,35 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $_item = $block->getItem();
 /** @var $_weeeHelper \Magento\Weee\Helper\Data */
-$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
+$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
 ?>
 <?php $_incl = $_item->getPriceInclTax(); ?>
-<?php if ($block->displayPriceWithWeeeDetails()): ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
-<?php else: ?>
+<?php if ($block->displayPriceWithWeeeDetails()) : ?>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
+<?php else : ?>
     <span class="cart-price">
 <?php endif; ?>
 
-<?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
+<?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
     </span>
 
-<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="unit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>" style="display: none;">
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
-            <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>"><?= /* @escapeNotVerified */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span>
+<?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
+    <span class="cart-tax-info" id="unit-item-tax-details<?= (int) $_item->getId() ?>" style="display: none;">
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
+            <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
+                <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span>
             <?php endforeach; ?>
         <?php endif; ?>
     </span>
 
-    <?php if ($block->displayFinalPrice()): ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
-            <span class="weee" data-label="<?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>">
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
+    <?php if ($block->displayFinalPrice()) : ?>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
+            <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
+                <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
             </span>
         </span>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
index bd0eefd9d2b98..5241da22470e8 100644
--- a/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
@@ -3,62 +3,59 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 ?>
 <?php
 /** @var \Magento\Weee\Block\Item\Price\Renderer $block */
 
 /** @var $_weeeHelper \Magento\Weee\Helper\Data */
-$_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
+$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
 
 $_item = $block->getItem();
 /** @var \Magento\Sales\Model\Order $_order */
 $_order = $_item->getOrder();
 ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?= /* @escapeNotVerified */  __('Excl. Tax') ?>:</span>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
+        <span class="label"><?=  $block->escapeHtml(__('Excl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */  $_order->formatPrice($block->getRowDisplayPriceExclTax()) ?>
+    <?= /* @noEscape */  $_order->formatPrice($block->getRowDisplayPriceExclTax()) ?>
 
-    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
         <br />
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?= /* @escapeNotVerified */  $tax['title'] ?>: <?= /* @escapeNotVerified */  $_order->formatPrice($tax['row_amount'], true, true) ?></span><br />
+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
+                    <span class="nobr"><?=  $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */  $_order->formatPrice($tax['row_amount'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
-        <?php if ($block->displayFinalPrice()): ?>
+        <?php if ($block->displayFinalPrice()) : ?>
             <br />
-            <span class="nobr"><?= /* @escapeNotVerified */  __('Total') ?>:<br /> <?= /* @escapeNotVerified */  $_order->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?></span>
+            <span class="nobr"><?=  $block->escapeHtml(__('Total')) ?>:<br /> <?= /* @noEscape */  $_order->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?></span>
         <?php endif; ?>
     <?php endif; ?>
 <?php endif; ?>
 
 
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?= /* @escapeNotVerified */  __('Incl. Tax') ?>:</span>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+    <?php if ($block->displayBothPrices()) : ?>
+        <br /><span class="label"><?=  $block->escapeHtml(__('Incl. Tax')) ?>:</span>
     <?php endif; ?>
-    <?= /* @escapeNotVerified */  $_order->formatPrice($block->getRowDisplayPriceInclTax()) ?>
-    <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+    <?= /* @noEscape */  $_order->formatPrice($block->getRowDisplayPriceInclTax()) ?>
+    <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
         <br />
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <small>
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?= /* @escapeNotVerified */  $tax['title'] ?>: <?= /* @escapeNotVerified */  $_order->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
+                    <span class="nobr"><?=  $block->escapeHtml($tax['title']) ?>: <?= /* @noEscape */  $_order->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
-        <?php if ($block->displayFinalPrice()): ?>
-            <span class="nobr"><?= /* @escapeNotVerified */  __('Total Incl. Tax') ?>:<br /> <?= /* @escapeNotVerified */  $_order->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?></span>
+        <?php if ($block->displayFinalPrice()) : ?>
+            <span class="nobr"><?=  $block->escapeHtml(__('Total Incl. Tax')) ?>:<br /> <?= /* @noEscape */  $_order->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?></span>
         <?php endif; ?>
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
index dc128902ef4d2..2bd079f84ee71 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
@@ -4,37 +4,35 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $item = $block->getItem();
 ?>
-<?php if (($block->displayPriceInclTax() || $block->displayBothPrices()) && !$item->getNoSubtotal()): ?>
-    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+<?php if (($block->displayPriceInclTax() || $block->displayBothPrices()) && !$item->getNoSubtotal()) : ?>
+    <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
-        <?php else: ?>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int) $item->getId() ?>"}}'>
+        <?php else : ?>
             <span class="cart-price">
         <?php endif; ?>
-            <?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
+            <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
             </span>
 
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
-            <div class="cart-tax-info" id="subtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>" style="display: none;">
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?>
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
+            <div class="cart-tax-info" id="subtotal-item-tax-details<?= (int) $item->getId() ?>" style="display: none;">
+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
+                        <?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </div>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <span class="cart-tax-total"
-                    data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
-                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
+                    data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int) $item->getId() ?>"}}'>
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
+                        <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
                     </span>
                 </span>
             <?php endif; ?>
@@ -42,32 +40,32 @@ $item = $block->getItem();
     </span>
 <?php endif; ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
-        <?php else: ?>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int) $item->getId() ?>"}}'>
+        <?php else : ?>
             <span class="cart-price">
         <?php endif; ?>
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
+                <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
             </span>
 
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
-            <span class="cart-tax-info" id="esubtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
+            <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int) $item->getId() ?>"
                 style="display: none;">
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount'], true, true) ?>
+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
+                        <?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </span>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <span class="cart-tax-total"
-                      data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
-                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
+                      data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int) $item->getId() ?>"}}'>
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
+                        <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
                     </span>
                 </span>
             <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml
index 03c050e0a0b04..7ffeb323b8b8c 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml
@@ -3,11 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
+// phpcs:disable PSR2.Files.ClosingTag
 /** @var \Magento\Weee\Block\Item\Price\Renderer $block */
 $_item = $block->getItem();
 ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<?= /* @escapeNotVerified */ $_order->formatPrice($block->getTotalAmount($_item)) ?>
+<?= /* @noEscape */ $_order->formatPrice($block->getTotalAmount($_item)) ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
index 575a0dd6c9aa8..d814ce29c26b6 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
@@ -4,37 +4,35 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /** @var $block \Magento\Weee\Block\Item\Price\Renderer */
 
 $item = $block->getItem();
 ?>
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+    <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
-        <?php else: ?>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int) $item->getId() ?>"}}'>
+        <?php else : ?>
             <span class="cart-price">
         <?php endif; ?>
-            <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
+            <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
             </span>
 
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
-            <span class="cart-tax-info" id="unit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>" style="display: none;">
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
+            <span class="cart-tax-info" id="unit-item-tax-details<?= (int) $item->getId() ?>" style="display: none;">
+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
+                        <?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </span>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <span class="cart-tax-total"
-                    data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
-                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
+                    data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int) $item->getId() ?>"}}'>
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
+                        <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
                     </span>
                 </span>
             <?php endif; ?>
@@ -42,32 +40,32 @@ $item = $block->getItem();
     </span>
 <?php endif; ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
-        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
+        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
-        <?php else: ?>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int) $item->getId() ?>"}}'>
+        <?php else : ?>
             <span class="cart-price">
         <?php endif; ?>
-                <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
+                <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
             </span>
 
-        <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
-            <span class="cart-tax-info" id="eunit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"
+        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
+            <span class="cart-tax-info" id="eunit-item-tax-details<?= (int) $item->getId() ?>"
                 style="display: none;">
-                <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount'], true, true) ?>
+                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
+                        <?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </span>
 
-            <?php if ($block->displayFinalPrice()): ?>
+            <?php if ($block->displayFinalPrice()) : ?>
                 <span class="cart-tax-total"
-                      data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
-                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
-                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
+                      data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int) $item->getId() ?>"}}'>
+                    <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
+                        <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
                     </span>
                 </span>
             <?php endif; ?>
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget.php b/app/code/Magento/Widget/Block/Adminhtml/Widget.php
index 975d206766b0c..56f97f58c3800 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget.php
@@ -12,11 +12,12 @@
  *
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
  */
 class Widget extends \Magento\Backend\Block\Widget\Form\Container
 {
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -36,12 +37,16 @@ protected function _construct()
         $this->buttonList->update('save', 'region', 'footer');
         $this->buttonList->update('save', 'data_attribute', []);
 
-        $this->_formScripts[] = 'require(["mage/adminhtml/wysiwyg/widget"], function(){wWidget = new WysiwygWidget.Widget(' .
-            '"widget_options_form", "select_widget_type", "widget_options", "' .
-            $this->getUrl(
-                'adminhtml/*/loadOptions'
-            ) . '", "' . $this->getRequest()->getParam(
-                'widget_target_id'
-            ) . '");});';
+        $this->_formScripts[] = <<<EOJS
+ 		require(['mage/adminhtml/wysiwyg/widget'], function() {
+ 		    wWidget = new WysiwygWidget.Widget(
+ 		        'widget_options_form',
+ 		        'select_widget_type',
+ 		        'widget_options',
+ 		        '{$this->getUrl('adminhtml/*/loadOptions')}',
+ 		        '{$this->escapeJs($this->getRequest()->getParam('widget_target_id'))}'
+ 		    );
+ 		});
+EOJS;
     }
 }
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
index beac66dce5016..c1182505bc0c6 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php
@@ -91,7 +91,7 @@ public function getMainFieldset()
         if ($this->_getData('main_fieldset') instanceof \Magento\Framework\Data\Form\Element\Fieldset) {
             return $this->_getData('main_fieldset');
         }
-        $mainFieldsetHtmlId = 'options_fieldset' . md5($this->getWidgetType());
+        $mainFieldsetHtmlId = 'options_fieldset' . hash('sha256', $this->getWidgetType());
         $this->setMainFieldsetHtmlId($mainFieldsetHtmlId);
         $fieldset = $this->getForm()->addFieldset(
             $mainFieldsetHtmlId,
@@ -141,7 +141,6 @@ protected function _addField($parameter)
     {
         $form = $this->getForm();
         $fieldset = $this->getMainFieldset();
-        //$form->getElement('options_fieldset');
 
         // prepare element data with values (either from request of from default values)
         $fieldName = $parameter->getKey();
@@ -159,15 +158,19 @@ protected function _addField($parameter)
             $data['value'] = $parameter->getValue();
             //prepare unique id value
             if ($fieldName == 'unique_id' && $data['value'] == '') {
-                $data['value'] = md5(microtime(1));
+                $data['value'] = hash('sha256', microtime(1));
             }
         }
 
         if (is_array($data['value'])) {
             foreach ($data['value'] as &$value) {
-                $value = html_entity_decode($value);
+                if (is_string($value)) {
+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                    $value = html_entity_decode($value);
+                }
             }
         } else {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $data['value'] = html_entity_decode($data['value']);
         }
 
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php
index d9ef20aa90e47..b52df887b47e2 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/BuildWidget.php
@@ -6,6 +6,8 @@
  */
 namespace Magento\Widget\Controller\Adminhtml\Widget;
 
+use Magento\Framework\App\ObjectManager;
+
 class BuildWidget extends \Magento\Backend\App\Action
 {
     /**
@@ -18,15 +20,25 @@ class BuildWidget extends \Magento\Backend\App\Action
      */
     protected $_widget;
 
+    /**
+     * @var \Magento\Framework\Serialize\SerializerInterface
+     */
+    private $serializer;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Widget\Model\Widget $widget
+     * @param \Magento\Framework\Serialize\SerializerInterface|null $serializer
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
-        \Magento\Widget\Model\Widget $widget
+        \Magento\Widget\Model\Widget $widget,
+        \Magento\Framework\Serialize\SerializerInterface $serializer = null
     ) {
         $this->_widget = $widget;
+        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(
+            \Magento\Framework\Serialize\SerializerInterface::class
+        );
         parent::__construct($context);
     }
 
@@ -37,6 +49,13 @@ public function __construct(
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            $this->getResponse()->representJson(
+                $this->serializer->serialize(['error' => true, 'message' => 'Invalid request'])
+            );
+            return;
+        }
+
         $type = $this->getRequest()->getPost('widget_type');
         $params = $this->getRequest()->getPost('parameters', []);
         $asIs = $this->getRequest()->getPost('as_is');
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php
index 6909f6058074e..c914f93e257f4 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Index.php
@@ -6,6 +6,8 @@
  */
 namespace Magento\Widget\Controller\Adminhtml\Widget;
 
+use Magento\Framework\Exception\NotFoundException;
+
 class Index extends \Magento\Backend\App\Action
 {
     /**
@@ -41,12 +43,16 @@ public function __construct(
     }
 
     /**
-     * Wisywyg widget plugin main page
+     * Wysiwyg widget plugin main page
      *
      * @return void
+     * @throws NotFoundException
      */
     public function execute()
     {
+        if (!$this->getRequest()->isPost()) {
+            throw new NotFoundException(__('Page not found'));
+        }
         // save extra params for widgets insertion form
         $skipped = $this->getRequest()->getParam('skip_widgets');
         $skipped = $this->_widgetConfig->decodeWidgetsFromQuery($skipped);
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php
index 98275c3b906db..0b38c5d99ca24 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php
@@ -16,7 +16,7 @@ class Save extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
     public function execute()
     {
         $widgetInstance = $this->_initWidgetInstance();
-        if (!$widgetInstance) {
+        if (!$this->getRequest()->isPost() || !$widgetInstance) {
             $this->_redirect('adminhtml/*/');
             return;
         }
diff --git a/app/code/Magento/Widget/Model/Widget.php b/app/code/Magento/Widget/Model/Widget.php
index f83fadf694784..8f0b31372b7b5 100644
--- a/app/code/Magento/Widget/Model/Widget.php
+++ b/app/code/Magento/Widget/Model/Widget.php
@@ -315,7 +315,7 @@ public function getWidgetDeclaration($type, $params = [], $asIs = true)
                 }
             }
             if (isset($value)) {
-                $directive .= sprintf(' %s="%s"', $name, $this->escaper->escapeQuote($value));
+                $directive .= sprintf(' %s="%s"', $name, $this->escaper->escapeHtmlAttr($value, false));
             }
         }
 
diff --git a/app/code/Magento/Widget/Setup/LayoutUpdateConverter.php b/app/code/Magento/Widget/Setup/LayoutUpdateConverter.php
index 54c364dcc49a4..39b3d3c4b5a6e 100644
--- a/app/code/Magento/Widget/Setup/LayoutUpdateConverter.php
+++ b/app/code/Magento/Widget/Setup/LayoutUpdateConverter.php
@@ -16,6 +16,11 @@
  */
 class LayoutUpdateConverter extends SerializedToJson
 {
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
     /**
      * @var Normalizer
      */
@@ -27,13 +32,18 @@ class LayoutUpdateConverter extends SerializedToJson
      * @param Serialize $serialize
      * @param Json $json
      * @param Normalizer $normalizer
+     * @param \Magento\Framework\Escaper|null $escaper
      */
     public function __construct(
         Serialize $serialize,
         Json $json,
-        Normalizer $normalizer
+        Normalizer $normalizer,
+        \Magento\Framework\Escaper $escaper = null
     ) {
         $this->normalizer = $normalizer;
+        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\Escaper::class
+        );
         parent::__construct($serialize, $json);
     }
 
@@ -85,7 +95,7 @@ protected function unserializeValue($value)
      */
     protected function encodeJson($value)
     {
-        return htmlspecialchars(
+        return $this->escaper->escapeHtml(
             $this->normalizer->replaceReservedCharacters(parent::encodeJson($value))
         );
     }
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
index b6dfc00c0ff9e..89812f98ef15e 100644
--- a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
@@ -7,58 +7,93 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminCreateProductsListWidgetActionGroup">
-      <arguments>
-          <argument name="widget"/>
-      </arguments>
-      <amOnPage url="{{AdminDashboardPage.url}}" stepKey="amOnAdminDashboard"/>
-      <click selector="{{AdminMenuSection.content}}" stepKey="clickContent"/>
-      <waitForLoadingMaskToDisappear stepKey="waitForWidgets" />
-      <click selector="{{AdminMenuSection.widgets}}" stepKey="clickWidgets"/>
-      <waitForPageLoad stepKey="waitForWidgetsLoad"/>
-      <click selector="{{AdminMainActionsSection.add}}" stepKey="addNewWidget"/>
-      <selectOption selector="{{AdminNewWidgetSection.widgetType}}" userInput="{{widget.type}}" stepKey="setWidgetType"/>
-      <selectOption selector="{{AdminNewWidgetSection.widgetDesignTheme}}" userInput="{{widget.design_theme}}" stepKey="setWidgetDesignTheme"/>
-      <click selector="{{AdminNewWidgetSection.continue}}" stepKey="clickContinue"/>
-      <fillField selector="{{AdminNewWidgetSection.widgetTitle}}" userInput="{{widget.name}}" stepKey="fillTitle"/>
-      <selectOption selector="{{AdminNewWidgetSection.widgetStoreIds}}" userInput="{{widget.store_ids[0]}}" stepKey="setWidgetStoreIds"/>
-      <click selector="{{AdminNewWidgetSection.addLayoutUpdate}}" stepKey="clickAddLayoutUpdate"/>
-      <selectOption selector="{{AdminNewWidgetSection.selectDisplayOn}}" userInput="{{widget.display_on}}" stepKey="setDisplayOn"/>
-      <waitForAjaxLoad stepKey="waitForLoad"/>
-      <selectOption selector="{{AdminNewWidgetSection.selectContainer}}" userInput="{{widget.container}}" stepKey="setContainer"/>
-      <waitForAjaxLoad stepKey="waitForPageLoad"/>
-      <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-      <click selector="{{AdminNewWidgetSection.widgetOptions}}" stepKey="clickWidgetOptions"/>
-      <click selector="{{AdminNewWidgetSection.addNewCondition}}" stepKey="clickAddNewCondition"/>
-      <selectOption selector="{{AdminNewWidgetSection.selectCondition}}" userInput="{{widget.condition}}" stepKey="selectCondition"/>
-      <waitForElement selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="waitRuleParameter"/>
-      <click selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="clickRuleParameter"/>
-      <click selector="{{AdminNewWidgetSection.openChooser}}" stepKey="clickChooser"/>
-      <waitForLoadingMaskToDisappear stepKey="waitForLoadChooser"/>
-      <click selector="{{AdminNewWidgetSection.sortById}}" stepKey="clickSortById"/>
-      <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear"/>
-      <click selector="{{AdminNewWidgetSection.sortByIdAscend}}" stepKey="clickSortByIdAscend"/>
-      <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-      <click selector="{{AdminNewWidgetSection.selectAll}}" stepKey="clickSelectAll"/>
-      <click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="clickApplyRuleParameter"/>
-      <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveWidget"/>
-      <waitForPageLoad stepKey="waitForSaveLoad"/>
-      <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateWidgetActionGroup">
+        <arguments>
+            <argument name="widget"/>
+        </arguments>
+        <amOnPage url="{{AdminNewWidgetPage.url}}" stepKey="amOnAdminNewWidgetPage"/>
+        <selectOption selector="{{AdminNewWidgetSection.widgetType}}" userInput="{{widget.type}}" stepKey="setWidgetType"/>
+        <selectOption selector="{{AdminNewWidgetSection.widgetDesignTheme}}" userInput="{{widget.design_theme}}" stepKey="setWidgetDesignTheme"/>
+        <click selector="{{AdminNewWidgetSection.continue}}" stepKey="clickContinue"/>
+        <fillField selector="{{AdminNewWidgetSection.widgetTitle}}" userInput="{{widget.name}}" stepKey="fillTitle"/>
+        <selectOption selector="{{AdminNewWidgetSection.widgetStoreIds}}" userInput="{{widget.store_ids[0]}}" stepKey="setWidgetStoreIds"/>
+        <click selector="{{AdminNewWidgetSection.addLayoutUpdate}}" stepKey="clickAddLayoutUpdate"/>
+        <selectOption selector="{{AdminNewWidgetSection.selectDisplayOn}}" userInput="{{widget.display_on}}" stepKey="setDisplayOn"/>
+        <waitForAjaxLoad stepKey="waitForLoad"/>
+        <selectOption selector="{{AdminNewWidgetSection.selectContainer}}" userInput="{{widget.container}}" stepKey="setContainer"/>
+        <waitForAjaxLoad stepKey="waitForPageLoad"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+        <click selector="{{AdminNewWidgetSection.widgetOptions}}" stepKey="clickWidgetOptions"/>
     </actionGroup>
+
+    <!--Create Product List Widget-->
+    <actionGroup name="AdminCreateProductsListWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
+        <click selector="{{AdminNewWidgetSection.addNewCondition}}" stepKey="clickAddNewCondition"/>
+        <selectOption selector="{{AdminNewWidgetSection.selectCondition}}" userInput="{{widget.condition}}" stepKey="selectCondition"/>
+        <waitForElement selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="waitRuleParameter"/>
+        <click selector="{{AdminNewWidgetSection.ruleParameterEdit}}" stepKey="clickRuleParameterEdit"/>
+        <selectOption selector="{{AdminNewWidgetSection.ruleParameterEditSelect}}" userInput="{{widget.ruleIsOneOf}}" stepKey="selectRuleParameterEdit"/>
+        <click selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="clickRuleParameter"/>
+        <click selector="{{AdminNewWidgetSection.openChooser}}" stepKey="clickChooser"/>
+        <waitForPageLoad 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">
+        <selectOption selector="{{AdminNewWidgetSection.displayMode}}" userInput="{{widget.display_mode}}" stepKey="selectDisplayMode"/>
+        <selectOption selector="{{AdminNewWidgetSection.restrictTypes}}" userInput="{{widget.restrict_type}}" stepKey="selectRestrictType"/>
+        <click selector="{{AdminMainActionsSection.saveAndContinue}}" stepKey="clickSaveWidget"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
+    </actionGroup>
+
     <actionGroup name="AdminDeleteWidgetActionGroup">
-      <arguments>
-          <argument name="widget"/>
-      </arguments>
-      <amOnPage url="{{AdminWidgetsPage.url}}" stepKey="amOnAdmin"/>
-      <waitForPageLoad stepKey="waitWidgetsLoad"/>
-      <fillField selector="{{AdminWidgetsSection.widgetTitleSearch}}" userInput="{{widget.name}}" stepKey="fillTitle"/>
-      <click selector="{{AdminWidgetsSection.searchButton}}" stepKey="clickContinue"/>
-      <click selector="{{AdminWidgetsSection.searchResult}}" stepKey="clickSearchResult"/>
-      <waitForPageLoad stepKey="waitForResultLoad"/>
-      <click selector="{{AdminMainActionsSection.delete}}" stepKey="clickDelete"/>
-      <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
-      <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
-      <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been deleted" stepKey="seeSuccess"/>
+        <arguments>
+            <argument name="widget"/>
+        </arguments>
+        <amOnPage url="{{AdminWidgetsPage.url}}" stepKey="amOnAdmin"/>
+        <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"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForAjaxLoad"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been deleted" stepKey="seeSuccess"/>
+    </actionGroup>
+
+    <actionGroup name="AdminCreateWidgetWithBlockActionGroup" extends="AdminCreateWidgetActionGroup">
+        <arguments>
+            <argument name="blockTitle" type="string"/>
+        </arguments>
+        <waitForElement selector="{{AdminNewWidgetSection.widgetSelectBlock}}" time="60" after="clickWidgetOptions" stepKey="waitForSelectBlock"/>
+        <click selector="{{AdminNewWidgetSection.widgetSelectBlock}}" stepKey="openSelectBlock"/>
+        <waitForPageLoad stepKey="waitForLoadBlocks"/>
+        <waitForElementVisible selector="{{AdminSelectWidgetBlockGridSection.sectionTitle}}" stepKey="waitSectionHeaderIsLoaded"/>
+        <selectOption selector="{{AdminSelectWidgetBlockGridSection.blockStatusFilter}}" userInput="Disabled" stepKey="chooseDisabledStatus"/>
+        <fillField selector="{{AdminSelectWidgetBlockGridSection.blockTitleFilter}}" userInput="{{blockTitle}}" stepKey="fillBlockTitle"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="searchBlock"/>
+        <click selector="{{AdminDataGridTableSection.row('1')}}" stepKey="clickSearchedBlock"/>
+        <waitForPageLoad stepKey="wait"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveWidget"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The widget instance has been saved." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+
+    <actionGroup name="AdminCreateProductLinkWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+        <selectOption selector="{{AdminNewWidgetSection.selectTemplate}}" userInput="{{widget.template}}" after="waitForPageLoad" stepKey="setTemplate"/>
+        <waitForAjaxLoad stepKey="waitForPageLoad2"/>
+        <click selector="{{AdminNewWidgetSection.selectProduct}}" after="clickWidgetOptions" stepKey="clickSelectProduct"/>
+        <fillField selector="{{AdminNewWidgetSelectProductPopupSection.filterBySku}}" userInput="{{product.sku}}" stepKey="fillProductNameInFilter"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="applyFilter"/>
+        <click selector="{{AdminNewWidgetSelectProductPopupSection.firstRow}}" 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/Data/WidgetsData.xml b/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
index 26864c60b6494..85f0d1170031c 100644
--- a/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="ProductsListWidget" type="widget">
         <data key="type">Catalog Products List</data>
         <data key="design_theme">Magento Luma</data>
@@ -18,5 +18,29 @@
         <data key="condition">SKU</data>
         <data key="display_on">All Pages</data>
         <data key="container">Main Content Area</data>
+        <data key="ruleIsOneOf">is one of</data>
+    </entity>
+    <entity name="DynamicBlocksRotatorWidget" type="widget">
+        <data key="type">Banner Rotator</data>
+        <data key="design_theme">Magento Luma</data>
+        <data key="name" unique="suffix">TestBannerWidget</data>
+        <array key="store_ids">
+            <item>All Store Views</item>
+        </array>
+        <data key="condition">SKU</data>
+        <data key="display_on">All Pages</data>
+        <data key="container">Main Content Area</data>
+        <data key="display_mode">salesrule</data>
+        <data key="restrict_type">header</data>
+    </entity>
+    <entity name="WidgetWithBlock" type="widget">
+        <data key="type">CMS Static Block</data>
+        <data key="design_theme">Magento Luma</data>
+        <data key="name" unique="suffix">testName</data>
+        <array key="store_ids">
+            <item>All Store Views</item>
+        </array>
+        <data key="display_on">All Pages</data>
+        <data key="container">Page Top</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml b/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml
index 8eb0a5f65318e..da77738c7d013 100644
--- a/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml
@@ -7,8 +7,9 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="AdminNewWidgetPage" url="admin/admin/widget_instance/new/" area="admin" module="Magento_Widget">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminNewWidgetPage" url="admin/widget_instance/new/" area="admin" module="Magento_Widget">
         <section name="AdminNewWidgetSection"/>
+        <section name="AdminSelectWidgetBlockGridSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
index b96d3865a6661..fe46a3d66bfad 100644
--- a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminNewWidgetSection">
         <element name="widgetType" type="select" selector="#code"/>
         <element name="widgetDesignTheme" type="select" selector="#theme_id"/>
@@ -17,9 +17,12 @@
         <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="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"/>
         <element name="selectCondition" type="input" selector="#conditions__1__new_child"/>
+        <element name="ruleParameterEdit" type="select" selector="#conditions__1__children>li:nth-child(1)>span:nth-child(3)>a"/>
+        <element name="ruleParameterEditSelect" type="select" selector="#conditions__1__children>li:nth-child(1)>span:nth-child(3)>span>select"/>
         <element name="ruleParameter" type="select" selector="#conditions__1__children>li:nth-child(1)>span:nth-child(4)>a"/>
         <element name="setRuleParameter" type="input" selector="#conditions__1--1__value"/>
         <element name="applyParameter" type="button" selector=".rule-param-apply"/>
@@ -27,5 +30,12 @@
         <element name="selectAll" type="checkbox" selector=".admin__control-checkbox"/>
         <element name="sortById" type="button" selector="th.data-grid-th._sortable.not-sort.col-entity_id"/>
         <element name="sortByIdAscend" type="button" selector="th.data-grid-th._sortable._ascend.col-entity_id"/>
+        <element name="insertWidget" type="button" selector="#insert_button" timeout="30"/>
+        <element name="widgetTypeDropDown" type="select" selector="#select_widget_type"/>
+        <element name="conditionOperator" type="text" selector="//*[@id='conditions__1--1__attribute']/following-sibling::span[1]"/>
+        <element name="conditionOperatorSelect" type="select" selector="#conditions__1--{{arg1}}__operator" parameterized="true"/>
+        <element name="displayMode" type="select" selector="select[id*='display_mode']"/>
+        <element name="restrictTypes" type="select" selector="select[id*='types']"/>
+        <element name="widgetSelectBlock" type="button" selector=".action-default.scalable.btn-chooser"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Widget/Test/Mftf/Section/AdminSelectWidgetBlockGridSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/AdminSelectWidgetBlockGridSection.xml
new file mode 100644
index 0000000000000..d46d6edf8026b
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/Section/AdminSelectWidgetBlockGridSection.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="AdminSelectWidgetBlockGridSection">
+        <element name="blockTitleFilter" type="input" selector=".modal-content input[name='chooser_title']"/>
+        <element name="blockStatusFilter" type="select" selector=".modal-content select[name='chooser_is_active']"/>
+        <element name="sectionTitle" type="button" selector="//*[@class='modal-header']//h1[contains(text(), 'Select Block')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Widget/Test/Mftf/Section/StorefrontWidgetsSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/StorefrontWidgetsSection.xml
index 23908626389f9..9d1944cc126b8 100644
--- a/app/code/Magento/Widget/Test/Mftf/Section/StorefrontWidgetsSection.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Section/StorefrontWidgetsSection.xml
@@ -11,5 +11,6 @@
     <section name="StorefrontWidgetsSection">
         <element name="widgetProductsGrid" type="block" selector=".block.widget.block-products-list.grid"/>
         <element name="widgetProductName" type="text" selector=".product-item-name"/>
+        <element name="checkElementStorefrontByPrice" type="text" selector="//*[@class='product-items widget-product-grid']//*[contains(text(),'${{arg2}}.00')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php b/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
index 9f06b954cad5d..652d5e030bee6 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
@@ -175,7 +175,7 @@ public function testGetWidgetDeclaration()
         $this->conditionsHelper->expects($this->once())->method('encode')->with($conditions)
             ->willReturn('encoded-conditions-string');
         $this->escaperMock->expects($this->atLeastOnce())
-            ->method('escapeQuote')
+            ->method('escapeHtmlAttr')
             ->willReturnMap([
                 ['my "widget"', false, 'my &quot;widget&quot;'],
                 ['1', false, '1'],
diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json
index 23ee88072fbd5..0f749439d581f 100644
--- a/app/code/Magento/Widget/composer.json
+++ b/app/code/Magento/Widget/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-widget",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-cms": "102.0.*",
         "magento/module-backend": "100.2.*",
@@ -16,7 +16,7 @@
         "magento/module-widget-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "101.0.4",
+    "version": "101.0.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Wishlist/Block/Customer/Sharing.php b/app/code/Magento/Wishlist/Block/Customer/Sharing.php
index 6fbf5a23dca22..992946363186c 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Sharing.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Sharing.php
@@ -11,6 +11,8 @@
  */
 namespace Magento\Wishlist\Block\Customer;
 
+use Magento\Captcha\Block\Captcha;
+
 /**
  * @api
  * @since 100.0.2
@@ -60,6 +62,20 @@ public function __construct(
      */
     protected function _prepareLayout()
     {
+        if (!$this->getChildBlock('captcha')) {
+            $this->addChild(
+                'captcha',
+                Captcha::class,
+                [
+                    'cacheable' => false,
+                    'after' => '-',
+                    'form_id' => 'share_wishlist_form',
+                    'image_width' => 230,
+                    'image_height' => 230
+                ]
+            );
+        }
+
         $this->pageConfig->getTitle()->set(__('Wish List Sharing'));
     }
 
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
index cafb6a5291481..40882ae00dae1 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
@@ -5,14 +5,15 @@
  */
 
 /**
- * Wishlist for item column in customer wishlist
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Model for item column in customer wishlist.
+ *
  * @api
+ * @deprecated
  * @since 100.0.2
  */
 class Actions extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php
index b043a8d4b684c..97cfd91b32498 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Cart.php
@@ -14,6 +14,28 @@
  */
 class Cart extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
 {
+    /**
+     * @var View
+     */
+    private $productView;
+
+    /**
+     * @param \Magento\Catalog\Block\Product\Context $context
+     * @param \Magento\Framework\App\Http\Context $httpContext
+     * @param \Magento\Catalog\Block\Product\View $productView
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Catalog\Block\Product\Context $context,
+        \Magento\Framework\App\Http\Context $httpContext,
+        array $data = [],
+        \Magento\Catalog\Block\Product\View $productView = null
+    ) {
+        $this->productView = $productView ?:
+                \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Catalog\Block\Product\View::class);
+        parent::__construct($context, $httpContext, $data);
+    }
+
     /**
      * Returns qty to show visually to user
      *
@@ -23,7 +45,9 @@ class Cart extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
     public function getAddToCartQty(\Magento\Wishlist\Model\Item $item)
     {
         $qty = $item->getQty();
-        return $qty ? $qty : 1;
+        $qty = $qty < $this->productView->getProductDefaultQty($this->getProductItem())
+                ? $this->productView->getProductDefaultQty($this->getProductItem()) : $qty;
+        return $qty ?: 1;
     }
 
     /**
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
index 2d75956858a0a..53f67626e956d 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
@@ -5,14 +5,15 @@
  */
 
 /**
- * Wishlist block customer item cart column
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Wishlist block customer item cart column.
+ *
  * @api
+ * @deprecated
  * @since 100.0.2
  */
 class Comment extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
index 53ca78c63524d..c4c786961694b 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
@@ -5,14 +5,15 @@
  */
 
 /**
- * Edit item in customer wishlist table
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Edit item in customer wishlist table.
+ *
  * @api
+ * @deprecated
  * @since 100.0.2
  */
 class Edit extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
index 33fb0f7325cdd..b7eaf53fc23b5 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
@@ -5,14 +5,15 @@
  */
 
 /**
- * Wishlist block customer item cart column
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Wishlist block customer item cart column.
+ *
  * @api
+ * @deprecated
  * @since 100.0.2
  */
 class Info extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
index 57703b9300db8..09f5014edead6 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
@@ -5,14 +5,15 @@
  */
 
 /**
- * Delete item column in customer wishlist table
- *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer\Wishlist\Item\Column;
 
 /**
+ * Delete item column in customer wishlist table
+ *
  * @api
+ * @deprecated
  * @since 100.0.2
  */
 class Remove extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Controller/Index/Send.php b/app/code/Magento/Wishlist/Controller/Index/Send.php
index c2389af6a2282..044a5e2907e8b 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Send.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Send.php
@@ -8,17 +8,31 @@
 
 use Magento\Framework\App\Action;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Session\Generic as WishlistSession;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\View\Result\Layout as ResultLayout;
+use Magento\Captcha\Helper\Data as CaptchaHelper;
+use Magento\Captcha\Observer\CaptchaStringResolver;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Captcha\Model\DefaultModel as CaptchaModel;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Customer\Model\Customer;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Send extends \Magento\Wishlist\Controller\AbstractIndex
 {
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
     /**
      * @var \Magento\Customer\Helper\View
      */
@@ -69,6 +83,16 @@ class Send extends \Magento\Wishlist\Controller\AbstractIndex
      */
     protected $storeManager;
 
+    /**
+     * @var CaptchaHelper
+     */
+    private $captchaHelper;
+
+    /**
+     * @var CaptchaStringResolver
+     */
+    private $captchaStringResolver;
+
     /**
      * @param Action\Context $context
      * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
@@ -81,6 +105,9 @@ class Send extends \Magento\Wishlist\Controller\AbstractIndex
      * @param WishlistSession $wishlistSession
      * @param ScopeConfigInterface $scopeConfig
      * @param StoreManagerInterface $storeManager
+     * @param CaptchaHelper|null $captchaHelper
+     * @param CaptchaStringResolver|null $captchaStringResolver
+     * @param \Magento\Framework\Escaper|null $escaper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -94,7 +121,10 @@ public function __construct(
         \Magento\Customer\Helper\View $customerHelperView,
         WishlistSession $wishlistSession,
         ScopeConfigInterface $scopeConfig,
-        StoreManagerInterface $storeManager
+        StoreManagerInterface $storeManager,
+        CaptchaHelper $captchaHelper = null,
+        CaptchaStringResolver $captchaStringResolver = null,
+        \Magento\Framework\Escaper $escaper = null
     ) {
         $this->_formKeyValidator = $formKeyValidator;
         $this->_customerSession = $customerSession;
@@ -106,27 +136,47 @@ public function __construct(
         $this->wishlistSession = $wishlistSession;
         $this->scopeConfig = $scopeConfig;
         $this->storeManager = $storeManager;
+        $this->captchaHelper = $captchaHelper ?: ObjectManager::getInstance()->get(CaptchaHelper::class);
+        $this->captchaStringResolver = $captchaStringResolver ?
+            : ObjectManager::getInstance()->get(CaptchaStringResolver::class);
+        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\Escaper::class
+        );
         parent::__construct($context);
     }
 
     /**
-     * Share wishlist
-     *
-     * @return \Magento\Framework\Controller\Result\Redirect
+     * @return ResponseInterface|Redirect|ResultInterface
      * @throws NotFoundException
+     * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @throws \Zend_Validate_Exception
      */
     public function execute()
     {
         /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+        $captchaFormName = 'share_wishlist_form';
+        /** @var CaptchaModel $captchaModel */
+        $captchaModel = $this->captchaHelper->getCaptcha($captchaFormName);
+
         if (!$this->_formKeyValidator->validate($this->getRequest())) {
             $resultRedirect->setPath('*/*/');
             return $resultRedirect;
         }
 
+        $isCorrectCaptcha = $this->validateCaptcha($captchaModel, $captchaFormName);
+
+        $this->logCaptchaAttempt($captchaModel);
+
+        if (!$isCorrectCaptcha) {
+            $this->messageManager->addErrorMessage(__('Incorrect CAPTCHA'));
+            $resultRedirect->setPath('*/*/share');
+            return $resultRedirect;
+        }
+
         $wishlist = $this->wishlistProvider->getWishlist();
         if (!$wishlist) {
             throw new NotFoundException(__('Page not found.'));
@@ -144,7 +194,7 @@ public function execute()
         if (strlen($message) > $textLimit) {
             $error = __('Message length must not exceed %1 symbols', $textLimit);
         } else {
-            $message = nl2br(htmlspecialchars($message));
+            $message = nl2br($this->escaper->escapeHtml($message));
             if (empty($emails)) {
                 $error = __('Please enter an email address.');
             } else {
@@ -288,4 +338,43 @@ protected function getWishlistItems(ResultLayout $resultLayout)
             ->getBlock('wishlist.email.items')
             ->toHtml();
     }
+
+    /**
+     * Log customer action attempts
+     * @param CaptchaModel $captchaModel
+     * @return void
+     */
+    private function logCaptchaAttempt(CaptchaModel $captchaModel)
+    {
+        /** @var  Customer $customer */
+        $customer = $this->_customerSession->getCustomer();
+        $email = '';
+
+        if ($customer->getId()) {
+            $email = $customer->getEmail();
+        }
+
+        $captchaModel->logAttempt($email);
+    }
+
+    /**
+     * @param CaptchaModel $captchaModel
+     * @param string $captchaFormName
+     * @return bool
+     */
+    private function validateCaptcha(CaptchaModel $captchaModel, string $captchaFormName) : bool
+    {
+        if ($captchaModel->isRequired()) {
+            $word = $this->captchaStringResolver->resolve(
+                $this->getRequest(),
+                $captchaFormName
+            );
+
+            if (!$captchaModel->isCorrect($word)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/app/code/Magento/Wishlist/Helper/Data.php b/app/code/Magento/Wishlist/Helper/Data.php
index 6b2e3de462d8e..32646e114b3cb 100644
--- a/app/code/Magento/Wishlist/Helper/Data.php
+++ b/app/code/Magento/Wishlist/Helper/Data.php
@@ -6,6 +6,8 @@
 namespace Magento\Wishlist\Helper;
 
 use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Escaper;
 use Magento\Wishlist\Controller\WishlistProviderInterface;
 
 /**
@@ -99,6 +101,11 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $productRepository;
 
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
@@ -129,6 +136,7 @@ public function __construct(
         $this->_customerViewHelper = $customerViewHelper;
         $this->wishlistProvider = $wishlistProvider;
         $this->productRepository = $productRepository;
+        $this->escaper = ObjectManager::getInstance()->get(Escaper::class);
         parent::__construct($context);
     }
 
@@ -321,10 +329,10 @@ public function getAddParams($item, array $params = [])
     {
         $productId = null;
         if ($item instanceof \Magento\Catalog\Model\Product) {
-            $productId = $item->getEntityId();
+            $productId = (int) $item->getEntityId();
         }
         if ($item instanceof \Magento\Wishlist\Model\Item) {
-            $productId = $item->getProductId();
+            $productId = (int) $item->getProductId();
         }
 
         $url = $this->_getUrlStore($item)->getUrl('wishlist/index/add');
@@ -332,7 +340,10 @@ public function getAddParams($item, array $params = [])
             $params['product'] = $productId;
         }
 
-        return $this->_postDataHelper->getPostData($url, $params);
+        return $this->_postDataHelper->getPostData(
+            $this->escaper->escapeUrl($url),
+            $params
+        );
     }
 
     /**
diff --git a/app/code/Magento/Wishlist/Model/Rss/Wishlist.php b/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
index 75df3027ad9a9..b73cae240b369 100644
--- a/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
@@ -7,6 +7,7 @@
 namespace Magento\Wishlist\Model\Rss;
 
 use Magento\Framework\App\Rss\DataProviderInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Wishlist RSS model
@@ -114,10 +115,8 @@ public function __construct(
      */
     public function isAllowed()
     {
-        return (bool)$this->scopeConfig->getValue(
-            'rss/wishlist/active',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
+        return $this->scopeConfig->isSetFlag('rss/wishlist/active', ScopeInterface::SCOPE_STORE)
+            && $this->getWishlist()->getCustomerId() == $this->wishlistHelper->getCustomer()->getId();
     }
 
     /**
@@ -180,8 +179,8 @@ public function getRssData()
             }
         } else {
             $data = [
-                'title' => __('We cannot retrieve the Wish List.'),
-                'description' => __('We cannot retrieve the Wish List.'),
+                'title' => __('We cannot retrieve the Wish List.')->render(),
+                'description' => __('We cannot retrieve the Wish List.')->render(),
                 'link' => $this->urlBuilder->getUrl(),
                 'charset' => 'UTF-8',
             ];
@@ -195,7 +194,7 @@ public function getRssData()
      */
     public function getCacheKey()
     {
-        return 'rss_wishlist_data';
+        return 'rss_wishlist_data_' . $this->getWishlist()->getId();
     }
 
     /**
@@ -215,7 +214,7 @@ public function getHeader()
     {
         $customerId = $this->getWishlist()->getCustomerId();
         $customer = $this->customerFactory->create()->load($customerId);
-        $title = __('%1\'s Wishlist', $customer->getName());
+        $title = __('%1\'s Wishlist', $customer->getName())->render();
         $newUrl = $this->urlBuilder->getUrl(
             'wishlist/shared/index',
             ['code' => $this->getWishlist()->getSharingCode()]
diff --git a/app/code/Magento/Wishlist/Observer/AddToCart.php b/app/code/Magento/Wishlist/Observer/AddToCart.php
index c0461a942060c..1ab24d87efbf7 100644
--- a/app/code/Magento/Wishlist/Observer/AddToCart.php
+++ b/app/code/Magento/Wishlist/Observer/AddToCart.php
@@ -76,7 +76,7 @@ public function execute(Observer $observer)
             $wishlistIds = [$singleWishlistId];
         }
 
-        if (count($wishlistIds) && $request->getParam('wishlist_next')) {
+        if (is_array($wishlistIds) && count($wishlistIds) && $request->getParam('wishlist_next')) {
             $wishlistId = array_shift($wishlistIds);
 
             if ($this->customerSession->isLoggedIn()) {
diff --git a/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
index 87a77526e0af5..b40f26f2b1a1a 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
@@ -87,4 +87,16 @@
         <click selector="{{StorefrontCustomerWishlistProductSection.productUpdateWishList}}" stepKey="submitUpdateWishlist"/>
         <see selector="{{StorefrontMessagesSection.success}}" userInput="{{product.name}} has been updated in your Wish List." stepKey="successMessage"/>
     </actionGroup>
+
+    <actionGroup name="StorefrontValidateQtyAfterEditProductInWishlist" extends="StorefrontCustomerEditProductInWishlist">
+        <arguments>
+            <argument name="maxQtyAllowed" type="string" defaultValue="10000"/>
+        </arguments>
+        <remove keyForRemoval="successMessage"/>
+        <waitForAjaxLoad after="submitUpdateWishlist" stepKey="waitForAjaxLoad"/>
+        <scrollToTopOfPage after="waitForAjaxLoad" stepKey="scrollToTop"/>
+        <moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.productInfoByName(product.name)}}" after="scrollToTop" stepKey="moveMouseOverProduct"/>
+        <waitForElementVisible selector="{{StorefrontCustomerWishlistProductSection.productQtyError(product.name)}}" after="moveMouseOverProduct" stepKey="waitForErrorMessage"/>
+        <see selector="{{StorefrontCustomerWishlistProductSection.productQtyError(product.name)}}" userInput="The maximum you may purchase is {{maxQtyAllowed}}." after="waitForErrorMessage" stepKey="seeErrorMessage"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Data/ProductStockOptionsData.xml b/app/code/Magento/Wishlist/Test/Mftf/Data/ProductStockOptionsData.xml
new file mode 100644
index 0000000000000..07a51e444a7e4
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Data/ProductStockOptionsData.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="DefaultMaxQtyAllowedConfig" type="max_qty_allowed_config">
+        <requiredEntity type="max_qty_allowed_config_default">DefaultMaxQtyAllowed</requiredEntity>
+    </entity>
+    <entity name="DefaultMaxQtyAllowed" type="max_qty_allowed_config_default">
+        <data key="value">0</data>
+    </entity>
+
+    <entity name="SetMaxQtyAllowedConfigZero" type="max_qty_allowed_config">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Metadata/product_stock_options-meta.xml b/app/code/Magento/Wishlist/Test/Mftf/Metadata/product_stock_options-meta.xml
new file mode 100644
index 0000000000000..748144ca6dc9f
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Metadata/product_stock_options-meta.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="MaxQtyAllowedConfig" dataType="max_qty_allowed_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/cataloginventory/" method="POST" successRegex="/messages-message-success/">
+        <object key="groups" dataType="max_qty_allowed_config">
+            <object key="item_options" dataType="max_qty_allowed_config">
+                <object key="fields" dataType="max_qty_allowed_config">
+                    <object key="max_sale_qty" dataType="max_qty_allowed_config">
+                        <field key="value">string</field>
+                        <object key="inherit" dataType="max_qty_allowed_config_default">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml
index 88d68a460da74..dd8814b199e13 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml
@@ -19,5 +19,6 @@
         <element name="productQuantity" type="input" selector="//a[contains(text(), '{{productName}}')]/ancestor::div[@class='product-item-info']//input[@class='input-text qty']" parameterized="true"/>
         <element name="productUpdateWishList" type="button" selector=".column.main .actions-toolbar .action.update" timeout="30"/>
         <element name="productAddAllToCart" type="button" selector=".column.main .actions-toolbar .action.tocart" timeout="30"/>
+        <element name="productQtyError" type="text" selector="//li[.//a[contains(text(), '{{productName}}')]]//div[@class='mage-error']" parameterized="true" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSection.xml
index 5d40d9a38d656..bfacc8093bede 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSection.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSection.xml
@@ -10,7 +10,7 @@
         xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerWishlistSection">
         <element name="productItemNameText" type="text" selector=".products-grid .product-item-name a"/>
-        <element name="removeWishlistButton" type="button" selector=".products-grid .btn-remove.action.delete>span" timeout="30"/>
+        <element name="removeWishlistButton" type="button" selector=".products-grid .btn-remove.action.delete" timeout="30"/>
         <element name="emptyWishlistText" type="text" selector=".message.info.empty>span"/>
         <element name="successMsg" type="text" selector="div.message-success.success.message"/>
     </section>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
index 60745d15e7688..b9ea513288c81 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
@@ -12,7 +12,6 @@
             <title value="Add products to wishlist from different stores"/>
             <description value="All products added to wishlist should be visible on any store. Even if product visibility was set to 'Not Visible Individually' for this store"/>
             <group value="wishlist"/>
-            <group value="skip" /><!-- Skipped; see MAGETWO-94100 -->
         </annotations>
         <before>
             <getData entity="DefaultRootCategoryGetter" stepKey="getDefaultRootCategory"/>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontCheckingMaxQtyAllowedInWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontCheckingMaxQtyAllowedInWishlistTest.xml
new file mode 100644
index 0000000000000..4e9d3d9f1729b
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontCheckingMaxQtyAllowedInWishlistTest.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCheckingMaxQtyAllowedInWishlistTest">
+        <annotations>
+            <features value="Wishlist"/>
+            <stories value="Update wishlist item"/>
+            <title value="Validate quantity field during updating wishlist item"/>
+            <description value="Validate quantity field during updating wishlist item"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-7192"/>
+            <useCaseId value="MAGETWO-73613"/>
+            <group value="wishlist"/>
+        </annotations>
+        <before>
+            <!--Create category-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <!--Create product-->
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!--Create customer-->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <!--Login as Customer-->
+            <actionGroup ref="CustomerLoginOnStorefront" stepKey="customerLogin">
+                <argument name="customer" value="$createCustomer$" />
+            </actionGroup>
+        </before>
+        <after>
+            <!--Delete entities-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <!--Set "Maximum Qty Allowed in Shopping Cart" config to default-->
+            <createData entity="DefaultMaxQtyAllowedConfig" stepKey="setMaxQtyAllowedConfigToDefault"/>
+            <!--Logout-->
+            <actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="customerLogout"/>
+        </after>
+
+        <!--Go to product page-->
+        <amOnPage url="{{StorefrontProductPage.url($createProduct.custom_attributes[url_key]$)}}" stepKey="goToProductPage"/>
+        <!--Add product to Wishlist-->
+        <actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" stepKey="addProductToWishlist">
+            <argument name="productVar" value="$createProduct$"/>
+        </actionGroup>
+        <!--Validate quantity after edit product in Wishlist - Case 1-->
+        <actionGroup ref="StorefrontValidateQtyAfterEditProductInWishlist" stepKey="validateQtyFirstCase">
+            <argument name="product" value="$createProduct$"/>
+            <argument name="description" value="Test Description"/>
+            <argument name="quantity" value="222222222222222"/>
+            <argument name="maxQtyAllowed" value="10000"/>
+        </actionGroup>
+        <!--Set "Maximum Qty Allowed in Shopping Cart" config to "0"-->
+        <createData entity="SetMaxQtyAllowedConfigZero" stepKey="setMaxQtyAllowedConfigToZero"/>
+        <!--Go to Wishlist page-->
+        <amOnPage url="{{StorefrontCustomerWishlistPage.url}}" stepKey="goToWishlistPage"/>
+        <!--Validate quantity after edit product in Wishlist - Case 1-->
+        <actionGroup ref="StorefrontValidateQtyAfterEditProductInWishlist" stepKey="validateQtySecondCase">
+            <argument name="product" value="$createProduct$"/>
+            <argument name="description" value="Test Description"/>
+            <argument name="quantity" value="222222222222222"/>
+            <argument name="maxQtyAllowed" value="99999999"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml
index 66c636871c39a..2f17c29a6556b 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml
@@ -6,14 +6,16 @@
   */
 -->
 
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontDeletePersistedWishlistTest">
         <annotations>
-            <features value="Delete a persist wishlist for a customer"/>
+            <features value="Wishlist"/>
             <stories value="Delete a persist wishlist for a customer"/>
-            <title value="Delete a persist wishlist for a customer"/>
-            <description value="Delete a persist wishlist for a customer"/>
+            <title value="Customer should be able to delete a persistent wishlist"/>
+            <description value="Customer should be able to delete a persistent wishlist"/>
+            <severity value="AVERAGE"/>
             <group value="wishlist"/>
+            <testCaseId value="MC-4110"/>
         </annotations>
         <before>
             <createData stepKey="category" entity="SimpleSubCategory"/>
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php
index a8c0fbb951cce..34ad89e208b5f 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php
@@ -5,32 +5,25 @@
  */
 namespace Magento\Wishlist\Test\Unit\Controller\Index;
 
-use Magento\Customer\Helper\View as CustomerViewHelper;
+use Magento\Customer\CustomerData\Customer;
 use Magento\Customer\Model\Data\Customer as CustomerData;
-use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\App\Action\Context as ActionContext;
-use Magento\Framework\App\Area;
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\Result\Redirect as ResultRedirect;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Data\Form\FormKey\Validator as FormKeyValidator;
 use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
-use Magento\Framework\Mail\Template\TransportBuilder;
 use Magento\Framework\Mail\TransportInterface;
 use Magento\Framework\Message\ManagerInterface;
-use Magento\Framework\Session\Generic as WishlistSession;
-use Magento\Framework\Translate\Inline\StateInterface as TranslateInlineStateInterface;
 use Magento\Framework\UrlInterface;
-use Magento\Framework\View\Layout;
 use Magento\Framework\View\Result\Layout as ResultLayout;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Wishlist\Controller\Index\Send;
 use Magento\Wishlist\Controller\WishlistProviderInterface;
-use Magento\Wishlist\Model\Config as WishlistConfig;
-use Magento\Wishlist\Model\Wishlist;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Captcha\Helper\Data as CaptchaHelper;
+use Magento\Captcha\Model\DefaultModel as CaptchaModel;
+use Magento\Customer\Model\Session;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -47,36 +40,12 @@ class SendTest extends \PHPUnit\Framework\TestCase
     /** @var  FormKeyValidator |\PHPUnit_Framework_MockObject_MockObject */
     protected $formKeyValidator;
 
-    /** @var  CustomerSession |\PHPUnit_Framework_MockObject_MockObject */
-    protected $customerSession;
-
     /** @var  WishlistProviderInterface |\PHPUnit_Framework_MockObject_MockObject */
     protected $wishlistProvider;
 
-    /** @var  WishlistConfig |\PHPUnit_Framework_MockObject_MockObject */
-    protected $wishlistConfig;
-
-    /** @var  TransportBuilder |\PHPUnit_Framework_MockObject_MockObject */
-    protected $transportBuilder;
-
-    /** @var  TranslateInlineStateInterface |\PHPUnit_Framework_MockObject_MockObject */
-    protected $inlineTranslation;
-
-    /** @var  CustomerViewHelper |\PHPUnit_Framework_MockObject_MockObject */
-    protected $customerViewHelper;
-
-    /** @var  WishlistSession |\PHPUnit_Framework_MockObject_MockObject */
-    protected $wishlistSession;
-
-    /** @var  ScopeConfigInterface |\PHPUnit_Framework_MockObject_MockObject */
-    protected $scopeConfig;
-
     /** @var  Store |\PHPUnit_Framework_MockObject_MockObject */
     protected $store;
 
-    /** @var  StoreManagerInterface |\PHPUnit_Framework_MockObject_MockObject */
-    protected $storeManager;
-
     /** @var  ResultFactory |\PHPUnit_Framework_MockObject_MockObject */
     protected $resultFactory;
 
@@ -86,15 +55,9 @@ class SendTest extends \PHPUnit\Framework\TestCase
     /** @var  ResultLayout |\PHPUnit_Framework_MockObject_MockObject */
     protected $resultLayout;
 
-    /** @var  Layout |\PHPUnit_Framework_MockObject_MockObject */
-    protected $layout;
-
     /** @var  RequestInterface |\PHPUnit_Framework_MockObject_MockObject */
     protected $request;
 
-    /** @var  Wishlist |\PHPUnit_Framework_MockObject_MockObject */
-    protected $wishlist;
-
     /** @var  ManagerInterface |\PHPUnit_Framework_MockObject_MockObject */
     protected $messageManager;
 
@@ -110,6 +73,14 @@ class SendTest extends \PHPUnit\Framework\TestCase
     /** @var  EventManagerInterface |\PHPUnit_Framework_MockObject_MockObject */
     protected $eventManager;
 
+    /** @var  CaptchaHelper |\PHPUnit_Framework_MockObject_MockObject */
+    protected $captchaHelper;
+
+    /** @var CaptchaModel |\PHPUnit_Framework_MockObject_MockObject */
+    protected $captchaModel;
+    /** @var Session |\PHPUnit_Framework_MockObject_MockObject */
+    protected $customerSession;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -136,7 +107,7 @@ protected function setUp()
         $this->request = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
             ->setMethods([
                 'getPost',
-                'getPostValue',
+                'getPostValue'
             ])
             ->getMockForAbstractClass();
 
@@ -172,90 +143,72 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->customerSession = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->wishlistProvider = $this->getMockBuilder(\Magento\Wishlist\Controller\WishlistProviderInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->wishlistConfig = $this->getMockBuilder(\Magento\Wishlist\Model\Config::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->transportBuilder = $this->getMockBuilder(\Magento\Framework\Mail\Template\TransportBuilder::class)
+        $customerMock = $this->getMockBuilder(\Magento\Customer\Model\Customer::class)
             ->disableOriginalConstructor()
+            ->setMethods([
+                'getEmail',
+                'getId'
+            ])
             ->getMock();
 
-        $this->inlineTranslation = $this->getMockBuilder(\Magento\Framework\Translate\Inline\StateInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $customerMock->expects($this->any())
+            ->method('getEmail')
+            ->willReturn('expamle@mail.com');
 
-        $this->customerViewHelper = $this->getMockBuilder(\Magento\Customer\Helper\View::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $customerMock->expects($this->any())
+            ->method('getId')
+            ->willReturn(false);
 
-        $this->wishlistSession = $this->getMockBuilder(\Magento\Framework\Session\Generic::class)
+        $this->customerSession = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setSharingForm'])
+            ->setMethods([
+                'getCustomer',
+                'getData'
+            ])
             ->getMock();
 
-        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->customerSession->expects($this->any())
+            ->method('getCustomer')
+            ->willReturn($customerMock);
 
-        $this->store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getStoreId'])
-            ->getMock();
+        $this->customerSession->expects($this->any())
+            ->method('getData')
+            ->willReturn(false);
 
-        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->storeManager->expects($this->any())
-            ->method('getStore')
-            ->willReturn($this->store);
+        $this->wishlistProvider = $this->getMockBuilder(\Magento\Wishlist\Controller\WishlistProviderInterface::class)
+            ->getMockForAbstractClass();
 
-        $this->wishlist = $this->getMockBuilder(\Magento\Wishlist\Model\Wishlist::class)
+        $this->captchaHelper = $this->getMockBuilder(CaptchaHelper::class)
             ->disableOriginalConstructor()
             ->setMethods([
-                'getShared',
-                'setShared',
-                'getId',
-                'getSharingCode',
-                'save',
-                'isSalable',
+                'getCaptcha'
             ])
             ->getMock();
 
-        $this->customerData = $this->getMockBuilder(\Magento\Customer\Model\Data\Customer::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->layout = $this->getMockBuilder(\Magento\Framework\View\Layout::class)
+        $this->captchaModel = $this->getMockBuilder(CaptchaModel::class)
             ->disableOriginalConstructor()
             ->setMethods([
-                'getBlock',
-                'setWishlistId',
-                'toHtml',
+                'isRequired',
+                'logAttempt'
             ])
             ->getMock();
 
-        $this->transport = $this->getMockBuilder(\Magento\Framework\Mail\TransportInterface::class)
-            ->getMockForAbstractClass();
+        $objectHelper = new ObjectManager($this);
 
-        $this->model = new Send(
-            $this->context,
-            $this->formKeyValidator,
-            $this->customerSession,
-            $this->wishlistProvider,
-            $this->wishlistConfig,
-            $this->transportBuilder,
-            $this->inlineTranslation,
-            $this->customerViewHelper,
-            $this->wishlistSession,
-            $this->scopeConfig,
-            $this->storeManager
+        $this->captchaHelper->expects($this->once())->method('getCaptcha')
+            ->willReturn($this->captchaModel);
+        $this->captchaModel->expects($this->any())->method('isRequired')
+            ->willReturn(false);
+
+        $this->model = $objectHelper->getObject(
+            Send::class,
+            [
+                'context' => $this->context,
+                'formKeyValidator' => $this->formKeyValidator,
+                'wishlistProvider' => $this->wishlistProvider,
+                'captchaHelper' => $this->captchaHelper,
+                '_customerSession' => $this->customerSession
+            ]
         );
     }
 
@@ -291,409 +244,4 @@ public function testExecuteNoWishlistAvailable()
 
         $this->model->execute();
     }
-
-    /**
-     * @param string $text
-     * @param int $textLimit
-     * @param string $emails
-     * @param int $emailsLimit
-     * @param int $shared
-     * @param string $postValue
-     * @param string $errorMessage
-     *
-     * @dataProvider dataProviderExecuteWithError
-     */
-    public function testExecuteWithError(
-        $text,
-        $textLimit,
-        $emails,
-        $emailsLimit,
-        $shared,
-        $postValue,
-        $errorMessage
-    ) {
-        $this->formKeyValidator->expects($this->once())
-            ->method('validate')
-            ->with($this->request)
-            ->willReturn(true);
-
-        $this->wishlist->expects($this->once())
-            ->method('getShared')
-            ->willReturn($shared);
-
-        $this->wishlistProvider->expects($this->once())
-            ->method('getWishlist')
-            ->willReturn($this->wishlist);
-
-        $this->wishlistConfig->expects($this->once())
-            ->method('getSharingEmailLimit')
-            ->willReturn($emailsLimit);
-        $this->wishlistConfig->expects($this->once())
-            ->method('getSharingTextLimit')
-            ->willReturn($textLimit);
-
-        $this->request->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap([
-                ['emails', $emails],
-                ['message', $text],
-            ]);
-        $this->request->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn($postValue);
-
-        $this->messageManager->expects($this->once())
-            ->method('addError')
-            ->with($errorMessage)
-            ->willReturnSelf();
-
-        $this->wishlistSession->expects($this->any())
-            ->method('setSharingForm')
-            ->with($postValue)
-            ->willReturnSelf();
-
-        $this->resultRedirect->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/share')
-            ->willReturnSelf();
-
-        $this->assertEquals($this->resultRedirect, $this->model->execute());
-    }
-
-    /**
-     * 1. Text
-     * 2. Text limit
-     * 3. Emails
-     * 4. Emails limit
-     * 5. Shared wishlists counter
-     * 6. POST value
-     * 7. Error message (RESULT)
-     *
-     * @return array
-     */
-    public function dataProviderExecuteWithError()
-    {
-        return [
-            ['test text', 1, 'user1@example.com', 1, 0, '', 'Message length must not exceed 1 symbols'],
-            ['test text', 100, null, 1, 0, '', 'Please enter an email address.'],
-            ['test text', 100, '', 1, 0, '', 'Please enter an email address.'],
-            ['test text', 100, 'user1@example.com', 1, 1, '', 'This wish list can be shared 0 more times.'],
-            [
-                'test text',
-                100,
-                'u1@example.com, u2@example.com',
-                3,
-                2,
-                '',
-                'This wish list can be shared 1 more times.'
-            ],
-            ['test text', 100, 'wrongEmailAddress', 1, 0, '', 'Please enter a valid email address.'],
-            ['test text', 100, 'user1@example.com, wrongEmailAddress', 2, 0, '', 'Please enter a valid email address.'],
-            ['test text', 100, 'wrongEmailAddress, user2@example.com', 2, 0, '', 'Please enter a valid email address.'],
-        ];
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecuteWithException()
-    {
-        $text = 'test text';
-        $textLimit = 100;
-        $emails = 'user1@example.com';
-        $emailsLimit = 1;
-        $shared = 0;
-        $customerName = 'user1 user1';
-        $wishlistId = 1;
-        $rssLink = 'rss link';
-        $sharingCode = 'sharing code';
-        $exceptionMessage = 'test exception message';
-        $postValue = '';
-
-        $this->formKeyValidator->expects($this->once())
-            ->method('validate')
-            ->with($this->request)
-            ->willReturn(true);
-
-        $this->wishlist->expects($this->exactly(2))
-            ->method('getShared')
-            ->willReturn($shared);
-        $this->wishlist->expects($this->once())
-            ->method('setShared')
-            ->with($shared)
-            ->willReturnSelf();
-        $this->wishlist->expects($this->once())
-            ->method('getId')
-            ->willReturn($wishlistId);
-        $this->wishlist->expects($this->once())
-            ->method('getSharingCode')
-            ->willReturn($sharingCode);
-        $this->wishlist->expects($this->once())
-            ->method('save')
-            ->willReturnSelf();
-
-        $this->wishlistProvider->expects($this->once())
-            ->method('getWishlist')
-            ->willReturn($this->wishlist);
-
-        $this->wishlistConfig->expects($this->once())
-            ->method('getSharingEmailLimit')
-            ->willReturn($emailsLimit);
-        $this->wishlistConfig->expects($this->once())
-            ->method('getSharingTextLimit')
-            ->willReturn($textLimit);
-
-        $this->request->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap([
-                ['emails', $emails],
-                ['message', $text],
-            ]);
-        $this->request->expects($this->exactly(2))
-            ->method('getParam')
-            ->with('rss_url')
-            ->willReturn(true);
-        $this->request->expects($this->once())
-            ->method('getPostValue')
-            ->willReturn($postValue);
-
-        $this->layout->expects($this->once())
-            ->method('getBlock')
-            ->with('wishlist.email.rss')
-            ->willReturnSelf();
-        $this->layout->expects($this->once())
-            ->method('setWishlistId')
-            ->with($wishlistId)
-            ->willReturnSelf();
-        $this->layout->expects($this->once())
-            ->method('toHtml')
-            ->willReturn($rssLink);
-
-        $this->resultLayout->expects($this->exactly(2))
-            ->method('addHandle')
-            ->willReturnMap([
-                ['wishlist_email_rss', null],
-                ['wishlist_email_items', null],
-            ]);
-        $this->resultLayout->expects($this->once())
-            ->method('getLayout')
-            ->willReturn($this->layout);
-
-        $this->inlineTranslation->expects($this->once())
-            ->method('suspend')
-            ->willReturnSelf();
-        $this->inlineTranslation->expects($this->once())
-            ->method('resume')
-            ->willReturnSelf();
-
-        $this->customerSession->expects($this->once())
-            ->method('getCustomerDataObject')
-            ->willReturn($this->customerData);
-
-        $this->customerViewHelper->expects($this->once())
-            ->method('getCustomerName')
-            ->with($this->customerData)
-            ->willReturn($customerName);
-
-        // Throw Exception
-        $this->transportBuilder->expects($this->once())
-            ->method('setTemplateIdentifier')
-            ->willThrowException(new \Exception($exceptionMessage));
-
-        $this->messageManager->expects($this->once())
-            ->method('addError')
-            ->with($exceptionMessage)
-            ->willReturnSelf();
-
-        $this->wishlistSession->expects($this->any())
-            ->method('setSharingForm')
-            ->with($postValue)
-            ->willReturnSelf();
-
-        $this->resultRedirect->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/share')
-            ->willReturnSelf();
-
-        $this->assertEquals($this->resultRedirect, $this->model->execute());
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testExecute()
-    {
-        $text = 'text';
-        $textLimit = 100;
-        $emails = 'user1@example.com';
-        $emailsLimit = 1;
-        $shared = 0;
-        $customerName = 'user1 user1';
-        $wishlistId = 1;
-        $sharingCode = 'sharing code';
-        $templateIdentifier = 'template identifier';
-        $storeId = 1;
-        $viewOnSiteLink = 'view on site link';
-        $from = 'user0@example.com';
-
-        $this->formKeyValidator->expects($this->once())
-            ->method('validate')
-            ->with($this->request)
-            ->willReturn(true);
-
-        $this->wishlist->expects($this->exactly(2))
-            ->method('getShared')
-            ->willReturn($shared);
-        $this->wishlist->expects($this->once())
-            ->method('setShared')
-            ->with(++$shared)
-            ->willReturnSelf();
-        $this->wishlist->expects($this->exactly(2))
-            ->method('getId')
-            ->willReturn($wishlistId);
-        $this->wishlist->expects($this->once())
-            ->method('getSharingCode')
-            ->willReturn($sharingCode);
-        $this->wishlist->expects($this->once())
-            ->method('save')
-            ->willReturnSelf();
-        $this->wishlist->expects($this->once())
-            ->method('isSalable')
-            ->willReturn(true);
-
-        $this->wishlistProvider->expects($this->once())
-            ->method('getWishlist')
-            ->willReturn($this->wishlist);
-
-        $this->wishlistConfig->expects($this->once())
-            ->method('getSharingEmailLimit')
-            ->willReturn($emailsLimit);
-        $this->wishlistConfig->expects($this->once())
-            ->method('getSharingTextLimit')
-            ->willReturn($textLimit);
-
-        $this->request->expects($this->exactly(2))
-            ->method('getPost')
-            ->willReturnMap([
-                ['emails', $emails],
-                ['message', $text],
-            ]);
-        $this->request->expects($this->exactly(2))
-            ->method('getParam')
-            ->with('rss_url')
-            ->willReturn(true);
-
-        $this->layout->expects($this->exactly(2))
-            ->method('getBlock')
-            ->willReturnMap([
-                ['wishlist.email.rss', $this->layout],
-                ['wishlist.email.items', $this->layout],
-            ]);
-
-        $this->layout->expects($this->once())
-            ->method('setWishlistId')
-            ->with($wishlistId)
-            ->willReturnSelf();
-        $this->layout->expects($this->exactly(2))
-            ->method('toHtml')
-            ->willReturn($text);
-
-        $this->resultLayout->expects($this->exactly(2))
-            ->method('addHandle')
-            ->willReturnMap([
-                ['wishlist_email_rss', null],
-                ['wishlist_email_items', null],
-            ]);
-        $this->resultLayout->expects($this->exactly(2))
-            ->method('getLayout')
-            ->willReturn($this->layout);
-
-        $this->inlineTranslation->expects($this->once())
-            ->method('suspend')
-            ->willReturnSelf();
-        $this->inlineTranslation->expects($this->once())
-            ->method('resume')
-            ->willReturnSelf();
-
-        $this->customerSession->expects($this->once())
-            ->method('getCustomerDataObject')
-            ->willReturn($this->customerData);
-
-        $this->customerViewHelper->expects($this->once())
-            ->method('getCustomerName')
-            ->with($this->customerData)
-            ->willReturn($customerName);
-
-        $this->scopeConfig->expects($this->exactly(2))
-            ->method('getValue')
-            ->willReturnMap([
-                ['wishlist/email/email_template', ScopeInterface::SCOPE_STORE, null, $templateIdentifier],
-                ['wishlist/email/email_identity', ScopeInterface::SCOPE_STORE, null, $from],
-            ]);
-
-        $this->store->expects($this->once())
-            ->method('getStoreId')
-            ->willReturn($storeId);
-
-        $this->url->expects($this->once())
-            ->method('getUrl')
-            ->with('*/shared/index', ['code' => $sharingCode])
-            ->willReturn($viewOnSiteLink);
-
-        $this->transportBuilder->expects($this->once())
-            ->method('setTemplateIdentifier')
-            ->with($templateIdentifier)
-            ->willReturnSelf();
-        $this->transportBuilder->expects($this->once())
-            ->method('setTemplateOptions')
-            ->with([
-                'area' => Area::AREA_FRONTEND,
-                'store' => $storeId,
-            ])
-            ->willReturnSelf();
-        $this->transportBuilder->expects($this->once())
-            ->method('setTemplateVars')
-            ->with([
-                'customer' => $this->customerData,
-                'customerName' => $customerName,
-                'salable' => 'yes',
-                'items' => $text,
-                'viewOnSiteLink' => $viewOnSiteLink,
-                'message' => $text . $text,
-                'store' => $this->store,
-            ])
-            ->willReturnSelf();
-        $this->transportBuilder->expects($this->once())
-            ->method('setFrom')
-            ->with($from)
-            ->willReturnSelf();
-        $this->transportBuilder->expects($this->once())
-            ->method('addTo')
-            ->with($emails)
-            ->willReturnSelf();
-        $this->transportBuilder->expects($this->once())
-            ->method('getTransport')
-            ->willReturn($this->transport);
-
-        $this->transport->expects($this->once())
-            ->method('sendMessage')
-            ->willReturnSelf();
-
-        $this->eventManager->expects($this->once())
-            ->method('dispatch')
-            ->with('wishlist_share', ['wishlist' => $this->wishlist])
-            ->willReturnSelf();
-
-        $this->messageManager->expects($this->once())
-            ->method('addSuccess')
-            ->with(__('Your wish list has been shared.'))
-            ->willReturnSelf();
-
-        $this->resultRedirect->expects($this->once())
-            ->method('setPath')
-            ->with('*/*', ['wishlist_id' => $wishlistId])
-            ->willReturnSelf();
-
-        $this->assertEquals($this->resultRedirect, $this->model->execute());
-    }
 }
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php
new file mode 100644
index 0000000000000..fb0113eb6ae75
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/Product/AttributeValueProviderTest.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Test\Unit\Model\Product;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Wishlist\Model\Product\AttributeValueProvider;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject;
+
+/**
+ * AttributeValueProviderTest
+ */
+class AttributeValueProviderTest extends TestCase
+{
+    /**
+     * @var AttributeValueProvider|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attributeValueProvider;
+
+    /**
+     * @var CollectionFactory|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productCollectionFactoryMock;
+
+    /**
+     * @var Product|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productMock;
+
+    /**
+     * @var AdapterInterface|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * Set Up
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->productCollectionFactoryMock = $this->createPartialMock(
+            CollectionFactory::class,
+            ['create']
+        );
+        $this->attributeValueProvider = new AttributeValueProvider(
+            $this->productCollectionFactoryMock
+        );
+    }
+
+    /**
+     * Get attribute text when the flat table is disabled
+     *
+     * @param int $productId
+     * @param string $attributeCode
+     * @param string $attributeText
+     * @return void
+     * @dataProvider attributeDataProvider
+     */
+    public function testGetAttributeTextWhenFlatIsDisabled(int $productId, string $attributeCode, string $attributeText)
+    {
+        $this->productMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getData'])
+            ->getMock();
+
+        $this->productMock->expects($this->any())
+            ->method('getData')
+            ->with($attributeCode)
+            ->willReturn($attributeText);
+
+        $productCollection = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'addIdFilter', 'addStoreFilter', 'addAttributeToSelect', 'isEnabledFlat', 'getFirstItem'
+            ])->getMock();
+
+        $productCollection->expects($this->any())
+            ->method('addIdFilter')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())
+            ->method('addStoreFilter')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())
+            ->method('addAttributeToSelect')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())
+            ->method('isEnabledFlat')
+            ->willReturn(false);
+        $productCollection->expects($this->any())
+            ->method('getFirstItem')
+            ->willReturn($this->productMock);
+
+        $this->productCollectionFactoryMock->expects($this->atLeastOnce())
+            ->method('create')
+            ->willReturn($productCollection);
+
+        $actual = $this->attributeValueProvider->getRawAttributeValue($productId, $attributeCode);
+
+        $this->assertEquals($attributeText, $actual);
+    }
+
+    /**
+     * Get attribute text when the flat table is enabled
+     *
+     * @dataProvider attributeDataProvider
+     * @param int $productId
+     * @param string $attributeCode
+     * @param string $attributeText
+     * @return void
+     */
+    public function testGetAttributeTextWhenFlatIsEnabled(int $productId, string $attributeCode, string $attributeText)
+    {
+        $this->connectionMock = $this->getMockBuilder(AdapterInterface::class)->getMockForAbstractClass();
+        $this->connectionMock->expects($this->any())
+            ->method('fetchRow')
+            ->willReturn([
+                $attributeCode => $attributeText
+            ]);
+        $this->productMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getData'])
+            ->getMock();
+        $this->productMock->expects($this->any())
+            ->method('getData')
+            ->with($attributeCode)
+            ->willReturn($attributeText);
+
+        $productCollection = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'addIdFilter', 'addStoreFilter', 'addAttributeToSelect', 'isEnabledFlat', 'getConnection'
+            ])->getMock();
+
+        $productCollection->expects($this->any())
+            ->method('addIdFilter')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())
+            ->method('addStoreFilter')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())
+            ->method('addAttributeToSelect')
+            ->willReturnSelf();
+        $productCollection->expects($this->any())
+            ->method('isEnabledFlat')
+            ->willReturn(true);
+        $productCollection->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $this->productCollectionFactoryMock->expects($this->atLeastOnce())
+            ->method('create')
+            ->willReturn($productCollection);
+
+        $actual = $this->attributeValueProvider->getRawAttributeValue($productId, $attributeCode);
+
+        $this->assertEquals($attributeText, $actual);
+    }
+
+    /**
+     * @return array
+     */
+    public function attributeDataProvider(): array
+    {
+        return [
+            [1, 'attribute_code', 'Attribute Text']
+        ];
+    }
+}
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php
index 98d36dea28a2a..763812ce39dab 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php
@@ -19,37 +19,37 @@ class WishlistTest extends \PHPUnit\Framework\TestCase
     protected $model;
 
     /**
-     * @var \Magento\Wishlist\Block\Customer\Wishlist
+     * @var \Magento\Wishlist\Block\Customer\Wishlist|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $wishlistBlock;
 
     /**
-     * @var \Magento\Rss\Model\RssFactory
+     * @var \Magento\Rss\Model\RssFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $rssFactoryMock;
 
     /**
-     * @var \Magento\Framework\UrlInterface
+     * @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $urlBuilderMock;
 
     /**
-     * @var \Magento\Wishlist\Helper\Rss
+     * @var \Magento\Wishlist\Helper\Rss|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $wishlistHelperMock;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $scopeConfig;
 
     /**
-     * @var \Magento\Catalog\Helper\Image
+     * @var \Magento\Catalog\Helper\Image|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $imageHelperMock;
 
     /**
-     * @var \Magento\Catalog\Helper\Output
+     * @var \Magento\Catalog\Helper\Output|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $catalogOutputMock;
 
@@ -59,7 +59,7 @@ class WishlistTest extends \PHPUnit\Framework\TestCase
     protected $layoutMock;
 
     /**
-     * @var \Magento\Customer\Model\CustomerFactory
+     * @var \Magento\Customer\Model\CustomerFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $customerFactory;
 
@@ -276,17 +276,46 @@ protected function processWishlistItemDescription($wishlistModelMock, $staticArg
         return $description;
     }
 
+    /**
+     * @return void
+     */
     public function testIsAllowed()
     {
-        $this->scopeConfig->expects($this->once())->method('getValue')
+        $customerId = 1;
+        $customerServiceMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
+        $wishlist = $this->getMockBuilder(\Magento\Wishlist\Model\Wishlist::class)
+            ->setMethods(['getCustomerId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $wishlist->expects($this->once())->method('getCustomerId')->willReturn($customerId);
+        $this->wishlistHelperMock->expects($this->once())->method('getWishlist')
+            ->willReturn($wishlist);
+        $this->wishlistHelperMock->expects($this->once())
+            ->method('getCustomer')
+            ->willReturn($customerServiceMock);
+        $customerServiceMock->expects($this->once())->method('getId')->willReturn($customerId);
+
+        $this->scopeConfig->expects($this->once())->method('isSetFlag')
             ->with('rss/wishlist/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue(true));
+
         $this->assertTrue($this->model->isAllowed());
     }
 
+    /**
+     * @return void
+     */
     public function testGetCacheKey()
     {
-        $this->assertEquals('rss_wishlist_data', $this->model->getCacheKey());
+        $wishlistId = 1;
+        $wishlist = $this->getMockBuilder(\Magento\Wishlist\Model\Wishlist::class)
+            ->setMethods(['getId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $wishlist->expects($this->once())->method('getId')->willReturn($wishlistId);
+        $this->wishlistHelperMock->expects($this->once())->method('getWishlist')->willReturn($wishlist);
+
+        $this->assertEquals('rss_wishlist_data_1', $this->model->getCacheKey());
     }
 
     public function testGetCacheLifetime()
diff --git a/app/code/Magento/Wishlist/ViewModel/AllowedQuantity.php b/app/code/Magento/Wishlist/ViewModel/AllowedQuantity.php
new file mode 100644
index 0000000000000..993d8817d035c
--- /dev/null
+++ b/app/code/Magento/Wishlist/ViewModel/AllowedQuantity.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\ViewModel;
+
+use Magento\Catalog\Controller\Adminhtml\Product\Initialization\StockDataFilter;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\CatalogInventory\Model\StockRegistry;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * ViewModel for Wishlist Cart Block.
+ */
+class AllowedQuantity implements ArgumentInterface
+{
+    /**
+     * @var StockRegistry
+     */
+    private $stockRegistry;
+
+    /**
+     * @var ItemInterface
+     */
+    private $item;
+
+    /**
+     * @param StockRegistry $stockRegistry
+     */
+    public function __construct(StockRegistry $stockRegistry)
+    {
+        $this->stockRegistry = $stockRegistry;
+    }
+
+    /**
+     * Set product configuration item.
+     *
+     * @param ItemInterface $item
+     * @return self
+     */
+    public function setItem(ItemInterface $item): self
+    {
+        $this->item = $item;
+
+        return $this;
+    }
+
+    /**
+     * Get product configuration item.
+     *
+     * @return ItemInterface
+     */
+    public function getItem(): ItemInterface
+    {
+        return $this->item;
+    }
+
+    /**
+     * Get min and max qty for wishlist form.
+     *
+     * @return array
+     */
+    public function getMinMaxQty(): array
+    {
+        $product = $this->getItem()->getProduct();
+        $stockItem = $this->stockRegistry->getStockItem($product->getId(), $product->getStore()->getWebsiteId());
+        $params = [];
+
+        $params['minAllowed'] = (float)$stockItem->getMinSaleQty();
+        if ($stockItem->getMaxSaleQty()) {
+            $params['maxAllowed'] = (float)$stockItem->getMaxSaleQty();
+        } else {
+            $params['maxAllowed'] = (float)StockDataFilter::MAX_QTY_VALUE;
+        }
+
+        return $params;
+    }
+}
diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json
index 4db0e55d869fc..f45813d6eebae 100644
--- a/app/code/Magento/Wishlist/composer.json
+++ b/app/code/Magento/Wishlist/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-wishlist",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/module-store": "100.2.*",
         "magento/module-customer": "101.0.*",
         "magento/module-catalog": "102.0.*",
@@ -12,7 +12,8 @@
         "magento/module-backend": "100.2.*",
         "magento/module-sales": "101.0.*",
         "magento/framework": "101.0.*",
-        "magento/module-ui": "101.0.*"
+        "magento/module-ui": "101.0.*",
+        "magento/module-captcha": "100.2.*"
     },
     "suggest": {
         "magento/module-configurable-product": "100.2.*",
@@ -23,7 +24,7 @@
         "magento/module-wishlist-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "101.0.4",
+    "version": "101.0.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Wishlist/etc/config.xml b/app/code/Magento/Wishlist/etc/config.xml
index 1fec2d1baf9d4..572ecf9de63df 100644
--- a/app/code/Magento/Wishlist/etc/config.xml
+++ b/app/code/Magento/Wishlist/etc/config.xml
@@ -18,5 +18,22 @@
                 <text_limit>255</text_limit>
             </email>
         </wishlist>
+        <captcha translate="label">
+            <frontend>
+                <areas>
+                    <share_wishlist_form>
+                        <label>Share Wishlist Form</label>
+                    </share_wishlist_form>
+                </areas>
+            </frontend>
+        </captcha>
+        <customer>
+            <captcha>
+                <shown_to_logged_in_user>
+                    <share_wishlist_form>1</share_wishlist_form>
+                </shown_to_logged_in_user>
+            </captcha>
+        </customer>
     </default>
+
 </config>
diff --git a/app/code/Magento/Wishlist/etc/module.xml b/app/code/Magento/Wishlist/etc/module.xml
index ade606be9e086..e36445cfd86e6 100644
--- a/app/code/Magento/Wishlist/etc/module.xml
+++ b/app/code/Magento/Wishlist/etc/module.xml
@@ -10,6 +10,7 @@
         <sequence>
             <module name="Magento_Customer"/>
             <module name="Magento_Catalog"/>
+            <module name="Magento_Captcha"/>
         </sequence>
     </module>
 </config>
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
index 243a06062425a..05540e313f11d 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
@@ -17,6 +17,7 @@
                 <block class="Magento\Wishlist\Block\Customer\Wishlist\Items" name="customer.wishlist.items" as="items" template="Magento_Wishlist::item/list.phtml" cacheable="false">
                     <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Image" name="customer.wishlist.item.image" template="Magento_Wishlist::item/column/image.phtml" cacheable="false"/>
                     <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Info" name="customer.wishlist.item.name" template="Magento_Wishlist::item/column/name.phtml" cacheable="false"/>
+                    <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column" name="customer.wishlist.item.review" template="Magento_Wishlist::item/column/review.phtml" cacheable="false"/>
                     <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Cart" name="customer.wishlist.item.price" template="Magento_Wishlist::item/column/price.phtml" cacheable="false">
                         <block class="Magento\Catalog\Pricing\Render" name="product.price.render.wishlist">
                             <arguments>
@@ -39,6 +40,7 @@
                         </block>
                         <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Cart" name="customer.wishlist.item.cart" template="Magento_Wishlist::item/column/cart.phtml" cacheable="false">
                             <arguments>
+                                <argument name="allowedQuantityViewModel" xsi:type="object">Magento\Wishlist\ViewModel\AllowedQuantity</argument>
                                 <argument name="title" translate="true" xsi:type="string">Add to Cart</argument>
                             </arguments>
                         </block>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
index 9ea0d1a823235..434bd57a2087f 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
@@ -11,6 +11,9 @@
 /** @var \Magento\Wishlist\Model\Item $item */
 $item = $block->getItem();
 $product = $item->getProduct();
+/** @var \Magento\Wishlist\ViewModel\AllowedQuantity $viewModel */
+$viewModel = $block->getData('allowedQuantityViewModel');
+$allowedQty = $viewModel->setItem($item)->getMinMaxQty();
 ?>
 <?php foreach ($block->getChildNames() as $childName): ?>
     <?= /* @noEscape */ $block->getLayout()->renderElement($childName, false) ?>
@@ -21,8 +24,8 @@ $product = $item->getProduct();
         <div class="field qty">
             <label class="label" for="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]"><span><?= $block->escapeHtml(__('Qty')) ?></span></label>
             <div class="control">
-                <input type="number" data-role="qty" id="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]" class="input-text qty" data-validate="{'required-number':true,'validate-greater-than-zero':true}"
-               name="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]" value="<?= /* @noEscape */ (int)($block->getAddToCartQty($item) * 1) ?>">
+                <input type="number" data-role="qty" id="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]" class="input-text qty" data-validate="{'required-number':true,'validate-greater-than-zero':true,'validate-item-quantity':{'minAllowed':<?= /* @noEscape */ $allowedQty['minAllowed'] ?>,'maxAllowed':<?= /* @noEscape */ $allowedQty['maxAllowed'] ?>}}"
+               name="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]" value="<?= /* @noEscape */ (int)($block->getAddToCartQty($item) * 1) ?>" <?= $product->isSaleable() ? '' : 'disabled="disabled"' ?>>
             </div>
         </div>
     <?php endif; ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml
index 17e2404ee23cf..5ab5bc5422e7e 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml
@@ -17,6 +17,6 @@ $item = $block->getItem();
         <span><?= $block->escapeHtml(__('Comment')) ?></span>
     </label>
     <div class="control">
-        <textarea id="product-item-comment-<?= $block->escapeHtmlAttr($item->getWishlistItemId()) ?>" placeholder="<?= /* @noEscape */ $this->helper('Magento\Wishlist\Helper\Data')->defaultCommentString() ?>" name="description[<?= $block->escapeHtmlAttr($item->getWishlistItemId()) ?>]" title="<?= $block->escapeHtmlAttr(__('Comment')) ?>" class="product-item-comment"><?= ($block->escapeHtml($item->getDescription())) ?></textarea>
+        <textarea id="product-item-comment-<?= $block->escapeHtmlAttr($item->getWishlistItemId()) ?>" placeholder="<?= /* @noEscape */ $this->helper('Magento\Wishlist\Helper\Data')->defaultCommentString() ?>" name="description[<?= $block->escapeHtmlAttr($item->getWishlistItemId()) ?>]" title="<?= $block->escapeHtmlAttr(__('Comment')) ?>" class="product-item-comment" <?= $item->getProduct()->isSaleable() ? '' : 'disabled="disabled"' ?>><?= ($block->escapeHtml($item->getDescription())) ?></textarea>
     </div>
 </div>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/review.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/review.phtml
new file mode 100644
index 0000000000000..3fd492233bdd5
--- /dev/null
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/review.phtml
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column $block */
+$product = $block->getItem()->getProduct();
+?>
+<?= $block->getReviewsSummaryHtml($product, 'short');
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml
index 430ebd384c82b..ff01cb4532cc7 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml
@@ -40,6 +40,7 @@
             </div>
         <?php endif; ?>
     </fieldset>
+    <?= $block->getChildHtml('captcha'); ?>
     <div class="actions-toolbar">
         <div class="primary">
             <button type="submit" title="<?= $block->escapeHtmlAttr(__('Share Wish List')) ?>" class="action submit primary">
diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
index 7ce934317263b..db3b8c83a5064 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
+++ b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
@@ -162,18 +162,11 @@ define([
                 $.each(elementValue, function (key, option) {
                     data[elementName + '[' + option + ']'] = option;
                 });
+            } else if (elementName.substr(elementName.length - 2) == '[]') { //eslint-disable-line eqeqeq, max-depth
+                elementName = elementName.substring(0, elementName.length - 2);
+                data[elementName + '[' + elementValue + ']'] = elementValue;
             } else {
-                if (elementValue) { //eslint-disable-line no-lonely-if
-                    if (elementName.substr(elementName.length - 2) == '[]') { //eslint-disable-line eqeqeq, max-depth
-                        elementName = elementName.substring(0, elementName.length - 2);
-
-                        if (elementValue) { //eslint-disable-line max-depth
-                            data[elementName + '[' + elementValue + ']'] = elementValue;
-                        }
-                    } else {
-                        data[elementName] = elementValue;
-                    }
-                }
+                data[elementName] = elementValue;
             }
 
             return data;
diff --git a/app/code/Magento/WishlistAnalytics/composer.json b/app/code/Magento/WishlistAnalytics/composer.json
index 820430f6c7d17..f24bba445c102 100644
--- a/app/code/Magento/WishlistAnalytics/composer.json
+++ b/app/code/Magento/WishlistAnalytics/composer.json
@@ -2,12 +2,12 @@
     "name": "magento/module-wishlist-analytics",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*",
         "magento/module-wishlist": "101.0.*"
     },
     "type": "magento2-module",
-    "version": "100.2.2",
+    "version": "100.2.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/design/adminhtml/Magento/backend/Magento_AdminNotification/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_AdminNotification/web/css/source/_module.less
index c1b684aef354f..afd91ed3dbde6 100644
--- a/app/design/adminhtml/Magento/backend/Magento_AdminNotification/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_AdminNotification/web/css/source/_module.less
@@ -83,7 +83,7 @@
 
 .message-system-short-wrapper {
     overflow: hidden;
-    padding: 0 1.5rem 0 @indent__l;
+    padding: 0 1.5rem 0 1rem;
 }
 
 .message-system-collapsible {
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
index 8825f4ea3f5a2..0573054d5b96f 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
@@ -15,9 +15,9 @@
 
 @menu__background-color: @color-very-dark-grayish-orange;
 
-@menu-logo__padding-bottom: 2.2rem;
+@menu-logo__padding-bottom: 1.7rem;
 @menu-logo__outer-size: @menu-logo__padding-top + @menu-logo-img__height + @menu-logo__padding-bottom;
-@menu-logo__padding-top: 1.2rem;
+@menu-logo__padding-top: 1.7rem; 
 @menu-logo-img__height: 4.1rem;
 @menu-logo-img__width: 3.5rem;
 
@@ -187,12 +187,12 @@
         display: block;
     }
 
-    // External link marker
+    //  External link marker
     [target='_blank'] {
         &:after {
             &:extend(.abs-icon all);
             content: @icon-external-link__content;
-            font-size: 0.5rem;
+            font-size: .5rem;
             margin-left: @indent__xs;
             vertical-align: super;
         }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less
index 8fcb0f94fff4e..39832ab783c4c 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less
@@ -84,6 +84,8 @@
         position: absolute;
         right: 0;
         top: 100%;
+        word-break: break-word;
+        word-wrap: break-word;
         z-index: 2;
 
         &:after {
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less
index 07050c1e5111d..08434727ccc9c 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less
@@ -44,7 +44,6 @@
 
 .page-actions {
     @_page-action__indent: 1.3rem;
-    float: right;
 
     .page-main-actions & {
         &._fixed {
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
index 6420738c6fb9b..4f173dcb3adaa 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
@@ -105,11 +105,16 @@
 //
 
 .admin__collapsible-block-wrapper {
+    .admin__collapsible-title[aria-expanded='true'] {
+        &:before {
+            content: @icon-expand-close__content;
+        }
+    } 
+    
     .__collapsible-block-wrapper-pattern();
     .admin__collapsible-title {
         .__collapsible-title-pattern();
     }
-
     &.opened,
     &._show {
         > .fieldset-wrapper-title {
@@ -127,8 +132,24 @@
                 }
             }
         }
+        td.admin__collapsible-block-wrapper {
+            .admin__collapsible-title {
+                &:before {
+                    content: @icon-expand-open__content;
+                }
+            }
+            &._show {
+                .admin__collapsible-title {
+                    &:before {
+                        content: @icon-expand-close__content;
+                    } 
+                }
+            }
+        }
     }
 
+    
+
     &.fieldset-wrapper {
         border-bottom: 1px solid @collapsible__border-color;
         padding: 0;
@@ -147,6 +168,14 @@
     &.collapsible-block-wrapper-last {
         border-bottom: 0;
     }
+
+    .admin__dynamic-rows.admin__control-collapsible {
+        td {
+            &.admin__collapsible-block-wrapper {
+                border-bottom: none;
+            }
+        }
+    }
 }
 
 .admin__collapsible-content {
@@ -322,7 +351,7 @@
             }
 
             .value {
-                padding-right: 4rem;
+                padding-right: 2rem;
             }
         }
 
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_page-nav.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_page-nav.less
index 42b3ecfb71122..070ee6347508f 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_page-nav.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_page-nav.less
@@ -203,7 +203,7 @@
     font-weight: @font-weight__heavier;
     line-height: @line-height__s;
     margin: 0 0 -1px;
-    padding: @admin__page-nav-link__padding;
+    padding: 2rem 0 2rem 1rem;
     transition: @admin__page-nav-transition;
     word-wrap: break-word;
 }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less
index 80bebb22a9043..1bf1c51f54976 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/actions-bar/_store-switcher.less
@@ -10,11 +10,6 @@
 //  ToDo UI: Consist old styles, should be changed with new design
 
 .store-switcher {
-    color: @text__color; // ToDo UI: Delete with admin scope
-    float: left;
-    font-size: round(@font-size__base - .1rem, 1);
-    margin-top: .7rem;
-
     .admin__action-dropdown {
         background-color: @page-main-actions__background-color;
         margin-left: .5em;
@@ -47,8 +42,8 @@
             width: 7px;
         }
         &::-webkit-scrollbar-thumb {
-            border-radius: 4px;
             background-color: rgba(0, 0, 0, .5);
+            border-radius: 4px;
         }
 
         li {
@@ -116,6 +111,12 @@
             }
         }
     }
+
+    color: @text__color; // ToDo UI: Delete with admin scope
+    float: left;
+    font-size: round(@font-size__base - .1rem, 1);
+    margin-top: .59rem;
+
 }
 
 .store-switcher-label {
@@ -235,11 +236,11 @@
 .store-view {
     &:not(.store-switcher) {
         float: left;
+        margin-top: 13px;
     }
 
     .store-switcher-label {
         display: inline-block;
-        margin-top: @indent__s;
     }
 }
 
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/images/logo-magento.png b/app/design/adminhtml/Magento/backend/Magento_Backend/web/images/logo-magento.png
index d9395c938cbff..0cca183e08da2 100644
Binary files a/app/design/adminhtml/Magento/backend/Magento_Backend/web/images/logo-magento.png and b/app/design/adminhtml/Magento/backend/Magento_Backend/web/images/logo-magento.png differ
diff --git a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less
index 3355950254072..4cb6bdc59f722 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less
@@ -15,12 +15,33 @@
     }
 }
 
+.catalog-category-edit {
+    .admin__grid-control {
+        .admin__grid-control-value {
+            display: none;
+        }
+    }  
+}
+
 .product-composite-configure-inner {
     .admin__control-text {
         &.qty {
             &:extend(.abs-control-qty all);
         }
     }
+
+    .admin__field {
+        &.required,
+        &._required {
+            & > .admin__field-label > span {
+                width: 100%;
+
+                & span:after {
+                    display: none;
+                }
+            }
+        }
+    }
 }
 
 //
diff --git a/app/design/adminhtml/Magento/backend/Magento_Review/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Review/web/css/source/_module.less
index 17be2ca706076..faa5845405ab2 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Review/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Review/web/css/source/_module.less
@@ -34,7 +34,7 @@
         .admin__field-control {
             direction: rtl;
             display: inline-block;
-            margin: -4px 0 0;
+            margin: -2px 0 0;
             unicode-bidi: bidi-override;
             vertical-align: top;
             width: 125px;
diff --git a/app/design/adminhtml/Magento/backend/Magento_Rma/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Rma/web/css/source/_module.less
index c405707ee7bbe..2ae33e0269ac4 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Rma/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Rma/web/css/source/_module.less
@@ -3,6 +3,8 @@
 //  * See COPYING.txt for license details.
 //  */
 
+@import 'module/_rma.less';
+
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .rma-request-details,
     .rma-wrapper .order-shipping-address {
diff --git a/app/design/adminhtml/Magento/backend/Magento_Rma/web/css/source/module/_rma.less b/app/design/adminhtml/Magento/backend/Magento_Rma/web/css/source/module/_rma.less
new file mode 100644
index 0000000000000..4b3ee21e04ff3
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Rma/web/css/source/module/_rma.less
@@ -0,0 +1,15 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Layout
+//  ---------------------------------------------
+
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
+    .rma-wrapper .order-shipping-method {
+        float: right;
+        #mix-grid .width(6,12);
+    }
+}
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 1e76679f594c1..fa1ae25628986 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
@@ -92,6 +92,14 @@
         margin: 0;
         padding: 0;
     }
+     .admin__data-grid-pager-wrap{
+         .selectmenu {
+             margin-bottom: 10px;
+         }
+     }
+   .data-grid-search-control-wrap {
+        margin-bottom: 10px;
+    }
 }
 
 //
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-account.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-account.less
index e14bcbcddd47f..5c30a00c9a0d7 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-account.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-account.less
@@ -27,3 +27,22 @@
         width: 50%;
     }
 }
+
+.page-create-order {
+    .order-details {
+        &:not(.order-details-existing-customer) {
+            .order-account-information {
+                .field-email {
+                    margin-left: -30px;
+                }
+                /**
+                 * @codingStandardsIgnoreStart
+                 */
+                .field-group_id {
+                    margin-right: 30px;
+                }
+                // @codingStandardsIgnoreEnd
+            }
+        }
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-comments.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-comments.less
index 2f6aec0315e3b..5bcf4d4953cc6 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-comments.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_order-comments.less
@@ -49,7 +49,7 @@
     margin: 0 0 @order-create-sidebar__margin;
     .lib-typography(
     @_font-size: 1.9rem,
-    @_color: @color-brown-darkie,
+    @_color: @color-brown-darker,
     @_font-weight: @font-weight__semibold,
     @_line-height: @line-height__s,
     @_font-family: false,
diff --git a/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_staging-preview.less b/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_staging-preview.less
index a71731320c5ce..a1b22b0e97120 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_staging-preview.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Staging/web/css/source/module/_staging-preview.less
@@ -1,5 +1,5 @@
 // /**
-//  * Copyright © 2015 Magento. All rights reserved.
+//  * Copyright © Magento, Inc. All rights reserved.
 //  * See COPYING.txt for license details.
 //  */
 
@@ -16,7 +16,7 @@
 @staging-preview-header__font-size: 1.3rem;
 
 @staging-preview-header-item__active__background-color: @color-brownie-almost;
-@staging-preview-header-item-actions__border-color: @color-darkie-gray;
+@staging-preview-header-item-actions__border-color: @color-darker-gray;
 
 @staging-preview-form-element__background-color: @color-very-dark-brownie;
 @staging-preview-form-element__border-color: @color-lighter-grayish-almost;
@@ -366,7 +366,7 @@
     //  Generic data grid
     .admin__data-grid-outer-wrap {
         border-top: 1px solid @staging-preview-table-dark__border-color;
-        max-height: 400px; // ToDO: remove after JS adjustment implemented
+        max-height: 400px; // ToDO remove after JS adjustment implemented
         overflow-y: auto;
         padding: 15px @indent__s 0 0;
     }
diff --git a/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less
index 909935e1f8ea8..18d35d2f24654 100644
--- a/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less
@@ -80,6 +80,13 @@
 
         .info-block {
             height: 100px;
+            > span {
+                display: inline-block;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                width: 100%;
+            }
         }
 
         .controlbar-bottom {
diff --git a/app/design/adminhtml/Magento/backend/composer.json b/app/design/adminhtml/Magento/backend/composer.json
index 11f13279b8bc8..752f8a588e438 100644
--- a/app/design/adminhtml/Magento/backend/composer.json
+++ b/app/design/adminhtml/Magento/backend/composer.json
@@ -2,11 +2,11 @@
     "name": "magento/theme-adminhtml-backend",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-theme",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/design/adminhtml/Magento/backend/etc/view.xml b/app/design/adminhtml/Magento/backend/etc/view.xml
index f10f7789b0888..18c2d8f1b1722 100644
--- a/app/design/adminhtml/Magento/backend/etc/view.xml
+++ b/app/design/adminhtml/Magento/backend/etc/view.xml
@@ -23,6 +23,8 @@
         </images>
     </media>
     <exclude>
+        <item type="file">Lib::mage/captcha.js</item>
+        <item type="file">Lib::mage/captcha.min.js</item>
         <item type="file">Lib::mage/common.js</item>
         <item type="file">Lib::mage/cookies.js</item>
         <item type="file">Lib::mage/dataPost.js</item>
diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less
index c535047e37682..c9ad0c6c60b66 100644
--- a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less
+++ b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/tooltips/_tooltips.less
@@ -10,7 +10,7 @@
 @tooltip__background-color: @color-white;
 @tooltip__border-color: @color-gray68;
 @tooltip__border-radius: 0;
-@tooltip__color: @color-brown-darkie;
+@tooltip__color: @color-brown-darker;
 @tooltip__max-width: 31rem;
 @tooltip__opacity: .9;
 @tooltip__shadow-color: @color-gray80;
diff --git a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_variables.less b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_variables.less
index 39d7be029f81f..be1378638180f 100644
--- a/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_variables.less
+++ b/app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_variables.less
@@ -28,7 +28,7 @@
 @color-green-apple: #79a22e;
 @color-green-islamic: #090;
 @color-dark-brownie: #41362f;
-@color-brown-darkie: #41362f;
+@color-brown-darker: #41362f;
 @color-phoenix-down: #e04f00;
 @color-phoenix: #eb5202;
 @color-phoenix-almost-rise: #ef672f;
diff --git a/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/pages/_extension-manager.less b/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/pages/_extension-manager.less
index 911ef55f3f2e6..30500569c82a0 100644
--- a/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/pages/_extension-manager.less
+++ b/app/design/adminhtml/Magento/backend/web/app/updater/styles/less/pages/_extension-manager.less
@@ -15,7 +15,7 @@
 
 @extension-manager-title__background-color: @color-white-fog;
 @extension-manager-title__border-color: @color-gray89;
-@extension-manager-title__color: @color-brown-darkie;
+@extension-manager-title__color: @color-brown-darker;
 
 @extension-manager-button__border-color: @color-gray68;
 
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_tabs.less b/app/design/adminhtml/Magento/backend/web/css/source/_tabs.less
index 475d3914a5ff0..5658214a76986 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_tabs.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_tabs.less
@@ -45,13 +45,13 @@
     }
 
     .ui-tabs-anchor {
-        color: @color-brown-darkie;
+        color: @color-brown-darker;
         display: block;
         padding: 1.5rem 1.8rem 1.3rem;
         text-decoration: none;
 
         &:hover { // ToDo UI: should be deleted with old styles
-            color: @color-brown-darkie;
+            color: @color-brown-darker;
             text-decoration: none;
         }
     }
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_typography.less b/app/design/adminhtml/Magento/backend/web/css/source/_typography.less
index 54726d2d34bd9..1f7d7f879c4aa 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_typography.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_typography.less
@@ -71,7 +71,7 @@ h1 {
 
     .lib-typography(
         @_font-size: 2.8rem,
-        @_color: @color-brown-darkie,
+        @_color: @color-brown-darker,
         @_font-weight: @font-weight__regular,
         @_line-height: @line-height__s,
         @_font-family: false,
@@ -84,7 +84,7 @@ h2 {
 
     .lib-typography(
         @_font-size: 2rem,
-        @_color: @color-brown-darkie,
+        @_color: @color-brown-darker,
         @_font-weight: @font-weight__regular,
         @_line-height: @line-height__s,
         @_font-family: false,
@@ -97,7 +97,7 @@ h3 {
 
     .lib-typography(
         @_font-size: 1.7rem,
-        @_color: @color-brown-darkie,
+        @_color: @color-brown-darker,
         @_font-weight: @font-weight__semibold,
         @_line-height: @line-height__s,
         @_font-family: false,
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
index 213dd3d0f8e25..fc56ec1b6570a 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
@@ -330,7 +330,7 @@
             border-top: @action-multiselect-tree-lines;
             height: 1px;
             top: @action-multiselect-menu-item__padding + @action-multiselect-tree-arrow__size/2;
-            width: @action-multiselect-tree-menu-item__margin-left + @action-multiselect-menu-item__padding;
+            width: @action-multiselect-tree-menu-item__margin-left;
         }
 
         //  Vertical dotted line
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less
index 773b70ca5f09d..0fe3a3e8b2ec7 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_file-insertion.less
@@ -42,6 +42,7 @@
     margin: 0 @indent__xs 15px 0;
     overflow: hidden;
     padding: 3px;
+    text-overflow: ellipsis;
     width: 100px;
 
     &.selected {
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_file-uploader.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_file-uploader.less
index 141e5b604e2e2..7e086db5b7d26 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_file-uploader.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_file-uploader.less
@@ -48,7 +48,7 @@
 
 @data-grid-file-uploader-menu-button__width: 2rem;
 
-@data-grid-file-uploader-upload-icon__color: @color-darkie-gray;
+@data-grid-file-uploader-upload-icon__color: @color-darker-gray;
 @data-grid-file-uploader-upload-icon__hover__color: @color-very-dark-gray;
 @data-grid-file-uploader-upload-icon__line-height: 48px;
 
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
index de24bf89620d4..15cd295885892 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
@@ -76,7 +76,8 @@
         position: absolute;
         speak: none;
         text-shadow: none;
-        top: 1.3rem;
+        top: 50%;
+        margin-top: -1.25rem;
         width: auto;
     }
 }
@@ -110,7 +111,7 @@
         content: @alert-icon__error__content;
         font-size: @alert-icon__error__font-size;
         left: 2.2rem;
-        margin-top: 0.5rem;
+        margin-top: -1.1rem;
     }
 }
 
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
index 63d97dc52e453..565b127ccad3e 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
@@ -146,13 +146,13 @@
     }
 
     .action-close {
-        padding: @modal-popup__padding;
+        padding: @modal-popup__padding - 2;
 
         &:active,
         &:focus {
             background: transparent;
-            padding-right: @modal-popup__padding + (@modal-action-close__font-size - @modal-action-close__active__font-size) / 2;
-            padding-top: @modal-popup__padding + (@modal-action-close__font-size - @modal-action-close__active__font-size) / 2;
+            padding-right: @modal-popup__padding - 2;
+            padding-top: @modal-popup__padding - 2;
         }
     }
 }
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less
index 7bd10ad491f0c..334e0a4a396bc 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less
@@ -264,7 +264,7 @@
             }
         }
 
-        #contents-uploader {
+        .contents-uploader {
             margin: 0 0 @indent__base;
         }
 
@@ -298,6 +298,7 @@
             margin: 0 @indent__xs 15px 0;
             overflow: hidden;
             padding: 3px;
+            text-overflow: ellipsis;
             width: 100px;
 
             &.selected {
@@ -309,7 +310,7 @@
             }
         }
 
-        #contents-uploader {
+        .contents-uploader {
             &:extend(.abs-clearfix all);
         }
 
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
index 5f1cee13b5b88..3dc2a3d85df54 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
@@ -85,7 +85,7 @@
         cursor: pointer;
     }
 
-    &:focus {
+    &:active {
         background-image+: url('../images/arrows-bg.svg');
         background-position+: ~'calc(100% - 12px)' 13px;
 
@@ -107,19 +107,6 @@
     }
 }
 
-//  ToDo UI: add month and date styles
-//  .admin__control-select-month {
-//      width: 140px;
-//  }
-
-//  .admin__control-select-year {
-//      width: 103px;
-//  }
-
-//  .admin__control-cvn {
-//      width: 3em;
-//  }
-
 option:empty {
     display: none;
 }
@@ -151,22 +138,24 @@ option:empty {
 .admin__control-file-label {
     &:before {
         &:extend(.abs-form-control-pattern);
-
-        content:'';
-        left: 0;
-        position: absolute;
-        top: 0;
-        width: 100%;
-        z-index: 0;
-
         .admin__control-file:active + &,
         .admin__control-file:focus + & {
+            /**
+             * @codingStandardsIgnoreStart
+             */
             &:extend(.abs-form-control-pattern:focus);
         }
 
         .admin__control-file[disabled] + & {
             &:extend(.abs-form-control-pattern[disabled]);
         }
+
+        content: '';
+        left: 0;
+        position: absolute;
+        top: 0;
+        width: 100%;
+        z-index: 0;
     }
 }
 
@@ -217,7 +206,6 @@ option:empty {
 
 .admin__control-textarea {
     &:extend(.abs-form-control-pattern all);
-    height: 8.48rem;
     line-height: 1.18;
     padding-top: .8rem;
     resize: vertical;
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 f195a28908abe..0218744b80a4d 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
@@ -60,11 +60,12 @@
 
 .abs-field-no-label {
     /**
-     * @codingStandardsIgnoreStart
+     *@codingStandardsIgnoreStart
      */
     #mix-grid .return_length(@field-label-grid__column, @field-grid__columns, '+');
     //@codingStandardsIgnoreEnd
     margin-left: @_length;
+    //@codingStandardsIgnoreEnd
 }
 
 //
@@ -170,13 +171,6 @@
     .admin__control-text,
     .admin__control-textarea {
         width: 100%;
-        &.disabled {
-            background-color: #e9e9e9;
-            border-color: #adadad;
-            color: #303030;
-            cursor: not-allowed;
-            opacity: .5;
-        }
     }
 }
 
@@ -194,13 +188,10 @@
 
 .admin__field-label {
     color: @field-label__color;
+    cursor: pointer;
     margin: 0;
     text-align: right;
 
-    label {
-        cursor: pointer;
-    }
-
     + br {
         display: none;
     }
@@ -216,7 +207,6 @@
 
         &:before {
             .appearing__off();
-            content: '.';
             margin-left: -7px;
             overflow: hidden;
         }
@@ -297,17 +287,33 @@
         }
     }
 
+    legend.admin__field-label {
+        span {
+            &:after {
+                display: none;
+            }
+        }
+    }
+
     //  ToDo UI: Scope Labels must be moved from right side of each control to the place under the label of the control.
     //  This code must be removed after Scope Labels are moved completely.
     //  Till that time they'll be disabled by commenting pseudo-element content property.
     &[data-config-scope] {
         &:before {
+            /**
+             *@codingStandardsIgnoreStart
+             */
             #mix-grid .return_length(@field-label-grid__column + @field-control-grid__column, @field-grid__columns);
+            //@codingStandardsIgnoreEnd
             color: @field-scope__color;
             content: attr(data-config-scope);
             display: inline-block;
             font-size: @font-size__s;
+            /**
+             *@codingStandardsIgnoreStart
+             */
             left: @_length;
+            //@codingStandardsIgnoreEnd
             line-height: 3.2rem;
             margin-left: 2 * @temp_gutter;
             position: absolute;
@@ -636,8 +642,8 @@
         &.admin__field {
             > .admin__field-control {
                 &:extend(.abs-field-size-small all);
-                float: left;
                 position: relative;
+                display: inline-block;
             }
         }
 
@@ -672,10 +678,13 @@
                 margin: 0;
                 opacity: 1;
                 position: static;
-                text-align: left;
             }
         }
 
+        .admin__field-label {
+            text-align: left;
+        }
+
         &:nth-child(n + 2) {
             &:not(.admin__field-option):not(.admin__field-group-show-label):not(.admin__field-date) {
                 > .admin__field-label[class] {
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less
index 0bfa454adbf0d..ec6fcb1d6b2df 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less
@@ -162,7 +162,7 @@
             @_icon-font-line-height: 16px,
             @_icon-font-text-hide: true,
             @_icon-font-position: after,
-            @_icon-font-color: @color-brown-darkie
+            @_icon-font-color: @color-brown-darker
         );
 
         span {
@@ -175,7 +175,7 @@
             z-index: 2;
 
             &:after {
-                color: darken(@color-brown-darkie, 20%);
+                color: darken(@color-brown-darker, 20%);
             }
 
             //  @Todo ui - testing solution to show action hint without title attribute
@@ -253,7 +253,7 @@ label.mage-error {
 
         .captcha-reload {
             float: right;
-            vertical-align: middle;
+            margin-top: 15px;
         }
     }
 }
@@ -408,15 +408,26 @@ label.mage-error {
             width: 16px;
             z-index: 1;
 
+            /**
+             *@codingStandardsIgnoreStart
+             */
             &:before {
+                /**
+                 * @codingStandardsIgnoreStart
+                 */
                 &:extend(.admin__control-checkbox + label:before);
+                //  @codingStandardsIgnoreEnd
                 left: 0;
                 position: absolute;
                 top: 0;
             }
 
             &:after {
+                /**
+                 * @codingStandardsIgnoreStart
+                 */
                 &:extend(.action-multicheck-wrap .action-multicheck-toggle:after);
+                //  @codingStandardsIgnoreEnd
                 top: 40% !important;
             }
         }
@@ -424,7 +435,11 @@ label.mage-error {
         &:focus {
             + label {
                 &:after {
+                    /**
+                     * @codingStandardsIgnoreStart
+                     */
                     &:extend(.action-multicheck-wrap .action-multicheck-toggle._active:after);
+                    //  @codingStandardsIgnoreEnd
                 }
             }
         }
@@ -432,8 +447,13 @@ label.mage-error {
         &._checked {
             + label {
                 &:before {
+                    /**
+                     * @codingStandardsIgnoreStart
+                     */
                     &:extend(.admin__control-checkbox:checked + label:before);
+                    //  @codingStandardsIgnoreEnd
                 }
+                //@codingStandardsIgnoreEnd
             }
 
             &._indeterminate {
@@ -547,7 +567,7 @@ label.mage-error {
         }
 
         .admin__control-select-placeholder {
-            color: @color-darkie-gray;
+            color: @color-darker-gray;
             font-weight: @font-weight__bold;
         }
     }
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/variables/_colors.less b/app/design/adminhtml/Magento/backend/web/css/source/variables/_colors.less
index b477384096b01..ad57d7b47113e 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/variables/_colors.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/variables/_colors.less
@@ -8,7 +8,7 @@
 //  _____________________________________________
 
 @color-brown-dark: #4a3f39;
-@color-brown-darkie: #41362f;
+@color-brown-darker: #41362f;
 @color-very-dark-gray-black: #303030;
 @color-very-dark-gray-black2: #35302c;
 @color-very-dark-grayish-orange: #373330;
@@ -23,7 +23,7 @@
 @color-brownie-vanilla: #736963;
 @color-dark-gray0: #7f7c7a;
 @color-dark-gray: #808080;
-@color-darkie-gray: #8a837f;
+@color-darker-gray: #8a837f;
 @color-gray65: #a6a6a6;
 @color-gray65-almost: #a79d95;
 @color-gray65-lighten: #aaa6a0;
@@ -73,5 +73,5 @@
 
 @primary__color: @color-phoenix;
 @success__color: @color-green-apple;
-@text__color: @color-brown-darkie;
+@text__color: @color-brown-darker;
 @border__color: @color-gray89;
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/variables/_data-grid.less b/app/design/adminhtml/Magento/backend/web/css/source/variables/_data-grid.less
index 69393a62200cc..40831684adceb 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/variables/_data-grid.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/variables/_data-grid.less
@@ -30,7 +30,7 @@
 @data-grid-td__odd__update__active__background-color: darken(@data-grid-td__update__active__background-color, 10%);
 @data-grid-td__odd__update__upcoming__background-color: darken(@data-grid-td__update__upcoming__background-color, 10%);
 
-@data-grid-th__border-color: @color-darkie-gray;
+@data-grid-th__border-color: @color-darker-gray;
 @data-grid-th__border-style: solid;
 @data-grid-th__background-color: @color-brownie;
 @data-grid-th__color: @color-white;
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 6d46145df388c..116163cc375a8 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -2738,7 +2738,8 @@
     //  ---------------------------------------------
 
     #widget_instace_tabs_properties_section_content .widget-option-label {
-        margin-top: 6px;
+        margin-top: 7px;
+        display: inline-block;
     }
 
     //
@@ -4832,6 +4833,9 @@
                     margin-bottom: @indent__m;
                     margin-top: -@indent__xl;
                 }
+                select + .mage-error {
+                    margin-top: 0;
+                }
             }
         }
     }
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 2dd8463308a2c..85ef048ef0fc7 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
@@ -488,6 +488,7 @@
 
         .product-items-names {
             .product-item {
+                display: flex;
                 margin-bottom: @indent__s;
             }
 
diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less
index 8b727b0d9c28d..f38b98c14b0b3 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less
@@ -63,7 +63,6 @@
             }
 
             &-actions {
-                display: none;
 
                 .actions-secondary {
                     > button.action {
@@ -95,7 +94,6 @@
                 .reviews-actions {
                     font-size: @font-size__s;
                     margin-top: 5px;
-                    text-transform: lowercase;
                 }
             }
 
diff --git a/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/_module.less
index daed96db717c7..b7255f9792993 100644
--- a/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_CatalogSearch/web/css/source/_module.less
@@ -188,6 +188,17 @@
             margin-bottom: 0;
         }
     }
+
+    .form.search.advanced {
+        .field.price {
+            .with-addon {
+                .input-text {
+                    flex-basis: auto;
+                    width: 100%;
+                }
+            }
+        }
+    }
 }
 
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
@@ -256,4 +267,9 @@
     .search-autocomplete {
         margin-top: 0;
     }
+
+    .form.search.advanced {
+        min-width: 600px;
+        width: 50%;
+    }
 }
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 54457353f90ae..5cf1e9f59af39 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
@@ -107,7 +107,7 @@
         @_toggle-selector: ~'.action.showcart',
         @_options-selector: ~'.block-minicart',
         @_dropdown-list-width: 320px,
-        @_dropdown-list-position-right: 0px,
+        @_dropdown-list-position-right: 0,
         @_dropdown-list-pointer-position: right,
         @_dropdown-list-pointer-position-left-right: 26px,
         @_dropdown-list-z-index: 101,    
@@ -341,7 +341,7 @@
         .item-qty {
             margin-right: @indent__s;
             text-align: center;
-            width: 40px;
+            width: 45px;
         }
 
         .update-cart-item {
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_fields.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_fields.less
index 4479c070a4e17..8dec680b58726 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_fields.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_fields.less
@@ -55,31 +55,3 @@
         }
     }
 }
-
-//
-//  Desktop
-//  _____________________________________________
-
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
-    //  ToDo UI: remove with global blank theme .field.required update
-    .opc-wrapper {
-        .fieldset {
-            > .field {
-                &.required,
-                &._required {
-                    position: relative;
-
-                    > label {
-                        padding-right: 25px;
-
-                        &:after {
-                            margin-left: @indent__s;
-                            position: absolute;
-                            top: 9px;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
index 5f8134193c67f..35445b0989e86 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
@@ -209,6 +209,13 @@
             .fieldset {
                 > .field {
                     margin: 0 0 @indent__base;
+                    
+                    &.choice {
+                        &:before {
+                            padding: 0;
+                            width: 0;
+                        }
+                    }
 
                     &.type {
                         .control {
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
index cf84f34279086..39b9a051e6592 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
@@ -8,7 +8,6 @@
 //  _____________________________________________
 
 @checkout-tooltip__hover__z-index: @tooltip__z-index;
-@checkout-tooltip-breakpoint__screen-m: @modal-popup-breakpoint-screen__m;
 
 @checkout-tooltip-icon-arrow__font-size: 10px;
 @checkout-tooltip-icon-arrow__left: -( @checkout-tooltip-content__padding + @checkout-tooltip-icon-arrow__font-size - @checkout-tooltip-content__border-width);
@@ -138,10 +137,42 @@
     }
 }
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @checkout-tooltip-breakpoint__screen-m) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break >= @screen__m) {
     .field-tooltip {
         .field-tooltip-content {
+            .lib-css(right, @checkout-tooltip-content-mobile__right);
+            .lib-css(top, @checkout-tooltip-content-mobile__top);
+            left: auto;
             &:extend(.abs-checkout-tooltip-content-position-top-mobile all);
         }
     }
 }
+
+//
+//  Tablet
+//  _____________________________________________
+
+@media only screen and (max-width: @screen__m) {
+    .field-tooltip .field-tooltip-content {
+        left: auto;
+        right: -10px;
+        top: 40px;
+    }
+    .field-tooltip .field-tooltip-content::before,
+    .field-tooltip .field-tooltip-content::after {
+        border: 10px solid transparent;
+        height: 0;
+        left: auto;
+        margin-top: -21px;
+        right: 10px;
+        top: 0;
+        width: 0;
+    }
+    .field-tooltip .field-tooltip-content::before {
+        border-bottom-color: @color-gray40;
+    }
+    .field-tooltip .field-tooltip-content::after {
+        border-bottom-color: @color-gray-light01;
+        top: 1px;
+    }
+}
diff --git a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
index 3ffaeb82cdc2a..2b6eda56331f3 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
@@ -165,7 +165,7 @@
 
     //  Checkout address (create shipping address)
     .field.street {
-        .field.additional {
+        .field {
             .label {
                 &:extend(.abs-visually-hidden all);
             }
@@ -367,8 +367,8 @@
     }
 
     .account {
-        .page.messages {
-            margin-bottom: @indent__xl;
+        .messages {
+            margin-bottom: 0;
         }
 
         .toolbar {
@@ -421,7 +421,7 @@
 
             > .field {
                 > .control {
-                    width: 55%;
+                    width: 80%;
                 }
             }
         }
@@ -451,7 +451,8 @@
     .form.password.reset,
     .form.send.confirmation,
     .form.password.forget,
-    .form.create.account {
+    .form.create.account,
+    .form.form-orders-search {
         min-width: 600px;
         width: 50%;
     }
diff --git a/app/design/frontend/Magento/blank/Magento_Msrp/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Msrp/web/css/source/_module.less
index f0dd8a957e9b5..6e2069c6e88ef 100644
--- a/app/design/frontend/Magento/blank/Magento_Msrp/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Msrp/web/css/source/_module.less
@@ -55,6 +55,10 @@
         }
     }
 
+    .map-fallback-price {
+        display: none;
+    }
+
     .map-old-price {
         text-decoration: none;
 
diff --git a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less
index 6baa2432ff035..7d86850c4e517 100644
--- a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less
@@ -342,7 +342,7 @@
         .product {
             &-item {
                 &-checkbox {
-                    left: 20px;
+                    left: 0;
                     position: absolute;
                     top: 20px;
                 }
@@ -381,16 +381,16 @@
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .wishlist {
         &.window.popup {
+            .field {
+                .lib-form-field-type-revert(@_type: block);
+            }
+
             bottom: auto;
             .lib-css(top, @desktop-popup-position-top);
             .lib-css(left, @desktop-popup-position-left);
             .lib-css(margin-left, @desktop-popup-margin-left);
             .lib-css(width, @desktop-popup-width);
             right: auto;
-
-            .field {
-                .lib-form-field-type-revert(@_type: block);
-            }
         }
     }
 
diff --git a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less
index 1ea1e2c483d0b..44eb06ac5ce19 100644
--- a/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less
@@ -294,6 +294,14 @@
             }
         }
     }
+    .order-items.table-wrapper {
+        .col.price,
+        .col.qty,
+        .col.subtotal,
+        .col.msrp {
+            text-align: left;
+        }
+    }
 }
 
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
diff --git a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
index 0e8350261e002..2163fe2aee897 100644
--- a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
@@ -177,10 +177,10 @@
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .products-grid.wishlist {
         margin-bottom: @indent__l;
-        margin-right: -@indent__s;
+        margin-right: 0;
         .product {
             &-item {
-                padding: @indent__base @indent__s @indent__base @indent__base;
+                padding: @indent__base 0 @indent__base 0;
                 position: relative;
 
                 &-photo {
@@ -194,6 +194,7 @@
 
                 &-actions {
                     display: block;
+                    float: left;
 
                     .action {
                         margin-right: 15px;
diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json
index 5219254e42674..0660b46cfa11f 100644
--- a/app/design/frontend/Magento/blank/composer.json
+++ b/app/design/frontend/Magento/blank/composer.json
@@ -2,11 +2,11 @@
     "name": "magento/theme-frontend-blank",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-theme",
-    "version": "100.2.4",
+    "version": "100.2.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/design/frontend/Magento/blank/web/css/source/_forms.less b/app/design/frontend/Magento/blank/web/css/source/_forms.less
index 94b993b53b508..26f5ff89e99e3 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_forms.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_forms.less
@@ -18,7 +18,7 @@
     .fieldset {
         .lib-form-fieldset();
         &:last-child {
-            margin-bottom: 0;
+            margin-bottom: @indent__base;
         }
 
         > .field,
@@ -101,6 +101,18 @@
         .lib-form-validation-note();
     }
 
+    .product-options-wrapper {
+        .date {
+            &.required {
+                div[for*='options'] {
+                    &.mage-error {
+                        display: none !important;
+                    }
+                }
+            }
+        }
+    }
+
     .field .tooltip {
         .lib-tooltip(right);
         .tooltip-content {
diff --git a/app/design/frontend/Magento/blank/web/css/source/_loaders.less b/app/design/frontend/Magento/blank/web/css/source/_loaders.less
index 5fcba9653ef01..ed062c382442a 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_loaders.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_loaders.less
@@ -42,4 +42,8 @@
     ._block-content-loading {
         position: relative;
     }
+
+    [data-role='main-css-loader'] {
+        display: none;
+    }
 }
diff --git a/app/design/frontend/Magento/blank/web/css/source/_navigation.less b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
index 4499886ef0f10..21b7315779764 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_navigation.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
@@ -131,12 +131,18 @@
                 );
             }
         }
-
         .switcher-dropdown {
             .lib-list-reset-styles();
+            display: none;
             padding: @indent__s 0;
         }
-
+        .switcher-options {
+            &.active {
+                .switcher-dropdown {
+                    display: block;
+                }
+            }
+        } 
         .header.links {
             .lib-list-reset-styles();
             border-bottom: 1px solid @color-gray82;
@@ -207,7 +213,7 @@
         }
 
         .nav-toggle {
-            &:after{
+            &:after {
                 background: rgba(0, 0, 0, @overlay__opacity);
                 content: '';
                 display: block;
diff --git a/app/design/frontend/Magento/blank/web/css/source/_sections.less b/app/design/frontend/Magento/blank/web/css/source/_sections.less
index f0a3518c92a8b..90e82a114d10c 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_sections.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_sections.less
@@ -34,5 +34,6 @@
         .data.item {
             display: block;
         }
+
     }
 }
diff --git a/app/design/frontend/Magento/blank/web/css/source/_typography.less b/app/design/frontend/Magento/blank/web/css/source/_typography.less
index 8ce76fad97902..6807c0f692af8 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_typography.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_typography.less
@@ -12,28 +12,32 @@
         @family-name: @font-family-name__base,
         @font-path: '@{baseDir}fonts/opensans/light/opensans-300',
         @font-weight: 300,
-        @font-style: normal
+        @font-style: normal,
+        @font-display: swap
     );
 
     .lib-font-face(
         @family-name: @font-family-name__base,
         @font-path: '@{baseDir}fonts/opensans/regular/opensans-400',
         @font-weight: 400,
-        @font-style: normal
+        @font-style: normal,
+        @font-display: swap
     );
 
     .lib-font-face(
         @family-name: @font-family-name__base,
         @font-path: '@{baseDir}fonts/opensans/semibold/opensans-600',
         @font-weight: 600,
-        @font-style: normal
+        @font-style: normal,
+        @font-display: swap
     );
 
     .lib-font-face(
         @family-name: @font-family-name__base,
         @font-path: '@{baseDir}fonts/opensans/bold/opensans-700',
         @font-weight: 700,
-        @font-style: normal
+        @font-style: normal,
+        @font-display: swap
     );
 }
 
diff --git a/app/design/frontend/Magento/blank/web/images/logo.svg b/app/design/frontend/Magento/blank/web/images/logo.svg
index 013d6e7c5a107..0f29d4e3eef21 100644
--- a/app/design/frontend/Magento/blank/web/images/logo.svg
+++ b/app/design/frontend/Magento/blank/web/images/logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="55.139px" viewBox="0 0 189 55.139" width="189px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 189 55.139"><path d="m23.333 0l-23.333 14.135v26.865l6.06 3.568v-26.865l17.278-10.504 17.292 10.488 0.074 0.042-0.008 26.798 6.001-3.527v-26.865l-23.364-14.135zm3.088 16.538v31.407l-3.088 1.889-3.091-1.896v-31.376l-8.003 4.928v26.86l11.094 6.789 11.189-6.837v-26.829l-8.101-4.935z" fill="#ED7402"/><path d="m12.239 21.491l8.003 4.886v-9.814l-8.003 4.928zm14.182-4.953v9.902l8.101-4.967-8.101-4.935zm20.276-2.403l-23.364-14.135-23.333 14.135 6.06 3.568 17.278-10.504 17.365 10.53 5.994-3.594z" fill="#F8B97F"/><path d="m82.328 39.984l-1.608-20.54-8.156 20.651h-2.656l-8.156-20.651-1.571 20.541h-3.293l2.058-25.814h4.34l8.043 21.174 8.044-21.174h4.301l2.021 25.814h-3.367z" fill="#131108"/><path d="m99.91 39.984l-0.375-2.396c-1.421 1.458-3.366 2.769-6.284 2.769-3.218 0-5.237-1.945-5.237-4.977 0-4.452 3.815-6.209 11.261-6.996v-0.748c0-2.244-1.348-3.03-3.406-3.03-2.17 0-4.227 0.673-6.172 1.533l-0.449-2.88c2.133-0.861 4.153-1.496 6.922-1.496 4.339 0 6.436 1.757 6.436 5.723v12.498h-2.7zm-0.635-9.055c-6.586 0.636-7.97 2.432-7.97 4.266 0 1.457 0.973 2.394 2.657 2.394 1.945 0 3.815-0.974 5.312-2.508v-4.152h0.001z" fill="#131108"/><path d="m121.72 21.876l0.485 2.992-3.404 0.336c0.486 0.824 0.712 1.76 0.712 2.769 0 3.817-3.219 6.134-6.848 6.134-0.449 0-0.898-0.037-1.348-0.111-0.523 0.338-0.897 0.75-0.897 1.085 0 0.636 0.634 0.787 3.777 1.349l1.272 0.223c3.778 0.673 6.135 1.871 6.135 4.639 0 3.741-4.078 5.5-8.715 5.5-4.64 0-8.343-1.458-8.343-4.6 0-1.834 1.271-3.256 3.777-4.603-0.784-0.562-1.121-1.198-1.121-1.872 0-0.861 0.672-1.722 1.87-2.432-1.982-0.973-3.33-2.879-3.33-5.312 0-3.852 3.217-6.208 6.846-6.208 1.795 0 3.368 0.522 4.604 1.496l4.53-1.385zm-13.99 20.052c0 1.424 1.834 2.471 5.312 2.471 3.48 0 5.424-1.197 5.424-2.693 0-1.086-0.822-1.832-3.365-2.282l-2.134-0.375c-0.972-0.187-1.495-0.299-2.207-0.448-2.1 1.045-3.03 2.094-3.03 3.327zm4.86-17.733c-2.244 0-3.629 1.722-3.629 3.891 0 2.058 1.421 3.665 3.629 3.665 2.283 0 3.704-1.682 3.704-3.815 0.01-2.132-1.49-3.741-3.7-3.741z" fill="#131108"/><path d="m137.58 31.416h-12.122c0.112 4.15 2.094 6.098 5.2 6.098 2.583 0 4.453-1.009 6.397-2.544l0.484 2.994c-1.907 1.497-4.188 2.394-7.143 2.394-4.642 0-8.271-2.807-8.271-9.354 0-5.724 3.368-9.239 7.856-9.239 5.199 0 7.595 4.002 7.595 8.94v0.711zm-7.63-7.033c-2.059 0-3.817 1.459-4.34 4.526h8.604c-0.41-2.881-1.68-4.526-4.26-4.526z" fill="#131108"/><path d="m151.61 39.984v-12.16c0-1.832-0.786-3.067-2.73-3.067-1.759 0-3.555 1.161-5.163 2.88v12.347h-3.329v-17.846h2.655l0.412 2.582c1.683-1.533 3.78-2.955 6.321-2.955 3.369 0 5.166 2.019 5.166 5.236v12.983h-3.33z" fill="#131108"/><path d="m164.78 40.284c-3.143 0-5.199-1.124-5.199-4.716v-10.624h-2.694v-2.806h2.694v-5.949l3.255-0.485v6.434h3.853l0.449 2.806h-4.302v10.025c0 1.461 0.599 2.357 2.47 2.357 0.598 0 1.121-0.035 1.531-0.112l0.45 2.843c-0.57 0.112-1.35 0.227-2.51 0.227z" fill="#131108"/><path d="m175.82 40.357c-4.752 0-8.194-3.403-8.194-9.278 0-5.874 3.442-9.314 8.194-9.314 4.787 0 8.305 3.44 8.305 9.314 0 5.875-3.52 9.278-8.3 9.278zm0-15.788c-3.217 0-4.826 2.769-4.826 6.51 0 3.668 1.683 6.511 4.826 6.511 3.291 0 4.938-2.77 4.938-6.511-0.01-3.666-1.73-6.51-4.94-6.51z" fill="#131108"/><path d="m186.48 24.81c-1.338 0-2.268-0.929-2.268-2.318 0-1.379 0.95-2.328 2.268-2.328 1.34 0 2.27 0.939 2.27 2.328 0 1.378-0.95 2.318-2.27 2.318zm0-4.376c-1.078 0-1.938 0.739-1.938 2.058 0 1.31 0.859 2.049 1.938 2.049 1.09 0 1.949-0.739 1.949-2.049 0-1.319-0.87-2.058-1.95-2.058zm0.67 3.297l-0.768-1.099h-0.249v1.059h-0.44v-2.568h0.779c0.54 0 0.898 0.27 0.898 0.75 0 0.37-0.201 0.609-0.52 0.709l0.74 1.049-0.44 0.1zm-0.68-2.209h-0.34v0.759h0.319c0.29 0 0.471-0.12 0.471-0.379 0-0.25-0.16-0.38-0.45-0.38z" fill="#131108"/></svg>
\ No newline at end of file
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 179.073 50"><style>.st0{fill:#f26322}.st1{fill:#4d4d4d}</style><path class="st0" d="M21.432 0L0 12.373v24.713l6.117 3.533-.041-24.713 15.315-8.842 15.313 8.842v24.706l6.118-3.526V12.35z"/><path class="st0" d="M24.47 40.618l-3.058 1.772-3.071-1.759V15.906l-6.116 3.532.01 24.712 9.172 5.298 9.18-5.298V19.438l-6.117-3.532z"/><path class="st1" d="M56.838 12.522l8.415 21.258h.068l8.21-21.258h3.203V36.88h-2.215V15.656h-.068c-.114.386-.239.772-.374 1.158-.115.318-.246.67-.393 1.055-.147.387-.278.75-.391 1.09l-7.052 17.919h-2.01L57.11 18.96a19.913 19.913 0 0 1-.408-1.039 43.558 43.558 0 0 1-.375-1.073 68.067 68.067 0 0 0-.408-1.192h-.069v21.223h-2.112V12.522h3.1zM83.17 36.982a5.205 5.205 0 0 1-1.823-.92 4.327 4.327 0 0 1-1.209-1.533 4.881 4.881 0 0 1-.443-2.145 5.018 5.018 0 0 1 .579-2.556 4.472 4.472 0 0 1 1.568-1.584 7.927 7.927 0 0 1 2.299-.903 24.732 24.732 0 0 1 2.811-.477 36 36 0 0 0 2.198-.29 6.689 6.689 0 0 0 1.465-.392c.329-.123.614-.343.817-.63.187-.325.276-.698.256-1.073v-.34a3.212 3.212 0 0 0-1.09-2.674 4.93 4.93 0 0 0-3.134-.87c-3.135 0-4.781 1.306-4.941 3.918h-2.077a5.748 5.748 0 0 1 1.891-4.089 7.5 7.5 0 0 1 5.127-1.533 7.335 7.335 0 0 1 4.564 1.278 4.923 4.923 0 0 1 1.67 4.173v9.573c-.034.402.069.804.29 1.141.219.251.536.394.868.392.12-.001.24-.012.358-.034.124-.022.266-.057.425-.102h.103v1.533c-.188.077-.382.14-.58.188-.28.062-.566.091-.852.086a2.694 2.694 0 0 1-1.839-.597 2.575 2.575 0 0 1-.75-1.891v-.374h-.102c-.277.372-.578.725-.903 1.056-.38.385-.81.717-1.278.988a7.14 7.14 0 0 1-1.737.715 8.443 8.443 0 0 1-2.249.272 8.186 8.186 0 0 1-2.282-.306m5.195-1.857a5.971 5.971 0 0 0 1.857-1.175 4.767 4.767 0 0 0 1.499-3.441V27.34a7.295 7.295 0 0 1-2.061.732 33.21 33.21 0 0 1-2.504.426c-.749.114-1.441.233-2.077.358a5.237 5.237 0 0 0-1.652.596 3.055 3.055 0 0 0-1.108 1.107 3.579 3.579 0 0 0-.408 1.824c-.018.53.093 1.056.324 1.533.201.392.493.73.851.987a3.35 3.35 0 0 0 1.244.529c.493.104.995.155 1.499.153a6.555 6.555 0 0 0 2.536-.46M99.35 41.734a4.687 4.687 0 0 1-2.009-3.287h2.043c.14.966.763 1.794 1.652 2.197a7.522 7.522 0 0 0 3.288.664 5.688 5.688 0 0 0 4.173-1.345 4.997 4.997 0 0 0 1.345-3.697v-2.793h-.102a7.293 7.293 0 0 1-2.283 2.282 6.297 6.297 0 0 1-3.304.784 7.375 7.375 0 0 1-3.135-.647 6.921 6.921 0 0 1-2.385-1.806 8.095 8.095 0 0 1-1.516-2.777 11.429 11.429 0 0 1-.528-3.56 10.89 10.89 0 0 1 .613-3.799 8.483 8.483 0 0 1 1.636-2.777 6.75 6.75 0 0 1 2.402-1.703 7.45 7.45 0 0 1 2.913-.58 6.234 6.234 0 0 1 3.372.835 6.938 6.938 0 0 1 2.215 2.265h.102v-2.725h2.078v16.931a6.78 6.78 0 0 1-1.636 4.735 7.751 7.751 0 0 1-5.893 2.112 8.337 8.337 0 0 1-5.041-1.309m9.232-8.908a8.565 8.565 0 0 0 1.397-5.11 11.22 11.22 0 0 0-.34-2.862 6.239 6.239 0 0 0-1.056-2.231 4.828 4.828 0 0 0-1.789-1.448 5.772 5.772 0 0 0-2.503-.511 4.782 4.782 0 0 0-4.071 1.941 8.464 8.464 0 0 0-1.448 5.179c-.008.936.107 1.87.34 2.777a6.64 6.64 0 0 0 1.022 2.214 4.81 4.81 0 0 0 1.703 1.465 5.208 5.208 0 0 0 2.42.528 4.967 4.967 0 0 0 4.325-1.942M119.244 36.624a7.19 7.19 0 0 1-2.572-1.941 8.66 8.66 0 0 1-1.583-2.93 11.839 11.839 0 0 1-.546-3.662 11.179 11.179 0 0 1 .58-3.663 9.138 9.138 0 0 1 1.617-2.929 7.307 7.307 0 0 1 2.522-1.942 7.684 7.684 0 0 1 3.321-.698 7.275 7.275 0 0 1 3.56.8 6.678 6.678 0 0 1 2.351 2.146 8.806 8.806 0 0 1 1.278 3.083 16.87 16.87 0 0 1 .374 3.577h-13.422c.013.941.157 1.875.426 2.777a6.968 6.968 0 0 0 1.124 2.231 5.108 5.108 0 0 0 1.857 1.499 5.948 5.948 0 0 0 2.623.546 4.985 4.985 0 0 0 3.424-1.074 5.875 5.875 0 0 0 1.719-2.878h2.044a7.51 7.51 0 0 1-2.385 4.19 7.072 7.072 0 0 1-4.803 1.567 8.386 8.386 0 0 1-3.509-.699m8.312-12.264a5.986 5.986 0 0 0-.988-1.976 4.525 4.525 0 0 0-1.635-1.311 5.362 5.362 0 0 0-2.351-.478 5.623 5.623 0 0 0-2.368.478 5.064 5.064 0 0 0-1.754 1.311 6.566 6.566 0 0 0-1.141 1.96 9.615 9.615 0 0 0-.562 2.453h11.174a9.268 9.268 0 0 0-.375-2.437M134.879 19.267v2.691h.068a7.237 7.237 0 0 1 2.333-2.197 6.798 6.798 0 0 1 3.561-.868 5.834 5.834 0 0 1 4.037 1.413 5.174 5.174 0 0 1 1.584 4.071V36.88h-2.112V24.581a3.716 3.716 0 0 0-1.073-2.947 4.334 4.334 0 0 0-2.948-.937 5.896 5.896 0 0 0-2.111.375 5.558 5.558 0 0 0-1.738 1.039 4.717 4.717 0 0 0-1.601 3.593V36.88h-2.112V19.267h2.112zM151.912 36.284a2.934 2.934 0 0 1-.92-2.436V21.005h-2.657v-1.738h2.657v-5.416h2.112v5.416h3.271v1.738h-3.271v12.502a1.65 1.65 0 0 0 .426 1.312c.371.265.823.391 1.277.357.258-.001.515-.029.766-.085.215-.043.426-.106.63-.188h.103v1.806a5.907 5.907 0 0 1-1.942.306 3.819 3.819 0 0 1-2.452-.731M162.625 36.624a7.368 7.368 0 0 1-2.571-1.942 8.732 8.732 0 0 1-1.618-2.929 12.217 12.217 0 0 1 0-7.324 8.744 8.744 0 0 1 1.618-2.93 7.386 7.386 0 0 1 2.571-1.942 8.106 8.106 0 0 1 3.424-.698 7.989 7.989 0 0 1 3.406.698 7.424 7.424 0 0 1 2.556 1.942 8.504 8.504 0 0 1 1.601 2.93 12.57 12.57 0 0 1 0 7.324 8.5 8.5 0 0 1-1.601 2.929 7.415 7.415 0 0 1-2.556 1.942 7.959 7.959 0 0 1-3.406.698 8.075 8.075 0 0 1-3.424-.698m6.013-1.652a5.308 5.308 0 0 0 1.873-1.601 7.215 7.215 0 0 0 1.124-2.385 11.348 11.348 0 0 0 0-5.792 7.215 7.215 0 0 0-1.124-2.385 5.289 5.289 0 0 0-1.873-1.601 6.109 6.109 0 0 0-5.195 0 5.497 5.497 0 0 0-1.874 1.601 7.046 7.046 0 0 0-1.141 2.385 11.392 11.392 0 0 0 0 5.792c.227.86.614 1.669 1.141 2.385a5.817 5.817 0 0 0 7.069 1.601M176.856 22.191a2.128 2.128 0 0 1-2.213-2.265 2.216 2.216 0 1 1 4.431 0 2.146 2.146 0 0 1-2.218 2.265m0-4.277a1.845 1.845 0 0 0-1.892 2.012 1.9 1.9 0 1 0 3.797 0 1.854 1.854 0 0 0-1.905-2.012m.653 3.222l-.751-1.073h-.243v1.035h-.43v-2.509h.763c.526 0 .877.264.877.732a.681.681 0 0 1-.508.693l.724 1.025-.432.097zm-.661-2.157h-.333v.741h.312c.283 0 .46-.117.46-.371.001-.244-.158-.37-.439-.37"/></svg>
diff --git a/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
index 43ae23bab7895..ac415f007f86e 100644
--- a/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
@@ -58,6 +58,11 @@
             .field.choice {
                 input {
                     float: left;
+                    margin-top: 4px;
+                }
+
+                input[type='checkbox'] {
+                    margin-top: 2px;
                 }
 
                 .label {
@@ -253,7 +258,7 @@
             .box-tocart {
                 .action.primary {
                     margin-right: 1%;
-                    width: 49%;
+                    width: auto;
                 }
             }
 
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 228c6947c938b..fca906d432790 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
@@ -294,6 +294,11 @@
     }
 
     .product-options-wrapper {
+        .fieldset {
+            &:focus {
+                box-shadow: none;
+            }
+        }
         .fieldset-product-options-inner {
             .legend {
                 .lib-css(font-weight, @font-weight__semibold);
@@ -534,6 +539,15 @@
             }
         }
 
+        .block-compare {
+            .action {
+                &.delete {
+                    &:extend(.abs-remove-button-for-blocks all);
+                    right: initial;
+                }
+            }
+        }
+
         .action.tocart {
             border-radius: 0;
         }
@@ -563,6 +577,7 @@
 
         .product-items-names {
             .product-item {
+                display: flex;
                 margin-bottom: @indent__s;
             }
 
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 d0382d34d39fc..6c0d4da83b8c5 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
@@ -68,7 +68,6 @@
             }
 
             &-actions {
-                display: none;
 
                 .actions-secondary {
                     > button.action {
@@ -100,7 +99,6 @@
                 .reviews-actions {
                     font-size: @font-size__s;
                     margin-top: 5px;
-                    text-transform: lowercase;
                 }
             }
 
diff --git a/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
index f785dd74d900e..cdc9ce2b3be72 100644
--- a/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_CatalogSearch/web/css/source/_module.less
@@ -18,6 +18,20 @@
 //  _____________________________________________
 
 & when (@media-common = true) {
+    
+    .search {
+        .fieldset {
+            .control {
+                .addon {
+                    input {
+                        flex-basis: auto;
+                        width: 100%;
+                    }
+                }
+            }
+        }
+    }
+    
     .block-search {
         margin-bottom: 0;
 
@@ -199,6 +213,19 @@
 //  Mobile
 //  _____________________________________________
 
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
+    .form.search.advanced {
+        .field.price {
+            .with-addon {
+                .input-text {
+                    flex-basis: auto;
+                    width: 100%;
+                }
+            }
+        }
+    }
+}
+
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
     .block-search {
         margin-top: @indent__s;
@@ -261,4 +288,9 @@
     .search-autocomplete {
         margin-top: 0;
     }
+
+    .form.search.advanced {
+        min-width: 600px;
+        width: 50%;
+    }
 }
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 1015bb584ff7b..20d4f4986b611 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
@@ -219,7 +219,7 @@
                         height: 36px;
                         margin-top: -7px;
                         text-align: center;
-                        width: 45px;
+                        width: 60px;
                     }
                 }
 
@@ -422,6 +422,14 @@
             &:extend(.abs-sidebar-totals-mobile all);
         }
     }
+    .order-items.table-wrapper {
+        .col.price,
+        .col.qty,
+        .col.subtotal,
+        .col.msrp {
+            text-align: left;
+        }
+    }
 }
 
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
@@ -501,6 +509,17 @@
             }
         }
     }
+
+    .cart.table-wrapper,
+    .order-items.table-wrapper {
+        .col.price,
+        .col.qty,
+        .col.subtotal,
+        .col.msrp {
+            text-align: left;
+        }
+    }
+
 }
 
 //
@@ -698,6 +717,9 @@
                     position: static;
                 }
             }
+            &.discount {
+                width: auto;
+            }
         }
     }
 
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 547460c387c33..510d5ae507bdd 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
@@ -110,9 +110,9 @@
         @_toggle-selector: ~'.action.showcart',
         @_options-selector: ~'.block-minicart',
         @_dropdown-list-width: 320px,
-        @_dropdown-list-position-right: 0px,
+        @_dropdown-list-position-right: -10px,
         @_dropdown-list-pointer-position: right,
-        @_dropdown-list-pointer-position-left-right: 26px,
+        @_dropdown-list-pointer-position-left-right: 12px,
         @_dropdown-list-z-index: 101,               
         @_dropdown-toggle-icon-content: @icon-cart,
         @_dropdown-toggle-active-icon-content: @icon-cart,
@@ -352,7 +352,7 @@
         .item-qty {
             margin-right: @indent__s;
             text-align: center;
-            width: 40px;
+            width: 60px;
         }
 
         .update-cart-item {
@@ -412,7 +412,6 @@
         margin-left: 13px;
 
         .block-minicart {
-            right: -15px;
             width: 390px;
         }
     }
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less
index 0df0cace338c0..33a8facc61295 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
@@ -48,6 +48,7 @@
         .step-title {
             &:extend(.abs-checkout-title all);
             .lib-css(border-bottom, @checkout-step-title__border);
+            margin-bottom: 15px;
         }
 
         .step-content {
@@ -73,6 +74,36 @@
             display: none;
         }
     }
+
+    .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 {
+            display: table;
+            width: 100%;
+
+            > .field {
+                > .label {
+                    display: none;
+                }
+            }
+        }
+    }
 }
 
 //
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
index 5ecc4d4713bf1..5e2c010c13e8f 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
@@ -137,6 +137,10 @@
         }
 
         .product-item {
+            .product-item-details {
+                &:extend(.abs-add-clearfix all);
+            }
+
             .product-item-inner {
                 display: table;
                 margin: 0 0 @indent__s;
@@ -166,6 +170,10 @@
                     }
                 }
             }
+
+            .message {
+                margin-top: 10px;
+            }
         }
 
         .actions-toolbar {
@@ -204,6 +212,12 @@
             &:extend(.abs-sidebar-totals-mobile all);
         }
     }
+
+    .opc-block-shipping-information {
+        .shipping-information-title {
+            font-size: 2.4rem;
+        }
+    }
 }
 
 //
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
index 0b27454b206e3..eb577475b1089 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
@@ -69,6 +69,17 @@
 
         .payment-option-content {
             .lib-css(padding, 0 0 @indent__base @checkout-payment-option-content__padding__xl);
+
+            &:extend(.abs-discount-code all);
+
+            .primary {
+                .action {
+                    &.action-apply {
+                        margin-right: 0;
+                    }
+                }
+            }
+
         }
 
         .payment-option-inner {
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml b/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml
index 5ef5dcac1131d..21f22459e1a98 100644
--- a/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml
+++ b/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml
@@ -7,52 +7,12 @@
 -->
 <page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
-        <referenceContainer name="sidebar.main">
-            <block class="Magento\Framework\View\Element\Template" name="customer_account_navigation_block" template="Magento_Theme::html/collapsible.phtml" before="-">
-                <arguments>
-                    <argument name="block_title" translate="true" xsi:type="string">My Account</argument>
-                    <argument name="block_css" xsi:type="string">block-collapsible-nav</argument>
-                </arguments>
-                <block class="Magento\Customer\Block\Account\Navigation" name="customer_account_navigation" before="-">
-                    <arguments>
-                        <argument name="css_class" xsi:type="string">nav items</argument>
-                    </arguments>
-                    <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-account-link">
-                        <arguments>
-                            <argument name="label" xsi:type="string" translate="true">My Account</argument>
-                            <argument name="path" xsi:type="string">customer/account</argument>
-                            <argument name="sortOrder" xsi:type="number">250</argument>
-                        </arguments>
-                    </block>
-                    <block class="Magento\Customer\Block\Account\Delimiter" name="customer-account-navigation-delimiter-1"
-                           template="Magento_Customer::account/navigation-delimiter.phtml">
-                        <arguments>
-                            <argument name="sortOrder" xsi:type="number">200</argument>
-                        </arguments>
-                    </block>
-                    <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-address-link">
-                        <arguments>
-                            <argument name="label" xsi:type="string" translate="true">Address Book</argument>
-                            <argument name="path" xsi:type="string">customer/address</argument>
-                            <argument name="sortOrder" xsi:type="number">190</argument>
-                        </arguments>
-                    </block>
-                    <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-account-edit-link">
-                        <arguments>
-                            <argument name="label" xsi:type="string" translate="true">Account Information</argument>
-                            <argument name="path" xsi:type="string">customer/account/edit</argument>
-                            <argument name="sortOrder" xsi:type="number">180</argument>
-                        </arguments>
-                    </block>
-                    <block class="Magento\Customer\Block\Account\Delimiter" name="customer-account-navigation-delimiter-2"
-                           template="Magento_Customer::account/navigation-delimiter.phtml">
-                        <arguments>
-                            <argument name="sortOrder" xsi:type="number">130</argument>
-                        </arguments>
-                    </block>
-                </block>
-            </block>
-        </referenceContainer>
+        <referenceBlock name="sidebar.main.account_nav">
+            <arguments>
+                <argument name="block_title" translate="true" xsi:type="string">My Account</argument>
+                <argument name="block_css" xsi:type="string">block-collapsible-nav</argument>
+            </arguments>
+        </referenceBlock>
         <move element="page.main.title" destination="content.top" before="-"/>
     </body>
 </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 d7ae6c3b28f4a..f283a11da3400 100755
--- 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
@@ -199,7 +199,7 @@
 
     //  Checkout address (create shipping address)
     .field.street {
-        .field.additional {
+        .field {
             .label {
                 &:extend(.abs-visually-hidden all);
             }
@@ -371,7 +371,7 @@
         .fieldset {
             > .field {
                 > .control {
-                    width: 55%;
+                    width: 80%;
                 }
             }
         }
@@ -402,7 +402,8 @@
     .form.password.reset,
     .form.send.confirmation,
     .form.password.forget,
-    .form.create.account {
+    .form.create.account,
+    .form.form-orders-search {
         min-width: 600px;
         width: 50%;
     }
@@ -417,6 +418,12 @@
         .column.main {
             width: 77.7%;
         }
+
+        .sidebar-main {
+            .block {
+                margin-bottom: 0;
+            }
+        }
     }
 
     .account {
@@ -528,11 +535,18 @@
         .column.main,
         .sidebar-additional {
             margin: 0;
+            padding: 0;
         }
 
         .data.table {
             &:extend(.abs-table-striped-mobile all);
         }
+
+        .sidebar-main {
+            .account-nav {
+                margin-bottom: 0;
+            }
+        }
     }
 }
 
@@ -550,8 +564,8 @@
     }
 
     .account {
-        .page.messages {
-            margin-bottom: @indent__xl;
+        .messages {
+            margin-bottom: 0;
         }
 
         .column.main {
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 0c329f32d3739..621bf40b03093 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
@@ -246,6 +246,10 @@
     .gift-messages-order {
         margin-bottom: @indent__m;
     }
+
+    .gift-message-summary {
+        padding-right: 7rem;
+    }
 }
 
 //
@@ -282,10 +286,6 @@
         }
     }
 
-    .gift-message-summary {
-        padding-right: 7rem;
-    }
-
     //
     //  In-table block
     //  ---------------------------------------------
diff --git a/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less
index 088372808aa6a..fe49d6679a613 100644
--- a/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less
@@ -133,9 +133,18 @@
 }
 
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-    .table-wrapper.grouped {
-        .lib-css(margin-left, -@layout__width-xs-indent);
-        .lib-css(margin-right, -@layout__width-xs-indent);
+    .product-add-form {
+        .table-wrapper.grouped {
+            .lib-css(margin-left, -@layout__width-xs-indent);
+            .lib-css(margin-right, -@layout__width-xs-indent);
+            .table.data.grouped {
+                tr {
+                    td {
+                        padding: 5px 10px 5px 15px;
+                    }
+                }
+            }
+        }
     }
 }
 
diff --git a/app/design/frontend/Magento/luma/Magento_Msrp/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Msrp/web/css/source/_module.less
index 112184b45fe86..475361c56afc8 100644
--- a/app/design/frontend/Magento/luma/Magento_Msrp/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Msrp/web/css/source/_module.less
@@ -74,6 +74,10 @@
         }
     }
 
+    .map-fallback-price {
+        display: none;
+    }
+
     .map-old-price,
     .product-item .map-old-price,
     .product-info-price .map-show-info {
diff --git a/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less
index e10278e3abbec..917e85cdf94b5 100644
--- a/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less
@@ -435,7 +435,7 @@
         .product {
             &-item {
                 &-checkbox {
-                    left: 20px;
+                    left: 0;
                     position: absolute;
                     top: 20px;
                 }
diff --git a/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less
index 7662c60734a1b..7977fb16c524c 100644
--- a/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less
@@ -345,6 +345,22 @@
 
             .data.table {
                 &:extend(.abs-checkout-order-review all);
+                &.table-order-review {
+                    > tbody {
+                        > tr {
+                            > td {
+                                &.col {
+                                    &.subtotal {
+                                        border-bottom: none;
+                                    }
+                                    &.qty {
+                                        text-align: center;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
             }
         }
 
@@ -374,7 +390,7 @@
                 text-align: right;
 
                 .action {
-                    margin-left: @indent__s;
+                    margin-left: 0;
 
                     &.back {
                         display: block;
@@ -496,4 +512,12 @@
             margin-left: @indent__xl;
         }
     }
+    
+    .multicheckout { 
+        .actions-toolbar {
+            > .primary {
+                margin-right: 0;
+            }
+        }
+    }
 }
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 9ccd6c190ec0e..d7ee1319c9a43 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
@@ -81,3 +81,24 @@
         width: 34%;
     }
 }
+
+//
+//  Mobile
+//  _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
+    .block {
+        &.newsletter {
+            input {
+                font-size: 12px;
+                padding-left: 30px;
+            }
+
+            .field {
+                .control:before {
+                    font-size: 13px;
+                }
+            }
+        }
+    }
+}
diff --git a/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
index da78406f92212..650db315853b2 100644
--- a/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
@@ -298,6 +298,9 @@
             a:not(:last-child) {
                 margin-right: 30px;
             }
+            .action.add {
+                white-space: nowrap;
+            }
         }
     }
 
@@ -361,6 +364,7 @@
             .label {
                 .lib-css(font-weight, @font-weight__semibold);
                 .lib-css(margin-right, @indent__s);
+                vertical-align: middle;
             }
         }
     }
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 8c4084fcaf496..e467aa843e2f4 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
@@ -51,7 +51,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
                 </tr>
             </table>
             {{/depend}}
-            {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
             <table class="order-details">
                 <tr>
                     <td class="address-details">
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 68f1886986c5b..385110f8f037e 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
@@ -49,7 +49,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
                 </tr>
             </table>
             {{/depend}}
-            {{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
+            {{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
             <table class="order-details">
                 <tr>
                     <td class="address-details">
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 1e4a92fa0701f..314f0d0ee6298 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
@@ -555,13 +555,13 @@
             margin: 0 @tab-control__margin-right 0 0;
 
             a {
-                padding: @tab-control__padding-top @tab-control__padding-right;
+                padding: @tab-control__padding-top @indent__base;
             }
 
             strong {
                 border-bottom: 0;
                 margin-bottom: -1px;
-                padding: @tab-control__padding-top @tab-control__padding-right @tab-control__padding-bottom + 1 @tab-control__padding-left;
+                padding: @tab-control__padding-top @indent__base @tab-control__padding-bottom + 1 @indent__base;
             }
         }
     }
@@ -687,3 +687,19 @@
         }
     }
 }
+
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) { 
+    .order-links {
+        .item {
+            margin: 0 @tab-control__margin-right 0 0;
+
+            a {
+                padding: @tab-control__padding-top @tab-control__padding-right;
+            }
+
+            strong {
+                padding: @tab-control__padding-top @tab-control__padding-right @tab-control__padding-bottom + 1 @tab-control__padding-left;
+            }
+        }
+    }
+}
diff --git a/app/design/frontend/Magento/luma/Magento_SendFriend/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_SendFriend/web/css/source/_module.less
index baf5468b18485..3435736a54a6a 100644
--- a/app/design/frontend/Magento/luma/Magento_SendFriend/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_SendFriend/web/css/source/_module.less
@@ -10,6 +10,14 @@
 & when (@media-common = true) {
     .form.send.friend {
         &:extend(.abs-add-fields all);
+        
+        .fieldset {
+            .field {
+                .control {
+                    width: 100%;
+                }  
+            }
+        } 
     }
 
     .product-social-links .action.mailto.friend {
@@ -44,3 +52,18 @@
         }
     }
 }
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { 
+    .form.send.friend {
+        .fieldset {
+            padding-bottom: @indent__xs;
+        } 
+        
+        .action {
+            &.remove {
+                margin-left: 0;
+                right: 0;
+                top: 100%;
+            }
+        }
+    }
+}
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/layout/default_head_blocks.xml b/app/design/frontend/Magento/luma/Magento_Theme/layout/default_head_blocks.xml
index 2dfb1d3ee6bf0..e516978fd6e57 100644
--- a/app/design/frontend/Magento/luma/Magento_Theme/layout/default_head_blocks.xml
+++ b/app/design/frontend/Magento/luma/Magento_Theme/layout/default_head_blocks.xml
@@ -7,6 +7,11 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
+        <font src="fonts/opensans/light/opensans-300.woff2"/>
+        <font src="fonts/opensans/regular/opensans-400.woff2"/>
+        <font src="fonts/opensans/semibold/opensans-600.woff2"/>
+        <font src="fonts/opensans/bold/opensans-700.woff2"/>
+        <font src="fonts/Luma-Icons.woff2"/>
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no"/>
     </head>
 </page>
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 68938ed206038..c5ad329a17c52 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
@@ -151,6 +151,12 @@
         }
     }
 
+    .page-print {
+        .nav-toggle {
+            display: none;
+        }
+    }
+
     .page-main {
         > .page-title-wrapper {
             .page-title + .action {
@@ -319,6 +325,23 @@
             }
         }
     }
+    .page-header {
+        .switcher {
+            .options {
+                ul.dropdown {
+                    right: 0;
+                    &:before {
+                        left: auto;
+                        right: 10px;
+                    }
+                    &:after {
+                        left: auto;
+                        right: 9px;
+                    }
+                }
+            }
+        }
+    }
 
     //
     //  Widgets
@@ -441,7 +464,7 @@
 
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .cms-page-view .page-main {
-        padding-top: 41px;
+        padding-top: 0;
         position: relative;
     }
 }
diff --git a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
index 584eefb9bc643..96b8c3442f44a 100644
--- a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
@@ -164,6 +164,31 @@
             }
         }
     }
+
+    .products-grid.wishlist {
+        .product-item-actions { 
+            .action {
+                &.edit,
+                &.delete {
+                    .lib-icon-font(
+                        @icon-edit,
+                        @_icon-font-size: 18px,
+                        @_icon-font-line-height: 20px,
+                        @_icon-font-text-hide: true,
+                        @_icon-font-color: @minicart-icons-color,
+                        @_icon-font-color-hover: @primary__color,
+                        @_icon-font-color-active: @minicart-icons-color
+                    );
+                }
+
+                &.delete {
+                    .lib-icon-font-symbol(
+                        @_icon-font-content: @icon-trash
+                    );
+                }
+            }
+        }
+    }
 }
 
 //
@@ -185,11 +210,11 @@
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .products-grid.wishlist {
         margin-bottom: @indent__l;
-        margin-right: -@indent__s;
+        margin-right: 0;
 
         .product {
             &-item {
-                padding: @indent__base @indent__s @indent__base @indent__base;
+                padding: @indent__base 0 @indent__base 0;
                 position: relative;
 
                 &-photo {
@@ -203,6 +228,7 @@
 
                 &-actions {
                     display: block;
+                    float: left;
 
                     .action {
                         margin-right: 15px;
@@ -210,15 +236,7 @@
                         &:last-child {
                             margin-right: 0;
                         }
-
-                        &.edit {
-                            float: left;
-                        }
-
-                        &.delete {
-                            float: right;
-                        }
-
+                        
                         &.edit,
                         &.delete {
                             margin-top: 7px;
diff --git a/app/design/frontend/Magento/luma/composer.json b/app/design/frontend/Magento/luma/composer.json
index 19d37d0216064..e5a5ab147fb99 100644
--- a/app/design/frontend/Magento/luma/composer.json
+++ b/app/design/frontend/Magento/luma/composer.json
@@ -2,12 +2,12 @@
     "name": "magento/theme-frontend-luma",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/theme-frontend-blank": "100.2.*",
         "magento/framework": "101.0.*"
     },
     "type": "magento2-theme",
-    "version": "100.2.5",
+    "version": "100.2.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/design/frontend/Magento/luma/web/css/critical.css b/app/design/frontend/Magento/luma/web/css/critical.css
new file mode 100644
index 0000000000000..922a1eefa89e8
--- /dev/null
+++ b/app/design/frontend/Magento/luma/web/css/critical.css
@@ -0,0 +1 @@
+body{margin:0}.page-main{flex-grow:1}.product-image-wrapper{display:block;height:0;overflow:hidden;position:relative;z-index:1}.product-image-wrapper .product-image-photo{bottom:0;display:block;height:auto;left:0;margin:auto;max-width:100%;position:absolute;right:0;top:0}.product-image-container{display:inline-block}.modal-popup{position:fixed}.page-wrapper{display:flex;flex-direction:column;min-height:100vh}.action.skip:not(:focus),.block.newsletter .label,.minicart-wrapper .action.showcart .counter-label,.minicart-wrapper .action.showcart .text,.page-header .switcher .label,.product-item-actions .actions-secondary>.action span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.alink,a{color:#006bb4;text-decoration:none}.page-header .panel.wrapper{background-color:#6e716e;color:#fff}.header.panel>.header.links{list-style:none none;float:right;font-size:0;margin-right:20px}.header.panel>.header.links>li{font-size:14px;margin:0 0 0 15px}.block-search .action.search,.block-search .block-title,.block-search .nested,.block.newsletter .title,.breadcrumbs .item,.nav-toggle,.no-display,.page-footer .switcher .options ul.dropdown,.page-header .switcher .options ul.dropdown{display:none}.block-search .label>span{height:1px;overflow:hidden;position:absolute}.logo{float:left;margin:0 0 10px 40px}.minicart-wrapper{float:right}.page-footer{margin-top:25px}.footer.content{border-top:1px solid #cecece;padding-top:20px}.block.newsletter .actions{display:table-cell;vertical-align:top;width:1%}.block-banners .banner-items,.block-banners-inline .banner-items,.block-event .slider-panel .slider,.footer.content ul,.product-items{margin:0;padding:0;list-style:none none}.copyright{background-color:#6e716e;color:#fff;box-sizing:border-box;display:block;padding:10px;text-align:center}.modal-popup,.modal-slide{visibility:hidden;opacity:0}input[type=email],input[type=number],input[type=password],input[type=search],input[type=text],input[type=url]{background:#fff;background-clip:padding-box;border:1px solid #c2c2c2;border-radius:1px;font-size:14px;height:32px;line-height:1.42857143;padding:0 9px;vertical-align:baseline;width:100%;box-sizing:border-box}.action.primary{background:#1979c3;border:1px solid #1979c3;color:#fff;font-weight:600;padding:7px 15px}.block.newsletter .form.subscribe{display:table}.footer.content .links a{color:#575757}.load.indicator{background-color:rgba(255,255,255,.7);z-index:9999;bottom:0;left:0;position:fixed;right:0;top:0;position:absolute}.load.indicator:before{background:transparent url(../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}.load.indicator>span{display:none}.loading-mask{bottom:0;left:0;margin:auto;position:fixed;right:0;top:0;z-index:100;background:rgba(255,255,255,.5)}.loading-mask .loader>img{bottom:0;left:0;margin:auto;position:fixed;right:0;top:0;z-index:100}.loading-mask .loader>p{display:none}body>.loading-mask{z-index:9999}._block-content-loading{position:relative}@media (min-width:768px),print{body,html{height:100%}.page-header{border:0;margin-bottom:0}.nav-sections-item-title,.section-item-content .switcher-currency,ul.header.links li.customer-welcome,ul.level0.submenu{display:none}.abs-add-clearfix-desktop:after,.abs-add-clearfix-desktop:before,.account .column.main .block.block-order-details-view:after,.account .column.main .block.block-order-details-view:before,.account .column.main .block:not(.widget) .block-content:after,.account .column.main .block:not(.widget) .block-content:before,.account .page-title-wrapper:after,.account .page-title-wrapper:before,.block-addresses-list .items.addresses:after,.block-addresses-list .items.addresses:before,.block-cart-failed .block-content:after,.block-cart-failed .block-content:before,.block-giftregistry-shared .item-options:after,.block-giftregistry-shared .item-options:before,.block-wishlist-management:after,.block-wishlist-management:before,.cart-container:after,.cart-container:before,.data.table .gift-wrapping .content:after,.data.table .gift-wrapping .content:before,.data.table .gift-wrapping .nested:after,.data.table .gift-wrapping .nested:before,.header.content:after,.header.content:before,.login-container:after,.login-container:before,.magento-rma-guest-returns .column.main .block.block-order-details-view:after,.magento-rma-guest-returns .column.main .block.block-order-details-view:before,.order-links:after,.order-links:before,.order-review-form:after,.order-review-form:before,.page-header .header.panel:after,.page-header .header.panel:before,.paypal-review .block-content:after,.paypal-review .block-content:before,.paypal-review-discount:after,.paypal-review-discount:before,.sales-guest-view .column.main .block.block-order-details-view:after,.sales-guest-view .column.main .block.block-order-details-view:before,[class^=sales-guest-] .column.main .block.block-order-details-view:after,[class^=sales-guest-] .column.main .block.block-order-details-view:before{content:'';display:table}.abs-add-clearfix-desktop:after,.account .column.main .block.block-order-details-view:after,.account .column.main .block:not(.widget) .block-content:after,.account .page-title-wrapper:after,.block-addresses-list .items.addresses:after,.block-cart-failed .block-content:after,.block-giftregistry-shared .item-options:after,.block-wishlist-management:after,.cart-container:after,.data.table .gift-wrapping .content:after,.data.table .gift-wrapping .nested:after,.header.content:after,.login-container:after,.magento-rma-guest-returns .column.main .block.block-order-details-view:after,.order-links:after,.order-review-form:after,.page-header .header.panel:after,.paypal-review .block-content:after,.paypal-review-discount:after,.sales-guest-view .column.main .block.block-order-details-view:after,[class^=sales-guest-] .column.main .block.block-order-details-view:after{clear:both}.block.category.event,.breadcrumbs,.footer.content,.header.content,.navigation,.page-header .header.panel,.page-main,.page-wrapper>.page-bottom,.page-wrapper>.widget,.top-container{box-sizing:border-box;margin-left:auto;margin-right:auto;max-width:1280px;padding-left:20px;padding-right:20px;width:auto}.panel.header{padding:10px 20px}.page-header .switcher{float:right;margin-left:15px;margin-right:-6px}.header.panel>.header.links>li>a{color:#fff}.header.content{padding:30px 20px 0}.logo{margin:-8px auto 25px 0}.minicart-wrapper{margin-left:13px}.compare.wrapper{list-style:none none}.nav-sections{margin-bottom:25px}.nav-sections-item-content>.navigation{display:block}.navigation{background:#f0f0f0;font-weight:700;height:inherit;left:auto;overflow:inherit;padding:0;position:relative;top:0;width:100%;z-index:3}.navigation ul{margin-top:0;margin-bottom:0;padding:0 8px;position:relative}.navigation .level0{margin:0 10px 0 0;display:inline-block}.navigation .level0>.level-top{color:#575757;line-height:47px;padding:0 12px}.page-main{width:100%}.page-footer{background:#f4f4f4;padding-bottom:25px}.footer.content .links{display:inline-block;padding-right:50px;vertical-align:top}.footer.content ul{padding-right:50px}.footer.content .links li{border:none;font-size:14px;margin:0 0 8px;padding:0}.footer.content .block{float:right}.block.newsletter{width:34%}}@media only screen and (max-width:767px){.compare.wrapper,.panel.wrapper,[class*=block-compare]{display:none}.footer.content .links>li{background:#f4f4f4;font-size:1.6rem;border-top:1px solid #cecece;margin:0 -15px;padding:0 15px}.page-header .header.panel,.page-main{padding-left:15px;padding-right:15px}.header.content{padding-top:10px}.nav-sections-items:after,.nav-sections-items:before{content:'';display:table}.nav-sections-items:after{clear:both}.nav-sections{width:100vw;position:fixed;left:-100vw}}
diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less
index d923bee0b7f8a..8621b7be2a931 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_extends.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_extends.less
@@ -1532,6 +1532,7 @@
     .abs-block-items-counter {
         .lib-css(color, @block-items__counter__color);
         .lib-font-size(12px);
+        vertical-align: middle;
         white-space: nowrap;
 
         &:before {
@@ -1555,6 +1556,7 @@
         strong {
             font-size: @font-size__l;
             font-weight: @font-weight__light;
+            vertical-align: middle;
         }
     }
 }
diff --git a/app/design/frontend/Magento/luma/web/css/source/_forms.less b/app/design/frontend/Magento/luma/web/css/source/_forms.less
index 7c5027aef113b..fc637384e7a49 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_forms.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_forms.less
@@ -20,7 +20,7 @@
         .lib-form-fieldset();
 
         &:last-child {
-            margin-bottom: 0;
+            margin-bottom: @indent__base;
         }
 
         > .field,
@@ -118,6 +118,18 @@
         .lib-form-validation-note();
     }
 
+    .product-options-wrapper {
+        .date {
+            &.required {
+                div[for*='options'] {
+                    &.mage-error {
+                        display: none !important;
+                    }
+                }
+            }
+        }
+    }
+
     //  TEMP
 
     .field .tooltip {
diff --git a/app/design/frontend/Magento/luma/web/css/source/_sections.less b/app/design/frontend/Magento/luma/web/css/source/_sections.less
index 73665fd22da23..95769c4f4b6ba 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_sections.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_sections.less
@@ -19,16 +19,16 @@
             a {
                 position: relative;
                 .lib-icon-font(
-                @_icon-font-content: @icon-down,
-                @_icon-font-size: @font-size__base,
-                @_icon-font-line-height: @icon-font__line-height,
-                @_icon-font-color: @icon-font__color,
-                @_icon-font-color-hover: @icon-font__color-hover,
-                @_icon-font-color-active: @icon-font__color-active,
-                @_icon-font-margin: @icon-font__margin,
-                @_icon-font-vertical-align: @icon-font__vertical-align,
-                @_icon-font-position: after,
-                @_icon-font-display: false
+                    @_icon-font-content: @icon-down,
+                    @_icon-font-size: @font-size__base,
+                    @_icon-font-line-height: @icon-font__line-height,
+                    @_icon-font-color: @icon-font__color,
+                    @_icon-font-color-hover: @icon-font__color-hover,
+                    @_icon-font-color-active: @icon-font__color-active,
+                    @_icon-font-margin: @icon-font__margin,
+                    @_icon-font-vertical-align: @icon-font__vertical-align,
+                    @_icon-font-position: after,
+                    @_icon-font-display: false
                 );
 
                 &:after {
@@ -75,3 +75,17 @@
         }
     }
 }
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
+    .product.data.items {
+        .item.title {
+            > .switch {
+                padding: 1px 15px 1px;
+            }
+        }
+
+        > .item.content {
+            padding: 10px 15px 30px;
+        }
+    }
+}
diff --git a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
index ed01ef7d027f5..834423912e8a1 100644
--- a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
+++ b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
@@ -59,7 +59,7 @@
 
     .modal-custom {
         .action-close {
-            .lib-css(margin, @indent__m);
+            .lib-css(margin, 15px);
         }
     }
 
@@ -83,7 +83,8 @@
 
     .modal-slide {
         .action-close {
-            padding: @modal-slide-action-close__padding;
+            margin: 15px;
+            padding: 0;
         }
 
         .page-main-actions {
diff --git a/app/etc/di.xml b/app/etc/di.xml
index ad77ae3adc566..4309d84773e03 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -37,7 +37,7 @@
     <preference for="Magento\Framework\Locale\ListsInterface" type="Magento\Framework\Locale\TranslatedLists" />
     <preference for="Magento\Framework\Locale\AvailableLocalesInterface" type="Magento\Framework\Locale\Deployed\Codes" />
     <preference for="Magento\Framework\Locale\OptionInterface" type="Magento\Framework\Locale\Deployed\Options" />
-    <preference for="Magento\Framework\Lock\LockManagerInterface" type="Magento\Framework\Lock\Backend\Database" />
+    <preference for="Magento\Framework\Lock\LockManagerInterface" type="Magento\Framework\Lock\Proxy" />
     <preference for="Magento\Framework\Api\AttributeTypeResolverInterface" type="Magento\Framework\Reflection\AttributeTypeResolver" />
     <preference for="Magento\Framework\Api\Search\SearchResultInterface" type="Magento\Framework\Api\Search\SearchResult" />
     <preference for="Magento\Framework\Api\Search\SearchCriteriaInterface" type="Magento\Framework\Api\Search\SearchCriteria"/>
@@ -248,6 +248,13 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\FeedFactory">
+        <arguments>
+            <argument name="formats" xsi:type="array">
+                <item name="rss" xsi:type="string">Magento\Framework\App\Feed</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\Session\SaveHandler\Redis">
         <arguments>
             <argument name="config" xsi:type="object">Cm\RedisSession\Handler\ConfigInterface</argument>
@@ -1356,4 +1363,11 @@
             <argument name="scopeType" xsi:type="const">Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\ScopeResolverPool">
+        <arguments>
+            <argument name="scopeResolvers" xsi:type="array">
+                <item name="default" xsi:type="object">Magento\Framework\App\ScopeResolver</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/composer.json b/composer.json
index 891667b6ee942..1ab53d8a10a87 100644
--- a/composer.json
+++ b/composer.json
@@ -2,13 +2,13 @@
     "name": "magento/magento2ce",
     "description": "Magento 2 (Open Source)",
     "type": "project",
-    "version": "2.2.7-dev",
+    "version": "2.2.9-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "zendframework/zend-stdlib": "^2.7.7",
         "zendframework/zend-code": "~3.1.0",
         "zendframework/zend-server": "^2.6.1",
@@ -22,6 +22,7 @@
         "zendframework/zend-text": "^2.6.0",
         "zendframework/zend-i18n": "^2.7.3",
         "zendframework/zend-eventmanager": "^2.6.3",
+        "zendframework/zend-feed": "^2.9.0",
         "zendframework/zend-view": "^2.8.1",
         "zendframework/zend-servicemanager": "^2.7.8",
         "zendframework/zend-json": "^2.6.1",
@@ -35,11 +36,11 @@
         "zendframework/zend-captcha": "^2.7.1",
         "zendframework/zend-session": "^2.7.3",
         "zendframework/zend-mail": "^2.9.0",
-        "magento/zendframework1": "~1.13.0",
+        "magento/zendframework1": "~1.14.0",
         "colinmollenhour/credis": "1.8.2",
-        "colinmollenhour/php-redis-session-abstract": "1.3.4",
-        "colinmollenhour/cache-backend-redis": "1.10.4",
-        "colinmollenhour/cache-backend-file": "1.4",
+        "colinmollenhour/php-redis-session-abstract": "~1.3.8",
+        "colinmollenhour/cache-backend-redis": "~1.10.4",
+        "colinmollenhour/cache-backend-file": "~1.4",
         "composer/composer": "1.4.1",
         "monolog/monolog": "^1.17",
         "oyejorge/less.php": "~1.7.0",
@@ -50,16 +51,16 @@
         "symfony/console": "~2.3, !=2.7.0",
         "symfony/event-dispatcher": "~2.1",
         "symfony/process": "~2.1",
+        "phpseclib/mcrypt_compat": "1.0.8",
         "phpseclib/phpseclib": "2.0.*",
         "tedivm/jshrink": "~1.3.0",
-        "magento/composer": "~1.2.0",
+        "magento/composer": "1.2.x-dev as 1.2.1",
         "lib-libxml": "*",
         "ext-ctype": "*",
         "ext-gd": "*",
         "ext-spl": "*",
         "ext-dom": "*",
         "ext-simplexml": "*",
-        "ext-mcrypt": "*",
         "ext-bcmath": "*",
         "ext-hash": "*",
         "ext-curl": "*",
@@ -74,7 +75,8 @@
         "ramsey/uuid": "~3.7.3"
     },
     "require-dev": {
-        "magento/magento2-functional-testing-framework": "2.3.11",
+        "allure-framework/allure-phpunit": "~1.2.0",
+        "magento/magento2-functional-testing-framework": "2.4.1",
         "phpunit/phpunit": "~6.2.0",
         "squizlabs/php_codesniffer": "3.2.2",
         "phpmd/phpmd": "@stable",
@@ -87,125 +89,126 @@
         "ext-pcntl": "Need for run processes in parallel mode"
     },
     "replace": {
-        "magento/module-marketplace": "100.2.3",
-        "magento/module-admin-notification": "100.2.4",
-        "magento/module-advanced-pricing-import-export": "100.2.4",
-        "magento/module-analytics": "100.2.3",
-        "magento/module-authorization": "100.2.2",
-        "magento/module-authorizenet": "100.2.2",
-        "magento/module-backend": "100.2.6",
-        "magento/module-backup": "100.2.5",
-        "magento/module-braintree": "100.2.6",
-        "magento/module-bundle": "100.2.5",
-        "magento/module-bundle-import-export": "100.2.3",
-        "magento/module-cache-invalidate": "100.2.2",
-        "magento/module-captcha": "100.2.3",
-        "magento/module-catalog": "102.0.6",
-        "magento/module-catalog-analytics": "100.2.2",
-        "magento/module-catalog-import-export": "100.2.5",
-        "magento/module-catalog-inventory": "100.2.5",
-        "magento/module-catalog-rule": "101.0.5",
-        "magento/module-catalog-rule-configurable": "100.2.2",
-        "magento/module-catalog-search": "100.2.5",
-        "magento/module-catalog-url-rewrite": "100.2.5",
-        "magento/module-catalog-widget": "100.2.3",
-        "magento/module-checkout": "100.2.6",
-        "magento/module-checkout-agreements": "100.2.2",
-        "magento/module-cms": "102.0.6",
-        "magento/module-cms-url-rewrite": "100.2.2",
-        "magento/module-config": "101.0.6",
-        "magento/module-configurable-import-export": "100.2.3",
-        "magento/module-configurable-product": "100.2.6",
-        "magento/module-configurable-product-sales": "100.2.3",
-        "magento/module-contact": "100.2.3",
-        "magento/module-cookie": "100.2.2",
-        "magento/module-cron": "100.2.4",
-        "magento/module-currency-symbol": "100.2.2",
-        "magento/module-customer": "101.0.6",
-        "magento/module-customer-analytics": "100.2.2",
-        "magento/module-customer-import-export": "100.2.4",
-        "magento/module-deploy": "100.2.5",
-        "magento/module-developer": "100.2.4",
-        "magento/module-dhl": "100.2.3",
-        "magento/module-directory": "100.2.5",
-        "magento/module-downloadable": "100.2.5",
-        "magento/module-downloadable-import-export": "100.2.2",
-        "magento/module-eav": "101.0.5",
-        "magento/module-email": "100.2.4",
-        "magento/module-encryption-key": "100.2.2",
-        "magento/module-fedex": "100.2.3",
-        "magento/module-gift-message": "100.2.2",
-        "magento/module-google-adwords": "100.2.2",
-        "magento/module-google-analytics": "100.2.4",
-        "magento/module-google-optimizer": "100.2.3",
-        "magento/module-grouped-import-export": "100.2.2",
-        "magento/module-grouped-product": "100.2.4",
-        "magento/module-import-export": "100.2.6",
-        "magento/module-indexer": "100.2.4",
-        "magento/module-instant-purchase": "100.2.2",
-        "magento/module-integration": "100.2.4",
-        "magento/module-layered-navigation": "100.2.3",
-        "magento/module-media-storage": "100.2.2",
-        "magento/module-msrp": "100.2.2",
-        "magento/module-multishipping": "100.2.3",
-        "magento/module-new-relic-reporting": "100.2.4",
-        "magento/module-newsletter": "100.2.5",
-        "magento/module-offline-payments": "100.2.2",
-        "magento/module-offline-shipping": "100.2.4",
-        "magento/module-page-cache": "100.2.3",
-        "magento/module-payment": "100.2.4",
-        "magento/module-paypal": "100.2.4",
-        "magento/module-persistent": "100.2.2",
-        "magento/module-product-alert": "100.2.3",
-        "magento/module-product-video": "100.2.4",
-        "magento/module-quote": "101.0.5",
-        "magento/module-quote-analytics": "100.2.2",
-        "magento/module-release-notification": "100.2.3",
-        "magento/module-reports": "100.2.6",
-        "magento/module-require-js": "100.2.3",
-        "magento/module-review": "100.2.6",
-        "magento/module-review-analytics": "100.2.2",
-        "magento/module-robots": "100.2.3",
-        "magento/module-rss": "100.2.2",
-        "magento/module-rule": "100.2.3",
-        "magento/module-sales": "101.0.5",
-        "magento/module-sales-analytics": "100.2.2",
-        "magento/module-sales-inventory": "100.2.2",
-        "magento/module-sales-rule": "101.0.4",
-        "magento/module-sales-sequence": "100.2.2",
-        "magento/module-sample-data": "100.2.4",
-        "magento/module-search": "100.2.5",
-        "magento/module-security": "100.2.3",
-        "magento/module-send-friend": "100.2.2",
-        "magento/module-shipping": "100.2.6",
-        "magento/module-signifyd": "100.2.3",
-        "magento/module-sitemap": "100.2.5",
-        "magento/module-store": "100.2.5",
-        "magento/module-swagger-webapi": "100.2.0",
-        "magento/module-swagger": "100.2.4",
-        "magento/module-swatches": "100.2.4",
-        "magento/module-swatches-layered-navigation": "100.2.2",
-        "magento/module-tax": "100.2.6",
-        "magento/module-tax-import-export": "100.2.2",
-        "magento/module-theme": "100.2.6",
-        "magento/module-translation": "100.2.5",
-        "magento/module-ui": "101.0.6",
-        "magento/module-ups": "100.2.4",
-        "magento/module-url-rewrite": "101.0.5",
-        "magento/module-user": "101.0.4",
-        "magento/module-usps": "100.2.4",
-        "magento/module-variable": "100.2.5",
-        "magento/module-vault": "101.0.4",
-        "magento/module-version": "100.2.2",
-        "magento/module-webapi": "100.2.4",
-        "magento/module-webapi-security": "100.2.3",
-        "magento/module-weee": "100.2.3",
-        "magento/module-widget": "101.0.4",
-        "magento/module-wishlist": "101.0.4",
-        "magento/module-wishlist-analytics": "100.2.2",
-        "magento/theme-adminhtml-backend": "100.2.4",
-        "magento/theme-frontend-blank": "100.2.4",
-        "magento/theme-frontend-luma": "100.2.5",
+        "magento/module-marketplace": "100.2.4",
+        "magento/module-admin-notification": "100.2.6",
+        "magento/module-advanced-pricing-import-export": "100.2.5",
+        "magento/module-analytics": "100.2.5",
+        "magento/module-authorization": "100.2.3",
+        "magento/module-authorizenet": "100.2.4",
+        "magento/module-backend": "100.2.8",
+        "magento/module-backup": "100.2.7",
+        "magento/module-braintree": "100.2.8",
+        "magento/module-bundle": "100.2.7",
+        "magento/module-bundle-import-export": "100.2.5",
+        "magento/module-cache-invalidate": "100.2.4",
+        "magento/module-captcha": "100.2.5",
+        "magento/module-catalog": "102.0.8",
+        "magento/module-catalog-analytics": "100.2.3",
+        "magento/module-catalog-import-export": "100.2.7",
+        "magento/module-catalog-inventory": "100.2.7",
+        "magento/module-catalog-rule": "101.0.7",
+        "magento/module-catalog-rule-configurable": "100.2.3",
+        "magento/module-catalog-search": "100.2.7",
+        "magento/module-catalog-url-rewrite": "100.2.7",
+        "magento/module-catalog-widget": "100.2.5",
+        "magento/module-checkout": "100.2.8",
+        "magento/module-checkout-agreements": "100.2.4",
+        "magento/module-cms": "102.0.8",
+        "magento/module-cms-url-rewrite": "100.2.3",
+        "magento/module-config": "101.0.8",
+        "magento/module-configurable-import-export": "100.2.5",
+        "magento/module-configurable-product": "100.2.8",
+        "magento/module-configurable-product-sales": "100.2.4",
+        "magento/module-contact": "100.2.5",
+        "magento/module-cookie": "100.2.3",
+        "magento/module-cron": "100.2.6",
+        "magento/module-currency-symbol": "100.2.4",
+        "magento/module-customer": "101.0.8",
+        "magento/module-customer-analytics": "100.2.3",
+        "magento/module-customer-import-export": "100.2.6",
+        "magento/module-deploy": "100.2.7",
+        "magento/module-developer": "100.2.6",
+        "magento/module-dhl": "100.2.4",
+        "magento/module-directory": "100.2.7",
+        "magento/module-downloadable": "100.2.7",
+        "magento/module-downloadable-import-export": "100.2.3",
+        "magento/module-eav": "101.0.7",
+        "magento/module-email": "100.2.6",
+        "magento/module-encryption-key": "100.2.3",
+        "magento/module-fedex": "100.2.4",
+        "magento/module-gift-message": "100.2.4",
+        "magento/module-google-adwords": "100.2.3",
+        "magento/module-google-analytics": "100.2.6",
+        "magento/module-google-optimizer": "100.2.4",
+        "magento/module-grouped-import-export": "100.2.4",
+        "magento/module-grouped-product": "100.2.6",
+        "magento/module-import-export": "100.2.8",
+        "magento/module-indexer": "100.2.6",
+        "magento/module-instant-purchase": "100.2.4",
+        "magento/module-integration": "100.2.6",
+        "magento/module-layered-navigation": "100.2.5",
+        "magento/module-media-storage": "100.2.3",
+        "magento/module-msrp": "100.2.4",
+        "magento/module-multishipping": "100.2.5",
+        "magento/module-new-relic-reporting": "100.2.6",
+        "magento/module-newsletter": "100.2.7",
+        "magento/module-offline-payments": "100.2.3",
+        "magento/module-offline-shipping": "100.2.6",
+        "magento/module-page-cache": "100.2.5",
+        "magento/module-payment": "100.2.6",
+        "magento/module-paypal": "100.2.6",
+        "magento/module-paypal-captcha": "100.2.0",
+        "magento/module-persistent": "100.2.4",
+        "magento/module-product-alert": "100.2.4",
+        "magento/module-product-video": "100.2.6",
+        "magento/module-quote": "101.0.7",
+        "magento/module-quote-analytics": "100.2.3",
+        "magento/module-release-notification": "100.2.4",
+        "magento/module-reports": "100.2.8",
+        "magento/module-require-js": "100.2.4",
+        "magento/module-review": "100.2.8",
+        "magento/module-review-analytics": "100.2.3",
+        "magento/module-robots": "100.2.4",
+        "magento/module-rss": "100.2.3",
+        "magento/module-rule": "100.2.5",
+        "magento/module-sales": "101.0.7",
+        "magento/module-sales-analytics": "100.2.3",
+        "magento/module-sales-inventory": "100.2.3",
+        "magento/module-sales-rule": "101.0.6",
+        "magento/module-sales-sequence": "100.2.3",
+        "magento/module-sample-data": "100.2.5",
+        "magento/module-search": "100.2.7",
+        "magento/module-security": "100.2.5",
+        "magento/module-send-friend": "100.2.4",
+        "magento/module-shipping": "100.2.8",
+        "magento/module-signifyd": "100.2.5",
+        "magento/module-sitemap": "100.2.7",
+        "magento/module-store": "100.2.7",
+        "magento/module-swagger-webapi": "100.2.1",
+        "magento/module-swagger": "100.2.5",
+        "magento/module-swatches": "100.2.6",
+        "magento/module-swatches-layered-navigation": "100.2.3",
+        "magento/module-tax": "100.2.8",
+        "magento/module-tax-import-export": "100.2.3",
+        "magento/module-theme": "100.2.8",
+        "magento/module-translation": "100.2.6",
+        "magento/module-ui": "101.0.8",
+        "magento/module-ups": "100.2.6",
+        "magento/module-url-rewrite": "101.0.7",
+        "magento/module-user": "101.0.6",
+        "magento/module-usps": "100.2.6",
+        "magento/module-variable": "100.2.6",
+        "magento/module-vault": "101.0.5",
+        "magento/module-version": "100.2.3",
+        "magento/module-webapi": "100.2.6",
+        "magento/module-webapi-security": "100.2.4",
+        "magento/module-weee": "100.2.5",
+        "magento/module-widget": "101.0.6",
+        "magento/module-wishlist": "101.0.6",
+        "magento/module-wishlist-analytics": "100.2.3",
+        "magento/theme-adminhtml-backend": "100.2.6",
+        "magento/theme-frontend-blank": "100.2.6",
+        "magento/theme-frontend-luma": "100.2.7",
         "magento/language-de_de": "100.2.0",
         "magento/language-en_us": "100.2.0",
         "magento/language-es_es": "100.2.0",
@@ -213,7 +216,7 @@
         "magento/language-nl_nl": "100.2.0",
         "magento/language-pt_br": "100.2.0",
         "magento/language-zh_hans_cn": "100.2.0",
-        "magento/framework": "101.0.6",
+        "magento/framework": "101.0.8",
         "trentrichardson/jquery-timepicker-addon": "1.4.3",
         "components/jquery": "1.11.0",
         "blueimp/jquery-file-upload": "5.6.14",
@@ -269,5 +272,12 @@
             "Magento\\TestFramework\\Utility\\": "dev/tests/static/framework/Magento/TestFramework/Utility/"
         }
     },
-    "minimum-stability": "stable"
+    "prefer-stable": true,
+    "minimum-stability": "dev",
+    "repositories": {
+        "magento.composer": {
+            "type": "vcs",
+            "url": "https://github.com/magento/composer.git"
+        }
+    }
 }
diff --git a/composer.lock b/composer.lock
index 98c4846dc228a..b3e859ea015bf 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": "d101565e8093f4857dc138911992d64b",
+    "content-hash": "5e8efc018c1d8d2c668a5ad1105dda0d",
     "packages": [
         {
             "name": "braintree/braintree_php",
@@ -55,21 +55,18 @@
         },
         {
             "name": "colinmollenhour/cache-backend-file",
-            "version": "1.4",
+            "version": "v1.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_File.git",
-                "reference": "51251b80a817790eb624fbe2afc882c14f3c4fb0"
+                "reference": "03c7d4c0f43b2de1b559a3527d18ff697d306544"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_File/zipball/51251b80a817790eb624fbe2afc882c14f3c4fb0",
-                "reference": "51251b80a817790eb624fbe2afc882c14f3c4fb0",
+                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_File/zipball/03c7d4c0f43b2de1b559a3527d18ff697d306544",
+                "reference": "03c7d4c0f43b2de1b559a3527d18ff697d306544",
                 "shasum": ""
             },
-            "require": {
-                "magento-hackathon/magento-composer-installer": "*"
-            },
             "type": "magento-module",
             "autoload": {
                 "classmap": [
@@ -87,20 +84,20 @@
             ],
             "description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.",
             "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File",
-            "time": "2016-05-02T16:24:47+00:00"
+            "time": "2019-04-18T21:54:31+00:00"
         },
         {
             "name": "colinmollenhour/cache-backend-redis",
-            "version": "1.10.4",
+            "version": "1.10.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis.git",
-                "reference": "6bf0a4b7a3f8dc4a6255fad5b6e42213253d9972"
+                "reference": "0ea3e4bf924242f8d03155761bf540c90a2db2d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/6bf0a4b7a3f8dc4a6255fad5b6e42213253d9972",
-                "reference": "6bf0a4b7a3f8dc4a6255fad5b6e42213253d9972",
+                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/0ea3e4bf924242f8d03155761bf540c90a2db2d7",
+                "reference": "0ea3e4bf924242f8d03155761bf540c90a2db2d7",
                 "shasum": ""
             },
             "require": {
@@ -123,7 +120,7 @@
             ],
             "description": "Zend_Cache backend using Redis with full support for tags.",
             "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis",
-            "time": "2017-10-05T20:50:44+00:00"
+            "time": "2019-02-18T18:59:51+00:00"
         },
         {
             "name": "colinmollenhour/credis",
@@ -167,21 +164,21 @@
         },
         {
             "name": "colinmollenhour/php-redis-session-abstract",
-            "version": "v1.3.4",
+            "version": "v1.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/colinmollenhour/php-redis-session-abstract.git",
-                "reference": "6f005b2c3755e4a96ddad821e2ea15d66fb314ae"
+                "reference": "9f69f5c1be512d5ff168e731e7fa29ab2905d847"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/6f005b2c3755e4a96ddad821e2ea15d66fb314ae",
-                "reference": "6f005b2c3755e4a96ddad821e2ea15d66fb314ae",
+                "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/9f69f5c1be512d5ff168e731e7fa29ab2905d847",
+                "reference": "9f69f5c1be512d5ff168e731e7fa29ab2905d847",
                 "shasum": ""
             },
             "require": {
                 "colinmollenhour/credis": "~1.6",
-                "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0"
+                "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0|~7.2.0"
             },
             "type": "library",
             "autoload": {
@@ -200,20 +197,20 @@
             ],
             "description": "A Redis-based session handler with optimistic locking",
             "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract",
-            "time": "2017-03-22T16:13:03+00:00"
+            "time": "2018-01-08T14:53:13+00:00"
         },
         {
             "name": "composer/ca-bundle",
-            "version": "1.1.2",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0"
+                "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/46afded9720f40b9dc63542af4e3e43a1177acb0",
-                "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
+                "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
                 "shasum": ""
             },
             "require": {
@@ -256,7 +253,7 @@
                 "ssl",
                 "tls"
             ],
-            "time": "2018-08-08T08:57:40+00:00"
+            "time": "2019-01-28T09:30:10+00:00"
         },
         {
             "name": "composer/composer",
@@ -337,16 +334,16 @@
         },
         {
             "name": "composer/semver",
-            "version": "1.4.2",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573"
+                "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573",
-                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573",
+                "url": "https://api.github.com/repos/composer/semver/zipball/46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
+                "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
                 "shasum": ""
             },
             "require": {
@@ -395,28 +392,27 @@
                 "validation",
                 "versioning"
             ],
-            "time": "2016-08-30T16:08:34+00:00"
+            "time": "2019-03-19T17:25:45+00:00"
         },
         {
             "name": "composer/spdx-licenses",
-            "version": "1.4.0",
+            "version": "1.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/spdx-licenses.git",
-                "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b"
+                "reference": "a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/cb17687e9f936acd7e7245ad3890f953770dec1b",
-                "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b",
+                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d",
+                "reference": "a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.2 || ^7.0"
+                "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
-                "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 7"
             },
             "type": "library",
             "extra": {
@@ -456,7 +452,7 @@
                 "spdx",
                 "validator"
             ],
-            "time": "2018-04-30T10:33:04+00:00"
+            "time": "2019-03-26T10:23:26+00:00"
         },
         {
             "name": "container-interop/container-interop",
@@ -491,23 +487,23 @@
         },
         {
             "name": "justinrainbow/json-schema",
-            "version": "5.2.7",
+            "version": "5.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/justinrainbow/json-schema.git",
-                "reference": "8560d4314577199ba51bf2032f02cd1315587c23"
+                "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/8560d4314577199ba51bf2032f02cd1315587c23",
-                "reference": "8560d4314577199ba51bf2032f02cd1315587c23",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/dcb6e1006bb5fd1e392b4daa68932880f37550d4",
+                "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.1",
+                "friendsofphp/php-cs-fixer": "~2.2.20",
                 "json-schema/json-schema-test-suite": "1.2.0",
                 "phpunit/phpunit": "^4.8.35"
             },
@@ -553,25 +549,25 @@
                 "json",
                 "schema"
             ],
-            "time": "2018-02-14T22:26:30+00:00"
+            "time": "2019-01-14T23:55:14+00:00"
         },
         {
             "name": "magento/composer",
-            "version": "1.2.0",
+            "version": "1.2.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/composer.git",
-                "reference": "130753af2b755f1967e253deb661225942bb302c"
+                "reference": "6b406bc65690c1b28be9255249507e1c6572d815"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/composer/zipball/130753af2b755f1967e253deb661225942bb302c",
-                "reference": "130753af2b755f1967e253deb661225942bb302c",
+                "url": "https://api.github.com/repos/magento/composer/zipball/6b406bc65690c1b28be9255249507e1c6572d815",
+                "reference": "6b406bc65690c1b28be9255249507e1c6572d815",
                 "shasum": ""
             },
             "require": {
                 "composer/composer": "1.4.1",
-                "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0",
+                "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0|~7.2.0",
                 "symfony/console": "~2.3, !=2.7.0"
             },
             "require-dev": {
@@ -583,13 +579,16 @@
                     "Magento\\Composer\\": "src"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "OSL-3.0",
                 "AFL-3.0"
             ],
             "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
-            "time": "2017-04-24T09:57:02+00:00"
+            "support": {
+                "source": "https://github.com/magento/composer/tree/1.2",
+                "issues": "https://github.com/magento/composer/issues"
+            },
+            "time": "2019-05-21T16:03:27+00:00"
         },
         {
             "name": "magento/magento-composer-installer",
@@ -672,16 +671,16 @@
         },
         {
             "name": "magento/zendframework1",
-            "version": "1.13.1",
+            "version": "1.14.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/zf1.git",
-                "reference": "e2693f047bb7ccb8affa8f72ea40269f4c9f4fbf"
+                "reference": "4df018254c70b5b998b00a8cb1a30760f831ff0d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/zf1/zipball/e2693f047bb7ccb8affa8f72ea40269f4c9f4fbf",
-                "reference": "e2693f047bb7ccb8affa8f72ea40269f4c9f4fbf",
+                "url": "https://api.github.com/repos/magento/zf1/zipball/4df018254c70b5b998b00a8cb1a30760f831ff0d",
+                "reference": "4df018254c70b5b998b00a8cb1a30760f831ff0d",
                 "shasum": ""
             },
             "require": {
@@ -715,20 +714,20 @@
                 "ZF1",
                 "framework"
             ],
-            "time": "2017-06-21T14:56:23+00:00"
+            "time": "2018-08-09T15:03:40+00:00"
         },
         {
             "name": "monolog/monolog",
-            "version": "1.23.0",
+            "version": "1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4"
+                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
-                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
+                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
                 "shasum": ""
             },
             "require": {
@@ -793,7 +792,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2017-06-19T01:22:40+00:00"
+            "time": "2018-11-05T09:00:11+00:00"
         },
         {
             "name": "oyejorge/less.php",
@@ -859,16 +858,16 @@
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v2.0.17",
+            "version": "v2.0.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d"
+                "reference": "0a58ef6e3146256cc3dc7cc393927bcc7d1b72db"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d",
-                "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/0a58ef6e3146256cc3dc7cc393927bcc7d1b72db",
+                "reference": "0a58ef6e3146256cc3dc7cc393927bcc7d1b72db",
                 "shasum": ""
             },
             "require": {
@@ -904,28 +903,33 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2018-07-04T16:31:37+00:00"
+            "time": "2019-01-03T20:59:08+00:00"
         },
         {
             "name": "pelago/emogrifier",
-            "version": "v2.0.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MyIntervals/emogrifier.git",
-                "reference": "8babf8ddbf348f26b29674e2f84db66ff7e3d95e"
+                "reference": "8ee7fb5ad772915451ed3415c1992bd3697d4983"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/8babf8ddbf348f26b29674e2f84db66ff7e3d95e",
-                "reference": "8babf8ddbf348f26b29674e2f84db66ff7e3d95e",
+                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/8ee7fb5ad772915451ed3415c1992bd3697d4983",
+                "reference": "8ee7fb5ad772915451ed3415c1992bd3697d4983",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.0"
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "php": "^5.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0",
+                "symfony/css-selector": "^3.4.0 || ^4.0.0"
             },
             "require-dev": {
+                "friendsofphp/php-cs-fixer": "^2.2.0",
+                "phpmd/phpmd": "^2.6.0",
                 "phpunit/phpunit": "^4.8.0",
-                "squizlabs/php_codesniffer": "^3.1.0"
+                "squizlabs/php_codesniffer": "^3.3.2"
             },
             "type": "library",
             "extra": {
@@ -935,7 +939,7 @@
             },
             "autoload": {
                 "psr-4": {
-                    "Pelago\\": "Classes/"
+                    "Pelago\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -953,10 +957,6 @@
                 {
                     "name": "Jaime Prado"
                 },
-                {
-                    "name": "Roman Ožana",
-                    "email": "ozana@omdesign.cz"
-                },
                 {
                     "name": "Oliver Klee",
                     "email": "github@oliverklee.de"
@@ -964,6 +964,10 @@
                 {
                     "name": "Zoli Szabó",
                     "email": "zoli.szabo+github@gmail.com"
+                },
+                {
+                    "name": "Jake Hotson",
+                    "email": "jake@qzdesign.co.uk"
                 }
             ],
             "description": "Converts CSS styles into inline style attributes in your HTML code",
@@ -973,20 +977,69 @@
                 "email",
                 "pre-processing"
             ],
-            "time": "2018-01-05T23:30:21+00:00"
+            "time": "2018-12-10T10:36:30+00:00"
+        },
+        {
+            "name": "phpseclib/mcrypt_compat",
+            "version": "1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpseclib/mcrypt_compat.git",
+                "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpseclib/mcrypt_compat/zipball/f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
+                "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpseclib/phpseclib": ">=2.0.11 <3.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35|^5.7|^6.0"
+            },
+            "suggest": {
+                "ext-openssl": "Will enable faster cryptographic operations"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "lib/mcrypt.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jim Wigginton",
+                    "email": "terrafrost@php.net",
+                    "homepage": "http://phpseclib.sourceforge.net"
+                }
+            ],
+            "description": "PHP 7.1 polyfill for the mcrypt extension from PHP <= 7.0",
+            "keywords": [
+                "cryptograpy",
+                "encryption",
+                "mcrypt"
+            ],
+            "time": "2018-08-22T03:11:43+00:00"
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.11",
+            "version": "2.0.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "7053f06f91b3de78e143d430e55a8f7889efc08b"
+                "reference": "d6819a55b05e123db1e881d8b230d57f912126be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/7053f06f91b3de78e143d430e55a8f7889efc08b",
-                "reference": "7053f06f91b3de78e143d430e55a8f7889efc08b",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d6819a55b05e123db1e881d8b230d57f912126be",
+                "reference": "d6819a55b05e123db1e881d8b230d57f912126be",
                 "shasum": ""
             },
             "require": {
@@ -1065,7 +1118,7 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2018-04-15T16:55:05+00:00"
+            "time": "2019-06-23T16:33:11+00:00"
         },
         {
             "name": "psr/container",
@@ -1168,16 +1221,16 @@
         },
         {
             "name": "psr/log",
-            "version": "1.0.2",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
                 "shasum": ""
             },
             "require": {
@@ -1211,7 +1264,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2016-10-10T12:19:37+00:00"
+            "time": "2018-11-20T15:27:04+00:00"
         },
         {
             "name": "ramsey/uuid",
@@ -1436,16 +1489,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v2.8.46",
+            "version": "v2.8.50",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "aca0dcc0c75496e17e2aa0303bb9c8e6d79ed789"
+                "reference": "cbcf4b5e233af15cd2bbd50dee1ccc9b7927dc12"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/aca0dcc0c75496e17e2aa0303bb9c8e6d79ed789",
-                "reference": "aca0dcc0c75496e17e2aa0303bb9c8e6d79ed789",
+                "url": "https://api.github.com/repos/symfony/console/zipball/cbcf4b5e233af15cd2bbd50dee1ccc9b7927dc12",
+                "reference": "cbcf4b5e233af15cd2bbd50dee1ccc9b7927dc12",
                 "shasum": ""
             },
             "require": {
@@ -1493,7 +1546,60 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2018-09-30T03:33:07+00:00"
+            "time": "2018-11-20T15:55:20+00:00"
+        },
+        {
+            "name": "symfony/css-selector",
+            "version": "v3.4.29",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/css-selector.git",
+                "reference": "8ca29297c29b64fb3a1a135e71cb25f67f9fdccf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/8ca29297c29b64fb3a1a135e71cb25f67f9fdccf",
+                "reference": "8ca29297c29b64fb3a1a135e71cb25f67f9fdccf",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9|>=7.0.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\CssSelector\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jean-François Simon",
+                    "email": "jeanfrancois.simon@sensiolabs.com"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony CssSelector Component",
+            "homepage": "https://symfony.com",
+            "time": "2019-01-16T09:39:14+00:00"
         },
         {
             "name": "symfony/debug",
@@ -1554,16 +1660,16 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.8.46",
+            "version": "v2.8.50",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "84ae343f39947aa084426ed1138bb96bf94d1f12"
+                "reference": "a77e974a5fecb4398833b0709210e3d5e334ffb0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/84ae343f39947aa084426ed1138bb96bf94d1f12",
-                "reference": "84ae343f39947aa084426ed1138bb96bf94d1f12",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a77e974a5fecb4398833b0709210e3d5e334ffb0",
+                "reference": "a77e974a5fecb4398833b0709210e3d5e334ffb0",
                 "shasum": ""
             },
             "require": {
@@ -1610,20 +1716,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T09:03:18+00:00"
+            "time": "2018-11-21T14:20:20+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v3.4.17",
+            "version": "v3.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "d69930fc337d767607267d57c20a7403d0a822a4"
+                "reference": "70adda061ef83bb7def63a17953dc41f203308a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/d69930fc337d767607267d57c20a7403d0a822a4",
-                "reference": "d69930fc337d767607267d57c20a7403d0a822a4",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/70adda061ef83bb7def63a17953dc41f203308a7",
+                "reference": "70adda061ef83bb7def63a17953dc41f203308a7",
                 "shasum": ""
             },
             "require": {
@@ -1660,20 +1766,20 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2018-10-02T12:28:39+00:00"
+            "time": "2019-06-23T09:29:17+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.4.17",
+            "version": "v3.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "54ba444dddc5bd5708a34bd095ea67c6eb54644d"
+                "reference": "5f80266a729e30bbcc37f8bf0e62c3d5a38c8208"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/54ba444dddc5bd5708a34bd095ea67c6eb54644d",
-                "reference": "54ba444dddc5bd5708a34bd095ea67c6eb54644d",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/5f80266a729e30bbcc37f8bf0e62c3d5a38c8208",
+                "reference": "5f80266a729e30bbcc37f8bf0e62c3d5a38c8208",
                 "shasum": ""
             },
             "require": {
@@ -1709,20 +1815,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2018-10-03T08:46:40+00:00"
+            "time": "2019-05-30T15:47:52+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.9.0",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+                "reference": "82ebae02209c21113908c229e9883c419720738a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
+                "reference": "82ebae02209c21113908c229e9883c419720738a",
                 "shasum": ""
             },
             "require": {
@@ -1734,7 +1840,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                 }
             },
             "autoload": {
@@ -1756,7 +1862,7 @@
                 },
                 {
                     "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
+                    "email": "backendtea@gmail.com"
                 }
             ],
             "description": "Symfony polyfill for ctype functions",
@@ -1767,20 +1873,20 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2018-08-06T14:22:27+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.9.0",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8"
+                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8",
-                "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609",
+                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609",
                 "shasum": ""
             },
             "require": {
@@ -1792,7 +1898,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                 }
             },
             "autoload": {
@@ -1826,20 +1932,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-08-06T14:22:27+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v2.8.46",
+            "version": "v2.8.50",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "f09e21b7c5aba06c47bbfad9cbcf13ac7f0db0a6"
+                "reference": "c3591a09c78639822b0b290d44edb69bf9f05dc8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/f09e21b7c5aba06c47bbfad9cbcf13ac7f0db0a6",
-                "reference": "f09e21b7c5aba06c47bbfad9cbcf13ac7f0db0a6",
+                "url": "https://api.github.com/repos/symfony/process/zipball/c3591a09c78639822b0b290d44edb69bf9f05dc8",
+                "reference": "c3591a09c78639822b0b290d44edb69bf9f05dc8",
                 "shasum": ""
             },
             "require": {
@@ -1875,20 +1981,20 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2018-09-06T17:11:15+00:00"
+            "time": "2018-11-11T11:18:13+00:00"
         },
         {
             "name": "tedivm/jshrink",
-            "version": "v1.3.1",
+            "version": "v1.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tedious/JShrink.git",
-                "reference": "21254058dc3ce6aba6bef458cff4bfa25cf8b198"
+                "reference": "d9b51729f3c6692c2da3e3fe6c5cd7c9d1d3fa8f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tedious/JShrink/zipball/21254058dc3ce6aba6bef458cff4bfa25cf8b198",
-                "reference": "21254058dc3ce6aba6bef458cff4bfa25cf8b198",
+                "url": "https://api.github.com/repos/tedious/JShrink/zipball/d9b51729f3c6692c2da3e3fe6c5cd7c9d1d3fa8f",
+                "reference": "d9b51729f3c6692c2da3e3fe6c5cd7c9d1d3fa8f",
                 "shasum": ""
             },
             "require": {
@@ -1921,7 +2027,7 @@
                 "javascript",
                 "minifier"
             ],
-            "time": "2018-09-16T00:02:51+00:00"
+            "time": "2019-06-15T23:11:19+00:00"
         },
         {
             "name": "true/punycode",
@@ -2294,16 +2400,16 @@
         },
         {
             "name": "zendframework/zend-db",
-            "version": "2.9.3",
+            "version": "2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-db.git",
-                "reference": "5b4f2c42f94c9f7f4b2f456a0ebe459fab12b3d9"
+                "reference": "77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-db/zipball/5b4f2c42f94c9f7f4b2f456a0ebe459fab12b3d9",
-                "reference": "5b4f2c42f94c9f7f4b2f456a0ebe459fab12b3d9",
+                "url": "https://api.github.com/repos/zendframework/zend-db/zipball/77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e",
+                "reference": "77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e",
                 "shasum": ""
             },
             "require": {
@@ -2314,7 +2420,7 @@
                 "phpunit/phpunit": "^5.7.25 || ^6.4.4",
                 "zendframework/zend-coding-standard": "~1.0.0",
                 "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-                "zendframework/zend-hydrator": "^1.1 || ^2.1",
+                "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
                 "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
             },
             "suggest": {
@@ -2348,7 +2454,7 @@
                 "db",
                 "zf"
             ],
-            "time": "2018-04-09T13:21:36+00:00"
+            "time": "2019-02-25T11:37:45+00:00"
         },
         {
             "name": "zendframework/zend-di",
@@ -2553,18 +2659,79 @@
             ],
             "time": "2017-12-12T17:48:56+00:00"
         },
+        {
+            "name": "zendframework/zend-feed",
+            "version": "2.10.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-feed.git",
+                "reference": "6641f4cf3f4586c63f83fd70b6d19966025c8888"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/6641f4cf3f4586c63f83fd70b6d19966025c8888",
+                "reference": "6641f4cf3f4586c63f83fd70b6d19966025c8888",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0",
+                "zendframework/zend-escaper": "^2.5.2",
+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+                "psr/http-message": "^1.0.1",
+                "zendframework/zend-cache": "^2.7.2",
+                "zendframework/zend-coding-standard": "~1.0.0",
+                "zendframework/zend-db": "^2.8.2",
+                "zendframework/zend-http": "^2.7",
+                "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
+                "zendframework/zend-validator": "^2.10.1"
+            },
+            "suggest": {
+                "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator",
+                "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests",
+                "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub",
+                "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations",
+                "zendframework/zend-validator": "Zend\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.10.x-dev",
+                    "dev-develop": "2.11.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Feed\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides functionality for consuming RSS and Atom feeds",
+            "keywords": [
+                "ZendFramework",
+                "feed",
+                "zf"
+            ],
+            "time": "2018-08-01T13:53:20+00:00"
+        },
         {
             "name": "zendframework/zend-filter",
-            "version": "2.8.0",
+            "version": "2.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-filter.git",
-                "reference": "7b997dbe79459f1652deccc8786d7407fb66caa9"
+                "reference": "1c3e6d02f9cd5f6c929c9859498f5efbe216e86f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/7b997dbe79459f1652deccc8786d7407fb66caa9",
-                "reference": "7b997dbe79459f1652deccc8786d7407fb66caa9",
+                "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/1c3e6d02f9cd5f6c929c9859498f5efbe216e86f",
+                "reference": "1c3e6d02f9cd5f6c929c9859498f5efbe216e86f",
                 "shasum": ""
             },
             "require": {
@@ -2577,12 +2744,14 @@
             "require-dev": {
                 "pear/archive_tar": "^1.4.3",
                 "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+                "psr/http-factory": "^1.0",
                 "zendframework/zend-coding-standard": "~1.0.0",
                 "zendframework/zend-crypt": "^3.2.1",
                 "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
                 "zendframework/zend-uri": "^2.6"
             },
             "suggest": {
+                "psr/http-factory-implementation": "psr/http-factory-implementation, for creating file upload instances when consuming PSR-7 in file upload filters",
                 "zendframework/zend-crypt": "Zend\\Crypt component, for encryption filters",
                 "zendframework/zend-i18n": "Zend\\I18n component for filters depending on i18n functionality",
                 "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for using the filter chain functionality",
@@ -2591,8 +2760,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8.x-dev",
-                    "dev-develop": "2.9.x-dev"
+                    "dev-master": "2.9.x-dev",
+                    "dev-develop": "2.10.x-dev"
                 },
                 "zf": {
                     "component": "Zend\\Filter",
@@ -2614,25 +2783,25 @@
                 "filter",
                 "zf"
             ],
-            "time": "2018-04-11T16:20:04+00:00"
+            "time": "2018-12-17T16:00:04+00:00"
         },
         {
             "name": "zendframework/zend-form",
-            "version": "2.12.0",
+            "version": "2.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-form.git",
-                "reference": "565fb4f4bb3e0dbeea0173c923c4a8be77de9441"
+                "reference": "c713a12ccbd43148b71c9339e171ca11e3f8a1da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-form/zipball/565fb4f4bb3e0dbeea0173c923c4a8be77de9441",
-                "reference": "565fb4f4bb3e0dbeea0173c923c4a8be77de9441",
+                "url": "https://api.github.com/repos/zendframework/zend-form/zipball/c713a12ccbd43148b71c9339e171ca11e3f8a1da",
+                "reference": "c713a12ccbd43148b71c9339e171ca11e3f8a1da",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.6 || ^7.0",
-                "zendframework/zend-hydrator": "^1.1 || ^2.1",
+                "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
                 "zendframework/zend-inputfilter": "^2.8",
                 "zendframework/zend-stdlib": "^2.7 || ^3.0"
             },
@@ -2666,8 +2835,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.12.x-dev",
-                    "dev-develop": "2.13.x-dev"
+                    "dev-master": "2.13.x-dev",
+                    "dev-develop": "2.14.x-dev"
                 },
                 "zf": {
                     "component": "Zend\\Form",
@@ -2692,20 +2861,20 @@
                 "form",
                 "zf"
             ],
-            "time": "2018-05-16T18:49:44+00:00"
+            "time": "2018-12-11T22:51:29+00:00"
         },
         {
             "name": "zendframework/zend-http",
-            "version": "2.8.2",
+            "version": "2.8.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-http.git",
-                "reference": "2c8aed3d25522618573194e7cc51351f8cd4a45b"
+                "reference": "d160aedc096be230af0fe9c31151b2b33ad4e807"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-http/zipball/2c8aed3d25522618573194e7cc51351f8cd4a45b",
-                "reference": "2c8aed3d25522618573194e7cc51351f8cd4a45b",
+                "url": "https://api.github.com/repos/zendframework/zend-http/zipball/d160aedc096be230af0fe9c31151b2b33ad4e807",
+                "reference": "d160aedc096be230af0fe9c31151b2b33ad4e807",
                 "shasum": ""
             },
             "require": {
@@ -2747,7 +2916,7 @@
                 "zend",
                 "zf"
             ],
-            "time": "2018-08-13T18:47:03+00:00"
+            "time": "2019-02-07T17:47:08+00:00"
         },
         {
             "name": "zendframework/zend-hydrator",
@@ -2877,34 +3046,38 @@
         },
         {
             "name": "zendframework/zend-inputfilter",
-            "version": "2.8.2",
+            "version": "2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-inputfilter.git",
-                "reference": "3f02179e014d9ef0faccda2ad6c65d38adc338d8"
+                "reference": "4f52b71ec9cef3a06e3bba8f5c2124e94055ec0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/3f02179e014d9ef0faccda2ad6c65d38adc338d8",
-                "reference": "3f02179e014d9ef0faccda2ad6c65d38adc338d8",
+                "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/4f52b71ec9cef3a06e3bba8f5c2124e94055ec0c",
+                "reference": "4f52b71ec9cef3a06e3bba8f5c2124e94055ec0c",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.6 || ^7.0",
-                "zendframework/zend-filter": "^2.6",
+                "zendframework/zend-filter": "^2.9.1",
                 "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1",
                 "zendframework/zend-stdlib": "^2.7 || ^3.0",
-                "zendframework/zend-validator": "^2.10.1"
+                "zendframework/zend-validator": "^2.11"
             },
             "require-dev": {
                 "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+                "psr/http-message": "^1.0",
                 "zendframework/zend-coding-standard": "~1.0.0"
             },
+            "suggest": {
+                "psr/http-message-implementation": "PSR-7 is required if you wish to validate PSR-7 UploadedFileInterface payloads"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8.x-dev",
-                    "dev-develop": "2.9.x-dev"
+                    "dev-master": "2.10.x-dev",
+                    "dev-develop": "2.11.x-dev"
                 },
                 "zf": {
                     "component": "Zend\\InputFilter",
@@ -2926,7 +3099,7 @@
                 "inputfilter",
                 "zf"
             ],
-            "time": "2018-05-14T17:38:03+00:00"
+            "time": "2019-01-30T16:58:51+00:00"
         },
         {
             "name": "zendframework/zend-json",
@@ -3163,16 +3336,16 @@
         },
         {
             "name": "zendframework/zend-math",
-            "version": "2.7.0",
+            "version": "2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-math.git",
-                "reference": "f4358090d5d23973121f1ed0b376184b66d9edec"
+                "reference": "1abce074004dacac1a32cd54de94ad47ef960d38"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-math/zipball/f4358090d5d23973121f1ed0b376184b66d9edec",
-                "reference": "f4358090d5d23973121f1ed0b376184b66d9edec",
+                "url": "https://api.github.com/repos/zendframework/zend-math/zipball/1abce074004dacac1a32cd54de94ad47ef960d38",
+                "reference": "1abce074004dacac1a32cd54de94ad47ef960d38",
                 "shasum": ""
             },
             "require": {
@@ -3209,7 +3382,7 @@
                 "math",
                 "zf2"
             ],
-            "time": "2016-04-07T16:29:53+00:00"
+            "time": "2018-12-04T15:34:17+00:00"
         },
         {
             "name": "zendframework/zend-mime",
@@ -3691,16 +3864,16 @@
         },
         {
             "name": "zendframework/zend-soap",
-            "version": "2.7.0",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-soap.git",
-                "reference": "af03c32f0db2b899b3df8cfe29aeb2b49857d284"
+                "reference": "8762d79efa220d82529c43ce08d70554146be645"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-soap/zipball/af03c32f0db2b899b3df8cfe29aeb2b49857d284",
-                "reference": "af03c32f0db2b899b3df8cfe29aeb2b49857d284",
+                "url": "https://api.github.com/repos/zendframework/zend-soap/zipball/8762d79efa220d82529c43ce08d70554146be645",
+                "reference": "8762d79efa220d82529c43ce08d70554146be645",
                 "shasum": ""
             },
             "require": {
@@ -3740,7 +3913,7 @@
                 "soap",
                 "zf2"
             ],
-            "time": "2018-01-29T17:51:26+00:00"
+            "time": "2019-04-30T16:45:35+00:00"
         },
         {
             "name": "zendframework/zend-stdlib",
@@ -3851,16 +4024,16 @@
         },
         {
             "name": "zendframework/zend-uri",
-            "version": "2.6.1",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-uri.git",
-                "reference": "3b6463645c6766f78ce537c70cb4fdabee1e725f"
+                "reference": "b2785cd38fe379a784645449db86f21b7739b1ee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/3b6463645c6766f78ce537c70cb4fdabee1e725f",
-                "reference": "3b6463645c6766f78ce537c70cb4fdabee1e725f",
+                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/b2785cd38fe379a784645449db86f21b7739b1ee",
+                "reference": "b2785cd38fe379a784645449db86f21b7739b1ee",
                 "shasum": ""
             },
             "require": {
@@ -3875,8 +4048,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6.x-dev",
-                    "dev-develop": "2.7.x-dev"
+                    "dev-master": "2.7.x-dev",
+                    "dev-develop": "2.8.x-dev"
                 }
             },
             "autoload": {
@@ -3894,20 +4067,20 @@
                 "uri",
                 "zf"
             ],
-            "time": "2018-04-30T13:40:08+00:00"
+            "time": "2019-02-27T21:39:04+00:00"
         },
         {
             "name": "zendframework/zend-validator",
-            "version": "2.10.2",
+            "version": "2.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-validator.git",
-                "reference": "38109ed7d8e46cfa71bccbe7e6ca80cdd035f8c9"
+                "reference": "3c28dfe4e5951ba38059cea895244d9d206190b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/38109ed7d8e46cfa71bccbe7e6ca80cdd035f8c9",
-                "reference": "38109ed7d8e46cfa71bccbe7e6ca80cdd035f8c9",
+                "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/3c28dfe4e5951ba38059cea895244d9d206190b3",
+                "reference": "3c28dfe4e5951ba38059cea895244d9d206190b3",
                 "shasum": ""
             },
             "require": {
@@ -3917,6 +4090,7 @@
             },
             "require-dev": {
                 "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+                "psr/http-message": "^1.0",
                 "zendframework/zend-cache": "^2.6.1",
                 "zendframework/zend-coding-standard": "~1.0.0",
                 "zendframework/zend-config": "^2.6",
@@ -3930,6 +4104,7 @@
                 "zendframework/zend-uri": "^2.5"
             },
             "suggest": {
+                "psr/http-message": "psr/http-message, required when validating PSR-7 UploadedFileInterface instances via the Upload and UploadFile validators",
                 "zendframework/zend-db": "Zend\\Db component, required by the (No)RecordExists validator",
                 "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator",
                 "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages",
@@ -3942,8 +4117,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.10.x-dev",
-                    "dev-develop": "2.11.x-dev"
+                    "dev-master": "2.11.x-dev",
+                    "dev-develop": "2.12.x-dev"
                 },
                 "zf": {
                     "component": "Zend\\Validator",
@@ -3965,25 +4140,26 @@
                 "validator",
                 "zf2"
             ],
-            "time": "2018-02-01T17:05:33+00:00"
+            "time": "2019-01-29T22:26:39+00:00"
         },
         {
             "name": "zendframework/zend-view",
-            "version": "2.10.0",
+            "version": "2.11.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-view.git",
-                "reference": "4478cc5dd960e2339d88b363ef99fa278700e80e"
+                "reference": "4f5cb653ed4c64bb8d9bf05b294300feb00c67f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-view/zipball/4478cc5dd960e2339d88b363ef99fa278700e80e",
-                "reference": "4478cc5dd960e2339d88b363ef99fa278700e80e",
+                "url": "https://api.github.com/repos/zendframework/zend-view/zipball/4f5cb653ed4c64bb8d9bf05b294300feb00c67f2",
+                "reference": "4f5cb653ed4c64bb8d9bf05b294300feb00c67f2",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.6 || ^7.0",
                 "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+                "zendframework/zend-json": "^2.6.1 || ^3.0",
                 "zendframework/zend-loader": "^2.5",
                 "zendframework/zend-stdlib": "^2.7 || ^3.0"
             },
@@ -3999,10 +4175,9 @@
                 "zendframework/zend-filter": "^2.6.1",
                 "zendframework/zend-http": "^2.5.4",
                 "zendframework/zend-i18n": "^2.6",
-                "zendframework/zend-json": "^2.6.1",
                 "zendframework/zend-log": "^2.7",
                 "zendframework/zend-modulemanager": "^2.7.1",
-                "zendframework/zend-mvc": "^2.7 || ^3.0",
+                "zendframework/zend-mvc": "^2.7.14 || ^3.0",
                 "zendframework/zend-navigation": "^2.5",
                 "zendframework/zend-paginator": "^2.5",
                 "zendframework/zend-permissions-acl": "^2.6",
@@ -4019,8 +4194,8 @@
                 "zendframework/zend-filter": "Zend\\Filter component",
                 "zendframework/zend-http": "Zend\\Http component",
                 "zendframework/zend-i18n": "Zend\\I18n component",
-                "zendframework/zend-json": "Zend\\Json component",
                 "zendframework/zend-mvc": "Zend\\Mvc component",
+                "zendframework/zend-mvc-plugin-flashmessenger": "zend-mvc-plugin-flashmessenger component, if you want to use the FlashMessenger view helper with zend-mvc versions 3 and up",
                 "zendframework/zend-navigation": "Zend\\Navigation component",
                 "zendframework/zend-paginator": "Zend\\Paginator component",
                 "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component",
@@ -4033,8 +4208,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.10.x-dev",
-                    "dev-develop": "2.11.x-dev"
+                    "dev-master": "2.11.x-dev",
+                    "dev-develop": "2.12.x-dev"
                 }
             },
             "autoload": {
@@ -4052,22 +4227,22 @@
                 "view",
                 "zf2"
             ],
-            "time": "2018-01-17T22:21:50+00:00"
+            "time": "2019-02-19T17:40:15+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "allure-framework/allure-codeception",
-            "version": "1.2.7",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/allure-framework/allure-codeception.git",
-                "reference": "48598f4b4603b50b663bfe977260113a40912131"
+                "reference": "9d31d781b3622b028f1f6210bc76ba88438bd518"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/allure-framework/allure-codeception/zipball/48598f4b4603b50b663bfe977260113a40912131",
-                "reference": "48598f4b4603b50b663bfe977260113a40912131",
+                "url": "https://api.github.com/repos/allure-framework/allure-codeception/zipball/9d31d781b3622b028f1f6210bc76ba88438bd518",
+                "reference": "9d31d781b3622b028f1f6210bc76ba88438bd518",
                 "shasum": ""
             },
             "require": {
@@ -4105,7 +4280,7 @@
                 "steps",
                 "testing"
             ],
-            "time": "2018-03-07T11:18:27+00:00"
+            "time": "2018-12-18T19:47:23+00:00"
         },
         {
             "name": "allure-framework/allure-php-api",
@@ -4159,18 +4334,68 @@
             ],
             "time": "2016-12-07T12:15:46+00:00"
         },
+        {
+            "name": "allure-framework/allure-phpunit",
+            "version": "1.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/allure-framework/allure-phpunit.git",
+                "reference": "45504aeba41304cf155a898fa9ac1aae79f4a089"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/allure-framework/allure-phpunit/zipball/45504aeba41304cf155a898fa9ac1aae79f4a089",
+                "reference": "45504aeba41304cf155a898fa9ac1aae79f4a089",
+                "shasum": ""
+            },
+            "require": {
+                "allure-framework/allure-php-api": "~1.1.0",
+                "mikey179/vfsstream": "1.*",
+                "php": ">=7.0.0",
+                "phpunit/phpunit": ">=6.0.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Yandex": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Krutov",
+                    "email": "vania-pooh@yandex-team.ru",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A PHPUnit adapter for Allure report.",
+            "homepage": "http://allure.qatools.ru/",
+            "keywords": [
+                "allure",
+                "attachments",
+                "cases",
+                "phpunit",
+                "report",
+                "steps",
+                "testing"
+            ],
+            "time": "2017-11-03T13:08:21+00:00"
+        },
         {
             "name": "behat/gherkin",
-            "version": "v4.4.5",
+            "version": "v4.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Behat/Gherkin.git",
-                "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74"
+                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/5c14cff4f955b17d20d088dec1bde61c0539ec74",
-                "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74",
+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/ab0a02ea14893860bca00f225f5621d351a3ad07",
+                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07",
                 "shasum": ""
             },
             "require": {
@@ -4178,8 +4403,8 @@
             },
             "require-dev": {
                 "phpunit/phpunit": "~4.5|~5",
-                "symfony/phpunit-bridge": "~2.7|~3",
-                "symfony/yaml": "~2.3|~3"
+                "symfony/phpunit-bridge": "~2.7|~3|~4",
+                "symfony/yaml": "~2.3|~3|~4"
             },
             "suggest": {
                 "symfony/yaml": "If you want to parse features, represented in YAML files"
@@ -4216,35 +4441,32 @@
                 "gherkin",
                 "parser"
             ],
-            "time": "2016-10-30T11:50:56+00:00"
+            "time": "2019-01-16T14:22:17+00:00"
         },
         {
             "name": "codeception/codeception",
-            "version": "2.3.9",
+            "version": "2.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "104f46fa0bde339f1bcc3a375aac21eb36e65a1e"
+                "reference": "5fee32d5c82791548931cbc34806b4de6aa1abfc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/104f46fa0bde339f1bcc3a375aac21eb36e65a1e",
-                "reference": "104f46fa0bde339f1bcc3a375aac21eb36e65a1e",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/5fee32d5c82791548931cbc34806b4de6aa1abfc",
+                "reference": "5fee32d5c82791548931cbc34806b4de6aa1abfc",
                 "shasum": ""
             },
             "require": {
-                "behat/gherkin": "~4.4.0",
-                "codeception/stub": "^1.0",
+                "behat/gherkin": "^4.4.0",
+                "codeception/phpunit-wrapper": "^6.0.9|^7.0.6",
+                "codeception/stub": "^2.0",
                 "ext-json": "*",
                 "ext-mbstring": "*",
                 "facebook/webdriver": ">=1.1.3 <2.0",
                 "guzzlehttp/guzzle": ">=4.1.4 <7.0",
                 "guzzlehttp/psr7": "~1.0",
-                "php": ">=5.4.0 <8.0",
-                "phpunit/php-code-coverage": ">=2.2.4 <6.0",
-                "phpunit/phpunit": ">=4.8.28 <5.0.0 || >=5.6.3 <7.0",
-                "sebastian/comparator": ">1.1 <3.0",
-                "sebastian/diff": ">=1.4 <3.0",
+                "php": ">=5.6.0 <8.0",
                 "symfony/browser-kit": ">=2.7 <5.0",
                 "symfony/console": ">=2.7 <5.0",
                 "symfony/css-selector": ">=2.7 <5.0",
@@ -4310,27 +4532,70 @@
                 "functional testing",
                 "unit testing"
             ],
-            "time": "2018-02-26T23:29:41+00:00"
+            "time": "2018-08-01T07:21:49+00:00"
         },
         {
-            "name": "codeception/stub",
-            "version": "1.0.4",
+            "name": "codeception/phpunit-wrapper",
+            "version": "6.0.16",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Codeception/Stub.git",
-                "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805"
+                "url": "https://github.com/Codeception/phpunit-wrapper.git",
+                "reference": "299e3aece31489ed962e6c39fe2fb6f3bbd2eb16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Stub/zipball/681b62348837a5ef07d10d8a226f5bc358cc8805",
-                "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805",
+                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/299e3aece31489ed962e6c39fe2fb6f3bbd2eb16",
+                "reference": "299e3aece31489ed962e6c39fe2fb6f3bbd2eb16",
                 "shasum": ""
             },
             "require": {
-                "phpunit/phpunit-mock-objects": ">2.3 <7.0"
+                "phpunit/php-code-coverage": ">=4.0.4 <6.0",
+                "phpunit/phpunit": ">=5.7.27 <6.5.13",
+                "sebastian/comparator": ">=1.2.4 <3.0",
+                "sebastian/diff": ">=1.4 <4.0"
+            },
+            "replace": {
+                "codeception/phpunit-wrapper": "*"
             },
             "require-dev": {
-                "phpunit/phpunit": ">=4.8 <8.0"
+                "codeception/specify": "*",
+                "vlucas/phpdotenv": "^3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Codeception\\PHPUnit\\": "src\\"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Davert",
+                    "email": "davert.php@resend.cc"
+                }
+            ],
+            "description": "PHPUnit classes used by Codeception",
+            "time": "2019-02-26T20:47:56+00:00"
+        },
+        {
+            "name": "codeception/stub",
+            "version": "2.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/Stub.git",
+                "reference": "853657f988942f7afb69becf3fd0059f192c705a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/Stub/zipball/853657f988942f7afb69becf3fd0059f192c705a",
+                "reference": "853657f988942f7afb69becf3fd0059f192c705a",
+                "shasum": ""
+            },
+            "require": {
+                "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3"
             },
             "type": "library",
             "autoload": {
@@ -4343,20 +4608,20 @@
                 "MIT"
             ],
             "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
-            "time": "2018-05-17T09:31:08+00:00"
+            "time": "2019-03-02T15:35:10+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "1.3.0",
+            "version": "1.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "b8e9745fb9b06ea6664d8872c4505fb16df4611c"
+                "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/b8e9745fb9b06ea6664d8872c4505fb16df4611c",
-                "reference": "b8e9745fb9b06ea6664d8872c4505fb16df4611c",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/46867cbf8ca9fb8d60c506895449eb799db1184f",
+                "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f",
                 "shasum": ""
             },
             "require": {
@@ -4387,38 +4652,82 @@
                 "Xdebug",
                 "performance"
             ],
-            "time": "2018-08-31T19:07:57+00:00"
+            "time": "2019-05-27T17:52:04+00:00"
         },
         {
             "name": "consolidation/annotated-command",
-            "version": "2.9.1",
+            "version": "2.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/annotated-command.git",
-                "reference": "4bdbb8fa149e1cc1511bd77b0bc4729fd66bccac"
+                "reference": "512a2e54c98f3af377589de76c43b24652bcb789"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/4bdbb8fa149e1cc1511bd77b0bc4729fd66bccac",
-                "reference": "4bdbb8fa149e1cc1511bd77b0bc4729fd66bccac",
+                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/512a2e54c98f3af377589de76c43b24652bcb789",
+                "reference": "512a2e54c98f3af377589de76c43b24652bcb789",
                 "shasum": ""
             },
             "require": {
-                "consolidation/output-formatters": "^3.1.12",
-                "php": ">=5.4.0",
+                "consolidation/output-formatters": "^3.4",
+                "php": ">=5.4.5",
                 "psr/log": "^1",
                 "symfony/console": "^2.8|^3|^4",
                 "symfony/event-dispatcher": "^2.5|^3|^4",
                 "symfony/finder": "^2.5|^3|^4"
             },
             "require-dev": {
-                "g1a/composer-test-scenarios": "^2",
+                "g1a/composer-test-scenarios": "^3",
+                "php-coveralls/php-coveralls": "^1",
                 "phpunit/phpunit": "^6",
-                "satooshi/php-coveralls": "^2",
                 "squizlabs/php_codesniffer": "^2.7"
             },
             "type": "library",
             "extra": {
+                "scenarios": {
+                    "symfony4": {
+                        "require": {
+                            "symfony/console": "^4.0"
+                        },
+                        "config": {
+                            "platform": {
+                                "php": "7.1.3"
+                            }
+                        }
+                    },
+                    "symfony2": {
+                        "require": {
+                            "symfony/console": "^2.8"
+                        },
+                        "require-dev": {
+                            "phpunit/phpunit": "^4.8.36"
+                        },
+                        "remove": [
+                            "php-coveralls/php-coveralls"
+                        ],
+                        "config": {
+                            "platform": {
+                                "php": "5.4.8"
+                            }
+                        },
+                        "scenario-options": {
+                            "create-lockfile": "false"
+                        }
+                    },
+                    "phpunit4": {
+                        "require-dev": {
+                            "phpunit/phpunit": "^4.8.36"
+                        },
+                        "remove": [
+                            "php-coveralls/php-coveralls"
+                        ],
+                        "config": {
+                            "platform": {
+                                "php": "5.4.8"
+                            }
+                        }
+                    }
+                },
                 "branch-alias": {
                     "dev-master": "2.x-dev"
                 }
@@ -4439,20 +4748,20 @@
                 }
             ],
             "description": "Initialize Symfony Console commands from annotated command class methods.",
-            "time": "2018-09-19T17:47:18+00:00"
+            "time": "2019-03-08T16:55:03+00:00"
         },
         {
             "name": "consolidation/config",
-            "version": "1.1.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/config.git",
-                "reference": "c9fc25e9088a708637e18a256321addc0670e578"
+                "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/config/zipball/c9fc25e9088a708637e18a256321addc0670e578",
-                "reference": "c9fc25e9088a708637e18a256321addc0670e578",
+                "url": "https://api.github.com/repos/consolidation/config/zipball/cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1",
+                "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1",
                 "shasum": ""
             },
             "require": {
@@ -4461,9 +4770,9 @@
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "g1a/composer-test-scenarios": "^1",
+                "g1a/composer-test-scenarios": "^3",
+                "php-coveralls/php-coveralls": "^1",
                 "phpunit/phpunit": "^5",
-                "satooshi/php-coveralls": "^1.0",
                 "squizlabs/php_codesniffer": "2.*",
                 "symfony/console": "^2.5|^3|^4",
                 "symfony/yaml": "^2.8.11|^3|^4"
@@ -4473,6 +4782,33 @@
             },
             "type": "library",
             "extra": {
+                "scenarios": {
+                    "symfony4": {
+                        "require-dev": {
+                            "symfony/console": "^4.0"
+                        },
+                        "config": {
+                            "platform": {
+                                "php": "7.1.3"
+                            }
+                        }
+                    },
+                    "symfony2": {
+                        "require-dev": {
+                            "symfony/console": "^2.8",
+                            "symfony/event-dispatcher": "^2.8",
+                            "phpunit/phpunit": "^4.8.36"
+                        },
+                        "remove": [
+                            "php-coveralls/php-coveralls"
+                        ],
+                        "config": {
+                            "platform": {
+                                "php": "5.4.8"
+                            }
+                        }
+                    }
+                },
                 "branch-alias": {
                     "dev-master": "1.x-dev"
                 }
@@ -4493,35 +4829,76 @@
                 }
             ],
             "description": "Provide configuration services for a commandline tool.",
-            "time": "2018-08-07T22:57:00+00:00"
+            "time": "2019-03-03T19:37:04+00:00"
         },
         {
             "name": "consolidation/log",
-            "version": "1.0.6",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/log.git",
-                "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395"
+                "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/log/zipball/dfd8189a771fe047bf3cd669111b2de5f1c79395",
-                "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395",
+                "url": "https://api.github.com/repos/consolidation/log/zipball/b2e887325ee90abc96b0a8b7b474cd9e7c896e3a",
+                "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.0",
-                "psr/log": "~1.0",
+                "php": ">=5.4.5",
+                "psr/log": "^1.0",
                 "symfony/console": "^2.8|^3|^4"
             },
             "require-dev": {
-                "g1a/composer-test-scenarios": "^1",
-                "phpunit/phpunit": "4.*",
-                "satooshi/php-coveralls": "^2",
-                "squizlabs/php_codesniffer": "2.*"
+                "g1a/composer-test-scenarios": "^3",
+                "php-coveralls/php-coveralls": "^1",
+                "phpunit/phpunit": "^6",
+                "squizlabs/php_codesniffer": "^2"
             },
             "type": "library",
             "extra": {
+                "scenarios": {
+                    "symfony4": {
+                        "require": {
+                            "symfony/console": "^4.0"
+                        },
+                        "config": {
+                            "platform": {
+                                "php": "7.1.3"
+                            }
+                        }
+                    },
+                    "symfony2": {
+                        "require": {
+                            "symfony/console": "^2.8"
+                        },
+                        "require-dev": {
+                            "phpunit/phpunit": "^4.8.36"
+                        },
+                        "remove": [
+                            "php-coveralls/php-coveralls"
+                        ],
+                        "config": {
+                            "platform": {
+                                "php": "5.4.8"
+                            }
+                        }
+                    },
+                    "phpunit4": {
+                        "require-dev": {
+                            "phpunit/phpunit": "^4.8.36"
+                        },
+                        "remove": [
+                            "php-coveralls/php-coveralls"
+                        ],
+                        "config": {
+                            "platform": {
+                                "php": "5.4.8"
+                            }
+                        }
+                    }
+                },
                 "branch-alias": {
                     "dev-master": "1.x-dev"
                 }
@@ -4542,33 +4919,33 @@
                 }
             ],
             "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.",
-            "time": "2018-05-25T18:14:39+00:00"
+            "time": "2019-01-01T17:30:51+00:00"
         },
         {
             "name": "consolidation/output-formatters",
-            "version": "3.2.1",
+            "version": "3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/output-formatters.git",
-                "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5"
+                "reference": "99ec998ffb697e0eada5aacf81feebfb13023605"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/d78ef59aea19d3e2e5a23f90a055155ee78a0ad5",
-                "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5",
+                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/99ec998ffb697e0eada5aacf81feebfb13023605",
+                "reference": "99ec998ffb697e0eada5aacf81feebfb13023605",
                 "shasum": ""
             },
             "require": {
+                "dflydev/dot-access-data": "^1.1.0",
                 "php": ">=5.4.0",
                 "symfony/console": "^2.8|^3|^4",
                 "symfony/finder": "^2.5|^3|^4"
             },
             "require-dev": {
-                "g1a/composer-test-scenarios": "^2",
+                "g1a/composer-test-scenarios": "^3",
+                "php-coveralls/php-coveralls": "^1",
                 "phpunit/phpunit": "^5.7.27",
-                "satooshi/php-coveralls": "^2",
                 "squizlabs/php_codesniffer": "^2.7",
-                "symfony/console": "3.2.3",
                 "symfony/var-dumper": "^2.8|^3|^4",
                 "victorjonsson/markdowndocs": "^1.3"
             },
@@ -4577,6 +4954,52 @@
             },
             "type": "library",
             "extra": {
+                "scenarios": {
+                    "symfony4": {
+                        "require": {
+                            "symfony/console": "^4.0"
+                        },
+                        "require-dev": {
+                            "phpunit/phpunit": "^6"
+                        },
+                        "config": {
+                            "platform": {
+                                "php": "7.1.3"
+                            }
+                        }
+                    },
+                    "symfony3": {
+                        "require": {
+                            "symfony/console": "^3.4",
+                            "symfony/finder": "^3.4",
+                            "symfony/var-dumper": "^3.4"
+                        },
+                        "config": {
+                            "platform": {
+                                "php": "5.6.32"
+                            }
+                        }
+                    },
+                    "symfony2": {
+                        "require": {
+                            "symfony/console": "^2.8"
+                        },
+                        "require-dev": {
+                            "phpunit/phpunit": "^4.8.36"
+                        },
+                        "remove": [
+                            "php-coveralls/php-coveralls"
+                        ],
+                        "config": {
+                            "platform": {
+                                "php": "5.4.8"
+                            }
+                        },
+                        "scenario-options": {
+                            "create-lockfile": "false"
+                        }
+                    }
+                },
                 "branch-alias": {
                     "dev-master": "3.x-dev"
                 }
@@ -4597,29 +5020,28 @@
                 }
             ],
             "description": "Format text by applying transformations provided by plug-in formatters.",
-            "time": "2018-05-25T18:02:34+00:00"
+            "time": "2019-05-30T23:16:01+00:00"
         },
         {
             "name": "consolidation/robo",
-            "version": "1.3.1",
+            "version": "1.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/Robo.git",
-                "reference": "31f2d2562c4e1dcde70f2659eefd59aa9c7f5b2d"
+                "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/Robo/zipball/31f2d2562c4e1dcde70f2659eefd59aa9c7f5b2d",
-                "reference": "31f2d2562c4e1dcde70f2659eefd59aa9c7f5b2d",
+                "url": "https://api.github.com/repos/consolidation/Robo/zipball/5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345",
+                "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345",
                 "shasum": ""
             },
             "require": {
-                "consolidation/annotated-command": "^2.8.2",
-                "consolidation/config": "^1.0.10",
+                "consolidation/annotated-command": "^2.10.2",
+                "consolidation/config": "^1.2",
                 "consolidation/log": "~1",
                 "consolidation/output-formatters": "^3.1.13",
                 "consolidation/self-update": "^1",
-                "g1a/composer-test-scenarios": "^2",
                 "grasmash/yaml-expander": "^1.3",
                 "league/container": "^2.2",
                 "php": ">=5.5.0",
@@ -4636,14 +5058,15 @@
                 "codeception/aspect-mock": "^1|^2.1.1",
                 "codeception/base": "^2.3.7",
                 "codeception/verify": "^0.3.2",
+                "g1a/composer-test-scenarios": "^3",
                 "goaop/framework": "~2.1.2",
                 "goaop/parser-reflection": "^1.1.0",
                 "natxet/cssmin": "3.0.4",
                 "nikic/php-parser": "^3.1.5",
                 "patchwork/jsqueeze": "~2",
-                "pear/archive_tar": "^1.4.2",
+                "pear/archive_tar": "^1.4.4",
+                "php-coveralls/php-coveralls": "^1",
                 "phpunit/php-code-coverage": "~2|~4",
-                "satooshi/php-coveralls": "^2",
                 "squizlabs/php_codesniffer": "^2.8"
             },
             "suggest": {
@@ -4657,9 +5080,36 @@
             ],
             "type": "library",
             "extra": {
+                "scenarios": {
+                    "symfony4": {
+                        "require": {
+                            "symfony/console": "^4"
+                        },
+                        "config": {
+                            "platform": {
+                                "php": "7.1.3"
+                            }
+                        }
+                    },
+                    "symfony2": {
+                        "require": {
+                            "symfony/console": "^2.8"
+                        },
+                        "remove": [
+                            "goaop/framework"
+                        ],
+                        "config": {
+                            "platform": {
+                                "php": "5.5.9"
+                            }
+                        },
+                        "scenario-options": {
+                            "create-lockfile": "false"
+                        }
+                    }
+                },
                 "branch-alias": {
-                    "dev-master": "1.x-dev",
-                    "dev-state": "1.x-dev"
+                    "dev-master": "2.x-dev"
                 }
             },
             "autoload": {
@@ -4678,20 +5128,20 @@
                 }
             ],
             "description": "Modern task runner",
-            "time": "2018-08-17T18:44:18+00:00"
+            "time": "2019-03-19T18:07:19+00:00"
         },
         {
             "name": "consolidation/self-update",
-            "version": "1.1.3",
+            "version": "1.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/self-update.git",
-                "reference": "de33822f907e0beb0ffad24cf4b1b4fae5ada318"
+                "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/self-update/zipball/de33822f907e0beb0ffad24cf4b1b4fae5ada318",
-                "reference": "de33822f907e0beb0ffad24cf4b1b4fae5ada318",
+                "url": "https://api.github.com/repos/consolidation/self-update/zipball/a1c273b14ce334789825a09d06d4c87c0a02ad54",
+                "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54",
                 "shasum": ""
             },
             "require": {
@@ -4728,7 +5178,7 @@
                 }
             ],
             "description": "Provides a self:update command for Symfony Console applications.",
-            "time": "2018-08-24T17:01:46+00:00"
+            "time": "2018-10-28T01:52:03+00:00"
         },
         {
             "name": "dflydev/dot-access-data",
@@ -4980,21 +5430,24 @@
         },
         {
             "name": "doctrine/lexer",
-            "version": "v1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
+                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
-                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8",
+                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.2"
             },
+            "require-dev": {
+                "phpunit/phpunit": "^4.5"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -5002,8 +5455,8 @@
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Lexer\\": "lib/"
+                "psr-4": {
+                    "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5024,13 +5477,16 @@
                     "email": "schmittjoh@gmail.com"
                 }
             ],
-            "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
-            "homepage": "http://www.doctrine-project.org",
+            "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
+            "homepage": "https://www.doctrine-project.org/projects/lexer.html",
             "keywords": [
+                "annotations",
+                "docblock",
                 "lexer",
-                "parser"
+                "parser",
+                "php"
             ],
-            "time": "2014-09-09T13:34:57+00:00"
+            "time": "2019-06-08T11:03:04+00:00"
         },
         {
             "name": "epfremme/swagger-php",
@@ -5080,16 +5536,16 @@
         },
         {
             "name": "facebook/webdriver",
-            "version": "1.6.0",
+            "version": "1.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/facebook/php-webdriver.git",
-                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e"
+                "reference": "e43de70f3c7166169d0f14a374505392734160e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/bd8c740097eb9f2fc3735250fc1912bc811a954e",
-                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e",
+                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/e43de70f3c7166169d0f14a374505392734160e5",
+                "reference": "e43de70f3c7166169d0f14a374505392734160e5",
                 "shasum": ""
             },
             "require": {
@@ -5136,7 +5592,7 @@
                 "selenium",
                 "webdriver"
             ],
-            "time": "2018-05-16T17:37:13+00:00"
+            "time": "2019-06-13T08:02:18+00:00"
         },
         {
             "name": "flow/jsonpath",
@@ -5317,39 +5773,6 @@
             ],
             "time": "2018-07-12T10:23:15+00:00"
         },
-        {
-            "name": "g1a/composer-test-scenarios",
-            "version": "2.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/g1a/composer-test-scenarios.git",
-                "reference": "a166fd15191aceab89f30c097e694b7cf3db4880"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/g1a/composer-test-scenarios/zipball/a166fd15191aceab89f30c097e694b7cf3db4880",
-                "reference": "a166fd15191aceab89f30c097e694b7cf3db4880",
-                "shasum": ""
-            },
-            "bin": [
-                "scripts/create-scenario",
-                "scripts/dependency-licenses",
-                "scripts/install-scenario"
-            ],
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Anderson",
-                    "email": "greg.1.anderson@greenknowe.org"
-                }
-            ],
-            "description": "Useful scripts for testing multiple sets of Composer dependencies.",
-            "time": "2018-08-08T23:37:23+00:00"
-        },
         {
             "name": "grasmash/expander",
             "version": "1.0.0",
@@ -5563,32 +5986,33 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.4.2",
+            "version": "1.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
+                "reference": "9f83dded91781a01c63574e387eaa769be769115"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
-                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115",
+                "reference": "9f83dded91781a01c63574e387eaa769be769115",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0",
-                "psr/http-message": "~1.0"
+                "psr/http-message": "~1.0",
+                "ralouphie/getallheaders": "^2.0.5"
             },
             "provide": {
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0"
+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "1.5-dev"
                 }
             },
             "autoload": {
@@ -5618,13 +6042,14 @@
             "keywords": [
                 "http",
                 "message",
+                "psr-7",
                 "request",
                 "response",
                 "stream",
                 "uri",
                 "url"
             ],
-            "time": "2017-03-20T17:10:46+00:00"
+            "time": "2018-12-04T20:46:45+00:00"
         },
         {
             "name": "ircmaxell/password-compat",
@@ -5670,16 +6095,16 @@
         },
         {
             "name": "jms/metadata",
-            "version": "1.6.0",
+            "version": "1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/metadata.git",
-                "reference": "6a06970a10e0a532fb52d3959547123b84a3b3ab"
+                "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/6a06970a10e0a532fb52d3959547123b84a3b3ab",
-                "reference": "6a06970a10e0a532fb52d3959547123b84a3b3ab",
+                "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/e5854ab1aa643623dc64adde718a8eec32b957a8",
+                "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8",
                 "shasum": ""
             },
             "require": {
@@ -5702,9 +6127,13 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "Apache-2.0"
+                "MIT"
             ],
             "authors": [
+                {
+                    "name": "Asmir Mustafic",
+                    "email": "goetas@gmail.com"
+                },
                 {
                     "name": "Johannes M. Schmitt",
                     "email": "schmittjoh@gmail.com"
@@ -5717,7 +6146,7 @@
                 "xml",
                 "yaml"
             ],
-            "time": "2016-12-05T10:18:33+00:00"
+            "time": "2018-10-26T12:40:10+00:00"
         },
         {
             "name": "jms/parser-lib",
@@ -5756,16 +6185,16 @@
         },
         {
             "name": "jms/serializer",
-            "version": "1.13.0",
+            "version": "1.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/serializer.git",
-                "reference": "00863e1d55b411cc33ad3e1de09a4c8d3aae793c"
+                "reference": "ee96d57024af9a7716d56fcbe3aa94b3d030f3ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/00863e1d55b411cc33ad3e1de09a4c8d3aae793c",
-                "reference": "00863e1d55b411cc33ad3e1de09a4c8d3aae793c",
+                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/ee96d57024af9a7716d56fcbe3aa94b3d030f3ca",
+                "reference": "ee96d57024af9a7716d56fcbe3aa94b3d030f3ca",
                 "shasum": ""
             },
             "require": {
@@ -5805,7 +6234,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-1.x": "1.13-dev"
+                    "dev-1.x": "1.14-dev"
                 }
             },
             "autoload": {
@@ -5836,7 +6265,7 @@
                 "serialization",
                 "xml"
             ],
-            "time": "2018-07-25T13:58:54+00:00"
+            "time": "2019-04-17T08:12:16+00:00"
         },
         {
             "name": "league/container",
@@ -5972,39 +6401,41 @@
         },
         {
             "name": "magento/magento2-functional-testing-framework",
-            "version": "2.3.11",
+            "version": "2.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/magento2-functional-testing-framework.git",
-                "reference": "3ca1bd74228a61bd05520bed1ef88b5a19764d92"
+                "reference": "9b5de03fe069d4a36c911112c30b824ff4e80c3a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/3ca1bd74228a61bd05520bed1ef88b5a19764d92",
-                "reference": "3ca1bd74228a61bd05520bed1ef88b5a19764d92",
+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/9b5de03fe069d4a36c911112c30b824ff4e80c3a",
+                "reference": "9b5de03fe069d4a36c911112c30b824ff4e80c3a",
                 "shasum": ""
             },
             "require": {
-                "allure-framework/allure-codeception": "~1.2.6",
-                "codeception/codeception": "~2.3.4",
+                "allure-framework/allure-codeception": "~1.3.0",
+                "codeception/codeception": "~2.3.4 || ~2.4.0 ",
                 "consolidation/robo": "^1.0.0",
                 "epfremme/swagger-php": "^2.0",
+                "ext-curl": "*",
                 "flow/jsonpath": ">0.2",
                 "fzaninotto/faker": "^1.6",
                 "monolog/monolog": "^1.0",
                 "mustache/mustache": "~2.5",
-                "php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0",
+                "php": "7.0.2||7.0.4||~7.0.6||~7.1.0||~7.2.0||~7.3.0",
                 "symfony/process": "^2.8 || ^3.1 || ^4.0",
                 "vlucas/phpdotenv": "^2.4"
             },
             "require-dev": {
-                "brainmaestro/composer-git-hooks": "^2.3",
+                "brainmaestro/composer-git-hooks": "^2.3.1",
                 "codacy/coverage": "^1.4",
                 "codeception/aspect-mock": "^3.0",
                 "doctrine/cache": "<1.7.0",
                 "goaop/framework": "2.2.0",
                 "php-coveralls/php-coveralls": "^1.0",
                 "phpmd/phpmd": "^2.6.0",
+                "phpunit/phpunit": "~6.5.0 || ~7.0.0",
                 "rregeer/phpunit-coverage-check": "^0.1.4",
                 "sebastian/phpcpd": "~3.0 || ~4.0",
                 "squizlabs/php_codesniffer": "~3.2",
@@ -6039,7 +6470,53 @@
                 "magento",
                 "testing"
             ],
-            "time": "2018-11-13T18:22:25+00:00"
+            "time": "2019-06-10T17:57:40+00:00"
+        },
+        {
+            "name": "mikey179/vfsStream",
+            "version": "v1.6.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/bovigo/vfsStream.git",
+                "reference": "095238a0711c974ae5b4ebf4c4534a23f3f6c99d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/095238a0711c974ae5b4ebf4c4534a23f3f6c99d",
+                "reference": "095238a0711c974ae5b4ebf4c4534a23f3f6c99d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "org\\bovigo\\vfs\\": "src/main/php"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Frank Kleine",
+                    "homepage": "http://frankkleine.de/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Virtual file system to mock the real file system in unit tests.",
+            "homepage": "http://vfs.bovigo.org/",
+            "time": "2019-04-08T13:54:32+00:00"
         },
         {
             "name": "moontoast/math",
@@ -6427,16 +6904,16 @@
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "4.3.0",
+            "version": "4.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
+                "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
-                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
+                "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
                 "shasum": ""
             },
             "require": {
@@ -6474,7 +6951,7 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-11-30T07:14:17+00:00"
+            "time": "2019-04-30T17:48:53+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
@@ -6641,16 +7118,16 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.8.0",
+            "version": "1.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
+                "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
-                "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
+                "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
                 "shasum": ""
             },
             "require": {
@@ -6671,8 +7148,8 @@
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
+                "psr-4": {
+                    "Prophecy\\": "src/Prophecy"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -6700,7 +7177,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2018-08-05T17:53:17+00:00"
+            "time": "2019-06-13T12:50:23+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -7092,8 +7569,49 @@
                 "mock",
                 "xunit"
             ],
+            "abandoned": true,
             "time": "2017-08-03T14:08:16+00:00"
         },
+        {
+            "name": "ralouphie/getallheaders",
+            "version": "2.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ralouphie/getallheaders.git",
+                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~3.7.0",
+                "satooshi/php-coveralls": ">=1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/getallheaders.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ralph Khattar",
+                    "email": "ralph.khattar@gmail.com"
+                }
+            ],
+            "description": "A polyfill for getallheaders.",
+            "time": "2016-02-11T07:05:27+00:00"
+        },
         {
             "name": "sebastian/code-unit-reverse-lookup",
             "version": "1.0.1",
@@ -7796,16 +8314,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v3.4.17",
+            "version": "v3.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "f6668d1a6182d5a8dec65a1c863a4c1d963816c0"
+                "reference": "53266c9a1536e2dc673eb1efb6a6142ef84c6282"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/f6668d1a6182d5a8dec65a1c863a4c1d963816c0",
-                "reference": "f6668d1a6182d5a8dec65a1c863a4c1d963816c0",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/53266c9a1536e2dc673eb1efb6a6142ef84c6282",
+                "reference": "53266c9a1536e2dc673eb1efb6a6142ef84c6282",
                 "shasum": ""
             },
             "require": {
@@ -7849,20 +8367,20 @@
             ],
             "description": "Symfony BrowserKit Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T09:06:28+00:00"
+            "time": "2019-06-09T14:27:26+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v3.4.17",
+            "version": "v3.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "e5389132dc6320682de3643091121c048ff796b3"
+                "reference": "29a33f66194fbe2ed4555981810f15fd8440e4a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/e5389132dc6320682de3643091121c048ff796b3",
-                "reference": "e5389132dc6320682de3643091121c048ff796b3",
+                "url": "https://api.github.com/repos/symfony/config/zipball/29a33f66194fbe2ed4555981810f15fd8440e4a8",
+                "reference": "29a33f66194fbe2ed4555981810f15fd8440e4a8",
                 "shasum": ""
             },
             "require": {
@@ -7913,60 +8431,7 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2018-09-08T13:15:14+00:00"
-        },
-        {
-            "name": "symfony/css-selector",
-            "version": "v3.4.17",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/css-selector.git",
-                "reference": "3503415d4aafabc31cd08c3a4ebac7f43fde8feb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/3503415d4aafabc31cd08c3a4ebac7f43fde8feb",
-                "reference": "3503415d4aafabc31cd08c3a4ebac7f43fde8feb",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\CssSelector\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jean-François Simon",
-                    "email": "jeanfrancois.simon@sensiolabs.com"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony CssSelector Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-10-02T16:33:53+00:00"
+            "time": "2019-05-30T15:47:52+00:00"
         },
         {
             "name": "symfony/dependency-injection",
@@ -8040,16 +8505,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v3.4.17",
+            "version": "v3.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "c705bee03ade5b47c087807dd9ffaaec8dda2722"
+                "reference": "adb96e63af6fb0cc721cc69861001d60d0133d0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/c705bee03ade5b47c087807dd9ffaaec8dda2722",
-                "reference": "c705bee03ade5b47c087807dd9ffaaec8dda2722",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/adb96e63af6fb0cc721cc69861001d60d0133d0c",
+                "reference": "adb96e63af6fb0cc721cc69861001d60d0133d0c",
                 "shasum": ""
             },
             "require": {
@@ -8093,20 +8558,20 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2018-10-02T12:28:39+00:00"
+            "time": "2019-05-30T15:47:52+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v3.4.17",
+            "version": "v3.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "3a4498236ade473c52b92d509303e5fd1b211ab1"
+                "reference": "8cfbf75bb3a72963b12c513a73e9247891df24f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3a4498236ade473c52b92d509303e5fd1b211ab1",
-                "reference": "3a4498236ade473c52b92d509303e5fd1b211ab1",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8cfbf75bb3a72963b12c513a73e9247891df24f8",
+                "reference": "8cfbf75bb3a72963b12c513a73e9247891df24f8",
                 "shasum": ""
             },
             "require": {
@@ -8147,20 +8612,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2018-10-03T08:48:18+00:00"
+            "time": "2019-06-22T20:10:25+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v3.4.17",
+            "version": "v3.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "1cf7d8e704a9cc4164c92e430f2dfa3e6983661d"
+                "reference": "ed3b397f9c07c8ca388b2a1ef744403b4d4ecc44"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/1cf7d8e704a9cc4164c92e430f2dfa3e6983661d",
-                "reference": "1cf7d8e704a9cc4164c92e430f2dfa3e6983661d",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/ed3b397f9c07c8ca388b2a1ef744403b4d4ecc44",
+                "reference": "ed3b397f9c07c8ca388b2a1ef744403b4d4ecc44",
                 "shasum": ""
             },
             "require": {
@@ -8201,20 +8666,20 @@
                 "configuration",
                 "options"
             ],
-            "time": "2018-09-17T17:29:18+00:00"
+            "time": "2019-04-10T16:00:48+00:00"
         },
         {
             "name": "symfony/polyfill-php54",
-            "version": "v1.9.0",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php54.git",
-                "reference": "412977e090c6a8472dc39d50d1beb7d59495a965"
+                "reference": "2964b17ddc32dba7bcba009d5501c84d3fba1452"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/412977e090c6a8472dc39d50d1beb7d59495a965",
-                "reference": "412977e090c6a8472dc39d50d1beb7d59495a965",
+                "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/2964b17ddc32dba7bcba009d5501c84d3fba1452",
+                "reference": "2964b17ddc32dba7bcba009d5501c84d3fba1452",
                 "shasum": ""
             },
             "require": {
@@ -8223,7 +8688,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                 }
             },
             "autoload": {
@@ -8259,20 +8724,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-08-06T14:22:27+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
         },
         {
             "name": "symfony/polyfill-php55",
-            "version": "v1.9.0",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php55.git",
-                "reference": "578b8528da843de0fc65ec395900fa3181f2ead7"
+                "reference": "96fa25cef405ea452919559a0025d5dc16e30e4c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/578b8528da843de0fc65ec395900fa3181f2ead7",
-                "reference": "578b8528da843de0fc65ec395900fa3181f2ead7",
+                "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/96fa25cef405ea452919559a0025d5dc16e30e4c",
+                "reference": "96fa25cef405ea452919559a0025d5dc16e30e4c",
                 "shasum": ""
             },
             "require": {
@@ -8282,7 +8747,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                 }
             },
             "autoload": {
@@ -8315,20 +8780,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-08-06T14:22:27+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
         },
         {
             "name": "symfony/polyfill-php70",
-            "version": "v1.9.0",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934"
+                "reference": "bc4858fb611bda58719124ca079baff854149c89"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/1e24b0c4a56d55aaf368763a06c6d1c7d3194934",
-                "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/bc4858fb611bda58719124ca079baff854149c89",
+                "reference": "bc4858fb611bda58719124ca079baff854149c89",
                 "shasum": ""
             },
             "require": {
@@ -8338,7 +8803,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                 }
             },
             "autoload": {
@@ -8374,20 +8839,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-08-06T14:22:27+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.9.0",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae"
+                "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/95c50420b0baed23852452a7f0c7b527303ed5ae",
-                "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/ab50dcf166d5f577978419edd37aa2bb8eabce0c",
+                "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c",
                 "shasum": ""
             },
             "require": {
@@ -8396,7 +8861,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                 }
             },
             "autoload": {
@@ -8429,20 +8894,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-08-06T14:22:27+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v3.4.17",
+            "version": "v3.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "05e52a39de52ba690aebaed462b2bc8a9649f0a4"
+                "reference": "2a651c2645c10bbedd21170771f122d935e0dd58"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/05e52a39de52ba690aebaed462b2bc8a9649f0a4",
-                "reference": "05e52a39de52ba690aebaed462b2bc8a9649f0a4",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/2a651c2645c10bbedd21170771f122d935e0dd58",
+                "reference": "2a651c2645c10bbedd21170771f122d935e0dd58",
                 "shasum": ""
             },
             "require": {
@@ -8478,7 +8943,7 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "time": "2018-10-02T12:28:39+00:00"
+            "time": "2019-01-16T09:39:14+00:00"
         },
         {
             "name": "symfony/yaml",
@@ -8577,16 +9042,16 @@
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.1.0",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b"
+                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b",
-                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
                 "shasum": ""
             },
             "require": {
@@ -8613,24 +9078,25 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2017-04-07T12:08:54+00:00"
+            "time": "2019-06-13T22:48:21+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v2.5.1",
+            "version": "v2.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e"
+                "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
-                "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
+                "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
+                "php": ">=5.3.9",
+                "symfony/polyfill-ctype": "^1.9"
             },
             "require-dev": {
                 "phpunit/phpunit": "^4.8.35 || ^5.0"
@@ -8638,7 +9104,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev"
+                    "dev-master": "2.6-dev"
                 }
             },
             "autoload": {
@@ -8663,24 +9129,25 @@
                 "env",
                 "environment"
             ],
-            "time": "2018-07-29T20:33:41+00:00"
+            "time": "2019-01-29T11:11:52+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.3.0",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
+                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
-                "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
+                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0"
+                "php": "^5.3.3 || ^7.0",
+                "symfony/polyfill-ctype": "^1.8"
             },
             "require-dev": {
                 "phpunit/phpunit": "^4.6",
@@ -8713,25 +9180,32 @@
                 "check",
                 "validate"
             ],
-            "time": "2018-01-29T19:49:41+00:00"
+            "time": "2018-12-25T11:19:39+00:00"
+        }
+    ],
+    "aliases": [
+        {
+            "alias": "1.2.1",
+            "alias_normalized": "1.2.1.0",
+            "version": "1.2.9999999.9999999-dev",
+            "package": "magento/composer"
         }
     ],
-    "aliases": [],
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "stability-flags": {
+        "magento/composer": 20,
         "phpmd/phpmd": 0
     },
-    "prefer-stable": false,
+    "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "lib-libxml": "*",
         "ext-ctype": "*",
         "ext-gd": "*",
         "ext-spl": "*",
         "ext-dom": "*",
         "ext-simplexml": "*",
-        "ext-mcrypt": "*",
         "ext-bcmath": "*",
         "ext-hash": "*",
         "ext-curl": "*",
diff --git a/dev/tests/acceptance/.gitignore b/dev/tests/acceptance/.gitignore
index 7e27d5178fc48..9ca88b3597bad 100755
--- a/dev/tests/acceptance/.gitignore
+++ b/dev/tests/acceptance/.gitignore
@@ -6,5 +6,6 @@ tests/_output/*
 tests/functional.suite.yml
 tests/functional/Magento/FunctionalTest/_generated
 vendor/*
-mftf.logm
+mftf.log
+/.credentials.example
 /utils/
diff --git a/dev/tests/acceptance/RoboFile.php b/dev/tests/acceptance/RoboFile.php
deleted file mode 100644
index f36150ad254b5..0000000000000
--- a/dev/tests/acceptance/RoboFile.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use Symfony\Component\Yaml\Yaml;
-
-/** This is project's console commands configuration for Robo task runner.
- *
- * @codingStandardsIgnoreStart
- * @see http://robo.li/
- */
-class RoboFile extends \Robo\Tasks
-{
-    use Robo\Task\Base\loadShortcuts;
-
-    /**
-     * Duplicate the Example configuration files for the Project.
-     * Build the Codeception project.
-     *
-     * @return void
-     */
-    function buildProject()
-    {
-        passthru($this->getBaseCmd("build:project"));
-    }
-
-    /**
-     * Generate all Tests in PHP OR Generate set of tests via passing array of tests
-     *
-     * @param array $tests
-     * @param array $opts
-     * @return void
-     */
-    function generateTests(array $tests, $opts = [
-        'config' => null,
-        'force' => false,
-        'nodes' => null,
-        'lines' => null,
-        'tests' => null
-    ])
-    {
-        $baseCmd = $this->getBaseCmd("generate:tests");
-
-        $mftfArgNames = ['config', 'nodes', 'lines', 'tests'];
-        // append arguments to the end of the command
-        foreach ($opts as $argName => $argValue) {
-            if (in_array($argName, $mftfArgNames) && $argValue !== null) {
-                $baseCmd .= " --$argName $argValue";
-            }
-        }
-
-        // use a separate conditional for the force flag (casting bool to string in php is hard)
-        if ($opts['force']) {
-            $baseCmd .= ' --force';
-        }
-
-        $this->taskExec($baseCmd)->args($tests)->run();
-    }
-
-    /**
-     * Generate a suite based on name(s) passed in as args.
-     *
-     * @param array $args
-     * @throws Exception
-     * @return void
-     */
-    function generateSuite(array $args)
-    {
-        if (empty($args)) {
-            throw new Exception("Please provide suite name(s) after generate:suite command");
-        }
-        $baseCmd = $this->getBaseCmd("generate:suite");
-        $this->taskExec($baseCmd)->args($args)->run();
-    }
-
-    /**
-     * Run all Tests with the specified @group tag'.
-     *
-     * @param array $args
-     * @return void
-     */
-    function group(array $args)
-    {
-        $args = array_merge($args, ['-k']);
-        $baseCmd = $this->getBaseCmd("run:group");
-        $this->taskExec($baseCmd)->args($args)->run();
-    }
-
-    /**
-     * Generate the HTML for the Allure report based on the Test XML output - Allure v1.4.X
-     *
-     * @return \Robo\Result
-     */
-    function allure1Generate()
-    {
-        return $this->_exec('allure generate tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-results'. DIRECTORY_SEPARATOR .' -o tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .'');
-    }
-
-    /**
-     * Generate the HTML for the Allure report based on the Test XML output - Allure v2.3.X
-     *
-     * @return \Robo\Result
-     */
-    function allure2Generate()
-    {
-        return $this->_exec('allure generate tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-results'. DIRECTORY_SEPARATOR .' --output tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .' --clean');
-    }
-
-    /**
-     * Open the HTML Allure report - Allure v1.4.X
-     *
-     * @return void
-     */
-    function allure1Open()
-    {
-        $this->_exec('allure report open --report-dir tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .'');
-    }
-
-    /**
-     * Open the HTML Allure report - Allure v2.3.X
-     *
-     * @return void
-     */
-    function allure2Open()
-    {
-        $this->_exec('allure open --port 0 tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .'');
-    }
-
-    /**
-     * Generate and open the HTML Allure report - Allure v1.4.X
-     *
-     * @return void
-     */
-    function allure1Report()
-    {
-        $result1 = $this->allure1Generate();
-
-        if ($result1->wasSuccessful()) {
-            $this->allure1Open();
-        }
-    }
-
-    /**
-     * Generate and open the HTML Allure report - Allure v2.3.X
-     *
-     * @return void
-     */
-    function allure2Report()
-    {
-        $result1 = $this->allure2Generate();
-
-        if ($result1->wasSuccessful()) {
-            $this->allure2Open();
-        }
-    }
-
-    /**
-     * Private function for returning the formatted command for the passthru to mftf bin execution.
-     *
-     * @param string $command
-     * @return string
-     */
-    private function getBaseCmd($command)
-    {
-        $this->writeln("\033[01;31m Use of robo will be deprecated with next major release, please use <root>/vendor/bin/mftf $command \033[0m");
-        chdir(__DIR__);
-        return realpath('../../../vendor/bin/mftf') . " $command";
-    }
-}
diff --git a/dev/tests/acceptance/composer.json b/dev/tests/acceptance/composer.json
deleted file mode 100755
index a0c3ad37f47a3..0000000000000
--- a/dev/tests/acceptance/composer.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "description": "Magento 2 (Open Source) Functional Tests",
-    "type": "project",
-    "version": "1.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "php": "~7.0.13|~7.1.0",
-        "codeception/codeception": "~2.3.4",
-        "consolidation/robo": "^1.0.0",
-        "vlucas/phpdotenv": "^2.4",
-        "doctrine/instantiator": "<=1.0.5",
-        "myclabs/deep-copy": "<=1.7.0",
-        "symfony/filesystem": "<=3.4.12",
-        "symfony/finder": "<=3.4.12",
-        "symfony/process": "<=3.4.12",
-        "symfony/yaml": "<=3.4.12"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\": "tests/functional/Magento"
-        },
-        "files": ["tests/_bootstrap.php"]
-    },
-    "prefer-stable": true
-}
diff --git a/dev/tests/acceptance/composer.lock b/dev/tests/acceptance/composer.lock
deleted file mode 100644
index 1592e385dd5c0..0000000000000
--- a/dev/tests/acceptance/composer.lock
+++ /dev/null
@@ -1,3316 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "87a504ae6c961babfa9113e81f9345fc",
-    "packages": [
-        {
-            "name": "behat/gherkin",
-            "version": "v4.4.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Behat/Gherkin.git",
-                "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/5c14cff4f955b17d20d088dec1bde61c0539ec74",
-                "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.5|~5",
-                "symfony/phpunit-bridge": "~2.7|~3",
-                "symfony/yaml": "~2.3|~3"
-            },
-            "suggest": {
-                "symfony/yaml": "If you want to parse features, represented in YAML files"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Behat\\Gherkin": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Gherkin DSL parser for PHP 5.3",
-            "homepage": "http://behat.org/",
-            "keywords": [
-                "BDD",
-                "Behat",
-                "Cucumber",
-                "DSL",
-                "gherkin",
-                "parser"
-            ],
-            "time": "2016-10-30T11:50:56+00:00"
-        },
-        {
-            "name": "codeception/codeception",
-            "version": "2.3.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "104f46fa0bde339f1bcc3a375aac21eb36e65a1e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/104f46fa0bde339f1bcc3a375aac21eb36e65a1e",
-                "reference": "104f46fa0bde339f1bcc3a375aac21eb36e65a1e",
-                "shasum": ""
-            },
-            "require": {
-                "behat/gherkin": "~4.4.0",
-                "codeception/stub": "^1.0",
-                "ext-json": "*",
-                "ext-mbstring": "*",
-                "facebook/webdriver": ">=1.1.3 <2.0",
-                "guzzlehttp/guzzle": ">=4.1.4 <7.0",
-                "guzzlehttp/psr7": "~1.0",
-                "php": ">=5.4.0 <8.0",
-                "phpunit/php-code-coverage": ">=2.2.4 <6.0",
-                "phpunit/phpunit": ">=4.8.28 <5.0.0 || >=5.6.3 <7.0",
-                "sebastian/comparator": ">1.1 <3.0",
-                "sebastian/diff": ">=1.4 <3.0",
-                "symfony/browser-kit": ">=2.7 <5.0",
-                "symfony/console": ">=2.7 <5.0",
-                "symfony/css-selector": ">=2.7 <5.0",
-                "symfony/dom-crawler": ">=2.7 <5.0",
-                "symfony/event-dispatcher": ">=2.7 <5.0",
-                "symfony/finder": ">=2.7 <5.0",
-                "symfony/yaml": ">=2.7 <5.0"
-            },
-            "require-dev": {
-                "codeception/specify": "~0.3",
-                "facebook/graph-sdk": "~5.3",
-                "flow/jsonpath": "~0.2",
-                "monolog/monolog": "~1.8",
-                "pda/pheanstalk": "~3.0",
-                "php-amqplib/php-amqplib": "~2.4",
-                "predis/predis": "^1.0",
-                "squizlabs/php_codesniffer": "~2.0",
-                "symfony/process": ">=2.7 <5.0",
-                "vlucas/phpdotenv": "^2.4.0"
-            },
-            "suggest": {
-                "aws/aws-sdk-php": "For using AWS Auth in REST module and Queue module",
-                "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests",
-                "codeception/specify": "BDD-style code blocks",
-                "codeception/verify": "BDD-style assertions",
-                "flow/jsonpath": "For using JSONPath in REST module",
-                "league/factory-muffin": "For DataFactory module",
-                "league/factory-muffin-faker": "For Faker support in DataFactory module",
-                "phpseclib/phpseclib": "for SFTP option in FTP Module",
-                "stecman/symfony-console-completion": "For BASH autocompletion",
-                "symfony/phpunit-bridge": "For phpunit-bridge support"
-            },
-            "bin": [
-                "codecept"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": []
-            },
-            "autoload": {
-                "psr-4": {
-                    "Codeception\\": "src\\Codeception",
-                    "Codeception\\Extension\\": "ext"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Bodnarchuk",
-                    "email": "davert@mail.ua",
-                    "homepage": "http://codegyre.com"
-                }
-            ],
-            "description": "BDD-style testing framework",
-            "homepage": "http://codeception.com/",
-            "keywords": [
-                "BDD",
-                "TDD",
-                "acceptance testing",
-                "functional testing",
-                "unit testing"
-            ],
-            "time": "2018-02-26T23:29:41+00:00"
-        },
-        {
-            "name": "codeception/stub",
-            "version": "1.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Codeception/Stub.git",
-                "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Stub/zipball/681b62348837a5ef07d10d8a226f5bc358cc8805",
-                "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805",
-                "shasum": ""
-            },
-            "require": {
-                "phpunit/phpunit-mock-objects": ">2.3 <7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": ">=4.8 <8.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Codeception\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
-            "time": "2018-05-17T09:31:08+00:00"
-        },
-        {
-            "name": "consolidation/annotated-command",
-            "version": "2.8.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/consolidation/annotated-command.git",
-                "reference": "651541a0b68318a2a202bda558a676e5ad92223c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/651541a0b68318a2a202bda558a676e5ad92223c",
-                "reference": "651541a0b68318a2a202bda558a676e5ad92223c",
-                "shasum": ""
-            },
-            "require": {
-                "consolidation/output-formatters": "^3.1.12",
-                "php": ">=5.4.0",
-                "psr/log": "^1",
-                "symfony/console": "^2.8|^3|^4",
-                "symfony/event-dispatcher": "^2.5|^3|^4",
-                "symfony/finder": "^2.5|^3|^4"
-            },
-            "require-dev": {
-                "g1a/composer-test-scenarios": "^2",
-                "phpunit/phpunit": "^6",
-                "satooshi/php-coveralls": "^2",
-                "squizlabs/php_codesniffer": "^2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Consolidation\\AnnotatedCommand\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Anderson",
-                    "email": "greg.1.anderson@greenknowe.org"
-                }
-            ],
-            "description": "Initialize Symfony Console commands from annotated command class methods.",
-            "time": "2018-05-25T18:04:25+00:00"
-        },
-        {
-            "name": "consolidation/config",
-            "version": "1.0.11",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/consolidation/config.git",
-                "reference": "ede41d946078e97e7a9513aadc3352f1c26817af"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/config/zipball/ede41d946078e97e7a9513aadc3352f1c26817af",
-                "reference": "ede41d946078e97e7a9513aadc3352f1c26817af",
-                "shasum": ""
-            },
-            "require": {
-                "dflydev/dot-access-data": "^1.1.0",
-                "grasmash/expander": "^1",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "g1a/composer-test-scenarios": "^1",
-                "phpunit/phpunit": "^4",
-                "satooshi/php-coveralls": "^1.0",
-                "squizlabs/php_codesniffer": "2.*",
-                "symfony/console": "^2.5|^3|^4",
-                "symfony/yaml": "^2.8.11|^3|^4"
-            },
-            "suggest": {
-                "symfony/yaml": "Required to use Consolidation\\Config\\Loader\\YamlConfigLoader"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Consolidation\\Config\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Anderson",
-                    "email": "greg.1.anderson@greenknowe.org"
-                }
-            ],
-            "description": "Provide configuration services for a commandline tool.",
-            "time": "2018-05-27T01:17:02+00:00"
-        },
-        {
-            "name": "consolidation/log",
-            "version": "1.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/consolidation/log.git",
-                "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/log/zipball/dfd8189a771fe047bf3cd669111b2de5f1c79395",
-                "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.0",
-                "psr/log": "~1.0",
-                "symfony/console": "^2.8|^3|^4"
-            },
-            "require-dev": {
-                "g1a/composer-test-scenarios": "^1",
-                "phpunit/phpunit": "4.*",
-                "satooshi/php-coveralls": "^2",
-                "squizlabs/php_codesniffer": "2.*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Consolidation\\Log\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Anderson",
-                    "email": "greg.1.anderson@greenknowe.org"
-                }
-            ],
-            "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.",
-            "time": "2018-05-25T18:14:39+00:00"
-        },
-        {
-            "name": "consolidation/output-formatters",
-            "version": "3.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/consolidation/output-formatters.git",
-                "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/d78ef59aea19d3e2e5a23f90a055155ee78a0ad5",
-                "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0",
-                "symfony/console": "^2.8|^3|^4",
-                "symfony/finder": "^2.5|^3|^4"
-            },
-            "require-dev": {
-                "g1a/composer-test-scenarios": "^2",
-                "phpunit/phpunit": "^5.7.27",
-                "satooshi/php-coveralls": "^2",
-                "squizlabs/php_codesniffer": "^2.7",
-                "symfony/console": "3.2.3",
-                "symfony/var-dumper": "^2.8|^3|^4",
-                "victorjonsson/markdowndocs": "^1.3"
-            },
-            "suggest": {
-                "symfony/var-dumper": "For using the var_dump formatter"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Consolidation\\OutputFormatters\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Anderson",
-                    "email": "greg.1.anderson@greenknowe.org"
-                }
-            ],
-            "description": "Format text by applying transformations provided by plug-in formatters.",
-            "time": "2018-05-25T18:02:34+00:00"
-        },
-        {
-            "name": "consolidation/robo",
-            "version": "1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/consolidation/Robo.git",
-                "reference": "ac563abfadf7cb7314b4e152f2b5033a6c255f6f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/Robo/zipball/ac563abfadf7cb7314b4e152f2b5033a6c255f6f",
-                "reference": "ac563abfadf7cb7314b4e152f2b5033a6c255f6f",
-                "shasum": ""
-            },
-            "require": {
-                "consolidation/annotated-command": "^2.8.2",
-                "consolidation/config": "^1.0.10",
-                "consolidation/log": "~1",
-                "consolidation/output-formatters": "^3.1.13",
-                "grasmash/yaml-expander": "^1.3",
-                "league/container": "^2.2",
-                "php": ">=5.5.0",
-                "symfony/console": "^2.8|^3|^4",
-                "symfony/event-dispatcher": "^2.5|^3|^4",
-                "symfony/filesystem": "^2.5|^3|^4",
-                "symfony/finder": "^2.5|^3|^4",
-                "symfony/process": "^2.5|^3|^4"
-            },
-            "replace": {
-                "codegyre/robo": "< 1.0"
-            },
-            "require-dev": {
-                "codeception/aspect-mock": "^1|^2.1.1",
-                "codeception/base": "^2.3.7",
-                "codeception/verify": "^0.3.2",
-                "g1a/composer-test-scenarios": "^2",
-                "goaop/framework": "~2.1.2",
-                "goaop/parser-reflection": "^1.1.0",
-                "natxet/cssmin": "3.0.4",
-                "nikic/php-parser": "^3.1.5",
-                "patchwork/jsqueeze": "~2",
-                "pear/archive_tar": "^1.4.2",
-                "phpunit/php-code-coverage": "~2|~4",
-                "satooshi/php-coveralls": "^2",
-                "squizlabs/php_codesniffer": "^2.8"
-            },
-            "suggest": {
-                "henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch",
-                "natxet/CssMin": "For minifying CSS files in taskMinify",
-                "patchwork/jsqueeze": "For minifying JS files in taskMinify",
-                "pear/archive_tar": "Allows tar archives to be created and extracted in taskPack and taskExtract, respectively."
-            },
-            "bin": [
-                "robo"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev",
-                    "dev-state": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Robo\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Davert",
-                    "email": "davert.php@resend.cc"
-                }
-            ],
-            "description": "Modern task runner",
-            "time": "2018-05-27T01:42:53+00:00"
-        },
-        {
-            "name": "container-interop/container-interop",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/container-interop/container-interop.git",
-                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-                "shasum": ""
-            },
-            "require": {
-                "psr/container": "^1.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Interop\\Container\\": "src/Interop/Container/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
-            "homepage": "https://github.com/container-interop/container-interop",
-            "time": "2017-02-14T19:40:03+00:00"
-        },
-        {
-            "name": "dflydev/dot-access-data",
-            "version": "v1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/dflydev/dflydev-dot-access-data.git",
-                "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/3fbd874921ab2c041e899d044585a2ab9795df8a",
-                "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Dflydev\\DotAccessData": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Dragonfly Development Inc.",
-                    "email": "info@dflydev.com",
-                    "homepage": "http://dflydev.com"
-                },
-                {
-                    "name": "Beau Simensen",
-                    "email": "beau@dflydev.com",
-                    "homepage": "http://beausimensen.com"
-                },
-                {
-                    "name": "Carlos Frutos",
-                    "email": "carlos@kiwing.it",
-                    "homepage": "https://github.com/cfrutos"
-                }
-            ],
-            "description": "Given a deep data structure, access data by dot notation.",
-            "homepage": "https://github.com/dflydev/dflydev-dot-access-data",
-            "keywords": [
-                "access",
-                "data",
-                "dot",
-                "notation"
-            ],
-            "time": "2017-01-20T21:14:22+00:00"
-        },
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3,<8.0-DEV"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2015-06-14T21:17:01+00:00"
-        },
-        {
-            "name": "facebook/webdriver",
-            "version": "1.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/facebook/php-webdriver.git",
-                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/bd8c740097eb9f2fc3735250fc1912bc811a954e",
-                "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e",
-                "shasum": ""
-            },
-            "require": {
-                "ext-curl": "*",
-                "ext-json": "*",
-                "ext-mbstring": "*",
-                "ext-zip": "*",
-                "php": "^5.6 || ~7.0",
-                "symfony/process": "^2.8 || ^3.1 || ^4.0"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.0",
-                "jakub-onderka/php-parallel-lint": "^0.9.2",
-                "php-coveralls/php-coveralls": "^2.0",
-                "php-mock/php-mock-phpunit": "^1.1",
-                "phpunit/phpunit": "^5.7",
-                "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
-                "squizlabs/php_codesniffer": "^2.6",
-                "symfony/var-dumper": "^3.3 || ^4.0"
-            },
-            "suggest": {
-                "ext-SimpleXML": "For Firefox profile creation"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-community": "1.5-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Facebook\\WebDriver\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "description": "A PHP client for Selenium WebDriver",
-            "homepage": "https://github.com/facebook/php-webdriver",
-            "keywords": [
-                "facebook",
-                "php",
-                "selenium",
-                "webdriver"
-            ],
-            "time": "2018-05-16T17:37:13+00:00"
-        },
-        {
-            "name": "grasmash/expander",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/grasmash/expander.git",
-                "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/grasmash/expander/zipball/95d6037344a4be1dd5f8e0b0b2571a28c397578f",
-                "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f",
-                "shasum": ""
-            },
-            "require": {
-                "dflydev/dot-access-data": "^1.1.0",
-                "php": ">=5.4"
-            },
-            "require-dev": {
-                "greg-1-anderson/composer-test-scenarios": "^1",
-                "phpunit/phpunit": "^4|^5.5.4",
-                "satooshi/php-coveralls": "^1.0.2|dev-master",
-                "squizlabs/php_codesniffer": "^2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Grasmash\\Expander\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Matthew Grasmick"
-                }
-            ],
-            "description": "Expands internal property references in PHP arrays file.",
-            "time": "2017-12-21T22:14:55+00:00"
-        },
-        {
-            "name": "grasmash/yaml-expander",
-            "version": "1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/grasmash/yaml-expander.git",
-                "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/3f0f6001ae707a24f4d9733958d77d92bf9693b1",
-                "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1",
-                "shasum": ""
-            },
-            "require": {
-                "dflydev/dot-access-data": "^1.1.0",
-                "php": ">=5.4",
-                "symfony/yaml": "^2.8.11|^3|^4"
-            },
-            "require-dev": {
-                "greg-1-anderson/composer-test-scenarios": "^1",
-                "phpunit/phpunit": "^4.8|^5.5.4",
-                "satooshi/php-coveralls": "^1.0.2|dev-master",
-                "squizlabs/php_codesniffer": "^2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Grasmash\\YamlExpander\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Matthew Grasmick"
-                }
-            ],
-            "description": "Expands internal property references in a yaml file.",
-            "time": "2017-12-16T16:06:03+00:00"
-        },
-        {
-            "name": "guzzlehttp/guzzle",
-            "version": "6.3.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-                "shasum": ""
-            },
-            "require": {
-                "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.4",
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "ext-curl": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-                "psr/log": "^1.0"
-            },
-            "suggest": {
-                "psr/log": "Required for using the Log middleware"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "6.3-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
-                "psr-4": {
-                    "GuzzleHttp\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "Guzzle is a PHP HTTP client library",
-            "homepage": "http://guzzlephp.org/",
-            "keywords": [
-                "client",
-                "curl",
-                "framework",
-                "http",
-                "http client",
-                "rest",
-                "web service"
-            ],
-            "time": "2018-04-22T15:46:56+00:00"
-        },
-        {
-            "name": "guzzlehttp/promises",
-            "version": "v1.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/promises.git",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Promise\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "Guzzle promises library",
-            "keywords": [
-                "promise"
-            ],
-            "time": "2016-12-20T10:07:11+00:00"
-        },
-        {
-            "name": "guzzlehttp/psr7",
-            "version": "1.4.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
-                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0",
-                "psr/http-message": "~1.0"
-            },
-            "provide": {
-                "psr/http-message-implementation": "1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Psr7\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "Tobias Schultze",
-                    "homepage": "https://github.com/Tobion"
-                }
-            ],
-            "description": "PSR-7 message implementation that also provides common utility methods",
-            "keywords": [
-                "http",
-                "message",
-                "request",
-                "response",
-                "stream",
-                "uri",
-                "url"
-            ],
-            "time": "2017-03-20T17:10:46+00:00"
-        },
-        {
-            "name": "league/container",
-            "version": "2.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/container.git",
-                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/container/zipball/43f35abd03a12977a60ffd7095efd6a7808488c0",
-                "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0",
-                "shasum": ""
-            },
-            "require": {
-                "container-interop/container-interop": "^1.2",
-                "php": "^5.4.0 || ^7.0"
-            },
-            "provide": {
-                "container-interop/container-interop-implementation": "^1.2",
-                "psr/container-implementation": "^1.0"
-            },
-            "replace": {
-                "orno/di": "~2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.x-dev",
-                    "dev-1.x": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "League\\Container\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Phil Bennett",
-                    "email": "philipobenito@gmail.com",
-                    "homepage": "http://www.philipobenito.com",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A fast and intuitive dependency injection container.",
-            "homepage": "https://github.com/thephpleague/container",
-            "keywords": [
-                "container",
-                "dependency",
-                "di",
-                "injection",
-                "league",
-                "provider",
-                "service"
-            ],
-            "time": "2017-05-10T09:20:27+00:00"
-        },
-        {
-            "name": "myclabs/deep-copy",
-            "version": "1.7.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
-                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "doctrine/collections": "^1.0",
-                "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^4.1"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                },
-                "files": [
-                    "src/DeepCopy/deep_copy.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Create deep copies (clones) of your objects",
-            "keywords": [
-                "clone",
-                "copy",
-                "duplicate",
-                "object",
-                "object graph"
-            ],
-            "time": "2017-10-19T19:58:43+00:00"
-        },
-        {
-            "name": "phar-io/manifest",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phar-io/manifest.git",
-                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0",
-                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-phar": "*",
-                "phar-io/version": "^1.0.1",
-                "php": "^5.6 || ^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Heuer",
-                    "email": "sebastian@phpeople.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "time": "2017-03-05T18:14:27+00:00"
-        },
-        {
-            "name": "phar-io/version",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phar-io/version.git",
-                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
-                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Heuer",
-                    "email": "sebastian@phpeople.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Library for handling version information and constraints",
-            "time": "2017-03-05T17:38:23+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "time": "2017-09-11T18:02:19+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "4.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
-                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0.0",
-                "phpdocumentor/type-resolver": "^0.4.0",
-                "webmozart/assert": "^1.0"
-            },
-            "require-dev": {
-                "doctrine/instantiator": "~1.0.5",
-                "mockery/mockery": "^1.0",
-                "phpunit/phpunit": "^6.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-11-30T07:14:17+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "0.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5 || ^7.0",
-                "phpdocumentor/reflection-common": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^5.2||^4.8.24"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "time": "2017-07-14T14:27:02+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "1.7.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
-                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-                "sebastian/comparator": "^1.1|^2.0|^3.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^2.5|^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.7.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2018-04-18T13:57:24+00:00"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "5.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "c89677919c5dd6d3b3852f230a663118762218ac"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
-                "reference": "c89677919c5dd6d3b3852f230a663118762218ac",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-xmlwriter": "*",
-                "php": "^7.0",
-                "phpunit/php-file-iterator": "^1.4.2",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^2.0.1",
-                "sebastian/code-unit-reverse-lookup": "^1.0.1",
-                "sebastian/environment": "^3.0",
-                "sebastian/version": "^2.0.1",
-                "theseer/tokenizer": "^1.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "suggest": {
-                "ext-xdebug": "^2.5.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2018-04-06T15:36:58+00:00"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.4.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2017-11-27T13:52:08+00:00"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2015-06-21T13:50:34+00:00"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "1.0.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2017-02-26T11:10:40+00:00"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "2.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "791198a2c6254db10131eecfe8c06670700904db"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db",
-                "reference": "791198a2c6254db10131eecfe8c06670700904db",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.2.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2017-11-27T05:48:46+00:00"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "6.5.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "093ca5508174cd8ab8efe44fd1dde447adfdec8f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/093ca5508174cd8ab8efe44fd1dde447adfdec8f",
-                "reference": "093ca5508174cd8ab8efe44fd1dde447adfdec8f",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-libxml": "*",
-                "ext-mbstring": "*",
-                "ext-xml": "*",
-                "myclabs/deep-copy": "^1.6.1",
-                "phar-io/manifest": "^1.0.1",
-                "phar-io/version": "^1.0",
-                "php": "^7.0",
-                "phpspec/prophecy": "^1.7",
-                "phpunit/php-code-coverage": "^5.3",
-                "phpunit/php-file-iterator": "^1.4.3",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-timer": "^1.0.9",
-                "phpunit/phpunit-mock-objects": "^5.0.5",
-                "sebastian/comparator": "^2.1",
-                "sebastian/diff": "^2.0",
-                "sebastian/environment": "^3.1",
-                "sebastian/exporter": "^3.1",
-                "sebastian/global-state": "^2.0",
-                "sebastian/object-enumerator": "^3.0.3",
-                "sebastian/resource-operations": "^1.0",
-                "sebastian/version": "^2.0.1"
-            },
-            "conflict": {
-                "phpdocumentor/reflection-docblock": "3.0.2",
-                "phpunit/dbunit": "<3.0"
-            },
-            "require-dev": {
-                "ext-pdo": "*"
-            },
-            "suggest": {
-                "ext-xdebug": "*",
-                "phpunit/php-invoker": "^1.1"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "6.5.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2018-07-03T06:40:40+00:00"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "5.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "6f9a3c8bf34188a2b53ce2ae7a126089c53e0a9f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/6f9a3c8bf34188a2b53ce2ae7a126089c53e0a9f",
-                "reference": "6f9a3c8bf34188a2b53ce2ae7a126089c53e0a9f",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.5",
-                "php": "^7.0",
-                "phpunit/php-text-template": "^1.2.1",
-                "sebastian/exporter": "^3.1"
-            },
-            "conflict": {
-                "phpunit/phpunit": "<6.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.5"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2018-07-13T03:27:23+00:00"
-        },
-        {
-            "name": "psr/container",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Container\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common Container Interface (PHP FIG PSR-11)",
-            "homepage": "https://github.com/php-fig/container",
-            "keywords": [
-                "PSR-11",
-                "container",
-                "container-interface",
-                "container-interop",
-                "psr"
-            ],
-            "time": "2017-02-14T16:28:37+00:00"
-        },
-        {
-            "name": "psr/http-message",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Message\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for HTTP messages",
-            "homepage": "https://github.com/php-fig/http-message",
-            "keywords": [
-                "http",
-                "http-message",
-                "psr",
-                "psr-7",
-                "request",
-                "response"
-            ],
-            "time": "2016-08-06T14:39:51+00:00"
-        },
-        {
-            "name": "psr/log",
-            "version": "1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "time": "2016-10-10T12:19:37+00:00"
-        },
-        {
-            "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Looks up which function or method a line of code belongs to",
-            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2017-03-04T06:30:41+00:00"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "2.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
-                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0",
-                "sebastian/diff": "^2.0 || ^3.0",
-                "sebastian/exporter": "^3.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.1.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "https://github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2018-02-01T13:46:46+00:00"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
-                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2017-08-03T08:09:46+00:00"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "3.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
-                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2017-07-01T08:51:00+00:00"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "3.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937",
-                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0",
-                "sebastian/recursion-context": "^3.0"
-            },
-            "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2017-04-03T13:19:02+00:00"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2017-04-27T15:39:26+00:00"
-        },
-        {
-            "name": "sebastian/object-enumerator",
-            "version": "3.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
-                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
-            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2017-08-03T12:35:26+00:00"
-        },
-        {
-            "name": "sebastian/object-reflector",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "773f97c67f28de00d397be301821b06708fca0be"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
-                "reference": "773f97c67f28de00d397be301821b06708fca0be",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Allows reflection of object attributes, including inherited and non-public ones",
-            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "time": "2017-03-29T09:07:27+00:00"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
-                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2017-03-03T06:23:57+00:00"
-        },
-        {
-            "name": "sebastian/resource-operations",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2015-07-28T20:34:47+00:00"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2016-10-03T07:35:21+00:00"
-        },
-        {
-            "name": "symfony/browser-kit",
-            "version": "v3.4.14",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "f6668d1a6182d5a8dec65a1c863a4c1d963816c0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/f6668d1a6182d5a8dec65a1c863a4c1d963816c0",
-                "reference": "f6668d1a6182d5a8dec65a1c863a4c1d963816c0",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/dom-crawler": "~2.8|~3.0|~4.0"
-            },
-            "require-dev": {
-                "symfony/css-selector": "~2.8|~3.0|~4.0",
-                "symfony/process": "~2.8|~3.0|~4.0"
-            },
-            "suggest": {
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\BrowserKit\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony BrowserKit Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-07-26T09:06:28+00:00"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v3.4.14",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/6b217594552b9323bcdcfc14f8a0ce126e84cd73",
-                "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/debug": "~2.8|~3.0|~4.0",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<3.4",
-                "symfony/process": "<3.3"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~3.3|~4.0",
-                "symfony/dependency-injection": "~3.4|~4.0",
-                "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
-                "symfony/lock": "~3.4|~4.0",
-                "symfony/process": "~3.3|~4.0"
-            },
-            "suggest": {
-                "psr/log-implementation": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/lock": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Console Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-07-26T11:19:56+00:00"
-        },
-        {
-            "name": "symfony/css-selector",
-            "version": "v3.4.14",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/css-selector.git",
-                "reference": "edda5a6155000ff8c3a3f85ee5c421af93cca416"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/edda5a6155000ff8c3a3f85ee5c421af93cca416",
-                "reference": "edda5a6155000ff8c3a3f85ee5c421af93cca416",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\CssSelector\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jean-François Simon",
-                    "email": "jeanfrancois.simon@sensiolabs.com"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony CssSelector Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-07-26T09:06:28+00:00"
-        },
-        {
-            "name": "symfony/debug",
-            "version": "v3.4.14",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/debug.git",
-                "reference": "d5a058ff6ecad26b30c1ba452241306ea34c65cc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/d5a058ff6ecad26b30c1ba452241306ea34c65cc",
-                "reference": "d5a058ff6ecad26b30c1ba452241306ea34c65cc",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "psr/log": "~1.0"
-            },
-            "conflict": {
-                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
-            },
-            "require-dev": {
-                "symfony/http-kernel": "~2.8|~3.0|~4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Debug\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Debug Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-07-26T11:19:56+00:00"
-        },
-        {
-            "name": "symfony/dom-crawler",
-            "version": "v3.4.14",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "452bfc854b60134438e3824b159b0d24a5892331"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/452bfc854b60134438e3824b159b0d24a5892331",
-                "reference": "452bfc854b60134438e3824b159b0d24a5892331",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "require-dev": {
-                "symfony/css-selector": "~2.8|~3.0|~4.0"
-            },
-            "suggest": {
-                "symfony/css-selector": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\DomCrawler\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony DomCrawler Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-07-26T10:03:52+00:00"
-        },
-        {
-            "name": "symfony/event-dispatcher",
-            "version": "v3.4.14",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb",
-                "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<3.3"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0|~4.0",
-                "symfony/dependency-injection": "~3.3|~4.0",
-                "symfony/expression-language": "~2.8|~3.0|~4.0",
-                "symfony/stopwatch": "~2.8|~3.0|~4.0"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\EventDispatcher\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony EventDispatcher Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-07-26T09:06:28+00:00"
-        },
-        {
-            "name": "symfony/filesystem",
-            "version": "v3.4.12",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "8a721a5f2553c6c3482b1c5b22ed60fe94dd63ed"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/8a721a5f2553c6c3482b1c5b22ed60fe94dd63ed",
-                "reference": "8a721a5f2553c6c3482b1c5b22ed60fe94dd63ed",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/polyfill-ctype": "~1.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Filesystem\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Filesystem Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-06-21T11:10:19+00:00"
-        },
-        {
-            "name": "symfony/finder",
-            "version": "v3.4.12",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/finder.git",
-                "reference": "3a8c3de91d2b2c68cd2d665cf9d00f7ef9eaa394"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/3a8c3de91d2b2c68cd2d665cf9d00f7ef9eaa394",
-                "reference": "3a8c3de91d2b2c68cd2d665cf9d00f7ef9eaa394",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Finder\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Finder Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-06-19T20:52:10+00:00"
-        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.8.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
-                "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                },
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "time": "2018-04-30T19:57:29+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.8.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "3296adf6a6454a050679cde90f95350ad604b171"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171",
-                "reference": "3296adf6a6454a050679cde90f95350ad604b171",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2018-04-26T10:06:28+00:00"
-        },
-        {
-            "name": "symfony/process",
-            "version": "v3.4.12",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "acc5a37c706ace827962851b69705b24e71ca17c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/acc5a37c706ace827962851b69705b24e71ca17c",
-                "reference": "acc5a37c706ace827962851b69705b24e71ca17c",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Process\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Process Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-05-30T04:24:30+00:00"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v3.4.12",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "c5010cc1692ce1fa328b1fb666961eb3d4a85bb0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/c5010cc1692ce1fa328b1fb666961eb3d4a85bb0",
-                "reference": "c5010cc1692ce1fa328b1fb666961eb3d4a85bb0",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/polyfill-ctype": "~1.8"
-            },
-            "conflict": {
-                "symfony/console": "<3.4"
-            },
-            "require-dev": {
-                "symfony/console": "~3.4|~4.0"
-            },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2018-05-03T23:18:14+00:00"
-        },
-        {
-            "name": "theseer/tokenizer",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b",
-                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": "^7.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2017-04-07T12:08:54+00:00"
-        },
-        {
-            "name": "vlucas/phpdotenv",
-            "version": "v2.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
-                "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Dotenv\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Vance Lucas",
-                    "email": "vance@vancelucas.com",
-                    "homepage": "http://www.vancelucas.com"
-                }
-            ],
-            "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
-            "keywords": [
-                "dotenv",
-                "env",
-                "environment"
-            ],
-            "time": "2018-07-29T20:33:41+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
-                "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
-                "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6",
-                "sebastian/version": "^1.0.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "time": "2018-01-29T19:49:41+00:00"
-        }
-    ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": true,
-    "prefer-lowest": false,
-    "platform": {
-        "php": "~7.0.13|~7.1.0"
-    },
-    "platform-dev": []
-}
diff --git a/dev/tests/acceptance/tests/_data/catalog_products.csv b/dev/tests/acceptance/tests/_data/catalog_products.csv
new file mode 100644
index 0000000000000..e6651ffcfae21
--- /dev/null
+++ b/dev/tests/acceptance/tests/_data/catalog_products.csv
@@ -0,0 +1,4 @@
+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
+"Simple Product for Test",,Default,simple,,base,"Simple Product for Test",,,,1,"Taxable Goods","Catalog, Search",123.0000,,,,simple-product-for-test,,,,,,,,,,,,"12/26/18, 5:05 AM","12/26/18, 5:05 AM",,,"Block after Info Column",,,,,,,,,,,"Use config",,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
+"Virtual Product for Test",,Default,virtual,,base,"Virtual Product for Test",,,0.0000,1,"Taxable Goods","Catalog, Search",99.9900,,,,virtual-product-for-test,,,,,,,,,,,,"12/26/18, 5:05 AM","12/26/18, 5:05 AM",,,"Block after Info Column",,,,,,,,,,,"Use config",,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
+"Api Downloadable Product for Test",,Default,downloadable,,base,"Api Downloadable Product for Test","API Product Description5c23605cc09b71","API Product Short Description5c23605cc0a111",,1,"Taxable Goods","Catalog, Search",123.0000,,,,api-downloadable-product-for-test,,,,,,,,,,,,"12/26/18, 5:05 AM","12/26/18, 5:05 AM",,,"Block after Info Column",,,,,,,,,,,"Use config",,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
diff --git a/dev/tests/acceptance/tests/_data/import_updated.csv b/dev/tests/acceptance/tests/_data/import_updated.csv
new file mode 100644
index 0000000000000..620af02641ecc
--- /dev/null
+++ b/dev/tests/acceptance/tests/_data/import_updated.csv
@@ -0,0 +1,4 @@
+product_websites,store_view_code,attribute_set_code,product_type,categories,sku,price,name,url_key
+base,,Default,simple,Default Category/category-admin,productformagetwo76287,123,productformagetwo76287,productformagetwo76287
+,en,Default,simple,,productformagetwo76287,,productformagetwo76287-english,productformagetwo76287-english
+,nl,Default,simple,,productformagetwo76287,,productformagetwo76287-dutch,productformagetwo76287-dutch
diff --git a/dev/tests/acceptance/tests/_data/magento2.jpg b/dev/tests/acceptance/tests/_data/magento2.jpg
new file mode 100644
index 0000000000000..d0b76b45d46be
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/magento2.jpg differ
diff --git a/dev/tests/acceptance/tests/_data/table_rate_30895.csv b/dev/tests/acceptance/tests/_data/table_rate_30895.csv
new file mode 100644
index 0000000000000..6c4420c937815
--- /dev/null
+++ b/dev/tests/acceptance/tests/_data/table_rate_30895.csv
@@ -0,0 +1,3 @@
+Country,Region/State,Zip/Postal Code,Weight (and above),Shipping Price
+US,CA,*,0,5
+US,*,*,0,10
diff --git a/dev/tests/acceptance/tests/_suite/WYSIWYGDisabledSuite.xml b/dev/tests/acceptance/tests/_suite/WYSIWYGDisabledSuite.xml
new file mode 100644
index 0000000000000..65c2bb7004503
--- /dev/null
+++ b/dev/tests/acceptance/tests/_suite/WYSIWYGDisabledSuite.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Suite/etc/suiteSchema.xsd">
+    <suite name="WYSIWYGDisabledSuite">
+        <before>
+            <magentoCLI stepKey="disableWYSYWYG" command="config:set cms/wysiwyg/enabled disabled" />
+        </before>
+        <include>
+            <group name="WYSIWYGDisabled"/>
+        </include>
+        <exclude>
+            <group name="skip"/>
+        </exclude>
+        <after>
+            <magentoCLI stepKey="disableWYSYWYG" command="config:set cms/wysiwyg/enabled enabled" />
+        </after>
+    </suite>
+</suites>
\ No newline at end of file
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json b/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json
index b8c10d886fd76..9797885b942ba 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json
+++ b/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json
@@ -2,7 +2,7 @@
   "name": "magento/module-test-module-integration-from-config",
   "description": "test integration create from config",
   "require": {
-    "php": "~7.0.13|~7.1.0",
+    "php": "~7.0.13|~7.1.0|~7.2.0",
     "magento/framework": "0.42.0-beta8",
     "magento/module-integration": "0.42.0-beta8"
   },
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json b/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json
index f99883f4b4c26..622413b9c0ac7 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json
+++ b/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json
@@ -2,7 +2,7 @@
   "name": "magento/module-test-join-directives",
   "description": "test integration for join directives",
   "require": {
-    "php": "~7.0.13|~7.1.0",
+    "php": "~7.0.13|~7.1.0|~7.2.0",
     "magento/framework": "0.42.0-beta8",
     "magento/module-sales": "0.42.0-beta8"
   },
diff --git a/dev/tests/api-functional/phpunit.xml.dist b/dev/tests/api-functional/phpunit.xml.dist
index 88919a5596d5d..2e05c1418c960 100644
--- a/dev/tests/api-functional/phpunit.xml.dist
+++ b/dev/tests/api-functional/phpunit.xml.dist
@@ -64,5 +64,61 @@
     <!-- Test listeners -->
     <listeners>
         <listener class="Magento\TestFramework\Event\PhpUnit"/>
+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
+            <arguments>
+                <string>var/allure-results</string> <!-- XML files output folder -->
+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
+                <array> <!-- A list of custom annotations to ignore (optional) -->
+                    <element key="codingStandardsIgnoreFile">
+                        <string>codingStandardsIgnoreFile</string>
+                    </element>
+                    <element key="codingStandardsIgnoreStart">
+                        <string>codingStandardsIgnoreStart</string>
+                    </element>
+                    <element key="codingStandardsIgnoreEnd">
+                        <string>codingStandardsIgnoreEnd</string>
+                    </element>
+                    <element key="expectedExceptionMessageRegExp">
+                        <string>expectedExceptionMessageRegExp</string>
+                    </element>
+                    <element key="magentoAdminConfigFixture">
+                        <string>magentoAdminConfigFixture</string>
+                    </element>
+                    <element key="magentoAppArea">
+                        <string>magentoAppArea</string>
+                    </element>
+                    <element key="magentoAppIsolation">
+                        <string>magentoAppIsolation</string>
+                    </element>
+                    <element key="magentoCache">
+                        <string>magentoCache</string>
+                    </element>
+                    <element key="magentoComponentsDir">
+                        <string>magentoComponentsDir</string>
+                    </element>
+                    <element key="magentoConfigFixture">
+                        <string>magentoConfigFixture</string>
+                    </element>
+                    <element key="magentoDataFixture">
+                        <string>magentoDataFixture</string>
+                    </element>
+                    <element key="magentoDataFixtureBeforeTransaction">
+                        <string>magentoDataFixtureBeforeTransaction</string>
+                    </element>
+                    <element key="magentoDbIsolation">
+                        <string>magentoDbIsolation</string>
+                    </element>
+                    <element key="magentoIndexerDimensionMode">
+                        <string>magentoIndexerDimensionMode</string>
+                    </element>
+                    <element key="magentoApiDataFixture">
+                        <string>magentoApiDataFixture</string>
+                    </element>
+                    <element key="Override">
+                        <string>Override</string>
+                    </element>
+                </array>
+            </arguments>
+        </listener>
     </listeners>
 </phpunit>
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php
index 1927d967a181c..e99a892b184ec 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php
@@ -5,32 +5,41 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Catalog\Api;
 
+use Magento\Catalog\Model\ProductFactory;
 use Magento\Catalog\Model\ProductRepository;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
 class ProductCustomOptionRepositoryTest extends WebapiAbstract
 {
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     protected $objectManager;
 
     const SERVICE_NAME = 'catalogProductCustomOptionRepositoryV1';
 
     /**
-     * @var \Magento\Catalog\Model\ProductFactory
+     * @var ProductFactory
      */
     protected $productFactory;
 
+    /**
+     * @var ProductRepository
+     */
+    private $productRepository;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->productFactory = $this->objectManager->get(\Magento\Catalog\Model\ProductFactory::class);
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->productFactory = $this->objectManager->get(ProductFactory::class);
+        $this->productRepository = $this->objectManager->create(ProductRepository::class);
     }
 
     /**
@@ -40,12 +49,8 @@ protected function setUp()
     public function testRemove()
     {
         $sku = 'simple';
-        /** @var ProductRepository $productRepository */
-        $productRepository = $this->objectManager->create(
-            \Magento\Catalog\Model\ProductRepository::class
-        );
-        /** @var  \Magento\Catalog\Model\Product $product */
-        $product = $productRepository->get($sku, false, null, true);
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $this->productRepository->get($sku, false, null, true);
         $customOptions = $product->getOptions();
         $optionId = array_pop($customOptions)->getId();
         $serviceInfo = [
@@ -60,8 +65,8 @@ public function testRemove()
             ],
         ];
         $this->assertTrue($this->_webApiCall($serviceInfo, ['sku' => $sku, 'optionId' => $optionId]));
-        /** @var  \Magento\Catalog\Model\Product $product */
-        $product = $productRepository->get($sku, false, null, true);
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $this->productRepository->get($sku, false, null, true);
         $this->assertNull($product->getOptionById($optionId));
         $this->assertEquals(9, count($product->getOptions()));
     }
@@ -164,6 +169,7 @@ public function testSave($optionData)
         ];
 
         $result = $this->_webApiCall($serviceInfo, ['option' => $optionDataPost]);
+        $product = $this->productRepository->get($productSku);
         unset($result['product_sku']);
         unset($result['option_id']);
         if (!empty($result['values'])) {
@@ -172,6 +178,10 @@ public function testSave($optionData)
             }
         }
         $this->assertEquals($optionData, $result);
+        $this->assertEquals(1, $product->getHasOptions());
+        if ($optionDataPost['is_require']) {
+            $this->assertEquals(1, $product->getRequiredOptions());
+        }
     }
 
     public function optionDataProvider()
@@ -182,7 +192,7 @@ public function optionDataProvider()
             $fixtureOptions[$item['type']] = [
                 'optionData' => $item,
             ];
-        };
+        }
 
         return $fixtureOptions;
     }
@@ -191,8 +201,9 @@ public function optionDataProvider()
      * @magentoApiDataFixture Magento/Catalog/_files/product_without_options.php
      * @magentoAppIsolation enabled
      * @dataProvider optionNegativeDataProvider
+     * @param array $optionData
      */
-    public function testAddNegative($optionData)
+    public function testAddNegative(array $optionData)
     {
         $productSku = 'simple';
         $optionDataPost = $optionData;
@@ -244,12 +255,7 @@ public function optionNegativeDataProvider()
     public function testUpdate()
     {
         $productSku = 'simple';
-        /** @var ProductRepository $productRepository */
-        $productRepository = $this->objectManager->create(
-            \Magento\Catalog\Model\ProductRepository::class
-        );
-
-        $options = $productRepository->get($productSku, true)->getOptions();
+        $options = $this->productRepository->get($productSku, true)->getOptions();
         $option = array_shift($options);
         $optionId = $option->getOptionId();
         $optionDataPost = [
@@ -292,14 +298,13 @@ public function testUpdate()
     }
 
     /**
-     * @param string $optionType
-     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_with_options.php
      * @magentoAppIsolation enabled
      * @dataProvider validOptionDataProvider
+     * @param string $optionType
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
-    public function testUpdateOptionAddingNewValue($optionType)
+    public function testUpdateOptionAddingNewValue(string $optionType)
     {
         $fixtureOption = null;
         $valueData = [
@@ -310,14 +315,10 @@ public function testUpdateOptionAddingNewValue($optionType)
             'sort_order' => 100,
         ];
 
-        /** @var ProductRepository $productRepository */
-        $productRepository = $this->objectManager->create(
-            \Magento\Catalog\Model\ProductRepository::class
-        );
-        /** @var  \Magento\Catalog\Model\Product $product */
-        $product = $productRepository->get('simple', false, null, true);
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $this->productRepository->get('simple', false, null, true);
 
-        /**@var $option \Magento\Catalog\Model\Product\Option */
+        /** @var \Magento\Catalog\Model\Product\Option $option */
         foreach ($product->getOptions() as $option) {
             if ($option->getType() == $optionType) {
                 $fixtureOption = $option;
@@ -361,7 +362,7 @@ public function testUpdateOptionAddingNewValue($optionType)
             $data['option_id'] = $fixtureOption->getId();
             $valueObject = $this->_webApiCall(
                 $serviceInfo,
-                [ 'option_id' => $fixtureOption->getId(), 'option' => $data]
+                ['option_id' => $fixtureOption->getId(), 'option' => $data]
             );
         } else {
             $valueObject = $this->_webApiCall($serviceInfo, ['option' => $data]);
@@ -397,9 +398,7 @@ public function testUpdateNegative($optionData, $message, $exceptionCode)
     {
         $this->_markTestAsRestOnly();
         $productSku = 'simple';
-        /** @var ProductRepository $productRepository */
-        $productRepository = $this->objectManager->create(ProductRepository::class);
-        $options = $productRepository->get($productSku, true)->getOptions();
+        $options = $this->productRepository->get($productSku, true)->getOptions();
         $option = array_shift($options);
         $optionId = $option->getOptionId();
 
diff --git a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/LinkManagementTest.php b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/LinkManagementTest.php
index df4138db30ce0..9053a88e84acd 100644
--- a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/LinkManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/LinkManagementTest.php
@@ -6,11 +6,16 @@
  */
 namespace Magento\ConfigurableProduct\Api;
 
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Eav\Model\AttributeRepository;
+use Magento\Eav\Model\Entity\Attribute\Option;
+use Magento\Framework\Webapi\Rest\Request;
+use Magento\TestFramework\TestCase\WebapiAbstract;
 
-class LinkManagementTest extends \Magento\TestFramework\TestCase\WebapiAbstract
+class LinkManagementTest extends WebapiAbstract
 {
     const SERVICE_NAME = 'configurableProductLinkManagementV1';
+    const OPTION_SERVICE_NAME = 'configurableProductOptionRepositoryV1';
     const SERVICE_VERSION = 'V1';
     const RESOURCE_PATH = '/V1/configurable-products';
 
@@ -88,9 +93,27 @@ public function testAddChildFullRestCreation()
 
         $this->createConfigurableProduct($productSku);
         $attribute = $this->attributeRepository->get('catalog_product', 'test_configurable');
-        $attributeValue = $attribute->getOptions()[1]->getValue();
-        $this->addOptionToConfigurableProduct($productSku, $attribute->getAttributeId(), $attributeValue);
-        $this->createSimpleProduct($childSku, $attributeValue);
+
+        $this->addOptionToConfigurableProduct(
+            $productSku,
+            $attribute->getAttributeId(),
+            [
+                [
+                    'value_index' => $attribute->getOptions()[1]->getValue()
+                ]
+            ]
+        );
+
+        $this->createSimpleProduct(
+            $childSku,
+            [
+                [
+                    'attribute_code' => 'test_configurable',
+                    'value' => $attribute->getOptions()[1]->getValue()
+                ]
+            ]
+        );
+
         $res = $this->addChild($productSku, $childSku);
         $this->assertTrue($res);
 
@@ -106,10 +129,129 @@ public function testAddChildFullRestCreation()
         $this->assertTrue($added);
 
         // clean up products
+
+        $this->deleteProduct($productSku);
+        $this->deleteProduct($childSku);
+    }
+
+    /**
+     * Test if configurable option attribute positions are being preserved after simple products were assigned to a
+     * configurable product.
+     *
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_attributes_for_position_test.php
+     */
+    public function testConfigurableOptionPositionPreservation()
+    {
+        $productSku = 'configurable-product-sku';
+        $childProductSkus = [
+            'simple-product-sku-1',
+            'simple-product-sku-2'
+        ];
+        $attributesToAdd = [
+            'custom_attr_1',
+            'custom_attr_2',
+        ];
+
+        $this->createConfigurableProduct($productSku);
+
+        $position = 0;
+        $attributeOptions = [];
+        foreach ($attributesToAdd as $attributeToAdd) {
+            /** @var Attribute $attribute */
+            $attribute = $this->attributeRepository->get('catalog_product', $attributeToAdd);
+
+            /** @var Option $options[] */
+            $options = $attribute->getOptions();
+            array_shift($options);
+
+            $attributeOptions[$attributeToAdd] = $options;
+
+            $valueIndexesData = [];
+            foreach ($options as $option) {
+                $valueIndexesData []['value_index']= $option->getValue();
+            }
+            $this->addOptionToConfigurableProduct(
+                $productSku,
+                $attribute->getAttributeId(),
+                $valueIndexesData,
+                $position
+            );
+            $position++;
+        }
+
+        $this->assertArrayHasKey($attributesToAdd[0], $attributeOptions);
+        $this->assertArrayHasKey($attributesToAdd[1], $attributeOptions);
+        $this->assertCount(4, $attributeOptions[$attributesToAdd[0]]);
+        $this->assertCount(4, $attributeOptions[$attributesToAdd[1]]);
+
+        $attributesBeforeAssign = $this->getConfigurableAttribute($productSku);
+
+        $simpleProdsAttributeData = [];
+        foreach ($attributeOptions as $attributeCode => $options) {
+            $simpleProdsAttributeData [0][] = [
+                'attribute_code' => $attributeCode,
+                'value' => $options[0]->getValue(),
+            ];
+            $simpleProdsAttributeData [0][] = [
+                'attribute_code' => $attributeCode,
+                'value' => $options[1]->getValue(),
+            ];
+            $simpleProdsAttributeData [1][] = [
+                'attribute_code' => $attributeCode,
+                'value' => $options[2]->getValue(),
+            ];
+            $simpleProdsAttributeData [1][] = [
+                'attribute_code' => $attributeCode,
+                'value' => $options[3]->getValue(),
+            ];
+        }
+
+        foreach ($childProductSkus as $childNum => $childSku) {
+            $this->createSimpleProduct($childSku, $simpleProdsAttributeData[$childNum]);
+            $res = $this->addChild($productSku, $childSku);
+            $this->assertTrue($res);
+        }
+
+        $childProductsDiff = array_diff(
+            $childProductSkus,
+            array_column(
+                $this->getChildren($productSku),
+                'sku'
+            )
+        );
+        $this->assertCount(0, $childProductsDiff, 'Added child product count mismatch expected result');
+
+        $attributesAfterAssign = $this->getConfigurableAttribute($productSku);
+
+        $this->assertEquals(
+            $attributesBeforeAssign[0]['position'],
+            $attributesAfterAssign[0]['position'],
+            'Product 1 attribute option position mismatch'
+        );
+        $this->assertEquals(
+            $attributesBeforeAssign[1]['position'],
+            $attributesAfterAssign[1]['position'],
+            'Product 2 attribute option position mismatch'
+        );
+
+        foreach ($childProductSkus as $childSku) {
+            $this->deleteProduct($childSku);
+        }
+        $this->deleteProduct($productSku);
+    }
+
+    /**
+     * Delete product by SKU
+     *
+     * @param string $sku
+     * @return bool
+     */
+    private function deleteProduct(string $sku): bool
+    {
         $serviceInfo = [
             'rest' => [
-                'resourcePath' => '/V1/products/' . $productSku,
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_DELETE
+                'resourcePath' => '/V1/products/' . $sku,
+                'httpMethod' => Request::HTTP_METHOD_DELETE
             ],
             'soap' => [
                 'service' => 'catalogProductRepositoryV1',
@@ -117,19 +259,29 @@ public function testAddChildFullRestCreation()
                 'operation' => 'catalogProductRepositoryV1DeleteById',
             ],
         ];
-        $this->_webApiCall($serviceInfo, ['sku' => $productSku]);
+        return $this->_webApiCall($serviceInfo, ['sku' => $sku]);
+    }
+
+    /**
+     * Get configurable product attributes
+     *
+     * @param string $productSku
+     * @return array
+     */
+    protected function getConfigurableAttribute(string $productSku): array
+    {
         $serviceInfo = [
             'rest' => [
-                'resourcePath' => '/V1/products/' . $childSku,
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_DELETE
+                'resourcePath' => self::RESOURCE_PATH . '/' . $productSku . '/options/all',
+                'httpMethod' => Request::HTTP_METHOD_GET
             ],
             'soap' => [
-                'service' => 'catalogProductRepositoryV1',
+                'service' => self::OPTION_SERVICE_NAME,
                 'serviceVersion' => self::SERVICE_VERSION,
-                'operation' => 'catalogProductRepositoryV1DeleteById',
-            ],
+                'operation' => self::OPTION_SERVICE_NAME . 'GetList'
+            ]
         ];
-        $this->_webApiCall($serviceInfo, ['sku' => $childSku]);
+        return $this->_webApiCall($serviceInfo, ['sku' => $productSku]);
     }
 
     private function addChild($productSku, $childSku)
@@ -137,7 +289,7 @@ private function addChild($productSku, $childSku)
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . '/' . $productSku . '/child',
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST
+                'httpMethod' => Request::HTTP_METHOD_POST
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,
@@ -162,7 +314,7 @@ protected function createConfigurableProduct($productSku)
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => '/V1/products',
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST
+                'httpMethod' => Request::HTTP_METHOD_POST
             ],
             'soap' => [
                 'service' => 'catalogProductRepositoryV1',
@@ -173,24 +325,22 @@ protected function createConfigurableProduct($productSku)
         return $this->_webApiCall($serviceInfo, $requestData);
     }
 
-    protected function addOptionToConfigurableProduct($productSku, $attributeId, $attributeValue)
+    protected function addOptionToConfigurableProduct($productSku, $attributeId, $attributeValues, $position = 0)
     {
         $requestData = [
             'sku' => $productSku,
             'option' => [
                 'attribute_id' => $attributeId,
                 'label' => 'test_configurable',
-                'position' => 0,
+                'position' => $position,
                 'is_use_default' => true,
-                'values' => [
-                    ['value_index' => $attributeValue],
-                ]
+                'values' => $attributeValues
             ]
         ];
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => '/V1/configurable-products/'. $productSku .'/options',
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
+                'httpMethod' => Request::HTTP_METHOD_POST,
             ],
             'soap' => [
                 'service' => 'configurableProductOptionRepositoryV1',
@@ -201,7 +351,7 @@ protected function addOptionToConfigurableProduct($productSku, $attributeId, $at
         return $this->_webApiCall($serviceInfo, $requestData);
     }
 
-    protected function createSimpleProduct($sku, $attributeValue)
+    protected function createSimpleProduct($sku, $customAttributes)
     {
         $requestData = [
             'product' => [
@@ -212,15 +362,13 @@ protected function createSimpleProduct($sku, $attributeValue)
                 'price' => 3.62,
                 'status' => 1,
                 'visibility' => 4,
-                'custom_attributes' => [
-                    ['attribute_code' => 'test_configurable', 'value' => $attributeValue],
-                ]
+                'custom_attributes' => $customAttributes
             ]
         ];
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => '/V1/products',
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
+                'httpMethod' => Request::HTTP_METHOD_POST,
             ],
             'soap' => [
                 'service' => 'catalogProductRepositoryV1',
@@ -247,7 +395,7 @@ protected function removeChild($productSku, $childSku)
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => sprintf($resourcePath, $productSku, $childSku),
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_DELETE
+                'httpMethod' => Request::HTTP_METHOD_DELETE
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,
@@ -268,7 +416,7 @@ protected function getChildren($productSku)
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . '/' . $productSku  . '/children',
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET
+                'httpMethod' => Request::HTTP_METHOD_GET
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,
diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php
index f2632aa1481e4..6a68925f76cbc 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerMetadataTest.php
@@ -9,6 +9,7 @@
 use Magento\Customer\Api\Data\CustomerInterface as Customer;
 use Magento\Customer\Model\Data\AttributeMetadata;
 use Magento\TestFramework\TestCase\WebapiAbstract;
+use Magento\TestFramework\Helper\Bootstrap;
 
 /**
  * Class CustomerMetadataTest
@@ -19,6 +20,19 @@ class CustomerMetadataTest extends WebapiAbstract
     const SERVICE_VERSION = "V1";
     const RESOURCE_PATH = "/V1/attributeMetadata/customer";
 
+    /**
+     * @var CustomerMetadataInterface
+     */
+    private $customerMetadata;
+
+    /**
+     * @inheritdoc
+     */
+    public function setUp()
+    {
+        $this->customerMetadata = Bootstrap::getObjectManager()->create(CustomerMetadataInterface::class);
+    }
+
     /**
      * Test retrieval of attribute metadata for the customer entity type.
      *
@@ -200,8 +214,7 @@ public function testGetCustomAttributesMetadata()
 
         $attributeMetadata = $this->_webApiCall($serviceInfo);
 
-        // There are no default custom attributes.
-        $this->assertCount(0, $attributeMetadata);
+        $this->assertCount(count($this->customerMetadata->getCustomAttributesMetadata()), $attributeMetadata);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php
index 9682c4b2ee603..39a64c94067aa 100644
--- a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php
@@ -472,6 +472,10 @@ public function testUpdateDownloadableProductSamplesWithNewFile()
             'title' => 'sample2_updated',
             'sort_order' => 2,
             'sample_type' => 'file',
+            'sample_file_content' => [
+                'name' => 'sample2.jpg',
+                'file_data' => base64_encode(file_get_contents($this->testImagePath)),
+            ],
         ];
 
         $response[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]["downloadable_product_samples"] =
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditMemoCreateRefundTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditMemoCreateRefundTest.php
index eae0e600434a6..2b9c539f64e66 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditMemoCreateRefundTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditMemoCreateRefundTest.php
@@ -10,7 +10,7 @@
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
 /**
- * Class CreditMemoCreateRefundTest
+ * API tests for CreditMemoCreateRefund.
  */
 class CreditMemoCreateRefundTest extends WebapiAbstract
 {
@@ -25,12 +25,17 @@ class CreditMemoCreateRefundTest extends WebapiAbstract
      */
     protected $objectManager;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
     }
 
     /**
+     * Test for Invoke method.
+     *
      * @magentoApiDataFixture Magento/Sales/_files/invoice.php
      */
     public function testInvoke()
@@ -115,8 +120,7 @@ public function testInvoke()
         );
         $this->assertNotEmpty($result);
         $order = $this->objectManager->get(OrderRepositoryInterface::class)->get($order->getId());
-        //Totally refunded orders still can be processed and shipped.
-        $this->assertEquals(Order::STATE_PROCESSING, $order->getState());
+        $this->assertEquals(Order::STATE_CLOSED, $order->getState());
     }
 
     private function getItemsForRest($order)
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php
index 6715c73510290..0eb9e4229b957 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php
@@ -197,4 +197,42 @@ private function getBundleProduct(array $items): array
 
         return [];
     }
+
+    /**
+     * @return void
+     * @magentoApiDataFixture Magento/Sales/_files/order_with_tax.php
+     */
+    public function testOrderGetExtensionAttributes()
+    {
+        $expectedTax = [
+            'code' => 'US-NY-*-Rate 1',
+            'type' => 'shipping',
+        ];
+
+        /** @var \Magento\Sales\Model\Order $order */
+        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
+        $order->loadByIncrementId(self::ORDER_INCREMENT_ID);
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '/' . $order->getId(),
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_READ_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_READ_NAME . 'get',
+            ],
+        ];
+        $result = $this->_webApiCall($serviceInfo, ['id' => $order->getId()]);
+
+        $appliedTaxes = $result['extension_attributes']['applied_taxes'];
+        $this->assertEquals($expectedTax['code'], $appliedTaxes[0]['code']);
+        $appliedTaxes = $result['extension_attributes']['item_applied_taxes'];
+        $this->assertEquals($expectedTax['type'], $appliedTaxes[0]['type']);
+        $this->assertNotEmpty($appliedTaxes[0]['applied_taxes']);
+        $this->assertEquals(true, $result['extension_attributes']['converting_from_quote']);
+        $this->assertArrayHasKey('payment_additional_info', $result['extension_attributes']);
+        $this->assertNotEmpty($result['extension_attributes']['payment_additional_info']);
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php
index 3ab93f9aecb99..a527c69c7e92d 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php
@@ -77,4 +77,37 @@ protected function assertOrderItem(\Magento\Sales\Model\Order\Item $orderItem, a
         $this->assertEquals($orderItem->getBasePrice(), $response['base_price']);
         $this->assertEquals($orderItem->getRowTotal(), $response['row_total']);
     }
+
+    /**
+     * @return void
+     * @magentoApiDataFixture Magento/Sales/_files/order_with_discount.php
+     */
+    public function testGetOrderWithDiscount()
+    {
+        /** @var \Magento\Sales\Model\Order $order */
+        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
+        $order->loadByIncrementId(self::ORDER_INCREMENT_ID);
+        /** @var \Magento\Sales\Model\Order\Item $orderItem */
+        $orderItem = current($order->getItems());
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '/' . $orderItem->getId(),
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'get',
+            ],
+        ];
+
+        $response = $this->_webApiCall($serviceInfo, ['id' => $orderItem->getId()]);
+
+        $this->assertTrue(is_array($response));
+        $this->assertEquals(8.00, $response['row_total']);
+        $this->assertEquals(8.00, $response['base_row_total']);
+        $this->assertEquals(9.00, $response['row_total_incl_tax']);
+        $this->assertEquals(9.00, $response['base_row_total_incl_tax']);
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php
index 0500f31858291..5e092bb1ebd69 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php
@@ -30,9 +30,78 @@ protected function setUp()
     }
 
     /**
+     * @return void
      * @magentoApiDataFixture Magento/Sales/_files/order_list.php
      */
     public function testOrderList()
+    {
+        $searchData = $this->getSearchData();
+
+        $requestData = ['searchCriteria' => $searchData];
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($requestData),
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_READ_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_READ_NAME . 'getList',
+            ],
+        ];
+
+        $result = $this->_webApiCall($serviceInfo, $requestData);
+        $this->assertArrayHasKey('items', $result);
+        $this->assertCount(2, $result['items']);
+        $this->assertArrayHasKey('search_criteria', $result);
+        $this->assertEquals($searchData, $result['search_criteria']);
+        $this->assertEquals('100000002', $result['items'][0]['increment_id']);
+        $this->assertEquals('100000001', $result['items'][1]['increment_id']);
+    }
+
+    /**
+     * @return void
+     * @magentoApiDataFixture Magento/Sales/_files/order_list_with_tax.php
+     */
+    public function testOrderListExtensionAttributes()
+    {
+        $searchData = $this->getSearchData();
+
+        $requestData = ['searchCriteria' => $searchData];
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($requestData),
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_READ_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_READ_NAME . 'getList',
+            ],
+        ];
+
+        $result = $this->_webApiCall($serviceInfo, $requestData);
+
+        $expectedTax = [
+            'code' => 'US-NY-*-Rate 1',
+            'type' => 'shipping',
+        ];
+        $appliedTaxes = $result['items'][0]['extension_attributes']['applied_taxes'];
+        $this->assertEquals($expectedTax['code'], $appliedTaxes[0]['code']);
+        $appliedTaxes = $result['items'][0]['extension_attributes']['item_applied_taxes'];
+        $this->assertEquals($expectedTax['type'], $appliedTaxes[0]['type']);
+        $this->assertNotEmpty($appliedTaxes[0]['applied_taxes']);
+        $this->assertEquals(true, $result['items'][0]['extension_attributes']['converting_from_quote']);
+        $this->assertArrayHasKey('payment_additional_info', $result['items'][0]['extension_attributes']);
+        $this->assertNotEmpty($result['items'][0]['extension_attributes']['payment_additional_info']);
+    }
+
+    /**
+     * Get search data for request.
+     *
+     * @return array
+     */
+    private function getSearchData() : array
     {
         /** @var \Magento\Framework\Api\SortOrderBuilder $sortOrderBuilder */
         $sortOrderBuilder = $this->objectManager->get(
@@ -70,25 +139,6 @@ public function testOrderList()
         $searchCriteriaBuilder->addSortOrder($sortOrder);
         $searchData = $searchCriteriaBuilder->create()->__toArray();
 
-        $requestData = ['searchCriteria' => $searchData];
-        $serviceInfo = [
-            'rest' => [
-                'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($requestData),
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
-            ],
-            'soap' => [
-                'service' => self::SERVICE_READ_NAME,
-                'serviceVersion' => self::SERVICE_VERSION,
-                'operation' => self::SERVICE_READ_NAME . 'getList',
-            ],
-        ];
-
-        $result = $this->_webApiCall($serviceInfo, $requestData);
-        $this->assertArrayHasKey('items', $result);
-        $this->assertCount(2, $result['items']);
-        $this->assertArrayHasKey('search_criteria', $result);
-        $this->assertEquals($searchData, $result['search_criteria']);
-        $this->assertEquals('100000002', $result['items'][0]['increment_id']);
-        $this->assertEquals('100000001', $result['items'][1]['increment_id']);
+        return $searchData;
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/RefundOrderTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/RefundOrderTest.php
index aacda763ca2aa..69bbecc1317a7 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/RefundOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/RefundOrderTest.php
@@ -5,8 +5,10 @@
  */
 namespace Magento\Sales\Service\V1;
 
+use Magento\Sales\Model\Order;
+
 /**
- * API test for creation of Creditmemo for certain Order.
+ * API tests for creation of Creditmemo for certain Order.
  */
 class RefundOrderTest extends \Magento\TestFramework\TestCase\WebapiAbstract
 {
@@ -23,6 +25,9 @@ class RefundOrderTest extends \Magento\TestFramework\TestCase\WebapiAbstract
      */
     private $creditmemoRepository;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -86,9 +91,8 @@ public function testShortRequest()
                 'Failed asserting that proper shipping amount of the Order was refunded'
             );
 
-            //Totally refunded orders can be processed.
             $this->assertEquals(
-                $existingOrder->getStatus(),
+                Order::STATE_COMPLETE,
                 $updatedOrder->getStatus(),
                 'Failed asserting that order status has not changed'
             );
diff --git a/dev/tests/functional/.htaccess.sample b/dev/tests/functional/.htaccess.sample
deleted file mode 100644
index 67c2f3fe2d027..0000000000000
--- a/dev/tests/functional/.htaccess.sample
+++ /dev/null
@@ -1,11 +0,0 @@
-##############################################
-## Allow access to command.php, website.php, export.php, pathChecker.php, locales.php, deleteMagentoGeneratedCode.php and log.php
-    <FilesMatch "command.php|website.php|export.php|pathChecker.php|deleteMagentoGeneratedCode.php|log.php|locales.php">
-        <IfVersion < 2.4>
-            order allow,deny
-            allow from all
-        </IfVersion>
-        <IfVersion >= 2.4>
-            Require all granted
-        </IfVersion>
-    </FilesMatch>
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index 93de6b3363900..5c632ca9f05ed 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -3,7 +3,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|~7.0.6|~7.1.0",
+        "php": "7.0.2|~7.0.6|~7.1.0|~7.2.0",
         "magento/mtf": "2.2.x-dev",
         "allure-framework/allure-phpunit": "~1.2.0",
         "doctrine/annotations": "1.4.*",
diff --git a/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php b/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php
index 60abe18f5a7ba..fc54e73ff1ac2 100644
--- a/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php
+++ b/dev/tests/functional/lib/Magento/Mtf/App/State/State1.php
@@ -7,6 +7,7 @@
 namespace Magento\Mtf\App\State;
 
 use Magento\Mtf\ObjectManager;
+use Magento\Mtf\Util\Command\Cli;
 use Magento\Mtf\Util\Protocol\CurlInterface;
 use Magento\Mtf\Util\Protocol\CurlTransport;
 
@@ -27,7 +28,7 @@ class State1 extends AbstractState
      *
      * @var string
      */
-    protected $config ='admin_session_lifetime_1_hour, wysiwyg_disabled, admin_account_sharing_enable, log_to_file';
+    protected $config ='admin_session_lifetime_1_hour, wysiwyg_disabled, admin_account_sharing_enable';
 
     /**
      * HTTP CURL Adapter.
@@ -55,6 +56,7 @@ public function __construct(
      * Apply set up configuration profile.
      *
      * @return void
+     * @throws \Exception
      */
     public function apply()
     {
@@ -67,6 +69,10 @@ public function apply()
                 ['configData' => $this->config]
             )->run();
         }
+
+        /** @var Cli $cli */
+        $cli = $this->objectManager->create(Cli::class);
+        $cli->execute('setup:config:set', ['--enable-debug-logging=true']);
     }
 
     /**
diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
index 6dbf2b1aa6a12..9edd087020a72 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
@@ -195,6 +195,13 @@ class ConditionsElement extends SimpleElement
      */
     protected $exception;
 
+    /**
+     * Condition option text selector.
+     *
+     * @var string
+     */
+    private $conditionOptionTextSelector = '//option[normalize-space(text())="%s"]';
+
     /**
      * @inheritdoc
      */
@@ -282,10 +289,16 @@ protected function addCondition($type, ElementInterface $context)
         $count = 0;
 
         do {
-            $newCondition->find($this->addNew, Locator::SELECTOR_XPATH)->click();
-
             try {
-                $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'select')->setValue($type);
+                $specificType = $newCondition->find(
+                    sprintf($this->conditionOptionTextSelector, $type),
+                    Locator::SELECTOR_XPATH
+                )->isPresent();
+                $newCondition->find($this->addNew, Locator::SELECTOR_XPATH)->click();
+                $condition = $specificType
+                    ? $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'selectcondition')
+                    : $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'select');
+                $condition->setValue($type);
                 $isSetType = true;
             } catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
                 $isSetType = false;
diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectconditionElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectconditionElement.php
new file mode 100644
index 0000000000000..15a799eac5188
--- /dev/null
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectconditionElement.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Mtf\Client\Element;
+
+/**
+ * @inheritdoc
+ */
+class SelectconditionElement extends SelectElement
+{
+    /**
+     * @inheritdoc
+     */
+    protected $optionByValue = './/option[normalize-space(.)=%s]';
+}
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli.php
index 8fa22122cce89..f0abd280f3ebc 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli.php
@@ -8,6 +8,7 @@
 
 use Magento\Mtf\Util\Protocol\CurlInterface;
 use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\WebapiDecorator;
 
 /**
  * Perform bin/magento commands from command line for functional tests executions.
@@ -17,7 +18,7 @@ class Cli
     /**
      * Url to command.php.
      */
-    const URL = 'dev/tests/functional/utils/command.php';
+    const URL = '/dev/tests/functional/utils/command.php';
 
     /**
      * Curl transport protocol.
@@ -26,12 +27,21 @@ class Cli
      */
     private $transport;
 
+    /**
+     * Webapi handler.
+     *
+     * @var WebapiDecorator
+     */
+    private $webapiHandler;
+
     /**
      * @param CurlTransport $transport
+     * @param WebapiDecorator $webapiHandler
      */
-    public function __construct(CurlTransport $transport)
+    public function __construct(CurlTransport $transport, WebapiDecorator $webapiHandler)
     {
         $this->transport = $transport;
+        $this->webapiHandler = $webapiHandler;
     }
 
     /**
@@ -43,22 +53,31 @@ public function __construct(CurlTransport $transport)
      */
     public function execute($command, $options = [])
     {
-        $curl = $this->transport;
-        $curl->write($this->prepareUrl($command, $options), [], CurlInterface::GET);
-        $curl->read();
-        $curl->close();
+        $this->transport->write(
+            rtrim(str_replace('index.php', '', $_ENV['app_frontend_url']), '/') . self::URL,
+            $this->prepareParamArray($command, $options),
+            CurlInterface::POST,
+            []
+        );
+        $this->transport->read();
+        $this->transport->close();
     }
 
     /**
-     * Prepare url.
+     * Prepare parameter array.
      *
      * @param string $command
      * @param array $options [optional]
-     * @return string
+     * @return array
      */
-    private function prepareUrl($command, $options = [])
+    private function prepareParamArray($command, $options = [])
     {
-        $command .= ' ' . implode(' ', $options);
-        return $_ENV['app_frontend_url'] . self::URL . '?command=' . urlencode($command);
+        if (!empty($options)) {
+            $command .= ' ' . implode(' ', $options);
+        }
+        return [
+            'token' => urlencode($this->webapiHandler->getWebapiToken()),
+            'command' => urlencode($command)
+        ];
     }
 }
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export/Reader.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export/Reader.php
index 1c05fbaebf625..69df78a5cad64 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export/Reader.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export/Reader.php
@@ -3,12 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Mtf\Util\Command\File\Export;
 
 use Magento\Mtf\ObjectManagerInterface;
 use Magento\Mtf\Util\Protocol\CurlTransport;
 use Magento\Mtf\Util\Protocol\CurlInterface;
+use Magento\Mtf\Util\Protocol\CurlTransport\WebapiDecorator;
 
 /**
  * File reader for Magento export files.
@@ -36,16 +36,29 @@ class Reader implements ReaderInterface
      */
     private $transport;
 
+    /**
+     * Webapi handler.
+     *
+     * @var WebapiDecorator
+     */
+    private $webapiHandler;
+
     /**
      * @param ObjectManagerInterface $objectManager
      * @param CurlTransport $transport
+     * @param WebapiDecorator $webapiHandler
      * @param string $template
      */
-    public function __construct(ObjectManagerInterface $objectManager, CurlTransport $transport, $template)
-    {
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        CurlTransport $transport,
+        WebapiDecorator $webapiHandler,
+        $template
+    ) {
         $this->objectManager = $objectManager;
         $this->template = $template;
         $this->transport = $transport;
+        $this->webapiHandler = $webapiHandler;
     }
 
     /**
@@ -70,20 +83,27 @@ public function getData()
      */
     private function getFiles()
     {
-        $this->transport->write($this->prepareUrl(), [], CurlInterface::GET);
+        $this->transport->write(
+            rtrim(str_replace('index.php', '', $_ENV['app_frontend_url']), '/') . self::URL,
+            $this->prepareParamArray(),
+            CurlInterface::POST,
+            []
+        );
         $serializedFiles = $this->transport->read();
         $this->transport->close();
-
         return unserialize($serializedFiles);
     }
 
     /**
-     * Prepare url.
+     * Prepare parameter array.
      *
-     * @return string
+     * @return array
      */
-    private function prepareUrl()
+    private function prepareParamArray()
     {
-        return $_ENV['app_frontend_url'] . self::URL . '?template=' . urlencode($this->template);
+        return [
+            'token' => urlencode($this->webapiHandler->getWebapiToken()),
+            'template' => urlencode($this->template)
+        ];
     }
 }
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export/ReaderInterface.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export/ReaderInterface.php
index 93f7cf1ce9764..3666e8643efa3 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export/ReaderInterface.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Export/ReaderInterface.php
@@ -14,7 +14,7 @@ interface ReaderInterface
     /**
      * Url to export.php.
      */
-    const URL = 'dev/tests/functional/utils/export.php';
+    const URL = '/dev/tests/functional/utils/export.php';
 
     /**
      * Exporting files as Data object from Magento.
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Log.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Log.php
index 8b41924fe0a90..820a5b0a82228 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Log.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/File/Log.php
@@ -7,6 +7,7 @@
 namespace Magento\Mtf\Util\Command\File;
 
 use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\WebapiDecorator;
 
 /**
  * Get content of log file in var/log folder.
@@ -16,7 +17,7 @@ class Log
     /**
      * Url to log.php.
      */
-    const URL = 'dev/tests/functional/utils/log.php';
+    const URL = '/dev/tests/functional/utils/log.php';
 
     /**
      * Curl transport protocol.
@@ -25,12 +26,21 @@ class Log
      */
     private $transport;
 
+    /**
+     * Webapi handler.
+     *
+     * @var WebapiDecorator
+     */
+    private $webapiHandler;
+
     /**
      * @param CurlTransport $transport
+     * @param WebapiDecorator $webapiHandler
      */
-    public function __construct(CurlTransport $transport)
+    public function __construct(CurlTransport $transport, WebapiDecorator $webapiHandler)
     {
         $this->transport = $transport;
+        $this->webapiHandler = $webapiHandler;
     }
 
     /**
@@ -41,22 +51,28 @@ public function __construct(CurlTransport $transport)
      */
     public function getFileContent($name)
     {
-        $curl = $this->transport;
-        $curl->write($this->prepareUrl($name), [], CurlTransport::GET);
-        $data = $curl->read();
-        $curl->close();
-
+        $this->transport->write(
+            rtrim(str_replace('index.php', '', $_ENV['app_frontend_url']), '/') . self::URL,
+            $this->prepareParamArray($name),
+            CurlInterface::POST,
+            []
+        );
+        $data = $this->transport->read();
+        $this->transport->close();
         return unserialize($data);
     }
 
     /**
-     * Prepare url.
+     * Prepare parameter array.
      *
      * @param string $name
-     * @return string
+     * @return array
      */
-    private function prepareUrl($name)
+    private function prepareParamArray($name)
     {
-        return $_ENV['app_frontend_url'] . self::URL . '?name=' . urlencode($name);
+        return [
+            'token' => urlencode($this->webapiHandler->getWebapiToken()),
+            'name' => urlencode($name)
+        ];
     }
 }
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/GeneratedCode.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/GeneratedCode.php
index dde3409ed1562..a9fefa25ffa24 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/GeneratedCode.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/GeneratedCode.php
@@ -7,6 +7,7 @@
 
 use Magento\Mtf\Util\Protocol\CurlInterface;
 use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\WebapiDecorator;
 
 /**
  * GeneratedCode removes generated code of Magento (like generated/code and generated/metadata).
@@ -16,7 +17,7 @@ class GeneratedCode
     /**
      * Url to deleteMagentoGeneratedCode.php.
      */
-    const URL = 'dev/tests/functional/utils/deleteMagentoGeneratedCode.php';
+    const URL = '/dev/tests/functional/utils/deleteMagentoGeneratedCode.php';
 
     /**
      * Curl transport protocol.
@@ -25,12 +26,21 @@ class GeneratedCode
      */
     private $transport;
 
+    /**
+     * Webapi handler.
+     *
+     * @var WebapiDecorator
+     */
+    private $webapiHandler;
+
     /**
      * @param CurlTransport $transport
+     * @param WebapiDecorator $webapiHandler
      */
-    public function __construct(CurlTransport $transport)
+    public function __construct(CurlTransport $transport, WebapiDecorator $webapiHandler)
     {
         $this->transport = $transport;
+        $this->webapiHandler = $webapiHandler;
     }
 
     /**
@@ -40,10 +50,25 @@ public function __construct(CurlTransport $transport)
      */
     public function delete()
     {
-        $url = $_ENV['app_frontend_url'] . self::URL;
-        $curl = $this->transport;
-        $curl->write($url, [], CurlInterface::GET);
-        $curl->read();
-        $curl->close();
+        $this->transport->write(
+            rtrim(str_replace('index.php', '', $_ENV['app_frontend_url']), '/') . self::URL,
+            $this->prepareParamArray(),
+            CurlInterface::POST,
+            []
+        );
+        $this->transport->read();
+        $this->transport->close();
+    }
+
+    /**
+     * Prepare parameter array.
+     *
+     * @return array
+     */
+    private function prepareParamArray()
+    {
+        return [
+            'token' => urlencode($this->webapiHandler->getWebapiToken())
+        ];
     }
 }
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Locales.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Locales.php
index f669d91f2f2e5..a55d803f43087 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Locales.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Locales.php
@@ -7,6 +7,7 @@
 
 use Magento\Mtf\Util\Protocol\CurlInterface;
 use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\WebapiDecorator;
 
 /**
  * Returns array of locales depends on fetching type.
@@ -26,7 +27,7 @@ class Locales
     /**
      * Url to locales.php.
      */
-    const URL = 'dev/tests/functional/utils/locales.php';
+    const URL = '/dev/tests/functional/utils/locales.php';
 
     /**
      * Curl transport protocol.
@@ -35,12 +36,21 @@ class Locales
      */
     private $transport;
 
+    /**
+     * Webapi handler.
+     *
+     * @var WebapiDecorator
+     */
+    private $webapiHandler;
+
     /**
      * @param CurlTransport $transport Curl transport protocol
+     * @param WebapiDecorator $webapiHandler
      */
-    public function __construct(CurlTransport $transport)
+    public function __construct(CurlTransport $transport, WebapiDecorator $webapiHandler)
     {
         $this->transport = $transport;
+        $this->webapiHandler = $webapiHandler;
     }
 
     /**
@@ -51,12 +61,28 @@ public function __construct(CurlTransport $transport)
      */
     public function getList($type = self::TYPE_ALL)
     {
-        $url = $_ENV['app_frontend_url'] . self::URL . '?type=' . $type;
-        $curl = $this->transport;
-        $curl->write($url, [], CurlInterface::GET);
-        $result = $curl->read();
-        $curl->close();
-
+        $this->transport->write(
+            rtrim(str_replace('index.php', '', $_ENV['app_frontend_url']), '/') . self::URL,
+            $this->prepareParamArray($type),
+            CurlInterface::POST,
+            []
+        );
+        $result = $this->transport->read();
+        $this->transport->close();
         return explode('|', $result);
     }
+
+    /**
+     * Prepare parameter array.
+     *
+     * @param string $type
+     * @return array
+     */
+    private function prepareParamArray($type)
+    {
+        return [
+            'token' => urlencode($this->webapiHandler->getWebapiToken()),
+            'type' => urlencode($type)
+        ];
+    }
 }
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/PathChecker.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/PathChecker.php
index fd1f746a6f09c..4b12f6eec87aa 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/PathChecker.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/PathChecker.php
@@ -7,6 +7,7 @@
 
 use Magento\Mtf\Util\Protocol\CurlInterface;
 use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\WebapiDecorator;
 
 /**
  * PathChecker checks that path to file or directory exists.
@@ -16,7 +17,7 @@ class PathChecker
     /**
      * Url to checkPath.php.
      */
-    const URL = 'dev/tests/functional/utils/pathChecker.php';
+    const URL = '/dev/tests/functional/utils/pathChecker.php';
 
     /**
      * Curl transport protocol.
@@ -26,11 +27,21 @@ class PathChecker
     private $transport;
 
     /**
+     * Webapi handler.
+     *
+     * @var WebapiDecorator
+     */
+    private $webapiHandler;
+
+    /**
+     * @constructor
      * @param CurlTransport $transport
+     * @param WebapiDecorator $webapiHandler
      */
-    public function __construct(CurlTransport $transport)
+    public function __construct(CurlTransport $transport, WebapiDecorator $webapiHandler)
     {
         $this->transport = $transport;
+        $this->webapiHandler = $webapiHandler;
     }
 
     /**
@@ -41,12 +52,28 @@ public function __construct(CurlTransport $transport)
      */
     public function pathExists($path)
     {
-        $url = $_ENV['app_frontend_url'] . self::URL . '?path=' . urlencode($path);
-        $curl = $this->transport;
-        $curl->write($url, [], CurlInterface::GET);
-        $result = $curl->read();
-        $curl->close();
-
+        $this->transport->write(
+            rtrim(str_replace('index.php', '', $_ENV['app_frontend_url']), '/') . self::URL,
+            $this->prepareParamArray($path),
+            CurlInterface::POST,
+            []
+        );
+        $result = $this->transport->read();
+        $this->transport->close();
         return strpos($result, 'path exists: true') !== false;
     }
+
+    /**
+     * Prepare parameter array.
+     *
+     * @param string $path
+     * @return array
+     */
+    private function prepareParamArray($path)
+    {
+        return [
+            'token' => urlencode($this->webapiHandler->getWebapiToken()),
+            'path' => urlencode($path)
+        ];
+    }
 }
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Website.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Website.php
index 7d73634c0360d..fec20bb2a8715 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Website.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Website.php
@@ -3,11 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Mtf\Util\Command;
 
 use Magento\Mtf\Util\Protocol\CurlInterface;
 use Magento\Mtf\Util\Protocol\CurlTransport;
+use Magento\Mtf\Util\Protocol\CurlTransport\WebapiDecorator;
 
 /**
  * Perform Website folder creation for functional tests executions.
@@ -17,7 +17,7 @@ class Website
     /**
      * Url to website.php.
      */
-    const URL = 'dev/tests/functional/utils/website.php';
+    const URL = '/dev/tests/functional/utils/website.php';
 
     /**
      * Curl transport protocol.
@@ -26,13 +26,22 @@ class Website
      */
     private $transport;
 
+    /**
+     * Webapi handler.
+     *
+     * @var WebapiDecorator
+     */
+    private $webapiHandler;
+
     /**
      * @constructor
      * @param CurlTransport $transport
+     * @param WebapiDecorator $webapiHandler
      */
-    public function __construct(CurlTransport $transport)
+    public function __construct(CurlTransport $transport, WebapiDecorator $webapiHandler)
     {
         $this->transport = $transport;
+        $this->webapiHandler = $webapiHandler;
     }
 
     /**
@@ -43,21 +52,28 @@ public function __construct(CurlTransport $transport)
      */
     public function create($websiteCode)
     {
-        $curl = $this->transport;
-        $curl->addOption(CURLOPT_HEADER, 1);
-        $curl->write($this->prepareUrl($websiteCode), [], CurlInterface::GET);
-        $curl->read();
-        $curl->close();
+        $this->transport->addOption(CURLOPT_HEADER, 1);
+        $this->transport->write(
+            rtrim(str_replace('index.php', '', $_ENV['app_frontend_url']), '/') . self::URL,
+            $this->prepareParamArray($websiteCode),
+            CurlInterface::POST,
+            []
+        );
+        $this->transport->read();
+        $this->transport->close();
     }
 
     /**
-     * Prepare url.
+     * Prepare parameter array.
      *
      * @param string $websiteCode
-     * @return string
+     * @return array
      */
-    private function prepareUrl($websiteCode)
+    private function prepareParamArray($websiteCode)
     {
-        return $_ENV['app_frontend_url'] . self::URL . '?website_code=' . urlencode($websiteCode);
+        return [
+            'token' => urlencode($this->webapiHandler->getWebapiToken()),
+            'website_code' => urlencode($websiteCode)
+        ];
     }
 }
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php
index ab333dc7c005a..a5e09232b78a4 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php
@@ -63,23 +63,58 @@ public function __construct(CurlTransport $transport, DataInterface $configurati
      */
     protected function authorize()
     {
-        // Perform GET to backend url so form_key is set
-        $url = $_ENV['app_backend_url'];
-        $this->transport->write($url, [], CurlInterface::GET);
-        $this->read();
-
-        $url = $_ENV['app_backend_url'] . $this->configuration->get('application/0/backendLoginUrl/0/value');
-        $data = [
-            'login[username]' => $this->configuration->get('application/0/backendLogin/0/value'),
-            'login[password]' => $this->configuration->get('application/0/backendPassword/0/value'),
-            'form_key' => $this->formKey,
-        ];
-        $this->transport->write($url, $data, CurlInterface::POST);
-        $response = $this->read();
-        if (strpos($response, 'login-form')) {
-            throw new \Exception(
-                'Admin user cannot be logged in by curl handler!'
-            );
+        // There are situations where magento application backend url could be slightly different from the environment
+        // variable we know. It could be intentionally (e.g. InstallTest) or unintentionally. We would still want tests
+        // to run in this case.
+        // When the original app_backend_url does not work, we will try 4 variants of the it. i.e. with and without
+        // url rewrite, http and https.
+        $urls = [];
+        $originalUrl = rtrim($_ENV['app_backend_url'], '/') . '/';
+        $urls[] = $originalUrl;
+        // It could be the case that the page needs a refresh, so we will try the original one twice
+        $urls[] = $originalUrl;
+        if (strpos($originalUrl, '/index.php') !== false) {
+            $url2 = str_replace('/index.php', '', $originalUrl);
+        } else {
+            $url2 = $originalUrl . 'index.php/';
+        }
+        $urls[] = $url2;
+        if (strpos($originalUrl, 'https') !== false) {
+            $urls[] = str_replace('https', 'http', $originalUrl);
+            $urls[] = str_replace('https', 'http', $url2);
+        } else {
+            $urls[] = str_replace('http', 'https', $originalUrl);
+            $urls[] = str_replace('http', 'https', $url2);
+        }
+
+        $isAuthorized = false;
+        foreach ($urls as $url) {
+            try {
+                // Perform GET to backend url so form_key is set
+                $this->transport->write($url, [], CurlInterface::GET);
+                $this->read();
+
+                $authUrl = $url . $this->configuration->get('application/0/backendLoginUrl/0/value');
+                $data = [
+                    'login[username]' => $this->configuration->get('application/0/backendLogin/0/value'),
+                    'login[password]' => $this->configuration->get('application/0/backendPassword/0/value'),
+                    'form_key' => $this->formKey,
+                ];
+
+                $this->transport->write($authUrl, $data, CurlInterface::POST);
+                $response = $this->read();
+                if (strpos($response, 'login-form') !== false) {
+                    continue;
+                }
+                $isAuthorized = true;
+                $_ENV['app_backend_url'] = $url;
+                break;
+            } catch (\Exception $e) {
+                continue;
+            }
+        }
+        if ($isAuthorized == false) {
+            throw new \Exception('Admin user cannot be logged in by curl handler!');
         }
     }
 
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/WebapiDecorator.php b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/WebapiDecorator.php
index 3aa756904ab00..df5ab45a3f96d 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/WebapiDecorator.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/WebapiDecorator.php
@@ -70,6 +70,13 @@ class WebapiDecorator implements CurlInterface
      */
     protected $response;
 
+    /**
+     * Webapi token.
+     *
+     * @var string
+     */
+    protected $webapiToken;
+
     /**
      * @construct
      * @param ObjectManager $objectManager
@@ -110,6 +117,9 @@ protected function init()
             $integration->persist();
 
             $this->setConfiguration($integration);
+            $this->webapiToken = $integration->getToken();
+        } else {
+            $this->webapiToken = $integrationToken;
         }
     }
 
@@ -161,7 +171,13 @@ protected function setConfiguration(Integration $integration)
      */
     protected function isValidIntegration()
     {
-        $this->write($_ENV['app_frontend_url'] . 'rest/V1/modules', [], CurlInterface::GET);
+        $url = rtrim($_ENV['app_frontend_url'], '/');
+        if (strpos($url, 'index.php') === false) {
+            $url .=  '/index.php/rest/V1/modules';
+        } else {
+            $url .= '/rest/V1/modules';
+        }
+        $this->write($url, [], CurlInterface::GET);
         $response = json_decode($this->read(), true);
 
         return (null !== $response) && !isset($response['message']);
@@ -219,4 +235,18 @@ public function close()
     {
         $this->transport->close();
     }
+
+    /**
+     * Return webapiToken.
+     *
+     * @return string
+     */
+    public function getWebapiToken()
+    {
+        // Request token if integration is no longer valid
+        if (!$this->isValidIntegration()) {
+            $this->init();
+        }
+        return $this->webapiToken;
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml
index 9c19f80e91d39..76f60a51c0ece 100644
--- a/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml
@@ -8,9 +8,10 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest" summary="Navigate to menu chapter">
         <variation name="NavigateMenuTestBIEssentials" summary="Navigate through BI Essentials admin menu to Sign Up page" ticketId="MAGETWO-63700">
+            <data name="issue" xsi:type="string">MAGETWO-97298: [2.2-develop] Magento\Backend\Test\TestCase\NavigateMenuTest fails on Jenkins</data>
             <data name="menuItem" xsi:type="string">Reports > BI Essentials</data>
             <data name="waitMenuItemNotVisible" xsi:type="boolean">false</data>
-            <data name="businessIntelligenceLink" xsi:type="string">https://dashboard.rjmetrics.com/v2/magento/signup</data>
+            <data name="businessIntelligenceLink" xsi:type="string">https://account.magento.com/onboarding/steps/view/step/gmv/</data>
             <constraint name="Magento\Analytics\Test\Constraint\AssertBIEssentialsLink" />
         </variation>
         <variation name="NavigateMenuTestAdvancedReporting" summary="Navigate through Advanced Reporting admin menu to BI Reports page" ticketId="MAGETWO-65748">
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php
index 87a3ed048dbb9..275b1225f71a7 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/StoreGrid.php
@@ -6,30 +6,37 @@
 
 namespace Magento\Backend\Test\Block\System\Store;
 
-use Magento\Backend\Test\Block\Widget\Grid;
+use Magento\Mtf\Client\Locator;
 use Magento\Store\Test\Fixture\Store;
 use Magento\Store\Test\Fixture\StoreGroup;
 use Magento\Store\Test\Fixture\Website;
-use Magento\Mtf\Client\Locator;
+use Magento\Ui\Test\Block\Adminhtml\DataGrid;
 
 /**
  * Adminhtml Store View management grid.
  */
-class StoreGrid extends Grid
+class StoreGrid extends DataGrid
 {
     /**
-     * Locator value for opening needed row.
+     * Secondary part of row locator template for getRow() method
      *
      * @var string
      */
-    protected $editLink = 'td[data-column="store_title"] > a';
+    protected $rowTemplate = 'td[div[*[contains(.,normalize-space("%s"))]]]';
 
     /**
-     * Secondary part of row locator template for getRow() method with strict option.
+     * Secondary part of row locator template for getRow() method with strict option
+     *
+     * @var string
+     */
+    protected $rowTemplateStrict = 'td[div[*[text()[normalize-space()="%s"]]]]';
+
+    /**
+     * Locator value for opening needed row.
      *
      * @var string
      */
-    protected $rowTemplateStrict = '//*[text()[normalize-space()="%s"]]';
+    protected $editLink = '[href*="editStore"]';
 
     /**
      * Filters array mapping.
@@ -38,13 +45,13 @@ class StoreGrid extends Grid
      */
     protected $filters = [
         'store_title' => [
-            'selector' => '#storeGrid_filter_store_title',
+            'selector' => '[name="store_title"]',
         ],
         'group_title' => [
-            'selector' => '#storeGrid_filter_group_title',
+            'selector' => '[name="group_title"]',
         ],
         'website_title' => [
-            'selector' => '#storeGrid_filter_website_title',
+            'selector' => '[name="name"]',
         ],
     ];
 
@@ -53,7 +60,7 @@ class StoreGrid extends Grid
      *
      * @var string
      */
-    protected $titleFormat = '//td[a[.="%s"]]';
+    protected $titleFormat = '//a[.="%s"]';
 
     /**
      * Store name link selector.
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreIndex.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreIndex.xml
index 0491106412fe5..bc2b91fe65e6b 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreIndex.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreIndex.xml
@@ -9,6 +9,6 @@
   <page name="StoreIndex" area="Adminhtml" mca="admin/system_store" module="Magento_Backend">
     <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages" strategy="css selector"/>
     <block name="gridPageActions" class="Magento\Backend\Test\Block\System\Store\GridPageActions" locator=".page-main-actions" strategy="css selector"/>
-    <block name="storeGrid" class="Magento\Backend\Test\Block\System\Store\StoreGrid" locator="[id='page:main-container']" strategy="css selector"/>
+    <block name="storeGrid" class="Magento\Backend\Test\Block\System\Store\StoreGrid" locator="//div[contains(@data-bind, 'store_listing')]" strategy="xpath"/>
   </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml
index 1792ddb5abdc9..5587d605e14b3 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml
@@ -175,15 +175,6 @@
             </field>
         </dataset>
 
-        <dataset name="log_to_file">
-            <field name="dev/debug/debug_logging" xsi:type="array">
-                <item name="scope" xsi:type="string">default</item>
-                <item name="scope_id" xsi:type="number">0</item>
-                <item name="label" xsi:type="string">Yes</item>
-                <item name="value" xsi:type="number">1</item>
-            </field>
-        </dataset>
-        
         <dataset name="minify_js_files">
             <field name="dev/js/minify_files" xsi:type="array">
                 <item name="scope" xsi:type="string">default</item>
diff --git a/dev/tests/functional/tests/app/Magento/Backup/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Backup/Test/Repository/ConfigData.xml
new file mode 100644
index 0000000000000..c8b19aa2bd32b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Backup/Test/Repository/ConfigData.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
+    <repository class="Magento\Config\Test\Repository\ConfigData">
+        <dataset name="enable_backups_functionality">
+            <field name="system/backup/functionality_enabled" xsi:type="array">
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+        </dataset>
+        <dataset name="enable_backups_functionality_rollback">
+            <field name="web/url/use_store" xsi:type="array">
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+        </dataset>
+    </repository>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Backup/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Backup/Test/TestCase/NavigateMenuTest.xml
deleted file mode 100644
index 0c024f0e3f5aa..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Backup/Test/TestCase/NavigateMenuTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
- -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-    <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
-        <variation name="NavigateMenuTest7">
-            <data name="menuItem" xsi:type="string">System > Backups</data>
-            <data name="pageTitle" xsi:type="string">Backups</data>
-            <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
-        </variation>
-    </testCase>
-</config>
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/Form/BraintreeCc.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/Form/BraintreeCc.php
index b4569e63e5886..5f02a29a0f5ff 100644
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/Form/BraintreeCc.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/Form/BraintreeCc.php
@@ -64,12 +64,6 @@ function () use ($element, $iframe) {
             );
             $this->browser->switchToFrame($iframeLocator);
             $element = $this->browser->find('body');
-            $this->browser->waitUntil(
-                function () use ($element) {
-                    $fieldElement = $element->find('input');
-                    return $fieldElement->isVisible() ? true : null;
-                }
-            );
             $this->_fill([$mapping[$field]], $element);
             $this->browser->switchToFrame();
         }
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
index 6be21d2e71f9f..3653b0b2b5857 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Constraint/AssertCaptchaFieldOnContactUsForm.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Captcha\Test\Constraint;
 
-use Magento\Contact\Test\Page\ContactIndex;
+use Magento\Captcha\Test\Page\ContactIndexCaptcha as ContactIndex;
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/ContactIndex.xml b/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/ContactIndex.xml
index 060fc5f346fda..742eabb61f371 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/ContactIndex.xml
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/Page/ContactIndex.xml
@@ -6,7 +6,7 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
-    <page name="ContactIndex" mca="contact/index/index" module="Magento_Contact">
+    <page name="ContactIndexCaptcha" mca="contact/index/index" module="Magento_Captcha">
         <block name="contactUs" class="Magento\Captcha\Test\Block\Form\ContactUs" locator="#contact-form" strategy="css selector" />
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.php b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.php
index d8c9bf1f719de..0de71c3a416c8 100644
--- a/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.php
+++ b/dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaOnContactUsTest.php
@@ -8,7 +8,7 @@
 
 use Magento\Captcha\Test\Constraint\AssertCaptchaFieldOnContactUsForm;
 use Magento\Contact\Test\Fixture\Comment;
-use Magento\Contact\Test\Page\ContactIndex;
+use Magento\Captcha\Test\Page\ContactIndexCaptcha as ContactIndex;
 use Magento\Mtf\TestCase\Injectable;
 use Magento\Mtf\TestStep\TestStepFactory;
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
index 4ba335511c82c..d65bb22402e20 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php
@@ -298,6 +298,7 @@ public function configure(FixtureInterface $product)
         $checkoutData = $product->getCheckoutData();
 
         $this->getMiniCartBlock()->waitInit();
+        sleep(10);
         $this->fillOptions($product);
         if (isset($checkoutData['qty'])) {
             $this->setQty($checkoutData['qty']);
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
index ccb0d43337562..9f35059556fa8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php
@@ -128,7 +128,8 @@ class CustomOptions extends Form
      *
      * @var string
      */
-    private $validationErrorMessage = '//div[@class="mage-error"][contains(text(), "required field")]';
+    private $validationErrorMessage = '//div[@class="mage-error"][contains(text(), "required field")' .
+    ' and not(contains(@style,"display"))]';
 
     /**
      * Get product options
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
index f1086f4871f3b..2d9dea375e97c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
@@ -91,15 +91,18 @@ public function persist(FixtureInterface $fixture = null)
         $data['frontend_label'] = [0 => $data['frontend_label']];
 
         if (isset($data['options'])) {
+            $optionsData = [];
             foreach ($data['options'] as $key => $values) {
+                $optionRowData = [];
                 $index = 'option_' . $key;
                 if ($values['is_default'] == 'Yes') {
-                    $data['default'][] = $index;
+                    $optionRowData['default'][] = $index;
                 }
-                $data['option']['value'][$index] = [$values['admin'], $values['view']];
-                $data['option']['order'][$index] = $key;
+                $optionRowData['option']['value'][$index] = [$values['admin'], $values['view']];
+                $optionRowData['option']['order'][$index] = $key;
+                $optionsData[] = $optionRowData;
             }
-            unset($data['options']);
+            $data['options'] = $optionsData;
         }
 
         $data = $this->changeStructureOfTheData($data);
@@ -134,11 +137,39 @@ public function persist(FixtureInterface $fixture = null)
     }
 
     /**
+     * Additional data handling.
+     *
      * @param array $data
      * @return array
      */
-    protected function changeStructureOfTheData(array $data)
+    protected function changeStructureOfTheData(array $data): array
     {
+        if (!isset($data['options'])) {
+            return $data;
+        }
+
+        $serializedOptions = $this->getSerializeOptions($data['options']);
+        if ($serializedOptions) {
+            $data['serialized_options'] = $serializedOptions;
+            unset($data['options']);
+        }
+
         return $data;
     }
+
+    /**
+     * Provides serialized product attribute options.
+     *
+     * @param array $data
+     * @return string
+     */
+    protected function getSerializeOptions(array $data): string
+    {
+        $options = [];
+        foreach ($data as $optionRowData) {
+            $options[] = http_build_query($optionRowData);
+        }
+
+        return json_encode($options);
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml
index 721b0ff570079..e90ca6bf7868a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml
@@ -41,7 +41,7 @@
             <field name="attribute_set_id" xsi:type="array">
                 <item name="dataset" xsi:type="string">default</item>
             </field>
-            <field name="name" xsi:type="string">Product \&#39;!@#$%^&amp;*()+:;\\|}{][?=-~` %isolation%</field>
+            <field name="name" xsi:type="string">Product \&#39;!@#$%^&amp;*()+:;\\|}{][?=~` %isolation%</field>
             <field name="sku" xsi:type="string">sku_simple_product_%isolation%</field>
             <field name="is_virtual" xsi:type="string">No</field>
             <field name="product_has_weight" xsi:type="string">This item has weight</field>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml
index 7c4824c604e29..49cd2a347c687 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest.xml
@@ -58,7 +58,6 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductIsNotDisplayedSeparately" />
         </variation>
         <variation name="ProductTypeSwitchingOnCreationTestVariation7">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="createProduct" xsi:type="string">virtual</data>
             <data name="product" xsi:type="string">downloadableProduct::default</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
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 43741393e7968..90cd6bdb76328 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
@@ -143,5 +143,6 @@ protected function clearDownloadableData()
         /** @var Downloadable $downloadableInfoTab */
         $downloadableInfoTab = $this->catalogProductEdit->getProductForm()->getSection('downloadable_information');
         $downloadableInfoTab->getDownloadableBlock('Links')->clearDownloadableData();
+        $downloadableInfoTab->setIsDownloadable('No');
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml
index f3df374a8bac8..5fa1cfe5e5911 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml
@@ -11,7 +11,6 @@
             <data name="productOrigin" xsi:type="string">catalogProductSimple::default</data>
             <data name="product" xsi:type="string">configurableProduct::default</data>
             <data name="actionName" xsi:type="string">-</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />
@@ -21,7 +20,6 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductIsNotDisplayedSeparately" />
         </variation>
         <variation name="ProductTypeSwitchingOnUpdateTestVariation2">
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <data name="productOrigin" xsi:type="string">catalogProductSimple::default</data>
             <data name="product" xsi:type="string">catalogProductVirtual::default</data>
             <data name="actionName" xsi:type="string">-</data>
@@ -29,7 +27,6 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
         </variation>
         <variation name="ProductTypeSwitchingOnUpdateTestVariation3">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="productOrigin" xsi:type="string">configurableProduct::default</data>
             <data name="product" xsi:type="string">catalogProductSimple::product_without_category</data>
             <data name="actionName" xsi:type="string">deleteVariations</data>
@@ -40,12 +37,10 @@
             <data name="productOrigin" xsi:type="string">configurableProduct::default</data>
             <data name="product" xsi:type="string">catalogProductVirtual::required_fields</data>
             <data name="actionName" xsi:type="string">deleteVariations</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
         </variation>
         <variation name="ProductTypeSwitchingOnUpdateTestVariation5">
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <data name="productOrigin" xsi:type="string">catalogProductVirtual::default</data>
             <data name="product" xsi:type="string">catalogProductSimple::default</data>
             <data name="actionName" xsi:type="string">-</data>
@@ -56,7 +51,6 @@
             <data name="productOrigin" xsi:type="string">catalogProductVirtual::default</data>
             <data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
             <data name="actionName" xsi:type="string">-</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />
@@ -69,7 +63,6 @@
             <data name="productOrigin" xsi:type="string">catalogProductVirtual::default</data>
             <data name="product" xsi:type="string">downloadableProduct::default</data>
             <data name="actionName" xsi:type="string">-</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
@@ -81,15 +74,13 @@
             <data name="productOrigin" xsi:type="string">downloadableProduct::default</data>
             <data name="product" xsi:type="string">catalogProductSimple::default</data>
             <data name="actionName" xsi:type="string">-</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
         </variation>
         <variation name="ProductTypeSwitchingOnUpdateTestVariation9">
             <data name="productOrigin" xsi:type="string">downloadableProduct::default</data>
             <data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
-            <data name="actionName" xsi:type="string">-</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
+            <data name="actionName" xsi:type="string">clearDownloadableData</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />
@@ -99,7 +90,6 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductIsNotDisplayedSeparately" />
         </variation>
         <variation name="ProductTypeSwitchingOnUpdateTestVariation10">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="productOrigin" xsi:type="string">downloadableProduct::default</data>
             <data name="product" xsi:type="string">catalogProductVirtual::default</data>
             <data name="actionName" xsi:type="string">clearDownloadableData</data>
@@ -110,7 +100,6 @@
             <data name="productOrigin" xsi:type="string">catalogProductSimple::default</data>
             <data name="product" xsi:type="string">downloadableProduct::default</data>
             <data name="actionName" xsi:type="string">-</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php
index 4ecbb382e66fe..3830bd483743c 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php
@@ -6,6 +6,7 @@
 
 namespace Magento\CatalogRule\Test\Constraint;
 
+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
 use Magento\Customer\Test\Fixture\Customer;
 use Magento\Checkout\Test\Page\CheckoutCart;
 use Magento\Mtf\Constraint\AbstractConstraint;
@@ -16,6 +17,8 @@
  */
 class AssertCatalogPriceRuleAppliedShoppingCart extends AbstractConstraint
 {
+    use CartPageLoadTrait;
+
     /**
      * Assert that Catalog Price Rule is applied for product(s) in Shopping Cart
      * according to Priority(Priority/Stop Further Rules Processing).
@@ -48,6 +51,7 @@ public function processAssert(
             ['products' => $products]
         )->run();
         $checkoutCartPage->open();
+        $this->waitForCartPageLoaded($checkoutCartPage);
         foreach ($products as $key => $product) {
             $actualPrice = $checkoutCartPage->getCartBlock()->getCartItem($product)->getSubtotalPrice();
             \PHPUnit_Framework_Assert::assertEquals(
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml
index d99ee5e234e4d..95122969116ad 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml
@@ -57,12 +57,9 @@
         <variation name="SearchEntityResultsTestVariation12" summary="Search for simple product name using 2 symbols query length" ticketId="MAGETWO-36542">
             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::default::name</data>
             <data name="queryLength" xsi:type="string">2</data>
-            <constraint name="Magento\CatalogSearch\Test\Constraint\AssertCatalogSearchNoResultMessage" />
-            <constraint name="Magento\CatalogSearch\Test\Constraint\AssertCatalogSearchNoResult" />
+            <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductCanBeOpenedFromSearchResult" />
         </variation>
         <variation name="SearchEntityResultsTestVariation13" summary="Search for simple product name using 3 symbols query length" ticketId="MAGETWO-36542">
-            <data name="issue" xsi:type="string">MAGETWO-65509: [FT] Magento\CatalogSearch\Test\TestCase\SearchEntityResultsTest fails on Jenkins</data>
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::default::name</data>
             <data name="queryLength" xsi:type="string">3</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductCanBeOpenedFromSearchResult" />
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/EditShippingAddressOnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/EditShippingAddressOnePageCheckoutTest.xml
index 3c88d9193db28..f41731287a5ec 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/EditShippingAddressOnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/EditShippingAddressOnePageCheckoutTest.xml
@@ -14,7 +14,6 @@
             <data name="editShippingAddress/dataset" xsi:type="string">empty_UK_address_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="billingCheckboxState" xsi:type="string">Yes</data>
             <data name="products" xsi:type="array">
                 <item name="0" xsi:type="string">catalogProductSimple::default</item>
             </data>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
index 9e20bbdaac1d9..6716e4aacab81 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
@@ -15,13 +15,11 @@
             <data name="shippingAddressCustomer" xsi:type="array">
                 <item name="added" xsi:type="number">1</item>
             </data>
-            <data name="billingAddressCustomer" xsi:type="array">
-                <item name="added" xsi:type="number">1</item>
-            </data>
             <data name="prices" xsi:type="array">
                 <item name="grandTotal" xsi:type="string">565.00</item>
             </data>
             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="editBillingInformation" xsi:type="boolean">false</data>
             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
             <data name="payment/method" xsi:type="string">checkmo</data>
             <data name="configData" xsi:type="string">checkmo</data>
@@ -43,6 +41,7 @@
                 <item name="grandTotal" xsi:type="string">565.00</item>
             </data>
             <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="editBillingInformation" xsi:type="boolean">false</data>
             <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
             <data name="payment/method" xsi:type="string">checkmo</data>
             <data name="configData" xsi:type="string">checkmo</data>
@@ -61,7 +60,7 @@
             <data name="shippingAddress/dataset" xsi:type="string">UK_address_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="billingCheckboxState" xsi:type="string">Yes</data>
+            <data name="editBillingInformation" xsi:type="boolean">false</data>
             <data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="payment/method" xsi:type="string">checkmo</data>
             <data name="configData" xsi:type="string">checkmo</data>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
index aa7eba634145f..f13fb93e89b71 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php
@@ -126,11 +126,15 @@ public function run()
         if ($this->billingCheckboxState) {
             $this->assertBillingAddressCheckbox->processAssert($this->checkoutOnepage, $this->billingCheckboxState);
         }
-        if ($this->billingCheckboxState === 'Yes' && !$this->editBillingInformation) {
-            return [
-                'billingAddress' => $this->shippingAddress
-            ];
+
+        if (!$this->editBillingInformation) {
+            $billingAddress = $this->billingCheckboxState === 'Yes'
+                ? $this->shippingAddress
+                : $this->getDefaultBillingAddress();
+
+            return ['billingAddress' => $billingAddress];
         }
+
         if ($this->billingAddress) {
             $selectedPaymentMethod = $this->checkoutOnepage->getPaymentBlock()->getSelectedPaymentMethodBlock();
             if ($this->shippingAddress) {
@@ -156,4 +160,25 @@ public function run()
             'billingAddress' => $billingAddress
         ];
     }
+
+    /**
+     * Get default billing address
+     *
+     * @return Address|null
+     */
+    private function getDefaultBillingAddress()
+    {
+        $addresses = $this->customer->hasData('address')
+            ? $this->customer->getDataFieldConfig('address')['source']->getAddresses()
+            : [];
+        $defaultAddress = null;
+        foreach ($addresses as $address) {
+            if ($address->getDefaultBilling() === 'Yes') {
+                $defaultAddress = $address;
+                break;
+            }
+        }
+
+        return $defaultAddress;
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml
index d304d305a7265..a266b09278ddb 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Page/MultishippingCheckoutOverview.xml
@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
     <page name="MultishippingCheckoutOverview" mca="multishipping/checkout/overview" module="Magento_Checkout">
-        <block name="agreementReview" class="Magento\CheckoutAgreements\Test\Block\Multishipping\MultishippingAgreementReview" locator="#checkout-agreements" strategy="css selector"/>
+        <block name="agreementReview" class="Magento\CheckoutAgreements\Test\Block\Multishipping\MultishippingAgreementReview" locator=".checkout-agreements" strategy="css selector"/>
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Config/Test/Handler/ConfigData/Curl.php b/dev/tests/functional/tests/app/Magento/Config/Test/Handler/ConfigData/Curl.php
index 66587879848a3..0d89a1d4eba6e 100644
--- a/dev/tests/functional/tests/app/Magento/Config/Test/Handler/ConfigData/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Config/Test/Handler/ConfigData/Curl.php
@@ -123,9 +123,9 @@ protected function prepareConfigPath(array $input)
      */
     protected function applyConfigSettings(array $data, $section)
     {
-        $url = $this->getUrl($section);
         $curl = new BackendDecorator(new CurlTransport(), $this->_configuration);
         $curl->addOption(CURLOPT_HEADER, 1);
+        $url = $this->getUrl($section);
         $curl->write($url, $data);
         $response = $curl->read();
         $curl->close();
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.xml
index a66753c2adf23..9614f0d1bf7b5 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Composite/Configure.xml
@@ -9,7 +9,7 @@
     <fields>
         <qty />
         <attribute>
-            <selector>//div[@class="product-options"]//label[.="%s"]//following-sibling::*//select</selector>
+            <selector>//div[contains(@class, "product-options")]//div//label[.="%s"]//following-sibling::*//select</selector>
             <strategy>xpath</strategy>
             <input>select</input>
         </attribute>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/TaxCalculationTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/TaxCalculationTest.xml
index 8b89e9f085279..89fa91d3a6264 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/TaxCalculationTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/TaxCalculationTest.xml
@@ -6,7 +6,7 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
-    <testCase name="Magento\Tax\Test\TestCase\TaxCalculationTest">
+    <testCase name="Magento\Tax\Test\TestCase\TaxCalculationTest" summary="Apply Taxes for configurable products" >
         <variation name="TaxCalculationTestConfigurableProduct" ticketId="MAGETWO-42708">
             <data name="product" xsi:type="string">configurableProduct::two_options_by_one_dollar</data>
             <data name="taxRule" xsi:type="string">us_full_tax_rule</data>
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Samples.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Samples.php
index 98c7e1abf0d88..bcc8a012c1a63 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Samples.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Adminhtml/Catalog/Product/Edit/Section/Downloadable/Samples.php
@@ -114,8 +114,9 @@ protected function sortSample($position, $sortOrder, SimpleElement $element = nu
         foreach ($this->sortRowsData as &$sortRowData) {
             if ($sortRowData['sort_order'] > $currentSortRowData['sort_order']) {
                 // need to reload block because we are changing dom
-                $target = $this->getRowBlock($sortRowData['current_position_in_grid'], $element)->getSortHandle();
-                $this->getRowBlock($currentSortRowData['current_position_in_grid'], $element)->dragAndDropTo($target);
+                $target = $this->getRowBlock($currentSortRowData['current_position_in_grid'], $element)
+                    ->getSortHandle();
+                $this->getRowBlock($sortRowData['current_position_in_grid'], $element)->dragAndDropTo($target);
 
                 $currentSortRowData['current_position_in_grid']--;
                 $sortRowData['current_position_in_grid']++;
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml
index 5afe815edad45..b18f6849e0c8a 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml
@@ -18,10 +18,10 @@
             <data name="product/data/downloadable_links/dataset" xsi:type="string">one_separately_link</data>
             <data name="product/data/checkout_data/dataset" xsi:type="string">downloadable_one_dollar_product_with_separated_link</data>
             <data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInCart" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInCart"/>
         </variation>
         <variation name="CreateDownloadableProductEntityTestVariation2" summary="Create product with default set links">
             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
@@ -33,16 +33,14 @@
             <data name="product/data/category" xsi:type="string">Default Category</data>
             <data name="product/data/downloadable_links/dataset" xsi:type="string">with_two_separately_links</data>
             <data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInStock" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInStock"/>
         </variation>
         <variation name="CreateDownloadableProductEntityTestVariation3" summary="Create product with default sets samples and links">
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
-            <data name="issue" xsi:type="string">MAGETWO-67096: [FT] Magento\Downloadable\Test\TestCase\CreateDownloadableProductEntityTest fails on Jenkins</data>
             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
             <data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">1</data>
@@ -53,12 +51,12 @@
             <data name="product/data/downloadable_sample/dataset" xsi:type="string">with_two_samples</data>
             <data name="product/data/downloadable_links/dataset" xsi:type="string">with_two_separately_links</data>
             <data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableSamplesData" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableLinksData" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableSamplesData"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableLinksData"/>
         </variation>
         <variation name="CreateDownloadableProductEntityTestVariation4" summary="Create product with custom options">
             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
@@ -71,16 +69,14 @@
             <data name="product/data/downloadable_links/dataset" xsi:type="string">with_two_separately_links</data>
             <data name="product/data/custom_options/dataset" xsi:type="string">default</data>
             <data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsOnProductPage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableLinksData" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsOnProductPage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableLinksData"/>
         </variation>
         <variation name="CreateDownloadableProductEntityTestVariation5" summary="Create product without category">
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
-            <data name="issue" xsi:type="string">MAGETWO-67096: [FT] Magento\Downloadable\Test\TestCase\CreateDownloadableProductEntityTest fails on Jenkins</data>
             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
             <data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">55</data>
@@ -91,15 +87,15 @@
             <data name="product/data/downloadable_links/dataset" xsi:type="string">with_three_links</data>
             <data name="product/data/custom_options/dataset" xsi:type="string">two_options</data>
             <data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsOnProductPage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableLinksData" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInStock" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsOnProductPage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableLinksData"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInStock"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku"/>
         </variation>
         <variation name="CreateDownloadableProductEntityTestVariation6" summary="Create product with out of stock status">
             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
@@ -111,10 +107,10 @@
             <data name="product/data/category" xsi:type="string">Default Category</data>
             <data name="product/data/downloadable_links/dataset" xsi:type="string">with_two_separately_links</data>
             <data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm"/>
         </variation>
         <variation name="CreateDownloadableProductEntityTestVariation7" summary="Create product with manage stock">
             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
@@ -127,10 +123,10 @@
             <data name="product/data/stock_data/min_qty" xsi:type="string">123</data>
             <data name="product/data/downloadable_links/dataset" xsi:type="string">with_two_separately_links</data>
             <data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock"/>
         </variation>
         <variation name="CreateDownloadableProductEntityTestVariation8" summary="Create product without tax class id">
             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
@@ -143,13 +139,12 @@
             <data name="product/data/description" xsi:type="string">This is description for downloadable product</data>
             <data name="product/data/downloadable_links/dataset" xsi:type="string">with_two_separately_links</data>
             <data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage"/>
         </variation>
         <variation name="CreateDownloadableProductEntityTestVariation9" summary="Create product with import custom options">
-            <data name="issue" xsi:type="string">MAGETWO-59316: Sort order of Customizable Options isn't taken into account while creating Product via Webapi</data>
             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
             <data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">57</data>
@@ -163,17 +158,15 @@
             <data name="product/data/custom_options/dataset" xsi:type="string">default</data>
             <data name="product/data/custom_options/import_products" xsi:type="string">catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option</data>
             <data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsOnProductPage" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableSamplesData" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableLinksData" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsOnProductPage"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableSamplesData"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableLinksData"/>
         </variation>
         <variation name="CreateDownloadableProductEntityTestVariation10" summary="Create product with three links">
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
-            <data name="issue" xsi:type="string">MAGETWO-67096: [FT] Magento\Downloadable\Test\TestCase\CreateDownloadableProductEntityTest fails on Jenkins</data>
             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
             <data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">65</data>
@@ -187,17 +180,15 @@
             <data name="product/data/downloadable_links/dataset" xsi:type="string">with_three_links</data>
             <data name="product/data/custom_options/dataset" xsi:type="string">default</data>
             <data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsOnProductPage" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableSamplesData" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableLinksData" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsOnProductPage"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableSamplesData"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableLinksData"/>
         </variation>
         <variation name="CreateDownloadableProductEntityTestVariation11" summary="Create product with three links without description">
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
-            <data name="issue" xsi:type="string">MAGETWO-67096: [FT] Magento\Downloadable\Test\TestCase\CreateDownloadableProductEntityTest fails on Jenkins</data>
             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
             <data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">65</data>
@@ -209,12 +200,12 @@
             <data name="product/data/downloadable_links/dataset" xsi:type="string">with_three_links</data>
             <data name="product/data/custom_options/dataset" xsi:type="string">default</data>
             <data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableLinksData" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsOnProductPage" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableLinksData"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsOnProductPage"/>
         </variation>
         <variation name="CreateDownloadableProductEntityTestVariation12" summary="Create product without filling quantity and stock">
             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
@@ -225,10 +216,10 @@
             <data name="product/data/category" xsi:type="string">default_category</data>
             <data name="product/data/downloadable_links/dataset" xsi:type="string">with_two_separately_links</data>
             <data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage"/>
         </variation>
         <variation name="CreateDownloadableProductEntityTestVariation13" summary="Create product with special price">
             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
@@ -241,11 +232,11 @@
             <data name="product/data/downloadable_links/dataset" xsi:type="string">with_two_separately_links</data>
             <data name="product/data/special_price" xsi:type="string">5</data>
             <data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSpecialPriceOnProductPage" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSpecialPriceOnProductPage"/>
         </variation>
         <variation name="CreateDownloadableProductEntityTestVariation14" summary="Create product with group price">
             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
@@ -257,10 +248,10 @@
             <data name="product/data/category" xsi:type="string">category %isolation%</data>
             <data name="product/data/downloadable_links/dataset" xsi:type="string">with_two_separately_links</data>
             <data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage"/>
         </variation>
         <variation name="CreateDownloadableProductEntityTestVariation15" summary="Create product with tier price">
             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
@@ -273,11 +264,11 @@
             <data name="product/data/downloadable_links/dataset" xsi:type="string">with_two_separately_links</data>
             <data name="product/data/tier_price/dataset" xsi:type="string">default</data>
             <data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid"/>
+            <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage"/>
         </variation>
         <variation name="CreateDownloadableProductEntityTestVariation16" summary="Create downloadable product and assign it to custom website">
             <data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
@@ -288,8 +279,8 @@
             <data name="product/data/downloadable_links/dataset" xsi:type="string">one_separately_link</data>
             <data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>
             <data name="product/data/website_ids/0/dataset" xsi:type="string">custom_store</data>
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductOnCustomWebsite" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductOnCustomWebsite"/>
         </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View.php
index 5627a9d887bc7..c47df8c5463e5 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Catalog/Product/View.php
@@ -27,14 +27,15 @@ class View extends ParentView
      *
      * @var string
      */
-    protected $formatTierPrice = "//tbody[%row-number%]//ul[contains(@class,'tier')]//*[@class='item'][%line-number%]";
+    protected $formatTierPrice =
+        "//tr[@class='row-tier-price'][%row-number%]//ul[contains(@class,'tier')]//*[@class='item'][%line-number%]";
 
     /**
      * This member holds the class name of the special price block.
      *
      * @var string
      */
-    protected $formatSpecialPrice = '//tbody[%row-number%]//*[contains(@class,"price-box")]';
+    protected $formatSpecialPrice = '//tbody//tr[%row-number%]//*[contains(@class,"price-box")]';
 
     /**
      * Get grouped product block
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.xml
index dce1358a1ecf4..59c00683e3b1a 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.xml
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.xml
@@ -58,7 +58,7 @@
         <field name="sku" is_required="1" group="product-details" />
         <field name="small_image" is_required="0" />
         <field name="small_image_label" is_required="0" />
-        <field name="status" is_required="0" />
+        <field name="status" is_required="0" group="product-details" />
         <field name="thumbnail" is_required="0" />
         <field name="thumbnail_label" is_required="0" />
         <field name="updated_at" is_required="1" />
@@ -66,7 +66,7 @@
         <field name="upsell_tgtr_position_limit" is_required="0" />
         <field name="url_key" is_required="0" group="search-engine-optimization" />
         <field name="url_path" is_required="0" />
-        <field name="visibility" is_required="0" />
+        <field name="visibility" is_required="0" group="product-details" />
         <field name="id" />
         <field name="type_id" />
         <field name="attribute_set_id" group="product-details" source="Magento\Catalog\Test\Fixture\Product\AttributeSetId" />
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml
index 38ef02ff49441..39f4fd08bb922 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.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\GroupedProduct\Test\TestCase\CreateGroupedProductEntityTest" summary="Create Grouped Product" ticketId="MAGETWO-24877">
         <variation name="CreateGroupedProductEntityTestVariation1" summary="Create Grouped Product and Assign It to the Category" ticketId="MAGETWO-13610">
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, stable:no</data>
+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
             <data name="product/data/url_key" xsi:type="string">test-grouped-product-%isolation%</data>
             <data name="product/data/name" xsi:type="string">GroupedProduct %isolation%</data>
             <data name="product/data/sku" xsi:type="string">GroupedProduct_sku%isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertReportStatisticsNoticeMessage.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertReportStatisticsNoticeMessage.php
index 4650905fc4147..0345691c32f61 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertReportStatisticsNoticeMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertReportStatisticsNoticeMessage.php
@@ -7,8 +7,6 @@
 namespace Magento\Reports\Test\Constraint;
 
 use Magento\Reports\Test\Page\Adminhtml\SalesReport;
-use Magento\Sales\Test\Fixture\OrderInjectable;
-use DateTime;
 
 /**
  * Assert that message in Sales Reports Pages displays correct date/time.
@@ -27,22 +25,22 @@ class AssertReportStatisticsNoticeMessage extends AbstractAssertSalesReportResul
      *
      * @param array $salesReport
      * @param SalesReport $salesReportPage
-     * @param DateTime $currentDate
      * @return void
      */
     public function processAssert(
         array $salesReport,
-        SalesReport $salesReportPage,
-        DateTime $currentDate
+        SalesReport $salesReportPage
     ) {
+        $timezone = new \DateTimeZone($_ENV['magento_timezone']);
+        $initialDate = new \DateTime('now', $timezone);
         $this->salesReportPage = $salesReportPage;
         $this->searchInSalesReportGrid($salesReport);
-        $date = $this->getLastUpdatedDate();
-        $currentDateTime = $currentDate->format('M j, Y, g');
-        $displayedDateTime = date('M j, Y, g', strtotime($date));
-        \PHPUnit_Framework_Assert::assertEquals(
-            $currentDateTime,
-            $displayedDateTime,
+        $displayedDate = new \DateTime($this->getLastUpdatedDate(), $timezone);
+        $currentDate = new \DateTime('now', $timezone);
+
+        \PHPUnit_Framework_Assert::assertTrue(
+            $displayedDate->getTimestamp() > $initialDate->getTimestamp()
+            && $displayedDate->getTimestamp() < $currentDate->getTimestamp(),
             "Message in Sales Reports Page is displayed in an incorrect timezone."
         );
     }
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.xml
index 998102bcfbc45..20501b73813fd 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.xml
@@ -22,7 +22,6 @@
             <constraint name="Magento\Reports\Test\Constraint\AssertReportStatisticsNoticeMessage" />
         </variation>
         <variation name="SalesOrderReportEntityTestVariation2">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="order/dataset" xsi:type="string">default</data>
             <data name="order/data/price/dataset" xsi:type="string">full_invoice</data>
             <data name="salesReport/report_type" xsi:type="string">Order Created</data>
@@ -36,7 +35,6 @@
             <constraint name="Magento\Reports\Test\Constraint\AssertSalesReportTotalResult" />
         </variation>
         <variation name="SalesOrderReportEntityTestVariation3">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="order/dataset" xsi:type="string">default</data>
             <data name="order/data/price/dataset" xsi:type="string">full_invoice</data>
             <data name="salesReport/report_type" xsi:type="string">Order Updated</data>
@@ -50,5 +48,19 @@
             <constraint name="Magento\Reports\Test\Constraint\AssertSalesReportIntervalResult" />
             <constraint name="Magento\Reports\Test\Constraint\AssertSalesReportTotalResult" />
         </variation>
+        <variation name="SalesOrderReportEntityTestVariation4">
+            <data name="order/dataset" xsi:type="string">default</data>
+            <data name="order/data/price/dataset" xsi:type="string">full_invoice</data>
+            <data name="salesReport/report_type" xsi:type="string">Order Created</data>
+            <data name="salesReport/period_type" xsi:type="string">Year</data>
+            <data name="salesReport/from" xsi:type="string">12/31/Y 12:00 a-1 year</data>
+            <data name="salesReport/to" xsi:type="string">m/d/Y 12:00</data>
+            <data name="salesReport/show_order_statuses" xsi:type="string">Any</data>
+            <data name="salesReport/show_empty_rows" xsi:type="string">Yes</data>
+            <data name="salesReport/show_actual_columns" xsi:type="string">No</data>
+            <constraint name="Magento\Reports\Test\Constraint\AssertSalesReportIntervalResult" />
+            <constraint name="Magento\Reports\Test\Constraint\AssertSalesReportTotalResult" />
+            <constraint name="Magento\Reports\Test\Constraint\AssertReportStatisticsNoticeMessage" />
+        </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.xml
index 27014c0afb375..58fad5925e5bf 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest.xml
@@ -20,7 +20,6 @@
             <constraint name="Magento\Reports\Test\Constraint\AssertRefundReportIntervalResult" />
         </variation>
         <variation name="SalesRefundsReportEntityTestVariation2">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="description" xsi:type="string">assert refunds month report</data>
             <data name="order/dataset" xsi:type="string">default</data>
             <data name="order/data/price/dataset" xsi:type="string">full_invoice</data>
@@ -33,7 +32,6 @@
             <constraint name="Magento\Reports\Test\Constraint\AssertRefundReportIntervalResult" />
         </variation>
         <variation name="SalesRefundsReportEntityTestVariation3">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="description" xsi:type="string">assert refund Daily report</data>
             <data name="order/dataset" xsi:type="string">default</data>
             <data name="order/data/price/dataset" xsi:type="string">full_invoice</data>
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 d13137c4887f7..e9b0c372a09eb 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
@@ -55,6 +55,13 @@ class Totals extends \Magento\Sales\Test\Block\Adminhtml\Order\Totals
      */
     private $updateTotalsSelector = '.update-totals-button';
 
+    /**
+     * Loader css selector.
+     *
+     * @var string
+     */
+    private $loader = '[data-role="loader"]';
+
     /**
      * Submit invoice.
      *
@@ -126,6 +133,22 @@ public function clickUpdateTotals()
         $button = $this->_rootElement->find($this->updateTotalsSelector);
         if (!$button->isDisabled()) {
             $button->click();
+            $this->waitLoader();
         }
     }
+
+    /**
+     * Wait loader to disappear.
+     *
+     * @return void
+     */
+    private function waitLoader()
+    {
+        $this->browser->waitUntil(
+            function () {
+                $element = $this->browser->find($this->loader);
+                return $element->isVisible() == false ? true : null;
+            }
+        );
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
index 6d3b99ce81a04..9f4181b70e801 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
@@ -11,17 +11,17 @@
 
 /**
  * Class AssertOrderCancelMassActionFailMessage
- * Assert cancel fail message is displayed on order index page
+ * Assert cancel fail message is displayed on order index page.
  */
 class AssertOrderCancelMassActionFailMessage extends AbstractConstraint
 {
     /**
-     * Text value to be checked
+     * Text value to be checked.
      */
-    const FAIL_CANCEL_MESSAGE = '1 order(s) cannot be canceled.';
+    const FAIL_CANCEL_MESSAGE = 'You cannot cancel the order(s).';
 
     /**
-     * Assert cancel fail message is displayed on order index page
+     * Assert cancel fail message is displayed on order index page.
      *
      * @param OrderIndex $orderIndex
      * @return void
@@ -35,7 +35,7 @@ public function processAssert(OrderIndex $orderIndex)
     }
 
     /**
-     * Returns a string representation of the object
+     * Returns a string representation of the object.
      *
      * @return string
      */
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
index 46f6ebba51fe1..7a46d0c5ef820 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
@@ -39,8 +39,8 @@ public function processAssert(
         /** @var \Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info $infoTab */
         $infoTab = $salesOrderView->getOrderForm()->openTab('info')->getTab('info');
         \PHPUnit_Framework_Assert::assertEquals(
-            $infoTab->getOrderStatus(),
-            $orderStatus
+            $orderStatus,
+            $infoTab->getOrderStatus()
         );
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml
index 6ae9d19a898bc..28894ed6cc158 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml
@@ -9,7 +9,6 @@
     <testCase name="Magento\Ui\Test\TestCase\GridSortingTest" summary="Grid UI Component Sorting" ticketId="MAGETWO-41328">
         <variation name="SalesOrderGridSorting">
             <data name="tag" xsi:type="string">severity:S2</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <data name="description" xsi:type="string">Verify sales order grid storting</data>
             <data name="steps" xsi:type="array">
                 <item name="0" xsi:type="string">-</item>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml
index eddc321e9ca52..1f75b07c8ca1e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml
@@ -8,7 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Sales\Test\TestCase\MassOrdersUpdateTest" summary="Mass Update Orders" ticketId="MAGETWO-27897">
         <variation name="MassOrdersUpdateTestVariation1">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="description" xsi:type="string">cancel orders in status Pending and Processing</data>
             <data name="steps" xsi:type="string">-</data>
             <data name="action" xsi:type="string">Cancel</data>
@@ -18,20 +17,20 @@
             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
         </variation>
         <variation name="MassOrdersUpdateTestVariation2">
-            <data name="description" xsi:type="string">try to cancel orders in status Complete, Canceled</data>
+            <data name="description" xsi:type="string">try to cancel orders in status Complete, Closed</data>
             <data name="steps" xsi:type="string">invoice, shipment|invoice, credit memo</data>
             <data name="action" xsi:type="string">Cancel</data>
             <data name="ordersCount" xsi:type="string">2</data>
-            <data name="resultStatuses" xsi:type="string">Complete,Canceled</data>
+            <data name="resultStatuses" xsi:type="string">Complete,Closed</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelMassActionFailMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
         </variation>
         <variation name="MassOrdersUpdateTestVariation3">
-            <data name="description" xsi:type="string">try to cancel orders in status Pending, Closed</data>
+            <data name="description" xsi:type="string">try to cancel orders in status Processing, Closed</data>
             <data name="steps" xsi:type="string">invoice|invoice, credit memo</data>
             <data name="action" xsi:type="string">Cancel</data>
             <data name="ordersCount" xsi:type="string">2</data>
-            <data name="resultStatuses" xsi:type="string">Processing,Canceled</data>
+            <data name="resultStatuses" xsi:type="string">Processing,Closed</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelMassActionFailMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
         </variation>
@@ -45,7 +44,6 @@
             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
         </variation>
         <variation name="MassOrdersUpdateTestVariation5">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="description" xsi:type="string">Try to put order in status Complete on Hold</data>
             <data name="steps" xsi:type="string">invoice, shipment</data>
             <data name="action" xsi:type="string">Hold</data>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml
index 6f568df8f21ca..a9bd3fcacea8a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml
@@ -14,7 +14,6 @@
             <constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
         </variation>
         <variation name="MoveLastOrderedProductsOnOrderPageTestVariation2">
-            <data name="issue" xsi:type="string">MAGETWO-58762: Customer grid does not open in MoveLastOrderedProductsOnOrderPageTestVariation2 on Jenkins</data>
             <data name="order/dataset" xsi:type="string">default</data>
             <data name="order/data/entity_id/products" xsi:type="string">configurableProduct::configurable_with_qty_1</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.php
index 2627f99d4c8c2..54cec6cf279f6 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.php
@@ -28,6 +28,13 @@ class PromoQuoteForm extends FormSections
      */
     protected $waitForSelectorVisible = false;
 
+    /**
+     * Selector of name element on the form.
+     *
+     * @var string
+     */
+    private $nameElementSelector = 'input[name=name]';
+
     /**
      * Fill form with sections.
      *
@@ -38,6 +45,8 @@ class PromoQuoteForm extends FormSections
      */
     public function fill(FixtureInterface $fixture, SimpleElement $element = null, array $replace = null)
     {
+        $this->waitForElementNotVisible($this->waitForSelector);
+        $this->waitForElementVisible($this->nameElementSelector);
         $sections = $this->getFixtureFieldsByContainers($fixture);
         if ($replace) {
             $sections = $this->prepareData($sections, $replace);
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
index 586ad2acee203..4995c1feb048e 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.xml
@@ -75,7 +75,6 @@
             <data name="salesRule/data/coupon_code" xsi:type="string">Lorem ipsum dolor sit amet, consectetur adipiscing elit - %isolation%</data>
             <data name="salesRule/data/simple_action" xsi:type="string">Fixed amount discount for whole cart</data>
             <data name="salesRule/data/discount_amount" xsi:type="string">60</data>
-            <data name="salesRule/data/apply_to_shipping" xsi:type="string">No</data>
             <data name="salesRule/data/simple_free_shipping" xsi:type="string">No</data>
             <data name="salesRule/data/store_labels/0" xsi:type="string">Coupon code+Fixed amount discount for whole cart</data>
             <data name="productForSalesRule1/dataset" xsi:type="string">simple_for_salesrule_1</data>
diff --git a/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/AdvancedSearchWithAttributeTest.xml b/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/AdvancedSearchWithAttributeTest.xml
index 13c7051d0c1ba..733b110ec5494 100644
--- a/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/AdvancedSearchWithAttributeTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/AdvancedSearchWithAttributeTest.xml
@@ -8,8 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Search\Test\TestCase\AdvancedSearchWithAttributeTest" summary="Use Advanced Search by Decimal indexable attribute if Edit/Add Attribute" ticketId="MAGETWO-25931">
         <variation name="AdvancedSearchWithWeightAttributeTestVariation1">
-            <data name="issue" xsi:type="string">MAGETWO-65408: [FT] Magento\Search\Test\TestCase\AdvancedSearchWithAttributeTest fails on Jenkins</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <data name="productDropDownList/0" xsi:type="string">configurable</data>
             <data name="productDropDownList/1" xsi:type="string">simple</data>
             <data name="productDropDownList/2" xsi:type="string">bundle</data>
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/Curl.php b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/Curl.php
index 2fb05e59c379a..091cea329b78e 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Store/Curl.php
@@ -90,22 +90,29 @@ protected function prepareData(FixtureInterface $fixture)
      */
     protected function getStoreId($name)
     {
-        //Set pager limit to 2000 in order to find created store view by name
-        $url = $_ENV['app_backend_url'] . 'admin/system_store/index/sort/store_title/dir/asc/limit/2000';
+        $url = $_ENV['app_backend_url'] . 'mui/index/render/';
+        $data = [
+            'namespace' => 'store_listing',
+            'filters' => [
+                'placeholder' => true,
+                'store_title' => $name,
+            ],
+            'paging' => [
+                'pageSize' => 1,
+            ]
+        ];
         $curl = new BackendDecorator(new CurlTransport(), $this->_configuration);
-        $curl->addOption(CURLOPT_HEADER, 1);
-        $curl->write($url, [], CurlInterface::GET);
+
+        $curl->write($url, $data, CurlInterface::POST);
         $response = $curl->read();
+        $curl->close();
 
-        $expectedUrl = '/admin/system_store/editStore/store_id/';
-        $expectedUrl = preg_quote($expectedUrl);
-        $expectedUrl = str_replace('/', '\/', $expectedUrl);
-        preg_match('/' . $expectedUrl . '([0-9]*)\/(.)*>' . $name . '<\/a>/', $response, $matches);
+        preg_match('/store_listing_data_source.+items.+"store_id":"(\d+)"/', $response, $match);
 
-        if (empty($matches)) {
+        if (empty($match)) {
             throw new \Exception('Cannot find store id');
         }
 
-        return empty($matches[1]) ? null : $matches[1];
+        return intval($match[1]);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php
index d593165405102..511f0ed4f4a44 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php
@@ -49,23 +49,30 @@ public function persist(FixtureInterface $fixture = null)
      */
     protected function getStoreGroupIdByGroupName($storeName)
     {
-        //Set pager limit to 2000 in order to find created store group by name
-        $url = $_ENV['app_backend_url'] . 'admin/system_store/index/sort/group_title/dir/asc/limit/2000';
+        $url = $_ENV['app_backend_url'] . 'mui/index/render/';
+        $data = [
+            'namespace' => 'store_listing',
+            'filters' => [
+                'placeholder' => true,
+                'group_title' => $storeName,
+            ],
+            'paging' => [
+                'pageSize' => 1,
+            ]
+        ];
         $curl = new BackendDecorator(new CurlTransport(), $this->_configuration);
-        $curl->addOption(CURLOPT_HEADER, 1);
-        $curl->write($url, [], CurlInterface::GET);
+
+        $curl->write($url, $data, CurlInterface::POST);
         $response = $curl->read();
+        $curl->close();
 
-        $expectedUrl = '/admin/system_store/editGroup/group_id/';
-        $expectedUrl = preg_quote($expectedUrl);
-        $expectedUrl = str_replace('/', '\/', $expectedUrl);
-        preg_match('/' . $expectedUrl . '([0-9]*)\/(.)*>' . $storeName . '<\/a>/', $response, $matches);
+        preg_match('/store_listing_data_source.+items.+"group_id":"(\d+)"/', $response, $match);
 
-        if (empty($matches)) {
+        if (empty($match)) {
             throw new \Exception('Cannot find store group id');
         }
 
-        return (int)$matches[1];
+        return (int)$match[1];
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php
index ecc59ebb55ca5..0e83e36c0f109 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Handler/Website/Curl.php
@@ -103,23 +103,30 @@ public function persist(FixtureInterface $fixture = null)
      */
     protected function getWebSiteIdByWebsiteName($websiteName)
     {
-        // Set pager limit to 2000 in order to find created website by name
-        $url = $_ENV['app_backend_url'] . 'admin/system_store/index/sort/group_title/dir/asc/limit/2000';
+        $url = $_ENV['app_backend_url'] . 'mui/index/render/';
+        $data = [
+            'namespace' => 'store_listing',
+            'filters' => [
+                'placeholder' => true,
+                'name' => $websiteName,
+            ],
+            'paging' => [
+                'pageSize' => 1,
+            ]
+        ];
         $curl = new BackendDecorator(new CurlTransport(), $this->_configuration);
-        $curl->addOption(CURLOPT_HEADER, 1);
-        $curl->write($url, [], CurlInterface::GET);
+
+        $curl->write($url, $data, CurlInterface::POST);
         $response = $curl->read();
+        $curl->close();
 
-        $expectedUrl = '/admin/system_store/editWebsite/website_id/';
-        $expectedUrl = preg_quote($expectedUrl);
-        $expectedUrl = str_replace('/', '\/', $expectedUrl);
-        preg_match('/' . $expectedUrl . '([0-9]*)\/(.)*>' . $websiteName . '<\/a>/', $response, $matches);
+        preg_match('/store_listing_data_source.+items.+"website_id":"(\d+)"/', $response, $match);
 
-        if (empty($matches)) {
+        if (empty($match)) {
             throw new \Exception('Cannot find website id.');
         }
 
-        return (int)$matches[1];
+        return (int)$match[1];
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php
index e867ebe399784..86c7c365b16ad 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php
@@ -12,6 +12,7 @@
 use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
 use Magento\Store\Test\Fixture\Store;
 use Magento\Mtf\TestCase\Injectable;
+use Magento\Config\Test\TestStep\SetupConfigurationStep;
 
 /**
  * Test Creation for DeleteStoreEntity
@@ -100,7 +101,15 @@ public function test(Store $store, $createBackup)
     {
         // Preconditions:
         $store->persist();
-        $this->backupIndex->open()->getBackupGrid()->massaction([], 'Delete', true, 'Select All');
+        /** @var SetupConfigurationStep $enableBackupsStep */
+        $enableBackupsStep = $this->objectManager->create(
+            SetupConfigurationStep::class,
+            ['configData' => 'enable_backups_functionality']
+        );
+        $enableBackupsStep->run();
+        $this->backupIndex->open()
+            ->getBackupGrid()
+            ->massaction([], 'Delete', true, 'Select All');
 
         // Steps:
         $this->storeIndex->open();
@@ -110,4 +119,19 @@ public function test(Store $store, $createBackup)
         $this->storeDelete->getFormPageActions()->delete();
         $this->storeDelete->getModalBlock()->acceptAlert();
     }
+
+    /**
+     * Reset config settings to default.
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        /** @var SetupConfigurationStep $enableBackupsStep */
+        $enableBackupsStep = $this->objectManager->create(
+            SetupConfigurationStep::class,
+            ['configData' => 'enable_backups_functionality', 'rollback' => true]
+        );
+        $enableBackupsStep->run();
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php
index cd37576443cdb..4338da84545d6 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php
@@ -12,6 +12,7 @@
 use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
 use Magento\Store\Test\Fixture\StoreGroup;
 use Magento\Mtf\TestCase\Injectable;
+use Magento\Config\Test\TestStep\SetupConfigurationStep;
 
 /**
  * Delete StoreGroup (Store Management)
@@ -101,7 +102,15 @@ public function test(StoreGroup $storeGroup, $createBackup)
     {
         //Preconditions
         $storeGroup->persist();
-        $this->backupIndex->open()->getBackupGrid()->massaction([], 'Delete', true, 'Select All');
+        /** @var SetupConfigurationStep $enableBackupsStep */
+        $enableBackupsStep = $this->objectManager->create(
+            SetupConfigurationStep::class,
+            ['configData' => 'enable_backups_functionality']
+        );
+        $enableBackupsStep->run();
+        $this->backupIndex->open()
+            ->getBackupGrid()
+            ->massaction([], 'Delete', true, 'Select All');
 
         //Steps
         $this->storeIndex->open();
@@ -110,4 +119,19 @@ public function test(StoreGroup $storeGroup, $createBackup)
         $this->deleteGroup->getDeleteGroupForm()->fillForm(['create_backup' => $createBackup]);
         $this->deleteGroup->getFormPageActions()->delete();
     }
+
+    /**
+     * Reset config settings to default.
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        /** @var SetupConfigurationStep $enableBackupsStep */
+        $enableBackupsStep = $this->objectManager->create(
+            SetupConfigurationStep::class,
+            ['configData' => 'enable_backups_functionality', 'rollback' => true]
+        );
+        $enableBackupsStep->run();
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
index 2431cb3e065d2..9157e1cbd12d4 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
@@ -12,6 +12,7 @@
 use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
 use Magento\Store\Test\Fixture\Website;
 use Magento\Mtf\TestCase\Injectable;
+use Magento\Config\Test\TestStep\SetupConfigurationStep;
 
 /**
  * Delete Website (Store Management)
@@ -102,7 +103,15 @@ public function test(Website $website, $createBackup)
     {
         //Preconditions
         $website->persist();
-        $this->backupIndex->open()->getBackupGrid()->massaction([], 'Delete', true, 'Select All');
+        /** @var SetupConfigurationStep $enableBackupsStep */
+        $enableBackupsStep = $this->objectManager->create(
+            SetupConfigurationStep::class,
+            ['configData' => 'enable_backups_functionality']
+        );
+        $enableBackupsStep->run();
+        $this->backupIndex->open()
+            ->getBackupGrid()
+            ->massaction([], 'Delete', true, 'Select All');
 
         //Steps
         $this->storeIndex->open();
@@ -111,4 +120,19 @@ public function test(Website $website, $createBackup)
         $this->deleteWebsite->getDeleteWebsiteForm()->fillForm(['create_backup' => $createBackup]);
         $this->deleteWebsite->getFormPageActions()->delete();
     }
+
+    /**
+     * Reset config settings to default.
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        /** @var SetupConfigurationStep $enableBackupsStep */
+        $enableBackupsStep = $this->objectManager->create(
+            SetupConfigurationStep::class,
+            ['configData' => 'enable_backups_functionality', 'rollback' => true]
+        );
+        $enableBackupsStep->run();
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestStep/DeleteWebsitesEntityStep.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestStep/DeleteWebsitesEntityStep.php
index c18f5629d2e02..1c1413274d60f 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestStep/DeleteWebsitesEntityStep.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestStep/DeleteWebsitesEntityStep.php
@@ -10,10 +10,12 @@
 use Magento\Backend\Test\Page\Adminhtml\DeleteWebsite;
 use Magento\Backend\Test\Page\Adminhtml\StoreIndex;
 use Magento\Backup\Test\Page\Adminhtml\BackupIndex;
+use Magento\Config\Test\TestStep\SetupConfigurationStep;
 use Magento\Store\Test\Fixture\Store;
 use Magento\Mtf\TestStep\TestStepInterface;
 use Magento\Mtf\Fixture\FixtureFactory;
 use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\TestStep\TestStepFactory;
 
 /**
  * Test Step for DeleteStoreEntity
@@ -72,6 +74,11 @@ class DeleteWebsitesEntityStep implements TestStepInterface
      */
     private $createBackup;
 
+    /**
+     * @var TestStepFactory
+     */
+    private $stepFactory;
+
     /**
      * Prepare pages for test
      *
@@ -81,6 +88,7 @@ class DeleteWebsitesEntityStep implements TestStepInterface
      * @param DeleteWebsite $deleteWebsite
      * @param FixtureFactory $fixtureFactory
      * @param FixtureInterface $item
+     * @param TestStepFactory $testStepFactory
      * @param string $createBackup
      */
     public function __construct(
@@ -90,6 +98,7 @@ public function __construct(
         DeleteWebsite $deleteWebsite,
         FixtureFactory $fixtureFactory,
         FixtureInterface $item,
+        TestStepFactory $testStepFactory,
         $createBackup = 'No'
     ) {
         $this->storeIndex = $storeIndex;
@@ -99,6 +108,7 @@ public function __construct(
         $this->item = $item;
         $this->createBackup = $createBackup;
         $this->fixtureFactory = $fixtureFactory;
+        $this->stepFactory = $testStepFactory;
     }
 
     /**
@@ -108,6 +118,12 @@ public function __construct(
      */
     public function run()
     {
+        /** @var SetupConfigurationStep $enableBackupsStep */
+        $enableBackupsStep = $this->stepFactory->create(
+            SetupConfigurationStep::class,
+            ['configData' => 'enable_backups_functionality']
+        );
+        $enableBackupsStep->run();
         $this->backupIndex->open()->getBackupGrid()->massaction([], 'Delete', true, 'Select All');
         $this->storeIndex->open();
         $websiteNames = $this->item->getWebsiteIds();
diff --git a/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php
index 083fa246c96ef..f4adb9dec1250 100644
--- a/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php
@@ -29,21 +29,32 @@ public function __construct(DataInterface $configuration, EventManagerInterface
         ];
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected function changeStructureOfTheData(array $data): array
+    {
+        return parent::changeStructureOfTheData($data);
+    }
+
     /**
      * Re-map options from default options structure to swatches structure,
      * as swatches was initially created with name convention differ from other attributes.
      *
-     * @param array $data
-     * @return array
+     * @inheritdoc
      */
-    protected function changeStructureOfTheData(array $data)
+    protected function getSerializeOptions(array $data): string
     {
-        $data = parent::changeStructureOfTheData($data);
-        $data['optiontext'] = $data['option'];
-        $data['swatchtext'] = [
-            'value' => $data['option']['value']
-        ];
-        unset($data['option']);
-        return $data;
+        $options = [];
+        foreach ($data as $optionRowData) {
+            $optionRowData['optiontext'] = $optionRowData['option'];
+            $optionRowData['swatchtext'] = [
+                'value' => $optionRowData['option']['value']
+            ];
+            unset($optionRowData['option']);
+            $options[] = http_build_query($optionRowData);
+        }
+
+        return json_encode($options);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/Curl.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/Curl.php
index 64f69d44abc80..bdc3015a81272 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/TaxRule/Curl.php
@@ -46,7 +46,7 @@ public function persist(FixtureInterface $fixture = null)
         $response = $curl->read();
         $curl->close();
 
-        if (!strpos($response, 'data-ui-id="messages-message-success"')) {
+        if (strpos($response, 'data-ui-id="messages-message-success"') === false) {
             $this->_eventManager->dispatchEvent(['curl_failed'], [$response]);
             throw new \Exception("Tax rate creation by curl handler was not successful!");
         }
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/Block/StoredPayments.php b/dev/tests/functional/tests/app/Magento/Vault/Test/Block/StoredPayments.php
index d839ff2cd927e..51f60afbfa73d 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/Block/StoredPayments.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/Block/StoredPayments.php
@@ -25,6 +25,13 @@ class StoredPayments extends Block
      */
     private $deleteStoredPayment = '.delete';
 
+    /**
+     * Content in popup modal window.
+     *
+     * @var string
+     */
+    private $popupModalContent = '.modal-content';
+
     /**
      * Delete saved credit card.
      *
@@ -33,8 +40,10 @@ class StoredPayments extends Block
     public function deleteCreditCard(ElementInterface $creditCard)
     {
         $creditCard->click();
+        $this->waitForElementVisible($this->popupModalContent);
         $this->browser->selectWindow();
         $this->browser->find($this->deleteButton, Locator::SELECTOR_XPATH)->click();
+        $this->waitForElementNotVisible($this->popupModalContent);
         $this->browser->selectWindow();
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml
index eaffe2485f222..dadf97d7940bd 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml
@@ -110,6 +110,7 @@
             <data name="product" xsi:type="array">
                 <item name="0" xsi:type="string">bundleProduct::with_special_price_and_custom_options</item>
             </data>
+            <data name="configure" xsi:type="boolean">false</data>
             <constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist"/>
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInCustomerBackendWishlist"/>
diff --git a/dev/tests/functional/utils/command.php b/dev/tests/functional/utils/command.php
deleted file mode 100644
index 8eaf82475a4e4..0000000000000
--- a/dev/tests/functional/utils/command.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-require_once __DIR__ . '/../../../../app/bootstrap.php';
-
-use Symfony\Component\Console\Input\StringInput;
-use Symfony\Component\Console\Output\NullOutput;
-
-if (isset($_GET['command'])) {
-    $command = urldecode($_GET['command']);
-    $magentoObjectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
-    $magentoObjectManager = $magentoObjectManagerFactory->create($_SERVER);
-    $cli = $magentoObjectManager->create(\Magento\Framework\Console\Cli::class);
-    $input = new StringInput($command);
-    $input->setInteractive(false);
-    $output = new NullOutput();
-    $cli->doRun($input, $output);
-} else {
-    throw new \InvalidArgumentException("Command GET parameter is not set.");
-}
diff --git a/dev/tests/functional/utils/export.php b/dev/tests/functional/utils/export.php
deleted file mode 100644
index 343dcc557c832..0000000000000
--- a/dev/tests/functional/utils/export.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-if (!isset($_GET['template'])) {
-    throw new \InvalidArgumentException('Argument "template" must be set.');
-}
-
-$varDir = '../../../../var/';
-$template = urldecode($_GET['template']);
-$fileList = scandir($varDir, SCANDIR_SORT_NONE);
-$files = [];
-
-foreach ($fileList as $fileName) {
-    if (preg_match("`$template`", $fileName) === 1) {
-        $filePath = $varDir . $fileName;
-        $files[] = [
-            'content' => file_get_contents($filePath),
-            'name' => $fileName,
-            'date' => filectime($filePath),
-        ];
-    }
-}
-
-echo serialize($files);
diff --git a/dev/tests/functional/utils/locales.php b/dev/tests/functional/utils/locales.php
deleted file mode 100644
index 827b8b1b89448..0000000000000
--- a/dev/tests/functional/utils/locales.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-if (isset($_GET['type']) && $_GET['type'] == 'deployed') {
-    $themePath = isset($_GET['theme_path']) ? $_GET['theme_path'] : 'adminhtml/Magento/backend';
-    $directory = __DIR__ . '/../../../../pub/static/' . $themePath;
-    $locales = array_diff(scandir($directory), ['..', '.']);
-} else {
-    require_once __DIR__ . DIRECTORY_SEPARATOR . 'bootstrap.php';
-    $localeConfig = $magentoObjectManager->create(\Magento\Framework\Locale\Config::class);
-    $locales = $localeConfig->getAllowedLocales();
-}
-
-echo implode('|', $locales);
diff --git a/dev/tests/functional/utils/log.php b/dev/tests/functional/utils/log.php
deleted file mode 100644
index 8f07d72e2a569..0000000000000
--- a/dev/tests/functional/utils/log.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-if (!isset($_GET['name'])) {
-    throw new \InvalidArgumentException(
-        'The name of log file is required for getting logs.'
-    );
-}
-$name = urldecode($_GET['name']);
-if (preg_match('/\.\.(\\\|\/)/', $name)) {
-    throw new \InvalidArgumentException('Invalid log file name');
-}
-
-echo serialize(file_get_contents('../../../../var/log' .'/' .$name));
diff --git a/dev/tests/functional/utils/pathChecker.php b/dev/tests/functional/utils/pathChecker.php
deleted file mode 100644
index 11f8229bce56f..0000000000000
--- a/dev/tests/functional/utils/pathChecker.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-if (isset($_GET['path'])) {
-    $path = urldecode($_GET['path']);
-
-    if (file_exists('../../../../' . $path)) {
-        echo 'path exists: true';
-    } else {
-        echo 'path exists: false';
-    }
-} else {
-    throw new \InvalidArgumentException("GET parameter 'path' is not set.");
-}
diff --git a/dev/tests/functional/utils/website.php b/dev/tests/functional/utils/website.php
deleted file mode 100644
index 625f5c6b483f8..0000000000000
--- a/dev/tests/functional/utils/website.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-if (!isset($_GET['website_code'])) {
-    throw new \Exception("website_code GET parameter is not set.");
-}
-
-$websiteCode = urldecode($_GET['website_code']);
-$rootDir = '../../../../';
-$websiteDir = $rootDir . 'websites/' . $websiteCode . '/';
-$contents = file_get_contents($rootDir . 'index.php');
-
-$websiteParam = <<<EOD
-\$params = \$_SERVER;
-\$params[\Magento\Store\Model\StoreManager::PARAM_RUN_CODE] = '$websiteCode';
-\$params[\Magento\Store\Model\StoreManager::PARAM_RUN_TYPE] = 'website';
-EOD;
-
-$pattern = '`(try {.*?)(\/app\/bootstrap.*?}\n)(.*?)\$_SERVER`mis';
-$replacement = "$1/../..$2\n$websiteParam$3\$params";
-
-$contents = preg_replace($pattern, $replacement, $contents);
-
-$old = umask(0);
-mkdir($websiteDir, 0760, true);
-umask($old);
-
-copy($rootDir . '.htaccess', $websiteDir . '.htaccess');
-file_put_contents($websiteDir . 'index.php', $contents);
diff --git a/dev/tests/integration/_files/Magento/TestModuleSample/composer.json b/dev/tests/integration/_files/Magento/TestModuleSample/composer.json
index f72844a2968f3..bcf490e35c99b 100644
--- a/dev/tests/integration/_files/Magento/TestModuleSample/composer.json
+++ b/dev/tests/integration/_files/Magento/TestModuleSample/composer.json
@@ -2,7 +2,7 @@
   "name": "magento/module-sample-test",
   "description": "test sample module",
   "require": {
-    "php": "~7.0.13|~7.1.0",
+    "php": "~7.0.13|~7.1.0|~7.2.0",
     "magento/framework": "100.1.*",
     "magento/module-integration": "100.1.*"
   },
diff --git a/dev/tests/integration/bin/magento b/dev/tests/integration/bin/magento
new file mode 100755
index 0000000000000..303fbfb217d2b
--- /dev/null
+++ b/dev/tests/integration/bin/magento
@@ -0,0 +1,42 @@
+#!/usr/bin/env php
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+if (PHP_SAPI !== 'cli') {
+    echo 'bin/magento must be run as a CLI application';
+    exit(1);
+}
+
+if (isset($_SERVER['INTEGRATION_TEST_PARAMS'])) {
+    parse_str($_SERVER['INTEGRATION_TEST_PARAMS'], $params);
+    foreach ($params as $paramName => $paramValue) {
+        $_SERVER[$paramName] = $paramValue;
+    }
+} else {
+    echo 'Test parameters are required';
+    exit(1);
+}
+
+try {
+    require $_SERVER['MAGE_DIRS']['base']['path'] . '/app/bootstrap.php';
+} catch (\Exception $e) {
+    echo 'Autoload error: ' . $e->getMessage();
+    exit(1);
+}
+try {
+    $handler = new \Magento\Framework\App\ErrorHandler();
+    set_error_handler([$handler, 'handler']);
+    $application = new Magento\Framework\Console\Cli('Magento CLI');
+    $application->run();
+} catch (\Exception $e) {
+    while ($e) {
+        echo $e->getMessage();
+        echo $e->getTraceAsString();
+        echo "\n\n";
+        $e = $e->getPrevious();
+    }
+    exit(Cli::RETURN_FAILURE);
+}
diff --git a/dev/tests/integration/etc/di/preferences/ce.php b/dev/tests/integration/etc/di/preferences/ce.php
index d5aaa7e730826..fe2c1c7d01740 100644
--- a/dev/tests/integration/etc/di/preferences/ce.php
+++ b/dev/tests/integration/etc/di/preferences/ce.php
@@ -24,5 +24,10 @@
     \Magento\Framework\App\ResourceConnection\ConnectionAdapterInterface::class =>
         \Magento\TestFramework\Db\ConnectionAdapter::class,
     \Magento\Framework\Filesystem\DriverInterface::class => \Magento\Framework\Filesystem\Driver\File::class,
-    \Magento\Framework\App\Config\ScopeConfigInterface::class => \Magento\TestFramework\App\Config::class
+    \Magento\Framework\App\Config\ScopeConfigInterface::class => \Magento\TestFramework\App\Config::class,
+    \Magento\Framework\Lock\Backend\Cache::class =>
+        \Magento\TestFramework\Lock\Backend\DummyLocker::class,
+    \Magento\Framework\ShellInterface::class => \Magento\TestFramework\App\Shell::class,
+    \Magento\Framework\App\Shell::class => \Magento\TestFramework\App\Shell::class,
+    \Magento\Framework\Session\SessionStartChecker::class => \Magento\TestFramework\Session\SessionStartChecker::class,
 ];
diff --git a/dev/tests/integration/framework/Magento/TestFramework/App/Shell.php b/dev/tests/integration/framework/Magento/TestFramework/App/Shell.php
new file mode 100644
index 0000000000000..89f64aec16d06
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/App/Shell.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\App;
+
+/**
+ * Shell command line wrapper encapsulates command execution and arguments escaping
+ */
+class Shell extends \Magento\Framework\App\Shell
+{
+    /**
+     * Override app/shell by running bin/magento located in the integration test and pass environment parameters
+     *
+     * @inheritdoc
+     */
+    public function execute($command, array $arguments = [])
+    {
+        if (strpos($command, BP . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'magento ') !== false) {
+            $command = str_replace(
+                BP . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'magento ',
+                BP . DIRECTORY_SEPARATOR . 'dev' . DIRECTORY_SEPARATOR . 'tests' . DIRECTORY_SEPARATOR . 'integration'
+                . DIRECTORY_SEPARATOR. 'bin' . DIRECTORY_SEPARATOR . 'magento ',
+                $command
+            );
+        }
+
+        $params = \Magento\TestFramework\Helper\Bootstrap::getInstance()->getAppInitParams();
+
+        $params['MAGE_DIRS']['base']['path'] = BP;
+        $params = 'INTEGRATION_TEST_PARAMS="' . urldecode(http_build_query($params)) . '"';
+        $integrationTestCommand = $params . ' ' . $command;
+        $output = parent::execute($integrationTestCommand, $arguments);
+        return $output;
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Isolation/DeploymentConfig.php b/dev/tests/integration/framework/Magento/TestFramework/Isolation/DeploymentConfig.php
index 873fb0366a8e1..ae59bc004db0e 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Isolation/DeploymentConfig.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Isolation/DeploymentConfig.php
@@ -28,6 +28,17 @@ class DeploymentConfig
      */
     private $config;
 
+    /**
+     * Ignore values in the config nested array, paths are separated by single slash "/".
+     *
+     * Example: compiled_config is not set in default mode, and once set it can't be unset
+     *
+     * @var array
+     */
+    private $ignoreValues = [
+        'cache_types/compiled_config',
+    ];
+
     /**
      * Memorizes the initial value of configuration reader and the configuration value
      *
@@ -40,7 +51,7 @@ public function startTestSuite()
     {
         if (null === $this->reader) {
             $this->reader = Bootstrap::getObjectManager()->get(\Magento\Framework\App\DeploymentConfig\Reader::class);
-            $this->config = $this->reader->load();
+            $this->config = $this->filterIgnoredConfigValues($this->reader->load());
         }
     }
 
@@ -57,7 +68,7 @@ public function startTestSuite()
      */
     public function endTest(\PHPUnit\Framework\TestCase $test)
     {
-        $config = $this->reader->load();
+        $config = $this->filterIgnoredConfigValues($this->reader->load());
         if ($this->config != $config) {
             $error = "\n\nERROR: deployment configuration is corrupted. The application state is no longer valid.\n"
                 . 'Further tests may fail.'
@@ -66,4 +77,28 @@ public function endTest(\PHPUnit\Framework\TestCase $test)
             $test->fail($error);
         }
     }
+
+    /**
+     * Filter ignored config values which are not set by default and appear when tests would change state.
+     *
+     * Example: compiled_config is not set in default mode, and once set it can't be unset
+     *
+     * @param array $config
+     * @param string $path
+     * @return array
+     */
+    private function filterIgnoredConfigValues(array $config, string $path = '')
+    {
+        foreach ($config as $configKeyName => $configValue) {
+            $newPath = !empty($path) ?  $path . '/' . $configKeyName : $configKeyName;
+            if (is_array($configValue)) {
+                $config[$configKeyName] = $this->filterIgnoredConfigValues($configValue, $newPath);
+            } else {
+                if (array_key_exists($newPath, array_flip($this->ignoreValues))) {
+                    unset($config[$configKeyName]);
+                }
+            }
+        }
+        return $config;
+    }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Lock/Backend/DummyLocker.php b/dev/tests/integration/framework/Magento/TestFramework/Lock/Backend/DummyLocker.php
new file mode 100644
index 0000000000000..41125493643e3
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Lock/Backend/DummyLocker.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\Lock\Backend;
+
+use Magento\Framework\Lock\LockManagerInterface;
+
+/**
+ * Dummy locker for the integration framework.
+ */
+class DummyLocker implements LockManagerInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function lock(string $name, int $timeout = -1): bool
+    {
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function unlock(string $name): bool
+    {
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isLocked(string $name): bool
+    {
+        return false;
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Session/SessionStartChecker.php b/dev/tests/integration/framework/Magento/TestFramework/Session/SessionStartChecker.php
new file mode 100644
index 0000000000000..136b0565a729a
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Session/SessionStartChecker.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\Session;
+
+/**
+ * Class to check if session can be started or not. Dummy for integration tests.
+ */
+class SessionStartChecker extends \Magento\Framework\Session\SessionStartChecker
+{
+    /**
+     * Can session be started or not.
+     *
+     * @return bool
+     */
+    public function check() : bool
+    {
+        return true;
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
index 543bac2c6b5b5..efa7cda029994 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
@@ -5,10 +5,12 @@
  */
 namespace Magento\TestFramework\TestCase;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 /**
- * A parent class for backend controllers - contains directives for admin user creation and authentication
+ * A parent class for backend controllers - contains directives for admin user creation and authentication.
+ *
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @SuppressWarnings(PHPMD.numberOfChildren)
  */
 abstract class AbstractBackendController extends \Magento\TestFramework\TestCase\AbstractController
 {
@@ -36,6 +38,16 @@ abstract class AbstractBackendController extends \Magento\TestFramework\TestCase
      */
     protected $uri = null;
 
+    /**
+     * @var string|null
+     */
+    protected $httpMethod;
+
+    /**
+     * @inheritDoc
+     *
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -62,6 +74,9 @@ protected function _getAdminCredentials()
         ];
     }
 
+    /**
+     * @inheritDoc
+     */
     protected function tearDown()
     {
         $this->_auth->getAuthStorage()->destroy(['send_expire_cookie' => false]);
@@ -86,21 +101,33 @@ public function assertSessionMessages(
         parent::assertSessionMessages($constraint, $messageType, $messageManagerClass);
     }
 
+    /**
+     * Test ACL configuration for action working.
+     */
     public function testAclHasAccess()
     {
         if ($this->uri === null) {
             $this->markTestIncomplete('AclHasAccess test is not complete');
         }
+        if ($this->httpMethod) {
+            $this->getRequest()->setMethod($this->httpMethod);
+        }
         $this->dispatch($this->uri);
         $this->assertNotSame(403, $this->getResponse()->getHttpResponseCode());
         $this->assertNotSame(404, $this->getResponse()->getHttpResponseCode());
     }
 
+    /**
+     * Test ACL actually denying access.
+     */
     public function testAclNoAccess()
     {
-        if ($this->resource === null) {
+        if ($this->resource === null || $this->uri === null) {
             $this->markTestIncomplete('Acl test is not complete');
         }
+        if ($this->httpMethod) {
+            $this->getRequest()->setMethod($this->httpMethod);
+        }
         $this->_objectManager->get(\Magento\Framework\Acl\Builder::class)
             ->getAcl()
             ->deny(null, $this->resource);
diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php
index 9920f90193f69..feb9eca0793a2 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php
@@ -9,9 +9,13 @@
  */
 namespace Magento\TestFramework\TestCase;
 
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\Stdlib\CookieManagerInterface;
 use Magento\Framework\View\Element\Message\InterpretationStrategyInterface;
 use Magento\Theme\Controller\Result\MessagePlugin;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\App\Response\Http as HttpResponse;
 
 /**
  * @SuppressWarnings(PHPMD.NumberOfChildren)
@@ -68,6 +72,9 @@ protected function setUp()
         $this->_objectManager->removeSharedInstance(\Magento\Framework\App\RequestInterface::class);
     }
 
+    /**
+     * @inheritDoc
+     */
     protected function tearDown()
     {
         $this->_request = null;
@@ -96,14 +103,23 @@ protected function assertPostConditions()
      */
     public function dispatch($uri)
     {
-        $this->getRequest()->setRequestUri($uri);
+        /** @var HttpRequest $request */
+        $request = $this->getRequest();
+        $request->setRequestUri($uri);
+        if ($request->isPost()
+            && !array_key_exists('form_key', $request->getPost())
+        ) {
+            /** @var FormKey $formKey */
+            $formKey = $this->_objectManager->get(FormKey::class);
+            $request->setPostValue('form_key', $formKey->getFormKey());
+        }
         $this->_getBootstrap()->runApp();
     }
 
     /**
      * Request getter
      *
-     * @return \Magento\Framework\App\RequestInterface
+     * @return \Magento\Framework\App\RequestInterface|HttpRequest
      */
     public function getRequest()
     {
@@ -116,7 +132,7 @@ public function getRequest()
     /**
      * Response getter
      *
-     * @return \Magento\Framework\App\ResponseInterface
+     * @return \Magento\Framework\App\ResponseInterface|HttpResponse
      */
     public function getResponse()
     {
@@ -201,13 +217,21 @@ public function assertSessionMessages(
         $messageManagerClass = \Magento\Framework\Message\Manager::class
     ) {
         $this->_assertSessionErrors = false;
-
+        /** @var MessageInterface[]|string[] $messageObjects */
         $messages = $this->getMessages($messageType, $messageManagerClass);
+        /** @var string[] $messages */
+        $messagesFiltered = array_map(
+            function ($message) {
+                /** @var MessageInterface|string $message */
+                return ($message instanceof MessageInterface) ? $message->toString() : $message;
+            },
+            $messages
+        );
 
         $this->assertThat(
-            $messages,
+            $messagesFiltered,
             $constraint,
-            'Session messages do not meet expectations ' . var_export($messages, true)
+            'Session messages do not meet expectations ' . var_export($messagesFiltered, true)
         );
     }
 
diff --git a/dev/tests/integration/framework/tests/unit/phpunit.xml.dist b/dev/tests/integration/framework/tests/unit/phpunit.xml.dist
index 6152ce4d89495..e4778a63ebc35 100644
--- a/dev/tests/integration/framework/tests/unit/phpunit.xml.dist
+++ b/dev/tests/integration/framework/tests/unit/phpunit.xml.dist
@@ -20,4 +20,32 @@
     <php>
         <ini name="date.timezone" value="America/Los_Angeles"/>
     </php>
+    <listeners>
+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
+            <arguments>
+                <string>var/allure-results</string> <!-- XML files output directory -->
+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
+                <array> <!-- A list of custom annotations to ignore (optional) -->
+                    <element key="magentoAdminConfigFixture">
+                        <string>magentoAdminConfigFixture</string>
+                    </element>
+                    <element key="magentoAppIsolation">
+                        <string>magentoAppIsolation</string>
+                    </element>
+                    <element key="magentoComponentsDir">
+                        <string>magentoComponentsDir</string>
+                    </element>
+                    <element key="magentoConfigFixture">
+                        <string>magentoConfigFixture</string>
+                    </element>
+                    <element key="@magentoDbIsolation">
+                        <string>magentoDataFixture</string>
+                    </element>
+                    <element key="magentoDbIsolation">
+                        <string>magentoDbIsolation</string>
+                    </element>
+                </array>
+            </arguments>
+        </listener>
+    </listeners>
 </phpunit>
diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php
index b6207f309ead9..cc8fa19fd440e 100644
--- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php
+++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php
@@ -33,6 +33,7 @@ public static function tearDownAfterClass()
 
     protected function setUp()
     {
+        $this->markTestSkipped('MC-16892: php7.2 dont support session_id as php7.1');
         $this->_object = new \Magento\TestFramework\Bootstrap\Environment();
     }
 
diff --git a/dev/tests/integration/phpunit.xml.dist b/dev/tests/integration/phpunit.xml.dist
index 9c4b0bd19d25c..8f54dbfc4109d 100644
--- a/dev/tests/integration/phpunit.xml.dist
+++ b/dev/tests/integration/phpunit.xml.dist
@@ -77,5 +77,58 @@
     <listeners>
         <listener class="Magento\TestFramework\Event\PhpUnit"/>
         <listener class="Magento\TestFramework\ErrorLog\Listener"/>
+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
+            <arguments>
+                <string>var/allure-results</string> <!-- XML files output directory -->
+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
+                <array> <!-- A list of custom annotations to ignore (optional) -->
+                    <element key="codingStandardsIgnoreFile">
+                        <string>codingStandardsIgnoreFile</string>
+                    </element>
+                    <element key="codingStandardsIgnoreStart">
+                        <string>codingStandardsIgnoreStart</string>
+                    </element>
+                    <element key="codingStandardsIgnoreEnd">
+                        <string>codingStandardsIgnoreEnd</string>
+                    </element>
+                    <element key="expectedExceptionMessageRegExp">
+                        <string>expectedExceptionMessageRegExp</string>
+                    </element>
+                    <element key="magentoAdminConfigFixture">
+                        <string>magentoAdminConfigFixture</string>
+                    </element>
+                    <element key="magentoAppArea">
+                        <string>magentoAppArea</string>
+                    </element>
+                    <element key="magentoAppIsolation">
+                        <string>magentoAppIsolation</string>
+                    </element>
+                    <element key="magentoCache">
+                        <string>magentoCache</string>
+                    </element>
+                    <element key="magentoComponentsDir">
+                        <string>magentoComponentsDir</string>
+                    </element>
+                    <element key="magentoConfigFixture">
+                        <string>magentoConfigFixture</string>
+                    </element>
+                    <element key="magentoDataFixture">
+                        <string>magentoDataFixture</string>
+                    </element>
+                    <element key="magentoDataFixtureBeforeTransaction">
+                        <string>magentoDataFixtureBeforeTransaction</string>
+                    </element>
+                    <element key="magentoDbIsolation">
+                        <string>magentoDbIsolation</string>
+                    </element>
+                    <element key="magentoIndexerDimensionMode">
+                        <string>magentoIndexerDimensionMode</string>
+                    </element>
+                    <element key="security">
+                        <string>security</string>
+                    </element>
+                </array>
+            </arguments>
+        </listener>
     </listeners>
 </phpunit>
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/GraphTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/GraphTest.php
index 17863cd709580..3c8930fb78097 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/GraphTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/GraphTest.php
@@ -15,6 +15,9 @@ class GraphTest extends \PHPUnit\Framework\TestCase
      */
     protected $_block;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -25,8 +28,13 @@ protected function setUp()
         $this->_block->setDataHelper($objectManager->get(\Magento\Backend\Helper\Dashboard\Order::class));
     }
 
+    /**
+     * Tests getChartUrl.
+     *
+     * @return void
+     */
     public function testGetChartUrl()
     {
-        $this->assertStringStartsWith('http://chart.apis.google.com/chart', $this->_block->getChartUrl());
+        $this->assertStringStartsWith('https://image-charts.com/chart', $this->_block->getChartUrl());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php
index 8aeee9cf12494..e11c5ce5d9cf3 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Grid/MassactionTest.php
@@ -87,41 +87,6 @@ public function testMassactionDefaultValues()
         $this->assertFalse($blockEmpty->isAvailable());
     }
 
-    public function testGetJavaScript()
-    {
-        $this->loadLayout();
-
-        $javascript = $this->_block->getJavaScript();
-
-        $expectedItemFirst = '#"option_id1":{"label":"Option One",' .
-            '"url":"http:\\\/\\\/localhost\\\/index\.php\\\/(?:key\\\/([\w\d]+)\\\/)?",' .
-            '"complete":"Test","id":"option_id1"}#';
-        $this->assertRegExp($expectedItemFirst, $javascript);
-
-        $expectedItemSecond = '#"option_id2":{"label":"Option Two",' .
-            '"url":"http:\\\/\\\/localhost\\\/index\.php\\\/(?:key\\\/([\w\d]+)\\\/)?",' .
-            '"confirm":"Are you sure\?","id":"option_id2"}#';
-        $this->assertRegExp($expectedItemSecond, $javascript);
-    }
-
-    public function testGetJavaScriptWithAddedItem()
-    {
-        $this->loadLayout();
-
-        $input = [
-            'id' => 'option_id3',
-            'label' => 'Option Three',
-            'url' => '*/*/option3',
-            'block_name' => 'admin.test.grid.massaction.option3',
-        ];
-        $expected = '#"option_id3":{"id":"option_id3","label":"Option Three",' .
-            '"url":"http:\\\/\\\/localhost\\\/index\.php\\\/(?:key\\\/([\w\d]+)\\\/)?",' .
-            '"block_name":"admin.test.grid.massaction.option3"}#';
-
-        $this->_block->addItem($input['id'], $input);
-        $this->assertRegExp($expected, $this->_block->getJavaScript());
-    }
-
     /**
      * @param string $mageMode
      * @param int $expectedCount
@@ -213,21 +178,4 @@ public function getItemsDataProvider()
             ]
         ];
     }
-
-    public function testGridContainsMassactionColumn()
-    {
-        $this->loadLayout();
-        $this->_layout->getBlock('admin.test.grid')->toHtml();
-
-        $gridMassactionColumn = $this->_layout->getBlock('admin.test.grid')
-            ->getColumnSet()
-            ->getChildBlock('massaction');
-
-        $this->assertNotNull($gridMassactionColumn, 'Massaction column does not exist in the grid column set');
-        $this->assertInstanceOf(
-            \Magento\Backend\Block\Widget\Grid\Column::class,
-            $gridMassactionColumn,
-            'Massaction column is not an instance of \Magento\Backend\Block\Widget\Column'
-        );
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
index 07af21505f180..4373523350c49 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
@@ -19,8 +19,15 @@ public function testAjaxBlockAction()
         $this->assertContains('dashboard-diagram', $actual);
     }
 
+    /**
+     * Tests tunnelAction.
+     *
+     * @return void
+     * @throws \Exception
+     */
     public function testTunnelAction()
     {
+        // phpcs:disable Magento2.Functions.DiscouragedFunction
         $testUrl = \Magento\Backend\Block\Dashboard\Graph::API_URL . '?cht=p3&chd=t:60,40&chs=250x100&chl=Hello|World';
         $handle = curl_init();
         curl_setopt($handle, CURLOPT_URL, $testUrl);
@@ -34,6 +41,7 @@ public function testTunnelAction()
             curl_close($handle);
             throw $e;
         }
+        // phpcs:enable
 
         $gaData = [
             'cht' => 'lc',
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php
index 219fde6e37075..d5a48b960811e 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Backend\Controller\Adminhtml;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 /**
  * @magentoAppArea adminhtml
  * @magentoDbIsolation enabled
@@ -45,6 +47,7 @@ public function testLoggedIndexAction()
     public function testGlobalSearchAction()
     {
         $this->getRequest()->setParam('isAjax', 'true');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue('query', 'dummy');
         $this->dispatch('backend/admin/index/globalSearch');
 
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlRewriteTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlRewriteTest.php
index 1185ae9727e98..0d48fc8b0f59c 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlRewriteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/UrlRewriteTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Backend\Controller\Adminhtml;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 /**
  * @magentoAppArea adminhtml
  */
@@ -20,6 +22,7 @@ public function testSaveActionCmsPage()
         $page = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Cms\Model\Page::class);
         $page->load('page_design_blank', 'identifier');
 
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(
             [
                 'description' => 'Some URL rewrite description',
diff --git a/dev/tests/integration/testsuite/Magento/Backend/_files/allowed_countries_fr.php b/dev/tests/integration/testsuite/Magento/Backend/_files/allowed_countries_fr.php
new file mode 100644
index 0000000000000..4bce8d95dafa6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Backend/_files/allowed_countries_fr.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ConfigInterface $config */
+$config = $objectManager->get(ConfigInterface::class);
+$config->saveConfig('general/country/allow', 'FR');
+$objectManager->get(ReinitableConfigInterface::class)->reinit();
diff --git a/dev/tests/integration/testsuite/Magento/Backend/_files/allowed_countries_fr_rollback.php b/dev/tests/integration/testsuite/Magento/Backend/_files/allowed_countries_fr_rollback.php
new file mode 100644
index 0000000000000..711d985786329
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Backend/_files/allowed_countries_fr_rollback.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ConfigInterface $config */
+$config = $objectManager->get(ConfigInterface::class);
+$config->deleteConfig('general/country/allow');
+$objectManager->get(ReinitableConfigInterface::class)->reinit();
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/PlaceOrderTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/PlaceOrderTest.php
new file mode 100644
index 0000000000000..4f2b0fd67840d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/PlaceOrderTest.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Controller\Paypal;
+
+use Braintree\Result\Successful;
+use Braintree\Transaction;
+use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
+use Magento\Checkout\Model\Session;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Message\MessageInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\TestFramework\TestCase\AbstractController;
+use PHPUnit\Framework\MockObject\MockObject;
+
+/**
+ * PlaceOrderTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class PlaceOrderTest extends AbstractController
+{
+    /**
+     * @var Session|MockObject
+     */
+    private $session;
+
+    /**
+     * @var BraintreeAdapter|MockObject
+     */
+    private $adapter;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->session = $this->getMockBuilder(Session::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getQuote', 'setLastOrderStatus', 'unsLastBillingAgreementReferenceId'])
+            ->getMock();
+
+        $adapterFactory = $this->getMockBuilder(BraintreeAdapterFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->adapter = $this->getMockBuilder(BraintreeAdapter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $adapterFactory->method('create')
+            ->willReturn($this->adapter);
+
+        $this->_objectManager->addSharedInstance($this->session, Session::class);
+        $this->_objectManager->addSharedInstance($adapterFactory, BraintreeAdapterFactory::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->_objectManager->removeSharedInstance(Session::class);
+        $this->_objectManager->removeSharedInstance(BraintreeAdapterFactory::class);
+        parent::tearDown();
+    }
+
+    /**
+     * Tests a negative scenario for a place order flow when exception throws after placing an order.
+     *
+     * @magentoDataFixture Magento/Braintree/Fixtures/paypal_quote.php
+     */
+    public function testExecuteWithFailedOrder()
+    {
+        $reservedOrderId = 'test01';
+        $quote = $this->getQuote($reservedOrderId);
+
+        $this->session->method('getQuote')
+            ->willReturn($quote);
+
+        $this->adapter->method('sale')
+            ->willReturn($this->getTransactionStub('authorized'));
+        $this->adapter->method('void')
+            ->willReturn($this->getTransactionStub('voided'));
+
+        // emulates an error after placing the order
+        $this->session->method('setLastOrderStatus')
+            ->willThrowException(new \Exception('Test Exception'));
+
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->dispatch('braintree/paypal/placeOrder');
+
+        self::assertRedirect(self::stringContains('checkout/cart'));
+        self::assertSessionMessages(
+            self::equalTo(['The order #' . $reservedOrderId . ' cannot be processed.']),
+            MessageInterface::TYPE_ERROR
+        );
+
+        $order = $this->getOrder($reservedOrderId);
+        self::assertEquals('canceled', $order->getState());
+    }
+
+    /**
+     * Gets quote by reserved order ID.
+     *
+     * @param string $reservedOrderId
+     * @return CartInterface
+     */
+    private function getQuote(string $reservedOrderId): CartInterface
+    {
+        $searchCriteria = $this->_objectManager->get(SearchCriteriaBuilder::class)
+            ->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class);
+        $items = $quoteRepository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+
+    /**
+     * Gets order by increment ID.
+     *
+     * @param string $incrementId
+     * @return OrderInterface
+     */
+    private function getOrder(string $incrementId): OrderInterface
+    {
+        $searchCriteria = $this->_objectManager->get(SearchCriteriaBuilder::class)
+            ->addFilter('increment_id', $incrementId)
+            ->create();
+
+        /** @var OrderRepositoryInterface $repository */
+        $repository = $this->_objectManager->get(OrderRepositoryInterface::class);
+        $items = $repository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+
+    /**
+     * Creates stub for Braintree Transaction.
+     *
+     * @param string $status
+     * @return Successful
+     */
+    private function getTransactionStub(string $status): Successful
+    {
+        $transaction = $this->getMockBuilder(Transaction::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $transaction->status = $status;
+        $transaction->paypal = [
+            'paymentId' => 'pay-001',
+            'payerEmail' => 'test@test.com'
+        ];
+        $response = new Successful();
+        $response->success = true;
+        $response->transaction = $transaction;
+
+        return $response;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/assign_items_per_address.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/assign_items_per_address.php
new file mode 100644
index 0000000000000..91cea7dc96602
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/assign_items_per_address.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Api\CartRepositoryInterface;
+
+$store = $storeManager->getStore();
+$quote->setReservedOrderId('multishipping_quote_id_braintree')
+    ->setStoreId($store->getId())
+    ->setCustomerEmail('customer001@test.com');
+
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+$quote->collectTotals();
+$quoteRepository->save($quote);
+
+$items = $quote->getAllItems();
+$addressList = $quote->getAllShippingAddresses();
+
+foreach ($addressList as $key => $address) {
+    $item = $items[$key];
+    // set correct quantity per shipping address
+    $item->setQty(1);
+    $address->setTotalQty(1);
+    $address->addItem($item);
+}
+
+// assign virtual product to the billing address
+$billingAddress = $quote->getBillingAddress();
+$virtualItem = $items[sizeof($items) - 1];
+$billingAddress->setTotalQty(1);
+$billingAddress->addItem($virtualItem);
+
+// need to recollect totals
+$quote->setTotalsCollectedFlag(false);
+$quote->collectTotals();
+$quoteRepository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree.php
new file mode 100644
index 0000000000000..3e1db90f1f2c8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Model\Quote\Payment;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Braintree\Model\Ui\ConfigProvider;
+
+/**
+ * @var Magento\Quote\Model\Quote $quote
+ */
+
+if (empty($quote)) {
+    throw new \Exception('$quote should be defined in the parent fixture');
+}
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var PaymentInterface $payment */
+$payment = $objectManager->create(Payment::class);
+$payment->setMethod(ConfigProvider::CODE);
+$quote->setPayment($payment);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree_paypal.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree_paypal.php
new file mode 100644
index 0000000000000..e4bba222078b0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/payment_braintree_paypal.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Model\Quote\Payment;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
+
+/**
+ * @var Magento\Quote\Model\Quote $quote
+ */
+
+if (empty($quote)) {
+    throw new \Exception('$quote should be defined in the parent fixture');
+}
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var PaymentInterface $payment */
+$payment = $objectManager->create(Payment::class);
+$payment->setMethod(ConfigProvider::PAYPAL_CODE);
+$quote->setPayment($payment);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote.php
new file mode 100644
index 0000000000000..d0db6233f05b1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
+use Magento\Quote\Api\CartRepositoryInterface;
+
+require __DIR__ . '/../_files/paypal_vault_token.php';
+require __DIR__ . '/../../Sales/_files/quote_with_customer.php';
+
+$quote->getShippingAddress()
+    ->setShippingMethod('flatrate_flatrate')
+    ->setCollectShippingRates(true);
+$quote->getPayment()
+    ->setMethod(ConfigProvider::PAYPAL_VAULT_CODE)
+    ->setAdditionalInformation(
+        [
+            'customer_id' => $quote->getCustomerId(),
+            'public_hash' => $paymentToken->getPublicHash()
+        ]
+    );
+
+$quote->collectTotals();
+
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+$quoteRepository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote_rollback.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote_rollback.php
new file mode 100644
index 0000000000000..5d0fa8cca85d9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/paypal_quote_rollback.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+require __DIR__ . '/../../Sales/_files/quote_with_customer_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree.php
new file mode 100644
index 0000000000000..1c56e611dd6db
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Model\Quote;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+
+/** @var Quote $quote */
+$quote = $objectManager->create(Quote::class);
+
+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/shipping_address_list.php';
+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/billing_address.php';
+require __DIR__ . '/payment_braintree.php';
+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/items.php';
+require __DIR__ . '/assign_items_per_address.php';
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree_paypal.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree_paypal.php
new file mode 100644
index 0000000000000..4bd8e926abb76
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/quote_with_split_items_braintree_paypal.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Model\Quote;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+
+/** @var Quote $quote */
+$quote = $objectManager->create(Quote::class);
+
+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/shipping_address_list.php';
+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/billing_address.php';
+require __DIR__ . '/payment_braintree_paypal.php';
+require __DIR__ . '/../../../Magento/Multishipping/Fixtures/items.php';
+require __DIR__ . '/assign_items_per_address.php';
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Model/MultishippingTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Model/MultishippingTest.php
new file mode 100644
index 0000000000000..91bc0388d8551
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Model/MultishippingTest.php
@@ -0,0 +1,254 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Model;
+
+use Braintree\Result\Successful;
+use Braintree\Transaction;
+use Magento\Braintree\Gateway\Command\GetPaymentNonceCommand;
+use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order\Email\Sender\OrderSender;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Payment\Gateway\Command\ResultInterface as CommandResultInterface;
+
+/**
+ * Tests Magento\Multishipping\Model\Checkout\Type\Multishipping with Braintree and BraintreePayPal payments.
+ *
+ * @magentoAppArea frontend
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class MultishippingTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var BraintreeAdapter|MockObject
+     */
+    private $adapter;
+
+    /**
+     * @var Multishipping
+     */
+    private $model;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $orderSender = $this->getMockBuilder(OrderSender::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $adapterFactory = $this->getMockBuilder(BraintreeAdapterFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->adapter = $this->getMockBuilder(BraintreeAdapter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $adapterFactory->method('create')
+            ->willReturn($this->adapter);
+
+        $this->objectManager->addSharedInstance($adapterFactory, BraintreeAdapterFactory::class);
+        $this->objectManager->addSharedInstance($this->getPaymentNonceMock(), GetPaymentNonceCommand::class);
+
+        $this->model = $this->objectManager->create(
+            Multishipping::class,
+            ['orderSender' => $orderSender]
+        );
+    }
+
+    /**
+     * Checks a case when multiple orders are created successfully using Braintree payment method.
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Braintree/Fixtures/quote_with_split_items_braintree.php
+     * @magentoConfigFixture current_store payment/braintree/active 1
+     * @return void
+     */
+    public function testCreateOrdersWithBraintree()
+    {
+        $this->adapter->method('sale')
+            ->willReturn(
+                $this->getTransactionStub()
+            );
+        $this->createOrders();
+    }
+
+    /**
+     * Checks a case when multiple orders are created successfully using Braintree PayPal payment method.
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Braintree/Fixtures/quote_with_split_items_braintree_paypal.php
+     * @magentoConfigFixture current_store payment/braintree_paypal/active 1
+     * @return void
+     */
+    public function testCreateOrdersWithBraintreePaypal()
+    {
+        $this->adapter->method('sale')
+            ->willReturn(
+                $this->getTransactionPaypalStub()
+            );
+        $this->createOrders();
+    }
+
+    /**
+     * Creates orders for multishipping checkout flow.
+     *
+     * @return void
+     */
+    private function createOrders()
+    {
+        $expectedPlacedOrdersNumber = 3;
+        $quote = $this->getQuote('multishipping_quote_id_braintree');
+
+        /** @var CheckoutSession $session */
+        $session = $this->objectManager->get(CheckoutSession::class);
+        $session->replaceQuote($quote);
+
+        $this->model->createOrders();
+
+        $orderList = $this->getOrderList((int)$quote->getId());
+        self::assertCount(
+            $expectedPlacedOrdersNumber,
+            $orderList,
+            'Total successfully placed orders number mismatch'
+        );
+    }
+
+    /**
+     * Creates stub for Braintree capture Transaction.
+     *
+     * @return Successful
+     */
+    private function getTransactionStub(): Successful
+    {
+        $transaction = $this->getMockBuilder(Transaction::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $transaction->status = 'submitted_for_settlement';
+        $transaction->creditCard = [
+            'last4' => '1111',
+            'cardType' => 'Visa',
+            'expirationMonth' => '12',
+            'expirationYear' => '2021'
+        ];
+
+        $creditCardDetails = new \stdClass();
+        $creditCardDetails->token = '4fdg';
+        $creditCardDetails->expirationMonth = '12';
+        $creditCardDetails->expirationYear = '2021';
+        $creditCardDetails->cardType = 'Visa';
+        $creditCardDetails->last4 = '1111';
+        $creditCardDetails->expirationDate = '12/2021';
+        $transaction->creditCardDetails = $creditCardDetails;
+
+        $response = new Successful();
+        $response->success = true;
+        $response->transaction = $transaction;
+
+        return $response;
+    }
+
+    /**
+     * Creates stub for BraintreePaypal capture Transaction.
+     *
+     * @return Successful
+     */
+    private function getTransactionPaypalStub(): Successful
+    {
+        $transaction = $this->getMockBuilder(Transaction::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $transaction->status = 'submitted_for_settlement';
+        $transaction->paypal = [
+            'token' => 'fchxqx',
+            'payerEmail' => 'payer@example.com',
+            'paymentId' => 'PAY-33ac47a28e7f54791f6cda45',
+        ];
+        $paypalDetails = new \stdClass();
+        $paypalDetails->token = 'fchxqx';
+        $paypalDetails->payerEmail = 'payer@example.com';
+        $paypalDetails->paymentId = '33ac47a28e7f54791f6cda45';
+        $transaction->paypalDetails = $paypalDetails;
+
+        $response = new Successful();
+        $response->success = true;
+        $response->transaction = $transaction;
+
+        return $response;
+    }
+
+    /**
+     * Retrieves quote by reserved order id.
+     *
+     * @param string $reservedOrderId
+     * @return Quote
+     */
+    private function getQuote(string $reservedOrderId): Quote
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
+        $items = $quoteRepository->getList($searchCriteria)->getItems();
+
+        return array_pop($items);
+    }
+
+    /**
+     * Get list of orders by quote id.
+     *
+     * @param int $quoteId
+     * @return array
+     */
+    private function getOrderList(int $quoteId): array
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('quote_id', $quoteId)
+            ->create();
+
+        /** @var OrderRepositoryInterface $orderRepository */
+        $orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
+        return $orderRepository->getList($searchCriteria)->getItems();
+    }
+
+    /**
+     * Returns GetPaymentNonceCommand command mock.
+     *
+     * @return MockObject
+     */
+    private function getPaymentNonceMock(): MockObject
+    {
+        $commandResult = $this->createMock(CommandResultInterface::class);
+        $commandResult->method('get')
+            ->willReturn(['paymentMethodNonce' => 'testNonce']);
+        $paymentNonce = $this->createMock(GetPaymentNonceCommand::class);
+        $paymentNonce->method('execute')
+            ->willReturn($commandResult);
+
+        return $paymentNonce;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundlePriceCalculatorWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundlePriceCalculatorWithDimensionTest.php
index 6794a686146f9..c1750332fa568 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundlePriceCalculatorWithDimensionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundlePriceCalculatorWithDimensionTest.php
@@ -8,7 +8,7 @@
 
 /**
  * @magentoDbIsolation disabled
- * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
+ * @--magentoIndexerDimensionMode catalog_product_price website_and_customer_group
  * @group indexer_dimension
  * @magentoAppArea frontend
  */
@@ -24,6 +24,9 @@ class DynamicBundlePriceCalculatorWithDimensionTest extends BundlePriceAbstract
      */
     public function testPriceForDynamicBundle(array $strategyModifiers, array $expectedResults)
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $this->prepareFixture($strategyModifiers, 'bundle_product');
         $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
 
@@ -63,6 +66,9 @@ public function testPriceForDynamicBundle(array $strategyModifiers, array $expec
      */
     public function testPriceForDynamicBundleInWebsiteScope(array $strategyModifiers, array $expectedResults)
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $this->prepareFixture($strategyModifiers, 'bundle_product');
         $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
 
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorWithDimensionTest.php
index ffc24b2f45d5c..9e7c8d9836c74 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorWithDimensionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/FixedBundlePriceCalculatorWithDimensionTest.php
@@ -10,7 +10,7 @@
 
 /**
  * @magentoDbIsolation disabled
- * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
+ * @--magentoIndexerDimensionMode catalog_product_price website_and_customer_group
  * @group indexer_dimension
  * @magentoAppArea frontend
  */
@@ -26,6 +26,9 @@ class FixedBundlePriceCalculatorWithDimensionTest extends BundlePriceAbstract
      */
     public function testPriceForFixedBundle(array $strategyModifiers, array $expectedResults)
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $this->prepareFixture($strategyModifiers, 'bundle_product');
         $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
 
@@ -65,6 +68,9 @@ public function testPriceForFixedBundle(array $strategyModifiers, array $expecte
      */
     public function testPriceForFixedBundleInWebsiteScope(array $strategyModifiers, array $expectedResults)
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $this->prepareFixture($strategyModifiers, 'bundle_product');
         $bundleProduct = $this->productRepository->get('bundle_product', false, null, true);
 
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceTest.php
index 2a68ff48e5f9a..4a5757aae3134 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Bundle\Model\Product;
 
 /**
- * @magentoDataFixture Magento/Bundle/_files/product_with_tier_pricing.php
+ * Class to test bundle prices
  */
 class PriceTest extends \PHPUnit\Framework\TestCase
 {
@@ -22,6 +22,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @magentoDataFixture Magento/Bundle/_files/product_with_tier_pricing.php
+     */
     public function testGetTierPrice()
     {
         /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
@@ -37,4 +40,50 @@ public function testGetTierPrice()
         $this->assertEquals(20.0, $this->_model->getTierPrice(4, $product));
         $this->assertEquals(30.0, $this->_model->getTierPrice(5, $product));
     }
+
+    /**
+     * Test calculation final price for bundle product with tire price in simple product
+     *
+     * @param float $bundleQty
+     * @param float $selectionQty
+     * @param float $finalPrice
+     * @magentoDataFixture Magento/Bundle/_files/product_with_simple_tier_pricing.php
+     * @dataProvider getSelectionFinalTotalPriceWithSimpleTierPriceDataProvider
+     */
+    public function testGetSelectionFinalTotalPriceWithSimpleTierPrice(
+        float $bundleQty,
+        float $selectionQty,
+        float $finalPrice
+    ) {
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $bundleProduct = $productRepository->get('bundle-product');
+        $simpleProduct = $productRepository->get('simple');
+        $simpleProduct->setCustomerGroupId(\Magento\Customer\Model\Group::CUST_GROUP_ALL);
+
+        $this->assertEquals(
+            $finalPrice,
+            $this->_model->getSelectionFinalTotalPrice(
+                $bundleProduct,
+                $simpleProduct,
+                $bundleQty,
+                $selectionQty,
+                false
+            ),
+            'Tier price calculation for Simple product is wrong'
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getSelectionFinalTotalPriceWithSimpleTierPriceDataProvider(): array
+    {
+        return [
+            [1, 1, 10],
+            [2, 1, 8],
+            [5, 1, 5],
+        ];
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceWithDimensionTest.php
index 3b3b1ed5cbd07..a1516c6a74808 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceWithDimensionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/PriceWithDimensionTest.php
@@ -7,7 +7,7 @@
 
 /**
  * @magentoDbIsolation disabled
- * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
+ * @--magentoIndexerDimensionMode catalog_product_price website_and_customer_group
  * @group indexer_dimension
  * @magentoDataFixture Magento/Bundle/_files/product_with_tier_pricing.php
  */
@@ -27,6 +27,9 @@ protected function setUp()
 
     public function testGetTierPrice()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
         $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php
new file mode 100644
index 0000000000000..30f0978480701
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+
+/** @var $productFactory Magento\Catalog\Model\ProductFactory */
+$productFactory = $objectManager->create(\Magento\Catalog\Model\ProductFactory::class);
+/** @var $bundleProduct \Magento\Catalog\Model\Product */
+$bundleProduct = $productFactory->create();
+$bundleProduct->setTypeId('bundle')
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([1])
+    ->setPriceType(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC)
+    ->setPriceView(1)
+    ->setName('Bundle Product')
+    ->setSku('bundle-product')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData([
+        'use_config_manage_stock' => 1,
+        'qty' => 100,
+        'is_qty_decimal' => 0,
+        'is_in_stock' => 1,
+    ])
+    ->setBundleOptionsData(
+        [
+            [
+                'title' => 'Bundle Product Items',
+                'default_title' => 'Bundle Product Items',
+                'type' => 'checkbox',
+                'required' => 1,
+                'delete' => '',
+            ],
+        ]
+    )
+    ->setBundleSelectionsData(
+        [[['product_id' => $product->getId(), 'selection_qty' => 1, 'delete' => '']]]
+    );
+$productRepository->save($bundleProduct);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing_rollback.php
new file mode 100644
index 0000000000000..aa661c7412d42
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing_rollback.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $product = $productRepository->get('bundle-product');
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Observer/CaseCaptchaIsRequiredAfterFailedLoginAttemptsTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Observer/CaseCaptchaIsRequiredAfterFailedLoginAttemptsTest.php
index 32fab1f456b3e..4c469421402c2 100644
--- a/dev/tests/integration/testsuite/Magento/Captcha/Observer/CaseCaptchaIsRequiredAfterFailedLoginAttemptsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Observer/CaseCaptchaIsRequiredAfterFailedLoginAttemptsTest.php
@@ -7,9 +7,14 @@
 
 use Magento\Framework\Message\MessageInterface;
 
+/**
+ * @magentoAppArea adminhtml
+ */
 class CaseCaptchaIsRequiredAfterFailedLoginAttemptsTest extends \Magento\TestFramework\TestCase\AbstractController
 {
     /**
+     * Tests backend login action with invalid captcha.
+     *
      * @magentoAdminConfigFixture admin/captcha/forms backend_login
      * @magentoAdminConfigFixture admin/captcha/enable 1
      * @magentoAdminConfigFixture admin/captcha/mode always
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
index c97dc821913f9..eb08509a9e36d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/GalleryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/GalleryTest.php
@@ -12,6 +12,7 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\View\LayoutInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Block\Product\View\GalleryOptions;
 
 class GalleryTest extends \PHPUnit\Framework\TestCase
 {
@@ -41,10 +42,12 @@ public function testHtml()
         /** @var Gallery $block */
         $block = $layout->createBlock(Gallery::class);
         $block->setData('product', $product);
+        $galleryoptions = $this->objectManager->get(GalleryOptions::class);
+        $block->setData('gallery_options', $galleryoptions);
         $block->setTemplate("Magento_Catalog::product/view/gallery.phtml");
 
         $showCaption = $block->getVar('gallery/caption');
 
-        self::assertContains('"showCaption": ' . $showCaption, $block->toHtml());
+        self::assertContains('"showCaption":' . $showCaption, $block->toHtml());
     }
 }
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 bfc7e33d5f771..bdf2486ac2e38 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
@@ -5,11 +5,36 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml;
 
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Store\Model\Store;
+use Magento\Catalog\Model\ResourceModel\Product;
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 /**
  * @magentoAppArea adminhtml
  */
 class CategoryTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Product
+     */
+    protected $productResource;
+
+    /**
+     * @inheritDoc
+     *
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        /** @var Product $productResource */
+        $this->productResource = Bootstrap::getObjectManager()->get(
+            Product::class
+        );
+    }
+
     /**
      * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      * @magentoDbIsolation enabled
@@ -27,6 +52,7 @@ public function testSaveAction($inputData, $defaultAttributes, $attributesSaved
         $store->load('fixturestore', 'code');
         $storeId = $store->getId();
 
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($inputData);
         $this->getRequest()->setParam('store', $storeId);
         $this->getRequest()->setParam('id', 2);
@@ -75,6 +101,7 @@ public function testSaveAction($inputData, $defaultAttributes, $attributesSaved
      */
     public function testSaveActionFromProductCreationPage($postData)
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
 
         $this->dispatch('backend/catalog/category/save');
@@ -123,6 +150,9 @@ public static function categoryCreatedFromProductCreationPageDataProvider()
         return [[$postData], [$postData + ['return_session_messages_only' => 1]]];
     }
 
+    /**
+     * Test SuggestCategories finds any categories.
+     */
     public function testSuggestCategoriesActionDefaultCategoryFound()
     {
         $this->getRequest()->setParam('label_part', 'Default');
@@ -133,6 +163,9 @@ public function testSuggestCategoriesActionDefaultCategoryFound()
         );
     }
 
+    /**
+     * Test SuggestCategories properly processes search by label.
+     */
     public function testSuggestCategoriesActionNoSuggestions()
     {
         $this->getRequest()->setParam('label_part', strrev('Default'));
@@ -322,8 +355,12 @@ public function saveActionDataProvider()
         ];
     }
 
+    /**
+     * Test validation.
+     */
     public function testSaveActionCategoryWithDangerRequest()
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(
             [
                 'general' => [
@@ -374,7 +411,8 @@ public function testMoveAction($parentId, $childId, $childUrlKey, $grandChildId,
         }
         $this->getRequest()
             ->setPostValue('id', $grandChildId)
-            ->setPostValue('pid', $parentId);
+            ->setPostValue('pid', $parentId)
+            ->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/catalog/category/move');
         $jsonResponse = json_decode($this->getResponse()->getBody());
         $this->assertNotNull($jsonResponse);
@@ -388,9 +426,131 @@ public function moveActionDataProvider()
     {
         return [
             [400, 401, 'first_url_key', 402, 'second_url_key', false],
-            [400, 401, 'duplicated_url_key', 402, 'duplicated_url_key', true],
+            [400, 401, 'duplicated_url_key', 402, 'duplicated_url_key', false],
             [0, 401, 'first_url_key', 402, 'second_url_key', true],
             [400, 401, 'first_url_key', 0, 'second_url_key', true],
         ];
     }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/products_in_different_stores.php
+     * @magentoDbIsolation disabled
+     * @dataProvider saveActionWithDifferentWebsitesDataProvider
+     *
+     * @param array $postData
+     */
+    public function testSaveCategoryWithProductPosition(array $postData)
+    {
+        /** @var $store \Magento\Store\Model\Store */
+        $store = Bootstrap::getObjectManager()->create(Store::class);
+        $store->load('fixturestore', 'code');
+        $storeId = $store->getId();
+        $oldCategoryProductsCount = $this->getCategoryProductsCount();
+        $this->getRequest()->setParam('store', $storeId);
+        $this->getRequest()->setParam('id', 96377);
+        $this->getRequest()->setPostValue($postData);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->dispatch('backend/catalog/category/save');
+        $newCategoryProductsCount = $this->getCategoryProductsCount();
+        $this->assertEquals(
+            $oldCategoryProductsCount,
+            $newCategoryProductsCount,
+            'After changing product position number of records from catalog_category_product has changed'
+        );
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @return array
+     */
+    public function saveActionWithDifferentWebsitesDataProvider()
+    {
+        return [
+            'default_values' => [
+                [
+                    'store_id' => '1',
+                    'entity_id' => '96377',
+                    'attribute_set_id' => '4',
+                    'parent_id' => '2',
+                    'created_at' => '2018-11-29 08:28:37',
+                    'updated_at' => '2018-11-29 08:57:43',
+                    'path' => '1/2/96377',
+                    'level' => '2',
+                    'children_count' => '0',
+                    'row_id' => '96377',
+                    'name' => 'Category 1',
+                    'display_mode' => 'PRODUCTS',
+                    'url_key' => 'category-1',
+                    'url_path' => 'category-1',
+                    'automatic_sorting' => '0',
+                    'is_active' => '1',
+                    'is_anchor' => '1',
+                    'include_in_menu' => '1',
+                    'custom_use_parent_settings' => '0',
+                    'custom_apply_to_products' => '0',
+                    'path_ids' => [
+                        0 => '1',
+                        1 => '2',
+                        2 => '96377'
+                    ],
+                    'use_config' => [
+                        'available_sort_by' => 'true',
+                        'default_sort_by' => 'true',
+                        'filter_price_range' => 'true'
+                    ],
+                    'id' => '',
+                    'parent' => '0',
+                    'use_default' => [
+                        'name' => '1',
+                        'url_key' => '1',
+                        'meta_title' => '1',
+                        'is_active' => '1',
+                        'include_in_menu' => '1',
+                        'custom_use_parent_settings' => '1',
+                        'custom_apply_to_products' => '1',
+                        'description' => '1',
+                        'landing_page' => '1',
+                        'display_mode' => '1',
+                        'custom_design' => '1',
+                        'page_layout' => '1',
+                        'meta_keywords' => '1',
+                        'meta_description' => '1',
+                        'custom_layout_update' => '1',
+                        'image' => '1'
+                    ],
+                    'filter_price_range' => false,
+                    'meta_title' => false,
+                    'url_key_create_redirect' => 'category-1',
+                    'description' => false,
+                    'landing_page' => false,
+                    'default_sort_by' => 'position',
+                    'available_sort_by' => false,
+                    'custom_design' => false,
+                    'page_layout' => false,
+                    'meta_keywords' => false,
+                    'meta_description' => false,
+                    'custom_layout_update' => false,
+                    'position_cache_key' => '5c069248346ac',
+                    'is_smart_category' => '0',
+                    'smart_category_rules' => false,
+                    'sort_order' => '0',
+                    'vm_category_products' => '{"1":1,"3":0}'
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * Get items count from catalog_category_product
+     *
+     * @return int
+     */
+    private function getCategoryProductsCount(): int
+    {
+        $oldCategoryProducts = $this->productResource->getConnection()->select()->from(
+            $this->productResource->getTable('catalog_category_product'),
+            new \Zend_Db_Expr('COUNT(product_id)')
+        );
+        return $this->productResource->getConnection()->fetchOne($oldCategoryProducts);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
index cea49d940cb62..3d7575729cd92 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Action;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 /**
  * @magentoAppArea adminhtml
  */
@@ -23,6 +25,7 @@ public function testSaveActionRedirectsSuccessfully()
         /** @var $session \Magento\Backend\Model\Session */
         $session = $objectManager->get(\Magento\Backend\Model\Session::class);
         $session->setProductIds([1]);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('backend/catalog/product_action_attribute/save/store/0');
 
@@ -69,6 +72,7 @@ public function testSaveActionChangeVisibility($attributes)
         $session = $objectManager->get(\Magento\Backend\Model\Session::class);
         $session->setProductIds([$product->getId()]);
         $this->getRequest()->setParam('attributes', $attributes);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('backend/catalog/product_action_attribute/save/store/0');
         /** @var \Magento\Catalog\Model\Category $category */
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 098b18d6f38c9..ee71223a1df16 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
@@ -6,10 +6,13 @@
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * @magentoAppArea adminhtml
  * @magentoDbIsolation enabled
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
@@ -18,10 +21,14 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
      */
     public function testWrongFrontendInput()
     {
-        $postData = $this->_getAttributeData() + [
+        $postData = array_merge(
+            $this->_getAttributeData(),
+            [
                 'attribute_id' => 100500,
                 'frontend_input' => 'some_input',
-            ];
+            ]
+        );
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/product_attribute/save');
         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
@@ -47,6 +54,7 @@ public function testWithPopup()
             'popup' => 'true',
             'new_attribute_set_name' => 'new_attribute_set',
         ];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/product_attribute/save');
         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
@@ -68,6 +76,7 @@ public function testWithExceptionWhenSaveAttribute()
     {
         $postData = $this->_getAttributeData() + ['attribute_id' => 0, 'frontend_input' => 'boolean'];
         $this->getRequest()->setPostValue($postData);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/catalog/product_attribute/save');
         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
         $this->assertContains(
@@ -86,6 +95,7 @@ public function testWrongAttributeId()
     {
         $postData = $this->_getAttributeData() + ['attribute_id' => 100500];
         $this->getRequest()->setPostValue($postData);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/catalog/product_attribute/save');
         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
         $this->assertContains(
@@ -110,6 +120,7 @@ public function testAttributeWithoutId()
                 'set' => 4,
                 'frontend_input' => 'boolean',
             ];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/product_attribute/save');
         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
@@ -132,6 +143,7 @@ public function testWrongAttributeCode()
     {
         $postData = $this->_getAttributeData() + ['attribute_code' => '_()&&&?'];
         $this->getRequest()->setPostValue($postData);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/catalog/product_attribute/save');
         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
         $this->assertContains(
@@ -144,8 +156,8 @@ public function testWrongAttributeCode()
         /** @var \Magento\Framework\Message\Error $message */
         $message = $messages->getItemsByType('error')[0];
         $this->assertEquals(
-            'Attribute code "_()&&&?" is invalid. Please use only letters (a-z),'
-            . ' numbers (0-9) or underscore(_) in this field, first character should be a letter.',
+            '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()
         );
     }
@@ -156,6 +168,7 @@ public function testWrongAttributeCode()
     public function testAttributeWithoutEntityTypeId()
     {
         $postData = $this->_getAttributeData() + ['attribute_id' => '2', 'new_attribute_set_name' => ' '];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/product_attribute/save');
         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
@@ -171,6 +184,7 @@ public function testAttributeWithoutEntityTypeId()
     public function testSaveActionApplyToDataSystemAttribute()
     {
         $postData = $this->_getAttributeData() + ['attribute_id' => '2'];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/product_attribute/save');
         $model = $this->_objectManager->create(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
@@ -184,6 +198,7 @@ public function testSaveActionApplyToDataSystemAttribute()
     public function testSaveActionApplyToDataUserDefinedAttribute()
     {
         $postData = $this->_getAttributeData() + ['attribute_id' => '1'];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/product_attribute/save');
         /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $model */
@@ -199,6 +214,7 @@ public function testSaveActionApplyToData()
     {
         $postData = $this->_getAttributeData() + ['attribute_id' => '3'];
         unset($postData['apply_to']);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/product_attribute/save');
         $model = $this->_objectManager->create(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
@@ -218,6 +234,7 @@ public function testSaveActionCleanAttributeLabelCache()
         $this->assertEquals('predefined string translation', $this->_translate('string to translate'));
         $string->saveTranslate('string to translate', 'new string translation');
         $postData = $this->_getAttributeData() + ['attribute_id' => 1];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/product_attribute/save');
         $this->assertEquals('new string translation', $this->_translate('string to translate'));
@@ -282,15 +299,18 @@ public function testLargeOptionsDataSet()
         $optionsData = [];
         $expectedOptionsLabels = [];
         for ($i = 0; $i < $optionsCount; $i++) {
-            $order = $i + 1;
-            $expectedOptionLabelOnStoreView = "value_{$i}_store_1";
+            $expectedOptionLabelOnStoreView = 'value_' . $i . '_store_1';
             $expectedOptionsLabels[$i+1] = $expectedOptionLabelOnStoreView;
-            $optionsData []= "option[order][option_{$i}]={$order}";
-            $optionsData []= "option[value][option_{$i}][0]=value_{$i}_admin";
-            $optionsData []= "option[value][option_{$i}][1]={$expectedOptionLabelOnStoreView}";
-            $optionsData []= "option[delete][option_{$i}=";
+            $optionId = 'option_' . $i;
+            $optionRowData = [];
+            $optionRowData['option']['order'][$optionId] = $i + 1;
+            $optionRowData['option']['value'][$optionId][0] = 'value_' . $i . '_admin';
+            $optionRowData['option']['value'][$optionId][1] = $expectedOptionLabelOnStoreView;
+            $optionRowData['option']['delete'][$optionId] = '';
+            $optionsData[] = http_build_query($optionRowData);
         }
         $attributeData['serialized_options'] = json_encode($optionsData);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($attributeData);
         $this->dispatch('backend/catalog/product_attribute/save');
         $entityTypeId = $this->_objectManager->create(
@@ -362,6 +382,7 @@ protected function _getAttributeData()
             'default_value_textarea' => '0',
             'is_required' => '1',
             'frontend_class' => '',
+            'frontend_input' => 'select',
             'is_searchable' => '0',
             'is_visible_in_advanced_search' => '0',
             'is_comparable' => '0',
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/DeleteTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/DeleteTest.php
index 7c5d4ea48a238..7e034b8b3cb7e 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/DeleteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/DeleteTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Controller\Adminhtml\Product\Set;
 
 use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 class DeleteTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
@@ -15,7 +16,7 @@ class DeleteTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
     public function testDeleteById()
     {
         $attributeSet = $this->getAttributeSetByName('empty_attribute_set');
-        $this->getRequest()->setParam('id', $attributeSet->getId());
+        $this->getRequest()->setParam('id', $attributeSet->getId())->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('backend/catalog/product_set/delete/');
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/SaveTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/SaveTest.php
index 5b711b2ea7418..8ccd426424a29 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/SaveTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/SaveTest.php
@@ -9,6 +9,7 @@
 use Magento\Eav\Api\Data\AttributeSetInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
@@ -20,6 +21,7 @@ public function testAlreadyExistsExceptionProcessingWhenGroupCodeIsDuplicated()
         $attributeSet = $this->getAttributeSetByName('attribute_set_test');
         $this->assertNotEmpty($attributeSet, 'Attribute set with name "attribute_set_test" is missed');
 
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue('data', json_encode([
             'attribute_set_name' => 'attribute_set_test',
             'groups' => [
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php
index 4761f13175d81..44577b2a228a0 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php
@@ -11,6 +11,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * @magentoAppArea adminhtml
@@ -19,6 +20,7 @@ class ProductTest extends \Magento\TestFramework\TestCase\AbstractBackendControl
 {
     public function testSaveActionWithDangerRequest()
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(['product' => ['entity_id' => 15]]);
         $this->dispatch('backend/catalog/product/save');
         $this->assertSessionMessages(
@@ -36,6 +38,7 @@ public function testSaveActionAndNew()
         $this->getRequest()->setPostValue(['back' => 'new']);
         $repository = $this->_objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
         $product = $repository->get('simple');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/catalog/product/save/id/' . $product->getEntityId());
         $this->assertRedirect($this->stringStartsWith('http://localhost/index.php/backend/catalog/product/new/'));
         $this->assertSessionMessages(
@@ -52,6 +55,7 @@ public function testSaveActionAndDuplicate()
         $this->getRequest()->setPostValue(['back' => 'duplicate']);
         $repository = $this->_objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
         $product = $repository->get('simple');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/catalog/product/save/id/' . $product->getEntityId());
         $this->assertRedirect($this->stringStartsWith('http://localhost/index.php/backend/catalog/product/edit/'));
         $this->assertRedirect(
@@ -161,11 +165,13 @@ public function testEditAction()
     public function testSaveActionWithAlreadyExistingUrlKey(array $postData)
     {
         $this->getRequest()->setPostValue($postData);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/catalog/product/save');
         /** @var Manager $messageManager */
         $messageManager = $this->_objectManager->get(Manager::class);
         $messages = $messageManager->getMessages();
         $errors = $messages->getItemsByType('error');
+        $this->assertNotEmpty($errors);
         $message = array_shift($errors);
         $this->assertSame('URL key for specified store already exists.', $message->getText());
         $this->assertRedirect($this->stringContains('/backend/catalog/product/new'));
@@ -233,7 +239,6 @@ public function saveActionWithAlreadyExistingUrlKeyDataProvider()
                             'thumbnail' => '/m/a//magento_image.jpg.tmp',
                             'swatch_image' => '/m/a//magento_image.jpg.tmp',
                         ],
-                    'form_key' => Bootstrap::getObjectManager()->get(FormKey::class)->getFormKey(),
                 ]
             ]
         ];
@@ -251,6 +256,7 @@ public function saveActionWithAlreadyExistingUrlKeyDataProvider()
     public function testSaveActionTierPrice(array $postData, array $tierPrice)
     {
         $postData['product'] = $this->getProductData($tierPrice);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/product/save/id/' . $postData['id']);
         $this->assertSessionMessages(
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php
index 7e27fd7ede8b4..f9b1d10cbb8ae 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php
@@ -7,7 +7,9 @@
 // @codingStandardsIgnoreFile
 
 namespace Magento\Catalog\Controller\Product;
+
 use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * @magentoDataFixture Magento/Catalog/controllers/_files/products.php
@@ -23,6 +25,9 @@ class CompareTest extends \Magento\TestFramework\TestCase\AbstractController
      */
     protected $productRepository;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -40,6 +45,7 @@ public function testAddAction()
         /** @var \Magento\Framework\Data\Form\FormKey $formKey */
         $formKey = $objectManager->get(\Magento\Framework\Data\Form\FormKey::class);
         $product = $this->productRepository->get('simple_product_1');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch(
             sprintf(
                 'catalog/product_compare/add/product/%s/form_key/%s?nocookie=1',
@@ -49,7 +55,12 @@ public function testAddAction()
         );
 
         $this->assertSessionMessages(
-            $this->equalTo(['You added product Simple Product 1 Name to the <a href="http://localhost/index.php/catalog/product_compare/">comparison list</a>.']),
+            $this->equalTo(
+                [
+                    'You added product Simple Product 1 Name to the '.
+                    '<a href="http://localhost/index.php/catalog/product_compare/">comparison list</a>.'
+                ]
+            ),
             MessageInterface::TYPE_SUCCESS
         );
 
@@ -73,6 +84,7 @@ public function testRemoveAction()
     {
         $this->_requireVisitorWithTwoProducts();
         $product = $this->productRepository->get('simple_product_2');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('catalog/product_compare/remove/product/' . $product->getEntityId());
 
         $this->assertSessionMessages(
@@ -89,6 +101,7 @@ public function testRemoveActionWithSession()
     {
         $this->_requireCustomerWithTwoProducts();
         $product = $this->productRepository->get('simple_product_1');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('catalog/product_compare/remove/product/' . $product->getEntityId());
         $secondProduct = $this->productRepository->get('simple_product_2');
 
@@ -132,6 +145,7 @@ public function testClearAction()
     {
         $this->_requireVisitorWithTwoProducts();
 
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('catalog/product_compare/clear');
 
         $this->assertSessionMessages(
@@ -151,6 +165,7 @@ public function testRemoveActionProductNameXss()
     {
         $this->_prepareCompareListWithProductNameXss();
         $product = $this->productRepository->get('product-with-xss');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('catalog/product_compare/remove/product/' . $product->getEntityId() . '?nocookie=1');
 
         $this->assertSessionMessages(
@@ -307,7 +322,8 @@ protected function _assertCompareListEquals(array $expectedProductIds)
         // important
         $compareItems->setVisitorId(
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                \Magento\Customer\Model\Visitor::class)->getId()
+                \Magento\Customer\Model\Visitor::class
+            )->getId()
         );
         $actualProductIds = [];
         foreach ($compareItems as $compareItem) {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/CustomFlatAttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/CustomFlatAttributeTest.php
new file mode 100644
index 0000000000000..763237c702933
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/CustomFlatAttributeTest.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Indexer\Product\Flat\Action;
+
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\TestFramework\Indexer\TestCase as IndexerTestCase;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Indexer\Product\Flat\Processor;
+use Magento\Catalog\Model\ResourceModel\Product\Flat as FlatResource;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Store\Model\Store;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\Indexer\Product\Flat\State as FlatState;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+
+/**
+ * Custom Flat Attribute Test
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CustomFlatAttributeTest extends IndexerTestCase
+{
+    /**
+     * @var Processor
+     */
+    private $processor;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var ProductAttributeRepositoryInterface
+     */
+    private $attributeRepository;
+
+    /**
+     * @var FlatResource
+     */
+    private $flatResource;
+
+    /**
+     * @var FlatState
+     */
+    private $flatState;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var \Magento\Store\Api\Data\StoreInterface
+     */
+    private $savedCurrentStore;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->processor = $this->objectManager->get(Processor::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->attributeRepository = $this->objectManager->get(ProductAttributeRepositoryInterface::class);
+        $this->flatResource = $this->objectManager->get(FlatResource::class);
+        $this->flatState = $this->objectManager->create(FlatState::class, [
+            'isAvailable' => true
+        ]);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $this->savedCurrentStore = $this->storeManager->getStore();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->storeManager->setCurrentStore($this->savedCurrentStore);
+    }
+
+    /**
+     * Tests that custom product attribute will appear in flat table and can be updated in it.
+     *
+     * @magentoDbIsolation disabled
+     * @magentoAppArea frontend
+     * @magentoConfigFixture current_store catalog/frontend/flat_catalog_product 1
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat.php
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\StateException
+     */
+    public function testProductUpdateCustomAttribute()
+    {
+        $product = $this->productRepository->get('simple_with_custom_flat_attribute');
+        $product->setCustomAttribute('flat_attribute', 'changed flat attribute');
+        $this->productRepository->save($product);
+
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->create(SearchCriteriaBuilder::class);
+        /** @var \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria */
+        $searchCriteria = $searchCriteriaBuilder->addFilter('sku', 'simple_with_custom_flat_attribute')
+            ->create();
+
+        $items = $this->productRepository->getList($searchCriteria)
+            ->getItems();
+        $product = reset($items);
+        $resourceModel = $product->getResourceCollection()
+            ->getEntity();
+
+        self::assertInstanceOf(
+            FlatResource::class,
+            $resourceModel,
+            'Product should be received from flat resource'
+        );
+
+        self::assertEquals(
+            'changed flat attribute',
+            $product->getFlatAttribute(),
+            'Product flat attribute should be able to change.'
+        );
+    }
+
+    /**
+     * Tests flat dropdown attribute.
+     * Tests that flat dropdown attribute will be changed for different flat tables (it means for different stores)
+     *
+     * @magentoDbIsolation disabled
+     * @magentoAppArea adminhtml
+     * @magentoConfigFixture default_store catalog/frontend/flat_catalog_product 1
+     * @magentoConfigFixture default_store catalog/frontend/flat_catalog_category 1
+     * @magentoConfigFixture fixturestore_store catalog/frontend/flat_catalog_product 1
+     * @magentoConfigFixture fixturestore_store catalog/frontend/flat_catalog_category 1
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_multistore.php
+     * @magentoDataFixture Magento/Catalog/_files/flat_dropdown_attribute.php
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\StateException
+     */
+    public function testFlatDropDownAttribute()
+    {
+        $attribute = $this->attributeRepository->get('flat_attribute');
+        $attributeOptions = $attribute->getOptions();
+
+        $firstStoreAttributeOption = $attributeOptions[1];
+        $productStore1 = $this->productRepository->get('simple', false, 1);
+        $productStore1->setFlatAttribute($firstStoreAttributeOption->getValue());
+        $this->productRepository->save($productStore1);
+
+        /** @var StoreRepositoryInterface $storeRepository */
+        $storeRepository = $this->objectManager->get(StoreRepositoryInterface::class);
+        $store = $storeRepository->get('fixturestore');
+
+        $secondStoreAttributeOption = $attributeOptions[2];
+        $productStore2 = $this->productRepository->get('simple', false, $store->getId());
+        $productStore2->setFlatAttribute($secondStoreAttributeOption->getValue());
+        $this->productRepository->save($productStore2);
+
+        $this->processor = $this->objectManager->create(Processor::class);
+        $this->processor->reindexAll();
+
+        $productStore1 = $this->getFlatProductFromStore('simple');
+        self::assertEquals($firstStoreAttributeOption->getLabel(), $productStore1->getFlatAttributeValue());
+
+        $productStore2 = $this->getFlatProductFromStore('simple', $store);
+        self::assertEquals($secondStoreAttributeOption->getLabel(), $productStore2->getFlatAttributeValue());
+    }
+
+    /**
+     * Get product from store with flat data
+     *
+     * @param string $sku
+     * @param Store|null $store
+     * @return ProductInterface
+     */
+    private function getFlatProductFromStore(string $sku, $store = null): ProductInterface
+    {
+        if ($store) {
+            $this->storeManager->setCurrentStore($store);
+        }
+
+        /** @var Collection $productCollection */
+        $productCollection = $this->objectManager->create(
+            Collection::class,
+            [
+                'catalogProductFlatState' => $this->flatState
+            ]
+        );
+
+        if ($store) {
+            $productCollection->setStoreId($store->getId());
+        }
+
+        $productCollection->setEntity($this->flatResource);
+        $productCollection->addAttributeToFilter('sku', $sku);
+        $productCollection->addAttributeToSelect('flat_attribute');
+
+        return $productCollection->load()
+            ->getFirstItem();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
index 15c90891878a0..67c81772462d6 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
@@ -3,87 +3,110 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model\Indexer\Product\Flat\Action;
 
+use Magento\TestFramework\Indexer\TestCase as IndexerTestCase;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Indexer\Product\Flat\Processor;
+use Magento\Catalog\Block\Product\ListProduct;
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+
 /**
  * Class RowTest
  */
-class RowTest extends \Magento\TestFramework\Indexer\TestCase
+class RowTest extends IndexerTestCase
 {
     /**
-     * @var \Magento\Catalog\Model\Product
+     * @var Processor
      */
-    protected $_product;
+    private $processor;
 
     /**
-     * @var \Magento\Catalog\Model\Category
+     * @var \Magento\Framework\ObjectManagerInterface
      */
-    protected $_category;
+    private $objectManager;
 
     /**
-     * @var \Magento\Catalog\Model\Indexer\Product\Flat\State
+     * @var ProductRepositoryInterface
      */
-    protected $_state;
+    private $productRepository;
 
     /**
-     * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
+     * @var CategoryRepositoryInterface
      */
-    protected $_processor;
+    private $categoryRepository;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->_product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
-        $this->_category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Category::class
-        );
-        $this->_processor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Indexer\Product\Flat\Processor::class
-        );
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->processor = $this->objectManager->get(Processor::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->categoryRepository = $this->objectManager->get(CategoryRepositoryInterface::class);
     }
 
     /**
+     * Tests product update
+     *
      * @magentoDbIsolation disabled
      * @magentoDataFixture Magento/Catalog/_files/row_fixture.php
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_product 1
      * @magentoAppArea frontend
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\StateException
      */
     public function testProductUpdate()
     {
-        $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Catalog\Model\CategoryFactory::class);
-        $listProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Catalog\Block\Product\ListProduct::class);
+        /** @var ListProduct $listProduct */
+        $listProduct = $this->objectManager->create(ListProduct::class);
 
-        $this->_processor->getIndexer()->setScheduled(false);
-        $this->assertFalse(
-            $this->_processor->getIndexer()->isScheduled(),
+        $this->processor->getIndexer()
+            ->setScheduled(false);
+        $isScheduled = $this->processor->getIndexer()
+            ->isScheduled();
+        self::assertFalse(
+            $isScheduled,
             'Indexer is in scheduled mode when turned to update on save mode'
         );
 
-        $this->_product->load(1);
-        $this->_product->setName('Updated Product');
-        $this->_product->save();
+        $this->processor->reindexAll();
 
-        $this->_processor->reindexAll();
-        
-        $category = $categoryFactory->create()->load(9);
+        $product = $this->productRepository->get('simple');
+        $product->setName('Updated Product');
+        $this->productRepository->save($product);
+
+        /** @var \Magento\Catalog\Api\Data\CategoryInterface $category */
+        $category = $this->categoryRepository->get(9);
+        /** @var \Magento\Catalog\Model\Layer $layer */
         $layer = $listProduct->getLayer();
         $layer->setCurrentCategory($category);
         /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection */
         $productCollection = $layer->getProductCollection();
-        $this->assertTrue(
+        self::assertTrue(
             $productCollection->isEnabledFlat(),
             'Product collection is not using flat resource when flat is on'
         );
 
-        $this->assertEquals(2, $productCollection->count(), 'Product collection items count must be exactly 2');
+        self::assertEquals(
+            2,
+            $productCollection->count(),
+            'Product collection items count must be exactly 2'
+        );
 
         foreach ($productCollection as $product) {
             /** @var $product \Magento\Catalog\Model\Product */
-            if ($product->getId() == 1) {
-                $this->assertEquals(
+            if ($product->getSku() === 'simple') {
+                self::assertEquals(
                     'Updated Product',
                     $product->getName(),
                     'Product name from flat does not match with updated name'
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/SimpleWithOptionsTierPriceWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/SimpleWithOptionsTierPriceWithDimensionTest.php
index 40607cd85b3b4..814f814cdc1fd 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/SimpleWithOptionsTierPriceWithDimensionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Price/SimpleWithOptionsTierPriceWithDimensionTest.php
@@ -11,7 +11,7 @@
 use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Catalog\Pricing\Price\TierPrice;
-use Magento\Customer\Model\Group;
+use Magento\Customer\Model\Group as CustomerGroup;
 
 /**
  * @group indexer_dimension
@@ -42,16 +42,19 @@ protected function setUp()
 
     /**
      * @magentoDbIsolation disabled
-     * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
+     * @--magentoIndexerDimensionMode catalog_product_price website_and_customer_group
      * @magentoDataFixture Magento/Catalog/_files/category_product.php
      */
     public function testTierPrice()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $tierPriceValue = 9.00;
 
         $tierPrice = $this->objectManager->create(ProductTierPriceInterfaceFactory::class)
             ->create();
-        $tierPrice->setCustomerGroupId(Group::CUST_GROUP_ALL);
+        $tierPrice->setCustomerGroupId(CustomerGroup::CUST_GROUP_ALL);
         $tierPrice->setQty(1.00);
         $tierPrice->setValue($tierPriceValue);
         $tierPriceManagement = $this->objectManager->create(ScopedProductTierPriceManagementInterface::class);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/OptionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/OptionTest.php
new file mode 100644
index 0000000000000..7a26848aea77d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/OptionTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Model\Product;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Test Product Custom Options
+ *
+ * @magentoAppArea adminhtml
+ */
+class OptionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
+        $this->storeManager = Bootstrap::getObjectManager()->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
+     * @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 not default store is wrong');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php
index 12b7da2bd6e35..e0f26a7aab01b 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/PriceWithDimensionTest.php
@@ -17,7 +17,7 @@
 
 /**
  * @magentoDbIsolation disabled
- * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
+ * @--magentoIndexerDimensionMode catalog_product_price website_and_customer_group
  * @group indexer_dimension
  * @magentoDataFixture Magento/Catalog/_files/product_simple.php
  */
@@ -37,6 +37,9 @@ protected function setUp()
 
     public function testGetPriceFromIndexer()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         /** @var PriceTableResolver $tableResolver */
         $tableResolver = Bootstrap::getObjectManager()->create(PriceTableResolver::class);
 
@@ -66,11 +69,17 @@ public function testGetPriceFromIndexer()
 
     public function testGetPrice()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $this->assertEquals('test', $this->_model->getPrice(new DataObject(['price' => 'test'])));
     }
 
     public function testGetFinalPrice()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $repository = Bootstrap::getObjectManager()->create(
             ProductRepository::class
         );
@@ -95,6 +104,9 @@ public function testGetFinalPrice()
 
     public function testGetFormatedPrice()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $repository = Bootstrap::getObjectManager()->create(
             ProductRepository::class
         );
@@ -105,12 +117,18 @@ public function testGetFormatedPrice()
 
     public function testCalculatePrice()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $this->assertEquals(10, $this->_model->calculatePrice(10, 8, '1970-12-12 23:59:59', '1971-01-01 01:01:01'));
         $this->assertEquals(8, $this->_model->calculatePrice(10, 8, '1970-12-12 23:59:59', '2034-01-01 01:01:01'));
     }
 
     public function testCalculateSpecialPrice()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $this->assertEquals(
             10,
             $this->_model->calculateSpecialPrice(10, 8, '1970-12-12 23:59:59', '1971-01-01 01:01:01')
@@ -123,6 +141,9 @@ public function testCalculateSpecialPrice()
 
     public function testIsTierPriceFixed()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $this->assertTrue($this->_model->isTierPriceFixed());
     }
 
@@ -134,6 +155,9 @@ public function testIsTierPriceFixed()
      */
     private function prepareBuyRequest(Product $product)
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $options = [];
         /** @var $option \Magento\Catalog\Model\Product\Option */
         foreach ($product->getOptions() as $option) {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
index 8370e514dc2f2..a1923e63972ee 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
@@ -69,7 +69,7 @@ public function testGetCategoryId()
     {
         $this->assertFalse($this->_model->getCategoryId());
         $category = new \Magento\Framework\DataObject(['id' => 5]);
-
+        $this->_model->setCategoryIds([5]);
         $this->objectManager->get(\Magento\Framework\Registry::class)->register('current_category', $category);
         try {
             $this->assertEquals(5, $this->_model->getCategoryId());
@@ -83,6 +83,7 @@ public function testGetCategoryId()
     public function testGetCategory()
     {
         $this->assertEmpty($this->_model->getCategory());
+        $this->_model->setCategoryIds([3]);
 
         $this->objectManager->get(\Magento\Framework\Registry::class)
             ->register('current_category', new \Magento\Framework\DataObject(['id' => 3]));
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceWithDimensionTest.php
index 9e3db8c155e28..cb776fb08723f 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceWithDimensionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceWithDimensionTest.php
@@ -15,7 +15,7 @@
  * - pricing behaviour is tested
  * @group indexer_dimension
  * @magentoDbIsolation disabled
- * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
+ * @--magentoIndexerDimensionMode catalog_product_price website_and_customer_group
  * @see \Magento\Catalog\Model\ProductTest
  * @see \Magento\Catalog\Model\ProductExternalTest
  */
@@ -39,6 +39,9 @@ protected function setUp()
 
     public function testGetPrice()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $this->assertEmpty($this->_model->getPrice());
         $this->_model->setPrice(10.0);
         $this->assertEquals(10.0, $this->_model->getPrice());
@@ -46,6 +49,9 @@ public function testGetPrice()
 
     public function testGetPriceModel()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $default = $this->_model->getPriceModel();
         $this->assertInstanceOf(\Magento\Catalog\Model\Product\Type\Price::class, $default);
         $this->assertSame($default, $this->_model->getPriceModel());
@@ -56,6 +62,9 @@ public function testGetPriceModel()
      */
     public function testGetTierPrice()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $this->assertEquals([], $this->_model->getTierPrice());
     }
 
@@ -64,6 +73,9 @@ public function testGetTierPrice()
      */
     public function testGetTierPriceCount()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $this->assertEquals(0, $this->_model->getTierPriceCount());
     }
 
@@ -72,11 +84,17 @@ public function testGetTierPriceCount()
      */
     public function testGetFormatedPrice()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $this->assertEquals('<span class="price">$0.00</span>', $this->_model->getFormatedPrice());
     }
 
     public function testSetGetFinalPrice()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $this->assertEquals(0, $this->_model->getFinalPrice());
         $this->_model->setPrice(10);
         $this->_model->setFinalPrice(10);
@@ -88,6 +106,9 @@ public function testSetGetFinalPrice()
      */
     public function testGetMinPrice()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $product = $this->productRepository->get('simple');
         $collection = Bootstrap::getObjectManager()->create(Collection::class);
         $collection->addIdFilter($product->getId());
@@ -103,6 +124,9 @@ public function testGetMinPrice()
      */
     public function testGetMinPriceForComposite()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $confProduct = $this->productRepository->get('configurable');
         $collection = Bootstrap::getObjectManager()->create(Collection::class);
         $collection->addIdFilter($confProduct->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/RemoveRedundantImageTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/RemoveRedundantImageTest.php
new file mode 100644
index 0000000000000..1bc545a25ac32
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/RemoveRedundantImageTest.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Test removing old Category Image file from pub/media/catalog/category directory if such Image is not used anymore.
+ */
+class RemoveRedundantImageTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var WriteInterface
+     */
+    private $mediaDirectory;
+
+    /**
+     * @var CategoryRepository
+     */
+    private $categoryRepository;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var Filesystem $filesystem */
+        $this->filesystem = $this->objectManager->get(Filesystem::class);
+        $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $this->categoryRepository = $this->objectManager->get(CategoryRepository::class);
+    }
+
+    /**
+     * Tests removing Image file if it is not used anymore.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/categories_with_image.php
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     */
+    public function testRemoveRedundantImage()
+    {
+        $imagesPath = 'catalog' . DIRECTORY_SEPARATOR . 'category';
+        $absoluteImagesPath = $this->mediaDirectory->getAbsolutePath($imagesPath);
+        $filePath1 = $absoluteImagesPath . DIRECTORY_SEPARATOR . 'test_image_1.jpg';
+        $filePath2 = $absoluteImagesPath . DIRECTORY_SEPARATOR . 'test_image_2.jpg';
+        $this->mediaDirectory->create($absoluteImagesPath);
+        $this->mediaDirectory->touch($filePath1);
+        $this->mediaDirectory->touch($filePath2);
+
+        $category1 = $this->categoryRepository->get(3);
+        $category1->setImage('test_image_3.jpg');
+        $this->categoryRepository->save($category1);
+        $category2 = $this->categoryRepository->get(5);
+        $category2->setImage('test_image_3.jpg');
+        $this->categoryRepository->save($category2);
+
+        $this->assertTrue($this->mediaDirectory->isExist($filePath1));
+        $this->assertFalse($this->mediaDirectory->isExist($filePath2));
+    }
+
+    protected function tearDown()
+    {
+        $this->mediaDirectory->delete();
+    }
+}
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 6ac7a8551fd99..19be025b5e40f 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
@@ -5,6 +5,9 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Product;
 
+/**
+ * Collection test
+ */
 class CollectionTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -228,4 +231,17 @@ public function testAddAttributeToFilterAffectsGetSize()
         $this->collection->addAttributeToFilter('sku', 'Product1');
         $this->assertEquals(1, $this->collection->getSize());
     }
+
+    /**
+     * Add tier price attribute filter to collection
+     *
+     * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/few_simple_products.php
+     * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/product_simple.php
+     */
+    public function testAddAttributeTierPriceToFilter()
+    {
+        $this->assertEquals(11, $this->collection->getSize());
+        $this->collection->addAttributeToFilter('tier_price', ['gt' => 0]);
+        $this->assertEquals(1, $this->collection->getSize());
+    }
 }
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 7954e2c36227f..476f01eb277df 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php
@@ -12,6 +12,11 @@
 
 class ProductTest extends TestCase
 {
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
     /**
      * @var Product
      */
@@ -29,7 +34,8 @@ protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
 
-        $this->model = $this->objectManager->get(Product::class);
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->model = $this->objectManager->create(Product::class);
     }
 
     /**
@@ -42,11 +48,29 @@ public function testGetAttributeRawValue()
         $sku = 'simple';
         $attribute = 'name';
 
-        /** @var ProductRepositoryInterface $productRepository */
-        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-        $product = $productRepository->get($sku);
-
+        $product = $this->productRepository->get($sku);
         $actual = $this->model->getAttributeRawValue($product->getId(), $attribute, null);
         self::assertEquals($product->getName(), $actual);
     }
+
+    /**
+     * @magentoAppArea adminhtml
+     * @magentoDataFixture Magento/Catalog/_files/product_special_price.php
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default_store catalog/price/scope 1
+     */
+    public function testUpdateStoreSpecificSpecialPrice()
+    {
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $this->productRepository->get('simple', true, 1);
+        $this->assertEquals(5.99, $product->getSpecialPrice());
+
+        $product->setSpecialPrice('');
+        $this->model->save($product);
+        $product = $this->productRepository->get('simple', false, 1, true);
+        $this->assertEmpty($product->getSpecialPrice());
+
+        $product = $this->productRepository->get('simple', false, 0, true);
+        $this->assertEquals(5.99, $product->getSpecialPrice());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/QuantityAndStockStatusTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/QuantityAndStockStatusTest.php
new file mode 100644
index 0000000000000..00fc5d3a46ec4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/QuantityAndStockStatusTest.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\Ui\DataProvider\Product;
+
+use Magento\CatalogInventory\Model\Stock\StockItemRepository;
+use Magento\CatalogInventory\Ui\DataProvider\Product\AddQuantityAndStockStatusFieldToCollection;
+use PHPUnit\Framework\TestCase;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\CatalogInventory\Api\StockRegistryInterface;
+
+/**
+ * Quantity and stock status test
+ */
+class QuantityAndStockStatusTest extends TestCase
+{
+    /**
+     * @var string
+     */
+    private static $quantityAndStockStatus = 'quantity_and_stock_status';
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
+    /**
+     * Test product stock status in the products grid column
+     *
+     * @magentoDataFixture Magento/Catalog/_files/quantity_and_stock_status_attribute_used_in_grid.php
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     */
+    public function testProductStockStatus()
+    {
+        /** @var StockItemRepository $stockItemRepository */
+        $stockItemRepository = $this->objectManager->create(StockItemRepository::class);
+
+        /** @var StockRegistryInterface $stockRegistry */
+        $stockRegistry = $this->objectManager->create(StockRegistryInterface::class);
+
+        $stockItem = $stockRegistry->getStockItemBySku('simple');
+        $stockItem->setIsInStock(false);
+        $stockItemRepository->save($stockItem);
+        $savedStockStatus = (int)$stockItem->getIsInStock();
+
+        $dataProvider = $this->objectManager->create(
+            ProductDataProvider::class,
+            [
+                'name' => 'product_listing_data_source',
+                'primaryFieldName' => 'entity_id',
+                'requestFieldName' => 'id',
+                'addFieldStrategies' => [
+                    'quantity_and_stock_status' =>
+                        $this->objectManager->get(AddQuantityAndStockStatusFieldToCollection::class)
+                ]
+            ]
+        );
+
+        $dataProvider->addField(self::$quantityAndStockStatus);
+        $data = $dataProvider->getData();
+        $dataProviderStockStatus = $data['items'][0][self::$quantityAndStockStatus];
+
+        $this->assertEquals($dataProviderStockStatus, $savedStockStatus);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_with_image.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_with_image.php
new file mode 100644
index 0000000000000..6fc0f4e8b6efa
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_with_image.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/**
+ * After installation system has two categories: root one with ID:1 and Default category with ID:2
+ */
+/** @var $category \Magento\Catalog\Model\Category */
+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setId(3)
+    ->setName('Category 1')
+    ->setParentId(2)
+    ->setPath('1/2/3')
+    ->setLevel(2)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(1)
+    ->setImage('test_image_1.jpg')
+    ->save();
+
+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setId(4)
+    ->setName('Category 1.1')
+    ->setParentId(3)
+    ->setPath('1/2/3/4')
+    ->setLevel(3)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setIsAnchor(true)
+    ->setPosition(1)
+    ->setImage('test_image_1.jpg')
+    ->save();
+
+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setId(5)
+    ->setName('Category 2')
+    ->setParentId(2)
+    ->setPath('1/2/5')
+    ->setLevel(2)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(2)
+    ->setImage('test_image_2.jpg')
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_with_image_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_with_image_rollback.php
new file mode 100644
index 0000000000000..d290a164f639e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_with_image_rollback.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+//Remove categories
+/** @var Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
+$collection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
+$collection
+    ->addAttributeToFilter('level', 2)
+    ->load()
+    ->delete();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_product.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_product.php
index 6803d96f0c0de..fe61b3e197ca0 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_product.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_product.php
@@ -15,7 +15,7 @@
 )->setParentId(
     2
 )->setPath(
-    '1/2/3'
+    '1/2/333'
 )->setLevel(
     2
 )->setAvailableSortBy(
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/flat_dropdown_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/flat_dropdown_attribute.php
new file mode 100644
index 0000000000000..290958b56b886
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/flat_dropdown_attribute.php
@@ -0,0 +1,72 @@
+<?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\Setup\CategorySetup;
+use Magento\Eav\Model\Entity;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Eav\Api\Data\AttributeOptionInterfaceFactory;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+
+/** @var \Magento\TestFramework\ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var AttributeOptionInterfaceFactory $attributeOptionFactory */
+$attributeOptionFactory = $objectManager->get(AttributeOptionInterfaceFactory::class);
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+/** @var $installer CategorySetup */
+$installer = $objectManager->create(CategorySetup::class);
+$entityModel = $objectManager->create(Entity::class);
+$attributeSetId = $installer->getAttributeSetId(Product::ENTITY, 'Default');
+$entityTypeId = $entityModel->setType(Product::ENTITY)
+    ->getTypeId();
+$groupId = $installer->getDefaultAttributeGroupId($entityTypeId, $attributeSetId);
+/** @var ProductAttributeInterface $attribute */
+$attribute = $objectManager->create(ProductAttributeInterface::class);
+
+$attribute->setAttributeCode('flat_attribute')
+    ->setEntityTypeId($entityTypeId)
+    ->setIsVisible(true)
+    ->setFrontendInput('select')
+    ->setIsFilterable(1)
+    ->setIsUserDefined(1)
+    ->setUsedInProductListing(1)
+    ->setBackendType('int')
+    ->setIsUsedInGrid(1)
+    ->setIsVisibleInGrid(1)
+    ->setIsFilterable(0)
+    ->setIsHtmlAllowedOnFront(1)
+    ->setIsFilterableInGrid(1)
+    ->setAttributeGroupId($groupId)
+    ->setIsGlobal(0)
+    ->setIsUsedInProductListing(1)
+    ->setFrontendLabel('nobody cares')
+    ->setAttributeGroupId($groupId)
+    ->setAttributeSetId(4);
+
+$optionsArray = [
+    [
+        'label' => 'Option 1',
+        'value' => 'option_1'
+    ],
+    [
+        'label' => 'Option 2',
+        'value' => 'option_2'
+    ],
+    [
+        'label' => 'Option 3',
+        'value' => 'option_3'
+    ],
+];
+
+$options = [];
+foreach ($optionsArray as $option) {
+    $options[] = $attributeOptionFactory->create(['data' => $option]);
+}
+$attribute->setOptions($options);
+$attributeRepository->save($attribute);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/flat_dropdown_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/flat_dropdown_attribute_rollback.php
new file mode 100644
index 0000000000000..d56fefaa99aa2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/flat_dropdown_attribute_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\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/** @var \Magento\TestFramework\ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+
+try {
+    $attribute = $attributeRepository->get('flat_attribute');
+    $attributeRepository->delete($attribute);
+} catch (NoSuchEntityException $e) {
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat.php
new file mode 100644
index 0000000000000..2b1b271a8bb3c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\Indexer\Product\Flat\Processor;
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\Eav\Model\Entity;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type;
+
+/** @var \Magento\TestFramework\ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var ProductFactory $productFactory */
+$productFactory = $objectManager->get(ProductFactory::class);
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+
+
+/** @var $installer CategorySetup */
+$installer = $objectManager->create(CategorySetup::class);
+$entityModel = $objectManager->create(Entity::class);
+$attributeSetId = $installer->getAttributeSetId(Product::ENTITY, 'Default');
+$entityTypeId = $entityModel->setType(Product::ENTITY)
+    ->getTypeId();
+$groupId = $installer->getDefaultAttributeGroupId($entityTypeId, $attributeSetId);
+
+/** @var ProductAttributeInterface $attribute */
+$attribute = $objectManager->create(ProductAttributeInterface::class);
+
+$attribute->setAttributeCode('flat_attribute')
+    ->setEntityTypeId($entityTypeId)
+    ->setIsVisible(true)
+    ->setFrontendInput('text')
+    ->setIsFilterable(1)
+    ->setIsUserDefined(1)
+    ->setUsedInProductListing(1)
+    ->setBackendType('varchar')
+    ->setIsUsedInGrid(1)
+    ->setIsVisibleInGrid(1)
+    ->setIsFilterableInGrid(1)
+    ->setFrontendLabel('nobody cares')
+    ->setAttributeGroupId($groupId)
+    ->setAttributeSetId(4);
+
+$attributeRepository->save($attribute);
+
+/** @var Processor $processor */
+$processor = $objectManager->create(Processor::class);
+$scheduled = $processor->getIndexer()
+    ->isScheduled();
+$processor->reindexAll();
+
+$product = $productFactory->create()
+    ->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId(4)
+    ->setName('Simple With Attribute That Used In Flat')
+    ->setSku('simple_with_custom_flat_attribute')
+    ->setPrice(100)
+    ->setVisibility(1)
+    ->setStockData(
+        [
+            'use_config_manage_stock'   => 1,
+            'qty'                       => 100,
+            'is_in_stock'               => 1,
+        ]
+    )
+    ->setStatus(1);
+$product->setCustomAttribute('flat_attribute', 'flat attribute value');
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat_rollback.php
new file mode 100644
index 0000000000000..c1892d504ecc3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat_rollback.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+
+/** @var Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
+    $product = $productRepository->get('simple_with_custom_flat_attribute');
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+}
+
+try {
+    /** @var \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute */
+    $attribute = $attributeRepository->get('flat_attribute');
+    $attributeRepository->delete($attribute);
+} catch (NoSuchEntityException $e) {
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_non_latin_url_key.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_non_latin_url_key.php
new file mode 100644
index 0000000000000..23fd8d7fe324e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_non_latin_url_key.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$stockDataConfig = [
+    'use_config_manage_stock' => 1,
+    'qty' => 100,
+    'is_qty_decimal' => 0,
+    'is_in_stock' => 1
+];
+
+/** @var ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+
+/** @var ProductInterface $product */
+$product = $objectManager->create(ProductInterface::class);
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Чудовий продукт без Url Key')
+    ->setSku('ukrainian-without-url-key')
+    ->setPrice(10)
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setCategoryIds([2])
+    ->setStockData($stockDataConfig);
+try {
+    $productRepository->save($product);
+} catch (\Exception $e) {
+    // problems during save
+};
+
+/** @var ProductInterface $product */
+$product = $objectManager->create(ProductInterface::class);
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Надзвичайний продукт з Url Key')
+    ->setSku('ukrainian-with-url-key')
+    ->setPrice(10)
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setCategoryIds([2])
+    ->setStockData($stockDataConfig)
+    ->setUrlKey('надзвичайний продукт на кожен день');
+try {
+    $productRepository->save($product);
+} catch (\Exception $e) {
+    // problems during save
+};
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_non_latin_url_key_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_non_latin_url_key_rollback.php
new file mode 100644
index 0000000000000..d4592430c0e94
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_non_latin_url_key_rollback.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+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);
+
+$productSkus = [
+    'ukrainian-with-url-key',
+    'ukrainian-without-url-key',
+];
+try {
+    foreach ($productSkus as $sku) {
+        $product = $productRepository->get($sku, false, null, true);
+        $productRepository->delete($product);
+    }
+} catch (NoSuchEntityException $e) {
+    // nothing to delete
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_file_custom_option.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_file_custom_option.php
new file mode 100644
index 0000000000000..bba4893596b4a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_file_custom_option.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+
+$product->setTypeId('simple')
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([1])
+    ->setName('Simple Product With File Custom Option')
+    ->setSku('simple-with-file-option')
+    ->setPrice(10)
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setCanSaveCustomOptions(true)
+    ->setStockData(
+        [
+            'qty' => 100,
+            'is_in_stock' => 1,
+        ]
+    )
+    ->setHasOptions(true);
+
+$option = [
+    'title' => 'file option',
+    'type' => 'file',
+    'is_require' => true,
+    'sort_order' => 3,
+    'price' => 30.0,
+    'price_type' => 'fixed',
+    'sku' => 'file option sku',
+    'file_extension' => 'jpg,png,gif',
+    'image_size_x' => 2000,
+    'image_size_y' => 2000,
+];
+
+$customOptions = [];
+
+/** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory $customOptionFactory */
+$customOptionFactory = $objectManager->create(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class);
+
+/** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterface $customOption */
+$customOption = $customOptionFactory->create(['data' => $option]);
+$customOption->setProductSku($product->getSku());
+$customOptions[] = $customOption;
+
+$product->setOptions($customOptions);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepositoryFactory */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_file_custom_option_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_file_custom_option_rollback.php
new file mode 100644
index 0000000000000..a3758168cfa3f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_file_custom_option_rollback.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Catalog\Model\ProductRepository::class
+);
+try {
+    $product = $repository->get('simple-with-file-option', false, null, true);
+    $product->delete();
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    //Entity already deleted
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_different_stores.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_different_stores.php
new file mode 100644
index 0000000000000..6102738bd6be4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_different_stores.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+
+require __DIR__ . '/../../Store/_files/core_fixturestore.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Magento\Store\Model\Website $website */
+$website = $objectManager->get(Magento\Store\Model\Website::class);
+
+$website->setData(
+    [
+        'code' => 'second_website',
+        'name' => 'Test Website',
+    ]
+);
+
+$website->save();
+
+$objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();
+
+/** @var IndexerRegistry $indexerRegistry */
+$indexerRegistry = $objectManager->create(IndexerRegistry::class);
+$indexer =  $indexerRegistry->get('catalogsearch_fulltext');
+
+$indexer->reindexAll();
+
+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setId(96377)
+    ->setName('Category 1')
+    ->setParentId(2)
+    ->setPath('1/2/96377')
+    ->setLevel(2)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(1)
+    ->save();
+
+/** @var $product Product */
+$product = $objectManager->create(Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product')
+    ->setSku('simple_1')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setShortDescription("Short description")
+    ->setTaxClassId(0)
+    ->setDescription('Description with <b>html tag</b>')
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setCategoryIds([96377]);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$productRepository->save($product);
+
+/** @var $product Product */
+$product = $objectManager->create(Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([$website->getId()])
+    ->setName('Simple Product 2')
+    ->setSku('simple_2')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setShortDescription("Short description")
+    ->setTaxClassId(0)
+    ->setDescription('Description with <b>html tag</b>')
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setCategoryIds([96377]);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$productRepository->save($product);
+
+/** @var $product Product */
+$product = $objectManager->create(Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1, $website->getId()])
+    ->setName('Simple Product 3')
+    ->setSku('simple_3')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setShortDescription("Short description")
+    ->setTaxClassId(0)
+    ->setDescription('Description with <b>html tag</b>')
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setCategoryIds([96377]);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_different_stores_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_different_stores_rollback.php
new file mode 100644
index 0000000000000..9b957b75eb2a3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_different_stores_rollback.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/../../Store/_files/core_fixturestore_rollback.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+//Remove category
+/** @var $category \Magento\Catalog\Model\Category */
+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category->load(96377);
+if ($category->getId()) {
+    $category->delete();
+}
+
+$productSkuList = ['simple_1', 'simple_2', 'simple_3'];
+foreach ($productSkuList as $sku) {
+    try {
+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $product = $productRepository->get($sku, true);
+        if ($product->getId()) {
+            $productRepository->delete($product);
+        }
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Product already removed
+    }
+}
+
+/** @var Magento\Store\Model\Website $website */
+$website = $objectManager->get(Magento\Store\Model\Website::class);
+$website->load('second_website', 'code');
+if ($website->getId()) {
+    $website->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php
index 15e274541bac4..a5ca4573d98b0 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php
@@ -15,8 +15,8 @@
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
     ->setStockData(['qty' => 100, 'is_in_stock' => 1])
-    ->setNewsFromDate(date('Y-m-d', strtotime('-2 day')))
-    ->setNewsToDate(date('Y-m-d', strtotime('+2 day')))
+    ->setNewsFromDate(date('Y-m-d H:i:s', strtotime('-2 day')))
+    ->setNewsToDate(date('Y-m-d H:i:s', strtotime('+2 day')))
     ->setDescription('description')
     ->setShortDescription('short desc')
     ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/quantity_and_stock_status_attribute_used_in_grid.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/quantity_and_stock_status_attribute_used_in_grid.php
new file mode 100644
index 0000000000000..1870eaba566d8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/quantity_and_stock_status_attribute_used_in_grid.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$eavSetupFactory = $objectManager->create(\Magento\Eav\Setup\EavSetupFactory::class);
+/** @var \Magento\Eav\Setup\EavSetup $eavSetup */
+$eavSetup = $eavSetupFactory->create();
+$eavSetup->updateAttribute(
+    \Magento\Catalog\Model\Product::ENTITY,
+    'quantity_and_stock_status',
+    [
+        'is_used_in_grid' => 1,
+    ]
+);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/quantity_and_stock_status_attribute_used_in_grid_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/quantity_and_stock_status_attribute_used_in_grid_rollback.php
new file mode 100644
index 0000000000000..fba12f19fdca8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/quantity_and_stock_status_attribute_used_in_grid_rollback.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$eavSetupFactory = $objectManager->create(\Magento\Eav\Setup\EavSetupFactory::class);
+/** @var \Magento\Eav\Setup\EavSetup $eavSetup */
+$eavSetup = $eavSetupFactory->create();
+$eavSetup->updateAttribute(
+    \Magento\Catalog\Model\Product::ENTITY,
+    'quantity_and_stock_status',
+    [
+        'is_used_in_grid' => 0,
+    ]
+);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_products_not_visible_individually.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_products_not_visible_individually.php
new file mode 100644
index 0000000000000..dfb8ce4d4741f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_products_not_visible_individually.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId(67)
+    ->setAttributeSetId(4)
+    ->setName('Simple Product Not visible 1')
+    ->setSku('simple_not_visible_1')
+    ->setTaxClassId('none')
+    ->setDescription('description')
+    ->setShortDescription('short description')
+    ->setOptionsContainer('container1')
+    ->setMsrpDisplayActualPriceType(\Magento\Msrp\Model\Product\Attribute\Source\Type::TYPE_IN_CART)
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setMetaTitle('meta title product Not visible')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setWebsiteIds([1])
+    ->setCategoryIds([300])
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 30, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setSpecialPrice('5.99')
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_products_not_visible_individually_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_products_not_visible_individually_rollback.php
new file mode 100644
index 0000000000000..bbdcfd7acf081
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_products_not_visible_individually_rollback.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Exception\NoSuchEntityException;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('simple_not_visible_1', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
index 81592b6901f1c..482cfd13391ca 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
@@ -70,7 +70,7 @@ protected function setUp()
 
     /**
      * @magentoDataFixture Magento/CatalogImportExport/_files/product_export_data.php
-     * @magentoDbIsolationEnabled
+     * @magentoDbIsolation enabled
      */
     public function testExport()
     {
@@ -95,7 +95,7 @@ public function testExport()
 
     /**
      * @magentoDataFixture Magento/CatalogImportExport/_files/product_export_data_special_chars.php
-     * @magentoDbIsolationEnabled
+     * @magentoDbIsolation enabled
      */
     public function testExportSpecialChars()
     {
@@ -110,7 +110,7 @@ public function testExportSpecialChars()
 
     /**
      * @magentoDataFixture Magento/CatalogImportExport/_files/product_export_with_product_links_data.php
-     * @magentoDbIsolationEnabled
+     * @magentoDbIsolation enabled
      */
     public function testExportWithProductLinks()
     {
@@ -325,8 +325,10 @@ public function testExportWithMedia()
 
     /**
      * @magentoDataFixture Magento/CatalogImportExport/_files/product_export_data.php
+     *
+     * @return void
      */
-    public function testExportWithCustomOptions()
+    public function testExportWithCustomOptionsAndSecondStore()
     {
         $storeCode = 'default';
         $expectedData = [];
@@ -380,6 +382,56 @@ public function testExportWithCustomOptions()
         self::assertSame($expectedData, $customOptionData);
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_custom_options.php
+     *
+     * @return void
+     */
+    public function testExportWithCustomOptions()
+    {
+        $expectedData = [];
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
+        $product = $productRepository->get('simple_with_custom_options', true);
+
+        foreach ($product->getOptions() as $customOption) {
+            $optionTitle = $customOption->getTitle();
+            $expectedData[$optionTitle] = [];
+            if ($customOption->getValues()) {
+                foreach ($customOption->getValues() as $customOptionValue) {
+                    $expectedData[$optionTitle][] = $customOptionValue->getTitle();
+                }
+            }
+        }
+
+        ksort($expectedData);
+
+        $this->model->setWriter(
+            $this->objectManager->create(
+                \Magento\ImportExport\Model\Export\Adapter\Csv::class
+            )
+        );
+        $exportData = $this->model->export();
+        /** @var $varDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
+        $varDirectory = $this->objectManager->get(\Magento\Framework\Filesystem::class)
+            ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR);
+        $varDirectory->writeFile('test_product_with_custom_options.csv', $exportData);
+        /** @var \Magento\Framework\File\Csv $csv */
+        $csv = $this->objectManager->get(\Magento\Framework\File\Csv::class);
+        $data = $csv->getData($varDirectory->getAbsolutePath('test_product_with_custom_options.csv'));
+
+        foreach ($data[0] as $columnNumber => $columnName) {
+            if ($columnName === 'custom_options') {
+                $exportedCustomOptionData = $this->parseExportedCustomOption($data[1][$columnNumber]);
+            }
+        }
+
+        ksort($exportedCustomOptionData);
+
+        self::assertSame($expectedData, $exportedCustomOptionData);
+    }
+
     /**
      * @param $exportedCustomOption
      * @return array
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractTest.php
index 9f7f92b1ebe54..a03675664afba 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractTest.php
@@ -43,6 +43,11 @@ protected function setUp()
     }
 
     /**
+     * Test adding default attribute to product before save.
+     *
+     * @param array $rowData
+     * @param bool $withDefaultValue
+     * @param array $expectedAttributes
      * @dataProvider prepareAttributesWithDefaultValueForSaveDataProvider
      */
     public function testPrepareAttributesWithDefaultValueForSave($rowData, $withDefaultValue, $expectedAttributes)
@@ -52,9 +57,15 @@ public function testPrepareAttributesWithDefaultValueForSave($rowData, $withDefa
             $this->assertArrayHasKey($key, $actualAttributes);
             $this->assertEquals($value, $actualAttributes[$key]);
         }
+        
+        if (!empty($rowData['_store'])) {
+            $this->assertEquals($expectedAttributes, $actualAttributes, '', 0.0, 10, true);
+        }
     }
 
     /**
+     * Data provider for testPrepareAttributesWithDefaultValueForSave.
+     *
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -78,6 +89,17 @@ public function prepareAttributesWithDefaultValueForSaveDataProvider()
                 false,
                 ['price' => 65, 'visibility' => 1, 'tax_class_id' => ''],
             ],
+            'Updating existing product with attributes that do not have default values with store in dataRow' => [
+                [
+                    'sku' => 'simple_product_3',
+                    'price' => 75,
+                    '_attribute_set' => 'Default',
+                    'product_type' => 'simple',
+                    '_store' => 1
+                ],
+                true,
+                ['price' => 75],
+            ],
             'Adding new product with attributes that do not have default values' => [
                 [
                     'sku' => 'simple_product_3',
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 f3cb01a9bbe2e..829576ce8c193 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -25,17 +25,22 @@
 use Magento\Framework\Filesystem;
 use Magento\Framework\Registry;
 use Magento\ImportExport\Model\Import;
+use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 use Magento\Store\Model\Store;
 use Psr\Log\LoggerInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\ImportExport\Model\Import\Source\Csv;
 
 /**
  * Class ProductTest
  * @magentoAppIsolation enabled
  * @magentoDbIsolation enabled
+ * @magentoAppArea adminhtml
  * @magentoDataFixtureBeforeTransaction Magento/Catalog/_files/enable_reindex_schedule.php
  * @magentoDataFixtureBeforeTransaction Magento/Catalog/_files/enable_catalog_product_reindex_schedule.php
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  */
 class ProductTest extends \Magento\TestFramework\Indexer\TestCase
 {
@@ -69,19 +74,45 @@ class ProductTest extends \Magento\TestFramework\Indexer\TestCase
      */
     private $logger;
 
+    /**
+     * @var array
+     */
+    private $importedProducts;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $this->logger = $this->getMockBuilder(LoggerInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $this->_model = $this->objectManager->create(
             \Magento\CatalogImportExport\Model\Import\Product::class,
             ['logger' => $this->logger]
         );
+        $this->importedProducts = [];
+
         parent::setUp();
     }
 
+    protected function tearDown()
+    {
+        /* We rollback here the products created during the Import because they were
+           created during test execution and we do not have the rollback for them */
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        foreach ($this->importedProducts as $productSku) {
+            try {
+                $product = $productRepository->get($productSku, false, null, true);
+                $productRepository->delete($product);
+            } catch (NoSuchEntityException $e) {
+                // nothing to delete
+            }
+        }
+    }
+
     /**
      * Options for assertion
      *
@@ -103,7 +134,7 @@ protected function setUp()
     protected $_assertOptionValues = [
         'title' => 'option_title',
         'price' => 'price',
-        'sku' => 'sku'
+        'sku' => 'sku',
     ];
 
     /**
@@ -127,24 +158,19 @@ protected function setUp()
     public function testSaveProductsVisibility()
     {
         /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Api\ProductRepositoryInterface::class
-        );
+        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
         $id1 = $productRepository->get('simple1')->getId();
         $id2 = $productRepository->get('simple2')->getId();
         $id3 = $productRepository->get('simple3')->getId();
         $existingProductIds = [$id1, $id2, $id3];
         $productsBeforeImport = [];
         foreach ($existingProductIds as $productId) {
-            $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-                \Magento\Catalog\Model\Product::class
-            );
+            $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
             $product->load($productId);
             $productsBeforeImport[] = $product;
         }
 
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Framework\Filesystem::class);
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
 
         $source = $this->objectManager->create(
@@ -167,9 +193,7 @@ public function testSaveProductsVisibility()
         /** @var $productBeforeImport \Magento\Catalog\Model\Product */
         foreach ($productsBeforeImport as $productBeforeImport) {
             /** @var $productAfterImport \Magento\Catalog\Model\Product */
-            $productAfterImport = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-                \Magento\Catalog\Model\Product::class
-            );
+            $productAfterImport = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
             $productAfterImport->load($productBeforeImport->getId());
 
             $this->assertEquals($productBeforeImport->getVisibility(), $productAfterImport->getVisibility());
@@ -188,9 +212,7 @@ public function testSaveProductsVisibility()
     public function testSaveStockItemQty()
     {
         /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Api\ProductRepositoryInterface::class
-        );
+        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
         $id1 = $productRepository->get('simple1')->getId();
         $id2 = $productRepository->get('simple2')->getId();
         $id3 = $productRepository->get('simple3')->getId();
@@ -198,16 +220,13 @@ public function testSaveStockItemQty()
         $stockItems = [];
         foreach ($existingProductIds as $productId) {
             /** @var $stockRegistry \Magento\CatalogInventory\Model\StockRegistry */
-            $stockRegistry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-                \Magento\CatalogInventory\Model\StockRegistry::class
-            );
+            $stockRegistry = $this->objectManager->create(\Magento\CatalogInventory\Model\StockRegistry::class);
 
             $stockItem = $stockRegistry->getStockItem($productId, 1);
             $stockItems[$productId] = $stockItem;
         }
 
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Framework\Filesystem::class);
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
             \Magento\ImportExport\Model\Import\Source\Csv::class,
@@ -229,9 +248,7 @@ public function testSaveStockItemQty()
         /** @var $stockItmBeforeImport \Magento\CatalogInventory\Model\Stock\Item */
         foreach ($stockItems as $productId => $stockItmBeforeImport) {
             /** @var $stockRegistry \Magento\CatalogInventory\Model\StockRegistry */
-            $stockRegistry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-                \Magento\CatalogInventory\Model\StockRegistry::class
-            );
+            $stockRegistry = $this->objectManager->create(\Magento\CatalogInventory\Model\StockRegistry::class);
 
             $stockItemAfterImport = $stockRegistry->getStockItem($productId, 1);
 
@@ -251,8 +268,7 @@ public function testSaveStockItemQty()
      */
     public function testStockState()
     {
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Framework\Filesystem::class);
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
             \Magento\ImportExport\Model\Import\Source\Csv::class,
@@ -280,6 +296,8 @@ public function testStockState()
      * @param string $importFile
      * @param string $sku
      * @param int $expectedOptionsQty
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @magentoAppIsolation enabled
      */
     public function testSaveCustomOptions($importFile, $sku, $expectedOptionsQty)
@@ -292,7 +310,7 @@ public function testSaveCustomOptions($importFile, $sku, $expectedOptionsQty)
         $importModel->importData();
 
         /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $productRepository = $this->objectManager->create(
             \Magento\Catalog\Api\ProductRepositoryInterface::class
         );
         $product = $productRepository->get($sku);
@@ -350,13 +368,12 @@ public function testSaveCustomOptions($importFile, $sku, $expectedOptionsQty)
      */
     public function testSaveCustomOptionsWithMultipleStoreViews()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
-        $storeManager = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
+        $storeManager = $this->objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
         $storeCodes = [
             'admin',
             'default',
-            'fixture_second_store'
+            'fixture_second_store',
         ];
         /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
         $importFile = 'product_with_custom_options_and_multiple_store_views.csv';
@@ -367,9 +384,7 @@ public function testSaveCustomOptionsWithMultipleStoreViews()
         $this->assertTrue($errors->getErrorsCount() == 0);
         $importModel->importData();
         /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Api\ProductRepositoryInterface::class
-        );
+        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
         foreach ($storeCodes as $storeCode) {
             $storeManager->setCurrentStore($storeCode);
             $product = $productRepository->get($sku);
@@ -416,24 +431,24 @@ public function testSaveCustomOptionsWithMultipleStoreViews()
     /**
      * @return array
      */
-    public function getBehaviorDataProvider()
+    public function getBehaviorDataProvider(): array
     {
         return [
             'Append behavior with existing product' => [
                 'importFile' => 'product_with_custom_options.csv',
                 'sku' => 'simple',
-                'expectedOptionsQty' => 6
+                'expectedOptionsQty' => 6,
             ],
             'Append behavior with existing product and without options in import file' => [
                 'importFile' => 'product_without_custom_options.csv',
                 'sku' => 'simple',
-                'expectedOptionsQty' => 0
+                'expectedOptionsQty' => 0,
             ],
             'Append behavior with new product' => [
                 'importFile' => 'product_with_custom_options_new.csv',
                 'sku' => 'simple_new',
-                'expectedOptionsQty' => 4
-            ]
+                'expectedOptionsQty' => 4,
+            ],
         ];
     }
 
@@ -444,8 +459,7 @@ public function getBehaviorDataProvider()
      */
     private function createImportModel($pathToFile, $behavior = \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND)
     {
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Framework\Filesystem::class);
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
 
         /** @var \Magento\ImportExport\Model\Import\Source\Csv $source */
@@ -458,9 +472,7 @@ private function createImportModel($pathToFile, $behavior = \Magento\ImportExpor
         );
 
         /** @var \Magento\CatalogImportExport\Model\Import\Product $importModel */
-        $importModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\CatalogImportExport\Model\Import\Product::class
-        );
+        $importModel = $this->objectManager->create(\Magento\CatalogImportExport\Model\Import\Product::class);
         $importModel->setParameters(['behavior' => $behavior, 'entity' => 'catalog_product'])->setSource($source);
 
         return $importModel;
@@ -497,24 +509,19 @@ private function getCustomOptionValues($productSku)
     public function testSaveDatetimeAttribute()
     {
         /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Api\ProductRepositoryInterface::class
-        );
+        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
         $id1 = $productRepository->get('simple1')->getId();
         $id2 = $productRepository->get('simple2')->getId();
         $id3 = $productRepository->get('simple3')->getId();
         $existingProductIds = [$id1, $id2, $id3];
         $productsBeforeImport = [];
         foreach ($existingProductIds as $productId) {
-            $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-                \Magento\Catalog\Model\Product::class
-            );
+            $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
             $product->load($productId);
             $productsBeforeImport[$product->getSku()] = $product;
         }
 
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Framework\Filesystem::class);
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
 
         $source = $this->objectManager->create(
@@ -540,9 +547,7 @@ public function testSaveDatetimeAttribute()
             $productBeforeImport = $productsBeforeImport[$row['sku']];
 
             /** @var $productAfterImport \Magento\Catalog\Model\Product */
-            $productAfterImport = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-                \Magento\Catalog\Model\Product::class
-            );
+            $productAfterImport = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
             $productAfterImport->load($productBeforeImport->getId());
             $this->assertEquals(
                 @strtotime(date('m/d/Y', @strtotime($row['news_from_date']))),
@@ -588,7 +593,7 @@ protected function getExpectedOptionsData($pathToFile, $storeCode = '')
                 $option = array_values(
                     array_map(
                         function ($input) {
-                            $data = explode('=',$input);
+                            $data = explode('=', $input);
                             return [$data[0] => $data[1]];
                         },
                         explode(',', $optionData)
@@ -624,11 +629,12 @@ function ($input) {
                 }
             }
         }
+
         return [
             'id' => $expectedOptionId,
             'options' => $expectedOptions,
             'data' => $expectedData,
-            'values' => $expectedValues
+            'values' => $expectedValues,
         ];
     }
 
@@ -662,13 +668,14 @@ protected function mergeWithExistingData(
                 $expectedData[$existingOptionId] = array_merge(
                     $this->getOptionData($option),
                     $expectedData[$existingOptionId]
-
                 );
                 if ($optionValues) {
-                    foreach ($optionValues as $optionKey => $optionValue)
-                    $expectedValues[$existingOptionId][$optionKey] = array_merge(
-                        $optionValue, $expectedValues[$existingOptionId][$optionKey]
-                    );
+                    foreach ($optionValues as $optionKey => $optionValue) {
+                        $expectedValues[$existingOptionId][$optionKey] = array_merge(
+                            $optionValue,
+                            $expectedValues[$existingOptionId][$optionKey]
+                        );
+                    }
                 }
             }
         }
@@ -761,7 +768,6 @@ protected function getOptionValues(\Magento\Catalog\Model\Product\Option $option
     /**
      * Test that product import with images works properly
      *
-     * @magentoDataIsolation enabled
      * @magentoDataFixture mediaImportImageFixture
      * @magentoAppIsolation enabled
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -812,7 +818,6 @@ public function testSaveMediaImage()
     /**
      * Test that errors occurred during importing images are logged.
      *
-     * @magentoDataIsolation enabled
      * @magentoAppIsolation enabled
      * @magentoDataFixture mediaImportImageFixture
      * @magentoDataFixture mediaImportImageFixtureError
@@ -905,7 +910,6 @@ public static function mediaImportImageFixtureError()
         }
     }
 
-
     /**
      * Export CSV string to array
      *
@@ -923,7 +927,7 @@ protected function csvToArray($content, $entityId = null)
                 $data['header'] = str_getcsv($line);
             } else {
                 $row = array_combine($data['header'], str_getcsv($line));
-                if (!is_null($entityId) && !empty($row[$entityId])) {
+                if ($entityId !== null && !empty($row[$entityId])) {
                     $data['data'][$row[$entityId]] = $row;
                 } else {
                     $data['data'][] = $row;
@@ -944,9 +948,7 @@ public function testInvalidSkuLink()
     {
         // import data from CSV file
         $pathToFile = __DIR__ . '/_files/products_to_import_invalid_attribute_set.csv';
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Filesystem::class
-        );
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
             \Magento\ImportExport\Model\Import\Source\Csv::class,
@@ -958,6 +960,7 @@ public function testInvalidSkuLink()
         $errors = $this->_model->setParameters(
             [
                 'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
+                Import::FIELD_NAME_VALIDATION_STRATEGY => null,
                 'entity' => 'catalog_product'
             ]
         )->setSource(
@@ -971,7 +974,7 @@ public function testInvalidSkuLink()
         );
         $this->_model->importData();
 
-        $productCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $productCollection = $this->objectManager->create(
             \Magento\Catalog\Model\ResourceModel\Product\Collection::class
         );
 
@@ -992,9 +995,7 @@ public function testInvalidSkuLink()
      */
     public function testValidateInvalidMultiselectValues()
     {
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Filesystem::class
-        );
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
             \Magento\ImportExport\Model\Import\Source\Csv::class,
@@ -1028,9 +1029,7 @@ public function testValidateInvalidMultiselectValues()
      */
     public function testProductsWithMultipleStores()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        $filesystem = $objectManager->create(\Magento\Framework\Filesystem::class);
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
             \Magento\ImportExport\Model\Import\Source\Csv::class,
@@ -1050,15 +1049,15 @@ public function testProductsWithMultipleStores()
         $this->_model->importData();
 
         /** @var \Magento\Catalog\Model\Product $product */
-        $product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+        $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
         $id = $product->getIdBySku('Configurable 03');
         $product->load($id);
         $this->assertEquals('1', $product->getHasOptions());
 
-        $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->setCurrentStore('fixturestore');
+        $this->objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->setCurrentStore('fixturestore');
 
         /** @var \Magento\Catalog\Model\Product $simpleProduct */
-        $simpleProduct = $objectManager->create(\Magento\Catalog\Model\Product::class);
+        $simpleProduct = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
         $id = $simpleProduct->getIdBySku('Configurable 03-Option 1');
         $simpleProduct->load($id);
         $this->assertTrue(count($simpleProduct->getWebsiteIds()) == 2);
@@ -1076,9 +1075,7 @@ public function testProductsWithMultipleStores()
      */
     public function testGenerateUrlsWithMultipleStores()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        $filesystem = $objectManager->create(\Magento\Framework\Filesystem::class);
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
             \Magento\ImportExport\Model\Import\Source\Csv::class,
@@ -1109,22 +1106,21 @@ public function testGenerateUrlsWithMultipleStores()
      */
     private function assertProductRequestPath($storeCode, $expected)
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         /** @var Store $storeCode */
-        $store = $objectManager->get(Store::class);
+        $store = $this->objectManager->get(Store::class);
         $storeId = $store->load($storeCode)->getId();
 
         /** @var Category $category */
-        $category = $objectManager->get(Category::class);
+        $category = $this->objectManager->get(Category::class);
         $category->setStoreId($storeId);
         $category->load(555);
 
         /** @var Registry $registry */
-        $registry = $objectManager->get(Registry::class);
+        $registry = $this->objectManager->get(Registry::class);
         $registry->register('current_category', $category);
 
         /** @var \Magento\Catalog\Model\Product $product */
-        $product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+        $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
         $id = $product->getIdBySku('product');
         $product->setStoreId($storeId);
         $product->load($id);
@@ -1140,9 +1136,7 @@ public function testProductWithInvalidWeight()
     {
         // import data from CSV file
         $pathToFile = __DIR__ . '/_files/product_to_import_invalid_weight.csv';
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Filesystem::class
-        );
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
 
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
@@ -1175,9 +1169,7 @@ public function testProductCategories($fixture, $separator)
     {
         // import data from CSV file
         $pathToFile = __DIR__ . '/_files/' . $fixture;
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Filesystem::class
-        );
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
 
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
@@ -1200,14 +1192,11 @@ public function testProductCategories($fixture, $separator)
         $this->assertTrue($errors->getErrorsCount() == 0);
         $this->_model->importData();
 
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $resource = $objectManager->get(\Magento\Catalog\Model\ResourceModel\Product::class);
+        $resource = $this->objectManager->get(\Magento\Catalog\Model\ResourceModel\Product::class);
         $productId = $resource->getIdBySku('simple1');
         $this->assertTrue(is_numeric($productId));
         /** @var \Magento\Catalog\Model\Product $product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
+        $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
         $product->load($productId);
         $this->assertFalse($product->isObjectNew());
         $categories = $product->getCategoryIds();
@@ -1240,9 +1229,7 @@ public function testProductPositionInCategory()
         $category->setPostedProducts($categoryProducts);
         $category->save();
 
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Filesystem::class
-        );
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
 
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
@@ -1265,9 +1252,7 @@ public function testProductPositionInCategory()
         $this->_model->importData();
 
         /** @var \Magento\Framework\App\ResourceConnection $resourceConnection */
-        $resourceConnection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\App\ResourceConnection::class
-        );
+        $resourceConnection = $this->objectManager->get(\Magento\Framework\App\ResourceConnection::class);
         $tableName = $resourceConnection->getTableName('catalog_category_product');
         $select = $resourceConnection->getConnection()->select()->from($tableName)
             ->where('category_id = ?', $category->getId());
@@ -1278,6 +1263,51 @@ public function testProductPositionInCategory()
         }
     }
 
+    /**
+     * Check new product position in category.
+     *
+     * @magentoAppArea adminhtml
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testNewProductPositionInCategory()
+    {
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
+
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = $this->objectManager->create(
+            \Magento\ImportExport\Model\Import\Source\Csv::class,
+            [
+                'file' => __DIR__ . '/_files/product_to_import_with_category.csv',
+                'directory' => $directory,
+            ]
+        );
+        $errors = $this->_model->setSource(
+            $source
+        )->setParameters(
+            [
+                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
+                'entity' => 'catalog_product',
+            ]
+        )->validateData();
+
+        $this->assertTrue($errors->getErrorsCount() === 0);
+        $this->_model->importData();
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        /** @var ProductInterface $product */
+        $product = $productRepository->get('simpleImported');
+        $categoryLinks = $product->getExtensionAttributes('category_links')->getCategoryLinks();
+        $position = $categoryLinks[0]->getPosition();
+
+        $this->assertEquals(0, $position);
+    }
+
     /**
      * @return array
      */
@@ -1302,9 +1332,7 @@ public function testProductDuplicateCategories()
         $csvFixture = 'products_duplicate_category.csv';
         // import data from CSV file
         $pathToFile = __DIR__ . '/_files/' . $csvFixture;
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Filesystem::class
-        );
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
 
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
@@ -1324,9 +1352,7 @@ public function testProductDuplicateCategories()
         $this->assertTrue($errors->getErrorsCount() === 0);
 
         /** @var \Magento\Catalog\Model\Category $category */
-        $category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Category::class
-        );
+        $category = $this->objectManager->create(\Magento\Catalog\Model\Category::class);
 
         $category->load(444);
 
@@ -1338,7 +1364,7 @@ public function testProductDuplicateCategories()
 
         $this->_model->importData();
 
-        $errorProcessor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $errorProcessor = $this->objectManager->get(
             \Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregator::class
         );
         $errorCount = count($errorProcessor->getAllErrors());
@@ -1352,9 +1378,7 @@ public function testProductDuplicateCategories()
         $this->assertTrue($categoryAfter === null);
 
         /** @var \Magento\Catalog\Model\Product $product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
+        $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
         $product->load(1);
         $categories = $product->getCategoryIds();
         $this->assertTrue(count($categories) == 1);
@@ -1374,12 +1398,11 @@ protected function loadCategoryByName($categoryName)
      * @dataProvider validateUrlKeysDataProvider
      * @param $importFile string
      * @param $expectedErrors array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function testValidateUrlKeys($importFile, $expectedErrors)
     {
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Filesystem::class
-        );
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
 
         $source = $this->objectManager->create(
@@ -1395,10 +1418,15 @@ public function testValidateUrlKeys($importFile, $expectedErrors)
         )->setSource(
             $source
         )->validateData();
+        $urlKeyErrors = $errors->getErrorsByCode([RowValidatorInterface::ERROR_DUPLICATE_URL_KEY]);
         $this->assertEquals(
             $expectedErrors[RowValidatorInterface::ERROR_DUPLICATE_URL_KEY],
-            count($errors->getErrorsByCode([RowValidatorInterface::ERROR_DUPLICATE_URL_KEY]))
+            count($urlKeyErrors)
         );
+
+        foreach ($urlKeyErrors as $error) {
+            $this->assertEquals('critical', $error->getErrorLevel());
+        }
     }
 
     /**
@@ -1437,9 +1465,7 @@ public function validateUrlKeysDataProvider()
      */
     public function testValidateUrlKeysMultipleStores()
     {
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Filesystem::class
-        );
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
 
         $source = $this->objectManager->create(
@@ -1481,9 +1507,7 @@ public function testProductWithLinks()
         ];
         // import data from CSV file
         $pathToFile = __DIR__ . '/_files/products_to_import_with_product_links.csv';
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Filesystem::class
-        );
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
 
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
@@ -1505,13 +1529,10 @@ public function testProductWithLinks()
         $this->assertTrue($errors->getErrorsCount() == 0);
         $this->_model->importData();
 
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $resource = $objectManager->get(\Magento\Catalog\Model\ResourceModel\Product::class);
+        $resource = $this->objectManager->get(\Magento\Catalog\Model\ResourceModel\Product::class);
         $productId = $resource->getIdBySku('simple4');
         /** @var \Magento\Catalog\Model\Product $product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
+        $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
         $product->load($productId);
         $productLinks = [
             'upsell' => $product->getUpSellProducts(),
@@ -1539,8 +1560,7 @@ public function testExistingProductWithUrlKeys()
             'simple2' => 'url-key2',
             'simple3' => 'url-key3'
         ];
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Framework\Filesystem::class);
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
             \Magento\ImportExport\Model\Import\Source\Csv::class,
@@ -1559,14 +1579,41 @@ public function testExistingProductWithUrlKeys()
         $this->assertTrue($errors->getErrorsCount() == 0);
         $this->_model->importData();
 
-        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Api\ProductRepositoryInterface::class
-        );
+        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
         foreach ($products as $productSku => $productUrlKey) {
             $this->assertEquals($productUrlKey, $productRepository->get($productSku)->getUrlKey());
         }
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_url_key.php
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     */
+    public function testImportWithoutChangingUrlKeys()
+    {
+        $filesystem = $this->objectManager->create(Filesystem::class);
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = $this->objectManager->create(
+            Csv::class,
+            [
+                'file' => __DIR__ . '/_files/products_to_import_without_url_key_column.csv',
+                'directory' => $directory
+            ]
+        );
+
+        $errors = $this->_model->setParameters(
+            ['behavior' => Import::BEHAVIOR_APPEND, 'entity' => 'catalog_product']
+        )
+            ->setSource($source)
+            ->validateData();
+
+        $this->assertTrue($errors->getErrorsCount() == 0);
+        $this->_model->importData();
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->assertEquals('url-key', $productRepository->get('simple1')->getUrlKey());
+    }
+
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_simple_with_url_key.php
      * @magentoDbIsolation enabled
@@ -1609,12 +1656,13 @@ public function testImportWithoutUrlKeys()
      * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function testImportWithUrlKeysWithSpaces()
     {
         $products = [
-            'simple1' => 'url-key-with-spaces1',
-            'simple2' => 'url-key-with-spaces2',
+            'simple1' => 'url key with spaces1',
+            'simple2' => 'url key with spaces2',
         ];
         $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
@@ -1641,6 +1689,52 @@ public function testImportWithUrlKeysWithSpaces()
         }
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_non_latin_url_key.php
+     * @magentoDbIsolation disabled
+     * @magentoAppIsolation enabled
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function testImportWithNonLatinUrlKeys()
+    {
+        $productsCreatedByFixture = [
+            'ukrainian-with-url-key' => 'nove-im-ja-pislja-importu-scho-stane-url-key',
+            'ukrainian-without-url-key' => 'новий url key після імпорту',
+        ];
+        $productsImportedByCsv = [
+            'imported-ukrainian-with-url-key' => 'імпортований продукт',
+            'imported-ukrainian-without-url-key' => 'importovanij-produkt-bez-url-key',
+        ];
+        $productSkuMap = array_merge($productsCreatedByFixture, $productsImportedByCsv);
+        $this->importedProducts = array_keys($productsImportedByCsv);
+
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = $this->objectManager->create(
+            \Magento\ImportExport\Model\Import\Source\Csv::class,
+            [
+                'file' => __DIR__ . '/_files/products_to_import_with_non_latin_url_keys.csv',
+                'directory' => $directory,
+            ]
+        );
+
+        $errors = $this->_model->setParameters(
+            ['behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_ADD_UPDATE, 'entity' => 'catalog_product']
+        )
+            ->setSource($source)
+            ->validateData();
+
+        $this->assertEquals($errors->getErrorsCount(), 0);
+        $this->_model->importData();
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        foreach ($productSkuMap as $productSku => $productUrlKey) {
+            $this->assertEquals($productUrlKey, $productRepository->get($productSku)->getUrlKey());
+        }
+    }
+
     /**
      * Make sure the absence of a url_key column in the csv file won't erase the url key of the existing products.
      * To reach the goal we need to not send the name column, as the url key is generated from it.
@@ -1690,8 +1784,7 @@ public function testProductWithUseConfigSettings()
             'simple2' => true,
             'simple3' => false
         ];
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Framework\Filesystem::class);
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
             \Magento\ImportExport\Model\Import\Source\Csv::class,
@@ -1712,7 +1805,7 @@ public function testProductWithUseConfigSettings()
 
         foreach ($products as $sku => $manageStockUseConfig) {
             /** @var \Magento\CatalogInventory\Model\StockRegistry $stockRegistry */
-            $stockRegistry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            $stockRegistry = $this->objectManager->create(
                 \Magento\CatalogInventory\Model\StockRegistry::class
             );
             $stockItem = $stockRegistry->getStockItemBySku($sku);
@@ -1789,8 +1882,7 @@ function (ProductInterface $item) {
         $productSkuList = ['simple1', 'simple2', 'simple3'];
         foreach ($productSkuList as $sku) {
             try {
-                $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+                $productRepository = $this->objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
                 $product = $productRepository->get($sku, true);
                 if ($product->getId()) {
                     $productRepository->delete($product);
@@ -1836,9 +1928,7 @@ public function testProductWithWrappedAdditionalAttributes()
         $this->_model->importData();
 
         /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Api\ProductRepositoryInterface::class
-        );
+        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 
         /** @var \Magento\Eav\Api\AttributeOptionManagementInterface $multiselectOptions */
         $multiselectOptions = $this->objectManager->get(\Magento\Eav\Api\AttributeOptionManagementInterface::class)
@@ -1860,6 +1950,7 @@ public function testProductWithWrappedAdditionalAttributes()
      *
      * @param string $fileName
      * @param int $expectedErrors
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function importDataForMediaTest(string $fileName, int $expectedErrors = 0)
     {
@@ -2032,8 +2123,7 @@ public function validateRowDataProvider()
      */
     public function testValidateData()
     {
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Framework\Filesystem::class);
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
 
         $source = $this->objectManager->create(
@@ -2077,12 +2167,10 @@ public function testImportWithFilesystemImages()
      * @magentoDataFixture Magento/Catalog/_files/attribute_set_with_renamed_group.php
      * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
-     *
      */
     public function testImportDataChangeAttributeSet()
     {
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Framework\Filesystem::class);
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
 
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
 
@@ -2095,7 +2183,7 @@ public function testImportDataChangeAttributeSet()
         );
         $errors = $this->_model->setParameters(
             [
-                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_ADD_UPDATE,
+                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
                 'entity' => \Magento\Catalog\Model\Product::ENTITY
             ]
         )->setSource(
@@ -2107,18 +2195,14 @@ public function testImportDataChangeAttributeSet()
         $this->_model->importData();
 
         /** @var \Magento\Catalog\Model\Product[] $products */
-        $products[] = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Catalog\Model\ProductRepository::class)->get('simple');
-        $products[] = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Catalog\Model\ProductRepository::class)->get('simple2');
+        $products[] = $this->objectManager->create(\Magento\Catalog\Model\ProductRepository::class)->get('simple');
+        $products[] = $this->objectManager->create(\Magento\Catalog\Model\ProductRepository::class)->get('simple2');
 
         /** @var \Magento\Catalog\Model\Config $catalogConfig */
-        $catalogConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Catalog\Model\Config::class);
+        $catalogConfig = $this->objectManager->create(\Magento\Catalog\Model\Config::class);
 
         /** @var \Magento\Eav\Model\Config $eavConfig */
-        $eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Eav\Model\Config::class);
+        $eavConfig = $this->objectManager->create(\Magento\Eav\Model\Config::class);
 
         $entityTypeId = (int)$eavConfig->getEntityType(\Magento\Catalog\Model\Product::ENTITY)
             ->getId();
@@ -2135,12 +2219,9 @@ public function testImportDataChangeAttributeSet()
     public function testImportWithDifferentSkuCase()
     {
         /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Api\ProductRepositoryInterface::class
-        );
+        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
         /** @var \Magento\Framework\Api\SearchCriteria $searchCriteria */
-        $searchCriteria = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Framework\Api\SearchCriteria::class);
+        $searchCriteria = $this->objectManager->create(\Magento\Framework\Api\SearchCriteria::class);
 
         $importedPrices = [
             'simple1' => 25,
@@ -2153,8 +2234,7 @@ public function testImportWithDifferentSkuCase()
             'simple3' => 333,
         ];
 
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Framework\Filesystem::class);
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
 
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
 
@@ -2219,7 +2299,6 @@ public function testImportWithDifferentSkuCase()
     /**
      * Test that product import with images for non-default store works properly.
      *
-     * @magentoDataIsolation enabled
      * @magentoDataFixture mediaImportImageFixture
      * @magentoAppIsolation enabled
      */
@@ -2266,7 +2345,6 @@ public function testProductsWithMultipleStoresWhenMediaIsDisabled()
     /**
      * Test that imported product stock status with backorders functionality enabled can be set to 'out of stock'.
      *
-     * @magentoDataIsolation enabled
      * @magentoAppIsolation enabled
      */
     public function testImportWithBackordersEnabled()
@@ -2276,10 +2354,25 @@ public function testImportWithBackordersEnabled()
         $this->assertFalse($product->getDataByKey('quantity_and_stock_status')['is_in_stock']);
     }
 
+    /**
+     * Test that imported product stock status with stock quantity > 0 and backorders functionality disabled
+     * can be set to 'out of stock'.
+     *
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     */
+    public function testImportWithBackordersDisabled()
+    {
+        $this->importFile('products_to_import_with_backorders_disabled_and_not_0_qty.csv');
+        $product = $this->getProductBySku('simple_new');
+        $this->assertFalse($product->getDataByKey('quantity_and_stock_status')['is_in_stock']);
+    }
+
     /**
      * Import file by providing import filename in parameters
      *
      * @param string $fileName
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function importFile(string $fileName)
     {
@@ -2307,6 +2400,42 @@ private function importFile(string $fileName)
         $this->_model->importData();
     }
 
+    /**
+     * Import file with non-existing images and skip-errors strategy.
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function testImportWithSkipErrorsAndNonExistingImage()
+    {
+        $fileName = 'products_error_img.csv';
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = $this->objectManager->create(
+            \Magento\ImportExport\Model\Import\Source\Csv::class,
+            [
+                'file' => __DIR__ . '/_files/' . $fileName,
+                'directory' => $directory,
+            ]
+        );
+        $this->_model->getErrorAggregator()->initValidationStrategy('validation-skip-errors', 10);
+        $errors = $this->_model->setParameters(
+            [
+                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
+                'entity' => 'catalog_product',
+            ]
+        )->setSource(
+            $source
+        )->validateData();
+
+        $this->assertTrue($errors->getErrorsCount() == 0);
+
+        $this->_model->importData();
+        foreach ($this->_model->getErrorAggregator()->getAllErrors() as $error) {
+            $this->assertEquals('mediaUrlNotAvailable', $error->getErrorCode());
+        }
+    }
+
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoDbIsolation disabled
@@ -2354,4 +2483,81 @@ public function testImportProductWithUpdateUrlKey()
             $collUrlRewrite->getFirstItem()->getRequestPath()
         );
     }
+
+    /**
+     * Test that product import with non existing images does not broke roles on existing images.
+     *
+     * @magentoDataFixture mediaImportImageFixture
+     * @magentoAppIsolation enabled
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function testSaveProductOnImportNonExistingImage()
+    {
+        $this->importDataForMediaTest('import_media.csv');
+
+        $product = $this->getProductBySku('simple_new');
+
+        $this->assertEquals('/m/a/magento_image.jpg', $product->getData('image'));
+        $this->assertEquals('/m/a/magento_small_image.jpg', $product->getData('small_image'));
+        $this->assertEquals('/m/a/magento_thumbnail.jpg', $product->getData('thumbnail'));
+        $this->assertEquals('/m/a/magento_image.jpg', $product->getData('swatch_image'));
+
+        $this->importDataForMediaTest('import_media_non_existing_images.csv', 1);
+
+        $this->assertNotEquals('/u/p/uploaded.jpg', $product->getData('image'));
+        $this->assertNotEquals('/u/p/uploaded.jpg', $product->getData('small_image'));
+        $this->assertNotEquals('/u/p/uploaded.jpg', $product->getData('thumbnail'));
+        $this->assertNotEquals('/u/p/uploaded.jpg', $product->getData('swatch_image'));
+
+        $this->assertEquals('/m/a/magento_image.jpg', $product->getData('image'));
+        $this->assertEquals('/m/a/magento_small_image.jpg', $product->getData('small_image'));
+        $this->assertEquals('/m/a/magento_thumbnail.jpg', $product->getData('thumbnail'));
+        $this->assertEquals('/m/a/magento_image.jpg', $product->getData('swatch_image'));
+    }
+
+    /**
+     * Test import product with wrong sku when On Error option is set as Continue Processing.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
+     * @magentoAppIsolation enabled
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testImportProductWithContinueOnError()
+    {
+        $filesystem = $this->objectManager->create(Filesystem::class);
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = $this->objectManager->create(
+            \Magento\ImportExport\Model\Import\Source\Csv::class,
+            [
+                'file' => __DIR__ . '/_files/product_import_qty_wrong_sku.csv',
+                'directory' => $directory,
+            ]
+        );
+
+        $this->_model->setParameters(
+            [
+                'behavior' => Import::BEHAVIOR_APPEND,
+                Import::FIELD_NAME_VALIDATION_STRATEGY =>
+                    ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_SKIP_ERRORS,
+                'entity' => 'catalog_product',
+            ]
+        )->setSource($source)->validateData();
+
+        $result = $this->_model->importData();
+
+        $this->assertTrue($result);
+
+        /** @var $repository \Magento\Catalog\Model\ProductRepository */
+        $repository = $this->objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
+        $product = $repository->get('simple');
+        /** @var $stockRegistry \Magento\CatalogInventory\Model\StockRegistry */
+        $stockRegistry = $this->objectManager->create(\Magento\CatalogInventory\Model\StockRegistry::class);
+
+        $stockItem = $stockRegistry->getStockItem($product->getId());
+        $this->assertEquals(17, $stockItem->getQty());
+    }
 }
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 f1308347b138e..95fa9500815bb 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php
@@ -46,6 +46,7 @@ protected function setUp()
         $mediaPath = $appParams[DirectoryList::MEDIA][DirectoryList::PATH];
         $this->directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $tmpDir = $this->directory->getRelativePath($mediaPath . '/import');
+        $this->directory->create($tmpDir);
         $this->uploader->setTmpDir($tmpDir);
 
         parent::setUp();
@@ -75,4 +76,16 @@ public function testMoveWithInvalidFile()
         $this->uploader->move($fileName);
         $this->assertFalse($this->directory->isExist($this->uploader->getTmpDir() . '/' . $fileName));
     }
+
+    /**
+     * @inheritdoc
+     */
+    public static function tearDownAfterClass()
+    {
+        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Framework\Filesystem::class);
+        /** @var \Magento\Framework\Filesystem\Directory\WriteInterface $directory */
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $directory->delete('import');
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_non_existing_images.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_non_existing_images.csv
new file mode 100644
index 0000000000000..99fdf641d9a33
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_non_existing_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,/u/p/uploaded.jpg,Image Label,/u/p/uploaded.jpg,Small Image Label,/u/p/uploaded.jpg,Thumbnail Label,magento_image.jpg,Image Label,10/20/15 07:05,10/20/15 07: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",,,,,,,,
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_import_qty_wrong_sku.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_import_qty_wrong_sku.csv
new file mode 100644
index 0000000000000..6a9b7e0e1d62c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_import_qty_wrong_sku.csv
@@ -0,0 +1,3 @@
+sku,qty
+simple100150,10
+simple,17
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_to_import_with_category.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_to_import_with_category.csv
new file mode 100644
index 0000000000000..2bab84ec1ca57
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_to_import_with_category.csv
@@ -0,0 +1,2 @@
+sku,product_type,store_view_code,name,price,attribute_set_code,categories
+simpleImported,simple,,"simple Imported",25,Default,"Default Category/Category 1"
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_error_img.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_error_img.csv
new file mode 100755
index 0000000000000..97ac55e8e5a20
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_error_img.csv
@@ -0,0 +1,11 @@
+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,additional_images
+simple1,,Default,simple,,base,simple1,,,,1,Taxable Goods,"Catalog, Search",100,,,,simple1,test.jpg
+simple2,,Default,simple,,base,simple2,,,,2,Taxable Goods,"Catalog, Search",101,,,,simple2,test.jpg
+simple3,,Default,simple,,base,simple3,,,,3,Taxable Goods,"Catalog, Search",102,,,,simple3,test.jpg
+simple4,,Default,simple,,base,simple4,,,,4,Taxable Goods,"Catalog, Search",103,,,,simple4,test.jpg
+simple5,,Default,simple,,base,simple5,,,,5,Taxable Goods,"Catalog, Search",104,,,,simple5,test.jpg
+simple6,,Default,simple,,base,simple6,,,,6,Taxable Goods,"Catalog, Search",105,,,,simple6,test.jpg
+simple7,,Default,simple,,base,simple7,,,,7,Taxable Goods,"Catalog, Search",106,,,,simple7,test.jpg
+simple8,,Default,simple,,base,simple8,,,,8,Taxable Goods,"Catalog, Search",107,,,,simple8,test.jpg
+simple9,,Default,simple,,base,simple9,,,,9,Taxable Goods,"Catalog, Search",108,,,,simple9,test.jpg
+simple10,,Default,simple,,base,simple10,,,,10,Taxable Goods,"Catalog, Search",109,,,,simple10,test.jpg
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_backorders_disabled_and_not_0_qty.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_backorders_disabled_and_not_0_qty.csv
new file mode 100644
index 0000000000000..b22427a8af120
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_backorders_disabled_and_not_0_qty.csv
@@ -0,0 +1,2 @@
+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,related_skus,crosssell_skus,upsell_skus,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,associated_skus
+simple_new,,Default,simple,,base,New Product,,,,1,Taxable Goods,"Catalog, Search",10,,,,new-product,New Product,New Product,New Product ,,,,,,,10/20/2015 7:05,10/20/2015 7:05,,,Block after Info Column,,,,,,,,,,,,,"has_options=1,quantity_and_stock_status=In Stock,required_options=1",100,0,1,0,0,0,1,1,10000,1,0,1,1,1,0,1,1,0,0,0,1,,,,,,,,,,,,,
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_non_latin_url_keys.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_non_latin_url_keys.csv
new file mode 100644
index 0000000000000..8b324a5330779
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_non_latin_url_keys.csv
@@ -0,0 +1,5 @@
+sku,product_type,store_view_code,name,price,attribute_set_code,url_key
+imported-ukrainian-with-url-key,simple,,"Імпортований продукт з Url Key",50,Default,"імпортований продукт"
+imported-ukrainian-without-url-key,simple,,"Імпортований продукт без Url Key",55,Default,
+ukrainian-without-url-key,simple,,"Чудовий продукт без Url Key",55,Default,"новий url key після імпорту"
+ukrainian-with-url-key,simple,,"Нове ім'я після імпорту що стане url key",55,Default,
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_without_url_key_column.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_without_url_key_column.csv
new file mode 100644
index 0000000000000..437ed182f9f5e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_without_url_key_column.csv
@@ -0,0 +1,2 @@
+sku,product_type,store_view_code,name,price,attribute_set_code
+simple1,simple,,"simple 1",25,Default
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php
index 5157874172579..de5350c8288f4 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php
@@ -70,7 +70,7 @@
 )->setPrice(
     10
 )->addData(
-    ['text_attribute' => '!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/']
+    ['text_attribute' => '!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/›ƒª']
 )->setTierPrice(
     [0 => ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 3, 'price' => 8]]
 )->setVisibility(
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars.php
index 95dd6329751d8..8914168f20ecc 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars.php
@@ -23,7 +23,7 @@
     ->setName('New Product')
     ->setSku('simple &quot;1&quot;')
     ->setPrice(10)
-    ->addData(['text_attribute' => '!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/'])
+    ->addData(['text_attribute' => '!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/›ƒª'])
     ->setTierPrice([0 => ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 3, 'price' => 8]])
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/_files/simple_product_decimal_qty.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/_files/simple_product_decimal_qty.php
new file mode 100644
index 0000000000000..a43dfd76bd7cd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/_files/simple_product_decimal_qty.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Product $product */
+$product = $objectManager->create(Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product Decimal Qty')
+    ->setSku('simple_with_decimal_qty')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED);
+
+/** @var StockItemInterface $stockItem */
+$stockItem = $objectManager->create(StockItemInterface::class);
+$stockItem->setIsInStock(true)
+    ->setQty(10000)
+    ->setIsQtyDecimal(true)
+    ->setUseConfigMinSaleQty(false)
+    ->setMinSaleQty(1.1)
+    ->setUseConfigEnableQtyInc(false)
+    ->setEnableQtyIncrements(true)
+    ->setUseConfigQtyIncrements(false)
+    ->setQtyIncrements(1.1);
+
+$extensionAttributes = $product->getExtensionAttributes();
+$extensionAttributes->setStockItem($stockItem);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$product = $productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/_files/simple_product_decimal_qty_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/_files/simple_product_decimal_qty_rollback.php
new file mode 100644
index 0000000000000..cca9408f17776
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/_files/simple_product_decimal_qty_rollback.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->deleteById('simple_with_decimal_qty');
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/ResultTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/ResultTest.php
index 4cd0f124b6e46..4f8a279a59165 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/ResultTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/ResultTest.php
@@ -33,13 +33,15 @@ public function testIndexActionTranslation()
 
     public function testIndexActionXSSQueryVerification()
     {
+        $escaper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Framework\Escaper::class);
         $this->getRequest()->setParam('q', '<script>alert(1)</script>');
         $this->dispatch('catalogsearch/result');
 
         $responseBody = $this->getResponse()->getBody();
         $data = '<script>alert(1)</script>';
         $this->assertNotContains($data, $responseBody);
-        $this->assertContains(htmlspecialchars($data, ENT_COMPAT, 'UTF-8', false), $responseBody);
+        $this->assertContains($escaper->escapeHtml($data), $responseBody);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
index 59ad91ae7b076..993462350b638 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
@@ -29,6 +29,8 @@ protected function setUp()
     }
 
     /**
+     * Testing fulltext index rebuild.
+     *
      * @magentoDataFixture Magento/CatalogSearch/_files/products_for_index.php
      * @magentoDataFixture Magento/CatalogSearch/_files/product_configurable_not_available.php
      * @magentoDataFixture Magento/Framework/Search/_files/product_configurable.php
@@ -58,6 +60,8 @@ public function testGetIndexData()
     }
 
     /**
+     * Prepare and return expected index data.
+     *
      * @return array
      */
     private function getExpectedIndexData()
@@ -68,32 +72,49 @@ private function getExpectedIndexData()
         $nameId = $attributeRepository->get(ProductInterface::NAME)->getAttributeId();
         /** @see dev/tests/integration/testsuite/Magento/Framework/Search/_files/configurable_attribute.php */
         $configurableId = $attributeRepository->get('test_configurable')->getAttributeId();
+        $statusId = $attributeRepository->get(ProductInterface::STATUS)->getAttributeId();
+        $taxClassId = $attributeRepository
+            ->get(\Magento\Customer\Api\Data\GroupInterface::TAX_CLASS_ID)
+            ->getAttributeId();
+
         return [
             'configurable' => [
                 $skuId => 'configurable',
                 $configurableId => 'Option 1 | Option 2',
                 $nameId => 'Configurable Product | Configurable OptionOption 1 | Configurable OptionOption 2',
+                $taxClassId => 'Taxable Goods | Taxable Goods | Taxable Goods',
+                $statusId => 'Enabled | Enabled | Enabled',
             ],
             'index_enabled' => [
                 $skuId => 'index_enabled',
                 $nameId => 'index enabled',
+                $taxClassId => 'Taxable Goods',
+                $statusId => 'Enabled',
             ],
             'index_visible_search' => [
                 $skuId => 'index_visible_search',
                 $nameId => 'index visible search',
+                $taxClassId => 'Taxable Goods',
+                $statusId => 'Enabled',
             ],
             'index_visible_category' => [
                 $skuId => 'index_visible_category',
                 $nameId => 'index visible category',
+                $taxClassId => 'Taxable Goods',
+                $statusId => 'Enabled',
             ],
             'index_visible_both' => [
                 $skuId => 'index_visible_both',
                 $nameId => 'index visible both',
+                $taxClassId => 'Taxable Goods',
+                $statusId => 'Enabled',
             ]
         ];
     }
 
     /**
+     * Testing fulltext index rebuild with configurations.
+     *
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
      */
     public function testRebuildStoreIndexConfigurable()
@@ -114,6 +135,8 @@ public function testRebuildStoreIndexConfigurable()
     }
 
     /**
+     * Get product Id by its SKU.
+     *
      * @param string $sku
      * @return int
      */
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
index a6cd7d195731c..8dea5623a74c2 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
@@ -14,6 +14,7 @@
 
 /**
  * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CategoryUrlRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
 {
@@ -263,4 +264,93 @@ protected function assertResults($expected, $actual)
             );
         }
     }
+
+    /**
+     * Get all actual url paths.
+     *
+     * @param array $filter
+     * @return array
+     */
+    private function getActualUrlPaths(array $filter)
+    {
+        /** @var \Magento\UrlRewrite\Model\UrlFinderInterface $urlFinder */
+        $urlFinder = $this->objectManager->get(\Magento\UrlRewrite\Model\UrlFinderInterface::class);
+        $actualResults = [];
+        foreach ($urlFinder->findAllByData($filter) as $url) {
+            $actualResults[] = [
+                $url->getRequestPath(),
+                $url->getTargetPath(),
+                $url->getStoreId(),
+            ];
+        }
+
+        return $actualResults;
+    }
+
+    /**
+     * Test getting url path.
+     *
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories.php
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     */
+    public function testGetUrlPath()
+    {
+        /** @var \Magento\Catalog\Api\CategoryRepositoryInterface $repository */
+        $repository = $this->objectManager->get(\Magento\Catalog\Api\CategoryRepositoryInterface::class);
+
+        /** @var \Magento\Store\Api\StoreRepositoryInterface $storeRepository */
+        $storeRepository = $this->objectManager->get(\Magento\Store\Api\StoreRepositoryInterface::class);
+        $storeId = $storeRepository->get('fixture_second_store')->getId();
+
+        $storeManager = $this->objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
+        $store = $storeManager->getStore($storeId);
+        $storeManager->setCurrentStore($store->getCode());
+
+        $categoryFilter = [
+            UrlRewrite::ENTITY_TYPE => CategoryUrlRewriteGenerator::ENTITY_TYPE,
+            UrlRewrite::ENTITY_ID => [5],
+        ];
+
+        $category = $repository->get(5);
+        $category->addData(
+            [
+                'use_default' => [
+                    'url_key' => 0,
+                ],
+                'url_key_create_redirect' => 0,
+                'url_key' => 'url-key',
+            ]);
+        $category->setStoreId($storeId);
+        $repository->save($category);
+
+        $actualResults = $this->getActualUrlPaths($categoryFilter);
+        $categoryExpectedResult = [
+            ['category-1/category-1-1/category-1-1-1.html', 'catalog/category/view/id/5', 1],
+            ['category-1/category-1-1/url-key.html', 'catalog/category/view/id/5', $storeId],
+        ];
+
+        $this->assertResults($categoryExpectedResult, $actualResults);
+
+        $category = $repository->get(5);
+
+        $category->addData(
+            [
+                'use_default' => [
+                    'url_key' => 1,
+                ],
+               'url_key' => '',
+            ]);
+
+        $repository->save($category);
+
+        $actualResults = $this->getActualUrlPaths($categoryFilter);
+        $categoryExpectedResult = [
+            ['category-1/category-1-1/category-1-1-1.html', 'catalog/category/view/id/5', 1],
+            ['category-1/category-1-1/category-1-1-1.html', 'catalog/category/view/id/5', $storeId],
+        ];
+
+        $this->assertResults($categoryExpectedResult, $actualResults);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php
index 402db06a0bbc9..c6ed8611b3813 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandlerTest.php
@@ -9,7 +9,6 @@
 
 use Magento\Catalog\Api\CategoryListInterface;
 use Magento\Catalog\Api\Data\CategoryInterface;
-use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -19,6 +18,7 @@
 
 /**
  * @magentoAppArea adminhtml
+ * @magentoDbIsolation disabled
  */
 class UrlRewriteHandlerTest extends TestCase
 {
@@ -27,6 +27,11 @@ class UrlRewriteHandlerTest extends TestCase
      */
     private $handler;
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
     /**
      * @var ObjectManager
      */
@@ -38,20 +43,20 @@ class UrlRewriteHandlerTest extends TestCase
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->handler = $this->objectManager->get(UrlRewriteHandler::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->handler = $this->objectManager->create(UrlRewriteHandler::class);
     }
 
     /**
      * Checks category URLs rewrites generation with enabled `Use Categories Path for Product URLs` option and
      * store's specific product URL key.
      *
-     * @magentoDbIsolation disabled
      * @magentoDataFixture Magento/CatalogUrlRewrite/Fixtures/product_custom_url_key.php
      * @magentoConfigFixture admin_store catalog/seo/product_use_categories 1
      */
     public function testGenerateProductUrlRewrites()
     {
-        $product = $this->getProduct('p002');
+        $product = $this->productRepository->get('p002');
         $category = $this->getCategory('category 1');
         // change the category scope to the global
         $category->setStoreId(0)
@@ -75,6 +80,31 @@ public function testGenerateProductUrlRewrites()
         self::assertEquals($expected, $actual, 'Generated URLs rewrites do not match.');
     }
 
+    /**
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/category_with_products.php
+     */
+    public function testGenerateProductUrlRewrites2()
+    {
+        $product1 = $this->productRepository->get('simple');
+        $product2 = $this->productRepository->get('12345');
+        $category = $this->getCategory('Category 1');
+
+        $category->setChangedProductIds([$product1->getId()]);
+        $category->setAffectedProductIds([$product1->getId(), $product2->getId()]);
+        $category->setAnchorsAbove(false);
+        $generatedUrls = $this->handler->generateProductUrlRewrites($category);
+        $actual = array_values(array_map(function (UrlRewrite $urlRewrite) {
+            return $urlRewrite->getRequestPath();
+        }, $generatedUrls));
+
+        $expected = [
+            'simple-product.html',
+            'category-1/simple-product.html',
+            '/simple-product.html',
+        ];
+        $this->assertEquals($expected, $actual, 'Generated URLs rewrites do not match.');
+    }
+
     /**
      * Gets category by name.
      *
@@ -94,18 +124,4 @@ private function getCategory(string $name): CategoryInterface
 
         return array_pop($items);
     }
-
-    /**
-     * Gets product by SKU.
-     *
-     * @param string $sku
-     * @return ProductInterface
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     */
-    private function getProduct(string $sku): ProductInterface
-    {
-        /** @var ProductRepositoryInterface $productRepository */
-        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-        return $productRepository->get($sku);
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/category_with_products.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/category_with_products.php
new file mode 100644
index 0000000000000..8d0a7ea6096a5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/category_with_products.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$installer = $objectManager->create(\Magento\Catalog\Setup\CategorySetup::class);
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea(
+    \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE
+);
+
+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setId(3)
+    ->setName('Category 1')
+    ->setParentId(2)
+    ->setPath('1/2/3')
+    ->setLevel(2)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(1)
+    ->save();
+
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$categoryLinkRepository = $objectManager->create(
+    \Magento\Catalog\Api\CategoryLinkRepositoryInterface::class,
+    [
+        'productRepository' => $productRepository
+    ]
+);
+$categoryLinkManagement = $objectManager->create(
+    \Magento\Catalog\Api\CategoryLinkManagementInterface::class,
+    [
+        'productRepository' => $productRepository,
+        'categoryLinkRepository' => $categoryLinkRepository
+    ]
+);
+
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
+    ->setStoreId(1)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product')
+    ->setSku('simple')
+    ->setPrice(10)
+    ->setWeight(18)
+    ->setStockData(['use_config_manage_stock' => 0])
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->save();
+$categoryLinkManagement->assignProductToCategories($product->getSku(), [3]);
+
+$product =$objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
+    ->setStoreId(1)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product Two')
+    ->setSku('12345') // SKU intentionally contains digits only
+    ->setPrice(45.67)
+    ->setWeight(56)
+    ->setStockData(['use_config_manage_stock' => 0])
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->save();
+$categoryLinkManagement->assignProductToCategories($product->getSku(), [3]);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/category_with_products_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/category_with_products_rollback.php
new file mode 100644
index 0000000000000..62130ad2c7628
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/category_with_products_rollback.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productSkuList = ['simple', '12345'];
+foreach ($productSkuList as $sku) {
+    try {
+        $product = $productRepository->get($sku, true, null, true);
+        $productRepository->delete($product);
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Product already removed
+    }
+}
+
+$collection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
+$collection->addAttributeToFilter('level', 2)
+    ->load()
+    ->delete();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
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 08e9ebbd1f9f0..5774f1cf76ae9 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php
@@ -73,21 +73,6 @@ public function testCreateCollection()
         $this->performAssertions(2);
     }
 
-    /**
-     * Test product list widget can process condition with multiple product sku.
-     *
-     * @magentoDbIsolation disabled
-     * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
-     */
-    public function testCreateCollectionWithMultipleSkuCondition()
-    {
-        $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`:`sku`,`operator`:`==`,`value`:`simple1, simple2`^]^]';
-        $this->block->setData('conditions_encoded', $encodedConditions);
-        $this->performAssertions(2);
-    }
-
     /**
      * Test product list widget can process condition with dropdown type of attribute
      *
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Api/GuestShippingInformationManagementTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Api/GuestShippingInformationManagementTest.php
new file mode 100644
index 0000000000000..26d9651263cef
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Api/GuestShippingInformationManagementTest.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Api;
+
+use Magento\Checkout\Api\Data\ShippingInformationInterface;
+use Magento\Checkout\Api\Data\ShippingInformationInterfaceFactory;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\ShippingAssignmentInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+use Magento\Quote\Model\QuoteIdMask;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+
+/**
+ * Test GuestShippingInformationManagement API.
+ */
+class GuestShippingInformationManagementTest extends TestCase
+{
+    /**
+     * @var GuestShippingInformationManagementInterface
+     */
+    private $management;
+
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepo;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepo;
+
+    /**
+     * @var ShippingInformationInterfaceFactory
+     */
+    private $shippingFactory;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteria;
+
+    /**
+     * @var QuoteIdMaskFactory
+     */
+    private $maskFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->management = $objectManager->get(GuestShippingInformationManagementInterface::class);
+        $this->cartRepo = $objectManager->get(CartRepositoryInterface::class);
+        $this->customerRepo = $objectManager->get(CustomerRepositoryInterface::class);
+        $this->shippingFactory = $objectManager->get(ShippingInformationInterfaceFactory::class);
+        $this->searchCriteria = $objectManager->get(SearchCriteriaBuilder::class);
+        $this->maskFactory = $objectManager->get(QuoteIdMaskFactory::class);
+    }
+
+    /**
+     * Test using another address for quote.
+     *
+     * @param bool $swapShipping Whether to swap shipping or billing addresses.
+     * @return void
+     *
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @magentoDataFixture Magento/Customer/_files/customer_with_addresses.php
+     * @dataProvider differentAddressesDataProvider
+     * @expectedException  \Magento\Framework\Exception\InputException
+     * @expectedExceptionMessage Unable to save shipping information. Please check input data.
+     */
+    public function testDifferentAddresses(bool $swapShipping)
+    {
+        $carts = $this->cartRepo->getList(
+            $this->searchCriteria->addFilter('reserved_order_id', 'test01')->create()
+        )->getItems();
+        $cart = array_pop($carts);
+        $otherCustomer = $this->customerRepo->get('customer_with_addresses@test.com');
+        $otherAddresses = $otherCustomer->getAddresses();
+        $otherAddress = array_pop($otherAddresses);
+
+        //Setting invalid IDs.
+        /** @var ShippingAssignmentInterface $shippingAssignment */
+        $shippingAssignment = $cart->getExtensionAttributes()->getShippingAssignments()[0];
+        $shippingAddress = $shippingAssignment->getShipping()->getAddress();
+        $billingAddress = $cart->getBillingAddress();
+        if ($swapShipping) {
+            $address = $shippingAddress;
+        } else {
+            $address = $billingAddress;
+        }
+        $address->setCustomerAddressId($otherAddress->getId());
+        $address->setCustomerId($otherCustomer->getId());
+        $address->setId(null);
+        /** @var ShippingInformationInterface $shippingInformation */
+        $shippingInformation = $this->shippingFactory->create();
+        $shippingInformation->setBillingAddress($billingAddress);
+        $shippingInformation->setShippingAddress($shippingAddress);
+        $shippingInformation->setShippingMethodCode('flatrate');
+        /** @var QuoteIdMask $idMask */
+        $idMask = $this->maskFactory->create();
+        $idMask->load($cart->getId(), 'quote_id');
+        $this->management->saveAddressInformation($idMask->getMaskedId(), $shippingInformation);
+    }
+
+    /**
+     * @return array
+     */
+    public function differentAddressesDataProvider(): array
+    {
+        return [
+            'Shipping address swap' => [true],
+            'Billing address swap' => [false],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Api/ShippingInformationManagementTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Api/ShippingInformationManagementTest.php
new file mode 100644
index 0000000000000..ff795a73fec35
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Api/ShippingInformationManagementTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Api;
+
+use Magento\Checkout\Api\Data\ShippingInformationInterface;
+use Magento\Checkout\Api\Data\ShippingInformationInterfaceFactory;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\ShippingAssignmentInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test ShippingInformationManagement API.
+ */
+class ShippingInformationManagementTest extends TestCase
+{
+    /**
+     * @var ShippingInformationManagementInterface
+     */
+    private $management;
+
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepo;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepo;
+
+    /**
+     * @var ShippingInformationInterfaceFactory
+     */
+    private $shippingFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->management = $objectManager->get(ShippingInformationManagementInterface::class);
+        $this->cartRepo = $objectManager->get(CartRepositoryInterface::class);
+        $this->customerRepo = $objectManager->get(CustomerRepositoryInterface::class);
+        $this->shippingFactory = $objectManager->get(ShippingInformationInterfaceFactory::class);
+    }
+
+    /**
+     * Test using another address for quote.
+     *
+     * @param bool $swapShipping Whether to swap shipping or billing addresses.
+     * @return void
+     *
+     * @magentoDataFixture Magento/Sales/_files/quote_with_customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_with_addresses.php
+     * @dataProvider differentAddressesDataProvider
+     * @expectedException  \Magento\Framework\Exception\InputException
+     * @expectedExceptionMessage Unable to save shipping information. Please check input data.
+     */
+    public function testDifferentAddresses(bool $swapShipping)
+    {
+        $cart = $this->cartRepo->getForCustomer(1);
+        $otherCustomer = $this->customerRepo->get('customer_with_addresses@test.com');
+        $otherAddresses = $otherCustomer->getAddresses();
+        $otherAddress = array_pop($otherAddresses);
+
+        //Setting invalid IDs.
+        /** @var ShippingAssignmentInterface $shippingAssignment */
+        $shippingAssignment = $cart->getExtensionAttributes()->getShippingAssignments()[0];
+        $shippingAddress = $shippingAssignment->getShipping()->getAddress();
+        $billingAddress = $cart->getBillingAddress();
+        if ($swapShipping) {
+            $address = $shippingAddress;
+        } else {
+            $address = $billingAddress;
+        }
+        $address->setCustomerAddressId($otherAddress->getId());
+        $address->setCustomerId($otherCustomer->getId());
+        $address->setId(null);
+        /** @var ShippingInformationInterface $shippingInformation */
+        $shippingInformation = $this->shippingFactory->create();
+        $shippingInformation->setBillingAddress($billingAddress);
+        $shippingInformation->setShippingAddress($shippingAddress);
+        $shippingInformation->setShippingMethodCode('flatrate');
+        $this->management->saveAddressInformation($cart->getId(), $shippingInformation);
+    }
+
+    /**
+     * @return array
+     */
+    public function differentAddressesDataProvider(): array
+    {
+        return [
+            'Shipping address swap' => [true],
+            'Billing address swap' => [false],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php
index 2036042d0463c..ec450d3f2fdda 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Checkout\Controller\Cart\Index;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 /**
  * @magentoDbIsolation enabled
  */
@@ -26,14 +28,46 @@ public function testExecute()
             'remove' => 0,
             'coupon_code' => 'test'
         ];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($inputData);
         $this->dispatch(
             'checkout/cart/couponPost/'
         );
 
         $this->assertSessionMessages(
-            $this->equalTo(['The coupon code "test" is not valid.']),
+            $this->equalTo(['The coupon code &quot;test&quot; is not valid.']),
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
     }
+
+    /**
+     * Testing by adding a valid coupon to cart
+     *
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     * @magentoDataFixture Magento/Usps/Fixtures/cart_rule_coupon_free_shipping.php
+     * @return void
+     */
+    public function testAddingValidCoupon()
+    {
+        /** @var $session \Magento\Checkout\Model\Session */
+        $session = $this->_objectManager->create(\Magento\Checkout\Model\Session::class);
+        $quote = $session->getQuote();
+        $quote->setData('trigger_recollect', 1)->setTotalsCollectedFlag(true);
+
+        $couponCode = 'IMPHBR852R61';
+        $inputData = [
+            'remove' => 0,
+            'coupon_code' => $couponCode
+        ];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($inputData);
+        $this->dispatch(
+            'checkout/cart/couponPost/'
+        );
+
+        $this->assertSessionMessages(
+            $this->equalTo(['You used coupon code &quot;' . $couponCode . '&quot;.']),
+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+        );
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php
index 068a9c3529c15..d2e93f7c94ff4 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php
@@ -22,6 +22,7 @@
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Sales\Model\ResourceModel\Order\Collection as OrderCollection;
 use Magento\Sales\Model\ResourceModel\Order\Item\Collection as OrderItemCollection;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -286,7 +287,8 @@ private function getQuote($reservedOrderId)
      * Gets \Magento\Quote\Model\Quote\Item from \Magento\Quote\Model\Quote by product id
      *
      * @param \Magento\Quote\Model\Quote $quote
-     * @param $productId
+     * @param string|int $productId
+     *
      * @return \Magento\Quote\Model\Quote\Item|null
      */
     private function _getQuoteItemIdByProductId($quote, $productId)
@@ -321,6 +323,7 @@ public function testAddToCartSimpleProduct($area, $expectedPrice)
             'isAjax' => 1
         ];
         \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea($area);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
 
         $quote =  $this->_objectManager->create(\Magento\Checkout\Model\Cart::class);
@@ -367,6 +370,7 @@ public function testMessageAtAddToCartWithRedirect()
         ];
         \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea('frontend');
         $this->getRequest()->setPostValue($postData);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('checkout/cart/add');
 
@@ -402,6 +406,7 @@ public function testMessageAtAddToCartWithoutRedirect()
         ];
         \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea('frontend');
         $this->getRequest()->setPostValue($postData);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('checkout/cart/add');
 
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/Sidebar/UpdateItemQtyTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Sidebar/UpdateItemQtyTest.php
new file mode 100644
index 0000000000000..3619d281c420a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Sidebar/UpdateItemQtyTest.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Controller\Sidebar;
+
+use Magento\Checkout\Model\Session;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+
+/**
+ * Tests update item quantity controller.
+ */
+class UpdateItemQtyTest extends \Magento\TestFramework\TestCase\AbstractController
+{
+    /**
+     * @var Json
+     */
+    private $json;
+
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->json = $this->_objectManager->create(Json::class);
+        $this->session = $this->_objectManager->create(Session::class);
+        $this->productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * Tests of cart validation when contains product with decimal quantity.
+     *
+     * @param string $requestQuantity
+     * @param array $expectedResponse
+     *
+     * @magentoAppArea frontend
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product_decimal_qty.php
+     * @dataProvider executeWithDecimalQtyDataProvider
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testExecuteWithDecimalQty(string $requestQuantity, array $expectedResponse)
+    {
+        $product = $this->productRepository->get('simple_with_decimal_qty');
+        $quote = $this->getQuote('decimal_quote_id');
+        $quoteItem = $quote->getItemByProduct($product);
+        $this->session->setQuoteId($quote->getId());
+
+        $this->assertNotNull($quoteItem, 'Cannot get quote item for simple product');
+
+        $request= [
+            'item_id' => $quoteItem->getId(),
+            'item_qty' => $requestQuantity
+        ];
+
+        $this->getRequest()->setPostValue($request);
+        $this->dispatch('checkout/sidebar/updateItemQty');
+        $response = $this->getResponse()->getBody();
+
+        $this->assertEquals($this->json->unserialize($response), $expectedResponse);
+    }
+
+    /**
+     * Variations of request data.
+     * @returns array
+     */
+    public function executeWithDecimalQtyDataProvider(): array
+    {
+        return [
+            [
+                'requestQuantity' => '2.2',
+                'response' => [
+                    'success' => true,
+                ]
+            ],
+            [
+                'requestQuantity' => '2',
+                'response' => [
+                    'success' => false,
+                    'error_message' => 'You can buy this product only in quantities of 1.1 at a time.']
+            ],
+        ];
+    }
+
+    /**
+     * Retrieves quote by reserved order id.
+     *
+     * @param string $reservedOrderId
+     * @return Quote
+     */
+    private function getQuote(string $reservedOrderId): Quote
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class);
+        $items = $quoteRepository->getList($searchCriteria)->getItems();
+
+        return array_pop($items);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Model/ShippingInformationManagementTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Model/ShippingInformationManagementTest.php
new file mode 100644
index 0000000000000..369919437526c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Model/ShippingInformationManagementTest.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Model;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Checkout\Api\Data\ShippingInformationInterface;
+use Magento\Checkout\Api\PaymentInformationManagementInterface;
+use Magento\Checkout\Api\ShippingInformationManagementInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Quote\Api\CartItemRepositoryInterface;
+use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Api\Data\AddressInterfaceFactory;
+use Magento\Quote\Api\Data\CartItemInterface;
+use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Quote\Api\ShipmentEstimationInterface;
+use Magento\Sales\Api\InvoiceOrderInterface;
+
+/**
+ * Shipping information managment test.
+ */
+class ShippingInformationManagementTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var CartManagementInterface */
+    private $cartManagement;
+
+    /** @var CartItemRepositoryInterface */
+    private $cartItemRepository;
+
+    /** @var CartItemInterface */
+    private $cartItem;
+
+    /** @var ShippingInformationManagementInterface */
+    private $shippingInformationManagement;
+
+    /** @var ShippingInformationInterface */
+    private $shippingInformation;
+
+    /** @var CustomerRepositoryInterface */
+    private $customerRepository;
+
+    /** @var AddressInterfaceFactory */
+    private $apiAddressFactory;
+
+    /** @var ShipmentEstimationInterface */
+    private $shipmentEstimation;
+
+    /** @var PaymentInformationManagementInterface */
+    private $paymentInformationManagement;
+
+    /** @var PaymentInterface */
+    private $payment;
+
+    /** @var InvoiceOrderInterface */
+    private $invoiceOrder;
+
+    public function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+
+        $this->cartManagement = $objectManager->create(CartManagementInterface::class);
+        $this->cartItemRepository = $objectManager->create(CartItemRepositoryInterface::class);
+        $this->cartItem = $objectManager->create(CartItemInterface::class);
+        $this->shippingInformationManagement = $objectManager->create(ShippingInformationManagementInterface::class);
+        $this->shippingInformation = $objectManager->create(ShippingInformationInterface::class);
+        $this->customerRepository = $objectManager->create(CustomerRepositoryInterface::class);
+        $this->apiAddressFactory = $objectManager->create(AddressInterfaceFactory::class);
+        $this->shipmentEstimation = $objectManager->create(ShipmentEstimationInterface::class);
+        $this->paymentInformationManagement = $objectManager->create(PaymentInformationManagementInterface::class);
+        $this->payment = $objectManager->create(PaymentInterface::class);
+        $this->invoiceOrder = $objectManager->create(InvoiceOrderInterface::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_address.php
+     * @magentoDataFixture Magento/Catalog/_files/product_virtual_in_stock.php
+     */
+    public function testQuoteApiWithOnlyVirtualProducts()
+    {
+        $customer = $this->customerRepository->getById(1);
+
+        // Create empty quote
+        $quoteId = $this->cartManagement->createEmptyCartForCustomer($customer->getId());
+
+        $cartItem = $this->cartItem
+            ->setSku('virtual-product')
+            ->setQty(1)
+            ->setQuoteId($quoteId);
+
+        // Add item to cart
+        $this->cartItemRepository->save($cartItem);
+
+        $billingAddress = $shippingAddress = null;
+        foreach ($customer->getAddresses() as $address) {
+            $billingAddress = $address;
+            $shippingAddress = $address;
+            break;
+        }
+
+        /** @var \Magento\Quote\Model\Quote\Address $apiBillingAddress */
+        $apiBillingAddress = $this->apiAddressFactory->create();
+        $apiBillingAddress->setRegion($billingAddress->getRegion())
+            ->setRegionId($billingAddress->getRegionId())
+            ->setCountryId($billingAddress->getCountryId())
+            ->setStreet($billingAddress->getStreet())
+            ->setPostcode($billingAddress->getPostcode())
+            ->setCity($billingAddress->getCity())
+            ->setFirstname($billingAddress->getFirstname())
+            ->setLastname($billingAddress->getLastname())
+            ->setEmail($customer->getEmail())
+            ->setTelephone($billingAddress->getTelephone());
+
+        /** @var \Magento\Quote\Model\Quote\Address $apiShippingAddress */
+        $apiShippingAddress = $this->apiAddressFactory->create();
+        $apiShippingAddress->setRegion($shippingAddress->getRegion())
+            ->setRegionId($shippingAddress->getRegionId())
+            ->setCountryId($shippingAddress->getCountryId())
+            ->setStreet($shippingAddress->getStreet())
+            ->setPostcode($shippingAddress->getPostcode())
+            ->setCity($shippingAddress->getCity())
+            ->setFirstname($shippingAddress->getFirstname())
+            ->setLastname($shippingAddress->getLastname())
+            ->setEmail($customer->getEmail())
+            ->setTelephone($shippingAddress->getTelephone());
+
+        // Estimate shipping
+        $this->shipmentEstimation->estimateByExtendedAddress($quoteId, $apiShippingAddress);
+
+        $addressInformation = $this->shippingInformation
+            ->setBillingAddress($apiBillingAddress)
+            ->setShippingAddress($apiShippingAddress)
+            ->setShippingCarrierCode('flatrate')
+            ->setShippingMethodCode('flatrate');
+
+        // Set address information on quote
+        $this->shippingInformationManagement->saveAddressInformation($quoteId, $addressInformation);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php
index 43108dbca1f5e..85dede0d84c2d 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php
@@ -21,6 +21,7 @@ class ResetQuoteAddressesTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @magentoDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     * @magentoAppArea frontend
      *
      * @return void
      */
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_decimal_qty.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_decimal_qty.php
new file mode 100644
index 0000000000000..a23c9e32d0eed
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_simple_product_decimal_qty.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\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/../../../Magento/CatalogInventory/_files/simple_product_decimal_qty.php';
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()
+    ->create(ProductRepositoryInterface::class);
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $productRepository->get('simple_with_decimal_qty');
+
+/** @var Quote $quote */
+$quote = Bootstrap::getObjectManager()->create(Quote::class);
+$quote->setReservedOrderId('decimal_quote_id');
+$item = $objectManager->create(\Magento\Quote\Model\Quote\Item::class);
+$item->setProduct($product)
+    ->setPrice($product->getPrice())
+    ->setQty(1.1);
+$quote->addItem($item);
+
+
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+$quoteRepository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFilesTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFilesTest.php
index 8da29210d2f4b..e205f75fef2f4 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFilesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFilesTest.php
@@ -43,6 +43,11 @@ class DeleteFilesTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManager;
 
+    /**
+     * @var string
+     */
+    private $fullDirectoryPath;
+
     /**
      * @inheritdoc
      */
@@ -54,6 +59,7 @@ protected function setUp()
         $this->imagesHelper = $this->objectManager->get(\Magento\Cms\Helper\Wysiwyg\Images::class);
         $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
         $this->model = $this->objectManager->get(\Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\DeleteFiles::class);
+        $this->fullDirectoryPath = $this->imagesHelper->getStorageRoot() . '/directory1';
     }
 
     /**
@@ -64,20 +70,15 @@ protected function setUp()
      */
     public function testExecute()
     {
-        $directoryName = 'directory1';
-        $fullDirectoryPath = $this->imagesHelper->getStorageRoot() . '/' . $directoryName;
-        $this->mediaDirectory->create($this->mediaDirectory->getRelativePath($fullDirectoryPath));
-        $filePath =  $fullDirectoryPath . DIRECTORY_SEPARATOR . $this->fileName;
+        $this->mediaDirectory->create($this->mediaDirectory->getRelativePath($this->fullDirectoryPath));
+        $filePath =  $this->fullDirectoryPath . DIRECTORY_SEPARATOR . $this->fileName;
         $fixtureDir = realpath(__DIR__ . '/../../../../../Catalog/_files');
         copy($fixtureDir . '/' . $this->fileName, $filePath);
 
-        $this->model->getRequest()->setMethod('POST')
-            ->setPostValue('files', [$this->imagesHelper->idEncode($this->fileName)]);
-        $this->model->getStorage()->getSession()->setCurrentPath($fullDirectoryPath);
-        $this->model->execute();
+        $this->executeFileDelete($this->fullDirectoryPath, $this->fileName);
         $this->assertFalse(
             $this->mediaDirectory->isExist(
-                $this->mediaDirectory->getRelativePath($fullDirectoryPath . '/' . $this->fileName)
+                $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . '/' . $this->fileName)
             )
         );
     }
@@ -99,11 +100,74 @@ public function testExecuteWithLinkedMedia()
         copy($fixtureDir . '/' . $this->fileName, $filePath);
 
         $wysiwygDir = $this->mediaDirectory->getAbsolutePath() . '/wysiwyg';
+        $this->executeFileDelete($wysiwygDir, $this->fileName);
+        $this->assertFalse(is_file($fullDirectoryPath . DIRECTORY_SEPARATOR . $this->fileName));
+    }
+
+    /**
+     * Check that htaccess file couldn't be removed via
+     * \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\DeleteFiles::execute method
+     *
+     * @return void
+     */
+    public function testDeleteHtaccess()
+    {
+        $this->createFile($this->fullDirectoryPath, '.htaccess');
+        $this->executeFileDelete($this->fullDirectoryPath, '.htaccess');
+
+        $this->assertTrue(
+            $this->mediaDirectory->isExist(
+                $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . '/.htaccess')
+            )
+        );
+    }
+
+    /**
+     * Check that random file could be removed via
+     * \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images\DeleteFiles::execute method
+     *
+     * @return void
+     */
+    public function testDeleteAnyFile()
+    {
+        $this->createFile($this->fullDirectoryPath, 'ahtaccess');
+        $this->executeFileDelete($this->fullDirectoryPath, 'ahtaccess');
+
+        $this->assertFalse(
+            $this->mediaDirectory->isExist(
+                $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . '/ahtaccess')
+            )
+        );
+    }
+
+    /**
+     * Create file.
+     *
+     * @param string $path
+     * @param string $fileName
+     * @return void
+     */
+    private function createFile(string $path, string $fileName)
+    {
+        $file = $path . '/' . $fileName;
+        if (!$this->mediaDirectory->isFile($file)) {
+            $this->mediaDirectory->writeFile($file, 'Content');
+        }
+    }
+
+    /**
+     * Execute file delete operation.
+     *
+     * @param string $path
+     * @param string $fileName
+     * @return void
+     */
+    private function executeFileDelete(string $path, string $fileName)
+    {
         $this->model->getRequest()->setMethod('POST')
-            ->setPostValue('files', [$this->imagesHelper->idEncode($this->fileName)]);
-        $this->model->getStorage()->getSession()->setCurrentPath($wysiwygDir);
+            ->setPostValue('files', [$this->imagesHelper->idEncode($fileName)]);
+        $this->model->getStorage()->getSession()->setCurrentPath($path);
         $this->model->execute();
-        $this->assertFalse(is_file($fullDirectoryPath . DIRECTORY_SEPARATOR . $this->fileName));
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolderTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolderTest.php
index 79d4a05aba3c4..994d4d1412b05 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolderTest.php
@@ -58,6 +58,7 @@ public function testExecute()
             $this->mediaDirectory->getRelativePath($fullDirectoryPath . $directoryName)
         );
         $this->model->getRequest()->setParams(['node' => $this->imagesHelper->idEncode($directoryName)]);
+        $this->model->getRequest()->setMethod('POST');
         $this->model->execute();
         $this->assertFalse(
             $this->mediaDirectory->isExist(
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php
index 629d997a64f87..6b1f8fc717c2d 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php
@@ -77,6 +77,7 @@ public function testExecute()
         $this->mediaDirectory->create($this->mediaDirectory->getRelativePath($fullDirectoryPath));
 
         $this->model->getRequest()->setParams(['type' => 'image/png']);
+        $this->model->getRequest()->setMethod('POST');
         $this->model->getStorage()->getSession()->setCurrentPath($fullDirectoryPath);
         $this->model->execute();
         $this->assertTrue(
@@ -101,6 +102,7 @@ public function testExecuteWithLinkedMedia()
         $fullDirectoryPath = $this->filesystem->getDirectoryRead(DirectoryList::PUB)
                 ->getAbsolutePath() . DIRECTORY_SEPARATOR . $directoryName;
         $wysiwygDir = $this->mediaDirectory->getAbsolutePath() . '/wysiwyg';
+        $this->model->getRequest()->setMethod('POST');
         $this->model->getRequest()->setParams(['type' => 'image/png']);
         $this->model->getStorage()->getSession()->setCurrentPath($wysiwygDir);
         $this->model->execute();
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php b/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php
index 12d2a467360ea..83d4757660b18 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php
@@ -7,6 +7,9 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 
+/**
+ * @magentoAppArea adminhtml
+ */
 class ImagesTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetStorageRoot()
@@ -23,6 +26,12 @@ public function testGetStorageRoot()
         $this->assertStringStartsWith($mediaPath, $helper->getStorageRoot());
     }
 
+    /**
+     * @magentoConfigFixture default_store admin/url/use_custom 1
+     * @magentoConfigFixture default_store admin/url/custom http://backend/
+     * @magentoConfigFixture admin_store web/secure/base_url http://backend/
+     * @magentoConfigFixture admin_store web/unsecure/base_url http://backend/
+     */
     public function testGetCurrentUrl()
     {
         $helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php
index 9b2bb67c55da1..bc419f527830d 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php
@@ -6,10 +6,9 @@
 namespace Magento\Cms\Model;
 
 use Magento\Cms\Api\BlockRepositoryInterface;
-use Magento\Cms\Model\BlockFactory;
 use Magento\Cms\Model\ResourceModel\Block;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
@@ -38,42 +37,53 @@ class BlockTest extends TestCase
      */
     private $blockRepository;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
-
-        /** @var BlockFactory $blockFactory */
-        /** @var Block $blockResource */
         $this->blockResource   = $this->objectManager->create(Block::class);
         $this->blockFactory    = $this->objectManager->create(BlockFactory::class);
         $this->blockRepository = $this->objectManager->create(BlockRepositoryInterface::class);
     }
 
     /**
-     * Test UpdateTime
+     * Tests update time.
+     *
      * @param array $blockData
-     * @throws \Exception
+     * @return void
      * @magentoDbIsolation enabled
      * @dataProvider testUpdateTimeDataProvider
      */
     public function testUpdateTime(array $blockData)
     {
+        /** @var \Magento\Framework\DB\Adapter\AdapterInterface $db */
+        $db = $this->objectManager->get(ResourceConnection::class)
+            ->getConnection(ResourceConnection::DEFAULT_CONNECTION);
+
         # Prepare and save the temporary block
         $tempBlock = $this->blockFactory->create();
         $tempBlock->setData($blockData);
+        $beforeTimestamp = $db->fetchOne('SELECT UNIX_TIMESTAMP()');
         $this->blockResource->save($tempBlock);
+        $afterTimestamp = $db->fetchOne('SELECT UNIX_TIMESTAMP()');
 
         # Load previously created block and compare update_time field
         $block = $this->blockRepository->getById($tempBlock->getId());
-        $date  = $this->objectManager->get(DateTime::class)->date();
-        $this->assertEquals($date, $block->getUpdateTime());
+        $blockTimestamp = strtotime($block->getUpdateTime());
+
+        /** These checks prevent a race condition */
+        $this->assertGreaterThanOrEqual($beforeTimestamp, $blockTimestamp);
+        $this->assertLessThanOrEqual($afterTimestamp, $blockTimestamp);
     }
 
     /**
-     * Data provider "testUpdateTime" method
+     * Data provider "testUpdateTime" method.
+     *
      * @return array
      */
-    public function testUpdateTimeDataProvider()
+    public function testUpdateTimeDataProvider(): array
     {
         return [
             [
@@ -82,9 +92,9 @@ public function testUpdateTimeDataProvider()
                     'stores'     => [0],
                     'identifier' => 'test-identifier',
                     'content'    => 'Test content',
-                    'is_active'  => 1
-                ]
-            ]
+                    'is_active'  => 1,
+                ],
+            ],
         ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/PageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/PageTest.php
index c8040861b08eb..c3553717d0224 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Model/PageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/PageTest.php
@@ -6,23 +6,32 @@
 namespace Magento\Cms\Model;
 
 use Magento\Cms\Api\PageRepositoryInterface;
-use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\App\ResourceConnection;
 
 /**
  * @magentoAppArea adminhtml
  */
 class PageTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $user = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $user = $this->objectManager->create(
             \Magento\User\Model\User::class
         )->loadByUsername(
             \Magento\TestFramework\Bootstrap::ADMIN_NAME
         );
 
         /** @var $session \Magento\Backend\Model\Auth\Session */
-        $session = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $session = $this->objectManager->get(
             \Magento\Backend\Model\Auth\Session::class
         );
         $session->setUser($user);
@@ -30,13 +39,15 @@ protected function setUp()
 
     /**
      * @magentoDbIsolation enabled
-     * @dataProvider generateIdentifierFromTitleDataProvider
+     * @dataProvider       generateIdentifierFromTitleDataProvider
+     * @param array  $data
+     * @param string $expectedIdentifier
+     * @return void
      */
-    public function testGenerateIdentifierFromTitle($data, $expectedIdentifier)
+    public function testGenerateIdentifierFromTitle(array $data, string $expectedIdentifier)
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /** @var \Magento\Cms\Model\Page $page */
-        $page = $objectManager->create(\Magento\Cms\Model\Page::class);
+        /** @var Page $page */
+        $page = $this->objectManager->create(Page::class);
         $page->setData($data);
         $page->save();
         $this->assertEquals($expectedIdentifier, $page->getIdentifier());
@@ -44,31 +55,43 @@ public function testGenerateIdentifierFromTitle($data, $expectedIdentifier)
 
     /**
      * @magentoDbIsolation enabled
+     * @return void
      */
     public function testUpdateTime()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /** @var \Magento\Cms\Model\Page $page */
-        $page = $objectManager->create(\Magento\Cms\Model\Page::class);
+        /** @var \Magento\Framework\DB\Adapter\AdapterInterface $db */
+        $db = $this->objectManager->get(ResourceConnection::class)
+            ->getConnection(ResourceConnection::DEFAULT_CONNECTION);
+
+        /** @var Page $page */
+        $page = $this->objectManager->create(Page::class);
         $page->setData(['title' => 'Test', 'stores' => [1]]);
+        $beforeTimestamp = $db->fetchOne('SELECT UNIX_TIMESTAMP()');
         $page->save();
-        $page = $objectManager->get(PageRepositoryInterface::class)->getById($page->getId());
-        $date = $objectManager->get(DateTime::class)->date();
-        $this->assertEquals($date, $page->getUpdateTime());
+        $afterTimestamp = $db->fetchOne('SELECT UNIX_TIMESTAMP()');
+        $page = $this->objectManager->get(PageRepositoryInterface::class)->getById($page->getId());
+        $pageTimestamp = strtotime($page->getUpdateTime());
+
+        /** These checks prevent a race condition */
+        $this->assertGreaterThanOrEqual($beforeTimestamp, $pageTimestamp);
+        $this->assertLessThanOrEqual($afterTimestamp, $pageTimestamp);
     }
 
-    public function generateIdentifierFromTitleDataProvider()
+    /**
+     * @return array
+     */
+    public function generateIdentifierFromTitleDataProvider(): array
     {
         return [
             ['data' => ['title' => 'Test title', 'stores' => [1]], 'expectedIdentifier' => 'test-title'],
             [
                 'data' => ['title' => 'Кирилический заголовок', 'stores' => [1]],
-                'expectedIdentifier' => 'kirilicheskij-zagolovok'
+                'expectedIdentifier' => 'kirilicheskij-zagolovok',
             ],
             [
                 'data' => ['title' => 'Test title', 'identifier' => 'custom-identifier', 'stores' => [1]],
-                'expectedIdentifier' => 'custom-identifier'
-            ]
+                'expectedIdentifier' => 'custom-identifier',
+            ],
         ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php b/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
index 3f333a36c9c93..782d8dadcc1e8 100644
--- a/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
@@ -6,6 +6,8 @@
 namespace Magento\Config\Console\Command;
 
 use Magento\Config\Model\Config\Backend\Admin\Custom;
+use Magento\Config\Model\Config\Structure\Converter;
+use Magento\Config\Model\Config\Structure\Data as StructureData;
 use Magento\Directory\Model\Currency;
 use Magento\Framework\App\Config\ConfigPathResolver;
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -27,7 +29,7 @@
 /**
  * Tests the different flows of config:set command.
  *
- * {@inheritdoc}
+ * @inheritdoc
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @magentoDbIsolation enabled
  */
@@ -90,6 +92,8 @@ protected function setUp()
     {
         Bootstrap::getInstance()->reinitialize();
         $this->objectManager = Bootstrap::getObjectManager();
+        $this->extendSystemStructure();
+
         $this->scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
         $this->reader = $this->objectManager->get(FileReader::class);
         $this->filesystem = $this->objectManager->get(Filesystem::class);
@@ -122,6 +126,21 @@ protected function tearDown()
         $this->appConfig->reinit();
     }
 
+    /**
+     * Add test system structure to main system structure
+     *
+     * @return void
+     */
+    private function extendSystemStructure()
+    {
+        $document = new \DOMDocument();
+        $document->load(__DIR__ . '/../../_files/system.xml');
+        $converter = $this->objectManager->get(Converter::class);
+        $systemConfig = $converter->convert($document);
+        $structureData = $this->objectManager->get(StructureData::class);
+        $structureData->merge($systemConfig);
+    }
+
     /**
      * @return array
      */
@@ -190,6 +209,8 @@ public function runLockDataProvider()
             ['general/region/display_all', '1'],
             ['general/region/state_required', 'BR,FR', ScopeInterface::SCOPE_WEBSITE, 'base'],
             ['admin/security/use_form_key', '0'],
+            ['general/group/subgroup/field', 'default_value'],
+            ['general/group/subgroup/field', 'website_value', ScopeInterface::SCOPE_WEBSITE, 'base'],
         ];
     }
 
@@ -291,8 +312,7 @@ public function runExtendedDataProvider()
      * @param string $scope
      * @param $scopeCode string|null
      * @dataProvider configSetValidationErrorDataProvider
-     *
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      */
     public function testConfigSetValidationError(
         $path,
@@ -306,6 +326,7 @@ public function testConfigSetValidationError(
 
     /**
      * Data provider for testConfigSetValidationError
+     *
      * @return array
      */
     public function configSetValidationErrorDataProvider()
@@ -398,7 +419,6 @@ public function testConfigSetCurrency()
      * Saving values with successful validation
      *
      * @dataProvider configSetValidDataProvider
-     *
      * @magentoDbIsolation enabled
      */
     public function testConfigSetValid()
diff --git a/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php
index 9ad99745d572f..5170a4b8a4dd6 100644
--- a/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Controller/Adminhtml/System/ConfigTest.php
@@ -9,6 +9,7 @@
 namespace Magento\Config\Controller\Adminhtml\System;
 
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * @magentoAppArea adminhtml
@@ -22,6 +23,8 @@ public function testEditAction()
     }
 
     /**
+     * Test redirect after changing base URL.
+     *
      * @magentoAppIsolation enabled
      * @magentoDbIsolation enabled
      */
@@ -31,20 +34,22 @@ public function testChangeBaseUrl()
         $newHost = 'm2test123.loc';
         $request = $this->getRequest();
         $request->setPostValue(
-            ['groups' =>
-                ['unsecure' =>
-                    ['fields' =>
-                        ['base_url' =>
-                            ['value' => 'http://' . $newHost . '/']
+            [
+                'groups' =>
+                    ['unsecure' =>
+                        ['fields' =>
+                            ['base_url' =>
+                                ['value' => 'http://' . $newHost . '/']
+                            ]
                         ]
-                    ]
-                ],
-            'config_state' =>
-                ['web_unsecure' => 1]
+                    ],
+                    'config_state' => ['web_unsecure' => 1]
             ]
         )->setParam(
             'section',
             'web'
+        )->setMethod(
+            HttpRequest::METHOD_POST
         );
         $this->dispatch('backend/admin/system_config/save');
 
@@ -62,14 +67,16 @@ public function testChangeBaseUrl()
     }
 
     /**
-     * Reset test framework default base url
+     * Reset test framework default base url.
+     *
+     * @param string $defaultHost
      */
     protected function resetBaseUrl($defaultHost)
     {
         $baseUrlData = [
             'section' => 'web',
-            'website' => NULL,
-            'store' => NULL,
+            'website' => null,
+            'store' => null,
             'groups' => [
                 'unsecure' => [
                     'fields' => [
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ConverterStub.php b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ConverterStub.php
similarity index 63%
rename from dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ConverterStub.php
rename to dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ConverterStub.php
index 223ef35c0dcd3..7493d31f02b31 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ConverterStub.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ConverterStub.php
@@ -3,14 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Paypal\Model\Config\Structure\Reader;
+declare(strict_types=1);
+
+namespace Magento\Config\Model\Config\Structure\Reader;
+
+use Magento\Config\Model\Config\Structure\Converter;
 
 /**
- * Class ConverterStub
+ * Class ConverterStub used for ReaderTest.
  */
-class ConverterStub extends \Magento\Config\Model\Config\Structure\Converter
+class ConverterStub extends Converter
 {
     /**
+     * Convert dom document wrapper.
+     *
      * @param \DOMDocument $document
      * @return array|null
      */
@@ -20,7 +26,7 @@ public function getArrayData(\DOMDocument $document)
     }
 
     /**
-     * Convert dom document
+     * Convert dom document.
      *
      * @param \DOMNode $source
      * @return array
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/DataTest.php
similarity index 95%
rename from dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php
rename to dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/DataTest.php
index d4724072ecdc8..3a97ee25e9aea 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/DataTest.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  *
  */
-namespace Magento\Widget\Model\Config;
+namespace Magento\Config\Model\Config\Structure\Reader;
 
 /**
  * @magentoAppArea adminhtml
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderStub.php b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderStub.php
similarity index 53%
rename from dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderStub.php
rename to dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderStub.php
index ed1366ad737f9..866ff91678ec4 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderStub.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderStub.php
@@ -3,14 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Paypal\Model\Config\Structure\Reader;
+declare(strict_types=1);
+
+namespace Magento\Config\Model\Config\Structure\Reader;
+
+use Magento\Config\Model\Config\Structure\Reader;
 
 /**
- * Class ReaderStub
+ * Class ReaderStub used for testing protected Reader::_readFiles() method.
  */
-class ReaderStub extends \Magento\Config\Model\Config\Structure\Reader
+class ReaderStub extends Reader
 {
     /**
+     * Wrapper for protected Reader::_readFiles() method.
+     *
      * @param array $fileList
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
diff --git a/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderTest.php
new file mode 100644
index 0000000000000..53a3d4f643bee
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/ReaderTest.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Config\Model\Config\Structure\Reader;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Config\Model\Config\SchemaLocator;
+use Magento\Framework\App\Utility\Files;
+use Magento\Framework\Config\Dom;
+use Magento\Framework\Config\FileResolverInterface;
+use Magento\Framework\Config\ValidationStateInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\View\TemplateEngine\Xhtml\CompilerInterface;
+
+/**
+ * Class ReaderTest check Magento\Config\Model\Config\Structure\Reader::_readFiles() method.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ReaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Widget\Model\Config\Reader
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileResolver;
+
+    /**
+     * Test config location.
+     *
+     * @string
+     */
+    const CONFIG = '/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/';
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Files
+     */
+    private $fileUtility;
+
+    /**
+     * @var ValidationStateInterface
+     */
+    private $validationStateMock;
+
+    /**
+     * @var \Magento\Framework\Config\SchemaLocatorInterface
+     */
+    private $schemaLocatorMock;
+
+    /**
+     * @var FileResolverInterface
+     */
+    private $fileResolverMock;
+
+    /**
+     * @var ReaderStub
+     */
+    private $reader;
+
+    /**
+     * @var ConverterStub
+     */
+    private $converter;
+
+    /**
+     * @var CompilerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $compiler;
+
+    /**
+     * @inheritdoc
+     */
+    public function setUp()
+    {
+        $this->fileResolver = $this->getMockForAbstractClass(FileResolverInterface::class);
+        $objectManager = Bootstrap::getObjectManager();
+        $this->model = $objectManager->create(
+            \Magento\Widget\Model\Config\Reader::class,
+            ['fileResolver' => $this->fileResolver]
+        );
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->fileUtility = Files::init();
+        $this->fileResolverMock = $this->getMockBuilder(FileResolverInterface::class)
+            ->getMockForAbstractClass();
+        $this->converter = $this->objectManager->create(ConverterStub::class);
+
+        //Isolate test from actual configuration, and leave only sample data.
+        $this->compiler = $this->getMockBuilder(CompilerInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['compile'])
+            ->getMockForAbstractClass();
+    }
+
+    /**
+     * The test checks the file structure after processing the nodes responsible for inserting content.
+     *
+     * @return void
+     */
+    public function testXmlConvertedConfigurationAndCompereStructure()
+    {
+        $this->validationStateMock = $this->getMockBuilder(ValidationStateInterface::class)
+            ->setMethods(['isValidationRequired'])
+            ->getMockForAbstractClass();
+        $this->validationStateMock->expects($this->atLeastOnce())
+            ->method('isValidationRequired')
+            ->willReturn(false);
+        $this->schemaLocatorMock = $this->getMockBuilder(SchemaLocator::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getPerFileSchema'])
+            ->getMock();
+        $this->reader = $this->objectManager->create(
+            ReaderStub::class,
+            [
+                'fileResolver' => $this->fileResolverMock,
+                'converter' => $this->converter,
+                'schemaLocator' => $this->schemaLocatorMock,
+                'validationState' => $this->validationStateMock,
+                'fileName' => 'no_existing_file.xml',
+                'compiler' => $this->compiler,
+                'domDocumentClass' => Dom::class
+            ]
+        );
+        $actual = $this->reader->readFiles(['actual' => $this->getContent()]);
+
+        $document = new \DOMDocument();
+        $document->loadXML($this->getContent());
+
+        $expected = $this->converter->getArrayData($document);
+
+        $this->assertEquals($expected, $actual);
+    }
+
+    /**
+     * Get config sample data for test.
+     *
+     * @return string
+     */
+    protected function getContent()
+    {
+        $files = $this->fileUtility->getFiles([BP . static::CONFIG], 'config.xml');
+
+        return file_get_contents(reset($files));
+    }
+
+    /**
+     * Checks method read() to get correct config.
+     *
+     */
+    public function testRead()
+    {
+        $this->fileResolver->expects($this->once())
+            ->method('get')
+            ->willReturn([file_get_contents(__DIR__ . '/_files/orders_and_returns.xml')]);
+        $expected = include __DIR__ . '/_files/expectedGlobalArray.php';
+        $this->assertEquals($expected, $this->model->read('global'));
+    }
+
+    /**
+     * Checks method _readFiles() to get correct config.
+     *
+     */
+    public function testReadFile()
+    {
+        $file = file_get_contents(__DIR__ . '/_files/orders_and_returns.xml');
+        $expected = include __DIR__ . '/_files/expectedGlobalArray.php';
+        $this->assertEquals($expected, $this->model->readFile($file));
+    }
+
+    /**
+     * Checks method _readFiles() to get correct config with merged configs.
+     *
+     */
+    public function testMergeCompleteAndPartial()
+    {
+        $fileList = [
+            file_get_contents(__DIR__ . '/_files/catalog_new_products_list.xml'),
+            file_get_contents(__DIR__ . '/_files/orders_and_returns_customized.xml'),
+        ];
+        $this->fileResolver->expects($this->once())
+            ->method('get')
+            ->with('widget.xml', 'global')
+            ->willReturn($fileList);
+        $expected = include __DIR__ . '/_files/expectedMergedArray.php';
+        $this->assertEquals($expected, $this->model->read('global'));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/catalog_new_products_list.xml b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/catalog_new_products_list.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/catalog_new_products_list.xml
rename to dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/catalog_new_products_list.xml
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual/config.xml b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/config.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual/config.xml
rename to dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/config.xml
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/expectedGlobalArray.php b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/expectedGlobalArray.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/expectedGlobalArray.php
rename to dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/expectedGlobalArray.php
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/expectedGlobalDesignArray.php b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/expectedGlobalDesignArray.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/expectedGlobalDesignArray.php
rename to dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/expectedGlobalDesignArray.php
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/expectedMergedArray.php b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/expectedMergedArray.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/expectedMergedArray.php
rename to dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/expectedMergedArray.php
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/orders_and_returns.xml b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/orders_and_returns.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/orders_and_returns.xml
rename to dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/orders_and_returns.xml
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/orders_and_returns_customized.xml b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/orders_and_returns_customized.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/orders_and_returns_customized.xml
rename to dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/orders_and_returns_customized.xml
diff --git a/dev/tests/integration/testsuite/Magento/Config/_files/system.xml b/dev/tests/integration/testsuite/Magento/Config/_files/system.xml
new file mode 100644
index 0000000000000..f0063a3c0bf7f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Config/_files/system.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <section id="general">
+            <group id="group">
+                <group id="subgroup">
+                    <field id="field" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <label>Label</label>
+                    </field>
+                </group>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/ProductTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/ProductTest.php
index 4254a6ce9c71d..b71507ae43f9f 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/ProductTest.php
@@ -9,6 +9,7 @@
 use Magento\Framework\Registry;
 use Magento\TestFramework\ObjectManager;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * @magentoAppArea adminhtml
@@ -23,6 +24,7 @@ public function testSaveActionAssociatedProductIds()
     {
         $associatedProductIds = ['3', '14', '15', '92'];
         $associatedProductIdsJSON = json_encode($associatedProductIds);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(
             [
                 'id' => 1,
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php
index f9776b2264ff3..0d93d3ad4f4ae 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php
@@ -9,6 +9,8 @@
  */
 namespace Magento\ConfigurableProduct\Controller;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 class CartTest extends \Magento\TestFramework\TestCase\AbstractController
 {
     /**
@@ -85,13 +87,14 @@ public function testExecuteForConfigurableLastOption()
             'remove' => 0,
             'coupon_code' => 'test'
         ];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($inputData);
         $this->dispatch(
             'checkout/cart/couponPost/'
         );
 
         $this->assertSessionMessages(
-            $this->equalTo(['The coupon code "test" is not valid.']),
+            $this->equalTo(['The coupon code &quot;test&quot; is not valid.']),
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
index 66091c108f0b2..f02ab6acf7ac3 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
@@ -12,11 +12,18 @@
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\CatalogInventory\Model\Stock;
+use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
+use PHPUnit\Framework\TestCase;
+use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
+ * Configurable test
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @magentoAppArea adminhtml
  */
-class ConfigurableTest extends \PHPUnit\Framework\TestCase
+class ConfigurableTest extends TestCase
 {
     /**
      * @var StoreManagerInterface
@@ -28,26 +35,36 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
      */
     private $productRepository;
 
+    /**
+     * @var StockItemRepositoryInterface
+     */
+    private $stockRepository;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
         $this->productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+        $this->stockRepository = Bootstrap::getObjectManager()->get(StockItemRepositoryInterface::class);
     }
 
     /**
+     * Test get product final price if one of child is disabled
+     *
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
      * @magentoDbIsolation disabled
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\StateException
      */
     public function testGetProductFinalPriceIfOneOfChildIsDisabled()
     {
-        /** @var Collection $collection */
-        $collection = Bootstrap::getObjectManager()->get(CollectionFactory::class)
-            ->create();
-        $configurableProduct = $collection
-            ->addIdFilter([1])
-            ->addMinimalPrice()
-            ->load()
-            ->getFirstItem();
+        $configurableProduct = $this->getConfigurableProductFromCollection();
         $this->assertEquals(10, $configurableProduct->getMinimalPrice());
 
         $childProduct = $this->productRepository->getById(10, false, null, true);
@@ -58,31 +75,25 @@ public function testGetProductFinalPriceIfOneOfChildIsDisabled()
         $this->productRepository->save($childProduct);
         $this->storeManager->setCurrentStore($currentStoreId);
 
-        /** @var Collection $collection */
-        $collection = Bootstrap::getObjectManager()->get(CollectionFactory::class)
-            ->create();
-        $configurableProduct = $collection
-            ->addIdFilter([1])
-            ->addMinimalPrice()
-            ->load()
-            ->getFirstItem();
+        $configurableProduct = $this->getConfigurableProductFromCollection();
         $this->assertEquals(20, $configurableProduct->getMinimalPrice());
     }
 
     /**
+     * Test get product final price if one of child is disabled per store
+     *
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
      * @magentoDbIsolation disabled
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\StateException
      */
     public function testGetProductFinalPriceIfOneOfChildIsDisabledPerStore()
     {
-        /** @var Collection $collection */
-        $collection = Bootstrap::getObjectManager()->get(CollectionFactory::class)
-            ->create();
-        $configurableProduct = $collection
-            ->addIdFilter([1])
-            ->addMinimalPrice()
-            ->load()
-            ->getFirstItem();
+        $configurableProduct = $this->getConfigurableProductFromCollection();
         $this->assertEquals(10, $configurableProduct->getMinimalPrice());
 
         $childProduct = $this->productRepository->getById(10, false, null, true);
@@ -95,14 +106,53 @@ public function testGetProductFinalPriceIfOneOfChildIsDisabledPerStore()
         $this->productRepository->save($childProduct);
         $this->storeManager->setCurrentStore($currentStoreId);
 
+        $configurableProduct = $this->getConfigurableProductFromCollection();
+        $this->assertEquals(20, $configurableProduct->getMinimalPrice());
+    }
+
+    /**
+     * Test get product minimal price if one child is out of stock
+     *
+     * @magentoConfigFixture current_store cataloginventory/options/show_out_of_stock 1
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoDbIsolation disabled
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testGetProductMinimalPriceIfOneOfChildIsOutOfStock()
+    {
+        $configurableProduct = $this->getConfigurableProductFromCollection();
+        $this->assertEquals(10, $configurableProduct->getMinimalPrice());
+
+        $childProduct = $this->productRepository->get('simple_10', false, null, true);
+        $stockItem = $childProduct->getExtensionAttributes()->getStockItem();
+        $stockItem->setIsInStock(Stock::STOCK_OUT_OF_STOCK);
+        $this->stockRepository->save($stockItem);
+
+        $configurableProduct = $this->getConfigurableProductFromCollection();
+        $this->assertEquals(20, $configurableProduct->getMinimalPrice());
+    }
+
+    /**
+     * Retrieve configurable product.
+     * Returns Configurable product that was created by Magento/ConfigurableProduct/_files/product_configurable.php
+     * fixture
+     *
+     * @return ProductInterface
+     */
+    private function getConfigurableProductFromCollection(): ProductInterface
+    {
         /** @var Collection $collection */
         $collection = Bootstrap::getObjectManager()->get(CollectionFactory::class)
             ->create();
+        /** @var ProductInterface $configurableProduct */
         $configurableProduct = $collection
             ->addIdFilter([1])
             ->addMinimalPrice()
             ->load()
             ->getFirstItem();
-        $this->assertEquals(20, $configurableProduct->getMinimalPrice());
+
+        return $configurableProduct;
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/SpecialPriceIndexerWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/SpecialPriceIndexerWithDimensionTest.php
index f08f0a4543ea3..140df500472b3 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/SpecialPriceIndexerWithDimensionTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/SpecialPriceIndexerWithDimensionTest.php
@@ -16,7 +16,7 @@
 /**
  * @magentoDbIsolation disabled
  * @group indexer_dimension
- * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
+ * @--magentoIndexerDimensionMode catalog_product_price website_and_customer_group
  */
 class SpecialPriceIndexerWithDimensionTest extends \PHPUnit\Framework\TestCase
 {
@@ -51,6 +51,9 @@ protected function setUp()
      */
     public function testFullReindexIfChildHasSpecialPrice()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $specialPrice = 2;
         /** @var Product $childProduct */
         $childProduct = $this->productRepository->get('simple_10', true);
@@ -88,6 +91,9 @@ public function testFullReindexIfChildHasSpecialPrice()
      */
     public function testOnSaveIndexationIfChildHasSpecialPrice()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $specialPrice = 2;
         /** @var Product $childProduct */
         $childProduct = $this->productRepository->get('simple_10', true);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagWithDimensionTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagWithDimensionTest.php
index bddbb38e9f019..214dcafc9f686 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagWithDimensionTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagWithDimensionTest.php
@@ -16,7 +16,7 @@
 
 /**
  * @magentoDbIsolation disabled
- * @magentoIndexerDimensionMode catalog_product_price website_and_customer_group
+ * @--magentoIndexerDimensionMode catalog_product_price website_and_customer_group
  * @group indexer_dimension
  * Test price rendering according to is_product_list flag for Configurable product
  */
@@ -82,6 +82,9 @@ protected function setUp()
      */
     public function testRenderingByDefault()
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $html = $this->finalPriceBox->toHtml();
         self::assertContains('5.99', $html);
         $this->assertGreaterThanOrEqual(
@@ -117,6 +120,9 @@ public function testRenderingByDefault()
      */
     public function testRenderingAccordingToIsProductListFlag($flag, $count)
     {
+        $this->markTestSkipped(
+            'Skipped because of MAGETWO-99136'
+        );
         $this->finalPriceBox->setData('is_product_list', $flag);
         $html = $this->finalPriceBox->toHtml();
         self::assertContains('5.99', $html);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProductsTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProductsTest.php
index 234f0aae6a3ea..63858e91b64f2 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProductsTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProductsTest.php
@@ -5,7 +5,19 @@
  */
 namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier\Data;
 
-class AssociatedProductsTest extends \PHPUnit\Framework\TestCase
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Ui\Component\Filters\FilterModifier;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier\ConfigurablePanel;
+use Magento\Framework\App\RequestInterface;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * AssociatedProductsTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class AssociatedProductsTest extends TestCase
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface $objectManager
@@ -17,6 +29,9 @@ class AssociatedProductsTest extends \PHPUnit\Framework\TestCase
      */
     private $registry;
 
+    /**
+     * @inheritdoc
+     */
     public function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -64,6 +79,53 @@ public function testGetProductMatrix($interfaceLocale)
         }
     }
 
+    /**
+     * Tests configurable product won't appear in product listing.
+     *
+     * Tests configurable product won't appear in configurable associated product listing if its options attribute
+     * is not filterable in grid.
+     *
+     * @return void
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoAppArea adminhtml
+     */
+    public function testAddManuallyConfigurationsWithNotFilterableInGridAttribute()
+    {
+        /** @var RequestInterface $request */
+        $request = $this->objectManager->get(RequestInterface::class);
+        $request->setParams([
+            FilterModifier::FILTER_MODIFIER => [
+                'test_configurable' => [
+                    'condition_type' => 'notnull',
+                ],
+            ],
+            'attributes_codes' => [
+                'test_configurable'
+            ],
+        ]);
+        $context = $this->objectManager->create(ContextInterface::class, ['request' => $request]);
+        /** @var UiComponentFactory $uiComponentFactory */
+        $uiComponentFactory = $this->objectManager->get(UiComponentFactory::class);
+        $uiComponent = $uiComponentFactory->create(
+            ConfigurablePanel::ASSOCIATED_PRODUCT_LISTING,
+            null,
+            ['context' => $context]
+        );
+
+        foreach ($uiComponent->getChildComponents() as $childUiComponent) {
+            $childUiComponent->prepare();
+        }
+
+        $dataSource = $uiComponent->getDataSourceData();
+        $skus = array_column($dataSource['data']['items'], 'sku');
+
+        $this->assertNotContains(
+            'configurable',
+            $skus,
+            'Only products with specified attribute should be in product list'
+        );
+    }
+
     /**
      * @return array
      */
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attributes_for_position_test.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attributes_for_position_test.php
new file mode 100644
index 0000000000000..3f907c0ad0cb6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attributes_for_position_test.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\Eav\Model\Config;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Eav\Api\AttributeRepositoryInterface;
+
+Bootstrap::getInstance()->reinitialize();
+
+/** @var $eavConfig Config */
+$eavConfig = Bootstrap::getObjectManager()->get(Config::class);
+
+/** @var $installer CategorySetup */
+$installer = Bootstrap::getObjectManager()->create(CategorySetup::class);
+
+$attributesData = [
+    [
+        'code' => 'custom_attr_1',
+        'label' => 'custom_attr_1',
+    ],
+    [
+        'code' => 'custom_attr_2',
+        'label' => 'custom_attr_2',
+    ],
+];
+
+foreach ($attributesData as $attributeData) {
+    $attribute = $eavConfig->getAttribute('catalog_product', $attributeData['code']);
+
+    $eavConfig->clear();
+
+
+    if (!$attribute->getId()) {
+
+        /** @var $attribute Attribute */
+        $attribute = Bootstrap::getObjectManager()->create(
+            Attribute::class
+        );
+
+        /** @var AttributeRepositoryInterface $attributeRepository */
+        $attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepositoryInterface::class);
+
+        $attribute->setData(
+            [
+                'attribute_code' => $attributeData['code'],
+                'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
+                'is_global' => 1,
+                'is_user_defined' => 1,
+                'frontend_input' => 'select',
+                'is_unique' => 0,
+                'is_required' => 0,
+                'is_searchable' => 0,
+                'is_visible_in_advanced_search' => 0,
+                'is_comparable' => 0,
+                'is_filterable' => 0,
+                'is_filterable_in_search' => 0,
+                'is_used_for_promo_rules' => 0,
+                'is_html_allowed_on_front' => 1,
+                'is_visible_on_front' => 0,
+                'used_in_product_listing' => 0,
+                'used_for_sort_by' => 0,
+                'frontend_label' => $attributeData['label'],
+                'backend_type' => 'int',
+                'option' => [
+                    'value' => [
+                        'option_0' => [
+                            $attributeData['label'] . ' Option 1'
+                        ],
+                        'option_1' => [
+                            $attributeData['label'] . ' Option 2'
+                        ],
+                        'option_2' => [
+                            $attributeData['label'] . ' Option 3'
+                        ],
+                        'option_3' => [
+                            $attributeData['label'] . ' Option 4'
+                        ]
+                    ],
+                    'order' => [
+                        'option_0' => 1,
+                        'option_1' => 2,
+                        'option_2' => 3,
+                        'option_3' => 4
+                    ],
+                ],
+            ]
+        );
+
+        $attributeRepository->save($attribute);
+
+        /* Assign attribute to attribute set */
+        $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attribute->getId());
+    }
+}
+
+$eavConfig->clear();
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attributes_for_position_test_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attributes_for_position_test_rollback.php
new file mode 100644
index 0000000000000..c947eaafda393
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attributes_for_position_test_rollback.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+$productCollection = Bootstrap::getObjectManager()
+    ->get(Collection::class);
+foreach ($productCollection as $product) {
+    $product->delete();
+}
+
+$attributesToDelete = [
+    'custom_attr_1',
+    'custom_attr_2',
+];
+
+foreach ($attributesToDelete as $attributeToDelete) {
+    $eavConfig = Bootstrap::getObjectManager()->get(Config::class);
+    $attribute = $eavConfig->getAttribute('catalog_product', $attributeToDelete);
+    if ($attribute instanceof AbstractAttribute
+        && $attribute->getId()
+    ) {
+        $attribute->delete();
+    }
+    $eavConfig->clear();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php
index c9f2ffad67644..fefd1a7b250c3 100644
--- a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php
+++ b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 class SaveRatesTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
 
@@ -43,6 +45,7 @@ public function testSaveAction()
         $rate = 1.0000;
 
         $request = $this->getRequest();
+        $request->setMethod(HttpRequest::METHOD_POST);
         $request->setPostValue(
             'rate',
             [
@@ -75,6 +78,7 @@ public function testSaveWithWarningAction()
         $rate = '0';
 
         $request = $this->getRequest();
+        $request->setMethod(HttpRequest::METHOD_POST);
         $request->setPostValue(
             'rate',
             [
diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php
index 5217c3576a51d..2929f137be89f 100644
--- a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php
+++ b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php
@@ -5,10 +5,16 @@
  */
 namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
     /**
-     * Test save action
+     * Test save action.
+     *
+     * @param string $currencyCode
+     * @param string $inputCurrencySymbol
+     * @param string $outputCurrencySymbol
      *
      * @magentoConfigFixture               currency/options/allow USD
      * @magentoDbIsolation enabled
@@ -31,6 +37,7 @@ public function testSaveAction($currencyCode, $inputCurrencySymbol, $outputCurre
                 $currencyCode => $inputCurrencySymbol,
             ]
         );
+        $request->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/admin/system_currencysymbol/save');
 
         $this->assertRedirect();
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
index ff0d838cb6f82..c169272b133bc 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
@@ -19,17 +19,35 @@
 use Magento\Framework\App\Http;
 use Magento\Framework\Data\Form\FormKey;
 use Magento\Framework\Message\MessageInterface;
-use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Request;
 use Magento\TestFramework\Response;
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Stdlib\CookieManagerInterface;
+use Magento\Theme\Controller\Result\MessagePlugin;
 use Zend\Stdlib\Parameters;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
 {
+    /**
+     * @var TransportBuilderMock
+     */
+    private $transportBuilderMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->transportBuilderMock = $this->_objectManager->get(TransportBuilderMock::class);
+    }
+
     /**
      * Login the user
      *
@@ -94,19 +112,13 @@ public function testForgotPasswordEmailMessageWithSpecialCharacters()
     {
         $email = 'customer@example.com';
 
-        $this->getRequest()
-            ->setPostValue([
-                'email' => $email,
-            ]);
+        $this->getRequest()->setPostValue(['email' => $email]);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('customer/account/forgotPasswordPost');
         $this->assertRedirect($this->stringContains('customer/account/'));
 
-        /** @var \Magento\TestFramework\Mail\Template\TransportBuilderMock $transportBuilder */
-        $transportBuilder = $this->_objectManager->get(
-            \Magento\TestFramework\Mail\Template\TransportBuilderMock::class
-        );
-        $subject = $transportBuilder->getSentMessage()->getSubject();
+        $subject = $this->transportBuilderMock->getSentMessage()->getSubject();
         $this->assertContains(
             'Test special\' characters',
             $subject
@@ -219,6 +231,7 @@ public function testConfirmActionAlreadyActive()
     public function testNoFormKeyCreatePostAction()
     {
         $this->fillRequestWithAccountData();
+        $this->getRequest()->setPostValue('form_key', null);
         $this->dispatch('customer/account/createPost');
 
         $this->assertNull($this->getCustomerByEmail('test1@email.com'));
@@ -228,26 +241,10 @@ public function testNoFormKeyCreatePostAction()
     /**
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Customer/_files/customer_confirmation_config_disable.php
      */
     public function testNoConfirmCreatePostAction()
     {
-        /** @var \Magento\Framework\App\Config\MutableScopeConfigInterface $mutableScopeConfig */
-        $mutableScopeConfig = Bootstrap::getObjectManager()
-            ->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class);
-
-        $scopeValue = $mutableScopeConfig->getValue(
-            'customer/create_account/confirm',
-            ScopeInterface::SCOPE_WEBSITES,
-            null
-        );
-
-        $mutableScopeConfig->setValue(
-            'customer/create_account/confirm',
-            0,
-            ScopeInterface::SCOPE_WEBSITES,
-            null
-        );
-
         $this->fillRequestWithAccountDataAndFormKey();
         $this->dispatch('customer/account/createPost');
         $this->assertRedirect($this->stringEndsWith('customer/account/'));
@@ -255,38 +252,15 @@ public function testNoConfirmCreatePostAction()
             $this->equalTo(['Thank you for registering with Main Website Store.']),
             MessageInterface::TYPE_SUCCESS
         );
-
-        $mutableScopeConfig->setValue(
-            'customer/create_account/confirm',
-            $scopeValue,
-            ScopeInterface::SCOPE_WEBSITES,
-            null
-        );
     }
 
     /**
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Customer/_files/customer_confirmation_config_enable.php
      */
     public function testWithConfirmCreatePostAction()
     {
-        /** @var \Magento\Framework\App\Config\MutableScopeConfigInterface $mutableScopeConfig */
-        $mutableScopeConfig = Bootstrap::getObjectManager()
-            ->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class);
-
-        $scopeValue = $mutableScopeConfig->getValue(
-            'customer/create_account/confirm',
-            ScopeInterface::SCOPE_WEBSITES,
-            null
-        );
-
-        $mutableScopeConfig->setValue(
-            'customer/create_account/confirm',
-            1,
-            ScopeInterface::SCOPE_WEBSITES,
-            null
-        );
-
         $this->fillRequestWithAccountDataAndFormKey();
         $this->dispatch('customer/account/createPost');
         $this->assertRedirect($this->stringContains('customer/account/index/'));
@@ -298,13 +272,6 @@ public function testWithConfirmCreatePostAction()
             ]),
             MessageInterface::TYPE_SUCCESS
         );
-
-        $mutableScopeConfig->setValue(
-            'customer/create_account/confirm',
-            $scopeValue,
-            ScopeInterface::SCOPE_WEBSITES,
-            null
-        );
     }
 
     /**
@@ -312,8 +279,7 @@ public function testWithConfirmCreatePostAction()
      */
     public function testExistingEmailCreatePostAction()
     {
-        $this->fillRequestWithAccountDataAndFormKey();
-        $this->getRequest()->setParam('email', 'customer@example.com');
+        $this->fillRequestWithAccountDataAndFormKey('customer@example.com');
         $this->dispatch('customer/account/createPost');
         $this->assertRedirect($this->stringContains('customer/account/create/'));
         $this->assertSessionMessages(
@@ -372,10 +338,8 @@ public function testForgotPasswordPostAction()
     {
         $email = 'customer@example.com';
 
-        $this->getRequest()
-            ->setPostValue([
-                'email' => $email,
-            ]);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue(['email' => $email]);
 
         $this->dispatch('customer/account/forgotPasswordPost');
         $this->assertRedirect($this->stringContains('customer/account/'));
@@ -395,6 +359,7 @@ public function testForgotPasswordPostAction()
      */
     public function testForgotPasswordPostWithBadEmailAction()
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()
             ->setPostValue([
                 'email' => 'bad@email',
@@ -416,6 +381,7 @@ public function testResetPasswordPostNoTokenAction()
         $this->getRequest()
             ->setParam('id', 1)
             ->setParam('token', '8ed8677e6c79e68b94e61658bd756ea5')
+            ->setMethod('POST')
             ->setPostValue([
                 'password' => 'new-password',
                 'password_confirmation' => 'new-password',
@@ -548,18 +514,19 @@ public function testChangePasswordEditPostAction()
         $this->login(1);
         $this->getRequest()
             ->setMethod('POST')
-            ->setPostValue([
-                'form_key'         => $this->_objectManager->get(
-                    FormKey::class)->getFormKey(),
-                'firstname'        => 'John',
-                'lastname'         => 'Doe',
-                'email'            => 'johndoe@email.com',
-                'change_password'  => 1,
-                'change_email'     => 1,
-                'current_password' => 'password',
-                'password'         => 'new-Password1',
-                'password_confirmation' => 'new-Password1',
-            ]);
+            ->setPostValue(
+                [
+                    'form_key'         => $this->_objectManager->get(FormKey::class)->getFormKey(),
+                    'firstname'        => 'John',
+                    'lastname'         => 'Doe',
+                    'email'            => 'johndoe@email.com',
+                    'change_password'  => 1,
+                    'change_email'     => 1,
+                    'current_password' => 'password',
+                    'password'         => 'new-Password1',
+                    'password_confirmation' => 'new-Password1',
+                ]
+            );
 
         $this->dispatch('customer/account/editPost');
 
@@ -583,14 +550,16 @@ public function testMissingDataEditPostAction()
         $this->login(1);
         $this->getRequest()
             ->setMethod('POST')
-            ->setPostValue([
-                'form_key'  => $this->_objectManager->get(FormKey::class)->getFormKey(),
-                'firstname' => 'John',
-                'lastname'  => 'Doe',
-                'change_email'  => 1,
-                'current_password'  => 'password',
-                'email'     => 'bad-email',
-            ]);
+            ->setPostValue(
+                [
+                    'form_key' => $this->_objectManager->get(FormKey::class)->getFormKey(),
+                    'firstname' => 'John',
+                    'lastname' => 'Doe',
+                    'change_email' => 1,
+                    'current_password' => 'password',
+                    'email' => 'bad-email',
+                ]
+            );
 
         $this->dispatch('customer/account/editPost');
 
@@ -609,17 +578,18 @@ public function testWrongPasswordEditPostAction()
         $this->login(1);
         $this->getRequest()
             ->setMethod('POST')
-            ->setPostValue([
-                'form_key'         => $this->_objectManager->get(
-                    FormKey::class)->getFormKey(),
-                'firstname'        => 'John',
-                'lastname'         => 'Doe',
-                'email'            => 'johndoe@email.com',
-                'change_password'  => 1,
-                'current_password' => 'wrong-password',
-                'password'         => 'new-password',
-                'password_confirmation' => 'new-password',
-            ]);
+            ->setPostValue(
+                [
+                    'form_key' => $this->_objectManager->get(FormKey::class)->getFormKey(),
+                    'firstname' => 'John',
+                    'lastname' => 'Doe',
+                    'email' => 'johndoe@email.com',
+                    'change_password' => 1,
+                    'current_password' => 'wrong-password',
+                    'password' => 'new-password',
+                    'password_confirmation' => 'new-password',
+                ]
+            );
 
         $this->dispatch('customer/account/editPost');
 
@@ -640,8 +610,7 @@ public function testWrongConfirmationEditPostAction()
         $this->getRequest()
             ->setMethod('POST')
             ->setPostValue([
-                'form_key'         => $this->_objectManager->get(
-                    FormKey::class)->getFormKey(),
+                'form_key'         => $this->_objectManager->get(FormKey::class)->getFormKey(),
                 'firstname'        => 'John',
                 'lastname'         => 'Doe',
                 'email'            => 'johndoe@email.com',
@@ -673,23 +642,62 @@ public function testWrongConfirmationEditPostAction()
     public function testLoginPostRedirect($redirectDashboard, string $redirectUrl)
     {
         if (isset($redirectDashboard)) {
-            $this->_objectManager->get(ScopeConfigInterface::class)->setValue('customer/startup/redirect_dashboard', $redirectDashboard);
+            $this->_objectManager->get(ScopeConfigInterface::class)->setValue(
+                'customer/startup/redirect_dashboard',
+                $redirectDashboard
+            );
         }
-
         $this->_objectManager->get(Redirect::class)->setRedirectCookie('test');
-
         $configValue = $this->_objectManager->create(Value::class);
         $configValue->load('web/unsecure/base_url', 'path');
         $baseUrl = $configValue->getValue() ?: 'http://localhost/';
-
         $request = $this->prepareRequest();
         $app = $this->_objectManager->create(Http::class, ['_request' => $request]);
         $response = $app->launch();
-
         $this->assertResponseRedirect($response, $baseUrl . $redirectUrl);
         $this->assertTrue($this->_objectManager->get(Session::class)->isLoggedIn());
     }
 
+    /**
+     * Test that confirmation email address displays special characters correctly.
+     *
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Customer/_files/customer_confirmation_email_address_with_special_chars.php
+     *
+     * @return void
+     */
+    public function testConfirmationEmailWithSpecialCharacters()
+    {
+        $email = 'customer+confirmation@example.com';
+        $this->dispatch('customer/account/confirmation/email/customer%2Bconfirmation%40email.com');
+        $this->getRequest()->setPostValue('email', $email);
+        $this->dispatch('customer/account/confirmation/email/customer%2Bconfirmation%40email.com');
+
+        $this->assertRedirect($this->stringContains('customer/account/index'));
+        $this->assertSessionMessages(
+            $this->equalTo(['Please check your email for confirmation key.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+
+        /** @var $message \Magento\Framework\Mail\Message */
+        $message = $this->transportBuilderMock->getSentMessage();
+        $rawMessage = $message->getRawMessage();
+
+        $this->assertContains('To: ' . $email, $rawMessage);
+
+        $content = $message->getBody()->getPartContent(0);
+        $confirmationUrl = $this->getConfirmationUrlFromMessageContent($content);
+        $this->setRequestInfo($confirmationUrl, 'confirm');
+        $this->clearCookieMessagesList();
+        $this->dispatch($confirmationUrl);
+
+        $this->assertRedirect($this->stringContains('customer/account/index'));
+        $this->assertSessionMessages(
+            $this->equalTo(['Thank you for registering with Main Website Store.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+    }
+
     /**
      * Data provider for testLoginPostRedirect.
      *
@@ -705,16 +713,17 @@ public function loginPostRedirectDataProvider()
     }
 
     /**
+     * @param string $email
      * @return void
      */
-    private function fillRequestWithAccountData()
+    private function fillRequestWithAccountData(string $email = 'test1@email.com')
     {
         $this->getRequest()
             ->setMethod('POST')
             ->setParam('firstname', 'firstname1')
             ->setParam('lastname', 'lastname1')
             ->setParam('company', '')
-            ->setParam('email', 'test1@email.com')
+            ->setParam('email', $email)
             ->setParam('password', '_Password1')
             ->setParam('password_confirmation', '_Password1')
             ->setParam('telephone', '5123334444')
@@ -731,11 +740,12 @@ private function fillRequestWithAccountData()
     }
 
     /**
+     * @param string $email
      * @return void
      */
-    private function fillRequestWithAccountDataAndFormKey()
+    private function fillRequestWithAccountDataAndFormKey(string $email = 'test1@email.com')
     {
-        $this->fillRequestWithAccountData();
+        $this->fillRequestWithAccountData($email);
         $formKey = $this->_objectManager->get(FormKey::class);
         $this->getRequest()->setParam('form_key', $formKey->getFormKey());
     }
@@ -805,4 +815,53 @@ private function assertResponseRedirect(Response $response, string $redirectUrl)
         $this->assertTrue($response->isRedirect());
         $this->assertSame($redirectUrl, $response->getHeader('Location')->getUri());
     }
+
+    /**
+     * Add new request info (request uri, path info, action name).
+     *
+     * @param string $uri
+     * @param string $actionName
+     * @return void
+     */
+    private function setRequestInfo(string $uri, string $actionName)
+    {
+        $this->getRequest()
+            ->setRequestUri($uri)
+            ->setPathInfo()
+            ->setActionName($actionName);
+    }
+
+    /**
+     * Clear cookie messages list.
+     *
+     * @return void
+     */
+    private function clearCookieMessagesList()
+    {
+        $cookieManager = $this->_objectManager->get(CookieManagerInterface::class);
+        $jsonSerializer = $this->_objectManager->get(Json::class);
+        $cookieManager->setPublicCookie(
+            MessagePlugin::MESSAGES_COOKIES_NAME,
+            $jsonSerializer->serialize([])
+        );
+    }
+
+    /**
+     * Get confirmation URL from message content.
+     *
+     * @param string $content
+     * @return string
+     */
+    private function getConfirmationUrlFromMessageContent(string $content): string
+    {
+        $confirmationUrl = '';
+
+        if (preg_match('<a\s*href="(?<url>.*?)".*>', $content, $matches)) {
+            $confirmationUrl = $matches['url'];
+            $confirmationUrl = str_replace('http://localhost/index.php/', '', $confirmationUrl);
+            $confirmationUrl = html_entity_decode($confirmationUrl);
+        }
+
+        return $confirmationUrl;
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php
index ddf23e1b6ea98..484725346af64 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php
@@ -9,6 +9,7 @@
 use Magento\Customer\Model\CustomerRegistry;
 use Magento\Framework\Data\Form\FormKey;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 class AddressTest extends \Magento\TestFramework\TestCase\AbstractController
 {
@@ -18,6 +19,9 @@ class AddressTest extends \Magento\TestFramework\TestCase\AbstractController
     /** @var FormKey */
     private $formKey;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -165,7 +169,7 @@ public function testFailedFormPostAction()
     public function testDeleteAction()
     {
         $this->getRequest()->setParam('id', 1);
-        $this->getRequest()->setParam('form_key', $this->formKey->getFormKey());
+        $this->getRequest()->setParam('form_key', $this->formKey->getFormKey())->setMethod(HttpRequest::METHOD_POST);
         // we are overwriting the address coming from the fixture
         $this->dispatch('customer/address/delete');
 
@@ -183,13 +187,13 @@ public function testDeleteAction()
     public function testWrongAddressDeleteAction()
     {
         $this->getRequest()->setParam('id', 555);
-        $this->getRequest()->setParam('form_key', $this->formKey->getFormKey());
+        $this->getRequest()->setParam('form_key', $this->formKey->getFormKey())->setMethod(HttpRequest::METHOD_POST);
         // we are overwriting the address coming from the fixture
         $this->dispatch('customer/address/delete');
 
         $this->assertRedirect($this->stringContains('customer/address/index'));
         $this->assertSessionMessages(
-            $this->equalTo(['We can\'t delete the address right now.']),
+            $this->equalTo(['We can&#039;t delete the address right now.']),
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php
index 28c8d7556270a..1cc421fd2973d 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\Message\MessageInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * @magentoAppArea adminhtml
@@ -25,6 +26,9 @@ class GroupTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
     /** @var  \Magento\Customer\Api\GroupRepositoryInterface */
     private $groupRepository;
 
+    /**
+     * @inheritDoc
+     */
     public function setUp()
     {
         parent::setUp();
@@ -33,12 +37,9 @@ public function setUp()
         $this->groupRepository = $objectManager->get(\Magento\Customer\Api\GroupRepositoryInterface::class);
     }
 
-    public function tearDown()
-    {
-        parent::tearDown();
-        //$this->session->unsCustomerGroupData();
-    }
-
+    /**
+     * Test new group form.
+     */
     public function testNewActionNoCustomerGroupDataInSession()
     {
         $this->dispatch('backend/customer/group/new');
@@ -49,6 +50,9 @@ public function testNewActionNoCustomerGroupDataInSession()
         $this->assertContains($expected, $responseBody);
     }
 
+    /**
+     * Test form filling with data in session.
+     */
     public function testNewActionWithCustomerGroupDataInSession()
     {
         /** @var \Magento\Customer\Api\Data\GroupInterfaceFactory $customerGroupFactory */
@@ -76,21 +80,27 @@ public function testNewActionWithCustomerGroupDataInSession()
     }
 
     /**
+     * Test calling delete without an ID.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer_group.php
      */
     public function testDeleteActionNoGroupId()
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/group/delete');
         $this->assertRedirect($this->stringStartsWith(self::BASE_CONTROLLER_URL));
     }
 
     /**
+     * Test deleting a group.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer_group.php
      */
     public function testDeleteActionExistingGroup()
     {
         $groupId = $this->findGroupIdWithCode(self::CUSTOMER_GROUP_CODE);
         $this->getRequest()->setParam('id', $groupId);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/group/delete');
 
         /**
@@ -104,11 +114,14 @@ public function testDeleteActionExistingGroup()
     }
 
     /**
+     * Tet deleting with wrong ID.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer_group.php
      */
     public function testDeleteActionNonExistingGroupId()
     {
         $this->getRequest()->setParam('id', 10000);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/group/delete');
 
         /**
@@ -122,6 +135,8 @@ public function testDeleteActionNonExistingGroupId()
     }
 
     /**
+     * Test saving a valid group.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer_group.php
      */
     public function testSaveActionExistingGroup()
@@ -130,6 +145,7 @@ public function testSaveActionExistingGroup()
         $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID);
         $this->getRequest()->setParam('id', $groupId);
         $this->getRequest()->setParam('code', self::CUSTOMER_GROUP_CODE);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('backend/customer/group/save');
 
@@ -161,9 +177,13 @@ public function testSaveActionExistingGroup()
         );
     }
 
+    /**
+     * Test saving an invalid group.
+     */
     public function testSaveActionCreateNewGroupWithoutCode()
     {
         $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('backend/customer/group/save');
 
@@ -173,19 +193,26 @@ public function testSaveActionCreateNewGroupWithoutCode()
         );
     }
 
+    /**
+     * Test saving an empty group.
+     */
     public function testSaveActionForwardNewCreateNewGroup()
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/group/save');
         $responseBody = $this->getResponse()->getBody();
         $this->assertRegExp('/<h1 class\="page-title">\s*New Customer Group\s*<\/h1>/', $responseBody);
     }
 
     /**
+     * Test saving an existing group.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer_group.php
      */
     public function testSaveActionForwardNewEditExistingGroup()
     {
         $groupId = $this->findGroupIdWithCode(self::CUSTOMER_GROUP_CODE);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setParam('id', $groupId);
         $this->dispatch('backend/customer/group/save');
 
@@ -193,10 +220,14 @@ public function testSaveActionForwardNewEditExistingGroup()
         $this->assertRegExp('/<h1 class\="page-title">\s*' . self::CUSTOMER_GROUP_CODE . '\s*<\/h1>/', $responseBody);
     }
 
+    /**
+     * Test using an invalid ID.
+     */
     public function testSaveActionNonExistingGroupId()
     {
         $this->getRequest()->setParam('id', 10000);
         $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('backend/customer/group/save');
 
@@ -211,6 +242,8 @@ public function testSaveActionNonExistingGroupId()
     }
 
     /**
+     * Test using existing code.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer_group.php
      */
     public function testSaveActionNewGroupWithExistingGroupCode()
@@ -220,6 +253,7 @@ public function testSaveActionNewGroupWithExistingGroupCode()
 
         $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID);
         $this->getRequest()->setParam('code', self::CUSTOMER_GROUP_CODE);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('backend/customer/group/save');
 
@@ -232,6 +266,8 @@ public function testSaveActionNewGroupWithExistingGroupCode()
     }
 
     /**
+     * Test saving an invalid group.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer_group.php
      */
     public function testSaveActionNewGroupWithoutGroupCode()
@@ -240,6 +276,7 @@ public function testSaveActionNewGroupWithoutGroupCode()
         $originalCode = $this->groupRepository->getById($groupId)->getCode();
 
         $this->getRequest()->setParam('tax_class', self::TAX_CLASS_ID);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('backend/customer/group/save');
 
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php
index 434e24b7d2771..3df07fbd4e1c0 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroupTest.php
@@ -9,6 +9,7 @@
 
 use Magento\Backend\Model\Session;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Framework\Message\MessageInterface;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -31,12 +32,18 @@ class MassAssignGroupTest extends AbstractBackendController
      */
     protected $customerRepository;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         parent::setUp();
         $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
     }
 
+    /**
+     * @inheritDoc
+     */
     protected function tearDown()
     {
         /**
@@ -73,8 +80,8 @@ public function testMassAssignGroupAction()
             'form_key' => $formKey->getFormKey()
         ];
 
-        $this->getRequest()->setParams($params);
-        $this->getRequest()->setMethod('POST');
+        $this->getRequest()->setParams($params)
+            ->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/massAssignGroup');
         $this->assertSessionMessages(
             self::equalTo(['A total of 1 record(s) were updated.']),
@@ -111,8 +118,8 @@ public function testLargeGroupMassAssignGroupAction()
             'form_key' => $formKey->getFormKey()
         ];
 
-        $this->getRequest()->setParams($params);
-        $this->getRequest()->setMethod('POST');
+        $this->getRequest()->setParams($params)
+            ->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/massAssignGroup');
         $this->assertSessionMessages(
             self::equalTo(['A total of 5 record(s) were updated.']),
@@ -141,9 +148,7 @@ public function testMassAssignGroupActionNoCustomerIds()
             'namespace' => 'customer_listing',
             'form_key' => $formKey->getFormKey()
         ];
-
-        $this->getRequest()->setParams($params);
-        $this->getRequest()->setMethod('POST');
+        $this->getRequest()->setParams($params)->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/massAssignGroup');
         $this->assertSessionMessages(
             $this->equalTo(['Please select item(s).']),
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php
index 96e993932cb18..dc192c3c8681d 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php
@@ -13,6 +13,7 @@
 use PHPUnit\Framework\Constraint\Constraint;
 use Magento\Framework\Message\MessageInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\TestFramework\TestCase\AbstractBackendController;
 
 /**
@@ -32,12 +33,18 @@ class MassDeleteTest extends AbstractBackendController
      */
     private $baseControllerUrl = 'http://localhost/index.php/backend/customer/index/index';
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         parent::setUp();
         $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
     }
 
+    /**
+     * @inheritDoc
+     */
     protected function tearDown()
     {
         /**
@@ -110,8 +117,7 @@ private function massDeleteAssertions($ids, Constraint $constraint, $messageType
             'form_key' => $formKey->getFormKey()
         ];
 
-        $this->getRequest()->setParams($requestData);
-        $this->getRequest()->setMethod('POST');
+        $this->getRequest()->setParams($requestData)->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/massDelete');
         $this->assertSessionMessages(
             $constraint,
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php
index b5ca783d68cf2..eaaba639d49a8 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/ResetPasswordTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 /**
  * ResetPassword controller test.
  *
@@ -32,7 +34,7 @@ public function testResetPasswordSuccess()
         $this->passwordResetRequestEventCreate(
             \Magento\Security\Model\PasswordResetRequestEvent::CUSTOMER_PASSWORD_RESET_REQUEST
         );
-        $this->getRequest()->setPostValue(['customer_id' => '1']);
+        $this->getRequest()->setPostValue(['customer_id' => '1'])->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/resetPassword');
         $this->assertSessionMessages(
             $this->equalTo(['The customer will receive an email with a link to reset password.']),
@@ -55,7 +57,7 @@ public function testResetPasswordMinTimeError()
         $this->passwordResetRequestEventCreate(
             \Magento\Security\Model\PasswordResetRequestEvent::CUSTOMER_PASSWORD_RESET_REQUEST
         );
-        $this->getRequest()->setPostValue(['customer_id' => '1']);
+        $this->getRequest()->setPostValue(['customer_id' => '1'])->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/resetPassword');
         $this->assertSessionMessages(
             $this->equalTo(['The customer will receive an email with a link to reset password.']),
@@ -78,7 +80,7 @@ public function testResetPasswordLimitError()
         $this->passwordResetRequestEventCreate(
             \Magento\Security\Model\PasswordResetRequestEvent::CUSTOMER_PASSWORD_RESET_REQUEST
         );
-        $this->getRequest()->setPostValue(['customer_id' => '1']);
+        $this->getRequest()->setPostValue(['customer_id' => '1'])->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/resetPassword');
         $this->assertSessionMessages(
             $this->equalTo(['The customer will receive an email with a link to reset password.']),
@@ -103,7 +105,7 @@ public function testResetPasswordWithSecurityViolationException()
         $this->passwordResetRequestEventCreate(
             \Magento\Security\Model\PasswordResetRequestEvent::ADMIN_PASSWORD_RESET_REQUEST
         );
-        $this->getRequest()->setPostValue(['customer_id' => '1']);
+        $this->getRequest()->setPostValue(['customer_id' => '1'])->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/resetPassword');
         $this->assertSessionMessages(
             $this->equalTo(['The customer will receive an email with a link to reset password.']),
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
index 36df9cbf851bd..4d5c46dff6221 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
@@ -12,6 +12,7 @@
 use Magento\Customer\Controller\RegistryConstants;
 use Magento\Customer\Model\EmailNotification;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * @magentoAppArea adminhtml
@@ -85,7 +86,7 @@ protected function tearDown()
      */
     public function testSaveActionWithEmptyPostData()
     {
-        $this->getRequest()->setPostValue([]);
+        $this->getRequest()->setPostValue([])->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/save');
         $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl));
     }
@@ -96,43 +97,7 @@ public function testSaveActionWithEmptyPostData()
     public function testSaveActionWithInvalidFormData()
     {
         $post = ['account' => ['middlename' => 'test middlename', 'group_id' => 1]];
-        $this->getRequest()->setPostValue($post);
-        $this->dispatch('backend/customer/index/save');
-        /**
-         * Check that errors was generated and set to session
-         */
-        $this->assertSessionMessages(
-            $this->logicalNot($this->isEmpty()),
-            \Magento\Framework\Message\MessageInterface::TYPE_ERROR
-        );
-        /**
-         * Check that customer data were set to session
-         */
-        $this->assertEquals(
-            $post,
-            $this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerFormData()
-        );
-        $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'new'));
-    }
-
-    /**
-     * @magentoDbIsolation enabled
-     */
-    public function testSaveActionWithInvalidCustomerAddressData()
-    {
-        $post = [
-            'customer' => [
-                'middlename' => 'test middlename',
-                'group_id' => 1,
-                'website_id' => 0,
-                'firstname' => 'test firstname',
-                'lastname' => 'test lastname',
-                'email' => 'example@domain.com',
-                'default_billing' => '_item1',
-            ],
-            'address' => ['_item1' => []],
-        ];
-        $this->getRequest()->setPostValue($post);
+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/save');
         /**
          * Check that errors was generated and set to session
@@ -141,13 +106,13 @@ public function testSaveActionWithInvalidCustomerAddressData()
             $this->logicalNot($this->isEmpty()),
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
+        /** @var \Magento\Backend\Model\Session $session */
+        $session = $this->objectManager->get(\Magento\Backend\Model\Session::class);
         /**
          * Check that customer data were set to session
          */
-        $this->assertEquals(
-            $post,
-            $this->objectManager->get(\Magento\Backend\Model\Session::class)->getCustomerFormData()
-        );
+        $this->assertNotEmpty($session->getCustomerFormData());
+        $this->assertArraySubset($post, $session->getCustomerFormData());
         $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'new'));
     }
 
@@ -181,7 +146,7 @@ public function testSaveActionWithValidCustomerDataAndValidAddressData()
                 ],
             ],
         ];
-        $this->getRequest()->setPostValue($post);
+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setParam('back', '1');
 
         // Emulate setting customer data to session in editAction
@@ -293,7 +258,7 @@ public function testSaveActionExistingCustomerAndExistingAddressData()
             ],
             'subscription' => '',
         ];
-        $this->getRequest()->setPostValue($post);
+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setParam('id', 1);
         $this->dispatch('backend/customer/index/save');
 
@@ -359,7 +324,7 @@ public function testSaveActionExistingCustomerUnsubscribeNewsletter()
             ],
             'subscription' => '0'
         ];
-        $this->getRequest()->setPostValue($post);
+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setParam('id', 1);
         $this->dispatch('backend/customer/index/save');
 
@@ -397,7 +362,7 @@ public function testSaveActionExistingCustomerChangeEmail()
             'change_email_template',
             [
                 'name' => 'CustomerSupport',
-                'email' => 'support@example.com'
+                'email' => 'support@example.com',
             ],
             $customerId,
             $newEmail
@@ -420,7 +385,7 @@ public function testSaveActionExistingCustomerChangeEmail()
                 'default_billing' => 1,
             ]
         ];
-        $this->getRequest()->setPostValue($post);
+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setParam('id', 1);
         $this->dispatch('backend/customer/index/save');
 
@@ -447,7 +412,7 @@ public function testInlineEditChangeEmail()
             'change_email_template',
             [
                 'name' => 'CustomerSupport',
-                'email' => 'support@example.com'
+                'email' => 'support@example.com',
             ],
             $customerId,
             $newEmail
@@ -467,7 +432,7 @@ public function testInlineEditChangeEmail()
             ]
         ];
         $this->getRequest()->setParam('ajax', true)->setParam('isAjax', true);
-        $this->getRequest()->setPostValue($post);
+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setParam('id', 1);
         $this->dispatch('backend/customer/index/inlineEdit');
 
@@ -493,7 +458,7 @@ public function testSaveActionCoreException()
                 'password' => 'password',
             ],
         ];
-        $this->getRequest()->setPostValue($post);
+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/save');
         /*
          * Check that error message is set
@@ -502,13 +467,49 @@ public function testSaveActionCoreException()
             $this->equalTo(['A customer with the same email already exists in an associated website.']),
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
-        $this->assertEquals(
+        $this->assertArraySubset(
             $post,
             Bootstrap::getObjectManager()->get(\Magento\Backend\Model\Session::class)->getCustomerFormData()
         );
         $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'new/key/'));
     }
 
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer_sample.php
+     */
+    public function testSaveActionCoreExceptionFormatFormData()
+    {
+        $post = [
+            'customer' => [
+                'website_id' => 1,
+                'email' => 'customer@example.com',
+                'dob' => '12/3/1996',
+            ],
+        ];
+        $postFormatted = [
+            'customer' => [
+                'website_id' => 1,
+                'email' => 'customer@example.com',
+                'dob' => '1996-12-03',
+            ],
+        ];
+        $this->getRequest()->setPostValue($post);
+        $this->dispatch('backend/customer/index/save');
+        /*
+         * Check that error message is set
+         */
+        $this->assertSessionMessages(
+            $this->equalTo(['A customer with the same email already exists in an associated website.']),
+            \Magento\Framework\Message\MessageInterface::TYPE_ERROR
+        );
+        $this->assertEquals(
+            $postFormatted,
+            Bootstrap::getObjectManager()->get(\Magento\Backend\Model\Session::class)->getCustomerFormData(),
+            'Customer form data should be formatted'
+        );
+        $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'new/key/'));
+    }
+
     /**
      * @magentoDataFixture Magento/Customer/_files/customer_sample.php
      */
@@ -579,8 +580,7 @@ public function testNotExistingCustomerDeleteAction()
     {
         $this->getRequest()->setParam('id', 2);
         $this->getRequest()->setParam('form_key', $this->formKey->getFormKey());
-
-        $this->getRequest()->setMethod(\Zend\Http\Request::METHOD_POST);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
         $this->dispatch('backend/customer/index/delete');
         $this->assertRedirect($this->stringContains('customer/index'));
@@ -657,7 +657,7 @@ public function testValidateCustomerWithAddressSuccess()
         /**
          * set customer data
          */
-        $this->getRequest()->setParams($customerData);
+        $this->getRequest()->setParams($customerData)->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/validate');
         $body = $this->getResponse()->getBody();
 
@@ -711,7 +711,7 @@ public function testValidateCustomerWithAddressFailure()
         /**
          * set customer data
          */
-        $this->getRequest()->setPostValue($customerData);
+        $this->getRequest()->setPostValue($customerData)->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/validate');
         $body = $this->getResponse()->getBody();
 
@@ -728,6 +728,7 @@ public function testValidateCustomerWithAddressFailure()
     public function testResetPasswordActionNoCustomerId()
     {
         // No customer ID in post, will just get redirected to base
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/resetPassword');
         $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl));
     }
@@ -738,6 +739,7 @@ public function testResetPasswordActionNoCustomerId()
     public function testResetPasswordActionBadCustomerId()
     {
         // Bad customer ID in post, will just get redirected to base
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(['customer_id' => '789']);
         $this->dispatch('backend/customer/index/resetPassword');
         $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl));
@@ -749,6 +751,7 @@ public function testResetPasswordActionBadCustomerId()
     public function testResetPasswordActionSuccess()
     {
         $this->getRequest()->setPostValue(['customer_id' => '1']);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/resetPassword');
         $this->assertSessionMessages(
             $this->equalTo(['The customer will receive an email with a link to reset password.']),
@@ -789,7 +792,7 @@ protected function prepareEmailMock($occurrenceNumber, $templateId, $sender, $cu
                     'setTemplateIdentifier',
                     'setTemplateVars',
                     'setTemplateOptions',
-                    'getTransport'
+                    'getTransport',
                 ]
             )
             ->getMock();
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/SendTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/SendTest.php
new file mode 100644
index 0000000000000..415591ac7d990
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/SendTest.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Controller;
+
+use Magento\TestFramework\TestCase\AbstractController;
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Customer\Model\Session;
+use Psr\Log\LoggerInterface;
+
+class SendTest extends AbstractController
+{
+    /** @var AccountManagementInterface */
+    private $accountManagement;
+
+    /** @var FormKey */
+    private $formKey;
+
+    /**
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $logger = $this->createMock(LoggerInterface::class);
+        $session = Bootstrap::getObjectManager()->create(
+            Session::class,
+            [$logger]
+        );
+        $this->accountManagement = Bootstrap::getObjectManager()->create(AccountManagementInterface::class);
+        $this->formKey = Bootstrap::getObjectManager()->create(FormKey::class);
+        $customer = $this->accountManagement->authenticate('customer@example.com', 'password');
+        $session->setCustomerDataAsLoggedIn($customer);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testExecutePost()
+    {
+        $this->getRequest()
+            ->setMethod('POST')
+            ->setPostValue(
+                [
+                    'form_key' => $this->formKey->getFormKey(),
+                    'emails' => 'example1@gmail.com, example2@gmail.com, example3@gmail.com'
+                ]
+            );
+
+        $this->dispatch('wishlist/index/send');
+        $this->assertRedirect($this->stringContains('wishlist/index/index'));
+        $this->assertSessionMessages(
+            $this->equalTo(['Your wish list has been shared.']),
+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php
index 2e132d27f5cb1..507150029c0c6 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php
@@ -14,6 +14,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\State\ExpiredException;
 use Magento\Framework\Reflection\DataObjectProcessor;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -53,6 +54,9 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\Api\ExtensibleDataObjectConverter */
     private $extensibleDataObjectConverter;
 
+    /** @var StoreManagerInterface */
+    private $storeManager;
+
     /** @var  \Magento\Framework\Api\DataObjectHelper */
     protected $dataObjectHelper;
 
@@ -114,6 +118,9 @@ protected function setUp()
 
         $this->extensibleDataObjectConverter = $this->objectManager
             ->create(\Magento\Framework\Api\ExtensibleDataObjectConverter::class);
+
+        $this->storeManager = $this->objectManager
+            ->create(StoreManagerInterface::class);
     }
 
     /**
@@ -1028,4 +1035,42 @@ protected function setResetPasswordData(
         $customerModel->setRpTokenCreatedAt(date($date));
         $customerModel->save();
     }
+
+    /**
+     * Customer has two addresses one of it is allowed in website and second is not
+     *
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @magentoDataFixture Magento/Store/_files/websites_different_countries.php
+     * @magentoConfigFixture fixture_second_store_store general/country/allow UA
+     * @return void
+     */
+    public function testCreateNewCustomerWithPasswordHashWithNotAllowedCountry()
+    {
+        $customerId = 1;
+        $allowedCountryIdForSecondWebsite = 'UA';
+        $store = $this->storeManager->getStore('fixture_second_store');
+        $customerData = $this->customerRepository->getById($customerId);
+        $customerData->getAddresses()[1]->setRegion(null)->setCountryId($allowedCountryIdForSecondWebsite)
+            ->setRegionId(null);
+        $customerData->setStoreId($store->getId())->setWebsiteId($store->getWebsiteId())->setId(null);
+        $encryptor = $this->objectManager->get(\Magento\Framework\Encryption\EncryptorInterface::class);
+        /** @var \Magento\Framework\Math\Random $mathRandom */
+        $password = $this->objectManager->get(\Magento\Framework\Math\Random::class)->getRandomString(8);
+        $passwordHash = $encryptor->getHash($password, true);
+        $savedCustomer = $this->accountManagement->createAccountWithPasswordHash(
+            $customerData,
+            $passwordHash
+        );
+        $this->assertCount(
+            1,
+            $savedCustomer->getAddresses(),
+            'The wrong address quantity was saved'
+        );
+        $this->assertSame(
+            'UA',
+            $savedCustomer->getAddresses()[0]->getCountryId(),
+            'The address with the disallowed country was saved'
+        );
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
index 5425af856bd9f..d013309eda3dc 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
@@ -54,16 +54,23 @@ protected function setUp()
 
     public function testGetCustomAttributesMetadata()
     {
-        $customAttributesMetadata = $this->service->getCustomAttributesMetadata();
-        $this->assertCount(0, $customAttributesMetadata, "Invalid number of attributes returned.");
+        $customAttributesMetadataQty = count($this->service->getCustomAttributesMetadata()) ;
 
         // Verify the consistency of getCustomerAttributeMetadata() function from the 2nd call of the same service
-        $customAttributesMetadata1 = $this->service->getCustomAttributesMetadata();
-        $this->assertCount(0, $customAttributesMetadata1, "Invalid number of attributes returned.");
+        $customAttributesMetadata1Qty = count($this->service->getCustomAttributesMetadata());
+        $this->assertEquals(
+            $customAttributesMetadataQty,
+            $customAttributesMetadata1Qty,
+            "Invalid number of attributes returned."
+        );
 
         // Verify the consistency of getCustomAttributesMetadata() function from the 2nd service
-        $customAttributesMetadata2 = $this->serviceTwo->getCustomAttributesMetadata();
-        $this->assertCount(0, $customAttributesMetadata2, "Invalid number of attributes returned.");
+        $customAttributesMetadata2Qty = count($this->serviceTwo->getCustomAttributesMetadata());
+        $this->assertEquals(
+            $customAttributesMetadataQty,
+            $customAttributesMetadata2Qty,
+            "Invalid number of attributes returned."
+        );
     }
 
     public function testGetNestedOptionsCustomerAttributesMetadata()
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
index 2b74a58288600..37a36b1b3c42a 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
@@ -17,6 +17,8 @@
 use Magento\Store\Api\WebsiteRepositoryInterface;
 
 /**
+ * Class with integration tests for AddressRepository.
+ *
  * @SuppressWarnings(PHPMD.TooManyMethods)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -39,6 +41,9 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
     /** @var  \Magento\Framework\Api\DataObjectHelper */
     private $dataObjectHelper;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -87,6 +92,9 @@ protected function setUp()
         $this->expectedAddresses = [$address, $address2];
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function tearDown()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -96,6 +104,8 @@ protected function tearDown()
     }
 
     /**
+     * Test for save address changes.
+     *
      * @magentoDataFixture  Magento/Customer/_files/customer.php
      * @magentoDataFixture  Magento/Customer/_files/customer_address.php
      * @magentoDataFixture  Magento/Customer/_files/customer_two_addresses.php
@@ -117,6 +127,8 @@ public function testSaveAddressChanges()
     }
 
     /**
+     * Test for method save address with new id.
+     *
      * @magentoDataFixture  Magento/Customer/_files/customer.php
      * @magentoDataFixture  Magento/Customer/_files/customer_address.php
      * @magentoDataFixture  Magento/Customer/_files/customer_two_addresses.php
@@ -131,6 +143,8 @@ public function testSaveAddressesIdSetButNotAlreadyExisting()
     }
 
     /**
+     * Test for method get address by id.
+     *
      * @magentoDataFixture  Magento/Customer/_files/customer.php
      * @magentoDataFixture  Magento/Customer/_files/customer_address.php
      * @magentoDataFixture  Magento/Customer/_files/customer_two_addresses.php
@@ -144,6 +158,8 @@ public function testGetAddressById()
     }
 
     /**
+     * Test for method get address by id with incorrect id.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
      * @expectedExceptionMessage No such entity with addressId = 12345
@@ -154,6 +170,8 @@ public function testGetAddressByIdBadAddressId()
     }
 
     /**
+     * Test for method save new address.
+     *
      * @magentoDataFixture  Magento/Customer/_files/customer.php
      * @magentoDataFixture  Magento/Customer/_files/customer_address.php
      * @magentoAppIsolation enabled
@@ -174,6 +192,8 @@ public function testSaveNewAddress()
     }
 
     /**
+     * Test for saving address with invalid address.
+     *
      * @magentoDataFixture  Magento/Customer/_files/customer.php
      * @magentoDataFixture  Magento/Customer/_files/customer_address.php
      * @magentoAppIsolation enabled
@@ -199,6 +219,8 @@ public function testSaveNewAddressWithAttributes()
     }
 
     /**
+     * Test for method saaveNewAddress with new attributes.
+     *
      * @magentoDataFixture  Magento/Customer/_files/customer.php
      * @magentoDataFixture  Magento/Customer/_files/customer_address.php
      * @magentoAppIsolation enabled
@@ -222,6 +244,11 @@ public function testSaveNewInvalidAddress()
         }
     }
 
+    /**
+     * Test for saving address without existing customer.
+     *
+     * @return void
+     */
     public function testSaveAddressesCustomerIdNotExist()
     {
         $proposedAddress = $this->_createSecondAddress()->setCustomerId(4200);
@@ -233,6 +260,11 @@ public function testSaveAddressesCustomerIdNotExist()
         }
     }
 
+    /**
+     * Test for saving addresses with invalid customer id.
+     *
+     * @return void
+     */
     public function testSaveAddressesCustomerIdInvalid()
     {
         $proposedAddress = $this->_createSecondAddress()->setCustomerId('this_is_not_a_valid_id');
@@ -245,6 +277,8 @@ public function testSaveAddressesCustomerIdInvalid()
     }
 
     /**
+     * Test for deleteAddressById.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_address.php
      */
@@ -268,6 +302,8 @@ public function testDeleteAddress()
     }
 
     /**
+     * Test for delete method.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_address.php
      */
@@ -291,6 +327,8 @@ public function testDeleteAddressById()
     }
 
     /**
+     * Test delete address from customer with incorrect address id.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer.php
      */
     public function testDeleteAddressFromCustomerBadAddressId()
@@ -304,10 +342,14 @@ public function testDeleteAddressFromCustomerBadAddressId()
     }
 
     /**
+     * Test for searching addressed.
+     *
      * @param \Magento\Framework\Api\Filter[] $filters
-     * @param \Magento\Framework\Api\Filter[] $filterGroup
-     * @param \Magento\Framework\Api\SortOrder[] $filterOrders
+     * @param \Magento\Framework\Api\Filter[]|null $filterGroup
+     * @param \Magento\Framework\Api\SortOrder[]|null $filterOrders
      * @param array $expectedResult array of expected results indexed by ID
+     * @param int $currentPage current page for search criteria
+     * @return void
      *
      * @dataProvider searchAddressDataProvider
      *
@@ -315,8 +357,13 @@ public function testDeleteAddressFromCustomerBadAddressId()
      * @magentoDataFixture  Magento/Customer/_files/customer_two_addresses.php
      * @magentoAppIsolation enabled
      */
-    public function testSearchAddresses($filters, $filterGroup, $filterOrders, $expectedResult)
-    {
+    public function testSearchAddresses(
+        array $filters,
+        $filterGroup,
+        $filterOrders,
+        array $expectedResult,
+        int $currentPage
+    ) {
         /** @var \Magento\Framework\Api\SearchCriteriaBuilder $searchBuilder */
         $searchBuilder = $this->objectManager->create(\Magento\Framework\Api\SearchCriteriaBuilder::class);
         foreach ($filters as $filter) {
@@ -332,7 +379,7 @@ public function testSearchAddresses($filters, $filterGroup, $filterOrders, $expe
         }
 
         $searchBuilder->setPageSize(1);
-        $searchBuilder->setCurrentPage(2);
+        $searchBuilder->setCurrentPage($currentPage);
 
         $searchCriteria = $searchBuilder->create();
         $searchResults = $this->repository->getList($searchCriteria);
@@ -350,7 +397,12 @@ public function testSearchAddresses($filters, $filterGroup, $filterOrders, $expe
         $this->assertEquals($expectedResult[$expectedResultIndex]['firstname'], $items[0]->getFirstname());
     }
 
-    public function searchAddressDataProvider()
+    /**
+     * Data provider for searchAddresses.
+     *
+     * @return array
+     */
+    public function searchAddressDataProvider(): array
     {
         /**
          * @var \Magento\Framework\Api\FilterBuilder $filterBuilder
@@ -365,23 +417,25 @@ public function searchAddressDataProvider()
         return [
             'Address with postcode 75477' => [
                 [$filterBuilder->setField('postcode')->setValue('75477')->create()],
-                null,
+                [],
                 null,
                 [
                     ['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
                 ],
+                1,
             ],
             'Address with city CityM' => [
                 [$filterBuilder->setField('city')->setValue('CityM')->create()],
-                null,
+                [],
                 null,
                 [
                     ['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
                 ],
+                1,
             ],
             'Addresses with firstname John sorted by firstname desc, city asc' => [
                 [$filterBuilder->setField('firstname')->setValue('John')->create()],
-                null,
+                [],
                 [
                     $orderBuilder->setField('firstname')->setDirection(SortOrder::SORT_DESC)->create(),
                     $orderBuilder->setField('city')->setDirection(SortOrder::SORT_ASC)->create(),
@@ -390,6 +444,7 @@ public function searchAddressDataProvider()
                     ['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
                     ['id' => 2, 'city' => 'CityX', 'postcode' => 47676, 'firstname' => 'John'],
                 ],
+                2,
             ],
             'Addresses with postcode of either 75477 or 47676 sorted by city desc' => [
                 [],
@@ -404,10 +459,11 @@ public function searchAddressDataProvider()
                     ['id' => 2, 'city' => 'CityX', 'postcode' => 47676, 'firstname' => 'John'],
                     ['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
                 ],
+                2,
             ],
             'Addresses with postcode greater than 0 sorted by firstname asc, postcode desc' => [
                 [$filterBuilder->setField('postcode')->setValue('0')->setConditionType('gt')->create()],
-                null,
+                [],
                 [
                     $orderBuilder->setField('firstname')->setDirection(SortOrder::SORT_ASC)->create(),
                     $orderBuilder->setField('postcode')->setDirection(SortOrder::SORT_ASC)->create(),
@@ -416,11 +472,14 @@ public function searchAddressDataProvider()
                     ['id' => 2, 'city' => 'CityX', 'postcode' => 47676, 'firstname' => 'John'],
                     ['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
                 ],
+                2,
             ],
         ];
     }
 
     /**
+     * Test for save addresses with restricted countries.
+     *
      * @magentoDataFixture Magento/Customer/Fixtures/customer_sec_website.php
      */
     public function testSaveAddressWithRestrictedCountries()
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Grid/CollectionReindexOnAccountLockTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Grid/CollectionReindexOnAccountLockTest.php
new file mode 100644
index 0000000000000..3f3884464763e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Grid/CollectionReindexOnAccountLockTest.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Model\ResourceModel\Grid;
+
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\Exception\InvalidEmailOrPasswordException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Indexer\TestCase;
+use Magento\Tests\NamingConvention\true\mixed;
+
+/**
+ * Test if customer account lock on too many failed authentication attempts triggers customer grid reindex
+ *
+ * @SuppressWarnings(PHPMD)
+ */
+class CollectionReindexOnAccountLockTest extends TestCase
+{
+    /**
+     * Trigger customer account lock by making 10 failed authentication attempts
+     */
+    private function lockCustomerAccountWithInvalidAuthentications()
+    {
+        /** @var AccountManagementInterface */
+        $accountManagement = Bootstrap::getObjectManager()->create(AccountManagementInterface::class);
+
+        for ($i = 0; $i < 10; $i++) {
+            try {
+                $accountManagement->authenticate('customer@example.com', 'wrongPassword');
+                // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
+            } catch (InvalidEmailOrPasswordException $e) {
+            }
+        }
+    }
+
+    /**
+     * @return mixed
+     * @throws NoSuchEntityException
+     */
+    private function getCustomerLockExpire()
+    {
+        /** @var CustomerRegistry $customerRegistry */
+        $customerRegistry = Bootstrap::getObjectManager()->create(CustomerRegistry::class);
+        $customerModel = $customerRegistry->retrieve(1);
+        $this->assertNotEmpty($customerModel);
+
+        return $customerModel->getData('lock_expires');
+    }
+
+    /**
+     * @return mixed
+     */
+    private function getCustomerGridLockExpire()
+    {
+        /** @var Collection */
+        $gridCustomerCollection = Bootstrap::getObjectManager()->create(Collection::class);
+        $gridCustomerItem = $gridCustomerCollection->getItemById(1);
+        $this->assertNotEmpty($gridCustomerItem);
+
+        return $gridCustomerItem->getData('lock_expires');
+    }
+
+    /**
+     * Test if customer account lock on too many failed authentication attempts triggers customer grid reindex
+     *
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation disabled
+     */
+    public function testCustomerAccountReindexOnLock()
+    {
+        $this->assertSame(
+            $this->getCustomerGridLockExpire(),
+            $this->getCustomerLockExpire()
+        );
+
+        $this->lockCustomerAccountWithInvalidAuthentications();
+
+        $this->assertSame(
+            $this->getCustomerGridLockExpire(),
+            $this->getCustomerLockExpire()
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable.php
new file mode 100644
index 0000000000000..7d4e451db514b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$mutableScopeConfig = $objectManager->create(MutableScopeConfigInterface::class);
+
+$mutableScopeConfig->setValue(
+    'customer/create_account/confirm',
+    0,
+    ScopeInterface::SCOPE_WEBSITES,
+    null
+);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable_rollback.php
new file mode 100644
index 0000000000000..36743b4a20e9a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable_rollback.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Config\Model\ResourceModel\Config;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var Config $config */
+$config = Bootstrap::getObjectManager()->create(Config::class);
+$config->deleteConfig('customer/create_account/confirm');
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable.php
new file mode 100644
index 0000000000000..c8deb7ec2a536
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$mutableScopeConfig = $objectManager->create(MutableScopeConfigInterface::class);
+
+$mutableScopeConfig->setValue(
+    'customer/create_account/confirm',
+    1,
+    ScopeInterface::SCOPE_WEBSITES,
+    null
+);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable_rollback.php
new file mode 100644
index 0000000000000..36743b4a20e9a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable_rollback.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Config\Model\ResourceModel\Config;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var Config $config */
+$config = Bootstrap::getObjectManager()->create(Config::class);
+$config->deleteConfig('customer/create_account/confirm');
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars.php
new file mode 100644
index 0000000000000..c4f046bac57a6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\Customer;
+use Magento\TestFramework\Helper\Bootstrap;
+
+include __DIR__ . '/customer_confirmation_config_enable.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Customer $customer */
+$customer = $objectManager->create(Customer::class);
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->create(CustomerRepositoryInterface::class);
+/** @var CustomerInterface $customerInterface */
+$customerInterface = $objectManager->create(CustomerInterface::class);
+
+$customerInterface->setWebsiteId(1)
+    ->setEmail('customer+confirmation@example.com')
+    ->setConfirmation($customer->getRandomConfirmationKey())
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setFirstname('John')
+    ->setLastname('Smith')
+    ->setDefaultBilling(1)
+    ->setDefaultShipping(1)
+    ->setTaxvat('12')
+    ->setGender(0);
+
+$customerRepository->save($customerInterface, 'password');
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars_rollback.php
new file mode 100644
index 0000000000000..7a0ebf74ed8a0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars_rollback.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+include __DIR__ . '/customer_confirmation_config_enable_rollback.php';
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = Bootstrap::getObjectManager()->create(CustomerRepositoryInterface::class);
+
+try {
+    $customer = $customerRepository->get('customer+confirmation@example.com');
+    $customerRepository->delete($customer);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    // Customer with the specified email does not exist
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses.php
new file mode 100644
index 0000000000000..a07010249319c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Customer;
+use Magento\Customer\Model\Address;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Model\AddressRegistry;
+
+$objectManager = Bootstrap::getObjectManager();
+//Creating customer
+/** @var $repository CustomerRepositoryInterface */
+$repository = $objectManager->create(CustomerRepositoryInterface::class);
+/** @var Customer $customer */
+$customer = $objectManager->create(Customer::class);
+/** @var CustomerRegistry $customerRegistry */
+$customerRegistry = $objectManager->get(CustomerRegistry::class);
+$customer->setWebsiteId(1)
+    ->setEmail('customer_with_addresses@test.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setPrefix('Mr.')
+    ->setFirstname('John')
+    ->setMiddlename('A')
+    ->setLastname('Smith')
+    ->setSuffix('Esq.')
+    ->setDefaultBilling(1)
+    ->setDefaultShipping(1)
+    ->setTaxvat('12')
+    ->setGender(0);
+
+$customer->isObjectNew(true);
+$customer->save();
+$customerRegistry->remove($customer->getId());
+
+//Creating address
+/** @var Address $customerAddress */
+$customerAddress = $objectManager->create(Address::class);
+$customerAddress->isObjectNew(true);
+$customerAddress->setData(
+    [
+        'attribute_set_id' => 2,
+        'telephone' => 3468676,
+        'postcode' => 75477,
+        'country_id' => 'US',
+        'city' => 'CityM',
+        'company' => 'CompanyName',
+        'street' => 'CustomerAddress1',
+        'lastname' => 'Smith',
+        'firstname' => 'John',
+        'parent_id' => $customer->getId(),
+        'region_id' => 1,
+    ]
+);
+$customerAddress->save();
+/** @var AddressRepositoryInterface $addressRepository */
+$addressRepository = $objectManager->get(AddressRepositoryInterface::class);
+$customerAddress = $addressRepository->getById($customerAddress->getId());
+$customerAddress->setCustomerId($customer->getId());
+$customerAddress->isDefaultBilling(true);
+$customerAddress->setIsDefaultShipping(true);
+$customerAddress = $addressRepository->save($customerAddress);
+$customerRegistry->remove($customerAddress->getCustomerId());
+/** @var AddressRegistry $addressRegistry */
+$addressRegistry = $objectManager->get(AddressRegistry::class);
+$addressRegistry->remove($customerAddress->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses_rollback.php
new file mode 100644
index 0000000000000..c3acf62cddefa
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_addresses_rollback.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var CustomerRepositoryInterface $customerRepo */
+$customerRepo = $objectManager->get(CustomerRepositoryInterface::class);
+try {
+    $customer = $customerRepo->get('customer_with_addresses@test.com');
+    $customerRepo->delete($customer);
+} catch (NoSuchEntityException $exception) {
+    //Already deleted
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/two_customers_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/two_customers_rollback.php
new file mode 100644
index 0000000000000..cde7569cc2467
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/two_customers_rollback.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require 'customer_rollback.php';
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
+try {
+    $customer = $customerRepository->get('customer_two@example.com');
+    $customerRepository->delete($customer);
+} catch (NoSuchEntityException $e) {
+    /** Tests which are wrapped with MySQL transaction clear all data by transaction rollback. */
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Deploy/Console/Command/SetModeCommandTest.php b/dev/tests/integration/testsuite/Magento/Deploy/Console/Command/SetModeCommandTest.php
new file mode 100644
index 0000000000000..687c80cc952af
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Deploy/Console/Command/SetModeCommandTest.php
@@ -0,0 +1,203 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Deploy\Console\Command;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Console\Cli;
+use Magento\Framework\Filesystem;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\State;
+use Symfony\Component\Console\Tester\CommandTester;
+use Magento\Deploy\Console\ConsoleLogger;
+use Magento\Deploy\Console\ConsoleLoggerFactory;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\App\DeploymentConfig\FileReader;
+use Magento\Framework\App\DeploymentConfig\Writer;
+
+/**
+ * Tests working status of deploy:mode:set command.
+ *
+ * {@inheritdoc}
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
+ */
+class SetModeCommandTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var CommandTester
+     */
+    private $commandTester;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var string
+     */
+    private $prevMode;
+
+    /**
+     * @var FileReader
+     */
+    private $reader;
+
+    /**
+     * @var Writer
+     */
+    private $writer;
+
+    /**
+     * @var array
+     */
+    private $config;
+
+    /**
+     * @var array
+     */
+    private $envConfig;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->reader = $this->objectManager->get(FileReader::class);
+        $this->writer = $this->objectManager->get(Writer::class);
+        $this->prevMode = $this->objectManager->get(State::class)->getMode();
+        $this->filesystem = $this->objectManager->get(Filesystem::class);
+
+        // Load the original config to restore it on teardown
+        $this->config = $this->reader->load(ConfigFilePool::APP_CONFIG);
+        $this->envConfig = $this->reader->load(ConfigFilePool::APP_ENV);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function tearDown()
+    {
+        // Restore the original config
+        $this->writer->saveConfig([ConfigFilePool::APP_CONFIG => $this->config]);
+        $this->writer->saveConfig([ConfigFilePool::APP_ENV => $this->envConfig]);
+
+        $this->clearStaticFiles();
+        // enable default mode
+        $this->commandTester = new CommandTester($this->getStaticContentDeployCommand());
+        $this->commandTester->execute(
+            ['mode' => 'default']
+        );
+        $commandOutput = $this->commandTester->getDisplay();
+        $this->assertEquals(Cli::RETURN_SUCCESS, $this->commandTester->getStatusCode());
+        $this->assertContains('Enabled default mode', $commandOutput);
+    }
+
+    /**
+     * Clear pub/static and var/view_preprocessed directories
+     *
+     * @return void
+     */
+    private function clearStaticFiles()
+    {
+        $this->filesystem->getDirectoryWrite(DirectoryList::PUB)->delete(DirectoryList::STATIC_VIEW);
+        $this->filesystem->getDirectoryWrite(DirectoryList::VAR_DIR)->delete(DirectoryList::TMP_MATERIALIZATION_DIR);
+    }
+
+    public function testSwitchMode()
+    {
+        if ($this->prevMode === 'production') {
+            //in production mode, so we have to switch to dev, then to production
+            $this->enableAndAssertDeveloperMode();
+            $this->enableAndAssertProductionMode();
+        } else {
+            //already in non production mode
+            $this->enableAndAssertProductionMode();
+        }
+    }
+
+    /**
+     * Enable production mode
+     *
+     * @return void
+     */
+    private function enableAndAssertProductionMode()
+    {
+        // Enable production mode
+        $this->commandTester = new CommandTester($this->getStaticContentDeployCommand());
+        $this->commandTester->execute(
+            ['mode' => 'production']
+        );
+        $commandOutput = $this->commandTester->getDisplay();
+
+        $this->assertEquals(Cli::RETURN_SUCCESS, $this->commandTester->getStatusCode(), $commandOutput);
+
+        $this->assertContains('Deployment of static content complete', $commandOutput);
+        $this->assertContains('Enabled production mode', $commandOutput);
+    }
+
+    /**
+     * Enable developer mode
+     *
+     * @return void
+     */
+    private function enableAndAssertDeveloperMode()
+    {
+        $this->commandTester = new CommandTester($this->getStaticContentDeployCommand());
+        $this->commandTester->execute(
+            ['mode' => 'developer']
+        );
+        $commandOutput = $this->commandTester->getDisplay();
+
+        $this->assertEquals(Cli::RETURN_SUCCESS, $this->commandTester->getStatusCode());
+        $this->assertContains('Enabled developer mode', $commandOutput);
+    }
+
+    /**
+     * Create SetModeCommand instance with mocked loggers
+     *
+     * @return SetModeCommand
+     */
+    private function getStaticContentDeployCommand()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $consoleLoggerFactoryMock = $this->getMockBuilder(ConsoleLoggerFactory::class)
+            ->setMethods(['getLogger'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $consoleLoggerFactoryMock
+            ->method('getLogger')
+            ->will($this->returnCallback(
+                function ($output) use ($objectManager) {
+                    return $objectManager->create(ConsoleLogger::class, ['output' => $output]);
+                }
+            ));
+        $objectManagerProviderMock = $this->getMockBuilder(ObjectManagerProvider::class)
+            ->setMethods(['get'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $objectManagerProviderMock
+            ->method('get')
+            ->willReturn(\Magento\TestFramework\Helper\Bootstrap::getObjectManager());
+        $deployStaticContentCommand = $objectManager->create(
+            SetModeCommand::class,
+            [
+                'consoleLoggerFactory' => $consoleLoggerFactoryMock,
+                'objectManagerProvider' => $objectManagerProviderMock
+            ]
+        );
+
+        return $deployStaticContentCommand;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php b/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php
index 3bef48d8801f7..f7a47017f8b18 100644
--- a/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php
+++ b/dev/tests/integration/testsuite/Magento/Developer/Model/Logger/Handler/DebugTest.php
@@ -5,34 +5,20 @@
  */
 namespace Magento\Developer\Model\Logger\Handler;
 
-use Magento\Config\Console\Command\ConfigSetCommand;
-use Magento\Framework\App\Config;
-use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Config\Setup\ConfigOptionsList;
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\State;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Framework\Logger\Monolog;
+use Magento\Framework\Shell;
+use Magento\Setup\Mvc\Bootstrap\InitParamListener;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Deploy\Model\Mode;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
+use Magento\TestFramework\ObjectManager;
 
 /**
- * Preconditions
- *  - Developer mode enabled
- *  - Log file isn't exists
- *  - 'Log to file' setting are enabled
- *
- * Test steps
- *  - Enable production mode without compilation
- *  - Try to log message into log file
- *  - Assert that log file isn't exists
- *  - Assert that 'Log to file' setting are disabled
- *
- *  - Enable 'Log to file' setting
- *  - Try to log message into debug file
- *  - Assert that log file is exists
- *  - Assert that log file contain logged message
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DebugTest extends \PHPUnit\Framework\TestCase
 {
@@ -42,127 +28,212 @@ class DebugTest extends \PHPUnit\Framework\TestCase
     private $logger;
 
     /**
-     * @var Mode
+     * @var WriteInterface
      */
-    private $mode;
+    private $etcDirectory;
 
     /**
-     * @var InputInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ObjectManager
      */
-    private $inputMock;
+    private $objectManager;
 
     /**
-     * @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var Shell
      */
-    private $outputMock;
+    private $shell;
 
     /**
-     * @var ConfigSetCommand
+     * @var DeploymentConfig
      */
-    private $configSetCommand;
+    private $deploymentConfig;
 
     /**
-     * @var WriteInterface
+     * @var string
      */
-    private $etcDirectory;
+    private $debugLogPath = '';
+
+    /**
+     * @var string
+     */
+    private static $backupFile = 'env.base.php';
+
+    /**
+     * @var string
+     */
+    private static $configFile = 'env.php';
 
     /**
-     * @var Config
+     * @var Debug
      */
-    private $appConfig;
+    private $debugHandler;
 
+    /**
+     * @inheritdoc
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \Exception
+     */
     public function setUp()
     {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->shell = $this->objectManager->get(Shell::class);
+        $this->logger = $this->objectManager->get(Monolog::class);
+        $this->deploymentConfig = $this->objectManager->get(DeploymentConfig::class);
+
         /** @var Filesystem $filesystem */
-        $filesystem = Bootstrap::getObjectManager()->create(Filesystem::class);
+        $filesystem = $this->objectManager->create(Filesystem::class);
         $this->etcDirectory = $filesystem->getDirectoryWrite(DirectoryList::CONFIG);
-        $this->etcDirectory->copyFile('env.php', 'env.base.php');
-
-        $this->inputMock = $this->getMockBuilder(InputInterface::class)
-            ->getMockForAbstractClass();
-        $this->outputMock = $this->getMockBuilder(OutputInterface::class)
-            ->getMockForAbstractClass();
-        $this->logger = Bootstrap::getObjectManager()->get(Monolog::class);
-        $this->mode = Bootstrap::getObjectManager()->create(
-            Mode::class,
-            [
-                'input' => $this->inputMock,
-                'output' => $this->outputMock
-            ]
-        );
-        $this->configSetCommand = Bootstrap::getObjectManager()->create(ConfigSetCommand::class);
-        $this->appConfig = Bootstrap::getObjectManager()->create(Config::class);
-
-        // Preconditions
-        $this->mode->enableDeveloperMode();
-        $this->enableDebugging();
-        if (file_exists($this->getDebuggerLogPath())) {
-            unlink($this->getDebuggerLogPath());
-        }
+        $this->etcDirectory->copyFile(self::$configFile, self::$backupFile);
     }
 
+    /**
+     * @inheritdoc
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
     public function tearDown()
     {
-        $this->etcDirectory->delete('env.php');
-        $this->etcDirectory->renameFile('env.base.php', 'env.php');
+        $this->reinitDeploymentConfig();
+        $this->etcDirectory->delete(self::$backupFile);
     }
 
-    private function enableDebugging()
+    /**
+     * @param bool $flag
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function enableDebugging(bool $flag)
     {
-        $this->inputMock = $this->getMockBuilder(InputInterface::class)
-            ->getMockForAbstractClass();
-        $this->outputMock = $this->getMockBuilder(OutputInterface::class)
-            ->getMockForAbstractClass();
-        $this->inputMock->expects($this->exactly(4))
-            ->method('getOption')
-            ->withConsecutive(
-                [ConfigSetCommand::OPTION_LOCK_ENV],
-                [ConfigSetCommand::OPTION_LOCK_CONFIG],
-                [ConfigSetCommand::OPTION_SCOPE],
-                [ConfigSetCommand::OPTION_SCOPE_CODE]
-            )
-            ->willReturnOnConsecutiveCalls(
-                true,
-                false,
-                ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
-                null
-            );
-        $this->inputMock->expects($this->exactly(2))
-            ->method('getArgument')
-            ->withConsecutive([ConfigSetCommand::ARG_PATH], [ConfigSetCommand::ARG_VALUE])
-            ->willReturnOnConsecutiveCalls('dev/debug/debug_logging', 1);
-        $this->outputMock->expects($this->once())
-            ->method('writeln')
-            ->with('<info>Value was saved in app/etc/env.php and locked.</info>');
-        $this->assertFalse((bool)$this->configSetCommand->run($this->inputMock, $this->outputMock));
+        $this->shell->execute(
+            PHP_BINARY . ' -f %s setup:config:set -n --%s=%s --%s=%s',
+            [
+                BP . '/bin/magento',
+                ConfigOptionsList::INPUT_KEY_DEBUG_LOGGING,
+                (int)$flag,
+                InitParamListener::BOOTSTRAP_PARAM,
+                urldecode(http_build_query(Bootstrap::getInstance()->getAppInitParams())),
+            ]
+        );
+        $this->deploymentConfig->resetData();
+        $this->assertSame((int)$flag, $this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_DEBUG_LOGGING));
     }
 
+    /**
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function testDebugInProductionMode()
     {
         $message = 'test message';
+        $this->reinitDebugHandler(State::MODE_PRODUCTION);
 
-        $this->mode->enableProductionModeMinimal();
+        $this->removeDebugLog();
         $this->logger->debug($message);
         $this->assertFileNotExists($this->getDebuggerLogPath());
-        $this->assertFalse((bool)$this->appConfig->getValue('dev/debug/debug_logging'));
+        $this->assertNull($this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_DEBUG_LOGGING));
 
-        $this->enableDebugging();
-        $this->logger->debug($message);
+        $this->checkCommonFlow($message);
+        $this->reinitDeploymentConfig();
+    }
+
+    /**
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function testDebugInDeveloperMode()
+    {
+        $message = 'test message';
+        $this->reinitDebugHandler(State::MODE_DEVELOPER);
 
+        $this->removeDebugLog();
+        $this->logger->debug($message);
         $this->assertFileExists($this->getDebuggerLogPath());
         $this->assertContains($message, file_get_contents($this->getDebuggerLogPath()));
+        $this->assertNull($this->deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_DEBUG_LOGGING));
+
+        $this->checkCommonFlow($message);
+        $this->reinitDeploymentConfig();
     }
 
     /**
-     * @return bool|string
+     * @return string
      */
     private function getDebuggerLogPath()
     {
-        foreach ($this->logger->getHandlers() as $handler) {
-            if ($handler instanceof Debug) {
-                return $handler->getUrl();
+        if (!$this->debugLogPath) {
+            foreach ($this->logger->getHandlers() as $handler) {
+                if ($handler instanceof Debug) {
+                    $this->debugLogPath = $handler->getUrl();
+                }
             }
         }
-        return false;
+
+        return $this->debugLogPath;
+    }
+
+    /**
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    private function reinitDeploymentConfig()
+    {
+        $this->etcDirectory->delete(self::$configFile);
+        $this->etcDirectory->copyFile(self::$backupFile, self::$configFile);
+    }
+
+    /**
+     * @param string $instanceMode
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function reinitDebugHandler(string $instanceMode)
+    {
+        $this->debugHandler = $this->objectManager->create(
+            Debug::class,
+            [
+                'filePath' => Bootstrap::getInstance()->getAppTempDir(),
+                'state' => $this->objectManager->create(
+                    State::class,
+                    [
+                        'mode' => $instanceMode,
+                    ]
+                ),
+            ]
+        );
+        $this->logger->setHandlers(
+            [
+                $this->debugHandler,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    private function detachLogger()
+    {
+        $this->debugHandler->close();
+    }
+
+    /**
+     * @return void
+     */
+    private function removeDebugLog()
+    {
+        $this->detachLogger();
+        if (file_exists($this->getDebuggerLogPath())) {
+            unlink($this->getDebuggerLogPath());
+        }
+    }
+
+    /**
+     * @param string $message
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function checkCommonFlow(string $message)
+    {
+        $this->enableDebugging(true);
+        $this->removeDebugLog();
+        $this->logger->debug($message);
+        $this->assertFileExists($this->getDebuggerLogPath());
+        $this->assertContains($message, file_get_contents($this->getDebuggerLogPath()));
+
+        $this->enableDebugging(false);
+        $this->removeDebugLog();
+        $this->logger->debug($message);
+        $this->assertFileNotExists($this->getDebuggerLogPath());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php b/dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php
new file mode 100644
index 0000000000000..dd1f917e34d5e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php
@@ -0,0 +1,252 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Dhl\Model;
+
+use Magento\Framework\HTTP\ZendClient;
+use Magento\Framework\HTTP\ZendClientFactory;
+use Magento\Framework\Simplexml\Element;
+use Magento\Shipping\Model\Tracking\Result\Status;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Test DHL Shipping Method.
+ */
+class CarrierTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Carrier
+     */
+    private $dhlCarrier;
+
+    /**
+     * @var ZendClient|MockObject
+     */
+    private $httpClientMock;
+
+    /**
+     * @var \Zend_Http_Response|MockObject
+     */
+    private $httpResponseMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->dhlCarrier = $objectManager->create(
+            Carrier::class,
+            ['httpClientFactory' => $this->getHttpClientFactory()]
+        );
+    }
+
+    /**
+     * @magentoDbIsolation enabled
+     *
+     * @magentoConfigFixture default_store carriers/dhl/id CustomerSiteID
+     * @magentoConfigFixture default_store carriers/dhl/password CustomerPassword
+     *
+     * @param array $trackingNumbers
+     * @param string $responseXml
+     * @param array $expectedTrackingData
+     * @param string $expectedRequestXml
+     * @dataProvider getTrackingDataProvider
+     *
+     * @return void
+     */
+    public function testGetTracking(
+        array $trackingNumbers,
+        string $responseXml,
+        array $expectedTrackingData,
+        string $expectedRequestXml = ''
+    ) {
+        $this->httpResponseMock->method('getBody')
+            ->willReturn($responseXml);
+        $trackingResult = $this->dhlCarrier->getTracking($trackingNumbers);
+        $this->assertTrackingResult($expectedTrackingData, $trackingResult->getAllTrackings());
+        if ($expectedRequestXml !== '') {
+            $method = new \ReflectionMethod($this->httpClientMock, '_prepareBody');
+            $method->setAccessible(true);
+            $requestXml = $method->invoke($this->httpClientMock);
+            $this->assertRequest($expectedRequestXml, $requestXml);
+        }
+    }
+
+    /**
+     * Get tracking data provider.
+     *
+     * @return array
+     */
+    public function getTrackingDataProvider(): array
+    {
+        $expectedMultiAWBRequestXml = file_get_contents(__DIR__ . '/../_files/TrackingRequest_MultipleAWB.xml');
+        $multiAWBResponseXml = file_get_contents(__DIR__ . '/../_files/TrackingResponse_MultipleAWB.xml');
+        $expectedSingleAWBRequestXml = file_get_contents(__DIR__ . '/../_files/TrackingRequest_SingleAWB.xml');
+        $singleAWBResponseXml = file_get_contents(__DIR__ . '/../_files/TrackingResponse_SingleAWB.xml');
+        $singleNoDataResponseXml = file_get_contents(__DIR__ . '/../_files/SingleknownTrackResponse-no-data-found.xml');
+        $failedResponseXml = file_get_contents(__DIR__ . '/../_files/Track-res-XML-Parse-Err.xml');
+        $expectedTrackingDataA = [
+            'carrier' => 'dhl',
+            'carrier_title' => 'DHL',
+            'tracking' => 4781584780,
+            'service' => 'DOCUMENT',
+            'progressdetail' => [
+                [
+                    'activity' => 'SD Shipment information received',
+                    'deliverydate' => '2017-12-25',
+                    'deliverytime' => '14:38:00',
+                    'deliverylocation' => 'BEIJING-CHN [PEK]',
+                ],
+            ],
+            'weight' => '0.5 K',
+        ];
+        $expectedTrackingDataB = [
+            'carrier' => 'dhl',
+            'carrier_title' => 'DHL',
+            'tracking' => 4781585060,
+            'service' => 'NOT RESTRICTED FOR TRANSPORT,',
+            'progressdetail' => [
+                [
+                    'activity' => 'SD Shipment information received',
+                    'deliverydate' => '2017-12-24',
+                    'deliverytime' => '13:35:00',
+                    'deliverylocation' => 'HONG KONG-HKG [HKG]',
+                ],
+            ],
+            'weight' => '2.0 K',
+        ];
+        $expectedTrackingDataC = [
+            'carrier' => 'dhl',
+            'carrier_title' => 'DHL',
+            'tracking' => 5702254250,
+            'service' => 'CD',
+            'progressdetail' => [
+                [
+                    'activity' => 'SD Shipment information received',
+                    'deliverydate' => '2017-12-24',
+                    'deliverytime' => '04:12:00',
+                    'deliverylocation' => 'BIRMINGHAM-GBR [BHX]',
+                ],
+            ],
+            'weight' => '0.12 K',
+        ];
+        $expectedTrackingDataD = [
+            'carrier' => 'dhl',
+            'carrier_title' => 'DHL',
+            'tracking' => 4781585060,
+            'error_message' => __('Unable to retrieve tracking'),
+        ];
+        $expectedTrackingDataE = [
+            'carrier' => 'dhl',
+            'carrier_title' => 'DHL',
+            'tracking' => 111,
+            'error_message' => __(
+                'Error #%1 : %2',
+                '111',
+                ' Error Parsing incoming request XML
+                    Error: The content of element type
+                    "ShipperReference" must match
+                    "(ReferenceID,ReferenceType?)". at line
+                    16, column 22'
+            ),
+        ];
+
+        return [
+            'multi-AWB' => [
+                ['4781584780', '4781585060', '5702254250'],
+                $multiAWBResponseXml,
+                [$expectedTrackingDataA, $expectedTrackingDataB, $expectedTrackingDataC],
+                $expectedMultiAWBRequestXml,
+            ],
+            'single-AWB' => [
+                ['4781585060'],
+                $singleAWBResponseXml,
+                [$expectedTrackingDataB],
+                $expectedSingleAWBRequestXml,
+            ],
+            'single-AWB-no-data' => [
+                ['4781585061'],
+                $singleNoDataResponseXml,
+                [$expectedTrackingDataD],
+            ],
+            'failed-response' => [
+                ['4781585060-failed'],
+                $failedResponseXml,
+                [$expectedTrackingDataE],
+            ],
+        ];
+    }
+
+    /**
+     * Get mocked Http Client Factory.
+     *
+     * @return MockObject
+     */
+    private function getHttpClientFactory(): MockObject
+    {
+        $this->httpResponseMock = $this->getMockBuilder(\Zend_Http_Response::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->httpClientMock = $this->getMockBuilder(ZendClient::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['request'])
+            ->getMock();
+        $this->httpClientMock->method('request')
+            ->willReturn($this->httpResponseMock);
+        /** @var ZendClientFactory|MockObject $httpClientFactoryMock */
+        $httpClientFactoryMock = $this->getMockBuilder(ZendClientFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $httpClientFactoryMock->method('create')
+            ->willReturn($this->httpClientMock);
+
+        return $httpClientFactoryMock;
+    }
+
+    /**
+     * Assert request.
+     *
+     * @param string $expectedRequestXml
+     * @param string $requestXml
+     *
+     * @return void
+     */
+    private function assertRequest(string $expectedRequestXml, string $requestXml)
+    {
+        $expectedRequestElement = new Element($expectedRequestXml);
+        $requestElement = new Element($requestXml);
+        $requestMessageTime = $requestElement->Request->ServiceHeader->MessageTime->__toString();
+        $this->assertRegexp(
+            "/\d{4}\-\d{2}\-\d{2}T\d{2}\:\d{2}\:\d{2}\+\d{2}\:\d{2}/",
+            $requestMessageTime
+        );
+        $expectedRequestElement->Request->ServiceHeader->MessageTime = $requestMessageTime;
+        $messageReference = $requestElement->Request->ServiceHeader->MessageReference->__toString();
+        $this->assertStringStartsWith('MAGE_TRCK_', $messageReference);
+        $this->assertGreaterThanOrEqual(28, strlen($messageReference));
+        $this->assertLessThanOrEqual(32, strlen($messageReference));
+        $requestElement->Request->ServiceHeader->MessageReference = 'MAGE_TRCK_28TO32_Char_CHECKED';
+        $this->assertXmlStringEqualsXmlString($expectedRequestElement->asXML(), $requestElement->asXML());
+    }
+
+    /**
+     * Assert tracking.
+     *
+     * @param array|null $expectedTrackingData
+     * @param Status[]|null $trackingResults
+     *
+     * @return void
+     */
+    private function assertTrackingResult($expectedTrackingData, $trackingResults)
+    {
+        $ctr = 0;
+        foreach ($trackingResults as $trackingResult) {
+            $this->assertEquals($expectedTrackingData[$ctr++], $trackingResult->getData());
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/SingleknownTrackResponse-no-data-found.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/SingleknownTrackResponse-no-data-found.xml
new file mode 100644
index 0000000000000..80e7b42e4c534
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/SingleknownTrackResponse-no-data-found.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<req:TrackingResponse xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com TrackingResponse.xsd">
+    <Response>
+        <ServiceHeader>
+            <MessageTime>2018-02-27T12:59:34+01:00</MessageTime>
+            <MessageReference>1234567890123456789012345678</MessageReference>
+            <SiteID>CustomerSiteID</SiteID>
+        </ServiceHeader>
+    </Response>
+    <AWBInfo>
+        <AWBNumber>4781585060</AWBNumber>
+        <Status>
+            <ActionStatus>No Shipments Found</ActionStatus>
+            <Condition>
+                <ConditionCode>209</ConditionCode>
+                <ConditionData>No Shipments Found for AWBNumber 6017300993</ConditionData>
+            </Condition>
+        </Status>
+    </AWBInfo>
+    <LanguageCode>String</LanguageCode>
+</req:TrackingResponse>
+        <!-- ServiceInvocationId:20180227125934_5793_74fbd9e1-a8b0-4f6a-a326-26aae979e5f0 -->
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/Track-res-XML-Parse-Err.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/Track-res-XML-Parse-Err.xml
new file mode 100644
index 0000000000000..a3b4729fb21ae
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/Track-res-XML-Parse-Err.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<req:ShipmentTrackingErrorResponse xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com track-err-res.xsd">
+    <Response>
+        <ServiceHeader>
+            <MessageTime>2018-02-27T12:55:05+01:00</MessageTime>
+        </ServiceHeader>
+        <Status>
+            <ActionStatus>Failure</ActionStatus>
+            <Condition>
+                <ConditionCode>111</ConditionCode>
+                <ConditionData> Error Parsing incoming request XML
+                    Error: The content of element type
+                    &quot;ShipperReference&quot; must match
+                    &quot;(ReferenceID,ReferenceType?)&quot;. at line
+                    16, column 22</ConditionData>
+            </Condition>
+        </Status>
+    </Response>
+</req:ShipmentTrackingErrorResponse>
+        <!-- ServiceInvocationId:20180227125505_5793_2008671c-9292-4790-87b6-b02ccdf913db -->
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_MultipleAWB.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_MultipleAWB.xml
new file mode 100644
index 0000000000000..fefadf2d4ebde
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_MultipleAWB.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<req:KnownTrackingRequest xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com TrackingRequestKnown-1.0.xsd" schemaVersion="1.0">
+    <Request>
+        <ServiceHeader>
+            <MessageTime>2002-06-25T11:28:56-08:00</MessageTime>
+            <MessageReference>MAGE_TRCK_28TO32_Char_CHECKED</MessageReference>
+            <SiteID>CustomerSiteID</SiteID>
+            <Password>CustomerPassword</Password>
+        </ServiceHeader>
+    </Request>
+    <LanguageCode>EN</LanguageCode>
+    <AWBNumber>4781584780</AWBNumber>
+    <AWBNumber>4781585060</AWBNumber>
+    <AWBNumber>5702254250</AWBNumber>
+    <LevelOfDetails>ALL_CHECK_POINTS</LevelOfDetails>
+</req:KnownTrackingRequest>
+
+
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_SingleAWB.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_SingleAWB.xml
new file mode 100644
index 0000000000000..e9968e1464906
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_SingleAWB.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<req:KnownTrackingRequest xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com TrackingRequestKnown-1.0.xsd" schemaVersion="1.0">
+    <Request>
+        <ServiceHeader>
+            <MessageTime>2002-06-25T11:28:56-08:00</MessageTime>
+            <MessageReference>MAGE_TRCK_28TO32_Char_CHECKED</MessageReference>
+            <SiteID>CustomerSiteID</SiteID>
+            <Password>CustomerPassword</Password>
+        </ServiceHeader>
+    </Request>
+    <LanguageCode>EN</LanguageCode>
+    <AWBNumber>4781585060</AWBNumber>
+    <LevelOfDetails>ALL_CHECK_POINTS</LevelOfDetails>
+</req:KnownTrackingRequest>
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_MultipleAWB.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_MultipleAWB.xml
new file mode 100644
index 0000000000000..618bbb4de8e78
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_MultipleAWB.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<req:TrackingResponse xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com TrackingResponse.xsd">
+    <Response>
+        <ServiceHeader>
+            <MessageTime>2018-02-27T12:43:44+01:00</MessageTime>
+            <MessageReference>1234567890123456789012345678</MessageReference>
+            <SiteID>CustomerSiteID</SiteID>
+        </ServiceHeader>
+    </Response>
+    <AWBInfo>
+        <AWBNumber>4781584780</AWBNumber>
+        <Status>
+            <ActionStatus>success</ActionStatus>
+        </Status>
+        <ShipmentInfo>
+            <OriginServiceArea>
+                <ServiceAreaCode>PEK</ServiceAreaCode>
+                <Description>BEIJING-CHN</Description>
+            </OriginServiceArea>
+            <DestinationServiceArea>
+                <ServiceAreaCode>PHL</ServiceAreaCode>
+                <Description>WEST PHILADELPHIA,PA-USA</Description>
+            </DestinationServiceArea>
+            <ShipperName>THE EXP HIGH SCH ATT TO BNU</ShipperName>
+            <ShipperAccountNumber>123456789</ShipperAccountNumber>
+            <ConsigneeName>HAVEFORD COLLEGE</ConsigneeName>
+            <ShipmentDate>2017-12-25T14:38:00</ShipmentDate>
+            <Pieces>1</Pieces>
+            <Weight>0.5</Weight>
+            <WeightUnit>K</WeightUnit>
+            <GlobalProductCode>D</GlobalProductCode>
+            <ShipmentDesc>DOCUMENT</ShipmentDesc>
+            <DlvyNotificationFlag>Y</DlvyNotificationFlag>
+            <Shipper>
+                <City>BEIJING</City>
+                <PostalCode>100032</PostalCode>
+                <CountryCode>CN</CountryCode>
+            </Shipper>
+            <Consignee>
+                <City>HAVERFORD</City>
+                <DivisionCode>PA</DivisionCode>
+                <PostalCode>19041</PostalCode>
+                <CountryCode>US</CountryCode>
+            </Consignee>
+            <ShipperReference>
+                <ReferenceID>2469</ReferenceID>
+            </ShipperReference>
+            <ShipmentEvent>
+                <Date>2017-12-25</Date>
+                <Time>14:38:00</Time>
+                <ServiceEvent>
+                    <EventCode>SD</EventCode>
+                    <Description>Shipment information received</Description>
+                </ServiceEvent>
+                <Signatory/>
+                <ServiceArea>
+                    <ServiceAreaCode>PEK</ServiceAreaCode>
+                    <Description>BEIJING-CHN</Description>
+                </ServiceArea>
+            </ShipmentEvent>
+        </ShipmentInfo>
+    </AWBInfo>
+    <AWBInfo>
+        <AWBNumber>4781585060</AWBNumber>
+        <Status>
+            <ActionStatus>success</ActionStatus>
+        </Status>
+        <ShipmentInfo>
+            <OriginServiceArea>
+                <ServiceAreaCode>HKG</ServiceAreaCode>
+                <Description>HONG KONG-HKG</Description>
+            </OriginServiceArea>
+            <DestinationServiceArea>
+                <ServiceAreaCode>HKG</ServiceAreaCode>
+                <Description>HONG KONG-HKG</Description>
+            </DestinationServiceArea>
+            <ShipperName>NET-A-PORTER</ShipperName>
+            <ShipperAccountNumber>123456789</ShipperAccountNumber>
+            <ConsigneeName>NICOLE LI</ConsigneeName>
+            <ShipmentDate>2017-12-24T13:35:00</ShipmentDate>
+            <Pieces>1</Pieces>
+            <Weight>2.0</Weight>
+            <WeightUnit>K</WeightUnit>
+            <GlobalProductCode>N</GlobalProductCode>
+            <ShipmentDesc>NOT RESTRICTED FOR TRANSPORT,</ShipmentDesc>
+            <DlvyNotificationFlag>Y</DlvyNotificationFlag>
+            <Shipper>
+                <City>HONG KONG</City>
+                <CountryCode>HK</CountryCode>
+            </Shipper>
+            <Consignee>
+                <City>HONG KONG</City>
+                <DivisionCode>CH</DivisionCode>
+                <CountryCode>HK</CountryCode>
+            </Consignee>
+            <ShipperReference>
+                <ReferenceID>1060571</ReferenceID>
+            </ShipperReference>
+            <ShipmentEvent>
+                <Date>2017-12-24</Date>
+                <Time>13:35:00</Time>
+                <ServiceEvent>
+                    <EventCode>SD</EventCode>
+                    <Description>Shipment information received</Description>
+                </ServiceEvent>
+                <Signatory/>
+                <ServiceArea>
+                    <ServiceAreaCode>HKG</ServiceAreaCode>
+                    <Description>HONG KONG-HKG</Description>
+                </ServiceArea>
+            </ShipmentEvent>
+        </ShipmentInfo>
+    </AWBInfo>
+    <AWBInfo>
+        <AWBNumber>5702254250</AWBNumber>
+        <Status>
+            <ActionStatus>success</ActionStatus>
+        </Status>
+        <ShipmentInfo>
+            <OriginServiceArea>
+                <ServiceAreaCode>BHX</ServiceAreaCode>
+                <Description>BIRMINGHAM-GBR</Description>
+            </OriginServiceArea>
+            <DestinationServiceArea>
+                <ServiceAreaCode>AOI</ServiceAreaCode>
+                <Description>ANCONA-ITA</Description>
+            </DestinationServiceArea>
+            <ShipperName>AMAZON EU SARL</ShipperName>
+            <ShipperAccountNumber>123456789</ShipperAccountNumber>
+            <ConsigneeName>MATTEO LOMBO</ConsigneeName>
+            <ShipmentDate>2017-12-24T04:12:00</ShipmentDate>
+            <Pieces>1</Pieces>
+            <Weight>0.12</Weight>
+            <WeightUnit>K</WeightUnit>
+            <GlobalProductCode>U</GlobalProductCode>
+            <ShipmentDesc>CD</ShipmentDesc>
+            <DlvyNotificationFlag>Y</DlvyNotificationFlag>
+            <Shipper>
+                <City>PETERBOROUGH</City>
+                <PostalCode>PE2 9EN</PostalCode>
+                <CountryCode>GB</CountryCode>
+            </Shipper>
+            <Consignee>
+                <City>ORTONA</City>
+                <PostalCode>66026</PostalCode>
+                <CountryCode>IT</CountryCode>
+            </Consignee>
+            <ShipperReference>
+                <ReferenceID>DGWYDy4xN_1</ReferenceID>
+            </ShipperReference>
+            <ShipmentEvent>
+                <Date>2017-12-24</Date>
+                <Time>04:12:00</Time>
+                <ServiceEvent>
+                    <EventCode>SD</EventCode>
+                    <Description>Shipment information received</Description>
+                </ServiceEvent>
+                <Signatory/>
+                <ServiceArea>
+                    <ServiceAreaCode>BHX</ServiceAreaCode>
+                    <Description>BIRMINGHAM-GBR</Description>
+                </ServiceArea>
+            </ShipmentEvent>
+        </ShipmentInfo>
+    </AWBInfo>
+    <LanguageCode>en</LanguageCode>
+</req:TrackingResponse>
+        <!-- ServiceInvocationId:20180227124344_5793_23bed3d9-e792-4955-8055-9472b1b41929 -->
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_SingleAWB.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_SingleAWB.xml
new file mode 100644
index 0000000000000..fa31b898b7a1f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_SingleAWB.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<req:TrackingResponse xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com TrackingResponse.xsd">
+    <Response>
+        <ServiceHeader>
+            <MessageTime>2018-02-27T12:27:42+01:00</MessageTime>
+            <MessageReference>1234567890123456789012345678</MessageReference>
+            <SiteID>CustomerSiteID</SiteID>
+        </ServiceHeader>
+    </Response>
+    <AWBInfo>
+        <AWBNumber>4781585060</AWBNumber>
+        <Status>
+            <ActionStatus>success</ActionStatus>
+        </Status>
+        <ShipmentInfo>
+            <OriginServiceArea>
+                <ServiceAreaCode>HKG</ServiceAreaCode>
+                <Description>HONG KONG-HKG</Description>
+            </OriginServiceArea>
+            <DestinationServiceArea>
+                <ServiceAreaCode>HKG</ServiceAreaCode>
+                <Description>HONG KONG-HKG</Description>
+            </DestinationServiceArea>
+            <ShipperName>NET-A-PORTER</ShipperName>
+            <ShipperAccountNumber>123456789</ShipperAccountNumber>
+            <ConsigneeName>NICOLE LI</ConsigneeName>
+            <ShipmentDate>2017-12-24T13:35:00</ShipmentDate>
+            <Pieces>1</Pieces>
+            <Weight>2.0</Weight>
+            <WeightUnit>K</WeightUnit>
+            <GlobalProductCode>N</GlobalProductCode>
+            <ShipmentDesc>NOT RESTRICTED FOR TRANSPORT,</ShipmentDesc>
+            <DlvyNotificationFlag>Y</DlvyNotificationFlag>
+            <Shipper>
+                <City>HONG KONG</City>
+                <CountryCode>HK</CountryCode>
+            </Shipper>
+            <Consignee>
+                <City>HONG KONG</City>
+                <DivisionCode>CH</DivisionCode>
+                <CountryCode>HK</CountryCode>
+            </Consignee>
+            <ShipperReference>
+                <ReferenceID>1060571</ReferenceID>
+            </ShipperReference>
+            <ShipmentEvent>
+                <Date>2017-12-24</Date>
+                <Time>13:35:00</Time>
+                <ServiceEvent>
+                    <EventCode>SD</EventCode>
+                    <Description>Shipment information received</Description>
+                </ServiceEvent>
+                <Signatory/>
+                <ServiceArea>
+                    <ServiceAreaCode>HKG</ServiceAreaCode>
+                    <Description>HONG KONG-HKG</Description>
+                </ServiceArea>
+            </ShipmentEvent>
+        </ShipmentInfo>
+    </AWBInfo>
+    <LanguageCode>en</LanguageCode>
+</req:TrackingResponse>
+        <!-- ServiceInvocationId:20180227122741_5793_e0f8c40e-5245-4737-ab31-323030366721 -->
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/CurrencyConfigTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/CurrencyConfigTest.php
index b620d9097b4be..10f2749ddace1 100644
--- a/dev/tests/integration/testsuite/Magento/Directory/Model/CurrencyConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Directory/Model/CurrencyConfigTest.php
@@ -56,7 +56,7 @@ protected function setUp()
     }
 
     /**
-     * Test get currency config for admin and storefront areas.
+     * Test get currency config for admin, crontab and storefront areas.
      *
      * @dataProvider getConfigCurrenciesDataProvider
      * @magentoDataFixture Magento/Store/_files/store.php
@@ -77,7 +77,7 @@ public function testGetConfigCurrencies(string $areaCode, array $expected)
         $storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
         $storeManager->setCurrentStore($store->getId());
 
-        if ($areaCode === Area::AREA_ADMINHTML) {
+        if (in_array($areaCode, [Area::AREA_ADMINHTML, Area::AREA_CRONTAB])) {
             self::assertEquals($expected['allowed'], $this->currency->getConfigAllowCurrencies());
             self::assertEquals($expected['base'], $this->currency->getConfigBaseCurrencies());
             self::assertEquals($expected['default'], $this->currency->getConfigDefaultCurrencies());
@@ -118,6 +118,14 @@ public function getConfigCurrenciesDataProvider()
                     'default' => ['BDT', 'USD'],
                 ],
             ],
+            [
+                'areaCode' => Area::AREA_CRONTAB,
+                'expected' => [
+                    'allowed' => ['BDT', 'BNS', 'BTD', 'EUR', 'USD'],
+                    'base' => ['BDT', 'USD'],
+                    'default' => ['BDT', 'USD'],
+                ],
+            ],
             [
                 'areaCode' => Area::AREA_FRONTEND,
                 'expected' => [
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 a68b0942ec090..dd55dcc8b47c7 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
@@ -130,22 +130,22 @@ public function layoutDirectiveDataProvider()
             'area parameter - omitted' => [
                 'adminhtml',
                 'handle="email_template_test_handle"',
-                '<b>Email content for frontend/Magento/default theme</b>',
+                '<strong>Email content for frontend/Magento/default theme</strong>',
             ],
             'area parameter - frontend' => [
                 'adminhtml',
                 'handle="email_template_test_handle" area="frontend"',
-                '<b>Email content for frontend/Magento/default theme</b>',
+                '<strong>Email content for frontend/Magento/default theme</strong>',
             ],
             'area parameter - backend' => [
                 'frontend',
                 'handle="email_template_test_handle" area="adminhtml"',
-                '<b>Email content for adminhtml/Magento/default theme</b>',
+                '<strong>Email content for adminhtml/Magento/default theme</strong>',
             ],
             'custom parameter' => [
                 'frontend',
                 'handle="email_template_test_handle" template="Magento_Email::sample_email_content_custom.phtml"',
-                '<b>Custom Email content for frontend/Magento/default theme</b>',
+                '<strong>Custom Email content for frontend/Magento/default theme</strong>',
             ],
         ];
         return $result;
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
index a83de07443e95..7789a79794f39 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
@@ -315,25 +315,25 @@ public function templateDirectiveDataProvider()
                 Area::AREA_FRONTEND,
                 TemplateTypesInterface::TYPE_HTML,
                 '{{template config_path="customer/create_account/email_template"}}',
-                '<b>customer_create_account_email_template template from Vendor/custom_theme</b>',
+                '<strong>customer_create_account_email_template template from Vendor/custom_theme</strong>',
             ],
             'Template from parent theme - frontend' => [
                 Area::AREA_FRONTEND,
                 TemplateTypesInterface::TYPE_HTML,
                 '{{template config_path="customer/create_account/email_confirmation_template"}}',
-                '<b>customer_create_account_email_confirmation_template template from Vendor/default</b>',
+                '<strong>customer_create_account_email_confirmation_template template from Vendor/default</strong',
             ],
             'Template from grandparent theme - frontend' => [
                 Area::AREA_FRONTEND,
                 TemplateTypesInterface::TYPE_HTML,
                 '{{template config_path="customer/create_account/email_confirmed_template"}}',
-                '<b>customer_create_account_email_confirmed_template template from Magento/default</b>',
+                '<strong>customer_create_account_email_confirmed_template template from Magento/default</strong',
             ],
             'Template from grandparent theme - adminhtml' => [
                 BackendFrontNameResolver::AREA_CODE,
                 TemplateTypesInterface::TYPE_HTML,
                 '{{template config_path="catalog/productalert_cron/error_email_template"}}',
-                '<b>catalog_productalert_cron_error_email_template template from Magento/default</b>',
+                '<strong>catalog_productalert_cron_error_email_template template from Magento/default</strong',
                 null,
                 null,
                 true,
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_Email/templates/sample_email_content.phtml b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_Email/templates/sample_email_content.phtml
index d53468a38376f..bb0073cedee96 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_Email/templates/sample_email_content.phtml
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_Email/templates/sample_email_content.phtml
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 ?>
-<b>Email content for adminhtml/Magento/default theme</b>
+<strong>Email content for adminhtml/Magento/default theme</strong>
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_ProductAlert/email/cron_error.html b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_ProductAlert/email/cron_error.html
index f13e54edf93a4..d65f9d4c40877 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_ProductAlert/email/cron_error.html
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_ProductAlert/email/cron_error.html
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 -->
-<b>catalog_productalert_cron_error_email_template template from Magento/default</b>
+<strong>catalog_productalert_cron_error_email_template template from Magento/default</strong>
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Customer/email/account_new_confirmed.html b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Customer/email/account_new_confirmed.html
index f687fc041db1e..ffc4d8893fe98 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Customer/email/account_new_confirmed.html
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Customer/email/account_new_confirmed.html
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 -->
-<b>customer_create_account_email_confirmed_template template from Magento/default</b>
+<strong>customer_create_account_email_confirmed_template template from Magento/default</strong>
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content.phtml b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content.phtml
index acbdf16d474df..9c973818272c8 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content.phtml
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content.phtml
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 ?>
-<b>Email content for frontend/Magento/default theme</b>
+<strong>Email content for frontend/Magento/default theme</strong>
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content_custom.phtml b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content_custom.phtml
index 1730bf904bb34..4ed5685ee0106 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content_custom.phtml
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content_custom.phtml
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 ?>
-<b>Custom Email content for frontend/Magento/default theme</b>
+<strong>Custom Email content for frontend/Magento/default theme</strong>
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/custom_theme/Magento_Customer/email/account_new.html b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/custom_theme/Magento_Customer/email/account_new.html
index 7e8f9bd1b12b6..46257060f8284 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/custom_theme/Magento_Customer/email/account_new.html
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/custom_theme/Magento_Customer/email/account_new.html
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 -->
-<b>customer_create_account_email_template template from Vendor/custom_theme</b>
+<strong>customer_create_account_email_template template from Vendor/custom_theme</strong>
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/default/Magento_Customer/email/account_new_confirmation.html b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/default/Magento_Customer/email/account_new_confirmation.html
index c5801b6557a61..9c52c5a1b38cf 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/default/Magento_Customer/email/account_new_confirmation.html
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Vendor/default/Magento_Customer/email/account_new_confirmation.html
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 -->
-<b>customer_create_account_email_confirmation_template template from Vendor/default</b>
+<strong>customer_create_account_email_confirmation_template template from Vendor/default</strong>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php
index 278c08fbd2b07..4502134d45cc1 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Framework\App\Filesystem;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -24,9 +25,9 @@ class DirectoryResolverTest extends \PHPUnit\Framework\TestCase
     private $directoryResolver;
 
     /**
-     * @var \Magento\Framework\Filesystem\Directory\WriteInterface
+     * @var \Magento\Framework\Filesystem
      */
-    private $directory;
+    private $filesystem;
 
     /**
      * @inheritdoc
@@ -36,9 +37,7 @@ protected function setUp()
         $this->objectManager = Bootstrap::getObjectManager();
         $this->directoryResolver = $this->objectManager
             ->create(\Magento\Framework\App\Filesystem\DirectoryResolver::class);
-        /** @var \Magento\Framework\Filesystem $filesystem */
-        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
-        $this->directory = $filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
+        $this->filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
     }
 
     /**
@@ -51,7 +50,8 @@ protected function setUp()
      */
     public function testValidatePath($path, $directoryConfig, $expectation)
     {
-        $path = $this->directory->getAbsolutePath($path);
+        $directory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $path = $directory->getAbsolutePath() .'/' .$path;
         $this->assertEquals($expectation, $this->directoryResolver->validatePath($path, $directoryConfig));
     }
 
@@ -62,7 +62,8 @@ public function testValidatePath($path, $directoryConfig, $expectation)
      */
     public function testValidatePathWithException()
     {
-        $path = $this->directory->getAbsolutePath();
+        $directory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $path = $directory->getAbsolutePath();
         $this->directoryResolver->validatePath($path, 'wrong_dir');
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/File/Validator/NotProtectedExtensionTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/File/Validator/NotProtectedExtensionTest.php
new file mode 100644
index 0000000000000..265958f28d641
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/File/Validator/NotProtectedExtensionTest.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\Code\File\Validator;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Tests protected extensions.
+ */
+class NotProtectedExtensionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Tests that phpt, pht are invalid extension types.
+     *
+     * @dataProvider isValidDataProvider
+     * @param string $extension
+     * @return void
+     */
+    public function testIsValid(string $extension)
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $model */
+        $model = $objectManager->create(\Magento\MediaStorage\Model\File\Validator\NotProtectedExtension::class);
+        $this->assertFalse($model->isValid($extension));
+    }
+
+    /**
+     * @return array
+     */
+    public function isValidDataProvider(): array
+    {
+        return [
+            ['phpt'],
+            ['pht'],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/Generator/AutoloaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/Generator/AutoloaderTest.php
new file mode 100644
index 0000000000000..aaa3aa6c97a7e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/Generator/AutoloaderTest.php
@@ -0,0 +1,85 @@
+<?php declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Code\Generator;
+
+use Magento\Framework\Code\Generator;
+use Magento\Framework\Logger\Monolog as MagentoMonologLogger;
+use Magento\TestFramework\ObjectManager;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Psr\Log\LoggerInterface;
+
+class AutoloaderTest extends TestCase
+{
+    /**
+     * This method exists to fix the wrong return type hint on \Magento\Framework\App\ObjectManager::getInstance.
+     * This way the IDE knows it's dealing with an instance of \Magento\TestFramework\ObjectManager and
+     * not \Magento\Framework\App\ObjectManager. The former has the method addSharedInstance, the latter does not.
+     *
+     * @return ObjectManager|\Magento\Framework\App\ObjectManager
+     * @SuppressWarnings(PHPMD.StaticAccess)
+     */
+    private function getTestFrameworkObjectManager()
+    {
+        return ObjectManager::getInstance();
+    }
+
+    /**
+     * @before
+     */
+    public function setupLoggerTestDouble()
+    {
+        $loggerTestDouble = $this->createMock(LoggerInterface::class);
+        $this->getTestFrameworkObjectManager()->addSharedInstance($loggerTestDouble, MagentoMonologLogger::class);
+    }
+
+    /**
+     * @after
+     */
+    public function removeLoggerTestDouble()
+    {
+        $this->getTestFrameworkObjectManager()->removeSharedInstance(MagentoMonologLogger::class);
+    }
+
+    /**
+     * @param \RuntimeException $testException
+     * @return Generator|MockObject
+     */
+    private function createExceptionThrowingGeneratorTestDouble(\RuntimeException $testException)
+    {
+        /** @var Generator|MockObject $generatorStub */
+        $generatorStub = $this->createMock(Generator::class);
+        $generatorStub->method('generateClass')->willThrowException($testException);
+
+        return $generatorStub;
+    }
+
+    public function testLogsExceptionDuringGeneration()
+    {
+        $exceptionMessage = 'Test exception thrown during generation';
+        $testException = new \RuntimeException($exceptionMessage);
+
+        $loggerMock = ObjectManager::getInstance()->get(LoggerInterface::class);
+        $loggerMock->expects($this->once())->method('debug')->with($exceptionMessage, ['exception' => $testException]);
+
+        $autoloader = new Autoloader($this->createExceptionThrowingGeneratorTestDouble($testException));
+        $this->assertNull($autoloader->load(NonExistingClassName::class));
+    }
+
+    public function testFiltersDuplicateExceptionMessages()
+    {
+        $exceptionMessage = 'Test exception thrown during generation';
+        $testException = new \RuntimeException($exceptionMessage);
+
+        $loggerMock = ObjectManager::getInstance()->get(LoggerInterface::class);
+        $loggerMock->expects($this->once())->method('debug')->with($exceptionMessage, ['exception' => $testException]);
+
+        $autoloader = new Autoloader($this->createExceptionThrowingGeneratorTestDouble($testException));
+        $autoloader->load(OneNonExistingClassName::class);
+        $autoloader->load(AnotherNonExistingClassName::class);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php
index 2f7f040d82c24..d1b22e853ce1d 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php
@@ -41,8 +41,8 @@ public function getConstructorArgumentTypesDataProvider()
                     '\Imported\Name\Space\One',
                     '\Imported\Name\Space\AnotherTest\Extended',
                     '\Imported\Name\Space\Test',
-                    '\Imported\Name\Space\Object\Under\Test',
-                    '\Imported\Name\Space\Object',
+                    '\Imported\Name\Space\ClassName\Under\Test',
+                    '\Imported\Name\Space\ClassName',
                     '\Some\Testing\Name\Space\Test',
                     'array',
                     ''
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample
index 739369ee4e16a..47c059de2034b 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample
@@ -6,8 +6,8 @@
 namespace Some\Testing\Name\Space;
 
 use Imported\Name\Space\One as FirstImport;
-use Imported\Name\Space\Object;
-use Imported\Name\Space\Test as Testing, \Imported\Name\Space\AnotherTest;
+use Imported\Name\Space\ClassName;
+use Imported\Name\Space\Test as Testing, \Imported\Name\Space\AnotherTest ;
 
 class AnotherSimpleClass
 {
@@ -16,8 +16,8 @@ class AnotherSimpleClass
         FirstImport $itemTwo,
         AnotherTest\Extended $itemThree,
         Testing $itemFour,
-        Object\Under\Test $itemFive,
-        Object $itemSix,
+        ClassName\Under\Test $itemFive,
+        ClassName $itemSix,
         Test $itemSeven,
         array $itemEight = [],
         $itemNine = 'test'
diff --git a/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php b/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
index cf3b9f05cbe0f..403c45dde71a3 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
@@ -8,6 +8,7 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\TestFramework\Helper\CacheCleaner;
 use Magento\Framework\DB\Ddl\Table;
+use Magento\TestFramework\Helper\Bootstrap;
 
 class MysqlTest extends \PHPUnit\Framework\TestCase
 {
@@ -19,7 +20,7 @@ class MysqlTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         set_error_handler(null);
-        $this->resourceConnection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+        $this->resourceConnection = Bootstrap::getObjectManager()
             ->get(ResourceConnection::class);
         CacheCleaner::cleanAll();
     }
@@ -40,7 +41,6 @@ public function testWaitTimeout()
             $this->markTestSkipped('This test is for \Magento\Framework\DB\Adapter\Pdo\Mysql');
         }
         try {
-            $defaultWaitTimeout = $this->getWaitTimeout();
             $minWaitTimeout = 1;
             $this->setWaitTimeout($minWaitTimeout);
             $this->assertEquals($minWaitTimeout, $this->getWaitTimeout(), 'Wait timeout was not changed');
@@ -49,17 +49,8 @@ public function testWaitTimeout()
             sleep($minWaitTimeout + 1);
             $result = $this->executeQuery('SELECT 1');
             $this->assertInstanceOf(\Magento\Framework\DB\Statement\Pdo\Mysql::class, $result);
-            // Restore wait_timeout
-            $this->setWaitTimeout($defaultWaitTimeout);
-            $this->assertEquals(
-                $defaultWaitTimeout,
-                $this->getWaitTimeout(),
-                'Default wait timeout was not restored'
-            );
-        } catch (\Exception $e) {
-            // Reset connection on failure to restore global variables
+        } finally {
             $this->getDbAdapter()->closeConnection();
-            throw $e;
         }
     }
 
@@ -87,30 +78,14 @@ private function setWaitTimeout($waitTimeout)
     /**
      * Execute SQL query and return result statement instance
      *
-     * @param string $sql
-     * @return \Zend_Db_Statement_Interface
-     * @throws \Exception
+     * @param $sql
+     * @return void|\Zend_Db_Statement_Pdo
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Zend_Db_Adapter_Exception
      */
     private function executeQuery($sql)
     {
-        /**
-         * Suppress PDO warnings to work around the bug https://bugs.php.net/bug.php?id=63812
-         */
-        $phpErrorReporting = error_reporting();
-        /** @var $pdoConnection \PDO */
-        $pdoConnection = $this->getDbAdapter()->getConnection();
-        $pdoWarningsEnabled = $pdoConnection->getAttribute(\PDO::ATTR_ERRMODE) & \PDO::ERRMODE_WARNING;
-        if (!$pdoWarningsEnabled) {
-            error_reporting($phpErrorReporting & ~E_WARNING);
-        }
-        try {
-            $result = $this->getDbAdapter()->query($sql);
-            error_reporting($phpErrorReporting);
-        } catch (\Exception $e) {
-            error_reporting($phpErrorReporting);
-            throw $e;
-        }
-        return $result;
+        return $this->getDbAdapter()->query($sql);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/ReadTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/ReadTest.php
index f43a523a12ed0..d8367ca79aee0 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/ReadTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/ReadTest.php
@@ -7,6 +7,7 @@
  */
 namespace Magento\Framework\Filesystem\Directory;
 
+use Magento\Framework\Exception\ValidatorException;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -34,13 +35,57 @@ public function testGetAbsolutePath()
         $this->assertContains('_files/foo/bar', $dir->getAbsolutePath('bar'));
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testGetAbsolutePathOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('foo');
+
+        $dir->getAbsolutePath($path . '/ReadTest.php');
+    }
+
+    /**
+     * @return array
+     */
+    public function pathDataProvider(): array
+    {
+        return [
+            ['../../Directory'],
+            ['//./..///../Directory'],
+            ['\..\..\Directory'],
+        ];
+    }
+
     public function testGetRelativePath()
     {
         $dir = $this->getDirectoryInstance('foo');
+        $this->assertEquals(
+            'file_three.txt',
+            $dir->getRelativePath('file_three.txt')
+        );
         $this->assertEquals('', $dir->getRelativePath());
         $this->assertEquals('bar', $dir->getRelativePath(__DIR__ . '/../_files/foo/bar'));
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testGetRelativePathOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('foo');
+
+        $dir->getRelativePath(__DIR__ . $path . '/ReadTest.php');
+    }
+
     /**
      * Test for read method
      *
@@ -72,6 +117,20 @@ public function readProvider()
         ];
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testReadOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('foo');
+
+        $dir->read($path . '/ReadTest.php');
+    }
+
     /**
      * Test for search method
      *
@@ -103,6 +162,20 @@ public function searchProvider()
         ];
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testSearchOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('foo');
+
+        $dir->search('/*/*.txt', $path . '/ReadTest.php');
+    }
+
     /**
      * Test for isExist method
      *
@@ -127,6 +200,20 @@ public function existsProvider()
         return [['foo', 'bar', true], ['foo', 'bar/baz/', true], ['foo', 'bar/notexists', false]];
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testIsExistOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('foo');
+
+        $dir->isExist($path . '/ReadTest.php');
+    }
+
     /**
      * Test for stat method
      *
@@ -168,6 +255,20 @@ public function statProvider()
         return [['foo', 'bar'], ['foo', 'file_three.txt']];
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testStatOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('foo');
+
+        $dir->stat('bar/' . $path);
+    }
+
     /**
      * Test for isReadable method
      *
@@ -182,6 +283,20 @@ public function testIsReadable($dirPath, $path, $readable)
         $this->assertEquals($readable, $dir->isReadable($path));
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testIsReadableOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('foo');
+
+        $dir->isReadable($path . '/ReadTest.php');
+    }
+
     /**
      * Test for isFile method
      *
@@ -194,6 +309,20 @@ public function testIsFile($path, $isFile)
         $this->assertEquals($isFile, $this->getDirectoryInstance('foo')->isFile($path));
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testIsFileOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('foo');
+
+        $dir->isFile($path . '/ReadTest.php');
+    }
+
     /**
      * Test for isDirectory method
      *
@@ -206,6 +335,20 @@ public function testIsDirectory($path, $isDirectory)
         $this->assertEquals($isDirectory, $this->getDirectoryInstance('foo')->isDirectory($path));
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testIsDirectoryOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('foo');
+
+        $dir->isDirectory($path . '/ReadTest.php');
+    }
+
     /**
      * Data provider for testIsReadable
      *
@@ -246,6 +389,20 @@ public function testOpenFile()
         $this->assertTrue($file instanceof \Magento\Framework\Filesystem\File\ReadInterface);
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testOpenFileOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('foo');
+
+        $dir->openFile($path . '/ReadTest.php');
+    }
+
     /**
      * Test readFile
      *
@@ -268,10 +425,27 @@ public function readFileProvider()
     {
         return [
             ['popup.csv', 'var myData = 5;'],
-            ['data.csv', '"field1", "field2"' . "\n" . '"field3", "field4"' . "\n"]
+            [
+                'data.csv',
+                '"field1", "field2"' . PHP_EOL . '"field3", "field4"' . PHP_EOL,
+            ],
         ];
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testReadFileOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('foo');
+
+        $dir->readFile($path . '/ReadTest.php');
+    }
+
     /**
      * Get readable file instance
      * Get full path for files located in _files directory
@@ -301,4 +475,18 @@ public function testReadRecursively()
         sort($expected);
         $this->assertEquals($expected, $actual);
     }
+
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testReadRecursivelyOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('foo');
+
+        $dir->readRecursively($path);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php
index 380c7998680a1..49ff3965e1ec0 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php
@@ -7,6 +7,7 @@
  */
 namespace Magento\Framework\Filesystem\Directory;
 
+use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\Filesystem\DriverPool;
 use Magento\TestFramework\Helper\Bootstrap;
 
@@ -63,6 +64,20 @@ public function createProvider()
         ];
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testCreateOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+
+        $dir->create($path);
+    }
+
     /**
      * Test for delete method
      *
@@ -88,6 +103,32 @@ public function deleteProvider()
         return [['subdir'], ['subdir/subsubdir']];
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testDeleteOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+
+        $dir->delete($path);
+    }
+
+    /**
+     * @return array
+     */
+    public function pathDataProvider(): array
+    {
+        return [
+            ['../../Directory'],
+            ['//./..///../Directory'],
+            ['\..\..\Directory'],
+        ];
+    }
+
     /**
      * Test for rename method (in scope of one directory instance)
      *
@@ -119,6 +160,20 @@ public function renameProvider()
         return [['newDir1', 0777, 'first_name.txt', 'second_name.txt']];
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testRenameOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+
+        $dir->renameFile($path . '/ReadTest.php', 'RenamedTest');
+    }
+
     /**
      * Test for rename method (moving to new directory instance)
      *
@@ -185,6 +240,35 @@ public function copyProvider()
         ];
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testCopyFromOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+
+        $dir->copyFile($path . '/ReadTest.php', 'CopiedTest');
+    }
+
+    /**
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     */
+    public function testCopyToOutside()
+    {
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+        $dir->touch('test_file_for_copy_outside.txt');
+
+        $dir->copyFile(
+            'test_file_for_copy_outside.txt',
+            '../../Directory/copied_outside.txt'
+        );
+    }
+
     /**
      * Test for copy method (copy to another directory instance)
      *
@@ -231,6 +315,20 @@ public function testChangePermissions()
         $this->assertTrue($directory->changePermissions('test_directory', 0644));
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testChangePermissionsOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+
+        $dir->changePermissions($path, 0777);
+    }
+
     /**
      * Test for changePermissionsRecursively method
      */
@@ -244,6 +342,20 @@ public function testChangePermissionsRecursively()
         $this->assertTrue($directory->changePermissionsRecursively('test_directory', 0777, 0644));
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testChangePermissionsRecursivelyOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+
+        $dir->changePermissionsRecursively($path, 0777, 0777);
+    }
+
     /**
      * Test for touch method
      *
@@ -274,6 +386,20 @@ public function touchProvider()
         ];
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testTouchOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+
+        $dir->touch($path . '/foo.txt');
+    }
+
     /**
      * Test isWritable method
      */
@@ -285,6 +411,23 @@ public function testIsWritable()
         $this->assertTrue($directory->isWritable('bar'));
     }
 
+    /**
+     * @return void
+     */
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testIsWritableOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+
+        $dir->isWritable($path);
+    }
+
     /**
      * Test for openFile method
      *
@@ -315,6 +458,20 @@ public function openFileProvider()
         ];
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testOpenFileOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+
+        $dir->openFile($path . '/ReadTest.php');
+    }
+
     /**
      * Test writeFile
      *
@@ -359,6 +516,20 @@ public function writeFileProvider()
         return [['file1', '123', '456'], ['folder1/file1', '123', '456']];
     }
 
+    /**
+     * @param string $path
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
+     */
+    public function testWriteFileOutside(string $path)
+    {
+        $dir = $this->getDirectoryInstance('newDir1', 0777);
+
+        $dir->writeFile($path . '/ReadTest.php', 'tst');
+    }
+
     /**
      * Tear down
      */
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileLockTest.php b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileLockTest.php
new file mode 100644
index 0000000000000..e64b3c505acf1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/FileLockTest.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\Lock\Backend;
+
+/**
+ * \Magento\Framework\Lock\Backend\File test case
+ */
+class FileLockTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Lock\Backend\FileLock
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->model = $this->objectManager->create(
+            \Magento\Framework\Lock\Backend\FileLock::class,
+            ['path' => '/tmp']
+        );
+    }
+
+    public function testLockAndUnlock()
+    {
+        $name = 'test_lock';
+
+        $this->assertFalse($this->model->isLocked($name));
+
+        $this->assertTrue($this->model->lock($name));
+        $this->assertTrue($this->model->isLocked($name));
+        $this->assertFalse($this->model->lock($name, 2));
+
+        $this->assertTrue($this->model->unlock($name));
+        $this->assertFalse($this->model->isLocked($name));
+    }
+
+    public function testUnlockWithoutExistingLock()
+    {
+        $name = 'test_lock';
+
+        $this->assertFalse($this->model->isLocked($name));
+        $this->assertFalse($this->model->unlock($name));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php
new file mode 100644
index 0000000000000..8d0caad5d55e4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/ZookeeperTest.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Backend;
+
+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
+use Magento\Framework\Lock\LockBackendFactory;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\App\DeploymentConfig\FileReader;
+use Magento\Framework\Stdlib\ArrayManager;
+
+/**
+ * \Magento\Framework\Lock\Backend\Zookeeper test case
+ */
+class ZookeeperTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var FileReader
+     */
+    private $configReader;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var LockBackendFactory
+     */
+    private $lockBackendFactory;
+
+    /**
+     * @var ArrayManager
+     */
+    private $arrayManager;
+
+    /**
+     * @var ZookeeperLock
+     */
+    private $model;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        if (!extension_loaded('zookeeper')) {
+            $this->markTestSkipped('php extension Zookeeper is not installed.');
+        }
+
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->configReader = $this->objectManager->get(FileReader::class);
+        $this->lockBackendFactory = $this->objectManager->create(LockBackendFactory::class);
+        $this->arrayManager = $this->objectManager->create(ArrayManager::class);
+        $config = $this->configReader->load(ConfigFilePool::APP_ENV);
+
+        if ($this->arrayManager->get('lock/provider', $config) !== 'zookeeper') {
+            $this->markTestSkipped('Zookeeper is not configured during installation.');
+        }
+
+        $this->model = $this->lockBackendFactory->create();
+        $this->assertInstanceOf(ZookeeperLock::class, $this->model);
+    }
+
+    public function testLockAndUnlock()
+    {
+        $name = 'test_lock';
+
+        $this->assertFalse($this->model->isLocked($name));
+
+        $this->assertTrue($this->model->lock($name));
+        $this->assertTrue($this->model->isLocked($name));
+        $this->assertFalse($this->model->lock($name, 2));
+
+        $this->assertTrue($this->model->unlock($name));
+        $this->assertFalse($this->model->isLocked($name));
+    }
+
+    public function testUnlockWithoutExistingLock()
+    {
+        $name = 'test_lock';
+
+        $this->assertFalse($this->model->isLocked($name));
+        $this->assertFalse($this->model->unlock($name));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php
index 573531cff960a..048ba454fafbc 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php
@@ -3,314 +3,435 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\Session;
-
-use Magento\Framework\App\Filesystem\DirectoryList;
-
-/**
- * @magentoAppIsolation enabled
- */
-class ConfigTest extends \PHPUnit\Framework\TestCase
-{
-    /** @var \Magento\Framework\Session\Config */
-    protected $_model;
-
-    /** @var string */
-    protected $_cacheLimiter = 'private_no_expire';
-
-    /** @var \Magento\TestFramework\ObjectManager */
-    protected $_objectManager;
+// @codingStandardsIgnoreStart
+namespace {
+    $mockPHPFunctions = false;
+}
 
-    /** @var string Default value for session.save_path setting */
-    protected $defaultSavePath;
+namespace Magento\Framework\Session {
 
-    /** @var \Magento\Framework\App\DeploymentConfig | \PHPUnit_Framework_MockObject_MockObject */
-    protected $deploymentConfigMock;
+    use Magento\Framework\App\Filesystem\DirectoryList;
 
-    protected function setUp()
-    {
-        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /** @var $sessionManager \Magento\Framework\Session\SessionManager */
-        $sessionManager = $this->_objectManager->create(\Magento\Framework\Session\SessionManager::class);
-        if ($sessionManager->isSessionExists()) {
-            $sessionManager->writeClose();
-        }
-        $this->deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
-        $this->deploymentConfigMock
-            ->method('get')
-            ->willReturnCallback(function ($configPath) {
-                switch ($configPath) {
-                    case Config::PARAM_SESSION_SAVE_METHOD:
-                        return 'files';
-                    case Config::PARAM_SESSION_CACHE_LIMITER:
-                        return $this->_cacheLimiter;
-                    default:
-                        return null;
-                }
-            });
-
-        $this->_model = $this->_objectManager->create(
-            \Magento\Framework\Session\Config::class,
-            ['deploymentConfig' => $this->deploymentConfigMock]
-        );
-        $this->defaultSavePath = $this->_objectManager
-            ->get(\Magento\Framework\Filesystem\DirectoryList::class)
-            ->getPath(DirectoryList::SESSION);
-    }
+    // @codingStandardsIgnoreEnd
 
     /**
-     * @magentoAppIsolation enabled
+     * Mock ini_get global function.
+     *
+     * @param string $varName
+     * @return string
      */
-    public function testDefaultConfiguration()
+    function ini_get(string $varName)
     {
-        /** @var \Magento\Framework\Filesystem $filesystem */
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\Filesystem::class
-        );
-        $path = ini_get('session.save_path') ?:
-            $filesystem->getDirectoryRead(DirectoryList::SESSION)->getAbsolutePath();
-
-        $this->assertEquals(
-            $path,
-            $this->_model->getSavePath()
-        );
-        $this->assertEquals(
-            \Magento\Framework\Session\Config::COOKIE_LIFETIME_DEFAULT,
-            $this->_model->getCookieLifetime()
-        );
-        $this->assertEquals($this->_cacheLimiter, $this->_model->getCacheLimiter());
-        $this->assertEquals('/', $this->_model->getCookiePath());
-        $this->assertEquals('localhost', $this->_model->getCookieDomain());
-        $this->assertEquals(false, $this->_model->getCookieSecure());
-        $this->assertEquals(true, $this->_model->getCookieHttpOnly());
-        $this->assertEquals($this->_model->getSavePath(), $this->_model->getOption('save_path'));
-    }
+        global $mockPHPFunctions;
+        if ($mockPHPFunctions === 1) {
+            switch ($varName) {
+                case 'session.save_path':
+                    return 'preset_save_path';
+                case 'session.save_handler':
+                    return 'php';
+                default:
+                    return '';
+            }
+        } elseif ($mockPHPFunctions === 2) {
+            return null;
+        }
 
-    public function testSetOptionsInvalidValue()
-    {
-        $preValue = $this->_model->getOptions();
-        $this->_model->setOptions('');
-        $this->assertEquals($preValue, $this->_model->getOptions());
+        return call_user_func_array('\ini_get', func_get_args());
     }
 
     /**
-     * @dataProvider optionsProvider
+     * @magentoAppIsolation enabled
      */
-    public function testSetOptions($option, $getter, $value)
+    class ConfigTest extends \PHPUnit\Framework\TestCase
     {
-        $options = [$option => $value];
-        $this->_model->setOptions($options);
-        $this->assertSame($value, $this->_model->{$getter}());
-    }
+        /** @var \Magento\Framework\Session\Config */
+        private $model;
+
+        /** @var string */
+        private $cacheLimiter = 'private_no_expire';
+
+        /** @var \Magento\TestFramework\ObjectManager */
+        private $objectManager;
+
+        /** @var string Default value for session.save_path setting */
+        private $defaultSavePath;
+
+        /** @var \Magento\Framework\App\DeploymentConfig | \PHPUnit_Framework_MockObject_MockObject */
+        private $deploymentConfigMock;
+
+        /**
+         * @inheritdoc
+         */
+        protected function setUp()
+        {
+            $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+            $this->deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
+            $this->deploymentConfigMock
+                ->method('get')
+                ->willReturnCallback(function ($configPath) {
+                    switch ($configPath) {
+                        case Config::PARAM_SESSION_SAVE_METHOD:
+                            return 'files';
+                        case Config::PARAM_SESSION_CACHE_LIMITER:
+                            return $this->cacheLimiter;
+                        default:
+                            return null;
+                    }
+                });
+
+            $this->model = $this->objectManager->create(
+                \Magento\Framework\Session\Config::class,
+                ['deploymentConfig' => $this->deploymentConfigMock]
+            );
+            $this->defaultSavePath = $this->objectManager
+                ->get(\Magento\Framework\Filesystem\DirectoryList::class)
+                ->getPath(DirectoryList::SESSION);
+        }
 
-    public function optionsProvider()
-    {
-        return [
-            ['save_path', 'getSavePath', __DIR__],
-            ['name', 'getName', 'FOOBAR'],
-            ['gc_probability', 'getGcProbability', 42],
-            ['gc_divisor', 'getGcDivisor', 3],
-            ['gc_maxlifetime', 'getGcMaxlifetime', 180],
-            ['serialize_handler', 'getSerializeHandler', 'php_binary'],
-            ['cookie_lifetime', 'getCookieLifetime', 180],
-            ['cookie_path', 'getCookiePath', '/foo/bar'],
-            ['cookie_domain', 'getCookieDomain', 'framework.zend.com'],
-            ['cookie_secure', 'getCookieSecure', true],
-            ['cookie_httponly', 'getCookieHttpOnly', true],
-            ['use_cookies', 'getUseCookies', false],
-            ['use_only_cookies', 'getUseOnlyCookies', true],
-            ['referer_check', 'getRefererCheck', 'foobar'],
-            ['entropy_file', 'getEntropyFile', __FILE__],
-            ['entropy_length', 'getEntropyLength', 42],
-            ['cache_limiter', 'getCacheLimiter', 'private'],
-            ['cache_expire', 'getCacheExpire', 42],
-            ['use_trans_sid', 'getUseTransSid', true],
-            ['hash_function', 'getHashFunction', 'md5'],
-            ['hash_bits_per_character', 'getHashBitsPerCharacter', 5],
-            ['url_rewriter_tags', 'getUrlRewriterTags', 'a=href']
-        ];
-    }
+        /**
+         * @return void
+         * @magentoAppIsolation enabled
+         */
+        public function testDefaultConfiguration()
+        {
+            /** @var \Magento\Framework\Filesystem $filesystem */
+            $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+                \Magento\Framework\Filesystem::class
+            );
+            $path = ini_get('session.save_path') ?:
+                $filesystem->getDirectoryRead(DirectoryList::SESSION)->getAbsolutePath();
+
+            $this->assertEquals(
+                $path,
+                $this->model->getSavePath()
+            );
+            $this->assertEquals(
+                \Magento\Framework\Session\Config::COOKIE_LIFETIME_DEFAULT,
+                $this->model->getCookieLifetime()
+            );
+            $this->assertEquals($this->cacheLimiter, $this->model->getCacheLimiter());
+            $this->assertEquals('/', $this->model->getCookiePath());
+            $this->assertEquals('localhost', $this->model->getCookieDomain());
+            $this->assertEquals(false, $this->model->getCookieSecure());
+            $this->assertEquals(true, $this->model->getCookieHttpOnly());
+            $this->assertEquals($this->model->getSavePath(), $this->model->getOption('save_path'));
+        }
 
-    public function testNameIsMutable()
-    {
-        $this->_model->setName('FOOBAR');
-        $this->assertEquals('FOOBAR', $this->_model->getName());
-    }
+        /**
+         * @return void
+         */
+        public function testSetOptionsInvalidValue()
+        {
+            $preValue = $this->model->getOptions();
+            $this->model->setOptions('');
+            $this->assertEquals($preValue, $this->model->getOptions());
+        }
 
-    public function testCookieLifetimeIsMutable()
-    {
-        $this->_model->setCookieLifetime(20);
-        $this->assertEquals(20, $this->_model->getCookieLifetime());
-    }
+        /**
+         * @param string $option
+         * @param string $getter
+         * @param mixed $value
+         * @return void
+         * @dataProvider optionsProvider
+         */
+        public function testSetOptions(string $option, string $getter, $value)
+        {
+            $options = [$option => $value];
+            $this->model->setOptions($options);
+            $this->assertSame($value, $this->model->{$getter}());
+        }
 
-    public function testCookieLifetimeCanBeZero()
-    {
-        $this->_model->setCookieLifetime(0);
-        $this->assertEquals(0, $this->_model->getCookieLifetime());
-    }
+        /**
+         * @return array
+         */
+        public function optionsProvider(): array
+        {
+            return [
+                ['save_path', 'getSavePath', __DIR__],
+                ['name', 'getName', 'FOOBAR'],
+                ['gc_probability', 'getGcProbability', 42],
+                ['gc_divisor', 'getGcDivisor', 3],
+                ['gc_maxlifetime', 'getGcMaxlifetime', 180],
+                ['serialize_handler', 'getSerializeHandler', 'php_binary'],
+                ['cookie_lifetime', 'getCookieLifetime', 180],
+                ['cookie_path', 'getCookiePath', '/foo/bar'],
+                ['cookie_domain', 'getCookieDomain', 'framework.zend.com'],
+                ['cookie_secure', 'getCookieSecure', true],
+                ['cookie_httponly', 'getCookieHttpOnly', true],
+                ['use_cookies', 'getUseCookies', false],
+                ['use_only_cookies', 'getUseOnlyCookies', true],
+                ['referer_check', 'getRefererCheck', 'foobar'],
+                ['entropy_file', 'getEntropyFile', __FILE__],
+                ['entropy_length', 'getEntropyLength', 42],
+                ['cache_limiter', 'getCacheLimiter', 'private'],
+                ['cache_expire', 'getCacheExpire', 42],
+                ['use_trans_sid', 'getUseTransSid', true],
+                ['hash_function', 'getHashFunction', 'md5'],
+                ['hash_bits_per_character', 'getHashBitsPerCharacter', 5],
+                ['url_rewriter_tags', 'getUrlRewriterTags', 'a=href'],
+            ];
+        }
 
-    public function testSettingInvalidCookieLifetime()
-    {
-        $preVal = $this->_model->getCookieLifetime();
-        $this->_model->setCookieLifetime('foobar_bogus');
-        $this->assertEquals($preVal, $this->_model->getCookieLifetime());
-    }
+        /**
+         * @return void
+         */
+        public function testNameIsMutable()
+        {
+            $this->model->setName('FOOBAR');
+            $this->assertEquals('FOOBAR', $this->model->getName());
+        }
 
-    public function testSettingInvalidCookieLifetime2()
-    {
-        $preVal = $this->_model->getCookieLifetime();
-        $this->_model->setCookieLifetime(-1);
-        $this->assertEquals($preVal, $this->_model->getCookieLifetime());
-    }
+        /**
+         * @return void
+         */
+        public function testCookieLifetimeIsMutable()
+        {
+            $this->model->setCookieLifetime(20);
+            $this->assertEquals(20, $this->model->getCookieLifetime());
+        }
 
-    public function testWrongMethodCall()
-    {
-        $this->expectException(
-            '\BadMethodCallException',
-            'Method "methodThatNotExist" does not exist in Magento\Framework\Session\Config'
-        );
-        $this->_model->methodThatNotExist();
-    }
+        /**
+         * @return void
+         */
+        public function testCookieLifetimeCanBeZero()
+        {
+            $this->model->setCookieLifetime(0);
+            $this->assertEquals(0, $this->model->getCookieLifetime());
+        }
 
-    public function testCookieSecureDefaultsToIniSettings()
-    {
-        $this->assertSame((bool)ini_get('session.cookie_secure'), $this->_model->getCookieSecure());
-    }
+        /**
+         * @return void
+         */
+        public function testSettingInvalidCookieLifetime()
+        {
+            $preVal = $this->model->getCookieLifetime();
+            $this->model->setCookieLifetime('foobar_bogus');
+            $this->assertEquals($preVal, $this->model->getCookieLifetime());
+        }
 
-    public function testSetCookieSecureInOptions()
-    {
-        $this->_model->setCookieSecure(true);
-        $this->assertTrue($this->_model->getCookieSecure());
-    }
+        /**
+         * @return void
+         */
+        public function testSettingInvalidCookieLifetime2()
+        {
+            $preVal = $this->model->getCookieLifetime();
+            $this->model->setCookieLifetime(-1);
+            $this->assertEquals($preVal, $this->model->getCookieLifetime());
+        }
 
-    public function testCookieDomainIsMutable()
-    {
-        $this->_model->setCookieDomain('example.com');
-        $this->assertEquals('example.com', $this->_model->getCookieDomain());
-    }
+        /**
+         * @return void
+         */
+        public function testWrongMethodCall()
+        {
+            $this->expectException(
+                '\BadMethodCallException',
+                'Method "methodThatNotExist" does not exist in Magento\Framework\Session\Config'
+            );
+            $this->model->methodThatNotExist();
+        }
 
-    public function testCookieDomainCanBeEmpty()
-    {
-        $this->_model->setCookieDomain('');
-        $this->assertEquals('', $this->_model->getCookieDomain());
-    }
+        /**
+         * @return void
+         */
+        public function testCookieSecureDefaultsToIniSettings()
+        {
+            $this->assertSame((bool)ini_get('session.cookie_secure'), $this->model->getCookieSecure());
+        }
 
-    public function testSettingInvalidCookieDomain()
-    {
-        $preVal = $this->_model->getCookieDomain();
-        $this->_model->setCookieDomain(24);
-        $this->assertEquals($preVal, $this->_model->getCookieDomain());
-    }
+        /**
+         * @return void
+         */
+        public function testSetCookieSecureInOptions()
+        {
+            $this->model->setCookieSecure(true);
+            $this->assertTrue($this->model->getCookieSecure());
+        }
 
-    public function testSettingInvalidCookieDomain2()
-    {
-        $preVal = $this->_model->getCookieDomain();
-        $this->_model->setCookieDomain('D:\\WINDOWS\\System32\\drivers\\etc\\hosts');
-        $this->assertEquals($preVal, $this->_model->getCookieDomain());
-    }
+        /**
+         * @return void
+         */
+        public function testCookieDomainIsMutable()
+        {
+            $this->model->setCookieDomain('example.com');
+            $this->assertEquals('example.com', $this->model->getCookieDomain());
+        }
 
-    public function testSetCookieHttpOnlyInOptions()
-    {
-        $this->_model->setCookieHttpOnly(true);
-        $this->assertTrue($this->_model->getCookieHttpOnly());
-    }
+        /**
+         * @return void
+         */
+        public function testCookieDomainCanBeEmpty()
+        {
+            $this->model->setCookieDomain('');
+            $this->assertEquals('', $this->model->getCookieDomain());
+        }
 
-    public function testUseCookiesDefaultsToIniSettings()
-    {
-        $this->assertSame((bool)ini_get('session.use_cookies'), $this->_model->getUseCookies());
-    }
+        /**
+         * @return void
+         */
+        public function testSettingInvalidCookieDomain()
+        {
+            $preVal = $this->model->getCookieDomain();
+            $this->model->setCookieDomain(24);
+            $this->assertEquals($preVal, $this->model->getCookieDomain());
+        }
 
-    public function testSetUseCookiesInOptions()
-    {
-        $this->_model->setUseCookies(true);
-        $this->assertTrue($this->_model->getUseCookies());
-    }
+        /**
+         * @return void
+         */
+        public function testSettingInvalidCookieDomain2()
+        {
+            $preVal = $this->model->getCookieDomain();
+            $this->model->setCookieDomain('D:\\WINDOWS\\System32\\drivers\\etc\\hosts');
+            $this->assertEquals($preVal, $this->model->getCookieDomain());
+        }
 
-    public function testUseOnlyCookiesDefaultsToIniSettings()
-    {
-        $this->assertSame((bool)ini_get('session.use_only_cookies'), $this->_model->getUseOnlyCookies());
-    }
+        /**
+         * @return void
+         */
+        public function testSetCookieHttpOnlyInOptions()
+        {
+            $this->model->setCookieHttpOnly(true);
+            $this->assertTrue($this->model->getCookieHttpOnly());
+        }
 
-    public function testSetUseOnlyCookiesInOptions()
-    {
-        $this->_model->setOption('use_only_cookies', true);
-        $this->assertTrue((bool)$this->_model->getOption('use_only_cookies'));
-    }
+        /**
+         * @return void
+         */
+        public function testUseCookiesDefaultsToIniSettings()
+        {
+            $this->assertSame((bool)ini_get('session.use_cookies'), $this->model->getUseCookies());
+        }
 
-    public function testRefererCheckDefaultsToIniSettings()
-    {
-        $this->assertSame(ini_get('session.referer_check'), $this->_model->getRefererCheck());
-    }
+        /**
+         * @return void
+         */
+        public function testSetUseCookiesInOptions()
+        {
+            $this->model->setUseCookies(true);
+            $this->assertTrue($this->model->getUseCookies());
+        }
 
-    public function testRefererCheckIsMutable()
-    {
-        $this->_model->setOption('referer_check', 'FOOBAR');
-        $this->assertEquals('FOOBAR', $this->_model->getOption('referer_check'));
-    }
+        /**
+         * @return void
+         */
+        public function testUseOnlyCookiesDefaultsToIniSettings()
+        {
+            $this->assertSame((bool)ini_get('session.use_only_cookies'), $this->model->getUseOnlyCookies());
+        }
 
-    public function testRefererCheckMayBeEmpty()
-    {
-        $this->_model->setOption('referer_check', '');
-        $this->assertEquals('', $this->_model->getOption('referer_check'));
-    }
+        /**
+         * @return void
+         */
+        public function testSetUseOnlyCookiesInOptions()
+        {
+            $this->model->setOption('use_only_cookies', true);
+            $this->assertTrue((bool)$this->model->getOption('use_only_cookies'));
+        }
 
-    public function testSetSavePath()
-    {
-        $this->_model->setSavePath('some_save_path');
-        $this->assertEquals($this->_model->getOption('save_path'), 'some_save_path');
-    }
+        /**
+         * @return void
+         */
+        public function testRefererCheckDefaultsToIniSettings()
+        {
+            $this->assertSame(ini_get('session.referer_check'), $this->model->getRefererCheck());
+        }
 
-    /**
-     * @dataProvider savePathDataProvider
-     */
-    public function testConstructorSavePath($existing, $given, $expected)
-    {
-        $sessionSavePath = ini_get('session.save_path');
-        if ($expected === 'default') {
-            $expected = $this->defaultSavePath . '/';
+        /**
+         * @return void
+         */
+        public function testRefererCheckIsMutable()
+        {
+            $this->model->setOption('referer_check', 'FOOBAR');
+            $this->assertEquals('FOOBAR', $this->model->getOption('referer_check'));
         }
-        $setup = ini_set('session.save_path', $existing);
-        if ($setup === false) {
-            $this->markTestSkipped('Cannot set session.save_path with ini_set');
+
+        /**
+         * @return void
+         */
+        public function testRefererCheckMayBeEmpty()
+        {
+            $this->model->setOption('referer_check', '');
+            $this->assertEquals('', $this->model->getOption('referer_check'));
         }
 
-        $deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
-        $deploymentConfigMock
-            ->method('get')
-            ->willReturnCallback(function ($configPath) use ($given) {
-                switch ($configPath) {
-                    case Config::PARAM_SESSION_SAVE_METHOD:
-                        return 'files';
-                    case Config::PARAM_SESSION_CACHE_LIMITER:
-                        return $this->_cacheLimiter;
-                    case Config::PARAM_SESSION_SAVE_PATH:
-                        return $given;
-                    default:
-                        return null;
-                }
-            });
-
-        $model = $this->_objectManager->create(
-            \Magento\Framework\Session\Config::class,
-            ['deploymentConfig' => $deploymentConfigMock]
-        );
-        $this->assertEquals($expected, $model->getOption('save_path'));
-
-        if ($sessionSavePath != ini_get('session.save_path')) {
-            ini_set('session.save_path', $sessionSavePath);
+        /**
+         * @return void
+         */
+        public function testSetSavePath()
+        {
+            $this->model->setSavePath('some_save_path');
+            $this->assertEquals($this->model->getOption('save_path'), 'some_save_path');
         }
-    }
 
-    public function savePathDataProvider()
-    {
-        // preset value (null = not set), input value (null = not set), expected value
-        $savePathGiven = 'explicit_save_path';
-        $presetPath = 'preset_save_path';
-        return [
-            [null, $savePathGiven, $savePathGiven],
-            [null, null, 'default'],
-            [$presetPath, $savePathGiven, $savePathGiven],
-            [$presetPath, null, $presetPath],
-        ];
+        /**
+         * @param int $mockPHPFunctionNum
+         * @param string|null $givenSavePath
+         * @param string $expectedSavePath
+         * @param string|null $givenSaveHandler
+         * @param string $expectedSaveHandler
+         * @return void
+         * @dataProvider constructorDataProvider
+         */
+        public function testConstructor(
+            int $mockPHPFunctionNum,
+            $givenSavePath,
+            string $expectedSavePath,
+            $givenSaveHandler,
+            string $expectedSaveHandler
+        ) {
+            global $mockPHPFunctions;
+            $mockPHPFunctions = $mockPHPFunctionNum;
+
+            $sessionSaveHandler = ini_get('session.save_handler');
+            if ($expectedSavePath === 'default') {
+                $expectedSavePath = $this->defaultSavePath . '/';
+            }
+            if ($expectedSaveHandler === 'php') {
+                $expectedSaveHandler = $sessionSaveHandler;
+            }
+
+            $deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
+            $deploymentConfigMock
+                ->method('get')
+                ->willReturnCallback(function ($configPath) use ($givenSavePath, $givenSaveHandler) {
+                    switch ($configPath) {
+                        case Config::PARAM_SESSION_SAVE_METHOD:
+                            return $givenSaveHandler;
+                        case Config::PARAM_SESSION_CACHE_LIMITER:
+                            return $this->cacheLimiter;
+                        case Config::PARAM_SESSION_SAVE_PATH:
+                            return $givenSavePath;
+                        default:
+                            return null;
+                    }
+                });
+
+            $model = $this->objectManager->create(
+                \Magento\Framework\Session\Config::class,
+                ['deploymentConfig' => $deploymentConfigMock]
+            );
+            $this->assertEquals($expectedSavePath, $model->getOption('save_path'));
+            $this->assertEquals($expectedSaveHandler, $model->getOption('session.save_handler'));
+            global $mockPHPFunctions;
+            $mockPHPFunctions = false;
+        }
+
+        /**
+         * @return array
+         */
+        public function constructorDataProvider(): array
+        {
+            // preset value (null = not set), input value (null = not set), expected value
+            $savePathGiven = 'explicit_save_path';
+            $presetPath = 'preset_save_path';
+            return [
+                [2, $savePathGiven, $savePathGiven, 'db', 'db'],
+                [2, null, 'default', 'redis', 'redis'],
+                [1, $savePathGiven, $savePathGiven, null, 'php'],
+                [1, null, $presetPath, 'files', 'files'],
+            ];
+        }
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php
index 81630b1827037..aaf5da982e2f5 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php
@@ -6,18 +6,47 @@
 namespace Magento\Framework\Session;
 
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Exception\SessionException;
+use Magento\Framework\Phrase;
 use Magento\Framework\Session\Config\ConfigInterface;
-use Magento\Framework\Session\SaveHandler;
 use Magento\Framework\App\ObjectManager;
 
 class SaveHandlerTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var string Original session.save_handler ini config value */
-    private $originalSaveHandler;
+    /**
+     * @var \Magento\TestFramework\ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var SaveHandlerFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $saveHandlerFactoryMock;
 
-    public function setUp()
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+        $this->objectManager->addSharedInstance($this->deploymentConfigMock, DeploymentConfig::class);
+        $this->saveHandlerFactoryMock = $this->createMock(SaveHandlerFactory::class);
+        $this->objectManager->addSharedInstance($this->saveHandlerFactoryMock, SaveHandlerFactory::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
     {
-        $this->originalSaveHandler = ini_get('session.save_handler');
+        $this->objectManager->removeSharedInstance(DeploymentConfig::class);
+        $this->objectManager->removeSharedInstance(SaveHandlerFactory::class);
     }
 
     /**
@@ -25,57 +54,54 @@ public function setUp()
      *
      * @dataProvider saveHandlerProvider
      * @param string $deploymentConfigHandler
-     * @param string $iniHandler
+     * @return void
      */
-    public function testSetSaveHandler($deploymentConfigHandler, $iniHandler)
+    public function testConstructor($deploymentConfigHandler)
     {
-        $expected = $this->getExpectedSaveHandler($deploymentConfigHandler, $iniHandler);
+        $expected = $this->getExpectedSaveHandler($deploymentConfigHandler, ini_get('session.save_handler'));
 
-        // Set ini configuration
-        if ($iniHandler) {
-            ini_set('session.save_handler', $iniHandler);
-        }
-        $defaultHandler = ini_get('session.save_handler') ?: SaveHandlerInterface::DEFAULT_HANDLER;
-        /** @var DeploymentConfig | \PHPUnit_Framework_MockObject_MockObject $deploymentConfigMock */
-        $deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $deploymentConfigMock->expects($this->once())
-            ->method('get')
-            ->with(Config::PARAM_SESSION_SAVE_METHOD, $defaultHandler)
-            ->willReturn($deploymentConfigHandler ?: SaveHandlerInterface::DEFAULT_HANDLER);
+        $this->deploymentConfigMock->method('get')
+            ->willReturnCallback(function ($configPath) use ($deploymentConfigHandler) {
+                switch ($configPath) {
+                    case Config::PARAM_SESSION_SAVE_METHOD:
+                        return $deploymentConfigHandler;
+                    case Config::PARAM_SESSION_CACHE_LIMITER:
+                        return 'private_no_expire';
+                    case Config::PARAM_SESSION_SAVE_PATH:
+                        return 'explicit_save_path';
+                    default:
+                        return null;
+                }
+            });
 
-        new SaveHandler(
-            ObjectManager::getInstance()->get(SaveHandlerFactory::class),
-            $deploymentConfigMock
-        );
+        $this->saveHandlerFactoryMock->expects($this->once())
+            ->method('create')
+            ->with($expected);
+        $sessionConfig = $this->objectManager->create(ConfigInterface::class);
+        $this->objectManager->create(SaveHandler::class, ['sessionConfig' => $sessionConfig]);
 
         // Test expectation
         $this->assertEquals(
             $expected,
-            ObjectManager::getInstance()->get(ConfigInterface::class)->getOption('session.save_handler')
+            $sessionConfig->getOption('session.save_handler')
         );
     }
 
-    public function tearDown()
-    {
-        if (isset($this->originalSaveHandler)) {
-            ini_set('session.save_handler', $this->originalSaveHandler);
-        }
-    }
-
-    public function saveHandlerProvider()
+    /**
+     * @return array
+     */
+    public function saveHandlerProvider(): array
     {
         return [
-            ['db', false],
-            ['db', 'files'],
-            [false, 'files'],
-            [false, false],
+            ['db'],
+            ['redis'],
+            ['files'],
+            [false],
         ];
     }
 
     /**
-     * Retrieve expected session.save_handler
+     * Retrieve expected session.save_handler.
      *
      * @param string $deploymentConfigHandler
      * @param string $iniHandler
@@ -83,21 +109,44 @@ public function saveHandlerProvider()
      */
     private function getExpectedSaveHandler($deploymentConfigHandler, $iniHandler)
     {
-        // Set expected session.save_handler config
         if ($deploymentConfigHandler) {
-            if ($deploymentConfigHandler !== 'files') {
-                $expected = 'user';
-                return $expected;
-            } else {
-                $expected = $deploymentConfigHandler;
-                return $expected;
-            }
+            return $deploymentConfigHandler;
         } elseif ($iniHandler) {
-            $expected = $iniHandler;
-            return $expected;
+            return $iniHandler;
         } else {
-            $expected = SaveHandlerInterface::DEFAULT_HANDLER;
-            return $expected;
+            return SaveHandlerInterface::DEFAULT_HANDLER;
         }
     }
+
+    /**
+     * @return void
+     */
+    public function testConstructorWithException()
+    {
+        $this->deploymentConfigMock->method('get')
+            ->willReturnCallback(function ($configPath) {
+                switch ($configPath) {
+                    case Config::PARAM_SESSION_SAVE_METHOD:
+                        return 'db';
+                    case Config::PARAM_SESSION_CACHE_LIMITER:
+                        return 'private_no_expire';
+                    case Config::PARAM_SESSION_SAVE_PATH:
+                        return 'explicit_save_path';
+                    default:
+                        return null;
+                }
+            });
+
+        $this->saveHandlerFactoryMock->expects($this->at(0))
+            ->method('create')
+            ->willThrowException(new SessionException(new Phrase('Session Exception')));
+        $this->saveHandlerFactoryMock->expects($this->at(1))
+            ->method('create')
+            ->with(SaveHandlerInterface::DEFAULT_HANDLER);
+        $sessionConfig = $this->objectManager->create(ConfigInterface::class);
+        $this->objectManager->create(SaveHandler::class, ['sessionConfig' => $sessionConfig]);
+
+        // Test expectation
+        $this->assertEquals('db', $sessionConfig->getOption('session.save_handler'));
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
index 7bb9ed9da3b15..f6ee55d9f1f73 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
@@ -10,7 +10,9 @@
 
 namespace Magento\Framework\Session {
 
+    use Magento\Framework\App\DeploymentConfig;
     use Magento\Framework\App\State;
+
     // @codingStandardsIgnoreEnd
 
     /**
@@ -24,6 +26,7 @@ function session_status()
         if ($mockPHPFunctions) {
             return PHP_SESSION_NONE;
         }
+
         return call_user_func_array('\session_status', func_get_args());
     }
 
@@ -33,33 +36,96 @@ function headers_sent()
         if ($mockPHPFunctions) {
             return false;
         }
+
         return call_user_func_array('\headers_sent', func_get_args());
     }
 
     /**
+     * Mock ini_set global function.
+     *
+     * @param string $varName
+     * @param string $newValue
+     * @return bool|string
+     */
+    function ini_set($varName, $newValue)
+    {
+        global $mockPHPFunctions;
+        if ($mockPHPFunctions) {
+            SessionManagerTest::$isIniSetInvoked[$varName] = $newValue;
+
+            return true;
+        }
+
+        return call_user_func_array('\ini_set', func_get_args());
+    }
+
+    /**
+     * Mock session_set_save_handler global function.
+     *
+     * @return bool
+     */
+    function session_set_save_handler()
+    {
+        global $mockPHPFunctions;
+        if ($mockPHPFunctions) {
+            SessionManagerTest::$isSessionSetSaveHandlerInvoked = true;
+
+            return true;
+        }
+
+        return call_user_func_array('\session_set_save_handler', func_get_args());
+    }
+
+    /**
+     * Mock session_start global function.
+     *
+     * @return bool
+     */
+    function session_start()
+    {
+        global $mockPHPFunctions;
+        if ($mockPHPFunctions) {
+            return true;
+        }
+
+        return call_user_func_array('\session_start', func_get_args());
+    }
+
+    /**
+     * @magentoAppIsolation enabled
      * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
      */
     class SessionManagerTest extends \PHPUnit\Framework\TestCase
     {
+        /**
+         * @var string[]
+         */
+        public static $isIniSetInvoked = [];
+
+        /**
+         * @var bool
+         */
+        public static $isSessionSetSaveHandlerInvoked;
+
         /**
          * @var \Magento\Framework\Session\SessionManagerInterface
          */
-        protected $_model;
+        private $model;
 
         /**
          * @var \Magento\Framework\Session\SidResolverInterface
          */
-        protected $_sidResolver;
+        private $sidResolver;
 
         /**
          * @var string
          */
-        protected $sessionName;
+        private $sessionName;
 
         /**
-         * @var \Magento\Framework\ObjectManagerInterface
+         * @var \Magento\TestFramework\ObjectManager
          */
-        protected $objectManager;
+        private $objectManager;
 
         /**
          * @var \Magento\Framework\App\RequestInterface
@@ -71,6 +137,9 @@ class SessionManagerTest extends \PHPUnit\Framework\TestCase
          */
         private $appState;
 
+        /**
+         * @inheritdoc
+         */
         protected function setUp()
         {
             $this->sessionName = 'frontEndSession';
@@ -80,144 +149,186 @@ protected function setUp()
 
             $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
+            /** @var \Magento\Framework\Session\SidResolverInterface $sidResolver */
             $this->appState = $this->getMockBuilder(State::class)
                 ->setMethods(['getAreaCode'])
                 ->disableOriginalConstructor()
                 ->getMock();
 
             /** @var \Magento\Framework\Session\SidResolver $sidResolver */
-            $this->_sidResolver = $this->objectManager->create(
+            $this->sidResolver = $this->objectManager->create(
                 \Magento\Framework\Session\SidResolver::class,
                 [
-                    'appState' => $this->appState
+                    'appState' => $this->appState,
                 ]
             );
 
             $this->request = $this->objectManager->get(\Magento\Framework\App\RequestInterface::class);
-
-            /** @var \Magento\Framework\Session\SessionManager _model */
-            $this->_model = $this->objectManager->create(
-                \Magento\Framework\Session\SessionManager::class,
-                [
-                    $this->objectManager->get(\Magento\Framework\App\Request\Http::class),
-                    $this->_sidResolver,
-                    $this->objectManager->get(\Magento\Framework\Session\Config\ConfigInterface::class),
-                    $this->objectManager->get(\Magento\Framework\Session\SaveHandlerInterface::class),
-                    $this->objectManager->get(\Magento\Framework\Session\ValidatorInterface::class),
-                    $this->objectManager->get(\Magento\Framework\Session\StorageInterface::class)
-                ]
-            );
         }
 
+        /**
+         * @inheritdoc
+         */
         protected function tearDown()
         {
             global $mockPHPFunctions;
             $mockPHPFunctions = false;
+            self::$isIniSetInvoked = [];
+            self::$isSessionSetSaveHandlerInvoked = false;
+            if ($this->model !== null) {
+                $this->model->destroy();
+                $this->model = null;
+            }
         }
 
+        /**
+         * @return void
+         */
         public function testSessionNameFromIni()
         {
-            $this->_model->start();
-            $this->assertSame($this->sessionName, $this->_model->getName());
-            $this->_model->destroy();
+            $this->initializeModel();
+            $this->model->start();
+            $this->assertSame($this->sessionName, $this->model->getName());
+            $this->model->destroy();
         }
 
+        /**
+         * @return void
+         */
         public function testSessionUseOnlyCookies()
         {
+            $this->initializeModel();
             $expectedValue = '1';
             $sessionUseOnlyCookies = ini_get('session.use_only_cookies');
             $this->assertSame($expectedValue, $sessionUseOnlyCookies);
         }
 
+        /**
+         * @return void
+         */
         public function testGetData()
         {
-            $this->_model->setData(['test_key' => 'test_value']);
-            $this->assertEquals('test_value', $this->_model->getData('test_key', true));
-            $this->assertNull($this->_model->getData('test_key'));
+            $this->initializeModel();
+            $this->model->setData(['test_key' => 'test_value']);
+            $this->assertEquals('test_value', $this->model->getData('test_key', true));
+            $this->assertNull($this->model->getData('test_key'));
         }
 
+        /**
+         * @return void
+         */
         public function testGetSessionId()
         {
-            $this->assertEquals(session_id(), $this->_model->getSessionId());
+            $this->initializeModel();
+            $this->assertEquals(session_id(), $this->model->getSessionId());
         }
 
+        /**
+         * @return void
+         */
         public function testGetName()
         {
-            $this->assertEquals(session_name(), $this->_model->getName());
+            $this->initializeModel();
+            $this->assertEquals(session_name(), $this->model->getName());
         }
 
+        /**
+         * @return void
+         */
         public function testSetName()
         {
-            $this->_model->setName('test');
-            $this->assertEquals('test', $this->_model->getName());
+            $this->initializeModel();
+            $this->model->destroy();
+            $this->model->setName('test');
+            $this->model->start();
+            $this->assertEquals('test', $this->model->getName());
         }
 
+        /**
+         * @return void
+         */
         public function testDestroy()
         {
+            $this->initializeModel();
             $data = ['key' => 'value'];
-            $this->_model->setData($data);
+            $this->model->setData($data);
 
-            $this->assertEquals($data, $this->_model->getData());
-            $this->_model->destroy();
+            $this->assertEquals($data, $this->model->getData());
+            $this->model->destroy();
 
-            $this->assertEquals([], $this->_model->getData());
+            $this->assertEquals([], $this->model->getData());
         }
 
+        /**
+         * @return void
+         */
         public function testSetSessionId()
         {
-            $sessionId = $this->_model->getSessionId();
+            $this->initializeModel();
+            $sessionId = $this->model->getSessionId();
             $this->appState->expects($this->atLeastOnce())
                 ->method('getAreaCode')
                 ->willReturn(\Magento\Framework\App\Area::AREA_FRONTEND);
-            $this->_model->setSessionId($this->_sidResolver->getSid($this->_model));
-            $this->assertEquals($sessionId, $this->_model->getSessionId());
+            $this->model->setSessionId($this->sidResolver->getSid($this->model));
+            $this->assertEquals($sessionId, $this->model->getSessionId());
 
-            $this->_model->setSessionId('test');
-            $this->assertEquals('test', $this->_model->getSessionId());
+            $this->model->setSessionId('test');
+            $this->assertEquals('test', $this->model->getSessionId());
         }
 
         /**
+         * @return void
          * @magentoConfigFixture current_store web/session/use_frontend_sid 1
          */
         public function testSetSessionIdFromParam()
         {
+            $this->initializeModel();
             $this->appState->expects($this->atLeastOnce())
                 ->method('getAreaCode')
                 ->willReturn(\Magento\Framework\App\Area::AREA_FRONTEND);
-            $this->assertNotEquals('test_id', $this->_model->getSessionId());
-            $this->request->getQuery()->set($this->_sidResolver->getSessionIdQueryParam($this->_model), 'test-id');
-            $this->_model->setSessionId($this->_sidResolver->getSid($this->_model));
-            $this->assertEquals('test-id', $this->_model->getSessionId());
+            $this->assertNotEquals('test_id', $this->model->getSessionId());
+            $this->request->getQuery()->set($this->sidResolver->getSessionIdQueryParam($this->model), 'test-id');
+            $this->model->setSessionId($this->sidResolver->getSid($this->model));
+            $this->assertEquals('test-id', $this->model->getSessionId());
             /* Use not valid identifier */
-            $this->request->getQuery()->set($this->_sidResolver->getSessionIdQueryParam($this->_model), 'test_id');
-            $this->_model->setSessionId($this->_sidResolver->getSid($this->_model));
-            $this->assertEquals('test-id', $this->_model->getSessionId());
+            $this->request->getQuery()->set($this->sidResolver->getSessionIdQueryParam($this->model), 'test_id');
+            $this->model->setSessionId($this->sidResolver->getSid($this->model));
+            $this->assertEquals('test-id', $this->model->getSessionId());
         }
 
+        /**
+         * @return void
+         */
         public function testGetSessionIdForHost()
         {
+            $this->initializeModel();
             $_SERVER['HTTP_HOST'] = 'localhost';
-            $this->_model->start();
-            $this->assertEmpty($this->_model->getSessionIdForHost('localhost'));
-            $this->assertNotEmpty($this->_model->getSessionIdForHost('test'));
-            $this->_model->destroy();
+            $this->model->start();
+            $this->assertEmpty($this->model->getSessionIdForHost('localhost'));
+            $this->assertNotEmpty($this->model->getSessionIdForHost('test'));
+            $this->model->destroy();
         }
 
+        /**
+         * @return void
+         */
         public function testIsValidForHost()
         {
+            $this->initializeModel();
             $_SERVER['HTTP_HOST'] = 'localhost';
-            $this->_model->start();
+            $this->model->start();
 
-            $reflection = new \ReflectionMethod($this->_model, '_addHost');
+            $reflection = new \ReflectionMethod($this->model, '_addHost');
             $reflection->setAccessible(true);
-            $reflection->invoke($this->_model);
+            $reflection->invoke($this->model);
 
-            $this->assertFalse($this->_model->isValidForHost('test.com'));
-            $this->assertTrue($this->_model->isValidForHost('localhost'));
-            $this->_model->destroy();
+            $this->assertFalse($this->model->isValidForHost('test.com'));
+            $this->assertTrue($this->model->isValidForHost('localhost'));
+            $this->model->destroy();
         }
 
         /**
+         * @return void
          * @expectedException \Magento\Framework\Exception\SessionException
          * @expectedExceptionMessage Area code not set: Area code must be set before starting a session.
          */
@@ -232,9 +343,9 @@ public function testStartAreaNotSet()
              *
              * @var \Magento\Framework\Session\SessionManager _model
              */
-            $this->_model = new \Magento\Framework\Session\SessionManager(
+            $this->model = new \Magento\Framework\Session\SessionManager(
                 $this->objectManager->get(\Magento\Framework\App\Request\Http::class),
-                $this->_sidResolver,
+                $this->sidResolver,
                 $this->objectManager->get(\Magento\Framework\Session\Config\ConfigInterface::class),
                 $this->objectManager->get(\Magento\Framework\Session\SaveHandlerInterface::class),
                 $this->objectManager->get(\Magento\Framework\Session\ValidatorInterface::class),
@@ -246,7 +357,71 @@ public function testStartAreaNotSet()
 
             global $mockPHPFunctions;
             $mockPHPFunctions = true;
-            $this->_model->start();
+            $this->model->start();
+        }
+
+        /**
+         * @return void
+         */
+        public function testConstructor()
+        {
+            global $mockPHPFunctions;
+            $mockPHPFunctions = true;
+
+            $deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+            $deploymentConfigMock->method('get')
+                ->willReturnCallback(function ($configPath) {
+                    switch ($configPath) {
+                        case Config::PARAM_SESSION_SAVE_METHOD:
+                            return 'db';
+                        case Config::PARAM_SESSION_CACHE_LIMITER:
+                            return 'private_no_expire';
+                        case Config::PARAM_SESSION_SAVE_PATH:
+                            return 'explicit_save_path';
+                        default:
+                            return null;
+                    }
+                });
+
+            $sessionConfig = $this->objectManager->create(Config::class, ['deploymentConfig' => $deploymentConfigMock]);
+            $saveHandler = $this->objectManager->create(SaveHandler::class, ['sessionConfig' => $sessionConfig]);
+
+            $this->model = $this->objectManager->create(
+                \Magento\Framework\Session\SessionManager::class,
+                [
+                    'sidResolver' => $this->sidResolver,
+                    'saveHandler' => $saveHandler,
+                    'sessionConfig' => $sessionConfig,
+                ]
+            );
+
+            $this->assertEquals('db', $sessionConfig->getOption('session.save_handler'));
+            $this->assertEquals('private_no_expire', $sessionConfig->getOption('session.cache_limiter'));
+            $this->assertEquals('explicit_save_path', $sessionConfig->getOption('session.save_path'));
+            $this->assertArrayHasKey('session.use_only_cookies', self::$isIniSetInvoked);
+            $this->assertEquals('1', self::$isIniSetInvoked['session.use_only_cookies']);
+            foreach ($sessionConfig->getOptions() as $option => $value) {
+                if ($option=='session.save_handler') {
+                    $this->assertArrayNotHasKey('session.save_handler', self::$isIniSetInvoked);
+                } else {
+                    $this->assertArrayHasKey($option, self::$isIniSetInvoked);
+                    $this->assertEquals($value, self::$isIniSetInvoked[$option]);
+                }
+            }
+            $this->assertTrue(self::$isSessionSetSaveHandlerInvoked);
+        }
+
+        /**
+         * @return void
+         */
+        private function initializeModel()
+        {
+            $this->model = $this->objectManager->create(
+                \Magento\Framework\Session\SessionManager::class,
+                [
+                    'sidResolver' => $this->sidResolver
+                ]
+            );
         }
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
index 6e043728b073a..5e70eb491b50c 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
@@ -114,7 +114,7 @@ public function testGetSid($sid, $useFrontedSid, $isOwnOriginUrl, $testSid)
         $this->scopeConfig->expects(
             $this->any()
         )->method(
-            'getValue'
+            'isSetFlag'
         )->with(
             \Magento\Framework\Session\SidResolver::XML_PATH_USE_FRONTEND_SID,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
@@ -154,10 +154,12 @@ public function testGetSessionIdQueryParam()
 
     public function testGetSessionIdQueryParamCustom()
     {
+        $this->session->destroy();
         $oldSessionName = $this->session->getName();
         $this->session->setName($this->customSessionName);
         $this->assertEquals($this->customSessionQueryParam, $this->model->getSessionIdQueryParam($this->session));
         $this->session->setName($oldSessionName);
+        $this->session->start();
     }
 
     public function testSetGetUseSessionVar()
@@ -193,7 +195,7 @@ public function testSetGetUseSessionInUrl($configValue)
         $this->scopeConfig->expects(
             $this->any()
         )->method(
-            'getValue'
+            'isSetFlag'
         )->with(
             \Magento\Framework\Session\SidResolver::XML_PATH_USE_FRONTEND_SID,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
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 552a23a0c1fd5..674335d361ffb 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
@@ -3,9 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\ImportExport\Controller\Adminhtml\Import;
 
 use Magento\Framework\Filesystem\DirectoryList;
+use Magento\Framework\HTTP\Adapter\FileTransferFactory;
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 
@@ -17,12 +19,14 @@ class ValidateTest extends \Magento\TestFramework\TestCase\AbstractBackendContro
     /**
      * @dataProvider validationDataProvider
      * @param string $fileName
+     * @param string $mimeType
      * @param string $message
      * @param string $delimiter
      * @backupGlobals enabled
      * @magentoDbIsolation enabled
+     * @SuppressWarnings(PHPMD.Superglobals)
      */
-    public function testValidationReturn($fileName, $message, $delimiter)
+    public function testValidationReturn(string $fileName, string $mimeType, string $message, string $delimiter)
     {
         $validationStrategy = ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_STOP_ON_ERROR;
 
@@ -50,7 +54,7 @@ public function testValidationReturn($fileName, $message, $delimiter)
         $_FILES = [
             'import_file' => [
                 'name' => $fileName,
-                'type' => 'text/csv',
+                'type' => $mimeType,
                 'tmp_name' => $target,
                 'error' => 0,
                 'size' => filesize($target)
@@ -59,10 +63,7 @@ public function testValidationReturn($fileName, $message, $delimiter)
 
         $this->_objectManager->configure(
             [
-                'preferences' => [
-                    \Magento\Framework\HTTP\Adapter\FileTransferFactory::class =>
-                        \Magento\ImportExport\Controller\Adminhtml\Import\HttpFactoryMock::class
-                ]
+                'preferences' => [FileTransferFactory::class => HttpFactoryMock::class]
             ]
         );
 
@@ -79,29 +80,39 @@ public function testValidationReturn($fileName, $message, $delimiter)
     /**
      * @return array
      */
-    public function validationDataProvider()
+    public function validationDataProvider(): array
     {
         return [
             [
                 'file_name' => 'catalog_product.csv',
+                'mime-type' => 'text/csv',
                 'message' => 'File is valid',
                 'delimiter' => ',',
             ],
             [
                 'file_name' => 'test.txt',
+                'mime-type' => 'text/csv',
                 'message' => '\'txt\' file extension is not supported',
                 'delimiter' => ',',
             ],
             [
                 'file_name' => 'incorrect_catalog_product_comma.csv',
+                'mime-type' => 'text/csv',
                 'message' => 'Download full report',
                 'delimiter' => ',',
             ],
             [
                 'file_name' => 'incorrect_catalog_product_semicolon.csv',
+                'mime-type' => 'text/csv',
                 'message' => 'Download full report',
                 'delimiter' => ';',
             ],
+            [
+                'file_name' => 'catalog_product.zip',
+                'mime-type' => 'application/zip',
+                'message' => 'File is valid',
+                'delimiter' => ',',
+            ],
         ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/_files/catalog_product.zip b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/_files/catalog_product.zip
new file mode 100644
index 0000000000000..812beae22b786
Binary files /dev/null and b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/_files/catalog_product.zip differ
diff --git a/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/DeleteTest.php b/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/DeleteTest.php
index 92ae76b0d9a4d..c6cc68582ae6b 100644
--- a/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/DeleteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/DeleteTest.php
@@ -39,8 +39,8 @@ public function testRender()
         $buttonHtml = $this->deleteButtonBlock->render($integration);
         $this->assertContains('title="Remove"', $buttonHtml);
         $this->assertContains(
-            'onclick="this.setAttribute(\'data-url\', '
-            . '\'http://localhost/index.php/backend/admin/integration/delete/id/'
+            'onclick="this.setAttribute(&#039;data-url&#039;, '
+            . '&#039;http://localhost/index.php/backend/admin/integration/delete/id/'
             . $integration->getId(),
             $buttonHtml
         );
@@ -54,8 +54,8 @@ public function testRenderDisabled()
         $buttonHtml = $this->deleteButtonBlock->render($integration);
         $this->assertContains('title="Uninstall the extension to remove this integration"', $buttonHtml);
         $this->assertContains(
-            'onclick="this.setAttribute(\'data-url\', '
-            . '\'http://localhost/index.php/backend/admin/integration/delete/id/'
+            'onclick="this.setAttribute(&#039;data-url&#039;, '
+            . '&#039;http://localhost/index.php/backend/admin/integration/delete/id/'
             . $integration->getId(),
             $buttonHtml
         );
diff --git a/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/EditTest.php b/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/EditTest.php
index df180d020888a..0463053e6b5f1 100644
--- a/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/EditTest.php
+++ b/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/EditTest.php
@@ -40,7 +40,7 @@ public function testRenderEdit()
         $this->assertContains('title="Edit"', $buttonHtml);
         $this->assertContains('class="action edit"', $buttonHtml);
         $this->assertContains(
-            'onclick="window.location.href=\'http://localhost/index.php/backend/admin/integration/edit/id/'
+            'onclick="window.location.href=&#039;http://localhost/index.php/backend/admin/integration/edit/id/'
             . $integration->getId(),
             $buttonHtml
         );
diff --git a/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php b/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
index 8011873577dc8..4da0c12c6087a 100644
--- a/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
+++ b/dev/tests/integration/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
@@ -7,6 +7,7 @@
 namespace Magento\Integration\Controller\Adminhtml;
 
 use Magento\TestFramework\Bootstrap;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * \Magento\Integration\Controller\Adminhtml\Integration
@@ -20,6 +21,9 @@ class IntegrationTest extends \Magento\TestFramework\TestCase\AbstractBackendCon
     /** @var \Magento\Integration\Model\Integration  */
     private $_integration;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -29,6 +33,9 @@ protected function setUp()
         $this->_integration = $integration->load('Fixture Integration', 'name');
     }
 
+    /**
+     * Test view page.
+     */
     public function testIndexAction()
     {
         $this->dispatch('backend/admin/integration/index');
@@ -44,6 +51,9 @@ public function testIndexAction()
         );
     }
 
+    /**
+     * Test creation form.
+     */
     public function testNewAction()
     {
         $this->dispatch('backend/admin/integration/new');
@@ -61,6 +71,9 @@ public function testNewAction()
         );
     }
 
+    /**
+     * Test update form.
+     */
     public function testEditAction()
     {
         $integrationId = $this->_integration->getId();
@@ -88,12 +101,16 @@ public function testEditAction()
         );
     }
 
+    /**
+     * Test saving.
+     */
     public function testSaveActionUpdateIntegration()
     {
         $integrationId = $this->_integration->getId();
         $integrationName = $this->_integration->getName();
         $this->getRequest()->setParam('id', $integrationId);
         $url = 'http://magento.ll/endpoint_url';
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(
             [
                 'name' => $integrationName,
@@ -111,10 +128,14 @@ public function testSaveActionUpdateIntegration()
         $this->assertRedirect($this->stringContains('backend/admin/integration/index/'));
     }
 
+    /**
+     * Test saving.
+     */
     public function testSaveActionNewIntegration()
     {
         $url = 'http://magento.ll/endpoint_url';
         $integrationName = md5(rand());
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(
             [
                 'name' => $integrationName,
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Subscriber/GridTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Subscriber/GridTest.php
new file mode 100644
index 0000000000000..48d3356525f49
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Subscriber/GridTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Newsletter\Block\Adminhtml\Subscriber;
+
+/**
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation enabled
+ *
+ * @see \Magento\Newsletter\Block\Adminhtml\Subscriber\Grid
+ */
+class GridTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var null|\Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager = null;
+    /**
+     * @var null|\Magento\Framework\View\LayoutInterface
+     */
+    private $layout = null;
+
+    /**
+     * Set up layout.
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $this->layout = $this->objectManager->create(\Magento\Framework\View\LayoutInterface::class);
+        $this->layout->getUpdate()->load('newsletter_subscriber_grid');
+        $this->layout->generateXml();
+        $this->layout->generateElements();
+    }
+
+    /**
+     * Check if mass action block exists.
+     */
+    public function testMassActionBlockExists()
+    {
+        $this->assertNotFalse(
+            $this->getMassActionBlock(),
+            'Mass action block does not exist in the grid, or it name was changed.'
+        );
+    }
+
+    /**
+     * Check if mass action id field is correct.
+     */
+    public function testMassActionFieldIdIsCorrect()
+    {
+        $this->assertEquals(
+            'subscriber_id',
+            $this->getMassActionBlock()->getMassactionIdField(),
+            'Mass action id field is incorrect.'
+        );
+    }
+
+    /**
+     * Check if function returns correct result.
+     *
+     * @magentoDataFixture Magento/Newsletter/_files/subscribers.php
+     */
+    public function testMassActionBlockContainsCorrectIdList()
+    {
+        $this->assertEquals(
+            implode(',', $this->getAllSubscriberIdList()),
+            $this->getMassActionBlock()->getGridIdsJson(),
+            'Function returns incorrect result.'
+        );
+    }
+
+    /**
+     * Retrieve mass action block.
+     *
+     * @return bool|\Magento\Backend\Block\Widget\Grid\Massaction
+     */
+    private function getMassActionBlock()
+    {
+        return $this->layout->getBlock('adminhtml.newslettrer.subscriber.grid.massaction');
+    }
+
+    /**
+     * Retrieve list of id of all subscribers.
+     *
+     * @return array
+     */
+    private function getAllSubscriberIdList()
+    {
+        /** @var \Magento\Framework\App\ResourceConnection $resourceConnection */
+        $resourceConnection = $this->objectManager->get(\Magento\Framework\App\ResourceConnection::class);
+        $select = $resourceConnection->getConnection()
+            ->select()
+            ->from($resourceConnection->getTableName('newsletter_subscriber'))
+            ->columns(['subscriber_id' => 'subscriber_id']);
+
+        return $resourceConnection->getConnection()->fetchCol($select);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php
index 5c1a11756c1b1..7a0ac030d120b 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 /**
  * @magentoAppArea adminhtml
  */
@@ -15,6 +17,9 @@ class NewsletterQueueTest extends \Magento\TestFramework\TestCase\AbstractBacken
      */
     protected $_model;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -23,6 +28,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @inheritDoc
+     */
     protected function tearDown()
     {
         /**
@@ -47,6 +55,7 @@ public function testSaveActionQueueTemplateAndVerifySuccessMessage()
             'subject' => 'test subject',
             'text' => 'newsletter text',
         ];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postForQueue);
 
         // Loading by code, since ID will vary. template_code is not actually used to load anywhere else.
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php
index 50e89d92e434c..4a5b190d789d7 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php
@@ -20,6 +20,9 @@ class NewsletterTemplateTest extends \Magento\TestFramework\TestCase\AbstractBac
      */
     protected $model;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -39,6 +42,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @inheritDoc
+     */
     protected function tearDown()
     {
         /**
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php
index 5347881f5e7d4..e13af108e6fa5 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php
@@ -53,11 +53,10 @@ public function testNewActionUsedEmail()
         $this->getRequest()->setPostValue([
             'email' => 'customer@example.com',
         ]);
-
         $this->dispatch('newsletter/subscriber/new');
 
         $this->assertSessionMessages($this->equalTo([
-                'There was a problem with the subscription: This email address is already assigned to another user.',
+                'Thank you for your subscription.',
             ]));
         $this->assertRedirect($this->anything());
     }
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php
index c6ba498319ff8..6c7aa204fded2 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php
@@ -8,6 +8,11 @@
 
 class SubscriberTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Magento\TestFramework\ObjectManager
+     */
+    private $objectManager;
+
     /**
      * @var Subscriber
      */
@@ -15,7 +20,8 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->_model = $this->objectManager->create(
             \Magento\Newsletter\Model\Subscriber::class
         );
     }
@@ -27,7 +33,7 @@ protected function setUp()
     public function testEmailConfirmation()
     {
         $this->_model->subscribe('customer_confirm@example.com');
-        $transportBuilder = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+        $transportBuilder = $this->objectManager
             ->get(\Magento\TestFramework\Mail\Template\TransportBuilderMock::class);
         // confirmationCode 'ysayquyajua23iq29gxwu2eax2qb6gvy' is taken from fixture
         $this->assertContains(
@@ -77,4 +83,47 @@ public function testUnsubscribeSubscribeByCustomerId()
         $this->assertSame($this->_model, $this->_model->subscribeCustomerById(1));
         $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $this->_model->getSubscriberStatus());
     }
+
+    /**
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     */
+    public function testSubscribeGuestRegisterCustomerWithSameEmailFromDifferentStore()
+    {
+        /** @var \Magento\Store\Model\Store $store */
+        $store = $this->objectManager->create(\Magento\Store\Model\Store::class);
+        $defaultStoreId = $store->load('default', 'code')->getId();
+        $secondStoreId = $store->load('fixture_second_store', 'code')->getId();
+
+        $email = 'test@example.com';
+
+        // Subscribing guest to a newsletter from default store
+        $this->_model->setStoreId($defaultStoreId)
+            ->setCustomerId(0)
+            ->setSubscriberEmail($email)
+            ->setSubscriberStatus(\Magento\Newsletter\Model\Subscriber::STATUS_SUBSCRIBED)
+            ->save();
+
+        // Registering customer with the same email from second store
+        $customer = $this->objectManager->create(
+            \Magento\Customer\Model\Data\Customer::class,
+            [
+                'data' => [
+                    \Magento\Customer\Model\Data\Customer::FIRSTNAME => 'John',
+                    \Magento\Customer\Model\Data\Customer::LASTNAME => 'Doe',
+                    \Magento\Customer\Model\Data\Customer::EMAIL => $email,
+                    \Magento\Customer\Model\Data\Customer::STORE_ID => $secondStoreId,
+                ]
+            ]
+        );
+
+        /** @var \Magento\Customer\Api\AccountManagementInterface $accountManagement */
+        $accountManagement = $this->objectManager->get(\Magento\Customer\Api\AccountManagementInterface::class);
+        $customer = $accountManagement->createAccount($customer);
+
+        /** @var \Magento\Newsletter\Model\ResourceModel\Subscriber\Collection $subscribers */
+        $subscribers = $this->_model->getCollection()->addFieldToFilter('subscriber_email', $email);
+
+        $this->assertCount(1, $subscribers->getItems());
+        $this->assertEquals($subscribers->getFirstItem()->getCustomerId(), $customer->getId());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheStateTest.php b/dev/tests/integration/testsuite/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheStateTest.php
new file mode 100644
index 0000000000000..456e6df3a7421
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheStateTest.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageCache\Observer\SwitchPageCacheOnMaintenance;
+
+use PHPUnit\Framework\TestCase;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Page Cache state test.
+ */
+class PageCacheStateTest extends TestCase
+{
+    /**
+     * @var PageCacheState
+     */
+    private $pageCacheStateStorage;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->pageCacheStateStorage = $objectManager->get(PageCacheState::class);
+    }
+
+    /**
+     * Tests save state.
+     *
+     * @param bool $state
+     * @return void
+     * @dataProvider saveStateProvider
+     */
+    public function testSave(bool $state)
+    {
+        $this->pageCacheStateStorage->save($state);
+        $this->assertEquals($state, $this->pageCacheStateStorage->isEnabled());
+    }
+
+    /**
+     * Tests flush state.
+     *
+     * @return void
+     */
+    public function testFlush()
+    {
+        $this->pageCacheStateStorage->save(true);
+        $this->assertTrue($this->pageCacheStateStorage->isEnabled());
+        $this->pageCacheStateStorage->flush();
+        $this->assertFalse($this->pageCacheStateStorage->isEnabled());
+    }
+
+    /**
+     * Save state provider.
+     *
+     * @return array
+     */
+    public function saveStateProvider(): array
+    {
+        return [[true], [false]];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Payment/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/Payment/Helper/DataTest.php
index e6689b37151b7..18e230feea20c 100644
--- a/dev/tests/integration/testsuite/Magento/Payment/Helper/DataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Payment/Helper/DataTest.php
@@ -3,22 +3,59 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+namespace Magento\Payment\Helper;
+
+use PHPUnit\Framework\TestCase;
+use Magento\OfflinePayments\Block\Info\Checkmo;
+use Magento\Payment\Model\Info;
+use Magento\TestFramework\Helper\Bootstrap;
 
 /**
  * Test class for \Magento\Payment\Helper\Data
  */
-namespace Magento\Payment\Helper;
-
-class DataTest extends \PHPUnit\Framework\TestCase
+class DataTest extends TestCase
 {
+    /**
+     * @var Data
+     */
+    private $helper;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->helper = Bootstrap::getObjectManager()->get(Data::class);
+    }
+
+    /**
+     * @return void
+     */
     public function testGetInfoBlock()
     {
-        $helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Payment\Helper\Data::class);
-        $paymentInfo = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Payment\Model\Info::class
+        $paymentInfo = Bootstrap::getObjectManager()->create(
+            Info::class
         );
         $paymentInfo->setMethod('checkmo');
-        $result = $helper->getInfoBlock($paymentInfo);
-        $this->assertInstanceOf(\Magento\OfflinePayments\Block\Info\Checkmo::class, $result);
+        $result = $this->helper->getInfoBlock($paymentInfo);
+        $this->assertInstanceOf(Checkmo::class, $result);
+    }
+
+    /**
+     * Test to load Payment method title from the store config
+     *
+     * @magentoConfigFixture current_store payment/cashondelivery/title Cash On Delivery Title Of The Method
+     */
+    public function testPaymentMethodLabelByStore()
+    {
+        $result = $this->helper->getPaymentMethodList(true, true);
+        $this->assertArrayHasKey('cashondelivery', $result, 'Payment info does not exist');
+        $this->assertEquals(
+            'Cash On Delivery Title Of The Method',
+            $result['cashondelivery']['label'],
+            'Payment method title is not loaded from the store config'
+        );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php
index 95e3abbfe6ff1..7cae512207b36 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php
@@ -226,4 +226,43 @@ public function testReturnAction()
         $this->_objectManager->removeSharedInstance(ApiFactory::class);
         $this->_objectManager->removeSharedInstance(PaypalSession::class);
     }
+
+    /**
+     * @magentoConfigFixture current_store carriers/freeshipping/active 1
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @magentoDataFixture Magento/Paypal/_files/quote_payment.php
+     * @return void
+     */
+    public function testPlaceOrderZeroGrandTotal()
+    {
+        /** @var \Magento\Framework\Escaper $escaper */
+        $escaper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Escaper::class);
+        /** @var Quote $quote */
+        $quote = $this->_objectManager->create(Quote::class);
+        $quote->load('test01', 'reserved_order_id');
+        $quote->getShippingAddress()->setShippingMethod('freeshipping');
+        $quote->getShippingAddress()->setCollectShippingRates(true);
+        /** @var \Magento\Quote\Model\Quote\Item[] $items */
+        $items = $quote->getItemsCollection()->getItems();
+        $quoteItem = reset($items);
+        /** @var \Magento\Quote\Model\Quote\Item\Updater $quoteItemUpdater */
+        $quoteItemUpdater = $this->_objectManager->get(\Magento\Quote\Model\Quote\Item\Updater::class);
+        $quoteItemUpdater->update($quoteItem, ['qty' => 1, 'custom_price' => 0]);
+        $quote->setTotalsCollectedFlag(false)->collectTotals()->save();
+
+        $this->_objectManager->get(Session::class)->setQuoteId($quote->getId());
+
+        $this->dispatch('paypal/express/placeOrder');
+        $this->assertSessionMessages(
+            $this->equalTo(
+                [
+                    $escaper->escapeHtml(
+                        (string)__('PayPal can\'t process orders with a zero balance due. '
+                        . 'To finish your purchase, please go through the standard checkout process.')
+                    )
+                ]
+            ),
+            \Magento\Framework\Message\MessageInterface::TYPE_ERROR
+        );
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/Transparent/ResponseTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Transparent/ResponseTest.php
new file mode 100644
index 0000000000000..e2bb1d7b8f7c6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Transparent/ResponseTest.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Controller\Transparent;
+
+use Magento\Checkout\Model\Session;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Intl\DateTimeFactory;
+use Magento\Framework\Session\Generic as GenericSession;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Api\PaymentMethodManagementInterface;
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * Tests PayPal transparent response controller.
+ */
+class ResponseTest extends AbstractController
+{
+    /**
+     * Tests setting credit card expiration month and year to payment from PayPal response.
+     *
+     * @param string $currentDateTime
+     * @param string $paypalExpDate
+     * @param string $expectedCcMonth
+     * @param string $expectedCcYear
+     * @throws NoSuchEntityException
+     *
+     * @magentoConfigFixture current_store payment/payflowpro/active 1
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @dataProvider paymentCcExpirationDateDataProvider
+     */
+    public function testPaymentCcExpirationDate(
+        string $currentDateTime,
+        string $paypalExpDate,
+        string $expectedCcMonth,
+        string $expectedCcYear
+    ) {
+        $reservedOrderId = 'test01';
+        $postData = [
+            'EXPDATE' => $paypalExpDate,
+            'AMT' => '0.00',
+            'RESPMSG' => 'Verified',
+            'CVV2MATCH' => 'Y',
+            'PNREF' => 'A10AAD866C87',
+            'SECURETOKEN' => '3HYEHfG06skydAdBXbpIl8QJZ',
+            'AVSDATA' => 'YNY',
+            'RESULT' => '0',
+            'IAVS' => 'N',
+            'AVSADDR' => 'Y',
+            'SECURETOKENID' => 'yqanLisRZbI0HAG8q3SbbKbhiwjNZAGf',
+        ];
+
+        $quote = $this->getQuote($reservedOrderId);
+        $this->getRequest()->setPostValue($postData);
+
+        /** @var Session $checkoutSession */
+        $checkoutSession = $this->_objectManager->get(GenericSession::class);
+        $checkoutSession->setQuoteId($quote->getId());
+        $this->setCurrentDateTime($currentDateTime);
+
+        $this->dispatch('paypal/transparent/response');
+
+        /** @var PaymentMethodManagementInterface $paymentManagment */
+        $paymentManagment = $this->_objectManager->get(PaymentMethodManagementInterface::class);
+        $payment = $paymentManagment->get($quote->getId());
+
+        $this->assertEquals($expectedCcMonth, $payment->getCcExpMonth());
+        $this->assertEquals($expectedCcYear, $payment->getCcExpYear());
+    }
+
+    /**
+     * @return array
+     */
+    public function paymentCcExpirationDateDataProvider(): array
+    {
+        return [
+            'Expiration year in current century' => [
+                'currentDateTime' => '2019-07-05 00:00:00',
+                'paypalExpDate' => '0321',
+                'expectedCcMonth' => 3,
+                'expectedCcYear' => 2021
+            ],
+            'Expiration year in next century' => [
+                'currentDateTime' => '2099-01-01 00:00:00',
+                'paypalExpDate' => '1002',
+                'expectedCcMonth' => 10,
+                'expectedCcYear' => 2102
+            ]
+        ];
+    }
+
+    /**
+     * Sets current date and time.
+     *
+     * @param string $date
+     */
+    private function setCurrentDateTime(string $dateTime)
+    {
+        $dateTime = new \DateTime($dateTime, new \DateTimeZone('UTC'));
+        $dateTimeFactory = $this->getMockBuilder(DateTimeFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $dateTimeFactory->method('create')
+            ->willReturn($dateTime);
+
+        $this->_objectManager->addSharedInstance($dateTimeFactory, DateTimeFactory::class);
+    }
+
+    /**
+     * Gets quote by reserved order ID.
+     *
+     * @param string $reservedOrderId
+     * @return CartInterface
+     */
+    private function getQuote(string $reservedOrderId): CartInterface
+    {
+        $searchCriteria = $this->_objectManager->get(SearchCriteriaBuilder::class)
+            ->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class);
+        $items = $quoteRepository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderTest.php
deleted file mode 100644
index 6b966a045c982..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/ReaderTest.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Paypal\Model\Config\Structure\Reader;
-
-use Magento\Framework\ObjectManagerInterface;
-
-/**
- * Class ReaderTest
- */
-class ReaderTest extends \PHPUnit\Framework\TestCase
-{
-    const EXPECTED = '/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected';
-
-    const ACTUAL = '/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/actual';
-
-    /**
-     * @var ObjectManagerInterface
-     */
-    protected $objectManager;
-
-    /**
-     * @var \Magento\Framework\App\Utility\Files
-     */
-    protected $fileUtility;
-
-    /**
-     * @var \Magento\Framework\Config\ValidationStateInterface
-     */
-    protected $validationStateMock;
-
-    /**
-     * @var \Magento\Framework\Config\SchemaLocatorInterface
-     */
-    protected $schemaLocatorMock;
-
-    /**
-     * @var \Magento\Framework\Config\FileResolverInterface
-     */
-    protected $fileResolverMock;
-
-    /**
-     * @var \Magento\Paypal\Model\Config\Structure\Reader\ReaderStub
-     */
-    protected $reader;
-
-    /**
-     * @var \Magento\Paypal\Model\Config\Structure\Reader\ConverterStub
-     */
-    protected $converter;
-
-    /**
-     * Set up
-     *
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->fileUtility = \Magento\Framework\App\Utility\Files::init();
-
-        $this->validationStateMock = $this->getMockBuilder(\Magento\Framework\Config\ValidationStateInterface::class)
-            ->setMethods(['isValidationRequired'])
-            ->getMockForAbstractClass();
-        $this->schemaLocatorMock = $this->getMockBuilder(\Magento\Config\Model\Config\SchemaLocator::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getPerFileSchema'])
-            ->getMock();
-        $this->fileResolverMock = $this->getMockBuilder(\Magento\Framework\Config\FileResolverInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->validationStateMock->expects($this->atLeastOnce())
-            ->method('isValidationRequired')
-            ->willReturn(false);
-        $this->schemaLocatorMock->expects($this->atLeastOnce())
-            ->method('getPerFileSchema')
-            ->willReturn(false);
-
-        /** @var \Magento\Paypal\Model\Config\Structure\Reader\ConverterStub $converter */
-        $this->converter = $this->objectManager->create(
-            \Magento\Paypal\Model\Config\Structure\Reader\ConverterStub::class
-        );
-
-        $this->reader = $this->objectManager->create(
-            \Magento\Paypal\Model\Config\Structure\Reader\ReaderStub::class,
-            [
-                'fileResolver' => $this->fileResolverMock,
-                'converter' => $this->converter,
-                'schemaLocator' => $this->schemaLocatorMock,
-                'validationState' => $this->validationStateMock,
-                'fileName' => 'no_existing_file.xml',
-                'domDocumentClass' => \Magento\Framework\Config\Dom::class
-            ]
-        );
-    }
-
-    /**
-     *  The test checks the file structure after processing the nodes responsible for inserting content
-     *
-     * @return void
-     */
-    public function testXmlConvertedConfigurationAndCompereStructure()
-    {
-        $actual = $this->reader->readFiles(['actual' => $this->getActualContent()]);
-
-        $document = new \DOMDocument();
-        $document->loadXML($this->getExpectedContent());
-
-        $expected = $this->converter->getArrayData($document);
-
-        $this->assertEquals($expected, $actual);
-    }
-
-    /**
-     * @return string
-     */
-    protected function getActualContent()
-    {
-        $files = $this->fileUtility->getFiles([BP . static::ACTUAL], 'config.xml');
-
-        return file_get_contents(reset($files));
-    }
-
-    /**
-     * @return string
-     */
-    protected function getExpectedContent()
-    {
-        $files = $this->fileUtility->getFiles([BP . static::EXPECTED], 'config.xml');
-
-        return file_get_contents(reset($files));
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
deleted file mode 100644
index 2552d383bbcc3..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
+++ /dev/null
@@ -1,2369 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
-    <system>
-        <section id="payment">
-            <group id="account" translate="label" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
-                <label>Merchant Location</label>
-                <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>
-                    <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>
-                    <config_path>paypal/general/merchant_country</config_path>
-                </field>
-            </group>
-            <group id="recommended_solutions" translate="label" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Recommended Solutions:</label>
-                <fieldset_css>paypal-top-section paypal-recommended-header</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-            </group>
-            <group id="other_paypal_payment_solutions" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Other PayPal Payment Solutions:</label>
-                <fieldset_css>paypal-top-section paypal-other-header</fieldset_css>
-                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-            </group>
-            <group id="other_payment_methods" translate="label" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Other Payment Methods:</label>
-                <fieldset_css>paypal-top-section payments-other-header</fieldset_css>
-                <frontend_model>\Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-            </group>
-        </section>
-        <section id="payment_all_paypal" showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_payflowpro" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
-                <label>Payflow Pro</label>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                <fieldset_css>paypal-other-section</fieldset_css>
-                <comment><![CDATA[Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)]]></comment>
-                <attribute type="activity_path">payment/payflowpro/active</attribute>
-                <attribute type="paypal_ec_separate">1</attribute>
-                <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
-                    <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-pro.html</comment>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
-                </group>
-                <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                    <label>Required PayPal Settings</label>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                    <group id="paypal_payflow_api_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                        <label>Payflow Pro</label>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                        <field id="partner" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1">
-                            <label>Partner</label>
-                            <config_path>payment/payflowpro/partner</config_path>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="user" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
-                            <label>User</label>
-                            <config_path>payment/payflowpro/user</config_path>
-                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="vendor" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1">
-                            <label>Vendor</label>
-                            <config_path>payment/payflowpro/vendor</config_path>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="pwd" translate="label" type="obscure" sortOrder="50" showInDefault="1" showInWebsite="1">
-                            <label>Password</label>
-                            <config_path>payment/payflowpro/pwd</config_path>
-                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="sandbox_flag" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1">
-                            <label>Test Mode</label>
-                            <config_path>payment/payflowpro/sandbox_flag</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="use_proxy" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
-                            <label>Use Proxy</label>
-                            <config_path>payment/payflowpro/use_proxy</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="proxy_host" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1">
-                            <label>Proxy Host</label>
-                            <config_path>payment/payflowpro/proxy_host</config_path>
-                            <depends>
-                                <field id="use_proxy">1</field>
-                            </depends>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="proxy_port" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1">
-                            <label>Proxy Port</label>
-                            <config_path>payment/payflowpro/proxy_port</config_path>
-                            <depends>
-                                <field id="use_proxy">1</field>
-                            </depends>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                    </group>
-                    <field id="enable_paypal_payflow" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
-                        <label>Enable this Solution</label>
-                        <config_path>payment/payflowpro/active</config_path>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
-                        <requires>
-                            <group id="paypal_payflow_api_settings"/>
-                        </requires>
-                    </field>
-                    <field id="payflowpro_cc_vault_active" translate="label" type="select" sortOrder="22" showInDefault="1" showInWebsite="1" showInStore="0">
-                        <label>Vault Enabled</label>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <config_path>payment/payflowpro_cc_vault/active</config_path>
-                        <attribute type="shared">1</attribute>
-                        <requires>
-                            <group id="paypal_payflow_api_settings"/>
-                        </requires>
-                    </field>
-                </group>
-                <group id="settings_paypal_payflow" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                    <label>Basic Settings - PayPal Payflow Pro</label>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                    <field id="title" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Title</label>
-                        <comment>It is recommended to set this value to "Debit or Credit Card" per store views.</comment>
-                        <config_path>payment/payflowpro/title</config_path>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="payflowpro_cc_vault_title" translate="label" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0">
-                        <label>Vault Title</label>
-                        <config_path>payment/payflowpro_cc_vault/title</config_path>
-                    </field>
-                    <field id="sort_order" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Sort Order</label>
-                        <config_path>payment/payflowpro/sort_order</config_path>
-                        <frontend_class>validate-number</frontend_class>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                        <label>Payment Action</label>
-                        <config_path>payment/payflowpro/payment_action</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="heading_cc" translate="label" sortOrder="40" showInDefault="1" showInWebsite="1">
-                        <label>Credit Card Settings</label>
-                        <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="cctypes" translate="label comment" type="multiselect" sortOrder="50" showInDefault="1" showInWebsite="1">
-                        <label>Allowed Credit Card Types</label>
-                        <comment>
-                            <![CDATA[Supporting of American Express cards require additional agreement. Learn more at <a href="http://www.paypal.com/amexupdate">http://www.paypal.com/amexupdate</a>.]]>
-                        </comment>
-                        <config_path>payment/payflowpro/cctypes</config_path>
-                        <source_model>Magento\Paypal\Model\Config::getPayflowproCcTypesAsOptionArray</source_model>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <group id="settings_paypal_payflow_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
-                        <label>Advanced Settings</label>
-                        <fieldset_css>config-advanced</fieldset_css>
-                        <field id="allowspecific" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
-                            <label>Payment Applicable From</label>
-                            <config_path>payment/payflowpro/allowspecific</config_path>
-                            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="specificcountry" translate="label" type="multiselect" sortOrder="20" showInDefault="1" showInWebsite="1">
-                            <label>Countries Payment Applicable From</label>
-                            <config_path>payment/payflowpro/specificcountry</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
-                            <depends>
-                                <field id="allowspecific">1</field>
-                            </depends>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="debug" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                            <label>Debug Mode</label>
-                            <config_path>payment/payflowpro/debug</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="verify_peer" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1">
-                            <label>Enable SSL verification</label>
-                            <config_path>payment/payflowpro/verify_peer</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="useccv" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
-                            <label>Require CVV Entry</label>
-                            <config_path>payment/payflowpro/useccv</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <group id="paypal_payflow_avs_check" translate="label" showInDefault="1" showInWebsite="1" sortOrder="80">
-                            <label>CVV and AVS Settings</label>
-                            <field id="heading_avs_settings" translate="label" sortOrder="0" showInDefault="1" showInWebsite="1">
-                                <label>Reject Transaction if:</label>
-                                <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="avs_street" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1">
-                                <label>AVS Street Does Not Match</label>
-                                <config_path>payment/payflowpro/avs_street</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="avs_zip" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1">
-                                <label>AVS Zip Does Not Match</label>
-                                <config_path>payment/payflowpro/avs_zip</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="avs_international" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1">
-                                <label>Card Issuer Is Outside The United States</label>
-                                <config_path>payment/payflowpro/avs_international</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="avs_security_code" translate="label" type="select" sortOrder="4" showInDefault="1" showInWebsite="1">
-                                <label>Card Security Code Does Not Match</label>
-                                <config_path>payment/payflowpro/avs_security_code</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">0</attribute>
-                            </field>
-                        </group>
-                        <group id="paypal_payflow_settlement_report" translate="label" showInDefault="1" showInWebsite="1" sortOrder="90">
-                            <label>Settlement Report Settings</label>
-                            <field id="heading_sftp" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_sftp"/>
-                            <field id="settlement_reports_ftp_login" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_login"/>
-                            <field id="settlement_reports_ftp_password" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_password"/>
-                            <field id="settlement_reports_ftp_sandbox" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_sandbox"/>
-                            <field id="settlement_reports_ftp_ip" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_ip"/>
-                            <field id="settlement_reports_ftp_path" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_path"/>
-                            <field id="heading_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_schedule"/>
-                            <field id="settlement_reports_active" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_active"/>
-                            <field id="settlement_reports_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_schedule"/>
-                            <field id="settlement_reports_time" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_time"/>
-                        </group>
-                    </group>
-                </group>
-            </group>
-            <group id="payflow_link" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                <label>Payflow Link</label>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                <fieldset_css>paypal-other-section</fieldset_css>
-                <comment><![CDATA[Connect your merchant account with a PCI-compliant gateway that lets customers pay without leaving your site. (<u>Includes Express Checkout</u>)]]></comment>
-                <attribute type="activity_path">payment/payflow_link/active</attribute>
-                <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
-                    <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payflow-link.html</comment>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
-                </group>
-                <group id="payflow_link_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                    <label>Required PayPal Settings</label>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                    <group id="payflow_link_payflow_link" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                        <label>Payflow Link and Express Checkout</label>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                        <field id="business_account" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/business_account" translate="label" sortOrder="5">
-                            <frontend_class>not-required</frontend_class>
-                            <label>Email Associated with PayPal Merchant Account (Optional)</label>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="partner" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1">
-                            <label>Partner</label>
-                            <config_path>payment/payflow_link/partner</config_path>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="vendor" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1">
-                            <label>Vendor</label>
-                            <config_path>payment/payflow_link/vendor</config_path>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="user" translate="label comment" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
-                            <label>User</label>
-                            <comment>If you do not have multiple users set up on your account, please re-enter your Vendor/Merchant Login here.</comment>
-                            <config_path>payment/payflow_link/user</config_path>
-                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="pwd" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1">
-                            <label>Password</label>
-                            <config_path>payment/payflow_link/pwd</config_path>
-                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="sandbox_flag" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
-                            <label>Test Mode</label>
-                            <config_path>payment/payflow_link/sandbox_flag</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="use_proxy" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1">
-                            <label>Use Proxy</label>
-                            <config_path>payment/payflow_link/use_proxy</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="proxy_host" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1">
-                            <label>Proxy Host</label>
-                            <config_path>payment/payflow_link/proxy_host</config_path>
-                            <depends>
-                                <field id="use_proxy">1</field>
-                            </depends>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="proxy_port" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1">
-                            <label>Proxy Port</label>
-                            <config_path>payment/payflow_link/proxy_port</config_path>
-                            <depends>
-                                <field id="use_proxy">1</field>
-                            </depends>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="payflowlink_info" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Info</frontend_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                    </group>
-
-
-
-                    <field id="enable_payflow_link" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
-                        <label>Enable Payflow Link</label>
-                        <config_path>payment/payflow_link/active</config_path>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
-                        <requires>
-                            <group id="payflow_link_payflow_link"/>
-                        </requires>
-                    </field>
-                    <field id="enable_express_checkout_basic" translate="label" type="select" sortOrder="40">
-                        <label>Enable Express Checkout</label>
-                        <config_path>payment/payflow_express/active</config_path>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Express</frontend_model>
-                    </field>
-                    <field id="enable_express_checkout" extends="payment_all_paypal/payflow_link/payflow_link_required/enable_express_checkout_basic" showInDefault="1" showInWebsite="1">
-                        <requires>
-                            <field id="enable_payflow_link"/>
-                        </requires>
-                    </field>
-                    <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="41">
-                        <comment><![CDATA[Payflow Link lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
-                        You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                        <a href="https:/www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
-                        </comment>
-                        <config_path>payment/payflow_express_bml/active</config_path>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Bml</frontend_model>
-                        <requires>
-                            <field id="enable_express_checkout"/>
-                        </requires>
-                    </field>
-                    <field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order">
-                        <config_path>payment/payflow_express_bml/sort_order</config_path>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder</frontend_model>
-                        <depends>
-                            <field id="enable_express_checkout_bml">1</field>
-                        </depends>
-                    </field>
-
-
-
-                    <group id="payflow_link_advertise_bml"  translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="60">
-                        <label>Advertise PayPal Credit</label>
-                        <comment>
-                            <![CDATA[<a href="https:/financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
-                        <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
-                        from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
-                        Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
-                        The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                        or more. <a href="https:/financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
-                        </comment>
-                        <field id="bml_publisher_id" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_publisher_id" />
-                        <field id="bml_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_wizard" />
-                        <group id="payflow_link_settings_bml_homepage"  translate="label" showInWebsite="1" sortOrder="20" showInDefault="1" showInStore="1">
-                            <label>Home Page</label>
-                            <field id="bml_homepage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_display"/>
-                            <field id="payflow_link_bml_homepage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_position"/>
-                            <field id="payflow_link_bml_homepage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/homepage_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="payflow_link_bml_homepage_position">0</field>
-                                </depends>
-                            </field>
-                            <field id="payflow_link_bml_homepage_size2" extends="payment_all_paypal/payflow_link/payflow_link_required/payflow_link_advertise_bml/payflow_link_settings_bml_homepage/payflow_link_bml_homepage_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS</source_model>
-                                <depends>
-                                    <field id="payflow_link_bml_homepage_position">1</field>
-                                </depends>
-                            </field>
-                        </group>
-                        <group id="payflow_link_settings_bml_categorypage"  translate="label" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Catalog Category Page</label>
-                            <field id="bml_categorypage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_display"/>
-                            <field id="payflow_link_bml_categorypage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_position" />
-                            <field id="payflow_link_bml_categorypage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="40">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/categorypage_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="payflow_link_bml_categorypage_position">0</field>
-                                </depends>
-                            </field>
-                            <field id="payflow_link_bml_categorypage_size2" extends="payment_all_paypal/payflow_link/payflow_link_required/payflow_link_advertise_bml/payflow_link_settings_bml_categorypage/payflow_link_bml_categorypage_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS</source_model>
-                                <depends>
-                                    <field id="payflow_link_bml_categorypage_position">1</field>
-                                </depends>
-                            </field>
-                        </group>
-                        <group id="payflow_link_settings_bml_productpage"  translate="label" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="50">
-                            <label>Catalog Product Page</label>
-                            <field id="bml_productpage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_display" />
-                            <field id="payflow_link_bml_productpage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_position" />
-                            <field id="payflow_link_bml_productpage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/productpage_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="payflow_link_bml_productpage_position">0</field>
-                                </depends>
-                            </field>
-                            <field id="payflow_link_bml_productpage_size2" extends="payment_all_paypal/payflow_link/payflow_link_required/payflow_link_advertise_bml/payflow_link_settings_bml_productpage/payflow_link_bml_productpage_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN</source_model>
-                                <depends>
-                                    <field id="payflow_link_bml_productpage_position">1</field>
-                                </depends>
-                            </field>
-                        </group>
-                        <group id="payflow_link_settings_bml_checkout"  translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
-                            <label>Checkout Cart Page</label>
-                            <field id="bml_checkout_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_display" />
-                            <field id="payflow_link_bml_checkout_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_position" />
-                            <field id="payflow_link_bml_checkout_size1" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/checkout_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="payflow_link_bml_checkout_position">0</field>
-                                </depends>
-                            </field>
-                            <field id="payflow_link_bml_checkout_size2" extends="payment_all_paypal/payflow_link/payflow_link_required/payflow_link_advertise_bml/payflow_link_settings_bml_checkout/payflow_link_bml_checkout_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="payflow_link_bml_checkout_position">1</field>
-                                </depends>
-                            </field>
-                        </group>
-                    </group>
-                </group>
-                <group id="settings_payflow_link" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                    <label>Basic Settings - PayPal Payflow Link</label>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                    <field id="title" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Title</label>
-                        <comment>It is recommended to set this value to "Debit or Credit Card" per store views.</comment>
-                        <config_path>payment/payflow_link/title</config_path>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="sort_order" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Sort Order</label>
-                        <config_path>payment/payflow_link/sort_order</config_path>
-                        <frontend_class>validate-number</frontend_class>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                        <label>Payment Action</label>
-                        <config_path>payment/payflow_link/payment_action</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <group id="settings_payflow_link_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
-                        <label>Advanced Settings</label>
-                        <fieldset_css>config-advanced</fieldset_css>
-                        <field id="allowspecific" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
-                            <label>Payment Applicable From</label>
-                            <config_path>payment/payflow_link/allowspecific</config_path>
-                            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="specificcountry" translate="label" type="multiselect" sortOrder="20" showInDefault="1" showInWebsite="1">
-                            <label>Countries Payment Applicable From</label>
-                            <config_path>payment/payflow_link/specificcountry</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
-                            <depends>
-                                <field id="allowspecific">1</field>
-                            </depends>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="debug" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                            <label>Debug Mode</label>
-                            <config_path>payment/payflow_link/debug</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="verify_peer" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1">
-                            <label>Enable SSL verification</label>
-                            <config_path>payment/payflow_link/verify_peer</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="csc_editable" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
-                            <label>CVV Entry is Editable</label>
-                            <config_path>payment/payflow_link/csc_editable</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="csc_required" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
-                            <label>Require CVV Entry</label>
-                            <config_path>payment/payflow_link/csc_required</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <depends>
-                                <field id="csc_editable">1</field>
-                            </depends>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="email_confirmation" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1">
-                            <label>Send Email Confirmation</label>
-                            <config_path>payment/payflow_link/email_confirmation</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="url_method" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
-                            <label>URL method for Cancel URL and Return URL</label>
-                            <config_path>payment/payflow_link/url_method</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\UrlMethod</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <group id="payflow_link_settlement_report" translate="label" showInDefault="1" showInWebsite="1" sortOrder="80">
-                            <label>Settlement Report Settings</label>
-                            <field id="heading_sftp" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_sftp"/>
-                            <field id="settlement_reports_ftp_login" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_login"/>
-                            <field id="settlement_reports_ftp_password" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_password"/>
-                            <field id="settlement_reports_ftp_sandbox" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_sandbox"/>
-                            <field id="settlement_reports_ftp_ip" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_ip"/>
-                            <field id="settlement_reports_ftp_path" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_path"/>
-                            <field id="heading_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_schedule"/>
-                            <field id="settlement_reports_active" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_active"/>
-                            <field id="settlement_reports_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_schedule"/>
-                            <field id="settlement_reports_time" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_time"/>
-                        </group>
-                        <group id="payflow_link_frontend" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
-                            <label>Frontend Experience Settings</label>
-                            <field id="logo" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/logo"/>
-                            <field id="paypal_pages" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_pages"/>
-                            <field id="page_style" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/page_style"/>
-                            <field id="paypal_hdrimg" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrimg"/>
-                            <field id="paypal_hdrbackcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbackcolor"/>
-                            <field id="paypal_hdrbordercolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbordercolor"/>
-                            <field id="paypal_payflowcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_payflowcolor"/>
-                        </group>
-                    </group>
-                </group>
-                <group id="settings_payflow_link_express_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
-                    <label>Basic Settings - PayPal Express Checkout</label>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                    <field id="title" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/title" />
-                    <field id="sort_order" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/sort_order" />
-                    <field id="payment_action" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/payment_action" />
-                    <field id="visible_on_product" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/visible_on_product" />
-                    <group id="settings_payflow_link_express_checkout_advanced" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/paypal_payflow_express_checkout_advanced"/>
-                </group>
-            </group>
-            <group id="express_checkout" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
-                <label>Express Checkout</label>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                <fieldset_css>paypal-other-section</fieldset_css>
-                <comment>Add PayPal as an additional payment method to your checkout page.</comment>
-                <attribute type="activity_path">payment/paypal_express/active</attribute>
-                <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
-                    <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-express-checkout.html</comment>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
-                </group>
-                <group id="express_checkout_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                    <label>Required PayPal Settings</label>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                    <group id="express_checkout_required_express_checkout" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                        <label>Express Checkout</label>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                        <field id="business_account" translate="label comment tooltip" showInDefault="1" showInWebsite="1" sortOrder="5">
-                            <label>Email Associated with PayPal Merchant Account (Optional)</label>
-                            <frontend_class>not-required</frontend_class>
-                            <comment>
-                                <![CDATA[<a href="http://www.magentocommerce.com/paypal">Start accepting payments via PayPal!</a>]]>
-                            </comment>
-                            <tooltip>Don't have a PayPal account? Simply enter your email address.</tooltip>
-                            <config_path>paypal/general/business_account</config_path>
-                            <validate>validate-email</validate>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="api_authentication" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
-                            <label>API Authentication Methods</label>
-                            <config_path>paypal/wpp/api_authentication</config_path>
-                            <source_model>Magento\Paypal\Model\Config::getApiAuthenticationMethods</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="api_username" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
-                            <label>API Username</label>
-                            <config_path>paypal/wpp/api_username</config_path>
-                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="api_password" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1">
-                            <label>API Password</label>
-                            <config_path>paypal/wpp/api_password</config_path>
-                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="api_signature" translate="label" type="obscure" sortOrder="50" showInDefault="1" showInWebsite="1">
-                            <label>API Signature</label>
-                            <config_path>paypal/wpp/api_signature</config_path>
-                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                            <attribute type="shared">1</attribute>
-                            <depends>
-                                <field id="api_authentication">0</field>
-                            </depends>
-                        </field>
-                        <field id="api_cert" translate="label" type="file" sortOrder="60" showInDefault="1" showInWebsite="1">
-                            <label>API Certificate</label>
-                            <config_path>paypal/wpp/api_cert</config_path>
-                            <backend_model>Magento\Paypal\Model\System\Config\Backend\Cert</backend_model>
-                            <attribute type="shared">1</attribute>
-                            <depends>
-                                <field id="api_authentication">1</field>
-                            </depends>
-                        </field>
-                        <field id="api_wizard" translate="button_label attribute sandbox_button_label" sortOrder="70" showInDefault="1" showInWebsite="1">
-                            <attribute type="button_label">Get Credentials from PayPal</attribute>
-                            <attribute type="button_url">
-                                <![CDATA[https://www.paypal.com/webapps/merchantboarding/webflow/externalpartnerflow]]>
-                            </attribute>
-
-                            <attribute type="sandbox_button_label">Sandbox Credentials</attribute>
-                            <attribute type="sandbox_button_url">
-                                <![CDATA[https://www.sandbox.paypal.com/webapps/merchantboarding/webflow/externalpartnerflow]]>
-                            </attribute>
-
-                            <!-- partnerId -->
-                            <attribute type="partner_id">NB9WWHYEMVUMS</attribute>
-                            <!-- partnerLogoUrl -->
-                            <attribute type="partner_logo_url">Magento_Backend/web/images/logo-magento.png</attribute>
-                            <!-- receiveCredentials -->
-                            <attribute type="receive_credentials">FALSE</attribute>
-                            <!-- showPermissions -->
-                            <attribute type="show_permissions">FALSE</attribute>
-                            <!-- displayMode -->
-                            <attribute type="display_mode">embedded</attribute>
-                            <!-- productIntentID -->
-                            <attribute type="product_intent_id">pp_express</attribute>
-
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\ApiWizard</frontend_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="sandbox_flag" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
-                            <label>Sandbox Mode</label>
-                            <config_path>paypal/wpp/sandbox_flag</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="use_proxy" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1">
-                            <label>API Uses Proxy</label>
-                            <config_path>paypal/wpp/use_proxy</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="proxy_host" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1">
-                            <label>Proxy Host</label>
-                            <config_path>paypal/wpp/proxy_host</config_path>
-                            <attribute type="shared">1</attribute>
-                            <depends>
-                                <field id="use_proxy">1</field>
-                            </depends>
-                        </field>
-                        <field id="proxy_port" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1">
-                            <label>Proxy Port</label>
-                            <config_path>paypal/wpp/proxy_port</config_path>
-                            <attribute type="shared">1</attribute>
-                            <depends>
-                                <field id="use_proxy">1</field>
-                            </depends>
-                        </field>
-                    </group>
-                    <field id="enable_express_checkout" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
-                        <label>Enable this Solution</label>
-                        <config_path>payment/paypal_express/active</config_path>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
-                        <requires>
-                            <group id="express_checkout_required_express_checkout"/>
-                        </requires>
-                    </field>
-                    <field id="enable_in_context_checkout" translate="label comment" type="select" sortOrder="21" showInDefault="1" showInWebsite="1">
-                        <label>Enable In-Context Checkout Experience</label>
-                        <comment>
-                            <![CDATA[See PayPal Feature Support details and list of supported regions
-                    <a href="https://developer.paypal.com/docs/classic/express-checkout/in-context/" target="_blank">here</a>.]]>
-                        </comment>
-                        <config_path>payment/paypal_express/in_context</config_path>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\InContextApi</frontend_model>
-                        <requires>
-                            <field id="enable_express_checkout"/>
-                        </requires>
-                    </field>
-                    <field id="merchant_id" translate="label" type="text" sortOrder="22" showInDefault="1" showInWebsite="1">
-                        <label>Merchant Account ID</label>
-                        <tooltip>You can look up your merchant ID by logging into https://www.paypal.com/. Click the profile icon on the top right side of the page and then select Profile and settings in the Business Profile menu. (If you do not see the profile icon at the top of the page, click Profile, which appears in the top menu when the My Account tab is selected.) Click My business info on the left, and the Merchant account ID is displayed in the list of profile items on the right.</tooltip>
-                        <config_path>payment/paypal_express/merchant_id</config_path>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\MerchantId</frontend_model>
-                        <depends>
-                            <field id="enable_in_context_checkout">1</field>
-                        </depends>
-                        <validate>required-entry</validate>
-                    </field>
-                    <field id="enable_express_checkout_bml" translate="label comment" type="select" sortOrder="23" showInDefault="1" showInWebsite="1">
-                        <label>Enable PayPal Credit</label>
-                        <comment><![CDATA[PayPal Express Checkout lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
-                        You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                        <a href="https:/www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
-                        </comment>
-                        <config_path>payment/paypal_express_bml/active</config_path>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\BmlApi</frontend_model>
-                        <requires>
-                            <field id="enable_express_checkout"/>
-                        </requires>
-                    </field>
-                    <field id="express_checkout_bml_sort_order" translate="label" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Sort Order PayPal Credit</label>
-                        <config_path>payment/paypal_express_bml/sort_order</config_path>
-                        <frontend_class>validate-number</frontend_class>
-                        <attribute type="shared">1</attribute>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlApiSortOrder</frontend_model>
-                        <depends>
-                            <field id="enable_express_checkout_bml">1</field>
-                        </depends>
-                    </field>
-                    <group id="advertise_bml" translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="30">
-                        <label>Advertise PayPal Credit</label>
-                        <comment>
-                            <![CDATA[<a href="https:/financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
-                        <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
-                        from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
-                        Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
-                        The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                        or more. <a href="https:/financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
-                        </comment>
-                        <field id="bml_publisher_id" translate="label comment tooltip" showInDefault="1" showInWebsite="1" sortOrder="10">
-                            <label>Publisher ID</label>
-                            <comment><![CDATA[Required to display a banner]]></comment>
-                            <config_path>payment/paypal_express_bml/publisher_id</config_path>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="bml_wizard" translate="button_label" sortOrder="15" showInDefault="1" showInWebsite="1">
-                            <button_label>Get Publisher ID from PayPal</button_label>
-                            <button_url><![CDATA[https:/financing.paypal.com/ppfinportal/cart/index?dcp=4eff8563b9cc505e0b9afaff3256705081553c79]]></button_url>
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\BmlApiWizard</frontend_model>
-                        </field>
-                        <group id="settings_bml_homepage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                            <label>Home Page</label>
-                            <field id="bml_homepage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
-                                <label>Display</label>
-                                <config_path>payment/paypal_express_bml/homepage_display</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="bml_homepage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
-                                <label>Position</label>
-                                <config_path>payment/paypal_express_bml/homepage_position</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsHP</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="bml_homepage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/homepage_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="bml_homepage_position">0</field>
-                                </depends>
-                            </field>
-                            <field id="bml_homepage_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS</source_model>
-                                <depends>
-                                    <field id="bml_homepage_position">1</field>
-                                </depends>
-                            </field>
-                        </group>
-                        <group id="settings_bml_categorypage" translate="label" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Catalog Category Page</label>
-                            <field id="bml_categorypage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
-                                <label>Display</label>
-                                <config_path>payment/paypal_express_bml/categorypage_display</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="bml_categorypage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
-                                <label>Position</label>
-                                <config_path>payment/paypal_express_bml/categorypage_position</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCCP</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="bml_categorypage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/categorypage_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends><field id="bml_categorypage_position">0</field></depends>
-                            </field>
-                            <field id="bml_categorypage_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS</source_model>
-                                <depends><field id="bml_categorypage_position">1</field></depends>
-                            </field>
-                        </group>
-                        <group id="settings_bml_productpage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
-                            <label>Catalog Product Page</label>
-                            <field id="bml_productpage_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
-                                <label>Display</label>
-                                <config_path>payment/paypal_express_bml/productpage_display</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="bml_productpage_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
-                                <label>Position</label>
-                                <config_path>payment/paypal_express_bml/productpage_position</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCPP</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="bml_productpage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/productpage_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends><field id="bml_productpage_position">0</field></depends>
-                            </field>
-                            <field id="bml_productpage_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN</source_model>
-                                <depends><field id="bml_productpage_position">1</field></depends>
-                            </field>
-                        </group>
-                        <group id="settings_bml_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
-                            <label>Checkout Cart Page</label>
-                            <field id="bml_checkout_display" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="10">
-                                <label>Display</label>
-                                <config_path>payment/paypal_express_bml/checkout_display</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="bml_checkout_position" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="20">
-                                <label>Position</label>
-                                <config_path>payment/paypal_express_bml/checkout_position</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlPosition::getBmlPositionsCheckout</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="bml_checkout_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/checkout_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends><field id="bml_checkout_position">0</field></depends>
-                            </field>
-                            <field id="bml_checkout_size2" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends><field id="bml_checkout_position">1</field></depends>
-                            </field>
-                        </group>
-                    </group>
-                </group>
-                <group id="settings_ec" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                    <label>Basic Settings - PayPal Express Checkout</label>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                    <field id="title" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Title</label>
-                        <comment>It is recommended to set this value to "PayPal" per store views.</comment>
-                        <config_path>payment/paypal_express/title</config_path>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="sort_order" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Sort Order</label>
-                        <config_path>payment/paypal_express/sort_order</config_path>
-                        <frontend_class>validate-number</frontend_class>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                        <label>Payment Action</label>
-                        <config_path>payment/paypal_express/payment_action</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions\Express</source_model>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="visible_on_product" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Display on Product Details Page</label>
-                        <config_path>payment/paypal_express/visible_on_product</config_path>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <attribute type="shared">1</attribute>
-                    </field>
-                    <field id="authorization_honor_period" translate="label comment" type="text" sortOrder="50" showInDefault="1" showInWebsite="1">
-                        <label>Authorization Honor Period (days)</label>
-                        <comment>Specifies what the Authorization Honor Period is on the merchant&#8217;s PayPal account. It must mirror the setting in PayPal.</comment>
-                        <config_path>payment/paypal_express/authorization_honor_period</config_path>
-                        <attribute type="shared">1</attribute>
-                        <depends>
-                            <field id="payment_action">Order</field>
-                        </depends>
-                    </field>
-                    <field id="order_valid_period" translate="label comment" type="text" sortOrder="60" showInDefault="1" showInWebsite="1">
-                        <label>Order Valid Period (days)</label>
-                        <comment>Specifies what the Order Valid Period is on the merchant&#x2019;s PayPal account. It must mirror the setting in PayPal.</comment>
-                        <config_path>payment/paypal_express/order_valid_period</config_path>
-                        <attribute type="shared">1</attribute>
-                        <depends>
-                            <field id="payment_action">Order</field>
-                        </depends>
-                    </field>
-                    <field id="child_authorization_number" translate="label comment" type="text" sortOrder="70" showInDefault="1" showInWebsite="1">
-                        <label>Number of Child Authorizations</label>
-                        <comment>The default number of child authorizations in your PayPal account is 1. To do multiple authorizations please contact PayPal to request an increase.</comment>
-                        <config_path>payment/paypal_express/child_authorization_number</config_path>
-                        <attribute type="shared">1</attribute>
-                        <depends>
-                            <field id="payment_action">Order</field>
-                        </depends>
-                    </field>
-                    <group id="settings_ec_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="80">
-                        <label>Advanced Settings</label>
-                        <fieldset_css>config-advanced</fieldset_css>
-                        <field id="visible_on_cart" translate="label comment" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Display on Shopping Cart</label>
-                            <config_path>payment/paypal_express/visible_on_cart</config_path>
-                            <comment>Also affects mini-shopping cart.</comment>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\Yesnoshortcut</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="allowspecific" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
-                            <label>Payment Applicable From</label>
-                            <config_path>payment/paypal_express/allowspecific</config_path>
-                            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="specificcountry" translate="label" type="multiselect" sortOrder="20" showInDefault="1" showInWebsite="1">
-                            <label>Countries Payment Applicable From</label>
-                            <config_path>payment/paypal_express/specificcountry</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
-                            <attribute type="shared">1</attribute>
-                            <depends>
-                                <field id="allowspecific">1</field>
-                            </depends>
-                        </field>
-                        <field id="debug" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                            <label>Debug Mode</label>
-                            <config_path>payment/paypal_express/debug</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="verify_peer" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1">
-                            <label>Enable SSL verification</label>
-                            <config_path>payment/paypal_express/verify_peer</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="line_items_enabled" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
-                            <label>Transfer Cart Line Items</label>
-                            <config_path>payment/paypal_express/line_items_enabled</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="transfer_shipping_options" translate="label tooltip comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
-                            <label>Transfer Shipping Options</label>
-                            <config_path>payment/paypal_express/transfer_shipping_options</config_path>
-                            <tooltip>If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.</tooltip>
-                            <comment>Notice that PayPal can handle up to 10 shipping options. That is why Magento will transfer only first 10 cheapest shipping options if there are more than 10 available.</comment>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                            <depends>
-                                <field id="line_items_enabled">1</field>
-                            </depends>
-                        </field>
-                        <field id="button_flavor" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Shortcut Buttons Flavor</label>
-                            <config_path>paypal/wpp/button_flavor</config_path>
-                            <source_model>Magento\Paypal\Model\Config::getExpressCheckoutButtonFlavors</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="solution_type" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
-                            <label>Enable PayPal Guest Checkout</label>
-                            <comment>Ability for buyer to purchase without PayPal account.</comment>
-                            <config_path>payment/paypal_express/solution_type</config_path>
-                            <source_model>Magento\Paypal\Model\Config::getExpressCheckoutSolutionTypes</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="require_billing_address" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
-                            <label>Require Customer's Billing Address</label>
-                            <comment>This feature needs be enabled first for the merchant account through PayPal technical support.</comment>
-                            <config_path>payment/paypal_express/require_billing_address</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\RequireBillingAddress</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="allow_ba_signup" translate="label comment tooltip" type="select" sortOrder="90" showInDefault="1" showInWebsite="1">
-                            <label>Billing Agreement Signup</label>
-                            <comment>Whether to create a billing agreement, if there are no active billing agreements available.</comment>
-                            <tooltip>
-                                <![CDATA[Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.]]>
-                            </tooltip>
-                            <config_path>payment/paypal_express/allow_ba_signup</config_path>
-                            <source_model>Magento\Paypal\Model\Config::getExpressCheckoutBASignupOptions</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="skip_order_review_step" translate="label" type="select" sortOrder="95" showInDefault="1" showInWebsite="1">
-                            <label>Skip Order Review Step</label>
-                            <config_path>payment/paypal_express/skip_order_review_step</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <group id="express_checkout_billing_agreement" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
-                            <label>PayPal Billing Agreement Settings</label>
-                            <field id="active" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
-                                <label>Enabled</label>
-                                <comment>
-                                    <![CDATA[Will appear as a payment option only for customers who have at least one active billing agreement.]]>
-                                </comment>
-                                <config_path>payment/paypal_billing_agreement/active</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>Title</label>
-                                <config_path>payment/paypal_billing_agreement/title</config_path>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>Sort Order</label>
-                                <config_path>payment/paypal_billing_agreement/sort_order</config_path>
-                                <frontend_class>validate-number</frontend_class>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="payment_action" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
-                                <label>Payment Action</label>
-                                <config_path>payment/paypal_billing_agreement/payment_action</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="allowspecific" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
-                                <label>Payment Applicable From</label>
-                                <config_path>payment/paypal_billing_agreement/allowspecific</config_path>
-                                <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="specificcountry" translate="label" type="multiselect" sortOrder="60" showInDefault="1" showInWebsite="1">
-                                <label>Countries Payment Applicable From</label>
-                                <config_path>payment/paypal_billing_agreement/specificcountry</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="allowspecific">1</field>
-                                </depends>
-                            </field>
-                            <field id="debug" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
-                                <label>Debug Mode</label>
-                                <config_path>payment/paypal_billing_agreement/debug</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="verify_peer" translate="label" type="select" sortOrder="75" showInDefault="1" showInWebsite="1">
-                                <label>Enable SSL verification</label>
-                                <config_path>payment/paypal_billing_agreement/verify_peer</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="line_items_enabled" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
-                                <label>Transfer Cart Line Items</label>
-                                <config_path>payment/paypal_billing_agreement/line_items_enabled</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="allow_billing_agreement_wizard" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1">
-                                <label>Allow in Billing Agreement Wizard</label>
-                                <config_path>payment/paypal_billing_agreement/allow_billing_agreement_wizard</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                        </group>
-                        <group id="express_checkout_settlement_report" translate="label" showInDefault="1" showInWebsite="1" sortOrder="110">
-                            <label>Settlement Report Settings</label>
-                            <field id="heading_sftp" translate="label" sortOrder="10" showInDefault="1" showInWebsite="1">
-                                <label>SFTP Credentials</label>
-                                <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="settlement_reports_ftp_login" translate="label" type="obscure" sortOrder="20" showInDefault="1" showInWebsite="1">
-                                <label>Login</label>
-                                <config_path>paypal/fetch_reports/ftp_login</config_path>
-                                <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="settlement_reports_ftp_password" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
-                                <label>Password</label>
-                                <config_path>paypal/fetch_reports/ftp_password</config_path>
-                                <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="settlement_reports_ftp_sandbox" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
-                                <label>Sandbox Mode</label>
-                                <config_path>paypal/fetch_reports/ftp_sandbox</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="settlement_reports_ftp_ip" translate="label comment tooltip" type="text" sortOrder="50" showInDefault="1" showInWebsite="1">
-                                <label>Custom Endpoint Hostname or IP-Address</label>
-                                <comment>By default it is "reports.paypal.com".</comment>
-                                <tooltip>Use colon to specify port. For example: "test.example.com:5224".</tooltip>
-                                <config_path>paypal/fetch_reports/ftp_ip</config_path>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="settlement_reports_ftp_sandbox">0</field>
-                                </depends>
-                            </field>
-                            <field id="settlement_reports_ftp_path" translate="label comeent" type="text" sortOrder="60" showInDefault="1" showInWebsite="1">
-                                <label>Custom Path</label>
-                                <comment>By default it is "/ppreports/outgoing".</comment>
-                                <config_path>paypal/fetch_reports/ftp_path</config_path>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="settlement_reports_ftp_sandbox">0</field>
-                                </depends>
-                            </field>
-                            <field id="heading_schedule" translate="label" sortOrder="70" showInDefault="1" showInWebsite="1">
-                                <label>Scheduled Fetching</label>
-                                <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="settlement_reports_active" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1">
-                                <label>Enable Automatic Fetching</label>
-                                <config_path>paypal/fetch_reports/active</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="settlement_reports_schedule" translate="label comment" type="select" sortOrder="90" showInDefault="1">
-                                <label>Schedule</label>
-                                <comment>PayPal retains reports for 45 days.</comment>
-                                <config_path>paypal/fetch_reports/schedule</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\FetchingSchedule</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="settlement_reports_time" translate="label" type="time" sortOrder="100" showInDefault="1">
-                                <label>Time of Day</label>
-                                <config_path>paypal/fetch_reports/time</config_path>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                        </group>
-                        <group id="express_checkout_frontend" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="120">
-                            <label>Frontend Experience Settings</label>
-                            <field id="logo" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>PayPal Product Logo</label>
-                                <comment>Displays on catalog pages and homepage.</comment>
-                                <config_path>paypal/style/logo</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\Logo</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="paypal_pages" translate="label" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>PayPal Merchant Pages Style</label>
-                                <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="page_style" translate="label tooltip" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>Page Style</label>
-                                <config_path>paypal/style/page_style</config_path>
-                                <tooltip>
-                                    <![CDATA[Allowable values: "paypal", "primary" (default), your_custom_value (a custom payment page style from your merchant account profile).]]>
-                                </tooltip>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="paypal_hdrimg" translate="label tooltip" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>Header Image URL</label>
-                                <config_path>paypal/style/paypal_hdrimg</config_path>
-                                <tooltip>
-                                    <![CDATA[The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style="color:red">https</strong> is highly encouraged.]]>
-                                </tooltip>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="paypal_hdrbackcolor" translate="label tooltip" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>Header Background Color</label>
-                                <config_path>paypal/style/paypal_hdrbackcolor</config_path>
-                                <tooltip>
-                                    <![CDATA[The background color for the header of the checkout page. Case-insensitive six-character HTML hexadecimal color code in ASCII.]]>
-                                </tooltip>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="paypal_hdrbordercolor" translate="label tooltip" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>Header Border Color</label>
-                                <config_path>paypal/style/paypal_hdrbordercolor</config_path>
-                                <tooltip>2-pixel perimeter around the header space.</tooltip>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="paypal_payflowcolor" translate="label tooltip" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>Page Background Color</label>
-                                <config_path>paypal/style/paypal_payflowcolor</config_path>
-                                <tooltip>
-                                    <![CDATA[The background color for the checkout page around the header and payment form.]]>
-                                </tooltip>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                        </group>
-                    </group>
-                </group>
-            </group>
-            <group id="payments_pro_hosted_solution" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                <label>Website Payments Pro Hosted Solution</label>
-                <fieldset_css>paypal-other-section</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                <attribute type="activity_path">payment/hosted_pro/active</attribute>
-                <comment><![CDATA[Accept payments with a PCI compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)]]></comment>
-                <attribute type="paypal_ec_separate">1</attribute>
-                <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
-                    <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
-                </group>
-                <group id="pphs_required_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                    <label>Required PayPal Settings</label>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                    <group id="pphs_required_settings_pphs" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                        <label>Payments Pro Hosted Solution</label>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                        <field id="business_account" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/business_account"/>
-                        <field id="api_authentication" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_authentication"/>
-                        <field id="api_username" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_username" />
-                        <field id="api_password" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_password" />
-                        <field id="api_signature" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_signature" />
-                        <field id="api_cert" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_cert" />
-                        <field id="api_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/api_wizard" />
-                        <field id="sandbox_flag" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/sandbox_flag" />
-                        <field id="use_proxy" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/use_proxy" />
-                        <field id="proxy_host" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/proxy_host" />
-                        <field id="proxy_port" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/proxy_port" />
-                    </group>
-                    <field id="pphs_enable" type="select" translate="label" sortOrder="20" showInDefault="1" showInWebsite="1">
-                        <label>Enable this Solution</label>
-                        <config_path>payment/hosted_pro/active</config_path>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
-                        <requires>
-                            <group id="pphs_required_settings_pphs"/>
-                        </requires>
-                        <frontend_class>paypal-enabler paypal-ec-separate</frontend_class>
-                    </field>
-
-                    <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="21">
-                        <comment><![CDATA[Payments Pro Hosted Solution lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
-                        You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                        <a href="https:/www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
-                        </comment>
-                        <requires>
-                            <field id="pphs_enable"/>
-                        </requires>
-                    </field>
-                    <group id="pphs_advertise_bml"  translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="22">
-                        <label>Advertise PayPal Credit</label>
-                        <comment>
-                            <![CDATA[<a href="https:/financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
-                            <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
-                            from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
-                            Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
-                            The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                            or more. <a href="https:/financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
-                        </comment>
-                        <field id="bml_publisher_id" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_publisher_id" />
-                        <field id="bml_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_wizard" />
-                        <group id="pphs_settings_bml_homepage"  translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                            <label>Home Page</label>
-                            <field id="bml_homepage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_display"/>
-                            <field id="pphs_bml_homepage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_position"/>
-                            <field id="pphs_bml_homepage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/homepage_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="pphs_bml_homepage_position">0</field>
-                                </depends>
-                            </field>
-                            <field id="pphs_bml_homepage_size2" extends="payment_all_paypal/payments_pro_hosted_solution/pphs_required_settings/pphs_advertise_bml/pphs_settings_bml_homepage/pphs_bml_homepage_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS</source_model>
-                                <depends>
-                                    <field id="pphs_bml_homepage_position">1</field>
-                                </depends>
-                            </field>
-                        </group>
-                        <group id="pphs_settings_bml_categorypage"  translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
-                            <label>Catalog Category Page</label>
-                            <field id="bml_categorypage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_display"/>
-                            <field id="pphs_bml_categorypage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_position" />
-                            <field id="pphs_bml_categorypage_size1" translate="label" showInDefault="1" showInWebsite="1" sortOrder="30" type="select">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/categorypage_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="pphs_bml_categorypage_position">0</field>
-                                </depends>
-                            </field>
-                            <field id="pphs_bml_categorypage_size2" extends="payment_all_paypal/payments_pro_hosted_solution/pphs_required_settings/pphs_advertise_bml/pphs_settings_bml_categorypage/pphs_bml_categorypage_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS</source_model>
-                                <depends>
-                                    <field id="pphs_bml_categorypage_position">1</field>
-                                </depends>
-                            </field>
-                        </group>
-                        <group id="pphs_settings_bml_productpage"  translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
-                            <label>Catalog Product Page</label>
-                            <field id="bml_productpage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_display" />
-                            <field id="pphs_bml_productpage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_position" />
-                            <field id="pphs_bml_productpage_size1" translate="label" type="select" showInWebsite="1" showInDefault="1" sortOrder="30">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/productpage_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="pphs_bml_productpage_position">0</field>
-                                </depends>
-                            </field>
-                            <field id="pphs_bml_productpage_size2" extends="payment_all_paypal/payments_pro_hosted_solution/pphs_required_settings/pphs_advertise_bml/pphs_settings_bml_productpage/pphs_bml_productpage_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN</source_model>
-                                <depends>
-                                    <field id="pphs_bml_productpage_position">1</field>
-                                </depends>
-                            </field>
-                        </group>
-                        <group id="pphs_settings_bml_checkout"  translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
-                            <label>Checkout Cart Page</label>
-                            <field id="bml_checkout_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_display" />
-                            <field id="pphs_bml_checkout_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_position" />
-                            <field id="pphs_bml_checkout_size1" translate="label" type="select" showInWebsite="1" showInDefault="1" sortOrder="30">
-                                <label>Size</label>
-                                <config_path>payment/paypal_express_bml/checkout_size</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="pphs_bml_checkout_position">0</field>
-                                </depends>
-                            </field>
-                            <field id="pphs_bml_checkout_size2" extends="payment_all_paypal/payments_pro_hosted_solution/pphs_required_settings/pphs_advertise_bml/pphs_settings_bml_checkout/pphs_bml_checkout_size1">
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN</source_model>
-                                <attribute type="shared">1</attribute>
-                                <depends>
-                                    <field id="pphs_bml_checkout_position">1</field>
-                                </depends>
-                            </field>
-                        </group>
-                    </group>
-                </group>
-                <group id="pphs_settings" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                    <label>Basic Settings - PayPal Payments Pro Hosted Solution</label>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                    <field id="title" type="text" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10" translate="label comment">
-                        <label>Title</label>
-                        <comment>It is recommended to set this value to "PayPal" per store views.</comment>
-                        <config_path>payment/hosted_pro/title</config_path>
-                    </field>
-                    <field id="sort_order" type="text" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20" translate="label">
-                        <label>Sort Order</label>
-                        <config_path>payment/hosted_pro/sort_order</config_path>
-                        <frontend_class>validate-number</frontend_class>
-                    </field>
-                    <field id="payment_action" type="select" showInDefault="1" showInWebsite="1" sortOrder="30" translate="label">
-                        <label>Payment Action</label>
-                        <config_path>payment/hosted_pro/payment_action</config_path>
-                        <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
-                    </field>
-                    <field id="display_ec" type="select" showInDefault="1" showInWebsite="1" sortOrder="40" translate="label">
-                        <label>Display Express Checkout in the Payment Information step</label>
-                        <config_path>payment/hosted_pro/display_ec</config_path>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    </field>
-                    <group id="pphs_settings_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
-                        <label>Advanced Settings</label>
-                        <fieldset_css>config-advanced</fieldset_css>
-                        <field id="allowspecific" type="select" showInDefault="1" showInWebsite="1" sortOrder="10" translate="label">
-                            <label>Payment Applicable From</label>
-                            <config_path>payment/hosted_pro/allowspecific</config_path>
-                            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
-                        </field>
-                        <field id="specificcountry" type="multiselect" showInDefault="1" showInWebsite="1" sortOrder="20" translate="label">
-                            <label>Countries Payment Applicable From</label>
-                            <config_path>payment/hosted_pro/specificcountry</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
-                            <depends>
-                                <field id="allowspecific">1</field>
-                            </depends>
-                        </field>
-                        <field id="debug" type="select" showInDefault="1" showInWebsite="1" sortOrder="30" translate="label">
-                            <label>Debug Mode</label>
-                            <config_path>payment/hosted_pro/debug</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        </field>
-                        <field id="verify_peer" type="select" showInDefault="1" showInWebsite="1" sortOrder="35" translate="label">
-                            <label>Enable SSL verification</label>
-                            <config_path>payment/hosted_pro/verify_peer</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        </field>
-                        <group id="pphs_settlement_report" showInDefault="1" showInWebsite="1" sortOrder="50" translate="label">
-                            <label>Settlement Report Settings</label>
-                            <field id="heading_sftp" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_sftp"/>
-                            <field id="settlement_reports_ftp_login" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_login" />
-                            <field id="settlement_reports_ftp_password" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_password" />
-                            <field id="settlement_reports_ftp_sandbox" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_sandbox" />
-                            <field id="settlement_reports_ftp_ip" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_ip" />
-                            <field id="settlement_reports_ftp_path" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_path" />
-                            <field id="heading_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_schedule" />
-                            <field id="settlement_reports_active" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_active" />
-                            <field id="settlement_reports_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_schedule" />
-                            <field id="settlement_reports_time" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_time" />
-                        </group>
-                    </group>
-                </group>
-            </group>
-            <group id="payments_pro_hosted_solution_without_bml" extends="payments_pro_hosted_solution">
-                <group id="pphs_required_settings">
-                    <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                    <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                    <group id="pphs_advertise_bml" showInDefault="0" showInWebsite="0"/>
-                </group>
-            </group>
-        </section>
-        <section id="payment_us" extends="payment"  showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
-                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                <comment>Choose a secure bundled payment solution for your business.</comment>
-                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
-                <group id="payflow_advanced" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
-                    <label>Payments Advanced</label>
-                    <fieldset_css>paypal-other-section</fieldset_css>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                    <comment><![CDATA[Accept payments with a PCI-compliant checkout that keeps customers on your site. (<u>Includes Express Checkout</u>)]]></comment>
-                    <attribute type="activity_path">payment/payflow_advanced/active</attribute>
-                    <group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
-                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-advanced.html</comment>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
-                    </group>
-                    <group id="required_settings" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                        <label>Required PayPal Settings</label>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                        <group id="payments_advanced" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                            <label>Payments Advanced and Express Checkout</label>
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                            <field id="business_account" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/business_account">
-                                <label>Email Associated with PayPal Merchant Account (Optional)</label>
-                            </field>
-                            <field id="partner" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1">
-                                <label>Partner</label>
-                                <config_path>payment/payflow_advanced/partner</config_path>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="vendor" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1">
-                                <label>Vendor</label>
-                                <config_path>payment/payflow_advanced/vendor</config_path>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="user" translate="label comment tooltip" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1">
-                                <label>User</label>
-                                <comment>PayPal recommends that you set up an additional User on your account at manager.paypal.com</comment>
-                                <tooltip>PayPal recommends you set up an additional User on your account at manager.paypal.com, instead of entering your admin username and password here. This will enhance your security and prevent service interruptions if you later change your password. If you do not want to set up an additional User, you can re-enter your Merchant Login here.</tooltip>
-                                <config_path>payment/payflow_advanced/user</config_path>
-                                <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="pwd" translate="label" type="obscure" sortOrder="50" showInDefault="1" showInWebsite="1">
-                                <label>Password</label>
-                                <config_path>payment/payflow_advanced/pwd</config_path>
-                                <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="sandbox_flag" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1">
-                                <label>Test Mode</label>
-                                <config_path>payment/payflow_advanced/sandbox_flag</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="use_proxy" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
-                                <label>Use Proxy</label>
-                                <config_path>payment/payflow_advanced/use_proxy</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="proxy_host" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1">
-                                <label>Proxy Host</label>
-                                <config_path>payment/payflow_advanced/proxy_host</config_path>
-                                <depends>
-                                    <field id="use_proxy">1</field>
-                                </depends>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="proxy_port" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1">
-                                <label>Proxy Port</label>
-                                <config_path>payment/payflow_advanced/proxy_port</config_path>
-                                <depends>
-                                    <field id="use_proxy">1</field>
-                                </depends>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="payflow_advanced_info" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
-                                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Payflowlink\Advanced</frontend_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                        </group>
-                        <field id="enable_payflow_advanced" translate="label comment" type="select" sortOrder="41" showInDefault="1" showInWebsite="1">
-                            <label>Enable this Solution</label>
-                            <config_path>payment/payflow_advanced/active</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
-                            <requires>
-                                <group id="payments_advanced"/>
-                            </requires>
-                        </field>
-                        <field id="enable_express_checkout" extends="payment_all_paypal/payflow_link/payflow_link_required/enable_express_checkout_basic" showInDefault="1" showInWebsite="1">
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Hidden</frontend_model>
-                            <requires>
-                                <field id="enable_payflow_advanced"/>
-                            </requires>
-                        </field>
-                        <field id="enable_express_checkout_bml" sortOrder="42" extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml">
-                            <comment><![CDATA[PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
-                            You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                            <a href="https:/www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
-                            </comment>
-                            <config_path>payment/payflow_express_bml/active</config_path>
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Bml</frontend_model>
-                            <requires>
-                                <field id="enable_payflow_advanced"/>
-                            </requires>
-                        </field>
-                        <field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order">
-                            <config_path>payment/payflow_express_bml/sort_order</config_path>
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder</frontend_model>
-                            <depends>
-                                <field id="enable_express_checkout_bml">1</field>
-                            </depends>
-                        </field>
-                        <group id="advanced_advertise_bml" showInDefault="1" showInWebsite="1" sortOrder="60" translate="label comment">
-                            <label>Advertise PayPal Credit</label>
-                            <comment>
-                                <![CDATA[<a href="https://financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
-                                            <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
-                                            from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
-                                            Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
-                                            The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                                            or more. <a href="https://financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
-                            </comment>
-                            <field id="bml_publisher_id" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_publisher_id" />
-                            <field id="bml_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_wizard" />
-                            <group id="advanced_settings_bml_homepage" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20" translate="label">
-                                <label>Home Page</label>
-                                <field id="bml_homepage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_display"/>
-                                <field id="advanced_bml_homepage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_position"/>
-                                <field id="advanced_bml_homepage_size1" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                                    <label>Size</label>
-                                    <config_path>payment/paypal_express_bml/homepage_size</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH</source_model>
-                                    <depends>
-                                        <field id="advanced_bml_homepage_position">0</field>
-                                    </depends>
-                                </field>
-                                <field id="advanced_bml_homepage_size2" extends="payment_us/paypal_group_all_in_one/payflow_advanced/required_settings/advanced_advertise_bml/advanced_settings_bml_homepage/advanced_bml_homepage_size1">
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS</source_model>
-                                    <depends>
-                                        <field id="advanced_bml_homepage_position">1</field>
-                                    </depends>
-                                </field>
-                            </group>
-                            <group id="advanced_settings_bml_categorypage" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30" translate="label">
-                                <label>Catalog Category Page</label>
-                                <field id="bml_categorypage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_display"/>
-                                <field id="advanced_bml_categorypage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_position"/>
-                                <field id="advanced_bml_categorypage_size1" type="select" showInDefault="1" showInWebsite="1" sortOrder="30" translate="label">
-                                    <label>Size</label>
-                                    <config_path>payment/paypal_express_bml/categorypage_size</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC</source_model>
-                                    <attribute type="shared">1</attribute>
-                                    <depends>
-                                        <field id="advanced_bml_categorypage_position">0</field>
-                                    </depends>
-                                </field>
-                                <field id="advanced_bml_categorypage_size2" extends="payment_us/paypal_group_all_in_one/payflow_advanced/required_settings/advanced_advertise_bml/advanced_settings_bml_categorypage/advanced_bml_categorypage_size1">
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS</source_model>
-                                    <depends>
-                                        <field id="advanced_bml_categorypage_position">1</field>
-                                    </depends>
-                                </field>
-                            </group>
-                            <group id="advanced_settings_bml_productpage" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40" translate="label">
-                                <label>Catalog Product Page</label>
-                                <field id="bml_productpage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_display" />
-                                <field id="advanced_bml_productpage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_position" />
-                                <field id="advanced_bml_productpage_size1" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" translate="label">
-                                    <label>Size</label>
-                                    <config_path>payment/paypal_express_bml/productpage_size</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC</source_model>
-                                    <attribute type="shared">1</attribute>
-                                    <depends>
-                                        <field id="advanced_bml_productpage_position">0</field>
-                                    </depends>
-                                </field>
-                                <field id="advanced_bml_productpage_size2" extends="payment_us/paypal_group_all_in_one/payflow_advanced/required_settings/advanced_advertise_bml/advanced_settings_bml_productpage/advanced_bml_productpage_size1">
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN</source_model>
-                                    <depends>
-                                        <field id="advanced_bml_productpage_position">1</field>
-                                    </depends>
-                                </field>
-
-                            </group>
-                            <group id="advanced_settings_bml_checkout" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50" translate="label">
-                                <label>Checkout Cart Page</label>
-                                <field id="bml_checkout_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_display"/>
-                                <field id="advanced_bml_checkout_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_position"/>
-                                <field id="advanced_bml_checkout_size1" type="select" showInDefault="1" showInWebsite="1" sortOrder="30" translate="label">
-                                    <label>Size</label>
-                                    <config_path>payment/paypal_express_bml/checkout_size</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC</source_model>
-                                    <attribute type="shared">1</attribute>
-                                    <depends>
-                                        <field id="advanced_bml_checkout_position">0</field>
-                                    </depends>
-                                </field>
-                                <field id="advanced_bml_checkout_size2" extends="payment_us/paypal_group_all_in_one/payflow_advanced/required_settings/advanced_advertise_bml/advanced_settings_bml_checkout/advanced_bml_checkout_size1">
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN</source_model>
-                                    <attribute type="shared">1</attribute>
-                                    <depends>
-                                        <field id="advanced_bml_checkout_position">1</field>
-                                    </depends>
-                                </field>
-                            </group>
-                        </group>
-                    </group>
-                    <group id="settings_payments_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                        <label>Basic Settings - PayPal Payments Advanced</label>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                        <field id="title" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Title</label>
-                            <comment>It is recommended to set this value to "Debit or Credit Card" per store views.</comment>
-                            <config_path>payment/payflow_advanced/title</config_path>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="sort_order" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Sort Order</label>
-                            <config_path>payment/payflow_advanced/sort_order</config_path>
-                            <frontend_class>validate-number</frontend_class>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                            <label>Payment Action</label>
-                            <config_path>payment/payflow_advanced/payment_action</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <group id="settings_payments_advanced_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
-                            <label>Advanced Settings</label>
-                            <fieldset_css>config-advanced</fieldset_css>
-                            <field id="allowspecific" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1">
-                                <label>Payment Applicable From</label>
-                                <config_path>payment/payflow_advanced/allowspecific</config_path>
-                                <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="specificcountry" translate="label" type="multiselect" sortOrder="25" showInDefault="1" showInWebsite="1">
-                                <label>Countries Payment Applicable From</label>
-                                <config_path>payment/payflow_advanced/specificcountry</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
-                                <depends>
-                                    <field id="allowspecific">1</field>
-                                </depends>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="debug" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                                <label>Debug Mode</label>
-                                <config_path>payment/payflow_advanced/debug</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="verify_peer" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1">
-                                <label>Enable SSL verification</label>
-                                <config_path>payment/payflow_advanced/verify_peer</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="csc_editable" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
-                                <label>CVV Entry is Editable</label>
-                                <config_path>payment/payflow_advanced/csc_editable</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="csc_required" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1">
-                                <label>Require CVV Entry</label>
-                                <config_path>payment/payflow_advanced/csc_required</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <depends>
-                                    <field id="csc_editable">1</field>
-                                </depends>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="email_confirmation" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1">
-                                <label>Send Email Confirmation</label>
-                                <config_path>payment/payflow_advanced/email_confirmation</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="url_method" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1">
-                                <label>URL method for Cancel URL and Return URL</label>
-                                <config_path>payment/payflow_advanced/url_method</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\UrlMethod</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <group id="settlement_report" translate="label" showInDefault="1" showInWebsite="1" sortOrder="80">
-                                <label>Settlement Report Settings</label>
-                                <field id="heading_sftp" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_sftp"/>
-                                <field id="settlement_reports_ftp_login" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_login"/>
-                                <field id="settlement_reports_ftp_password" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_password"/>
-                                <field id="settlement_reports_ftp_sandbox" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_sandbox"/>
-                                <field id="settlement_reports_ftp_ip" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_ip"/>
-                                <field id="settlement_reports_ftp_path" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_ftp_path"/>
-                                <field id="heading_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/heading_schedule"/>
-                                <field id="settlement_reports_active" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_active"/>
-                                <field id="settlement_reports_schedule" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_schedule"/>
-                                <field id="settlement_reports_time" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_settlement_report/settlement_reports_time"/>
-                            </group>
-                            <group id="frontend" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
-                                <label>Frontend Experience Settings</label>
-                                <field id="logo" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/logo"/>
-                                <field id="paypal_pages" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_pages"/>
-                                <field id="page_style" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/page_style"/>
-                                <field id="paypal_hdrimg" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrimg"/>
-                                <field id="paypal_hdrbackcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbackcolor"/>
-                                <field id="paypal_hdrbordercolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbordercolor"/>
-                                <field id="paypal_payflowcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_payflowcolor"/>
-                            </group>
-                        </group>
-                    </group>
-                    <group id="settings_express_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
-                        <label>Basic Settings - PayPal Express Checkout</label>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                        <field id="title" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/title" />
-                        <field id="sort_order" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/sort_order" />
-                        <field id="payment_action" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/payment_action" />
-                        <field id="visible_on_product" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/visible_on_product" />
-                        <group id="settings_express_checkout_advanced" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_express_checkout/paypal_payflow_express_checkout_advanced"/>
-                    </group>
-                </group>
-                <group id="wpp_usuk" translate="label" sortOrder="40" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout">
-                    <label>Payments Pro</label>
-                    <attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
-                    <group id="configuration_details">
-                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
-                    </group>
-                    <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                        <field id="enable_paypal_payflow">
-                            <attribute type="shared">0</attribute>
-                            <config_path>payment/paypal_payment_pro/active</config_path>
-                        </field>
-                        <group id="paypal_payflow_api_settings" translate="label">
-                            <label>Payments Pro and Express Checkout</label>
-                        </group>
-                    </group>
-                    <group id="settings_paypal_payflow" translate="label">
-                        <label>Basic Settings - PayPal Payments Pro</label>
-                    </group>
-                </group>
-                <group id="wps_express" extends="payment_all_paypal/express_checkout">
-                    <label>Payments Standard</label>
-                    <comment>Accept credit card and PayPal payments securely.</comment>
-                    <attribute type="activity_path">payment/wps_express/active</attribute>
-                    <group id="configuration_details">
-                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
-                    </group>
-                    <group id="express_checkout_required">
-                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
-                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
-                        <group id="express_checkout_required_express_checkout">
-                            <label>Payments Standard</label>
-                        </group>
-                        <field id="enable_express_checkout">
-                            <config_path>payment/wps_express/active</config_path>
-                        </field>
-                        <field id="enable_express_checkout_bml">
-                            <config_path>payment/wps_express_bml/active</config_path>
-                        </field>
-                    </group>
-                    <group id="settings_ec">
-                        <label>Basic Settings - PayPal Website Payments Standard</label>
-                    </group>
-                </group>
-            </group>
-            <group id="paypal_payment_gateways" translate="label" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
-                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
-                <group id="paypal_payflowpro_with_express_checkout" translate="label comment" extends="payment_all_paypal/paypal_payflowpro">
-                    <label>Payflow Pro</label>
-                    <attribute type="paypal_ec_separate">0</attribute>
-                    <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                        <label>Required PayPal Settings</label>
-                        <field id="enable_paypal_payflow">
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
-                        </field>
-                        <group id="paypal_payflow_api_settings" translate="label">
-                            <label>Payflow Pro and Express Checkout</label>
-                            <field id="business_account" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/business_account" translate="label" sortOrder="10">
-                                <frontend_class>not-required</frontend_class>
-                                <label>Email Associated with PayPal Merchant Account (Optional)</label>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                        </group>
-                        <field id="enable_express_checkout" extends="payment_all_paypal/payflow_link/payflow_link_required/enable_express_checkout_basic" showInDefault="1" showInWebsite="1">
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Hidden</frontend_model>
-                            <requires>
-                                <field id="enable_paypal_payflow"/>
-                            </requires>
-                        </field>
-                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
-                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
-                        <field id="enable_express_checkout_bml_payflow" translate="label" type="select" sortOrder="21" showInWebsite="1" showInDefault="1">
-                            <label>Enable PayPal Credit</label>
-                            <comment><![CDATA[PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
-                            You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                            <a href="https:/www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
-                            </comment>
-                            <config_path>payment/payflow_express_bml/active</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Bml</frontend_model>
-                            <requires>
-                                <field id="enable_paypal_payflow"/>
-                            </requires>
-                        </field>
-                        <field id="express_checkout_bml_sort_order" sortOrder="30" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order">
-                            <config_path>payment/payflow_express_bml/sort_order</config_path>
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder</frontend_model>
-                            <depends>
-                                <field id="enable_express_checkout_bml_payflow">1</field>
-                            </depends>
-                        </field>
-                        <group id="paypal_payflow_advertise_bml" translate="label comment" showInDefault="1" showInWebsite="1" sortOrder="40">
-                            <label>Advertise PayPal Credit</label>
-                            <comment>
-                                <![CDATA[<a href="https:/financing.paypal.com/ppfinportal/content/whyUseFinancing" target="_blank">Why Advertise Financing?</a><br/>
-                                <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
-                                from PayPal Credit&#174;. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
-                                Use PayPal’s free banner ads that let you advertise PayPal Credit&#174; financing as a payment option when your customers check out with PayPal.
-                                The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
-                                or more. <a href="https:/financing.paypal.com/ppfinportal/content/forrester" target="_blank">See Details</a>.]]>
-                            </comment>
-                            <field id="bml_publisher_id" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_publisher_id" />
-                            <field id="bml_wizard" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/bml_wizard" />
-                            <group id="paypal_payflow_settings_bml_homepage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
-                                <label>Home Page</label>
-                                <field id="bml_homepage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_display"/>
-                                <field id="paypal_payflow_bml_homepage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_homepage/bml_homepage_position"/>
-                                <field id="paypal_payflow_bml_homepage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                    <label>Size</label>
-                                    <config_path>payment/paypal_express_bml/homepage_size</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPH</source_model>
-                                    <attribute type="shared">1</attribute>
-                                    <depends>
-                                        <field id="paypal_payflow_bml_homepage_position">0</field>
-                                    </depends>
-                                </field>
-                                <field id="paypal_payflow_bml_homepage_size2" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_advertise_bml/paypal_payflow_settings_bml_homepage/paypal_payflow_bml_homepage_size1">
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeHPS</source_model>
-                                    <depends>
-                                        <field id="paypal_payflow_bml_homepage_position">1</field>
-                                    </depends>
-                                </field>
-                            </group>
-                            <group id="paypal_payflow_settings_bml_categorypage" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
-                                <label>Catalog Category Page</label>
-                                <field id="bml_categorypage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_display"/>
-                                <field id="paypal_payflow_bml_categorypage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_categorypage/bml_categorypage_position" />
-                                <field id="paypal_payflow_bml_categorypage_size1" translate="label" sortOrder="30" showInWebsite="1" showInDefault="1" type="select">
-                                    <label>Size</label>
-                                    <config_path>payment/paypal_express_bml/categorypage_size</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPC</source_model>
-                                    <attribute type="shared">1</attribute>
-                                    <depends>
-                                        <field id="paypal_payflow_bml_categorypage_position">0</field>
-                                    </depends>
-                                </field>
-                                <field id="paypal_payflow_bml_categorypage_size2" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_advertise_bml/paypal_payflow_settings_bml_categorypage/paypal_payflow_bml_categorypage_size1">
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCCPS</source_model>
-                                    <depends>
-                                        <field id="paypal_payflow_bml_categorypage_position">1</field>
-                                    </depends>
-                                </field>
-                            </group>
-                            <group id="paypal_payflow_settings_bml_productpage" translate="label" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="40">
-                                <label>Catalog Product Page</label>
-                                <field id="bml_productpage_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_display" />
-                                <field id="paypal_payflow_bml_productpage_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_productpage/bml_productpage_position" />
-                                <field id="paypal_payflow_bml_productpage_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                    <label>Size</label>
-                                    <config_path>payment/paypal_express_bml/productpage_size</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPC</source_model>
-                                    <attribute type="shared">1</attribute>
-                                    <depends>
-                                        <field id="paypal_payflow_bml_productpage_position">0</field>
-                                    </depends>
-                                </field>
-                                <field id="paypal_payflow_bml_productpage_size2" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_advertise_bml/paypal_payflow_settings_bml_productpage/paypal_payflow_bml_productpage_size1">
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCPPN</source_model>
-                                    <depends>
-                                        <field id="paypal_payflow_bml_productpage_position">1</field>
-                                    </depends>
-                                </field>
-                            </group>
-                            <group id="paypal_payflow_settings_bml_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
-                                <label>Checkout Cart Page</label>
-                                <field id="bml_checkout_display" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_display" />
-                                <field id="paypal_payflow_bml_checkout_position" translate="label" extends="payment_all_paypal/express_checkout/express_checkout_required/advertise_bml/settings_bml_checkout/bml_checkout_position" />
-                                <field id="paypal_payflow_bml_checkout_size1" translate="label" type="select" showInDefault="1" showInWebsite="1" sortOrder="30">
-                                    <label>Size</label>
-                                    <config_path>payment/paypal_express_bml/checkout_size</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutC</source_model>
-                                    <attribute type="shared">1</attribute>
-                                    <depends>
-                                        <field id="paypal_payflow_bml_checkout_position">0</field>
-                                    </depends>
-                                </field>
-                                <field id="paypal_payflow_bml_checkout_size2" extends="payment_us/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_advertise_bml/paypal_payflow_settings_bml_checkout/paypal_payflow_bml_checkout_size1">
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\BmlSize::getBmlSizeCheckoutN</source_model>
-                                    <attribute type="shared">1</attribute>
-                                    <depends>
-                                        <field id="paypal_payflow_bml_checkout_position">1</field>
-                                    </depends>
-                                </field>
-                            </group>
-                        </group>
-                    </group>
-                    <group id="settings_paypal_payflow" translate="label">
-                        <group id="settings_paypal_payflow_advanced" translate="label">
-                            <group id="paypal_payflow_frontend" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
-                                <label>Frontend Experience Settings</label>
-                                <field id="logo" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/logo"/>
-                                <field id="paypal_pages" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_pages"/>
-                                <field id="page_style" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/page_style"/>
-                                <field id="paypal_hdrimg" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrimg"/>
-                                <field id="paypal_hdrbackcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbackcolor"/>
-                                <field id="paypal_hdrbordercolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbordercolor"/>
-                                <field id="paypal_payflowcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_payflowcolor"/>
-                            </group>
-                        </group>
-                    </group>
-                    <group id="paypal_payflow_express_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
-                        <label>Basic Settings - PayPal Express Checkout</label>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                        <field id="title" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Title</label>
-                            <config_path>payment/payflow_express/title</config_path>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="sort_order" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Sort Order</label>
-                            <config_path>payment/payflow_express/sort_order</config_path>
-                            <frontend_class>validate-number</frontend_class>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                            <label>Payment Action</label>
-                            <config_path>payment/payflow_express/payment_action</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\PaymentActions</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <field id="visible_on_product" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Display on Product Details Page</label>
-                            <config_path>payment/payflow_express/visible_on_product</config_path>
-                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <attribute type="shared">1</attribute>
-                        </field>
-                        <group id="paypal_payflow_express_checkout_advanced" translate="label" showInDefault="1" showInWebsite="1" sortOrder="60">
-                            <label>Advanced Settings</label>
-                            <fieldset_css>config-advanced</fieldset_css>
-                            <field id="visible_on_cart" translate="label comment" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>Display on Shopping Cart</label>
-                                <comment>Also affects mini-shopping cart.</comment>
-                                <config_path>payment/payflow_express/visible_on_cart</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\Yesnoshortcut</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="allowspecific" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1">
-                                <label>Payment Applicable From</label>
-                                <config_path>payment/payflow_express/allowspecific</config_path>
-                                <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="specificcountry" translate="label" type="multiselect" sortOrder="20" showInDefault="1" showInWebsite="1">
-                                <label>Countries Payment Applicable From</label>
-                                <config_path>payment/payflow_express/specificcountry</config_path>
-                                <source_model>Magento\Paypal\Model\System\Config\Source\BuyerCountry</source_model>
-                                <depends>
-                                    <field id="allowspecific">1</field>
-                                </depends>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="debug" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1">
-                                <label>Debug Mode</label>
-                                <config_path>payment/payflow_express/debug</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="verify_peer" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1">
-                                <label>Enable SSL verification</label>
-                                <config_path>payment/payflow_express/verify_peer</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="line_items_enabled" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1">
-                                <label>Transfer Cart Line Items</label>
-                                <config_path>payment/payflow_express/line_items_enabled</config_path>
-                                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                                <attribute type="shared">1</attribute>
-                            </field>
-                            <field id="skip_order_review_step" sortOrder="50" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/skip_order_review_step"/>
-                        </group>
-                    </group>
-                </group>
-                <group id="payflow_link_us" extends="payment_all_paypal/payflow_link"/>
-            </group>
-            <group id="paypal_alternative_payment_methods" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
-                <group id="express_checkout_us" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>PayPal Express Checkout</label>
-                    <fieldset_css>complex paypal-express-section</fieldset_css>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-                    <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
-                    <attribute type="shared">0</attribute>
-                    <attribute type="activity_path">payment/paypal_express/active</attribute>
-                    <attribute type="activity_path">payment/payflow_express/active</attribute>
-                    <attribute type="displayIn">recommended_solutions</attribute>
-                </group>
-            </group>
-        </section>
-        <section id="payment_gb" extends="payment"  showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
-                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                <comment>Choose a secure bundled payment solution for your business.</comment>
-                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
-                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
-                <group id="wpp_usuk" translate="comment" sortOrder="20">
-                    <fieldset_css>pp-general-uk</fieldset_css>
-                    <demo_link>http://www.youtube.com/watch?v=LBe-TW87eGI&amp;list=PLF18B1094ABCD7CE8&amp;index=1&amp;feature=plpp_video</demo_link>
-                    <comment>Accept payments with a completely customizable checkout page.</comment>
-                    <group id="wpp_required_settings">
-                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                        <group id="wpp_advertise_bml" showInDefault="0" showInWebsite="0"/>
-                    </group>
-                </group>
-                <group id="payments_pro_hosted_solution_with_express_checkout" translate="label comment" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="30">
-                    <label>Website Payments Pro Hosted Solution</label>
-                    <attribute type="paypal_ec_separate">0</attribute>
-                    <group id="pphs_required_settings">
-                        <group id="pphs_required_settings_pphs" translate="label">
-                            <label>Website Payments Pro Hosted Solution and Express Checkout</label>
-                        </group>
-                        <field id="pphs_enable">
-                            <requires>
-                                <group id="pphs_required_settings_pphs"/>
-                            </requires>
-                            <frontend_class>paypal-enabler</frontend_class>
-                        </field>
-                    </group>
-                    <group id="pphs_settings" translate="label">
-                        <label>Basic Settings - PayPal Website Payments Pro Hosted Solution</label>
-                        <group id="pphs_settings_advanced">
-                            <group id="pphs_billing_agreement" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
-                                <label>PayPal Billing Agreement Settings</label>
-                                <field id="active" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/active" />
-                                <field id="title" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/title" />
-                                <field id="sort_order" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/sort_order" />
-                                <field id="payment_action" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/payment_action" />
-                                <field id="allowspecific" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/allowspecific" />
-                                <field id="specificcountry" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/specificcountry" />
-                                <field id="debug" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/debug" />
-                                <field id="verify_peer" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/verify_peer" />
-                                <field id="line_items_enabled" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/line_items_enabled" />
-                                <field id="allow_billing_agreement_wizard" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_billing_agreement/allow_billing_agreement_wizard" />
-                            </group>
-                            <group id="pphs_frontend" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
-                                <label>Frontend Experience Settings</label>
-                                <field id="logo" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/logo" />
-                                <field id="paypal_pages" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_pages" />
-                                <field id="page_style" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/page_style" />
-                                <field id="paypal_hdrimg" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrimg" />
-                                <field id="paypal_hdrbackcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbackcolor" />
-                                <field id="paypal_hdrbordercolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_hdrbordercolor" />
-                                <field id="paypal_payflowcolor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/paypal_payflowcolor" />
-                            </group>
-                        </group>
-                    </group>
-                    <group id="pphs_settings_express_checkout" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
-                        <label>Basic Settings - PayPal Express Checkout</label>
-                        <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                        <field id="title" extends="payment_all_paypal/express_checkout/settings_ec/title" />
-                        <field id="sort_order" extends="payment_all_paypal/express_checkout/settings_ec/sort_order" />
-                        <field id="payment_action" extends="payment_all_paypal/express_checkout/settings_ec/payment_action" />
-                        <field id="visible_on_product" extends="payment_all_paypal/express_checkout/settings_ec/visible_on_product" />
-                        <field id="authorization_honor_period" extends="payment_all_paypal/express_checkout/settings_ec/authorization_honor_period" />
-                        <field id="order_valid_period" extends="payment_all_paypal/express_checkout/settings_ec/order_valid_period" />
-                        <field id="child_authorization_number" extends="payment_all_paypal/express_checkout/settings_ec/child_authorization_number" />
-                        <group id="pphs_settings_express_checkout_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="80">
-                            <label>Advanced Settings</label>
-                            <fieldset_css>config-advanced</fieldset_css>
-                            <field id="visible_on_cart" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/visible_on_cart" />
-                            <field id="allowspecific" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/allowspecific" />
-                            <field id="specificcountry" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/specificcountry" />
-                            <field id="debug" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/debug" />
-                            <field id="verify_peer" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/verify_peer" />
-                            <field id="line_items_enabled" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/line_items_enabled" />
-                            <field id="transfer_shipping_options" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/transfer_shipping_options" />
-                            <field id="button_flavor" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/button_flavor" />
-                            <field id="solution_type" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/solution_type" />
-                            <field id="require_billing_address" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/require_billing_address" />
-                            <field id="allow_ba_signup" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/allow_ba_signup" />
-                            <field id="skip_order_review_step" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/skip_order_review_step" />
-                        </group>
-                    </group>
-                </group>
-                <group id="wps_express" extends="payment_all_paypal/express_checkout" sortOrder="50">
-                    <label>Website Payments Standard</label>
-                    <comment>Accept credit card and PayPal payments securely.</comment>
-                    <attribute type="activity_path">payment/wps_express/active</attribute>
-                    <group id="configuration_details">
-                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
-                    </group>
-                    <group id="express_checkout_required">
-                        <group id="express_checkout_required_express_checkout">
-                            <label>Website Payments Standard</label>
-                        </group>
-                        <field id="enable_express_checkout">
-                            <config_path>payment/wps_express/active</config_path>
-                        </field>
-                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
-                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
-                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-                    </group>
-                    <group id="settings_ec">
-                        <label>Basic Settings - PayPal Website Payments Standard</label>
-                    </group>
-                </group>
-            </group>
-            <group id="paypal_alternative_payment_methods" sortOrder="5" showInDefault="0" showInWebsite="0" showInStore="0">
-                <group id="express_checkout_gb" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>PayPal Express Checkout</label>
-                    <fieldset_css>complex paypal-express-section</fieldset_css>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-                    <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
-                    <attribute type="displayIn">recommended_solutions</attribute>
-                    <group id="express_checkout_required">
-                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-                    </group>
-                </group>
-            </group>
-        </section>
-        <section id="payment_de" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="paypal_payment_solutions" showInDefault="0" showInWebsite="0" showInStore="0" sortOrder="5">
-                <group id="express_checkout_de" translate="label comment" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>PayPal Express Checkout</label>
-                    <fieldset_css>complex paypal-express-section</fieldset_css>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                    <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-                    <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
-                    <attribute type="displayIn">recommended_solutions</attribute>
-                    <group id="express_checkout_required">
-                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-                    </group>
-                    <group id="settings_ec">
-                        <group id="settings_ec_advanced">
-                            <field id="solution_type" showInDefault="0" showInWebsite="0"/>
-                        </group>
-                    </group>
-                </group>
-            </group>
-        </section>
-        <section id="payment_other" extends="payment" showInDefault="0" showInWebsite="0" showInStore="0">
-            <group id="express_checkout_other" translate="label comment" sortOrder="5" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>PayPal Express Checkout</label>
-                <fieldset_css>complex paypal-express-section</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                <comment>Add another payment method to your existing solution or as a stand-alone option.</comment>
-                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
-                <attribute type="displayIn">recommended_solutions</attribute>
-                <group id="express_checkout_required">
-                    <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                    <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                    <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-                </group>
-            </group>
-            <group id="paypal_group_all_in_one" translate="label comment" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label><![CDATA[PayPal All-in-One Payment Solutions&nbsp;&nbsp;<i>Accept and process credit cards and PayPal payments.</i>]]></label>
-                <fieldset_css>complex paypal-other-section paypal-all-in-one-section</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                <comment>Choose a secure bundled payment solution for your business.</comment>
-                <help_url>https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&amp;subTab=newlineup</help_url>
-                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
-                <group id="wps_other" extends="payment_all_paypal/express_checkout" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Website Payments Standard</label>
-                    <fieldset_css>complex</fieldset_css>
-                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment</frontend_model>
-                    <comment>Accept credit card and PayPal payments securely.</comment>
-                    <attribute type="activity_path">payment/wps_express/active</attribute>
-                    <group id="configuration_details">
-                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html</comment>
-                    </group>
-                    <group id="express_checkout_required">
-                        <group id="express_checkout_required_express_checkout">
-                            <label>Website Payments Standard</label>
-                        </group>
-                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
-                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
-                        <field id="enable_express_checkout">
-                            <config_path>payment/wps_express/active</config_path>
-                        </field>
-                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                        <group id="advertise_bml" showInDefault="0" showInWebsite="0"/>
-                    </group>
-                    <group id="settings_ec">
-                        <label>Basic Settings - PayPal Website Payments Standard</label>
-                    </group>
-                </group>
-            </group>
-            <group id="paypal_payment_gateways" translate="label comment" sortOrder="8" showInDefault="0" showInWebsite="0" showInStore="0">
-                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
-                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                <comment>Process payments using your own internet merchant account.</comment>
-                <help_url>https://merchant.paypal.com/cgi-bin/marketingweb?cmd=_render-content</help_url>
-                <attribute type="displayIn">other_paypal_payment_solutions</attribute>
-            </group>
-        </section>
-        <section id="payment_ca" extends="payment_other">
-            <group id="express_checkout_other">
-                <attribute type="activity_path">payment/paypal_express/active</attribute>
-                <attribute type="activity_path">payment/payflow_express/active</attribute>
-            </group>
-            <group id="paypal_group_all_in_one">
-                <group id="wps_other" sortOrder="20"/>
-            </group>
-            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
-                <fieldset_css>complex paypal-other-section paypal-gateways-section</fieldset_css>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
-                <label><![CDATA[PayPal Payment Gateways&nbsp;<i>Process payments using your own internet merchant account.</i>]]></label>
-                <group id="wpp_ca" translate="label" extends="payment_all_paypal/paypal_payflowpro" sortOrder="30">
-                    <label>Website Payments Pro</label>
-                    <attribute type="activity_path">payment/paypal_payment_pro/active</attribute>
-                    <group id="configuration_details">
-                        <comment>http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html</comment>
-                    </group>
-                    <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
-                        <group id="paypal_payflow_api_settings">
-                            <label>Payments Pro</label>
-                        </group>
-                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
-                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
-                        <field id="enable_paypal_payflow">
-                            <frontend_class>paypal-enabler paypal-ec-pe</frontend_class>
-                            <attribute type="shared">0</attribute>
-                            <config_path>payment/paypal_payment_pro/active</config_path>
-                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
-                        </field>
-                    </group>
-                    <group id="settings_paypal_payflow">
-                        <label>Basic Settings - PayPal Payments Pro</label>
-                    </group>
-                </group>
-                <group id="paypal_payflowpro_ca" extends="payment_all_paypal/paypal_payflowpro" sortOrder="40"/>
-                <group id="payflow_link_ca" extends="payment_all_paypal/payflow_link" sortOrder="50">
-                    <group id="payflow_link_required">
-                        <field id="enable_express_checkout_bml" showInDefault="0" showInWebsite="0"/>
-                        <field id="express_checkout_bml_sort_order" showInDefault="0" showInWebsite="0"/>
-                        <group id="payflow_link_advertise_bml" showInDefault="0" showInWebsite="0"/>
-                    </group>
-                </group>
-            </group>
-        </section>
-        <section id="payment_au" extends="payment_other">
-            <group id="express_checkout_other"/>
-            <group id="paypal_group_all_in_one">
-                <group id="wps_other" sortOrder="12"/>
-                <group id="payments_pro_hosted_solution_au" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10"/>
-            </group>
-            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
-                <group id="paypal_payflowpro_au" extends="payment_all_paypal/paypal_payflowpro" sortOrder="20"/>
-            </group>
-        </section>
-        <section id="payment_jp" extends="payment_other">
-            <group id="express_checkout_other"/>
-            <group id="paypal_group_all_in_one">
-                <group id="wps_other" sortOrder="12"/>
-                <group id="payments_pro_hosted_solution_jp" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
-                    <label>Website Payments Plus</label>
-                </group>
-            </group>
-        </section>
-        <section id="payment_fr" extends="payment_other">
-            <group id="express_checkout_other"/>
-            <group id="paypal_group_all_in_one">
-                <group id="wps_other" sortOrder="12"/>
-                <group id="payments_pro_hosted_solution_fr" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
-                    <label>Integral Evolution</label>
-                </group>
-            </group>
-        </section>
-        <section id="payment_it" extends="payment_other">
-            <group id="express_checkout_other"/>
-            <group id="paypal_group_all_in_one">
-                <group id="wps_other" sortOrder="12"/>
-                <group id="payments_pro_hosted_solution_it" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
-                    <label>Pro</label>
-                </group>
-            </group>
-        </section>
-        <section id="payment_es" extends="payment_other">
-            <group id="express_checkout_other"/>
-            <group id="paypal_group_all_in_one">
-                <group id="wps_other" sortOrder="12"/>
-                <group id="payments_pro_hosted_solution_es" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10">
-                    <label>Pasarela integral</label>
-                </group>
-            </group>
-        </section>
-        <section id="payment_hk" extends="payment_other">
-            <group id="express_checkout_other"/>
-            <group id="paypal_group_all_in_one">
-                <group id="wps_other" sortOrder="12"/>
-                <group id="payments_pro_hosted_solution_hk" extends="payment_all_paypal/payments_pro_hosted_solution_without_bml" sortOrder="10"/>
-            </group>
-        </section>
-        <section id="payment_nz" extends="payment_other">
-            <group id="express_checkout_other"/>
-            <group id="paypal_group_all_in_one">
-                <group id="wps_other"/>
-            </group>
-            <group id="paypal_payment_gateways" showInDefault="1" showInWebsite="1" showInStore="1">
-                <group id="paypal_payflowpro_nz" extends="payment_all_paypal/paypal_payflowpro"/>
-            </group>
-        </section>
-    </system>
-</config>
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php
index eb80da6d21b19..ee05e402bc689 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php
@@ -72,7 +72,7 @@ protected function setUp()
 
         $this->api = $this->getMockBuilder(Nvp::class)
             ->disableOriginalConstructor()
-            ->setMethods(['call', 'getExportedShippingAddress', 'getExportedBillingAddress'])
+            ->setMethods(['call', 'getExportedShippingAddress', 'getExportedBillingAddress', 'getShippingRateCode'])
             ->getMock();
 
         $this->api->expects($this->any())
@@ -303,6 +303,7 @@ public function testReturnFromPaypal()
     public function testReturnFromPaypalButton()
     {
         $quote = $this->getFixtureQuote();
+        $quote->getShippingAddress()->setShippingMethod('');
         $this->prepareCheckoutModel($quote);
         $quote->getPayment()->setAdditionalInformation(Checkout::PAYMENT_INFO_BUTTON, 1);
 
@@ -318,6 +319,8 @@ public function testReturnFromPaypalButton()
         $this->assertEquals($exportedShippingData['telephone'], $shippingAddress->getTelephone());
         $this->assertEquals($exportedShippingData['email'], $shippingAddress->getEmail());
 
+        $this->assertEquals('flatrate_flatrate', $shippingAddress->getShippingMethod());
+
         $this->assertEquals([$exportedShippingData['street']], $billingAddress->getStreet());
         $this->assertEquals($exportedShippingData['firstname'], $billingAddress->getFirstname());
         $this->assertEquals($exportedShippingData['city'], $billingAddress->getCity());
@@ -512,6 +515,9 @@ private function prepareCheckoutModel(Quote $quote, $prefix = '')
         $this->api->method('getExportedShippingAddress')
             ->will($this->returnValue($exportedShippingAddress));
 
+        $this->api->method('getShippingRateCode')
+            ->willReturn('flatrate_flatrate Flat Rate - Fixed');
+
         $this->paypalInfo->method('importToPayment')
             ->with($this->api, $quote->getPayment());
     }
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/IpnTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/IpnTest.php
index 6b92338e9932a..3c126bcdc2c5b 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/IpnTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/IpnTest.php
@@ -64,7 +64,7 @@ public function testProcessIpnRequestFullRefund()
         $creditmemoItems = $order->getCreditmemosCollection()->getItems();
         $creditmemo = current($creditmemoItems);
 
-        $this->assertEquals(Order::STATE_PROCESSING, $order->getState());
+        $this->assertEquals(Order::STATE_CLOSED, $order->getState());
         $this->assertEquals(1, count($creditmemoItems));
         $this->assertEquals(Creditmemo::STATE_REFUNDED, $creditmemo->getState());
         $this->assertEquals(10, $order->getSubtotalRefunded());
@@ -146,7 +146,7 @@ public function testProcessIpnRequestRestRefund()
 
         $creditmemoItems = $order->getCreditmemosCollection()->getItems();
 
-        $this->assertEquals(Order::STATE_PROCESSING, $order->getState());
+        $this->assertEquals(Order::STATE_CLOSED, $order->getState());
         $this->assertEquals(1, count($creditmemoItems));
         $this->assertEquals(10, $order->getSubtotalRefunded());
         $this->assertEquals(10, $order->getBaseSubtotalRefunded());
diff --git a/dev/tests/integration/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php b/dev/tests/integration/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
index fba5354b691d6..2e447e7854a7c 100644
--- a/dev/tests/integration/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
+++ b/dev/tests/integration/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
@@ -56,8 +56,8 @@ public function testToHtml()
         $this->_customerSession->loginById(1);
         $translation = __('Not you?');
 
-        $this->assertStringMatchesFormat(
-            '%A<span>%A<a%Ahref="' . $this->_block->getHref() . '"%A>' . $translation . '</a>%A</span>%A',
+        $this->assertContains(
+            '<a href="' . $this->_block->getHref() . '">' . $translation . '</a>',
             $this->_block->toHtml()
         );
         $this->_customerSession->logout();
diff --git a/dev/tests/integration/testsuite/Magento/Persistent/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Persistent/Model/ObserverTest.php
index ecf2cd77a13ff..d0c253fc7a64b 100644
--- a/dev/tests/integration/testsuite/Magento/Persistent/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Persistent/Model/ObserverTest.php
@@ -9,7 +9,6 @@
 use Magento\Customer\Model\Context;
 
 /**
- * @magentoDataFixture Magento/Persistent/_files/persistent.php
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ObserverTest extends \PHPUnit\Framework\TestCase
@@ -29,11 +28,6 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
      */
     protected $customerRepository;
 
-    /**
-     * @var \Magento\Persistent\Helper\Session
-     */
-    protected $_persistentSessionHelper;
-
     /**
      * @var \Magento\Framework\ObjectManagerInterface
      */
@@ -44,11 +38,6 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
      */
     protected $_observer;
 
-    /**
-     * @var \Magento\Customer\Model\Session
-     */
-    protected $_customerSession;
-
     /**
      * @var \Magento\Checkout\Model\Session | \PHPUnit_Framework_MockObject_MockObject
      */
@@ -58,8 +47,6 @@ public function setUp()
     {
         $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
-        $this->_customerSession = $this->_objectManager->get(\Magento\Customer\Model\Session::class);
-
         $this->_customerViewHelper = $this->_objectManager->create(
             \Magento\Customer\Helper\View::class
         );
@@ -75,8 +62,6 @@ public function setUp()
             \Magento\Checkout\Model\Session::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
 
-        $this->_persistentSessionHelper = $this->_objectManager->create(\Magento\Persistent\Helper\Session::class);
-
         $this->_observer = $this->_objectManager->create(
             \Magento\Persistent\Model\Observer::class,
             [
@@ -89,16 +74,11 @@ public function setUp()
     }
 
     /**
-     * @magentoConfigFixture current_store persistent/options/enabled 1
-     * @magentoConfigFixture current_store persistent/options/remember_enabled 1
-     * @magentoConfigFixture current_store persistent/options/remember_default 1
      * @magentoAppArea frontend
      * @magentoAppIsolation enabled
      */
     public function testEmulateWelcomeBlock()
     {
-        $this->_customerSession->loginById(1);
-
         $httpContext = new \Magento\Framework\App\Http\Context();
         $httpContext->setValue(Context::CONTEXT_AUTH, 1, 1);
         $block = $this->_objectManager->create(
@@ -108,15 +88,7 @@ public function testEmulateWelcomeBlock()
             ]
         );
         $this->_observer->emulateWelcomeBlock($block);
-        $customerName = $this->_escaper->escapeHtml(
-            $this->_customerViewHelper->getCustomerName(
-                $this->customerRepository->getById(
-                    $this->_persistentSessionHelper->getSession()->getCustomerId()
-                )
-            )
-        );
-        $translation = __('Welcome, %1!', $customerName)->__toString();
-        $this->assertStringMatchesFormat('%A' . $translation . '%A', $block->getWelcome()->__toString());
-        $this->_customerSession->logout();
+
+        $this->assertEquals('&nbsp;', $block->getWelcome());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Fixtures/quote_without_customer_email.php b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/quote_without_customer_email.php
new file mode 100644
index 0000000000000..49fd11593c798
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Quote/Fixtures/quote_without_customer_email.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+require __DIR__ . '/../../Sales/_files/quote_with_customer.php';
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+$quote->getPayment()
+    ->setMethod('checkmo');
+$quote->getShippingAddress()
+    ->setShippingMethod('flatrate_flatrate')
+    ->setCollectShippingRates(true);
+$quote->collectTotals();
+
+$quote->setCustomerEmail('');
+
+/** @var CartRepositoryInterface $repository */
+$repository = $objectManager->get(CartRepositoryInterface::class);
+$repository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/UpdaterTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/UpdaterTest.php
new file mode 100644
index 0000000000000..137d3347653bc
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/UpdaterTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Quote\Model\Quote\Item;
+
+use Magento\Quote\Api\CartItemRepositoryInterface;
+use Magento\Quote\Api\Data\CartItemInterface;
+use Magento\Quote\Model\Quote;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Quote\Model\Quote\Item\Updater;
+
+/**
+ * Tests \Magento\Quote\Model\Quote\Item\Updater
+ */
+class UpdaterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Updater
+     */
+    private $updater;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->updater = Bootstrap::getObjectManager()->create(Updater::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/quote_with_custom_price.php
+     * @return void
+     */
+    public function testUpdate()
+    {
+        /** @var CartItemRepositoryInterface $quoteItemRepository */
+        $quoteItemRepository = Bootstrap::getObjectManager()->create(CartItemRepositoryInterface::class);
+        /** @var Quote $quote */
+        $quote = Bootstrap::getObjectManager()->create(Quote::class);
+        $quoteId = $quote->load('test01', 'reserved_order_id')->getId();
+        /** @var CartItemInterface[] $quoteItems */
+        $quoteItems = $quoteItemRepository->getList($quoteId);
+        /** @var CartItemInterface $actualQuoteItem */
+        $actualQuoteItem = array_pop($quoteItems);
+        $this->assertInstanceOf(CartItemInterface::class, $actualQuoteItem);
+
+        $info = [
+            'qty' => 1,
+        ];
+        $this->updater->update($actualQuoteItem, $info);
+
+        $this->assertNull(
+            $actualQuoteItem->getCustomPrice(),
+            'Item custom price has to be null'
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
index 356117f2b3dc8..dc784aa55efc4 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
@@ -12,9 +12,11 @@
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Quote\Api\CartManagementInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Sales\Api\OrderManagementInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
+use PHPUnit\Framework\ExpectationFailedException;
 
 /**
  * Class for testing QuoteManagement model
@@ -101,6 +103,33 @@ public function testSubmitWithItemOutOfStock()
         $this->cartManagement->placeOrder($quote->getId());
     }
 
+    /**
+     * Tries to create an order using quote with empty customer email.
+     *
+     * Order should not start placing if order validation is failed.
+     *
+     * @magentoDataFixture Magento/Quote/Fixtures/quote_without_customer_email.php
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Email has a wrong format
+     */
+    public function testSubmitWithEmptyCustomerEmail()
+    {
+        $quote = $this->getQuote('test01');
+        $orderManagement = $this->createMock(OrderManagementInterface::class);
+        $orderManagement->expects($this->never())
+            ->method('place');
+        $cartManagement = $this->objectManager->create(
+            CartManagementInterface::class,
+            ['orderManagement' => $orderManagement]
+        );
+
+        try {
+            $cartManagement->placeOrder($quote->getId());
+        } catch (ExpectationFailedException $e) {
+            $this->fail('Place order method was not expected to be called if order validation is failed');
+        }
+    }
+
     /**
      * Gets quote by reserved order ID.
      *
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
index 802358c2c83c7..ce5180710728f 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
@@ -131,6 +131,9 @@ public function testUpdateCustomerData()
             $this->assertContains($item, $actual);
         }
         $this->assertEquals('test@example.com', $quote->getCustomerEmail());
+        $this->assertEquals('Joe', $quote->getCustomerFirstname());
+        $this->assertEquals('Dou', $quote->getCustomerLastname());
+        $this->assertEquals('Ivan', $quote->getCustomerMiddlename());
     }
 
     /**
@@ -308,6 +311,26 @@ public function testAssignCustomerWithAddressChange()
         }
     }
 
+    /**
+     * Customer has address with country which not allowed in website
+     *
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_address.php
+     * @magentoDataFixture Magento/Backend/_files/allowed_countries_fr.php
+     * @return void
+     */
+    public function testAssignCustomerWithAddressChangeWithNotAllowedCountry()
+    {
+        /** @var Quote $quote */
+        $quote = $this->objectManager->create(Quote::class);
+        $customerData = $this->_prepareQuoteForTestAssignCustomerWithAddressChange($quote);
+        $quote->assignCustomerWithAddressChange($customerData);
+
+        /** Check that addresses are empty */
+        $this->assertNull($quote->getBillingAddress()->getCountryId());
+        $this->assertNull($quote->getShippingAddress()->getCountryId());
+    }
+
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
      */
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/ResourceModel/Quote/Item/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/ResourceModel/Quote/Item/CollectionTest.php
new file mode 100644
index 0000000000000..7bfdb096673cc
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/ResourceModel/Quote/Item/CollectionTest.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\ResourceModel\Quote\Item;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\ResourceModel\Quote\Item\Collection as QuoteItemCollection;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Tests Magento\Quote\Model\ResourceModel\Quote\Item\Collection.
+ */
+class CollectionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * Covers case when during quote item collection load product exists in db but not accessible.
+     *
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @return void
+     */
+    public function testLoadCollectionWithNotAccessibleProduct()
+    {
+        /** @var Quote $quote */
+        $quote = $this->objectManager->create(Quote::class);
+        $quote->load('test01', 'reserved_order_id');
+
+        $this->assertCount(1, $quote->getItemsCollection());
+
+        $product = $this->productRepository->get('simple');
+        /** @var ProductCollection $productCollection */
+        $productCollection = $this->objectManager->create(ProductCollection::class);
+        $this->setPropertyValue($productCollection, '_isCollectionLoaded', true);
+        /** @var ProductCollectionFactory|\PHPUnit_Framework_MockObject_MockObject $productCollectionFactoryMock */
+        $productCollectionFactoryMock = $this->createMock(ProductCollectionFactory::class);
+        $productCollectionFactoryMock->expects($this->any())->method('create')->willReturn($productCollection);
+
+        /** @var QuoteItemCollection $quoteItemCollection */
+        $quoteItemCollection = $this->objectManager->create(
+            QuoteItemCollection::class,
+            [
+                'productCollectionFactory' => $productCollectionFactoryMock,
+            ]
+        );
+
+        $quoteItemCollection->setQuote($quote);
+        $this->assertCount(1, $quoteItemCollection);
+        $item = $quoteItemCollection->getItemByColumnValue('product_id', $product->getId());
+
+        $this->assertNotNull($item);
+        $this->assertTrue($item->isDeleted());
+    }
+
+    /**
+     * Set object non-public property value.
+     *
+     * @param object $object
+     * @param string $propertyName
+     * @param mixed $value
+     * @return void
+     */
+    private function setPropertyValue($object, string $propertyName, $value)
+    {
+        $reflectionClass = new \ReflectionClass($object);
+        if ($reflectionClass->hasProperty($propertyName)) {
+            $reflectionProperty = $reflectionClass->getProperty($propertyName);
+            $reflectionProperty->setAccessible(true);
+            $reflectionProperty->setValue($object, $value);
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Review/Controller/Adminhtml/Product/EditTest.php b/dev/tests/integration/testsuite/Magento/Review/Controller/Adminhtml/Product/EditTest.php
new file mode 100644
index 0000000000000..2af9b093cb815
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Review/Controller/Adminhtml/Product/EditTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Review\Controller\Adminhtml\Product;
+
+use Magento\Review\Model\Review;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+use Magento\Framework\Acl\Builder;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\UrlInterface;
+use Magento\Review\Model\ResourceModel\Review\CollectionFactory;
+
+/**
+ * Test Edit action.
+ *
+ * @magentoAppArea adminhtml
+ */
+class EditTest extends AbstractBackendController
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Builder
+     */
+    private $aclBuilder;
+
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->aclBuilder = $this->objectManager->get(Builder::class);
+        $this->urlBuilder = $this->objectManager->get(UrlInterface::class);
+        $this->collectionFactory = $this->objectManager->get(CollectionFactory::class);
+        $this->aclBuilder->resetRuntimeAcl();
+    }
+
+    /**
+     * Tests Edit action without reviews_all resource when manipulating Pending review.
+     *
+     * @return void
+     * @magentoDataFixture Magento/Review/_files/reviews.php
+     */
+    public function testAclHasAccess()
+    {
+        $collection = $this->collectionFactory->create();
+        $collection->addFilter('detail.nickname', 'Nickname');
+        /** @var Review $review */
+        $review = $collection->getItemByColumnValue('status_id', Review::STATUS_PENDING);
+
+        // Exclude resource from ACL.
+        $this->aclBuilder->getAcl()->deny(null, 'Magento_Review::reviews_all');
+        $this->uri = 'backend/review/product/edit/id/' . $review->getId();
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * Tests Edit action without pending and reviews_all resources.
+     *
+     * @return void
+     */
+    public function testAclNoAccess()
+    {
+        // Exclude resource from ACL.
+        $this->resource = ['Magento_Review::reviews_all', 'Magento_Review::pending'];
+        $this->uri = 'backend/review/product/edit/id/' . 'doesn\'t matter';
+
+        parent::testAclNoAccess();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Review/Controller/Adminhtml/Product/MassUpdateTest.php b/dev/tests/integration/testsuite/Magento/Review/Controller/Adminhtml/Product/MassUpdateTest.php
new file mode 100644
index 0000000000000..8e8973af6f597
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Review/Controller/Adminhtml/Product/MassUpdateTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Review\Controller\Adminhtml\Product;
+
+use Magento\Review\Model\Review;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+use Magento\Framework\Acl\Builder;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\UrlInterface;
+use Magento\Review\Model\ResourceModel\Review\CollectionFactory;
+use Zend\Http\Request;
+
+/**
+ * Test Mass Update action.
+ *
+ * @magentoAppArea adminhtml
+ */
+class MassUpdateTest extends AbstractBackendController
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Builder
+     */
+    private $aclBuilder;
+
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->aclBuilder = $this->objectManager->get(Builder::class);
+        $this->urlBuilder = $this->objectManager->get(UrlInterface::class);
+        $this->collectionFactory = $this->objectManager->get(CollectionFactory::class);
+        $this->aclBuilder->resetRuntimeAcl();
+        $this->httpMethod = Request::METHOD_POST;
+        $this->uri = 'backend/review/product/massUpdateStatus';
+    }
+
+    /**
+     * Tests Mass Update action without reviews_all resource when manipulating Pending reviews.
+     *
+     * @return void
+     * @magentoDataFixture Magento/Review/_files/reviews.php
+     */
+    public function testAclHasAccess()
+    {
+        $collection = $this->collectionFactory->create();
+        $collection->addFilter('detail.nickname', 'Nickname');
+        /** @var Review $review */
+        $review = $collection->getItemByColumnValue('status_id', Review::STATUS_PENDING);
+
+        // Exclude resource from ACL.
+        $this->aclBuilder->getAcl()->deny(null, 'Magento_Review::reviews_all');
+        $this->getRequest()->setPostValue(['reviews' => $review->getId()]);
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * Tests Mass Update action without pending and reviews_all resources.
+     *
+     * @return void
+     */
+    public function testAclNoAccess()
+    {
+        // Exclude resource from ACL.
+        $this->resource = ['Magento_Review::reviews_all', 'Magento_Review::pending'];
+
+        parent::testAclNoAccess();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Review/Controller/CaseCheckAddingProductReviewTest.php b/dev/tests/integration/testsuite/Magento/Review/Controller/CaseCheckAddingProductReviewTest.php
new file mode 100644
index 0000000000000..49e980ed53602
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Review/Controller/CaseCheckAddingProductReviewTest.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Review\Controller;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\Request;
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * Test review product controller behavior
+ *
+ * @magentoAppArea frontend
+ */
+class CaseCheckAddingProductReviewTest extends AbstractController
+{
+    /**
+     * Test adding a review for allowed guests with incomplete data by a not logged in user
+     *
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Review/_files/config.php
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     */
+    public function testAttemptForGuestToAddReviewsWithIncompleteData()
+    {
+        $product = $this->getProduct();
+        /** @var FormKey $formKey */
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $post = [
+            'nickname' => 'Test nick',
+            'title' => 'Summary',
+            'form_key' => $formKey->getFormKey(),
+        ];
+        $this->prepareRequestData($post);
+        $this->dispatch('review/product/post/id/' . $product->getId());
+        $this->assertSessionMessages(
+            $this->equalTo(['Please enter a review.']),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
+    /**
+     * Test adding a review for not allowed guests by a guest
+     *
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Review/_files/disable_config.php
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     */
+    public function testAttemptForGuestToAddReview()
+    {
+        $product = $this->getProduct();
+        /** @var FormKey $formKey */
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $post = [
+            'nickname' => 'Test nick',
+            'title' => 'Summary',
+            'detail' => 'Test Details',
+            'form_key' => $formKey->getFormKey(),
+        ];
+
+        $this->prepareRequestData($post);
+        $this->dispatch('review/product/post/id/' . $product->getId());
+
+        $this->assertRedirect($this->stringContains('customer/account/login'));
+    }
+
+    /**
+     * Test successfully adding a product review by a guest
+     *
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Review/_files/config.php
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     */
+    public function testSuccessfullyAddingProductReviewForGuest()
+    {
+        $product = $this->getProduct();
+        /** @var FormKey $formKey */
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $post = [
+            'nickname' => 'Test nick',
+            'title' => 'Summary',
+            'detail' => 'Test Details',
+            'form_key' => $formKey->getFormKey(),
+        ];
+
+        $this->prepareRequestData($post);
+        $this->dispatch('review/product/post/id/' . $product->getId());
+
+        $this->assertSessionMessages(
+            $this->equalTo(['You submitted your review for moderation.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+    }
+
+    /**
+     * @return ProductInterface
+     */
+    private function getProduct()
+    {
+        return $this->_objectManager->get(ProductRepositoryInterface::class)->get('custom-design-simple-product');
+    }
+
+    /**
+     * @param array $postData
+     * @return void
+     */
+    private function prepareRequestData($postData)
+    {
+        $this->getRequest()->setMethod(Request::METHOD_POST);
+        $this->getRequest()->setPostValue($postData);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/disable_config.php b/dev/tests/integration/testsuite/Magento/Review/_files/disable_config.php
new file mode 100644
index 0000000000000..ee21150bd6129
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Review/_files/disable_config.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var Value $config */
+use Magento\Framework\App\Config\Value;
+
+$config = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(Value::class);
+$config->setPath('catalog/review/allow_guest');
+$config->setScope('default');
+$config->setScopeId(0);
+$config->setValue(0);
+$config->save();
diff --git a/dev/tests/integration/testsuite/Magento/Rss/Controller/Feed/IndexTest.php b/dev/tests/integration/testsuite/Magento/Rss/Controller/Feed/IndexTest.php
new file mode 100644
index 0000000000000..e0c38775101a3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Rss/Controller/Feed/IndexTest.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Rss\Controller\Feed;
+
+/**
+ * Test for \Magento\Rss\Controller\Feed\Index
+ */
+class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /**
+     * @var \Magento\Rss\Model\UrlBuilder
+     */
+    private $urlBuilder;
+
+    /**
+     * @var \Magento\Customer\Api\CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var \Magento\Wishlist\Model\Wishlist
+     */
+    private $wishlist;
+
+    /**
+     * @var \Magento\Customer\Model\Session
+     */
+    private $customerSession;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->urlBuilder = $this->_objectManager->get(\Magento\Rss\Model\UrlBuilder::class);
+        $this->customerRepository = $this->_objectManager->get(
+            \Magento\Customer\Api\CustomerRepositoryInterface::class
+        );
+        $this->wishlist = $this->_objectManager->get(\Magento\Wishlist\Model\Wishlist::class);
+        $this->customerSession = $this->_objectManager->get(\Magento\Customer\Model\Session::class);
+    }
+
+    /**
+     * Check Rss response.
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php
+     * @magentoConfigFixture current_store rss/wishlist/active 1
+     * @magentoConfigFixture current_store rss/config/active 1
+     * @return void
+     */
+    public function testRssResponse()
+    {
+        $customerEmail = 'customer@example.com';
+        $customer = $this->customerRepository->get($customerEmail);
+        $customerId = $customer->getId();
+        $this->customerSession->setCustomerId($customerId);
+        $wishlistId = $this->wishlist->loadByCustomerId($customerId)->getId();
+        $this->dispatch($this->getLink($customerId, $customerEmail, $wishlistId));
+        $body = $this->getResponse()->getBody();
+
+        $this->assertContains('John Smith\'s Wishlist', $body);
+    }
+
+    /**
+     * Check Rss with incorrect wishlist id.
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php
+     * @magentoConfigFixture current_store rss/wishlist/active 1
+     * @magentoConfigFixture current_store rss/config/active 1
+     * @return void
+     */
+    public function testRssResponseWithIncorrectWishlistId()
+    {
+        $firstCustomerEmail = 'customer@example.com';
+        $secondCustomerEmail = 'customer_two@example.com';
+        $firstCustomer = $this->customerRepository->get($firstCustomerEmail);
+        $secondCustomer = $this->customerRepository->get($secondCustomerEmail);
+
+        $firstCustomerId = $firstCustomer->getId();
+        $secondCustomerId = $secondCustomer->getId();
+        $this->customerSession->setCustomerId($firstCustomerId);
+        $wishlistId = $this->wishlist->loadByCustomerId($secondCustomerId, true)->getId();
+        $this->dispatch($this->getLink($firstCustomerId, $firstCustomerEmail, $wishlistId));
+        $body = $this->getResponse()->getBody();
+
+        $this->assertContains('<title>404 Not Found</title>', $body);
+    }
+
+    /**
+     * @param mixed $customerId
+     * @param string $customerEmail
+     * @param mixed $wishlistId
+     * @return string
+     */
+    private function getLink($customerId, string $customerEmail, $wishlistId): string
+    {
+        return 'rss/feed/index/type/wishlist/data/'
+            . base64_encode($customerId . ',' . $customerEmail)
+            . '/wishlist_id/' . $wishlistId;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php
index 999522a49e006..cc051c11aabf8 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php
@@ -5,104 +5,166 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
 
 use Magento\Backend\Model\Session\Quote as SessionQuote;
+use Magento\Customer\Api\Data\AttributeMetadataInterface;
 use Magento\Customer\Api\Data\AttributeMetadataInterfaceFactory;
+use Magento\Customer\Model\Data\Option;
 use Magento\Customer\Model\Metadata\Form;
 use Magento\Customer\Model\Metadata\FormFactory;
 use Magento\Framework\View\LayoutInterface;
 use Magento\Quote\Model\Quote;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
+ * Class for test Account
+ *
  * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AccountTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var Account */
+    /**
+     * @var Account
+     */
     private $accountBlock;
 
     /**
-     * @var Bootstrap
+     * @var ObjectManager
      */
     private $objectManager;
 
     /**
-     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @var SessionQuote|MockObject
+     */
+    private $session;
+
+    /**
+     * @inheritdoc
      */
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
-        $quote = $this->objectManager->create(Quote::class)->load(1);
-        $sessionQuoteMock = $this->getMockBuilder(
-            SessionQuote::class
-        )->disableOriginalConstructor()->setMethods(
-            ['getCustomerId', 'getStore', 'getStoreId', 'getQuote']
-        )->getMock();
-        $sessionQuoteMock->expects($this->any())->method('getCustomerId')->will($this->returnValue(1));
-        $sessionQuoteMock->expects($this->any())->method('getQuote')->will($this->returnValue($quote));
-        /** @var LayoutInterface $layout */
-        $layout = $this->objectManager->get(LayoutInterface::class);
-        $this->accountBlock = $layout->createBlock(
-            Account::class,
-            'address_block' . rand(),
-            ['sessionQuote' => $sessionQuoteMock]
-        );
         parent::setUp();
     }
 
     /**
+     * Test for get form with existing customer
+     *
      * @magentoDataFixture Magento/Customer/_files/customer.php
      */
-    public function testGetForm()
+    public function testGetFormWithCustomer()
     {
+        $customerGroup = 2;
+        $quote = $this->objectManager->create(Quote::class);
+
+        $this->session = $this->getMockBuilder(SessionQuote::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCustomerId','getQuote'])
+            ->getMock();
+        $this->session->method('getQuote')
+            ->willReturn($quote);
+        $this->session->method('getCustomerId')
+            ->willReturn(1);
+
+        /** @var LayoutInterface $layout */
+        $layout = $this->objectManager->get(LayoutInterface::class);
+        $this->accountBlock = $layout->createBlock(
+            Account::class,
+            'address_block' . rand(),
+            ['sessionQuote' => $this->session]
+        );
+
+        $fixtureCustomerId = 1;
+        /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
+        $customerRepository = $this->objectManager->get(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+        /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
+        $customer = $customerRepository->getById($fixtureCustomerId);
+        $customer->setGroupId($customerGroup);
+        $customerRepository->save($customer);
+
         $expectedFields = ['group_id', 'email'];
         $form = $this->accountBlock->getForm();
-        $this->assertEquals(1, $form->getElements()->count(), "Form has invalid number of fieldsets");
+        self::assertEquals(1, $form->getElements()->count(), "Form has invalid number of fieldsets");
         $fieldset = $form->getElements()[0];
+        $content = $form->toHtml();
 
-        $this->assertEquals(count($expectedFields), $fieldset->getElements()->count());
+        self::assertEquals(count($expectedFields), $fieldset->getElements()->count());
 
         foreach ($fieldset->getElements() as $element) {
-            $this->assertTrue(
+            self::assertTrue(
                 in_array($element->getId(), $expectedFields),
                 sprintf('Unexpected field "%s" in form.', $element->getId())
             );
         }
+
+        self::assertContains(
+            '<option value="'.$customerGroup.'" selected="selected">Wholesale</option>',
+            $content,
+            'The Customer Group specified for the chosen customer should be selected.'
+        );
+
+        self::assertContains(
+            'value="'.$customer->getEmail().'"',
+            $content,
+            'The Customer Email specified for the chosen customer should be input '
+        );
     }
 
     /**
      * Tests a case when user defined custom attribute has default value.
      *
-     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Store/_files/core_second_third_fixturestore.php
+     * @magentoConfigFixture current_store customer/create_account/default_group 2
+     * @magentoConfigFixture secondstore_store customer/create_account/default_group 3
      */
     public function testGetFormWithUserDefinedAttribute()
     {
+        /** @var \Magento\Store\Model\StoreManagerInterface  $storeManager */
+        $storeManager = Bootstrap::getObjectManager()->get(\Magento\Store\Model\StoreManagerInterface::class);
+        $secondStore = $storeManager->getStore('secondstore');
+
+        $quoteSession = $this->objectManager->get(SessionQuote::class);
+        $quoteSession->setStoreId($secondStore->getId());
+
         $formFactory = $this->getFormFactoryMock();
         $this->objectManager->addSharedInstance($formFactory, FormFactory::class);
 
         /** @var LayoutInterface $layout */
         $layout = $this->objectManager->get(LayoutInterface::class);
-        $accountBlock = $layout->createBlock(Account::class, 'address_block' . rand());
+        $accountBlock = $layout->createBlock(
+            Account::class,
+            'address_block' . rand()
+        );
 
         $form = $accountBlock->getForm();
         $form->setUseContainer(true);
+        $content = $form->toHtml();
 
-        $this->assertContains(
+        self::assertContains(
             '<option value="1" selected="selected">Yes</option>',
-            $form->toHtml(),
-            'Default value for user defined custom attribute should be selected'
+            $content,
+            'Default value for user defined custom attribute should be selected.'
+        );
+
+        self::assertContains(
+            '<option value="3" selected="selected">Retailer</option>',
+            $content,
+            'The Customer Group specified for the chosen store should be selected.'
         );
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * Creates a mock for Form object.
+     *
+     * @return MockObject
      */
-    private function getFormFactoryMock(): \PHPUnit_Framework_MockObject_MockObject
+    private function getFormFactoryMock()
     {
         /** @var AttributeMetadataInterfaceFactory $attributeMetadataFactory */
         $attributeMetadataFactory = $this->objectManager->create(AttributeMetadataInterfaceFactory::class);
@@ -113,11 +175,12 @@ private function getFormFactoryMock(): \PHPUnit_Framework_MockObject_MockObject
             ->setDefaultValue('1')
             ->setFrontendLabel('Yes/No');
 
+        /** @var Form|MockObject $form */
         $form = $this->getMockBuilder(Form::class)
             ->disableOriginalConstructor()
             ->getMock();
         $form->method('getUserAttributes')->willReturn([$booleanAttribute]);
-        $form->method('getSystemAttributes')->willReturn([]);
+        $form->method('getSystemAttributes')->willReturn([$this->createCustomerGroupAttribute()]);
 
         $formFactory = $this->getMockBuilder(FormFactory::class)
             ->disableOriginalConstructor()
@@ -126,4 +189,33 @@ private function getFormFactoryMock(): \PHPUnit_Framework_MockObject_MockObject
 
         return $formFactory;
     }
+
+    /**
+     * Creates a customer group attribute object.
+     *
+     * @return AttributeMetadataInterface
+     */
+    private function createCustomerGroupAttribute(): AttributeMetadataInterface
+    {
+        /** @var Option $option1 */
+        $option1 = $this->objectManager->create(Option::class);
+        $option1->setValue(2);
+        $option1->setLabel('Wholesale');
+
+        /** @var Option $option2 */
+        $option2 = $this->objectManager->create(Option::class);
+        $option2->setValue(3);
+        $option2->setLabel('Retailer');
+
+        /** @var AttributeMetadataInterfaceFactory $attributeMetadataFactory */
+        $attributeMetadataFactory = $this->objectManager->create(AttributeMetadataInterfaceFactory::class);
+        $attribute = $attributeMetadataFactory->create()
+            ->setAttributeCode('group_id')
+            ->setBackendType('static')
+            ->setFrontendInput('select')
+            ->setOptions([$option1, $option2])
+            ->setIsRequired(true);
+
+        return $attribute;
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AddressTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AddressTest.php
index f5a22ec19ccf3..f3c091e854e82 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AddressTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AddressTest.php
@@ -84,6 +84,7 @@ public function testGetAddressCollection()
      * Checks address collection output encoded to json.
      *
      * @magentoDataFixture Magento/Customer/Fixtures/customer_sec_website_2_addresses.php
+     * @magentoDbIsolation enabled
      */
     public function testGetAddressCollectionJson()
     {
@@ -122,6 +123,10 @@ public function testGetAddressCollectionJson()
                 'postcode' => '90230',
                 'telephone' => '3468676',
                 'vat_id' => false,
+                'prefix' => false,
+                'middlename' => false,
+                'suffix' => false,
+                'fax' => false
             ],
             $addresses[1]->getId() => [
                 'telephone' => '845454465',
@@ -135,6 +140,10 @@ public function testGetAddressCollectionJson()
                 'region' => false,
                 'region_id' => 0,
                 'vat_id' => false,
+                'prefix' => false,
+                'middlename' => false,
+                'suffix' => false,
+                'fax' => false
             ]
         ];
 
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php
new file mode 100644
index 0000000000000..1125fc1730718
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/TotalsTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Block\Adminhtml;
+
+use Magento\Framework\View\LayoutInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\OrderFactory;
+
+/**
+ * Test class for \Magento\Sales\Block\Adminhtml\Totals
+ */
+class TotalsTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /** @var LayoutInterface */
+    private $layout;
+
+    /** @var Totals */
+    private $block;
+
+    /** @var OrderFactory */
+    private $orderFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->layout = $this->_objectManager->get(LayoutInterface::class);
+        $this->block = $this->layout->createBlock(Totals::class, 'totals_block');
+        $this->orderFactory = $this->_objectManager->get(OrderFactory::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/order_with_free_shipping_by_coupon.php
+     */
+    public function testShowShippingCoupon()
+    {
+        /** @var Order $order */
+        $order = $this->orderFactory->create();
+        $order->loadByIncrementId('100000001');
+
+        $this->block->setOrder($order);
+        $this->block->toHtml();
+
+        $shippingTotal = $this->block->getTotal('shipping');
+        $this->assertNotFalse($shippingTotal, 'Shipping method is absent on the total\'s block.');
+        $this->assertContains(
+            '1234567890',
+            $shippingTotal->getLabel(),
+            'Coupon code is absent in the shipping method label name.'
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php
index b9573c99b4493..26b5f58760da8 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php
@@ -8,21 +8,61 @@
 use Magento\Backend\Model\Session\Quote;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Data\Form\FormKey;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Message\MessageInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\OrderRepository;
 use Magento\Sales\Model\Service\OrderService;
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
 use Magento\TestFramework\TestCase\AbstractBackendController;
+use PHPUnit\Framework\Constraint\StringContains;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
+/**
+ * Class test backend order save.
+ *
+ * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class SaveTest extends AbstractBackendController
 {
+    /**
+     * @var TransportBuilderMock
+     */
+    private $transportBuilder;
+
+    /**
+     * @var FormKey
+     */
+    private $formKey;
+
+    /**
+     * @var string
+     */
+    protected $resource = 'Magento_Sales::create';
+
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/sales/order_create/save';
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
+        $this->formKey = $this->_objectManager->get(FormKey::class);
+    }
+
     /**
      * Checks a case when order creation is failed on payment method processing but new customer already created
      * in the database and after new controller dispatching the customer should be already loaded in session
      * to prevent invalid validation.
      *
-     * @magentoAppArea adminhtml
      * @magentoDataFixture Magento/Sales/_files/quote_with_new_customer.php
      */
     public function testExecuteWithPaymentOperation()
@@ -35,9 +75,10 @@ public function testExecuteWithPaymentOperation()
         $email = 'john.doe001@test.com';
         $data = [
             'account' => [
-                'email' => $email
+                'email' => $email,
             ]
         ];
+        $this->getRequest()->setMethod('POST');
         $this->getRequest()->setPostValue(['order' => $data]);
 
         /** @var OrderService|MockObject $orderService */
@@ -64,6 +105,45 @@ public function testExecuteWithPaymentOperation()
         $this->_objectManager->removeSharedInstance(OrderService::class);
     }
 
+    /**
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     *
+     * @return void
+     */
+    public function testSendEmailOnOrderSave()
+    {
+        $this->prepareRequest(['send_confirmation' => true]);
+        $this->dispatch('backend/sales/order_create/save');
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You created the order.')]),
+            MessageInterface::TYPE_SUCCESS
+        );
+
+        $this->assertRedirect($this->stringContains('sales/order/view/'));
+
+        $orderId = $this->getOrderId();
+        if ($orderId === false) {
+            $this->fail('Order is not created.');
+        }
+        $order = $this->getOrder($orderId);
+
+        $message = $this->transportBuilder->getSentMessage();
+        $subject = __('Your %1 order confirmation', $order->getStore()->getFrontendName())->render();
+        $assert = $this->logicalAnd(
+            new StringContains($order->getBillingAddress()->getName()),
+            new StringContains(
+                'Thank you for your order from ' . $order->getStore()->getFrontendName()
+            ),
+            new StringContains(
+                "Your Order <span class=\"no-link\">#{$order->getIncrementId()}</span>"
+            )
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $assert);
+    }
+
     /**
      * Gets quote by reserved order id.
      *
@@ -82,4 +162,78 @@ private function getQuote($reservedOrderId)
         $items = $quoteRepository->getList($searchCriteria)->getItems();
         return array_pop($items);
     }
+
+    /**
+     * @inheritdoc
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     */
+    public function testAclHasAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * @inheritdoc
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     */
+    public function testAclNoAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclNoAccess();
+    }
+
+    /**
+     * @param int $orderId
+     * @return OrderInterface
+     */
+    private function getOrder(int $orderId): OrderInterface
+    {
+        return $this->_objectManager->get(OrderRepository::class)->get($orderId);
+    }
+
+    /**
+     * @param array $params
+     * @return void
+     */
+    private function prepareRequest(array $params = [])
+    {
+        $quote = $this->getQuote('guest_quote');
+        $session = $this->_objectManager->get(Quote::class);
+        $session->setQuoteId($quote->getId());
+        $session->setCustomerId(0);
+
+        $email = 'john.doe001@test.com';
+        $data = [
+            'account' => [
+                'email' => $email,
+            ],
+        ];
+
+        $data = array_replace_recursive($data, $params);
+
+        $this->getRequest()
+            ->setMethod('POST')
+            ->setParams(['form_key' => $this->formKey->getFormKey()])
+            ->setPostValue(['order' => $data]);
+    }
+
+    /**
+     * @return string|bool
+     */
+    protected function getOrderId()
+    {
+        $currentUrl = $this->getResponse()->getHeader('Location');
+        $orderId = false;
+
+        if (preg_match('/order_id\/(?<order_id>\d+)/', $currentUrl, $matches)) {
+            $orderId = $matches['order_id'] ?? '';
+        }
+
+        return $orderId;
+    }
 }
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 7110f39ee532c..f8e468ac42a32 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
@@ -43,6 +43,7 @@ protected function setUp()
 
     public function testLoadBlockAction()
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setParam('block', ',');
         $this->getRequest()->setParam('json', 1);
         $this->dispatch('backend/sales/order_create/loadBlock');
@@ -60,6 +61,7 @@ public function testLoadBlockActionData()
         )->addProducts(
             [$product->getId() => ['qty' => 1]]
         );
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setParam('block', 'data');
         $this->getRequest()->setParam('json', 1);
         $this->dispatch('backend/sales/order_create/loadBlock');
@@ -135,6 +137,7 @@ public function testLoadBlockShippingMethod()
      */
     public function testLoadBlockActions($block, $expected)
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setParam('block', $block);
         $this->getRequest()->setParam('json', 1);
         $this->dispatch('backend/sales/order_create/loadBlock');
@@ -142,6 +145,9 @@ public function testLoadBlockActions($block, $expected)
         $this->assertContains($expected, $html);
     }
 
+    /**
+     * @return array
+     */
     public function loadBlockActionsDataProvider()
     {
         return [
@@ -166,6 +172,7 @@ public function testLoadBlockActionItems()
         )->addProducts(
             [$product->getId() => ['qty' => 1]]
         );
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setParam('block', 'items');
         $this->getRequest()->setParam('json', 1);
         $this->dispatch('backend/sales/order_create/loadBlock');
@@ -308,6 +315,7 @@ public function testDeniedSaveAction()
         \Magento\TestFramework\Helper\Bootstrap::getInstance()
             ->loadArea('adminhtml');
 
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/sales/order_create/save');
         $this->assertEquals('403', $this->getResponse()->getHttpResponseCode());
     }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AbstractCreditmemoControllerTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AbstractCreditmemoControllerTest.php
new file mode 100644
index 0000000000000..2a7731715021b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AbstractCreditmemoControllerTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
+
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Sales\Api\Data\CreditmemoInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\OrderRepository;
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Abstract backend creditmemo test.
+ */
+class AbstractCreditmemoControllerTest extends AbstractBackendController
+{
+    /**
+     * @var TransportBuilderMock
+     */
+    protected $transportBuilder;
+
+    /**
+     * @var OrderRepository
+     */
+    protected $orderRepository;
+
+    /**
+     * @var FormKey
+     */
+    protected $formKey;
+
+    /**
+     * @var string
+     */
+    protected $resource = 'Magento_Sales::sales_creditmemo';
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
+        $this->orderRepository = $this->_objectManager->get(OrderRepository::class);
+        $this->formKey = $this->_objectManager->get(FormKey::class);
+    }
+
+    /**
+     * @param string $incrementalId
+     * @return OrderInterface|null
+     */
+    protected function getOrder(string $incrementalId)
+    {
+        /** @var SearchCriteria $searchCriteria */
+        $searchCriteria = $this->_objectManager->create(SearchCriteriaBuilder::class)
+            ->addFilter(OrderInterface::INCREMENT_ID, $incrementalId)
+            ->create();
+
+        $orders = $this->orderRepository->getList($searchCriteria)->getItems();
+        /** @var OrderInterface|null $order */
+        $order = reset($orders);
+
+        return $order;
+    }
+
+    /**
+     * @param OrderInterface $order
+     * @return CreditmemoInterface
+     */
+    protected function getCreditMemo(OrderInterface $order): CreditmemoInterface
+    {
+        /** @var \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Collection $creditMemoCollection */
+        $creditMemoCollection = $this->_objectManager->create(
+            \Magento\Sales\Model\ResourceModel\Order\Creditmemo\CollectionFactory::class
+        )->create();
+
+        /** @var CreditmemoInterface $creditMemo */
+        $creditMemo = $creditMemoCollection
+            ->setOrderFilter($order)
+            ->setPageSize(1)
+            ->getFirstItem();
+
+        return $creditMemo;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php
new file mode 100644
index 0000000000000..ac11f777daf9c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
+
+use PHPUnit\Framework\Constraint\RegularExpression;
+use PHPUnit\Framework\Constraint\StringContains;
+
+/**
+ * Class verifies creditmemo add comment functionality.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppArea adminhtml
+ * @magentoDataFixture Magento/Sales/_files/creditmemo_for_get.php
+ */
+class AddCommentTest extends AbstractCreditmemoControllerTest
+{
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/sales/order_creditmemo/addComment';
+
+    /**
+     * @return void
+     */
+    public function testSendEmailOnAddCreditmemoComment()
+    {
+        $comment = 'Test Credit Memo Comment';
+        $order = $this->prepareRequest(
+            [
+                'comment' => ['comment' => $comment, 'is_customer_notified' => true],
+            ]
+        );
+        $this->dispatch('backend/sales/order_creditmemo/addComment');
+        $html = $this->getResponse()->getBody();
+        $this->assertContains($comment, $html);
+
+        $message = $this->transportBuilder->getSentMessage();
+        $subject =__('Update to your %1 credit memo', $order->getStore()->getFrontendName())->render();
+        $messageConstraint = $this->logicalAnd(
+            new StringContains($order->getBillingAddress()->getName()),
+            new RegularExpression(
+                sprintf(
+                    "/Your order #%s has been updated with a status of.*%s/",
+                    $order->getIncrementId(),
+                    $order->getFrontendStatusLabel()
+                )
+            ),
+            new StringContains($comment)
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $messageConstraint);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclHasAccess()
+    {
+        $this->prepareRequest(['comment' => ['comment' => 'Comment']]);
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclNoAccess()
+    {
+        $this->prepareRequest(['comment' => ['comment' => 'Comment']]);
+
+        parent::testAclNoAccess();
+    }
+
+    /**
+     * @param array $params
+     * @return \Magento\Sales\Api\Data\OrderInterface|null
+     */
+    private function prepareRequest(array $params = [])
+    {
+        $order = $this->getOrder('100000001');
+        $creditmemo = $this->getCreditMemo($order);
+
+        $this->getRequest()->setMethod('POST');
+        $this->getRequest()->setParams(
+            [
+                'id' => $creditmemo->getEntityId(),
+                'form_key' => $this->formKey->getFormKey(),
+            ]
+        );
+
+        $data = $params ?? [];
+        $this->getRequest()->setPostValue($data);
+
+        return $order;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
new file mode 100644
index 0000000000000..4df7710bb4388
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
+
+use PHPUnit\Framework\Constraint\StringContains;
+
+/**
+ * Class tests creditmemo creation in backend.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppArea adminhtml
+ * @magentoDataFixture Magento/Sales/_files/invoice.php
+ */
+class SaveTest extends AbstractCreditmemoControllerTest
+{
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/sales/order_creditmemo/save';
+
+    /**
+     * @return void
+     */
+    public function testSendEmailOnCreditmemoSave()
+    {
+        $order = $this->prepareRequest(['creditmemo' => ['send_email' => true]]);
+        $this->dispatch('backend/sales/order_creditmemo/save');
+
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You created the credit memo.')]),
+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+        );
+        $this->assertRedirect($this->stringContains('sales/order/view/order_id/' . $order->getEntityId()));
+
+        $creditMemo = $this->getCreditMemo($order);
+        $message = $this->transportBuilder->getSentMessage();
+        $subject = __('Credit memo for your %1 order', $order->getStore()->getFrontendName())->render();
+        $messageConstraint = $this->logicalAnd(
+            new StringContains($order->getBillingAddress()->getName()),
+            new StringContains(
+                'Thank you for your order from ' . $creditMemo->getStore()->getFrontendName()
+            ),
+            new StringContains(
+                "Your Credit Memo #{$creditMemo->getIncrementId()} for Order #{$order->getIncrementId()}"
+            )
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $messageConstraint);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclHasAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclNoAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclNoAccess();
+    }
+
+    /**
+     * @param array $params
+     * @return \Magento\Sales\Api\Data\OrderInterface|null
+     */
+    private function prepareRequest(array $params = [])
+    {
+        $order = $this->getOrder('100000001');
+        $this->getRequest()->setMethod('POST');
+        $this->getRequest()->setParams(
+            [
+                'order_id' => $order->getEntityId(),
+                'form_key' => $this->formKey->getFormKey(),
+            ]
+        );
+
+        $data = ['creditmemo' => ['do_offline' => true]];
+        $data = array_replace_recursive($data, $params);
+
+        $this->getRequest()->setPostValue($data);
+
+        return $order;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php
new file mode 100644
index 0000000000000..337ad206ade91
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Controller\Adminhtml\Order;
+
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\OrderRepository;
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
+use PHPUnit\Framework\Constraint\StringContains;
+
+/**
+ * Class verifies order send email functionality.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppArea adminhtml
+ * @magentoDataFixture Magento/Sales/_files/order.php
+ */
+class EmailTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /**
+     * @var OrderRepository
+     */
+    private $orderRepository;
+
+    /**
+     * @var TransportBuilderMock
+     */
+    private $transportBuilder;
+
+    /**
+     * @var string
+     */
+    protected $resource = 'Magento_Sales::email';
+
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/sales/order/email';
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->orderRepository = $this->_objectManager->get(OrderRepository::class);
+        $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
+    }
+
+    /**
+     * @return void
+     */
+    public function testSendOrderEmail()
+    {
+        $order = $this->prepareRequest();
+        $this->dispatch('backend/sales/order/email');
+
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You sent the order email.')]),
+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+        );
+
+        $redirectUrl = 'sales/order/view/order_id/' . $order->getEntityId();
+        $this->assertRedirect($this->stringContains($redirectUrl));
+
+        $message = $this->transportBuilder->getSentMessage();
+        $subject = __('Your %1 order confirmation', $order->getStore()->getFrontendName())->render();
+        $assert = $this->logicalAnd(
+            new StringContains($order->getBillingAddress()->getName()),
+            new StringContains(
+                'Thank you for your order from ' . $order->getStore()->getFrontendName()
+            ),
+            new StringContains(
+                "Your Order <span class=\"no-link\">#{$order->getIncrementId()}</span>"
+            )
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $assert);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclHasAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclNoAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclNoAccess();
+    }
+
+    /**
+     * @param string $incrementalId
+     * @return OrderInterface|null
+     */
+    private function getOrder(string $incrementalId)
+    {
+        /** @var SearchCriteria $searchCriteria */
+        $searchCriteria = $this->_objectManager->create(SearchCriteriaBuilder::class)
+            ->addFilter(OrderInterface::INCREMENT_ID, $incrementalId)
+            ->create();
+
+        $orders = $this->orderRepository->getList($searchCriteria)->getItems();
+        /** @var OrderInterface|null $order */
+        $order = reset($orders);
+
+        return $order;
+    }
+
+    /**
+     * @return OrderInterface|null
+     */
+    private function prepareRequest()
+    {
+        $order = $this->getOrder('100000001');
+        $this->getRequest()->setParams(['order_id' => $order->getEntityId()]);
+
+        return $order;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AbstractInvoiceControllerTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AbstractInvoiceControllerTest.php
new file mode 100644
index 0000000000000..3ba54418b6c26
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AbstractInvoiceControllerTest.php
@@ -0,0 +1,92 @@
+<?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\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Sales\Api\Data\InvoiceInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\OrderRepository;
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Abstract backend invoice test.
+ */
+class AbstractInvoiceControllerTest extends AbstractBackendController
+{
+    /**
+     * @var TransportBuilderMock
+     */
+    protected $transportBuilder;
+
+    /**
+     * @var OrderRepository
+     */
+    protected $orderRepository;
+
+    /**
+     * @var FormKey
+     */
+    protected $formKey;
+
+    /**
+     * @var string
+     */
+    protected $resource = 'Magento_Sales::sales_invoice';
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
+        $this->orderRepository = $this->_objectManager->get(OrderRepository::class);
+        $this->formKey = $this->_objectManager->get(FormKey::class);
+    }
+
+    /**
+     * @param string $incrementalId
+     * @return OrderInterface|null
+     */
+    protected function getOrder(string $incrementalId)
+    {
+        /** @var SearchCriteria $searchCriteria */
+        $searchCriteria = $this->_objectManager->create(SearchCriteriaBuilder::class)
+            ->addFilter(OrderInterface::INCREMENT_ID, $incrementalId)
+            ->create();
+
+        $orders = $this->orderRepository->getList($searchCriteria)->getItems();
+        /** @var OrderInterface $order */
+        $order = reset($orders);
+
+        return $order;
+    }
+
+    /**
+     * @param OrderInterface $order
+     * @return InvoiceInterface
+     */
+    protected function getInvoiceByOrder(OrderInterface $order): InvoiceInterface
+    {
+        /** @var \Magento\Sales\Model\ResourceModel\Order\Invoice\Collection $invoiceCollection */
+        $invoiceCollection = $this->_objectManager->create(
+            \Magento\Sales\Model\ResourceModel\Order\Invoice\CollectionFactory::class
+        )->create();
+
+        /** @var InvoiceInterface $invoice */
+        $invoice = $invoiceCollection
+            ->setOrderFilter($order)
+            ->setPageSize(1)
+            ->getFirstItem();
+
+        return $invoice;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php
new file mode 100644
index 0000000000000..8643dfc66f1b9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
+
+use PHPUnit\Framework\Constraint\RegularExpression;
+use PHPUnit\Framework\Constraint\StringContains;
+
+/**
+ * Class verifies invoice add comment functionality.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppArea adminhtml
+ * @magentoDataFixture Magento/Sales/_files/invoice.php
+ */
+class AddCommentTest extends AbstractInvoiceControllerTest
+{
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/sales/order_invoice/addComment';
+
+    /**
+     * @return void
+     */
+    public function testSendEmailOnAddInvoiceComment()
+    {
+        $comment = 'Test Invoice Comment';
+        $order = $this->prepareRequest(
+            [
+                'comment' => ['comment' => $comment, 'is_customer_notified' => true],
+            ]
+        );
+        $this->dispatch('backend/sales/order_invoice/addComment');
+
+        $html = $this->getResponse()->getBody();
+        $this->assertContains($comment, $html);
+
+        $message = $this->transportBuilder->getSentMessage();
+        $subject = __('Update to your %1 invoice', $order->getStore()->getFrontendName())->render();
+        $messageConstraint = $this->logicalAnd(
+            new StringContains($order->getBillingAddress()->getName()),
+            new RegularExpression(
+                sprintf(
+                    "/Your order #%s has been updated with a status of.*%s/",
+                    $order->getIncrementId(),
+                    $order->getFrontendStatusLabel()
+                )
+            ),
+            new StringContains($comment)
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $messageConstraint);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclHasAccess()
+    {
+        $this->prepareRequest(['comment' => ['comment' => 'Comment']]);
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclNoAccess()
+    {
+        $this->prepareRequest(['comment' => ['comment' => 'Comment']]);
+
+        parent::testAclNoAccess();
+    }
+
+    /**
+     * @param array $params
+     * @return \Magento\Sales\Api\Data\OrderInterface|null
+     */
+    private function prepareRequest(array $params = [])
+    {
+        $order = $this->getOrder('100000001');
+        $invoice = $this->getInvoiceByOrder($order);
+
+        $this->getRequest()->setMethod('POST');
+        $this->getRequest()->setParams(
+            [
+                'id' => $invoice->getEntityId(),
+                'form_key' => $this->formKey->getFormKey(),
+            ]
+        );
+
+        $data = $params ?? [];
+        $this->getRequest()->setPostValue($data);
+
+        return $order;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/EmailTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/EmailTest.php
new file mode 100644
index 0000000000000..39b7fc8ef0267
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/EmailTest.php
@@ -0,0 +1,88 @@
+<?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 PHPUnit\Framework\Constraint\StringContains;
+
+/**
+ * Class verifies invoice send email functionality.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppArea adminhtml
+ * @magentoDataFixture Magento/Sales/_files/invoice.php
+ */
+class EmailTest extends AbstractInvoiceControllerTest
+{
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/sales/order_invoice/email';
+
+    /**
+     * @return void
+     */
+    public function testSendInvoiceEmail()
+    {
+        $order = $this->getOrder('100000001');
+        $invoice = $this->getInvoiceByOrder($order);
+
+        $this->getRequest()->setParams(['invoice_id' => $invoice->getEntityId()]);
+        $this->dispatch('backend/sales/order_invoice/email');
+
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You sent the message.')]),
+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+        );
+
+        $redirectUrl = sprintf(
+            'sales/invoice/view/order_id/%s/invoice_id/%s',
+            $order->getEntityId(),
+            $invoice->getEntityId()
+        );
+        $this->assertRedirect($this->stringContains($redirectUrl));
+
+        $message = $this->transportBuilder->getSentMessage();
+        $subject = __('Invoice for your %1 order', $order->getStore()->getFrontendName())->render();
+        $messageConstraint = $this->logicalAnd(
+            new StringContains($invoice->getBillingAddress()->getName()),
+            new StringContains(
+                'Thank you for your order from ' . $invoice->getStore()->getFrontendName()
+            ),
+            new StringContains(
+                "Your Invoice #{$invoice->getIncrementId()} for Order #{$order->getIncrementId()}"
+            )
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $messageConstraint);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclHasAccess()
+    {
+        $order = $this->getOrder('100000001');
+        $invoice = $this->getInvoiceByOrder($order);
+        $this->uri .= '/invoice_id/' . $invoice->getEntityId();
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclNoAccess()
+    {
+        $order = $this->getOrder('100000001');
+        $invoice = $this->getInvoiceByOrder($order);
+        $this->uri .= '/invoice_id/' . $invoice->getEntityId();
+
+        parent::testAclNoAccess();
+    }
+}
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
new file mode 100644
index 0000000000000..d451bdcb287cf
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php
@@ -0,0 +1,97 @@
+<?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 PHPUnit\Framework\Constraint\StringContains;
+
+/**
+ * Class tests invoice creation in backend.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppArea adminhtml
+ * @magentoDataFixture Magento/Sales/_files/order.php
+ */
+class SaveTest extends AbstractInvoiceControllerTest
+{
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/sales/order_invoice/save';
+
+    /**
+     * @return void
+     */
+    public function testSendEmailOnInvoiceSave()
+    {
+        $order = $this->prepareRequest(['invoice' => ['send_email' => true]]);
+        $this->dispatch('backend/sales/order_invoice/save');
+
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('The invoice has been created.')]),
+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+        );
+        $this->assertRedirect($this->stringContains('sales/order/view/order_id/' . $order->getEntityId()));
+
+        $invoice = $this->getInvoiceByOrder($order);
+        $message = $this->transportBuilder->getSentMessage();
+        $subject = __('Invoice for your %1 order', $order->getStore()->getFrontendName())->render();
+        $messageConstraint = $this->logicalAnd(
+            new StringContains($invoice->getBillingAddress()->getName()),
+            new StringContains(
+                'Thank you for your order from ' . $invoice->getStore()->getFrontendName()
+            ),
+            new StringContains(
+                "Your Invoice #{$invoice->getIncrementId()} for Order #{$order->getIncrementId()}"
+            )
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $messageConstraint);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclHasAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclNoAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclNoAccess();
+    }
+
+    /**
+     * @param array $params
+     * @return \Magento\Sales\Api\Data\OrderInterface|null
+     */
+    private function prepareRequest(array $params = [])
+    {
+        $order = $this->getOrder('100000001');
+        $this->getRequest()->setMethod('POST');
+        $this->getRequest()->setParams(
+            [
+                'order_id' => $order->getEntityId(),
+                'form_key' => $this->formKey->getFormKey(),
+            ]
+        );
+
+        $data = $params ?? [];
+        $this->getRequest()->setPostValue($data);
+
+        return $order;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/CustomerData/LastOrderedItemsTest.php b/dev/tests/integration/testsuite/Magento/Sales/CustomerData/LastOrderedItemsTest.php
new file mode 100644
index 0000000000000..adeff2c89a241
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/CustomerData/LastOrderedItemsTest.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\CustomerData;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+use Magento\Customer\Model\Session;
+
+/**
+ * Test for LastOrderedItems.
+ *
+ * @magentoAppIsolation enabled
+ */
+class LastOrderedItemsTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    public function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
+    /**
+     * Test to check count in items collection.
+     *
+     * @magentoDataFixture Magento/Sales/_files/order_with_customer_and_multiple_order_items.php
+     */
+    public function testDefaultFormatterIsAppliedWhenBasicIntegration()
+    {
+        /** @var Session $customerSession */
+        $customerSession = $this->objectManager->get(Session::class);
+        $customerSession->loginById(1);
+
+        /** @var LastOrderedItems $customerDataSectionSource */
+        $customerDataSectionSource = $this->objectManager->get(LastOrderedItems::class);
+        $data = $customerDataSectionSource->getSectionData();
+
+        $this->assertEquals(
+            LastOrderedItems::SIDEBAR_ORDER_LIMIT,
+            count($data['items']),
+            'Section items count should not be greater then ' . LastOrderedItems::SIDEBAR_ORDER_LIMIT
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/AddressRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/AddressRepositoryTest.php
index 7a38c14685073..775ddd7274a48 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/AddressRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/AddressRepositoryTest.php
@@ -3,19 +3,23 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\Order;
 
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Sales\Api\Data\OrderAddressInterface;
+use Magento\Sales\Api\OrderAddressRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Api\SortOrderBuilder;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class AddressRepositoryTest
- * @package Magento\Sales\Model\Order]
- * @magentoDbIsolation enabled
  */
-class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
+class AddressRepositoryTest extends TestCase
 {
     /** @var AddressRepository */
     protected $repository;
@@ -29,22 +33,25 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
     /** @var SearchCriteriaBuilder */
     private $searchCriteriaBuilder;
 
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->repository = $objectManager->create(AddressRepository::class);
-        $this->searchCriteriaBuilder = $objectManager->create(
-            \Magento\Framework\Api\SearchCriteriaBuilder::class
-        );
-        $this->filterBuilder = $objectManager->get(
-            \Magento\Framework\Api\FilterBuilder::class
-        );
-        $this->sortOrderBuilder = $objectManager->get(
-            \Magento\Framework\Api\SortOrderBuilder::class
-        );
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->repository = $this->objectManager->get(AddressRepository::class);
+        $this->searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $this->filterBuilder = $this->objectManager->get(FilterBuilder::class);
+        $this->sortOrderBuilder = $this->objectManager->get(SortOrderBuilder::class);
     }
 
     /**
+     * Test for get list with multiple filters and sorting
+     *
+     * @return void
      * @magentoDataFixture Magento/Sales/_files/address_list.php
      */
     public function testGetListWithMultipleFiltersAndSorting()
@@ -78,4 +85,23 @@ public function testGetListWithMultipleFiltersAndSorting()
         $this->assertEquals('ZX0789', array_shift($items)->getPostcode());
         $this->assertEquals('47676', array_shift($items)->getPostcode());
     }
+
+    /**
+     * Test for formatting custom sales address multi-attribute
+     *
+     * @return void
+     * @magentoDataFixture Magento/Sales/_files/order_address_with_multi_attribute.php
+     */
+    public function testFormatSalesAddressCustomMultiAttribute()
+    {
+        $address = $this->objectManager->get(OrderAddressInterface::class)
+            ->load('multiattribute@example.com', 'email');
+        $address->setData('address_multiselect_attribute', ['dog', 'cat']);
+        $address->setData('address_multiline_attribute', ['dog', 'cat']);
+
+        $this->objectManager->get(OrderAddressRepositoryInterface::class)
+            ->save($address);
+        $this->assertEquals('dog,cat', $address->getData('address_multiselect_attribute'));
+        $this->assertEquals('dog'.PHP_EOL.'cat', $address->getData('address_multiline_attribute'));
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ConfigTest.php
new file mode 100644
index 0000000000000..b1c9b22772cf8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ConfigTest.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Order;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/**
+ * Test class for \Magento\Sales\Model\Order\Config
+ */
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var Config
+     */
+    private $orderConfig;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->orderConfig = $this->objectManager->create(Config::class);
+    }
+
+    /**
+     * Correct display of the list of "Order States" after assigning
+     * the state "complete" to a custom order status.
+     *
+     * @magentoDataFixture Magento/Sales/_files/order_status_assign_state_complete.php
+     */
+    public function testCorrectCompleteStatusInStatesList()
+    {
+        $allStates = $this->orderConfig->getStates();
+        /** @var Status $completeStatus */
+        $completeStatus = $this->objectManager->create(Status::class)
+            ->load(\Magento\Sales\Model\Order::STATE_COMPLETE);
+        $completeState = $allStates[$completeStatus->getStatus()];
+
+        $this->assertEquals($completeStatus->getLabel(), $completeState->getText());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/CreateTest.php
new file mode 100644
index 0000000000000..4ff4ad384d3e4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/CreateTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Order;
+
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Quote\Api\GuestCartManagementInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdMask;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+use Magento\Sales\Model\OrderRepository;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
+use PHPUnit\Framework\Constraint\StringContains;
+
+/**
+ * Class verifies order creation.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppArea frontend
+ */
+class CreateTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var TransportBuilderMock
+     */
+    private $transportBuilder;
+
+    /**
+     * @var QuoteIdMaskFactory
+     */
+    private $quoteIdMaskFactory;
+
+    /**
+     * @var FormKey
+     */
+    private $formKey;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->transportBuilder = $this->objectManager->get(TransportBuilderMock::class);
+        $this->quoteIdMaskFactory = $this->objectManager->get(QuoteIdMaskFactory::class);
+        $this->formKey = $this->objectManager->get(FormKey::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     * @return void
+     */
+    public function testSendEmailOnOrderPlace()
+    {
+        /** @var Quote $quote */
+        $quote = $this->objectManager->create(Quote::class);
+        $quote->load('guest_quote', 'reserved_order_id');
+
+        $checkoutSession = $this->objectManager->get(CheckoutSession::class);
+        $checkoutSession->setQuoteId($quote->getId());
+
+        /** @var QuoteIdMask $quoteIdMask */
+        $quoteIdMask = $this->quoteIdMaskFactory->create();
+        $quoteIdMask->load($quote->getId(), 'quote_id');
+        $cartId = $quoteIdMask->getMaskedId();
+
+        /** @var GuestCartManagementInterface $cartManagement */
+        $cartManagement = $this->objectManager->get(GuestCartManagementInterface::class);
+        $orderId = $cartManagement->placeOrder($cartId);
+        $order = $this->objectManager->get(OrderRepository::class)->get($orderId);
+
+        $message = $this->transportBuilder->getSentMessage();
+        $subject = __('Your %1 order confirmation', $order->getStore()->getFrontendName())->render();
+        $assert = $this->logicalAnd(
+            new StringContains($order->getBillingAddress()->getName()),
+            new StringContains(
+                'Thank you for your order from ' . $order->getStore()->getFrontendName()
+            ),
+            new StringContains(
+                "Your Order <span class=\"no-link\">#{$order->getIncrementId()}</span>"
+            )
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $assert);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses.php b/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses.php
new file mode 100644
index 0000000000000..601c500c18429
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/address_list.php';
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea('frontend');
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Catalog\Model\Product $product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId('simple')
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setName('Simple Product')
+    ->setSku('simple-product-guest-quote')
+    ->setPrice(10)
+    ->setTaxClassId(0)
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(
+        [
+            'qty' => 100,
+            'is_in_stock' => 1,
+        ]
+    )->save();
+
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$product = $productRepository->get('simple-product-guest-quote');
+
+$addressData = reset($addresses);
+
+$billingAddress = $objectManager->create(
+    \Magento\Quote\Model\Quote\Address::class,
+    ['data' => $addressData]
+);
+$billingAddress->setAddressType('billing');
+
+$shippingAddress = clone $billingAddress;
+$shippingAddress->setId(null)->setAddressType('shipping');
+
+$store = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->getStore();
+
+/** @var \Magento\Quote\Model\Quote $quote */
+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+$quote->setCustomerIsGuest(true)
+    ->setStoreId($store->getId())
+    ->setReservedOrderId('guest_quote')
+    ->setBillingAddress($billingAddress)
+    ->setShippingAddress($shippingAddress)
+    ->addProduct($product);
+$quote->getPayment()->setMethod('checkmo');
+$quote->getShippingAddress()->setShippingMethod('flatrate_flatrate')->setCollectShippingRates(1);
+$quote->collectTotals();
+
+$quoteRepository = $objectManager->create(\Magento\Quote\Api\CartRepositoryInterface::class);
+$quoteRepository->save($quote);
+
+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+$quoteIdMask = $objectManager->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)->create();
+$quoteIdMask->setQuoteId($quote->getId());
+$quoteIdMask->setDataChanges(true);
+$quoteIdMask->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses_rollback.php
new file mode 100644
index 0000000000000..02c42153b72c3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses_rollback.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Framework\Registry $registry */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $quote \Magento\Quote\Model\Quote */
+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+$quote->load('guest_quote', 'reserved_order_id');
+if ($quote->getId()) {
+    $quote->delete();
+}
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+try {
+    $product = $productRepository->get('simple-product-guest-quote', false, null, true);
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
index 9f9f2f740c84e..65b143d9d68f7 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
@@ -43,7 +43,8 @@
     ->setBasePrice($product->getPrice())
     ->setPrice($product->getPrice())
     ->setRowTotal($product->getPrice())
-    ->setProductType('simple');
+    ->setProductType('simple')
+    ->setName($product->getName());
 
 /** @var Order $order */
 $order = $objectManager->create(Order::class);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_address_with_multi_attribute.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_address_with_multi_attribute.php
new file mode 100644
index 0000000000000..c78caa66cfe1e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_address_with_multi_attribute.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Attribute\Set;
+use Magento\Customer\Model\Attribute;
+use Magento\Eav\Model\Entity\Type;
+use Magento\Eav\Model\Entity\Attribute\Backend\ArrayBackend;
+use Magento\Sales\Model\Order\Address;
+
+$objectManager = Bootstrap::getObjectManager();
+$addressData = [
+    'region' => 'CA',
+    'region_id' => '12',
+    'postcode' => '11111',
+    'lastname' => 'lastname',
+    'firstname' => 'firstname',
+    'street' => 'street',
+    'city' => 'Los Angeles',
+    'email' => 'multiattribute@example.com',
+    'telephone' => '2222222',
+    'country_id' => 'US'
+];
+
+/** @var $entityType Type */
+$entityType = $objectManager->get(Config::class)
+    ->getEntityType('customer_address');
+/** @var $attributeSet Set */
+$attributeSet = $objectManager->get(Set::class);
+
+$attributeMultiselect = $objectManager->create(
+    Attribute::class,
+    [
+        'data' => [
+            'frontend_input' => 'multiselect',
+            'frontend_label' => ['Multiselect Attribute'],
+            'sort_order' => '0',
+            'backend_type' => 'varchar',
+            'is_user_defined' => 1,
+            'is_system' => 0,
+            'is_required' => '0',
+            'is_visible' => '0',
+            'attribute_set_id' => $entityType->getDefaultAttributeSetId(),
+            'attribute_group_id' => $attributeSet->getDefaultGroupId($entityType->getDefaultAttributeSetId()),
+            'entity_type_id' => $entityType->getId(),
+            'backend_model' => ArrayBackend::class,
+            'used_in_forms' => ['customer_register_address'],
+            'option' => [
+                'value' => [
+                    'dog' => ['Dog'],
+                    'cat' => ['Cat'],
+                ],
+                'order' => [
+                    'dog' => 1,
+                    'cat' => 2,
+                ],
+            ],
+        ]
+    ]
+);
+
+$attributeMultiselect->setAttributeCode('address_multiselect_attribute');
+$attributeMultiselect->save();
+
+$attributeMultiline = $objectManager->create(
+    Attribute::class,
+    [
+        'data' => [
+            'frontend_input' => 'multiline',
+            'frontend_label' => ['Multiline Attribute'],
+            'multiline_count' => 2,
+            'sort_order' => '0',
+            'backend_type' => 'varchar',
+            'is_user_defined' => 1,
+            'is_system' => 0,
+            'is_required' => '0',
+            'is_visible' => '0',
+            'attribute_set_id' => $entityType->getDefaultAttributeSetId(),
+            'attribute_group_id' => $attributeSet->getDefaultGroupId($entityType->getDefaultAttributeSetId()),
+            'entity_type_id' => $entityType->getId(),
+            'backend_model' => ArrayBackend::class,
+            'used_in_forms' => ['customer_register_address'],
+        ]
+    ]
+);
+
+$attributeMultiline->setAttributeCode('address_multiline_attribute');
+$attributeMultiline->save();
+
+$billingAddress = $objectManager->create(
+    Address::class,
+    ['data' => $addressData]
+);
+$billingAddress->setAddressType('billing');
+$billingAddress->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_address_with_multi_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_address_with_multi_attribute_rollback.php
new file mode 100644
index 0000000000000..e7014583e872c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_address_with_multi_attribute_rollback.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Sales\Api\OrderAddressRepositoryInterface;
+use Magento\Sales\Api\Data\OrderAddressInterface;
+use Magento\Eav\Api\AttributeRepositoryInterface;
+
+$attributeCodes = [
+    'fixture_address_multiselect_attribute',
+    'fixture_address_multiline_attribute',
+];
+$eavConfigType = 'customer_address';
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var OrderAddressRepositoryInterface $salesAddressRepository */
+$salesAddressRepository = $objectManager->get(OrderAddressRepositoryInterface::class);
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+/** @var FilterBuilder $filterBuilder */
+$filterBuilder = $objectManager->get(FilterBuilder::class);
+$filters = [
+    $filterBuilder->setField(OrderAddressInterface::EMAIL)
+        ->setValue('multiattribute@example.com')
+        ->create(),
+];
+$searchCriteria = $searchCriteriaBuilder->addFilters($filters)
+    ->create();
+$saleAddresses = $salesAddressRepository->getList($searchCriteria)
+    ->getItems();
+foreach ($saleAddresses as $saleAddress) {
+    $salesAddressRepository->delete($saleAddress);
+}
+
+/** @var AttributeRepositoryInterface $attributerepository */
+$attributeRepository = $objectManager->get(AttributeRepositoryInterface::class);
+/** @var FilterBuilder $filterBuilder */
+$filterBuilder = $objectManager->get(FilterBuilder::class);
+$filters = [
+    $filterBuilder->setField('attribute_code')
+        ->setValue(
+            [
+                'address_multiline_attribute',
+                'address_multiselect_attribute',
+            ]
+        )
+        ->setConditionType('IN')
+        ->create(),
+];
+$searchCriteria = $searchCriteriaBuilder->addFilters($filters)
+    ->create();
+$attributes = $attributeRepository->getList($eavConfigType, $searchCriteria)
+    ->getItems();
+foreach ($attributes as $attribute) {
+    $attributeRepository->delete($attribute);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
index 43e98419798a8..221f5b559c9f2 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
@@ -5,6 +5,9 @@
  */
 
 use Magento\Sales\Model\Order;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order\Address as OrderAddress;
+use Magento\Sales\Model\Order\Payment;
 
 require 'order.php';
 /** @var Order $order */
@@ -48,16 +51,43 @@
     ],
 ];
 
+$orderList = [];
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
 /** @var array $orderData */
 foreach ($orders as $orderData) {
-    /** @var $order \Magento\Sales\Model\Order */
-    $order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-        \Magento\Sales\Model\Order::class
-    );
+    /** @var Order $order */
+    $order = $objectManager->create(Order::class);
+
+    // Reset addresses
+    /** @var Order\Address $billingAddress */
+    $billingAddress = $objectManager->create(OrderAddress::class, ['data' => $addressData]);
+    $billingAddress->setAddressType('billing');
+
+    $shippingAddress = clone $billingAddress;
+    $shippingAddress->setId(null)->setAddressType('shipping');
+
+    /** @var Payment $payment */
+    $payment = $objectManager->create(Payment::class);
+    $payment->setMethod('checkmo')
+        ->setAdditionalInformation('last_trans_id', '11122')
+        ->setAdditionalInformation(
+            'metadata',
+            [
+                'type' => 'free',
+                'fraudulent' => false,
+            ]
+        );
+
     $order
         ->setData($orderData)
         ->addItem($orderItem)
+        ->setCustomerIsGuest(true)
+        ->setCustomerEmail('customer@null.com')
         ->setBillingAddress($billingAddress)
-        ->setBillingAddress($shippingAddress)
-        ->save();
+        ->setShippingAddress($shippingAddress)
+        ->setPayment($payment);
+
+    $orderRepository->save($order);
+    $orderList[] = $order;
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_with_tax.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_with_tax.php
new file mode 100644
index 0000000000000..48f6ccfead297
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_with_tax.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Model\Order\Tax\ItemFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Tax\Model\Sales\Order\TaxFactory;
+
+require 'default_rollback.php';
+require 'order_list.php';
+
+/** @var array $orderList */
+foreach ($orderList as $order) {
+    $amount = 45;
+    $taxFactory = $objectManager->create(TaxFactory::class);
+
+    /** @var \Magento\Tax\Model\Sales\Order\Tax  $tax */
+    $tax = $taxFactory->create();
+    $tax->setOrderId($order->getId())
+        ->setCode('US-NY-*-Rate 1')
+        ->setTitle('US-NY-*-Rate 1')
+        ->setPercent(8.37)
+        ->setAmount($amount)
+        ->setBaseAmount($amount)
+        ->setBaseRealAmount($amount);
+    $tax->save();
+
+    $salesOrderFactory = $objectManager->create(ItemFactory::class);
+
+    /** @var \Magento\Sales\Model\Order\Tax\Item $salesOrderItem */
+    $salesOrderItem = $salesOrderFactory->create();
+    $salesOrderItem->setOrderId($order->getId())
+        ->setStoreId($objectManager->get(StoreManagerInterface::class)->getStore()->getId())
+        ->setProductOptions([]);
+    $salesCollection = $objectManager->create(\Magento\Sales\Model\ResourceModel\Order\Item::class);
+    $salesCollection->save($salesOrderItem);
+
+    /** @var \Magento\Sales\Model\Order\Tax\Item $salesOrderItem */
+    $salesOrderTaxItem = $salesOrderFactory->create();
+    $salesOrderTaxItem->setTaxId($tax->getId())
+        ->setTaxPercent(8.37)
+        ->setTaxAmount($amount)
+        ->setBaseAmount($amount)
+        ->setRealAmount($amount)
+        ->setRealBaseAmount($amount)
+        ->setAppliedTaxes([$tax])
+        ->setTaxableItemType('shipping')
+        ->setItemId($salesOrderItem->getId());
+
+    $taxItemCollection = $objectManager->create(\Magento\Sales\Model\ResourceModel\Order\Tax\Item::class);
+    $taxItemCollection->save($salesOrderTaxItem);
+}
diff --git a/dev/tests/functional/utils/deleteMagentoGeneratedCode.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_with_tax_rollback.php
similarity index 65%
rename from dev/tests/functional/utils/deleteMagentoGeneratedCode.php
rename to dev/tests/integration/testsuite/Magento/Sales/_files/order_list_with_tax_rollback.php
index 99aa9af06e92a..dd52deab825cb 100644
--- a/dev/tests/functional/utils/deleteMagentoGeneratedCode.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list_with_tax_rollback.php
@@ -3,5 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-exec('rm -rf ../../../../generated/*');
+require 'order_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_status_assign_state_complete.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_status_assign_state_complete.php
new file mode 100644
index 0000000000000..4f2176036787d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_status_assign_state_complete.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Model\Order\Status;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Status $orderStatus */
+$orderStatus = Bootstrap::getObjectManager()->create(Status::class);
+$data = [
+    'status' => 'custom_complete',
+    'label' => 'Custom Complete Status',
+];
+$orderStatus->setData($data)->save();
+$orderStatus->assignState(\Magento\Sales\Model\Order::STATE_COMPLETE, false, true);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_status_assign_state_complete_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_status_assign_state_complete_rollback.php
new file mode 100644
index 0000000000000..99187116db9d9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_status_assign_state_complete_rollback.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Model\Order\Status;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Status $orderStatus */
+$orderStatus = Bootstrap::getObjectManager()->create(Status::class);
+$orderStatus->load('custom_complete', 'status');
+$orderStatus->delete();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_and_multiple_order_items.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_and_multiple_order_items.php
new file mode 100644
index 0000000000000..586863dd07696
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_and_multiple_order_items.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/order_with_multiple_items.php';
+require __DIR__ . '/../../../Magento/Customer/_files/customer.php';
+
+$customerIdFromFixture = 1;
+/** @var $order \Magento\Sales\Model\Order */
+$order->setCustomerId($customerIdFromFixture)->setCustomerIsGuest(false)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount.php
new file mode 100644
index 0000000000000..29a7aa4d90334
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Address as OrderAddress;
+use Magento\Sales\Model\Order\Item as OrderItem;
+use Magento\Sales\Model\Order\Payment;
+use Magento\Store\Model\StoreManagerInterface;
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+/** @var \Magento\Catalog\Model\Product $product */
+
+$addressData = include __DIR__ . '/address_data.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$billingAddress = $objectManager->create(OrderAddress::class, ['data' => $addressData]);
+$billingAddress->setAddressType('billing');
+
+$shippingAddress = clone $billingAddress;
+$shippingAddress->setId(null)->setAddressType('shipping');
+
+/** @var Payment $payment */
+$payment = $objectManager->create(Payment::class);
+$payment->setMethod('checkmo')
+    ->setAdditionalInformation('last_trans_id', '11122')
+    ->setAdditionalInformation(
+        'metadata',
+        [
+            'type' => 'free',
+            'fraudulent' => false,
+        ]
+    );
+
+/** @var OrderItem $orderItem */
+$orderItem = $objectManager->create(OrderItem::class);
+$orderItem->setProductId($product->getId())
+    ->setQtyOrdered(2)
+    ->setBasePrice($product->getPrice())
+    ->setPrice($product->getPrice())
+    ->setRowTotal($product->getPrice())
+    ->setProductType('simple')
+    ->setDiscountAmount(2)
+    ->setBaseRowTotal($product->getPrice())
+    ->setBaseDiscountAmount(2)
+    ->setTaxAmount(1)
+    ->setBaseTaxAmount(1);
+
+/** @var Order $order */
+$order = $objectManager->create(Order::class);
+$order->setIncrementId('100000001')
+    ->setState(Order::STATE_PROCESSING)
+    ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_PROCESSING))
+    ->setSubtotal(100)
+    ->setGrandTotal(100)
+    ->setBaseSubtotal(100)
+    ->setBaseGrandTotal(100)
+    ->setCustomerIsGuest(true)
+    ->setCustomerEmail('customer@null.com')
+    ->setBillingAddress($billingAddress)
+    ->setShippingAddress($shippingAddress)
+    ->setStoreId($objectManager->get(StoreManagerInterface::class)->getStore()->getId())
+    ->addItem($orderItem)
+    ->setPayment($payment);
+
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
+$orderRepository->save($order);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount_rollback.php
new file mode 100644
index 0000000000000..1fb4b4636ab29
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require 'default_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon.php
new file mode 100644
index 0000000000000..57ccffadaa4d0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Item as OrderItem;
+
+require __DIR__ . '/../../../Magento/Sales/_files/order.php';
+/** @var \Magento\Catalog\Model\Product $product */
+
+/** @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())
+    ->setFreeShipping('1');
+
+/** @var Order $order */
+$order->setShippingDescription('Flat Rate - Fixed')
+    ->setShippingAmount(0)
+    ->setCouponCode('1234567890')
+    ->setDiscountDescription('1234567890')
+    ->addItem($orderItem);
+
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
+$orderRepository->save($order);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon_rollback.php
new file mode 100644
index 0000000000000..1fb4b4636ab29
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require 'default_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_multiple_items.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_multiple_items.php
new file mode 100644
index 0000000000000..8375ae71fd10b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_multiple_items.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require 'order.php';
+/** @var \Magento\Catalog\Model\Product $product */
+/** @var \Magento\Sales\Model\Order $order */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+$orderItems[] = [
+    'product_id' => $product->getId(),
+    'base_price' => 123,
+    'order_id' => $order->getId(),
+    'price' => 123,
+    'row_total' => 126,
+    'product_type' => 'simple'
+];
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_duplicated.php';
+$orderItems[] = [
+    'product_id' => $product->getId(),
+    'base_price' => 123,
+    'order_id' => $order->getId(),
+    'price' => 123,
+    'row_total' => 126,
+    'product_type' => 'simple'
+];
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_decimal_qty.php';
+$orderItems[] = [
+    'product_id' => $product->getId(),
+    'base_price' => 123,
+    'order_id' => $order->getId(),
+    'price' => 123,
+    'row_total' => 126,
+    'product_type' => 'simple'
+];
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_with_url_key.php';
+$orderItems[] = [
+    'product_id' => $product->getId(),
+    'base_price' => 123,
+    'order_id' => $order->getId(),
+    'price' => 123,
+    'row_total' => 126,
+    'product_type' => 'simple'
+];
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_sku_with_slash.php';
+$orderItems[] = [
+    'product_id' => $product->getId(),
+    'base_price' => 123,
+    'order_id' => $order->getId(),
+    'price' => 123,
+    'row_total' => 126,
+    'product_type' => 'simple'
+];
+
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_xss.php';
+$orderItems[] = [
+    'product_id' => $product->getId(),
+    'base_price' => 123,
+    'order_id' => $order->getId(),
+    'price' => 123,
+    'row_total' => 126,
+    'product_type' => 'simple'
+];
+
+/** @var array $orderItemData */
+foreach ($orderItems as $orderItemData) {
+    /** @var $orderItem \Magento\Sales\Model\Order\Item */
+    $orderItem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        \Magento\Sales\Model\Order\Item::class
+    );
+    $orderItem
+        ->setData($orderItemData)
+        ->save();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php
index a889235ea1862..61d8be98bdd22 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+use Magento\Sales\Model\Order\ShipmentFactory;
+
 require 'order.php';
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -36,4 +39,11 @@
 
 $order->setIsInProcess(true);
 
-$transaction->addObject($invoice)->addObject($order)->save();
+$items = [];
+foreach ($order->getItems() as $orderItem) {
+    $items[$orderItem->getId()] = $orderItem->getQtyOrdered();
+}
+$shipment = $objectManager->get(ShipmentFactory::class)->create($order, $items);
+$shipment->register();
+
+$transaction->addObject($invoice)->addObject($shipment)->addObject($order)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_tax.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_tax.php
new file mode 100644
index 0000000000000..0c7dc522f5759
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_tax.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Model\Order\Tax\ItemFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Tax\Model\Sales\Order\TaxFactory;
+
+require 'default_rollback.php';
+require 'order.php';
+
+$amount = 45;
+$taxFactory = $objectManager->create(TaxFactory::class);
+
+/** @var \Magento\Tax\Model\Sales\Order\Tax  $tax */
+$tax = $taxFactory->create();
+$tax->setOrderId($order->getId())
+    ->setCode('US-NY-*-Rate 1')
+    ->setTitle('US-NY-*-Rate 1')
+    ->setPercent(8.37)
+    ->setAmount($amount)
+    ->setBaseAmount($amount)
+    ->setBaseRealAmount($amount);
+$tax->save();
+
+$salesOrderFactory = $objectManager->create(ItemFactory::class);
+
+/** @var \Magento\Sales\Model\Order\Tax\Item $salesOrderItem */
+$salesOrderItem = $salesOrderFactory->create();
+$salesOrderItem->setOrderId($order->getId())
+    ->setStoreId($objectManager->get(StoreManagerInterface::class)->getStore()->getId())
+    ->setProductOptions([]);
+$salesCollection = $objectManager->create(\Magento\Sales\Model\ResourceModel\Order\Item::class);
+$salesCollection->save($salesOrderItem);
+
+/** @var \Magento\Sales\Model\Order\Tax\Item $salesOrderTaxItem */
+$salesOrderTaxItem = $salesOrderFactory->create();
+$salesOrderTaxItem->setTaxId($tax->getId())
+    ->setTaxPercent(8.37)
+    ->setTaxAmount($amount)
+    ->setBaseAmount($amount)
+    ->setRealAmount($amount)
+    ->setRealBaseAmount($amount)
+    ->setAppliedTaxes([$tax])
+    ->setTaxableItemType('shipping')
+    ->setItemId($salesOrderItem->getId());
+
+$taxItemCollection = $objectManager->create(\Magento\Sales\Model\ResourceModel\Order\Tax\Item::class);
+$taxItemCollection->save($salesOrderTaxItem);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_tax_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_tax_rollback.php
new file mode 100644
index 0000000000000..dd52deab825cb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_tax_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require 'order_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_custom_price.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_custom_price.php
new file mode 100644
index 0000000000000..3ed44bfd69528
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_custom_price.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+Bootstrap::getInstance()->loadArea('frontend');
+$product = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId('simple')
+    ->setAttributeSetId(4)
+    ->setName('Simple Product')
+    ->setSku('simple_quote_custom_price')
+    ->setPrice(10)
+    ->setTaxClassId(0)
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(
+        [
+            'qty' => 100,
+            'is_in_stock' => 1,
+        ]
+    )->save();
+
+$productRepository = Bootstrap::getObjectManager()->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$product = $productRepository->get('simple_quote_custom_price');
+
+$addressData = include __DIR__ . '/address_data.php';
+$billingAddress = Bootstrap::getObjectManager()->create(
+    \Magento\Quote\Model\Quote\Address::class,
+    ['data' => $addressData]
+);
+$billingAddress->setAddressType('billing');
+
+$shippingAddress = clone $billingAddress;
+$shippingAddress->setId(null)->setAddressType('shipping');
+
+$store = Bootstrap::getObjectManager()
+    ->get(\Magento\Store\Model\StoreManagerInterface::class)
+    ->getStore();
+
+$requestData = [
+    'qty' => 1,
+    'custom_price' => 12,
+];
+$request = Bootstrap::getObjectManager()->create(\Magento\Framework\DataObject::class, ['data' => $requestData]);
+
+/** @var \Magento\Quote\Model\Quote $quote */
+$quote = Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
+$quote->setCustomerIsGuest(true)
+    ->setStoreId($store->getId())
+    ->setReservedOrderId('test01')
+    ->setBillingAddress($billingAddress)
+    ->setShippingAddress($shippingAddress)
+    ->addProduct($product, $request);
+$quote->getPayment()->setMethod('checkmo');
+$quote->setIsMultiShipping('1');
+$quote->collectTotals();
+
+$quoteRepository = Bootstrap::getObjectManager()->create(\Magento\Quote\Api\CartRepositoryInterface::class);
+$quoteRepository->save($quote);
+
+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+$quoteIdMask = Bootstrap::getObjectManager()
+    ->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)
+    ->create();
+$quoteIdMask->setQuoteId($quote->getId());
+$quoteIdMask->setDataChanges(true);
+$quoteIdMask->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_custom_price_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_custom_price_rollback.php
new file mode 100644
index 0000000000000..d17ec28063543
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_custom_price_rollback.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+include __DIR__ . '/quote_rollback.php';
+
+/** @var \Magento\Framework\Registry $registry */
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+try {
+    $product = $productRepository->get('simple_quote_custom_price', false, null, true);
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Observer/AssignCouponDataAfterOrderCustomerAssignTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Observer/AssignCouponDataAfterOrderCustomerAssignTest.php
new file mode 100644
index 0000000000000..397650df416e9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Observer/AssignCouponDataAfterOrderCustomerAssignTest.php
@@ -0,0 +1,291 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\SalesRule\Model\Observer;
+
+use Magento\Sales\Model\Order;
+use Magento\Customer\Model\GroupManagement;
+use Magento\SalesRule\Api\CouponRepositoryInterface;
+use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\Rule;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Customer\Model\Data\Customer;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class AssignCouponDataAfterOrderCustomerAssignTest
+ *
+ * @magentoAppIsolation enabled
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class AssignCouponDataAfterOrderCustomerAssignTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Quote\Api\GuestCartManagementInterface
+     */
+    private $assignCouponToCustomerObserver;
+
+    /**
+     * @var Magento\Sales\Model\OrderRepository
+     */
+    private $orderRepository;
+
+    /**
+     * @var \Magento\Framework\Event\ManagerInterface
+     */
+    protected $eventManager;
+
+    /**
+     * @var Magento\Customer\Api\CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var Order\OrderCustomerDelegate
+     */
+    private $delegateCustomerService;
+
+    /**
+     * @var Magento\SalesRule\Model\Rule\CustomerFactory
+     */
+    private $ruleCustomerFactory;
+
+    /**
+     * @var Rule
+     */
+    private $salesRule;
+
+    /**
+     * @var Coupon
+     */
+    private $coupon;
+
+    /**
+     * @var Order
+     */
+    private $order;
+
+    /**
+     * @var Customer
+     */
+    private $customer;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->eventManager = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
+        $this->orderRepository = $this->objectManager->get(\Magento\Sales\Model\OrderRepository::class);
+        $this->delegateCustomerService = $this->objectManager->get(Order\OrderCustomerDelegate::class);
+        $this->customerRepository = $this->objectManager->get(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+        $this->ruleCustomerFactory =  $this->objectManager->get(\Magento\SalesRule\Model\Rule\CustomerFactory::class);
+        $this->assignCouponToCustomerObserver = $this->objectManager->get(
+            \Magento\SalesRule\Observer\AssignCouponDataAfterOrderCustomerAssignObserver::class
+        );
+
+        $this->salesRule = $this->prepareSalesRule();
+        $this->coupon = $this->attachSalesruleCoupon($this->salesRule);
+        $this->order  = $this->makeOrderWithCouponAsGuest($this->coupon);
+        $this->delegateOrderToBeAssigned($this->order);
+        $this->customer = $this->registerNewCustomer();
+        $this->order->setCustomerId($this->customer->getId());
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->salesRule = null;
+        $this->customer = null;
+        $this->coupon = null;
+        $this->order = null;
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     */
+    public function testCouponDataHasBeenAssignedTest()
+    {
+        $ruleCustomer = $this->getSalesruleCustomerUsage($this->customer, $this->salesRule);
+
+        // Assert, that rule customer model has been created for specific customer
+        $this->assertEquals(
+            $ruleCustomer->getCustomerId(),
+            $this->customer->getId()
+        );
+
+        // Assert, that customer has increased coupon usage of specific rule
+        $this->assertEquals(
+            1,
+            $ruleCustomer->getTimesUsed()
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     */
+    public function testOrderCancelingDecreasesCouponUsages()
+    {
+        $this->processOrder($this->order);
+
+        // Should not throw exception as bux is fixed now
+        $this->order->cancel();
+        $ruleCustomer = $this->getSalesruleCustomerUsage($this->customer, $this->salesRule);
+
+        // Assert, that rule customer model has been created for specific customer
+        $this->assertEquals(
+            $ruleCustomer->getCustomerId(),
+            $this->customer->getId()
+        );
+
+        // Assert, that customer has increased coupon usage of specific rule
+        $this->assertEquals(
+            0,
+            $ruleCustomer->getTimesUsed()
+        );
+    }
+
+    /**
+     * @param Order $order
+     * @return \Magento\Sales\Api\Data\OrderInterface
+     */
+    private function processOrder(Order $order)
+    {
+        $order->setState(Order::STATE_PROCESSING);
+        $order->setStatus(Order::STATE_PROCESSING);
+        return $this->orderRepository->save($order);
+    }
+
+    /**
+     * @param Customer $customer
+     * @param Rule $rule
+     * @return Rule\Customer
+     */
+    private function getSalesruleCustomerUsage(Customer $customer, Rule $rule) : \Magento\SalesRule\Model\Rule\Customer
+    {
+        $ruleCustomer = $this->ruleCustomerFactory->create();
+        return $ruleCustomer->loadByCustomerRule($customer->getId(), $rule->getRuleId());
+    }
+
+    /**
+     * @return Rule
+     */
+    private function prepareSalesRule() : Rule
+    {
+        /** @var Rule $salesRule */
+        $salesRule = $this->objectManager->create(Rule::class);
+        $salesRule->setData(
+            [
+                'name' => '15$ fixed discount on whole cart',
+                'is_active' => 1,
+                'customer_group_ids' => [GroupManagement::NOT_LOGGED_IN_ID],
+                'coupon_type' => Rule::COUPON_TYPE_SPECIFIC,
+                'conditions' => [
+                    [
+                        'type' => \Magento\SalesRule\Model\Rule\Condition\Address::class,
+                        'attribute' => 'base_subtotal',
+                        'operator' => '>',
+                        'value' => 45,
+                    ],
+                ],
+                'simple_action' => Rule::CART_FIXED_ACTION,
+                'discount_amount' => 15,
+                'discount_step' => 0,
+                'stop_rules_processing' => 1,
+                'website_ids' => [
+                    $this->objectManager->get(StoreManagerInterface::class)->getWebsite()->getId(),
+                ],
+            ]
+        );
+        Bootstrap::getObjectManager()->get(
+            \Magento\SalesRule\Model\ResourceModel\Rule::class
+        )->save($salesRule);
+
+        return $salesRule;
+    }
+
+    /**
+     * @param Rule $salesRule
+     * @return Coupon
+     */
+    private function attachSalesruleCoupon(Rule $salesRule) : Coupon
+    {
+        $coupon = $this->objectManager->create(Coupon::class);
+        $coupon->setRuleId($salesRule->getId())
+            ->setCode('CART_FIXED_DISCOUNT_15')
+            ->setType(0);
+
+        Bootstrap::getObjectManager()->get(CouponRepositoryInterface::class)->save($coupon);
+
+        return $coupon;
+    }
+
+    /**
+     * @param Coupon $coupon
+     * @return Order
+     */
+    private function makeOrderWithCouponAsGuest(Coupon $coupon) : Order
+    {
+        $order = Bootstrap::getObjectManager()->create(\Magento\Sales\Model\Order::class);
+        $order->loadByIncrementId('100000001')
+            ->setCustomerIsGuest(true)
+            ->setCouponCode($coupon->getCode())
+            ->setCreatedAt('2014-10-25 10:10:10')
+            ->setAppliedRuleIds($coupon->getRuleId())
+            ->save();
+
+        return $order;
+    }
+
+    /**
+     * @param Order $order
+     */
+    private function delegateOrderToBeAssigned(Order $order)
+    {
+        $this->delegateCustomerService->delegateNew($order->getId());
+    }
+
+    /**
+     * @return Customer
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\State\InputMismatchException
+     */
+    private function registerNewCustomer() : Customer
+    {
+        $customer = Bootstrap::getObjectManager()->create(
+            \Magento\Customer\Api\Data\CustomerInterface::class
+        );
+
+        /** @var Magento\Customer\Api\Data\CustomerInterface $customer */
+        $customer->setWebsiteId(1)
+            ->setEmail('customer@example.com')
+            ->setGroupId(1)
+            ->setStoreId(1)
+            ->setPrefix('Mr.')
+            ->setFirstname('John')
+            ->setMiddlename('A')
+            ->setLastname('Smith')
+            ->setSuffix('Esq.')
+            ->setDefaultBilling(1)
+            ->setDefaultShipping(1)
+            ->setTaxvat('12')
+            ->setGender(0);
+
+        $customer = $this->customerRepository->save($customer, 'password');
+
+        return $customer;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/Rule/CollectionTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/Rule/CollectionTest.php
index f619193d4921f..9ea97b6e939cc 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/Rule/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/Rule/CollectionTest.php
@@ -5,12 +5,39 @@
  */
 namespace Magento\SalesRule\Model\ResourceModel\Rule;
 
+use Magento\Config\Model\Config\Backend\Admin\Custom as AdminBackendConfig;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
 /**
  * @magentoDbIsolation enabled
  * @magentoAppIsolation enabled
  */
-class CollectionTest extends \PHPUnit\Framework\TestCase
+class CollectionTest extends TestCase
 {
+    /**
+     * @var Collection
+     */
+    private $collection;
+
+    /**
+     * @var string
+     */
+    private $defaultTimezone;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $scopeConfig = Bootstrap::getObjectManager()->get(ScopeConfigInterface::class);
+        $this->defaultTimezone = $scopeConfig->getValue(AdminBackendConfig::XML_PATH_GENERAL_LOCALE_TIMEZONE);
+
+        $this->collection = Bootstrap::getObjectManager()->create(Collection::class);
+    }
+
     /**
      * @magentoDataFixture Magento/SalesRule/_files/rules.php
      * @magentoDataFixture Magento/SalesRule/_files/coupons.php
@@ -21,12 +48,8 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
      */
     public function testSetValidationFilter($couponCode, $expectedItems)
     {
-        $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\SalesRule\Model\ResourceModel\Rule\Collection::class
-        );
-        $items = array_values($collection->setValidationFilter(1, 0, $couponCode)->getItems());
-
-        $ids = [];
+        /** @var \Magento\SalesRule\Model\Rule[] $items */
+        $items = array_values($this->collection->setValidationFilter(1, 0, $couponCode)->getItems());
 
         $this->assertEquals(
             count($expectedItems),
@@ -34,6 +57,7 @@ public function testSetValidationFilter($couponCode, $expectedItems)
             'Invalid number of items in the result collection'
         );
 
+        $ids = [];
         foreach ($items as $key => $item) {
             $this->assertEquals($expectedItems[$key], $item->getName());
             $this->assertFalse(
@@ -71,7 +95,7 @@ public function setValidationFilterDataProvider()
      */
     public function testSetValidationFilterWithGroup()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
 
         /** @var \Magento\SalesRule\Model\Rule $rule */
         $rule = $objectManager->get(\Magento\Framework\Registry::class)
@@ -82,13 +106,8 @@ public function testSetValidationFilterWithGroup()
         $quote->load('test_order_item_with_items', 'reserved_order_id');
 
         //gather only the existing rules that obey the validation filter
-        /** @var  \Magento\SalesRule\Model\ResourceModel\Rule\Collection $ruleCollection */
-        $ruleCollection = $objectManager->create(
-            \Magento\SalesRule\Model\ResourceModel\Rule\Collection::class
-        );
-
         $appliedRulesArray = array_keys(
-            $ruleCollection->setValidationFilter(
+            $this->collection->setValidationFilter(
                 $quote->getStore()->getWebsiteId(),
                 0,
                 '',
@@ -108,7 +127,7 @@ public function testSetValidationFilterWithGroup()
      */
     public function testSetValidationFilterAnyCategory()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
 
         /** @var \Magento\SalesRule\Model\Rule $rule */
         $rule = $objectManager->get(\Magento\Framework\Registry::class)
@@ -119,13 +138,8 @@ public function testSetValidationFilterAnyCategory()
         $quote->load('test_order_item_with_items', 'reserved_order_id');
 
         //gather only the existing rules that obey the validation filter
-        /** @var  \Magento\SalesRule\Model\ResourceModel\Rule\Collection $ruleCollection */
-        $ruleCollection = $objectManager->create(
-            \Magento\SalesRule\Model\ResourceModel\Rule\Collection::class
-        );
-
         $appliedRulesArray = array_keys(
-            $ruleCollection->setValidationFilter(
+            $this->collection->setValidationFilter(
                 $quote->getStore()->getWebsiteId(),
                 0,
                 '',
@@ -146,20 +160,15 @@ public function testSetValidationFilterAnyCategory()
      */
     public function testSetValidationFilterOther()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
 
         /** @var \Magento\Quote\Model\Quote  $quote */
         $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
         $quote->load('test_order_item_with_items', 'reserved_order_id');
 
         //gather only the existing rules that obey the validation filter
-        /** @var  \Magento\SalesRule\Model\ResourceModel\Rule\Collection $ruleCollection */
-        $ruleCollection = $objectManager->create(
-            \Magento\SalesRule\Model\ResourceModel\Rule\Collection::class
-        );
-
         $appliedRulesArray = array_keys(
-            $ruleCollection->setValidationFilter(
+            $this->collection->setValidationFilter(
                 $quote->getStore()->getWebsiteId(),
                 0,
                 '',
@@ -181,11 +190,8 @@ public function testSetValidationFilterOther()
     public function testMultiRulesWithTimezone()
     {
         $this->setSpecificTimezone('Europe/Kiev');
-        $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\SalesRule\Model\ResourceModel\Rule\Collection::class
-        );
-        $collection->addWebsiteGroupDateFilter(1, 0);
-        $items = array_values($collection->getItems());
+        $this->collection->addWebsiteGroupDateFilter(1, 0);
+        $items = array_values($this->collection->getItems());
         $this->assertNotEmpty($items);
     }
 
@@ -200,11 +206,8 @@ public function testMultiRulesWithTimezone()
     public function testMultiRulesWithDifferentTimezone()
     {
         $this->setSpecificTimezone('Australia/Sydney');
-        $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\SalesRule\Model\ResourceModel\Rule\Collection::class
-        );
-        $collection->addWebsiteGroupDateFilter(1, 0);
-        $items = array_values($collection->getItems());
+        $this->collection->addWebsiteGroupDateFilter(1, 0);
+        $items = array_values($this->collection->getItems());
         $this->assertNotEmpty($items);
     }
 
@@ -224,7 +227,7 @@ protected function setSpecificTimezone($timezone)
                 ]
             ]
         ];
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Config\Model\Config\Factory::class)
+        Bootstrap::getObjectManager()->get(\Magento\Config\Model\Config\Factory::class)
             ->create()
             ->addData($localeData)
             ->save();
@@ -239,11 +242,9 @@ protected function setSpecificTimezone($timezone)
      */
     public function testAddAttributeInConditionFilterPositive()
     {
-        $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\SalesRule\Model\ResourceModel\Rule\Collection::class
-        );
-        $collection->addAttributeInConditionFilter('attribute_for_sales_rule_1');
-        $item = $collection->getFirstItem();
+        $this->collection->addAttributeInConditionFilter('attribute_for_sales_rule_1');
+        /** @var \Magento\SalesRule\Model\Rule $item */
+        $item = $this->collection->getFirstItem();
         $this->assertEquals('50% Off on some attribute', $item->getName());
     }
 
@@ -256,16 +257,57 @@ public function testAddAttributeInConditionFilterPositive()
      */
     public function testAddAttributeInConditionFilterNegative()
     {
-        $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\SalesRule\Model\ResourceModel\Rule\Collection::class
-        );
-        $collection->addAttributeInConditionFilter('attribute_for_sales_rule_2');
-        $this->assertEquals(0, $collection->count());
+        $this->collection->addAttributeInConditionFilter('attribute_for_sales_rule_2');
+        $this->assertEquals(0, $this->collection->count());
+    }
+
+    /**
+     * @magentoAppIsolation disabled
+     * @magentoDataFixture Magento/SalesRule/_files/multi_websites_rules.php
+     * @dataProvider addWebsiteFilterDataProvider
+     * @param string[] $websiteCodes
+     * @param int $count
+     */
+    public function testAddWebsiteFilter(array $websiteCodes, int $count)
+    {
+        $websiteRepository = Bootstrap::getObjectManager()->get(WebsiteRepositoryInterface::class);
+        $websiteIds = [];
+        foreach ($websiteCodes as $websiteCode) {
+            $websiteIds[] = (int) $websiteRepository->get($websiteCode)->getId();
+        }
+
+        $this->collection->addWebsiteFilter($websiteIds);
+        $this->assertEquals($count, $this->collection->getSize());
+        $this->assertCount($count, $this->collection->getItems());
     }
 
-    public function tearDown()
+    /**
+     * @return array
+     */
+    public function addWebsiteFilterDataProvider(): array
+    {
+        return [
+            [
+                ['base'],
+                4,
+            ],
+            [
+                ['test'],
+                2,
+            ],
+            [
+                ['base', 'test'],
+                5,
+            ],
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function tearDown()
     {
         // restore default timezone
-        $this->setSpecificTimezone('America/Los_Angeles');
+        $this->setSpecificTimezone($this->defaultTimezone);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/multi_websites_rules.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/multi_websites_rules.php
new file mode 100644
index 0000000000000..a43df3d67c077
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/multi_websites_rules.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+include __DIR__ . '/../../Store/_files/website.php';
+include __DIR__ . '/rules.php';
+
+/** @var \Magento\SalesRule\Model\Rule $rule2 */
+$rule2->setWebsiteIds($website->getId())
+    ->save();
+
+/** @var \Magento\SalesRule\Model\Rule $rule3 */
+$rule3->setWebsiteIds(implode(',', [1, $website->getId()]))
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/multi_websites_rules_rollback.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/multi_websites_rules_rollback.php
new file mode 100644
index 0000000000000..9e0e01b9fc51c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/multi_websites_rules_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+include __DIR__ . '/rules_rollback.php';
+include __DIR__ . '/../../Store/_files/website_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/rules.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/rules.php
index f2366305473a0..ebedc20814c8b 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/rules.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/rules.php
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\SalesRule\Model\Rule $rule */
-$rule = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Rule::class);
-$rule->setName(
+/** @var \Magento\SalesRule\Model\Rule $rule1 */
+$rule1 = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Rule::class);
+$rule1->setName(
     '#1'
 )->setIsActive(
     1
@@ -27,9 +27,9 @@
 )->setSortOrder(1)
     ->save();
 
-/** @var \Magento\SalesRule\Model\Rule $rule */
-$rule = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Rule::class);
-$rule->setName(
+/** @var \Magento\SalesRule\Model\Rule $rule2 */
+$rule2 = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Rule::class);
+$rule2->setName(
     '#2'
 )->setIsActive(
     1
@@ -50,9 +50,9 @@
 )->setSortOrder(2)
     ->save();
 
-/** @var \Magento\SalesRule\Model\Rule $rule */
-$rule = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Rule::class);
-$rule->setName(
+/** @var \Magento\SalesRule\Model\Rule $rule3 */
+$rule3 = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Rule::class);
+$rule3->setName(
     '#3'
 )->setIsActive(
     1
@@ -73,9 +73,9 @@
 )->setSortOrder(3)
     ->save();
 
-/** @var \Magento\SalesRule\Model\Rule $rule */
-$rule = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Rule::class);
-$rule->setName(
+/** @var \Magento\SalesRule\Model\Rule $rule4 */
+$rule4 = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Rule::class);
+$rule4->setName(
     '#4'
 )->setIsActive(
     1
@@ -96,9 +96,9 @@
 )->setSortOrder(4)
     ->save();
 
-/** @var \Magento\SalesRule\Model\Rule $rule */
-$rule = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Rule::class);
-$rule->setName(
+/** @var \Magento\SalesRule\Model\Rule $rule5 */
+$rule5 = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Rule::class);
+$rule5->setName(
     '#5'
 )->setIsActive(
     1
diff --git a/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php b/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php
index b9ba89ba53144..9a6df9b9966d2 100644
--- a/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php
@@ -48,7 +48,31 @@ public static function loadByPhraseDataProvider()
                 ['synonyms' => 'queen,monarch', 'store_id' => 1, 'website_id' => 0],
                 ['synonyms' => 'british,english', 'store_id' => 1, 'website_id' => 0]
                 ]
-            ]
+            ],
+            [
+                'query_value', []
+            ],
+            [
+                'query_value+', []
+            ],
+            [
+                'query_value-', []
+            ],
+            [
+                'query_@value', []
+            ],
+            [
+                'query_value+@', []
+            ],
+            [
+                '<', []
+            ],
+            [
+                '>', []
+            ],
+            [
+                '<english>', [['synonyms' => 'british,english', 'store_id' => 1, 'website_id' => 0]]
+            ],
         ];
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
new file mode 100644
index 0000000000000..d464c51050834
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SendFriend\Controller\Product;
+
+use Magento\Captcha\Model\DefaultModel;
+use Magento\TestFramework\TestCase\AbstractController;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Model\Session;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Message\MessageInterface;
+use Magento\Captcha\Helper\Data as CaptchaHelper;
+
+class CustomerSendmailTest extends AbstractController
+{
+    /**
+     * @var AccountManagementInterface
+     */
+    private $accountManagement;
+
+    /**
+     * @var FormKey
+     */
+    private $formKey;
+
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @var CaptchaHelper
+     */
+    private $captchaHelper;
+
+    /**
+     * @throws LocalizedException
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->accountManagement = $this->_objectManager->create(AccountManagementInterface::class);
+        $this->formKey = $this->_objectManager->create(FormKey::class);
+        $logger = $this->createMock(LoggerInterface::class);
+        $this->session = $this->_objectManager->create(
+            Session::class,
+            [$logger]
+        );
+        $this->captchaHelper = $this->_objectManager->create(CaptchaHelper::class);
+        $customer = $this->accountManagement->authenticate('customer@example.com', 'password');
+        $this->session->setCustomerDataAsLoggedIn($customer);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testExecute()
+    {
+        $this->getRequest()
+            ->setMethod('POST')
+            ->setPostValue(
+                [
+                    'form_key' => $this->formKey->getFormKey(),
+                    'sender' => [
+                        'name' => 'customer',
+                        'email' => 'customer@example.com',
+                        'message' => 'example message'
+                    ],
+                    'id' => 1,
+                    'recipients' => [
+                        'name' => ['John'],
+                        'email' => ['example1@gmail.com']
+                    ]
+
+                ]
+            );
+
+        $this->dispatch('sendfriend/product/sendmail');
+        $this->assertSessionMessages(
+            $this->equalTo(['The link to a friend was sent.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+    }
+
+    /**
+     * @magentoConfigFixture default_store customer/captcha/enable 1
+     * @magentoConfigFixture default_store customer/captcha/failed_attempts_login 0
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoConfigFixture default_store customer/captcha/forms product_sendtofriend_form
+     */
+    public function testWithCaptchaFailed()
+    {
+        $this->getRequest()
+            ->setMethod('POST')
+            ->setPostValue(
+                [
+                    'form_key' => $this->formKey->getFormKey(),
+                    'sender' => [
+                        'name' => 'customer',
+                        'email' => 'customer@example.com',
+                        'message' => 'example message'
+                    ],
+                    'id' => 1,
+                    'recipients' => [
+                        'name' => ['John'],
+                        'email' => ['example1@gmail.com']
+                    ]
+
+                ]
+            );
+
+        $this->dispatch('sendfriend/product/sendmail');
+        $this->assertSessionMessages(
+            $this->equalTo(['Incorrect CAPTCHA']),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
+    /**
+     * @magentoConfigFixture default_store customer/captcha/enable 1
+     * @magentoConfigFixture default_store customer/captcha/failed_attempts_login 0
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoConfigFixture default_store customer/captcha/forms product_sendtofriend_form
+     *
+     */
+    public function testWithCaptchaSuccess()
+    {
+        /** @var DefaultModel $captchaModel */
+        $captchaModel = $this->captchaHelper->getCaptcha('product_sendtofriend_form');
+        $captchaModel->generate();
+        $word = $captchaModel->getWord();
+        $this->getRequest()
+            ->setMethod('POST')
+            ->setPostValue(
+                [
+                    'form_key' => $this->formKey->getFormKey(),
+                    'sender' => [
+                        'name' => 'customer',
+                        'email' => 'customer@example.com',
+                        'message' => 'example message'
+                    ],
+                    'id' => 1,
+                    'captcha' => [
+                        'product_sendtofriend_form' => $word
+                    ],
+                    'recipients' => [
+                        'name' => ['John'],
+                        'email' => ['example1@gmail.com']
+                    ]
+                ]
+            );
+
+        $this->dispatch('sendfriend/product/sendmail');
+        $this->assertSessionMessages(
+            $this->equalTo(['The link to a friend was sent.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php
new file mode 100644
index 0000000000000..a075398e9cdb7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SendFriend\Controller;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Customer\Model\Session;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\Request;
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * Class SendmailTest
+ */
+class SendmailTest extends AbstractController
+{
+    /**
+     * Share the product to friend as logged in customer
+     *
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/SendFriend/_files/disable_allow_guest_config.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     */
+    public function testSendActionAsLoggedIn()
+    {
+        $product = $this->getProduct();
+        $this->login(1);
+        $this->prepareRequestData();
+
+        $this->dispatch('sendfriend/product/sendmail/id/' . $product->getId());
+        $this->assertSessionMessages(
+            $this->equalTo(['The link to a friend was sent.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+    }
+
+    /**
+     * Share the product to friend as guest customer
+     *
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default_store sendfriend/email/enabled 1
+     * @magentoConfigFixture default_store sendfriend/email/allow_guest 1
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     */
+    public function testSendActionAsGuest()
+    {
+        $product = $this->getProduct();
+        $this->prepareRequestData();
+
+        $this->dispatch('sendfriend/product/sendmail/id/' . $product->getId());
+        $this->assertSessionMessages(
+            $this->equalTo(['The link to a friend was sent.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+    }
+
+    /**
+     * Share the product to friend as guest customer with invalid post data
+     *
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default_store sendfriend/email/enabled 1
+     * @magentoConfigFixture default_store sendfriend/email/allow_guest 1
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     */
+    public function testSendActionAsGuestWithInvalidData()
+    {
+        $product = $this->getProduct();
+        $this->prepareRequestData(true);
+
+        $this->dispatch('sendfriend/product/sendmail/id/' . $product->getId());
+        $this->assertSessionMessages(
+            $this->equalTo(['Invalid Sender Email']),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
+    /**
+     * @return ProductInterface
+     */
+    private function getProduct()
+    {
+        return $this->_objectManager->get(ProductRepositoryInterface::class)->get('custom-design-simple-product');
+    }
+
+    /**
+     * Login the user
+     *
+     * @param string $customerId Customer to mark as logged in for the session
+     * @return void
+     */
+    protected function login($customerId)
+    {
+        /** @var Session $session */
+        $session = Bootstrap::getObjectManager()
+            ->get(Session::class);
+        $session->loginById($customerId);
+    }
+
+    /**
+     * @param bool $invalidData
+     * @return void
+     */
+    private function prepareRequestData($invalidData = false)
+    {
+        /** @var FormKey $formKey */
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $post = [
+            'sender' => [
+                'name' => 'Test',
+                'email' => 'test@example.com',
+                'message' => 'Message',
+            ],
+            'recipients' => [
+                'name' => [
+                    'Recipient 1',
+                    'Recipient 2'
+                ],
+                'email' => [
+                    'r1@example.com',
+                    'r2@example.com'
+                ]
+            ],
+            'form_key' => $formKey->getFormKey(),
+        ];
+        if ($invalidData) {
+            unset($post['sender']['email']);
+        }
+
+        $this->getRequest()->setMethod(Request::METHOD_POST);
+        $this->getRequest()->setPostValue($post);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/_files/disable_allow_guest_config.php b/dev/tests/integration/testsuite/Magento/SendFriend/_files/disable_allow_guest_config.php
new file mode 100644
index 0000000000000..202a396132485
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SendFriend/_files/disable_allow_guest_config.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\App\Config\Value;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Value $config */
+$config = Bootstrap::getObjectManager()->create(Value::class);
+$config->setPath('sendfriend/email/enabled');
+$config->setScope('default');
+$config->setScopeId(0);
+$config->setValue(1);
+$config->save();
+
+/** @var Value $config */
+$config = Bootstrap::getObjectManager()->create(Value::class);
+$config->setPath('sendfriend/email/allow_guest');
+$config->setScope('default');
+$config->setScopeId(0);
+$config->setValue(0);
+$config->save();
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json
index ddf42815e0580..a19a1e2811ee0 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "magento/module-a",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "0.1",
         "magento/module-b": "0.1"
     },
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json
index 9634021dee0fb..ec34ef169ca01 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "magento/module-b",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "0.74.0-beta6",
         "magento/module-a": "0.1"
     },
diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AbstractShipmentControllerTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AbstractShipmentControllerTest.php
new file mode 100644
index 0000000000000..0a1926d58624c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AbstractShipmentControllerTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
+
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\ShipmentInterface;
+use Magento\Sales\Model\OrderRepository;
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Abstract backend shipment test.
+ */
+class AbstractShipmentControllerTest extends AbstractBackendController
+{
+    /**
+     * @var TransportBuilderMock
+     */
+    protected $transportBuilder;
+
+    /**
+     * @var OrderRepository
+     */
+    protected $orderRepository;
+
+    /**
+     * @var FormKey
+     */
+    protected $formKey;
+
+    /**
+     * @var string
+     */
+    protected $resource = 'Magento_Sales::shipment';
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
+        $this->orderRepository = $this->_objectManager->get(OrderRepository::class);
+        $this->formKey = $this->_objectManager->get(FormKey::class);
+    }
+
+    /**
+     * @param string $incrementalId
+     * @return OrderInterface|null
+     */
+    protected function getOrder(string $incrementalId)
+    {
+        /** @var SearchCriteria $searchCriteria */
+        $searchCriteria = $this->_objectManager->create(SearchCriteriaBuilder::class)
+            ->addFilter(OrderInterface::INCREMENT_ID, $incrementalId)
+            ->create();
+
+        $orders = $this->orderRepository->getList($searchCriteria)->getItems();
+        /** @var OrderInterface|null $order */
+        $order = reset($orders);
+
+        return $order;
+    }
+
+    /**
+     * @param OrderInterface $order
+     * @return ShipmentInterface
+     */
+    protected function getShipment(OrderInterface $order): ShipmentInterface
+    {
+        /** @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Collection $shipmentCollection */
+        $shipmentCollection = $this->_objectManager->create(
+            \Magento\Sales\Model\ResourceModel\Order\Shipment\CollectionFactory::class
+        )->create();
+
+        /** @var ShipmentInterface $shipment */
+        $shipment = $shipmentCollection
+            ->setOrderFilter($order)
+            ->setPageSize(1)
+            ->getFirstItem();
+
+        return $shipment;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php
new file mode 100644
index 0000000000000..c86ad71e7d5ca
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.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\Controller\Adminhtml\Order\Shipment;
+
+use PHPUnit\Framework\Constraint\RegularExpression;
+use PHPUnit\Framework\Constraint\StringContains;
+
+/**
+ * Class verifies shipment add comment functionality.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppArea adminhtml
+ * @magentoDataFixture Magento/Sales/_files/shipment.php
+ */
+class AddCommentTest extends AbstractShipmentControllerTest
+{
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/admin/order_shipment/addComment';
+
+    /**
+     * @return void
+     */
+    public function testSendEmailOnShipmentCommentAdd()
+    {
+        $comment = 'Test Shipment Comment';
+        $order = $this->prepareRequest(
+            [
+                'comment' => ['comment' => $comment, 'is_customer_notified' => true],
+            ]
+        );
+        $this->dispatch('backend/admin/order_shipment/addComment');
+        $html = $this->getResponse()->getBody();
+        $this->assertContains($comment, $html);
+
+        $message = $this->transportBuilder->getSentMessage();
+        $subject =__('Update to your %1 shipment', $order->getStore()->getFrontendName())->render();
+        $messageConstraint = $this->logicalAnd(
+            new StringContains($order->getBillingAddress()->getName()),
+            new RegularExpression(
+                sprintf(
+                    "/Your order #%s has been updated with a status of.*%s/",
+                    $order->getIncrementId(),
+                    $order->getFrontendStatusLabel()
+                )
+            ),
+            new StringContains($comment)
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $messageConstraint);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclHasAccess()
+    {
+        $this->prepareRequest(['comment', ['comment' => 'Comment']]);
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclNoAccess()
+    {
+        $this->prepareRequest(['comment', ['comment' => 'Comment']]);
+
+        parent::testAclNoAccess();
+    }
+
+    /**
+     * @param array $params
+     * @return \Magento\Sales\Api\Data\OrderInterface|null
+     */
+    private function prepareRequest(array $params = [])
+    {
+        $order = $this->getOrder('100000001');
+        $shipment = $this->getShipment($order);
+
+        $this->getRequest()->setMethod('POST');
+        $this->getRequest()->setParams(
+            [
+                'id' => $shipment->getEntityId(),
+                'form_key' => $this->formKey->getFormKey(),
+            ]
+        );
+
+        $data = $params ?? [];
+        $this->getRequest()->setPostValue($data);
+
+        return $order;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php
new file mode 100644
index 0000000000000..4eb65678583aa
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
+
+use PHPUnit\Framework\Constraint\StringContains;
+
+/**
+ * Class verifies shipment creation functionality.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppArea adminhtml
+ * @magentoDataFixture Magento/Sales/_files/order.php
+ */
+class SaveTest extends AbstractShipmentControllerTest
+{
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/admin/order_shipment/save';
+
+    /**
+     * @return void
+     */
+    public function testSendEmailOnShipmentSave()
+    {
+        $order = $this->prepareRequest(['shipment' => ['send_email' => true]]);
+        $this->dispatch('backend/admin/order_shipment/save');
+
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('The shipment has been created.')]),
+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+        );
+        $this->assertRedirect($this->stringContains('sales/order/view/order_id/' . $order->getEntityId()));
+
+        $shipment = $this->getShipment($order);
+        $message = $this->transportBuilder->getSentMessage();
+        $subject = __('Your %1 order has shipped', $order->getStore()->getFrontendName())->render();
+        $messageConstraint = $this->logicalAnd(
+            new StringContains($order->getBillingAddress()->getName()),
+            new StringContains(
+                'Thank you for your order from ' . $shipment->getStore()->getFrontendName()
+            ),
+            new StringContains(
+                "Your Shipment #{$shipment->getIncrementId()} for Order #{$order->getIncrementId()}"
+            )
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $messageConstraint);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclHasAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclNoAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclNoAccess();
+    }
+
+    /**
+     * @param array $params
+     * @return \Magento\Sales\Api\Data\OrderInterface|null
+     */
+    private function prepareRequest(array $params = [])
+    {
+        $order = $this->getOrder('100000001');
+        $this->getRequest()->setMethod('POST');
+        $this->getRequest()->setParams(
+            [
+                'order_id' => $order->getEntityId(),
+                'form_key' => $this->formKey->getFormKey(),
+            ]
+        );
+
+        $data = $params ?? [];
+        $this->getRequest()->setPostValue($data);
+
+        return $order;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/StoreResolver/WebsiteTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/StoreResolver/WebsiteTest.php
new file mode 100644
index 0000000000000..cc10b91a031cc
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/StoreResolver/WebsiteTest.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Store\Model\StoreResolver;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+class WebsiteTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Website
+     */
+    private $reader;
+
+    protected function setUp()
+    {
+        $this->reader = Bootstrap::getObjectManager()->create(Website::class);
+    }
+
+    /**
+     * Tests retrieving of stores id by passed scope.
+     *
+     * @param string|null $scopeCode website code
+     * @param int $storesCount
+     * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     * @magentoDbIsolation disabled
+     * @magentoAppIsolation enabled
+     * @dataProvider scopeDataProvider
+     */
+    public function testGetAllowedStoreIds($scopeCode, $storesCount)
+    {
+        $this->assertCount($storesCount, $this->reader->getAllowedStoreIds($scopeCode));
+    }
+
+    /**
+     * Provides scopes and corresponding count of resolved stores.
+     *
+     * @return array
+     */
+    public function scopeDataProvider(): array
+    {
+        return [
+            [null, 4],
+            ['test', 2]
+        ];
+    }
+
+    /**
+     * Tests retrieving of stores id by passing incorrect scope.
+     *
+     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
+     * @expectedExceptionMessage The website with code not_exists that was requested wasn't found.
+     */
+    public function testIncorrectScope()
+    {
+        $this->reader->getAllowedStoreIds('not_exists');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
index e62436460998f..9150ffb12b82d 100644
--- a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
@@ -4,13 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Store\Model;
 
+use Magento\Catalog\Model\ProductRepository;
 use Magento\Framework\App\Bootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\UrlInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
 use Zend\Stdlib\Parameters;
 
 /**
@@ -200,7 +200,7 @@ public function testGetBaseUrlInPub()
      */
     public function testGetBaseUrlForCustomEntryPoint($type, $useCustomEntryPoint, $useStoreCode, $expected)
     {
-         /* config operations require store to be loaded */
+        /* config operations require store to be loaded */
         $this->model->load('default');
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class)
@@ -269,12 +269,89 @@ public function testIsCanDelete()
         $this->assertFalse($this->model->isCanDelete());
     }
 
+    /**
+     * @magentoDataFixture Magento/Store/_files/core_second_third_fixturestore.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
+     */
     public function testGetCurrentUrl()
     {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class)
+            ->setValue('web/url/use_store', true, ScopeInterface::SCOPE_STORE, 'secondstore');
+
         $this->model->load('admin');
-        $this->model->expects($this->any())->method('getUrl')->will($this->returnValue('http://localhost/index.php'));
+        $this->model
+            ->expects($this->any())->method('getUrl')
+            ->will($this->returnValue('http://localhost/index.php'));
         $this->assertStringEndsWith('default', $this->model->getCurrentUrl());
         $this->assertStringEndsNotWith('default', $this->model->getCurrentUrl(false));
+
+        /** @var \Magento\Store\Model\Store $secondStore */
+        $secondStore = $objectManager->get(StoreRepositoryInterface::class)->get('secondstore');
+
+        /** @var \Magento\Catalog\Model\ProductRepository $productRepository */
+        $productRepository = $objectManager->create(ProductRepository::class);
+        $product = $productRepository->get('simple');
+        $product->setStoreId($secondStore->getId());
+        $url = $product->getUrlInStore();
+
+        $this->assertEquals(
+            $secondStore->getBaseUrl().'catalog/product/view/id/1/s/simple-product/',
+            $url
+        );
+        $this->assertEquals(
+            $secondStore->getBaseUrl().'?___from_store=default',
+            $secondStore->getCurrentUrl()
+        );
+        $this->assertEquals(
+            $secondStore->getBaseUrl(),
+            $secondStore->getCurrentUrl(false)
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
+     * @magentoDbIsolation disabled
+     */
+    public function testGetCurrentUrlWithUseStoreInUrlFalse()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class)
+            ->setValue('web/url/use_store', false, ScopeInterface::SCOPE_STORE, 'default');
+
+        /** @var \Magento\Store\Model\Store $secondStore */
+        $secondStore = $objectManager->get(StoreRepositoryInterface::class)->get('fixture_second_store');
+
+        /** @var \Magento\Catalog\Model\ProductRepository $productRepository */
+        $productRepository = $objectManager->create(ProductRepository::class);
+        $product = $productRepository->get('simple333');
+
+        $product->setStoreId($secondStore->getId());
+        $url = $product->getUrlInStore();
+
+        /** @var \Magento\Catalog\Model\CategoryRepository $categoryRepository */
+        $categoryRepository = $objectManager->get(\Magento\Catalog\Model\CategoryRepository::class);
+        $category = $categoryRepository->get(333, $secondStore->getStoreId());
+
+        $this->assertEquals(
+            $secondStore->getBaseUrl().'catalog/category/view/s/category-1/id/333/',
+            $category->getUrl()
+        );
+        $this->assertEquals(
+            $secondStore->getBaseUrl().
+            'catalog/product/view/id/333/s/simple-product-three/?___store=fixture_second_store',
+            $url
+        );
+        $this->assertEquals(
+            $secondStore->getBaseUrl().'?___store=fixture_second_store&___from_store=default',
+            $secondStore->getCurrentUrl()
+        );
+        $this->assertEquals(
+            $secondStore->getBaseUrl().'?___store=fixture_second_store',
+            $secondStore->getCurrentUrl(false)
+        );
     }
 
     /**
@@ -292,7 +369,11 @@ public function testCRUD()
             'sort_order' => 0,
             'is_active' => 1,
         ]);
-        $crud = new \Magento\TestFramework\Entity($this->model, ['name' => 'new name'], \Magento\Store\Model\Store::class);
+        $crud = new \Magento\TestFramework\Entity(
+            $this->model,
+            ['name' => 'new name'],
+            \Magento\Store\Model\Store::class
+        );
         $crud->testCrud();
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore.php b/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore.php
index 3cb429822eb9a..912e8e895f9c1 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore.php
@@ -13,7 +13,7 @@
 
 /** @var \Magento\Store\Model\Store $store */
 $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
-$store->setCode('secondstore')->setName('Second Store')->setSortOrder(10)->setIsActive(1);
+$store->setCode('secondstore')->setWebsiteId($websiteId)->setName('Second Store')->setSortOrder(10)->setIsActive(1);
 $store->save();
 
 /** @var \Magento\Store\Model\Website $website */
@@ -25,5 +25,5 @@
 
 /** @var \Magento\Store\Model\Store $store */
 $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
-$store->setCode('thirdstore')->setName('Third Store')->setSortOrder(10)->setIsActive(1);
+$store->setCode('thirdstore')->setWebsiteId($websiteId)->setName('Third Store')->setSortOrder(10)->setIsActive(1);
 $store->save();
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php
index be9fd96d75892..493c4dcadc1e4 100644
--- a/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php
@@ -7,6 +7,8 @@
 
 namespace Magento\Swatches\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Data\Form\FormKey;
 use Magento\Framework\Exception\LocalizedException;
 
 /**
@@ -17,6 +19,21 @@
  */
 class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
+    /**
+     * @var FormKey
+     */
+    private $formKey;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->formKey = $this->_objectManager->get(FormKey::class);
+    }
+
     /**
      * Generate random hex color.
      *
@@ -38,22 +55,27 @@ private function getSwatchVisualDataSet(int $optionsCount): array
         $optionsData = [];
         $expectedOptionsLabels = [];
         for ($i = 0; $i < $optionsCount; $i++) {
-            $order = $i + 1;
-            $expectedOptionLabelOnStoreView = "value_{$i}_store_1";
+            $expectedOptionLabelOnStoreView = 'value_' . $i .'_store_1';
             $expectedOptionsLabels[$i+1] = $expectedOptionLabelOnStoreView;
-            $optionsData []= "optionvisual[order][option_{$i}]={$order}";
-            $optionsData []= "defaultvisual[]=option_{$i}";
-            $optionsData []= "swatchvisual[value][option_{$i}]={$this->getRandomColor()}";
-            $optionsData []= "optionvisual[value][option_{$i}][0]=value_{$i}_admin";
-            $optionsData []= "optionvisual[value][option_{$i}][1]={$expectedOptionLabelOnStoreView}";
-            $optionsData []= "optionvisual[delete][option_{$i}]=";
+            $optionId = 'option_' .$i;
+            $optionRowData = [];
+            $optionRowData['optionvisual']['order'][$optionId] = $i + 1;
+            $optionRowData['defaultvisual'][] = $optionId;
+            $optionRowData['swatchvisual']['value'][$optionId] = $this->getRandomColor();
+            $optionRowData['optionvisual']['value'][$optionId][0] = 'value_' . $i .'_admin';
+            $optionRowData['optionvisual']['value'][$optionId][1] = $expectedOptionLabelOnStoreView;
+            $optionRowData['optionvisual']['delete'][$optionId] = '';
+            $optionsData[] = http_build_query($optionRowData);
         }
-        $optionsData []= "visual_swatch_validation=";
-        $optionsData []= "visual_swatch_validation_unique=";
+
         return [
             'attribute_data' => array_merge_recursive(
                 [
-                    'serialized_swatch_values' => json_encode($optionsData),
+                    'serialized_options' => json_encode($optionsData),
+                ],
+                [
+                    'visual_swatch_validation' => '',
+                    'visual_swatch_validation_unique' => '',
                 ],
                 $this->getAttributePreset(),
                 [
@@ -76,22 +98,27 @@ private function getSwatchTextDataSet(int $optionsCount): array
         $optionsData = [];
         $expectedOptionsLabels = [];
         for ($i = 0; $i < $optionsCount; $i++) {
-            $order = $i + 1;
-            $expectedOptionLabelOnStoreView = "value_{$i}_store_1";
+            $expectedOptionLabelOnStoreView = 'value_' . $i . '_store_1';
             $expectedOptionsLabels[$i+1] = $expectedOptionLabelOnStoreView;
-            $optionsData []= "optiontext[order][option_{$i}]={$order}";
-            $optionsData []= "defaulttext[]=option_{$i}";
-            $optionsData []= "swatchtext[value][option_{$i}]=x{$i}";
-            $optionsData []= "optiontext[value][option_{$i}][0]=value_{$i}_admin";
-            $optionsData []= "optiontext[value][option_{$i}][1]={$expectedOptionLabelOnStoreView}";
-            $optionsData []= "optiontext[delete][option_{$i}]=";
+            $optionId = 'option_' . $i;
+            $optionRowData = [];
+            $optionRowData['optiontext']['order'][$optionId] = $i + 1;
+            $optionRowData['defaulttext'][] = $optionId;
+            $optionRowData['swatchtext']['value'][$optionId] = 'x' . $i ;
+            $optionRowData['optiontext']['value'][$optionId][0] = 'value_' . $i . '_admin';
+            $optionRowData['optiontext']['value'][$optionId][1]= $expectedOptionLabelOnStoreView;
+            $optionRowData['optiontext']['delete'][$optionId]='';
+            $optionsData[] = http_build_query($optionRowData);
         }
-        $optionsData []= "text_swatch_validation=";
-        $optionsData []= "text_swatch_validation_unique=";
+
         return [
             'attribute_data' => array_merge_recursive(
                 [
-                    'serialized_swatch_values' => json_encode($optionsData),
+                    'serialized_options' => json_encode($optionsData),
+                ],
+                [
+                    'text_swatch_validation' => '',
+                    'text_swatch_validation_unique' => '',
                 ],
                 $this->getAttributePreset(),
                 [
@@ -111,7 +138,6 @@ private function getSwatchTextDataSet(int $optionsCount): array
     private function getAttributePreset(): array
     {
         return [
-            'serialized_options' => '[]',
             'form_key' => 'XxtpPYjm2YPYUlAt',
             'frontend_label' => [
                 0 => 'asdasd',
@@ -176,7 +202,9 @@ public function testLargeOptionsDataSet(
         int $expectedOptionsCount,
         array $expectedLabels
     ) {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($attributeData);
+        $this->getRequest()->setPostValue('form_key', $this->formKey->getFormKey());
         $this->dispatch('backend/catalog/product_attribute/save');
         $entityTypeId = $this->_objectManager->create(
             \Magento\Eav\Model\Entity::class
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/RateTest.php b/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/RateTest.php
index 91a845f151eaf..afc2fbdce5e1b 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/RateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/RateTest.php
@@ -16,7 +16,7 @@ class RateTest extends \Magento\TestFramework\TestCase\AbstractBackendController
      */
     public function testAjaxSaveAction($postData, $expectedData)
     {
-        $this->getRequest()->setPostValue($postData);
+        $this->getRequest()->setPostValue($postData)->setMethod('POST');
 
         $this->dispatch('backend/tax/rate/ajaxSave');
 
@@ -84,7 +84,7 @@ public function ajaxSaveActionDataProvider()
      */
     public function testAjaxSaveActionInvalidData($postData, $expectedData)
     {
-        $this->getRequest()->setPostValue($postData);
+        $this->getRequest()->setPostValue($postData)->setMethod('POST');
 
         $this->dispatch('backend/tax/rate/ajaxSave');
 
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
index bd6c900cf203c..4f9778febfb1c 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php
@@ -9,10 +9,19 @@
 namespace Magento\Tax\Model\Sales\Total\Quote;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Quote\Model\Quote;
 use Magento\Tax\Model\Config;
 use Magento\Tax\Model\Calculation;
+use Magento\Quote\Model\Quote\Item\Updater;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\Search\FilterGroup;
+use Magento\Framework\Api\SearchCriteriaInterface;
 
 /**
+ * Setup utility for quote
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SetupUtil
@@ -593,7 +602,7 @@ protected function createCartRule($ruleDataOverride)
      *
      * @param array $quoteData
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
-     * @return \Magento\Quote\Model\Quote
+     * @return Quote
      */
     protected function createQuote($quoteData, $customer)
     {
@@ -618,8 +627,8 @@ protected function createQuote($quoteData, $customer)
         $quoteBillingAddress = $this->objectManager->create(\Magento\Quote\Model\Quote\Address::class);
         $quoteBillingAddress->importCustomerAddressData($addressService->getById($billingAddress->getId()));
 
-        /** @var \Magento\Quote\Model\Quote $quote */
-        $quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class);
+        /** @var Quote $quote */
+        $quote = $this->objectManager->create(Quote::class);
         $quote->setStoreId(1)
             ->setIsActive(true)
             ->setIsMultiShipping(false)
@@ -633,7 +642,7 @@ protected function createQuote($quoteData, $customer)
     /**
      * Add products to quote
      *
-     * @param \Magento\Quote\Model\Quote $quote
+     * @param Quote $quote
      * @param array $itemsData
      * @return $this
      */
@@ -656,7 +665,8 @@ protected function addProductToQuote($quote, $itemsData)
      * Create a quote based on given data
      *
      * @param array $quoteData
-     * @return \Magento\Quote\Model\Quote
+     *
+     * @return Quote
      */
     public function setupQuote($quoteData)
     {
@@ -665,7 +675,9 @@ public function setupQuote($quoteData)
         $quote = $this->createQuote($quoteData, $customer);
 
         $this->addProductToQuote($quote, $quoteData['items']);
-
+        if (isset($quoteData['update_items'])) {
+            $this->updateItems($quote, $quoteData['update_items']);
+        }
         //Set shipping amount
         if (isset($quoteData['shipping_method'])) {
             $quote->getShippingAddress()->setShippingMethod($quoteData['shipping_method']);
@@ -682,4 +694,33 @@ public function setupQuote($quoteData)
 
         return $quote;
     }
+
+    /**
+     * Update quote items
+     *
+     * @param Quote $quote
+     * @param array $items
+     *
+     * @return void
+     */
+    private function updateItems(Quote $quote, array $items)
+    {
+        $updater = $this->objectManager->get(Updater::class);
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $filter = $this->objectManager->create(Filter::class);
+        $filter->setField('sku')->setValue(array_keys($items));
+        $filterGroup = $this->objectManager->create(FilterGroup::class);
+        $filterGroup->setFilters([$filter]);
+        $searchCriteria = $this->objectManager->create(SearchCriteriaInterface::class);
+        $searchCriteria->setFilterGroups([$filterGroup]);
+        $products = $productRepository->getList($searchCriteria)->getItems();
+        /** @var ProductInterface $product */
+        foreach ($products as $product) {
+            $quoteItem = $quote->getItemByProduct($product);
+            $updater->update(
+                $quoteItem,
+                $items[$product->getSku()]
+            );
+        }
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
index 0513dd1c7d3c4..ebf2c2eea9553 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
@@ -11,6 +11,7 @@
 
 require_once __DIR__ . '/SetupUtil.php';
 require_once __DIR__ . '/../../../../_files/tax_calculation_data_aggregated.php';
+require_once __DIR__ . '/../../../../_files/full_discount_with_tax.php';
 
 /**
  * Class TaxTest
@@ -124,6 +125,40 @@ public function testCollect()
         );
     }
 
+    /**
+     * Test taxes collection with full discount for quote.
+     *
+     * Test tax calculation and price when the discount may be bigger than total
+     * This method will test the collector through $quote->collectTotals() method
+     *
+     * @see \Magento\SalesRule\Model\Utility::deltaRoundingFix
+     * @magentoDataFixture Magento/Tax/_files/full_discount_with_tax.php
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     */
+    public function testFullDiscountWithDeltaRoundingFix()
+    {
+        global $fullDiscountIncTax;
+        $configData = $fullDiscountIncTax['config_data'];
+        $quoteData = $fullDiscountIncTax['quote_data'];
+        $expectedResults = $fullDiscountIncTax['expected_result'];
+
+        /** @var  \Magento\Framework\ObjectManagerInterface $objectManager */
+        $objectManager = Bootstrap::getObjectManager();
+
+        //Setup tax configurations
+        $this->setupUtil = new SetupUtil($objectManager);
+        $this->setupUtil->setupTax($configData);
+
+        $quote = $this->setupUtil->setupQuote($quoteData);
+
+        $quote->collectTotals();
+
+        $quoteAddress = $quote->getShippingAddress();
+
+        $this->verifyResult($quoteAddress, $expectedResults);
+    }
+
     /**
      * Verify fields in quote item
      *
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/full_discount_with_tax.php b/dev/tests/integration/testsuite/Magento/Tax/_files/full_discount_with_tax.php
new file mode 100644
index 0000000000000..2b5ef07de341a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/full_discount_with_tax.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Tax\Model\Config;
+use Magento\Tax\Model\Sales\Total\Quote\SetupUtil;
+
+$fullDiscountIncTax = [
+        'config_data' => [
+                'config_overrides' => [
+                        Config::CONFIG_XML_PATH_APPLY_AFTER_DISCOUNT => 0,
+                        Config::CONFIG_XML_PATH_DISCOUNT_TAX => 1,
+                        Config::XML_PATH_ALGORITHM => 'ROW_BASE_CALCULATION',
+                        Config::CONFIG_XML_PATH_SHIPPING_TAX_CLASS => SetupUtil::SHIPPING_TAX_CLASS,
+                    ],
+                'tax_rate_overrides' => [
+                        SetupUtil::TAX_RATE_TX => 18,
+                        SetupUtil::TAX_RATE_SHIPPING => 0,
+                    ],
+                'tax_rule_overrides' => [
+                        [
+                            'code' => 'Product Tax Rule',
+                            'product_tax_class_ids' => [
+                                    SetupUtil::PRODUCT_TAX_CLASS_1
+                                ],
+                        ],
+                        [
+                            'code' => 'Shipping Tax Rule',
+                            'product_tax_class_ids' => [
+                                    SetupUtil::SHIPPING_TAX_CLASS
+                                ],
+                            'tax_rate_ids' => [
+                                    SetupUtil::TAX_RATE_SHIPPING,
+                                ],
+                        ],
+                    ],
+        ],
+        'quote_data' => [
+                'billing_address' => [
+                        'region_id' => SetupUtil::REGION_TX,
+                    ],
+                'shipping_address' => [
+                        'region_id' => SetupUtil::REGION_TX,
+                    ],
+                'items' => [
+                        [
+                            'sku' => 'simple1',
+                            'price' => 2542.37,
+                            'qty' => 2,
+                        ]
+                    ],
+                'shipping_method' => 'free',
+                'shopping_cart_rules' => [
+                        [
+                            'discount_amount' => 100
+                        ],
+                    ],
+        ],
+        'expected_result' => [
+                'address_data' => [
+                        'subtotal' => 5084.74,
+                        'base_subtotal' => 5084.74,
+                        'subtotal_incl_tax' => 5999.99,
+                        'base_subtotal_incl_tax' => 5999.99,
+                        'tax_amount' => 915.25,
+                        'base_tax_amount' => 915.25,
+                        'shipping_amount' => 0,
+                        'base_shipping_amount' => 0,
+                        'shipping_incl_tax' => 0,
+                        'base_shipping_incl_tax' => 0,
+                        'shipping_tax_amount' => 0,
+                        'base_shipping_tax_amount' => 0,
+                        'discount_amount' => -5999.99,
+                        'base_discount_amount' => -5999.99,
+                        'discount_tax_compensation_amount' => 0,
+                        'base_discount_tax_compensation_amount' => 0,
+                        'shipping_discount_tax_compensation_amount' => 0,
+                        'base_shipping_discount_tax_compensation_amount' => 0,
+                        'grand_total' => 0,
+                        'base_grand_total' => 0,
+                        'applied_taxes' => [
+                                SetupUtil::TAX_RATE_TX => [
+                                        'percent' => 18,
+                                        'amount' => 915.25,
+                                        'base_amount' => 915.25,
+                                        'rates' => [
+                                                [
+                                                    'code' => SetupUtil::TAX_RATE_TX,
+                                                    'title' => SetupUtil::TAX_RATE_TX,
+                                                    'percent' => 18,
+                                                ],
+                                            ],
+                                    ]
+                            ],
+                    ],
+                'items_data' => [
+                        'simple1' => [
+                                'row_total' => 5084.74,
+                                'base_row_total' => 5084.74,
+                                'tax_percent' => 18,
+                                'price' => 2542.37,
+                                'base_price' => 2542.37,
+                                'price_incl_tax' => 3000,
+                                'base_price_incl_tax' => 3000,
+                                'row_total_incl_tax' => 5999.99,
+                                'base_row_total_incl_tax' => 5999.99,
+                                'tax_amount' => 915.25,
+                                'base_tax_amount' => 915.25,
+                                'discount_amount' => 5999.99,
+                                'base_discount_amount' => 5999.99,
+                                'discount_percent' => 100,
+                                'discount_tax_compensation_amount' => 0,
+                                'base_discount_tax_compensation_amount' => 0,
+                            ],
+                    ],
+        ]
+];
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/excluding_tax_apply_origin_price_with_custom_price.php b/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/excluding_tax_apply_origin_price_with_custom_price.php
new file mode 100644
index 0000000000000..081b8e0a24620
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/excluding_tax_apply_origin_price_with_custom_price.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Tax\Model\Config;
+use Magento\Tax\Model\Sales\Total\Quote\SetupUtil;
+
+$taxCalculationData['excluding_tax_apply_origin_price_with_custom_price'] = [
+    'config_data' => [
+        SetupUtil::CONFIG_OVERRIDES => [
+            Config::CONFIG_XML_PATH_APPLY_ON => 1,
+        ],
+        SetupUtil::TAX_RATE_OVERRIDES => [
+            SetupUtil::TAX_RATE_TX => 8.25,
+            SetupUtil::TAX_STORE_RATE => 8.25,
+        ],
+        SetupUtil::TAX_RULE_OVERRIDES => [
+        ],
+    ],
+    'quote_data' => [
+        'billing_address' => [
+            'region_id' => SetupUtil::REGION_TX,
+        ],
+        'shipping_address' => [
+            'region_id' => SetupUtil::REGION_TX,
+        ],
+        'items' => [
+            [
+                'sku' => 'simple1',
+                'price' => 16.24,
+                'qty' => 1,
+            ],
+        ],
+        'update_items' => [
+            'simple1' => [
+                'custom_price' => 14,
+                'qty' => 1,
+            ],
+        ],
+    ],
+    'expected_results' => [
+        'address_data' => [
+            'subtotal' => 14,
+            'base_subtotal' => 14,
+            'subtotal_incl_tax' => 15.34,
+            'base_subtotal_incl_tax' => 15.34,
+            'tax_amount' => 1.34,
+            'base_tax_amount' => 1.34,
+            'shipping_amount' => 0,
+            'base_shipping_amount' => 0,
+            'shipping_incl_tax' => 0,
+            'base_shipping_incl_tax' => 0,
+            'shipping_taxable' => 0,
+            'base_shipping_taxable' => 0,
+            'shipping_tax_amount' => 0,
+            'base_shipping_tax_amount' => 0,
+            'discount_amount' => 0,
+            'base_discount_amount' => 0,
+            'discount_tax_compensation_amount' => 0,
+            'base_discount_tax_compensation_amount' => 0,
+            'shipping_discount_tax_compensation_amount' => 0,
+            'base_shipping_discount_tax_compensation_amount' => 0,
+            'grand_total' => 15.34,
+            'base_grand_total' => 15.34,
+        ],
+        'items_data' => [
+            'simple1' => [
+                'row_total' => 14,
+                'base_row_total' => 14,
+                'tax_percent' => 8.25,
+                'price' => 14,
+                'custom_price' => 14,
+                'original_custom_price' => 14,
+                'base_price' => 14,
+                'price_incl_tax' => 15.34,
+                'base_price_incl_tax' => 15.34,
+                'row_total_incl_tax' => 15.34,
+                'base_row_total_incl_tax' => 15.34,
+                'tax_amount' => 1.34,
+                'base_tax_amount' => 1.34,
+                'discount_amount' => 0,
+                'base_discount_amount' => 0,
+                'discount_percent' => 0,
+                'discount_tax_compensation_amount' => 0,
+                'base_discount_tax_compensation_amount' => 0,
+            ],
+        ],
+    ],
+];
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_with_custom_price.php b/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_with_custom_price.php
new file mode 100644
index 0000000000000..290c133f455f6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_with_custom_price.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Tax\Model\Config;
+use Magento\Tax\Model\Sales\Total\Quote\SetupUtil;
+
+$taxCalculationData['including_tax_with_custom_price'] = [
+    'config_data' => [
+        SetupUtil::CONFIG_OVERRIDES => [
+            Config::CONFIG_XML_PATH_PRICE_INCLUDES_TAX => 1,
+            Config::CONFIG_XML_PATH_APPLY_ON => 0,
+        ],
+        SetupUtil::TAX_RATE_OVERRIDES => [
+            SetupUtil::TAX_RATE_TX => 8.25,
+            SetupUtil::TAX_STORE_RATE => 8.25,
+        ],
+        SetupUtil::TAX_RULE_OVERRIDES => [
+        ],
+    ],
+    'quote_data' => [
+        'billing_address' => [
+            'region_id' => SetupUtil::REGION_TX,
+        ],
+        'shipping_address' => [
+            'region_id' => SetupUtil::REGION_TX,
+        ],
+        'items' => [
+            [
+                'sku' => 'simple1',
+                'price' => 16.24,
+                'qty' => 1,
+            ],
+        ],
+        'update_items' => [
+            'simple1' => [
+                'custom_price' => 14,
+                'qty' => 1,
+            ],
+        ],
+    ],
+    'expected_results' => [
+        'address_data' => [
+            'subtotal' => 12.93,
+            'base_subtotal' => 12.93,
+            'subtotal_incl_tax' => 14,
+            'base_subtotal_incl_tax' => 14,
+            'tax_amount' => 1.07,
+            'base_tax_amount' => 1.07,
+            'shipping_amount' => 0,
+            'base_shipping_amount' => 0,
+            'shipping_incl_tax' => 0,
+            'base_shipping_incl_tax' => 0,
+            'shipping_taxable' => 0,
+            'base_shipping_taxable' => 0,
+            'shipping_tax_amount' => 0,
+            'base_shipping_tax_amount' => 0,
+            'discount_amount' => 0,
+            'base_discount_amount' => 0,
+            'discount_tax_compensation_amount' => 0,
+            'base_discount_tax_compensation_amount' => 0,
+            'shipping_discount_tax_compensation_amount' => 0,
+            'base_shipping_discount_tax_compensation_amount' => 0,
+            'grand_total' => 14,
+            'base_grand_total' => 14,
+        ],
+        'items_data' => [
+            'simple1' => [
+                'row_total' => 12.93,
+                'base_row_total' => 12.93,
+                'tax_percent' => 8.25,
+                'price' => 12.93,
+                'custom_price' => 12.93,
+                'original_custom_price' => 14,
+                'base_price' => 12.93,
+                'price_incl_tax' => 14,
+                'base_price_incl_tax' => 14,
+                'row_total_incl_tax' => 14,
+                'base_row_total_incl_tax' => 14,
+                'tax_amount' => 1.07,
+                'base_tax_amount' => 1.07,
+                'discount_amount' => 0,
+                'base_discount_amount' => 0,
+                'discount_percent' => 0,
+                'discount_tax_compensation_amount' => 0,
+                'base_discount_tax_compensation_amount' => 0,
+            ],
+        ],
+    ],
+];
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php
index f22b48a259685..d3716ae260e0f 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php
@@ -3,14 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 /**
- * Global array that holds test scenarios data
+ * Global array that holds test scenarios data.
  *
  * @var array
  */
 $taxCalculationData = [];
-
+//phpcs:disable Magento2.Security.IncludeFile
 require_once __DIR__ . '/scenarios/excluding_tax_apply_tax_after_discount.php';
 require_once __DIR__ . '/scenarios/excluding_tax_apply_tax_after_discount_discount_tax.php';
 require_once __DIR__ . '/scenarios/excluding_tax_apply_tax_before_discount.php';
@@ -31,3 +32,5 @@
 require_once __DIR__ . '/scenarios/multi_tax_rule_two_row_calculate_subtotal_yes_row.php';
 require_once __DIR__ . '/scenarios/multi_tax_rule_two_row_calculate_subtotal_yes_total.php';
 require_once __DIR__ . '/scenarios/including_tax_apply_tax_after_discount.php';
+require_once __DIR__ . '/scenarios/including_tax_with_custom_price.php';
+require_once __DIR__ . '/scenarios/excluding_tax_apply_origin_price_with_custom_price.php';
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/StaticFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/StaticFilesTest.php
index 46036faa99fca..ce3be1fe99c86 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/StaticFilesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/StaticFilesTest.php
@@ -51,7 +51,7 @@ protected function setUp()
     /**
      * Scan references to files from other static files and assert they are correct
      *
-     * The CSS or LESS files may refer to other resources using @import or url() notation
+     * The CSS or LESS files may refer to other resources using `import` or url() notation
      * We want to check integrity of all these references
      * Note that the references may have syntax specific to the Magento preprocessing subsystem
      *
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php b/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php
index 1ea2b28986d8a..1ceb15a63508c 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php
@@ -8,6 +8,7 @@
 
 use Magento\Framework\Data\Form\FormKey;
 use Magento\TestFramework\TestCase\AbstractBackendController;
+use Magento\Framework\App\Request\Http;
 
 /**
  * Class SaveTest @covers \Magento\Theme\Controller\Adminhtml\Design\Config\Save
@@ -24,6 +25,11 @@ class SaveTest extends AbstractBackendController
      */
     protected $uri = 'backend/theme/design_config/save';
 
+    /**
+     * @var string
+     */
+    protected $httpMethod = Http::METHOD_POST;
+
     /**
      * Test design configuration save valid values.
      *
diff --git a/dev/tests/integration/testsuite/Magento/Translation/Model/Js/PreProcessorTest.php b/dev/tests/integration/testsuite/Magento/Translation/Model/Js/PreProcessorTest.php
new file mode 100644
index 0000000000000..cb37dd5e0a319
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Translation/Model/Js/PreProcessorTest.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Translation\Model\Js;
+
+use Magento\Framework\App\AreaList;
+use Magento\Framework\Phrase;
+use Magento\Framework\Phrase\RendererInterface;
+use Magento\Framework\Translate;
+use Magento\Framework\View\FileSystem;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Helper\CacheCleaner;
+
+/**
+ * Class for testing translation.
+ */
+class PreProcessorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var PreProcessor
+     */
+    private $model;
+
+    /**
+     * @var RendererInterface
+     */
+    private $origRenderer;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $viewFileSystem = $this->createPartialMock(FileSystem::class, ['getLocaleFileName']);
+        $viewFileSystem->expects($this->any())
+            ->method('getLocaleFileName')
+            ->willReturn(
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                dirname(__DIR__) . '/_files/Magento/Store/i18n/en_AU.csv'
+            );
+
+        $objectManager = Bootstrap::getObjectManager();
+        $objectManager->addSharedInstance($viewFileSystem, FileSystem::class);
+        $translator = $objectManager->create(Translate::class);
+        $objectManager->addSharedInstance($translator, Translate::class);
+        $areaList = $this->getMockBuilder(AreaList::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->origRenderer = Phrase::getRenderer();
+        Phrase::setRenderer(
+            $objectManager->get(RendererInterface::class)
+        );
+
+        $this->model = $objectManager->create(
+            PreProcessor::class,
+            [
+                'translate' => $translator,
+                'areaList' => $areaList,
+            ]
+        );
+
+        $translator->setLocale('en_AU');
+        $translator->loadData();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        Phrase::setRenderer($this->origRenderer);
+    }
+
+    /**
+     * Test for backend translation strategy.
+     *
+     * @param string $content
+     * @param string $translation
+     * @return void
+     * @dataProvider contentForTranslateDataProvider
+     */
+    public function testProcess(string $content, string $translation)
+    {
+        CacheCleaner::cleanAll();
+        $this->assertEquals($translation, $this->model->translate($content));
+    }
+
+    /**
+     * Data provider for translation.
+     *
+     * @return array
+     */
+    public function contentForTranslateDataProvider(): array
+    {
+        return [
+            'i18n_js_file_error' => [
+                'setTranslateProp = function (el, original) {
+                    var location = $(el).prop(\'tagName\').toLowerCase(),
+                    translated = $.mage.__(original),
+                    translationData = {
+                        shown: translated,
+                        translated: translated,
+                        original: original
+                    },
+                    translateAttr = composeTranslateAttr(translationData, location);
+                    $(el).attr(\'data-translate\', translateAttr);
+                    setText(el, translationData.shown);
+                },',
+                'setTranslateProp = function (el, original) {
+                    var location = $(el).prop(\'tagName\').toLowerCase(),
+                    translated = $.mage.__(original),
+                    translationData = {
+                        shown: translated,
+                        translated: translated,
+                        original: original
+                    },
+                    translateAttr = composeTranslateAttr(translationData, location);
+                    $(el).attr(\'data-translate\', translateAttr);
+                    setText(el, translationData.shown);
+                },',
+            ],
+            'checkTranslationWithWhiteSpaces' => [
+                <<<i18n
+                title: $.mage.__(
+                    'Original value for Magento_Store module'
+                ),
+                title: \$t(
+                    'Original value for Magento_Store module'
+                );
+                title: jQuery.mage.__(
+                    'Original value for Magento_Store module'
+                );
+i18n
+                ,
+                <<<i18n
+                title: 'Translated value for Magento_Store module in en_AU',
+                title: 'Translated value for Magento_Store module in en_AU';
+                title: 'Translated value for Magento_Store module in en_AU';
+i18n
+                ,
+            ],
+            'checkTranslationWithReplace' => [
+                <<<i18n
+                $.mage.__('The maximum you may purchase is %1.').replace('%1', params.maxAllowed);
+                \$t('The maximum you may purchase is %1.').replace('%1', params.maxAllowed);
+i18n
+                ,
+                <<<i18n
+                'The maximum you may purchase is %1.'.replace('%1', params.maxAllowed);
+                'The maximum you may purchase is %1.'.replace('%1', params.maxAllowed);
+i18n
+                ,
+            ],
+            'checkAvoidingMatchingWithJsInString' => [
+                <<<i18n
+                \$t('Payment ' + this.getTitle() + ' can\'t be initialized')
+                \$t(
+                    'Set unique country-state combinations within the same fixed product tax. ' +
+                    'Verify the combinations and try again.'
+                )
+i18n
+                ,
+                <<<i18n
+                \$t('Payment ' + this.getTitle() + ' can\'t be initialized')
+                \$t(
+                    'Set unique country-state combinations within the same fixed product tax. ' +
+                    'Verify the combinations and try again.'
+                )
+i18n
+                ,
+            ],
+            'checkAvoidMatchingPhtml' => [
+                <<<i18n
+                globalMessageList.addErrorMessage({
+                    message: \$t(<?= /* @noEscape */ json_encode(\$params['error_msg'])?>)
+                });
+i18n
+                ,
+                <<<i18n
+                globalMessageList.addErrorMessage({
+                    message: \$t(<?= /* @noEscape */ json_encode(\$params['error_msg'])?>)
+                });
+i18n
+                ,
+            ]
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Ui/Controller/Adminhtml/Index/Renderer/HandleTest.php b/dev/tests/integration/testsuite/Magento/Ui/Controller/Adminhtml/Index/Renderer/HandleTest.php
new file mode 100644
index 0000000000000..3f941dc3664c5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Ui/Controller/Adminhtml/Index/Renderer/HandleTest.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Ui\Controller\Adminhtml\Index\Renderer;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\AuthorizationInterface;
+
+/**
+ * Test for \Magento\Ui\Controller\Adminhtml\Index\Render\Handle.
+ *
+ * @magentoAppArea adminhtml
+ */
+class HandleTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testExecuteWhenUserDoesNotHavePermission()
+    {
+        Bootstrap::getObjectManager()->configure([
+            'preferences' => [
+                AuthorizationInterface::class => \Magento\Ui\Model\AuthorizationMock::class,
+            ],
+        ]);
+        $this->getRequest()->setParam('handle', 'customer_index_index');
+        $this->getRequest()->setParam('namespace', 'customer_listing');
+        $this->getRequest()->setParam('sorting%5Bfield%5D', 'entity_id');
+        $this->getRequest()->setParam('paging%5BpageSize%5D', 20);
+        $this->getRequest()->setParam('isAjax', 1);
+        $this->dispatch('backend/mui/index/render_handle');
+        $output = $this->getResponse()->getBody();
+        $this->assertEmpty($output, 'The acl restriction wasn\'t applied properly');
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testExecuteWhenUserHasPermission()
+    {
+        $this->getRequest()->setParam('handle', 'customer_index_index');
+        $this->getRequest()->setParam('namespace', 'customer_listing');
+        $this->getRequest()->setParam('sorting%5Bfield%5D', 'entity_id');
+        $this->getRequest()->setParam('paging%5BpageSize%5D', 20);
+        $this->getRequest()->setParam('isAjax', 1);
+        $this->dispatch('backend/mui/index/render_handle');
+        $output = $this->getResponse()->getBody();
+        $this->assertNotEmpty($output, 'The acl restriction wasn\'t applied properly');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Ui/Model/AuthorizationMock.php b/dev/tests/integration/testsuite/Magento/Ui/Model/AuthorizationMock.php
new file mode 100644
index 0000000000000..7f92edf96f424
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Ui/Model/AuthorizationMock.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Ui\Model;
+
+/**
+ * Check current user permission on resource and privilege.
+ */
+class AuthorizationMock extends \Magento\Framework\Authorization
+{
+    /**
+     * Check current user permission on resource and privilege
+     *
+     * @param   string $resource
+     * @param   string $privilege
+     * @return  boolean
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function isAllowed($resource, $privilege = null)
+    {
+        return $resource !== 'Magento_Customer::manage';
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php b/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
index edea65ee810ba..296eb60b9dac3 100644
--- a/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
+++ b/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
@@ -57,6 +57,7 @@ public function testGetShipConfirmUrlLive()
      * @magentoConfigFixture current_store carriers/ups/active 1
      * @magentoConfigFixture current_store carriers/ups/allowed_methods 1DA,GND
      * @magentoConfigFixture current_store carriers/ups/free_method GND
+     * @magentoConfigFixture current_store carriers/ups/type UPS
      */
     public function testCollectFreeRates()
     {
@@ -76,4 +77,29 @@ public function testCollectFreeRates()
         $this->assertEquals(0, $methods['GND']['price']);
         $this->assertNotEquals(0, $methods['1DA']['price']);
     }
+
+    /**
+     * Check default UPS carrier parameters.
+     *
+     * @return void
+     */
+    public function testValidDefaultParameters()
+    {
+        $protocolType = $this->carrier->getConfigData('type');
+        $this->assertEquals("UPS_XML", $protocolType, "Default type should be UPS_XML");
+
+        $gatewayUrl = $this->carrier->getConfigData('gateway_url');
+        $this->assertEquals(
+            "https://www.ups.com/using/services/rave/qcostcgi.cgi",
+            $gatewayUrl,
+            "Incorrect gateway url"
+        );
+
+        $gatewayXmlUrl = $this->carrier->getConfigData('gateway_xml_url');
+        $this->assertEquals(
+            "https://onlinetools.ups.com/ups.app/xml/Rate",
+            $gatewayXmlUrl,
+            "Incorrect gateway XML url"
+        );
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php
index c0ceb022dad45..e02550a20f6d9 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\UrlRewrite\Controller;
 
+/**
+ * Class to test Match corresponding URL Rewrite
+ */
 class UrlRewriteTest extends \Magento\TestFramework\TestCase\AbstractController
 {
     /**
@@ -26,14 +29,26 @@ public function testMatchUrlRewrite(
         $expectedCode = 301
     ) {
         $this->dispatch($request);
-        $code = $this->getResponse()->getHttpResponseCode();
-        $location = $this->getResponse()->getHeader('Location')->getFieldValue();
-
+        $response = $this->getResponse();
+        $code = $response->getHttpResponseCode();
         $this->assertEquals($expectedCode, $code, 'Invalid response code');
-        $this->assertStringEndsWith($redirect, $location, 'Invalid location header');
+
+        if ($expectedCode !== 200) {
+            $location = $response->getHeader('Location')->getFieldValue();
+            $this->assertStringEndsWith(
+                $redirect,
+                $location,
+                'Invalid location header'
+            );
+        }
     }
 
-    public function requestDataProvider()
+    /**
+     * Data provider for testMatchUrlRewrite
+     *
+     * @return array
+     */
+    public function requestDataProvider(): array
     {
         return [
             'Use Case #1: Rewrite: page-one/ --(301)--> page-a/; Request: page-one/ --(301)--> page-a/' => [
@@ -59,7 +74,12 @@ public function requestDataProvider()
             'Use Case #6: Rewrite: page-similar/ --(301)--> page-b; Request: page-similar/ --(301)--> page-b' => [
                 '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 d23389718e2c2..c3c8a6536fee9 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrlTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrlTest.php
@@ -90,7 +90,8 @@ public function testSwitchToExistingPage()
         $storeRepository = $this->objectManager->create(\Magento\Store\Api\StoreRepositoryInterface::class);
         $toStore = $storeRepository->get($toStoreCode);
 
-        $redirectUrl = $expectedUrl = "http://localhost/page-c";
+        $redirectUrl = "http://localhost/index.php/page-c/";
+        $expectedUrl = "http://localhost/index.php/page-c-on-2nd-store";
 
         $this->assertEquals($expectedUrl, $this->storeSwitcher->switch($fromStore, $toStore, $redirectUrl));
     }
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/UrlFinderInterfaceTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/UrlFinderInterfaceTest.php
new file mode 100644
index 0000000000000..b6055f14e79d2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/UrlFinderInterfaceTest.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\UrlRewrite\Model;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+
+/**
+ * @magentoDataFixture Magento/UrlRewrite/_files/url_rewrites.php
+ */
+class UrlFinderInterfaceTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var UrlFinderInterface
+     */
+    private $urlFinder;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->urlFinder = Bootstrap::getObjectManager()->create(UrlFinderInterface::class);
+    }
+
+    /**
+     * @dataProvider findOneDataProvider
+     * @param string $requestPath
+     * @param string $targetPath
+     * @param int $redirectType
+     */
+    public function testFindOneByData(string $requestPath, string $targetPath, int $redirectType)
+    {
+        $data = [
+            UrlRewrite::REQUEST_PATH => $requestPath,
+        ];
+        $urlRewrite = $this->urlFinder->findOneByData($data);
+        $this->assertEquals($targetPath, $urlRewrite->getTargetPath());
+        $this->assertEquals($redirectType, $urlRewrite->getRedirectType());
+    }
+
+    /**
+     * @return array
+     */
+    public function findOneDataProvider(): array
+    {
+        return [
+            ['string', 'test_page1', 0],
+            ['string/', 'string', 301],
+            ['string_permanent', 'test_page1', 301],
+            ['string_permanent/', 'test_page1', 301],
+            ['string_temporary', 'test_page1', 302],
+            ['string_temporary/', 'test_page1', 302],
+            ['строка', 'test_page1', 0],
+            ['строка/', 'строка', 301],
+            [urlencode('строка'), 'test_page2', 0],
+            [urlencode('строка') . '/', urlencode('строка'), 301],
+            ['другая_строка', 'test_page1', 302],
+            ['другая_строка/', 'test_page1', 302],
+            [urlencode('другая_строка'), 'test_page1', 302],
+            [urlencode('другая_строка') . '/', 'test_page1', 302],
+            ['السلسلة', 'test_page1', 0],
+            [urlencode('السلسلة'), 'test_page1', 0],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_rollback.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_rollback.php
index 6938cf9512de7..c37a4100bb214 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_rollback.php
@@ -20,7 +20,6 @@
 $collection = $urlRewriteCollection
     ->addFieldToFilter('entity_type', 'custom')
     ->addFieldToFilter('request_path', ['page-a', 'page-b', 'page-c'])
-    ->addFieldToFilter('entity_id', '333')
     ->load()
     ->walk('delete');
 
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites.php
new file mode 100644
index 0000000000000..9edc6507308ee
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$rewritesData = [
+    [
+        'string', 'test_page1', 0
+    ],
+    [
+        'string_permanent', 'test_page1', \Magento\UrlRewrite\Model\OptionProvider::PERMANENT
+    ],
+    [
+        'string_temporary', 'test_page1', \Magento\UrlRewrite\Model\OptionProvider::TEMPORARY
+    ],
+    [
+        'строка', 'test_page1', 0
+    ],
+    [
+        urlencode('строка'), 'test_page2', 0
+    ],
+    [
+        'другая_строка', 'test_page1', \Magento\UrlRewrite\Model\OptionProvider::TEMPORARY
+    ],
+    [
+        'السلسلة', 'test_page1', 0
+    ],
+];
+
+$rewriteResource = $objectManager->create(\Magento\UrlRewrite\Model\ResourceModel\UrlRewrite::class);
+foreach ($rewritesData as $rewriteData) {
+    list ($requestPath, $targetPath, $redirectType) = $rewriteData;
+    $rewrite = $objectManager->create(\Magento\UrlRewrite\Model\UrlRewrite::class);
+    $rewrite->setEntityType('custom')
+        ->setRequestPath($requestPath)
+        ->setTargetPath($targetPath)
+        ->setRedirectType($redirectType);
+    $rewriteResource->save($rewrite);
+}
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites_rollback.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites_rollback.php
new file mode 100644
index 0000000000000..a98f947d614e0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrites_rollback.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$urlRewriteCollection = $objectManager->create(\Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection::class);
+$collection = $urlRewriteCollection
+    ->addFieldToFilter('target_path', ['test_page1', 'test_page2'])
+    ->load()
+    ->walk('delete');
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php
index cfed67b9ddbdb..e62b45862025f 100644
--- a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php
+++ b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\User\Controller\Adminhtml;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\TestFramework\Bootstrap;
 
 /**
@@ -34,6 +35,7 @@ public function testIndexAction()
      */
     public function testSaveActionNoData()
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/admin/user/save');
         $this->assertRedirect($this->stringContains('backend/admin/user/index/'));
     }
@@ -54,6 +56,7 @@ public function testSaveActionWrongId()
         $userId = $user->getId();
         $this->assertNotEmpty($userId, 'Broken fixture');
         $user->delete();
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue('user_id', $userId);
         $this->dispatch('backend/admin/user/save');
         $this->assertSessionMessages(
@@ -71,6 +74,7 @@ public function testSaveActionWrongId()
     public function testSaveActionMissingCurrentAdminPassword()
     {
         $fixture = uniqid();
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(
             [
                 'username' => $fixture,
@@ -94,6 +98,7 @@ public function testSaveActionMissingCurrentAdminPassword()
     public function testSaveAction()
     {
         $fixture = uniqid();
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(
             [
                 'username' => $fixture,
@@ -121,6 +126,7 @@ public function testSaveAction()
      */
     public function testSaveActionDuplicateUser()
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(
             [
                 'username' => 'adminUser',
@@ -149,6 +155,7 @@ public function testSaveActionDuplicateUser()
      */
     public function testSaveActionPasswordChange($postData, $isPasswordCorrect)
     {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/admin/user/save');
 
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
deleted file mode 100644
index b317c9359c4bf..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-// @codingStandardsIgnoreFile
-
-namespace Magento\Widget\Model\Config;
-
-use Magento\TestFramework\Helper\Bootstrap;
-
-class ReaderTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Widget\Model\Config\Reader
-     */
-    private $model;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $fileResolver;
-
-    public function setUp()
-    {
-        $this->fileResolver = $this->getMockForAbstractClass(\Magento\Framework\Config\FileResolverInterface::class);
-        $objectManager = Bootstrap::getObjectManager();
-        $this->model = $objectManager->create(
-            \Magento\Widget\Model\Config\Reader::class, ['fileResolver' => $this->fileResolver]
-        );
-    }
-
-    public function testRead()
-    {
-        $this->fileResolver->expects($this->once())
-            ->method('get')
-            ->willReturn([file_get_contents(__DIR__ . '/_files/orders_and_returns.xml')]);
-        $expected = include __DIR__ . '/_files/expectedGlobalArray.php';
-        $this->assertEquals($expected, $this->model->read('global'));
-    }
-
-    public function testReadFile()
-    {
-        $file = file_get_contents(__DIR__ . '/_files/orders_and_returns.xml');
-        $expected = include __DIR__ . '/_files/expectedGlobalArray.php';
-        $this->assertEquals($expected, $this->model->readFile($file));
-    }
-
-    public function testMergeCompleteAndPartial()
-    {
-        $fileList = [
-            file_get_contents(__DIR__ . '/_files/catalog_new_products_list.xml'),
-            file_get_contents(__DIR__ . '/_files/orders_and_returns_customized.xml'),
-        ];
-        $this->fileResolver->expects($this->once())
-            ->method('get')
-            ->with('widget.xml', 'global')
-            ->willReturn($fileList);
-        $expected = include __DIR__ . '/_files/expectedMergedArray.php';
-        $this->assertEquals($expected, $this->model->read('global'));
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json b/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json
index 654be88a3b58c..c49d52b3dc4c1 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json
+++ b/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/admin-Magento_Catalog",
     "description": "N/A",
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "magento/framework": "0.1.0-alpha103"
     },
     "type": "magento2-theme",
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/ShareTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/ShareTest.php
new file mode 100644
index 0000000000000..47705262caaf3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/ShareTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Controller;
+
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\Area;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Request;
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * @magentoAppIsolation enabled
+ */
+class ShareTest extends AbstractController
+{
+    /**
+     * Test share wishlist with correct data
+     *
+     * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
+     */
+    public function testSuccessfullyShareWishlist()
+    {
+        $this->login(1);
+        $this->prepareRequestData();
+        $this->dispatch('wishlist/index/send/');
+
+        $this->assertSessionMessages(
+            $this->equalTo(['Your wish list has been shared.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+    }
+
+    /**
+     * Test share wishlist with incorrect data
+     *
+     * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
+     */
+    public function testShareWishlistWithoutEmails()
+    {
+        $this->login(1);
+        $this->prepareRequestData(true);
+        $this->dispatch('wishlist/index/send/');
+
+        $this->assertSessionMessages(
+            $this->equalTo(['Please enter an email address.']),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
+    /**
+     * Login the user
+     *
+     * @param string $customerId Customer to mark as logged in for the session
+     * @return void
+     */
+    protected function login($customerId)
+    {
+        /** @var Session $session */
+        $session = $this->_objectManager->get(Session::class);
+        $session->loginById($customerId);
+    }
+
+    /**
+     * Prepares the request with data
+     *
+     * @param bool $invalidData
+     * @return void
+     */
+    private function prepareRequestData($invalidData = false)
+    {
+        Bootstrap::getInstance()->loadArea(Area::AREA_FRONTEND);
+        $emails = !$invalidData ? 'email-1@example.com,email-2@example.com' : '';
+
+        /** @var FormKey $formKey */
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $post = [
+            'emails' => $emails,
+            'message' => '',
+            'form_key' => $formKey->getFormKey(),
+        ];
+
+        $this->getRequest()->setMethod(Request::METHOD_POST);
+        $this->getRequest()->setPostValue($post);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php
new file mode 100644
index 0000000000000..d12dc4a61f8f1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/../../../Magento/Customer/_files/two_customers.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$customerRepository = $objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+$firstCustomer = $customerRepository->get('customer@example.com');
+
+$wishlistForFirstCustomer = $objectManager->create(\Magento\Wishlist\Model\Wishlist::class);
+$wishlistForFirstCustomer->loadByCustomerId($firstCustomer->getId(), true);
+$item = $wishlistForFirstCustomer->addNewItem($product, new \Magento\Framework\DataObject([]));
+$wishlistForFirstCustomer->save();
+
+$secondCustomer = $customerRepository->get('customer_two@example.com');
+$wishlistForSecondCustomer = $objectManager->create(\Magento\Wishlist\Model\Wishlist::class);
+$wishlistForSecondCustomer->loadByCustomerId($secondCustomer->getId(), true);
+$item = $wishlistForSecondCustomer->addNewItem($product, new \Magento\Framework\DataObject([]));
+$wishlistForSecondCustomer->save();
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers_rollback.php
new file mode 100644
index 0000000000000..31cab3f9cbc74
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers_rollback.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Wishlist\Model\Wishlist $wishlist */
+$wishlist = $objectManager->create(\Magento\Wishlist\Model\Wishlist::class);
+
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
+try {
+    $firstCustomer = $customerRepository->get('customer@example.com');
+    $wishlist->loadByCustomerId($firstCustomer->getId());
+    $wishlist->delete();
+    $secondCustomer = $customerRepository->get('customer_two@example.com');
+    $wishlist->loadByCustomerId($secondCustomer->getId());
+    $wishlist->delete();
+} catch (NoSuchEntityException $e) {
+    /** Tests which are wrapped with MySQL transaction clear all data by transaction rollback. */
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/../../../Magento/Customer/_files/two_customers_rollback.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/paypal/button.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/paypal/button.test.js
deleted file mode 100644
index a4767fb551ee3..0000000000000
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/paypal/button.test.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/* eslint-disable max-nested-callbacks */
-define([
-    'squire',
-    'jquery'
-], function (Squire) {
-    'use strict';
-
-    describe('Magento_Braintree/js/paypal/button', function () {
-        var injector,
-            mocks,
-            braintree,
-            component,
-            registry,
-            btnId = 'braintree_paypal_btn',
-            tplElement = jQuery('<button id="' + btnId + '"></button>')[0];
-
-        require.config({
-            map: {
-                '*': {
-                    'braintree': 'braintree'
-                }
-            }
-        });
-
-        injector = new Squire();
-        mocks = {
-            'braintree': {
-                paypal: {
-                    /** Stub */
-                    initAuthFlow: function () {}
-                },
-
-                /** Stub */
-                setup: function () {}
-            }
-        };
-
-        beforeEach(function (done) {
-            injector.mock(mocks);
-
-            injector.require([
-                'braintree',
-                'uiRegistry',
-                'Magento_Braintree/js/paypal/button'
-            ], function (adapter, reg, Constr) {
-                braintree = adapter;
-                registry = reg;
-                jQuery(document.body).append(tplElement);
-
-                spyOn(braintree, 'setup').and.callFake(function () {
-                    registry.set('braintreePaypal.currentIntegration', braintree);
-                    jQuery('#' + btnId).removeAttr('disabled');
-                });
-
-                component = new Constr({
-                    id: btnId
-                });
-                done();
-            });
-        });
-
-        afterAll(function (done) {
-            tplElement.remove();
-            registry.remove(component.integrationName);
-            done();
-        });
-
-        it('The PayPal::initAuthFlow throws an exception.', function () {
-            var $selector = jQuery('#' + component.id);
-
-            spyOn(braintree.paypal, 'initAuthFlow').and.callFake(function () {
-                throw new TypeError('Cannot read property of undefined');
-            });
-
-            $selector.trigger('click');
-
-            expect($selector.prop('disabled')).toEqual(true);
-        });
-    });
-});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js
deleted file mode 100644
index df6996afeb965..0000000000000
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/* eslint-disable max-nested-callbacks */
-define([
-    'jquery',
-    'squire',
-    'ko',
-    'Magento_Ui/js/model/messages'
-], function ($, Squire, ko, Messages) {
-    'use strict';
-
-    describe('Magento_Braintree/js/view/payment/method-renderer/cc-form', function () {
-        var injector = new Squire(),
-            mocks = {
-                'Magento_Checkout/js/model/quote': {
-                    billingAddress: ko.observable(),
-                    shippingAddress: ko.observable(),
-                    paymentMethod: ko.observable(),
-                    totals: ko.observable({}),
-
-                    /** Stub */
-                    isVirtual: function () {
-                        return false;
-                    }
-                },
-                'Magento_Braintree/js/view/payment/validator-handler': jasmine.createSpyObj(
-                    'validator-handler',
-                    ['initialize']
-                ),
-                'Magento_Braintree/js/view/payment/adapter':  jasmine.createSpyObj(
-                    'adapter',
-                    ['setup', 'setConfig', 'showError']
-                )
-            },
-            braintreeCcForm;
-
-        beforeAll(function (done) {
-            window.checkoutConfig = {
-                quoteData: {},
-                payment: {
-                    braintree: {
-                        hasFraudProtection: true
-                    }
-                }
-            };
-            injector.mock(mocks);
-            injector.require(['Magento_Braintree/js/view/payment/method-renderer/cc-form'], function (Constr) {
-                braintreeCcForm = new Constr({
-                    provider: 'provName',
-                    name: 'test',
-                    index: 'test',
-                    item: {
-                        title: 'Braintree'
-                    }
-                });
-
-                done();
-            });
-        });
-
-        it('Check if payment code and message container are restored after onActiveChange call.', function () {
-            var expectedMessageContainer = braintreeCcForm.messageContainer,
-                expectedCode = braintreeCcForm.code;
-
-            braintreeCcForm.code = 'braintree-vault';
-            braintreeCcForm.messageContainer = new Messages();
-
-            braintreeCcForm.onActiveChange(true);
-
-            expect(braintreeCcForm.getCode()).toEqual(expectedCode);
-            expect(braintreeCcForm.messageContainer).toEqual(expectedMessageContainer);
-        });
-
-        it('Check if form validation fails when "Place Order" button should be active.', function () {
-            var errorMessage = 'Something went wrong.',
-
-                /**
-                 * Anonymous wrapper
-                 */
-                func = function () {
-                    braintreeCcForm.clientConfig.onError({
-                        'message': errorMessage
-                    });
-                };
-
-            expect(func).toThrow(errorMessage);
-            expect(braintreeCcForm.isPlaceOrderActionAllowed()).toBeTruthy();
-        });
-    });
-});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js
deleted file mode 100644
index a2373cfb99091..0000000000000
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/* eslint-disable max-nested-callbacks */
-define([
-    'squire',
-    'ko'
-], function (Squire, ko) {
-    'use strict';
-
-    describe('Magento_Braintree/js/view/payment/method-renderer/paypal', function () {
-
-        var injector = new Squire(),
-            mocks = {
-                'Magento_Checkout/js/model/quote': {
-                    billingAddress: ko.observable(),
-                    shippingAddress: ko.observable({
-                        postcode: '',
-                        street: [],
-                        canUseForBilling: ko.observable()
-                    }),
-                    paymentMethod: ko.observable(),
-                    totals: ko.observable({
-                        'base_grand_total': 0
-                    }),
-
-                    /** Stub */
-                    isVirtual: function () {
-                        return false;
-                    }
-                },
-                'Magento_Braintree/js/view/payment/adapter': {
-                    config: {},
-
-                    /** Stub */
-                    onReady: function () {},
-
-                    /** Stub */
-                    setConfig: function (config) {
-                        this.config = config;
-                    },
-
-                    /** Stub */
-                    setup: function () {
-                        this.config.onReady(this.checkout);
-                    },
-
-                    checkout: {
-                        /** Stub */
-                        teardown: function () {},
-                        paypal: {
-                            /** Stub */
-                            initAuthFlow: function () {}
-                        }
-                    }
-                }
-            },
-            braintreeAdapter,
-            component,
-            additionalValidator;
-
-        beforeEach(function (done) {
-            window.checkoutConfig = {
-                quoteData: {},
-                payment: {
-                    'braintree_paypal': {
-                        title: 'Braintree PayPal'
-                    }
-                },
-                vault: {}
-            };
-
-            injector.mock(mocks);
-
-            injector.require([
-                'Magento_Braintree/js/view/payment/adapter',
-                'Magento_Checkout/js/model/payment/additional-validators',
-                'Magento_Braintree/js/view/payment/method-renderer/paypal'
-            ], function (adapter, validator, Constr) {
-                braintreeAdapter = adapter;
-                additionalValidator = validator;
-                component = new Constr();
-                done();
-            });
-        });
-
-        it('The PayPal::initAuthFlow throws an exception.', function () {
-
-            spyOn(additionalValidator, 'validate').and.returnValue(true);
-            spyOn(braintreeAdapter.checkout.paypal, 'initAuthFlow').and.callFake(function () {
-                throw new TypeError('Cannot read property of undefined');
-            });
-            spyOn(component.messageContainer, 'addErrorMessage');
-
-            component.payWithPayPal();
-            expect(component.messageContainer.addErrorMessage).toHaveBeenCalled();
-        });
-    });
-});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
index 12e12eb492c89..cc40386a7779d 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
@@ -24,6 +24,18 @@ define([
                 return true;
             }).and.callThrough(),
             mocks = {
+                'Magento_Checkout/js/model/checkout-data-resolver': {
+
+                    /** Stub */
+                    applyBillingAddress: function () {
+                        return true;
+                    },
+
+                    /** Stub */
+                    resolveBillingAddress: function () {
+                        return true;
+                    }
+                },
                 'Magento_Checkout/js/model/quote': {
                     billingAddress: ko.observable(),
                     shippingAddress: ko.observable(),
diff --git a/dev/tests/js/jasmine/tests/lib/mage/validation.test.js b/dev/tests/js/jasmine/tests/lib/mage/validation.test.js
index ccf3591be0dfe..2a3775ac538fc 100644
--- a/dev/tests/js/jasmine/tests/lib/mage/validation.test.js
+++ b/dev/tests/js/jasmine/tests/lib/mage/validation.test.js
@@ -1142,4 +1142,24 @@ define([
                 .call($.validator.prototype, '30', el1, null)).toEqual(false);
         });
     });
+
+    describe('Testing validate-forbidden-extensions', function () {
+        it('validate-forbidden-extensions', function () {
+            var el1 = $('<input type="text" value="" ' +
+                'class="validate-extensions" data-validation-params="php,phtml">').get(0);
+
+            expect($.validator.methods['validate-forbidden-extensions']
+                .call($.validator.prototype, 'php', el1, null)).toEqual(false);
+            expect($.validator.methods['validate-forbidden-extensions']
+                .call($.validator.prototype, 'php,phtml', el1, null)).toEqual(false);
+            expect($.validator.methods['validate-forbidden-extensions']
+                .call($.validator.prototype, 'html', el1, null)).toEqual(true);
+            expect($.validator.methods['validate-forbidden-extensions']
+                .call($.validator.prototype, 'html,png', el1, null)).toEqual(true);
+            expect($.validator.methods['validate-forbidden-extensions']
+                .call($.validator.prototype, 'php,html', el1, null)).toEqual(false);
+            expect($.validator.methods['validate-forbidden-extensions']
+                .call($.validator.prototype, 'html,php', el1, null)).toEqual(false);
+        });
+    });
 });
diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/RequestAwareBlockMethod.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/RequestAwareBlockMethod.php
new file mode 100644
index 0000000000000..9ce891da718b4
--- /dev/null
+++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/RequestAwareBlockMethod.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\CodeMessDetector\Rule\Design;
+
+use PHPMD\AbstractNode;
+use PHPMD\AbstractRule;
+use PHPMD\Node\ClassNode;
+use PHPMD\Node\MethodNode;
+use PDepend\Source\AST\ASTMethod;
+use PHPMD\Rule\MethodAware;
+
+/**
+ * Detect direct request usages.
+ */
+class RequestAwareBlockMethod extends AbstractRule implements MethodAware
+{
+    /**
+     * @inheritDoc
+     *
+     * @param ASTMethod|MethodNode $method
+     */
+    public function apply(AbstractNode $method)
+    {
+        $definedIn = $method->getParentType();
+        try {
+            $isBlock = ($definedIn instanceof ClassNode)
+                && is_subclass_of(
+                    $definedIn->getFullQualifiedName(),
+                    \Magento\Framework\View\Element\AbstractBlock::class
+                );
+        } catch (\Throwable $exception) {
+            //Failed to load classes.
+            return;
+        }
+
+        if ($isBlock) {
+            $nodes = $method->findChildrenOfType('PropertyPostfix') + $method->findChildrenOfType('MethodPostfix');
+            foreach ($nodes as $node) {
+                $name = mb_strtolower($node->getFirstChildOfType('Identifier')->getImage());
+                if ($name === '_request' || $name === 'getrequest') {
+                    $this->addViolation($method, [$method->getFullQualifiedName()]);
+                    break;
+                }
+            }
+        }
+    }
+}
diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml b/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
index 61d4f7b3be81d..b527b26784f98 100644
--- a/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
+++ b/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
@@ -29,6 +29,37 @@ final class Foo
 }
 class Baz {
     final public function bad() {}
+}
+            ]]>
+        </example>
+    </rule>
+    <rule name="RequestAwareBlockMethod"
+          class="Magento\CodeMessDetector\Rule\Design\RequestAwareBlockMethod"
+          message="{0} uses request object directly. Add user input validation and suppress this warning.">
+        <description>
+            <![CDATA[
+Blocks must not depend on being used with certain controllers.
+If you use request object in a block directly you must validate all user input inside the block.
+            ]]>
+        </description>
+        <priority>2</priority>
+        <properties />
+        <example>
+            <![CDATA[
+class MyOrder extends AbstractBlock
+{
+
+    .......
+
+    public function getOrder()
+    {
+        $orderId = $this->getRequest()->getParam('order_id');
+        //Validate customer having such order.
+        if (!$this->hasOrder($this->getCustomerId(), $orderId)) {
+            ...deny access...
+        }
+        .....
+    }
 }
             ]]>
         </example>
diff --git a/dev/tests/static/framework/Magento/ruleset.xml b/dev/tests/static/framework/Magento/ruleset.xml
index 56a5a9e55c30e..602207d85829e 100644
--- a/dev/tests/static/framework/Magento/ruleset.xml
+++ b/dev/tests/static/framework/Magento/ruleset.xml
@@ -15,6 +15,7 @@
             <property name="lineLimit" value="120"/>
             <property name="absoluteLineLimit" value="120"/>
         </properties>
+        <exclude-pattern>*.phtml</exclude-pattern>
     </rule>
     <rule ref="Magento.LiteralNamespaces.LiteralNamespaces">
         <exclude-pattern>*/_files/*</exclude-pattern>
@@ -25,5 +26,19 @@
 
     <rule ref="Squiz.Commenting.DocCommentAlignment"/>
     <rule ref="Squiz.Functions.GlobalFunction"/>
+    <rule ref="Squiz.Operators.ValidLogicalOperators"/>
     <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
+
+    <rule ref="PEAR.ControlStructures.ControlSignature">
+        <exclude-pattern>*.phtml</exclude-pattern>
+    </rule>
+    <rule ref="Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace">
+        <exclude-pattern>*.phtml</exclude-pattern>
+    </rule>
+    <rule ref="PEAR.WhiteSpace.ScopeClosingBrace">
+        <exclude-pattern>*.phtml</exclude-pattern>
+    </rule>
+    <rule ref="Squiz.WhiteSpace.ScopeClosingBrace">
+        <exclude-pattern>*.phtml</exclude-pattern>
+    </rule>
 </ruleset>
diff --git a/dev/tests/static/framework/tests/unit/phpunit.xml.dist b/dev/tests/static/framework/tests/unit/phpunit.xml.dist
index 546a437331e0a..918f758d2730e 100644
--- a/dev/tests/static/framework/tests/unit/phpunit.xml.dist
+++ b/dev/tests/static/framework/tests/unit/phpunit.xml.dist
@@ -19,4 +19,32 @@
     <php>
         <ini name="date.timezone" value="America/Los_Angeles"/>
     </php>
+    <listeners>
+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
+            <arguments>
+                <string>var/allure-results</string> <!-- XML files output directory -->
+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
+                <array> <!-- A list of custom annotations to ignore (optional) -->
+                    <element key="magentoAdminConfigFixture">
+                        <string>magentoAdminConfigFixture</string>
+                    </element>
+                    <element key="magentoAppIsolation">
+                        <string>magentoAppIsolation</string>
+                    </element>
+                    <element key="magentoComponentsDir">
+                        <string>magentoComponentsDir</string>
+                    </element>
+                    <element key="magentoConfigFixture">
+                        <string>magentoConfigFixture</string>
+                    </element>
+                    <element key="@magentoDbIsolation">
+                        <string>magentoDataFixture</string>
+                    </element>
+                    <element key="magentoDbIsolation">
+                        <string>magentoDbIsolation</string>
+                    </element>
+                </array>
+            </arguments>
+        </listener>
+    </listeners>
 </phpunit>
diff --git a/dev/tests/static/phpunit-all.xml.dist b/dev/tests/static/phpunit-all.xml.dist
index 131cfa6a5ff60..94c57af1968af 100644
--- a/dev/tests/static/phpunit-all.xml.dist
+++ b/dev/tests/static/phpunit-all.xml.dist
@@ -22,4 +22,12 @@
         <!-- TESTCODESTYLE_IS_FULL_SCAN - specify if full scan should be performed for test code style test -->
         <const name="TESTCODESTYLE_IS_FULL_SCAN" value="1"/>
     </php>
+    <listeners>
+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
+            <arguments>
+                <string>var/allure-results</string> <!-- XML files output directory -->
+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
+            </arguments>
+        </listener>
+    </listeners>
 </phpunit>
diff --git a/dev/tests/static/phpunit.xml.dist b/dev/tests/static/phpunit.xml.dist
index 1ae9342598e4b..4eec18f7bf8c5 100644
--- a/dev/tests/static/phpunit.xml.dist
+++ b/dev/tests/static/phpunit.xml.dist
@@ -34,4 +34,12 @@
         <!-- TESTS_COMPOSER_PATH - specify the path to composer binary, if a relative reference cannot be resolved -->
         <!--<const name="TESTS_COMPOSER_PATH" value="/usr/local/bin/composer"/>-->
     </php>
+    <listeners>
+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
+            <arguments>
+                <string>var/allure-results</string> <!-- XML files output directory -->
+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
+            </arguments>
+        </listener>
+    </listeners>
 </phpunit>
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
index 5c1e342e1bc81..4b31b80f1d7b3 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
@@ -191,7 +191,7 @@ private function assertClassesExist($classes, $path)
         foreach ($classes as $class) {
             $class = trim($class, '\\');
             try {
-                if (strrchr($class, '\\') === false and !Classes::isVirtual($class)) {
+                if (strrchr($class, '\\') === false && !Classes::isVirtual($class)) {
                     $badUsages[] = $class;
                     continue;
                 } else {
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
index 6fc84486c626b..2f1ab7a75bc83 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -452,7 +452,7 @@ private function convertModuleToPackageName($moduleName)
     {
         list($vendor, $name) = explode('_', $moduleName, 2);
         $package = 'module';
-        foreach (preg_split('/([A-Z][a-z\d]+)/', $name, -1, PREG_SPLIT_DELIM_CAPTURE) as $chunk) {
+        foreach (preg_split('/([A-Z\d][a-z]*)/', $name, -1, PREG_SPLIT_DELIM_CAPTURE) as $chunk) {
             $package .= $chunk ? "-{$chunk}" : '';
         }
         return strtolower("{$vendor}/{$package}");
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php
index fc53e4391007b..46bdd3dd666df 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/ControllerAclTest.php
@@ -97,7 +97,7 @@ public function testAcl()
                 $inheritanceMessage = "Backend controller $className have to inherit " . AbstractAction::class;
                 $errorMessages[] = $inheritanceMessage;
                 continue;
-            };
+            }
 
             $isAclRedefinedInTheChildClass = $this->isConstantOverwritten($controllerClass)
                 || $this->isMethodOverwritten($controllerClass);
@@ -233,7 +233,7 @@ private function isItTest($relativeFilePath)
     private function getControllerPath($relativeFilePath)
     {
         if (preg_match('~(Magento\/[^\/]+\/Controller\/Adminhtml\/.*)\.php~', $relativeFilePath, $matches)) {
-            if (count($matches) === 2 && count($partPath = $matches[1]) >= 1) {
+            if (count($matches) === 2) {
                 $partPath = $matches[1];
                 return $partPath;
             }
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
index 8a00037d2513b..2a6079d619d4c 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
@@ -112,7 +112,7 @@ public function testPhpFiles()
         $changedFiles = ChangedFiles::getPhpFiles(__DIR__ . '/../_files/changed_files*');
         $blacklistFiles = $this->getBlacklistFiles();
         foreach ($blacklistFiles as $blacklistFile) {
-            unset($changedFiles[BP . $blacklistFile]);
+            unset($changedFiles[$blacklistFile]);
         }
         $invoker(
             function ($file) {
@@ -920,7 +920,7 @@ private function processPattern($appPath, $pattern)
 
         $fileSet = glob($appPath . DIRECTORY_SEPARATOR . $pattern, GLOB_NOSORT);
         foreach ($fileSet as $file) {
-            $files[] = substr($file, $relativePathStart);
+            $files[] = ltrim(substr($file, $relativePathStart), '/');
         }
 
         return $files;
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index 4e296d74eefe4..412f91c3d0e19 100755
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -4,6 +4,8 @@
  *
  * Format: array(<class_name>[, <replacement>])
  *
+ * @codingStandardsIgnoreFile
+ *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -1818,7 +1820,7 @@
     ],
     ['Magento\Adminhtml\Block\Report\Shopcart\Product', 'Magento\Reports\Block\Adminhtml\Shopcart\Product'],
     ['Magento\Adminhtml\Block\Report\Wishlist\Grid', 'Magento\Reports\Block\Adminhtml\Wishlist\Grid'],
-    ['Magento\Adminhtml\Block\Report\Wishlist', 'Magento\Reports\Block\Adminhtml\Wishlist'],
+    ['Magento\Adminhtml\Block\Report\Wishlist'],
     ['Magento\Backend\Helper\Addresses'],
     ['Magento\Backend\Controller\Adminhtml\System\Variable', 'Magento\Variable\Controller\Adminhtml\System\Variable'],
     [
@@ -3226,6 +3228,8 @@
     ['Magento\Tax\Model\ResourceModel\Sales\Order\Tax\Item', 'Magento\Sales\Model\ResourceModel\Order\Tax\Item'],
     ['Magento\Tax\Model\Sales\Order\Tax\Item', 'Magento\Sales\Model\Order\Tax\Item'],
     ['Magento\Reports\Block\Adminhtml\Product\Grid'],
+    ['Magento\Reports\Block\Adminhtml\Product\Widget\Viewed\Item'],
+    ['Magento\Reports\Block\Adminhtml\Wishlist'],
     ['Magento\Reports\Model\Totals'],
     ['Magento\Log\Model\Shell'],
     ['Magento\Log\App\Shell'],
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php
index 38fb25dff760a..3e0df8e811f86 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/unsecure_php_functions.php
@@ -35,12 +35,29 @@
     ],
     'eval' => [
         'replacement' => '',
-        'exclude' => []
+        'exclude' => [
+            // allowing in this file so that an error isn't raised for its use of the JS eval function
+            [
+                'type' => 'module',
+                'name' => 'Magento_Config',
+                'path' => 'view/adminhtml/templates/system/config/js.phtml'
+            ],
+            [
+                'type' => 'module',
+                'name' => 'Magento_Catalog',
+                'path' => 'view/adminhtml/templates/catalog/wysiwyg/js.phtml'
+            ]
+        ]
     ],
     'md5' => [
         'replacement' => '',
         'exclude' => [
             ['type' => 'library', 'name' => 'magento/framework', 'path' => 'App/Utility/Files.php'],
+            [
+                'type' => 'module',
+                'name' => 'Magento_Catalog',
+                'path' => 'view/adminhtml/templates/catalog/product/edit/serializer.phtml'
+            ]
         ],
     ],
     'srand' => [
@@ -49,6 +66,14 @@
     ],
     'mt_srand' => [
         'replacement' => '',
-        'exclude' => []
+        'exclude' => [
+            ['type' => 'setup', 'path' => 'src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php'],
+        ]
+    ],
+    'htmlspecialchars' => [
+        'replacement' => '\Magento\Framework\Escaper::escapeHtml',
+        'exclude' => [
+            ['type' => 'library', 'name' => 'magento/framework', 'path' => 'Escaper.php'],
+        ]
     ],
 ];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml
index 4790ce24fd87f..520ea38840d89 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml
@@ -53,7 +53,7 @@
             <word>overriden</word>
         </item>
         <item>
-            <path>composer.lock</path>
+            <path>dev/composer.lock</path>
         </item>
         <item>
             <path>app/code/Magento/Customer/view/frontend/web/js/zxcvbn.js</path>
@@ -69,5 +69,8 @@
         <item>
             <path>dev/build/publication/sanity/ce.xml</path>
         </item>
+        <item>
+            <path>dev/composer.lock</path>
+        </item>
     </whitelist>
 </config>
diff --git a/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt b/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt
index 70764344de69b..7e29ef51964bc 100644
--- a/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Less/_files/blacklist/old.txt
@@ -4,6 +4,7 @@ app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/
 app/design/adminhtml/Magento/backend/Magento_Developer/web/css/source/_module-old.less
 app/design/adminhtml/Magento/backend/Magento_Enterprise/web/css/source/_module-old.less
 app/design/adminhtml/Magento/backend/Magento_Msrp/web/css/source/_module-old.less
+app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
 app/design/adminhtml/Magento/backend/Magento_Tax/web/css/source/_module-old.less
 app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/_module-old.less
 app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module-old.less
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
index 0ab8e0216c249..c3a66f0c33f0f 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -199,3 +199,5 @@ Magento/Framework/MessageQueue/Topology/Config/ExchangeConfigItem
 IntegrationConfig.php
 *Test.php
 setup/performance-toolkit/aggregate-report
+Magento/Customer/Model/FileUploaderDataResolver.php
+Magento/Customer/Model/Customer/DataProvider.php
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml
index 76f76e2b23c56..7fad5c3a3670b 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml
@@ -47,5 +47,5 @@
 
     <!-- Magento Specific Rules -->
     <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/FinalImplementation" />
-
+    <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/RequestAwareBlockMethod" />
 </ruleset>
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php
index 55104db48ba18..35066fc30bf82 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php
@@ -9,42 +9,29 @@
     'Magento_Backend',
     'Magento_Backup',
     'Magento_Bundle',
-    'Magento_Catalog',
     'Magento_CatalogInventory',
     'Magento_CatalogRule',
     'Magento_CatalogSearch',
-    'Magento_Checkout',
-    'Magento_CheckoutAgreements',
     'Magento_Config',
     'Magento_ConfigurableProduct',
     'Magento_CurrencySymbol',
     'Magento_Downloadable',
-    'Magento_GiftMessage',
     'Magento_GoogleAdwords',
     'Magento_GoogleAnalytics',
     'Magento_GroupedProduct',
-    'Magento_ImportExport',
     'Magento_Integration',
     'Magento_LayeredNavigation',
     'Magento_Marketplace',
     'Magento_MediaStorage',
     'Magento_Msrp',
-    'Magento_Multishipping',
     'Magento_PageCache',
     'Magento_Paypal',
-    'Magento_ProductVideo',
     'Magento_Reports',
-    'Magento_Sales',
     'Magento_Search',
-    'Magento_Shipping',
     'Magento_Store',
     'Magento_Swagger',
-    'Magento_Swatches',
-    'Magento_Tax',
-    'Magento_TaxImportExport',
     'Magento_Theme',
     'Magento_Translation',
     'Magento_Ui',
     'Magento_User',
-    'Magento_Weee',
 ];
diff --git a/dev/tests/unit/phpunit.xml.dist b/dev/tests/unit/phpunit.xml.dist
index b35b53a68b780..e73412eaa8f00 100644
--- a/dev/tests/unit/phpunit.xml.dist
+++ b/dev/tests/unit/phpunit.xml.dist
@@ -39,6 +39,32 @@
         </whitelist>
     </filter>
     <listeners>
+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
+            <arguments>
+                <string>var/allure-results</string> <!-- XML files output directory -->
+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
+                <array> <!-- A list of custom annotations to ignore (optional) -->
+                    <element key="codingStandardsIgnoreFile">
+                        <string>codingStandardsIgnoreFile</string>
+                    </element>
+                    <element key="codingStandardsIgnoreStart">
+                        <string>codingStandardsIgnoreStart</string>
+                    </element>
+                    <element key="codingStandardsIgnoreEnd">
+                        <string>codingStandardsIgnoreEnd</string>
+                    </element>
+                    <element key="cover">
+                        <string>cover</string>
+                    </element>
+                    <element key="expectedExceptionMessageRegExp">
+                        <string>expectedExceptionMessageRegExp</string>
+                    </element>
+                    <element key="security">
+                        <string>security</string>
+                    </element>
+                </array>
+            </arguments>
+        </listener>
         <listener class="Magento\Framework\TestFramework\Unit\Listener\ReplaceObjectManager"/>
     </listeners>
     <logging>
diff --git a/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php b/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php
index 538f4e646d060..2a8f0941be05a 100644
--- a/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php
+++ b/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php
@@ -45,6 +45,30 @@ public function toNestedArray(
         }
         $dataObjectArray = $this->dataObjectProcessor->buildOutputDataArray($dataObject, $dataObjectType);
         //process custom attributes if present
+        $dataObjectArray = $this->processCustomAttributes($dataObjectArray, $skipAttributes);
+
+        if (!empty($dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY])) {
+            /** @var array $extensionAttributes */
+            $extensionAttributes = $dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY];
+            unset($dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]);
+            foreach ($extensionAttributes as $attributeKey => $attributeValue) {
+                if (!in_array($attributeKey, $skipAttributes)) {
+                    $dataObjectArray[$attributeKey] = $attributeValue;
+                }
+            }
+        }
+        return $dataObjectArray;
+    }
+
+    /**
+     * Recursive process array to process customer attributes
+     *
+     * @param array $dataObjectArray
+     * @param array $skipAttributes
+     * @return array
+     */
+    private function processCustomAttributes(array $dataObjectArray, array $skipAttributes): array
+    {
         if (!empty($dataObjectArray[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY])) {
             /** @var AttributeValue[] $customAttributes */
             $customAttributes = $dataObjectArray[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY];
@@ -56,16 +80,13 @@ public function toNestedArray(
                 }
             }
         }
-        if (!empty($dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY])) {
-            /** @var array $extensionAttributes */
-            $extensionAttributes = $dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY];
-            unset($dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]);
-            foreach ($extensionAttributes as $attributeKey => $attributeValue) {
-                if (!in_array($attributeKey, $skipAttributes)) {
-                    $dataObjectArray[$attributeKey] = $attributeValue;
-                }
+
+        foreach ($dataObjectArray as $key => $value) {
+            if (is_array($value)) {
+                $dataObjectArray[$key] = $this->processCustomAttributes($value, $skipAttributes);
             }
         }
+
         return $dataObjectArray;
     }
 
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/ExtensibleDataObjectConverterTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/ExtensibleDataObjectConverterTest.php
index f0e333aa5e1d5..5563460f7ec04 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/ExtensibleDataObjectConverterTest.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/ExtensibleDataObjectConverterTest.php
@@ -83,6 +83,17 @@ public function testToNestedArrayCustom()
                     AttributeValue::VALUE => 'custom_attribute_value_skip',
                 ],
             ],
+            'test' => [
+                0 => [
+                    '3rd_attribute_key' => '3rd_attribute_value',
+                    AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY => [
+                        [
+                            AttributeValue::ATTRIBUTE_CODE => 'another_custom_attribute_code',
+                            AttributeValue::VALUE => 'another_custom_attribute_value',
+                        ],
+                    ],
+                ],
+            ],
         ];
 
         $resultArray = [
@@ -92,6 +103,12 @@ public function testToNestedArrayCustom()
                 'custom_attribute_value_multi_1',
                 'custom_attribute_value_multi_2',
             ],
+            'test' => [
+                0 => [
+                    '3rd_attribute_key' => '3rd_attribute_value',
+                    'another_custom_attribute_code' => 'another_custom_attribute_value',
+                ],
+            ],
         ];
 
         $this->processor->expects($this->any())
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig.php
index 615c295675adc..beb4f98ae76bd 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig.php
@@ -70,6 +70,11 @@ public function get($key = null, $defaultValue = null)
         if ($key === null) {
             return $this->flatData;
         }
+
+        if (array_key_exists($key, $this->flatData) && $this->flatData[$key] === null) {
+            return '';
+        }
+
         return $this->flatData[$key] ?? $defaultValue;
     }
 
diff --git a/lib/internal/Magento/Framework/App/DocRootLocator.php b/lib/internal/Magento/Framework/App/DocRootLocator.php
index 6fb35c42f1330..d73baf8e4e742 100644
--- a/lib/internal/Magento/Framework/App/DocRootLocator.php
+++ b/lib/internal/Magento/Framework/App/DocRootLocator.php
@@ -3,10 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\App;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\ReadFactory;
 
 /**
@@ -20,18 +22,26 @@ class DocRootLocator
     private $request;
 
     /**
+     * @deprecated
      * @var ReadFactory
      */
     private $readFactory;
 
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
     /**
      * @param RequestInterface $request
      * @param ReadFactory $readFactory
+     * @param Filesystem|null $filesystem
      */
-    public function __construct(RequestInterface $request, ReadFactory $readFactory)
+    public function __construct(RequestInterface $request, ReadFactory $readFactory, Filesystem $filesystem = null)
     {
         $this->request = $request;
         $this->readFactory = $readFactory;
+        $this->filesystem = $filesystem ?: ObjectManager::getInstance()->get(Filesystem::class);
     }
 
     /**
@@ -42,7 +52,8 @@ public function __construct(RequestInterface $request, ReadFactory $readFactory)
     public function isPub()
     {
         $rootBasePath = $this->request->getServer('DOCUMENT_ROOT');
-        $readDirectory = $this->readFactory->create(DirectoryList::ROOT);
-        return (substr($rootBasePath, -strlen('/pub')) === '/pub') && !$readDirectory->isExist($rootBasePath . 'setup');
+        $readDirectory = $this->filesystem->getDirectoryRead(DirectoryList::ROOT);
+
+        return (substr($rootBasePath, -\strlen('/pub')) === '/pub') && ! $readDirectory->isExist('setup');
     }
 }
diff --git a/lib/internal/Magento/Framework/App/Feed.php b/lib/internal/Magento/Framework/App/Feed.php
new file mode 100644
index 0000000000000..1154749a75b94
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Feed.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\App;
+
+use Zend\Feed\Writer\FeedFactory;
+
+/**
+ * Default XML feed class
+ */
+class Feed implements FeedInterface
+{
+    /**
+     * @var array
+     */
+    private $feeds;
+
+    /**
+     * Feed constructor.
+     * @param array $data
+     */
+    public function __construct(array $data)
+    {
+        $this->feeds = $data;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFormattedContent() : string
+    {
+        return FeedFactory::factory($this->feeds)->export(FeedFactoryInterface::FORMAT_RSS);
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/FeedFactory.php b/lib/internal/Magento/Framework/App/FeedFactory.php
new file mode 100644
index 0000000000000..c80ece29f6143
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/FeedFactory.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\App;
+
+use Magento\Framework\ObjectManagerInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Feed factory
+ */
+class FeedFactory implements FeedFactoryInterface
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var array
+     */
+    private $formats;
+
+    /**
+     * @param ObjectManagerInterface $objectManger
+     * @param LoggerInterface $logger
+     * @param array $formats
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManger,
+        LoggerInterface $logger,
+        array $formats
+    ) {
+        $this->objectManager = $objectManger;
+        $this->logger = $logger;
+        $this->formats = $formats;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(array $data, string $format = FeedFactoryInterface::FORMAT_RSS) : FeedInterface
+    {
+        if (!isset($this->formats[$format])) {
+            throw new \Magento\Framework\Exception\InputException(
+                new \Magento\Framework\Phrase('The format is not supported')
+            );
+        }
+
+        if (!is_subclass_of($this->formats[$format], \Magento\Framework\App\FeedInterface::class)) {
+            throw new \Magento\Framework\Exception\InputException(
+                new \Magento\Framework\Phrase('Wrong format handler type')
+            );
+        }
+
+        try {
+            return $this->objectManager->create(
+                $this->formats[$format],
+                ['data' => $data]
+            );
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage());
+            throw new \Magento\Framework\Exception\RuntimeException(
+                new \Magento\Framework\Phrase('There has been an error with import'),
+                $e
+            );
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/FeedFactoryInterface.php b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php
new file mode 100644
index 0000000000000..ac53a366bd127
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\App;
+
+/**
+ * Feed factory interface
+ */
+interface FeedFactoryInterface
+{
+    /**
+     * RSS feed input format
+     */
+    const FORMAT_RSS = 'rss';
+
+    /**
+     * Returns FeedInterface object from a custom array
+     *
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\RuntimeException
+     * @param array $data
+     * @param string $format
+     * @return FeedInterface
+     */
+    public function create(array $data, string $format = self::FORMAT_RSS) : FeedInterface;
+}
diff --git a/lib/internal/Magento/Framework/App/FeedInterface.php b/lib/internal/Magento/Framework/App/FeedInterface.php
new file mode 100644
index 0000000000000..7d6346e107cfd
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/FeedInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\App;
+
+/**
+ * Feed interface
+ */
+interface FeedInterface
+{
+    /**
+     * Returns the formatted feed content
+     *
+     * @return string
+     */
+    public function getFormattedContent() : string;
+}
diff --git a/lib/internal/Magento/Framework/App/Http.php b/lib/internal/Magento/Framework/App/Http.php
index 3c6dee49f97b4..23024a44c2def 100644
--- a/lib/internal/Magento/Framework/App/Http.php
+++ b/lib/internal/Magento/Framework/App/Http.php
@@ -6,6 +6,7 @@
 namespace Magento\Framework\App;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Debug;
 use Magento\Framework\ObjectManager\ConfigLoaderInterface;
 use Magento\Framework\App\Request\Http as RequestHttp;
 use Magento\Framework\App\Response\Http as ResponseHttp;
@@ -79,7 +80,7 @@ class Http implements \Magento\Framework\AppInterface
      * @param ResponseHttp $response
      * @param ConfigLoaderInterface $configLoader
      * @param State $state
-     * @param Filesystem $filesystem,
+     * @param Filesystem $filesystem
      * @param \Magento\Framework\Registry $registry
      */
     public function __construct(
@@ -149,7 +150,7 @@ public function launch()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function catchException(Bootstrap $bootstrap, \Exception $exception)
     {
@@ -198,6 +199,7 @@ private function buildContentFromException(\Exception $exception)
     {
         /** @var \Exception[] $exceptions */
         $exceptions = [];
+
         do {
             $exceptions[] = $exception;
         } while ($exception = $exception->getPrevious());
@@ -214,7 +216,12 @@ private function buildContentFromException(\Exception $exception)
                 $index,
                 get_class($exception),
                 $exception->getMessage(),
-                $exception->getTraceAsString()
+                Debug::trace(
+                    $exception->getTrace(),
+                    true,
+                    true,
+                    (bool)getenv('MAGE_DEBUG_SHOW_ARGS')
+                )
             );
         }
 
@@ -312,7 +319,15 @@ private function handleInitException(\Exception $exception)
      */
     private function handleGenericReport(Bootstrap $bootstrap, \Exception $exception)
     {
-        $reportData = [$exception->getMessage(), $exception->getTraceAsString()];
+        $reportData = [
+            $exception->getMessage(),
+            Debug::trace(
+                $exception->getTrace(),
+                true,
+                true,
+                (bool)getenv('MAGE_DEBUG_SHOW_ARGS')
+            )
+        ];
         $params = $bootstrap->getParams();
         if (isset($params['REQUEST_URI'])) {
             $reportData['url'] = $params['REQUEST_URI'];
diff --git a/lib/internal/Magento/Framework/App/MaintenanceMode.php b/lib/internal/Magento/Framework/App/MaintenanceMode.php
index 4e4328cb72aef..225375c7df463 100644
--- a/lib/internal/Magento/Framework/App/MaintenanceMode.php
+++ b/lib/internal/Magento/Framework/App/MaintenanceMode.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Event\Manager;
 
 /**
  * Application Maintenance Mode
@@ -39,13 +40,18 @@ class MaintenanceMode
     protected $flagDir;
 
     /**
-     * Constructor
-     *
+     * @var Manager
+     */
+    private $eventManager;
+
+    /**
      * @param \Magento\Framework\Filesystem $filesystem
+     * @param Manager|null $eventManager
      */
-    public function __construct(Filesystem $filesystem)
+    public function __construct(Filesystem $filesystem, Manager $eventManager = null)
     {
         $this->flagDir = $filesystem->getDirectoryWrite(self::FLAG_DIR);
+        $this->eventManager = $eventManager ?: ObjectManager::getInstance()->get(Manager::class);
     }
 
     /**
@@ -73,6 +79,8 @@ public function isOn($remoteAddr = '')
      */
     public function set($isOn)
     {
+        $this->eventManager->dispatch('maintenance_mode_changed', ['isOn' => $isOn]);
+
         if ($isOn) {
             return $this->flagDir->touch(self::FLAG_FILENAME);
         }
diff --git a/lib/internal/Magento/Framework/App/ScopeDefault.php b/lib/internal/Magento/Framework/App/ScopeDefault.php
index 2ea62387145bf..e62d19f9ffbb4 100644
--- a/lib/internal/Magento/Framework/App/ScopeDefault.php
+++ b/lib/internal/Magento/Framework/App/ScopeDefault.php
@@ -17,7 +17,7 @@ class ScopeDefault implements ScopeInterface
      */
     public function getCode()
     {
-        return 'default';
+        return '';
     }
 
     /**
@@ -27,7 +27,7 @@ public function getCode()
      */
     public function getId()
     {
-        return 1;
+        return 0;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/StaticResource.php b/lib/internal/Magento/Framework/App/StaticResource.php
index 87a2c37f94768..b5e4b2828d93b 100644
--- a/lib/internal/Magento/Framework/App/StaticResource.php
+++ b/lib/internal/Magento/Framework/App/StaticResource.php
@@ -10,6 +10,7 @@
 use Magento\Framework\Filesystem;
 use Magento\Framework\Config\ConfigOptionsListConstants;
 use Psr\Log\LoggerInterface;
+use Magento\Framework\Debug;
 
 /**
  * Entry point for retrieving static resources like JS, CSS, images by requested public path
@@ -54,12 +55,12 @@ class StaticResource implements \Magento\Framework\AppInterface
     private $objectManager;
 
     /**
-     * @var \Magento\Framework\ObjectManager\ConfigLoaderInterface
+     * @var ConfigLoaderInterface
      */
     private $configLoader;
 
     /**
-     * @var \Magento\Framework\Filesystem
+     * @var Filesystem
      */
     private $filesystem;
 
@@ -69,7 +70,7 @@ class StaticResource implements \Magento\Framework\AppInterface
     private $deploymentConfig;
 
     /**
-     * @var \Psr\Log\LoggerInterface
+     * @var LoggerInterface
      */
     private $logger;
 
@@ -138,7 +139,7 @@ public function launch()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function catchException(Bootstrap $bootstrap, \Exception $exception)
     {
@@ -146,7 +147,15 @@ public function catchException(Bootstrap $bootstrap, \Exception $exception)
         if ($bootstrap->isDeveloperMode()) {
             $this->response->setHttpResponseCode(404);
             $this->response->setHeader('Content-Type', 'text/plain');
-            $this->response->setBody($exception->getMessage() . "\n" . $exception->getTraceAsString());
+            $this->response->setBody(
+                $exception->getMessage() . "\n" .
+                Debug::trace(
+                    $exception->getTrace(),
+                    true,
+                    true,
+                    (bool)getenv('MAGE_DEBUG_SHOW_ARGS')
+                )
+            );
             $this->response->sendResponse();
         } else {
             require $this->getFilesystem()->getDirectoryRead(DirectoryList::PUB)->getAbsolutePath('errors/404.php');
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php
index 80ab2302dc91c..3508cfed0777b 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php
@@ -140,4 +140,43 @@ public function keyCollisionDataProvider()
             ]
         ];
     }
+
+    /**
+     * @param string $key
+     * @param string|null $expectedFlattenData
+     * @return void
+     * @dataProvider getDataProvider
+     */
+    public function testGet(string $key, $expectedFlattenData)
+    {
+        $flatData = [
+            'key1' => 'value',
+            'key2' => null,
+        ];
+
+        $this->reader->expects($this->once())->method('load')->willReturn($flatData);
+
+        $this->assertEquals($expectedFlattenData, $this->_deploymentConfig->get($key));
+    }
+
+    /**
+     * @return array
+     */
+    public function getDataProvider(): array
+    {
+        return [
+            [
+                'key' => 'key1',
+                'expectedFlattenData' => 'value',
+            ],
+            [
+                'key' => 'key2',
+                'expectedFlattenData' => '',
+            ],
+            [
+                'key' => 'key3',
+                'expectedFlattenData' => null,
+            ],
+        ];
+    }
 }
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php
index 23afbbc73d2b9..ef4152ba2e49e 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DocRootLocatorTest.php
@@ -8,6 +8,9 @@
 
 use Magento\Framework\App\DocRootLocator;
 
+/**
+ * Test for Magento\Framework\App\DocRootLocator class.
+ */
 class DocRootLocatorTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -21,11 +24,15 @@ public function testIsPub($path, $isExist, $result)
     {
         $request = $this->createMock(\Magento\Framework\App\Request\Http::class);
         $request->expects($this->once())->method('getServer')->willReturn($path);
+
+        $readFactory = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadFactory::class);
+
         $reader = $this->createMock(\Magento\Framework\Filesystem\Directory\Read::class);
+        $filesystem = $this->createMock(\Magento\Framework\Filesystem::class);
+        $filesystem->expects($this->once())->method('getDirectoryRead')->willReturn($reader);
         $reader->expects($this->any())->method('isExist')->willReturn($isExist);
-        $readFactory = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadFactory::class);
-        $readFactory->expects($this->once())->method('create')->willReturn($reader);
-        $model = new DocRootLocator($request, $readFactory);
+
+        $model = new DocRootLocator($request, $readFactory, $filesystem);
         $this->assertSame($result, $model->isPub());
     }
 
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/MaintenanceModeTest.php b/lib/internal/Magento/Framework/App/Test/Unit/MaintenanceModeTest.php
index 5d1c22a38af4d..09bcbd760c87a 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/MaintenanceModeTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/MaintenanceModeTest.php
@@ -6,9 +6,17 @@
 
 namespace Magento\Framework\App\Test\Unit;
 
-use \Magento\Framework\App\MaintenanceMode;
+use Magento\Framework\App\MaintenanceMode;
+use Magento\Framework\Event\Manager;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Filesystem;
+use PHPUnit\Framework\TestCase;
 
-class MaintenanceModeTest extends \PHPUnit\Framework\TestCase
+/**
+ * MaintenanceMode Test
+ */
+class MaintenanceModeTest extends TestCase
 {
     /**
      * @var MaintenanceMode
@@ -16,141 +24,213 @@ class MaintenanceModeTest extends \PHPUnit\Framework\TestCase
     protected $model;
 
     /**
-     * @var \Magento\Framework\Filesystem\Directory\WriteInterface  | \PHPUnit_Framework_MockObject_MockObject
+     * @var WriteInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $flagDir;
 
+    /**
+     * @var Manager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eventManager;
+
+    /**
+     * @inheritdoc
+     */
     protected function setup()
     {
-        $this->flagDir = $this->getMockForAbstractClass(\Magento\Framework\Filesystem\Directory\WriteInterface::class);
-        $filesystem = $this->createMock(\Magento\Framework\Filesystem::class);
-        $filesystem->expects($this->any())
-            ->method('getDirectoryWrite')
-            ->will($this->returnValue($this->flagDir));
+        $this->flagDir = $this->getMockForAbstractClass(WriteInterface::class);
+        $filesystem = $this->createMock(Filesystem::class);
+        $filesystem->method('getDirectoryWrite')
+            ->willReturn($this->flagDir);
+        $this->eventManager = $this->createMock(Manager::class);
 
-        $this->model = new MaintenanceMode($filesystem);
+        $objectManager = new ObjectManager($this);
+        $this->model = $objectManager->getObject(MaintenanceMode::class, [
+            'filesystem' => $filesystem,
+            'eventManager' => $this->eventManager,
+        ]);
     }
 
+    /**
+     * Is On initial test
+     *
+     * @return void
+     */
     public function testIsOnInitial()
     {
-        $this->flagDir->expects($this->once())->method('isExist')
+        $this->flagDir->expects($this->once())
+            ->method('isExist')
             ->with(MaintenanceMode::FLAG_FILENAME)
-            ->will($this->returnValue(false));
+            ->willReturn(false);
         $this->assertFalse($this->model->isOn());
     }
 
+    /**
+     * Is On without ip test
+     *
+     * @return void
+     */
     public function testisOnWithoutIP()
     {
         $mapisExist = [
             [MaintenanceMode::FLAG_FILENAME, true],
             [MaintenanceMode::IP_FILENAME, false],
         ];
-        $this->flagDir->expects($this->exactly(2))->method('isExist')
-            ->will(($this->returnValueMap($mapisExist)));
+        $this->flagDir->expects($this->exactly(2))
+            ->method('isExist')
+            ->willReturnMap($mapisExist);
         $this->assertTrue($this->model->isOn());
     }
 
+    /**
+     * Is On with IP test
+     *
+     * @return void
+     */
     public function testisOnWithIP()
     {
         $mapisExist = [
             [MaintenanceMode::FLAG_FILENAME, true],
             [MaintenanceMode::IP_FILENAME, true],
         ];
-        $this->flagDir->expects($this->exactly(2))->method('isExist')
-            ->will(($this->returnValueMap($mapisExist)));
+        $this->flagDir->expects($this->exactly(2))
+            ->method('isExist')
+            ->willReturnMap($mapisExist);
         $this->assertFalse($this->model->isOn());
     }
 
+    /**
+     * Is On with IP but no Maintenance files test
+     *
+     * @return void
+     */
     public function testisOnWithIPNoMaintenance()
     {
-        $this->flagDir->expects($this->once())->method('isExist')
+        $this->flagDir->expects($this->once())
+            ->method('isExist')
             ->with(MaintenanceMode::FLAG_FILENAME)
             ->willReturn(false);
         $this->assertFalse($this->model->isOn());
     }
 
+    /**
+     * Maintenance Mode On test
+     *
+     * Tests common scenario with Full Page Cache is set to On
+     *
+     * @return void
+     */
     public function testMaintenanceModeOn()
     {
-        $this->flagDir->expects($this->at(0))->method('isExist')->with(MaintenanceMode::FLAG_FILENAME)
-            ->will($this->returnValue(false));
-        $this->flagDir->expects($this->at(1))->method('touch')->will($this->returnValue(true));
-        $this->flagDir->expects($this->at(2))->method('isExist')->with(MaintenanceMode::FLAG_FILENAME)
-            ->will($this->returnValue(true));
-        $this->flagDir->expects($this->at(3))->method('isExist')->with(MaintenanceMode::IP_FILENAME)
-            ->will($this->returnValue(false));
+        $this->eventManager->expects($this->once())
+            ->method('dispatch')
+            ->with('maintenance_mode_changed', ['isOn' => true]);
 
-        $this->assertFalse($this->model->isOn());
-        $this->assertTrue($this->model->set(true));
-        $this->assertTrue($this->model->isOn());
+        $this->flagDir->expects($this->once())
+            ->method('touch')
+            ->with(MaintenanceMode::FLAG_FILENAME);
+
+        $this->model->set(true);
     }
 
+    /**
+     * Maintenance Mode Off test
+     *
+     * Tests common scenario when before Maintenance Mode Full Page Cache was setted to on
+     *
+     * @return void
+     */
     public function testMaintenanceModeOff()
     {
-        $this->flagDir->expects($this->at(0))->method('isExist')->with(MaintenanceMode::FLAG_FILENAME)
-            ->will($this->returnValue(true));
-        $this->flagDir->expects($this->at(1))->method('delete')->with(MaintenanceMode::FLAG_FILENAME)
-            ->will($this->returnValue(false));
-        $this->flagDir->expects($this->at(2))->method('isExist')->with(MaintenanceMode::FLAG_FILENAME)
-            ->will($this->returnValue(false));
-
-        $this->assertFalse($this->model->set(false));
-        $this->assertFalse($this->model->isOn());
+        $this->eventManager->expects($this->once())
+            ->method('dispatch')
+            ->with('maintenance_mode_changed', ['isOn' => false]);
+
+        $this->flagDir->method('isExist')
+            ->with(MaintenanceMode::FLAG_FILENAME)
+            ->willReturn(true);
+
+        $this->flagDir->expects($this->once())
+            ->method('delete')
+            ->with(MaintenanceMode::FLAG_FILENAME);
+
+        $this->model->set(false);
     }
 
+    /**
+     * Set empty addresses test
+     *
+     * @return void
+     */
     public function testSetAddresses()
     {
         $mapisExist = [
             [MaintenanceMode::FLAG_FILENAME, true],
             [MaintenanceMode::IP_FILENAME, true],
         ];
-        $this->flagDir->expects($this->any())->method('isExist')->will($this->returnValueMap($mapisExist));
-        $this->flagDir->expects($this->any())->method('writeFile')
+        $this->flagDir->method('isExist')
+            ->willReturnMap($mapisExist);
+        $this->flagDir->method('writeFile')
             ->with(MaintenanceMode::IP_FILENAME)
-            ->will($this->returnValue(true));
+            ->willReturn(true);
 
-        $this->flagDir->expects($this->any())->method('readFile')
+        $this->flagDir->method('readFile')
             ->with(MaintenanceMode::IP_FILENAME)
-            ->will($this->returnValue(''));
+            ->willReturn('');
 
         $this->model->setAddresses('');
         $this->assertEquals([''], $this->model->getAddressInfo());
     }
 
+    /**
+     * Set single address test
+     *
+     * @return void
+     */
     public function testSetSingleAddresses()
     {
         $mapisExist = [
             [MaintenanceMode::FLAG_FILENAME, true],
             [MaintenanceMode::IP_FILENAME, true],
         ];
-        $this->flagDir->expects($this->any())->method('isExist')->will($this->returnValueMap($mapisExist));
-        $this->flagDir->expects($this->any())->method('delete')->will($this->returnValueMap($mapisExist));
+        $this->flagDir->method('isExist')
+            ->willReturnMap($mapisExist);
+        $this->flagDir->method('delete')
+            ->willReturnMap($mapisExist);
 
-        $this->flagDir->expects($this->any())->method('writeFile')
-            ->will($this->returnValue(10));
+        $this->flagDir->method('writeFile')
+            ->willReturn(10);
 
-        $this->flagDir->expects($this->any())->method('readFile')
+        $this->flagDir->method('readFile')
             ->with(MaintenanceMode::IP_FILENAME)
-            ->will($this->returnValue('address1'));
+            ->willReturn('address1');
 
         $this->model->setAddresses('address1');
         $this->assertEquals(['address1'], $this->model->getAddressInfo());
     }
 
+    /**
+     * Is On when multiple addresses test was setted
+     *
+     * @return void
+     */
     public function testOnSetMultipleAddresses()
     {
         $mapisExist = [
             [MaintenanceMode::FLAG_FILENAME, true],
             [MaintenanceMode::IP_FILENAME, true],
         ];
-        $this->flagDir->expects($this->any())->method('isExist')->will($this->returnValueMap($mapisExist));
-        $this->flagDir->expects($this->any())->method('delete')->will($this->returnValueMap($mapisExist));
+        $this->flagDir->method('isExist')
+            ->willReturnMap($mapisExist);
+        $this->flagDir->method('delete')
+            ->willReturnMap($mapisExist);
 
-        $this->flagDir->expects($this->any())->method('writeFile')
-            ->will($this->returnValue(10));
+        $this->flagDir->method('writeFile')
+            ->willReturn(10);
 
-        $this->flagDir->expects($this->any())->method('readFile')
+        $this->flagDir->method('readFile')
             ->with(MaintenanceMode::IP_FILENAME)
-            ->will($this->returnValue('address1,10.50.60.123'));
+            ->willReturn('address1,10.50.60.123');
 
         $expectedArray = ['address1', '10.50.60.123'];
         $this->model->setAddresses('address1,10.50.60.123');
@@ -159,18 +239,25 @@ public function testOnSetMultipleAddresses()
         $this->assertTrue($this->model->isOn('address3'));
     }
 
+    /**
+     * Is Off when multiple addresses test was setted
+     *
+     * @return void
+     */
     public function testOffSetMultipleAddresses()
     {
         $mapisExist = [
             [MaintenanceMode::FLAG_FILENAME, false],
             [MaintenanceMode::IP_FILENAME, true],
         ];
-        $this->flagDir->expects($this->any())->method('isExist')->will($this->returnValueMap($mapisExist));
-        $this->flagDir->expects($this->any())->method('delete')->will($this->returnValueMap($mapisExist));
+        $this->flagDir->method('isExist')
+            ->willReturnMap($mapisExist);
+        $this->flagDir->method('delete')
+            ->willReturnMap($mapisExist);
 
-        $this->flagDir->expects($this->any())->method('readFile')
+        $this->flagDir->method('readFile')
             ->with(MaintenanceMode::IP_FILENAME)
-            ->will($this->returnValue('address1,10.50.60.123'));
+            ->willReturn('address1,10.50.60.123');
 
         $expectedArray = ['address1', '10.50.60.123'];
         $this->model->setAddresses('address1,10.50.60.123');
diff --git a/lib/internal/Magento/Framework/Archive/Zip.php b/lib/internal/Magento/Framework/Archive/Zip.php
index f33ad8700f056..c41f8b28ce348 100644
--- a/lib/internal/Magento/Framework/Archive/Zip.php
+++ b/lib/internal/Magento/Framework/Archive/Zip.php
@@ -4,13 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Class to work with zip archives
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Framework\Archive;
 
+/**
+ * Zip compressed file archive.
+ */
 class Zip extends AbstractArchive implements ArchiveInterface
 {
     /**
@@ -54,11 +52,34 @@ public function pack($source, $destination)
     public function unpack($source, $destination)
     {
         $zip = new \ZipArchive();
-        $zip->open($source);
-        $filename = $zip->getNameIndex(0);
-        $zip->extractTo(dirname($destination), $filename);
-        rename(dirname($destination).'/'.$filename, $destination);
-        $zip->close();
+        if ($zip->open($source) === true) {
+            $filename = $this->filterRelativePaths($zip->getNameIndex(0) ?: '');
+            if ($filename) {
+                $zip->extractTo(dirname($destination), $filename);
+                rename(dirname($destination).'/'.$filename, $destination);
+            } else {
+                $destination = '';
+            }
+            $zip->close();
+        } else {
+            $destination = '';
+        }
+
         return $destination;
     }
+
+    /**
+     * Filter file names with relative paths.
+     *
+     * @param string $path
+     * @return string
+     */
+    private function filterRelativePaths(string $path): string
+    {
+        if ($path && preg_match('#^\s*(../)|(/../)#i', $path)) {
+            $path = '';
+        }
+
+        return $path;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Backup/BackupInterface.php b/lib/internal/Magento/Framework/Backup/BackupInterface.php
index 3d054bdbd1a9c..16aada9689c11 100644
--- a/lib/internal/Magento/Framework/Backup/BackupInterface.php
+++ b/lib/internal/Magento/Framework/Backup/BackupInterface.php
@@ -13,6 +13,8 @@
 
 /**
  * @api
+ *
+ * @deprecated Backups should be done using other means.
  */
 interface BackupInterface
 {
diff --git a/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php b/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php
index 13e3c562bb527..a019ccac06b66 100644
--- a/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php
+++ b/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php
@@ -7,6 +7,8 @@
 
 /**
  * @api
+ *
+ * @deprecated Backups should be done using other means.
  */
 interface BackupDbInterface
 {
diff --git a/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php b/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php
index f7459f629cb4a..ae5879290eb20 100644
--- a/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php
+++ b/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php
@@ -7,6 +7,8 @@
 
 /**
  * @api
+ *
+ * @deprecated Backups should be done using other means.
  */
 interface BackupInterface
 {
diff --git a/lib/internal/Magento/Framework/Cache/Backend/Database.php b/lib/internal/Magento/Framework/Cache/Backend/Database.php
index 291078383014a..231a8584cc8a5 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/Database.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/Database.php
@@ -27,11 +27,11 @@
  * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
  */
 
-/**
- * Database cache backend
- */
 namespace Magento\Framework\Cache\Backend;
 
+/**
+ * Database cache backend.
+ */
 class Database extends \Zend_Cache_Backend implements \Zend_Cache_Backend_ExtendedInterface
 {
     /**
@@ -139,7 +139,7 @@ protected function _getTagsTable()
      *
      * Note : return value is always "string" (unserialization is done by the core not by the backend)
      *
-     * @param  string  $id                     Cache id
+     * @param  string $id Cache id
      * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
      * @return string|false cached datas
      */
@@ -432,7 +432,7 @@ public function touch($id, $extraLifetime)
             return $this->_getConnection()->update(
                 $this->_getDataTable(),
                 ['expire_time' => new \Zend_Db_Expr('expire_time+' . $extraLifetime)],
-                ['id=?' => $id, 'expire_time = 0 OR expire_time>' => time()]
+                ['id=?' => $id, 'expire_time = 0 OR expire_time>?' => time()]
             );
         } else {
             return true;
diff --git a/lib/internal/Magento/Framework/Code/Generator/Autoloader.php b/lib/internal/Magento/Framework/Code/Generator/Autoloader.php
index c214008393609..f8e469fe05265 100644
--- a/lib/internal/Magento/Framework/Code/Generator/Autoloader.php
+++ b/lib/internal/Magento/Framework/Code/Generator/Autoloader.php
@@ -3,37 +3,94 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Code\Generator;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Code\Generator;
+use Psr\Log\LoggerInterface;
 
+/**
+ * Class loader and generator.
+ */
 class Autoloader
 {
     /**
-     * @var \Magento\Framework\Code\Generator
+     * @var Generator
      */
     protected $_generator;
 
     /**
-     * @param \Magento\Framework\Code\Generator $generator
+     * Enables guarding against spamming the debug log with duplicate messages, as
+     * the generation exception will be thrown multiple times within a single request.
+     *
+     * @var string
+     */
+    private $lastGenerationErrorMessage;
+
+    /**
+     * @param Generator $generator
      */
-    public function __construct(
-        \Magento\Framework\Code\Generator $generator
-    ) {
+    public function __construct(Generator $generator)
+    {
         $this->_generator = $generator;
     }
 
     /**
      * Load specified class name and generate it if necessary
      *
+     * According to PSR-4 section 2.4 an autoloader MUST NOT throw an exception and SHOULD NOT return a value.
+     *
+     * @see https://www.php-fig.org/psr/psr-4/
+     *
      * @param string $className
-     * @return bool True if class was loaded
+     * @return void
      */
     public function load($className)
     {
-        if (!class_exists($className)) {
-            return Generator::GENERATION_ERROR != $this->_generator->generateClass($className);
+        if (! class_exists($className)) {
+            try {
+                $this->_generator->generateClass($className);
+            } catch (\Exception $exception) {
+                $this->tryToLogExceptionMessageIfNotDuplicate($exception);
+            }
+        }
+    }
+
+    /**
+     * Log exception.
+     *
+     * @param \Exception $exception
+     */
+    private function tryToLogExceptionMessageIfNotDuplicate(\Exception $exception)
+    {
+        if ($this->lastGenerationErrorMessage !== $exception->getMessage()) {
+            $this->lastGenerationErrorMessage = $exception->getMessage();
+            $this->tryToLogException($exception);
+        }
+    }
+
+    /**
+     * Try to capture the exception message.
+     *
+     * The Autoloader is instantiated before the ObjectManager, so the LoggerInterface can not be injected.
+     * The Logger is instantiated in the try/catch block because ObjectManager might still not be initialized.
+     * In that case the exception message can not be captured.
+     *
+     * The debug level is used for logging in case class generation fails for a common class, but a custom
+     * autoloader is used later in the stack. A more severe log level would fill the logs with messages on production.
+     * The exception message now can be accessed in developer mode if debug logging is enabled.
+     *
+     * @param \Exception $exception
+     * @return void
+     */
+    private function tryToLogException(\Exception $exception)
+    {
+        try {
+            $logger = ObjectManager::getInstance()->get(LoggerInterface::class);
+            $logger->debug($exception->getMessage(), ['exception' => $exception]);
+        } catch (\Exception $ignoreThisException) {
+            // Do not take an action here, since the original exception might have been caused by logger
         }
-        return true;
     }
 }
diff --git a/lib/internal/Magento/Framework/Convert/Excel.php b/lib/internal/Magento/Framework/Convert/Excel.php
index 09acd88b38a7f..13d8c0fa9d56b 100644
--- a/lib/internal/Magento/Framework/Convert/Excel.php
+++ b/lib/internal/Magento/Framework/Convert/Excel.php
@@ -12,6 +12,11 @@
  */
 class Excel
 {
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
     /**
      * \ArrayIterator Object
      *
@@ -45,15 +50,23 @@ class Excel
      *
      * @param \Iterator $iterator
      * @param array $rowCallback
+     * @param \Magento\Framework\Escaper|null $escaper
      */
-    public function __construct(\Iterator $iterator, $rowCallback = [])
-    {
+    public function __construct(
+        \Iterator $iterator,
+        $rowCallback = [],
+        \Magento\Framework\Escaper $escaper = null
+    ) {
         $this->_iterator = $iterator;
         $this->_rowCallback = $rowCallback;
+        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\Escaper::class
+        );
     }
 
     /**
      * Retrieve Excel XML Document Header XML Fragment
+     *
      * Append data header if it is available
      *
      * @param string $sheetName
@@ -65,7 +78,7 @@ protected function _getXmlHeader($sheetName = '')
             $sheetName = 'Sheet 1';
         }
 
-        $sheetName = htmlspecialchars($sheetName);
+        $sheetName = $this->escaper->escapeHtml($sheetName);
 
         $xmlHeader = '<' .
             '?xml version="1.0"?' .
@@ -98,6 +111,7 @@ protected function _getXmlHeader($sheetName = '')
 
     /**
      * Retrieve Excel XML Document Footer XML Fragment
+     *
      * Append data footer if it is available
      *
      * @return string
@@ -133,7 +147,7 @@ protected function _getXmlRow($row, $useCallback)
         $xmlData[] = '<Row>';
 
         foreach ($row as $value) {
-            $value = htmlspecialchars($value);
+            $value = $this->escaper->escapeHtml($value);
             $dataType = is_numeric($value) && $value[0] !== '+' && $value[0] !== '0' ? 'Number' : 'String';
 
             /**
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index 3d06e27542f07..f2e3e8163d375 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -2012,7 +2012,7 @@ public function insertArray($table, array $columns, array $data, $strategy = 0)
         $bind         = [];
         $columnsCount = count($columns);
         foreach ($data as $row) {
-            if ($columnsCount != count($row)) {
+            if (is_array($row) && $columnsCount != count($row)) {
                 throw new \Zend_Db_Exception('Invalid data for insert');
             }
             $values[] = $this->_prepareInsertData($row, $bind);
@@ -2854,6 +2854,7 @@ public function endSetup()
      * - array("gteq" => $greaterOrEqualValue)
      * - array("lteq" => $lessOrEqualValue)
      * - array("finset" => $valueInSet)
+     * - array("nfinset" => $valueNotInSet)
      * - array("regexp" => $regularExpression)
      * - array("seq" => $stringValue)
      * - array("sneq" => $stringValue)
@@ -2883,6 +2884,7 @@ public function prepareSqlCondition($fieldName, $condition)
             'gteq'          => "{{fieldName}} >= ?",
             'lteq'          => "{{fieldName}} <= ?",
             'finset'        => "FIND_IN_SET(?, {{fieldName}})",
+            'nfinset'       => "NOT FIND_IN_SET(?, {{fieldName}})",
             'regexp'        => "{{fieldName}} REGEXP ?",
             'from'          => "{{fieldName}} >= ?",
             'to'            => "{{fieldName}} <= ?",
@@ -2904,7 +2906,7 @@ public function prepareSqlCondition($fieldName, $condition)
                 if (isset($condition['to'])) {
                     $query .= empty($query) ? '' : ' AND ';
                     $to     = $this->_prepareSqlDateCondition($condition, 'to');
-                    $query = $this->_prepareQuotedSqlCondition($query . $conditionKeyMap['to'], $to, $fieldName);
+                    $query = $query . $this->_prepareQuotedSqlCondition($conditionKeyMap['to'], $to, $fieldName);
                 }
             } elseif (array_key_exists($key, $conditionKeyMap)) {
                 $value = $condition[$key];
diff --git a/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php b/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
index cc2f5a91f73fd..af0ddc9b18b9f 100644
--- a/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
+++ b/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
@@ -107,7 +107,7 @@ public function __construct(
     public function current()
     {
         if (null === $this->currentSelect) {
-            $this->isValid = ($this->currentOffset + $this->batchSize) <= $this->totalItemCount;
+            $this->isValid = $this->currentOffset < $this->totalItemCount;
             $this->currentSelect = $this->initSelectObject();
         }
         return $this->currentSelect;
@@ -138,7 +138,7 @@ public function next()
         if (null === $this->currentSelect) {
             $this->current();
         }
-        $this->isValid = ($this->batchSize + $this->currentOffset) <= $this->totalItemCount;
+        $this->isValid = $this->currentOffset < $this->totalItemCount;
         $select = $this->initSelectObject();
         if ($this->isValid) {
             $this->iteration++;
diff --git a/lib/internal/Magento/Framework/DB/Sql/UnionExpression.php b/lib/internal/Magento/Framework/DB/Sql/UnionExpression.php
index 3ce78177d875f..6961426fcc7f1 100644
--- a/lib/internal/Magento/Framework/DB/Sql/UnionExpression.php
+++ b/lib/internal/Magento/Framework/DB/Sql/UnionExpression.php
@@ -22,18 +22,25 @@ class UnionExpression extends Expression
      */
     protected $type;
 
+    /**
+     * @var string
+     */
+    private $pattern;
+
     /**
      * @param Select[] $parts
-     * @param string $type
+     * @param string $type (optional)
+     * @param string $pattern (optional)
      */
-    public function __construct(array $parts, $type = Select::SQL_UNION)
+    public function __construct(array $parts, $type = Select::SQL_UNION, $pattern = '')
     {
         $this->parts = $parts;
         $this->type = $type;
+        $this->pattern = $pattern;
     }
 
     /**
-     * @return string
+     * @inheritdoc
      */
     public function __toString()
     {
@@ -45,6 +52,11 @@ public function __toString()
                 $parts[] = $part;
             }
         }
-        return implode($parts, $this->type);
+        $sql = implode($parts, $this->type);
+        if ($this->pattern) {
+            return sprintf($this->pattern, $sql);
+        }
+
+        return $sql;
     }
 }
diff --git a/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php
index 7b8314a76f32e..d24bc5fef6ef6 100644
--- a/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php
@@ -3,21 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+namespace Magento\Framework\DB\Statement\Pdo;
+
+use Magento\Framework\DB\Statement\Parameter;
 
 /**
  * Mysql DB Statement
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Framework\DB\Statement\Pdo;
-
-use Magento\Framework\DB\Statement\Parameter;
-
 class Mysql extends \Zend_Db_Statement_Pdo
 {
+
     /**
-     * Executes statement with binding values to it.
-     * Allows transferring specific options to DB driver.
+     * Executes statement with binding values to it. Allows transferring specific options to DB driver.
      *
      * @param array $params Array of values to bind to parameter placeholders.
      * @return bool
@@ -61,11 +60,9 @@ public function _executeWithBinding(array $params)
             $statement->bindParam($paramName, $bindValues[$name], $dataType, $length, $driverOptions);
         }
 
-        try {
+        return $this->tryExecute(function () use ($statement) {
             return $statement->execute();
-        } catch (\PDOException $e) {
-            throw new \Zend_Db_Statement_Exception($e->getMessage(), (int)$e->getCode(), $e);
-        }
+        });
     }
 
     /**
@@ -90,7 +87,29 @@ public function _execute(array $params = null)
         if ($specialExecute) {
             return $this->_executeWithBinding($params);
         } else {
-            return parent::_execute($params);
+            return $this->tryExecute(function () use ($params) {
+                return $params !== null ? $this->_stmt->execute($params) : $this->_stmt->execute();
+            });
+        }
+    }
+
+    /**
+     * Executes query and avoid warnings.
+     *
+     * @param callable $callback
+     * @return bool
+     * @throws \Zend_Db_Statement_Exception
+     */
+    private function tryExecute($callback)
+    {
+        $previousLevel = error_reporting(\E_ERROR); // disable warnings for PDO bugs #63812, #74401
+        try {
+            return $callback();
+        } catch (\PDOException $e) {
+            $message = sprintf('%s, query was: %s', $e->getMessage(), $this->_stmt->queryString);
+            throw new \Zend_Db_Statement_Exception($message, (int)$e->getCode(), $e);
+        } finally {
+            error_reporting($previousLevel);
         }
     }
 }
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/DB/Statement/MysqlTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/DB/Statement/MysqlTest.php
new file mode 100644
index 0000000000000..714dfe6bb1059
--- /dev/null
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/DB/Statement/MysqlTest.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\DB\Test\Unit\DB\Statement;
+
+use Magento\Framework\DB\Statement\Parameter;
+use Magento\Framework\DB\Statement\Pdo\Mysql;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @inheritdoc
+ */
+class MysqlTest extends TestCase
+{
+    /**
+     * @var \Zend_Db_Adapter_Abstract|MockObject
+     */
+    private $adapterMock;
+
+    /**
+     * @var \PDO|MockObject
+     */
+    private $pdoMock;
+
+    /**
+     * @var \Zend_Db_Profiler|MockObject
+     */
+    private $zendDbProfilerMock;
+
+    /**
+     * @var \PDOStatement|MockObject
+     */
+    private $pdoStatementMock;
+
+    /**
+     * @inheritdoc
+     */
+    public function setUp()
+    {
+        $this->adapterMock = $this->getMockForAbstractClass(
+            \Zend_Db_Adapter_Abstract::class,
+            [],
+            '',
+            false,
+            true,
+            true,
+            ['getConnection', 'getProfiler']
+        );
+        $this->pdoMock = $this->createMock(\PDO::class);
+        $this->adapterMock->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($this->pdoMock);
+        $this->zendDbProfilerMock = $this->createMock(\Zend_Db_Profiler::class);
+        $this->adapterMock->expects($this->once())
+            ->method('getProfiler')
+            ->willReturn($this->zendDbProfilerMock);
+        $this->pdoStatementMock = $this->createMock(\PDOStatement::class);
+    }
+
+    public function testExecuteWithoutParams()
+    {
+        $query = 'SET @a=1;';
+        $this->pdoMock->expects($this->once())
+            ->method('prepare')
+            ->with($query)
+            ->willReturn($this->pdoStatementMock);
+        $this->pdoStatementMock->expects($this->once())
+            ->method('execute');
+        (new Mysql($this->adapterMock, $query))->_execute();
+    }
+
+    public function testExecuteWhenThrowPDOException()
+    {
+        $this->expectException(\Zend_Db_Statement_Exception::class);
+        $this->expectExceptionMessage('test message, query was:');
+        $errorReporting = error_reporting();
+        $query = 'SET @a=1;';
+        $this->pdoMock->expects($this->once())
+            ->method('prepare')
+            ->with($query)
+            ->willReturn($this->pdoStatementMock);
+        $this->pdoStatementMock->expects($this->once())
+            ->method('execute')
+            ->willThrowException(new \PDOException('test message'));
+
+        $this->assertEquals($errorReporting, error_reporting(), 'Error report level was\'t restored');
+
+        (new Mysql($this->adapterMock, $query))->_execute();
+    }
+
+    public function testExecuteWhenParamsAsPrimitives()
+    {
+        $params = [':param1' => 'value1', ':param2' => 'value2'];
+        $query = 'UPDATE `some_table1` SET `col1`=\'val1\' WHERE `param1`=\':param1\' AND `param2`=\':param2\';';
+        $this->pdoMock->expects($this->once())
+            ->method('prepare')
+            ->with($query)
+            ->willReturn($this->pdoStatementMock);
+        $this->pdoStatementMock->expects($this->never())
+            ->method('bindParam');
+        $this->pdoStatementMock->expects($this->once())
+            ->method('execute')
+            ->with($params);
+
+        (new Mysql($this->adapterMock, $query))->_execute($params);
+    }
+
+    public function testExecuteWhenParamsAsParameterObject()
+    {
+        $param1 = $this->createMock(Parameter::class);
+        $param1Value = 'SomeValue';
+        $param1DataType = 'dataType';
+        $param1Length = '9';
+        $param1DriverOptions = 'some driver options';
+        $param1->expects($this->once())
+            ->method('getIsBlob')
+            ->willReturn(false);
+        $param1->expects($this->once())
+            ->method('getDataType')
+            ->willReturn($param1DataType);
+        $param1->expects($this->once())
+            ->method('getLength')
+            ->willReturn($param1Length);
+        $param1->expects($this->once())
+            ->method('getDriverOptions')
+            ->willReturn($param1DriverOptions);
+        $param1->expects($this->once())
+            ->method('getValue')
+            ->willReturn($param1Value);
+        $params = [
+            ':param1' => $param1,
+            ':param2' => 'value2',
+        ];
+        $query = 'UPDATE `some_table1` SET `col1`=\'val1\' WHERE `param1`=\':param1\' AND `param2`=\':param2\';';
+        $this->pdoMock->expects($this->once())
+            ->method('prepare')
+            ->with($query)
+            ->willReturn($this->pdoStatementMock);
+        $this->pdoStatementMock->expects($this->exactly(2))
+            ->method('bindParam')
+            ->withConsecutive(
+                [':param1', $param1Value, $param1DataType, $param1Length, $param1DriverOptions],
+                [':param2', 'value2', \PDO::PARAM_STR, null, null]
+            );
+        $this->pdoStatementMock->expects($this->once())
+            ->method('execute');
+
+        (new Mysql($this->adapterMock, $query))->_execute($params);
+    }
+}
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Sql/UnionExpressionTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Sql/UnionExpressionTest.php
index 1a3a91ea6bd54..a5aca9707081b 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/Sql/UnionExpressionTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/Sql/UnionExpressionTest.php
@@ -6,11 +6,22 @@
 namespace Magento\Framework\DB\Test\Unit\Sql;
 
 use Magento\Framework\DB\Select;
+use Magento\Framework\DB\Sql\UnionExpression;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class UnionExpressionTest extends \PHPUnit\Framework\TestCase
 {
-    public function testToString()
+    /**
+     * @param string $type
+     * @param string $pattern
+     * @param string $expectedSql
+     * @return void
+     * @dataProvider toStringDataProvider
+     */
+    public function testToString(string $type, string $pattern, string $expectedSql)
     {
+        $objectManager = new ObjectManager($this);
+
         $sqlMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -21,7 +32,34 @@ public function testToString()
             $sqlMock,
             '(test_column)'
         ];
-        $model = new \Magento\Framework\DB\Sql\UnionExpression($parts);
-        $this->assertEquals('(test_assemble)' . Select::SQL_UNION . '(test_column)', $model->__toString());
+        $model = $objectManager->getObject(
+            UnionExpression::class,
+            [
+                'parts' => $parts,
+                'type' => $type,
+                'pattern' => $pattern,
+            ]
+        );
+
+        $this->assertEquals($expectedSql, $model->__toString());
+    }
+
+    /**
+     * @return array
+     */
+    public function toStringDataProvider(): array
+    {
+        return [
+            [
+                'type' => Select::SQL_UNION,
+                'pattern' => '',
+                'expectedSql' => "(test_assemble)" . Select::SQL_UNION . "(test_column)",
+            ],
+            [
+                'type' => Select::SQL_UNION,
+                'pattern' => 'test_with_pattern %s',
+                'expectedSql' => "test_with_pattern (test_assemble)" . Select::SQL_UNION . "(test_column)",
+            ],
+        ];
     }
 }
diff --git a/lib/internal/Magento/Framework/DB/Tree/NodeSet.php b/lib/internal/Magento/Framework/DB/Tree/NodeSet.php
index 525651577f289..1c9eb1db9dbfc 100644
--- a/lib/internal/Magento/Framework/DB/Tree/NodeSet.php
+++ b/lib/internal/Magento/Framework/DB/Tree/NodeSet.php
@@ -9,7 +9,7 @@
  * TODO implements iterators
  *
  */
-class NodeSet implements \Iterator
+class NodeSet implements \Iterator, \Countable
 {
     /**
      * @var Node[]
diff --git a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
index 8061b0c737bff..1b457cf13918a 100644
--- a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
+++ b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
@@ -237,7 +237,8 @@ public function getSelectCountSql()
         $countSelect->reset(\Magento\Framework\DB\Select::LIMIT_OFFSET);
         $countSelect->reset(\Magento\Framework\DB\Select::COLUMNS);
 
-        if (!count($this->getSelect()->getPart(\Magento\Framework\DB\Select::GROUP))) {
+        $part = $this->getSelect()->getPart(\Magento\Framework\DB\Select::GROUP);
+        if (!is_array($part) || !count($part)) {
             $countSelect->columns(new \Zend_Db_Expr('COUNT(*)'));
             return $countSelect;
         }
@@ -364,6 +365,7 @@ protected function _renderFilters()
 
     /**
      * Hook for operations before rendering filters
+     *
      * @return void
      */
     protected function _renderFiltersBefore()
@@ -601,6 +603,7 @@ protected function beforeAddLoadedItem(\Magento\Framework\DataObject $item)
     }
 
     /**
+     * Returns an items collection.
      * Returns a collection item that corresponds to the fetched row
      * and moves the internal data pointer ahead
      *
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
index ac9cdd3822ec5..fe9981be0d255 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
@@ -13,6 +13,7 @@
 /**
  * Data form abstract class
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.NumberOfChildren)
@@ -170,7 +171,11 @@ public function setId($id)
      */
     public function getHtmlId()
     {
-        return $this->getForm()->getHtmlIdPrefix() . $this->getData('html_id') . $this->getForm()->getHtmlIdSuffix();
+        return $this->_escaper->escapeHtml(
+            $this->getForm()->getHtmlIdPrefix() .
+            $this->getData('html_id') .
+            $this->getForm()->getHtmlIdSuffix()
+        );
     }
 
     /**
@@ -184,7 +189,7 @@ public function getName()
         if ($suffix = $this->getForm()->getFieldNameSuffix()) {
             $name = $this->getForm()->addSuffixToName($name, $suffix);
         }
-        return $name;
+        return $this->_escaper->escapeHtml($name);
     }
 
     /**
@@ -285,7 +290,7 @@ public function removeClass($class)
      */
     protected function _escape($string)
     {
-        return htmlspecialchars($string, ENT_COMPAT);
+        return $this->_escaper->escapeHtml($string);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Collection.php b/lib/internal/Magento/Framework/Data/Form/Element/Collection.php
index 7a544501861bd..ced1f4208223d 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Collection.php
@@ -13,7 +13,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Collection implements \ArrayAccess, \IteratorAggregate
+class Collection implements \ArrayAccess, \IteratorAggregate, \Countable
 {
     /**
      * Elements storage
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Date.php b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
index 1920115ff0a3a..52d3eae7d66ac 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Date.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
@@ -49,6 +49,19 @@ public function __construct(
         }
     }
 
+    /**
+     * Check if a string is a date value
+     *
+     * @param string $value
+     * @return bool
+     */
+    private function isDate(string $value): bool
+    {
+        $date = date_parse($value);
+
+        return !empty($date['year']) && !empty($date['month']) && !empty($date['day']);
+    }
+
     /**
      * If script executes on x64 system, converts large
      * numeric values to timestamp limit
@@ -82,13 +95,14 @@ public function setValue($value)
             $this->_value = $value;
             return $this;
         }
-        if (preg_match('/^[0-9]+$/', $value)) {
-            $this->_value = (new \DateTime())->setTimestamp($this->_toTimestamp($value));
-            return $this;
-        }
-
         try {
-            $this->_value = new \DateTime($value, new \DateTimeZone($this->localeDate->getConfigTimezone()));
+            if (preg_match('/^[0-9]+$/', $value)) {
+                $this->_value = (new \DateTime())->setTimestamp($this->_toTimestamp($value));
+            } else if (is_string($value) && $this->isDate($value)) {
+                $this->_value = new \DateTime($value, new \DateTimeZone($this->localeDate->getConfigTimezone()));
+            } else {
+                $this->_value = '';
+            }
         } catch (\Exception $e) {
             $this->_value = '';
         }
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
index 6ed2d8293e61d..412fedaec3831 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
@@ -487,4 +487,13 @@ protected function isToggleButtonVisible()
     {
         return !$this->getConfig()->hasData('toggle_button') || $this->getConfig('toggle_button');
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getHtmlId()
+    {
+        $suffix = $this->getConfig('dynamic_id') ? '${ $.wysiwygUniqueSuffix }' : '';
+        return parent::getHtmlId() . $suffix;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Label.php b/lib/internal/Magento/Framework/Data/Form/Element/Label.php
index 901dcb5289e8d..70b7885e7a0d0 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Label.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Label.php
@@ -4,13 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Data form abstract class
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Framework\Data\Form\Element;
 
+use Magento\Framework\Phrase;
+
+/**
+ * Label form element.
+ */
 class Label extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
     /**
@@ -37,8 +37,13 @@ public function __construct(
     public function getElementHtml()
     {
         $html = $this->getBold() ? '<div class="control-value special">' : '<div class="control-value">';
-        $html .= $this->getEscapedValue() . '</div>';
+        if (is_string($this->getValue()) || $this->getValue() instanceof Phrase) {
+            $html .= $this->getEscapedValue();
+        }
+
+        $html .= '</div>';
         $html .= $this->getAfterElementHtml();
+
         return $html;
     }
 }
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Text.php b/lib/internal/Magento/Framework/Data/Form/Element/Text.php
index eb157c7279a71..1b0946db796cb 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Text.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Text.php
@@ -4,15 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Form text element
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Framework\Data\Form\Element;
 
 use Magento\Framework\Escaper;
 
+/**
+ * Form text element
+ */
 class Text extends AbstractElement
 {
     /**
@@ -65,7 +63,8 @@ public function getHtmlAttributes()
             'placeholder',
             'data-form-part',
             'data-role',
-            'data-action'
+            'data-validation-params',
+            'data-action',
         ];
     }
 }
diff --git a/lib/internal/Magento/Framework/Data/Form/Filter/Escapehtml.php b/lib/internal/Magento/Framework/Data/Form/Filter/Escapehtml.php
index 6feca703f15fe..54821217ca124 100644
--- a/lib/internal/Magento/Framework/Data/Form/Filter/Escapehtml.php
+++ b/lib/internal/Magento/Framework/Data/Form/Filter/Escapehtml.php
@@ -11,8 +11,27 @@
  */
 namespace Magento\Framework\Data\Form\Filter;
 
+/**
+ * EscapeHtml Form Filter Data
+ */
 class Escapehtml implements \Magento\Framework\Data\Form\Filter\FilterInterface
 {
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
+    /**
+     * @param \Magento\Framework\Escaper|null $escaper
+     */
+    public function __construct(
+        \Magento\Framework\Escaper $escaper = null
+    ) {
+        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\Escaper::class
+        );
+    }
+
     /**
      * Returns the result of filtering $value
      *
@@ -32,6 +51,6 @@ public function inputFilter($value)
      */
     public function outputFilter($value)
     {
-        return htmlspecialchars($value);
+        return $this->escaper->escapeHtml($value);
     }
 }
diff --git a/lib/internal/Magento/Framework/Data/Form/FormKey.php b/lib/internal/Magento/Framework/Data/Form/FormKey.php
index 75b3311b4ffe9..355460902eee6 100644
--- a/lib/internal/Magento/Framework/Data/Form/FormKey.php
+++ b/lib/internal/Magento/Framework/Data/Form/FormKey.php
@@ -3,10 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Data\Form;
 
 /**
+ * Class FormKey
+ *
  * @api
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class FormKey
 {
@@ -50,24 +56,29 @@ public function __construct(
      * Retrieve Session Form Key
      *
      * @return string A 16 bit unique key for forms
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getFormKey()
     {
         if (!$this->isPresent()) {
             $this->set($this->mathRandom->getRandomString(16));
         }
-        return $this->escaper->escapeHtmlAttr($this->session->getData(self::FORM_KEY));
+        return $this->escaper->escapeJs($this->session->getData(self::FORM_KEY));
     }
 
     /**
+     * Determine if the form key is present in the session
+     *
      * @return bool
      */
     public function isPresent()
     {
-        return (bool)$this->session->getData(self::FORM_KEY);
+        return (bool) $this->session->getData(self::FORM_KEY);
     }
 
     /**
+     * Set the value of the form key
+     *
      * @param string $value
      * @return void
      */
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
index 2ecc67e1eb70e..a69f5af08a93c 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
@@ -7,6 +7,9 @@
 
 // @codingStandardsIgnoreFile
 
+/**
+ * Class for Collection test.
+ */
 class CollectionTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -14,6 +17,9 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
      */
     protected $_model;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->_model = new \Magento\Framework\Data\Collection(
@@ -21,6 +27,11 @@ protected function setUp()
         );
     }
 
+    /**
+     * Test for method removeAllItems.
+     *
+     * @return void
+     */
     public function testRemoveAllItems()
     {
         $this->_model->addItem(new \Magento\Framework\DataObject());
@@ -32,6 +43,7 @@ public function testRemoveAllItems()
 
     /**
      * Test loadWithFilter()
+     *
      * @return void
      */
     public function testLoadWithFilter()
@@ -44,6 +56,8 @@ public function testLoadWithFilter()
     }
 
     /**
+     * Test for method etItemObjectClass.
+     *
      * @dataProvider setItemObjectClassDataProvider
      */
     public function testSetItemObjectClass($class)
@@ -53,6 +67,8 @@ public function testSetItemObjectClass($class)
     }
 
     /**
+     * Data provider.
+     *
      * @return array
      */
     public function setItemObjectClassDataProvider()
@@ -61,6 +77,8 @@ public function setItemObjectClassDataProvider()
     }
 
     /**
+     * Test for method setItemObjectClass with exception.
+     *
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Incorrect_ClassName does not extend \Magento\Framework\DataObject
      */
@@ -69,12 +87,22 @@ public function testSetItemObjectClassException()
         $this->_model->setItemObjectClass('Incorrect_ClassName');
     }
 
+    /**
+     * Test for method addFilter.
+     *
+     * @return void
+     */
     public function testAddFilter()
     {
         $this->_model->addFilter('field1', 'value');
         $this->assertEquals('field1', $this->_model->getFilter('field1')->getData('field'));
     }
 
+    /**
+     * Test for method getFilters.
+     *
+     * @return void
+     */
     public function testGetFilters()
     {
         $this->_model->addFilter('field1', 'value');
@@ -83,12 +111,22 @@ public function testGetFilters()
         $this->assertEquals('field2', $this->_model->getFilter(['field1', 'field2'])[1]->getData('field'));
     }
 
+    /**
+     * Test for method get non existion filters.
+     *
+     * @return void
+     */
     public function testGetNonExistingFilters()
     {
         $this->assertEmpty($this->_model->getFilter([]));
         $this->assertEmpty($this->_model->getFilter('non_existing_filter'));
     }
 
+    /**
+     * Test for lag.
+     *
+     * @return void
+     */
     public function testFlag()
     {
         $this->_model->setFlag('flag_name', 'flag_value');
@@ -97,12 +135,22 @@ public function testFlag()
         $this->assertNull($this->_model->getFlag('non_existing_flag'));
     }
 
+    /**
+     * Test for method getCurPage.
+     *
+     * @return void
+     */
     public function testGetCurPage()
     {
-        $this->_model->setCurPage(10);
+        $this->_model->setCurPage(1);
         $this->assertEquals(1, $this->_model->getCurPage());
     }
 
+    /**
+     * Test for method possibleFlowWithItem.
+     *
+     * @return void
+     */
     public function testPossibleFlowWithItem()
     {
         $firstItemMock = $this->createPartialMock(\Magento\Framework\DataObject::class, ['getId', 'getData', 'toArray']);
@@ -164,6 +212,11 @@ public function testPossibleFlowWithItem()
         $this->assertEquals([], $this->_model->getItems());
     }
 
+    /**
+     * Test for method eachCallsMethodOnEachItemWithNoArgs.
+     *
+     * @return void
+     */
     public function testEachCallsMethodOnEachItemWithNoArgs()
     {
         for ($i = 0; $i < 3; $i++) {
@@ -173,7 +226,12 @@ public function testEachCallsMethodOnEachItemWithNoArgs()
         }
         $this->_model->each('testCallback');
     }
-    
+
+    /**
+     * Test for method eachCallsMethodOnEachItemWithArgs.
+     *
+     * @return void
+     */
     public function testEachCallsMethodOnEachItemWithArgs()
     {
         for ($i = 0; $i < 3; $i++) {
@@ -184,6 +242,11 @@ public function testEachCallsMethodOnEachItemWithArgs()
         $this->_model->each('testCallback', ['a', 'b', 'c']);
     }
 
+    /**
+     * Test for method callsClosureWithEachItemAndNoArgs.
+     *
+     * @return void
+     */
     public function testCallsClosureWithEachItemAndNoArgs()
     {
         for ($i = 0; $i < 3; $i++) {
@@ -196,6 +259,11 @@ public function testCallsClosureWithEachItemAndNoArgs()
         });
     }
 
+    /**
+     * Test for method callsClosureWithEachItemAndArgs.
+     *
+     * @return void
+     */
     public function testCallsClosureWithEachItemAndArgs()
     {
         for ($i = 0; $i < 3; $i++) {
@@ -208,6 +276,11 @@ public function testCallsClosureWithEachItemAndArgs()
         }, ['a', 'b', 'c']);
     }
 
+    /**
+     * Test for method callsCallableArrayWithEachItemNoArgs.
+     *
+     * @return void
+     */
     public function testCallsCallableArrayWithEachItemNoArgs()
     {
         $mockCallbackObject = $this->getMockBuilder('DummyEachCallbackInstance')
@@ -226,6 +299,11 @@ public function testCallsCallableArrayWithEachItemNoArgs()
         $this->_model->each([$mockCallbackObject, 'testObjCallback']);
     }
 
+    /**
+     * Test for method callsCallableArrayWithEachItemAndArgs.
+     *
+     * @return void
+     */
     public function testCallsCallableArrayWithEachItemAndArgs()
     {
         $mockCallbackObject = $this->getMockBuilder('DummyEachCallbackInstance')
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
index a85c1f4aa450c..f7585b8d62e19 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
@@ -3,12 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+namespace Magento\Framework\Data\Test\Unit\Form\Element;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Tests for \Magento\Framework\Data\Form\Element\AbstractElement
  */
-namespace Magento\Framework\Data\Test\Unit\Form\Element;
-
 class AbstractElementTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -27,9 +28,9 @@ class AbstractElementTest extends \PHPUnit\Framework\TestCase
     protected $_collectionFactoryMock;
 
     /**
-     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Escaper
      */
-    protected $_escaperMock;
+    protected $_escaper;
 
     protected function setUp()
     {
@@ -37,14 +38,15 @@ protected function setUp()
             $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
         $this->_collectionFactoryMock =
             $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
-        $this->_escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $objectManager = new ObjectManager($this);
+        $this->_escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
 
         $this->_model = $this->getMockForAbstractClass(
             \Magento\Framework\Data\Form\Element\AbstractElement::class,
             [
                 $this->_factoryMock,
                 $this->_collectionFactoryMock,
-                $this->_escaperMock
+                $this->_escaper
             ]
         );
     }
@@ -241,9 +243,9 @@ public function testRemoveClass()
      */
     public function testGetEscapedValueWithoutFilter()
     {
-        $this->_model->setValue('<a href="#hash_tag">my \'quoted\' string</a>');
+        $this->_model->setValue('<a href="#hash_tag">my &#039;quoted&#039; string</a>');
         $this->assertEquals(
-            '&lt;a href=&quot;#hash_tag&quot;&gt;my \'quoted\' string&lt;/a&gt;',
+            '&lt;a href=&quot;#hash_tag&quot;&gt;my &#039;quoted&#039; string&lt;/a&gt;',
             $this->_model->getEscapedValue()
         );
     }
@@ -253,8 +255,8 @@ public function testGetEscapedValueWithoutFilter()
      */
     public function testGetEscapedValueWithFilter()
     {
-        $value = '<a href="#hash_tag">my \'quoted\' string</a>';
-        $expectedValue = '&lt;a href=&quot;#hash_tag&quot;&gt;my \'quoted\' string&lt;/a&gt;';
+        $value = '<a href="#hash_tag">my &#039;quoted&#039; string</a>';
+        $expectedValue = '&lt;a href=&quot;#hash_tag&quot;&gt;my &#039;quoted&#039; string&lt;/a&gt;';
 
         $filterMock = $this->createPartialMock(\Magento\Framework\DataObject::class, ['filter']);
         $filterMock->expects($this->once())
@@ -302,7 +304,7 @@ public function testGetLabelHtml(array $initialData, $expectedValue)
     /**
      * @param array $initialData
      * @param string $expectedValue
-     * @dataProvider testGetDefaultHtmlDataProvider
+     * @dataProvider defaultHtmlDataProvider
      * @covers \Magento\Framework\Data\Form\Element\AbstractElement::getDefaultHtml()
      */
     public function testGetDefaultHtml(array $initialData, $expectedValue)
@@ -423,9 +425,6 @@ public function testGetHtmlContainerIdWithFieldContainerIdPrefix()
      */
     public function testAddElementValues(array $initialData, $expectedValue)
     {
-        $this->_escaperMock->expects($this->any())
-            ->method('escapeHtml')
-            ->will($this->returnArgument(0));
         $this->_model->setValues($initialData['initial_values']);
         $this->_model->addElementValues($initialData['add_values'], $initialData['overwrite']);
 
@@ -522,7 +521,7 @@ public function serializeDataProvider()
     /**
      * @return array
      */
-    public function testGetDefaultHtmlDataProvider()
+    public function defaultHtmlDataProvider()
     {
         return [
             [
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LabelTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LabelTest.php
index 8420f8e421f7b..ec625a1cdd4a5 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LabelTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LabelTest.php
@@ -3,18 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+namespace Magento\Framework\Data\Test\Unit\Form\Element;
 
 /**
  * Tests for \Magento\Framework\Data\Form\Element\Label
  */
-namespace Magento\Framework\Data\Test\Unit\Form\Element;
-
 class LabelTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_objectManagerMock;
+    /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
+    private $objectManager;
 
     /**
      * @var \Magento\Framework\Data\Form\Element\Label
@@ -25,11 +22,14 @@ protected function setUp()
     {
         $factoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
         $collectionFactoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
-        $escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $escaper = $this->objectManager->getObject(
+            \Magento\Framework\Escaper::class
+        );
         $this->_label = new \Magento\Framework\Data\Form\Element\Label(
             $factoryMock,
             $collectionFactoryMock,
-            $escaperMock
+            $escaper
         );
     }
 
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php
index a2a40ee03b044..d347fed13ed65 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php
@@ -26,6 +26,7 @@ protected function setUp()
         $factoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
         $collectionFactoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
         $escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $escaperMock->method('escapeHtml')->willReturnArgument(0);
         $this->_link = new \Magento\Framework\Data\Form\Element\Link(
             $factoryMock,
             $collectionFactoryMock,
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultilineTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultilineTest.php
index 9a391da4d65dd..85482e05188ab 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultilineTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultilineTest.php
@@ -5,8 +5,14 @@
  */
 namespace Magento\Framework\Data\Test\Unit\Form\Element;
 
+/**
+ * Test for \Magento\Framework\Data\Form\Element\Multiline
+ */
 class MultilineTest extends \PHPUnit\Framework\TestCase
 {
+    /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
+    private $objectManager;
+
     /**
      * @var \Magento\Framework\Data\Form\Element\Multiline
      */
@@ -37,9 +43,11 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->escaper = $this->getMockBuilder(\Magento\Framework\Escaper::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->escaper = $this->objectManager->getObject(
+            \Magento\Framework\Escaper::class
+        );
 
         $this->element = new \Magento\Framework\Data\Form\Element\Multiline(
             $this->elementFactory,
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
index 6d1680a9f38a6..ed2b04e47b7a0 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
@@ -7,6 +7,11 @@
 
 class MultiselectTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $escaperMock;
+
     /**
      * @var \Magento\Framework\Data\Form\Element\Multiselect
      */
@@ -15,7 +20,12 @@ class MultiselectTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_model = $testHelper->getObject(\Magento\Framework\Data\Form\Element\Editablemultiselect::class);
+        $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $this->escaperMock->method('escapeHtml')->willReturnArgument(0);
+        $this->_model = $testHelper->getObject(
+            \Magento\Framework\Data\Form\Element\Editablemultiselect::class,
+            ['escaper' => $this->escaperMock]
+        );
         $this->_model->setForm(new \Magento\Framework\DataObject());
     }
 
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php
index f77f4a816a1af..d58bc8639e82f 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php
@@ -26,6 +26,7 @@ protected function setUp()
         $factoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
         $collectionFactoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
         $escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $escaperMock->method('escapeHtml')->willReturnArgument(0);
         $this->_model = new \Magento\Framework\Data\Form\Element\Note(
             $factoryMock,
             $collectionFactoryMock,
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ObscureTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ObscureTest.php
index bb0b67a40abea..cec024fd4073b 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ObscureTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ObscureTest.php
@@ -3,18 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+namespace Magento\Framework\Data\Test\Unit\Form\Element;
 
 /**
  * Tests for \Magento\Framework\Data\Form\Element\Obscure
  */
-namespace Magento\Framework\Data\Test\Unit\Form\Element;
-
 class ObscureTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_objectManagerMock;
+    /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
+    private $objectManager;
 
     /**
      * @var \Magento\Framework\Data\Form\Element\Obscure
@@ -25,11 +22,14 @@ protected function setUp()
     {
         $factoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
         $collectionFactoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
-        $escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $escaper = $this->objectManager->getObject(
+            \Magento\Framework\Escaper::class
+        );
         $this->_model = new \Magento\Framework\Data\Form\Element\Obscure(
             $factoryMock,
             $collectionFactoryMock,
-            $escaperMock
+            $escaper
         );
         $formMock = new \Magento\Framework\DataObject();
         $formMock->getHtmlIdPrefix('id_prefix');
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/FormKeyTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/FormKeyTest.php
index 5d765955f3673..eb642278694c0 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/FormKeyTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/FormKeyTest.php
@@ -10,6 +10,9 @@
 use Magento\Framework\Math\Random;
 use Magento\Framework\Session\SessionManager;
 
+/**
+ * Class FormKeyTest
+ */
 class FormKeyTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -38,7 +41,7 @@ protected function setUp()
         $methods = ['setData', 'getData'];
         $this->sessionMock = $this->createPartialMock(\Magento\Framework\Session\SessionManager::class, $methods);
         $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
-        $this->escaperMock->expects($this->any())->method('escapeHtmlAttr')->willReturnArgument(0);
+        $this->escaperMock->expects($this->any())->method('escapeJs')->willReturnArgument(0);
         $this->formKey = new FormKey(
             $this->mathRandomMock,
             $this->sessionMock,
diff --git a/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php b/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php
index 832fd18b48606..94990c0340a83 100644
--- a/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php
@@ -17,7 +17,7 @@
 /**
  * @api
  */
-class Collection implements \ArrayAccess, \IteratorAggregate
+class Collection implements \ArrayAccess, \IteratorAggregate, \Countable
 {
     /**
      * @var array
diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_crypt_fixtures.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_crypt_fixtures.php
index 1b96b756f5ff0..0fbe6515c80b2 100644
--- a/lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_crypt_fixtures.php
+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/Crypt/_files/_crypt_fixtures.php
@@ -30,14 +30,6 @@
     5 => '',
   ],
   3 => [
-    0 => '5d304b80fbe2f6d6eaa51103d7558368e15f843b005fbd6353b7d0dd',
-    1 => 'blowfish',
-    2 => 'ofb',
-    3 => 'a8e85663',
-    4 => '',
-    5 => '',
-  ],
-  4 => [
     0 => 'f33d7a68248758b77863569a9caa08271fcda17eb3903e8c8f01ea48',
     1 => 'blowfish',
     2 => 'nofb',
@@ -45,7 +37,7 @@
     4 => '',
     5 => '',
   ],
-  5 => [
+  4 => [
     0 => '7e34794ae07b3540a683cfd47b24a039',
     1 => 'rijndael-128',
     2 => 'ecb',
@@ -53,7 +45,7 @@
     4 => '',
     5 => '',
   ],
-  6 => [
+  5 => [
     0 => 'eed11fb167c5ba7c6666b0379d3f0efd',
     1 => 'rijndael-128',
     2 => 'cbc',
@@ -61,7 +53,7 @@
     4 => '',
     5 => '',
   ],
-  7 => [
+  6 => [
     0 => 'b0baa1454a71e4902d2f21cca5822a43',
     1 => 'rijndael-128',
     2 => 'cfb',
@@ -69,15 +61,7 @@
     4 => '',
     5 => '',
   ],
-  8 => [
-    0 => '097577dd9bd37a37670d4ffac6db71ca',
-    1 => 'rijndael-128',
-    2 => 'ofb',
-    3 => '9662705b5c8a92e2',
-    4 => '',
-    5 => '',
-  ],
-  9 => [
+  7 => [
     0 => '26283c5ee61006051e109fb13cbeadd4',
     1 => 'rijndael-128',
     2 => 'nofb',
@@ -85,7 +69,7 @@
     4 => '',
     5 => '',
   ],
-  10 => [
+  8 => [
     0 => '912940718c6991dcc9927fe1357a59eb',
     1 => 'rijndael-256',
     2 => 'ecb',
@@ -93,7 +77,7 @@
     4 => '',
     5 => '',
   ],
-  11 => [
+  9 => [
     0 => '22eaec79b2ae279beac05375f1dd301f',
     1 => 'rijndael-256',
     2 => 'cbc',
@@ -101,7 +85,7 @@
     4 => '',
     5 => '',
   ],
-  12 => [
+  10 => [
     0 => '331ff7ee00849ef02acfcc4a4c44b002',
     1 => 'rijndael-256',
     2 => 'cfb',
@@ -109,15 +93,7 @@
     4 => '',
     5 => '',
   ],
-  13 => [
-    0 => '52b9991fb182434f8ef64db604c1946a',
-    1 => 'rijndael-256',
-    2 => 'ofb',
-    3 => '95118150491d3acb936fed8f8aad942a',
-    4 => '',
-    5 => '',
-  ],
-  14 => [
+  11 => [
     0 => '42cba7ea2c940077df289a594170c846',
     1 => 'rijndael-256',
     2 => 'nofb',
@@ -125,7 +101,7 @@
     4 => '',
     5 => '',
   ],
-  15 => [
+  12 => [
     0 => '72f761d4c435986911087485b8664d40b28d12f818eca42edf84fecd',
     1 => 'blowfish',
     2 => 'ecb',
@@ -133,7 +109,7 @@
     4 => 'Hello world!!!',
     5 => 'UObRTUnq3jCNZjJOxwNubA==',
   ],
-  16 => [
+  13 => [
     0 => '63341175e4edd8ef27ea0d754f985b6bbfddd29b381ea8473a450b8c',
     1 => 'blowfish',
     2 => 'cbc',
@@ -141,7 +117,7 @@
     4 => 'Hello world!!!',
     5 => '18QUXHt++6HiTQynQ4nUkg==',
   ],
-  17 => [
+  14 => [
     0 => '5c4beba2e7571460dd0c2a6971dec5d707b6d8681a69e927ba8fac9f',
     1 => 'blowfish',
     2 => 'cfb',
@@ -149,15 +125,7 @@
     4 => 'Hello world!!!',
     5 => '11ubM60SiGkecJRFZMQ=',
   ],
-  18 => [
-    0 => '073f901024e51b0ab85cf5944a90aea92bf353083ff642024f61a62d',
-    1 => 'blowfish',
-    2 => 'ofb',
-    3 => 'a9b4f0ca',
-    4 => 'Hello world!!!',
-    5 => 'SqliQR1lHxY4r/HCgoI=',
-  ],
-  19 => [
+  15 => [
     0 => '56df989b718351624480eb7776f827da7caf7996a6aa38dfa3e7328a',
     1 => 'blowfish',
     2 => 'nofb',
@@ -165,7 +133,7 @@
     4 => 'Hello world!!!',
     5 => 'vkPrtkjZ9TPapsG1sEY=',
   ],
-  20 => [
+  16 => [
     0 => '6f326ec41c0e1d17fc030018043c0862',
     1 => 'rijndael-128',
     2 => 'ecb',
@@ -173,7 +141,7 @@
     4 => 'Hello world!!!',
     5 => 'dYsG1NhOM0lvXj32RqXJuw==',
   ],
-  21 => [
+  17 => [
     0 => '7891bd79c8bae053e795733dd6b99d4e',
     1 => 'rijndael-128',
     2 => 'cbc',
@@ -181,7 +149,7 @@
     4 => 'Hello world!!!',
     5 => '5rMjKp16UzjD1rxcTFqNfg==',
   ],
-  22 => [
+  18 => [
     0 => '247ec5c7e7fa07628090ed1e07bc601f',
     1 => 'rijndael-128',
     2 => 'cfb',
@@ -189,15 +157,7 @@
     4 => 'Hello world!!!',
     5 => 'OOhZb1g3owMU05jD2qk=',
   ],
-  23 => [
-    0 => '0cedc5085da7c010a4136f7cc4c8f073',
-    1 => 'rijndael-128',
-    2 => 'ofb',
-    3 => 'f7cf137c927714de',
-    4 => 'Hello world!!!',
-    5 => 'iq9Kx0artzuKew+HWpU=',
-  ],
-  24 => [
+  19 => [
     0 => 'a0374d4b62c0394e01407f4133bc61c1',
     1 => 'rijndael-128',
     2 => 'nofb',
@@ -205,7 +165,7 @@
     4 => 'Hello world!!!',
     5 => 'gO5d+xbHk8E+8EH308E=',
   ],
-  25 => [
+  20 => [
     0 => 'afa6f9c61c9199e2e4b6a1426dead6d4',
     1 => 'rijndael-256',
     2 => 'ecb',
@@ -213,7 +173,7 @@
     4 => 'Hello world!!!',
     5 => 'qTO/oVNzMhFZCnjCY90IuMuJcb7UVa7SXygKHWExX70=',
   ],
-  26 => [
+  21 => [
     0 => '774bb6dac74b24796469d1865df679be',
     1 => 'rijndael-256',
     2 => 'cbc',
@@ -221,7 +181,7 @@
     4 => 'Hello world!!!',
     5 => '4APJzBRpwuZSqbIfr/GPS+Zb8wV/uo9qNSOvk68cGRM=',
   ],
-  27 => [
+  22 => [
     0 => '0a319daff472006ec9d10a70920dd592',
     1 => 'rijndael-256',
     2 => 'cfb',
@@ -229,15 +189,7 @@
     4 => 'Hello world!!!',
     5 => 'GbcnmzgYRB+4ETtw5zQ=',
   ],
-  28 => [
-    0 => '4fbd81fce821dd6042b46051eddcc300',
-    1 => 'rijndael-256',
-    2 => 'ofb',
-    3 => 'b78b752f32a9788347f6f70e7a5fe1f0',
-    4 => 'Hello world!!!',
-    5 => 'PvbnFhmV0tej2c6zVIc=',
-  ],
-  29 => [
+  23 => [
     0 => 'c183b2078424e7c9c129ba425421c0eb',
     1 => 'rijndael-256',
     2 => 'nofb',
diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php
index 6a65124b15f4c..2f6a3edb0879d 100644
--- a/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php
+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/CryptTest.php
@@ -9,20 +9,19 @@
  */
 namespace Magento\Framework\Encryption\Test\Unit;
 
+/**
+ *
+ */
 class CryptTest extends \PHPUnit\Framework\TestCase
 {
     private $_key;
 
     private static $_cipherInfo;
 
-    protected $_supportedCiphers = [MCRYPT_BLOWFISH, MCRYPT_RIJNDAEL_128, MCRYPT_RIJNDAEL_256];
-
-    protected $_supportedModes = [
-        MCRYPT_MODE_ECB,
-        MCRYPT_MODE_CBC,
-        MCRYPT_MODE_CFB,
-        MCRYPT_MODE_OFB,
-        MCRYPT_MODE_NOFB,
+    protected $_supportedCiphersModeCombinations = [
+        MCRYPT_BLOWFISH => [MCRYPT_MODE_ECB],
+        MCRYPT_RIJNDAEL_128 => [MCRYPT_MODE_ECB],
+        MCRYPT_RIJNDAEL_256 => [MCRYPT_MODE_CBC],
     ];
 
     protected function setUp()
@@ -32,7 +31,6 @@ protected function setUp()
 
     /**
      * @param $length
-     *
      * @return bool|string
      */
     protected function _getRandomString($length)
@@ -47,23 +45,7 @@ protected function _getRandomString($length)
     protected function _requireCipherInfo()
     {
         $filename = __DIR__ . '/Crypt/_files/_cipher_info.php';
-        /* Generate allowed sizes for encryption key and init vector
-           $data = array();
-           foreach ($this->_supportedCiphers as $cipher) {
-           if (!array_key_exists($cipher, $data)) {
-           $data[$cipher] = array();
-           }
-           foreach ($this->_supportedModes as $mode) {
-           $cipherHandle = mcrypt_module_open($cipher, '', $mode, '');
-           $data[$cipher][$mode] = array(
-           'key_size' => mcrypt_enc_get_key_size($cipherHandle),
-           'iv_size'  => mcrypt_enc_get_iv_size($cipherHandle),
-           );
-           mcrypt_module_close($cipherHandle);
-           }
-           }
-           file_put_contents($filename, '<?php return ' . var_export($data, true) . ";\n", LOCK_EX);
-           */
+
         if (!self::$_cipherInfo) {
             self::$_cipherInfo = include $filename;
         }
@@ -72,7 +54,6 @@ protected function _requireCipherInfo()
     /**
      * @param $cipherName
      * @param $modeName
-     *
      * @return mixed
      */
     protected function _getKeySize($cipherName, $modeName)
@@ -84,7 +65,6 @@ protected function _getKeySize($cipherName, $modeName)
     /**
      * @param $cipherName
      * @param $modeName
-     *
      * @return mixed
      */
     protected function _getInitVectorSize($cipherName, $modeName)
@@ -96,12 +76,13 @@ protected function _getInitVectorSize($cipherName, $modeName)
     /**
      * @return array
      */
-    public function getCipherModeCombinations()
+    public function getCipherModeCombinations(): array
     {
         $result = [];
-        foreach ($this->_supportedCiphers as $cipher) {
-            foreach ($this->_supportedModes as $mode) {
-                $result[] = [$cipher, $mode];
+        foreach ($this->_supportedCiphersModeCombinations as $cipher => $modes) {
+            /** @var array $modes */
+            foreach ($modes as $mode) {
+                $result[$cipher . '-' . $mode] = [$cipher, $mode];
             }
         }
         return $result;
@@ -127,15 +108,18 @@ public function testConstructor($cipher, $mode)
      */
     public function getConstructorExceptionData()
     {
+        $key = substr(__CLASS__, -32, 32);
         $result = [];
-        foreach ($this->_supportedCiphers as $cipher) {
-            foreach ($this->_supportedModes as $mode) {
+        foreach ($this->_supportedCiphersModeCombinations as $cipher => $modes) {
+            /** @var array $modes */
+            foreach ($modes as $mode) {
                 $tooLongKey = str_repeat('-', $this->_getKeySize($cipher, $mode) + 1);
                 $tooShortInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) - 1);
                 $tooLongInitVector = str_repeat('-', $this->_getInitVectorSize($cipher, $mode) + 1);
-                $result[] = [$tooLongKey, $cipher, $mode, false];
-                $result[] = [$this->_key, $cipher, $mode, $tooShortInitVector];
-                $result[] = [$this->_key, $cipher, $mode, $tooLongInitVector];
+                $result['tooLongKey-' . $cipher . '-' . $mode . '-false'] = [$tooLongKey, $cipher, $mode, false];
+                $keyPrefix = 'key-' . $cipher . '-' . $mode;
+                $result[$keyPrefix . '-tooShortInitVector'] = [$key, $cipher, $mode, $tooShortInitVector];
+                $result[$keyPrefix . '-tooLongInitVector'] = [$key, $cipher, $mode, $tooLongInitVector];
             }
         }
         return $result;
@@ -166,27 +150,7 @@ public function testConstructorDefaults()
     public function getCryptData()
     {
         $fixturesFilename = __DIR__ . '/Crypt/_files/_crypt_fixtures.php';
-        /* Generate fixtures
-           $fixtures = array();
-           foreach (array('', 'Hello world!!!') as $inputString) {
-           foreach ($this->_supportedCiphers as $cipher) {
-           foreach ($this->_supportedModes as $mode) {
-           $randomKey = $this->_getRandomString($this->_getKeySize($cipher, $mode));
-           $randomInitVector = $this->_getRandomString($this->_getInitVectorSize($cipher, $mode));
-           $crypt = new \Magento\Framework\Encryption\Crypt($randomKey, $cipher, $mode, $randomInitVector);
-           $fixtures[] = array(
-           $randomKey, // Encryption key
-           $cipher,
-           $mode,
-           $randomInitVector, // Init vector
-           $inputString, // String to encrypt
-           base64_encode($crypt->encrypt($inputString)) // Store result of encryption as base64
-           );
-           }
-           }
-           }
-           file_put_contents($fixturesFilename, '<?php return ' . var_export($fixtures, true) . ";\n", LOCK_EX);
-           */
+
         $result = include $fixturesFilename;
         /* Restore encoded string back to binary */
         foreach ($result as &$cryptParams) {
diff --git a/lib/internal/Magento/Framework/Escaper.php b/lib/internal/Magento/Framework/Escaper.php
index fec64378189eb..7eb7a8f11ba99 100644
--- a/lib/internal/Magento/Framework/Escaper.php
+++ b/lib/internal/Magento/Framework/Escaper.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework;
 
 /**
@@ -12,6 +13,11 @@
  */
 class Escaper
 {
+    /**
+     * HTML special characters flag
+     */
+    private $htmlSpecialCharsFlag = ENT_QUOTES | ENT_SUBSTITUTE;
+
     /**
      * @var \Magento\Framework\ZendEscaper
      */
@@ -32,14 +38,24 @@ class Escaper
      */
     private $allowedAttributes = ['id', 'class', 'href', 'target', 'title', 'style'];
 
+    /**
+     * @var string
+     */
+    private static $xssFiltrationPattern =
+        '/((javascript(\\\\x3a|:|%3A))|(data(\\\\x3a|:|%3A))|(vbscript:))|'
+        . '((\\\\x6A\\\\x61\\\\x76\\\\x61\\\\x73\\\\x63\\\\x72\\\\x69\\\\x70\\\\x74(\\\\x3a|:|%3A))|'
+        . '(\\\\x64\\\\x61\\\\x74\\\\x61(\\\\x3a|:|%3A)))/i';
+
     /**
      * @var string[]
      */
     private $escapeAsUrlAttributes = ['href'];
 
     /**
-     * Escape string for HTML context. allowedTags will not be escaped, except the following: script, img, embed,
-     * iframe, video, source, object, audio
+     * Escape string for HTML context.
+     *
+     * AllowedTags will not be escaped, except the following: script, img, embed,
+     * iframe, video, source, object, audio.
      *
      * @param string|array $data
      * @param array|null $allowedTags
@@ -47,6 +63,10 @@ class Escaper
      */
     public function escapeHtml($data, $allowedTags = null)
     {
+        if (!is_array($data)) {
+            $data = (string)$data;
+        }
+
         if (is_array($data)) {
             $result = [];
             foreach ($data as $item) {
@@ -54,28 +74,22 @@ public function escapeHtml($data, $allowedTags = null)
             }
         } elseif (strlen($data)) {
             if (is_array($allowedTags) && !empty($allowedTags)) {
-                $notAllowedTags = array_intersect(
-                    array_map('strtolower', $allowedTags),
-                    $this->notAllowedTags
-                );
-                if (!empty($notAllowedTags)) {
-                    $this->getLogger()->critical(
-                        'The following tag(s) are not allowed: ' . implode(', ', $notAllowedTags)
-                    );
-                    $allowedTags = array_diff($allowedTags, $this->notAllowedTags);
-                }
+                $allowedTags = $this->filterProhibitedTags($allowedTags);
                 $wrapperElementId = uniqid();
                 $domDocument = new \DOMDocument('1.0', 'UTF-8');
                 set_error_handler(
                     function ($errorNumber, $errorString) {
+                        // phpcs:ignore Magento2.Exceptions.DirectThrow
                         throw new \Exception($errorString, $errorNumber);
                     }
                 );
+                $data = $this->prepareUnescapedCharacters($data);
                 $string = mb_convert_encoding($data, 'HTML-ENTITIES', 'UTF-8');
                 try {
                     $domDocument->loadHTML(
                         '<html><body id="' . $wrapperElementId . '">' . $string . '</body></html>'
                     );
+                    // phpcs:disable Magento2.Exceptions.ThrowCatch
                 } catch (\Exception $e) {
                     restore_error_handler();
                     $this->getLogger()->critical($e);
@@ -91,7 +105,7 @@ function ($errorNumber, $errorString) {
                 preg_match('/<body id="' . $wrapperElementId . '">(.+)<\/body><\/html>$/si', $result, $matches);
                 return !empty($matches) ? $matches[1] : '';
             } else {
-                $result = htmlspecialchars($data, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8', false);
+                $result = htmlspecialchars($data, $this->htmlSpecialCharsFlag, 'UTF-8', false);
             }
         } else {
             $result = $data;
@@ -99,6 +113,19 @@ function ($errorNumber, $errorString) {
         return $result;
     }
 
+    /**
+     * Used to replace characters, that mb_convert_encoding will not process
+     *
+     * @param string $data
+     * @return string|null
+     */
+    private function prepareUnescapedCharacters(string $data)
+    {
+        $patterns = ['/\&/u'];
+        $replacements = ['&amp;'];
+        return \preg_replace($patterns, $replacements, $data);
+    }
+
     /**
      * Remove not allowed tags
      *
@@ -197,7 +224,7 @@ public function escapeHtmlAttr($string, $escapeSingleQuote = true)
         if ($escapeSingleQuote) {
             return $this->getEscaper()->escapeHtmlAttr((string) $string);
         }
-        return htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false);
+        return htmlspecialchars((string)$string, $this->htmlSpecialCharsFlag, 'UTF-8', false);
     }
 
     /**
@@ -278,14 +305,13 @@ public function escapeJsQuote($data, $quote = '\'')
                 $result[] = $this->escapeJsQuote($item, $quote);
             }
         } else {
-            $result = str_replace($quote, '\\' . $quote, $data);
+            $result = str_replace($quote, '\\' . $quote, (string)$data);
         }
         return $result;
     }
 
     /**
      * Escape xss in urls
-     * Remove `javascript:`, `vbscript:`, `data:` words from url
      *
      * @param string $data
      * @return string
@@ -293,15 +319,33 @@ public function escapeJsQuote($data, $quote = '\'')
      */
     public function escapeXssInUrl($data)
     {
-        $pattern = '/((javascript(\\\\x3a|:|%3A))|(data(\\\\x3a|:|%3A))|(vbscript:))|'
-            . '((\\\\x6A\\\\x61\\\\x76\\\\x61\\\\x73\\\\x63\\\\x72\\\\x69\\\\x70\\\\x74(\\\\x3a|:|%3A))|'
-            . '(\\\\x64\\\\x61\\\\x74\\\\x61(\\\\x3a|:|%3A)))/i';
-        $result = preg_replace($pattern, ':', $data);
-        return htmlspecialchars($result, ENT_COMPAT | ENT_HTML5 | ENT_HTML401, 'UTF-8', false);
+        return htmlspecialchars(
+            $this->escapeScriptIdentifiers((string)$data),
+            $this->htmlSpecialCharsFlag | ENT_HTML5 | ENT_HTML401,
+            'UTF-8',
+            false
+        );
+    }
+
+    /**
+     * Remove `javascript:`, `vbscript:`, `data:` words from the string.
+     *
+     * @param string $data
+     * @return string
+     */
+    private function escapeScriptIdentifiers(string $data): string
+    {
+        $filteredData = preg_replace(self::$xssFiltrationPattern, ':', $data) ?: '';
+        if (preg_match(self::$xssFiltrationPattern, $filteredData)) {
+            $filteredData = $this->escapeScriptIdentifiers($filteredData);
+        }
+
+        return $filteredData;
     }
 
     /**
      * Escape quotes inside html attributes
+     *
      * Use $addSlashes = false for escaping js that inside html attribute (onClick, onSubmit etc)
      *
      * @param string $data
@@ -314,7 +358,7 @@ public function escapeQuote($data, $addSlashes = false)
         if ($addSlashes === true) {
             $data = addslashes($data);
         }
-        return htmlspecialchars($data, ENT_QUOTES, null, false);
+        return htmlspecialchars($data, $this->htmlSpecialCharsFlag, null, false);
     }
 
     /**
@@ -346,4 +390,27 @@ private function getLogger()
         }
         return $this->logger;
     }
+
+    /**
+     * Filter prohibited tags.
+     *
+     * @param string[] $allowedTags
+     * @return string[]
+     */
+    private function filterProhibitedTags(array $allowedTags): array
+    {
+        $notAllowedTags = array_intersect(
+            array_map('strtolower', $allowedTags),
+            $this->notAllowedTags
+        );
+
+        if (!empty($notAllowedTags)) {
+            $this->getLogger()->critical(
+                'The following tag(s) are not allowed: ' . implode(', ', $notAllowedTags)
+            );
+            $allowedTags = array_diff($allowedTags, $this->notAllowedTags);
+        }
+
+        return $allowedTags;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php b/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php
index a7a387b5def81..acd0a61633557 100644
--- a/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php
+++ b/lib/internal/Magento/Framework/Event/Invoker/InvokerDefault.php
@@ -9,7 +9,12 @@
 namespace Magento\Framework\Event\Invoker;
 
 use Magento\Framework\Event\Observer;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\App\State;
 
+/**
+ * Default Invoker.
+ */
 class InvokerDefault implements \Magento\Framework\Event\InvokerInterface
 {
     /**
@@ -22,20 +27,29 @@ class InvokerDefault implements \Magento\Framework\Event\InvokerInterface
     /**
      * Application state
      *
-     * @var \Magento\Framework\App\State
+     * @var State
      */
     protected $_appState;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param \Magento\Framework\Event\ObserverFactory $observerFactory
-     * @param \Magento\Framework\App\State $appState
+     * @param State $appState
+     * @param LoggerInterface $logger
      */
     public function __construct(
         \Magento\Framework\Event\ObserverFactory $observerFactory,
-        \Magento\Framework\App\State $appState
+        State $appState,
+        LoggerInterface $logger = null
     ) {
         $this->_observerFactory = $observerFactory;
         $this->_appState = $appState;
+        $this->logger = $logger ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(LoggerInterface::class);
     }
 
     /**
@@ -61,6 +75,8 @@ public function dispatch(array $configuration, Observer $observer)
     }
 
     /**
+     * Execute Observer.
+     *
      * @param \Magento\Framework\Event\ObserverInterface $object
      * @param Observer $observer
      * @return $this
@@ -70,7 +86,7 @@ protected function _callObserverMethod($object, $observer)
     {
         if ($object instanceof \Magento\Framework\Event\ObserverInterface) {
             $object->execute($observer);
-        } elseif ($this->_appState->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) {
+        } elseif ($this->_appState->getMode() == State::MODE_DEVELOPER) {
             throw new \LogicException(
                 sprintf(
                     'Observer "%s" must implement interface "%s"',
@@ -78,6 +94,12 @@ protected function _callObserverMethod($object, $observer)
                     \Magento\Framework\Event\ObserverInterface::class
                 )
             );
+        } else {
+            $this->logger->warning(sprintf(
+                'Observer "%s" must implement interface "%s"',
+                get_class($object),
+                \Magento\Framework\Event\ObserverInterface::class
+            ));
         }
         return $this;
     }
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/invalidEventsXmlArray.php b/lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/invalidEventsXmlArray.php
index 33007b7295bca..e0dc7494cca19 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/invalidEventsXmlArray.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/invalidEventsXmlArray.php
@@ -4,10 +4,6 @@
  * See COPYING.txt for license details.
  */
 return [
-    'without_event_handle' => [
-        '<?xml version="1.0"?><config></config>',
-        ["Element 'config': Missing child element(s). Expected is ( event ).\nLine: 1\n"],
-    ],
     'event_without_required_name_attribute' => [
         '<?xml version="1.0"?><config><event name="some_name"></event></config>',
         ["Element 'event': Missing child element(s). Expected is ( observer ).\nLine: 1\n"],
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php
index 37f650dbef6a0..e6ec123823854 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Invoker/InvokerDefaultTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Framework\Event\Test\Unit\Invoker;
 
+/**
+ * Test for Magento\Framework\Event\Invoker\InvokerDefault.
+ */
 class InvokerDefaultTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -32,6 +35,11 @@ class InvokerDefaultTest extends \PHPUnit\Framework\TestCase
      */
     protected $_invokerDefault;
 
+    /**
+     * @var |Psr\Log|LoggerInterface
+     */
+    private $loggerMock;
+
     protected function setUp()
     {
         $this->_observerFactoryMock = $this->createMock(\Magento\Framework\Event\ObserverFactory::class);
@@ -41,10 +49,12 @@ protected function setUp()
             ['execute']
         );
         $this->_appStateMock = $this->createMock(\Magento\Framework\App\State::class);
+        $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
 
         $this->_invokerDefault = new \Magento\Framework\Event\Invoker\InvokerDefault(
             $this->_observerFactoryMock,
-            $this->_appStateMock
+            $this->_appStateMock,
+            $this->loggerMock
         );
     }
 
@@ -166,13 +176,15 @@ public function testWrongInterfaceCallWithDisabledDeveloperMode($shared)
             $this->returnValue($notObserver)
         );
         $this->_appStateMock->expects(
-            $this->once()
+            $this->exactly(1)
         )->method(
             'getMode'
         )->will(
             $this->returnValue(\Magento\Framework\App\State::MODE_PRODUCTION)
         );
 
+        $this->loggerMock->expects($this->once())->method('warning');
+
         $this->_invokerDefault->dispatch(
             [
                 'shared' => $shared,
diff --git a/lib/internal/Magento/Framework/Event/etc/events.xsd b/lib/internal/Magento/Framework/Event/etc/events.xsd
index d656b7fdb6ed6..cac62af356760 100644
--- a/lib/internal/Magento/Framework/Event/etc/events.xsd
+++ b/lib/internal/Magento/Framework/Event/etc/events.xsd
@@ -9,7 +9,7 @@
     <xs:element name="config">
         <xs:complexType>
             <xs:sequence>
-                <xs:element name="event" type="eventDeclaration" minOccurs="1" maxOccurs="unbounded">
+                <xs:element name="event" type="eventDeclaration" minOccurs="0" maxOccurs="unbounded">
                     <xs:unique name="uniqueObserverName">
                         <xs:annotation>
                             <xs:documentation>
diff --git a/lib/internal/Magento/Framework/File/Uploader.php b/lib/internal/Magento/Framework/File/Uploader.php
index 6a1351c0feffd..28f04f54649d5 100644
--- a/lib/internal/Magento/Framework/File/Uploader.php
+++ b/lib/internal/Magento/Framework/File/Uploader.php
@@ -210,20 +210,22 @@ public function save($destinationFolder, $newFileName = null)
         $this->_result = false;
         $destinationFile = $destinationFolder;
         $fileName = isset($newFileName) ? $newFileName : $this->_file['name'];
-        $fileName = self::getCorrectFileName($fileName);
+        $fileName = static::getCorrectFileName($fileName);
         if ($this->_enableFilesDispersion) {
             $fileName = $this->correctFileNameCase($fileName);
             $this->setAllowCreateFolders(true);
-            $this->_dispretionPath = self::getDispersionPath($fileName);
+            $this->_dispretionPath = static::getDispersionPath($fileName);
             $destinationFile .= $this->_dispretionPath;
             $this->_createDestinationFolder($destinationFile);
         }
 
         if ($this->_allowRenameFiles) {
-            $fileName = self::getNewFileName(self::_addDirSeparator($destinationFile) . $fileName);
+            $fileName = static::getNewFileName(
+                static::_addDirSeparator($destinationFile) . $fileName
+            );
         }
 
-        $destinationFile = self::_addDirSeparator($destinationFile) . $fileName;
+        $destinationFile = static::_addDirSeparator($destinationFile) . $fileName;
 
         try {
             $this->_result = $this->_moveFile($this->_file['tmp_name'], $destinationFile);
@@ -547,7 +549,7 @@ private function _setUploadFileId($fileId)
 
             preg_match("/^(.*?)\[(.*?)\]$/", $fileId, $file);
 
-            if (count($file) > 0 && count($file[0]) > 0 && count($file[1]) > 0) {
+            if (is_array($file) && count($file) > 0 && !empty($file[0]) && !empty($file[1])) {
                 array_shift($file);
                 $this->_uploadType = self::MULTIPLE_STYLE;
 
@@ -560,7 +562,7 @@ private function _setUploadFileId($fileId)
 
                 $fileAttributes = $tmpVar;
                 $this->_file = $fileAttributes;
-            } elseif (count($fileId) > 0 && isset($_FILES[$fileId])) {
+            } elseif (!empty($fileId) && isset($_FILES[$fileId])) {
                 $this->_uploadType = self::SINGLE_STYLE;
                 $this->_file = $_FILES[$fileId];
             } elseif ($fileId == '') {
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/PathValidator.php b/lib/internal/Magento/Framework/Filesystem/Directory/PathValidator.php
new file mode 100644
index 0000000000000..8791fe88ab65f
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/PathValidator.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Filesystem\Directory;
+
+use Magento\Framework\Exception\ValidatorException;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\Framework\Phrase;
+
+/**
+ * {@inheritdoc}
+ *
+ * Validates paths using driver.
+ */
+class PathValidator implements PathValidatorInterface
+{
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
+    /**
+     * @param DriverInterface $driver
+     */
+    public function __construct(DriverInterface $driver)
+    {
+        $this->driver = $driver;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(
+        string $directoryPath,
+        string $path,
+        $scheme = null,
+        $absolutePath = false
+    ) {
+        $realDirectoryPath = $this->driver->getRealPathSafety($directoryPath);
+        if (mb_substr($realDirectoryPath, -1) !== DIRECTORY_SEPARATOR) {
+            $realDirectoryPath .= DIRECTORY_SEPARATOR;
+        }
+        if (!$absolutePath) {
+            $actualPath = $this->driver->getRealPathSafety(
+                $this->driver->getAbsolutePath(
+                    $realDirectoryPath,
+                    $path,
+                    $scheme
+                )
+            );
+        } else {
+            $actualPath = $this->driver->getRealPathSafety($path);
+        }
+
+        if (mb_strpos($actualPath, $realDirectoryPath) !== 0
+            && $path . DIRECTORY_SEPARATOR !== $realDirectoryPath
+        ) {
+            throw new ValidatorException(
+                new Phrase(
+                    'Path "%1" cannot be used with directory "%2"',
+                    [$path, $directoryPath]
+                )
+            );
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/PathValidatorInterface.php b/lib/internal/Magento/Framework/Filesystem/Directory/PathValidatorInterface.php
new file mode 100644
index 0000000000000..46f4efd2467fe
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/PathValidatorInterface.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Filesystem\Directory;
+
+use Magento\Framework\Exception\ValidatorException;
+
+/**
+ * Validate paths to be used with directories.
+ */
+interface PathValidatorInterface
+{
+    /**
+     * Validate if path can be used with a directory.
+     *
+     * @param string $directoryPath
+     * @param string $path
+     * @param string|null $scheme
+     * @param bool $absolutePath
+     * @throws ValidatorException
+     *
+     * @return void
+     */
+    public function validate(
+        string $directoryPath,
+        string $path,
+        $scheme = null,
+        $absolutePath = false
+    );
+}
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/Read.php b/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
index 18c93f2f4e1c8..d5de745b8fc09 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
@@ -6,6 +6,8 @@
 namespace Magento\Framework\Filesystem\Directory;
 
 use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\ValidatorException;
+use Magento\Framework\Filesystem\File\ReadFactoryInterface;
 
 /**
  * @api
@@ -33,21 +35,52 @@ class Read implements ReadInterface
      */
     protected $driver;
 
+    /**
+     * @var PathValidatorInterface
+     */
+    private $pathValidator;
+
     /**
      * Constructor. Set properties.
      *
      * @param \Magento\Framework\Filesystem\File\ReadFactory $fileFactory
      * @param \Magento\Framework\Filesystem\DriverInterface $driver
      * @param string $path
+     * @param PathValidatorInterface|null $pathValidator
      */
     public function __construct(
         \Magento\Framework\Filesystem\File\ReadFactory $fileFactory,
         \Magento\Framework\Filesystem\DriverInterface $driver,
-        $path
+        $path,
+        PathValidatorInterface $pathValidator = null
     ) {
         $this->fileFactory = $fileFactory;
         $this->driver = $driver;
         $this->setPath($path);
+        $this->pathValidator = $pathValidator;
+    }
+
+    /**
+     * @param string|null $path
+     * @param string|null $scheme
+     * @param bool $absolutePath
+     *
+     * @return void
+     * @throws ValidatorException
+     */
+    protected function validatePath(
+        $path = null,
+        $scheme = null,
+        $absolutePath = false
+    ) {
+        if ($path && $this->pathValidator) {
+            $this->pathValidator->validate(
+                $this->path,
+                $path,
+                $scheme,
+                $absolutePath
+            );
+        }
     }
 
     /**
@@ -70,9 +103,12 @@ protected function setPath($path)
      * @param string $path
      * @param string $scheme
      * @return string
+     * @throws ValidatorException
      */
     public function getAbsolutePath($path = null, $scheme = null)
     {
+        $this->validatePath($path, $scheme);
+
         return $this->driver->getAbsolutePath($this->path, $path, $scheme);
     }
 
@@ -81,9 +117,16 @@ public function getAbsolutePath($path = null, $scheme = null)
      *
      * @param string $path
      * @return string
+     * @throws ValidatorException
      */
     public function getRelativePath($path = null)
     {
+        $this->validatePath(
+            $path,
+            null,
+            $path && $path[0] === DIRECTORY_SEPARATOR
+        );
+
         return $this->driver->getRelativePath($this->path, $path);
     }
 
@@ -92,14 +135,18 @@ public function getRelativePath($path = null)
      *
      * @param string|null $path
      * @return string[]
+     * @throws ValidatorException
      */
     public function read($path = null)
     {
+        $this->validatePath($path);
+
         $files = $this->driver->readDirectory($this->driver->getAbsolutePath($this->path, $path));
         $result = [];
         foreach ($files as $file) {
             $result[] = $this->getRelativePath($file);
         }
+
         return $result;
     }
 
@@ -108,9 +155,12 @@ public function read($path = null)
      *
      * @param null $path
      * @return string[]
+     * @throws ValidatorException
      */
     public function readRecursively($path = null)
     {
+        $this->validatePath($path);
+
         $result = [];
         $paths = $this->driver->readDirectoryRecursively($this->driver->getAbsolutePath($this->path, $path));
         /** @var \FilesystemIterator $file */
@@ -118,6 +168,7 @@ public function readRecursively($path = null)
             $result[] = $this->getRelativePath($file);
         }
         sort($result);
+
         return $result;
     }
 
@@ -127,9 +178,12 @@ public function readRecursively($path = null)
      * @param string $pattern
      * @param string $path [optional]
      * @return string[]
+     * @throws ValidatorException
      */
     public function search($pattern, $path = null)
     {
+        $this->validatePath($path);
+
         if ($path) {
             $absolutePath = $this->driver->getAbsolutePath($this->path, $this->getRelativePath($path));
         } else {
@@ -141,6 +195,7 @@ public function search($pattern, $path = null)
         foreach ($files as $file) {
             $result[] = $this->getRelativePath($file);
         }
+
         return $result;
     }
 
@@ -150,9 +205,12 @@ public function search($pattern, $path = null)
      * @param string $path [optional]
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws ValidatorException
      */
     public function isExist($path = null)
     {
+        $this->validatePath($path);
+
         return $this->driver->isExists($this->driver->getAbsolutePath($this->path, $path));
     }
 
@@ -162,9 +220,12 @@ public function isExist($path = null)
      * @param string $path
      * @return array
      * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws ValidatorException
      */
     public function stat($path)
     {
+        $this->validatePath($path);
+
         return $this->driver->stat($this->driver->getAbsolutePath($this->path, $path));
     }
 
@@ -174,9 +235,12 @@ public function stat($path)
      * @param string $path [optional]
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws ValidatorException
      */
     public function isReadable($path = null)
     {
+        $this->validatePath($path);
+
         return $this->driver->isReadable($this->driver->getAbsolutePath($this->path, $path));
     }
 
@@ -186,9 +250,12 @@ public function isReadable($path = null)
      * @param string $path
      *
      * @return \Magento\Framework\Filesystem\File\ReadInterface
+     * @throws ValidatorException
      */
     public function openFile($path)
     {
+        $this->validatePath($path);
+
         return $this->fileFactory->create(
             $this->driver->getAbsolutePath($this->path, $path),
             $this->driver
@@ -203,10 +270,14 @@ public function openFile($path)
      * @param resource|null $context
      * @return string
      * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function readFile($path, $flag = null, $context = null)
     {
+        $this->validatePath($path);
+
         $absolutePath = $this->driver->getAbsolutePath($this->path, $path);
+
         return $this->driver->fileGetContents($absolutePath, $flag, $context);
     }
 
@@ -215,9 +286,12 @@ public function readFile($path, $flag = null, $context = null)
      *
      * @param string $path
      * @return bool
+     * @throws ValidatorException
      */
     public function isFile($path)
     {
+        $this->validatePath($path);
+
         return $this->driver->isFile($this->driver->getAbsolutePath($this->path, $path));
     }
 
@@ -226,9 +300,12 @@ public function isFile($path)
      *
      * @param string $path [optional]
      * @return bool
+     * @throws ValidatorException
      */
     public function isDirectory($path = null)
     {
+        $this->validatePath($path);
+
         return $this->driver->isDirectory($this->driver->getAbsolutePath($this->path, $path));
     }
 }
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php b/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php
index a9fe7dcb7bf06..25a290455dc46 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/ReadFactory.php
@@ -36,7 +36,15 @@ public function __construct(DriverPool $driverPool)
     public function create($path, $driverCode = DriverPool::FILE)
     {
         $driver = $this->driverPool->getDriver($driverCode);
-        $factory = new \Magento\Framework\Filesystem\File\ReadFactory($this->driverPool);
-        return new Read($factory, $driver, $path);
+        $factory = new \Magento\Framework\Filesystem\File\ReadFactory(
+            $this->driverPool
+        );
+
+        return new Read(
+            $factory,
+            $driver,
+            $path,
+            new PathValidator($driver)
+        );
     }
 }
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/Write.php b/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
index 8be0fd9ae230a..1774731718f01 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
@@ -7,6 +7,8 @@
 namespace Magento\Framework\Filesystem\Directory;
 
 use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\ValidatorException;
+use Magento\Framework\Filesystem\File\WriteFactoryInterface;
 
 /**
  * Write Interface implementation
@@ -27,16 +29,16 @@ class Write extends Read implements WriteInterface
      * @param \Magento\Framework\Filesystem\DriverInterface $driver
      * @param string $path
      * @param int $createPermissions
+     * @param PathValidatorInterface|null $pathValidator
      */
     public function __construct(
         \Magento\Framework\Filesystem\File\WriteFactory $fileFactory,
         \Magento\Framework\Filesystem\DriverInterface $driver,
         $path,
-        $createPermissions = null
+        $createPermissions = null,
+        PathValidatorInterface $pathValidator = null
     ) {
-        $this->fileFactory = $fileFactory;
-        $this->driver = $driver;
-        $this->setPath($path);
+        parent::__construct($fileFactory, $driver, $path, $pathValidator);
         if (null !== $createPermissions) {
             $this->permissions = $createPermissions;
         }
@@ -83,13 +85,16 @@ protected function assertIsFile($path)
      * @param string $path
      * @return bool
      * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function create($path = null)
     {
+        $this->validatePath($path);
         $absolutePath = $this->driver->getAbsolutePath($this->path, $path);
         if ($this->driver->isDirectory($absolutePath)) {
             return true;
         }
+
         return $this->driver->createDirectory($absolutePath, $this->permissions);
     }
 
@@ -101,9 +106,11 @@ public function create($path = null)
      * @param WriteInterface $targetDirectory
      * @return bool
      * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function renameFile($path, $newPath, WriteInterface $targetDirectory = null)
     {
+        $this->validatePath($path);
         $this->assertIsFile($path);
         $targetDirectory = $targetDirectory ?: $this;
         if (!$targetDirectory->isExist($this->driver->getParentDirectory($newPath))) {
@@ -111,6 +118,7 @@ public function renameFile($path, $newPath, WriteInterface $targetDirectory = nu
         }
         $absolutePath = $this->driver->getAbsolutePath($this->path, $path);
         $absoluteNewPath = $targetDirectory->getAbsolutePath($newPath);
+
         return $this->driver->rename($absolutePath, $absoluteNewPath, $targetDirectory->driver);
     }
 
@@ -122,9 +130,11 @@ public function renameFile($path, $newPath, WriteInterface $targetDirectory = nu
      * @param WriteInterface $targetDirectory
      * @return bool
      * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function copyFile($path, $destination, WriteInterface $targetDirectory = null)
     {
+        $this->validatePath($path);
         $this->assertIsFile($path);
 
         $targetDirectory = $targetDirectory ?: $this;
@@ -145,9 +155,11 @@ public function copyFile($path, $destination, WriteInterface $targetDirectory =
      * @param WriteInterface $targetDirectory [optional]
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws ValidatorException
      */
     public function createSymlink($path, $destination, WriteInterface $targetDirectory = null)
     {
+        $this->validatePath($path);
         $targetDirectory = $targetDirectory ?: $this;
         $parentDirectory = $this->driver->getParentDirectory($destination);
         if (!$targetDirectory->isExist($parentDirectory)) {
@@ -165,10 +177,12 @@ public function createSymlink($path, $destination, WriteInterface $targetDirecto
      * @param string $path
      * @return bool
      * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function delete($path = null)
     {
         $exceptionMessages = [];
+        $this->validatePath($path);
         if (!$this->isExist($path)) {
             return true;
         }
@@ -195,6 +209,7 @@ public function delete($path = null)
                 );
             }
         }
+
         return true;
     }
 
@@ -236,10 +251,13 @@ private function deleteFilesRecursively(string $path)
      * @param int $permissions
      * @return bool
      * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function changePermissions($path, $permissions)
     {
+        $this->validatePath($path);
         $absolutePath = $this->driver->getAbsolutePath($this->path, $path);
+
         return $this->driver->changePermissions($absolutePath, $permissions);
     }
 
@@ -251,10 +269,13 @@ public function changePermissions($path, $permissions)
      * @param int $filePermissions
      * @return bool
      * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function changePermissionsRecursively($path, $dirPermissions, $filePermissions)
     {
+        $this->validatePath($path);
         $absolutePath = $this->driver->getAbsolutePath($this->path, $path);
+
         return $this->driver->changePermissionsRecursively($absolutePath, $dirPermissions, $filePermissions);
     }
 
@@ -265,9 +286,12 @@ public function changePermissionsRecursively($path, $dirPermissions, $filePermis
      * @param int|null $modificationTime
      * @return bool
      * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function touch($path, $modificationTime = null)
     {
+        $this->validatePath($path);
+
         $folder = $this->driver->getParentDirectory($path);
         $this->create($folder);
         $this->assertWritable($folder);
@@ -280,9 +304,12 @@ public function touch($path, $modificationTime = null)
      * @param string|null $path
      * @return bool
      * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws ValidatorException
      */
     public function isWritable($path = null)
     {
+        $this->validatePath($path);
+
         return $this->driver->isWritable($this->driver->getAbsolutePath($this->path, $path));
     }
 
@@ -293,13 +320,16 @@ public function isWritable($path = null)
      * @param string $mode
      * @return \Magento\Framework\Filesystem\File\WriteInterface
      * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws ValidatorException
      */
     public function openFile($path, $mode = 'w')
     {
+        $this->validatePath($path);
         $folder = dirname($path);
         $this->create($folder);
         $this->assertWritable($this->isExist($path) ? $path : $folder);
         $absolutePath = $this->driver->getAbsolutePath($this->path, $path);
+
         return $this->fileFactory->create($absolutePath, $this->driver, $mode);
     }
 
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php b/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php
index a723ed6a7bea6..ff14b12f62047 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/WriteFactory.php
@@ -37,7 +37,16 @@ public function __construct(DriverPool $driverPool)
     public function create($path, $driverCode = DriverPool::FILE, $createPermissions = null)
     {
         $driver = $this->driverPool->getDriver($driverCode);
-        $factory = new \Magento\Framework\Filesystem\File\WriteFactory($this->driverPool);
-        return new Write($factory, $driver, $path, $createPermissions);
+        $factory = new \Magento\Framework\Filesystem\File\WriteFactory(
+            $this->driverPool
+        );
+
+        return new Write(
+            $factory,
+            $driver,
+            $path,
+            $createPermissions,
+            new PathValidator($driver)
+        );
     }
 }
diff --git a/lib/internal/Magento/Framework/Filesystem/DirectoryList.php b/lib/internal/Magento/Framework/Filesystem/DirectoryList.php
index f07932d45ecb6..ef27cc19c4697 100644
--- a/lib/internal/Magento/Framework/Filesystem/DirectoryList.php
+++ b/lib/internal/Magento/Framework/Filesystem/DirectoryList.php
@@ -8,6 +8,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Filesystem;
 
 /**
@@ -96,7 +97,8 @@ public function __construct($root, array $config = [])
         static::validate($config);
         $this->root = $this->normalizePath($root);
         $this->directories = static::getDefaultConfig();
-        $this->directories[self::SYS_TMP] = [self::PATH => realpath(sys_get_temp_dir())];
+        $sysTmpPath = get_cfg_var('upload_tmp_dir') ?: sys_get_temp_dir();
+        $this->directories[self::SYS_TMP] = [self::PATH => realpath($sysTmpPath)];
 
         // inject custom values from constructor
         foreach ($this->directories as $code => $dir) {
diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/File.php b/lib/internal/Magento/Framework/Filesystem/Driver/File.php
index 53322f06bbc6f..aad59c654b424 100644
--- a/lib/internal/Magento/Framework/Filesystem/Driver/File.php
+++ b/lib/internal/Magento/Framework/Filesystem/Driver/File.php
@@ -352,7 +352,7 @@ public function copy($source, $destination, DriverInterface $targetDriver = null
     public function symlink($source, $destination, DriverInterface $targetDriver = null)
     {
         $result = false;
-        if (get_class($targetDriver) == get_class($this)) {
+        if ($targetDriver === null || get_class($targetDriver) == get_class($this)) {
             $result = @symlink($this->getScheme() . $source, $destination);
         }
         if (!$result) {
@@ -967,6 +967,13 @@ public function getRealPathSafety($path)
         if (strpos($path, DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR) === false) {
             return $path;
         }
+
+        //Removing redundant directory separators.
+        $path = preg_replace(
+            '/\\' . DIRECTORY_SEPARATOR . '\\' . DIRECTORY_SEPARATOR . '+/',
+            DIRECTORY_SEPARATOR,
+            $path
+        );
         $pathParts = explode(DIRECTORY_SEPARATOR, $path);
         $realPath = [];
         foreach ($pathParts as $pathPart) {
diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/Http.php b/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
index 5c7fdb0630186..46ad773cff201 100644
--- a/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
+++ b/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
@@ -27,26 +27,18 @@ class Http extends File
      *
      * @param string $path
      * @return bool
-     * @throws FileSystemException
      */
     public function isExists($path)
     {
         $headers = array_change_key_case(get_headers($this->getScheme() . $path, 1), CASE_LOWER);
-
         $status = $headers[0];
 
-        /* Handling 302 redirection */
-        if (strpos($status, '302 Found') !== false && isset($headers[1])) {
+        /* Handling 301 or 302 redirection */
+        if (isset($headers[1]) && preg_match('/30[12]/', $status)) {
             $status = $headers[1];
         }
 
-        if (strpos($status, '200 OK') === false) {
-            $result = false;
-        } else {
-            $result = true;
-        }
-
-        return $result;
+        return !(strpos($status, '200 OK') === false);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php b/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
index 64683a104784d..a45d6a62488f6 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
@@ -8,7 +8,7 @@
 use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Framework\Filesystem\DriverPool;
 
-class WriteFactory
+class WriteFactory extends ReadFactory
 {
     /**
      * Pool of filesystem drivers
@@ -24,6 +24,7 @@ class WriteFactory
      */
     public function __construct(DriverPool $driverPool)
     {
+        parent::__construct($driverPool);
         $this->driverPool = $driverPool;
     }
 
diff --git a/lib/internal/Magento/Framework/Filter/NormalizedToLocalized.php b/lib/internal/Magento/Framework/Filter/NormalizedToLocalized.php
new file mode 100644
index 0000000000000..bd42c79486ee8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/NormalizedToLocalized.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Filter;
+
+/**
+ * Class NormalizedToLocalized
+ */
+class NormalizedToLocalized extends \Zend_Filter_NormalizedToLocalized
+{
+}
diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php
index 40799bfe0a6b5..62a00b3dc0123 100644
--- a/lib/internal/Magento/Framework/Filter/Template.php
+++ b/lib/internal/Magento/Framework/Filter/Template.php
@@ -9,6 +9,9 @@
  */
 namespace Magento\Framework\Filter;
 
+use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\Framework\Model\AbstractModel;
+
 /**
  * @api
  */
@@ -52,6 +55,18 @@ class Template implements \Zend_Filter_Interface
      */
     protected $string;
 
+    /**
+     * @var string[]
+     */
+    private $restrictedMethods = [
+        'addafterfiltercallback',
+        'getresourcecollection',
+        'load',
+        'save',
+        'getcollection',
+        'getresource'
+    ];
+
     /**
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param array $variables
@@ -227,7 +242,7 @@ public function templateDirective($construction)
     {
         // Processing of {template config_path=... [...]} statement
         $templateParameters = $this->getParameters($construction[2]);
-        if (!isset($templateParameters['config_path']) or !$this->getTemplateProcessor()) {
+        if (!isset($templateParameters['config_path']) || !$this->getTemplateProcessor()) {
             // Not specified template or not set include processor
             $replacedValue = '{Error in template processing}';
         } else {
@@ -297,6 +312,46 @@ protected function getParameters($value)
         return $params;
     }
 
+    /**
+     * 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)
+    {
+        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
      *
@@ -336,21 +391,27 @@ protected function getVariable($value, $default = '{no_value_defined}')
                             || substr($stackVars[$i]['name'], 0, 3) == 'get'
                     ) {
                         $stackVars[$i]['args'] = $this->getStackArgs($stackVars[$i]['args']);
-                        $stackVars[$i]['variable'] = call_user_func_array(
-                            [$stackVars[$i - 1]['variable'], $stackVars[$i]['name']],
-                            $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']) && $stackVars[$i]['type'] == 'method') {
+            } elseif (isset($stackVars[$i - 1]['variable'])
+                      && is_object($stackVars[$i - 1]['variable'])
+                      && $stackVars[$i]['type'] == 'method'
+            ) {
                 // Calling object methods
-                if (method_exists($stackVars[$i - 1]['variable'], $stackVars[$i]['name'])) {
-                    $stackVars[$i]['args'] = $this->getStackArgs($stackVars[$i]['args']);
-                    $stackVars[$i]['variable'] = call_user_func_array(
-                        [$stackVars[$i - 1]['variable'], $stackVars[$i]['name']],
-                        $stackVars[$i]['args']
-                    );
+                $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;
             }
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
index e7376d9b7d264..a78c14eabc587 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Framework\Filter\Test\Unit;
 
+use Magento\Store\Model\Store;
+
 class TemplateTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -13,10 +15,16 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
      */
     private $templateFilter;
 
+    /**
+     * @var Store
+     */
+    private $store;
+
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->templateFilter = $objectManager->getObject(\Magento\Framework\Filter\Template::class);
+        $this->store = $objectManager->getObject(Store::class);
     }
 
     public function testFilter()
@@ -205,4 +213,60 @@ public function varDirectiveDataProvider()
             ],
         ];
     }
+
+    /**
+     * 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.
+     *
+     * @param string $method
+     * @dataProvider disallowedMethods
+     * @expectedException \InvalidArgumentException
+     *
+     * @return void
+     */
+    public function testDisallowedMethods(string $method)
+    {
+        $this->templateFilter->setVariables(['store' => $this->store]);
+        $this->templateFilter->filter('{{var store.'.$method.'()}}');
+    }
+
+    /**
+     * Data for testDisallowedMethods method.
+     *
+     * @return array
+     */
+    public function disallowedMethods(): array
+    {
+        return [
+            ['getResourceCollection'],
+            ['load'],
+            ['save'],
+            ['getCollection'],
+            ['getResource'],
+        ];
+    }
+
+    /**
+     * Check that if calling a method of an object fails expected result is returned.
+     *
+     * @return void
+     */
+    public function testInvalidMethodCall()
+    {
+        $this->templateFilter->setVariables(['dateTime' => '\DateTime']);
+        $this->assertEquals(
+            '\DateTime',
+            $this->templateFilter->filter('{{var dateTime.createFromFormat(\'d\',\'1548201468\')}}')
+        );
+    }
 }
diff --git a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
index db466ca30e7eb..5c2fbb855f161 100644
--- a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
+++ b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
@@ -183,6 +183,12 @@ public function write($method, $url, $http_ver = '1.1', $headers = [], $body = '
             curl_setopt($this->_getResource(), CURLOPT_CUSTOMREQUEST, 'GET');
         }
 
+        if ($http_ver === \Zend_Http_Client::HTTP_1) {
+            curl_setopt($this->_getResource(), CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+        } elseif ($http_ver === \Zend_Http_Client::HTTP_0) {
+            curl_setopt($this->_getResource(), CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+        }
+
         if (is_array($headers)) {
             curl_setopt($this->_getResource(), CURLOPT_HTTPHEADER, $headers);
         }
diff --git a/lib/internal/Magento/Framework/HTTP/Client/Curl.php b/lib/internal/Magento/Framework/HTTP/Client/Curl.php
index 57a5535751f09..375d85806a7d1 100644
--- a/lib/internal/Magento/Framework/HTTP/Client/Curl.php
+++ b/lib/internal/Magento/Framework/HTTP/Client/Curl.php
@@ -432,7 +432,7 @@ protected function parseHeaders($ch, $data)
     {
         if ($this->_headerCount == 0) {
             $line = explode(" ", trim($data), 3);
-            if (count($line) != 3) {
+            if (count($line) < 2) {
                 $this->doError("Invalid response line returned from server: " . $data);
             }
             $this->_responseStatus = (int)$line[1];
diff --git a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
index 00194a55dce53..8bb05b53ae0e5 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
@@ -415,6 +415,7 @@ public function rotate($angle)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @throws \Exception
      */
     public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity = 30, $tile = false)
     {
@@ -425,15 +426,13 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
             $imagePath
         );
 
-        $merged = false;
-
         if ($this->getWatermarkWidth() &&
             $this->getWatermarkHeight() &&
             $this->getWatermarkPosition() != self::POSITION_STRETCH
         ) {
             $newWatermark = imagecreatetruecolor($this->getWatermarkWidth(), $this->getWatermarkHeight());
             imagealphablending($newWatermark, false);
-            $col = imagecolorallocate($newWatermark, 255, 255, 255);
+            $col = imagecolorallocatealpha($newWatermark, 255, 255, 255, 127);
             imagecolortransparent($newWatermark, $col);
             imagefilledrectangle($newWatermark, 0, 0, $this->getWatermarkWidth(), $this->getWatermarkHeight(), $col);
             imagesavealpha($newWatermark, true);
@@ -457,7 +456,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
         } elseif ($this->getWatermarkPosition() == self::POSITION_STRETCH) {
             $newWatermark = imagecreatetruecolor($this->_imageSrcWidth, $this->_imageSrcHeight);
             imagealphablending($newWatermark, false);
-            $col = imagecolorallocate($newWatermark, 255, 255, 255);
+            $col = imagecolorallocatealpha($newWatermark, 255, 255, 255, 127);
             imagecolortransparent($newWatermark, $col);
             imagefilledrectangle($newWatermark, 0, 0, $this->_imageSrcWidth, $this->_imageSrcHeight, $col);
             imagesavealpha($newWatermark, true);
@@ -542,7 +541,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
             );
         }
 
-        if ($tile === false && $merged === false) {
+        if ($tile === false) {
             $this->copyImageWithAlphaPercentage(
                 $this->_imageHandler,
                 $watermark,
@@ -837,6 +836,8 @@ private function copyImageWithAlphaPercentage(
             );
         }
 
+        imagealphablending($destinationImage, true);
+
         if ($alphaPercentage >= 100) {
             return imagecopy(
                 $destinationImage,
diff --git a/lib/internal/Magento/Framework/Interception/Config/Config.php b/lib/internal/Magento/Framework/Interception/Config/Config.php
index 7c80051537baa..ba1a0f9685eac 100644
--- a/lib/internal/Magento/Framework/Interception/Config/Config.php
+++ b/lib/internal/Magento/Framework/Interception/Config/Config.php
@@ -125,7 +125,7 @@ public function __construct(
      */
     public function initialize($classDefinitions = [])
     {
-        $this->_cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [$this->_cacheId]);
+        $this->_cache->remove($this->_cacheId);
         $config = [];
         foreach ($this->_scopeList->getAllScopes() as $scope) {
             $config = array_replace_recursive($config, $this->_reader->read($scope));
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
index 8e6c42080a4ce..a4f728454a524 100644
--- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -295,7 +295,7 @@ protected function _loadScopedData()
                 $virtualTypes = [];
                 foreach ($this->_scopePriorityScheme as $scopeCode) {
                     if (false == isset($this->_loadedScopes[$scopeCode])) {
-                        $data = $this->_reader->read($scopeCode);
+                        $data = $this->_reader->read($scopeCode) ?: [];
                         unset($data['preferences']);
                         if (count($data) > 0) {
                             $this->_inherited = [];
diff --git a/lib/internal/Magento/Framework/Locale/Format.php b/lib/internal/Magento/Framework/Locale/Format.php
index ca50cdb2440f4..c5e9ad26a25e1 100644
--- a/lib/internal/Magento/Framework/Locale/Format.php
+++ b/lib/internal/Magento/Framework/Locale/Format.php
@@ -5,8 +5,16 @@
  */
 namespace Magento\Framework\Locale;
 
+/**
+ * Price locale format.
+ */
 class Format implements \Magento\Framework\Locale\FormatInterface
 {
+    /**
+     * Japan locale code
+     */
+    private static $japanLocaleCode = 'ja_JP';
+
     /**
      * @var \Magento\Framework\App\ScopeResolverInterface
      */
@@ -38,7 +46,8 @@ public function __construct(
     }
 
     /**
-     * Returns the first found number from a string
+     * Returns the first found number from a string.
+     *
      * Parsing depends on given locale (grouping and decimal)
      *
      * Examples for input:
@@ -77,7 +86,16 @@ public function getNumber($value)
                 $value = str_replace(',', '', $value);
             }
         } elseif ($separatorComa !== false) {
-            $value = str_replace(',', '.', $value);
+            $locale = $this->_localeResolver->getLocale();
+            /**
+             * It's hard code for Japan locale.
+             * The comma separator uses as group separator: 4,000 saves as 4,000.00
+             */
+            $value = str_replace(
+                ',',
+                $locale === self::$japanLocaleCode ? '' : '.',
+                $value
+            );
         }
 
         return (float)$value;
@@ -100,7 +118,7 @@ public function getPriceFormat($localeCode = null, $currencyCode = null)
         }
 
         $formatter = new \NumberFormatter(
-            $localeCode . '@currency=' . $currency->getCode(),
+            $currency->getCode() ? $localeCode . '@currency=' . $currency->getCode() : $localeCode,
             \NumberFormatter::CURRENCY
         );
         $format = $formatter->getPattern();
diff --git a/lib/internal/Magento/Framework/Locale/Resolver.php b/lib/internal/Magento/Framework/Locale/Resolver.php
index 8372908a380ff..abbfbdc5c6c37 100644
--- a/lib/internal/Magento/Framework/Locale/Resolver.php
+++ b/lib/internal/Magento/Framework/Locale/Resolver.php
@@ -6,7 +6,12 @@
 namespace Magento\Framework\Locale;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManager;
 
+/**
+ * Manages locale config information.
+ */
 class Resolver implements ResolverInterface
 {
     /**
@@ -47,26 +52,34 @@ class Resolver implements ResolverInterface
      */
     protected $emulatedLocales = [];
 
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
     /**
      * @param ScopeConfigInterface $scopeConfig
      * @param string $defaultLocalePath
      * @param string $scopeType
      * @param mixed $locale
+     * @param DeploymentConfig|null $deploymentConfig
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         $defaultLocalePath,
         $scopeType,
-        $locale = null
+        $locale = null,
+        DeploymentConfig $deploymentConfig = null
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->defaultLocalePath = $defaultLocalePath;
         $this->scopeType = $scopeType;
+        $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->create(DeploymentConfig::class);
         $this->setLocale($locale);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultLocalePath()
     {
@@ -74,7 +87,7 @@ public function getDefaultLocalePath()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDefaultLocale($locale)
     {
@@ -83,12 +96,15 @@ public function setDefaultLocale($locale)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultLocale()
     {
         if (!$this->defaultLocale) {
-            $locale = $this->scopeConfig->getValue($this->getDefaultLocalePath(), $this->scopeType);
+            $locale = false;
+            if ($this->deploymentConfig->isAvailable() && $this->deploymentConfig->isDbAvailable()) {
+                $locale = $this->scopeConfig->getValue($this->getDefaultLocalePath(), $this->scopeType);
+            }
             if (!$locale) {
                 $locale = self::DEFAULT_LOCALE;
             }
@@ -98,7 +114,7 @@ public function getDefaultLocale()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setLocale($locale = null)
     {
@@ -111,7 +127,7 @@ public function setLocale($locale = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getLocale()
     {
@@ -122,7 +138,7 @@ public function getLocale()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function emulate($scopeId)
     {
@@ -142,7 +158,7 @@ public function emulate($scopeId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function revert()
     {
diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
index aa7ca377efa03..8c8e118aa3169 100644
--- a/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
@@ -6,6 +6,9 @@
 
 namespace Magento\Framework\Locale\Test\Unit;
 
+/**
+ * Tests class for Number locale format
+ */
 class FormatTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -53,6 +56,7 @@ protected function setUp()
 
         /** @var \Magento\Directory\Model\CurrencyFactory|\PHPUnit_Framework_MockObject_MockObject $currencyFactory */
         $currencyFactory = $this->getMockBuilder(\Magento\Directory\Model\CurrencyFactory::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $this->formatModel = new \Magento\Framework\Locale\Format(
@@ -83,25 +87,31 @@ public function testGetPriceFormat($localeCode, $expectedResult)
      */
     public function getPriceFormatDataProvider()
     {
+        $swissGroupSymbol = INTL_ICU_VERSION >= 59.1 ? '’' : '\'';
         return [
             ['en_US', ['decimalSymbol' => '.', 'groupSymbol' => ',']],
             ['de_DE', ['decimalSymbol' => ',', 'groupSymbol' => '.']],
-            ['de_CH', ['decimalSymbol' => '.', 'groupSymbol' => '\'']],
+            ['de_CH', ['decimalSymbol' => '.', 'groupSymbol' => $swissGroupSymbol]],
             ['uk_UA', ['decimalSymbol' => ',', 'groupSymbol' => ' ']]
         ];
     }
 
     /**
-     * @param float | null $expected
      * @param string|float|int $value
+     * @param float | null $expected
+     * @param string $locale
      * @dataProvider provideNumbers
      */
-    public function testGetNumber($value, $expected)
+    public function testGetNumber(string $value, float $expected, string $locale = null)
     {
+        if ($locale !== null) {
+            $this->localeResolver->method('getLocale')->willReturn($locale);
+        }
         $this->assertEquals($expected, $this->formatModel->getNumber($value));
     }
 
     /**
+     *
      * @return array
      */
     public function provideNumbers(): array
@@ -117,6 +127,8 @@ public function provideNumbers(): array
             ['2 054.52', 2054.52],
             ['2,46 GB', 2.46],
             ['2,054.00', 2054],
+            ['4,000', 4000.0, 'ja_JP'],
+            ['4,000', 4.0, 'en_US'],
         ];
     }
 }
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Cache.php b/lib/internal/Magento/Framework/Lock/Backend/Cache.php
new file mode 100644
index 0000000000000..61818cbb8c53c
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Backend/Cache.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\Lock\Backend;
+
+use Magento\Framework\Cache\FrontendInterface;
+
+/**
+ * Implementation of the lock manager on the basis of the caching system.
+ */
+class Cache implements \Magento\Framework\Lock\LockManagerInterface
+{
+    /**
+     * @var FrontendInterface
+     */
+    private $cache;
+
+    /**
+     * @param FrontendInterface $cache
+     */
+    public function __construct(FrontendInterface $cache)
+    {
+        $this->cache = $cache;
+    }
+    /**
+     * @inheritdoc
+     */
+    public function lock(string $name, int $timeout = -1): bool
+    {
+        return $this->cache->save('1', $name, [], $timeout);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function unlock(string $name): bool
+    {
+        return $this->cache->remove($name);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isLocked(string $name): bool
+    {
+        return (bool)$this->cache->test($name);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Database.php b/lib/internal/Magento/Framework/Lock/Backend/Database.php
index 61857685a7bb4..a9dbecedab238 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Database.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Database.php
@@ -3,8 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
+
 namespace Magento\Framework\Lock\Backend;
 
 use Magento\Framework\App\DeploymentConfig;
@@ -14,6 +14,9 @@
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Phrase;
 
+/**
+ * Implementation of the lock manager on the basis of MySQL.
+ */
 class Database implements \Magento\Framework\Lock\LockManagerInterface
 {
     /** @var ResourceConnection */
@@ -53,9 +56,13 @@ public function __construct(
      * @return bool
      * @throws InputException
      * @throws AlreadyExistsException
+     * @throws \Zend_Db_Statement_Exception
      */
     public function lock(string $name, int $timeout = -1): bool
     {
+        if (!$this->deploymentConfig->isDbAvailable()) {
+            return true;
+        };
         $name = $this->addPrefix($name);
 
         /**
@@ -66,7 +73,7 @@ public function lock(string $name, int $timeout = -1): bool
         if ($this->currentLock) {
             throw new AlreadyExistsException(
                 new Phrase(
-                    'Current connection is already holding lock for $1, only single lock allowed',
+                    'Current connection is already holding lock for %1, only single lock allowed',
                     [$this->currentLock]
                 )
             );
@@ -90,9 +97,13 @@ 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
     {
+        if (!$this->deploymentConfig->isDbAvailable()) {
+            return true;
+        };
         $name = $this->addPrefix($name);
 
         $result = (bool)$this->resource->getConnection()->query(
@@ -113,9 +124,13 @@ 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
     {
+        if (!$this->deploymentConfig->isDbAvailable()) {
+            return false;
+        };
         $name = $this->addPrefix($name);
 
         return (bool)$this->resource->getConnection()->query(
diff --git a/lib/internal/Magento/Framework/Lock/Backend/FileLock.php b/lib/internal/Magento/Framework/Lock/Backend/FileLock.php
new file mode 100644
index 0000000000000..d168e910a4ab7
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Backend/FileLock.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Backend;
+
+use Magento\Framework\Lock\LockManagerInterface;
+use Magento\Framework\Filesystem\Driver\File as FileDriver;
+use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Phrase;
+
+/**
+ * LockManager using the file system for locks
+ */
+class FileLock implements LockManagerInterface
+{
+    /**
+     * The file driver instance
+     *
+     * @var FileDriver
+     */
+    private $fileDriver;
+
+    /**
+     * The path to the locks storage folder
+     *
+     * @var string
+     */
+    private $path;
+
+    /**
+     * How many microseconds to wait before re-try to acquire a lock
+     *
+     * @var int
+     */
+    private $sleepCycle = 100000;
+
+    /**
+     * The mapping list of the path lock with the file resource
+     *
+     * @var array
+     */
+    private $locks = [];
+
+    /**
+     * @param FileDriver $fileDriver The file driver
+     * @param string $path The path to the locks storage folder
+     * @throws RuntimeException Throws RuntimeException if $path is empty
+     *         or cannot create the directory for locks
+     */
+    public function __construct(FileDriver $fileDriver, string $path)
+    {
+        if (!$path) {
+            throw new RuntimeException(new Phrase('The path needs to be a non-empty string.'));
+        }
+
+        $this->fileDriver = $fileDriver;
+        $this->path = rtrim($path, '/') . '/';
+
+        try {
+            if (!$this->fileDriver->isExists($this->path)) {
+                $this->fileDriver->createDirectory($this->path);
+            }
+        } catch (FileSystemException $exception) {
+            throw new RuntimeException(
+                new Phrase('Cannot create the directory for locks: %1', [$this->path]),
+                $exception
+            );
+        }
+    }
+
+    /**
+     * Acquires a lock by name
+     *
+     * @param string $name The lock name
+     * @param int $timeout Timeout in seconds. A negative timeout value means infinite timeout
+     * @return bool Returns true if the lock is acquired, otherwise returns false
+     * @throws RuntimeException Throws RuntimeException if cannot acquires the lock because FS problems
+     */
+    public function lock(string $name, int $timeout = -1): bool
+    {
+        try {
+            $lockFile = $this->getLockPath($name);
+            $fileResource = $this->fileDriver->fileOpen($lockFile, 'w+');
+            $skipDeadline = $timeout < 0;
+            $deadline = microtime(true) + $timeout;
+
+            while (!$this->tryToLock($fileResource)) {
+                if (!$skipDeadline && $deadline <= microtime(true)) {
+                    $this->fileDriver->fileClose($fileResource);
+                    return false;
+                }
+                usleep($this->sleepCycle);
+            }
+        } catch (FileSystemException $exception) {
+            throw new RuntimeException(new Phrase('Cannot acquire a lock.'), $exception);
+        }
+
+        $this->locks[$lockFile] = $fileResource;
+        return true;
+    }
+
+    /**
+     * Checks if a lock exists by name
+     *
+     * @param string $name The lock name
+     * @return bool Returns true if the lock exists, otherwise returns false
+     * @throws RuntimeException Throws RuntimeException if cannot check that the lock exists
+     */
+    public function isLocked(string $name): bool
+    {
+        $lockFile = $this->getLockPath($name);
+        $result = false;
+
+        try {
+            if ($this->fileDriver->isExists($lockFile)) {
+                $fileResource = $this->fileDriver->fileOpen($lockFile, 'w+');
+                if ($this->tryToLock($fileResource)) {
+                    $result = false;
+                } else {
+                    $result = true;
+                }
+                $this->fileDriver->fileClose($fileResource);
+            }
+        } catch (FileSystemException $exception) {
+            throw new RuntimeException(new Phrase('Cannot verify that the lock exists.'), $exception);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Remove the lock by name
+     *
+     * @param string $name The lock name
+     * @return bool If the lock is removed returns true, otherwise returns false
+     */
+    public function unlock(string $name): bool
+    {
+        $lockFile = $this->getLockPath($name);
+
+        if (isset($this->locks[$lockFile]) && $this->tryToUnlock($this->locks[$lockFile])) {
+            unset($this->locks[$lockFile]);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the full path to the lock file by name
+     *
+     * @param string $name The lock name
+     * @return string The path to the lock file
+     */
+    private function getLockPath(string $name): string
+    {
+        return $this->path . $name;
+    }
+
+    /**
+     * Tries to lock a file resource
+     *
+     * @param resource $resource The file resource
+     * @return bool If the lock is acquired returns true, otherwise returns false
+     */
+    private function tryToLock($resource): bool
+    {
+        try {
+            return $this->fileDriver->fileLock($resource, LOCK_EX | LOCK_NB);
+        } catch (FileSystemException $exception) {
+            return false;
+        }
+    }
+
+    /**
+     * Tries to unlock a file resource
+     *
+     * @param resource $resource The file resource
+     * @return bool If the lock is removed returns true, otherwise returns false
+     */
+    private function tryToUnlock($resource): bool
+    {
+        try {
+            return $this->fileDriver->fileLock($resource, LOCK_UN | LOCK_NB);
+        } catch (FileSystemException $exception) {
+            return false;
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
new file mode 100644
index 0000000000000..cbba981ae1b51
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Backend/Zookeeper.php
@@ -0,0 +1,280 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Backend;
+
+use Magento\Framework\Lock\LockManagerInterface;
+use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\Phrase;
+
+/**
+ * LockManager using the Zookeeper for locks
+ */
+class Zookeeper implements LockManagerInterface
+{
+    /**
+     * Zookeeper provider
+     *
+     * @var \Zookeeper
+     */
+    private $zookeeper;
+
+    /**
+     * The base path to locks in Zookeeper
+     *
+     * @var string
+     */
+    private $path;
+
+    /**
+     * The name of sequence nodes
+     *
+     * @var string
+     */
+    private $lockName = 'lock-';
+
+    /**
+     * The host to connect to Zookeeper
+     *
+     * @var string
+     */
+    private $host;
+
+    /**
+     * How many seconds to wait before timing out on connections
+     *
+     * @var int
+     */
+    private $connectionTimeout = 2;
+
+    /**
+     * How many microseconds to wait before recheck connections or nodes
+     *
+     * @var int
+     */
+    private $sleepCycle = 100000;
+
+    /**
+     * The default permissions for Zookeeper nodes
+     *
+     * @var array
+     */
+    private $acl = [['perms'=>\Zookeeper::PERM_ALL, 'scheme' => 'world', 'id' => 'anyone']];
+
+    /**
+     * The mapping list of the lock name with the full lock path
+     *
+     * @var array
+     */
+    private $locks = [];
+
+    /**
+     * The default path to storage locks
+     */
+    const DEFAULT_PATH = '/magento/locks';
+
+    /**
+     * @param string $host The host to connect to Zookeeper
+     * @param string $path The base path to locks in Zookeeper
+     * @throws RuntimeException
+     */
+    public function __construct(string $host, string $path = self::DEFAULT_PATH)
+    {
+        if (!$path) {
+            throw new RuntimeException(
+                new Phrase('The path needs to be a non-empty string.')
+            );
+        }
+
+        if (!$host) {
+            throw new RuntimeException(
+                new Phrase('The host needs to be a non-empty string.')
+            );
+        }
+
+        $this->host = $host;
+        $this->path = rtrim($path, '/') . '/';
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * You can see the lock algorithm by the link
+     * @link https://zookeeper.apache.org/doc/r3.1.2/recipes.html#sc_recipes_Locks
+     *
+     * @throws RuntimeException
+     */
+    public function lock(string $name, int $timeout = -1): bool
+    {
+        $skipDeadline = $timeout < 0;
+        $lockPath = $this->getFullPathToLock($name);
+        $deadline = microtime(true) + $timeout;
+
+        if (!$this->checkAndCreateParentNode($lockPath)) {
+            throw new RuntimeException(new Phrase('Failed creating the path %1', [$lockPath]));
+        }
+
+        $lockKey = $this->getProvider()
+            ->create($lockPath, '1', $this->acl, \Zookeeper::EPHEMERAL | \Zookeeper::SEQUENCE);
+
+        if (!$lockKey) {
+            throw new RuntimeException(new Phrase('Failed creating lock %1', [$lockPath]));
+        }
+
+        while ($this->isAnyLock($lockKey, $this->getIndex($lockKey))) {
+            if (!$skipDeadline && $deadline <= microtime(true)) {
+                $this->getProvider()->delete($lockKey);
+                return false;
+            }
+
+            usleep($this->sleepCycle);
+        }
+
+        $this->locks[$name] = $lockKey;
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @throws RuntimeException
+     */
+    public function unlock(string $name): bool
+    {
+        if (!isset($this->locks[$name])) {
+            return false;
+        }
+
+        return $this->getProvider()->delete($this->locks[$name]);
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @throws RuntimeException
+     */
+    public function isLocked(string $name): bool
+    {
+        return $this->isAnyLock($this->getFullPathToLock($name));
+    }
+
+    /**
+     * Gets full path to lock by its name
+     *
+     * @param string $name
+     * @return string
+     */
+    private function getFullPathToLock(string $name): string
+    {
+        return $this->path . $name . '/' . $this->lockName;
+    }
+
+    /**
+     * Initiolizes and returns Zookeeper provider
+     *
+     * @return \Zookeeper
+     * @throws RuntimeException
+     */
+    private function getProvider(): \Zookeeper
+    {
+        if (!$this->zookeeper) {
+            $this->zookeeper = new \Zookeeper($this->host);
+        }
+
+        $deadline = microtime(true) + $this->connectionTimeout;
+        while ($this->zookeeper->getState() != \Zookeeper::CONNECTED_STATE) {
+            if ($deadline <= microtime(true)) {
+                throw new RuntimeException(new Phrase('Zookeeper connection timed out!'));
+            }
+            usleep($this->sleepCycle);
+        }
+
+        return $this->zookeeper;
+    }
+
+    /**
+     * Checks and creates base path recursively
+     *
+     * @param string $path
+     * @return bool
+     * @throws RuntimeException
+     */
+    private function checkAndCreateParentNode(string $path): bool
+    {
+        $path = dirname($path);
+        if ($this->getProvider()->exists($path)) {
+            return true;
+        }
+
+        if (!$this->checkAndCreateParentNode($path)) {
+            return false;
+        }
+
+        if ($this->getProvider()->create($path, '1', $this->acl)) {
+            return true;
+        }
+
+        return $this->getProvider()->exists($path);
+    }
+
+    /**
+     * Gets int increment of lock key
+     *
+     * @param string $key
+     * @return int|null
+     */
+    private function getIndex(string $key)
+    {
+        if (!preg_match('/' . $this->lockName . '([0-9]+)$/', $key, $matches)) {
+            return null;
+        }
+
+        return intval($matches[1]);
+    }
+
+    /**
+     * Checks if there is any sequence node under parent of $fullKey.
+     *
+     * At first checks that the $fullKey node is present, if not - returns false.
+     * If $indexKey is non-null and there is a smaller index than $indexKey then returns true,
+     * otherwise returns false.
+     *
+     * @param string $fullKey The full path without any sequence info
+     * @param int|null $indexKey The index to compare
+     * @return bool
+     * @throws RuntimeException
+     */
+    private function isAnyLock(string $fullKey, int $indexKey = null): bool
+    {
+        $parent = dirname($fullKey);
+
+        if (!$this->getProvider()->exists($parent)) {
+            return false;
+        }
+
+        $children = $this->getProvider()->getChildren($parent);
+
+        if (null === $indexKey && !empty($children)) {
+            return true;
+        }
+
+        foreach ($children as $childKey) {
+            $childIndex = $this->getIndex($childKey);
+
+            if (null === $childIndex) {
+                continue;
+            }
+
+            if ($childIndex < $indexKey) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Lock/LockBackendFactory.php b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
new file mode 100644
index 0000000000000..b142085ef6563
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/LockBackendFactory.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock;
+
+use Magento\Framework\Phrase;
+use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Lock\Backend\Database as DatabaseLock;
+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
+use Magento\Framework\Lock\Backend\Cache as CacheLock;
+use Magento\Framework\Lock\Backend\FileLock;
+
+/**
+ * The factory to create object that implements LockManagerInterface
+ */
+class LockBackendFactory
+{
+    /**
+     * The Object Manager instance
+     *
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * The Application deployment configuration
+     *
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * DB lock provider name
+     *
+     * @const string
+     */
+    const LOCK_DB = 'db';
+
+    /**
+     * Zookeeper lock provider name
+     *
+     * @const string
+     */
+    const LOCK_ZOOKEEPER = 'zookeeper';
+
+    /**
+     * Cache lock provider name
+     *
+     * @const string
+     */
+    const LOCK_CACHE = 'cache';
+
+    /**
+     * File lock provider name
+     *
+     * @const string
+     */
+    const LOCK_FILE = 'file';
+
+    /**
+     * The list of lock providers with mapping on classes
+     *
+     * @var array
+     */
+    private $lockers = [
+        self::LOCK_DB => DatabaseLock::class,
+        self::LOCK_ZOOKEEPER => ZookeeperLock::class,
+        self::LOCK_CACHE => CacheLock::class,
+        self::LOCK_FILE => FileLock::class,
+    ];
+
+    /**
+     * @param ObjectManagerInterface $objectManager The Object Manager instance
+     * @param DeploymentConfig $deploymentConfig The Application deployment configuration
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        DeploymentConfig $deploymentConfig
+    ) {
+        $this->objectManager = $objectManager;
+        $this->deploymentConfig = $deploymentConfig;
+    }
+
+    /**
+     * Creates an instance of LockManagerInterface using information from deployment config
+     *
+     * @return LockManagerInterface
+     * @throws RuntimeException
+     */
+    public function create(): LockManagerInterface
+    {
+        $provider = $this->deploymentConfig->get('lock/provider', self::LOCK_DB);
+        $config = $this->deploymentConfig->get('lock/config', []);
+
+        if (!isset($this->lockers[$provider])) {
+            throw new RuntimeException(new Phrase('Unknown locks provider: %1', [$provider]));
+        }
+
+        if (self::LOCK_ZOOKEEPER === $provider && !extension_loaded(self::LOCK_ZOOKEEPER)) {
+            throw new RuntimeException(new Phrase('php extension Zookeeper is not installed.'));
+        }
+
+        return $this->objectManager->create($this->lockers[$provider], $config);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Lock/LockManagerInterface.php b/lib/internal/Magento/Framework/Lock/LockManagerInterface.php
index 9df65f45adac3..76cc8506eb182 100644
--- a/lib/internal/Magento/Framework/Lock/LockManagerInterface.php
+++ b/lib/internal/Magento/Framework/Lock/LockManagerInterface.php
@@ -3,8 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
+
 namespace Magento\Framework\Lock;
 
 /**
diff --git a/lib/internal/Magento/Framework/Lock/Proxy.php b/lib/internal/Magento/Framework/Lock/Proxy.php
new file mode 100644
index 0000000000000..2718bf6cb3456
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Proxy.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock;
+
+use Magento\Framework\Exception\RuntimeException;
+
+/**
+ * Proxy for LockManagers
+ */
+class Proxy implements LockManagerInterface
+{
+    /**
+     * The factory to create LockManagerInterface implementation
+     *
+     * @var LockBackendFactory
+     */
+    private $factory;
+
+    /**
+     * A LockManagerInterface implementation
+     *
+     * @var LockManagerInterface
+     */
+    private $locker;
+
+    /**
+     * @param LockBackendFactory $factory The factory to create LockManagerInterface implementation
+     */
+    public function __construct(LockBackendFactory $factory)
+    {
+        $this->factory = $factory;
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @throws RuntimeException
+     */
+    public function isLocked(string $name): bool
+    {
+        return $this->getLocker()->isLocked($name);
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @throws RuntimeException
+     */
+    public function lock(string $name, int $timeout = -1): bool
+    {
+        return $this->getLocker()->lock($name, $timeout);
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @throws RuntimeException
+     */
+    public function unlock(string $name): bool
+    {
+        return $this->getLocker()->unlock($name);
+    }
+
+    /**
+     * Gets LockManagerInterface implementation using Factory
+     *
+     * @return LockManagerInterface
+     * @throws RuntimeException
+     */
+    private function getLocker(): LockManagerInterface
+    {
+        if (!$this->locker) {
+            $this->locker = $this->factory->create();
+        }
+
+        return $this->locker;
+    }
+}
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 a31b686dfacd8..e853d272aa372 100644
--- a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/DatabaseTest.php
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/DatabaseTest.php
@@ -5,8 +5,13 @@
  */
 namespace Magento\Framework\Lock\Test\Unit\Backend;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Lock\Backend\Database;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
+/**
+ * @inheritdoc
+ */
 class DatabaseTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -25,13 +30,21 @@ class DatabaseTest extends \PHPUnit\Framework\TestCase
     private $statement;
 
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var ObjectManager
      */
     private $objectManager;
 
     /** @var Database $database */
     private $database;
 
+    /**
+     * @var DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $deploymentConfig;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
@@ -52,17 +65,33 @@ protected function setUp()
             ->method('query')
             ->willReturn($this->statement);
 
-        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->objectManager = new ObjectManager($this);
+
+        $this->deploymentConfig = $this->getMockBuilder(DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         /** @var Database $database */
         $this->database = $this->objectManager->getObject(
             Database::class,
-            ['resource' => $this->resource]
+            [
+                'resource' => $this->resource,
+                'deploymentConfig' => $this->deploymentConfig,
+            ]
         );
     }
 
+    /**
+     * @return void
+     * @throws \Magento\Framework\Exception\AlreadyExistsException
+     * @throws \Magento\Framework\Exception\InputException
+     */
     public function testLock()
     {
+        $this->deploymentConfig
+            ->method('isDbAvailable')
+            ->with()
+            ->willReturn(true);
         $this->statement->expects($this->once())
             ->method('fetchColumn')
             ->willReturn(true);
@@ -75,14 +104,23 @@ public function testLock()
      */
     public function testlockWithTooLongName()
     {
+        $this->deploymentConfig
+            ->method('isDbAvailable')
+            ->with()
+            ->willReturn(true);
         $this->database->lock('BbXbyf9rIY5xuAVdviQJmh76FyoeeVHTDpcjmcImNtgpO4Hnz4xk76ZGEyYALvrQu');
     }
 
     /**
      * @expectedException \Magento\Framework\Exception\AlreadyExistsException
+     * @throws \Magento\Framework\Exception\InputException
      */
     public function testlockWithAlreadyAcquiredLockInSameSession()
     {
+        $this->deploymentConfig
+            ->method('isDbAvailable')
+            ->with()
+            ->willReturn(true);
         $this->statement->expects($this->any())
             ->method('fetchColumn')
             ->willReturn(true);
@@ -90,4 +128,47 @@ public function testlockWithAlreadyAcquiredLockInSameSession()
         $this->database->lock('testLock');
         $this->database->lock('differentLock');
     }
+
+    /**
+     * @return void
+     * @throws \Magento\Framework\Exception\AlreadyExistsException
+     * @throws \Magento\Framework\Exception\InputException
+     */
+    public function testLockWithUnavailableDeploymentConfig()
+    {
+        $this->deploymentConfig
+            ->expects($this->atLeast(1))
+            ->method('isDbAvailable')
+            ->with()
+            ->willReturn(false);
+        $this->assertTrue($this->database->lock('testLock'));
+    }
+
+    /**
+     * @return void
+     * @throws \Magento\Framework\Exception\InputException
+     */
+    public function testUnlockWithUnavailableDeploymentConfig()
+    {
+        $this->deploymentConfig
+            ->expects($this->atLeast(1))
+            ->method('isDbAvailable')
+            ->with()
+            ->willReturn(false);
+        $this->assertTrue($this->database->unlock('testLock'));
+    }
+
+    /**
+     * @return void
+     * @throws \Magento\Framework\Exception\InputException
+     */
+    public function testIsLockedWithUnavailableDB()
+    {
+        $this->deploymentConfig
+            ->expects($this->atLeast(1))
+            ->method('isDbAvailable')
+            ->with()
+            ->willReturn(false);
+        $this->assertFalse($this->database->isLocked('testLock'));
+    }
 }
diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.php
new file mode 100644
index 0000000000000..62521b9de3082
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/ZookeeperTest.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\Lock\Test\Unit\Backend;
+
+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperProvider;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+
+class ZookeeperTest extends TestCase
+{
+    /**
+     * @var ZookeeperProvider
+     */
+    private $zookeeperProvider;
+
+    /**
+     * @var string
+     */
+    private $host = 'localhost:123';
+
+    /**
+     * @var string
+     */
+    private $path = '/some/path';
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        if (!extension_loaded('zookeeper')) {
+            $this->markTestSkipped('Test was skipped because php extension Zookeeper is not installed.');
+        }
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\RuntimeException
+     * @expectedExceptionMessage The path needs to be a non-empty string.
+     * @return void
+     */
+    public function testConstructionWithPathException()
+    {
+        $this->zookeeperProvider = new ZookeeperProvider($this->host, '');
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\RuntimeException
+     * @expectedExceptionMessage The host needs to be a non-empty string.
+     * @return void
+     */
+    public function testConstructionWithHostException()
+    {
+        $this->zookeeperProvider = new ZookeeperProvider('', $this->path);
+    }
+
+    /**
+     * @return void
+     */
+    public function testConstructionWithoutException()
+    {
+        $this->zookeeperProvider = new ZookeeperProvider($this->host, $this->path);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
new file mode 100644
index 0000000000000..ebf2f54f3e093
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/LockBackendFactoryTest.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Lock\Test\Unit;
+
+use Magento\Framework\Lock\Backend\Database as DatabaseLock;
+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
+use Magento\Framework\Lock\Backend\Cache as CacheLock;
+use Magento\Framework\Lock\Backend\FileLock;
+use Magento\Framework\Lock\LockBackendFactory;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Lock\LockManagerInterface;
+use Magento\Framework\App\DeploymentConfig;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+
+class LockBackendFactoryTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface|MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * @var DeploymentConfig|MockObject
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var LockBackendFactory
+     */
+    private $factory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManagerMock = $this->getMockForAbstractClass(ObjectManagerInterface::class);
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+        $this->factory = new LockBackendFactory($this->objectManagerMock, $this->deploymentConfigMock);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\RuntimeException
+     * @expectedExceptionMessage Unknown locks provider: someProvider
+     */
+    public function testCreateWithException()
+    {
+        $this->deploymentConfigMock->expects($this->exactly(2))
+            ->method('get')
+            ->withConsecutive(['lock/provider', LockBackendFactory::LOCK_DB], ['lock/config', []])
+            ->willReturnOnConsecutiveCalls('someProvider', []);
+
+        $this->factory->create();
+    }
+
+    /**
+     * @param string $lockProvider
+     * @param string $lockProviderClass
+     * @param array $config
+     * @dataProvider createDataProvider
+     */
+    public function testCreate(string $lockProvider, string $lockProviderClass, array $config)
+    {
+        $lockManagerMock = $this->getMockForAbstractClass(LockManagerInterface::class);
+        $this->deploymentConfigMock->expects($this->exactly(2))
+            ->method('get')
+            ->withConsecutive(['lock/provider', LockBackendFactory::LOCK_DB], ['lock/config', []])
+            ->willReturnOnConsecutiveCalls($lockProvider, $config);
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with($lockProviderClass, $config)
+            ->willReturn($lockManagerMock);
+
+        $this->assertSame($lockManagerMock, $this->factory->create());
+    }
+
+    /**
+     * @return array
+     */
+    public function createDataProvider(): array
+    {
+        $data = [
+            'db' => [
+                'lockProvider' => LockBackendFactory::LOCK_DB,
+                'lockProviderClass' => DatabaseLock::class,
+                'config' => ['prefix' => 'somePrefix'],
+            ],
+            'cache' => [
+                'lockProvider' => LockBackendFactory::LOCK_CACHE,
+                'lockProviderClass' => CacheLock::class,
+                'config' => [],
+            ],
+            'file' => [
+                'lockProvider' => LockBackendFactory::LOCK_FILE,
+                'lockProviderClass' => FileLock::class,
+                'config' => ['path' => '/my/path'],
+            ],
+        ];
+
+        if (extension_loaded('zookeeper')) {
+            $data['zookeeper'] = [
+                'lockProvider' => LockBackendFactory::LOCK_ZOOKEEPER,
+                'lockProviderClass' => ZookeeperLock::class,
+                'config' => ['host' => 'some host'],
+            ];
+        }
+
+        return $data;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/ProxyTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/ProxyTest.php
new file mode 100644
index 0000000000000..c71dad701d715
--- /dev/null
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/ProxyTest.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\Lock\Test\Unit;
+
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Framework\Lock\Proxy;
+use Magento\Framework\Lock\LockBackendFactory;
+use Magento\Framework\Lock\LockManagerInterface;
+
+/**
+ * @inheritdoc
+ */
+class ProxyTest extends TestCase
+{
+    /**
+     * @var LockBackendFactory|MockObject
+     */
+    private $factoryMock;
+
+    /**
+     * @var LockManagerInterface|MockObject
+     */
+    private $lockerMock;
+
+    /**
+     * @var Proxy
+     */
+    private $proxy;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->factoryMock = $this->createMock(LockBackendFactory::class);
+        $this->lockerMock = $this->getMockForAbstractClass(LockManagerInterface::class);
+        $this->proxy = new Proxy($this->factoryMock);
+    }
+
+    /**
+     * @return void
+     */
+    public function testIsLocked()
+    {
+        $lockName = 'testLock';
+        $this->factoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->lockerMock);
+        $this->lockerMock->expects($this->exactly(2))
+            ->method('isLocked')
+            ->with($lockName)
+            ->willReturn(true);
+
+        $this->assertTrue($this->proxy->isLocked($lockName));
+
+        // Call one more time to check that method Factory::create is called one time
+        $this->assertTrue($this->proxy->isLocked($lockName));
+    }
+
+    /**
+     * @return void
+     */
+    public function testLock()
+    {
+        $lockName = 'testLock';
+        $timeout = 123;
+        $this->factoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->lockerMock);
+        $this->lockerMock->expects($this->exactly(2))
+            ->method('lock')
+            ->with($lockName, $timeout)
+            ->willReturn(true);
+
+        $this->assertTrue($this->proxy->lock($lockName, $timeout));
+
+        // Call one more time to check that method Factory::create is called one time
+        $this->assertTrue($this->proxy->lock($lockName, $timeout));
+    }
+
+    /**
+     * @return void
+     */
+    public function testUnlock()
+    {
+        $lockName = 'testLock';
+        $this->factoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->lockerMock);
+        $this->lockerMock->expects($this->exactly(2))
+            ->method('unlock')
+            ->with($lockName)
+            ->willReturn(true);
+
+        $this->assertTrue($this->proxy->unlock($lockName));
+
+        // Call one more time to check that method Factory::create is called one time
+        $this->assertTrue($this->proxy->unlock($lockName));
+    }
+}
diff --git a/lib/internal/Magento/Framework/Mail/Message.php b/lib/internal/Magento/Framework/Mail/Message.php
index c8f0e75c52800..1156a047ba370 100644
--- a/lib/internal/Magento/Framework/Mail/Message.php
+++ b/lib/internal/Magento/Framework/Mail/Message.php
@@ -20,7 +20,7 @@ class Message implements MailMessageInterface
      *
      * @var string
      */
-    private $messageType = self::TYPE_TEXT;
+    private $messageType = Mime::TYPE_TEXT;
 
     /**
      * Initialize dependencies.
@@ -55,8 +55,8 @@ public function setMessageType($type)
      */
     public function setBody($body)
     {
-        if (is_string($body) && $this->messageType === MailMessageInterface::TYPE_HTML) {
-            $body = $this->createHtmlMimeFromString($body);
+        if (is_string($body)) {
+            $body = $this->createMimeFromString($body, $this->messageType);
         }
         $this->zendMessage->setBody($body);
         return $this;
@@ -89,10 +89,23 @@ public function getBody()
 
     /**
      * @inheritdoc
+     *
+     * @deprecated This function is missing the from name. The
+     * setFromAddress() function sets both from address and from name.
+     * @see setFromAddress()
      */
     public function setFrom($fromAddress)
     {
-        $this->zendMessage->setFrom($fromAddress);
+        $this->setFromAddress($fromAddress, null);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setFromAddress($fromAddress, $fromName = null)
+    {
+        $this->zendMessage->setFrom($fromAddress, $fromName);
         return $this;
     }
 
@@ -145,7 +158,7 @@ public function getRawMessage()
      */
     public function setBodyHtml($html)
     {
-        $this->setMessageType(self::TYPE_HTML);
+        $this->setMessageType(Mime::TYPE_HTML);
         return $this->setBody($html);
     }
 
@@ -154,23 +167,24 @@ public function setBodyHtml($html)
      */
     public function setBodyText($text)
     {
-        $this->setMessageType(self::TYPE_TEXT);
+        $this->setMessageType(Mime::TYPE_TEXT);
         return $this->setBody($text);
     }
 
     /**
-     * Create HTML mime message from the string.
+     * Create mime message from the string.
      *
-     * @param string $htmlBody
+     * @param string $body
+     * @param string $messageType
      * @return \Zend\Mime\Message
      */
-    private function createHtmlMimeFromString($htmlBody)
+    private function createMimeFromString($body, $messageType)
     {
-        $htmlPart = new Part($htmlBody);
-        $htmlPart->setCharset($this->zendMessage->getEncoding());
-        $htmlPart->setType(Mime::TYPE_HTML);
+        $part = new Part($body);
+        $part->setCharset($this->zendMessage->getEncoding());
+        $part->setType($messageType);
         $mimeMessage = new \Zend\Mime\Message();
-        $mimeMessage->addPart($htmlPart);
+        $mimeMessage->addPart($part);
         return $mimeMessage;
     }
 }
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index a1c7333f41245..b5be1cbf52cfd 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -173,13 +173,29 @@ public function setReplyTo($email, $name = null)
     /**
      * Set mail from address
      *
+     * @deprecated This function sets the from address but does not provide
+     * a way of setting the correct from addresses based on the scope.
+     * @see setFromByScope()
+     *
      * @param string|array $from
      * @return $this
      */
     public function setFrom($from)
     {
-        $result = $this->_senderResolver->resolve($from);
-        $this->message->setFrom($result['email'], $result['name']);
+        return $this->setFromByScope($from, null);
+    }
+
+    /**
+     * Set mail from address by Scope
+     *
+     * @param string|array $from
+     * @param string|int $scopeId
+     * @return $this
+     */
+    public function setFromByScope($from, $scopeId = null)
+    {
+        $result = $this->_senderResolver->resolve($from, $scopeId);
+        $this->message->setFromAddress($result['email'], $result['name']);
         return $this;
     }
 
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
index 785c93824a57d..bdb7619d7fe07 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
@@ -8,6 +8,13 @@
 
 use Magento\Framework\Mail\MessageInterface;
 
+/**
+ * Class TransportBuilderByStore
+ *
+ * @deprecated The ability to set From address based on store is now available
+ * in the \Magento\Framework\Mail\Template\TransportBuilder class
+ * @see \Magento\Framework\Mail\Template\TransportBuilder::setFromByScope
+ */
 class TransportBuilderByStore
 {
     /**
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/MessageTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/MessageTest.php
index 0c33e25e0d9d0..bea2a9ea91d38 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/MessageTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/MessageTest.php
@@ -5,44 +5,40 @@
  */
 namespace Magento\Framework\Mail\Test\Unit;
 
+/**
+ * test Magento\Framework\Mail\Message
+ */
 class MessageTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Mail\Message
+     * @var \Magento\Framework\Mail\Message
      */
-    protected $_messageMock;
+    protected $message;
 
     protected function setUp()
     {
-        $this->_messageMock = $this->createPartialMock(
-            \Magento\Framework\Mail\Message::class,
-            ['setBody', 'setMessageType']
-        );
+        $this->message = new \Magento\Framework\Mail\Message();
     }
 
     public function testSetBodyHtml()
     {
-        $this->_messageMock->expects($this->once())
-            ->method('setMessageType')
-            ->with('text/html');
+        $this->message->setBodyHtml('body');
 
-        $this->_messageMock->expects($this->once())
-            ->method('setBody')
-            ->with('body');
-
-        $this->_messageMock->setBodyHtml('body');
+        $part = $this->message->getBody()->getParts()[0];
+        $this->assertEquals('text/html', $part->getType());
+        $this->assertEquals('8bit', $part->getEncoding());
+        $this->assertEquals('utf-8', $part->getCharset());
+        $this->assertEquals('body', $part->getContent());
     }
 
     public function testSetBodyText()
     {
-        $this->_messageMock->expects($this->once())
-            ->method('setMessageType')
-            ->with('text/plain');
-
-        $this->_messageMock->expects($this->once())
-            ->method('setBody')
-            ->with('body');
+        $this->message->setBodyText('body');
 
-        $this->_messageMock->setBodyText('body');
+        $part = $this->message->getBody()->getParts()[0];
+        $this->assertEquals('text/plain', $part->getType());
+        $this->assertEquals('8bit', $part->getEncoding());
+        $this->assertEquals('utf-8', $part->getCharset());
+        $this->assertEquals('body', $part->getContent());
     }
 }
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
index c3759bc43f81f..6c5c48fba1b9b 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
@@ -100,7 +100,7 @@ protected function setUp()
     public function testGetTransport($templateType, $messageType, $bodyText, $templateNamespace)
     {
         $this->builder->setTemplateModel($templateNamespace);
-
+        
         $vars = ['reason' => 'Reason', 'customer' => 'Customer'];
         $options = ['area' => 'frontend', 'store' => 1];
 
@@ -160,23 +160,24 @@ public function getTransportDataProvider()
             ]
         ];
     }
-
+    
     /**
      * @return void
      */
-    public function testSetFrom()
+    public function testSetFromByScope()
     {
         $sender = ['email' => 'from@example.com', 'name' => 'name'];
+        $scopeId = 1;
         $this->senderResolverMock->expects($this->once())
             ->method('resolve')
-            ->with($sender)
+            ->with($sender, $scopeId)
             ->willReturn($sender);
         $this->messageMock->expects($this->once())
-            ->method('setFrom')
+            ->method('setFromAddress')
             ->with('from@example.com', 'name')
             ->willReturnSelf();
 
-        $this->builder->setFrom($sender);
+        $this->builder->setFromByScope($sender, $scopeId);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Message/Manager.php b/lib/internal/Magento/Framework/Message/Manager.php
index f31892a938fb1..d71e196deea88 100644
--- a/lib/internal/Magento/Framework/Message/Manager.php
+++ b/lib/internal/Magento/Framework/Message/Manager.php
@@ -8,9 +8,12 @@
 use Magento\Framework\Event;
 use Psr\Log\LoggerInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Debug;
 
 /**
  * Message manager model
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Manager implements ManagerInterface
@@ -67,7 +70,7 @@ class Manager implements ManagerInterface
      * @param Event\ManagerInterface $eventManager
      * @param LoggerInterface $logger
      * @param string $defaultGroup
-     * @param ExceptionMessageFactoryInterface|null exceptionMessageFactory
+     * @param ExceptionMessageFactoryInterface|null $exceptionMessageFactory
      */
     public function __construct(
         Session $session,
@@ -89,7 +92,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDefaultGroup()
     {
@@ -110,8 +113,8 @@ protected function prepareGroup($group)
     /**
      * @inheritdoc
      *
-     * @param string|null $group
      * @param bool $clear
+     * @param string|null $group
      * @return Collection
      */
     public function getMessages($clear = false, $group = null)
@@ -226,7 +229,7 @@ public function addUniqueMessages(array $messages, $group = null)
         $items = $this->getMessages(false, $group)->getItems();
 
         foreach ($messages as $message) {
-            if ($message instanceof MessageInterface and !in_array($message, $items, false)) {
+            if ($message instanceof MessageInterface && !in_array($message, $items, false)) {
                 $this->addMessage($message, $group);
             }
         }
@@ -248,7 +251,12 @@ public function addException(\Exception $exception, $alternativeText = null, $gr
             'Exception message: %s%sTrace: %s',
             $exception->getMessage(),
             "\n",
-            $exception->getTraceAsString()
+            Debug::trace(
+                $exception->getTrace(),
+                true,
+                true,
+                (bool)getenv('MAGE_DEBUG_SHOW_ARGS')
+            )
         );
 
         $this->logger->critical($message);
@@ -286,7 +294,12 @@ public function addExceptionMessage(\Exception $exception, $alternativeText = nu
             'Exception message: %s%sTrace: %s',
             $exception->getMessage(),
             "\n",
-            $exception->getTraceAsString()
+            Debug::trace(
+                $exception->getTrace(),
+                true,
+                true,
+                (bool)getenv('MAGE_DEBUG_SHOW_ARGS')
+            )
         );
 
         $this->logger->critical($message);
diff --git a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
index bdfb77762b41c..72421f793f131 100644
--- a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
+++ b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
@@ -126,16 +126,21 @@ private function getModuleConfigs()
      *
      * @param array $origList
      * @return array
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     * @throws \Exception
      */
-    private function sortBySequence($origList)
+    private function sortBySequence(array $origList): array
     {
         ksort($origList);
+        $modules = $this->prearrangeModules($origList);
+
         $expanded = [];
-        foreach ($origList as $moduleName => $value) {
+        foreach (array_keys($modules) as $moduleName) {
+            $sequence = $this->expandSequence($origList, $moduleName);
+            asort($sequence);
+
             $expanded[] = [
                 'name' => $moduleName,
-                'sequence' => $this->expandSequence($origList, $moduleName),
+                'sequence' => $sequence,
             ];
         }
 
@@ -143,7 +148,7 @@ private function sortBySequence($origList)
         $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'])) {
+                if (in_array($expanded[$j]['name'], $expanded[$i]['sequence'], true)) {
                     $temp = $expanded[$i];
                     $expanded[$i] = $expanded[$j];
                     $expanded[$j] = $temp;
@@ -159,6 +164,27 @@ private function sortBySequence($origList)
         return $result;
     }
 
+    /**
+     * Prearrange all modules by putting those from Magento before the others
+     *
+     * @param array $modules
+     * @return array
+     */
+    private function prearrangeModules(array $modules): array
+    {
+        $breakdown = ['magento' => [], 'others' => []];
+
+        foreach ($modules as $moduleName => $moduleDetails) {
+            if (strpos($moduleName, 'Magento_') !== false) {
+                $breakdown['magento'][$moduleName] = $moduleDetails;
+            } else {
+                $breakdown['others'][$moduleName] = $moduleDetails;
+            }
+        }
+
+        return array_merge($breakdown['magento'], $breakdown['others']);
+    }
+
     /**
      * Accumulate information about all transitive "sequence" references
      *
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/LoaderTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/LoaderTest.php
index fe613450fd485..827a0df8e4930 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/LoaderTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/LoaderTest.php
@@ -160,4 +160,55 @@ public function testLoadCircular()
         ]));
         $this->loader->load();
     }
+
+    /**
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function testLoadPrearranged()
+    {
+        $fixtures = [
+            'Foo_Bar' => ['name' => 'Foo_Bar', 'sequence' => ['Magento_Store']],
+            'Magento_Directory' => ['name' => 'Magento_Directory', 'sequence' => ['Magento_Store']],
+            'Magento_Store' => ['name' => 'Magento_Store', 'sequence' => []],
+            'Magento_Theme' => ['name' => 'Magento_Theme', 'sequence' => ['Magento_Store', 'Magento_Directory']],
+            'Test_HelloWorld' => ['name' => 'Test_HelloWorld', 'sequence' => ['Magento_Theme']]
+        ];
+
+        $index = 0;
+        foreach ($fixtures as $name => $fixture) {
+            $this->converter->expects($this->at($index++))->method('convert')->willReturn([$name => $fixture]);
+        }
+
+        $this->registry->expects($this->once())
+            ->method('getPaths')
+            ->willReturn([
+                '/path/to/Foo_Bar',
+                '/path/to/Magento_Directory',
+                '/path/to/Magento_Store',
+                '/path/to/Magento_Theme',
+                '/path/to/Test_HelloWorld'
+            ]);
+
+        $this->driver->expects($this->exactly(5))
+            ->method('fileGetContents')
+            ->will($this->returnValueMap([
+                ['/path/to/Foo_Bar/etc/module.xml', null, null, self::$sampleXml],
+                ['/path/to/Magento_Directory/etc/module.xml', null, null, self::$sampleXml],
+                ['/path/to/Magento_Store/etc/module.xml', null, null, self::$sampleXml],
+                ['/path/to/Magento_Theme/etc/module.xml', null, null, self::$sampleXml],
+                ['/path/to/Test_HelloWorld/etc/module.xml', null, null, self::$sampleXml],
+            ]));
+
+        // Load the full module list information
+        $result = $this->loader->load();
+
+        $this->assertSame(
+            ['Magento_Store', 'Magento_Directory', 'Magento_Theme', 'Foo_Bar', 'Test_HelloWorld'],
+            array_keys($result)
+        );
+
+        foreach ($fixtures as $name => $fixture) {
+            $this->assertSame($fixture, $result[$name]);
+        }
+    }
 }
diff --git a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
index 6311003bd2ad5..2f3caf08c534e 100644
--- a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
@@ -40,25 +40,33 @@ class DataObjectProcessor
      */
     private $customAttributesProcessor;
 
+    /**
+     * @var array
+     */
+    private $processors;
+
     /**
      * @param MethodsMap $methodsMapProcessor
      * @param TypeCaster $typeCaster
      * @param FieldNamer $fieldNamer
      * @param CustomAttributesProcessor $customAttributesProcessor
      * @param ExtensionAttributesProcessor $extensionAttributesProcessor
+     * @param array $processors
      */
     public function __construct(
         MethodsMap $methodsMapProcessor,
         TypeCaster $typeCaster,
         FieldNamer $fieldNamer,
         CustomAttributesProcessor $customAttributesProcessor,
-        ExtensionAttributesProcessor $extensionAttributesProcessor
+        ExtensionAttributesProcessor $extensionAttributesProcessor,
+        array $processors = []
     ) {
         $this->methodsMapProcessor = $methodsMapProcessor;
         $this->typeCaster = $typeCaster;
         $this->fieldNamer = $fieldNamer;
         $this->extensionAttributesProcessor = $extensionAttributesProcessor;
         $this->customAttributesProcessor = $customAttributesProcessor;
+        $this->processors = $processors;
     }
 
     /**
@@ -121,6 +129,27 @@ public function buildOutputDataArray($dataObject, $dataObjectType)
 
             $outputData[$key] = $value;
         }
+
+        $outputData = $this->changeOutputArray($dataObject, $outputData);
+
+        return $outputData;
+    }
+
+    /**
+     * Change output array if needed.
+     *
+     * @param mixed $dataObject
+     * @param array $outputData
+     * @return array
+     */
+    private function changeOutputArray($dataObject, array $outputData): array
+    {
+        foreach ($this->processors as $dataObjectClassName => $processor) {
+            if ($dataObject instanceof $dataObjectClassName) {
+                $outputData = $processor->execute($dataObject, $outputData);
+            }
+        }
+
         return $outputData;
     }
 }
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
index 8e3758817adf0..7d3c26b07c469 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
@@ -15,13 +15,18 @@
 use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;
 
 /**
+ * Class for building select where condition.
+ *
  * @api
  */
 class Match implements QueryInterface
 {
+    /**
+     * @var string
+     */
     const SPECIAL_CHARACTERS = '-+~/\\<>\'":*$#@()!,.?`=%&^';
 
-    const MINIMAL_CHARACTER_LENGTH = 3;
+    const MINIMAL_CHARACTER_LENGTH = 1;
 
     /**
      * @var string[]
@@ -69,7 +74,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function build(
         ScoreBuilder $scoreBuilder,
@@ -113,6 +118,8 @@ public function build(
     }
 
     /**
+     * Prepare query value for build function.
+     *
      * @param string $queryValue
      * @param string $conditionType
      * @return string
diff --git a/lib/internal/Magento/Framework/Serialize/README.md b/lib/internal/Magento/Framework/Serialize/README.md
index 5af8fb7f71b6b..d900f89208a54 100644
--- a/lib/internal/Magento/Framework/Serialize/README.md
+++ b/lib/internal/Magento/Framework/Serialize/README.md
@@ -3,6 +3,7 @@
 **Serialize** library provides interface *SerializerInterface* and multiple implementations:
 
  * *Json* - default implementation. Uses PHP native json_encode/json_decode functions;
+ * *JsonHexTag* - default implementation. Uses PHP native json_encode/json_decode functions with `JSON_HEX_TAG` option enabled;
  * *Serialize* - less secure than *Json*, but gives higher performance on big arrays. Uses PHP native serialize/unserialize functions, does not unserialize objects on PHP 7.
  
 Using *Serialize* implementation directly is discouraged, always use *SerializerInterface*, using *Serialize* implementation may lead to security vulnerabilities.
\ No newline at end of file
diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/FormData.php b/lib/internal/Magento/Framework/Serialize/Serializer/FormData.php
new file mode 100644
index 0000000000000..077e91797d2b5
--- /dev/null
+++ b/lib/internal/Magento/Framework/Serialize/Serializer/FormData.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\Serialize\Serializer;
+
+use Magento\Framework\Serialize\Serializer\Json;
+
+/**
+ * Class for processing of serialized form data.
+ */
+class FormData
+{
+    /**
+     * @var Json
+     */
+    private $serializer;
+
+    /**
+     * @param Json $serializer
+     */
+    public function __construct(Json $serializer)
+    {
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Provides form data from the serialized data.
+     *
+     * @param string $serializedData
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    public function unserialize(string $serializedData): array
+    {
+        $encodedFields = $this->serializer->unserialize($serializedData);
+
+        if (!is_array($encodedFields)) {
+            throw new \InvalidArgumentException('Unable to unserialize value.');
+        }
+
+        $formData = [];
+        foreach ($encodedFields as $item) {
+            $decodedFieldData = [];
+            parse_str($item, $decodedFieldData);
+            $formData = array_replace_recursive($formData, $decodedFieldData);
+        }
+
+        return $formData;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
index e352d0c2d7124..7ce9756ff243d 100644
--- a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
+++ b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
@@ -16,27 +16,27 @@
 class Json implements SerializerInterface
 {
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      * @since 100.2.0
      */
     public function serialize($data)
     {
         $result = json_encode($data);
         if (false === $result) {
-            throw new \InvalidArgumentException('Unable to serialize value.');
+            throw new \InvalidArgumentException("Unable to serialize value. Error: " . json_last_error_msg());
         }
         return $result;
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      * @since 100.2.0
      */
     public function unserialize($string)
     {
         $result = json_decode($string, true);
         if (json_last_error() !== JSON_ERROR_NONE) {
-            throw new \InvalidArgumentException('Unable to unserialize value.');
+            throw new \InvalidArgumentException("Unable to unserialize value. Error: " . json_last_error_msg());
         }
         return $result;
     }
diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/JsonHexTag.php b/lib/internal/Magento/Framework/Serialize/Serializer/JsonHexTag.php
new file mode 100644
index 0000000000000..4a5406ff3fd99
--- /dev/null
+++ b/lib/internal/Magento/Framework/Serialize/Serializer/JsonHexTag.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\Serialize\Serializer;
+
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * Serialize data to JSON with the JSON_HEX_TAG option enabled
+ * (All < and > are converted to \u003C and \u003E),
+ * unserialize JSON encoded data
+ *
+ * @api
+ * @since 100.2.0
+ */
+class JsonHexTag extends Json implements SerializerInterface
+{
+    /**
+     * @inheritDoc
+     * @since 100.2.0
+     */
+    public function serialize($data): string
+    {
+        $result = json_encode($data, JSON_HEX_TAG);
+        if (false === $result) {
+            throw new \InvalidArgumentException('Unable to serialize value.');
+        }
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/FormDataTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/FormDataTest.php
new file mode 100644
index 0000000000000..7729a2da97efb
--- /dev/null
+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/FormDataTest.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Serialize\Test\Unit\Serializer;
+
+use Magento\Framework\Serialize\Serializer\FormData;
+use Magento\Framework\Serialize\Serializer\Json;
+use Psr\Log\InvalidArgumentException;
+
+/**
+ * Test for Magento\Framework\Serialize\Serializer\FormData class.
+ */
+class FormDataTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Json|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $jsonSerializerMock;
+
+    /**
+     * @var FormData
+     */
+    private $formDataSerializer;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->jsonSerializerMock = $this->createMock(Json::class);
+        $this->formDataSerializer = new FormData($this->jsonSerializerMock);
+    }
+
+    /**
+     * @param string $serializedData
+     * @param array $encodedFields
+     * @param array $expectedFormData
+     * @return void
+     * @dataProvider unserializeDataProvider
+     */
+    public function testUnserialize(string $serializedData, array $encodedFields, array $expectedFormData)
+    {
+        $this->jsonSerializerMock->expects($this->once())
+            ->method('unserialize')
+            ->with($serializedData)
+            ->willReturn($encodedFields);
+
+        $this->assertEquals($expectedFormData, $this->formDataSerializer->unserialize($serializedData));
+    }
+
+    /**
+     * @return array
+     */
+    public function unserializeDataProvider(): array
+    {
+        return [
+            [
+                'serializedData' =>
+                    '["option[order][option_0]=1","option[value][option_0]=1","option[delete][option_0]="]',
+                'encodedFields' => [
+                    'option[order][option_0]=1',
+                    'option[value][option_0]=1',
+                    'option[delete][option_0]=',
+                    ],
+                'expectedFormData' => [
+                    'option' => [
+                        'order' => [
+                            'option_0' => '1',
+                        ],
+                        'value' => [
+                            'option_0' => '1',
+                        ],
+                        'delete' => [
+                            'option_0' => '',
+                        ],
+                    ],
+                ],
+            ],
+            [
+                'serializedData' => '[]',
+                'encodedFields' => [],
+                'expectedFormData' => [],
+            ],
+        ];
+    }
+
+    /**
+     * @return void
+     * @expectedException InvalidArgumentException
+     * @expectedExceptionMessage Unable to unserialize value.
+     */
+    public function testUnserializeWithWrongSerializedData()
+    {
+        $serializedData = 'test';
+
+        $this->jsonSerializerMock->expects($this->once())
+            ->method('unserialize')
+            ->with($serializedData)
+            ->willReturn('test');
+
+        $this->formDataSerializer->unserialize($serializedData);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php
new file mode 100644
index 0000000000000..c867dced0fc6e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Serialize\Test\Unit\Serializer;
+
+use Magento\Framework\DataObject;
+use Magento\Framework\Serialize\Serializer\JsonHexTag;
+
+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);
+        $this->json = $objectManager->getObject(JsonHexTag::class);
+    }
+
+    /**
+     * @param string|int|float|bool|array|null $value
+     * @param string $expected
+     * @dataProvider serializeDataProvider
+     */
+    public function testSerialize($value, $expected)
+    {
+        $this->assertEquals(
+            $expected,
+            $this->json->serialize($value)
+        );
+    }
+
+    public function serializeDataProvider()
+    {
+        $dataObject = new DataObject(['something']);
+        return [
+            ['', '""'],
+            ['string', '"string"'],
+            [null, 'null'],
+            [false, 'false'],
+            [['a' => 'b', 'd' => 123], '{"a":"b","d":123}'],
+            [123, '123'],
+            [10.56, '10.56'],
+            [$dataObject, '{}'],
+            ['< >', '"\u003C \u003E"'],
+        ];
+    }
+
+    /**
+     * @param string $value
+     * @param string|int|float|bool|array|null $expected
+     * @dataProvider unserializeDataProvider
+     */
+    public function testUnserialize($value, $expected)
+    {
+        $this->assertEquals(
+            $expected,
+            $this->json->unserialize($value)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function unserializeDataProvider(): array
+    {
+        return [
+            ['""', ''],
+            ['"string"', 'string'],
+            ['null', null],
+            ['false', false],
+            ['{"a":"b","d":123}', ['a' => 'b', 'd' => 123]],
+            ['123', 123],
+            ['10.56', 10.56],
+            ['{}', []],
+            ['"\u003C \u003E"', '< >'],
+        ];
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Unable to serialize value.
+     */
+    public function testSerializeException()
+    {
+        $this->json->serialize(STDOUT);
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Unable to unserialize value.
+     * @dataProvider unserializeExceptionDataProvider
+     */
+    public function testUnserializeException($value)
+    {
+        $this->json->unserialize($value);
+    }
+
+    /**
+     * @return array
+     */
+    public function unserializeExceptionDataProvider(): array
+    {
+        return [
+            [''],
+            [false],
+            [null],
+            ['{']
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Session/SaveHandler.php b/lib/internal/Magento/Framework/Session/SaveHandler.php
index 4ab3d8e28f169..7678a3676eee3 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandler.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandler.php
@@ -5,10 +5,8 @@
  */
 namespace Magento\Framework\Session;
 
-use Magento\Framework\App\DeploymentConfig;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Exception\SessionException;
 use Magento\Framework\Session\Config\ConfigInterface;
+use Magento\Framework\Exception\SessionException;
 
 /**
  * Magento session save handler
@@ -22,23 +20,16 @@ class SaveHandler implements SaveHandlerInterface
      */
     protected $saveHandlerAdapter;
 
-    /**
-     * Config
-     *
-     * @var ConfigInterface
-     */
-    private $config;
-
     /**
      * Constructor
      *
      * @param SaveHandlerFactory $saveHandlerFactory
-     * @param DeploymentConfig $deploymentConfig
+     * @param ConfigInterface $sessionConfig
      * @param string $default
      */
     public function __construct(
         SaveHandlerFactory $saveHandlerFactory,
-        DeploymentConfig $deploymentConfig,
+        ConfigInterface $sessionConfig,
         $default = self::DEFAULT_HANDLER
     ) {
         /**
@@ -47,17 +38,13 @@ public function __construct(
          * Save handler may be set to custom value in deployment config, which will override everything else.
          * Otherwise, try to read PHP settings for session.save_handler value. Otherwise, use 'files' as default.
          */
-        $defaultSaveHandler = ini_get('session.save_handler') ?: SaveHandlerInterface::DEFAULT_HANDLER;
-        $saveMethod = $deploymentConfig->get(Config::PARAM_SESSION_SAVE_METHOD, $defaultSaveHandler);
-        $this->setSaveHandler($saveMethod);
+        $saveMethod = $sessionConfig->getOption('session.save_handler') ?: $default;
 
         try {
-            $connection = $saveHandlerFactory->create($saveMethod);
+            $this->saveHandlerAdapter = $saveHandlerFactory->create($saveMethod);
         } catch (SessionException $e) {
-            $connection = $saveHandlerFactory->create($default);
-            $this->setSaveHandler($default);
+            $this->saveHandlerAdapter = $saveHandlerFactory->create($default);
         }
-        $this->saveHandlerAdapter = $connection;
     }
 
     /**
@@ -128,33 +115,4 @@ public function gc($maxLifetime)
     {
         return $this->saveHandlerAdapter->gc($maxLifetime);
     }
-
-    /**
-     * Get config
-     *
-     * @return ConfigInterface
-     * @deprecated 100.0.8
-     */
-    private function getConfig()
-    {
-        if ($this->config === null) {
-            $this->config = ObjectManager::getInstance()->get(ConfigInterface::class);
-        }
-        return $this->config;
-    }
-
-    /**
-     * Set session.save_handler option
-     *
-     * @param string $saveHandler
-     * @return $this
-     */
-    private function setSaveHandler($saveHandler)
-    {
-        if ($saveHandler === 'db' || $saveHandler === 'redis') {
-            $saveHandler = 'user';
-        }
-        $this->getConfig()->setOption('session.save_handler', $saveHandler);
-        return $this;
-    }
 }
diff --git a/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php b/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php
index e21a92bbbdc24..05c3ac5022aa1 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php
@@ -100,6 +100,26 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
      */
     const PARAM_BREAK_AFTER             = 'session/redis/break_after';
 
+    /**
+     * Configuration path for comma separated list of sentinel servers
+     */
+    const PARAM_SENTINEL_SERVERS        = 'session/redis/sentinel_servers';
+
+    /**
+     * Configuration path for sentinel master
+     */
+    const PARAM_SENTINEL_MASTER         = 'session/redis/sentinel_master';
+
+    /**
+     * Configuration path for verify sentinel master flag
+     */
+    const PARAM_SENTINEL_VERIFY_MASTER  = 'session/redis/sentinel_verify_master';
+
+    /**
+     * Configuration path for number of sentinel connection retries
+     */
+    const PARAM_SENTINEL_CONNECT_RETRIES = 'session/redis/sentinel_connect_retries';
+
     /**
      * Cookie lifetime config path
      */
@@ -123,7 +143,7 @@ class Config implements \Cm\RedisSession\Handler\ConfigInterface
     /**
      * Deployment config
      *
-     * @var DeploymentConfig $deploymentConfig
+     * @var DeploymentConfig
      */
     private $deploymentConfig;
 
@@ -153,7 +173,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getLogLevel()
     {
@@ -161,7 +181,7 @@ public function getLogLevel()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getHost()
     {
@@ -169,7 +189,7 @@ public function getHost()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPort()
     {
@@ -177,7 +197,7 @@ public function getPort()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDatabase()
     {
@@ -185,7 +205,7 @@ public function getDatabase()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPassword()
     {
@@ -193,7 +213,7 @@ public function getPassword()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getTimeout()
     {
@@ -201,7 +221,7 @@ public function getTimeout()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPersistentIdentifier()
     {
@@ -209,7 +229,7 @@ public function getPersistentIdentifier()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCompressionThreshold()
     {
@@ -217,7 +237,7 @@ public function getCompressionThreshold()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCompressionLibrary()
     {
@@ -225,7 +245,7 @@ public function getCompressionLibrary()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getMaxConcurrency()
     {
@@ -233,7 +253,7 @@ public function getMaxConcurrency()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getMaxLifetime()
     {
@@ -241,7 +261,7 @@ public function getMaxLifetime()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getMinLifetime()
     {
@@ -249,7 +269,7 @@ public function getMinLifetime()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDisableLocking()
     {
@@ -257,7 +277,7 @@ public function getDisableLocking()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getBotLifetime()
     {
@@ -265,7 +285,7 @@ public function getBotLifetime()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getBotFirstLifetime()
     {
@@ -273,7 +293,7 @@ public function getBotFirstLifetime()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFirstLifetime()
     {
@@ -281,7 +301,7 @@ public function getFirstLifetime()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getBreakAfter()
     {
@@ -289,7 +309,7 @@ public function getBreakAfter()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getLifetime()
     {
@@ -300,7 +320,39 @@ public function getLifetime()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     */
+    public function getSentinelServers()
+    {
+        return $this->deploymentConfig->get(self::PARAM_SENTINEL_SERVERS);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSentinelMaster()
+    {
+        return $this->deploymentConfig->get(self::PARAM_SENTINEL_MASTER);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSentinelVerifyMaster()
+    {
+        return $this->deploymentConfig->get(self::PARAM_SENTINEL_VERIFY_MASTER);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSentinelConnectRetries()
+    {
+        return $this->deploymentConfig->get(self::PARAM_SENTINEL_CONNECT_RETRIES);
+    }
+
+    /**
+     * @inheritdoc
      */
     public function getFailAfter()
     {
diff --git a/lib/internal/Magento/Framework/Session/SessionManager.php b/lib/internal/Magento/Framework/Session/SessionManager.php
index 0d0838b47d9cf..edd4e3da6969c 100644
--- a/lib/internal/Magento/Framework/Session/SessionManager.php
+++ b/lib/internal/Magento/Framework/Session/SessionManager.php
@@ -12,6 +12,7 @@
 /**
  * Session Manager
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class SessionManager implements SessionManagerInterface
 {
@@ -92,6 +93,11 @@ class SessionManager implements SessionManagerInterface
      */
     private $appState;
 
+    /**
+     * @var SessionStartChecker
+     */
+    private $sessionStartChecker;
+
     /**
      * @param \Magento\Framework\App\Request\Http $request
      * @param SidResolverInterface $sidResolver
@@ -102,7 +108,10 @@ class SessionManager implements SessionManagerInterface
      * @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
      * @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
      * @param \Magento\Framework\App\State $appState
+     * @param SessionStartChecker|null $sessionStartChecker
      * @throws \Magento\Framework\Exception\SessionException
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\App\Request\Http $request,
@@ -113,7 +122,8 @@ public function __construct(
         StorageInterface $storage,
         \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
         \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
-        \Magento\Framework\App\State $appState
+        \Magento\Framework\App\State $appState,
+        SessionStartChecker $sessionStartChecker = null
     ) {
         $this->request = $request;
         $this->sidResolver = $sidResolver;
@@ -124,14 +134,16 @@ public function __construct(
         $this->cookieManager = $cookieManager;
         $this->cookieMetadataFactory = $cookieMetadataFactory;
         $this->appState = $appState;
+        $this->sessionStartChecker = $sessionStartChecker ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+            SessionStartChecker::class
+        );
 
-        // Enable session.use_only_cookies
-        ini_set('session.use_only_cookies', '1');
         $this->start();
     }
 
     /**
-     * This method needs to support sessions with APC enabled
+     * This method needs to support sessions with APC enabled.
+     *
      * @return void
      */
     public function writeClose()
@@ -166,47 +178,50 @@ public function __call($method, $args)
      */
     public function start()
     {
-        if (!$this->isSessionExists()) {
-            \Magento\Framework\Profiler::start('session_start');
-
-            try {
-                $this->appState->getAreaCode();
-            } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                throw new \Magento\Framework\Exception\SessionException(
-                    new \Magento\Framework\Phrase(
-                        'Area code not set: Area code must be set before starting a session.'
-                    ),
-                    $e
-                );
-            }
-
-            // Need to apply the config options so they can be ready by session_start
-            $this->initIniOptions();
-            $this->registerSaveHandler();
-            if (isset($_SESSION['new_session_id'])) {
-                // Not fully expired yet. Could be lost cookie by unstable network.
-                session_commit();
-                session_id($_SESSION['new_session_id']);
-            }
-            $sid = $this->sidResolver->getSid($this);
-            // potential custom logic for session id (ex. switching between hosts)
-            $this->setSessionId($sid);
-            session_start();
-            if (isset($_SESSION['destroyed'])
-                && $_SESSION['destroyed'] < time() - $this->sessionConfig->getCookieLifetime()
-            ) {
-                $this->destroy(['clear_storage' => true]);
+        if ($this->sessionStartChecker->check()) {
+            if (!$this->isSessionExists()) {
+                \Magento\Framework\Profiler::start('session_start');
+
+                try {
+                    $this->appState->getAreaCode();
+                } catch (\Magento\Framework\Exception\LocalizedException $e) {
+                    throw new \Magento\Framework\Exception\SessionException(
+                        new \Magento\Framework\Phrase(
+                            'Area code not set: Area code must be set before starting a session.'
+                        ),
+                        $e
+                    );
+                }
+
+                // Need to apply the config options so they can be ready by session_start
+                $this->initIniOptions();
+                $this->registerSaveHandler();
+                if (isset($_SESSION['new_session_id'])) {
+                    // Not fully expired yet. Could be lost cookie by unstable network.
+                    session_commit();
+                    session_id($_SESSION['new_session_id']);
+                }
+                $sid = $this->sidResolver->getSid($this);
+                // potential custom logic for session id (ex. switching between hosts)
+                $this->setSessionId($sid);
+                session_start();
+                if (isset($_SESSION['destroyed'])
+                    && $_SESSION['destroyed'] < time() - $this->sessionConfig->getCookieLifetime()
+                ) {
+                    $this->destroy(['clear_storage' => true]);
+                }
+
+                $this->validator->validate($this);
+                $this->renewCookie($sid);
+
+                register_shutdown_function([$this, 'writeClose']);
+
+                $this->_addHost();
+                \Magento\Framework\Profiler::stop('session_start');
             }
-
-            $this->validator->validate($this);
-            $this->renewCookie($sid);
-
-            register_shutdown_function([$this, 'writeClose']);
-
-            $this->_addHost();
-            \Magento\Framework\Profiler::stop('session_start');
+            $this->storage->init(isset($_SESSION) ? $_SESSION : []);
         }
-        $this->storage->init(isset($_SESSION) ? $_SESSION : []);
+
         return $this;
     }
 
@@ -556,7 +571,7 @@ protected function clearSubDomainSessionCookie()
     {
         foreach (array_keys($this->_getHosts()) as $host) {
             // Delete cookies with the same name for parent domains
-            if (strpos($this->sessionConfig->getCookieDomain(), $host) > 0) {
+            if ($this->sessionConfig->getCookieDomain() !== $host) {
                 $metadata = $this->cookieMetadataFactory->createPublicCookieMetadata();
                 $metadata->setPath($this->sessionConfig->getCookiePath());
                 $metadata->setDomain($host);
@@ -596,13 +611,25 @@ public function expireSessionCookie()
      */
     private function initIniOptions()
     {
+        $result = ini_set('session.use_only_cookies', '1');
+        if ($result === false) {
+            $error = error_get_last();
+            throw new \InvalidArgumentException(
+                sprintf('Failed to set ini option session.use_only_cookies to value 1. %s', $error['message'])
+            );
+        }
+
         foreach ($this->sessionConfig->getOptions() as $option => $value) {
-            $result = ini_set($option, $value);
-            if ($result === false) {
-                $error = error_get_last();
-                throw new \InvalidArgumentException(
-                    sprintf('Failed to set ini option "%s" to value "%s". %s', $option, $value, $error['message'])
-                );
+            if ($option === 'session.save_handler') {
+                continue;
+            } else {
+                $result = ini_set($option, $value);
+                if ($result === false) {
+                    $error = error_get_last();
+                    throw new \InvalidArgumentException(
+                        sprintf('Failed to set ini option "%s" to value "%s". %s', $option, $value, $error['message'])
+                    );
+                }
             }
         }
     }
diff --git a/lib/internal/Magento/Framework/Session/SessionStartChecker.php b/lib/internal/Magento/Framework/Session/SessionStartChecker.php
new file mode 100644
index 0000000000000..9cc32268d574a
--- /dev/null
+++ b/lib/internal/Magento/Framework/Session/SessionStartChecker.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\Session;
+
+/**
+ * Class to check if session can be started or not.
+ */
+class SessionStartChecker
+{
+    /**
+     * @var bool
+     */
+    private $checkSapi;
+
+    /**
+     * @param bool $checkSapi
+     */
+    public function __construct(bool $checkSapi = true)
+    {
+        $this->checkSapi = $checkSapi;
+    }
+
+    /**
+     * Can session be started or not.
+     *
+     * @return bool
+     */
+    public function check() : bool
+    {
+        return !($this->checkSapi && PHP_SAPI === 'cli');
+    }
+}
diff --git a/lib/internal/Magento/Framework/Session/SidResolver.php b/lib/internal/Magento/Framework/Session/SidResolver.php
index ab830b5991818..1208aeb31eaee 100644
--- a/lib/internal/Magento/Framework/Session/SidResolver.php
+++ b/lib/internal/Magento/Framework/Session/SidResolver.php
@@ -9,6 +9,9 @@
 
 use Magento\Framework\App\State;
 
+/**
+ * Class SidResolver
+ */
 class SidResolver implements SidResolverInterface
 {
     /**
@@ -86,8 +89,12 @@ public function __construct(
     }
 
     /**
+     * Get Sid
+     *
      * @param SessionManagerInterface $session
+     *
      * @return string|null
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getSid(SessionManagerInterface $session)
     {
@@ -96,6 +103,7 @@ public function getSid(SessionManagerInterface $session)
         }
 
         $sidKey = null;
+
         $useSidOnFrontend = $this->getUseSessionInUrl();
         if ($useSidOnFrontend && $this->request->getQuery(
             $this->getSessionIdQueryParam($session),
@@ -168,7 +176,7 @@ public function getUseSessionInUrl()
         if ($this->_useSessionInUrl === null) {
             //Using config value by default, can be overridden by using the
             //setter.
-            $this->_useSessionInUrl = (bool)$this->scopeConfig->getValue(
+            $this->_useSessionInUrl = $this->scopeConfig->isSetFlag(
                 self::XML_PATH_USE_FRONTEND_SID,
                 $this->_scopeType
             );
diff --git a/lib/internal/Magento/Framework/Stdlib/Parameters.php b/lib/internal/Magento/Framework/Stdlib/Parameters.php
new file mode 100644
index 0000000000000..dcefaf85d390e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Stdlib/Parameters.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Stdlib;
+
+use Zend\Stdlib\Parameters as ZendParameters;
+
+/**
+ * Class Parameters
+ */
+class Parameters
+{
+    /**
+     * @var ZendParameters
+     */
+    private $parameters;
+
+    /**
+     * @param ZendParameters $parameters
+     */
+    public function __construct(
+        ZendParameters $parameters
+    ) {
+        $this->parameters = $parameters;
+    }
+
+    /**
+     * Populate from native PHP array
+     *
+     * @param  array $values
+     * @return void
+     */
+    public function fromArray(array $values)
+    {
+        $this->parameters->fromArray($values);
+    }
+
+    /**
+     * Populate from query string
+     *
+     * @param  string $string
+     * @return void
+     */
+    public function fromString($string)
+    {
+        $this->parameters->fromString($string);
+    }
+
+    /**
+     * Serialize to native PHP array
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        return $this->parameters->toArray();
+    }
+
+    /**
+     * Serialize to query string
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return $this->parameters->toString();
+    }
+
+    /**
+     * Retrieve by key
+     *
+     * Returns null if the key does not exist.
+     *
+     * @param  string $name
+     * @return mixed
+     */
+    public function offsetGet($name)
+    {
+        return $this->parameters->offsetGet($name);
+    }
+
+    /**
+     * Get name
+     *
+     * @param string $name
+     * @param mixed $default optional default value
+     * @return mixed
+     */
+    public function get($name, $default = null)
+    {
+        return $this->parameters->get($name, $default);
+    }
+
+    /**
+     * Set name
+     *
+     * @param string $name
+     * @param mixed $value
+     * @return \Zend\Stdlib\Parameters
+     */
+    public function set($name, $value)
+    {
+        return $this->parameters->set($name, $value);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php b/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php
index 22fdf0a05686a..9e2014c1b070a 100644
--- a/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php
@@ -116,6 +116,6 @@ public function testIterations()
             $iterations++;
         }
 
-        $this->assertEquals(10, $iterations);
+        $this->assertEquals(11, $iterations);
     }
 }
diff --git a/lib/internal/Magento/Framework/Test/Unit/Data/Form/Element/HiddenTest.php b/lib/internal/Magento/Framework/Test/Unit/Data/Form/Element/HiddenTest.php
index b57cb7ac8f0b2..953664455aaf9 100644
--- a/lib/internal/Magento/Framework/Test/Unit/Data/Form/Element/HiddenTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/Data/Form/Element/HiddenTest.php
@@ -21,7 +21,15 @@ class HiddenTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
-        $this->element = $objectManager->getObject(\Magento\Framework\Data\Form\Element\Hidden::class);
+        $escaper = $objectManager->getObject(
+            \Magento\Framework\Escaper::class
+        );
+        $this->element = $objectManager->getObject(
+            \Magento\Framework\Data\Form\Element\Hidden::class,
+            [
+                'escaper' => $escaper
+            ]
+        );
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php b/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
index ec05478b90db9..e406994b54c17 100644
--- a/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
@@ -72,9 +72,9 @@ public function testEscapeJsEscapesOwaspRecommendedRanges()
         // Exceptions to escaping ranges
         $immune = [',', '.', '_'];
         for ($chr = 0; $chr < 0xFF; $chr++) {
-            if ($chr >= 0x30 && $chr <= 0x39
-                || $chr >= 0x41 && $chr <= 0x5A
-                || $chr >= 0x61 && $chr <= 0x7A
+            if (($chr >= 0x30 && $chr <= 0x39)
+                || ($chr >= 0x41 && $chr <= 0x5A)
+                || ($chr >= 0x61 && $chr <= 0x7A)
             ) {
                 $literal = $this->codepointToUtf8($chr);
                 $this->assertEquals($literal, $this->escaper->escapeJs($literal));
@@ -174,6 +174,11 @@ public function escapeHtmlDataProvider()
                 'data' => '&<>"\'&amp;&lt;&gt;&quot;&#039;&#9;',
                 'expected' => '&amp;&lt;&gt;&quot;&#039;&amp;&lt;&gt;&quot;&#039;&#9;'
             ],
+            'text with special characters and allowed tag' => [
+                'data' => '&<br/>"\'&amp;&lt;&gt;&quot;&#039;&#9;',
+                'expected' => '&amp;<br>&quot;&#039;&amp;&lt;&gt;&quot;&#039;&#9;',
+                'allowedTags' => ['br'],
+            ],
             'text with multiple allowed tags, includes self closing tag' => [
                 'data' => '<span>some text in tags<br /></span>',
                 'expected' => '<span>some text in tags<br></span>',
diff --git a/lib/internal/Magento/Framework/Test/Unit/Filesystem/Directory/PathValidatorTest.php b/lib/internal/Magento/Framework/Test/Unit/Filesystem/Directory/PathValidatorTest.php
new file mode 100644
index 0000000000000..d19dbde27a472
--- /dev/null
+++ b/lib/internal/Magento/Framework/Test/Unit/Filesystem/Directory/PathValidatorTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Test\Unit\Filesystem\Directory;
+
+use Magento\Framework\Filesystem\Directory\PathValidator;
+use Magento\Framework\Filesystem\DriverInterface;
+
+/**
+ * Test for Magento\Framework\Filesystem\Directory\PathValidator class.
+ */
+class PathValidatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DriverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $driverMock;
+
+    /**
+     * @var PathValidator
+     */
+    private $pathValidator;
+    
+    protected function setUp()
+    {
+        $this->driverMock = $this->getMockForAbstractClass(DriverInterface::class);
+        
+        $this->pathValidator = new PathValidator($this->driverMock);
+    }
+
+    /**
+     * @return void
+     */
+    public function testValidateWithAbsolutePath()
+    {
+        $directoryPath = __DIR__ . '/pub/static/';
+        $path = '/pub/static/testFile.txt';
+
+        $this->driverMock->expects($this->at(0))
+            ->method('getRealPathSafety')
+            ->with($directoryPath)
+            ->willReturn($directoryPath);
+        $this->driverMock->expects($this->at(1))
+            ->method('getRealPathSafety')
+            ->with($path)
+            ->willReturn($directoryPath);
+
+        $this->pathValidator->validate($directoryPath, $path, null, true);
+    }
+
+    /**
+     * @return void
+     */
+    public function testValidateWithoutAbsolutePath()
+    {
+        $directoryPath = __DIR__ . '/pub/static/';
+        $path = '/pub/static/testFile.txt';
+        $actualPath = __DIR__ . '/pub/static/';
+
+        $this->driverMock->expects($this->at(0))
+            ->method('getRealPathSafety')
+            ->with($directoryPath)
+            ->willReturn($directoryPath);
+        $this->driverMock->expects($this->once())
+            ->method('getAbsolutePath')
+            ->with($directoryPath, $path, null)
+            ->willReturn($actualPath);
+        $this->driverMock->expects($this->at(2))
+            ->method('getRealPathSafety')
+            ->with($actualPath)
+            ->willReturn($actualPath);
+
+        $this->pathValidator->validate($directoryPath, $path);
+    }
+
+    /**
+     * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @expectedExceptionMessageRegExp #^Path ".+/static/testFile.txt" cannot be used with directory ".+/pub/static/"$#
+     */
+    public function testValidateWithWrongPath()
+    {
+        $directoryPath = __DIR__ . '/pub/static/';
+        $path = '../../../pub/static/testFile.txt';
+        $actualPath = __DIR__ . '/../../app/etc/';
+
+        $this->driverMock->expects($this->at(0))
+            ->method('getRealPathSafety')
+            ->with($directoryPath)
+            ->willReturn($directoryPath);
+        $this->driverMock->expects($this->once())
+            ->method('getAbsolutePath')
+            ->with($directoryPath, $path, null)
+            ->willReturn($actualPath);
+        $this->driverMock->expects($this->at(2))
+            ->method('getRealPathSafety')
+            ->with($actualPath)
+            ->willReturn($actualPath);
+
+        $this->pathValidator->validate($directoryPath, $path);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php b/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php
index 5c634a1bca078..0480f05ca6ab4 100644
--- a/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php
@@ -228,11 +228,8 @@ public function testLoadData($area, $forceReload)
         $this->translate->loadData($area, $forceReload);
 
         $expected = [
-            'module original' => 'module translated',
-            'module theme' => 'theme translated overwrite',
-            'module pack' => 'theme-pack translated overwrite',
+            'module pack' => 'pack translated overwrite',
             'module db' => 'db translated overwrite',
-            'theme original' => 'theme translated',
             'pack original' => 'pack translated',
             'db original' => 'db translated',
         ];
diff --git a/lib/internal/Magento/Framework/Translate.php b/lib/internal/Magento/Framework/Translate.php
index 82296d776a73d..3682cfc88c8d4 100644
--- a/lib/internal/Magento/Framework/Translate.php
+++ b/lib/internal/Magento/Framework/Translate.php
@@ -8,6 +8,9 @@
 namespace Magento\Framework;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Filesystem\Driver\File;
+use Magento\Framework\Filesystem\DriverInterface;
 
 /**
  * Translate library
@@ -116,6 +119,11 @@ class Translate implements \Magento\Framework\TranslateInterface
      */
     protected $packDictionary;
 
+    /**
+     * @var DriverInterface
+     */
+    private $fileDriver;
+
     /**
      * @var \Magento\Framework\Serialize\SerializerInterface
      */
@@ -135,6 +143,7 @@ class Translate implements \Magento\Framework\TranslateInterface
      * @param \Magento\Framework\App\RequestInterface $request
      * @param \Magento\Framework\File\Csv $csvParser
      * @param \Magento\Framework\App\Language\Dictionary $packDictionary
+     * @param DriverInterface|null $fileDriver
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -151,7 +160,8 @@ public function __construct(
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\App\RequestInterface $request,
         \Magento\Framework\File\Csv $csvParser,
-        \Magento\Framework\App\Language\Dictionary $packDictionary
+        \Magento\Framework\App\Language\Dictionary $packDictionary,
+        DriverInterface $fileDriver = null
     ) {
         $this->_viewDesign = $viewDesign;
         $this->_cache = $cache;
@@ -166,6 +176,7 @@ public function __construct(
         $this->directory = $filesystem->getDirectoryRead(DirectoryList::ROOT);
         $this->_csvParser = $csvParser;
         $this->packDictionary = $packDictionary;
+        $this->fileDriver = $fileDriver ?: ObjectManager::getInstance()->get(File::class);
 
         $this->_config = [
             self::CONFIG_AREA_KEY => null,
@@ -469,7 +480,7 @@ protected function _getThemeTranslationFile($locale)
     protected function _getFileData($file)
     {
         $data = [];
-        if ($this->directory->isExist($this->directory->getRelativePath($file))) {
+        if ($this->fileDriver->isExists($file)) {
             $this->_csvParser->setDelimiter(',');
             $data = $this->_csvParser->getDataPairs($file);
         }
diff --git a/lib/internal/Magento/Framework/Validator/Factory.php b/lib/internal/Magento/Framework/Validator/Factory.php
index f2089c662e955..2a296f7cdcb24 100644
--- a/lib/internal/Magento/Framework/Validator/Factory.php
+++ b/lib/internal/Magento/Framework/Validator/Factory.php
@@ -6,22 +6,33 @@
 
 namespace Magento\Framework\Validator;
 
+use Magento\Framework\Module\Dir\Reader;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Phrase;
+use Magento\Framework\Validator;
 use Magento\Framework\Cache\FrontendInterface;
 
+/**
+ * Factory for \Magento\Framework\Validator and \Magento\Framework\Validator\Builder.
+ */
 class Factory
 {
-    /** cache key */
+    /**
+     * cache key
+     *
+     * @deprecated
+     */
     const CACHE_KEY = __CLASS__;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     protected $_objectManager;
 
     /**
      * Validator config files
      *
-     * @var array|null
+     * @var iterable|null
      */
     protected $_configFiles = null;
 
@@ -31,40 +42,25 @@ class Factory
     private $isDefaultTranslatorInitialized = false;
 
     /**
-     * @var \Magento\Framework\Module\Dir\Reader
+     * @var Reader
      */
     private $moduleReader;
 
-    /**
-     * @var FrontendInterface
-     */
-    private $cache;
-
-    /**
-     * @var \Magento\Framework\Serialize\SerializerInterface
-     */
-    private $serializer;
-
-    /**
-     * @var \Magento\Framework\Config\FileIteratorFactory
-     */
-    private $fileIteratorFactory;
-
     /**
      * Initialize dependencies
      *
-     * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @param FrontendInterface $cache
+     * @param ObjectManagerInterface $objectManager
+     * @param Reader $moduleReader
+     * @param FrontendInterface $cache @deprecated
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
-        \Magento\Framework\ObjectManagerInterface $objectManager,
-        \Magento\Framework\Module\Dir\Reader $moduleReader,
+        ObjectManagerInterface $objectManager,
+        Reader $moduleReader,
         FrontendInterface $cache
     ) {
         $this->_objectManager = $objectManager;
         $this->moduleReader = $moduleReader;
-        $this->cache = $cache;
     }
 
     /**
@@ -75,17 +71,7 @@ public function __construct(
     protected function _initializeConfigList()
     {
         if (!$this->_configFiles) {
-            $this->_configFiles = $this->cache->load(self::CACHE_KEY);
-            if (!$this->_configFiles) {
-                $this->_configFiles = $this->moduleReader->getConfigurationFiles('validation.xml');
-                $this->cache->save(
-                    $this->getSerializer()->serialize($this->_configFiles->toArray()),
-                    self::CACHE_KEY
-                );
-            } else {
-                $filesArray = $this->getSerializer()->unserialize($this->_configFiles);
-                $this->_configFiles = $this->getFileIteratorFactory()->create(array_keys($filesArray));
-            }
+            $this->_configFiles = $this->moduleReader->getConfigurationFiles('validation.xml');
         }
     }
 
@@ -93,6 +79,7 @@ protected function _initializeConfigList()
      * Create and set default translator to \Magento\Framework\Validator\AbstractValidator.
      *
      * @return void
+     * @throws \Zend_Translate_Exception
      */
     protected function _initializeDefaultTranslator()
     {
@@ -100,7 +87,7 @@ protected function _initializeDefaultTranslator()
             // Pass translations to \Magento\Framework\TranslateInterface from validators
             $translatorCallback = function () {
                 $argc = func_get_args();
-                return (string)new \Magento\Framework\Phrase(array_shift($argc), $argc);
+                return (string)new Phrase(array_shift($argc), $argc);
             };
             /** @var \Magento\Framework\Translate\Adapter $translator */
             $translator = $this->_objectManager->create(\Magento\Framework\Translate\Adapter::class);
@@ -115,14 +102,15 @@ protected function _initializeDefaultTranslator()
      *
      * Will instantiate \Magento\Framework\Validator\Config
      *
-     * @return \Magento\Framework\Validator\Config
+     * @return Config
+     * @throws \Zend_Translate_Exception
      */
     public function getValidatorConfig()
     {
         $this->_initializeConfigList();
         $this->_initializeDefaultTranslator();
         return $this->_objectManager->create(
-            \Magento\Framework\Validator\Config::class,
+            Config::class,
             ['configFiles' => $this->_configFiles]
         );
     }
@@ -133,7 +121,8 @@ public function getValidatorConfig()
      * @param string $entityName
      * @param string $groupName
      * @param array|null $builderConfig
-     * @return \Magento\Framework\Validator\Builder
+     * @return Builder
+     * @throws \Zend_Translate_Exception
      */
     public function createValidatorBuilder($entityName, $groupName, array $builderConfig = null)
     {
@@ -147,43 +136,12 @@ public function createValidatorBuilder($entityName, $groupName, array $builderCo
      * @param string $entityName
      * @param string $groupName
      * @param array|null $builderConfig
-     * @return \Magento\Framework\Validator
+     * @return Validator
+     * @throws \Zend_Translate_Exception
      */
     public function createValidator($entityName, $groupName, array $builderConfig = null)
     {
         $this->_initializeDefaultTranslator();
         return $this->getValidatorConfig()->createValidator($entityName, $groupName, $builderConfig);
     }
-
-    /**
-     * Get serializer
-     *
-     * @return \Magento\Framework\Serialize\SerializerInterface
-     * @deprecated 100.2.0
-     */
-    private function getSerializer()
-    {
-        if ($this->serializer === null) {
-            $this->serializer = $this->_objectManager->get(
-                \Magento\Framework\Serialize\SerializerInterface::class
-            );
-        }
-        return $this->serializer;
-    }
-
-    /**
-     * Get file iterator factory
-     *
-     * @return \Magento\Framework\Config\FileIteratorFactory
-     * @deprecated 100.2.0
-     */
-    private function getFileIteratorFactory()
-    {
-        if ($this->fileIteratorFactory === null) {
-            $this->fileIteratorFactory = $this->_objectManager->get(
-                \Magento\Framework\Config\FileIteratorFactory::class
-            );
-        }
-        return $this->fileIteratorFactory;
-    }
 }
diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/Constraint/Option/CallbackTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/Constraint/Option/CallbackTest.php
index 9617b28383088..1344e87c6323d 100644
--- a/lib/internal/Magento/Framework/Validator/Test/Unit/Constraint/Option/CallbackTest.php
+++ b/lib/internal/Magento/Framework/Validator/Test/Unit/Constraint/Option/CallbackTest.php
@@ -37,7 +37,6 @@ public function testGetValue($callback, $expectedResult, $arguments = null, $cre
      */
     public function getConfigDataProvider()
     {
-        $functionName = create_function('', 'return "Value from function";');
         $closure = function () {
             return 'Value from closure';
         };
@@ -55,7 +54,6 @@ public function getConfigDataProvider()
         );
 
         return [
-            [$functionName, 'Value from function'],
             [$closure, 'Value from closure'],
             [[$this, 'getTestValue'], self::TEST_VALUE],
             [[__CLASS__, 'getTestValueStatically'], self::TEST_VALUE],
diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/FactoryTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/FactoryTest.php
index 5511627c6dcc3..73a8c95c9a2ff 100644
--- a/lib/internal/Magento/Framework/Validator/Test/Unit/FactoryTest.php
+++ b/lib/internal/Magento/Framework/Validator/Test/Unit/FactoryTest.php
@@ -25,21 +25,6 @@ class FactoryTest extends \PHPUnit\Framework\TestCase
      */
     private $validatorConfigMock;
 
-    /**
-     * @var \Magento\Framework\Cache\FrontendInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $cacheMock;
-
-    /**
-     * @var \Magento\Framework\Serialize\SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $serializerMock;
-
-    /**
-     * @var \Magento\Framework\Config\FileIteratorFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $fileIteratorFactoryMock;
-
     /**
      * @var \Magento\Framework\Config\FileIterator|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -55,11 +40,6 @@ class FactoryTest extends \PHPUnit\Framework\TestCase
      */
     private $factory;
 
-    /**
-     * @var string
-     */
-    private $jsonString = '["\/tmp\/moduleOne\/etc\/validation.xml"]';
-
     /**
      * @var array
      */
@@ -99,23 +79,9 @@ protected function setUp()
             \Magento\Framework\Validator\Factory::class,
             [
                 'objectManager' => $this->objectManagerMock,
-                'moduleReader' => $this->readerMock,
-                'cache' => $this->cacheMock
+                'moduleReader' => $this->readerMock
             ]
         );
-
-        $this->serializerMock = $this->createMock(\Magento\Framework\Serialize\SerializerInterface::class);
-        $this->fileIteratorFactoryMock = $this->createMock(\Magento\Framework\Config\FileIteratorFactory::class);
-        $objectManager->setBackwardCompatibleProperty(
-            $this->factory,
-            'serializer',
-            $this->serializerMock
-        );
-        $objectManager->setBackwardCompatibleProperty(
-            $this->factory,
-            'fileIteratorFactory',
-            $this->fileIteratorFactoryMock
-        );
     }
 
     /**
@@ -147,46 +113,6 @@ public function testGetValidatorConfig()
         );
     }
 
-    public function testGetValidatorConfigCacheNotExist()
-    {
-        $this->cacheMock->expects($this->once())
-            ->method('load')
-            ->willReturn(false);
-        $this->readerMock->expects($this->once())
-            ->method('getConfigurationFiles')
-            ->willReturn($this->fileIteratorMock);
-        $this->fileIteratorMock->method('toArray')
-            ->willReturn($this->data);
-        $this->cacheMock->expects($this->once())
-            ->method('save')
-            ->with($this->jsonString);
-        $this->serializerMock->expects($this->once())
-            ->method('serialize')
-            ->with($this->data)
-            ->willReturn($this->jsonString);
-        $this->factory->getValidatorConfig();
-        $this->factory->getValidatorConfig();
-    }
-
-    public function testGetValidatorConfigCacheExist()
-    {
-        $this->cacheMock->expects($this->once())
-            ->method('load')
-            ->willReturn($this->jsonString);
-        $this->readerMock->expects($this->never())
-            ->method('getConfigurationFiles');
-        $this->cacheMock->expects($this->never())
-            ->method('save');
-        $this->serializerMock->expects($this->once())
-            ->method('unserialize')
-            ->with($this->jsonString)
-            ->willReturn($this->data);
-        $this->fileIteratorFactoryMock->method('create')
-            ->willReturn($this->fileIteratorMock);
-        $this->factory->getValidatorConfig();
-        $this->factory->getValidatorConfig();
-    }
-
     public function testCreateValidatorBuilder()
     {
         $this->readerMock->method('getConfigurationFiles')
diff --git a/lib/internal/Magento/Framework/View/Asset/MergeService.php b/lib/internal/Magento/Framework/View/Asset/MergeService.php
index a5820a6d7651b..9cb1026df5c74 100644
--- a/lib/internal/Magento/Framework/View/Asset/MergeService.php
+++ b/lib/internal/Magento/Framework/View/Asset/MergeService.php
@@ -40,6 +40,21 @@ class MergeService
      */
     protected $state;
 
+    /**
+     * List of supported types that can be processed by merge service
+     *
+     * @var array
+     */
+    private $supportedMergeType = [
+        'css',
+        'js',
+        'eot',
+        'svg',
+        'ttf',
+        'woff',
+        'woff2',
+    ];
+
     /**
      * Constructor
      *
@@ -72,7 +87,7 @@ public function getMergedAssets(array $assets, $contentType)
     {
         $isCss = $contentType == 'css';
         $isJs = $contentType == 'js';
-        if (!$isCss && !$isJs) {
+        if (!\in_array($contentType, $this->supportedMergeType, true)) {
             throw new \InvalidArgumentException("Merge for content type '{$contentType}' is not supported.");
         }
 
diff --git a/lib/internal/Magento/Framework/View/Context.php b/lib/internal/Magento/Framework/View/Context.php
index 0c3932ffe4bd7..508d63d158bd7 100644
--- a/lib/internal/Magento/Framework/View/Context.php
+++ b/lib/internal/Magento/Framework/View/Context.php
@@ -14,6 +14,7 @@
 use Magento\Framework\Event\ManagerInterface;
 use Psr\Log\LoggerInterface as Logger;
 use Magento\Framework\Session\SessionManager;
+use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Framework\TranslateInterface;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\View\ConfigInterface as ViewConfig;
@@ -144,6 +145,7 @@ class Context
      * @param Logger $logger
      * @param AppState $appState
      * @param LayoutInterface $layout
+     * @param SessionManagerInterface|null $sessionManager
      *
      * @todo reduce parameter number
      *
@@ -163,7 +165,8 @@ public function __construct(
         CacheState $cacheState,
         Logger $logger,
         AppState $appState,
-        LayoutInterface $layout
+        LayoutInterface $layout,
+        SessionManagerInterface $sessionManager = null
     ) {
         $this->request = $request;
         $this->eventManager = $eventManager;
@@ -171,7 +174,7 @@ public function __construct(
         $this->translator = $translator;
         $this->cache = $cache;
         $this->design = $design;
-        $this->session = $session;
+        $this->session = $sessionManager ?: $session;
         $this->scopeConfig = $scopeConfig;
         $this->frontController = $frontController;
         $this->viewConfig      = $viewConfig;
@@ -332,15 +335,13 @@ public function getModuleName()
     }
 
     /**
-     * Retrieve the module name
-     *
-     * @return string
+     * Get Front Name
      *
-     * @todo alias of getModuleName
+     * @see getModuleName
      */
     public function getFrontName()
     {
-        return $this->getRequest()->getModuleName();
+        return $this->getModuleName();
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index 84dd4270c59cf..60c7050efe62c 100644
--- a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -679,10 +679,13 @@ public function toHtml()
                 'html' => $html,
             ]
         );
-        $this->_eventManager->dispatch('view_block_abstract_to_html_after', [
-            'block' => $this,
-            'transport' => $transportObject
-        ]);
+        $this->_eventManager->dispatch(
+            'view_block_abstract_to_html_after',
+            [
+                'block' => $this,
+                'transport' => $transportObject
+            ]
+        );
         $html = $transportObject->getHtml();
 
         return $html;
@@ -725,7 +728,7 @@ protected function _toHtml()
      */
     public function getUiId($arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null)
     {
-        return ' data-ui-id="' . $this->getJsId($arg1, $arg2, $arg3, $arg4, $arg5) . '" ';
+        return ' data-ui-id="' . $this->escapeHtmlAttr($this->getJsId($arg1, $arg2, $arg3, $arg4, $arg5)) . '" ';
     }
 
     /**
@@ -952,7 +955,7 @@ public function stripTags($data, $allowableTags = null, $allowHtmlEntities = fal
      */
     public function escapeUrl($string)
     {
-        return $this->_escaper->escapeUrl($string);
+        return $this->_escaper->escapeUrl((string)$string);
     }
 
     /**
@@ -972,8 +975,8 @@ public function escapeXssInUrl($data)
      *
      * Use $addSlashes = false for escaping js that inside html attribute (onClick, onSubmit etc)
      *
-     * @param  string $data
-     * @param  bool $addSlashes
+     * @param string $data
+     * @param bool $addSlashes
      * @return string
      * @deprecated 100.2.0
      */
@@ -1152,7 +1155,8 @@ public function getVar($name, $module = null)
 
     /**
      * Determine if the block scope is private or public.
-     * Returns true if scope is private, false otherwise
+     *
+     * Returns true if scope is private, false otherwise.
      *
      * @return bool
      */
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Date.php b/lib/internal/Magento/Framework/View/Element/Html/Date.php
index 558e39427cb44..909938256b133 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Date.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Date.php
@@ -78,7 +78,7 @@ public function getEscapedValue()
         if ($this->getFormat() && $this->getValue()) {
             return strftime($this->getFormat(), strtotime($this->getValue()));
         }
-        return htmlspecialchars($this->getValue());
+        return $this->escapeHtml($this->getValue());
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php b/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
index 43bfd46c1193a..7aac210dcab89 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Framework\View\Element\Html\Link;
 
+use Magento\Framework\App\DefaultPathInterface;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+
 /**
  * Block representing link with two possible states.
  * "Current" state means link leads to URL equivalent to URL of currently displayed page.
@@ -17,25 +21,25 @@
  * @method null|bool                       getCurrent()
  * @method \Magento\Framework\View\Element\Html\Link\Current setCurrent(bool $value)
  */
-class Current extends \Magento\Framework\View\Element\Template
+class Current extends Template
 {
     /**
      * Default path
      *
-     * @var \Magento\Framework\App\DefaultPathInterface
+     * @var DefaultPathInterface
      */
     protected $_defaultPath;
 
     /**
      * Constructor
      *
-     * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Framework\App\DefaultPathInterface $defaultPath
+     * @param Context $context
+     * @param DefaultPathInterface $defaultPath
      * @param array $data
      */
     public function __construct(
-        \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Framework\App\DefaultPathInterface $defaultPath,
+        Context $context,
+        DefaultPathInterface $defaultPath,
         array $data = []
     ) {
         parent::__construct($context, $data);
@@ -56,18 +60,20 @@ public function getHref()
      * Get current mca
      *
      * @return string
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     private function getMca()
     {
         $routeParts = [
-            'module' => $this->_request->getModuleName(),
-            'controller' => $this->_request->getControllerName(),
-            'action' => $this->_request->getActionName(),
+            (string)$this->_request->getModuleName(),
+            (string)$this->_request->getControllerName(),
+            (string)$this->_request->getActionName(),
         ];
 
         $parts = [];
+        $pathParts = explode('/', trim($this->_request->getPathInfo(), '/'));
         foreach ($routeParts as $key => $value) {
-            if (!empty($value) && $value != $this->_defaultPath->getPart($key)) {
+            if (isset($pathParts[$key]) && $pathParts[$key] === $value) {
                 $parts[] = $value;
             }
         }
diff --git a/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php b/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php
index 4b4e7e1bad467..9354aef1c57f7 100644
--- a/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php
+++ b/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Framework\View\Element\Template\File;
 
-use \Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Filesystem\Driver\File as FileDriver;
 
 /**
- * Class Validator
- * @package Magento\Framework\View\Element\Template\File
+ * Class Validator.
  */
 class Validator
 {
@@ -68,6 +68,11 @@ class Validator
      */
     protected $_compiledDir;
 
+    /**
+     * @var FileDriver
+     */
+    private $fileDriver;
+
     /**
      * Class constructor
      *
@@ -75,12 +80,14 @@ class Validator
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfigInterface
      * @param ComponentRegistrar $componentRegistrar
      * @param string|null $scope
+     * @param FileDriver|null $fileDriver
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfigInterface,
         ComponentRegistrar $componentRegistrar,
-        $scope = null
+        $scope = null,
+        FileDriver $fileDriver = null
     ) {
         $this->_filesystem = $filesystem;
         $this->_isAllowSymlinks = $scopeConfigInterface->getValue(self::XML_PATH_TEMPLATE_ALLOW_SYMLINK, $scope);
@@ -88,6 +95,7 @@ public function __construct(
         $this->moduleDirs = $componentRegistrar->getPaths(ComponentRegistrar::MODULE);
         $this->_compiledDir = $this->_filesystem->getDirectoryRead(DirectoryList::TMP_MATERIALIZATION_DIR)
             ->getAbsolutePath();
+        $this->fileDriver = $fileDriver ?: \Magento\Framework\App\ObjectManager::getInstance()->get(FileDriver::class);
     }
 
     /**
@@ -128,7 +136,7 @@ protected function isPathInDirectories($path, $directories)
             $directories = (array)$directories;
         }
         foreach ($directories as $directory) {
-            if (0 === strpos($path, $directory)) {
+            if (0 === strpos($this->fileDriver->getRealPath($path), $directory)) {
                 return true;
             }
         }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
index f683e248aec91..e2920cf400a49 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
@@ -64,12 +64,13 @@ function ($column) use ($alias) {
 
     /**
      * Escape against value
+     *
      * @param string $value
      * @return string
      */
     private function escapeAgainstValue(string $value): string
     {
-        return preg_replace('/([+\-><\(\)~*\"@]+)/', ' ', $value);
+        return preg_replace('/([+\-><\(\)~*@]+)/', ' ', $value);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php b/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php
index b82e79806acf9..233b97baeef0c 100644
--- a/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\View\Layout\Generator;
 
 use Magento\Framework\View\Element\BlockFactory;
@@ -60,7 +61,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getType()
     {
@@ -85,8 +86,6 @@ public function process(ReaderContext $readerContext, GeneratorContext $generato
         $layout = $generatorContext->getLayout();
 
         // Instantiate blocks and collect all actions data
-        /** @var $blocks \Magento\Framework\View\Element\AbstractBlock[] */
-        $blocks = [];
         foreach ($scheduledElements as $elementName => $element) {
             list($elementType, $data) = $element;
 
@@ -94,9 +93,10 @@ public function process(ReaderContext $readerContext, GeneratorContext $generato
                 continue;
             }
 
-            $block = $this->generateComponent($structure, $elementName, $data, $layout);
-            $blocks[$elementName] = $block;
-            $layout->setBlock($elementName, $block);
+            $layout->setBlock(
+                $elementName,
+                $this->generateComponent($structure, $elementName, $data, $layout)
+            );
             $scheduledStructure->unsetElement($elementName);
         }
 
diff --git a/lib/internal/Magento/Framework/View/Layout/etc/head.xsd b/lib/internal/Magento/Framework/View/Layout/etc/head.xsd
index a913507ae17b3..51acc5789a4f8 100644
--- a/lib/internal/Magento/Framework/View/Layout/etc/head.xsd
+++ b/lib/internal/Magento/Framework/View/Layout/etc/head.xsd
@@ -20,6 +20,15 @@
         <xs:attribute name="type" type="xs:string"/>
         <xs:attribute name="order" type="xs:integer"/>
         <xs:attribute name="src_type" type="xs:string"/>
+        <xs:attribute name="as">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="font" />
+                    <xs:enumeration value="script" />
+                    <xs:enumeration value="style" />
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
     </xs:complexType>
 
     <xs:complexType name="metaType">
@@ -58,6 +67,7 @@
             <xs:element name="script" type="scriptType" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="remove" type="srcRemoveType" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="attribute" type="headAttributeType" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="font" type="linkType" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
 </xs:schema>
diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php
index 226abc538112b..fdb7c673d3dda 100644
--- a/lib/internal/Magento/Framework/View/Page/Config.php
+++ b/lib/internal/Magento/Framework/View/Page/Config.php
@@ -54,6 +54,11 @@ class Config
      */
     const HTML_ATTRIBUTE_LANG = 'lang';
 
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
     /**
      * Allowed group of types
      *
@@ -164,6 +169,7 @@ private function getAreaResolver()
      * @param Title $title
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param bool $isIncludesAvailable
+     * @param \Magento\Framework\Escaper|null $escaper
      */
     public function __construct(
         View\Asset\Repository $assetRepo,
@@ -172,7 +178,8 @@ public function __construct(
         View\Page\FaviconInterface $favicon,
         Title $title,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
-        $isIncludesAvailable = true
+        $isIncludesAvailable = true,
+        \Magento\Framework\Escaper $escaper = null
     ) {
         $this->assetRepo = $assetRepo;
         $this->pageAssets = $pageAssets;
@@ -186,6 +193,9 @@ public function __construct(
             self::HTML_ATTRIBUTE_LANG,
             strstr($this->localeResolver->getLocale(), '_', true)
         );
+        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\Escaper::class
+        );
     }
 
     /**
@@ -237,7 +247,7 @@ public function getTitle()
     public function setMetadata($name, $content)
     {
         $this->build();
-        $this->metadata[$name] = htmlspecialchars($content);
+        $this->metadata[$name] = $this->escaper->escapeHtml($content);
     }
 
     /**
@@ -498,7 +508,7 @@ public function addRss($title, $href)
      */
     public function addBodyClass($className)
     {
-        $className = preg_replace('#[^a-z0-9]+#', '-', strtolower($className));
+        $className = preg_replace('#[^a-z0-9-_]+#', '-', strtolower($className));
         $bodyClasses = $this->getElementAttribute(self::ELEMENT_TYPE_BODY, self::BODY_ATTRIBUTE_CLASS);
         $bodyClasses = $bodyClasses ? explode(' ', $bodyClasses) : [];
         $bodyClasses[] = $className;
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php b/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php
index 510da2b1b1ca9..e8c4f345625de 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\View\Layout;
 use Magento\Framework\View\Page\Config as PageConfig;
+use Magento\Framework\View\Page\Config\Structure;
 
 /**
  * Head structure reader is intended for collecting assets, title and metadata
@@ -17,6 +18,7 @@ class Head implements Layout\ReaderInterface
      * Supported types
      */
     const TYPE_HEAD = 'head';
+    const HEAD_FONT = 'font';
     /**#@-*/
 
     /**#@+
@@ -56,6 +58,9 @@ protected function addContentTypeByNodeName(Layout\Element $node)
             case self::HEAD_SCRIPT:
                 $node->addAttribute('content_type', 'js');
                 break;
+            case self::HEAD_FONT:
+                $node->addAttribute('content_type', 'font');
+                break;
         }
     }
 
@@ -81,42 +86,55 @@ function (Layout\Element $current, Layout\Element $next) {
         );
 
         foreach ($nodes as $node) {
-            switch ($node->getName()) {
-                case self::HEAD_CSS:
-                case self::HEAD_SCRIPT:
-                case self::HEAD_LINK:
-                    $this->addContentTypeByNodeName($node);
-                    $pageConfigStructure->addAssets($node->getAttribute('src'), $this->getAttributes($node));
-                    break;
-
-                case self::HEAD_REMOVE:
-                    $pageConfigStructure->removeAssets($node->getAttribute('src'));
-                    break;
-
-                case self::HEAD_TITLE:
-                    $pageConfigStructure->setTitle(new \Magento\Framework\Phrase($node));
-                    break;
-
-                case self::HEAD_META:
-                    $this->setMetadata($pageConfigStructure, $node);
-                    break;
-
-                case self::HEAD_ATTRIBUTE:
-                    $pageConfigStructure->setElementAttribute(
-                        PageConfig::ELEMENT_TYPE_HEAD,
-                        $node->getAttribute('name'),
-                        $node->getAttribute('value')
-                    );
-                    break;
-
-                default:
-                    break;
-            }
+            $this->processNode($node, $pageConfigStructure);
         }
 
         return $this;
     }
 
+    /**
+     * Process given node based on it's name.
+     *
+     * @param Layout\Element $node
+     * @param Structure $pageConfigStructure
+     * @return void
+     */
+    private function processNode(Layout\Element $node, Structure $pageConfigStructure)
+    {
+        switch ($node->getName()) {
+            case self::HEAD_CSS:
+            case self::HEAD_SCRIPT:
+            case self::HEAD_LINK:
+            case self::HEAD_FONT:
+                $this->addContentTypeByNodeName($node);
+                $pageConfigStructure->addAssets($node->getAttribute('src'), $this->getAttributes($node));
+                break;
+
+            case self::HEAD_REMOVE:
+                $pageConfigStructure->removeAssets($node->getAttribute('src'));
+                break;
+
+            case self::HEAD_TITLE:
+                $pageConfigStructure->setTitle(new \Magento\Framework\Phrase($node));
+                break;
+
+            case self::HEAD_META:
+                $this->setMetadata($pageConfigStructure, $node);
+                break;
+
+            case self::HEAD_ATTRIBUTE:
+                $pageConfigStructure->setElementAttribute(
+                    PageConfig::ELEMENT_TYPE_HEAD,
+                    $node->getAttribute('name'),
+                    $node->getAttribute('value')
+                );
+                break;
+
+            default:
+                break;
+        }
+    }
+
     /**
      * Get all attributes for current dom element
      *
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
index 183f8d34ee41f..77808b732219c 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
@@ -20,7 +20,29 @@ class Renderer implements RendererInterface
     /**
      * @var array
      */
-    protected $assetTypeOrder = ['css', 'ico', 'js'];
+    protected $assetTypeOrder = [
+        'css',
+        'ico',
+        'js',
+        'eot',
+        'svg',
+        'ttf',
+        'woff',
+        'woff2',
+    ];
+
+    /**
+     * Possible fonts type
+     *
+     * @var array
+     */
+    const FONTS_TYPE = [
+        'eot',
+        'svg',
+        'ttf',
+        'woff',
+        'woff2',
+    ];
 
     /**
      * @var Config
@@ -315,10 +337,25 @@ protected function addDefaultAttributes($contentType, $attributes)
             case 'css':
                 $attributes = ' rel="stylesheet" type="text/css" ' . ($attributes ?: ' media="all"');
                 break;
+
+            case $this->canTypeBeFont($contentType):
+                $attributes = 'rel="preload" as="font" crossorigin="anonymous"';
+                break;
         }
         return $attributes;
     }
 
+    /**
+     * Check if file type can be font
+     *
+     * @param string $type
+     * @return bool
+     */
+    private function canTypeBeFont(string $type): bool
+    {
+        return \in_array($type, self::FONTS_TYPE, true);
+    }
+
     /**
      * @param string $contentType
      * @param string|null $attributes
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 91abc5f085be6..36e0669420ab5 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
@@ -8,6 +8,7 @@
 
 namespace Magento\Framework\View\Test\Unit\Element;
 
+use Magento\Framework\Escaper;
 use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\View\Element\Context;
 use Magento\Framework\Config\View;
@@ -59,6 +60,11 @@ class AbstractBlockTest extends \PHPUnit\Framework\TestCase
      */
     private $sessionMock;
 
+    /**
+     * @var Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $escaperMock;
+
     /**
      * @return void
      */
@@ -70,6 +76,9 @@ protected function setUp()
         $this->cacheMock = $this->getMockForAbstractClass(CacheInterface::class);
         $this->sidResolverMock = $this->getMockForAbstractClass(SidResolverInterface::class);
         $this->sessionMock = $this->getMockForAbstractClass(SessionManagerInterface::class);
+        $this->escaperMock = $this->getMockBuilder(Escaper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $contextMock = $this->createMock(Context::class);
         $contextMock->expects($this->once())
             ->method('getEventManager')
@@ -89,6 +98,9 @@ protected function setUp()
         $contextMock->expects($this->once())
             ->method('getSession')
             ->willReturn($this->sessionMock);
+        $contextMock->expects($this->once())
+            ->method('getEscaper')
+            ->willReturn($this->escaperMock);
         $this->block = $this->getMockForAbstractClass(
             AbstractBlock::class,
             ['context' => $contextMock]
@@ -103,6 +115,13 @@ protected function setUp()
      */
     public function testGetUiId($expectedResult, $nameInLayout, $methodArguments)
     {
+        $this->escaperMock->expects($this->once())
+            ->method('escapeHtmlAttr')
+            ->willReturnCallback(
+                function ($string) {
+                    return $string;
+                }
+            );
         $this->block->setNameInLayout($nameInLayout);
         $this->assertEquals($expectedResult, call_user_func_array([$this->block, 'getUiId'], $methodArguments));
     }
@@ -149,10 +168,12 @@ public function testGetVar()
 
         $config->expects($this->any())
             ->method('getVarValue')
-            ->willReturnMap([
-                ['Magento_Theme', 'v1', 'one'],
-                [$module, 'v2', 'two']
-            ]);
+            ->willReturnMap(
+                [
+                    ['Magento_Theme', 'v1', 'one'],
+                    [$module, 'v2', 'two']
+                ]
+            );
 
         $configManager = $this->createMock(ConfigInterface::class);
         $configManager->expects($this->exactly(2))->method('getViewConfig')->willReturn($config);
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php
index 909748722a081..7070ec9d48c11 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php
@@ -17,11 +17,6 @@ class CurrentTest extends \PHPUnit\Framework\TestCase
      */
     protected $_requestMock;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_defaultPathMock;
-
     /**
      * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
      */
@@ -32,7 +27,6 @@ protected function setUp()
         $this->_objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->_urlBuilderMock = $this->createMock(\Magento\Framework\UrlInterface::class);
         $this->_requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
-        $this->_defaultPathMock = $this->createMock(\Magento\Framework\App\DefaultPathInterface::class);
     }
 
     public function testGetUrl()
@@ -60,29 +54,46 @@ public function testIsCurrentIfIsset()
         $this->assertTrue($link->isCurrent());
     }
 
+    /**
+     * Test if the current url is the same as link path
+     *
+     * @return void
+     */
     public function testIsCurrent()
     {
-        $path = 'test/path';
-        $url = 'http://example.com/a/b';
-
-        $this->_requestMock->expects($this->once())->method('getModuleName')->will($this->returnValue('a'));
-        $this->_requestMock->expects($this->once())->method('getControllerName')->will($this->returnValue('b'));
-        $this->_requestMock->expects($this->once())->method('getActionName')->will($this->returnValue('d'));
-        $this->_defaultPathMock->expects($this->atLeastOnce())->method('getPart')->will($this->returnValue('d'));
+        $path = 'test/index';
+        $url = 'http://example.com/test/index';
+
+        $this->_requestMock->expects($this->once())
+            ->method('getPathInfo')
+            ->will($this->returnValue('/test/index/'));
+        $this->_requestMock->expects($this->once())
+            ->method('getModuleName')
+            ->will($this->returnValue('test'));
+        $this->_requestMock->expects($this->once())
+            ->method('getControllerName')
+            ->will($this->returnValue('index'));
+        $this->_requestMock->expects($this->once())
+            ->method('getActionName')
+            ->will($this->returnValue('index'));
+        $this->_urlBuilderMock->expects($this->at(0))
+            ->method('getUrl')
+            ->with($path)
+            ->will($this->returnValue($url));
+        $this->_urlBuilderMock->expects($this->at(1))
+            ->method('getUrl')
+            ->with('test/index')
+            ->will($this->returnValue($url));
 
-        $this->_urlBuilderMock->expects($this->at(0))->method('getUrl')->with($path)->will($this->returnValue($url));
-        $this->_urlBuilderMock->expects($this->at(1))->method('getUrl')->with('a/b')->will($this->returnValue($url));
-
-        $this->_requestMock->expects($this->once())->method('getControllerName')->will($this->returnValue('b'));
         /** @var \Magento\Framework\View\Element\Html\Link\Current $link */
         $link = $this->_objectManager->getObject(
             \Magento\Framework\View\Element\Html\Link\Current::class,
             [
                 'urlBuilder' => $this->_urlBuilderMock,
-                'request' => $this->_requestMock,
-                'defaultPath' => $this->_defaultPathMock
+                'request' => $this->_requestMock
             ]
         );
+
         $link->setPath($path);
         $this->assertTrue($link->isCurrent());
     }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/MessagesTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/MessagesTest.php
index 57fefe4660cb2..223b9a364b1fe 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/MessagesTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/MessagesTest.php
@@ -9,13 +9,15 @@
  */
 namespace Magento\Framework\View\Test\Unit\Element;
 
+use Magento\Framework\Escaper;
 use Magento\Framework\Message\Manager;
 use Magento\Framework\View\Element\Message\InterpretationStrategyInterface;
 use \Magento\Framework\View\Element\Messages;
-
-use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\Message\MessageInterface;
 
+/**
+ * Unit test for \Magento\Framework\View\Element\Messages
+ */
 class MessagesTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -38,6 +40,11 @@ class MessagesTest extends \PHPUnit\Framework\TestCase
      */
     protected $messageInterpretationStrategy;
 
+    /**
+     * @var Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $escaperMock;
+
     protected function setUp()
     {
         $this->collectionFactory = $this->getMockBuilder(\Magento\Framework\Message\CollectionFactory::class)
@@ -52,13 +59,18 @@ protected function setUp()
             \Magento\Framework\View\Element\Message\InterpretationStrategyInterface::class
         );
 
+        $this->escaperMock = $this->getMockBuilder(Escaper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->messages = $objectManager->getObject(
             \Magento\Framework\View\Element\Messages::class,
             [
                 'collectionFactory' => $this->collectionFactory,
                 'messageFactory' => $this->messageFactory,
-                'interpretationStrategy' => $this->messageInterpretationStrategy
+                'interpretationStrategy' => $this->messageInterpretationStrategy,
+                'escaper' => $this->escaperMock,
             ]
         );
     }
@@ -317,6 +329,14 @@ public function testGetGroupedHtml()
                 ]
             );
 
+        $this->escaperMock->expects($this->any())
+            ->method('escapeHtmlAttr')
+            ->willReturnCallback(
+                function ($string) {
+                    return $string;
+                }
+            );
+
         $this->assertEquals($resultHtml, $this->messages->getGroupedHtml());
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Template/File/ValidatorTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Template/File/ValidatorTest.php
index 28d58f4685e80..696dca4eef75e 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Template/File/ValidatorTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Template/File/ValidatorTest.php
@@ -10,41 +10,40 @@
 use \Magento\Framework\Filesystem\DriverPool;
 
 /**
- * Class ValidatorTest
- * @package Magento\Framework\View\Test\Unit\Element\Template\File
+ * Tests for Magento\Framework\View\Element\Template\File\Validator class.
  */
 class ValidatorTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * Resolver object
+     * Resolver object.
      *
      * @var \Magento\Framework\View\Element\Template\File\Validator
      */
-    private $_validator;
+    private $validator;
 
     /**
-     * Mock for view file system
+     * Mock for view file system.
      *
      * @var \Magento\Framework\FileSystem|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $_fileSystemMock;
+    private $fileSystemMock;
 
     /**
-     * Mock for scope config
+     * Mock for scope config.
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $_scopeConfigMock;
+    private $scopeConfigMock;
 
     /**
-     * Mock for root directory reader
+     * Mock for root directory reader.
      *
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $rootDirectoryMock;
 
     /**
-     * Mock for compiled directory reader
+     * Mock for compiled directory reader.
      *
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -56,18 +55,16 @@ class ValidatorTest extends \PHPUnit\Framework\TestCase
     private $componentRegistrar;
 
     /**
-     * Test Setup
-     *
-     * @return void
+     * @inheritdoc
      */
     protected function setUp()
     {
-        $this->_fileSystemMock = $this->createMock(\Magento\Framework\Filesystem::class);
-        $this->_scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $this->fileSystemMock = $this->createMock(\Magento\Framework\Filesystem::class);
+        $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
         $this->rootDirectoryMock = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadInterface::class);
         $this->compiledDirectoryMock = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadInterface::class);
 
-        $this->_fileSystemMock->expects($this->any())
+        $this->fileSystemMock->expects($this->any())
             ->method('getDirectoryRead')
             ->will($this->returnValueMap(
                 [
@@ -87,39 +84,46 @@ protected function setUp()
                 $this->returnValueMap(
                     [
                         [ComponentRegistrar::MODULE, ['/magento/app/code/Some/Module']],
-                        [ComponentRegistrar::THEME, ['/magento/themes/default']]
+                        [ComponentRegistrar::THEME, ['/magento/themes/default']],
                     ]
                 )
             );
-        $this->_validator = new \Magento\Framework\View\Element\Template\File\Validator(
-            $this->_fileSystemMock,
-            $this->_scopeConfigMock,
-            $this->componentRegistrar
+
+        $fileDriverMock = $this->createMock(\Magento\Framework\Filesystem\Driver\File::class);
+        $fileDriverMock->expects($this->any())
+            ->method('getRealPath')
+            ->willReturnArgument(0);
+
+        $this->validator = new \Magento\Framework\View\Element\Template\File\Validator(
+            $this->fileSystemMock,
+            $this->scopeConfigMock,
+            $this->componentRegistrar,
+            null,
+            $fileDriverMock
         );
     }
 
     /**
-     * Test is file valid
+     * Test is file valid.
      *
      * @param string $file
      * @param bool $expectedResult
-     *
-     * @dataProvider testIsValidDataProvider
-     *
      * @return void
+     *
+     * @dataProvider isValidDataProvider
      */
-    public function testIsValid($file, $expectedResult)
+    public function testIsValid(string $file, bool $expectedResult)
     {
         $this->rootDirectoryMock->expects($this->any())->method('isFile')->will($this->returnValue(true));
-        $this->assertEquals($expectedResult, $this->_validator->isValid($file));
+        $this->assertEquals($expectedResult, $this->validator->isValid($file));
     }
 
     /**
-     * Data provider for testIsValid
+     * Data provider for testIsValid.
      *
-     * @return []
+     * @return array
      */
-    public function testIsValidDataProvider()
+    public function isValidDataProvider() : array
     {
         return [
             'empty' => ['', false],
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php
index 24fd9f98d7112..d20af502084f5 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php
@@ -69,6 +69,8 @@ public function testEvaluateWrongModel($input, $expectedException, $expectedExce
     {
         $this->expectException($expectedException);
         $this->expectExceptionMessage($expectedExceptionMessage);
+        $this->_objectManager->method('get')
+            ->willReturnSelf();
         $this->_model->evaluate($input);
     }
 
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/BodyTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/BodyTest.php
index 0f59c302f943f..ed926afa00856 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/BodyTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/BodyTest.php
@@ -57,13 +57,13 @@ public function testProcess()
             ->method('getPageConfigStructure')
             ->willReturn($structureMock);
 
-        $bodyClasses = ['class_1', 'class_2'];
+        $bodyClasses = ['class_1', 'class--2'];
         $structureMock->expects($this->once())
             ->method('getBodyClasses')
             ->will($this->returnValue($bodyClasses));
         $this->pageConfigMock->expects($this->exactly(2))
             ->method('addBodyClass')
-            ->withConsecutive(['class_1'], ['class_2']);
+            ->withConsecutive(['class_1'], ['class--2']);
 
         $this->assertEquals(
             $this->bodyGenerator,
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/StructureTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/StructureTest.php
index ed15a356cc4c7..d2eba5d2fa1b3 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/StructureTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/StructureTest.php
@@ -58,7 +58,7 @@ public function testSetElementAttribute()
     public function testSetBodyClass()
     {
         $class1 = 'class_1';
-        $class2 = 'class_2';
+        $class2 = 'class--2';
         $expected = [$class1, $class2];
         $this->structure->setBodyClass($class1);
         $this->structure->setBodyClass($class2);
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php
index 5bada08bbd00f..49b3c38bdd8bd 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php
@@ -19,6 +19,9 @@
  */
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
+    /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
+    private $objectManager;
+
     /**
      * @var Config
      */
@@ -90,6 +93,10 @@ protected function setUp()
         $this->localeMock->expects($this->any())
             ->method('getLocale')
             ->willReturn(Resolver::DEFAULT_LOCALE);
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $escaper = $this->objectManager->getObject(
+            \Magento\Framework\Escaper::class
+        );
         $this->model = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
             ->getObject(
                 \Magento\Framework\View\Page\Config::class,
@@ -98,7 +105,8 @@ protected function setUp()
                     'pageAssets' => $this->pageAssets,
                     'scopeConfig' => $this->scopeConfig,
                     'favicon' => $this->favicon,
-                    'localeResolver' => $this->localeMock
+                    'localeResolver' => $this->localeMock,
+                    'escaper' => $escaper
                 ]
             );
 
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php b/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php
index b4cfc61611a93..f25cd219e3eae 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Response/Renderer/Xml.php
@@ -7,6 +7,9 @@
  */
 namespace Magento\Framework\Webapi\Rest\Response\Renderer;
 
+/**
+ * Renders response data in Xml format.
+ */
 class Xml implements \Magento\Framework\Webapi\Rest\Response\RendererInterface
 {
     /**
@@ -111,8 +114,7 @@ protected function _formatValue($value)
             /** Without the following transformation boolean values are rendered incorrectly */
             $value = $value ? 'true' : 'false';
         }
-        $replacementMap = ['&' => '&amp;'];
-        return str_replace(array_keys($replacementMap), array_values($replacementMap), $value);
+        return (string) $value;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/Renderer/XmlTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/Renderer/XmlTest.php
index 396fbcdb1978b..71fb41491cc74 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/Renderer/XmlTest.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/Renderer/XmlTest.php
@@ -76,6 +76,11 @@ public function providerXmlRender()
                 '<?xml version="1.0"?><response><item_7key>value</item_7key></response>',
                 'Invalid XML render with numeric symbol in data index.'
             ],
+            [
+                ['key' => 'test & foo'],
+                '<?xml version="1.0"?><response><key>test &amp; foo</key></response>',
+                'Invalid XML render with ampersand symbol in data index.'
+            ],
             [
                 ['.key' => 'value'],
                 '<?xml version="1.0"?><response><item_key>value</item_key></response>',
diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
index ededfebaf94ab..f1c6497b70631 100644
--- a/lib/internal/Magento/Framework/composer.json
+++ b/lib/internal/Magento/Framework/composer.json
@@ -2,17 +2,16 @@
     "name": "magento/framework",
     "description": "N/A",
     "type": "magento2-library",
-    "version": "101.0.6",
+    "version": "101.0.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
     "require": {
-        "php": "~7.0.13|~7.1.0",
+        "php": "~7.0.13|~7.1.0|~7.2.0",
         "ext-spl": "*",
         "ext-dom": "*",
         "ext-simplexml": "*",
-        "ext-mcrypt": "*",
         "ext-hash": "*",
         "ext-curl": "*",
         "ext-iconv": "*",
@@ -22,7 +21,7 @@
         "ext-xsl": "*",
         "ext-bcmath": "*",
         "symfony/process": "~2.1",
-        "colinmollenhour/php-redis-session-abstract": "1.3.4",
+        "colinmollenhour/php-redis-session-abstract": "1.3.8",
         "composer/composer": "^1.4",
         "monolog/monolog": "^1.17",
         "oyejorge/less.php": "~1.7.0",
@@ -35,7 +34,7 @@
         "zendframework/zend-validator": "^2.6.0",
         "zendframework/zend-stdlib": "^2.7.7",
         "zendframework/zend-http": "^2.6.0",
-        "magento/zendframework1": "~1.13.0"
+        "magento/zendframework1": "~1.14.0"
     },
     "suggest": {
         "ext-imagick": "Use Image Magick >=3.0.0 as an optional alternative image processing library"
diff --git a/lib/web/css/docs/forms.html b/lib/web/css/docs/forms.html
index 211a9bd650ba0..dc08ddffd2066 100644
--- a/lib/web/css/docs/forms.html
+++ b/lib/web/css/docs/forms.html
@@ -713,7 +713,7 @@ <h2 id="simple-form-with-required-fields-message">Simple form with &quot;require
             <th>@_type</th>
             <td class="vars_value">@form-element-input-type</td>
             <td class="vars_value">'' [input-text | select | textarea | input-radio | input-checkbox]</td>
-            <td>Form control type.<br/><b>@form-element-input__[]</b> global variables are used to set up all form elements style. Control-specific global variables use these <b>@form-element-input__[]</b> variables by default. Control-specific global variables can be set up separately.<br/><b>@input-text__[]</b> is used to set up input-text controls style<br/><b>@select__[]</b> is used to set up selects style<br/><b>@textarea__[]</b> is used to set up textarea style</td>
+            <td>Form control type.<br/><strong>@form-element-input__[]</strong> global variables are used to set up all form elements style. Control-specific global variables use these <strong>@form-element-input__[]</strong> variables by default. Control-specific global variables can be set up separately.<br/><strong>@input-text__[]</strong> is used to set up input-text controls style<br/><strong>@select__[]</strong> is used to set up selects style<br/><strong>@textarea__[]</strong> is used to set up textarea style</td>
         </tr>
         <tr>
             <th>@_background</th>
diff --git a/lib/web/css/docs/variables.html b/lib/web/css/docs/variables.html
index 4f353dc1554a4..ebbf2122ab209 100644
--- a/lib/web/css/docs/variables.html
+++ b/lib/web/css/docs/variables.html
@@ -3507,7 +3507,7 @@ <h4 id="the-codelibformelementinputcoed-mixin-variables">The <code>.lib-form-ele
             <th>@_type</th>
             <td class="vars_value">@form-element-input-type</td>
             <td class="vars_value">'' [input-text | select | textarea | input-radio | input-checkbox]</td>
-            <td>Form control type.<br/><b>@form-element-input__[]</b> global variables are used to set up all form elements style. Control-specific global variables use these <b>@form-element-input__[]</b> variables by default. Control-specific global variables can be set up separately.<br/><b>@input-text__[]</b> is used to set up input-text controls style<br/><b>@select__[]</b> is used to set up selects style<br/><b>@textarea__[]</b> is used to set up textarea style</td>
+            <td>Form control type.<br/><strong>@form-element-input__[]</strong> global variables are used to set up all form elements style. Control-specific global variables use these <strong>@form-element-input__[]</strong> variables by default. Control-specific global variables can be set up separately.<br/><strong>@input-text__[]</strong> is used to set up input-text controls style<br/><strong>@select__[]</strong> is used to set up selects style<br/><strong>@textarea__[]</strong> is used to set up textarea style</td>
         </tr>
         <tr>
             <th>@_background</th>
diff --git a/lib/web/css/source/lib/_forms.less b/lib/web/css/source/lib/_forms.less
index b1c7a49da4a7a..5b6ff81bb4a65 100644
--- a/lib/web/css/source/lib/_forms.less
+++ b/lib/web/css/source/lib/_forms.less
@@ -300,6 +300,8 @@
 
     input[type="checkbox"] {
         .lib-form-element-choice(@_type: input-checkbox);
+        position: relative;
+        top: 2px;
     }
 
     input[type="radio"] {
diff --git a/lib/web/css/source/lib/_icons.less b/lib/web/css/source/lib/_icons.less
index d113935e2b1cd..abb8b43368f13 100644
--- a/lib/web/css/source/lib/_icons.less
+++ b/lib/web/css/source/lib/_icons.less
@@ -25,9 +25,12 @@
     @_icon-font-text-hide: @icon-font__text-hide,
     @_icon-font-display: @icon-font__display
 ) when (@_icon-font-position = before) {
-    ._lib-icon-text-hide(@_icon-font-text-hide);
     .lib-css(display, @_icon-font-display);
-    text-decoration: none;
+    text-decoration: none; 
+    
+    & when not (@_icon-font-content = false) {
+        ._lib-icon-text-hide(@_icon-font-text-hide);
+    }
 
     &:before {
         ._lib-icon-font(
@@ -68,10 +71,13 @@
     @_icon-font-text-hide: @icon-font__text-hide,
     @_icon-font-display: @icon-font__display
 ) when (@_icon-font-position = after) {
-    ._lib-icon-text-hide(@_icon-font-text-hide);
     .lib-css(display, @_icon-font-display);
     text-decoration: none;
-
+    
+    & when not (@_icon-font-content = false) {
+        ._lib-icon-text-hide(@_icon-font-text-hide);
+    }
+    
     &:after {
         ._lib-icon-font(
             @_icon-font-content,
@@ -151,8 +157,11 @@
     @_icon-image-text-hide: @icon__text-hide
 ) when (@_icon-image-position = before) {
     display: inline-block;
-    ._lib-icon-text-hide(@_icon-image-text-hide);
-
+    
+    & when not (@_icon-image = false) {
+        ._lib-icon-text-hide(@_icon-image-text-hide);
+    }
+    
     &:before {
         ._lib-icon-image(
             @_icon-image,
@@ -179,7 +188,10 @@
     @_icon-image-text-hide: @icon__text-hide
 ) when (@_icon-image-position = after) {
     display: inline-block;
-    ._lib-icon-text-hide(@_icon-image-text-hide);
+    
+    & when not (@_icon-image = false) {
+        ._lib-icon-text-hide(@_icon-font-text-hide);
+    }
 
     &:after {
         ._lib-icon-image(
diff --git a/lib/web/css/source/lib/_navigation.less b/lib/web/css/source/lib/_navigation.less
index acae3c629500e..6232333fca33f 100644
--- a/lib/web/css/source/lib/_navigation.less
+++ b/lib/web/css/source/lib/_navigation.less
@@ -330,6 +330,19 @@
                 padding-right: 0;
             }
 
+            &:hover {
+                &:after {
+                    content: '';
+                    display: block;
+                    position: absolute;
+                    top: 0;
+                    left: 100%;
+                    width: 10px;
+                    height: calc(100% + 3px);
+                    z-index: 1;
+                }
+            }
+
             > .level-top {
                 .lib-css(background, @_nav-level0-item-background-color);
                 .lib-css(border, @_nav-level0-item-border);
@@ -408,6 +421,17 @@
                     @_left: @_submenu-arrow-left
                 );
 
+                &:before {
+                    content: '';
+                    display: block;
+                    position: absolute;
+                    width: 100%;
+                    height: 4px;
+                    left: 0;
+                    top: -4px;
+                    z-index: 1;
+                }
+
                 a {
                     display: block;
                     line-height: inherit;
diff --git a/lib/web/css/source/lib/_resets.less b/lib/web/css/source/lib/_resets.less
index 8228a07ef92ab..5ad50b3bb39ab 100644
--- a/lib/web/css/source/lib/_resets.less
+++ b/lib/web/css/source/lib/_resets.less
@@ -55,7 +55,7 @@
     object,
     video,
     embed {
-        height: auto;
+        max-height: 100%;
         max-width: 100%;
     }
 
diff --git a/lib/web/css/source/lib/_typography.less b/lib/web/css/source/lib/_typography.less
index 62529fe08d1c8..db4eaaf584f4a 100644
--- a/lib/web/css/source/lib/_typography.less
+++ b/lib/web/css/source/lib/_typography.less
@@ -10,15 +10,35 @@
 .lib-font-face(
     @family-name,
     @font-path,
+    @font-format: false,
     @font-weight: normal,
-    @font-style: normal
-) {
+    @font-style: normal,
+    @font-display: auto
+) when (@font-format = false) {
     @font-face {
         font-family: @family-name;
         src: url('@{font-path}.woff2') format('woff2'),
         url('@{font-path}.woff') format('woff');
         font-weight: @font-weight;
         font-style: @font-style;
+        font-display: @font-display;
+    }
+}
+
+.lib-font-face(
+    @family-name,
+    @font-path,
+    @font-format: false,
+    @font-weight: normal,
+    @font-style: normal,
+    @font-display: auto
+) when not (@font-format = false) {
+    @font-face {
+        font-family: @family-name;
+        src: url('@{font-path}.@{font-format}') format(@font-format);
+        font-weight: @font-weight;
+        font-style: @font-style;
+        font-display: @font-display;
     }
 }
 
diff --git a/lib/web/fotorama/fotorama.js b/lib/web/fotorama/fotorama.js
index 4062c501cb798..33d731937707c 100644
--- a/lib/web/fotorama/fotorama.js
+++ b/lib/web/fotorama/fotorama.js
@@ -1455,16 +1455,24 @@ fotoramaVersion = '4.6.4';
                 }
             } else {
                 stopEvent(e);
-                (options.onMove || noop).call(el, e, {touch: touchFLAG});
+                if (movedEnough(xDiff,yDiff)) {
+                    (options.onMove || noop).call(el, e, {touch: touchFLAG});
+                }
             }
 
-            if (!moved && Math.sqrt(Math.pow(xDiff, 2) + Math.pow(yDiff, 2)) > tolerance) {
+            if (!moved && movedEnough(xDiff, yDiff) && Math.sqrt(Math.pow(xDiff, 2) + Math.pow(yDiff, 2)) > tolerance)
+            {
                 moved = true;
             }
 
             tail.checked = tail.checked || xWin || yWin;
         }
 
+
+        function movedEnough(xDiff, yDiff) {
+            return xDiff > yDiff && xDiff > 1.5;
+        }
+
         function onEnd(e) {
             (options.onTouchEnd || noop)();
 
@@ -2481,11 +2489,11 @@ fotoramaVersion = '4.6.4';
                         .append($videoPlay.clone());
 
                     // This solves tabbing problems
-                    addFocus(frame, function () {
+                    addFocus(frame, function (e) {
                         setTimeout(function () {
                             lockScroll($stage);
                         }, 0);
-                        clickToShow({index: frameData.eq, user: true});
+                        clickToShow({index: frameData.eq, user: true}, e);
                     });
 
                     $stageFrame = $stageFrame.add($frame);
@@ -3034,7 +3042,10 @@ fotoramaVersion = '4.6.4';
             return time;
         }
 
-        that.showStage = function (silent, options, time) {
+        that.showStage = function (silent, options, time, e) {
+            if (e !== undefined && e.target.tagName == 'IFRAME') {
+                return;
+            }
             unloadVideo($videoPlaying, activeFrame.i !== data[normalizeIndex(repositionIndex)].i);
             frameDraw(activeIndexes, 'stage');
             stageFramePosition(SLOW ? [dirtyIndex] : [dirtyIndex, getPrevIndex(dirtyIndex), getNextIndex(dirtyIndex)]);
@@ -3122,7 +3133,7 @@ fotoramaVersion = '4.6.4';
             }
         };
 
-        that.show = function (options) {
+        that.show = function (options, e) {
             that.longPress.singlePressInProgress = true;
 
             var index = calcActiveIndex(options);
@@ -3133,7 +3144,7 @@ fotoramaVersion = '4.6.4';
 
             var silent = _activeFrame === activeFrame && !options.user;
 
-            that.showStage(silent, options, time);
+            that.showStage(silent, options, time, e);
             that.showNav(silent, options, time);
 
             showedFLAG = typeof lastActiveIndex !== 'undefined' && lastActiveIndex !== activeIndex;
@@ -3493,7 +3504,7 @@ fotoramaVersion = '4.6.4';
 
         $stage.on('mousemove', stageCursor);
 
-        function clickToShow(showOptions) {
+        function clickToShow(showOptions, e) {
             clearTimeout(clickToShow.t);
 
             if (opts.clicktransition && opts.clicktransition !== opts.transition) {
@@ -3510,7 +3521,7 @@ fotoramaVersion = '4.6.4';
                     }, 10);
                 }, 0);
             } else {
-                that.show(showOptions);
+                that.show(showOptions, e);
             }
         }
 
diff --git a/lib/web/fotorama/fotorama.min.js b/lib/web/fotorama/fotorama.min.js
deleted file mode 100644
index e8eb9fbda63ef..0000000000000
--- a/lib/web/fotorama/fotorama.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*!
- * Fotorama 4.6.4 | http://fotorama.io/license/
- */
-fotoramaVersion="4.6.4";(function(bo,k,a3,bV,aP){var ag="fotorama",bH="fotorama__fullscreen",ae=ag+"__wrap",ah=ae+"--css2",aX=ae+"--css3",bt=ae+"--video",ar=ae+"--fade",aw=ae+"--slide",P=ae+"--no-controls",aM=ae+"--no-shadows",U=ae+"--pan-y",a0=ae+"--rtl",az=ae+"--only-active",bN=ae+"--no-captions",f=ae+"--toggle-arrows",a7=ag+"__stage",x=a7+"__frame",l=x+"--video",B=a7+"__shaft",aB=ag+"__grab",bC=ag+"__pointer",aK=ag+"__arr",F=aK+"--disabled",bc=aK+"--prev",r=aK+"--next",bO=ag+"__nav",bq=bO+"-wrap",aH=bO+"__shaft",b=bq+"--vertical",ax=bq+"--list",bZ=bq+"--horizontal",bW=bO+"--dots",ai=bO+"--thumbs",aG=bO+"__frame",br=ag+"__fade",al=br+"-front",n=br+"-rear",aW=ag+"__shadow",bz=aW+"s",S=bz+"--left",aL=bz+"--right",a2=bz+"--top",aR=bz+"--bottom",a4=ag+"__active",a9=ag+"__select",bs=ag+"--hidden",M=ag+"--fullscreen",aJ=ag+"__fullscreen-icon",bP=ag+"__error",bM=ag+"__loading",c=ag+"__loaded",b3=c+"--full",bg=c+"--img",bR=ag+"__grabbing",J=ag+"__img",Y=J+"--full",bS=ag+"__thumb",b0=bS+"__arr--left",H=bS+"__arr--right",cb=bS+"-border",bd=ag+"__html",af=ag+"-video-container",bJ=ag+"__video",T=bJ+"-play",w=bJ+"-close",au=ag+"_horizontal_ratio",aY=ag+"_vertical_ratio",ca=ag+"__spinner",Z=ca+"--show";var E=bV&&bV.fn.jquery.split(".");if(!E||E[0]<1||(E[0]==1&&E[1]<8)){throw"Fotorama requires jQuery 1.8 or later and will not run without it."}var bx={};var ap=(function(co,ct,cj){var cf="2.8.3",cm={},cD=ct.documentElement,cE="modernizr",cB=ct.createElement(cE),cp=cB.style,cg,cw={}.toString,cy=" -webkit- -moz- -o- -ms- ".split(" "),cd="Webkit Moz O ms",cG=cd.split(" "),cq=cd.toLowerCase().split(" "),ck={},ce={},cu={},cA=[],cv=cA.slice,cc,cz=function(cQ,cS,cK,cR){var cJ,cP,cM,cN,cI=ct.createElement("div"),cO=ct.body,cL=cO||ct.createElement("body");if(parseInt(cK,10)){while(cK--){cM=ct.createElement("div");cM.id=cR?cR[cK]:cE+(cK+1);cI.appendChild(cM)}}cJ=["&#173;",'<style id="s',cE,'">',cQ,"</style>"].join("");cI.id=cE;(cO?cI:cL).innerHTML+=cJ;cL.appendChild(cI);if(!cO){cL.style.background="";cL.style.overflow="hidden";cN=cD.style.overflow;cD.style.overflow="hidden";cD.appendChild(cL)}cP=cS(cI,cQ);if(!cO){cL.parentNode.removeChild(cL);cD.style.overflow=cN}else{cI.parentNode.removeChild(cI)}return !!cP},cs=({}).hasOwnProperty,cC;if(!cl(cs,"undefined")&&!cl(cs.call,"undefined")){cC=function(cI,cJ){return cs.call(cI,cJ)}}else{cC=function(cI,cJ){return((cJ in cI)&&cl(cI.constructor.prototype[cJ],"undefined"))}}if(!Function.prototype.bind){Function.prototype.bind=function cH(cK){var cL=this;if(typeof cL!="function"){throw new TypeError()}var cI=cv.call(arguments,1),cJ=function(){if(this instanceof cJ){var cO=function(){};cO.prototype=cL.prototype;var cN=new cO();var cM=cL.apply(cN,cI.concat(cv.call(arguments)));if(Object(cM)===cM){return cM}return cN}else{return cL.apply(cK,cI.concat(cv.call(arguments)))}};return cJ}}function cr(cI){cp.cssText=cI}function ci(cJ,cI){return cr(cy.join(cJ+";")+(cI||""))}function cl(cJ,cI){return typeof cJ===cI}function cn(cJ,cI){return !!~(""+cJ).indexOf(cI)}function cF(cK,cI){for(var cJ in cK){var cL=cK[cJ];if(!cn(cL,"-")&&cp[cL]!==cj){return cI=="pfx"?cL:true}}return false}function cx(cJ,cM,cL){for(var cI in cJ){var cK=cM[cJ[cI]];if(cK!==cj){if(cL===false){return cJ[cI]}if(cl(cK,"function")){return cK.bind(cL||cM)}return cK}}return false}function i(cM,cI,cL){var cJ=cM.charAt(0).toUpperCase()+cM.slice(1),cK=(cM+" "+cG.join(cJ+" ")+cJ).split(" ");if(cl(cI,"string")||cl(cI,"undefined")){return cF(cK,cI)}else{cK=(cM+" "+(cq).join(cJ+" ")+cJ).split(" ");return cx(cK,cI,cL)}}ck.touch=function(){var cI;if(("ontouchstart" in co)||co.DocumentTouch&&ct instanceof DocumentTouch){cI=true}else{cz(["@media (",cy.join("touch-enabled),("),cE,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(cJ){cI=cJ.offsetTop===9})}return cI};ck.csstransforms3d=function(){var cI=!!i("perspective");if(cI&&"webkitPerspective" in cD.style){cz("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(cJ,cK){cI=cJ.offsetLeft===9&&cJ.offsetHeight===3})}return cI};ck.csstransitions=function(){return i("transition")};for(var ch in ck){if(cC(ck,ch)){cc=ch.toLowerCase();cm[cc]=ck[ch]();cA.push((cm[cc]?"":"no-")+cc)}}cm.addTest=function(cJ,cK){if(typeof cJ=="object"){for(var cI in cJ){if(cC(cJ,cI)){cm.addTest(cI,cJ[cI])}}}else{cJ=cJ.toLowerCase();if(cm[cJ]!==cj){return cm}cK=typeof cK=="function"?cK():cK;if(typeof enableClasses!=="undefined"&&enableClasses){cD.className+=" "+(cK?"":"no-")+cJ}cm[cJ]=cK}return cm};cr("");cB=cg=null;cm._version=cf;cm._prefixes=cy;cm._domPrefixes=cq;cm._cssomPrefixes=cG;cm.testProp=function(cI){return cF([cI])};cm.testAllProps=i;cm.testStyles=cz;cm.prefixed=function(cK,cJ,cI){if(!cJ){return i(cK,"pfx")}else{return i(cK,cJ,cI)}};return cm})(bo,k);var bB={ok:false,is:function(){return false},request:function(){},cancel:function(){},event:"",prefix:""},h="webkit moz o ms khtml".split(" ");if(typeof k.cancelFullScreen!="undefined"){bB.ok=true}else{for(var bv=0,N=h.length;bv<N;bv++){bB.prefix=h[bv];if(typeof k[bB.prefix+"CancelFullScreen"]!="undefined"){bB.ok=true;break}}}if(bB.ok){bB.event=bB.prefix+"fullscreenchange";bB.is=function(){switch(this.prefix){case"":return k.fullScreen;case"webkit":return k.webkitIsFullScreen;default:return k[this.prefix+"FullScreen"]}};bB.request=function(i){return(this.prefix==="")?i.requestFullScreen():i[this.prefix+"RequestFullScreen"]()};bB.cancel=function(i){return(this.prefix==="")?k.cancelFullScreen():k[this.prefix+"CancelFullScreen"]()}}function a6(i){var cc="bez_"+bV.makeArray(arguments).join("_").replace(".","p");if(typeof bV.easing[cc]!=="function"){var cd=function(ck,ci){var cf=[null,null],cl=[null,null],cj=[null,null],ch=function(cm,cn){cj[cn]=3*ck[cn];cl[cn]=3*(ci[cn]-ck[cn])-cj[cn];cf[cn]=1-cj[cn]-cl[cn];return cm*(cj[cn]+cm*(cl[cn]+cm*cf[cn]))},cg=function(cm){return cj[0]+cm*(2*cl[0]+3*cf[0]*cm)},ce=function(co){var cm=co,cn=0,cp;while(++cn<14){cp=ch(cm,0)-co;if(Math.abs(cp)<0.001){break}cm-=cp/cg(cm)}return cm};return function(cm){return ch(ce(cm),1)}};bV.easing[cc]=function(cf,cg,ce,ci,ch){return ci*cd([i[0],i[1]],[i[2],i[3]])(cg/ch)+ce}}return cc}var bf=bV(bo),bw=bV(k),R,I,bT=a3.hash.replace("#","")==="quirks",ac=ap.csstransforms3d,aA=ac&&!bT,aN=ac||k.compatMode==="CSS1Compat",s=bB.ok,am=navigator.userAgent.match(/Android|webOS|iPhone|iPad|iPod|BlackBerry|Windows Phone/i),bh=!aA||am,aZ=navigator.msPointerEnabled,y="onwheel" in k.createElement("div")?"wheel":k.onmousewheel!==aP?"mousewheel":"DOMMouseScroll",b8=250,ba=300,bY=1400,bQ=5000,b9=2,L=64,bk=500,bE=333,bu="$stageFrame",b7="$navDotFrame",bl="$navThumbFrame",bF="auto",u=a6([0.1,0,0.25,1]),bK=1200,b4=1,Q={width:null,minwidth:null,maxwidth:"100%",height:null,minheight:null,maxheight:null,ratio:null,margin:b9,nav:"dots",navposition:"bottom",navwidth:null,thumbwidth:L,thumbheight:L,thumbmargin:b9,thumbborderwidth:b9,allowfullscreen:false,transition:"slide",clicktransition:null,transitionduration:ba,captions:true,startindex:0,loop:false,autoplay:false,stopautoplayontouch:true,keyboard:false,arrows:true,click:true,swipe:false,trackpad:false,shuffle:false,direction:"ltr",shadows:true,showcaption:true,navdir:"horizontal",navarrows:true,navtype:"thumbs"},p={left:true,right:true,down:true,up:true,space:false,home:false,end:false};function g(){}function bb(cd,cc,i){return Math.max(isNaN(cc)?-Infinity:cc,Math.min(isNaN(i)?Infinity:i,cd))}function bi(cc,i){return cc.match(/ma/)&&cc.match(/-?\d+(?!d)/g)[cc.match(/3d/)?(i==="vertical"?13:12):(i==="vertical"?5:4)]}function aa(cc,i){if(aA){return +bi(cc.css("transform"),i)}else{return +cc.css(i==="vertical"?"top":"left").replace("px","")}}function b2(cd,cc){var i={};if(aA){switch(cc){case"vertical":i.transform="translate3d(0, "+(cd)+"px,0)";break;case"list":break;default:i.transform="translate3d("+(cd)+"px,0,0)";break}}else{cc==="vertical"?i.top=cd:i.left=cd}return i}function b6(i){return{"transition-duration":i+"ms"}}function aV(cc,i){return isNaN(cc)?i:cc}function m(cc,i){return aV(+String(cc).replace(i||"px",""))}function K(i){return/%$/.test(i)?m(i,"%"):aP}function d(cc,i){return aV(K(cc)/100*i,m(cc))}function t(i){return(!isNaN(m(i))||!isNaN(m(i,"%")))&&i}function a8(cc,cd,ce,i){return(cc-(i||0))*(cd+(ce||0))}function by(ce,cc,cd,i){return -Math.round(ce/(cc+(cd||0))-(i||0))}function aO(cd){var cc=cd.data();if(cc.tEnd){return}var ce=cd[0],i={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",msTransition:"MSTransitionEnd",transition:"transitionend"};D(ce,i[ap.prefixed("transition")],function(cf){cc.tProp&&cf.propertyName.match(cc.tProp)&&cc.onEndFn()});cc.tEnd=true}function X(cd,cf,ce,cg){var cc,i=cd.data();if(i){i.onEndFn=function(){if(cc){return}cc=true;clearTimeout(i.tT);ce()};i.tProp=cf;clearTimeout(i.tT);i.tT=setTimeout(function(){i.onEndFn()},cg*1.5);aO(cd)}}function a1(cd,cf){var cc=cd.navdir||"horizontal";if(cd.length){var i=cd.data();if(aA){cd.css(b6(0));i.onEndFn=g;clearTimeout(i.tT)}else{cd.stop()}var ce=bj(cf,function(){return aa(cd,cc)});cd.css(b2(ce,cc));return ce}}function bj(){var cc;for(var cd=0,i=arguments.length;cd<i;cd++){cc=cd?arguments[cd]():arguments[cd];if(typeof cc==="number"){break}}return cc}function aF(cc,i){return Math.round(cc+((i-cc)/1.5))}function aU(){aU.p=aU.p||(a3.protocol==="https:"?"https://":"http://");return aU.p}function ak(cc){var i=k.createElement("a");i.href=cc;return i}function at(i,cd){if(typeof i!=="string"){return i}i=ak(i);var cf,ce;if(i.host.match(/youtube\.com/)&&i.search){cf=i.search.split("v=")[1];if(cf){var cc=cf.indexOf("&");if(cc!==-1){cf=cf.substring(0,cc)}ce="youtube"}}else{if(i.host.match(/youtube\.com|youtu\.be/)){cf=i.pathname.replace(/^\/(embed\/|v\/)?/,"").replace(/\/.*/,"");ce="youtube"}else{if(i.host.match(/vimeo\.com/)){ce="vimeo";cf=i.pathname.replace(/^\/(video\/)?/,"").replace(/\/.*/,"")}}}if((!cf||!ce)&&cd){cf=i.href;ce="custom"}return cf?{id:cf,type:ce,s:i.search.replace(/^\?/,""),p:aU()}:false}function aQ(cg,ce,cf){var cc,i,cd=cg.video;if(cd.type==="youtube"){i=aU()+"img.youtube.com/vi/"+cd.id+"/default.jpg";cc=i.replace(/\/default.jpg$/,"/hqdefault.jpg");cg.thumbsReady=true}else{if(cd.type==="vimeo"){bV.ajax({url:aU()+"vimeo.com/api/v2/video/"+cd.id+".json",dataType:"jsonp",success:function(ch){cg.thumbsReady=true;v(ce,{img:ch[0].thumbnail_large,thumb:ch[0].thumbnail_small},cg.i,cf)}})}else{cg.thumbsReady=true}}return{img:cc,thumb:i}}function v(ch,cd,cf,ci){for(var cg=0,ce=ch.length;cg<ce;cg++){var cj=ch[cg];if(cj.i===cf&&cj.thumbsReady){var cc={videoReady:true};cc[bu]=cc[bl]=cc[b7]=false;ci.splice(cg,1,bV.extend({},cj,cc,cd));break}}}function bI(cc){var ce=[];function cd(cf,ch,cn){var ci=cf.children("img").eq(0),cm=cf.attr("href"),ck=cf.attr("src"),cl=ci.attr("src"),cj=ch.video,cg=cn?at(cm,cj===true):false;if(cg){cm=false}else{cg=cj}i(cf,ci,bV.extend(ch,{video:cg,img:ch.img||cm||ck||cl,thumb:ch.thumb||cl||ck||cm}))}function i(cg,cj,ck){var ci=ck.thumb&&ck.img!==ck.thumb,ch=m(ck.width||cg.attr("width")),cf=m(ck.height||cg.attr("height"));bV.extend(ck,{width:ch,height:cf,thumbratio:bm(ck.thumbratio||(m(ck.thumbwidth||(cj&&cj.attr("width"))||ci||ch)/m(ck.thumbheight||(cj&&cj.attr("height"))||ci||cf)))})}cc.children().each(function(){var cf=bV(this),cg=bA(bV.extend(cf.data(),{id:cf.attr("id")}));if(cf.is("a, img")){cd(cf,cg,true)}else{if(!cf.is(":empty")){i(cf,null,bV.extend(cg,{html:this,_html:cf.html()}))}else{return}}ce.push(cg)});return ce}function W(i){return i.offsetWidth===0&&i.offsetHeight===0}function be(i){return !bV.contains(k.documentElement,i)}function bX(cf,cd,ce,cc){if(!bX.i){bX.i=1;bX.ii=[true]}cc=cc||bX.i;if(typeof bX.ii[cc]==="undefined"){bX.ii[cc]=true}if(cf()){cd()}else{bX.ii[cc]&&setTimeout(function(){bX.ii[cc]&&bX(cf,cd,ce,cc)},ce||100)}return bX.i++}bX.stop=function(cc){bX.ii[cc]=false};function V(ce,cd){var cc=ce.data(),cg=cc.measures;if(cg&&(!cc.l||cc.l.W!==cg.width||cc.l.H!==cg.height||cc.l.r!==cg.ratio||cc.l.w!==cd.w||cc.l.h!==cd.h)){var i=bb(cd.h,0,cg.height),cf=i*cg.ratio;aS.setRatio(ce,cf,i);cc.l={W:cg.width,H:cg.height,r:cg.ratio,w:cd.w,h:cd.h}}return true}function an(i,cd){var cc=i[0];if(cc.styleSheet){cc.styleSheet.cssText=cd}else{i.html(cd)}}function bp(ce,cd,i,cc){return cd===i?false:cc==="vertical"?(ce<=cd?"top":ce>=i?"bottom":"top bottom"):(ce<=cd?"left":ce>=i?"right":"left right")}function z(cc,cd,i){i=i||{};cc.each(function(){var cg=bV(this),cf=cg.data(),ce;if(cf.clickOn){return}cf.clickOn=true;bV.extend(aI(cg,{onStart:function(ch){ce=ch;(i.onStart||g).call(this,ch)},onMove:i.onMove||g,onTouchEnd:i.onTouchEnd||g,onEnd:function(ch){if(ch.moved){return}cd.call(this,ce)}}),{noMove:true})})}function ab(i,cc){return'<div class="'+i+'">'+(cc||"")+"</div>"}function aT(i){return"."+i}function q(i){var cc='<iframe src="'+i.p+i.type+".com/embed/"+i.id+'" frameborder="0" allowfullscreen></iframe>';return cc}function aC(cf){var cc=cf.length;while(cc){var ce=Math.floor(Math.random()*cc--);var cd=cf[cc];cf[cc]=cf[ce];cf[ce]=cd}return cf}function bG(i){return Object.prototype.toString.call(i)=="[object Array]"&&bV.map(i,function(cc){return bV.extend({},cc)})}function bU(i,cd,cc){i.scrollLeft(cd||0).scrollTop(cc||0)}function bA(i){if(i){var cc={};bV.each(i,function(cd,ce){cc[cd.toLowerCase()]=ce});return cc}}function bm(i){if(!i){return}var cc=+i;if(!isNaN(cc)){return cc}else{cc=i.split("/");return +cc[0]/+cc[1]||aP}}function D(cd,ce,cc,i){if(!ce){return}cd.addEventListener?cd.addEventListener(ce,cc,!!i):cd.attachEvent("on"+ce,cc)}function a5(i,cc){if(i>cc.max){i=cc.max}else{if(i<cc.min){i=cc.min}}return i}function aD(i,ck,ch,cf,ce,cd,cc){var cg,cj,ci;if(cc==="horizontal"){cj=i.thumbwidth;ci=cd.width()}else{cj=i.thumbheight;ci=cd.height()}if((cj+i.margin)*(ch+1)>=(ci-cf)){if(cc==="horizontal"){cg=-ce.position().left}else{cg=-ce.position().top}}else{if((cj+i.margin)*(ch)<=Math.abs(cf)){if(cc==="horizontal"){cg=-ce.position().left+ci-(cj+i.margin)}else{cg=-ce.position().top+ci-(cj+i.margin)}}else{cg=cf}}cg=a5(cg,ck);return cg||0}function aj(i){return !!i.getAttribute("disabled")}function ad(cc,i){if(i){return{disabled:cc}}else{return{tabindex:cc*-1+"",disabled:cc}}}function a(cc,i){D(cc,"keyup",function(cd){aj(cc)||cd.keyCode==13&&i.call(cc,cd)})}function bL(cc,i){D(cc,"focus",cc.onfocusin=function(cd){i.call(cc,cd)},true)}function O(cc,i){cc.preventDefault?cc.preventDefault():(cc.returnValue=false);i&&cc.stopPropagation&&cc.stopPropagation()}function aE(cd,cc){var i=/iP(ad|hone|od)/i.test(bo.navigator.userAgent);if(i&&cc==="touchend"){cd.on("touchend",function(ce){bw.trigger("mouseup",ce)})}cd.on(cc,function(ce){O(ce,true);return false})}function ay(i){return i?">":"<"}var aS=(function(){function cd(ch,ce,cg){var cf=ce/cg;if(cf<=1){ch.parent().removeClass(au);ch.parent().addClass(aY)}else{ch.parent().removeClass(aY);ch.parent().addClass(au)}}function i(cf,cg,ch){var ce=ch;if(!cf.attr(ce)&&cf.attr(ce)!==aP){cf.attr(ce,cg)}if(cf.find("["+ce+"]").length){cf.find("["+ce+"]").each(function(){bV(this).attr(ce,cg)})}}function cc(cf,ce,ci){var cg=false,ch;cf.showCaption===ci||cf.showCaption===true?ch=true:ch=false;if(!ce){return false}if(cf.caption&&ch){cg=true}return cg}return{setRatio:cd,setThumbAttr:i,isExpectedCaption:cc}}(aS||{},jQuery));function A(ce,cd){var cc=ce.data(),i=Math.round(cd.pos),cf=function(){if(cc&&cc.sliding){cc.sliding=false}(cd.onEnd||g)()};if(typeof cd.overPos!=="undefined"&&cd.overPos!==cd.pos){i=cd.overPos}var cg=bV.extend(b2(i,cd.direction),cd.width&&{width:cd.width},cd.height&&{height:cd.height});if(cc&&cc.sliding){cc.sliding=true}if(aA){ce.css(bV.extend(b6(cd.time),cg));if(cd.time>10){X(ce,"transform",cf,cd.time)}else{cf()}}else{ce.stop().animate(cg,cd.time,u,cf)}}function aq(ck,cj,cc,cm,ce,i){var ch=typeof i!=="undefined";if(!ch){ce.push(arguments);Array.prototype.push.call(arguments,ce.length);if(ce.length>1){return}}ck=ck||bV(ck);cj=cj||bV(cj);var ci=ck[0],cg=cj[0],cf=cm.method==="crossfade",cl=function(){if(!cl.done){cl.done=true;var cn=(ch||ce.shift())&&ce.shift();cn&&aq.apply(this,cn);(cm.onEnd||g)(!!cn)}},cd=cm.time/(i||1);cc.removeClass(n+" "+al);ck.stop().addClass(n);cj.stop().addClass(al);cf&&cg&&ck.fadeTo(0,0);ck.fadeTo(cf?cd:0,1,cf&&cl);cj.fadeTo(cd,0,cl);(ci&&cf)||cg||cl()}var G,b5,e,j,bD;function bn(i){var cc=(i.touches||[])[0]||i;i._x=cc.pageX||cc.originalEvent.pageX;i._y=cc.clientY||cc.originalEvent.clientY;i._now=bV.now()}function aI(cr,cg){var cc=cr[0],cj={},i,cl,cf,cn,cs,cd,ce,co,ch;function cq(ct){cf=bV(ct.target);cj.checked=cd=ce=ch=false;if(i||cj.flow||(ct.touches&&ct.touches.length>1)||ct.which>1||(G&&G.type!==ct.type&&e)||(cd=cg.select&&cf.is(cg.select,cc))){return cd}cs=ct.type==="touchstart";ce=cf.is("a, a *",cc);cn=cj.control;co=(cj.noMove||cj.noSwipe||cn)?16:!cj.snap?4:0;bn(ct);cl=G=ct;b5=ct.type.replace(/down|start/,"move").replace(/Down/,"Move");(cg.onStart||g).call(cc,ct,{control:cn,$target:cf});i=cj.flow=true;if(!cs||cj.go){O(ct)}}function ck(cx){if((cx.touches&&cx.touches.length>1)||(aZ&&!cx.isPrimary)||b5!==cx.type||!i){i&&ci();(cg.onTouchEnd||g)();return}bn(cx);var cy=Math.abs(cx._x-cl._x),cu=Math.abs(cx._y-cl._y),cw=cy-cu,cv=(cj.go||cj.x||cw>=0)&&!cj.noSwipe,ct=cw<0;if(cs&&!cj.checked){if(i=cv){O(cx)}}else{O(cx);(cg.onMove||g).call(cc,cx,{touch:cs})}if(!ch&&Math.sqrt(Math.pow(cy,2)+Math.pow(cu,2))>co){ch=true}cj.checked=cj.checked||cv||ct}function ci(cu){(cg.onTouchEnd||g)();var ct=i;cj.control=i=false;if(ct){cj.flow=false}if(!ct||(ce&&!cj.checked)){return}cu&&O(cu);e=true;clearTimeout(j);j=setTimeout(function(){e=false},1000);(cg.onEnd||g).call(cc,{moved:ch,$target:cf,control:cn,touch:cs,startEvent:cl,aborted:!cu||cu.type==="MSPointerCancel"})}function cm(){if(cj.flow){return}cj.flow=true}function cp(){if(!cj.flow){return}cj.flow=false}if(aZ){D(cc,"MSPointerDown",cq);D(k,"MSPointerMove",ck);D(k,"MSPointerCancel",ci);D(k,"MSPointerUp",ci)}else{D(cc,"touchstart",cq);D(cc,"touchmove",ck);D(cc,"touchend",ci);D(k,"touchstart",cm);D(k,"touchend",cp);D(k,"touchcancel",cp);bf.on("scroll",cp);cr.on("mousedown pointerdown",cq);bw.on("mousemove pointermove",ck).on("mouseup pointerup",ci)}if(ap.touch){bD="a"}else{bD="div"}cr.on("click",bD,function(ct){cj.checked&&O(ct)});return cj}function ao(cz,cd){var cc=cz[0],ce=cz.data(),cm={},cw,cf,cx,cj,ch,cy,co,cg,cr,ct,cp,cq,i,cv,ci,cn;function cs(cA,cB){cn=true;cw=cf=(cq==="vertical")?cA._y:cA._x;co=cA._now;cy=[[co,cw]];cx=cj=cm.noMove||cB?0:a1(cz,(cd.getPos||g)());(cd.onStart||g).call(cc,cA)}function cu(cB,cA){cr=cm.min;ct=cm.max;cp=cm.snap,cq=cm.direction||"horizontal",cz.navdir=cq;i=cB.altKey;cn=ci=false;cv=cA.control;if(!cv&&!ce.sliding){cs(cB)}}function cl(cB,cA){if(!cm.noSwipe){if(!cn){cs(cB)}cf=(cq==="vertical")?cB._y:cB._x;cy.push([cB._now,cf]);cj=cx-(cw-cf);ch=bp(cj,cr,ct,cq);if(cj<=cr){cj=aF(cj,cr)}else{if(cj>=ct){cj=aF(cj,ct)}}if(!cm.noMove){cz.css(b2(cj,cq));if(!ci){ci=true;cA.touch||aZ||cz.addClass(bR)}(cd.onMove||g).call(cc,cB,{pos:cj,edge:ch})}}}function ck(cJ){if(cm.noSwipe&&cJ.moved){return}if(!cn){cs(cJ.startEvent,true)}cJ.touch||aZ||cz.removeClass(bR);cg=bV.now();var cG=cg-b8,cK,cP,cQ,cS=null,cA,cE,cN,cD,cF,cI=ba,cO,cH=cd.friction;for(var cC=cy.length-1;cC>=0;cC--){cK=cy[cC][0];cP=Math.abs(cK-cG);if(cS===null||cP<cQ){cS=cK;cA=cy[cC][1]}else{if(cS===cG||cP>cQ){break}}cQ=cP}cD=bb(cj,cr,ct);var cT=cA-cf,cR=cT>=0,cL=cg-cS,cB=cL>b8,cM=!cB&&cj!==cx&&cD===cj;if(cp){cD=bb(Math[cM?(cR?"floor":"ceil"):"round"](cj/cp)*cp,cr,ct);cr=ct=cD}if(cM&&(cp||cD===cj)){cO=-(cT/cL);cI*=bb(Math.abs(cO),cd.timeLow,cd.timeHigh);cE=Math.round(cj+cO*cI/cH);if(!cp){cD=cE}if(!cR&&cE>ct||cR&&cE<cr){cN=cR?cr:ct;cF=cE-cN;if(!cp){cD=cN}cF=bb(cD+cF*0.03,cN-50,cN+50);cI=Math.abs((cj-cF)/(cO/cH))}}cI*=i?10:1;(cd.onEnd||g).call(cc,bV.extend(cJ,{moved:cJ.moved||cB&&cp,pos:cj,newPos:cD,overPos:cF,time:cI,dir:cq}))}cm=bV.extend(aI(cd.$wrap,bV.extend({},cd,{onStart:cu,onMove:cl,onEnd:ck})),cm);return cm}function o(ce,cd){var cg=ce[0],ch,cf,i,cc={prevent:{}};D(cg,y,function(co){var cl=co.wheelDeltaY||-1*co.deltaY||0,cn=co.wheelDeltaX||-1*co.deltaX||0,ck=Math.abs(cn)&&!Math.abs(cl),cm=ay(cn<0),cp=cf===cm,ci=bV.now(),cj=ci-i<b8;cf=cm;i=ci;if(!ck||!cc.ok||cc.prevent[cm]&&!ch){return}else{O(co,true);if(ch&&cp&&cj){return}}if(cd.shift){ch=true;clearTimeout(cc.t);cc.t=setTimeout(function(){ch=false},bY)}(cd.onEnd||g)(co,cd.shift?cm:cn)});return cc}jQuery.Fotorama=function(d6,c3){R=bV("html");I=bV("body");var cg=this,cC=bV.now(),cQ=ag+cC,eu=d6[0],dP,cY=1,cR=d6.data(),c1,de=bV("<style></style>"),c9=bV(ab(bs)),dk=d6.find(aT(ae)),cf=dk.find(aT(a7)),dY=cf[0],cl=d6.find(aT(B)),c8=bV(),dW=d6.find(aT(bc)),da=d6.find(aT(r)),cU=d6.find(aT(aK)),dU=d6.find(aT(bq)),dO=dU.find(aT(bO)),cF=dO.find(aT(aH)),dA,cB=bV(),cW=bV(),dS=cl.data(),cX=cF.data(),c7=d6.find(aT(cb)),eg=d6.find(aT(b0)),dX=d6.find(aT(H)),dM=d6.find(aT(aJ)),dD=dM[0],cH=bV(ab(T)),dt=d6.find(aT(w)),d1=dt[0],eb=d6.find(aT(ca)),dg,eo=false,dF,ea,c2,ed,dw,d4,cN,cK,dx,dj,cq,c0,d8,c4,d2,cv,ch,ej,ds,cu,ec,dH,dE,d0={},en={},dG,d5={},cG={},dy={},ef={},cs,cT,ee,cj,el,cd={},er={},dZ,c6,dz,dr,d3=0,cI=[];dk[bu]=bV('<div class="'+x+'"></div>');dk[bl]=bV(bV.Fotorama.jst.thumb());dk[b7]=bV(bV.Fotorama.jst.dots());cd[bu]=[];cd[bl]=[];cd[b7]=[];er[bu]={};dk.addClass(aA?aX:ah);cR.fotorama=this;function ep(){bV.each(dP,function(ey,eA){if(!eA.i){eA.i=cY++;var ez=at(eA.video,true);if(ez){var ex={};eA.video=ez;if(!eA.img&&!eA.thumb){ex=aQ(eA,dP,cg)}else{eA.thumbsReady=true}v(dP,{img:ex.img,thumb:ex.thumb},eA.i,cg)}}})}function df(ex){return dE[ex]}function i(){if(cf!==aP){if(c3.navdir=="vertical"){var ex=c3.thumbwidth+c3.thumbmargin;cf.css("left",ex);da.css("right",ex);dM.css("right",ex);dk.css("width",dk.css("width")+ex);cl.css("max-width",dk.width()-ex)}else{cf.css("left","");da.css("right","");dM.css("right","");dk.css("width",dk.css("width")+ex);cl.css("max-width","")}}}function ek(eB){var eC="keydown."+ag,eD=ag+cC,ex="keydown."+eD,eA="keyup."+eD,ey="resize."+eD+" orientationchange."+eD,ez;if(eB){bw.on(ex,function(eG){var eF,eE;if(dg&&eG.keyCode===27){eF=true;cO(dg,true,true)}else{if(cg.fullScreen||(c3.keyboard&&!cg.index)){if(eG.keyCode===27){eF=true;cg.cancelFullScreen()}else{if((eG.shiftKey&&eG.keyCode===32&&df("space"))||(!eG.altKey&&!eG.metaKey&&eG.keyCode===37&&df("left"))||(eG.keyCode===38&&df("up")&&bV(":focus").attr("data-gallery-role"))){cg.longPress.progress();eE="<"}else{if((eG.keyCode===32&&df("space"))||(!eG.altKey&&!eG.metaKey&&eG.keyCode===39&&df("right"))||(eG.keyCode===40&&df("down")&&bV(":focus").attr("data-gallery-role"))){cg.longPress.progress();eE=">"}else{if(eG.keyCode===36&&df("home")){cg.longPress.progress();eE="<<"}else{if(eG.keyCode===35&&df("end")){cg.longPress.progress();eE=">>"}}}}}}}(eF||eE)&&O(eG);ez={index:eE,slow:eG.altKey,user:true};eE&&(cg.longPress.inProgress?cg.showWhileLongPress(ez):cg.show(ez))});if(eB){bw.on(eA,function(eE){if(cg.longPress.inProgress){cg.showEndLongPress({user:true})}cg.longPress.reset()})}if(!cg.index){bw.off(eC).on(eC,"textarea, input, select",function(eE){!I.hasClass(bH)&&eE.stopPropagation()})}bf.on(ey,cg.resize)}else{bw.off(ex);bf.off(ey)}}function dd(ex){if(ex===dd.f){return}if(ex){d6.addClass(ag+" "+cQ).before(c9).before(de);C(cg)}else{c9.detach();de.detach();d6.html(cR.urtext).removeClass(cQ);av(cg)}ek(ex);dd.f=ex}function dn(){dP=cg.data=dP||bG(c3.data)||bI(d6);c1=cg.size=dP.length;eq.ok&&c3.shuffle&&aC(dP);ep();eo=cn(eo);c1&&dd(true)}function em(){var ex=c1<2||dg;d5.noMove=ex||cv;d5.noSwipe=ex||!c3.swipe;!cu&&cl.toggleClass(aB,!c3.click&&!d5.noMove&&!d5.noSwipe);aZ&&dk.toggleClass(U,!d5.noSwipe)}function dq(ex){if(ex===true){ex=""}c3.autoplay=Math.max(+ex||bQ,ds*1.5)}function db(ex){if(ex.navarrows&&ex.nav==="thumbs"){eg.show();dX.show()}else{eg.hide();dX.hide()}}function ck(ex,ey){return Math.floor(dk.width()/(ey.thumbwidth+ey.thumbmargin))}function dQ(){if(!c3.nav||c3.nav==="dots"){c3.navdir="horizontal"}cg.options=c3=bA(c3);b4=ck(dk,c3);cv=(c3.transition==="crossfade"||c3.transition==="dissolve");dj=c3.loop&&(c1>2||(cv&&(!cu||cu!=="slide")));ds=+c3.transitionduration||ba;dH=c3.direction==="rtl";dE=bV.extend({},c3.keyboard&&p,c3.keyboard);db(c3);var ey={add:[],remove:[]};function ex(ez,eA){ey[ez?"add":"remove"].push(eA)}if(c1>1){cq=c3.nav;d8=c3.navposition==="top";ey.remove.push(a9);cU.toggle(!!c3.arrows)}else{cq=false;cU.hide()}dh();cJ();ev();if(c3.autoplay){dq(c3.autoplay)}ch=m(c3.thumbwidth)||L;ej=m(c3.thumbheight)||L;cG.ok=ef.ok=c3.trackpad&&!bh;em();dL(c3,[en]);c0=cq==="thumbs";if(dU.filter(":hidden")&&!!cq){dU.show()}if(c0){dl(c1,"navThumb");dA=cW;dr=bl;an(de,bV.Fotorama.jst.style({w:ch,h:ej,b:c3.thumbborderwidth,m:c3.thumbmargin,s:cC,q:!aN}));dO.addClass(ai).removeClass(bW)}else{if(cq==="dots"){dl(c1,"navDot");dA=cB;dr=b7;dO.addClass(bW).removeClass(ai)}else{dU.hide();cq=false;dO.removeClass(ai+" "+bW)}}if(cq){if(d8){dU.insertBefore(cf)}else{dU.insertAfter(cf)}cz.nav=false;cz(dA,cF,"nav")}c4=c3.allowfullscreen;if(c4){dM.prependTo(cf);d2=s&&c4==="native";aE(dM,"touchend")}else{dM.detach();d2=false}ex(cv,ar);ex(!cv,aw);ex(!c3.captions,bN);ex(dH,a0);ex(c3.arrows,f);ec=c3.shadows&&!bh;ex(!ec,aM);dk.addClass(ey.add.join(" ")).removeClass(ey.remove.join(" "));d0=bV.extend({},c3);i()}function cZ(ex){return ex<0?(c1+(ex%c1))%c1:ex>=c1?ex%c1:ex}function cn(ex){return bb(ex,0,c1-1)}function du(ex){return dj?cZ(ex):cn(ex)}function dB(ex){return ex>0||dj?ex-1:false}function ci(ex){return ex<c1-1||dj?ex+1:false}function d9(){d5.min=dj?-Infinity:-a8(c1-1,en.w,c3.margin,c2);d5.max=dj?Infinity:-a8(0,en.w,c3.margin,c2);d5.snap=en.w+c3.margin}function c5(){var ex=(c3.navdir==="vertical");var ez=ex?cF.height():cF.width();var ey=ex?en.h:en.nw;dy.min=Math.min(0,ey-ez);dy.max=0;dy.direction=c3.navdir;cF.toggleClass(aB,!(dy.noMove=dy.min===dy.max))}function dm(ey,eA,ez){if(typeof ey==="number"){ey=new Array(ey);var ex=true}return bV.each(ey,function(eD,eB){if(ex){eB=eD}if(typeof eB==="number"){var eF=dP[cZ(eB)];if(eF){var eC="$"+eA+"Frame",eE=eF[eC];ez.call(this,eD,eB,eF,eE,eC,eE&&eE.data())}}})}function cc(eA,ex,ez,ey){if(!dG||(dG==="*"&&ey===dx)){eA=t(c3.width)||t(eA)||bk;ex=t(c3.height)||t(ex)||bE;cg.resize({width:eA,ratio:c3.ratio||ez||eA/ex},0,ey!==dx&&"*")}}function cx(ex,ey,eA,ez){dm(ex,ey,function(eM,eE,eD,eC,eR,eB){if(!eC){return}var eN=cg.fullScreen&&!eB.$full&&ey==="stage";if(eB.$img&&!ez&&!eN){return}var eS=new Image(),eG=bV(eS),eO=eG.data();eB[eN?"$full":"$img"]=eG;var eJ=ey==="stage"?(eN?"full":"img"):"thumb",eF=eD[eJ],eP=eN?eD.img:eD[ey==="stage"?"thumb":"img"];if(ey==="navThumb"){eC=eB.$wrap}function eH(eT){var eU=cZ(eE);dc(eT,{index:eU,src:eF,frame:dP[eU]})}function eK(){eG.remove();bV.Fotorama.cache[eF]="error";if((!eD.html||ey!=="stage")&&eP&&eP!==eF){eD[eJ]=eF=eP;eB.$full=null;cx([eE],ey,eA,true)}else{if(eF&&!eD.html&&!eN){eC.trigger("f:error").removeClass(bM).addClass(bP);eH("error")}else{if(ey==="stage"){eC.trigger("f:load").removeClass(bM+" "+bP).addClass(c);eH("load");cc()}}eB.state="error";if(c1>1&&dP[eE]===eD&&!eD.html&&!eD.deleted&&!eD.video&&!eN){eD.deleted=true;cg.splice(eE,1)}}}function eL(){bV.Fotorama.measures[eF]=eO.measures=bV.Fotorama.measures[eF]||{width:eS.width,height:eS.height,ratio:eS.width/eS.height};cc(eO.measures.width,eO.measures.height,eO.measures.ratio,eE);eG.off("load error").addClass(""+(eN?Y:J)).attr("aria-hidden","false").prependTo(eC);if(eC.hasClass(x)&&!eC.hasClass(af)){eC.attr("href",eG.attr("src"))}V(eG,(bV.isFunction(eA)?eA():eA)||en);bV.Fotorama.cache[eF]=eB.state="loaded";setTimeout(function(){eC.trigger("f:load").removeClass(bM+" "+bP).addClass(c+" "+(eN?b3:bg));if(ey==="stage"){eH("load")}else{if(eD.thumbratio===bF||!eD.thumbratio&&c3.thumbratio===bF){eD.thumbratio=eO.measures.ratio;dV()}}},0)}if(!eF){eK();return}function eI(){var eT=10;bX(function(){return !c6||!eT--&&!bh},function(){eL()})}if(!bV.Fotorama.cache[eF]){bV.Fotorama.cache[eF]="*";eG.on("load",eI).on("error",eK)}else{(function eQ(){if(bV.Fotorama.cache[eF]==="error"){eK()}else{if(bV.Fotorama.cache[eF]==="loaded"){setTimeout(eI,0)}else{setTimeout(eQ,100)}}})()}eB.state="";eS.src=eF;if(eB.data.caption){eS.alt=eB.data.caption||""}if(eB.data.full){bV(eS).data("original",eB.data.full)}if(aS.isExpectedCaption(eD,c3.showcaption)){bV(eS).attr("aria-labelledby",eD.labelledby)}})}function cy(){var ex=dF[bu];if(ex&&!ex.data().state){eb.addClass(Z);ex.on("f:load f:error",function(){ex.off("f:load f:error");eb.removeClass(Z)})}}function cL(ex){a(ex,dJ);bL(ex,function(){setTimeout(function(){bU(dO)},0);dT({time:ds,guessIndex:bV(this).data().eq,minMax:dy})})}function dl(ex,ey){dm(ex,ey,function(eB,ez,eG,eD,eA,eC){if(eD){return}eD=eG[eA]=dk[eA].clone();eC=eD.data();eC.data=eG;var eF=eD[0],eE="labelledby"+bV.now();if(ey==="stage"){if(eG.html){bV('<div class="'+bd+'"></div>').append(eG._html?bV(eG.html).removeAttr("id").html(eG._html):eG.html).appendTo(eD)}if(eG.id){eE=eG.id||eE}eG.labelledby=eE;if(aS.isExpectedCaption(eG,c3.showcaption)){bV(bV.Fotorama.jst.frameCaption({caption:eG.caption,labelledby:eE})).appendTo(eD)}eG.video&&eD.addClass(l).append(cH.clone());bL(eF,function(){setTimeout(function(){bU(cf)},0);cm({index:eC.eq,user:true})});c8=c8.add(eD)}else{if(ey==="navDot"){cL(eF);cB=cB.add(eD)}else{if(ey==="navThumb"){cL(eF);eC.$wrap=eD.children(":first");cW=cW.add(eD);if(eG.video){eC.$wrap.append(cH.clone())}}}}})}function cM(ey,ex){return ey&&ey.length&&V(ey,ex)}function di(ex){dm(ex,"stage",function(eB,ez,eE,eD,eA,eC){if(!eD){return}var ey=cZ(ez);eC.eq=ey;er[bu][ey]=eD.css(bV.extend({left:cv?0:a8(ez,en.w,c3.margin,c2)},cv&&b6(0)));if(be(eD[0])){eD.appendTo(cl);cO(eE.$video)}cM(eC.$img,en);cM(eC.$full,en);if(eD.hasClass(x)&&!(eD.attr("aria-hidden")==="false"&&eD.hasClass(a4))){eD.attr("aria-hidden","true")}})}function dp(eB,ex){var ey,ez,eA;if(cq!=="thumbs"||isNaN(eB)){return}ey=-eB;ez=-eB+en.nw;if(c3.navdir==="vertical"){eB=eB-c3.thumbheight;ez=-eB+en.h}cW.each(function(){var eH=bV(this),eD=eH.data(),eC=eD.eq,eG=function(){return{h:ej,w:eD.w}},eF=eG(),eE=c3.navdir==="vertical"?eD.t>ez:eD.l>ez;eF.w=eD.w;if(eD.l+eD.w<ey||eE||cM(eD.$img,eF)){return}ex&&cx([eC],"navThumb",eG)})}function cz(ex,eC,ey){if(!cz[ey]){var eB=ey==="nav"&&c0,eA=0,ez=0;eC.append(ex.filter(function(){var eH,eG=bV(this),eE=eG.data();for(var eF=0,eD=dP.length;eF<eD;eF++){if(eE.data===dP[eF]){eH=true;eE.eq=eF;break}}return eH||eG.remove()&&false}).sort(function(eE,eD){return bV(eE).data().eq-bV(eD).data().eq}).each(function(){var eE=bV(this),eD=eE.data();aS.setThumbAttr(eE,eD.data.caption,"aria-label")}).each(function(){if(!eB){return}var eF=bV(this),eE=eF.data(),eG=Math.round(ej*eE.data.thumbratio)||ch,eD=Math.round(ch/eE.data.thumbratio)||ej;eE.t=ez;eE.h=eD;eE.l=eA;eE.w=eG;eF.css({width:eG});ez+=eD+c3.thumbmargin;eA+=eG+c3.thumbmargin}));cz[ey]=true}}function eh(ex){return ex-d3>en.w/3}function cE(ex){return !dj&&(!(eo+ex)||!(eo-c1+ex))&&!dg}function dh(){var ey=cE(0),ex=cE(1);dW.toggleClass(F,ey).attr(ad(ey,false));da.toggleClass(F,ex).attr(ad(ex,false))}function ev(){var ex=false,ey=false;if(c3.navtype==="thumbs"&&!c3.loop){(eo==0)?ex=true:ex=false;(eo==c3.data.length-1)?ey=true:ey=false}if(c3.navtype==="slides"){var ez=aa(cF,c3.navdir);ez>=dy.max?ex=true:ex=false;ez<=dy.min?ey=true:ey=false}eg.toggleClass(F,ex).attr(ad(ex,true));dX.toggleClass(F,ey).attr(ad(ey,true))}function cJ(){if(cG.ok){cG.prevent={"<":cE(0),">":cE(1)}}}function dI(eD){var eA=eD.data(),eC,eB,ez,ex;if(c0){eC=eA.l;eB=eA.t;ez=eA.w;ex=eA.h}else{eC=eD.position().left;ez=eD.width()}var ey={c:eC+ez/2,min:-eC+c3.thumbmargin*10,max:-eC+en.w-ez-c3.thumbmargin*10};var eE={c:eB+ex/2,min:-eB+c3.thumbmargin*10,max:-eB+en.h-ex-c3.thumbmargin*10};return c3.navdir==="vertical"?eE:ey}function d7(ey){var ex=dF[dr].data();A(c7,{time:ey*1.2,pos:(c3.navdir==="vertical"?ex.t:ex.l),width:ex.w,height:ex.h,direction:c3.navdir})}function dT(eH){var eB=dP[eH.guessIndex][dr],ez=c3.navtype;var eD,ex,eA,eG,eC,ey,eE,eF;if(eB){if(ez==="thumbs"){eD=dy.min!==dy.max;eA=eH.minMax||eD&&dI(dF[dr]);eG=eD&&(eH.keep&&dT.t?dT.l:bb((eH.coo||en.nw/2)-dI(eB).c,eA.min,eA.max));eC=eD&&(eH.keep&&dT.l?dT.l:bb((eH.coo||en.nw/2)-dI(eB).c,eA.min,eA.max));ey=(c3.navdir==="vertical"?eG:eC);eE=eD&&bb(ey,dy.min,dy.max)||0;ex=eH.time*1.1;A(cF,{time:ex,pos:eE,direction:c3.navdir,onEnd:function(){dp(eE,true);ev()}});co(dO,bp(eE,dy.min,dy.max,c3.navdir));dT.l=ey}else{eF=aa(cF,c3.navdir);ex=eH.time*1.11;eE=aD(c3,dy,eH.guessIndex,eF,eB,dU,c3.navdir);A(cF,{time:ex,pos:eE,direction:c3.navdir,onEnd:function(){dp(eE,true);ev()}});co(dO,bp(eE,dy.min,dy.max,c3.navdir))}}}function cS(){dN(dr);cd[dr].push(dF[dr].addClass(a4).attr("data-active",true))}function dN(ey){var ex=cd[ey];while(ex.length){ex.shift().removeClass(a4).attr("data-active",false)}}function ce(ey){var ex=er[ey];bV.each(ea,function(eA,ez){delete ex[cZ(ez)]});bV.each(ex,function(ez,eA){delete ex[ez];eA.detach()})}function dC(ey){c2=ed=eo;var ex=dF[bu];if(ex){dN(bu);cd[bu].push(ex.addClass(a4).attr("data-active",true));if(ex.hasClass(x)){ex.attr("aria-hidden","false")}ey||cg.showStage.onEnd(true);a1(cl,0,true);ce(bu);di(ea);d9();c5();a(cl[0],function(){if(!d6.hasClass(M)){cg.requestFullScreen();dM.focus()}})}}function dL(ey,ex){if(!ey){return}bV.each(ex,function(ez,eA){if(!eA){return}bV.extend(eA,{width:ey.width||eA.width,height:ey.height,minwidth:ey.minwidth,maxwidth:ey.maxwidth,minheight:ey.minheight,maxheight:ey.maxheight,ratio:bm(ey.ratio)})})}function dc(ey,ex){d6.trigger(ag+":"+ey,[cg,ex])}function dR(){clearTimeout(cr.t);c6=1;if(c3.stopautoplayontouch){cg.stopAutoplay()}else{cj=true}}function cr(){if(!c6){return}if(!c3.stopautoplayontouch){cw();es()}cr.t=setTimeout(function(){c6=0},ba+b8)}function cw(){cj=!!(dg||el)}function es(){clearTimeout(es.t);bX.stop(es.w);if(!c3.autoplay||cj){if(cg.autoplay){cg.autoplay=false;dc("stopautoplay")}return}if(!cg.autoplay){cg.autoplay=true;dc("startautoplay")}var ey=eo;var ex=dF[bu].data();es.w=bX(function(){return ex.state||ey!==eo},function(){es.t=setTimeout(function(){if(cj||ey!==eo){return}var ez=cK,eA=dP[ez][bu].data();es.w=bX(function(){return eA.state||ez!==cK},function(){if(cj||ez!==cK){return}cg.show(dj?ay(!dH):cK)})},c3.autoplay)})}cg.startAutoplay=function(ex){if(cg.autoplay){return this}cj=el=false;dq(ex||c3.autoplay);es();return this};cg.stopAutoplay=function(){if(cg.autoplay){cj=el=true;es()}return this};cg.showSlide=function(ez){var eA=aa(cF,c3.navdir),eC,eB=500*1.1,ey=c3.navdir==="horizontal"?c3.thumbwidth:c3.thumbheight,ex=function(){ev()};if(ez==="next"){eC=eA-(ey+c3.margin)*b4}if(ez==="prev"){eC=eA+(ey+c3.margin)*b4}eC=a5(eC,dy);dp(eC,true);A(cF,{time:eB,pos:eC,direction:c3.navdir,onEnd:ex})};cg.showWhileLongPress=function(eA){if(cg.longPress.singlePressInProgress){return}var ez=dK(eA);ew(ez);var eB=cA(eA)/50;var ey=dF;cg.activeFrame=dF=dP[eo];var ex=ey===dF&&!eA.user;cg.showNav(ex,eA,eB);return this};cg.showEndLongPress=function(eA){if(cg.longPress.singlePressInProgress){return}var ez=dK(eA);ew(ez);var eB=cA(eA)/50;var ey=dF;cg.activeFrame=dF=dP[eo];var ex=ey===dF&&!eA.user;cg.showStage(ex,eA,eB);ee=typeof dw!=="undefined"&&dw!==eo;dw=eo;return this};function dK(ey){var ex;if(typeof ey!=="object"){ex=ey;ey={}}else{ex=ey.index}ex=ex===">"?ed+1:ex==="<"?ed-1:ex==="<<"?0:ex===">>"?c1-1:ex;ex=isNaN(ex)?aP:ex;ex=typeof ex==="undefined"?eo||0:ex;return ex}function ew(ex){cg.activeIndex=eo=du(ex);d4=dB(eo);cN=ci(eo);cK=cZ(eo+(dH?-1:1));ea=[eo,d4,cN];ed=dj?ex:eo}function cA(ey){var ex=Math.abs(dw-ed),ez=bj(ey.time,function(){return Math.min(ds*(1+(ex-1)/12),ds*2)});if(ey.slow){ez*=10}return ez}cg.showStage=function(ey,eA,eD){cO(dg,dF.i!==dP[cZ(c2)].i);dl(ea,"stage");di(bh?[ed]:[ed,dB(ed),ci(ed)]);cD("go",true);ey||dc("show",{user:eA.user,time:eD});cj=true;var eC=eA.overPos;var ez=cg.showStage.onEnd=function(eE){if(ez.ok){return}ez.ok=true;eE||dC(true);if(!ey){dc("showend",{user:eA.user})}if(!eE&&cu&&cu!==c3.transition){cg.setOptions({transition:cu});cu=false;return}cy();cx(ea,"stage");cD("go",false);cJ();ei();cw();es();if(cg.fullScreen){dF[bu].find("."+Y).attr("aria-hidden",false);dF[bu].find("."+J).attr("aria-hidden",true)}else{dF[bu].find("."+Y).attr("aria-hidden",true);dF[bu].find("."+J).attr("aria-hidden",false)}};if(!cv){A(cl,{pos:-a8(ed,en.w,c3.margin,c2),overPos:eC,time:eD,onEnd:ez})}else{var ex=dF[bu],eB=dP[dw]&&eo!==dw?dP[dw][bu]:null;aq(ex,eB,c8,{time:eD,method:c3.transition,onEnd:ez},cI)}dh()};cg.showNav=function(ey,ez,eA){ev();if(cq){cS();var ex=cn(eo+bb(ed-dw,-1,1));dT({time:eA,coo:ex!==eo&&ez.coo,guessIndex:typeof ez.coo!=="undefined"?ex:eo,keep:ey});if(c0){d7(eA)}}};cg.show=function(eA){cg.longPress.singlePressInProgress=true;var ez=dK(eA);ew(ez);var eB=cA(eA);var ey=dF;cg.activeFrame=dF=dP[eo];var ex=ey===dF&&!eA.user;cg.showStage(ex,eA,eB);cg.showNav(ex,eA,eB);ee=typeof dw!=="undefined"&&dw!==eo;dw=eo;cg.longPress.singlePressInProgress=false;return this};cg.requestFullScreen=function(){if(c4&&!cg.fullScreen){var ex=bV((cg.activeFrame||{}).$stageFrame||{}).hasClass("fotorama-video-container");if(ex){return}cs=bf.scrollTop();cT=bf.scrollLeft();bU(bf);cD("x",true);dZ=bV.extend({},en);d6.addClass(M).appendTo(I.addClass(bH));R.addClass(bH);cO(dg,true,true);cg.fullScreen=true;if(d2){bB.request(eu)}cg.resize();cx(ea,"stage");cy();dc("fullscreenenter");if(!("ontouchstart" in bo)){dM.focus()}}return this};function cP(){if(cg.fullScreen){cg.fullScreen=false;if(s){bB.cancel(eu)}I.removeClass(bH);R.removeClass(bH);d6.removeClass(M).insertAfter(c9);en=bV.extend({},dZ);cO(dg,true,true);cD("x",false);cg.resize();cx(ea,"stage");bU(bf,cT,cs);dc("fullscreenexit")}}cg.cancelFullScreen=function(){if(d2&&bB.is()){bB.cancel(k)}else{cP()}return this};cg.toggleFullScreen=function(){return cg[(cg.fullScreen?"cancel":"request")+"FullScreen"]()};cg.resize=function(ez){if(!dP){return this}var eC=arguments[1]||0,ey=arguments[2];b4=ck(dk,c3);dL(!cg.fullScreen?bA(ez):{width:bV(bo).width(),maxwidth:null,minwidth:null,height:bV(bo).height(),maxheight:null,minheight:null},[en,ey||cg.fullScreen||c3]);var eB=en.width,ex=en.height,eA=en.ratio,eD=bf.height()-(cq?dO.height():0);if(t(eB)){dk.css({width:""});dk.css({height:""});cf.css({width:""});cf.css({height:""});cl.css({width:""});cl.css({height:""});dO.css({width:""});dO.css({height:""});dk.css({minWidth:en.minwidth||0,maxWidth:en.maxwidth||bK});if(cq==="dots"){dU.hide()}eB=en.W=en.w=dk.width();en.nw=cq&&d(c3.navwidth,eB)||eB;cl.css({width:en.w,marginLeft:(en.W-en.w)/2});ex=d(ex,eD);ex=ex||(eA&&eB/eA);if(ex){eB=Math.round(eB);ex=en.h=Math.round(bb(ex,d(en.minheight,eD),d(en.maxheight,eD)));cf.css({width:eB,height:ex});if(c3.navdir==="vertical"&&!cg.fullscreen){dO.width(c3.thumbwidth+c3.thumbmargin*2)}if(c3.navdir==="horizontal"&&!cg.fullscreen){dO.height(c3.thumbheight+c3.thumbmargin*2)}if(cq==="dots"){dO.width(eB).height("auto");dU.show()}if(c3.navdir==="vertical"&&cg.fullScreen){cf.css("height",bf.height())}if(c3.navdir==="horizontal"&&cg.fullScreen){cf.css("height",bf.height()-dO.height())}if(cq){switch(c3.navdir){case"vertical":dU.removeClass(bZ);dU.removeClass(ax);dU.addClass(b);dO.stop().animate({height:en.h,width:c3.thumbwidth},eC);break;case"list":dU.removeClass(b);dU.removeClass(bZ);dU.addClass(ax);break;default:dU.removeClass(b);dU.removeClass(ax);dU.addClass(bZ);dO.stop().animate({width:en.nw},eC);break}dC();dT({guessIndex:eo,time:eC,keep:true});if(c0&&cz.nav){d7(eC)}}dG=ey||true;eq.ok=true;eq()}}d3=cf.offset().left;i();return this};cg.setOptions=function(ex){bV.extend(c3,ex);dV();return this};cg.shuffle=function(){dP&&aC(dP)&&dV();return this};function co(ex,ey){if(ec){ex.removeClass(S+" "+aL);ex.removeClass(a2+" "+aR);ey&&!dg&&ex.addClass(ey.replace(/^|\s/g," "+bz+"--"))}}cg.longPress={threshold:1,count:0,thumbSlideTime:20,progress:function(){if(!this.inProgress){this.count++;this.inProgress=this.count>this.threshold}},end:function(){if(this.inProgress){this.isEnded=true}},reset:function(){this.count=0;this.inProgress=false;this.isEnded=false}};cg.destroy=function(){cg.cancelFullScreen();cg.stopAutoplay();dP=cg.data=null;dd();ea=[];ce(bu);dV.ok=false;return this};cg.playVideo=function(){var ez=dF,ex=ez.video,ey=eo;if(typeof ex==="object"&&ez.videoReady){d2&&cg.fullScreen&&cg.cancelFullScreen();bX(function(){return !bB.is()||ey!==eo},function(){if(ey===eo){ez.$video=ez.$video||bV(ab(bJ)).append(q(ex));ez.$video.appendTo(ez[bu]);dk.addClass(bt);dg=ez.$video;em();cU.blur();dM.blur();dc("loadvideo")}})}return this};cg.stopVideo=function(){cO(dg,true,true);return this};cg.spliceByIndex=function(ex,ey){ey.i=ex+1;ey.img&&bV.ajax({url:ey.img,type:"HEAD",success:function(){dP.splice(ex,1,ey);dV()}})};function cO(ex,ez,ey){if(ez){dk.removeClass(bt);dg=false;em()}if(ex&&ex!==dg){ex.remove();dc("unloadvideo")}if(ey){cw();es()}}function cp(ex){dk.toggleClass(P,ex)}function ei(ez){if(d5.flow){return}var ex=ez?ez.pageX:ei.x,ey=ex&&!cE(eh(ex))&&c3.click;if(ei.p!==ey&&cf.toggleClass(bC,ey)){ei.p=ey;ei.x=ex}}cf.on("mousemove",ei);function cm(ex){clearTimeout(cm.t);if(c3.clicktransition&&c3.clicktransition!==c3.transition){setTimeout(function(){var ey=c3.transition;cg.setOptions({transition:c3.clicktransition});cu=ey;cm.t=setTimeout(function(){cg.show(ex)},10)},0)}else{cg.show(ex)}}function ct(eA,ey){var ez=eA.target,ex=bV(ez);if(ex.hasClass(T)){cg.playVideo()}else{if(ez===dD){cg.toggleFullScreen()}else{if(dg){ez===d1&&cO(dg,true,true)}else{if(!d6.hasClass(M)){cg.requestFullScreen()}}}}O(eA,true)}function cD(ex,ey){d5[ex]=dy[ex]=ey}d5=ao(cl,{onStart:dR,onMove:function(ey,ex){co(cf,ex.edge)},onTouchEnd:cr,onEnd:function(ex){var ez;co(cf);ez=(aZ&&!dz||ex.touch)&&c3.arrows;if((ex.moved||(ez&&ex.pos!==ex.newPos&&!ex.control))&&ex.$target[0]!==dM[0]){var ey=by(ex.newPos,en.w,c3.margin,c2);cg.show({index:ey,time:cv?ds:ex.time,overPos:ex.overPos,user:true})}else{if(!ex.aborted&&!ex.control){ct(ex.startEvent,ez)}}},timeLow:1,timeHigh:1,friction:2,select:"."+a9+", ."+a9+" *",$wrap:cf,direction:"horizontal"});dy=ao(cF,{onStart:dR,onMove:function(ey,ex){co(dO,ex.edge)},onTouchEnd:cr,onEnd:function(ex){function ey(){dT.l=ex.newPos;cw();es();dp(ex.newPos,true);ev()}if(!ex.moved){var ez=ex.$target.closest("."+aG,cF)[0];ez&&dJ.call(ez,ex.startEvent)}else{if(ex.pos!==ex.newPos){cj=true;A(cF,{time:ex.time,pos:ex.newPos,overPos:ex.overPos,direction:c3.navdir,onEnd:ey});dp(ex.newPos);ec&&co(dO,bp(ex.newPos,dy.min,dy.max,ex.dir))}else{ey()}}},timeLow:0.5,timeHigh:2,friction:5,$wrap:dO,direction:c3.navdir});cG=o(cf,{shift:true,onEnd:function(ey,ex){dR();cr();cg.show({index:ex,slow:ey.altKey})}});ef=o(dO,{onEnd:function(ez,ey){dR();cr();var ex=a1(cF)+ey*0.25;cF.css(b2(bb(ex,dy.min,dy.max),c3.navdir));ec&&co(dO,bp(ex,dy.min,dy.max,c3.navdir));ef.prevent={"<":ex>=dy.max,">":ex<=dy.min};clearTimeout(ef.t);ef.t=setTimeout(function(){dT.l=ex;dp(ex,true)},b8);dp(ex)}});dk.hover(function(){setTimeout(function(){if(c6){return}cp(!(dz=true))},0)},function(){if(!dz){return}cp(!(dz=false))});function dJ(ey){var ex=bV(this).data().eq;if(c3.navtype==="thumbs"){cm({index:ex,slow:ey.altKey,user:true,coo:ey._x-dO.offset().left})}else{cm({index:ex,slow:ey.altKey,user:true})}}function et(ex){cm({index:cU.index(this)?">":"<",slow:ex.altKey,user:true})}z(cU,function(ex){O(ex);et.call(this,ex)},{onStart:function(){dR();d5.control=true},onTouchEnd:cr});z(eg,function(ex){O(ex);if(c3.navtype==="thumbs"){cg.show("<")}else{cg.showSlide("prev")}});z(dX,function(ex){O(ex);if(c3.navtype==="thumbs"){cg.show(">")}else{cg.showSlide("next")}});function dv(ex){bL(ex,function(){setTimeout(function(){bU(cf)},0);cp(false)})}cU.each(function(){a(this,function(ex){et.call(this,ex)});dv(this)});a(dD,function(){if(d6.hasClass(M)){cg.cancelFullScreen();cl.focus()}else{cg.requestFullScreen();dM.focus()}});dv(dD);function dV(){dn();dQ();if(!dV.i){dV.i=true;var ex=c3.startindex;eo=c2=ed=dw=dx=du(ex)||0}if(c1){if(cV()){return}if(dg){cO(dg,true)}ea=[];ce(bu);dV.ok=true;cg.show({index:eo,time:0});cg.resize()}else{cg.destroy()}}function cV(){if(!cV.f===dH){cV.f=dH;eo=c1-1-eo;cg.reverse();return true}}bV.each("load push pop shift unshift reverse sort splice".split(" "),function(ex,ey){cg[ey]=function(){dP=dP||[];if(ey!=="load"){Array.prototype[ey].apply(dP,arguments)}else{if(arguments[0]&&typeof arguments[0]==="object"&&arguments[0].length){dP=bG(arguments[0])}}dV();return cg}});function eq(){if(eq.ok){eq.ok=false;dc("ready")}}dV()};bV.fn.fotorama=function(i){return this.each(function(){var ce=this,cd=bV(this),cc=cd.data(),cf=cc.fotorama;if(!cf){bX(function(){return !W(ce)},function(){cc.urtext=cd.html();new bV.Fotorama(cd,bV.extend({},Q,bo.fotoramaDefaults,i,cc))})}else{cf.setOptions(i,true)}})};bV.Fotorama.instances=[];function b1(){bV.each(bV.Fotorama.instances,function(cc,i){i.index=cc})}function C(i){bV.Fotorama.instances.push(i);b1()}function av(i){bV.Fotorama.instances.splice(i.index,1);b1()}bV.Fotorama.cache={};bV.Fotorama.measures={};bV=bV||{};bV.Fotorama=bV.Fotorama||{};bV.Fotorama.jst=bV.Fotorama.jst||{};bV.Fotorama.jst.dots=function(cc){var i,ce="",cd=bx.escape;ce+='<div class="fotorama__nav__frame fotorama__nav__frame--dot" tabindex="0" role="button" data-gallery-role="nav-frame" data-nav-type="thumb" aria-label>\r\n    <div class="fotorama__dot"></div>\r\n</div>';return ce};bV.Fotorama.jst.frameCaption=function(cc){var i,ce="",cd=bx.escape;ce+='<div class="fotorama__caption" aria-hidden="true">\r\n    <div class="fotorama__caption__wrap" id="'+((i=(cc.labelledby))==null?"":i)+'">'+((i=(cc.caption))==null?"":i)+"</div>\r\n</div>\r\n";return ce};bV.Fotorama.jst.style=function(cc){var i,ce="",cd=bx.escape;ce+=".fotorama"+((i=(cc.s))==null?"":i)+" .fotorama__nav--thumbs .fotorama__nav__frame{\r\npadding:"+((i=(cc.m))==null?"":i)+"px;\r\nheight:"+((i=(cc.h))==null?"":i)+"px}\r\n.fotorama"+((i=(cc.s))==null?"":i)+" .fotorama__thumb-border{\r\nheight:"+((i=(cc.h))==null?"":i)+"px;\r\nborder-width:"+((i=(cc.b))==null?"":i)+"px;\r\nmargin-top:"+((i=(cc.m))==null?"":i)+"px}";return ce};bV.Fotorama.jst.thumb=function(cc){var i,ce="",cd=bx.escape;ce+='<div class="fotorama__nav__frame fotorama__nav__frame--thumb" tabindex="0" role="button" data-gallery-role="nav-frame" data-nav-type="thumb" aria-label>\r\n    <div class="fotorama__thumb">\r\n    </div>\r\n</div>';return ce}})(window,document,location,typeof jQuery!=="undefined"&&jQuery);
diff --git a/lib/web/images/logo.svg b/lib/web/images/logo.svg
index 013d6e7c5a107..0f29d4e3eef21 100644
--- a/lib/web/images/logo.svg
+++ b/lib/web/images/logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="55.139px" viewBox="0 0 189 55.139" width="189px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 189 55.139"><path d="m23.333 0l-23.333 14.135v26.865l6.06 3.568v-26.865l17.278-10.504 17.292 10.488 0.074 0.042-0.008 26.798 6.001-3.527v-26.865l-23.364-14.135zm3.088 16.538v31.407l-3.088 1.889-3.091-1.896v-31.376l-8.003 4.928v26.86l11.094 6.789 11.189-6.837v-26.829l-8.101-4.935z" fill="#ED7402"/><path d="m12.239 21.491l8.003 4.886v-9.814l-8.003 4.928zm14.182-4.953v9.902l8.101-4.967-8.101-4.935zm20.276-2.403l-23.364-14.135-23.333 14.135 6.06 3.568 17.278-10.504 17.365 10.53 5.994-3.594z" fill="#F8B97F"/><path d="m82.328 39.984l-1.608-20.54-8.156 20.651h-2.656l-8.156-20.651-1.571 20.541h-3.293l2.058-25.814h4.34l8.043 21.174 8.044-21.174h4.301l2.021 25.814h-3.367z" fill="#131108"/><path d="m99.91 39.984l-0.375-2.396c-1.421 1.458-3.366 2.769-6.284 2.769-3.218 0-5.237-1.945-5.237-4.977 0-4.452 3.815-6.209 11.261-6.996v-0.748c0-2.244-1.348-3.03-3.406-3.03-2.17 0-4.227 0.673-6.172 1.533l-0.449-2.88c2.133-0.861 4.153-1.496 6.922-1.496 4.339 0 6.436 1.757 6.436 5.723v12.498h-2.7zm-0.635-9.055c-6.586 0.636-7.97 2.432-7.97 4.266 0 1.457 0.973 2.394 2.657 2.394 1.945 0 3.815-0.974 5.312-2.508v-4.152h0.001z" fill="#131108"/><path d="m121.72 21.876l0.485 2.992-3.404 0.336c0.486 0.824 0.712 1.76 0.712 2.769 0 3.817-3.219 6.134-6.848 6.134-0.449 0-0.898-0.037-1.348-0.111-0.523 0.338-0.897 0.75-0.897 1.085 0 0.636 0.634 0.787 3.777 1.349l1.272 0.223c3.778 0.673 6.135 1.871 6.135 4.639 0 3.741-4.078 5.5-8.715 5.5-4.64 0-8.343-1.458-8.343-4.6 0-1.834 1.271-3.256 3.777-4.603-0.784-0.562-1.121-1.198-1.121-1.872 0-0.861 0.672-1.722 1.87-2.432-1.982-0.973-3.33-2.879-3.33-5.312 0-3.852 3.217-6.208 6.846-6.208 1.795 0 3.368 0.522 4.604 1.496l4.53-1.385zm-13.99 20.052c0 1.424 1.834 2.471 5.312 2.471 3.48 0 5.424-1.197 5.424-2.693 0-1.086-0.822-1.832-3.365-2.282l-2.134-0.375c-0.972-0.187-1.495-0.299-2.207-0.448-2.1 1.045-3.03 2.094-3.03 3.327zm4.86-17.733c-2.244 0-3.629 1.722-3.629 3.891 0 2.058 1.421 3.665 3.629 3.665 2.283 0 3.704-1.682 3.704-3.815 0.01-2.132-1.49-3.741-3.7-3.741z" fill="#131108"/><path d="m137.58 31.416h-12.122c0.112 4.15 2.094 6.098 5.2 6.098 2.583 0 4.453-1.009 6.397-2.544l0.484 2.994c-1.907 1.497-4.188 2.394-7.143 2.394-4.642 0-8.271-2.807-8.271-9.354 0-5.724 3.368-9.239 7.856-9.239 5.199 0 7.595 4.002 7.595 8.94v0.711zm-7.63-7.033c-2.059 0-3.817 1.459-4.34 4.526h8.604c-0.41-2.881-1.68-4.526-4.26-4.526z" fill="#131108"/><path d="m151.61 39.984v-12.16c0-1.832-0.786-3.067-2.73-3.067-1.759 0-3.555 1.161-5.163 2.88v12.347h-3.329v-17.846h2.655l0.412 2.582c1.683-1.533 3.78-2.955 6.321-2.955 3.369 0 5.166 2.019 5.166 5.236v12.983h-3.33z" fill="#131108"/><path d="m164.78 40.284c-3.143 0-5.199-1.124-5.199-4.716v-10.624h-2.694v-2.806h2.694v-5.949l3.255-0.485v6.434h3.853l0.449 2.806h-4.302v10.025c0 1.461 0.599 2.357 2.47 2.357 0.598 0 1.121-0.035 1.531-0.112l0.45 2.843c-0.57 0.112-1.35 0.227-2.51 0.227z" fill="#131108"/><path d="m175.82 40.357c-4.752 0-8.194-3.403-8.194-9.278 0-5.874 3.442-9.314 8.194-9.314 4.787 0 8.305 3.44 8.305 9.314 0 5.875-3.52 9.278-8.3 9.278zm0-15.788c-3.217 0-4.826 2.769-4.826 6.51 0 3.668 1.683 6.511 4.826 6.511 3.291 0 4.938-2.77 4.938-6.511-0.01-3.666-1.73-6.51-4.94-6.51z" fill="#131108"/><path d="m186.48 24.81c-1.338 0-2.268-0.929-2.268-2.318 0-1.379 0.95-2.328 2.268-2.328 1.34 0 2.27 0.939 2.27 2.328 0 1.378-0.95 2.318-2.27 2.318zm0-4.376c-1.078 0-1.938 0.739-1.938 2.058 0 1.31 0.859 2.049 1.938 2.049 1.09 0 1.949-0.739 1.949-2.049 0-1.319-0.87-2.058-1.95-2.058zm0.67 3.297l-0.768-1.099h-0.249v1.059h-0.44v-2.568h0.779c0.54 0 0.898 0.27 0.898 0.75 0 0.37-0.201 0.609-0.52 0.709l0.74 1.049-0.44 0.1zm-0.68-2.209h-0.34v0.759h0.319c0.29 0 0.471-0.12 0.471-0.379 0-0.25-0.16-0.38-0.45-0.38z" fill="#131108"/></svg>
\ No newline at end of file
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 179.073 50"><style>.st0{fill:#f26322}.st1{fill:#4d4d4d}</style><path class="st0" d="M21.432 0L0 12.373v24.713l6.117 3.533-.041-24.713 15.315-8.842 15.313 8.842v24.706l6.118-3.526V12.35z"/><path class="st0" d="M24.47 40.618l-3.058 1.772-3.071-1.759V15.906l-6.116 3.532.01 24.712 9.172 5.298 9.18-5.298V19.438l-6.117-3.532z"/><path class="st1" d="M56.838 12.522l8.415 21.258h.068l8.21-21.258h3.203V36.88h-2.215V15.656h-.068c-.114.386-.239.772-.374 1.158-.115.318-.246.67-.393 1.055-.147.387-.278.75-.391 1.09l-7.052 17.919h-2.01L57.11 18.96a19.913 19.913 0 0 1-.408-1.039 43.558 43.558 0 0 1-.375-1.073 68.067 68.067 0 0 0-.408-1.192h-.069v21.223h-2.112V12.522h3.1zM83.17 36.982a5.205 5.205 0 0 1-1.823-.92 4.327 4.327 0 0 1-1.209-1.533 4.881 4.881 0 0 1-.443-2.145 5.018 5.018 0 0 1 .579-2.556 4.472 4.472 0 0 1 1.568-1.584 7.927 7.927 0 0 1 2.299-.903 24.732 24.732 0 0 1 2.811-.477 36 36 0 0 0 2.198-.29 6.689 6.689 0 0 0 1.465-.392c.329-.123.614-.343.817-.63.187-.325.276-.698.256-1.073v-.34a3.212 3.212 0 0 0-1.09-2.674 4.93 4.93 0 0 0-3.134-.87c-3.135 0-4.781 1.306-4.941 3.918h-2.077a5.748 5.748 0 0 1 1.891-4.089 7.5 7.5 0 0 1 5.127-1.533 7.335 7.335 0 0 1 4.564 1.278 4.923 4.923 0 0 1 1.67 4.173v9.573c-.034.402.069.804.29 1.141.219.251.536.394.868.392.12-.001.24-.012.358-.034.124-.022.266-.057.425-.102h.103v1.533c-.188.077-.382.14-.58.188-.28.062-.566.091-.852.086a2.694 2.694 0 0 1-1.839-.597 2.575 2.575 0 0 1-.75-1.891v-.374h-.102c-.277.372-.578.725-.903 1.056-.38.385-.81.717-1.278.988a7.14 7.14 0 0 1-1.737.715 8.443 8.443 0 0 1-2.249.272 8.186 8.186 0 0 1-2.282-.306m5.195-1.857a5.971 5.971 0 0 0 1.857-1.175 4.767 4.767 0 0 0 1.499-3.441V27.34a7.295 7.295 0 0 1-2.061.732 33.21 33.21 0 0 1-2.504.426c-.749.114-1.441.233-2.077.358a5.237 5.237 0 0 0-1.652.596 3.055 3.055 0 0 0-1.108 1.107 3.579 3.579 0 0 0-.408 1.824c-.018.53.093 1.056.324 1.533.201.392.493.73.851.987a3.35 3.35 0 0 0 1.244.529c.493.104.995.155 1.499.153a6.555 6.555 0 0 0 2.536-.46M99.35 41.734a4.687 4.687 0 0 1-2.009-3.287h2.043c.14.966.763 1.794 1.652 2.197a7.522 7.522 0 0 0 3.288.664 5.688 5.688 0 0 0 4.173-1.345 4.997 4.997 0 0 0 1.345-3.697v-2.793h-.102a7.293 7.293 0 0 1-2.283 2.282 6.297 6.297 0 0 1-3.304.784 7.375 7.375 0 0 1-3.135-.647 6.921 6.921 0 0 1-2.385-1.806 8.095 8.095 0 0 1-1.516-2.777 11.429 11.429 0 0 1-.528-3.56 10.89 10.89 0 0 1 .613-3.799 8.483 8.483 0 0 1 1.636-2.777 6.75 6.75 0 0 1 2.402-1.703 7.45 7.45 0 0 1 2.913-.58 6.234 6.234 0 0 1 3.372.835 6.938 6.938 0 0 1 2.215 2.265h.102v-2.725h2.078v16.931a6.78 6.78 0 0 1-1.636 4.735 7.751 7.751 0 0 1-5.893 2.112 8.337 8.337 0 0 1-5.041-1.309m9.232-8.908a8.565 8.565 0 0 0 1.397-5.11 11.22 11.22 0 0 0-.34-2.862 6.239 6.239 0 0 0-1.056-2.231 4.828 4.828 0 0 0-1.789-1.448 5.772 5.772 0 0 0-2.503-.511 4.782 4.782 0 0 0-4.071 1.941 8.464 8.464 0 0 0-1.448 5.179c-.008.936.107 1.87.34 2.777a6.64 6.64 0 0 0 1.022 2.214 4.81 4.81 0 0 0 1.703 1.465 5.208 5.208 0 0 0 2.42.528 4.967 4.967 0 0 0 4.325-1.942M119.244 36.624a7.19 7.19 0 0 1-2.572-1.941 8.66 8.66 0 0 1-1.583-2.93 11.839 11.839 0 0 1-.546-3.662 11.179 11.179 0 0 1 .58-3.663 9.138 9.138 0 0 1 1.617-2.929 7.307 7.307 0 0 1 2.522-1.942 7.684 7.684 0 0 1 3.321-.698 7.275 7.275 0 0 1 3.56.8 6.678 6.678 0 0 1 2.351 2.146 8.806 8.806 0 0 1 1.278 3.083 16.87 16.87 0 0 1 .374 3.577h-13.422c.013.941.157 1.875.426 2.777a6.968 6.968 0 0 0 1.124 2.231 5.108 5.108 0 0 0 1.857 1.499 5.948 5.948 0 0 0 2.623.546 4.985 4.985 0 0 0 3.424-1.074 5.875 5.875 0 0 0 1.719-2.878h2.044a7.51 7.51 0 0 1-2.385 4.19 7.072 7.072 0 0 1-4.803 1.567 8.386 8.386 0 0 1-3.509-.699m8.312-12.264a5.986 5.986 0 0 0-.988-1.976 4.525 4.525 0 0 0-1.635-1.311 5.362 5.362 0 0 0-2.351-.478 5.623 5.623 0 0 0-2.368.478 5.064 5.064 0 0 0-1.754 1.311 6.566 6.566 0 0 0-1.141 1.96 9.615 9.615 0 0 0-.562 2.453h11.174a9.268 9.268 0 0 0-.375-2.437M134.879 19.267v2.691h.068a7.237 7.237 0 0 1 2.333-2.197 6.798 6.798 0 0 1 3.561-.868 5.834 5.834 0 0 1 4.037 1.413 5.174 5.174 0 0 1 1.584 4.071V36.88h-2.112V24.581a3.716 3.716 0 0 0-1.073-2.947 4.334 4.334 0 0 0-2.948-.937 5.896 5.896 0 0 0-2.111.375 5.558 5.558 0 0 0-1.738 1.039 4.717 4.717 0 0 0-1.601 3.593V36.88h-2.112V19.267h2.112zM151.912 36.284a2.934 2.934 0 0 1-.92-2.436V21.005h-2.657v-1.738h2.657v-5.416h2.112v5.416h3.271v1.738h-3.271v12.502a1.65 1.65 0 0 0 .426 1.312c.371.265.823.391 1.277.357.258-.001.515-.029.766-.085.215-.043.426-.106.63-.188h.103v1.806a5.907 5.907 0 0 1-1.942.306 3.819 3.819 0 0 1-2.452-.731M162.625 36.624a7.368 7.368 0 0 1-2.571-1.942 8.732 8.732 0 0 1-1.618-2.929 12.217 12.217 0 0 1 0-7.324 8.744 8.744 0 0 1 1.618-2.93 7.386 7.386 0 0 1 2.571-1.942 8.106 8.106 0 0 1 3.424-.698 7.989 7.989 0 0 1 3.406.698 7.424 7.424 0 0 1 2.556 1.942 8.504 8.504 0 0 1 1.601 2.93 12.57 12.57 0 0 1 0 7.324 8.5 8.5 0 0 1-1.601 2.929 7.415 7.415 0 0 1-2.556 1.942 7.959 7.959 0 0 1-3.406.698 8.075 8.075 0 0 1-3.424-.698m6.013-1.652a5.308 5.308 0 0 0 1.873-1.601 7.215 7.215 0 0 0 1.124-2.385 11.348 11.348 0 0 0 0-5.792 7.215 7.215 0 0 0-1.124-2.385 5.289 5.289 0 0 0-1.873-1.601 6.109 6.109 0 0 0-5.195 0 5.497 5.497 0 0 0-1.874 1.601 7.046 7.046 0 0 0-1.141 2.385 11.392 11.392 0 0 0 0 5.792c.227.86.614 1.669 1.141 2.385a5.817 5.817 0 0 0 7.069 1.601M176.856 22.191a2.128 2.128 0 0 1-2.213-2.265 2.216 2.216 0 1 1 4.431 0 2.146 2.146 0 0 1-2.218 2.265m0-4.277a1.845 1.845 0 0 0-1.892 2.012 1.9 1.9 0 1 0 3.797 0 1.854 1.854 0 0 0-1.905-2.012m.653 3.222l-.751-1.073h-.243v1.035h-.43v-2.509h.763c.526 0 .877.264.877.732a.681.681 0 0 1-.508.693l.724 1.025-.432.097zm-.661-2.157h-.333v.741h.312c.283 0 .46-.117.46-.371.001-.244-.158-.37-.439-.37"/></svg>
diff --git a/lib/web/images/magento-logo.svg b/lib/web/images/magento-logo.svg
index 0d5cc0e6233d6..0f29d4e3eef21 100644
--- a/lib/web/images/magento-logo.svg
+++ b/lib/web/images/magento-logo.svg
@@ -1 +1 @@
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="214px" xml:space="preserve" height="62px" viewBox="0 0 214 62" baseProfile="tiny" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="m93.166 44.96l-1.809-23.096-9.17 23.221h-2.988l-9.17-23.221-1.767 23.096h-3.702l2.314-29.026h4.88l9.045 23.809 9.045-23.809h4.836l2.271 29.026h-3.785z" fill="#131108"/><path d="m112.94 44.96l-0.421-2.692c-1.597 1.639-3.785 3.112-7.066 3.112-3.619 0-5.889-2.188-5.889-5.596 0-5.006 4.29-6.981 12.663-7.867v-0.841c0-2.523-1.515-3.407-3.83-3.407-2.439 0-4.754 0.757-6.94 1.725l-0.505-3.238c2.398-0.969 4.67-1.682 7.783-1.682 4.88 0 7.236 1.976 7.236 6.435v14.051h-3.02zm-0.72-10.182c-7.406 0.715-8.963 2.735-8.963 4.796 0 1.642 1.095 2.693 2.989 2.693 2.187 0 4.291-1.095 5.974-2.82v-4.669z" fill="#131108"/><path d="m137.46 24.599l0.546 3.364-3.826 0.378c0.546 0.926 0.799 1.979 0.799 3.113 0 4.292-3.618 6.899-7.699 6.899-0.504 0-1.011-0.042-1.514-0.126-0.589 0.38-1.01 0.844-1.01 1.22 0 0.716 0.714 0.886 4.248 1.517l1.432 0.252c4.249 0.757 6.898 2.102 6.898 5.216 0 4.206-4.586 6.183-9.802 6.183s-9.381-1.64-9.381-5.173c0-2.062 1.431-3.66 4.248-5.174-0.882-0.631-1.26-1.348-1.26-2.104 0-0.969 0.756-1.936 2.103-2.734-2.229-1.095-3.744-3.238-3.744-5.974 0-4.332 3.616-6.981 7.697-6.981 2.019 0 3.786 0.587 5.175 1.682l5.08-1.558zm-15.73 22.547c0 1.599 2.06 2.775 5.972 2.775 3.913 0 6.099-1.345 6.099-3.027 0-1.222-0.924-2.061-3.784-2.566l-2.397-0.422c-1.095-0.208-1.682-0.336-2.481-0.502-2.36 1.177-3.41 2.356-3.41 3.742zm5.47-19.939c-2.522 0-4.081 1.936-4.081 4.375 0 2.313 1.6 4.12 4.081 4.12 2.566 0 4.165-1.892 4.165-4.29 0-2.397-1.68-4.205-4.16-4.205z" fill="#131108"/><path d="m155.3 35.325h-13.631c0.125 4.669 2.354 6.856 5.847 6.856 2.904 0 5.007-1.135 7.193-2.86l0.546 3.367c-2.144 1.682-4.709 2.691-8.031 2.691-5.219 0-9.299-3.155-9.299-10.519 0-6.435 3.787-10.388 8.835-10.388 5.846 0 8.54 4.5 8.54 10.052v0.801zm-8.58-7.908c-2.313 0-4.291 1.641-4.879 5.09h9.675c-0.47-3.239-1.9-5.09-4.8-5.09z" fill="#131108"/><path d="m171.07 44.96v-13.673c0-2.06-0.883-3.449-3.07-3.449-1.977 0-3.996 1.305-5.807 3.239v13.883h-3.743v-20.067h2.986l0.463 2.903c1.893-1.724 4.251-3.323 7.108-3.323 3.786 0 5.808 2.271 5.808 5.888v14.599h-3.75z" fill="#131108"/><path d="m185.88 45.298c-3.532 0-5.846-1.265-5.846-5.304v-11.946h-3.03v-3.156h3.03v-6.688l3.66-0.546v7.234h4.332l0.505 3.156h-4.837v11.273c0 1.643 0.675 2.651 2.776 2.651 0.673 0 1.262-0.041 1.724-0.127l0.506 3.196c-0.63 0.128-1.51 0.257-2.81 0.257z" fill="#131108"/><path d="m198.29 45.38c-5.342 0-9.213-3.827-9.213-10.434 0-6.605 3.871-10.473 9.213-10.473 5.383 0 9.339 3.868 9.339 10.473 0 6.607-3.96 10.434-9.34 10.434zm0-17.753c-3.617 0-5.426 3.113-5.426 7.319 0 4.125 1.892 7.321 5.426 7.321 3.702 0 5.553-3.114 5.553-7.321 0-4.122-1.93-7.319-5.55-7.319z" fill="#131108"/><path d="m210.28 27.897c-1.505 0-2.551-1.045-2.551-2.606 0-1.55 1.067-2.618 2.551-2.618 1.505 0 2.55 1.056 2.55 2.618 0 1.55-1.07 2.606-2.55 2.606zm0-4.92c-1.214 0-2.18 0.831-2.18 2.314 0 1.472 0.966 2.303 2.18 2.303 1.225 0 2.191-0.832 2.191-2.303 0-1.483-0.98-2.314-2.19-2.314zm0.75 3.708l-0.863-1.237h-0.281v1.191h-0.495v-2.888h0.878c0.606 0 1.01 0.303 1.01 0.843 0 0.416-0.225 0.686-0.585 0.798l0.833 1.18-0.5 0.113zm-0.76-2.484h-0.383v0.854h0.359c0.325 0 0.53-0.135 0.53-0.427 0-0.281-0.18-0.427-0.51-0.427z" fill="#131108"/><g fill="#E85D22"><path d="m26.845 8.857"/><polygon points="53.692 15.5 53.692 46.5 46.021 50.929 46.021 19.929 26.845 8.857 7.67 19.928 7.67 50.929 0 46.5 0 15.5 26.845 0"/><polygon points="26.847 62 15.341 55.356 15.341 24.357 23.011 19.928 23.011 50.929 26.845 53.257 30.682 50.929 30.682 19.929 38.353 24.357 38.353 55.356"/></g></svg>
\ No newline at end of file
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 179.073 50"><style>.st0{fill:#f26322}.st1{fill:#4d4d4d}</style><path class="st0" d="M21.432 0L0 12.373v24.713l6.117 3.533-.041-24.713 15.315-8.842 15.313 8.842v24.706l6.118-3.526V12.35z"/><path class="st0" d="M24.47 40.618l-3.058 1.772-3.071-1.759V15.906l-6.116 3.532.01 24.712 9.172 5.298 9.18-5.298V19.438l-6.117-3.532z"/><path class="st1" d="M56.838 12.522l8.415 21.258h.068l8.21-21.258h3.203V36.88h-2.215V15.656h-.068c-.114.386-.239.772-.374 1.158-.115.318-.246.67-.393 1.055-.147.387-.278.75-.391 1.09l-7.052 17.919h-2.01L57.11 18.96a19.913 19.913 0 0 1-.408-1.039 43.558 43.558 0 0 1-.375-1.073 68.067 68.067 0 0 0-.408-1.192h-.069v21.223h-2.112V12.522h3.1zM83.17 36.982a5.205 5.205 0 0 1-1.823-.92 4.327 4.327 0 0 1-1.209-1.533 4.881 4.881 0 0 1-.443-2.145 5.018 5.018 0 0 1 .579-2.556 4.472 4.472 0 0 1 1.568-1.584 7.927 7.927 0 0 1 2.299-.903 24.732 24.732 0 0 1 2.811-.477 36 36 0 0 0 2.198-.29 6.689 6.689 0 0 0 1.465-.392c.329-.123.614-.343.817-.63.187-.325.276-.698.256-1.073v-.34a3.212 3.212 0 0 0-1.09-2.674 4.93 4.93 0 0 0-3.134-.87c-3.135 0-4.781 1.306-4.941 3.918h-2.077a5.748 5.748 0 0 1 1.891-4.089 7.5 7.5 0 0 1 5.127-1.533 7.335 7.335 0 0 1 4.564 1.278 4.923 4.923 0 0 1 1.67 4.173v9.573c-.034.402.069.804.29 1.141.219.251.536.394.868.392.12-.001.24-.012.358-.034.124-.022.266-.057.425-.102h.103v1.533c-.188.077-.382.14-.58.188-.28.062-.566.091-.852.086a2.694 2.694 0 0 1-1.839-.597 2.575 2.575 0 0 1-.75-1.891v-.374h-.102c-.277.372-.578.725-.903 1.056-.38.385-.81.717-1.278.988a7.14 7.14 0 0 1-1.737.715 8.443 8.443 0 0 1-2.249.272 8.186 8.186 0 0 1-2.282-.306m5.195-1.857a5.971 5.971 0 0 0 1.857-1.175 4.767 4.767 0 0 0 1.499-3.441V27.34a7.295 7.295 0 0 1-2.061.732 33.21 33.21 0 0 1-2.504.426c-.749.114-1.441.233-2.077.358a5.237 5.237 0 0 0-1.652.596 3.055 3.055 0 0 0-1.108 1.107 3.579 3.579 0 0 0-.408 1.824c-.018.53.093 1.056.324 1.533.201.392.493.73.851.987a3.35 3.35 0 0 0 1.244.529c.493.104.995.155 1.499.153a6.555 6.555 0 0 0 2.536-.46M99.35 41.734a4.687 4.687 0 0 1-2.009-3.287h2.043c.14.966.763 1.794 1.652 2.197a7.522 7.522 0 0 0 3.288.664 5.688 5.688 0 0 0 4.173-1.345 4.997 4.997 0 0 0 1.345-3.697v-2.793h-.102a7.293 7.293 0 0 1-2.283 2.282 6.297 6.297 0 0 1-3.304.784 7.375 7.375 0 0 1-3.135-.647 6.921 6.921 0 0 1-2.385-1.806 8.095 8.095 0 0 1-1.516-2.777 11.429 11.429 0 0 1-.528-3.56 10.89 10.89 0 0 1 .613-3.799 8.483 8.483 0 0 1 1.636-2.777 6.75 6.75 0 0 1 2.402-1.703 7.45 7.45 0 0 1 2.913-.58 6.234 6.234 0 0 1 3.372.835 6.938 6.938 0 0 1 2.215 2.265h.102v-2.725h2.078v16.931a6.78 6.78 0 0 1-1.636 4.735 7.751 7.751 0 0 1-5.893 2.112 8.337 8.337 0 0 1-5.041-1.309m9.232-8.908a8.565 8.565 0 0 0 1.397-5.11 11.22 11.22 0 0 0-.34-2.862 6.239 6.239 0 0 0-1.056-2.231 4.828 4.828 0 0 0-1.789-1.448 5.772 5.772 0 0 0-2.503-.511 4.782 4.782 0 0 0-4.071 1.941 8.464 8.464 0 0 0-1.448 5.179c-.008.936.107 1.87.34 2.777a6.64 6.64 0 0 0 1.022 2.214 4.81 4.81 0 0 0 1.703 1.465 5.208 5.208 0 0 0 2.42.528 4.967 4.967 0 0 0 4.325-1.942M119.244 36.624a7.19 7.19 0 0 1-2.572-1.941 8.66 8.66 0 0 1-1.583-2.93 11.839 11.839 0 0 1-.546-3.662 11.179 11.179 0 0 1 .58-3.663 9.138 9.138 0 0 1 1.617-2.929 7.307 7.307 0 0 1 2.522-1.942 7.684 7.684 0 0 1 3.321-.698 7.275 7.275 0 0 1 3.56.8 6.678 6.678 0 0 1 2.351 2.146 8.806 8.806 0 0 1 1.278 3.083 16.87 16.87 0 0 1 .374 3.577h-13.422c.013.941.157 1.875.426 2.777a6.968 6.968 0 0 0 1.124 2.231 5.108 5.108 0 0 0 1.857 1.499 5.948 5.948 0 0 0 2.623.546 4.985 4.985 0 0 0 3.424-1.074 5.875 5.875 0 0 0 1.719-2.878h2.044a7.51 7.51 0 0 1-2.385 4.19 7.072 7.072 0 0 1-4.803 1.567 8.386 8.386 0 0 1-3.509-.699m8.312-12.264a5.986 5.986 0 0 0-.988-1.976 4.525 4.525 0 0 0-1.635-1.311 5.362 5.362 0 0 0-2.351-.478 5.623 5.623 0 0 0-2.368.478 5.064 5.064 0 0 0-1.754 1.311 6.566 6.566 0 0 0-1.141 1.96 9.615 9.615 0 0 0-.562 2.453h11.174a9.268 9.268 0 0 0-.375-2.437M134.879 19.267v2.691h.068a7.237 7.237 0 0 1 2.333-2.197 6.798 6.798 0 0 1 3.561-.868 5.834 5.834 0 0 1 4.037 1.413 5.174 5.174 0 0 1 1.584 4.071V36.88h-2.112V24.581a3.716 3.716 0 0 0-1.073-2.947 4.334 4.334 0 0 0-2.948-.937 5.896 5.896 0 0 0-2.111.375 5.558 5.558 0 0 0-1.738 1.039 4.717 4.717 0 0 0-1.601 3.593V36.88h-2.112V19.267h2.112zM151.912 36.284a2.934 2.934 0 0 1-.92-2.436V21.005h-2.657v-1.738h2.657v-5.416h2.112v5.416h3.271v1.738h-3.271v12.502a1.65 1.65 0 0 0 .426 1.312c.371.265.823.391 1.277.357.258-.001.515-.029.766-.085.215-.043.426-.106.63-.188h.103v1.806a5.907 5.907 0 0 1-1.942.306 3.819 3.819 0 0 1-2.452-.731M162.625 36.624a7.368 7.368 0 0 1-2.571-1.942 8.732 8.732 0 0 1-1.618-2.929 12.217 12.217 0 0 1 0-7.324 8.744 8.744 0 0 1 1.618-2.93 7.386 7.386 0 0 1 2.571-1.942 8.106 8.106 0 0 1 3.424-.698 7.989 7.989 0 0 1 3.406.698 7.424 7.424 0 0 1 2.556 1.942 8.504 8.504 0 0 1 1.601 2.93 12.57 12.57 0 0 1 0 7.324 8.5 8.5 0 0 1-1.601 2.929 7.415 7.415 0 0 1-2.556 1.942 7.959 7.959 0 0 1-3.406.698 8.075 8.075 0 0 1-3.424-.698m6.013-1.652a5.308 5.308 0 0 0 1.873-1.601 7.215 7.215 0 0 0 1.124-2.385 11.348 11.348 0 0 0 0-5.792 7.215 7.215 0 0 0-1.124-2.385 5.289 5.289 0 0 0-1.873-1.601 6.109 6.109 0 0 0-5.195 0 5.497 5.497 0 0 0-1.874 1.601 7.046 7.046 0 0 0-1.141 2.385 11.392 11.392 0 0 0 0 5.792c.227.86.614 1.669 1.141 2.385a5.817 5.817 0 0 0 7.069 1.601M176.856 22.191a2.128 2.128 0 0 1-2.213-2.265 2.216 2.216 0 1 1 4.431 0 2.146 2.146 0 0 1-2.218 2.265m0-4.277a1.845 1.845 0 0 0-1.892 2.012 1.9 1.9 0 1 0 3.797 0 1.854 1.854 0 0 0-1.905-2.012m.653 3.222l-.751-1.073h-.243v1.035h-.43v-2.509h.763c.526 0 .877.264.877.732a.681.681 0 0 1-.508.693l.724 1.025-.432.097zm-.661-2.157h-.333v.741h.312c.283 0 .46-.117.46-.371.001-.244-.158-.37-.439-.37"/></svg>
diff --git a/lib/web/jquery/patches/jquery-ui.js b/lib/web/jquery/patches/jquery-ui.js
new file mode 100644
index 0000000000000..ae2d8da7ece66
--- /dev/null
+++ b/lib/web/jquery/patches/jquery-ui.js
@@ -0,0 +1,46 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    /**
+     * Patch for CVE-2016-7103 (XSS vulnerability).
+     * Can safely remove only when jQuery UI is upgraded to >= 1.12.x.
+     * https://www.cvedetails.com/cve/CVE-2016-7103/
+     */
+    function dialogPatch() {
+        $.widget('ui.dialog', $.ui.dialog, {
+            /** @inheritdoc */
+            _createTitlebar: function () {
+                this.options.closeText = $('<a>').text('' + this.options.closeText).html();
+
+                this._superApply();
+            },
+
+            /** @inheritdoc */
+            _setOption: function (key, value) {
+                if (key === 'closeText') {
+                    value = $('<a>').text('' + value).html();
+                }
+
+                this._super(key, value);
+            }
+        });
+    }
+
+    return function () {
+        var majorVersion = $.ui.version.split('.')[0],
+            minorVersion = $.ui.version.split('.')[1];
+
+        if (majorVersion === 1 && minorVersion >= 12 || majorVersion >= 2) {
+            console.warn('jQuery patch for CVE-2016-7103 is no longer necessary, and should be removed');
+        }
+
+        dialogPatch();
+    };
+});
diff --git a/lib/web/jquery/patches/jquery.js b/lib/web/jquery/patches/jquery.js
new file mode 100644
index 0000000000000..9d733a92159c6
--- /dev/null
+++ b/lib/web/jquery/patches/jquery.js
@@ -0,0 +1,35 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([], function () {
+    'use strict';
+
+    /**
+     * Patch for CVE-2015-9251 (XSS vulnerability).
+     * Can safely remove only when jQuery UI is upgraded to >= 3.3.x.
+     * https://www.cvedetails.com/cve/CVE-2015-9251/
+     */
+    function ajaxResponsePatch(jQuery) {
+        jQuery.ajaxPrefilter(function (s) {
+            if (s.crossDomain) {
+                s.contents.script = false;
+            }
+        });
+    }
+
+    return function ($) {
+        var majorVersion = $.fn.jquery.split('.')[0];
+
+        $.noConflict();
+
+        if (majorVersion >= 3) {
+            console.warn('jQuery patch for CVE-2015-9251 is no longer necessary, and should be removed');
+        }
+
+        ajaxResponsePatch(jQuery);
+
+        return jQuery;
+    };
+});
diff --git a/lib/web/mage/adminhtml/grid.js b/lib/web/mage/adminhtml/grid.js
index c9af869d79161..141845f7d3b8a 100644
--- a/lib/web/mage/adminhtml/grid.js
+++ b/lib/web/mage/adminhtml/grid.js
@@ -340,6 +340,51 @@ define([
             location.href = url;
         },
 
+        /**
+         * Builds the form with fields containing the and submits
+         *
+         * @param {String} url
+         * @param {String} varName
+         * @param {String} varValue
+         * @private
+         */
+        _buildFormAndSubmit: function (url, varName, varValue) {
+            var re = new RegExp('\/(' + varName + '\/.*?\/)'),
+                parts = url.split(new RegExp('\\?')),
+                form = jQuery('<form/>'),
+                inputProps = [
+                    {
+                        name: varName,
+                        value: varValue
+                    },
+                    {
+                        name: 'form_key',
+                        value: window.FORM_KEY
+                    }
+                ],
+                input;
+
+            url = parts[0].replace(re, '/');
+
+            if (parts.size() > 1) {
+                url += '?' + parts[1];
+            }
+
+            form.attr('action', url);
+            form.attr('method', 'POST');
+
+            inputProps.forEach(function (item) {
+                input = jQuery('<input/>');
+                input.attr('name', item.name);
+                input.attr('type', 'hidden');
+                input.val(item.value);
+                form.append(input);
+            });
+            jQuery('[data-container="body"]').append(form);
+            form.submit();
+            form.remove();
+        },
+
         /**
          * @private
          */
@@ -389,13 +434,14 @@ define([
                 exportUrl = $(this.containerId + '_export').value;
 
                 if (this.massaction && this.massaction.checkedString) {
-                    exportUrl = this._addVarToUrl(
+                    this._buildFormAndSubmit(
                         exportUrl,
                         this.massaction.formFieldNameInternal,
                         this.massaction.checkedString
                     );
+                } else {
+                    location.href = exportUrl;
                 }
-                location.href = exportUrl;
             }
         },
 
@@ -530,13 +576,20 @@ define([
 
         /**
          * @param {Object} event
+         * @param {*} lastId
          */
-        inputPage: function (event) {
+        inputPage: function (event, lastId) {
             var element = Event.element(event),
-                keyCode = event.keyCode || event.which;
+                keyCode = event.keyCode || event.which,
+                enteredValue = parseInt(element.value, 10),
+                pageId = parseInt(lastId, 10);
 
             if (keyCode == Event.KEY_RETURN) { //eslint-disable-line eqeqeq
-                this.setPage(element.value);
+                if (enteredValue > pageId) {
+                    this.setPage(pageId);
+                } else {
+                    this.setPage(enteredValue);
+                }
             }
 
             /*if(keyCode>47 && keyCode<58){
diff --git a/lib/web/mage/adminhtml/tools.js b/lib/web/mage/adminhtml/tools.js
index f23a0193cb6b2..27f6efcfc5876 100644
--- a/lib/web/mage/adminhtml/tools.js
+++ b/lib/web/mage/adminhtml/tools.js
@@ -89,12 +89,6 @@ function checkByProductPriceType(elem) {
 
 }
 
-Event.observe(window, 'load', function () {
-    if ($('price_default') && $('price_default').checked) {
-        $('price').disabled = 'disabled';
-    }
-});
-
 function toggleSeveralValueElements(checkbox, containers, excludedElements, checked) {
     'use strict';
 
@@ -354,7 +348,7 @@ var Fieldset = {
     },
     saveState: function (url, parameters) {
         new Ajax.Request(url, {
-            method: 'get',
+            method: 'post',
             parameters: Object.toQueryString(parameters),
             loaderArea: false
         });
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/html5-schema.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/html5-schema.js
index 98ce6a005db04..41def246989db 100644
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/html5-schema.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/html5-schema.js
@@ -149,7 +149,8 @@ define([
             ['col', 'width align char charoff valign'],
             ['input button select textarea', 'autofocus'],
             ['input textarea', 'placeholder onselect onchange onfocus onblur'],
-            ['link script img', 'crossorigin']
+            ['link script img', 'crossorigin'],
+            ['div','aria-role']
         ];
 
         rawData.forEach(function (data) {
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
index fee0104efe87a..23f24bfcd1a9b 100755
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
@@ -238,10 +238,18 @@ define([
          * @param {Object} o
          */
         openFileBrowser: function (o) {
-            var typeTitle,
-                storeId = this.config['store_id'] !== null ? this.config['store_id'] : 0,
-                frameDialog = jQuery(o.win.frameElement).parents('[role="dialog"]'),
-                wUrl = this.config['files_browser_window_url'] +
+            var targetElementID =  tinyMCE.activeEditor.getElement().getAttribute('id'),
+                originId = this.id,
+                typeTitle,
+                storeId,
+                frameDialog,
+                wUrl;
+
+            this.initialize(targetElementID, this.config);
+
+            storeId = this.config['store_id'] !== null ? this.config['store_id'] : 0;
+            frameDialog = jQuery(o.win.frameElement).parents('[role="dialog"]');
+            wUrl = this.config['files_browser_window_url'] +
                 'target_element_id/' + this.id + '/' +
                 'store/' + storeId + '/';
 
@@ -255,6 +263,8 @@ define([
                 typeTitle = this.translate('Insert File...');
             }
 
+            this.initialize(originId, this.config);
+
             frameDialog.hide();
             jQuery('#mceModalBlocker').hide();
 
diff --git a/lib/web/mage/backend/validation.js b/lib/web/mage/backend/validation.js
index d3ab7dd086a43..f141fb3eeb8d0 100644
--- a/lib/web/mage/backend/validation.js
+++ b/lib/web/mage/backend/validation.js
@@ -171,6 +171,7 @@
                 this._submit();
             } else {
                 this._showErrors(response);
+                $(this.element[0]).trigger('afterValidate.error');
                 $('body').trigger('processStop');
             }
         },
diff --git a/lib/web/mage/dataPost.js b/lib/web/mage/dataPost.js
index 5d052f12db8fb..cc56ee266e08a 100644
--- a/lib/web/mage/dataPost.js
+++ b/lib/web/mage/dataPost.js
@@ -57,7 +57,7 @@ define([
          */
         postData: function (params) {
             var formKey = $(this.options.formKeyInputSelector).val(),
-                $form;
+                $form, input;
 
             if (formKey) {
                 params.data['form_key'] = formKey;
@@ -67,6 +67,19 @@ define([
                 data: params
             }));
 
+            if (params.files) {
+                $form[0].enctype = 'multipart/form-data';
+                $.each(params.files, function (key, files) {
+                    if (files instanceof FileList) {
+                        input = document.createElement('input');
+                        input.type = 'file';
+                        input.name = key;
+                        input.files = files;
+                        $form[0].appendChild(input);
+                    }
+                });
+            }
+
             if (params.data.confirmation) {
                 uiConfirm({
                     content: params.data.confirmationMessage,
diff --git a/lib/web/mage/gallery/gallery.js b/lib/web/mage/gallery/gallery.js
index db98a1cc39a30..be78856b21fcd 100644
--- a/lib/web/mage/gallery/gallery.js
+++ b/lib/web/mage/gallery/gallery.js
@@ -141,7 +141,7 @@ define([
             this.setupBreakpoints();
             this.initFullscreenSettings();
 
-            this.settings.$element.on('mouseup', '.fotorama__stage__frame', function () {
+            this.settings.$element.on('click', '.fotorama__stage__frame', function () {
                 if (
                     !$(this).parents('.fotorama__shadows--left, .fotorama__shadows--right').length &&
                     !$(this).hasClass('fotorama-video-container')
@@ -472,8 +472,18 @@ define([
                      * @param {Array.<Object>} data - Set of gallery items to update.
                      */
                     updateData: function (data) {
+                        var mainImageIndex;
+
                         if (_.isArray(data)) {
                             settings.fotoramaApi.load(data);
+                            mainImageIndex = getMainImageIndex(data);
+
+                            if (mainImageIndex) {
+                                settings.fotoramaApi.show({
+                                    index: mainImageIndex,
+                                    time: 0
+                                });
+                            }
 
                             $.extend(false, settings, {
                                 data: data,
diff --git a/lib/web/mage/gallery/gallery.less b/lib/web/mage/gallery/gallery.less
index f551157210692..fb95d3d1ed98c 100644
--- a/lib/web/mage/gallery/gallery.less
+++ b/lib/web/mage/gallery/gallery.less
@@ -768,6 +768,7 @@
         max-width: inherit;
         position: absolute;
         top: 0;
+        object-fit: scale-down;
     }
 }
 
diff --git a/lib/web/mage/menu.js b/lib/web/mage/menu.js
index e4ccbdf325ecc..839730c9ea600 100644
--- a/lib/web/mage/menu.js
+++ b/lib/web/mage/menu.js
@@ -21,8 +21,8 @@ define([
             expanded: false,
             showDelay: 42,
             hideDelay: 300,
-            delay: 300,
-            mediaBreakpoint: '(max-width: 768px)'
+            delay: 0,
+            mediaBreakpoint: '(max-width: 767px)'
         },
 
         /**
@@ -439,6 +439,10 @@ define([
                     event.preventDefault();
                     target = $(event.target).closest('.ui-menu-item');
 
+                    if (target.length) {
+                        target.get(0).scrollIntoView();
+                    }
+
                     if (!target.hasClass('level-top') || !target.has('.ui-menu').length) {
                         window.location.href = target.find('> a').attr('href');
                     }
@@ -460,7 +464,7 @@ define([
 
                 this.categoryLink = $('<a>')
                     .attr('href', categoryUrl)
-                    .text($.mage.__('All ') + category);
+                    .text($.mage.__('All %1').replace('%1', category));
 
                 this.categoryParent = $('<li>')
                     .addClass('ui-menu-item all-category')
diff --git a/lib/web/mage/requirejs/resolver.js b/lib/web/mage/requirejs/resolver.js
index 588a0f8411cff..5ba1f1351bcf6 100644
--- a/lib/web/mage/requirejs/resolver.js
+++ b/lib/web/mage/requirejs/resolver.js
@@ -34,7 +34,7 @@ define([
      * @return {Boolean}
      */
     function isRejected(module) {
-        return registry[module.id] && registry[module.id].error;
+        return registry[module.id] && (registry[module.id].inited || registry[module.id].error);
     }
 
     /**
diff --git a/lib/web/mage/tabs.js b/lib/web/mage/tabs.js
index b441477ab8d8a..65c452d33bf12 100644
--- a/lib/web/mage/tabs.js
+++ b/lib/web/mage/tabs.js
@@ -72,7 +72,7 @@ define([
 
             if (anchor && isValid) {
                 $.each(self.contents, function (i) {
-                    if ($(this).attr('id') === anchorId) {
+                    if ($(this).attr('id') === anchorId || $(this).find('#' + anchorId).length) {
                         self.collapsibles.not(self.collapsibles.eq(i)).collapsible('forceDeactivate');
 
                         return false;
diff --git a/lib/web/mage/translate-inline.js b/lib/web/mage/translate-inline.js
index bc3a190a9f712..141af6e141c39 100644
--- a/lib/web/mage/translate-inline.js
+++ b/lib/web/mage/translate-inline.js
@@ -200,32 +200,5 @@
         }
     });
 
-    $.widget('ui.button', $.ui.button, {
-        /**
-         * @private
-         */
-        _create: function () {
-            this._super();
-            // Decode HTML entities to prevent incorrect rendering of dialog button label
-            this.options.label = this.options.label ?
-                jQuery('<div/>').html(this.options.label).text() : this.options.label;
-            //Reset button to make decoded label visible
-            this._resetButton();
-        }
-    });
-
-    $.widget('ui.dialog', $.ui.dialog, {
-        /**
-         * Prevent rendering of dialog title as escaped HTML
-         */
-        _title: function (title) {
-            this._super(title);
-
-            if (this.options.title) {
-                title.html(this.options.title);
-            }
-        }
-    });
-
     return $.mage.translateInline;
 }));
diff --git a/lib/web/mage/trim-input.js b/lib/web/mage/trim-input.js
index 678192dcf61ac..d077dad8dc302 100644
--- a/lib/web/mage/trim-input.js
+++ b/lib/web/mage/trim-input.js
@@ -41,9 +41,20 @@ define([
          * @private
          */
         _trimInput: function () {
-            var input = this._getInputValue().trim();
+            // Safari caret position workaround: storing carter position
+            var caretStart, caretEnd, input;
+
+            caretStart = this.options.cache.input.get(0).selectionStart;
+            caretEnd = this.options.cache.input.get(0).selectionEnd;
+
+            input = this._getInputValue().trim();
 
             this.options.cache.input.val(input);
+
+            // Safari caret position workaround: setting caret position to previously stored values
+            if (caretStart !== null && caretEnd !== null) {
+                this.options.cache.input.get(0).setSelectionRange(caretStart, caretEnd);
+            }
         },
 
         /**
diff --git a/lib/web/mage/utils/compare.js b/lib/web/mage/utils/compare.js
index e620677f01768..bfc2027d6fb89 100644
--- a/lib/web/mage/utils/compare.js
+++ b/lib/web/mage/utils/compare.js
@@ -43,7 +43,7 @@ define([
             }
 
             return array.every(function (value, index) {
-                return target.indexOf(value) === index;
+                return target[index] === value;
             });
         });
     }
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index e14ecf982bc96..ea41ee38d9d3c 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -204,6 +204,21 @@
         return empty === 0;
     }
 
+    /**
+     *
+     * @param {float} qty
+     * @param {float} qtyIncrements
+     * @returns {float}
+     */
+    function resolveModulo(qty, qtyIncrements) {
+        while (qtyIncrements < 1) {
+            qty *= 10;
+            qtyIncrements *= 10;
+        }
+
+        return qty % qtyIncrements;
+    }
+
     /**
      * Collection of validation rules including rules from additional-methods.js
      * @type {Object}
@@ -887,6 +902,27 @@
             },
             $.mage.__('Please enter a valid number in this field.')
         ],
+        'validate-forbidden-extensions': [
+            function (v, elem) {
+                var forbiddenExtensions = $(elem).attr('data-validation-params'),
+                    forbiddenExtensionsArray = forbiddenExtensions.split(','),
+                    extensionsArray = v.split(','),
+                    result = true;
+
+                this.validateExtensionsMessage = $.mage.__('Forbidden extensions has been used. Avoid usage of ') +
+                    forbiddenExtensions;
+
+                $.each(extensionsArray, function (key, extension) {
+                    if (forbiddenExtensionsArray.indexOf(extension) !== -1) {
+                        result = false;
+                    }
+                });
+
+                return result;
+            }, function () {
+                return this.validateExtensionsMessage;
+            }
+        ],
         'validate-digits-range': [
             function (v, elm, param) {
                 var numValue, dataAttrRange, classNameRange, result, range, m, classes, ii;
@@ -969,8 +1005,8 @@
                         minValidRange = $.mage.parseNumber(validRange[1]);
                         maxValidRange = $.mage.parseNumber(validRange[2]);
                         result = result &&
-                        (isNaN(minValidRange) || minValue >= minValidRange) &&
-                        (isNaN(maxValidRange) || maxValue <= maxValidRange);
+                            (isNaN(minValidRange) || minValue >= minValidRange) &&
+                            (isNaN(maxValidRange) || maxValue <= maxValidRange);
                     }
                 }
 
@@ -1088,8 +1124,8 @@
                     options = p.find('input');
 
                 return options.map(function (el) {
-                        return $(el).val();
-                    }).length > 0;
+                    return $(el).val();
+                }).length > 0;
             },
             $.mage.__('Please select one of the options above.')
         ],
@@ -1105,9 +1141,9 @@
                     ovId;
 
                 if (!result) {
-                    ovId = $(elm).attr('id') + '_value';
+                    ovId = $('#' + $(elm).attr('id') + '_value');
 
-                    if ($(ovId)) {
+                    if (ovId.length > 0) {
                         result = !$.mage.isEmptyNoTrim($(ovId).val());
                     }
                 }
@@ -1404,10 +1440,14 @@
         ],
         'validate-per-page-value-list': [
             function (v) {
-                var isValid = !$.mage.isEmpty(v),
+                var isValid = true,
                     values = v.split(','),
                     i;
 
+                if ($.mage.isEmpty(v)) {
+                    return isValid;
+                }
+
                 for (i = 0; i < values.length; i++) {
                     if (!/^[0-9]+$/.test(values[i])) {
                         isValid = false;
@@ -1583,7 +1623,7 @@
                     isMaxAllowedValid = typeof params.maxAllowed === 'undefined' ||
                         qty <= $.mage.parseNumber(params.maxAllowed),
                     isQtyIncrementsValid = typeof params.qtyIncrements === 'undefined' ||
-                        qty % $.mage.parseNumber(params.qtyIncrements) === 0;
+                        resolveModulo(qty, $.mage.parseNumber(params.qtyIncrements)) === 0.0;
 
                 result = qty > 0;
 
@@ -1838,6 +1878,10 @@
                 if (element.siblings('.tooltip').length) {
                     errorPlacement = element.siblings('.tooltip');
                 }
+                //logic for select with tooltip in after element
+                if (element.next().find('.tooltip').length) {
+                    errorPlacement = element.next();
+                }
                 errorPlacement.after(error);
             }
         },
@@ -1897,15 +1941,15 @@
          * @param {jQuery.Event} event
          * @param {Object} validation
          */
-        listenFormValidateHandler:  function (event, validation) {
+        listenFormValidateHandler: function (event, validation) {
             var firstActive = $(validation.errorList[0].element || []),
                 lastActive = $(validation.findLastActive() ||
                     validation.errorList.length && validation.errorList[0].element || []),
-                parent, windowHeight, successList;
+                windowHeight = $(window).height(),
+                parent, successList;
 
             if (lastActive.is(':hidden')) {
                 parent = lastActive.parent();
-                windowHeight = $(window).height();
                 $('html, body').animate({
                     scrollTop: parent.offset().top - windowHeight / 2
                 });
@@ -1923,6 +1967,9 @@
             }
 
             if (firstActive.length) {
+                $('body').stop().animate({
+                    scrollTop: firstActive.offset().top - windowHeight / 2
+                });
                 firstActive.focus();
             }
         }
diff --git a/lib/web/magnifier/magnifier.js b/lib/web/magnifier/magnifier.js
index 0807a4c394995..f6ea1300e77ea 100644
--- a/lib/web/magnifier/magnifier.js
+++ b/lib/web/magnifier/magnifier.js
@@ -542,7 +542,11 @@
                         showWrapper = true;
                         bindEvents(eventType, thumb);
                         data[idx].status = 2;
-                        data[idx].zoom = largeObj.height / largeWrapper.height();
+                        if (largeObj.width > largeObj.height) {
+                            data[idx].zoom = largeObj.width / largeWrapper.width();
+                        } else {
+                            data[idx].zoom = largeObj.height / largeWrapper.height();
+                        }
                         setThumbData(thumb, data[idx]);
                         updateLensOnLoad(idx, thumb, largeObj, largeWrapper);
                     }
diff --git a/lib/web/tiny_mce/themes/advanced/js/source_editor.js b/lib/web/tiny_mce/themes/advanced/js/source_editor.js
index 9cf6b1a29cdaf..e90ee4d99628d 100644
--- a/lib/web/tiny_mce/themes/advanced/js/source_editor.js
+++ b/lib/web/tiny_mce/themes/advanced/js/source_editor.js
@@ -10,8 +10,9 @@ function onLoadInit() {
 	tinyMCEPopup.resizeToInnerSize();
 
 	// Remove Gecko spellchecking
-	if (tinymce.isGecko)
-		document.body.spellcheck = tinyMCEPopup.editor.getParam("gecko_spellcheck");
+	if (tinymce.isGecko) {
+		document.body.spellcheck = tinyMCEPopup.editor.getParam("gecko_spellcheck", false);
+	}
 
 	document.getElementById('htmlSource').value = tinyMCEPopup.editor.getContent({source_view : true});
 
diff --git a/lib/web/varien/js.js b/lib/web/varien/js.js
index 55e41a1652cb8..45032829f2fd8 100644
--- a/lib/web/varien/js.js
+++ b/lib/web/varien/js.js
@@ -607,17 +607,11 @@ if (!("console" in window) || !("firebug" in console))
  * @example fireEvent($('my-input', 'click'));
  */
 function fireEvent(element, event) {
-    if (document.createEvent) {
-        // dispatch for all browsers except IE before version 9
-        var evt = document.createEvent('HTMLEvents');
+    // dispatch event
+    var evt = document.createEvent('HTMLEvents');
 
-        evt.initEvent(event, true, true); // event type, bubbling, cancelable
-        return element.dispatchEvent(evt);
-    }
-    // dispatch for IE before version 9
-    var evt = document.createEventObject();
-
-    return element.fireEvent('on' + event, evt);
+    evt.initEvent(event, true, true); // event type, bubbling, cancelable
+    return element.dispatchEvent(evt);
 
 }
 
diff --git a/nginx.conf.sample b/nginx.conf.sample
index 6f87a9a076666..2104a920258f8 100644
--- a/nginx.conf.sample
+++ b/nginx.conf.sample
@@ -33,6 +33,11 @@ charset UTF-8;
 error_page 404 403 = /errors/404.php;
 #add_header "X-UA-Compatible" "IE=Edge";
 
+# Deny access to sensitive files
+location /.user.ini {
+    deny all;
+}
+
 # PHP entry point for setup application
 location ~* ^/setup($|/) {
     root $MAGE_ROOT;
@@ -159,9 +164,14 @@ location /media/downloadable/ {
 location /media/import/ {
     deny all;
 }
+location /errors/ {
+    location ~* \.xml$ {
+        deny all;
+    }
+}
 
 # PHP entry point for main application
-location ~ (index|get|static|report|404|503|health_check)\.php$ {
+location ~ ^/(index|get|static|errors/report|errors/404|errors/503|health_check)\.php$ {
     try_files $uri =404;
     fastcgi_pass   fastcgi_backend;
     fastcgi_buffers 1024 4k;
@@ -198,6 +208,6 @@ gzip_types
 gzip_vary on;
 
 # Banned locations (only reached if the earlier PHP entry point regexes don't match)
-location ~* (\.php$|\.htaccess$|\.git) {
+location ~* (\.php$|\.phtml$|\.htaccess$|\.git) {
     deny all;
 }
diff --git a/pub/.htaccess b/pub/.htaccess
index 8ba04ff4415f3..9f07f3319837e 100644
--- a/pub/.htaccess
+++ b/pub/.htaccess
@@ -220,6 +220,16 @@ ErrorDocument 403 /errors/404.php
             Require all denied
         </IfVersion>
     </Files>
+## Deny access  to .user.ini##
+    <Files .user.ini>
+        <IfVersion < 2.4>
+            order allow,deny
+            deny from all
+        </IfVersion>
+        <IfVersion >= 2.4>
+            Require all denied
+        </IfVersion>
+    </Files>
 
 <IfModule mod_headers.c>
     ############################################
diff --git a/pub/errors/.htaccess b/pub/errors/.htaccess
index 3692dd439e2ff..a7b9cbda05893 100644
--- a/pub/errors/.htaccess
+++ b/pub/errors/.htaccess
@@ -1,4 +1,7 @@
 Options None
+<FilesMatch "\.(xml|phtml)$">
+    Deny from all
+</FilesMatch>
 <IfModule mod_rewrite.c>
     RewriteEngine Off
 </IfModule>
diff --git a/pub/errors/default/images/logo.gif b/pub/errors/default/images/logo.gif
index f1f7fcaf4f020..0cca183e08da2 100644
Binary files a/pub/errors/default/images/logo.gif and b/pub/errors/default/images/logo.gif differ
diff --git a/pub/media/.htaccess b/pub/media/.htaccess
index 28e65b490fbb8..d8793a891430a 100644
--- a/pub/media/.htaccess
+++ b/pub/media/.htaccess
@@ -23,6 +23,9 @@ SetHandler default-handler
     Options +FollowSymLinks
     RewriteEngine on
 
+    ## you can put here your pub/media folder path relative to web root
+    #RewriteBase /magento/pub/media/
+
 ############################################
 ## never rewrite for existing files
     RewriteCond %{REQUEST_FILENAME} !-f
diff --git a/pub/static/.htaccess b/pub/static/.htaccess
index f49dce25d433e..8253efa80bed8 100644
--- a/pub/static/.htaccess
+++ b/pub/static/.htaccess
@@ -22,6 +22,11 @@ Options -MultiViews
     RewriteCond %{REQUEST_FILENAME} !-l
 
     RewriteRule .* ../static.php?resource=$0 [L]
+    # Detects if moxieplayer request with uri params and redirects to uri without params
+    <Files moxieplayer.swf>
+        RewriteCond %{QUERY_STRING} !^$
+        RewriteRule ^(.*)$ %{REQUEST_URI}? [R=301,L]
+    </Files>
 </IfModule>
 
 ############################################
diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index 80abe6da87f3c..73403e543e918 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -25803,6 +25803,39 @@ catch (java.lang.Exception e) {
         </ResponseAssertion>
         <hashTree/>
       </hashTree>
+      <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Filled Order Page" enabled="true">
+        <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+          <collectionProp name="Arguments.arguments"/>
+        </elementProp>
+        <stringProp name="HTTPSampler.domain"/>
+        <stringProp name="HTTPSampler.port"/>
+        <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+        <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+        <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
+        <stringProp name="HTTPSampler.contentEncoding"/>
+        <stringProp name="HTTPSampler.path">${base_path}${admin_path}/sales/order_create/index/</stringProp>
+        <stringProp name="HTTPSampler.method">GET</stringProp>
+        <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+        <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+        <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+        <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+        <boolProp name="HTTPSampler.monitor">false</boolProp>
+        <stringProp name="HTTPSampler.embedded_url_re"/>
+        <stringProp name="TestPlan.comments">Detected the start of a redirect chain</stringProp>
+      </HTTPSamplerProxy>
+      <hashTree>
+        <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Filled Order Page" enabled="true">
+          <collectionProp name="Asserion.test_strings">
+            <stringProp name="-37823069">Select from existing customer addresses</stringProp>
+            <stringProp name="-13185722">Submit Order</stringProp>
+            <stringProp name="-209419315">Items Ordered</stringProp>
+          </collectionProp>
+          <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+          <boolProp name="Assertion.assume_success">false</boolProp>
+          <intProp name="Assertion.test_type">2</intProp>
+        </ResponseAssertion>
+        <hashTree/>
+      </hashTree>
       <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save Order" enabled="true">
         <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
           <collectionProp name="Arguments.arguments">
@@ -32756,7 +32789,15 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate
       <hashTree/>
       <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Delete category" enabled="true">
         <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
-          <collectionProp name="Arguments.arguments"/>
+          <collectionProp name="Arguments.arguments">
+            <elementProp name="form_key" elementType="HTTPArgument">
+              <boolProp name="HTTPArgument.always_encode">true</boolProp>
+              <stringProp name="Argument.value">${admin_form_key}</stringProp>
+              <stringProp name="Argument.metadata">=</stringProp>
+              <boolProp name="HTTPArgument.use_equals">true</boolProp>
+              <stringProp name="Argument.name">form_key</stringProp>
+            </elementProp>
+          </collectionProp>
         </elementProp>
         <stringProp name="HTTPSampler.domain"/>
         <stringProp name="HTTPSampler.port"/>
@@ -32765,7 +32806,7 @@ vars.put("new_parent_category_id", props.get("admin_category_ids_list").get(cate
         <stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
         <stringProp name="HTTPSampler.contentEncoding"/>
         <stringProp name="HTTPSampler.path">${base_path}${admin_path}/catalog/category/delete/id/${admin_category_id}/</stringProp>
-        <stringProp name="HTTPSampler.method">GET</stringProp>
+        <stringProp name="HTTPSampler.method">POST</stringProp>
         <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
         <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
         <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
diff --git a/setup/pub/angular-ng-storage/angular-ng-storage.min.js b/setup/pub/angular-ng-storage/angular-ng-storage.min.js
index f5526bbace8ef..54891ebb4087f 100644
--- a/setup/pub/angular-ng-storage/angular-ng-storage.min.js
+++ b/setup/pub/angular-ng-storage/angular-ng-storage.min.js
@@ -1 +1 @@
-/*! ngStorage 0.3.0 | Copyright (c) 2013 Gias Kay Lee | MIT License */"use strict";!function(){function a(a){return["$rootScope","$window",function(b,c){for(var d,e,f,g=c[a]||(console.warn("This browser does not support Web Storage!"),{}),h={$default:function(a){for(var b in a)angular.isDefined(h[b])||(h[b]=a[b]);return h},$reset:function(a){for(var b in h)"$"===b[0]||delete h[b];return h.$default(a)}},i=0;i<g.length;i++)(f=g.key(i))&&"ngStorage-"===f.slice(0,10)&&(h[f.slice(10)]=angular.fromJson(g.getItem(f)));return d=angular.copy(h),b.$watch(function(){e||(e=setTimeout(function(){if(e=null,!angular.equals(h,d)){angular.forEach(h,function(a,b){angular.isDefined(a)&&"$"!==b[0]&&g.setItem("ngStorage-"+b,angular.toJson(a)),delete d[b]});for(var a in d)g.removeItem("ngStorage-"+a);d=angular.copy(h)}},100))}),"localStorage"===a&&c.addEventListener&&c.addEventListener("storage",function(a){"ngStorage-"===a.key.slice(0,10)&&(a.newValue?h[a.key.slice(10)]=angular.fromJson(a.newValue):delete h[a.key.slice(10)],d=angular.copy(h),b.$apply())}),h}]}angular.module("ngStorage",[]).factory("$localStorage",a("localStorage")).factory("$sessionStorage",a("sessionStorage"))}();
\ No newline at end of file
+/*! ngstorage 0.3.10 | Copyright (c) 2016 Gias Kay Lee | MIT License */!function(a,b){"use strict";"function"==typeof define&&define.amd?define(["angular"],b):a.hasOwnProperty("angular")?b(a.angular):"object"==typeof exports&&(module.exports=b(require("angular")))}(this,function(a){"use strict";function b(a,b){var c;try{c=a[b]}catch(d){c=!1}if(c){var e="__"+Math.round(1e7*Math.random());try{a[b].setItem(e,e),a[b].removeItem(e,e)}catch(d){c=!1}}return c}function c(c){var d=b(window,c);return function(){var e="ngStorage-";this.setKeyPrefix=function(a){if("string"!=typeof a)throw new TypeError("[ngStorage] - "+c+"Provider.setKeyPrefix() expects a String.");e=a};var f=a.toJson,g=a.fromJson;this.setSerializer=function(a){if("function"!=typeof a)throw new TypeError("[ngStorage] - "+c+"Provider.setSerializer expects a function.");f=a},this.setDeserializer=function(a){if("function"!=typeof a)throw new TypeError("[ngStorage] - "+c+"Provider.setDeserializer expects a function.");g=a},this.supported=function(){return!!d},this.get=function(a){return d&&g(d.getItem(e+a))},this.set=function(a,b){return d&&d.setItem(e+a,f(b))},this.remove=function(a){d&&d.removeItem(e+a)},this.$get=["$rootScope","$window","$log","$timeout","$document",function(d,h,i,j,k){var l,m,n=e.length,o=b(h,c),p=o||(i.warn("This browser does not support Web Storage!"),{setItem:a.noop,getItem:a.noop,removeItem:a.noop}),q={$default:function(b){for(var c in b)a.isDefined(q[c])||(q[c]=a.copy(b[c]));return q.$sync(),q},$reset:function(a){for(var b in q)"$"===b[0]||delete q[b]&&p.removeItem(e+b);return q.$default(a)},$sync:function(){for(var a,b=0,c=p.length;c>b;b++)(a=p.key(b))&&e===a.slice(0,n)&&(q[a.slice(n)]=g(p.getItem(a)))},$apply:function(){var b;if(m=null,!a.equals(q,l)){b=a.copy(l),a.forEach(q,function(c,d){a.isDefined(c)&&"$"!==d[0]&&(p.setItem(e+d,f(c)),delete b[d])});for(var c in b)p.removeItem(e+c);l=a.copy(q)}},$supported:function(){return!!o}};return q.$sync(),l=a.copy(q),d.$watch(function(){m||(m=j(q.$apply,100,!1))}),h.addEventListener&&h.addEventListener("storage",function(b){if(b.key){var c=k[0];c.hasFocus&&c.hasFocus()||e!==b.key.slice(0,n)||(b.newValue?q[b.key.slice(n)]=g(b.newValue):delete q[b.key.slice(n)],l=a.copy(q),d.$apply())}}),h.addEventListener&&h.addEventListener("beforeunload",function(){q.$apply()}),q}]}}return a=a&&a.module?a:window.angular,a.module("ngStorage",[]).provider("$localStorage",c("localStorage")).provider("$sessionStorage",c("sessionStorage"))});
\ No newline at end of file
diff --git a/setup/pub/angular-sanitize/angular-sanitize.js b/setup/pub/angular-sanitize/angular-sanitize.js
index 6004460cd17eb..8faa84315009f 100644
--- a/setup/pub/angular-sanitize/angular-sanitize.js
+++ b/setup/pub/angular-sanitize/angular-sanitize.js
@@ -1,76 +1,79 @@
 /**
- * @license AngularJS v1.2.14
- * (c) 2010-2014 Google, Inc. http://angularjs.org
+ * @license AngularJS v1.6.9
+ * (c) 2010-2018 Google, Inc. http://angularjs.org
  * License: MIT
  */
-(function(window, angular, undefined) {'use strict';
+(function(window, angular) {'use strict';
+
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+     *     Any commits to this file should be reviewed with security in mind.  *
+     *   Changes to this file can potentially create security vulnerabilities. *
+     *          An approval from 2 Core members with history of modifying      *
+     *                         this file is required.                          *
+     *                                                                         *
+     *  Does the change somehow allow for arbitrary javascript to be executed? *
+     *    Or allows for someone to change the prototype of built-in objects?   *
+     *     Or gives undesired access to variables likes document or window?    *
+     * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
     var $sanitizeMinErr = angular.$$minErr('$sanitize');
+    var bind;
+    var extend;
+    var forEach;
+    var isDefined;
+    var lowercase;
+    var noop;
+    var nodeContains;
+    var htmlParser;
+    var htmlSanitizeWriter;
 
     /**
      * @ngdoc module
      * @name ngSanitize
      * @description
      *
-     * # ngSanitize
-     *
      * The `ngSanitize` module provides functionality to sanitize HTML.
      *
-     *
-     * <div doc-module-components="ngSanitize"></div>
-     *
      * See {@link ngSanitize.$sanitize `$sanitize`} for usage.
      */
 
-    /*
-     * HTML Parser By Misko Hevery (misko@hevery.com)
-     * based on:  HTML Parser By John Resig (ejohn.org)
-     * Original code by Erik Arvidsson, Mozilla Public License
-     * http://erik.eae.net/simplehtmlparser/simplehtmlparser.js
-     *
-     * // Use like so:
-     * htmlParser(htmlString, {
-     *     start: function(tag, attrs, unary) {},
-     *     end: function(tag) {},
-     *     chars: function(text) {},
-     *     comment: function(text) {}
-     * });
-     *
-     */
-
-
     /**
      * @ngdoc service
      * @name $sanitize
-     * @function
+     * @kind function
      *
      * @description
-     *   The input is sanitized by parsing the html into tokens. All safe tokens (from a whitelist) are
+     *   Sanitizes an html string by stripping all potentially dangerous tokens.
+     *
+     *   The input is sanitized by parsing the HTML into tokens. All safe tokens (from a whitelist) are
      *   then serialized back to properly escaped html string. This means that no unsafe input can make
-     *   it into the returned string, however, since our parser is more strict than a typical browser
-     *   parser, it's possible that some obscure input, which would be recognized as valid HTML by a
-     *   browser, won't make it through the sanitizer.
-     *   The whitelist is configured using the functions `aHrefSanitizationWhitelist` and
-     *   `imgSrcSanitizationWhitelist` of {@link ng.$compileProvider `$compileProvider`}.
+     *   it into the returned string.
      *
-     * @param {string} html Html input.
-     * @returns {string} Sanitized html.
+     *   The whitelist for URL sanitization of attribute values is configured using the functions
+     *   `aHrefSanitizationWhitelist` and `imgSrcSanitizationWhitelist` of {@link ng.$compileProvider
+ *   `$compileProvider`}.
+     *
+     *   The input may also contain SVG markup if this is enabled via {@link $sanitizeProvider}.
+     *
+     * @param {string} html HTML input.
+     * @returns {string} Sanitized HTML.
      *
      * @example
-     <example module="ngSanitize" deps="angular-sanitize.js">
+     <example module="sanitizeExample" deps="angular-sanitize.js" name="sanitize-service">
      <file name="index.html">
      <script>
-     function Ctrl($scope, $sce) {
-         $scope.snippet =
-           '<p style="color:blue">an html\n' +
-           '<em onmouseover="this.textContent=\'PWN3D!\'">click here</em>\n' +
-           'snippet</p>';
-         $scope.deliberatelyTrustDangerousSnippet = function() {
-           return $sce.trustAsHtml($scope.snippet);
-         };
-       }
+     angular.module('sanitizeExample', ['ngSanitize'])
+     .controller('ExampleController', ['$scope', '$sce', function($scope, $sce) {
+             $scope.snippet =
+               '<p style="color:blue">an html\n' +
+               '<em onmouseover="this.textContent=\'PWN3D!\'">click here</em>\n' +
+               'snippet</p>';
+             $scope.deliberatelyTrustDangerousSnippet = function() {
+               return $sce.trustAsHtml($scope.snippet);
+             };
+           }]);
      </script>
-     <div ng-controller="Ctrl">
+     <div ng-controller="ExampleController">
      Snippet: <textarea ng-model="snippet" cols="60" rows="3"></textarea>
      <table>
      <tr>
@@ -105,410 +108,538 @@
      </file>
      <file name="protractor.js" type="protractor">
      it('should sanitize the html snippet by default', function() {
-       expect(element(by.css('#bind-html-with-sanitize div')).getInnerHtml()).
+       expect(element(by.css('#bind-html-with-sanitize div')).getAttribute('innerHTML')).
          toBe('<p>an html\n<em>click here</em>\nsnippet</p>');
      });
+
      it('should inline raw snippet if bound to a trusted value', function() {
-       expect(element(by.css('#bind-html-with-trust div')).getInnerHtml()).
+       expect(element(by.css('#bind-html-with-trust div')).getAttribute('innerHTML')).
          toBe("<p style=\"color:blue\">an html\n" +
               "<em onmouseover=\"this.textContent='PWN3D!'\">click here</em>\n" +
               "snippet</p>");
      });
+
      it('should escape snippet without any filter', function() {
-       expect(element(by.css('#bind-default div')).getInnerHtml()).
+       expect(element(by.css('#bind-default div')).getAttribute('innerHTML')).
          toBe("&lt;p style=\"color:blue\"&gt;an html\n" +
               "&lt;em onmouseover=\"this.textContent='PWN3D!'\"&gt;click here&lt;/em&gt;\n" +
               "snippet&lt;/p&gt;");
      });
+
      it('should update', function() {
        element(by.model('snippet')).clear();
        element(by.model('snippet')).sendKeys('new <b onclick="alert(1)">text</b>');
-       expect(element(by.css('#bind-html-with-sanitize div')).getInnerHtml()).
+       expect(element(by.css('#bind-html-with-sanitize div')).getAttribute('innerHTML')).
          toBe('new <b>text</b>');
-       expect(element(by.css('#bind-html-with-trust div')).getInnerHtml()).toBe(
+       expect(element(by.css('#bind-html-with-trust div')).getAttribute('innerHTML')).toBe(
          'new <b onclick="alert(1)">text</b>');
-       expect(element(by.css('#bind-default div')).getInnerHtml()).toBe(
+       expect(element(by.css('#bind-default div')).getAttribute('innerHTML')).toBe(
          "new &lt;b onclick=\"alert(1)\"&gt;text&lt;/b&gt;");
      });
      </file>
      </example>
      */
+
+
+    /**
+     * @ngdoc provider
+     * @name $sanitizeProvider
+     * @this
+     *
+     * @description
+     * Creates and configures {@link $sanitize} instance.
+     */
     function $SanitizeProvider() {
+        var svgEnabled = false;
+
         this.$get = ['$$sanitizeUri', function($$sanitizeUri) {
+            if (svgEnabled) {
+                extend(validElements, svgElements);
+            }
             return function(html) {
                 var buf = [];
                 htmlParser(html, htmlSanitizeWriter(buf, function(uri, isImage) {
-                    return !/^unsafe/.test($$sanitizeUri(uri, isImage));
+                    return !/^unsafe:/.test($$sanitizeUri(uri, isImage));
                 }));
                 return buf.join('');
             };
         }];
-    }
 
-    function sanitizeText(chars) {
-        var buf = [];
-        var writer = htmlSanitizeWriter(buf, angular.noop);
-        writer.chars(chars);
-        return buf.join('');
-    }
-
-
-// Regular Expressions for parsing tags and attributes
-    var START_TAG_REGEXP =
-            /^<\s*([\w:-]+)((?:\s+[\w:-]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)\s*>/,
-        END_TAG_REGEXP = /^<\s*\/\s*([\w:-]+)[^>]*>/,
-        ATTR_REGEXP = /([\w:-]+)(?:\s*=\s*(?:(?:"((?:[^"])*)")|(?:'((?:[^'])*)')|([^>\s]+)))?/g,
-        BEGIN_TAG_REGEXP = /^</,
-        BEGIN_END_TAGE_REGEXP = /^<\s*\//,
-        COMMENT_REGEXP = /<!--(.*?)-->/g,
-        DOCTYPE_REGEXP = /<!DOCTYPE([^>]*?)>/i,
-        CDATA_REGEXP = /<!\[CDATA\[(.*?)]]>/g,
-        // Match everything outside of normal chars and " (quote character)
-        NON_ALPHANUMERIC_REGEXP = /([^\#-~| |!])/g;
-
-
-// Good source of info about elements and attributes
-// http://dev.w3.org/html5/spec/Overview.html#semantics
-// http://simon.html5.org/html-elements
-
-// Safe Void Elements - HTML5
-// http://dev.w3.org/html5/spec/Overview.html#void-elements
-    var voidElements = makeMap("area,br,col,hr,img,wbr");
-
-// Elements that you can, intentionally, leave open (and which close themselves)
-// http://dev.w3.org/html5/spec/Overview.html#optional-tags
-    var optionalEndTagBlockElements = makeMap("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr"),
-        optionalEndTagInlineElements = makeMap("rp,rt"),
-        optionalEndTagElements = angular.extend({},
-            optionalEndTagInlineElements,
-            optionalEndTagBlockElements);
-
-// Safe Block Elements - HTML5
-    var blockElements = angular.extend({}, optionalEndTagBlockElements, makeMap("address,article," +
-        "aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5," +
-        "h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,script,section,table,ul"));
-
-// Inline Elements - HTML5
-    var inlineElements = angular.extend({}, optionalEndTagInlineElements, makeMap("a,abbr,acronym,b," +
-        "bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s," +
-        "samp,small,span,strike,strong,sub,sup,time,tt,u,var"));
-
-
-// Special Elements (can contain anything)
-    var specialElements = makeMap("script,style");
-
-    var validElements = angular.extend({},
-        voidElements,
-        blockElements,
-        inlineElements,
-        optionalEndTagElements);
-
-//Attributes that have href and hence need to be sanitized
-    var uriAttrs = makeMap("background,cite,href,longdesc,src,usemap");
-    var validAttrs = angular.extend({}, uriAttrs, makeMap(
-        'abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,'+
-        'color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,'+
-        'ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,'+
-        'scope,scrolling,shape,size,span,start,summary,target,title,type,'+
-        'valign,value,vspace,width'));
-
-    function makeMap(str) {
-        var obj = {}, items = str.split(','), i;
-        for (i = 0; i < items.length; i++) obj[items[i]] = true;
-        return obj;
-    }
 
+        /**
+         * @ngdoc method
+         * @name $sanitizeProvider#enableSvg
+         * @kind function
+         *
+         * @description
+         * Enables a subset of svg to be supported by the sanitizer.
+         *
+         * <div class="alert alert-warning">
+         *   <p>By enabling this setting without taking other precautions, you might expose your
+         *   application to click-hijacking attacks. In these attacks, sanitized svg elements could be positioned
+         *   outside of the containing element and be rendered over other elements on the page (e.g. a login
+         *   link). Such behavior can then result in phishing incidents.</p>
+         *
+         *   <p>To protect against these, explicitly setup `overflow: hidden` css rule for all potential svg
+         *   tags within the sanitized content:</p>
+         *
+         *   <br>
+         *
+         *   <pre><code>
+         *   .rootOfTheIncludedContent svg {
+         *     overflow: hidden !important;
+         *   }
+         *   </code></pre>
+         * </div>
+         *
+         * @param {boolean=} flag Enable or disable SVG support in the sanitizer.
+         * @returns {boolean|ng.$sanitizeProvider} Returns the currently configured value if called
+         *    without an argument or self for chaining otherwise.
+         */
+        this.enableSvg = function(enableSvg) {
+            if (isDefined(enableSvg)) {
+                svgEnabled = enableSvg;
+                return this;
+            } else {
+                return svgEnabled;
+            }
+        };
 
-    /**
-     * @example
-     * htmlParser(htmlString, {
- *     start: function(tag, attrs, unary) {},
- *     end: function(tag) {},
- *     chars: function(text) {},
- *     comment: function(text) {}
- * });
-     *
-     * @param {string} html string
-     * @param {object} handler
-     */
-    function htmlParser( html, handler ) {
-        var index, chars, match, stack = [], last = html;
-        stack.last = function() { return stack[ stack.length - 1 ]; };
-
-        while ( html ) {
-            chars = true;
+        //////////////////////////////////////////////////////////////////////////////////////////////////
+        // Private stuff
+        //////////////////////////////////////////////////////////////////////////////////////////////////
 
-            // Make sure we're not in a script or style element
-            if ( !stack.last() || !specialElements[ stack.last() ] ) {
+        bind = angular.bind;
+        extend = angular.extend;
+        forEach = angular.forEach;
+        isDefined = angular.isDefined;
+        lowercase = angular.lowercase;
+        noop = angular.noop;
 
-                // Comment
-                if ( html.indexOf("<!--") === 0 ) {
-                    // comments containing -- are not allowed unless they terminate the comment
-                    index = html.indexOf("--", 4);
+        htmlParser = htmlParserImpl;
+        htmlSanitizeWriter = htmlSanitizeWriterImpl;
 
-                    if ( index >= 0 && html.lastIndexOf("-->", index) === index) {
-                        if (handler.comment) handler.comment( html.substring( 4, index ) );
-                        html = html.substring( index + 3 );
-                        chars = false;
-                    }
-                    // DOCTYPE
-                } else if ( DOCTYPE_REGEXP.test(html) ) {
-                    match = html.match( DOCTYPE_REGEXP );
+        nodeContains = window.Node.prototype.contains || /** @this */ function(arg) {
+            // eslint-disable-next-line no-bitwise
+            return !!(this.compareDocumentPosition(arg) & 16);
+        };
 
-                    if ( match ) {
-                        html = html.replace( match[0] , '');
-                        chars = false;
-                    }
-                    // end tag
-                } else if ( BEGIN_END_TAGE_REGEXP.test(html) ) {
-                    match = html.match( END_TAG_REGEXP );
-
-                    if ( match ) {
-                        html = html.substring( match[0].length );
-                        match[0].replace( END_TAG_REGEXP, parseEndTag );
-                        chars = false;
-                    }
+        // Regular Expressions for parsing tags and attributes
+        var SURROGATE_PAIR_REGEXP = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g,
+            // Match everything outside of normal chars and " (quote character)
+            NON_ALPHANUMERIC_REGEXP = /([^#-~ |!])/g;
+
+
+        // Good source of info about elements and attributes
+        // http://dev.w3.org/html5/spec/Overview.html#semantics
+        // http://simon.html5.org/html-elements
+
+        // Safe Void Elements - HTML5
+        // http://dev.w3.org/html5/spec/Overview.html#void-elements
+        var voidElements = toMap('area,br,col,hr,img,wbr');
+
+        // Elements that you can, intentionally, leave open (and which close themselves)
+        // http://dev.w3.org/html5/spec/Overview.html#optional-tags
+        var optionalEndTagBlockElements = toMap('colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr'),
+            optionalEndTagInlineElements = toMap('rp,rt'),
+            optionalEndTagElements = extend({},
+                optionalEndTagInlineElements,
+                optionalEndTagBlockElements);
+
+        // Safe Block Elements - HTML5
+        var blockElements = extend({}, optionalEndTagBlockElements, toMap('address,article,' +
+            'aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5,' +
+            'h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,section,table,ul'));
+
+        // Inline Elements - HTML5
+        var inlineElements = extend({}, optionalEndTagInlineElements, toMap('a,abbr,acronym,b,' +
+            'bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s,' +
+            'samp,small,span,strike,strong,sub,sup,time,tt,u,var'));
+
+        // SVG Elements
+        // https://wiki.whatwg.org/wiki/Sanitization_rules#svg_Elements
+        // Note: the elements animate,animateColor,animateMotion,animateTransform,set are intentionally omitted.
+        // They can potentially allow for arbitrary javascript to be executed. See #11290
+        var svgElements = toMap('circle,defs,desc,ellipse,font-face,font-face-name,font-face-src,g,glyph,' +
+            'hkern,image,linearGradient,line,marker,metadata,missing-glyph,mpath,path,polygon,polyline,' +
+            'radialGradient,rect,stop,svg,switch,text,title,tspan');
+
+        // Blocked Elements (will be stripped)
+        var blockedElements = toMap('script,style');
+
+        var validElements = extend({},
+            voidElements,
+            blockElements,
+            inlineElements,
+            optionalEndTagElements);
+
+        //Attributes that have href and hence need to be sanitized
+        var uriAttrs = toMap('background,cite,href,longdesc,src,xlink:href,xml:base');
+
+        var htmlAttrs = toMap('abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,' +
+            'color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,' +
+            'ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,' +
+            'scope,scrolling,shape,size,span,start,summary,tabindex,target,title,type,' +
+            'valign,value,vspace,width');
+
+        // SVG attributes (without "id" and "name" attributes)
+        // https://wiki.whatwg.org/wiki/Sanitization_rules#svg_Attributes
+        var svgAttrs = toMap('accent-height,accumulate,additive,alphabetic,arabic-form,ascent,' +
+            'baseProfile,bbox,begin,by,calcMode,cap-height,class,color,color-rendering,content,' +
+            'cx,cy,d,dx,dy,descent,display,dur,end,fill,fill-rule,font-family,font-size,font-stretch,' +
+            'font-style,font-variant,font-weight,from,fx,fy,g1,g2,glyph-name,gradientUnits,hanging,' +
+            'height,horiz-adv-x,horiz-origin-x,ideographic,k,keyPoints,keySplines,keyTimes,lang,' +
+            'marker-end,marker-mid,marker-start,markerHeight,markerUnits,markerWidth,mathematical,' +
+            'max,min,offset,opacity,orient,origin,overline-position,overline-thickness,panose-1,' +
+            'path,pathLength,points,preserveAspectRatio,r,refX,refY,repeatCount,repeatDur,' +
+            'requiredExtensions,requiredFeatures,restart,rotate,rx,ry,slope,stemh,stemv,stop-color,' +
+            'stop-opacity,strikethrough-position,strikethrough-thickness,stroke,stroke-dasharray,' +
+            'stroke-dashoffset,stroke-linecap,stroke-linejoin,stroke-miterlimit,stroke-opacity,' +
+            'stroke-width,systemLanguage,target,text-anchor,to,transform,type,u1,u2,underline-position,' +
+            'underline-thickness,unicode,unicode-range,units-per-em,values,version,viewBox,visibility,' +
+            'width,widths,x,x-height,x1,x2,xlink:actuate,xlink:arcrole,xlink:role,xlink:show,xlink:title,' +
+            'xlink:type,xml:base,xml:lang,xml:space,xmlns,xmlns:xlink,y,y1,y2,zoomAndPan', true);
+
+        var validAttrs = extend({},
+            uriAttrs,
+            svgAttrs,
+            htmlAttrs);
+
+        function toMap(str, lowercaseKeys) {
+            var obj = {}, items = str.split(','), i;
+            for (i = 0; i < items.length; i++) {
+                obj[lowercaseKeys ? lowercase(items[i]) : items[i]] = true;
+            }
+            return obj;
+        }
 
-                    // start tag
-                } else if ( BEGIN_TAG_REGEXP.test(html) ) {
-                    match = html.match( START_TAG_REGEXP );
+        /**
+         * Create an inert document that contains the dirty HTML that needs sanitizing
+         * Depending upon browser support we use one of three strategies for doing this.
+         * Support: Safari 10.x -> XHR strategy
+         * Support: Firefox -> DomParser strategy
+         */
+        var getInertBodyElement /* function(html: string): HTMLBodyElement */ = (function(window, document) {
+            var inertDocument;
+            if (document && document.implementation) {
+                inertDocument = document.implementation.createHTMLDocument('inert');
+            } else {
+                throw $sanitizeMinErr('noinert', 'Can\'t create an inert html document');
+            }
+            var inertBodyElement = (inertDocument.documentElement || inertDocument.getDocumentElement()).querySelector('body');
 
-                    if ( match ) {
-                        html = html.substring( match[0].length );
-                        match[0].replace( START_TAG_REGEXP, parseStartTag );
-                        chars = false;
-                    }
+            // Check for the Safari 10.1 bug - which allows JS to run inside the SVG G element
+            inertBodyElement.innerHTML = '<svg><g onload="this.parentNode.remove()"></g></svg>';
+            if (!inertBodyElement.querySelector('svg')) {
+                return getInertBodyElement_XHR;
+            } else {
+                // Check for the Firefox bug - which prevents the inner img JS from being sanitized
+                inertBodyElement.innerHTML = '<svg><p><style><img src="</style><img src=x onerror=alert(1)//">';
+                if (inertBodyElement.querySelector('svg img')) {
+                    return getInertBodyElement_DOMParser;
+                } else {
+                    return getInertBodyElement_InertDocument;
                 }
+            }
 
-                if ( chars ) {
-                    index = html.indexOf("<");
-
-                    var text = index < 0 ? html : html.substring( 0, index );
-                    html = index < 0 ? "" : html.substring( index );
-
-                    if (handler.chars) handler.chars( decodeEntities(text) );
+            function getInertBodyElement_XHR(html) {
+                // We add this dummy element to ensure that the rest of the content is parsed as expected
+                // e.g. leading whitespace is maintained and tags like `<meta>` do not get hoisted to the `<head>` tag.
+                html = '<remove></remove>' + html;
+                try {
+                    html = encodeURI(html);
+                } catch (e) {
+                    return undefined;
                 }
+                var xhr = new window.XMLHttpRequest();
+                xhr.responseType = 'document';
+                xhr.open('GET', 'data:text/html;charset=utf-8,' + html, false);
+                xhr.send(null);
+                var body = xhr.response.body;
+                body.firstChild.remove();
+                return body;
+            }
 
-            } else {
-                html = html.replace(new RegExp("(.*)<\\s*\\/\\s*" + stack.last() + "[^>]*>", 'i'),
-                    function(all, text){
-                        text = text.replace(COMMENT_REGEXP, "$1").replace(CDATA_REGEXP, "$1");
+            function getInertBodyElement_DOMParser(html) {
+                // We add this dummy element to ensure that the rest of the content is parsed as expected
+                // e.g. leading whitespace is maintained and tags like `<meta>` do not get hoisted to the `<head>` tag.
+                html = '<remove></remove>' + html;
+                try {
+                    var body = new window.DOMParser().parseFromString(html, 'text/html').body;
+                    body.firstChild.remove();
+                    return body;
+                } catch (e) {
+                    return undefined;
+                }
+            }
 
-                        if (handler.chars) handler.chars( decodeEntities(text) );
+            function getInertBodyElement_InertDocument(html) {
+                inertBodyElement.innerHTML = html;
 
-                        return "";
-                    });
+                // Support: IE 9-11 only
+                // strip custom-namespaced attributes on IE<=11
+                if (document.documentMode) {
+                    stripCustomNsAttrs(inertBodyElement);
+                }
 
-                parseEndTag( "", stack.last() );
+                return inertBodyElement;
             }
-
-            if ( html == last ) {
-                throw $sanitizeMinErr('badparse', "The sanitizer was unable to parse the following block " +
-                    "of html: {0}", html);
+        })(window, window.document);
+
+        /**
+         * @example
+         * htmlParser(htmlString, {
+         *     start: function(tag, attrs) {},
+         *     end: function(tag) {},
+         *     chars: function(text) {},
+         *     comment: function(text) {}
+         * });
+         *
+         * @param {string} html string
+         * @param {object} handler
+         */
+        function htmlParserImpl(html, handler) {
+            if (html === null || html === undefined) {
+                html = '';
+            } else if (typeof html !== 'string') {
+                html = '' + html;
             }
-            last = html;
-        }
 
-        // Clean up any remaining tags
-        parseEndTag();
+            var inertBodyElement = getInertBodyElement(html);
+            if (!inertBodyElement) return '';
 
-        function parseStartTag( tag, tagName, rest, unary ) {
-            tagName = angular.lowercase(tagName);
-            if ( blockElements[ tagName ] ) {
-                while ( stack.last() && inlineElements[ stack.last() ] ) {
-                    parseEndTag( "", stack.last() );
+            //mXSS protection
+            var mXSSAttempts = 5;
+            do {
+                if (mXSSAttempts === 0) {
+                    throw $sanitizeMinErr('uinput', 'Failed to sanitize html because the input is unstable');
+                }
+                mXSSAttempts--;
+
+                // trigger mXSS if it is going to happen by reading and writing the innerHTML
+                html = inertBodyElement.innerHTML;
+                inertBodyElement = getInertBodyElement(html);
+            } while (html !== inertBodyElement.innerHTML);
+
+            var node = inertBodyElement.firstChild;
+            while (node) {
+                switch (node.nodeType) {
+                    case 1: // ELEMENT_NODE
+                        handler.start(node.nodeName.toLowerCase(), attrToMap(node.attributes));
+                        break;
+                    case 3: // TEXT NODE
+                        handler.chars(node.textContent);
+                        break;
                 }
-            }
 
-            if ( optionalEndTagElements[ tagName ] && stack.last() == tagName ) {
-                parseEndTag( "", tagName );
+                var nextNode;
+                if (!(nextNode = node.firstChild)) {
+                    if (node.nodeType === 1) {
+                        handler.end(node.nodeName.toLowerCase());
+                    }
+                    nextNode = getNonDescendant('nextSibling', node);
+                    if (!nextNode) {
+                        while (nextNode == null) {
+                            node = getNonDescendant('parentNode', node);
+                            if (node === inertBodyElement) break;
+                            nextNode = getNonDescendant('nextSibling', node);
+                            if (node.nodeType === 1) {
+                                handler.end(node.nodeName.toLowerCase());
+                            }
+                        }
+                    }
+                }
+                node = nextNode;
             }
 
-            unary = voidElements[ tagName ] || !!unary;
+            while ((node = inertBodyElement.firstChild)) {
+                inertBodyElement.removeChild(node);
+            }
+        }
 
-            if ( !unary )
-                stack.push( tagName );
+        function attrToMap(attrs) {
+            var map = {};
+            for (var i = 0, ii = attrs.length; i < ii; i++) {
+                var attr = attrs[i];
+                map[attr.name] = attr.value;
+            }
+            return map;
+        }
 
-            var attrs = {};
 
-            rest.replace(ATTR_REGEXP,
-                function(match, name, doubleQuotedValue, singleQuotedValue, unquotedValue) {
-                    var value = doubleQuotedValue
-                        || singleQuotedValue
-                        || unquotedValue
-                        || '';
+        /**
+         * Escapes all potentially dangerous characters, so that the
+         * resulting string can be safely inserted into attribute or
+         * element text.
+         * @param value
+         * @returns {string} escaped text
+         */
+        function encodeEntities(value) {
+            return value.
+            replace(/&/g, '&amp;').
+            replace(SURROGATE_PAIR_REGEXP, function(value) {
+                var hi = value.charCodeAt(0);
+                var low = value.charCodeAt(1);
+                return '&#' + (((hi - 0xD800) * 0x400) + (low - 0xDC00) + 0x10000) + ';';
+            }).
+            replace(NON_ALPHANUMERIC_REGEXP, function(value) {
+                return '&#' + value.charCodeAt(0) + ';';
+            }).
+            replace(/</g, '&lt;').
+            replace(/>/g, '&gt;');
+        }
 
-                    attrs[name] = decodeEntities(value);
-                });
-            if (handler.start) handler.start( tagName, attrs, unary );
+        /**
+         * create an HTML/XML writer which writes to buffer
+         * @param {Array} buf use buf.join('') to get out sanitized html string
+         * @returns {object} in the form of {
+         *     start: function(tag, attrs) {},
+         *     end: function(tag) {},
+         *     chars: function(text) {},
+         *     comment: function(text) {}
+         * }
+         */
+        function htmlSanitizeWriterImpl(buf, uriValidator) {
+            var ignoreCurrentElement = false;
+            var out = bind(buf, buf.push);
+            return {
+                start: function(tag, attrs) {
+                    tag = lowercase(tag);
+                    if (!ignoreCurrentElement && blockedElements[tag]) {
+                        ignoreCurrentElement = tag;
+                    }
+                    if (!ignoreCurrentElement && validElements[tag] === true) {
+                        out('<');
+                        out(tag);
+                        forEach(attrs, function(value, key) {
+                            var lkey = lowercase(key);
+                            var isImage = (tag === 'img' && lkey === 'src') || (lkey === 'background');
+                            if (validAttrs[lkey] === true &&
+                                (uriAttrs[lkey] !== true || uriValidator(value, isImage))) {
+                                out(' ');
+                                out(key);
+                                out('="');
+                                out(encodeEntities(value));
+                                out('"');
+                            }
+                        });
+                        out('>');
+                    }
+                },
+                end: function(tag) {
+                    tag = lowercase(tag);
+                    if (!ignoreCurrentElement && validElements[tag] === true && voidElements[tag] !== true) {
+                        out('</');
+                        out(tag);
+                        out('>');
+                    }
+                    // eslint-disable-next-line eqeqeq
+                    if (tag == ignoreCurrentElement) {
+                        ignoreCurrentElement = false;
+                    }
+                },
+                chars: function(chars) {
+                    if (!ignoreCurrentElement) {
+                        out(encodeEntities(chars));
+                    }
+                }
+            };
         }
 
-        function parseEndTag( tag, tagName ) {
-            var pos = 0, i;
-            tagName = angular.lowercase(tagName);
-            if ( tagName )
-            // Find the closest opened tag of the same type
-                for ( pos = stack.length - 1; pos >= 0; pos-- )
-                    if ( stack[ pos ] == tagName )
-                        break;
 
-            if ( pos >= 0 ) {
-                // Close all the open elements, up the stack
-                for ( i = stack.length - 1; i >= pos; i-- )
-                    if (handler.end) handler.end( stack[ i ] );
+        /**
+         * When IE9-11 comes across an unknown namespaced attribute e.g. 'xlink:foo' it adds 'xmlns:ns1' attribute to declare
+         * ns1 namespace and prefixes the attribute with 'ns1' (e.g. 'ns1:xlink:foo'). This is undesirable since we don't want
+         * to allow any of these custom attributes. This method strips them all.
+         *
+         * @param node Root element to process
+         */
+        function stripCustomNsAttrs(node) {
+            while (node) {
+                if (node.nodeType === window.Node.ELEMENT_NODE) {
+                    var attrs = node.attributes;
+                    for (var i = 0, l = attrs.length; i < l; i++) {
+                        var attrNode = attrs[i];
+                        var attrName = attrNode.name.toLowerCase();
+                        if (attrName === 'xmlns:ns1' || attrName.lastIndexOf('ns1:', 0) === 0) {
+                            node.removeAttributeNode(attrNode);
+                            i--;
+                            l--;
+                        }
+                    }
+                }
 
-                // Remove the open elements from the stack
-                stack.length = pos;
+                var nextNode = node.firstChild;
+                if (nextNode) {
+                    stripCustomNsAttrs(nextNode);
+                }
+
+                node = getNonDescendant('nextSibling', node);
             }
         }
-    }
 
-    var hiddenPre=document.createElement("pre");
-    var spaceRe = /^(\s*)([\s\S]*?)(\s*)$/;
-    /**
-     * decodes all entities into regular string
-     * @param value
-     * @returns {string} A string with decoded entities.
-     */
-    function decodeEntities(value) {
-        if (!value) { return ''; }
-
-        // Note: IE8 does not preserve spaces at the start/end of innerHTML
-        // so we must capture them and reattach them afterward
-        var parts = spaceRe.exec(value);
-        var spaceBefore = parts[1];
-        var spaceAfter = parts[3];
-        var content = parts[2];
-        if (content) {
-            hiddenPre.innerHTML=content.replace(/</g,"&lt;");
-            // innerText depends on styling as it doesn't display hidden elements.
-            // Therefore, it's better to use textContent not to cause unnecessary
-            // reflows. However, IE<9 don't support textContent so the innerText
-            // fallback is necessary.
-            content = 'textContent' in hiddenPre ?
-                hiddenPre.textContent : hiddenPre.innerText;
+        function getNonDescendant(propName, node) {
+            // An element is clobbered if its `propName` property points to one of its descendants
+            var nextNode = node[propName];
+            if (nextNode && nodeContains.call(node, nextNode)) {
+                throw $sanitizeMinErr('elclob', 'Failed to sanitize html because the element is clobbered: {0}', node.outerHTML || node.outerText);
+            }
+            return nextNode;
         }
-        return spaceBefore + content + spaceAfter;
-    }
-
-    /**
-     * Escapes all potentially dangerous characters, so that the
-     * resulting string can be safely inserted into attribute or
-     * element text.
-     * @param value
-     * @returns {string} escaped text
-     */
-    function encodeEntities(value) {
-        return value.
-        replace(/&/g, '&amp;').
-        replace(NON_ALPHANUMERIC_REGEXP, function(value){
-            return '&#' + value.charCodeAt(0) + ';';
-        }).
-        replace(/</g, '&lt;').
-        replace(/>/g, '&gt;');
     }
 
-    /**
-     * create an HTML/XML writer which writes to buffer
-     * @param {Array} buf use buf.jain('') to get out sanitized html string
-     * @returns {object} in the form of {
- *     start: function(tag, attrs, unary) {},
- *     end: function(tag) {},
- *     chars: function(text) {},
- *     comment: function(text) {}
- * }
-     */
-    function htmlSanitizeWriter(buf, uriValidator){
-        var ignore = false;
-        var out = angular.bind(buf, buf.push);
-        return {
-            start: function(tag, attrs, unary){
-                tag = angular.lowercase(tag);
-                if (!ignore && specialElements[tag]) {
-                    ignore = tag;
-                }
-                if (!ignore && validElements[tag] === true) {
-                    out('<');
-                    out(tag);
-                    angular.forEach(attrs, function(value, key){
-                        var lkey=angular.lowercase(key);
-                        var isImage = (tag === 'img' && lkey === 'src') || (lkey === 'background');
-                        if (validAttrs[lkey] === true &&
-                            (uriAttrs[lkey] !== true || uriValidator(value, isImage))) {
-                            out(' ');
-                            out(key);
-                            out('="');
-                            out(encodeEntities(value));
-                            out('"');
-                        }
-                    });
-                    out(unary ? '/>' : '>');
-                }
-            },
-            end: function(tag){
-                tag = angular.lowercase(tag);
-                if (!ignore && validElements[tag] === true) {
-                    out('</');
-                    out(tag);
-                    out('>');
-                }
-                if (tag == ignore) {
-                    ignore = false;
-                }
-            },
-            chars: function(chars){
-                if (!ignore) {
-                    out(encodeEntities(chars));
-                }
-            }
-        };
+    function sanitizeText(chars) {
+        var buf = [];
+        var writer = htmlSanitizeWriter(buf, noop);
+        writer.chars(chars);
+        return buf.join('');
     }
 
 
 // define ngSanitize module and register $sanitize service
-    angular.module('ngSanitize', []).provider('$sanitize', $SanitizeProvider);
-
-    /* global sanitizeText: false */
+    angular.module('ngSanitize', [])
+        .provider('$sanitize', $SanitizeProvider)
+        .info({ angularVersion: '1.6.9' });
 
     /**
      * @ngdoc filter
      * @name linky
-     * @function
+     * @kind function
      *
      * @description
-     * Finds links in text input and turns them into html links. Supports http/https/ftp/mailto and
+     * Finds links in text input and turns them into html links. Supports `http/https/ftp/sftp/mailto` and
      * plain email address links.
      *
      * Requires the {@link ngSanitize `ngSanitize`} module to be installed.
      *
      * @param {string} text Input text.
-     * @param {string} target Window (_blank|_self|_parent|_top) or named frame to open links in.
-     * @returns {string} Html-linkified text.
+     * @param {string} [target] Window (`_blank|_self|_parent|_top`) or named frame to open links in.
+     * @param {object|function(url)} [attributes] Add custom attributes to the link element.
+     *
+     *    Can be one of:
+     *
+     *    - `object`: A map of attributes
+     *    - `function`: Takes the url as a parameter and returns a map of attributes
+     *
+     *    If the map of attributes contains a value for `target`, it overrides the value of
+     *    the target parameter.
+     *
+     *
+     * @returns {string} Html-linkified and {@link $sanitize sanitized} text.
      *
      * @usage
      <span ng-bind-html="linky_expression | linky"></span>
      *
      * @example
-     <example module="ngSanitize" deps="angular-sanitize.js">
+     <example module="linkyExample" deps="angular-sanitize.js" name="linky-filter">
      <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-           $scope.snippet =
-             'Pretty text with some links:\n'+
-             'http://angularjs.org/,\n'+
-             'mailto:us@somewhere.org,\n'+
-             'another@somewhere.org,\n'+
-             'and one more: ftp://127.0.0.1/.';
-           $scope.snippetWithTarget = 'http://angularjs.org/';
-         }
-     </script>
-     <div ng-controller="Ctrl">
+     <div ng-controller="ExampleController">
      Snippet: <textarea ng-model="snippet" cols="60" rows="3"></textarea>
      <table>
      <tr>
-     <td>Filter</td>
-     <td>Source</td>
-     <td>Rendered</td>
+     <th>Filter</th>
+     <th>Source</th>
+     <th>Rendered</th>
      </tr>
      <tr id="linky-filter">
      <td>linky filter</td>
@@ -522,10 +653,19 @@
      <tr id="linky-target">
      <td>linky target</td>
      <td>
-     <pre>&lt;div ng-bind-html="snippetWithTarget | linky:'_blank'"&gt;<br>&lt;/div&gt;</pre>
+     <pre>&lt;div ng-bind-html="snippetWithSingleURL | linky:'_blank'"&gt;<br>&lt;/div&gt;</pre>
      </td>
      <td>
-     <div ng-bind-html="snippetWithTarget | linky:'_blank'"></div>
+     <div ng-bind-html="snippetWithSingleURL | linky:'_blank'"></div>
+     </td>
+     </tr>
+     <tr id="linky-custom-attributes">
+     <td>linky custom attributes</td>
+     <td>
+     <pre>&lt;div ng-bind-html="snippetWithSingleURL | linky:'_self':{rel: 'nofollow'}"&gt;<br>&lt;/div&gt;</pre>
+     </td>
+     <td>
+     <div ng-bind-html="snippetWithSingleURL | linky:'_self':{rel: 'nofollow'}"></div>
      </td>
      </tr>
      <tr id="escaped-html">
@@ -535,6 +675,18 @@
      </tr>
      </table>
      </file>
+     <file name="script.js">
+     angular.module('linkyExample', ['ngSanitize'])
+     .controller('ExampleController', ['$scope', function($scope) {
+           $scope.snippet =
+             'Pretty text with some links:\n' +
+             'http://angularjs.org/,\n' +
+             'mailto:us@somewhere.org,\n' +
+             'another@somewhere.org,\n' +
+             'and one more: ftp://127.0.0.1/.';
+           $scope.snippetWithSingleURL = 'http://angularjs.org/';
+         }]);
+     </file>
      <file name="protractor.js" type="protractor">
      it('should linkify the snippet with urls', function() {
          expect(element(by.id('linky-filter')).element(by.binding('snippet | linky')).getText()).
@@ -542,12 +694,14 @@
                   'another@somewhere.org, and one more: ftp://127.0.0.1/.');
          expect(element.all(by.css('#linky-filter a')).count()).toEqual(4);
        });
+
      it('should not linkify snippet without the linky filter', function() {
          expect(element(by.id('escaped-html')).element(by.binding('snippet')).getText()).
              toBe('Pretty text with some links: http://angularjs.org/, mailto:us@somewhere.org, ' +
                   'another@somewhere.org, and one more: ftp://127.0.0.1/.');
          expect(element.all(by.css('#escaped-html a')).count()).toEqual(0);
        });
+
      it('should update', function() {
          element(by.model('snippet')).clear();
          element(by.model('snippet')).sendKeys('new http://link.');
@@ -557,22 +711,43 @@
          expect(element(by.id('escaped-html')).element(by.binding('snippet')).getText())
              .toBe('new http://link.');
        });
+
      it('should work with the target property', function() {
         expect(element(by.id('linky-target')).
-            element(by.binding("snippetWithTarget | linky:'_blank'")).getText()).
+            element(by.binding("snippetWithSingleURL | linky:'_blank'")).getText()).
             toBe('http://angularjs.org/');
         expect(element(by.css('#linky-target a')).getAttribute('target')).toEqual('_blank');
        });
+
+     it('should optionally add custom attributes', function() {
+        expect(element(by.id('linky-custom-attributes')).
+            element(by.binding("snippetWithSingleURL | linky:'_self':{rel: 'nofollow'}")).getText()).
+            toBe('http://angularjs.org/');
+        expect(element(by.css('#linky-custom-attributes a')).getAttribute('rel')).toEqual('nofollow');
+       });
      </file>
      </example>
      */
     angular.module('ngSanitize').filter('linky', ['$sanitize', function($sanitize) {
         var LINKY_URL_REGEXP =
-                /((ftp|https?):\/\/|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>]/,
-            MAILTO_REGEXP = /^mailto:/;
+                /((s?ftp|https?):\/\/|(www\.)|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"\u201d\u2019]/i,
+            MAILTO_REGEXP = /^mailto:/i;
+
+        var linkyMinErr = angular.$$minErr('linky');
+        var isDefined = angular.isDefined;
+        var isFunction = angular.isFunction;
+        var isObject = angular.isObject;
+        var isString = angular.isString;
+
+        return function(text, target, attributes) {
+            if (text == null || text === '') return text;
+            if (!isString(text)) throw linkyMinErr('notstring', 'Expected string but received: {0}', text);
+
+            var attributesFn =
+                isFunction(attributes) ? attributes :
+                    isObject(attributes) ? function getAttributesObject() {return attributes;} :
+                        function getEmptyAttributesObject() {return {};};
 
-        return function(text, target) {
-            if (!text) return text;
             var match;
             var raw = text;
             var html = [];
@@ -581,8 +756,10 @@
             while ((match = raw.match(LINKY_URL_REGEXP))) {
                 // We can not end in these as they are sometimes found at the end of the sentence
                 url = match[0];
-                // if we did not match ftp/http/mailto then assume mailto
-                if (match[2] == match[3]) url = 'mailto:' + url;
+                // if we did not match ftp/http/www/mailto then assume mailto
+                if (!match[2] && !match[4]) {
+                    url = (match[3] ? 'http://' : 'mailto:') + url;
+                }
                 i = match.index;
                 addText(raw.substr(0, i));
                 addLink(url, match[0].replace(MAILTO_REGEXP, ''));
@@ -599,15 +776,21 @@
             }
 
             function addLink(url, text) {
+                var key, linkAttributes = attributesFn(url);
                 html.push('<a ');
-                if (angular.isDefined(target)) {
-                    html.push('target="');
-                    html.push(target);
-                    html.push('" ');
+
+                for (key in linkAttributes) {
+                    html.push(key + '="' + linkAttributes[key] + '" ');
+                }
+
+                if (isDefined(target) && !('target' in linkAttributes)) {
+                    html.push('target="',
+                        target,
+                        '" ');
                 }
-                html.push('href="');
-                html.push(url);
-                html.push('">');
+                html.push('href="',
+                    url.replace(/"/g, '&quot;'),
+                    '">');
                 addText(text);
                 html.push('</a>');
             }
diff --git a/setup/pub/angular-sanitize/angular-sanitize.min.js b/setup/pub/angular-sanitize/angular-sanitize.min.js
index 4fc586065be2f..991dd00987a8c 100644
--- a/setup/pub/angular-sanitize/angular-sanitize.min.js
+++ b/setup/pub/angular-sanitize/angular-sanitize.min.js
@@ -1,14 +1,17 @@
 /*
- AngularJS v1.2.14
- (c) 2010-2014 Google, Inc. http://angularjs.org
+ AngularJS v1.6.9
+ (c) 2010-2018 Google, Inc. http://angularjs.org
  License: MIT
- */
-(function(p,h,q){'use strict';function E(a){var e=[];s(e,h.noop).chars(a);return e.join("")}function k(a){var e={};a=a.split(",");var d;for(d=0;d<a.length;d++)e[a[d]]=!0;return e}function F(a,e){function d(a,b,d,g){b=h.lowercase(b);if(t[b])for(;f.last()&&u[f.last()];)c("",f.last());v[b]&&f.last()==b&&c("",b);(g=w[b]||!!g)||f.push(b);var l={};d.replace(G,function(a,b,e,c,d){l[b]=r(e||c||d||"")});e.start&&e.start(b,l,g)}function c(a,b){var c=0,d;if(b=h.lowercase(b))for(c=f.length-1;0<=c&&f[c]!=b;c--);
-    if(0<=c){for(d=f.length-1;d>=c;d--)e.end&&e.end(f[d]);f.length=c}}var b,g,f=[],l=a;for(f.last=function(){return f[f.length-1]};a;){g=!0;if(f.last()&&x[f.last()])a=a.replace(RegExp("(.*)<\\s*\\/\\s*"+f.last()+"[^>]*>","i"),function(b,a){a=a.replace(H,"$1").replace(I,"$1");e.chars&&e.chars(r(a));return""}),c("",f.last());else{if(0===a.indexOf("\x3c!--"))b=a.indexOf("--",4),0<=b&&a.lastIndexOf("--\x3e",b)===b&&(e.comment&&e.comment(a.substring(4,b)),a=a.substring(b+3),g=!1);else if(y.test(a)){if(b=a.match(y))a=
-    a.replace(b[0],""),g=!1}else if(J.test(a)){if(b=a.match(z))a=a.substring(b[0].length),b[0].replace(z,c),g=!1}else K.test(a)&&(b=a.match(A))&&(a=a.substring(b[0].length),b[0].replace(A,d),g=!1);g&&(b=a.indexOf("<"),g=0>b?a:a.substring(0,b),a=0>b?"":a.substring(b),e.chars&&e.chars(r(g)))}if(a==l)throw L("badparse",a);l=a}c()}function r(a){if(!a)return"";var e=M.exec(a);a=e[1];var d=e[3];if(e=e[2])n.innerHTML=e.replace(/</g,"&lt;"),e="textContent"in n?n.textContent:n.innerText;return a+e+d}function B(a){return a.replace(/&/g,
-    "&amp;").replace(N,function(a){return"&#"+a.charCodeAt(0)+";"}).replace(/</g,"&lt;").replace(/>/g,"&gt;")}function s(a,e){var d=!1,c=h.bind(a,a.push);return{start:function(a,g,f){a=h.lowercase(a);!d&&x[a]&&(d=a);d||!0!==C[a]||(c("<"),c(a),h.forEach(g,function(d,f){var g=h.lowercase(f),k="img"===a&&"src"===g||"background"===g;!0!==O[g]||!0===D[g]&&!e(d,k)||(c(" "),c(f),c('="'),c(B(d)),c('"'))}),c(f?"/>":">"))},end:function(a){a=h.lowercase(a);d||!0!==C[a]||(c("</"),c(a),c(">"));a==d&&(d=!1)},chars:function(a){d||
-c(B(a))}}}var L=h.$$minErr("$sanitize"),A=/^<\s*([\w:-]+)((?:\s+[\w:-]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)\s*>/,z=/^<\s*\/\s*([\w:-]+)[^>]*>/,G=/([\w:-]+)(?:\s*=\s*(?:(?:"((?:[^"])*)")|(?:'((?:[^'])*)')|([^>\s]+)))?/g,K=/^</,J=/^<\s*\//,H=/\x3c!--(.*?)--\x3e/g,y=/<!DOCTYPE([^>]*?)>/i,I=/<!\[CDATA\[(.*?)]]\x3e/g,N=/([^\#-~| |!])/g,w=k("area,br,col,hr,img,wbr");p=k("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr");q=k("rp,rt");var v=h.extend({},q,p),t=h.extend({},p,k("address,article,aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5,h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,script,section,table,ul")),
-    u=h.extend({},q,k("a,abbr,acronym,b,bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var")),x=k("script,style"),C=h.extend({},w,t,u,v),D=k("background,cite,href,longdesc,src,usemap"),O=h.extend({},D,k("abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,scope,scrolling,shape,size,span,start,summary,target,title,type,valign,value,vspace,width")),
-    n=document.createElement("pre"),M=/^(\s*)([\s\S]*?)(\s*)$/;h.module("ngSanitize",[]).provider("$sanitize",function(){this.$get=["$$sanitizeUri",function(a){return function(e){var d=[];F(e,s(d,function(c,b){return!/^unsafe/.test(a(c,b))}));return d.join("")}}]});h.module("ngSanitize").filter("linky",["$sanitize",function(a){var e=/((ftp|https?):\/\/|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>]/,d=/^mailto:/;return function(c,b){function g(a){a&&m.push(E(a))}function f(a,c){m.push("<a ");h.isDefined(b)&&
-(m.push('target="'),m.push(b),m.push('" '));m.push('href="');m.push(a);m.push('">');g(c);m.push("</a>")}if(!c)return c;for(var l,k=c,m=[],n,p;l=k.match(e);)n=l[0],l[2]==l[3]&&(n="mailto:"+n),p=l.index,g(k.substr(0,p)),f(n,l[0].replace(d,"")),k=k.substring(p+l[0].length);g(k);return a(m.join(""))}}])})(window,window.angular);
+*/
+(function(s,d){'use strict';function J(d){var k=[];w(k,B).chars(d);return k.join("")}var x=d.$$minErr("$sanitize"),C,k,D,E,p,B,F,G,w;d.module("ngSanitize",[]).provider("$sanitize",function(){function g(a,e){var c={},b=a.split(","),f;for(f=0;f<b.length;f++)c[e?p(b[f]):b[f]]=!0;return c}function K(a){for(var e={},c=0,b=a.length;c<b;c++){var f=a[c];e[f.name]=f.value}return e}function H(a){return a.replace(/&/g,"&amp;").replace(L,function(a){var c=a.charCodeAt(0);a=a.charCodeAt(1);return"&#"+(1024*(c-
+    55296)+(a-56320)+65536)+";"}).replace(M,function(a){return"&#"+a.charCodeAt(0)+";"}).replace(/</g,"&lt;").replace(/>/g,"&gt;")}function I(a){for(;a;){if(a.nodeType===s.Node.ELEMENT_NODE)for(var e=a.attributes,c=0,b=e.length;c<b;c++){var f=e[c],h=f.name.toLowerCase();if("xmlns:ns1"===h||0===h.lastIndexOf("ns1:",0))a.removeAttributeNode(f),c--,b--}(e=a.firstChild)&&I(e);a=t("nextSibling",a)}}function t(a,e){var c=e[a];if(c&&F.call(e,c))throw x("elclob",e.outerHTML||e.outerText);return c}var y=!1;this.$get=
+    ["$$sanitizeUri",function(a){y&&k(n,z);return function(e){var c=[];G(e,w(c,function(b,c){return!/^unsafe:/.test(a(b,c))}));return c.join("")}}];this.enableSvg=function(a){return E(a)?(y=a,this):y};C=d.bind;k=d.extend;D=d.forEach;E=d.isDefined;p=d.lowercase;B=d.noop;G=function(a,e){null===a||void 0===a?a="":"string"!==typeof a&&(a=""+a);var c=u(a);if(!c)return"";var b=5;do{if(0===b)throw x("uinput");b--;a=c.innerHTML;c=u(a)}while(a!==c.innerHTML);for(b=c.firstChild;b;){switch(b.nodeType){case 1:e.start(b.nodeName.toLowerCase(),
+    K(b.attributes));break;case 3:e.chars(b.textContent)}var f;if(!(f=b.firstChild)&&(1===b.nodeType&&e.end(b.nodeName.toLowerCase()),f=t("nextSibling",b),!f))for(;null==f;){b=t("parentNode",b);if(b===c)break;f=t("nextSibling",b);1===b.nodeType&&e.end(b.nodeName.toLowerCase())}b=f}for(;b=c.firstChild;)c.removeChild(b)};w=function(a,e){var c=!1,b=C(a,a.push);return{start:function(a,h){a=p(a);!c&&A[a]&&(c=a);c||!0!==n[a]||(b("<"),b(a),D(h,function(c,h){var d=p(h),g="img"===a&&"src"===d||"background"===
+        d;!0!==v[d]||!0===m[d]&&!e(c,g)||(b(" "),b(h),b('="'),b(H(c)),b('"'))}),b(">"))},end:function(a){a=p(a);c||!0!==n[a]||!0===h[a]||(b("</"),b(a),b(">"));a==c&&(c=!1)},chars:function(a){c||b(H(a))}}};F=s.Node.prototype.contains||function(a){return!!(this.compareDocumentPosition(a)&16)};var L=/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,M=/([^#-~ |!])/g,h=g("area,br,col,hr,img,wbr"),q=g("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr"),l=g("rp,rt"),r=k({},l,q),q=k({},q,g("address,article,aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5,h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,section,table,ul")),
+    l=k({},l,g("a,abbr,acronym,b,bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var")),z=g("circle,defs,desc,ellipse,font-face,font-face-name,font-face-src,g,glyph,hkern,image,linearGradient,line,marker,metadata,missing-glyph,mpath,path,polygon,polyline,radialGradient,rect,stop,svg,switch,text,title,tspan"),A=g("script,style"),n=k({},h,q,l,r),m=g("background,cite,href,longdesc,src,xlink:href,xml:base"),r=g("abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,scope,scrolling,shape,size,span,start,summary,tabindex,target,title,type,valign,value,vspace,width"),
+    l=g("accent-height,accumulate,additive,alphabetic,arabic-form,ascent,baseProfile,bbox,begin,by,calcMode,cap-height,class,color,color-rendering,content,cx,cy,d,dx,dy,descent,display,dur,end,fill,fill-rule,font-family,font-size,font-stretch,font-style,font-variant,font-weight,from,fx,fy,g1,g2,glyph-name,gradientUnits,hanging,height,horiz-adv-x,horiz-origin-x,ideographic,k,keyPoints,keySplines,keyTimes,lang,marker-end,marker-mid,marker-start,markerHeight,markerUnits,markerWidth,mathematical,max,min,offset,opacity,orient,origin,overline-position,overline-thickness,panose-1,path,pathLength,points,preserveAspectRatio,r,refX,refY,repeatCount,repeatDur,requiredExtensions,requiredFeatures,restart,rotate,rx,ry,slope,stemh,stemv,stop-color,stop-opacity,strikethrough-position,strikethrough-thickness,stroke,stroke-dasharray,stroke-dashoffset,stroke-linecap,stroke-linejoin,stroke-miterlimit,stroke-opacity,stroke-width,systemLanguage,target,text-anchor,to,transform,type,u1,u2,underline-position,underline-thickness,unicode,unicode-range,units-per-em,values,version,viewBox,visibility,width,widths,x,x-height,x1,x2,xlink:actuate,xlink:arcrole,xlink:role,xlink:show,xlink:title,xlink:type,xml:base,xml:lang,xml:space,xmlns,xmlns:xlink,y,y1,y2,zoomAndPan",
+        !0),v=k({},m,l,r),u=function(a,e){function c(b){b="<remove></remove>"+b;try{var c=(new a.DOMParser).parseFromString(b,"text/html").body;c.firstChild.remove();return c}catch(e){}}function b(a){d.innerHTML=a;e.documentMode&&I(d);return d}var h;if(e&&e.implementation)h=e.implementation.createHTMLDocument("inert");else throw x("noinert");var d=(h.documentElement||h.getDocumentElement()).querySelector("body");d.innerHTML='<svg><g onload="this.parentNode.remove()"></g></svg>';return d.querySelector("svg")?
+        (d.innerHTML='<svg><p><style><img src="</style><img src=x onerror=alert(1)//">',d.querySelector("svg img")?c:b):function(b){b="<remove></remove>"+b;try{b=encodeURI(b)}catch(c){return}var e=new a.XMLHttpRequest;e.responseType="document";e.open("GET","data:text/html;charset=utf-8,"+b,!1);e.send(null);b=e.response.body;b.firstChild.remove();return b}}(s,s.document)}).info({angularVersion:"1.6.9"});d.module("ngSanitize").filter("linky",["$sanitize",function(g){var k=/((s?ftp|https?):\/\/|(www\.)|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"\u201d\u2019]/i,
+    p=/^mailto:/i,s=d.$$minErr("linky"),t=d.isDefined,y=d.isFunction,w=d.isObject,x=d.isString;return function(d,q,l){function r(a){a&&m.push(J(a))}function z(a,d){var c,b=A(a);m.push("<a ");for(c in b)m.push(c+'="'+b[c]+'" ');!t(q)||"target"in b||m.push('target="',q,'" ');m.push('href="',a.replace(/"/g,"&quot;"),'">');r(d);m.push("</a>")}if(null==d||""===d)return d;if(!x(d))throw s("notstring",d);for(var A=y(l)?l:w(l)?function(){return l}:function(){return{}},n=d,m=[],v,u;d=n.match(k);)v=d[0],d[2]||
+d[4]||(v=(d[3]?"http://":"mailto:")+v),u=d.index,r(n.substr(0,u)),z(v,d[0].replace(p,"")),n=n.substring(u+d[0].length);r(n);return g(m.join(""))}}])})(window,window.angular);
 //# sourceMappingURL=angular-sanitize.min.js.map
\ No newline at end of file
diff --git a/setup/pub/angular-sanitize/angular-sanitize.min.js.map b/setup/pub/angular-sanitize/angular-sanitize.min.js.map
index 0310ddce9c937..8ce8290b2b387 100644
--- a/setup/pub/angular-sanitize/angular-sanitize.min.js.map
+++ b/setup/pub/angular-sanitize/angular-sanitize.min.js.map
@@ -1,8 +1,8 @@
 {
-"version":3,
-"file":"angular-sanitize.min.js",
-"lineCount":13,
-"mappings":"A;;;;;aAKC,SAAQ,CAACA,CAAD,CAASC,CAAT,CAAkBC,CAAlB,CAA6B,CAiJtCC,QAASA,EAAY,CAACC,CAAD,CAAQ,CAC3B,IAAIC,EAAM,EACGC,EAAAC,CAAmBF,CAAnBE,CAAwBN,CAAAO,KAAxBD,CACbH,MAAA,CAAaA,CAAb,CACA,OAAOC,EAAAI,KAAA,CAAS,EAAT,CAJoB,CAmE7BC,QAASA,EAAO,CAACC,CAAD,CAAM,CAAA,IAChBC,EAAM,EAAIC,EAAAA,CAAQF,CAAAG,MAAA,CAAU,GAAV,CAAtB,KAAsCC,CACtC,KAAKA,CAAL,CAAS,CAAT,CAAYA,CAAZ,CAAgBF,CAAAG,OAAhB,CAA8BD,CAAA,EAA9B,CAAmCH,CAAA,CAAIC,CAAA,CAAME,CAAN,CAAJ,CAAA,CAAgB,CAAA,CACnD,OAAOH,EAHa,CAmBtBK,QAASA,EAAU,CAAEC,CAAF,CAAQC,CAAR,CAAkB,CAiFnCC,QAASA,EAAa,CAAEC,CAAF,CAAOC,CAAP,CAAgBC,CAAhB,CAAsBC,CAAtB,CAA8B,CAClDF,CAAA,CAAUrB,CAAAwB,UAAA,CAAkBH,CAAlB,CACV,IAAKI,CAAA,CAAeJ,CAAf,CAAL,CACE,IAAA,CAAQK,CAAAC,KAAA,EAAR,EAAwBC,CAAA,CAAgBF,CAAAC,KAAA,EAAhB,CAAxB,CAAA,CACEE,CAAA,CAAa,EAAb,CAAiBH,CAAAC,KAAA,EAAjB,CAICG,EAAA,CAAwBT,CAAxB,CAAL,EAA0CK,CAAAC,KAAA,EAA1C,EAA0DN,CAA1D,EACEQ,CAAA,CAAa,EAAb,CAAiBR,CAAjB,CAKF,EAFAE,CAEA,CAFQQ,CAAA,CAAcV,CAAd,CAER,EAFmC,CAAC,CAACE,CAErC,GACEG,CAAAM,KAAA,CAAYX,CAAZ,CAEF,KAAIY,EAAQ,EAEZX,EAAAY,QAAA,CAAaC,CAAb,CACE,QAAQ,CAACC,CAAD,CAAQC,CAAR,CAAcC,CAAd,CAAiCC,CAAjC,CAAoDC,CAApD,CAAmE,CAMzEP,CAAA,CAAMI,CAAN,CAAA,CAAcI,CAAA,CALFH,CAKE,EAJTC,CAIS,EAHTC,CAGS,EAFT,EAES,CAN2D,CAD7E,CASItB,EAAAwB,MAAJ,EAAmBxB,CAAAwB,MAAA,CAAerB,CAAf,CAAwBY,CAAxB,CAA+BV,CAA/B,CA5B+B,CA+BpDM,QAASA,EAAW,CAAET,CAAF,CAAOC,CAAP,CAAiB,CAAA,IAC/BsB,EAAM,CADyB,CACtB7B,CAEb,IADAO,CACA,CADUrB,CAAAwB,UAAA,CAAkBH,CAAlB,CACV,CAEE,IAAMsB,CAAN,CAAYjB,CAAAX,OAAZ,CAA2B,CAA3B,CAAqC,CAArC,EAA8B4B,CAA9B,EACOjB,CAAA,CAAOiB,CAAP,CADP,EACuBtB,CADvB,CAAwCsB,CAAA,EAAxC;AAIF,GAAY,CAAZ,EAAKA,CAAL,CAAgB,CAEd,IAAM7B,CAAN,CAAUY,CAAAX,OAAV,CAAyB,CAAzB,CAA4BD,CAA5B,EAAiC6B,CAAjC,CAAsC7B,CAAA,EAAtC,CACMI,CAAA0B,IAAJ,EAAiB1B,CAAA0B,IAAA,CAAalB,CAAA,CAAOZ,CAAP,CAAb,CAGnBY,EAAAX,OAAA,CAAe4B,CAND,CATmB,CAhHF,IAC/BE,CAD+B,CACxB1C,CADwB,CACVuB,EAAQ,EADE,CACEC,EAAOV,CAG5C,KAFAS,CAAAC,KAEA,CAFamB,QAAQ,EAAG,CAAE,MAAOpB,EAAA,CAAOA,CAAAX,OAAP,CAAsB,CAAtB,CAAT,CAExB,CAAQE,CAAR,CAAA,CAAe,CACbd,CAAA,CAAQ,CAAA,CAGR,IAAMuB,CAAAC,KAAA,EAAN,EAAuBoB,CAAA,CAAiBrB,CAAAC,KAAA,EAAjB,CAAvB,CAmDEV,CASA,CATOA,CAAAiB,QAAA,CAAiBc,MAAJ,CAAW,kBAAX,CAAgCtB,CAAAC,KAAA,EAAhC,CAA+C,QAA/C,CAAyD,GAAzD,CAAb,CACL,QAAQ,CAACsB,CAAD,CAAMC,CAAN,CAAW,CACjBA,CAAA,CAAOA,CAAAhB,QAAA,CAAaiB,CAAb,CAA6B,IAA7B,CAAAjB,QAAA,CAA2CkB,CAA3C,CAAyD,IAAzD,CAEHlC,EAAAf,MAAJ,EAAmBe,CAAAf,MAAA,CAAesC,CAAA,CAAeS,CAAf,CAAf,CAEnB,OAAO,EALU,CADd,CASP,CAAArB,CAAA,CAAa,EAAb,CAAiBH,CAAAC,KAAA,EAAjB,CA5DF,KAAyD,CAGvD,GAA8B,CAA9B,GAAKV,CAAAoC,QAAA,CAAa,SAAb,CAAL,CAEER,CAEA,CAFQ5B,CAAAoC,QAAA,CAAa,IAAb,CAAmB,CAAnB,CAER,CAAc,CAAd,EAAKR,CAAL,EAAmB5B,CAAAqC,YAAA,CAAiB,QAAjB,CAAwBT,CAAxB,CAAnB,GAAsDA,CAAtD,GACM3B,CAAAqC,QAEJ,EAFqBrC,CAAAqC,QAAA,CAAiBtC,CAAAuC,UAAA,CAAgB,CAAhB,CAAmBX,CAAnB,CAAjB,CAErB,CADA5B,CACA,CADOA,CAAAuC,UAAA,CAAgBX,CAAhB,CAAwB,CAAxB,CACP,CAAA1C,CAAA,CAAQ,CAAA,CAHV,CAJF,KAUO,IAAKsD,CAAAC,KAAA,CAAoBzC,CAApB,CAAL,CAGL,IAFAmB,CAEA,CAFQnB,CAAAmB,MAAA,CAAYqB,CAAZ,CAER,CACExC,CACA;AADOA,CAAAiB,QAAA,CAAcE,CAAA,CAAM,CAAN,CAAd,CAAyB,EAAzB,CACP,CAAAjC,CAAA,CAAQ,CAAA,CAFV,CAHK,IAQA,IAAKwD,CAAAD,KAAA,CAA4BzC,CAA5B,CAAL,CAGL,IAFAmB,CAEA,CAFQnB,CAAAmB,MAAA,CAAYwB,CAAZ,CAER,CACE3C,CAEA,CAFOA,CAAAuC,UAAA,CAAgBpB,CAAA,CAAM,CAAN,CAAArB,OAAhB,CAEP,CADAqB,CAAA,CAAM,CAAN,CAAAF,QAAA,CAAkB0B,CAAlB,CAAkC/B,CAAlC,CACA,CAAA1B,CAAA,CAAQ,CAAA,CAHV,CAHK,IAUK0D,EAAAH,KAAA,CAAsBzC,CAAtB,CAAL,GACLmB,CADK,CACGnB,CAAAmB,MAAA,CAAY0B,CAAZ,CADH,IAIH7C,CAEA,CAFOA,CAAAuC,UAAA,CAAgBpB,CAAA,CAAM,CAAN,CAAArB,OAAhB,CAEP,CADAqB,CAAA,CAAM,CAAN,CAAAF,QAAA,CAAkB4B,CAAlB,CAAoC3C,CAApC,CACA,CAAAhB,CAAA,CAAQ,CAAA,CANL,CAUFA,EAAL,GACE0C,CAKA,CALQ5B,CAAAoC,QAAA,CAAa,GAAb,CAKR,CAHIH,CAGJ,CAHmB,CAAR,CAAAL,CAAA,CAAY5B,CAAZ,CAAmBA,CAAAuC,UAAA,CAAgB,CAAhB,CAAmBX,CAAnB,CAG9B,CAFA5B,CAEA,CAFe,CAAR,CAAA4B,CAAA,CAAY,EAAZ,CAAiB5B,CAAAuC,UAAA,CAAgBX,CAAhB,CAExB,CAAI3B,CAAAf,MAAJ,EAAmBe,CAAAf,MAAA,CAAesC,CAAA,CAAeS,CAAf,CAAf,CANrB,CAzCuD,CA+DzD,GAAKjC,CAAL,EAAaU,CAAb,CACE,KAAMoC,EAAA,CAAgB,UAAhB,CAC4C9C,CAD5C,CAAN,CAGFU,CAAA,CAAOV,CAvEM,CA2EfY,CAAA,EA/EmC,CA2IrCY,QAASA,EAAc,CAACuB,CAAD,CAAQ,CAC7B,GAAI,CAACA,CAAL,CAAc,MAAO,EAIrB,KAAIC,EAAQC,CAAAC,KAAA,CAAaH,CAAb,CACRI,EAAAA,CAAcH,CAAA,CAAM,CAAN,CAClB,KAAII,EAAaJ,CAAA,CAAM,CAAN,CAEjB,IADIK,CACJ,CADcL,CAAA,CAAM,CAAN,CACd,CACEM,CAAAC,UAKA,CALoBF,CAAApC,QAAA,CAAgB,IAAhB,CAAqB,MAArB,CAKpB,CAAAoC,CAAA,CAAU,aAAA,EAAiBC,EAAjB,CACRA,CAAAE,YADQ,CACgBF,CAAAG,UAE5B,OAAON,EAAP,CAAqBE,CAArB,CAA+BD,CAlBF,CA4B/BM,QAASA,EAAc,CAACX,CAAD,CAAQ,CAC7B,MAAOA,EAAA9B,QAAA,CACG,IADH;AACS,OADT,CAAAA,QAAA,CAEG0C,CAFH,CAE4B,QAAQ,CAACZ,CAAD,CAAO,CAC9C,MAAO,IAAP,CAAcA,CAAAa,WAAA,CAAiB,CAAjB,CAAd,CAAoC,GADU,CAF3C,CAAA3C,QAAA,CAKG,IALH,CAKS,MALT,CAAAA,QAAA,CAMG,IANH,CAMS,MANT,CADsB,CAoB/B7B,QAASA,EAAkB,CAACD,CAAD,CAAM0E,CAAN,CAAmB,CAC5C,IAAIC,EAAS,CAAA,CAAb,CACIC,EAAMhF,CAAAiF,KAAA,CAAa7E,CAAb,CAAkBA,CAAA4B,KAAlB,CACV,OAAO,OACEU,QAAQ,CAACtB,CAAD,CAAMa,CAAN,CAAaV,CAAb,CAAmB,CAChCH,CAAA,CAAMpB,CAAAwB,UAAA,CAAkBJ,CAAlB,CACD2D,EAAAA,CAAL,EAAehC,CAAA,CAAgB3B,CAAhB,CAAf,GACE2D,CADF,CACW3D,CADX,CAGK2D,EAAL,EAAsC,CAAA,CAAtC,GAAeG,CAAA,CAAc9D,CAAd,CAAf,GACE4D,CAAA,CAAI,GAAJ,CAcA,CAbAA,CAAA,CAAI5D,CAAJ,CAaA,CAZApB,CAAAmF,QAAA,CAAgBlD,CAAhB,CAAuB,QAAQ,CAAC+B,CAAD,CAAQoB,CAAR,CAAY,CACzC,IAAIC,EAAKrF,CAAAwB,UAAA,CAAkB4D,CAAlB,CAAT,CACIE,EAAmB,KAAnBA,GAAWlE,CAAXkE,EAAqC,KAArCA,GAA4BD,CAA5BC,EAAyD,YAAzDA,GAAgDD,CAC3B,EAAA,CAAzB,GAAIE,CAAA,CAAWF,CAAX,CAAJ,EACsB,CAAA,CADtB,GACGG,CAAA,CAASH,CAAT,CADH,EAC8B,CAAAP,CAAA,CAAad,CAAb,CAAoBsB,CAApB,CAD9B,GAEEN,CAAA,CAAI,GAAJ,CAIA,CAHAA,CAAA,CAAII,CAAJ,CAGA,CAFAJ,CAAA,CAAI,IAAJ,CAEA,CADAA,CAAA,CAAIL,CAAA,CAAeX,CAAf,CAAJ,CACA,CAAAgB,CAAA,CAAI,GAAJ,CANF,CAHyC,CAA3C,CAYA,CAAAA,CAAA,CAAIzD,CAAA,CAAQ,IAAR,CAAe,GAAnB,CAfF,CALgC,CAD7B,KAwBAqB,QAAQ,CAACxB,CAAD,CAAK,CACdA,CAAA,CAAMpB,CAAAwB,UAAA,CAAkBJ,CAAlB,CACD2D,EAAL,EAAsC,CAAA,CAAtC,GAAeG,CAAA,CAAc9D,CAAd,CAAf,GACE4D,CAAA,CAAI,IAAJ,CAEA,CADAA,CAAA,CAAI5D,CAAJ,CACA,CAAA4D,CAAA,CAAI,GAAJ,CAHF,CAKI5D,EAAJ,EAAW2D,CAAX,GACEA,CADF,CACW,CAAA,CADX,CAPc,CAxBb,OAmCE5E,QAAQ,CAACA,CAAD,CAAO,CACb4E,CAAL;AACEC,CAAA,CAAIL,CAAA,CAAexE,CAAf,CAAJ,CAFgB,CAnCjB,CAHqC,CAha9C,IAAI4D,EAAkB/D,CAAAyF,SAAA,CAAiB,WAAjB,CAAtB,CAwJI3B,EACG,4FAzJP,CA0JEF,EAAiB,2BA1JnB,CA2JEzB,EAAc,yEA3JhB,CA4JE0B,EAAmB,IA5JrB,CA6JEF,EAAyB,SA7J3B,CA8JER,EAAiB,qBA9JnB,CA+JEM,EAAiB,qBA/JnB,CAgKEL,EAAe,yBAhKjB,CAkKEwB,EAA0B,gBAlK5B,CA2KI7C,EAAetB,CAAA,CAAQ,wBAAR,CAIfiF,EAAAA,CAA8BjF,CAAA,CAAQ,gDAAR,CAC9BkF,EAAAA,CAA+BlF,CAAA,CAAQ,OAAR,CADnC,KAEIqB,EAAyB9B,CAAA4F,OAAA,CAAe,EAAf,CACeD,CADf,CAEeD,CAFf,CAF7B,CAOIjE,EAAgBzB,CAAA4F,OAAA,CAAe,EAAf,CAAmBF,CAAnB,CAAgDjF,CAAA,CAAQ,4KAAR,CAAhD,CAPpB;AAYImB,EAAiB5B,CAAA4F,OAAA,CAAe,EAAf,CAAmBD,CAAnB,CAAiDlF,CAAA,CAAQ,2JAAR,CAAjD,CAZrB,CAkBIsC,EAAkBtC,CAAA,CAAQ,cAAR,CAlBtB,CAoBIyE,EAAgBlF,CAAA4F,OAAA,CAAe,EAAf,CACe7D,CADf,CAEeN,CAFf,CAGeG,CAHf,CAIeE,CAJf,CApBpB,CA2BI0D,EAAW/E,CAAA,CAAQ,0CAAR,CA3Bf,CA4BI8E,EAAavF,CAAA4F,OAAA,CAAe,EAAf,CAAmBJ,CAAnB,CAA6B/E,CAAA,CAC1C,ySAD0C,CAA7B,CA5BjB;AA0LI8D,EAAUsB,QAAAC,cAAA,CAAuB,KAAvB,CA1Ld,CA2LI5B,EAAU,wBAsGdlE,EAAA+F,OAAA,CAAe,YAAf,CAA6B,EAA7B,CAAAC,SAAA,CAA0C,WAA1C,CA7UAC,QAA0B,EAAG,CAC3B,IAAAC,KAAA,CAAY,CAAC,eAAD,CAAkB,QAAQ,CAACC,CAAD,CAAgB,CACpD,MAAO,SAAQ,CAAClF,CAAD,CAAO,CACpB,IAAIb,EAAM,EACVY,EAAA,CAAWC,CAAX,CAAiBZ,CAAA,CAAmBD,CAAnB,CAAwB,QAAQ,CAACgG,CAAD,CAAMd,CAAN,CAAe,CAC9D,MAAO,CAAC,SAAA5B,KAAA,CAAeyC,CAAA,CAAcC,CAAd,CAAmBd,CAAnB,CAAf,CADsD,CAA/C,CAAjB,CAGA,OAAOlF,EAAAI,KAAA,CAAS,EAAT,CALa,CAD8B,CAA1C,CADe,CA6U7B,CAuGAR,EAAA+F,OAAA,CAAe,YAAf,CAAAM,OAAA,CAAoC,OAApC,CAA6C,CAAC,WAAD,CAAc,QAAQ,CAACC,CAAD,CAAY,CAAA,IACzEC,EACE,mEAFuE,CAGzEC,EAAgB,UAEpB,OAAO,SAAQ,CAACtD,CAAD,CAAOuD,CAAP,CAAe,CAoB5BC,QAASA,EAAO,CAACxD,CAAD,CAAO,CAChBA,CAAL,EAGAjC,CAAAe,KAAA,CAAU9B,CAAA,CAAagD,CAAb,CAAV,CAJqB,CAOvByD,QAASA,EAAO,CAACC,CAAD,CAAM1D,CAAN,CAAY,CAC1BjC,CAAAe,KAAA,CAAU,KAAV,CACIhC,EAAA6G,UAAA,CAAkBJ,CAAlB,CAAJ;CACExF,CAAAe,KAAA,CAAU,UAAV,CAEA,CADAf,CAAAe,KAAA,CAAUyE,CAAV,CACA,CAAAxF,CAAAe,KAAA,CAAU,IAAV,CAHF,CAKAf,EAAAe,KAAA,CAAU,QAAV,CACAf,EAAAe,KAAA,CAAU4E,CAAV,CACA3F,EAAAe,KAAA,CAAU,IAAV,CACA0E,EAAA,CAAQxD,CAAR,CACAjC,EAAAe,KAAA,CAAU,MAAV,CAX0B,CA1B5B,GAAI,CAACkB,CAAL,CAAW,MAAOA,EAMlB,KALA,IAAId,CAAJ,CACI0E,EAAM5D,CADV,CAEIjC,EAAO,EAFX,CAGI2F,CAHJ,CAII9F,CACJ,CAAQsB,CAAR,CAAgB0E,CAAA1E,MAAA,CAAUmE,CAAV,CAAhB,CAAA,CAEEK,CAMA,CANMxE,CAAA,CAAM,CAAN,CAMN,CAJIA,CAAA,CAAM,CAAN,CAIJ,EAJgBA,CAAA,CAAM,CAAN,CAIhB,GAJ0BwE,CAI1B,CAJgC,SAIhC,CAJ4CA,CAI5C,EAHA9F,CAGA,CAHIsB,CAAAS,MAGJ,CAFA6D,CAAA,CAAQI,CAAAC,OAAA,CAAW,CAAX,CAAcjG,CAAd,CAAR,CAEA,CADA6F,CAAA,CAAQC,CAAR,CAAaxE,CAAA,CAAM,CAAN,CAAAF,QAAA,CAAiBsE,CAAjB,CAAgC,EAAhC,CAAb,CACA,CAAAM,CAAA,CAAMA,CAAAtD,UAAA,CAAc1C,CAAd,CAAkBsB,CAAA,CAAM,CAAN,CAAArB,OAAlB,CAER2F,EAAA,CAAQI,CAAR,CACA,OAAOR,EAAA,CAAUrF,CAAAT,KAAA,CAAU,EAAV,CAAV,CAlBqB,CAL+C,CAAlC,CAA7C,CAzjBsC,CAArC,CAAA,CA0mBET,MA1mBF,CA0mBUA,MAAAC,QA1mBV;",
-"sources":["angular-sanitize.js"],
-"names":["window","angular","undefined","sanitizeText","chars","buf","htmlSanitizeWriter","writer","noop","join","makeMap","str","obj","items","split","i","length","htmlParser","html","handler","parseStartTag","tag","tagName","rest","unary","lowercase","blockElements","stack","last","inlineElements","parseEndTag","optionalEndTagElements","voidElements","push","attrs","replace","ATTR_REGEXP","match","name","doubleQuotedValue","singleQuotedValue","unquotedValue","decodeEntities","start","pos","end","index","stack.last","specialElements","RegExp","all","text","COMMENT_REGEXP","CDATA_REGEXP","indexOf","lastIndexOf","comment","substring","DOCTYPE_REGEXP","test","BEGIN_END_TAGE_REGEXP","END_TAG_REGEXP","BEGIN_TAG_REGEXP","START_TAG_REGEXP","$sanitizeMinErr","value","parts","spaceRe","exec","spaceBefore","spaceAfter","content","hiddenPre","innerHTML","textContent","innerText","encodeEntities","NON_ALPHANUMERIC_REGEXP","charCodeAt","uriValidator","ignore","out","bind","validElements","forEach","key","lkey","isImage","validAttrs","uriAttrs","$$minErr","optionalEndTagBlockElements","optionalEndTagInlineElements","extend","document","createElement","module","provider","$SanitizeProvider","$get","$$sanitizeUri","uri","filter","$sanitize","LINKY_URL_REGEXP","MAILTO_REGEXP","target","addText","addLink","url","isDefined","raw","substr"]
+  "version":3,
+  "file":"angular-sanitize.min.js",
+  "lineCount":16,
+  "mappings":"A;;;;;aAKC,SAAQ,CAACA,CAAD,CAASC,CAAT,CAAkB,CAykB3BC,QAASA,EAAY,CAACC,CAAD,CAAQ,CAC3B,IAAIC,EAAM,EACGC,EAAAC,CAAmBF,CAAnBE,CAAwBC,CAAxBD,CACbH,MAAA,CAAaA,CAAb,CACA,OAAOC,EAAAI,KAAA,CAAS,EAAT,CAJoB,CA5jB7B,IAAIC,EAAkBR,CAAAS,SAAA,CAAiB,WAAjB,CAAtB,CACIC,CADJ,CAEIC,CAFJ,CAGIC,CAHJ,CAIIC,CAJJ,CAKIC,CALJ,CAMIR,CANJ,CAOIS,CAPJ,CAQIC,CARJ,CASIZ,CA4jBJJ,EAAAiB,OAAA,CAAe,YAAf,CAA6B,EAA7B,CAAAC,SAAA,CACY,WADZ,CAhcAC,QAA0B,EAAG,CA4J3BC,QAASA,EAAK,CAACC,CAAD,CAAMC,CAAN,CAAqB,CAAA,IAC7BC,EAAM,EADuB,CACnBC,EAAQH,CAAAI,MAAA,CAAU,GAAV,CADW,CACKC,CACtC,KAAKA,CAAL,CAAS,CAAT,CAAYA,CAAZ,CAAgBF,CAAAG,OAAhB,CAA8BD,CAAA,EAA9B,CACEH,CAAA,CAAID,CAAA,CAAgBR,CAAA,CAAUU,CAAA,CAAME,CAAN,CAAV,CAAhB,CAAsCF,CAAA,CAAME,CAAN,CAA1C,CAAA,CAAsD,CAAA,CAExD,OAAOH,EAL0B,CAwJnCK,QAASA,EAAS,CAACC,CAAD,CAAQ,CAExB,IADA,IAAIC,EAAM,EAAV,CACSJ,EAAI,CADb,CACgBK,EAAKF,CAAAF,OAArB,CAAmCD,CAAnC,CAAuCK,CAAvC,CAA2CL,CAAA,EAA3C,CAAgD,CAC9C,IAAIM,EAAOH,CAAA,CAAMH,CAAN,CACXI,EAAA,CAAIE,CAAAC,KAAJ,CAAA,CAAiBD,CAAAE,MAF6B,CAIhD,MAAOJ,EANiB,CAiB1BK,QAASA,EAAc,CAACD,CAAD,CAAQ,CAC7B,MAAOA,EAAAE,QAAA,CACG,IADH,CACS,OADT,CAAAA,QAAA,CAEGC,CAFH,CAE0B,QAAQ,CAACH,CAAD,CAAQ,CAC7C,IAAII,EAAKJ,CAAAK,WAAA,CAAiB,CAAjB,CACLC,EAAAA,CAAMN,CAAAK,WAAA,CAAiB,CAAjB,CACV,OAAO,IAAP,EAAgC,IAAhC,EAAiBD,CAAjB;AAAsB,KAAtB,GAA0CE,CAA1C,CAAgD,KAAhD,EAA0D,KAA1D,EAAqE,GAHxB,CAF1C,CAAAJ,QAAA,CAOGK,CAPH,CAO4B,QAAQ,CAACP,CAAD,CAAQ,CAC/C,MAAO,IAAP,CAAcA,CAAAK,WAAA,CAAiB,CAAjB,CAAd,CAAoC,GADW,CAP5C,CAAAH,QAAA,CAUG,IAVH,CAUS,MAVT,CAAAA,QAAA,CAWG,IAXH,CAWS,MAXT,CADsB,CAgF/BM,QAASA,EAAkB,CAACC,CAAD,CAAO,CAChC,IAAA,CAAOA,CAAP,CAAA,CAAa,CACX,GAAIA,CAAAC,SAAJ,GAAsB7C,CAAA8C,KAAAC,aAAtB,CAEE,IADA,IAAIjB,EAAQc,CAAAI,WAAZ,CACSrB,EAAI,CADb,CACgBsB,EAAInB,CAAAF,OAApB,CAAkCD,CAAlC,CAAsCsB,CAAtC,CAAyCtB,CAAA,EAAzC,CAA8C,CAC5C,IAAIuB,EAAWpB,CAAA,CAAMH,CAAN,CAAf,CACIwB,EAAWD,CAAAhB,KAAAkB,YAAA,EACf,IAAiB,WAAjB,GAAID,CAAJ,EAAoE,CAApE,GAAgCA,CAAAE,YAAA,CAAqB,MAArB,CAA6B,CAA7B,CAAhC,CACET,CAAAU,oBAAA,CAAyBJ,CAAzB,CAEA,CADAvB,CAAA,EACA,CAAAsB,CAAA,EAN0C,CAYhD,CADIM,CACJ,CADeX,CAAAY,WACf,GACEb,CAAA,CAAmBY,CAAnB,CAGFX,EAAA,CAAOa,CAAA,CAAiB,aAAjB,CAAgCb,CAAhC,CAnBI,CADmB,CAwBlCa,QAASA,EAAgB,CAACC,CAAD,CAAWd,CAAX,CAAiB,CAExC,IAAIW,EAAWX,CAAA,CAAKc,CAAL,CACf,IAAIH,CAAJ,EAAgBvC,CAAA2C,KAAA,CAAkBf,CAAlB,CAAwBW,CAAxB,CAAhB,CACE,KAAM9C,EAAA,CAAgB,QAAhB,CAA2FmC,CAAAgB,UAA3F,EAA6GhB,CAAAiB,UAA7G,CAAN,CAEF,MAAON,EANiC,CA5a1C,IAAIO,EAAa,CAAA,CAEjB,KAAAC,KAAA;AAAY,CAAC,eAAD,CAAkB,QAAQ,CAACC,CAAD,CAAgB,CAChDF,CAAJ,EACElD,CAAA,CAAOqD,CAAP,CAAsBC,CAAtB,CAEF,OAAO,SAAQ,CAACC,CAAD,CAAO,CACpB,IAAI/D,EAAM,EACVa,EAAA,CAAWkD,CAAX,CAAiB9D,CAAA,CAAmBD,CAAnB,CAAwB,QAAQ,CAACgE,CAAD,CAAMC,CAAN,CAAe,CAC9D,MAAO,CAAC,UAAAC,KAAA,CAAgBN,CAAA,CAAcI,CAAd,CAAmBC,CAAnB,CAAhB,CADsD,CAA/C,CAAjB,CAGA,OAAOjE,EAAAI,KAAA,CAAS,EAAT,CALa,CAJ8B,CAA1C,CA4CZ,KAAA+D,UAAA,CAAiBC,QAAQ,CAACD,CAAD,CAAY,CACnC,MAAIzD,EAAA,CAAUyD,CAAV,CAAJ,EACET,CACO,CADMS,CACN,CAAA,IAFT,EAIST,CAL0B,CAarCnD,EAAA,CAAOV,CAAAU,KACPC,EAAA,CAASX,CAAAW,OACTC,EAAA,CAAUZ,CAAAY,QACVC,EAAA,CAAYb,CAAAa,UACZC,EAAA,CAAYd,CAAAc,UACZR,EAAA,CAAON,CAAAM,KAEPU,EAAA,CAsLAwD,QAAuB,CAACN,CAAD,CAAOO,CAAP,CAAgB,CACxB,IAAb,GAAIP,CAAJ,EAA8BQ,IAAAA,EAA9B,GAAqBR,CAArB,CACEA,CADF,CACS,EADT,CAE2B,QAF3B,GAEW,MAAOA,EAFlB,GAGEA,CAHF,CAGS,EAHT,CAGcA,CAHd,CAMA,KAAIS,EAAmBC,CAAA,CAAoBV,CAApB,CACvB,IAAKS,CAAAA,CAAL,CAAuB,MAAO,EAG9B,KAAIE,EAAe,CACnB,GAAG,CACD,GAAqB,CAArB,GAAIA,CAAJ,CACE,KAAMrE,EAAA,CAAgB,QAAhB,CAAN,CAEFqE,CAAA,EAGAX,EAAA,CAAOS,CAAAG,UACPH,EAAA,CAAmBC,CAAA,CAAoBV,CAApB,CARlB,CAAH,MASSA,CATT,GASkBS,CAAAG,UATlB,CAYA,KADInC,CACJ,CADWgC,CAAApB,WACX,CAAOZ,CAAP,CAAA,CAAa,CACX,OAAQA,CAAAC,SAAR,EACE,KAAK,CAAL,CACE6B,CAAAM,MAAA,CAAcpC,CAAAqC,SAAA7B,YAAA,EAAd;AAA2CvB,CAAA,CAAUe,CAAAI,WAAV,CAA3C,CACA,MACF,MAAK,CAAL,CACE0B,CAAAvE,MAAA,CAAcyC,CAAAsC,YAAd,CALJ,CASA,IAAI3B,CACJ,IAAM,EAAAA,CAAA,CAAWX,CAAAY,WAAX,CAAN,GACwB,CAIjBD,GAJDX,CAAAC,SAICU,EAHHmB,CAAAS,IAAA,CAAYvC,CAAAqC,SAAA7B,YAAA,EAAZ,CAGGG,CADLA,CACKA,CADME,CAAA,CAAiB,aAAjB,CAAgCb,CAAhC,CACNW,CAAAA,CAAAA,CALP,EAMI,IAAA,CAAmB,IAAnB,EAAOA,CAAP,CAAA,CAAyB,CACvBX,CAAA,CAAOa,CAAA,CAAiB,YAAjB,CAA+Bb,CAA/B,CACP,IAAIA,CAAJ,GAAagC,CAAb,CAA+B,KAC/BrB,EAAA,CAAWE,CAAA,CAAiB,aAAjB,CAAgCb,CAAhC,CACW,EAAtB,GAAIA,CAAAC,SAAJ,EACE6B,CAAAS,IAAA,CAAYvC,CAAAqC,SAAA7B,YAAA,EAAZ,CALqB,CAU7BR,CAAA,CAAOW,CA3BI,CA8Bb,IAAA,CAAQX,CAAR,CAAegC,CAAApB,WAAf,CAAA,CACEoB,CAAAQ,YAAA,CAA6BxC,CAA7B,CAvDmC,CArLvCvC,EAAA,CA0RAgF,QAA+B,CAACjF,CAAD,CAAMkF,CAAN,CAAoB,CACjD,IAAIC,EAAuB,CAAA,CAA3B,CACIC,EAAM7E,CAAA,CAAKP,CAAL,CAAUA,CAAAqF,KAAV,CACV,OAAO,CACLT,MAAOA,QAAQ,CAACU,CAAD,CAAM5D,CAAN,CAAa,CAC1B4D,CAAA,CAAM3E,CAAA,CAAU2E,CAAV,CACDH,EAAAA,CAAL,EAA6BI,CAAA,CAAgBD,CAAhB,CAA7B,GACEH,CADF,CACyBG,CADzB,CAGKH,EAAL,EAAoD,CAAA,CAApD,GAA6BtB,CAAA,CAAcyB,CAAd,CAA7B,GACEF,CAAA,CAAI,GAAJ,CAcA,CAbAA,CAAA,CAAIE,CAAJ,CAaA,CAZA7E,CAAA,CAAQiB,CAAR,CAAe,QAAQ,CAACK,CAAD,CAAQyD,CAAR,CAAa,CAClC,IAAIC,EAAO9E,CAAA,CAAU6E,CAAV,CAAX,CACIvB,EAAmB,KAAnBA,GAAWqB,CAAXrB,EAAqC,KAArCA,GAA4BwB,CAA5BxB,EAAyD,YAAzDA;AAAgDwB,CAC3B,EAAA,CAAzB,GAAIC,CAAA,CAAWD,CAAX,CAAJ,EACsB,CAAA,CADtB,GACGE,CAAA,CAASF,CAAT,CADH,EAC8B,CAAAP,CAAA,CAAanD,CAAb,CAAoBkC,CAApB,CAD9B,GAEEmB,CAAA,CAAI,GAAJ,CAIA,CAHAA,CAAA,CAAII,CAAJ,CAGA,CAFAJ,CAAA,CAAI,IAAJ,CAEA,CADAA,CAAA,CAAIpD,CAAA,CAAeD,CAAf,CAAJ,CACA,CAAAqD,CAAA,CAAI,GAAJ,CANF,CAHkC,CAApC,CAYA,CAAAA,CAAA,CAAI,GAAJ,CAfF,CAL0B,CADvB,CAwBLL,IAAKA,QAAQ,CAACO,CAAD,CAAM,CACjBA,CAAA,CAAM3E,CAAA,CAAU2E,CAAV,CACDH,EAAL,EAAoD,CAAA,CAApD,GAA6BtB,CAAA,CAAcyB,CAAd,CAA7B,EAAkF,CAAA,CAAlF,GAA4DM,CAAA,CAAaN,CAAb,CAA5D,GACEF,CAAA,CAAI,IAAJ,CAEA,CADAA,CAAA,CAAIE,CAAJ,CACA,CAAAF,CAAA,CAAI,GAAJ,CAHF,CAMIE,EAAJ,EAAWH,CAAX,GACEA,CADF,CACyB,CAAA,CADzB,CARiB,CAxBd,CAoCLpF,MAAOA,QAAQ,CAACA,CAAD,CAAQ,CAChBoF,CAAL,EACEC,CAAA,CAAIpD,CAAA,CAAejC,CAAf,CAAJ,CAFmB,CApClB,CAH0C,CAxRnDa,EAAA,CAAehB,CAAA8C,KAAAmD,UAAAC,SAAf,EAA8D,QAAQ,CAACC,CAAD,CAAM,CAE1E,MAAO,CAAG,EAAA,IAAAC,wBAAA,CAA6BD,CAA7B,CAAA,CAAoC,EAApC,CAFgE,CAtEjD,KA4EvB7D,EAAwB,iCA5ED,CA8EzBI,EAA0B,cA9ED,CAuFvBsD,EAAe3E,CAAA,CAAM,wBAAN,CAvFQ,CA2FvBgF,EAA8BhF,CAAA,CAAM,gDAAN,CA3FP,CA4FvBiF,EAA+BjF,CAAA,CAAM,OAAN,CA5FR,CA6FvBkF,EAAyB3F,CAAA,CAAO,EAAP,CACe0F,CADf,CAEeD,CAFf,CA7FF,CAkGvBG,EAAgB5F,CAAA,CAAO,EAAP,CAAWyF,CAAX,CAAwChF,CAAA,CAAM,qKAAN,CAAxC,CAlGO;AAuGvBoF,EAAiB7F,CAAA,CAAO,EAAP,CAAW0F,CAAX,CAAyCjF,CAAA,CAAM,2JAAN,CAAzC,CAvGM,CA+GvB6C,EAAc7C,CAAA,CAAM,wNAAN,CA/GS,CAoHvBsE,EAAkBtE,CAAA,CAAM,cAAN,CApHK,CAsHvB4C,EAAgBrD,CAAA,CAAO,EAAP,CACeoF,CADf,CAEeQ,CAFf,CAGeC,CAHf,CAIeF,CAJf,CAtHO,CA6HvBR,EAAW1E,CAAA,CAAM,uDAAN,CA7HY,CA+HvBqF,EAAYrF,CAAA,CAAM,kTAAN,CA/HW;AAuIvBsF,EAAWtF,CAAA,CAAM,guCAAN;AAcoE,CAAA,CAdpE,CAvIY,CAuJvByE,EAAalF,CAAA,CAAO,EAAP,CACemF,CADf,CAEeY,CAFf,CAGeD,CAHf,CAvJU,CA0KvB7B,EAAqE,QAAQ,CAAC7E,CAAD,CAAS4G,CAAT,CAAmB,CAyClGC,QAASA,EAA6B,CAAC1C,CAAD,CAAO,CAG3CA,CAAA,CAAO,mBAAP,CAA6BA,CAC7B,IAAI,CACF,IAAI2C,EAAOC,CAAA,IAAI/G,CAAAgH,UAAJD,iBAAA,CAAuC5C,CAAvC,CAA6C,WAA7C,CAAA2C,KACXA,EAAAtD,WAAAyD,OAAA,EACA,OAAOH,EAHL,CAIF,MAAOI,CAAP,CAAU,EAR+B,CAa7CC,QAASA,EAAiC,CAAChD,CAAD,CAAO,CAC/CS,CAAAG,UAAA,CAA6BZ,CAIzByC,EAAAQ,aAAJ,EACEzE,CAAA,CAAmBiC,CAAnB,CAGF,OAAOA,EATwC,CArDjD,IAAIyC,CACJ,IAAIT,CAAJ,EAAgBA,CAAAU,eAAhB,CACED,CAAA,CAAgBT,CAAAU,eAAAC,mBAAA,CAA2C,OAA3C,CADlB,KAGE,MAAM9G,EAAA,CAAgB,SAAhB,CAAN,CAEF,IAAImE,EAAmB4C,CAACH,CAAAI,gBAADD,EAAkCH,CAAAK,mBAAA,EAAlCF,eAAA,CAAoF,MAApF,CAGvB5C,EAAAG,UAAA,CAA6B,sDAC7B,OAAKH,EAAA4C,cAAA,CAA+B,KAA/B,CAAL;CAIE5C,CAAAG,UACA,CAD6B,kEAC7B,CAAIH,CAAA4C,cAAA,CAA+B,SAA/B,CAAJ,CACSX,CADT,CAGSM,CARX,EAYAQ,QAAgC,CAACxD,CAAD,CAAO,CAGrCA,CAAA,CAAO,mBAAP,CAA6BA,CAC7B,IAAI,CACFA,CAAA,CAAOyD,SAAA,CAAUzD,CAAV,CADL,CAEF,MAAO+C,CAAP,CAAU,CACV,MADU,CAGZ,IAAIW,EAAM,IAAI7H,CAAA8H,eACdD,EAAAE,aAAA,CAAmB,UACnBF,EAAAG,KAAA,CAAS,KAAT,CAAgB,+BAAhB,CAAkD7D,CAAlD,CAAwD,CAAA,CAAxD,CACA0D,EAAAI,KAAA,CAAS,IAAT,CACInB,EAAAA,CAAOe,CAAAK,SAAApB,KACXA,EAAAtD,WAAAyD,OAAA,EACA,OAAOH,EAf8B,CAvB2D,CAA5B,CAiErE9G,CAjEqE,CAiE7DA,CAAA4G,SAjE6D,CA1K7C,CAgc7B,CAAAuB,KAAA,CAEQ,CAAEC,eAAgB,OAAlB,CAFR,CAmIAnI,EAAAiB,OAAA,CAAe,YAAf,CAAAmH,OAAA,CAAoC,OAApC,CAA6C,CAAC,WAAD,CAAc,QAAQ,CAACC,CAAD,CAAY,CAAA,IACzEC,EACE,2FAFuE;AAGzEC,EAAgB,WAHyD,CAKzEC,EAAcxI,CAAAS,SAAA,CAAiB,OAAjB,CAL2D,CAMzEI,EAAYb,CAAAa,UAN6D,CAOzE4H,EAAazI,CAAAyI,WAP4D,CAQzEC,EAAW1I,CAAA0I,SAR8D,CASzEC,EAAW3I,CAAA2I,SAEf,OAAO,SAAQ,CAACC,CAAD,CAAOC,CAAP,CAAe9F,CAAf,CAA2B,CA6BxC+F,QAASA,EAAO,CAACF,CAAD,CAAO,CAChBA,CAAL,EAGA1E,CAAAsB,KAAA,CAAUvF,CAAA,CAAa2I,CAAb,CAAV,CAJqB,CAOvBG,QAASA,EAAO,CAACC,CAAD,CAAMJ,CAAN,CAAY,CAAA,IACtBjD,CADsB,CACjBsD,EAAiBC,CAAA,CAAaF,CAAb,CAC1B9E,EAAAsB,KAAA,CAAU,KAAV,CAEA,KAAKG,CAAL,GAAYsD,EAAZ,CACE/E,CAAAsB,KAAA,CAAUG,CAAV,CAAgB,IAAhB,CAAuBsD,CAAA,CAAetD,CAAf,CAAvB,CAA6C,IAA7C,CAGE,EAAA9E,CAAA,CAAUgI,CAAV,CAAJ,EAA2B,QAA3B,EAAuCI,EAAvC,EACE/E,CAAAsB,KAAA,CAAU,UAAV,CACUqD,CADV,CAEU,IAFV,CAIF3E,EAAAsB,KAAA,CAAU,QAAV,CACUwD,CAAA5G,QAAA,CAAY,IAAZ,CAAkB,QAAlB,CADV,CAEU,IAFV,CAGA0G,EAAA,CAAQF,CAAR,CACA1E,EAAAsB,KAAA,CAAU,MAAV,CAjB0B,CAnC5B,GAAY,IAAZ,EAAIoD,CAAJ,EAA6B,EAA7B,GAAoBA,CAApB,CAAiC,MAAOA,EACxC,IAAK,CAAAD,CAAA,CAASC,CAAT,CAAL,CAAqB,KAAMJ,EAAA,CAAY,WAAZ,CAA8DI,CAA9D,CAAN,CAYrB,IAVA,IAAIM,EACFT,CAAA,CAAW1F,CAAX,CAAA,CAAyBA,CAAzB,CACA2F,CAAA,CAAS3F,CAAT,CAAA,CAAuBoG,QAA4B,EAAG,CAAC,MAAOpG,EAAR,CAAtD,CACAqG,QAAiC,EAAG,CAAC,MAAO,EAAR,CAHtC,CAMIC,EAAMT,CANV,CAOI1E,EAAO,EAPX,CAQI8E,CARJ,CASItH,CACJ,CAAQ4H,CAAR,CAAgBD,CAAAC,MAAA,CAAUhB,CAAV,CAAhB,CAAA,CAEEU,CAQA,CARMM,CAAA,CAAM,CAAN,CAQN,CANKA,CAAA,CAAM,CAAN,CAML;AANkBA,CAAA,CAAM,CAAN,CAMlB,GALEN,CAKF,EALSM,CAAA,CAAM,CAAN,CAAA,CAAW,SAAX,CAAuB,SAKhC,EAL6CN,CAK7C,EAHAtH,CAGA,CAHI4H,CAAAC,MAGJ,CAFAT,CAAA,CAAQO,CAAAG,OAAA,CAAW,CAAX,CAAc9H,CAAd,CAAR,CAEA,CADAqH,CAAA,CAAQC,CAAR,CAAaM,CAAA,CAAM,CAAN,CAAAlH,QAAA,CAAiBmG,CAAjB,CAAgC,EAAhC,CAAb,CACA,CAAAc,CAAA,CAAMA,CAAAI,UAAA,CAAc/H,CAAd,CAAkB4H,CAAA,CAAM,CAAN,CAAA3H,OAAlB,CAERmH,EAAA,CAAQO,CAAR,CACA,OAAOhB,EAAA,CAAUnE,CAAA3D,KAAA,CAAU,EAAV,CAAV,CA3BiC,CAXmC,CAAlC,CAA7C,CArtB2B,CAA1B,CAAD,CA2xBGR,MA3xBH,CA2xBWA,MAAAC,QA3xBX;",
+  "sources":["angular-sanitize.js"],
+  "names":["window","angular","sanitizeText","chars","buf","htmlSanitizeWriter","writer","noop","join","$sanitizeMinErr","$$minErr","bind","extend","forEach","isDefined","lowercase","nodeContains","htmlParser","module","provider","$SanitizeProvider","toMap","str","lowercaseKeys","obj","items","split","i","length","attrToMap","attrs","map","ii","attr","name","value","encodeEntities","replace","SURROGATE_PAIR_REGEXP","hi","charCodeAt","low","NON_ALPHANUMERIC_REGEXP","stripCustomNsAttrs","node","nodeType","Node","ELEMENT_NODE","attributes","l","attrNode","attrName","toLowerCase","lastIndexOf","removeAttributeNode","nextNode","firstChild","getNonDescendant","propName","call","outerHTML","outerText","svgEnabled","$get","$$sanitizeUri","validElements","svgElements","html","uri","isImage","test","enableSvg","this.enableSvg","htmlParserImpl","handler","undefined","inertBodyElement","getInertBodyElement","mXSSAttempts","innerHTML","start","nodeName","textContent","end","removeChild","htmlSanitizeWriterImpl","uriValidator","ignoreCurrentElement","out","push","tag","blockedElements","key","lkey","validAttrs","uriAttrs","voidElements","prototype","contains","arg","compareDocumentPosition","optionalEndTagBlockElements","optionalEndTagInlineElements","optionalEndTagElements","blockElements","inlineElements","htmlAttrs","svgAttrs","document","getInertBodyElement_DOMParser","body","parseFromString","DOMParser","remove","e","getInertBodyElement_InertDocument","documentMode","inertDocument","implementation","createHTMLDocument","querySelector","documentElement","getDocumentElement","getInertBodyElement_XHR","encodeURI","xhr","XMLHttpRequest","responseType","open","send","response","info","angularVersion","filter","$sanitize","LINKY_URL_REGEXP","MAILTO_REGEXP","linkyMinErr","isFunction","isObject","isString","text","target","addText","addLink","url","linkAttributes","attributesFn","getAttributesObject","getEmptyAttributesObject","raw","match","index","substr","substring"]
 }
\ No newline at end of file
diff --git a/setup/pub/angular-ui-bootstrap/angular-ui-bootstrap.min.js b/setup/pub/angular-ui-bootstrap/angular-ui-bootstrap.min.js
index fa6a8613174cf..2676e0ae9dd18 100644
--- a/setup/pub/angular-ui-bootstrap/angular-ui-bootstrap.min.js
+++ b/setup/pub/angular-ui-bootstrap/angular-ui-bootstrap.min.js
@@ -6,5 +6,5 @@
  * License: MIT
  */
 angular.module("ui.bootstrap",["ui.bootstrap.tpls","ui.bootstrap.transition","ui.bootstrap.collapse","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.bindHtml","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.position","ui.bootstrap.datepicker","ui.bootstrap.dropdown","ui.bootstrap.modal","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]),angular.module("ui.bootstrap.tpls",["template/accordion/accordion-group.html","template/accordion/accordion.html","template/alert/alert.html","template/carousel/carousel.html","template/carousel/slide.html","template/datepicker/datepicker.html","template/datepicker/day.html","template/datepicker/month.html","template/datepicker/popup.html","template/datepicker/year.html","template/modal/backdrop.html","template/modal/window.html","template/pagination/pager.html","template/pagination/pagination.html","template/tooltip/tooltip-html-unsafe-popup.html","template/tooltip/tooltip-popup.html","template/popover/popover.html","template/progressbar/bar.html","template/progressbar/progress.html","template/progressbar/progressbar.html","template/rating/rating.html","template/tabs/tab.html","template/tabs/tabset.html","template/timepicker/timepicker.html","template/typeahead/typeahead-match.html","template/typeahead/typeahead-popup.html"]),angular.module("ui.bootstrap.transition",[]).factory("$transition",["$q","$timeout","$rootScope",function(a,b,c){function d(a){for(var b in a)if(void 0!==f.style[b])return a[b]}var e=function(d,f,g){g=g||{};var h=a.defer(),i=e[g.animation?"animationEndEventName":"transitionEndEventName"],j=function(){c.$apply(function(){d.unbind(i,j),h.resolve(d)})};return i&&d.bind(i,j),b(function(){angular.isString(f)?d.addClass(f):angular.isFunction(f)?f(d):angular.isObject(f)&&d.css(f),i||h.resolve(d)}),h.promise.cancel=function(){i&&d.unbind(i,j),h.reject("Transition cancelled")},h.promise},f=document.createElement("trans"),g={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",transition:"transitionend"},h={WebkitTransition:"webkitAnimationEnd",MozTransition:"animationend",OTransition:"oAnimationEnd",transition:"animationend"};return e.transitionEndEventName=d(g),e.animationEndEventName=d(h),e}]),angular.module("ui.bootstrap.collapse",["ui.bootstrap.transition"]).directive("collapse",["$transition",function(a){return{link:function(b,c,d){function e(b){function d(){j===e&&(j=void 0)}var e=a(c,b);return j&&j.cancel(),j=e,e.then(d,d),e}function f(){k?(k=!1,g()):(c.removeClass("collapse").addClass("collapsing"),e({height:c[0].scrollHeight+"px"}).then(g))}function g(){c.removeClass("collapsing"),c.addClass("collapse in"),c.css({height:"auto"})}function h(){if(k)k=!1,i(),c.css({height:0});else{c.css({height:c[0].scrollHeight+"px"});{c[0].offsetWidth}c.removeClass("collapse in").addClass("collapsing"),e({height:0}).then(i)}}function i(){c.removeClass("collapsing"),c.addClass("collapse")}var j,k=!0;b.$watch(d.collapse,function(a){a?h():f()})}}}]),angular.module("ui.bootstrap.accordion",["ui.bootstrap.collapse"]).constant("accordionConfig",{closeOthers:!0}).controller("AccordionController",["$scope","$attrs","accordionConfig",function(a,b,c){this.groups=[],this.closeOthers=function(d){var e=angular.isDefined(b.closeOthers)?a.$eval(b.closeOthers):c.closeOthers;e&&angular.forEach(this.groups,function(a){a!==d&&(a.isOpen=!1)})},this.addGroup=function(a){var b=this;this.groups.push(a),a.$on("$destroy",function(){b.removeGroup(a)})},this.removeGroup=function(a){var b=this.groups.indexOf(a);-1!==b&&this.groups.splice(b,1)}}]).directive("accordion",function(){return{restrict:"EA",controller:"AccordionController",transclude:!0,replace:!1,templateUrl:"template/accordion/accordion.html"}}).directive("accordionGroup",function(){return{require:"^accordion",restrict:"EA",transclude:!0,replace:!0,templateUrl:"template/accordion/accordion-group.html",scope:{heading:"@",isOpen:"=?",isDisabled:"=?"},controller:function(){this.setHeading=function(a){this.heading=a}},link:function(a,b,c,d){d.addGroup(a),a.$watch("isOpen",function(b){b&&d.closeOthers(a)}),a.toggleOpen=function(){a.isDisabled||(a.isOpen=!a.isOpen)}}}}).directive("accordionHeading",function(){return{restrict:"EA",transclude:!0,template:"",replace:!0,require:"^accordionGroup",link:function(a,b,c,d,e){d.setHeading(e(a,function(){}))}}}).directive("accordionTransclude",function(){return{require:"^accordionGroup",link:function(a,b,c,d){a.$watch(function(){return d[c.accordionTransclude]},function(a){a&&(b.html(""),b.append(a))})}}}),angular.module("ui.bootstrap.alert",[]).controller("AlertController",["$scope","$attrs",function(a,b){a.closeable="close"in b}]).directive("alert",function(){return{restrict:"EA",controller:"AlertController",templateUrl:"template/alert/alert.html",transclude:!0,replace:!0,scope:{type:"@",close:"&"}}}),angular.module("ui.bootstrap.bindHtml",[]).directive("bindHtmlUnsafe",function(){return function(a,b,c){b.addClass("ng-binding").data("$binding",c.bindHtmlUnsafe),a.$watch(c.bindHtmlUnsafe,function(a){b.html(a||"")})}}),angular.module("ui.bootstrap.buttons",[]).constant("buttonConfig",{activeClass:"active",toggleEvent:"click"}).controller("ButtonsController",["buttonConfig",function(a){this.activeClass=a.activeClass||"active",this.toggleEvent=a.toggleEvent||"click"}]).directive("btnRadio",function(){return{require:["btnRadio","ngModel"],controller:"ButtonsController",link:function(a,b,c,d){var e=d[0],f=d[1];f.$render=function(){b.toggleClass(e.activeClass,angular.equals(f.$modelValue,a.$eval(c.btnRadio)))},b.bind(e.toggleEvent,function(){var d=b.hasClass(e.activeClass);(!d||angular.isDefined(c.uncheckable))&&a.$apply(function(){f.$setViewValue(d?null:a.$eval(c.btnRadio)),f.$render()})})}}}).directive("btnCheckbox",function(){return{require:["btnCheckbox","ngModel"],controller:"ButtonsController",link:function(a,b,c,d){function e(){return g(c.btnCheckboxTrue,!0)}function f(){return g(c.btnCheckboxFalse,!1)}function g(b,c){var d=a.$eval(b);return angular.isDefined(d)?d:c}var h=d[0],i=d[1];i.$render=function(){b.toggleClass(h.activeClass,angular.equals(i.$modelValue,e()))},b.bind(h.toggleEvent,function(){a.$apply(function(){i.$setViewValue(b.hasClass(h.activeClass)?f():e()),i.$render()})})}}}),angular.module("ui.bootstrap.carousel",["ui.bootstrap.transition"]).controller("CarouselController",["$scope","$timeout","$transition",function(a,b,c){function d(){e();var c=+a.interval;!isNaN(c)&&c>=0&&(g=b(f,c))}function e(){g&&(b.cancel(g),g=null)}function f(){h?(a.next(),d()):a.pause()}var g,h,i=this,j=i.slides=a.slides=[],k=-1;i.currentSlide=null;var l=!1;i.select=a.select=function(e,f){function g(){if(!l){if(i.currentSlide&&angular.isString(f)&&!a.noTransition&&e.$element){e.$element.addClass(f);{e.$element[0].offsetWidth}angular.forEach(j,function(a){angular.extend(a,{direction:"",entering:!1,leaving:!1,active:!1})}),angular.extend(e,{direction:f,active:!0,entering:!0}),angular.extend(i.currentSlide||{},{direction:f,leaving:!0}),a.$currentTransition=c(e.$element,{}),function(b,c){a.$currentTransition.then(function(){h(b,c)},function(){h(b,c)})}(e,i.currentSlide)}else h(e,i.currentSlide);i.currentSlide=e,k=m,d()}}function h(b,c){angular.extend(b,{direction:"",active:!0,leaving:!1,entering:!1}),angular.extend(c||{},{direction:"",active:!1,leaving:!1,entering:!1}),a.$currentTransition=null}var m=j.indexOf(e);void 0===f&&(f=m>k?"next":"prev"),e&&e!==i.currentSlide&&(a.$currentTransition?(a.$currentTransition.cancel(),b(g)):g())},a.$on("$destroy",function(){l=!0}),i.indexOfSlide=function(a){return j.indexOf(a)},a.next=function(){var b=(k+1)%j.length;return a.$currentTransition?void 0:i.select(j[b],"next")},a.prev=function(){var b=0>k-1?j.length-1:k-1;return a.$currentTransition?void 0:i.select(j[b],"prev")},a.isActive=function(a){return i.currentSlide===a},a.$watch("interval",d),a.$on("$destroy",e),a.play=function(){h||(h=!0,d())},a.pause=function(){a.noPause||(h=!1,e())},i.addSlide=function(b,c){b.$element=c,j.push(b),1===j.length||b.active?(i.select(j[j.length-1]),1==j.length&&a.play()):b.active=!1},i.removeSlide=function(a){var b=j.indexOf(a);j.splice(b,1),j.length>0&&a.active?i.select(b>=j.length?j[b-1]:j[b]):k>b&&k--}}]).directive("carousel",[function(){return{restrict:"EA",transclude:!0,replace:!0,controller:"CarouselController",require:"carousel",templateUrl:"template/carousel/carousel.html",scope:{interval:"=",noTransition:"=",noPause:"="}}}]).directive("slide",function(){return{require:"^carousel",restrict:"EA",transclude:!0,replace:!0,templateUrl:"template/carousel/slide.html",scope:{active:"=?"},link:function(a,b,c,d){d.addSlide(a,b),a.$on("$destroy",function(){d.removeSlide(a)}),a.$watch("active",function(b){b&&d.select(a)})}}}),angular.module("ui.bootstrap.dateparser",[]).service("dateParser",["$locale","orderByFilter",function(a,b){function c(a,b,c){return 1===b&&c>28?29===c&&(a%4===0&&a%100!==0||a%400===0):3===b||5===b||8===b||10===b?31>c:!0}this.parsers={};var d={yyyy:{regex:"\\d{4}",apply:function(a){this.year=+a}},yy:{regex:"\\d{2}",apply:function(a){this.year=+a+2e3}},y:{regex:"\\d{1,4}",apply:function(a){this.year=+a}},MMMM:{regex:a.DATETIME_FORMATS.MONTH.join("|"),apply:function(b){this.month=a.DATETIME_FORMATS.MONTH.indexOf(b)}},MMM:{regex:a.DATETIME_FORMATS.SHORTMONTH.join("|"),apply:function(b){this.month=a.DATETIME_FORMATS.SHORTMONTH.indexOf(b)}},MM:{regex:"0[1-9]|1[0-2]",apply:function(a){this.month=a-1}},M:{regex:"[1-9]|1[0-2]",apply:function(a){this.month=a-1}},dd:{regex:"[0-2][0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a}},d:{regex:"[1-2]?[0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a}},EEEE:{regex:a.DATETIME_FORMATS.DAY.join("|")},EEE:{regex:a.DATETIME_FORMATS.SHORTDAY.join("|")}};this.createParser=function(a){var c=[],e=a.split("");return angular.forEach(d,function(b,d){var f=a.indexOf(d);if(f>-1){a=a.split(""),e[f]="("+b.regex+")",a[f]="$";for(var g=f+1,h=f+d.length;h>g;g++)e[g]="",a[g]="$";a=a.join(""),c.push({index:f,apply:b.apply})}}),{regex:new RegExp("^"+e.join("")+"$"),map:b(c,"index")}},this.parse=function(b,d){if(!angular.isString(b))return b;d=a.DATETIME_FORMATS[d]||d,this.parsers[d]||(this.parsers[d]=this.createParser(d));var e=this.parsers[d],f=e.regex,g=e.map,h=b.match(f);if(h&&h.length){for(var i,j={year:1900,month:0,date:1,hours:0},k=1,l=h.length;l>k;k++){var m=g[k-1];m.apply&&m.apply.call(j,h[k])}return c(j.year,j.month,j.date)&&(i=new Date(j.year,j.month,j.date,j.hours)),i}}}]),angular.module("ui.bootstrap.position",[]).factory("$position",["$document","$window",function(a,b){function c(a,c){return a.currentStyle?a.currentStyle[c]:b.getComputedStyle?b.getComputedStyle(a)[c]:a.style[c]}function d(a){return"static"===(c(a,"position")||"static")}var e=function(b){for(var c=a[0],e=b.offsetParent||c;e&&e!==c&&d(e);)e=e.offsetParent;return e||c};return{position:function(b){var c=this.offset(b),d={top:0,left:0},f=e(b[0]);f!=a[0]&&(d=this.offset(angular.element(f)),d.top+=f.clientTop-f.scrollTop,d.left+=f.clientLeft-f.scrollLeft);var g=b[0].getBoundingClientRect();return{width:g.width||b.prop("offsetWidth"),height:g.height||b.prop("offsetHeight"),top:c.top-d.top,left:c.left-d.left}},offset:function(c){var d=c[0].getBoundingClientRect();return{width:d.width||c.prop("offsetWidth"),height:d.height||c.prop("offsetHeight"),top:d.top+(b.pageYOffset||a[0].documentElement.scrollTop),left:d.left+(b.pageXOffset||a[0].documentElement.scrollLeft)}},positionElements:function(a,b,c,d){var e,f,g,h,i=c.split("-"),j=i[0],k=i[1]||"center";e=d?this.offset(a):this.position(a),f=b.prop("offsetWidth"),g=b.prop("offsetHeight");var l={center:function(){return e.left+e.width/2-f/2},left:function(){return e.left},right:function(){return e.left+e.width}},m={center:function(){return e.top+e.height/2-g/2},top:function(){return e.top},bottom:function(){return e.top+e.height}};switch(j){case"right":h={top:m[k](),left:l[j]()};break;case"left":h={top:m[k](),left:e.left-f};break;case"bottom":h={top:m[j](),left:l[k]()};break;default:h={top:e.top-g,left:l[k]()}}return h}}}]),angular.module("ui.bootstrap.datepicker",["ui.bootstrap.dateparser","ui.bootstrap.position"]).constant("datepickerConfig",{formatDay:"dd",formatMonth:"MMMM",formatYear:"yyyy",formatDayHeader:"EEE",formatDayTitle:"MMMM yyyy",formatMonthTitle:"yyyy",datepickerMode:"day",minMode:"day",maxMode:"year",showWeeks:!0,startingDay:0,yearRange:20,minDate:null,maxDate:null}).controller("DatepickerController",["$scope","$attrs","$parse","$interpolate","$timeout","$log","dateFilter","datepickerConfig",function(a,b,c,d,e,f,g,h){var i=this,j={$setViewValue:angular.noop};this.modes=["day","month","year"],angular.forEach(["formatDay","formatMonth","formatYear","formatDayHeader","formatDayTitle","formatMonthTitle","minMode","maxMode","showWeeks","startingDay","yearRange"],function(c,e){i[c]=angular.isDefined(b[c])?8>e?d(b[c])(a.$parent):a.$parent.$eval(b[c]):h[c]}),angular.forEach(["minDate","maxDate"],function(d){b[d]?a.$parent.$watch(c(b[d]),function(a){i[d]=a?new Date(a):null,i.refreshView()}):i[d]=h[d]?new Date(h[d]):null}),a.datepickerMode=a.datepickerMode||h.datepickerMode,a.uniqueId="datepicker-"+a.$id+"-"+Math.floor(1e4*Math.random()),this.activeDate=angular.isDefined(b.initDate)?a.$parent.$eval(b.initDate):new Date,a.isActive=function(b){return 0===i.compare(b.date,i.activeDate)?(a.activeDateId=b.uid,!0):!1},this.init=function(a){j=a,j.$render=function(){i.render()}},this.render=function(){if(j.$modelValue){var a=new Date(j.$modelValue),b=!isNaN(a);b?this.activeDate=a:f.error('Datepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.'),j.$setValidity("date",b)}this.refreshView()},this.refreshView=function(){if(this.element){this._refreshView();var a=j.$modelValue?new Date(j.$modelValue):null;j.$setValidity("date-disabled",!a||this.element&&!this.isDisabled(a))}},this.createDateObject=function(a,b){var c=j.$modelValue?new Date(j.$modelValue):null;return{date:a,label:g(a,b),selected:c&&0===this.compare(a,c),disabled:this.isDisabled(a),current:0===this.compare(a,new Date)}},this.isDisabled=function(c){return this.minDate&&this.compare(c,this.minDate)<0||this.maxDate&&this.compare(c,this.maxDate)>0||b.dateDisabled&&a.dateDisabled({date:c,mode:a.datepickerMode})},this.split=function(a,b){for(var c=[];a.length>0;)c.push(a.splice(0,b));return c},a.select=function(b){if(a.datepickerMode===i.minMode){var c=j.$modelValue?new Date(j.$modelValue):new Date(0,0,0,0,0,0,0);c.setFullYear(b.getFullYear(),b.getMonth(),b.getDate()),j.$setViewValue(c),j.$render()}else i.activeDate=b,a.datepickerMode=i.modes[i.modes.indexOf(a.datepickerMode)-1]},a.move=function(a){var b=i.activeDate.getFullYear()+a*(i.step.years||0),c=i.activeDate.getMonth()+a*(i.step.months||0);i.activeDate.setFullYear(b,c,1),i.refreshView()},a.toggleMode=function(b){b=b||1,a.datepickerMode===i.maxMode&&1===b||a.datepickerMode===i.minMode&&-1===b||(a.datepickerMode=i.modes[i.modes.indexOf(a.datepickerMode)+b])},a.keys={13:"enter",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down"};var k=function(){e(function(){i.element[0].focus()},0,!1)};a.$on("datepicker.focus",k),a.keydown=function(b){var c=a.keys[b.which];if(c&&!b.shiftKey&&!b.altKey)if(b.preventDefault(),b.stopPropagation(),"enter"===c||"space"===c){if(i.isDisabled(i.activeDate))return;a.select(i.activeDate),k()}else!b.ctrlKey||"up"!==c&&"down"!==c?(i.handleKeyDown(c,b),i.refreshView()):(a.toggleMode("up"===c?1:-1),k())}}]).directive("datepicker",function(){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/datepicker.html",scope:{datepickerMode:"=?",dateDisabled:"&"},require:["datepicker","?^ngModel"],controller:"DatepickerController",link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f)}}}).directive("daypicker",["dateFilter",function(a){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/day.html",require:"^datepicker",link:function(b,c,d,e){function f(a,b){return 1!==b||a%4!==0||a%100===0&&a%400!==0?i[b]:29}function g(a,b){var c=new Array(b),d=new Date(a),e=0;for(d.setHours(12);b>e;)c[e++]=new Date(d),d.setDate(d.getDate()+1);return c}function h(a){var b=new Date(a);b.setDate(b.getDate()+4-(b.getDay()||7));var c=b.getTime();return b.setMonth(0),b.setDate(1),Math.floor(Math.round((c-b)/864e5)/7)+1}b.showWeeks=e.showWeeks,e.step={months:1},e.element=c;var i=[31,28,31,30,31,30,31,31,30,31,30,31];e._refreshView=function(){var c=e.activeDate.getFullYear(),d=e.activeDate.getMonth(),f=new Date(c,d,1),i=e.startingDay-f.getDay(),j=i>0?7-i:-i,k=new Date(f);j>0&&k.setDate(-j+1);for(var l=g(k,42),m=0;42>m;m++)l[m]=angular.extend(e.createDateObject(l[m],e.formatDay),{secondary:l[m].getMonth()!==d,uid:b.uniqueId+"-"+m});b.labels=new Array(7);for(var n=0;7>n;n++)b.labels[n]={abbr:a(l[n].date,e.formatDayHeader),full:a(l[n].date,"EEEE")};if(b.title=a(e.activeDate,e.formatDayTitle),b.rows=e.split(l,7),b.showWeeks){b.weekNumbers=[];for(var o=h(b.rows[0][0].date),p=b.rows.length;b.weekNumbers.push(o++)<p;);}},e.compare=function(a,b){return new Date(a.getFullYear(),a.getMonth(),a.getDate())-new Date(b.getFullYear(),b.getMonth(),b.getDate())},e.handleKeyDown=function(a){var b=e.activeDate.getDate();if("left"===a)b-=1;else if("up"===a)b-=7;else if("right"===a)b+=1;else if("down"===a)b+=7;else if("pageup"===a||"pagedown"===a){var c=e.activeDate.getMonth()+("pageup"===a?-1:1);e.activeDate.setMonth(c,1),b=Math.min(f(e.activeDate.getFullYear(),e.activeDate.getMonth()),b)}else"home"===a?b=1:"end"===a&&(b=f(e.activeDate.getFullYear(),e.activeDate.getMonth()));e.activeDate.setDate(b)},e.refreshView()}}}]).directive("monthpicker",["dateFilter",function(a){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/month.html",require:"^datepicker",link:function(b,c,d,e){e.step={years:1},e.element=c,e._refreshView=function(){for(var c=new Array(12),d=e.activeDate.getFullYear(),f=0;12>f;f++)c[f]=angular.extend(e.createDateObject(new Date(d,f,1),e.formatMonth),{uid:b.uniqueId+"-"+f});b.title=a(e.activeDate,e.formatMonthTitle),b.rows=e.split(c,3)},e.compare=function(a,b){return new Date(a.getFullYear(),a.getMonth())-new Date(b.getFullYear(),b.getMonth())},e.handleKeyDown=function(a){var b=e.activeDate.getMonth();if("left"===a)b-=1;else if("up"===a)b-=3;else if("right"===a)b+=1;else if("down"===a)b+=3;else if("pageup"===a||"pagedown"===a){var c=e.activeDate.getFullYear()+("pageup"===a?-1:1);e.activeDate.setFullYear(c)}else"home"===a?b=0:"end"===a&&(b=11);e.activeDate.setMonth(b)},e.refreshView()}}}]).directive("yearpicker",["dateFilter",function(){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/year.html",require:"^datepicker",link:function(a,b,c,d){function e(a){return parseInt((a-1)/f,10)*f+1}var f=d.yearRange;d.step={years:f},d.element=b,d._refreshView=function(){for(var b=new Array(f),c=0,g=e(d.activeDate.getFullYear());f>c;c++)b[c]=angular.extend(d.createDateObject(new Date(g+c,0,1),d.formatYear),{uid:a.uniqueId+"-"+c});a.title=[b[0].label,b[f-1].label].join(" - "),a.rows=d.split(b,5)},d.compare=function(a,b){return a.getFullYear()-b.getFullYear()},d.handleKeyDown=function(a){var b=d.activeDate.getFullYear();"left"===a?b-=1:"up"===a?b-=5:"right"===a?b+=1:"down"===a?b+=5:"pageup"===a||"pagedown"===a?b+=("pageup"===a?-1:1)*d.step.years:"home"===a?b=e(d.activeDate.getFullYear()):"end"===a&&(b=e(d.activeDate.getFullYear())+f-1),d.activeDate.setFullYear(b)},d.refreshView()}}}]).constant("datepickerPopupConfig",{datepickerPopup:"yyyy-MM-dd",currentText:"Today",clearText:"Clear",closeText:"Done",closeOnDateSelection:!0,appendToBody:!1,showButtonBar:!0}).directive("datepickerPopup",["$compile","$parse","$document","$position","dateFilter","dateParser","datepickerPopupConfig",function(a,b,c,d,e,f,g){return{restrict:"EA",require:"ngModel",scope:{isOpen:"=?",currentText:"@",clearText:"@",closeText:"@",dateDisabled:"&"},link:function(h,i,j,k){function l(a){return a.replace(/([A-Z])/g,function(a){return"-"+a.toLowerCase()})}function m(a){if(a){if(angular.isDate(a)&&!isNaN(a))return k.$setValidity("date",!0),a;if(angular.isString(a)){var b=f.parse(a,n)||new Date(a);return isNaN(b)?void k.$setValidity("date",!1):(k.$setValidity("date",!0),b)}return void k.$setValidity("date",!1)}return k.$setValidity("date",!0),null}var n,o=angular.isDefined(j.closeOnDateSelection)?h.$parent.$eval(j.closeOnDateSelection):g.closeOnDateSelection,p=angular.isDefined(j.datepickerAppendToBody)?h.$parent.$eval(j.datepickerAppendToBody):g.appendToBody;h.showButtonBar=angular.isDefined(j.showButtonBar)?h.$parent.$eval(j.showButtonBar):g.showButtonBar,h.getText=function(a){return h[a+"Text"]||g[a+"Text"]},j.$observe("datepickerPopup",function(a){n=a||g.datepickerPopup,k.$render()});var q=angular.element("<div datepicker-popup-wrap><div datepicker></div></div>");q.attr({"ng-model":"date","ng-change":"dateSelection()"});var r=angular.element(q.children()[0]);j.datepickerOptions&&angular.forEach(h.$parent.$eval(j.datepickerOptions),function(a,b){r.attr(l(b),a)}),angular.forEach(["minDate","maxDate"],function(a){j[a]&&(h.$parent.$watch(b(j[a]),function(b){h[a]=b}),r.attr(l(a),a))}),j.dateDisabled&&r.attr("date-disabled","dateDisabled({ date: date, mode: mode })"),k.$parsers.unshift(m),h.dateSelection=function(a){angular.isDefined(a)&&(h.date=a),k.$setViewValue(h.date),k.$render(),o&&(h.isOpen=!1,i[0].focus())},i.bind("input change keyup",function(){h.$apply(function(){h.date=k.$modelValue})}),k.$render=function(){var a=k.$viewValue?e(k.$viewValue,n):"";i.val(a),h.date=m(k.$modelValue)};var s=function(a){h.isOpen&&a.target!==i[0]&&h.$apply(function(){h.isOpen=!1})},t=function(a){h.keydown(a)};i.bind("keydown",t),h.keydown=function(a){27===a.which?(a.preventDefault(),a.stopPropagation(),h.close()):40!==a.which||h.isOpen||(h.isOpen=!0)},h.$watch("isOpen",function(a){a?(h.$broadcast("datepicker.focus"),h.position=p?d.offset(i):d.position(i),h.position.top=h.position.top+i.prop("offsetHeight"),c.bind("click",s)):c.unbind("click",s)}),h.select=function(a){if("today"===a){var b=new Date;angular.isDate(k.$modelValue)?(a=new Date(k.$modelValue),a.setFullYear(b.getFullYear(),b.getMonth(),b.getDate())):a=new Date(b.setHours(0,0,0,0))}h.dateSelection(a)},h.close=function(){h.isOpen=!1,i[0].focus()};var u=a(q)(h);p?c.find("body").append(u):i.after(u),h.$on("$destroy",function(){u.remove(),i.unbind("keydown",t),c.unbind("click",s)})}}}]).directive("datepickerPopupWrap",function(){return{restrict:"EA",replace:!0,transclude:!0,templateUrl:"template/datepicker/popup.html",link:function(a,b){b.bind("click",function(a){a.preventDefault(),a.stopPropagation()})}}}),angular.module("ui.bootstrap.dropdown",[]).constant("dropdownConfig",{openClass:"open"}).service("dropdownService",["$document",function(a){var b=null;this.open=function(e){b||(a.bind("click",c),a.bind("keydown",d)),b&&b!==e&&(b.isOpen=!1),b=e},this.close=function(e){b===e&&(b=null,a.unbind("click",c),a.unbind("keydown",d))};var c=function(a){a&&a.isDefaultPrevented()||b.$apply(function(){b.isOpen=!1})},d=function(a){27===a.which&&(b.focusToggleElement(),c())}}]).controller("DropdownController",["$scope","$attrs","$parse","dropdownConfig","dropdownService","$animate",function(a,b,c,d,e,f){var g,h=this,i=a.$new(),j=d.openClass,k=angular.noop,l=b.onToggle?c(b.onToggle):angular.noop;this.init=function(d){h.$element=d,b.isOpen&&(g=c(b.isOpen),k=g.assign,a.$watch(g,function(a){i.isOpen=!!a}))},this.toggle=function(a){return i.isOpen=arguments.length?!!a:!i.isOpen},this.isOpen=function(){return i.isOpen},i.focusToggleElement=function(){h.toggleElement&&h.toggleElement[0].focus()},i.$watch("isOpen",function(b,c){f[b?"addClass":"removeClass"](h.$element,j),b?(i.focusToggleElement(),e.open(i)):e.close(i),k(a,b),angular.isDefined(b)&&b!==c&&l(a,{open:!!b})}),a.$on("$locationChangeSuccess",function(){i.isOpen=!1}),a.$on("$destroy",function(){i.$destroy()})}]).directive("dropdown",function(){return{restrict:"CA",controller:"DropdownController",link:function(a,b,c,d){d.init(b)}}}).directive("dropdownToggle",function(){return{restrict:"CA",require:"?^dropdown",link:function(a,b,c,d){if(d){d.toggleElement=b;var e=function(e){e.preventDefault(),b.hasClass("disabled")||c.disabled||a.$apply(function(){d.toggle()})};b.bind("click",e),b.attr({"aria-haspopup":!0,"aria-expanded":!1}),a.$watch(d.isOpen,function(a){b.attr("aria-expanded",!!a)}),a.$on("$destroy",function(){b.unbind("click",e)})}}}}),angular.module("ui.bootstrap.modal",["ui.bootstrap.transition"]).factory("$$stackedMap",function(){return{createNew:function(){var a=[];return{add:function(b,c){a.push({key:b,value:c})},get:function(b){for(var c=0;c<a.length;c++)if(b==a[c].key)return a[c]},keys:function(){for(var b=[],c=0;c<a.length;c++)b.push(a[c].key);return b},top:function(){return a[a.length-1]},remove:function(b){for(var c=-1,d=0;d<a.length;d++)if(b==a[d].key){c=d;break}return a.splice(c,1)[0]},removeTop:function(){return a.splice(a.length-1,1)[0]},length:function(){return a.length}}}}}).directive("modalBackdrop",["$timeout",function(a){return{restrict:"EA",replace:!0,templateUrl:"template/modal/backdrop.html",link:function(b){b.animate=!1,a(function(){b.animate=!0})}}}]).directive("modalWindow",["$modalStack","$timeout",function(a,b){return{restrict:"EA",scope:{index:"@",animate:"="},replace:!0,transclude:!0,templateUrl:function(a,b){return b.templateUrl||"template/modal/window.html"},link:function(c,d,e){d.addClass(e.windowClass||""),c.size=e.size,b(function(){c.animate=!0,d[0].focus()}),c.close=function(b){var c=a.getTop();c&&c.value.backdrop&&"static"!=c.value.backdrop&&b.target===b.currentTarget&&(b.preventDefault(),b.stopPropagation(),a.dismiss(c.key,"backdrop click"))}}}}]).factory("$modalStack",["$transition","$timeout","$document","$compile","$rootScope","$$stackedMap",function(a,b,c,d,e,f){function g(){for(var a=-1,b=n.keys(),c=0;c<b.length;c++)n.get(b[c]).value.backdrop&&(a=c);return a}function h(a){var b=c.find("body").eq(0),d=n.get(a).value;n.remove(a),j(d.modalDomEl,d.modalScope,300,function(){d.modalScope.$destroy(),b.toggleClass(m,n.length()>0),i()})}function i(){if(k&&-1==g()){var a=l;j(k,l,150,function(){a.$destroy(),a=null}),k=void 0,l=void 0}}function j(c,d,e,f){function g(){g.done||(g.done=!0,c.remove(),f&&f())}d.animate=!1;var h=a.transitionEndEventName;if(h){var i=b(g,e);c.bind(h,function(){b.cancel(i),g(),d.$apply()})}else b(g,0)}var k,l,m="modal-open",n=f.createNew(),o={};return e.$watch(g,function(a){l&&(l.index=a)}),c.bind("keydown",function(a){var b;27===a.which&&(b=n.top(),b&&b.value.keyboard&&(a.preventDefault(),e.$apply(function(){o.dismiss(b.key,"escape key press")})))}),o.open=function(a,b){n.add(a,{deferred:b.deferred,modalScope:b.scope,backdrop:b.backdrop,keyboard:b.keyboard});var f=c.find("body").eq(0),h=g();h>=0&&!k&&(l=e.$new(!0),l.index=h,k=d("<div modal-backdrop></div>")(l),f.append(k));var i=angular.element("<div modal-window></div>");i.attr({"template-url":b.windowTemplateUrl,"window-class":b.windowClass,size:b.size,index:n.length()-1,animate:"animate"}).html(b.content);var j=d(i)(b.scope);n.top().value.modalDomEl=j,f.append(j),f.addClass(m)},o.close=function(a,b){var c=n.get(a).value;c&&(c.deferred.resolve(b),h(a))},o.dismiss=function(a,b){var c=n.get(a).value;c&&(c.deferred.reject(b),h(a))},o.dismissAll=function(a){for(var b=this.getTop();b;)this.dismiss(b.key,a),b=this.getTop()},o.getTop=function(){return n.top()},o}]).provider("$modal",function(){var a={options:{backdrop:!0,keyboard:!0},$get:["$injector","$rootScope","$q","$http","$templateCache","$controller","$modalStack",function(b,c,d,e,f,g,h){function i(a){return a.template?d.when(a.template):e.get(a.templateUrl,{cache:f}).then(function(a){return a.data})}function j(a){var c=[];return angular.forEach(a,function(a){(angular.isFunction(a)||angular.isArray(a))&&c.push(d.when(b.invoke(a)))}),c}var k={};return k.open=function(b){var e=d.defer(),f=d.defer(),k={result:e.promise,opened:f.promise,close:function(a){h.close(k,a)},dismiss:function(a){h.dismiss(k,a)}};if(b=angular.extend({},a.options,b),b.resolve=b.resolve||{},!b.template&&!b.templateUrl)throw new Error("One of template or templateUrl options is required.");var l=d.all([i(b)].concat(j(b.resolve)));return l.then(function(a){var d=(b.scope||c).$new();d.$close=k.close,d.$dismiss=k.dismiss;var f,i={},j=1;b.controller&&(i.$scope=d,i.$modalInstance=k,angular.forEach(b.resolve,function(b,c){i[c]=a[j++]}),f=g(b.controller,i)),h.open(k,{scope:d,deferred:e,content:a[0],backdrop:b.backdrop,keyboard:b.keyboard,windowClass:b.windowClass,windowTemplateUrl:b.windowTemplateUrl,size:b.size})},function(a){e.reject(a)}),l.then(function(){f.resolve(!0)},function(){f.reject(!1)}),k},k}]};return a}),angular.module("ui.bootstrap.pagination",[]).controller("PaginationController",["$scope","$attrs","$parse",function(a,b,c){var d=this,e={$setViewValue:angular.noop},f=b.numPages?c(b.numPages).assign:angular.noop;this.init=function(f,g){e=f,this.config=g,e.$render=function(){d.render()},b.itemsPerPage?a.$parent.$watch(c(b.itemsPerPage),function(b){d.itemsPerPage=parseInt(b,10),a.totalPages=d.calculateTotalPages()}):this.itemsPerPage=g.itemsPerPage},this.calculateTotalPages=function(){var b=this.itemsPerPage<1?1:Math.ceil(a.totalItems/this.itemsPerPage);return Math.max(b||0,1)},this.render=function(){a.page=parseInt(e.$viewValue,10)||1},a.selectPage=function(b){a.page!==b&&b>0&&b<=a.totalPages&&(e.$setViewValue(b),e.$render())},a.getText=function(b){return a[b+"Text"]||d.config[b+"Text"]},a.noPrevious=function(){return 1===a.page},a.noNext=function(){return a.page===a.totalPages},a.$watch("totalItems",function(){a.totalPages=d.calculateTotalPages()}),a.$watch("totalPages",function(b){f(a.$parent,b),a.page>b?a.selectPage(b):e.$render()})}]).constant("paginationConfig",{itemsPerPage:10,boundaryLinks:!1,directionLinks:!0,firstText:"First",previousText:"Previous",nextText:"Next",lastText:"Last",rotate:!0}).directive("pagination",["$parse","paginationConfig",function(a,b){return{restrict:"EA",scope:{totalItems:"=",firstText:"@",previousText:"@",nextText:"@",lastText:"@"},require:["pagination","?ngModel"],controller:"PaginationController",templateUrl:"template/pagination/pagination.html",replace:!0,link:function(c,d,e,f){function g(a,b,c){return{number:a,text:b,active:c}}function h(a,b){var c=[],d=1,e=b,f=angular.isDefined(k)&&b>k;f&&(l?(d=Math.max(a-Math.floor(k/2),1),e=d+k-1,e>b&&(e=b,d=e-k+1)):(d=(Math.ceil(a/k)-1)*k+1,e=Math.min(d+k-1,b)));for(var h=d;e>=h;h++){var i=g(h,h,h===a);c.push(i)}if(f&&!l){if(d>1){var j=g(d-1,"...",!1);c.unshift(j)}if(b>e){var m=g(e+1,"...",!1);c.push(m)}}return c}var i=f[0],j=f[1];if(j){var k=angular.isDefined(e.maxSize)?c.$parent.$eval(e.maxSize):b.maxSize,l=angular.isDefined(e.rotate)?c.$parent.$eval(e.rotate):b.rotate;c.boundaryLinks=angular.isDefined(e.boundaryLinks)?c.$parent.$eval(e.boundaryLinks):b.boundaryLinks,c.directionLinks=angular.isDefined(e.directionLinks)?c.$parent.$eval(e.directionLinks):b.directionLinks,i.init(j,b),e.maxSize&&c.$parent.$watch(a(e.maxSize),function(a){k=parseInt(a,10),i.render()});var m=i.render;i.render=function(){m(),c.page>0&&c.page<=c.totalPages&&(c.pages=h(c.page,c.totalPages))}}}}}]).constant("pagerConfig",{itemsPerPage:10,previousText:"« Previous",nextText:"Next »",align:!0}).directive("pager",["pagerConfig",function(a){return{restrict:"EA",scope:{totalItems:"=",previousText:"@",nextText:"@"},require:["pager","?ngModel"],controller:"PaginationController",templateUrl:"template/pagination/pager.html",replace:!0,link:function(b,c,d,e){var f=e[0],g=e[1];g&&(b.align=angular.isDefined(d.align)?b.$parent.$eval(d.align):a.align,f.init(g,a))}}}]),angular.module("ui.bootstrap.tooltip",["ui.bootstrap.position","ui.bootstrap.bindHtml"]).provider("$tooltip",function(){function a(a){var b=/[A-Z]/g,c="-";
-return a.replace(b,function(a,b){return(b?c:"")+a.toLowerCase()})}var b={placement:"top",animation:!0,popupDelay:0},c={mouseenter:"mouseleave",click:"click",focus:"blur"},d={};this.options=function(a){angular.extend(d,a)},this.setTriggers=function(a){angular.extend(c,a)},this.$get=["$window","$compile","$timeout","$parse","$document","$position","$interpolate",function(e,f,g,h,i,j,k){return function(e,l,m){function n(a){var b=a||o.trigger||m,d=c[b]||b;return{show:b,hide:d}}var o=angular.extend({},b,d),p=a(e),q=k.startSymbol(),r=k.endSymbol(),s="<div "+p+'-popup title="'+q+"tt_title"+r+'" content="'+q+"tt_content"+r+'" placement="'+q+"tt_placement"+r+'" animation="tt_animation" is-open="tt_isOpen"></div>';return{restrict:"EA",scope:!0,compile:function(){var a=f(s);return function(b,c,d){function f(){b.tt_isOpen?m():k()}function k(){(!y||b.$eval(d[l+"Enable"]))&&(b.tt_popupDelay?v||(v=g(p,b.tt_popupDelay,!1),v.then(function(a){a()})):p()())}function m(){b.$apply(function(){q()})}function p(){return v=null,u&&(g.cancel(u),u=null),b.tt_content?(r(),t.css({top:0,left:0,display:"block"}),w?i.find("body").append(t):c.after(t),z(),b.tt_isOpen=!0,b.$digest(),z):angular.noop}function q(){b.tt_isOpen=!1,g.cancel(v),v=null,b.tt_animation?u||(u=g(s,500)):s()}function r(){t&&s(),t=a(b,function(){}),b.$digest()}function s(){u=null,t&&(t.remove(),t=null)}var t,u,v,w=angular.isDefined(o.appendToBody)?o.appendToBody:!1,x=n(void 0),y=angular.isDefined(d[l+"Enable"]),z=function(){var a=j.positionElements(c,t,b.tt_placement,w);a.top+="px",a.left+="px",t.css(a)};b.tt_isOpen=!1,d.$observe(e,function(a){b.tt_content=a,!a&&b.tt_isOpen&&q()}),d.$observe(l+"Title",function(a){b.tt_title=a}),d.$observe(l+"Placement",function(a){b.tt_placement=angular.isDefined(a)?a:o.placement}),d.$observe(l+"PopupDelay",function(a){var c=parseInt(a,10);b.tt_popupDelay=isNaN(c)?o.popupDelay:c});var A=function(){c.unbind(x.show,k),c.unbind(x.hide,m)};d.$observe(l+"Trigger",function(a){A(),x=n(a),x.show===x.hide?c.bind(x.show,f):(c.bind(x.show,k),c.bind(x.hide,m))});var B=b.$eval(d[l+"Animation"]);b.tt_animation=angular.isDefined(B)?!!B:o.animation,d.$observe(l+"AppendToBody",function(a){w=angular.isDefined(a)?h(a)(b):w}),w&&b.$on("$locationChangeSuccess",function(){b.tt_isOpen&&q()}),b.$on("$destroy",function(){g.cancel(u),g.cancel(v),A(),s()})}}}}}]}).directive("tooltipPopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-popup.html"}}).directive("tooltip",["$tooltip",function(a){return a("tooltip","tooltip","mouseenter")}]).directive("tooltipHtmlUnsafePopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-html-unsafe-popup.html"}}).directive("tooltipHtmlUnsafe",["$tooltip",function(a){return a("tooltipHtmlUnsafe","tooltip","mouseenter")}]),angular.module("ui.bootstrap.popover",["ui.bootstrap.tooltip"]).directive("popoverPopup",function(){return{restrict:"EA",replace:!0,scope:{title:"@",content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/popover/popover.html"}}).directive("popover",["$tooltip",function(a){return a("popover","popover","click")}]),angular.module("ui.bootstrap.progressbar",[]).constant("progressConfig",{animate:!0,max:100}).controller("ProgressController",["$scope","$attrs","progressConfig",function(a,b,c){var d=this,e=angular.isDefined(b.animate)?a.$parent.$eval(b.animate):c.animate;this.bars=[],a.max=angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max,this.addBar=function(b,c){e||c.css({transition:"none"}),this.bars.push(b),b.$watch("value",function(c){b.percent=+(100*c/a.max).toFixed(2)}),b.$on("$destroy",function(){c=null,d.removeBar(b)})},this.removeBar=function(a){this.bars.splice(this.bars.indexOf(a),1)}}]).directive("progress",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",require:"progress",scope:{},templateUrl:"template/progressbar/progress.html"}}).directive("bar",function(){return{restrict:"EA",replace:!0,transclude:!0,require:"^progress",scope:{value:"=",type:"@"},templateUrl:"template/progressbar/bar.html",link:function(a,b,c,d){d.addBar(a,b)}}}).directive("progressbar",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",scope:{value:"=",type:"@"},templateUrl:"template/progressbar/progressbar.html",link:function(a,b,c,d){d.addBar(a,angular.element(b.children()[0]))}}}),angular.module("ui.bootstrap.rating",[]).constant("ratingConfig",{max:5,stateOn:null,stateOff:null}).controller("RatingController",["$scope","$attrs","ratingConfig",function(a,b,c){var d={$setViewValue:angular.noop};this.init=function(e){d=e,d.$render=this.render,this.stateOn=angular.isDefined(b.stateOn)?a.$parent.$eval(b.stateOn):c.stateOn,this.stateOff=angular.isDefined(b.stateOff)?a.$parent.$eval(b.stateOff):c.stateOff;var f=angular.isDefined(b.ratingStates)?a.$parent.$eval(b.ratingStates):new Array(angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max);a.range=this.buildTemplateObjects(f)},this.buildTemplateObjects=function(a){for(var b=0,c=a.length;c>b;b++)a[b]=angular.extend({index:b},{stateOn:this.stateOn,stateOff:this.stateOff},a[b]);return a},a.rate=function(b){!a.readonly&&b>=0&&b<=a.range.length&&(d.$setViewValue(b),d.$render())},a.enter=function(b){a.readonly||(a.value=b),a.onHover({value:b})},a.reset=function(){a.value=d.$viewValue,a.onLeave()},a.onKeydown=function(b){/(37|38|39|40)/.test(b.which)&&(b.preventDefault(),b.stopPropagation(),a.rate(a.value+(38===b.which||39===b.which?1:-1)))},this.render=function(){a.value=d.$viewValue}}]).directive("rating",function(){return{restrict:"EA",require:["rating","ngModel"],scope:{readonly:"=?",onHover:"&",onLeave:"&"},controller:"RatingController",templateUrl:"template/rating/rating.html",replace:!0,link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f)}}}),angular.module("ui.bootstrap.tabs",[]).controller("TabsetController",["$scope",function(a){var b=this,c=b.tabs=a.tabs=[];b.select=function(a){angular.forEach(c,function(b){b.active&&b!==a&&(b.active=!1,b.onDeselect())}),a.active=!0,a.onSelect()},b.addTab=function(a){c.push(a),1===c.length?a.active=!0:a.active&&b.select(a)},b.removeTab=function(a){var d=c.indexOf(a);if(a.active&&c.length>1){var e=d==c.length-1?d-1:d+1;b.select(c[e])}c.splice(d,1)}}]).directive("tabset",function(){return{restrict:"EA",transclude:!0,replace:!0,scope:{type:"@"},controller:"TabsetController",templateUrl:"template/tabs/tabset.html",link:function(a,b,c){a.vertical=angular.isDefined(c.vertical)?a.$parent.$eval(c.vertical):!1,a.justified=angular.isDefined(c.justified)?a.$parent.$eval(c.justified):!1}}}).directive("tab",["$parse",function(a){return{require:"^tabset",restrict:"EA",replace:!0,templateUrl:"template/tabs/tab.html",transclude:!0,scope:{active:"=?",heading:"@",onSelect:"&select",onDeselect:"&deselect"},controller:function(){},compile:function(b,c,d){return function(b,c,e,f){b.$watch("active",function(a){a&&f.select(b)}),b.disabled=!1,e.disabled&&b.$parent.$watch(a(e.disabled),function(a){b.disabled=!!a}),b.select=function(){b.disabled||(b.active=!0)},f.addTab(b),b.$on("$destroy",function(){f.removeTab(b)}),b.$transcludeFn=d}}}}]).directive("tabHeadingTransclude",[function(){return{restrict:"A",require:"^tab",link:function(a,b){a.$watch("headingElement",function(a){a&&(b.html(""),b.append(a))})}}}]).directive("tabContentTransclude",function(){function a(a){return a.tagName&&(a.hasAttribute("tab-heading")||a.hasAttribute("data-tab-heading")||"tab-heading"===a.tagName.toLowerCase()||"data-tab-heading"===a.tagName.toLowerCase())}return{restrict:"A",require:"^tabset",link:function(b,c,d){var e=b.$eval(d.tabContentTransclude);e.$transcludeFn(e.$parent,function(b){angular.forEach(b,function(b){a(b)?e.headingElement=b:c.append(b)})})}}}),angular.module("ui.bootstrap.timepicker",[]).constant("timepickerConfig",{hourStep:1,minuteStep:1,showMeridian:!0,meridians:null,readonlyInput:!1,mousewheel:!0}).controller("TimepickerController",["$scope","$attrs","$parse","$log","$locale","timepickerConfig",function(a,b,c,d,e,f){function g(){var b=parseInt(a.hours,10),c=a.showMeridian?b>0&&13>b:b>=0&&24>b;return c?(a.showMeridian&&(12===b&&(b=0),a.meridian===p[1]&&(b+=12)),b):void 0}function h(){var b=parseInt(a.minutes,10);return b>=0&&60>b?b:void 0}function i(a){return angular.isDefined(a)&&a.toString().length<2?"0"+a:a}function j(a){k(),o.$setViewValue(new Date(n)),l(a)}function k(){o.$setValidity("time",!0),a.invalidHours=!1,a.invalidMinutes=!1}function l(b){var c=n.getHours(),d=n.getMinutes();a.showMeridian&&(c=0===c||12===c?12:c%12),a.hours="h"===b?c:i(c),a.minutes="m"===b?d:i(d),a.meridian=n.getHours()<12?p[0]:p[1]}function m(a){var b=new Date(n.getTime()+6e4*a);n.setHours(b.getHours(),b.getMinutes()),j()}var n=new Date,o={$setViewValue:angular.noop},p=angular.isDefined(b.meridians)?a.$parent.$eval(b.meridians):f.meridians||e.DATETIME_FORMATS.AMPMS;this.init=function(c,d){o=c,o.$render=this.render;var e=d.eq(0),g=d.eq(1),h=angular.isDefined(b.mousewheel)?a.$parent.$eval(b.mousewheel):f.mousewheel;h&&this.setupMousewheelEvents(e,g),a.readonlyInput=angular.isDefined(b.readonlyInput)?a.$parent.$eval(b.readonlyInput):f.readonlyInput,this.setupInputEvents(e,g)};var q=f.hourStep;b.hourStep&&a.$parent.$watch(c(b.hourStep),function(a){q=parseInt(a,10)});var r=f.minuteStep;b.minuteStep&&a.$parent.$watch(c(b.minuteStep),function(a){r=parseInt(a,10)}),a.showMeridian=f.showMeridian,b.showMeridian&&a.$parent.$watch(c(b.showMeridian),function(b){if(a.showMeridian=!!b,o.$error.time){var c=g(),d=h();angular.isDefined(c)&&angular.isDefined(d)&&(n.setHours(c),j())}else l()}),this.setupMousewheelEvents=function(b,c){var d=function(a){a.originalEvent&&(a=a.originalEvent);var b=a.wheelDelta?a.wheelDelta:-a.deltaY;return a.detail||b>0};b.bind("mousewheel wheel",function(b){a.$apply(d(b)?a.incrementHours():a.decrementHours()),b.preventDefault()}),c.bind("mousewheel wheel",function(b){a.$apply(d(b)?a.incrementMinutes():a.decrementMinutes()),b.preventDefault()})},this.setupInputEvents=function(b,c){if(a.readonlyInput)return a.updateHours=angular.noop,void(a.updateMinutes=angular.noop);var d=function(b,c){o.$setViewValue(null),o.$setValidity("time",!1),angular.isDefined(b)&&(a.invalidHours=b),angular.isDefined(c)&&(a.invalidMinutes=c)};a.updateHours=function(){var a=g();angular.isDefined(a)?(n.setHours(a),j("h")):d(!0)},b.bind("blur",function(){!a.invalidHours&&a.hours<10&&a.$apply(function(){a.hours=i(a.hours)})}),a.updateMinutes=function(){var a=h();angular.isDefined(a)?(n.setMinutes(a),j("m")):d(void 0,!0)},c.bind("blur",function(){!a.invalidMinutes&&a.minutes<10&&a.$apply(function(){a.minutes=i(a.minutes)})})},this.render=function(){var a=o.$modelValue?new Date(o.$modelValue):null;isNaN(a)?(o.$setValidity("time",!1),d.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')):(a&&(n=a),k(),l())},a.incrementHours=function(){m(60*q)},a.decrementHours=function(){m(60*-q)},a.incrementMinutes=function(){m(r)},a.decrementMinutes=function(){m(-r)},a.toggleMeridian=function(){m(720*(n.getHours()<12?1:-1))}}]).directive("timepicker",function(){return{restrict:"EA",require:["timepicker","?^ngModel"],controller:"TimepickerController",replace:!0,scope:{},templateUrl:"template/timepicker/timepicker.html",link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f,b.find("input"))}}}),angular.module("ui.bootstrap.typeahead",["ui.bootstrap.position","ui.bootstrap.bindHtml"]).factory("typeaheadParser",["$parse",function(a){var b=/^\s*(.*?)(?:\s+as\s+(.*?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+(.*)$/;return{parse:function(c){var d=c.match(b);if(!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "'+c+'".');return{itemName:d[3],source:a(d[4]),viewMapper:a(d[2]||d[1]),modelMapper:a(d[1])}}}}]).directive("typeahead",["$compile","$parse","$q","$timeout","$document","$position","typeaheadParser",function(a,b,c,d,e,f,g){var h=[9,13,27,38,40];return{require:"ngModel",link:function(i,j,k,l){var m,n=i.$eval(k.typeaheadMinLength)||1,o=i.$eval(k.typeaheadWaitMs)||0,p=i.$eval(k.typeaheadEditable)!==!1,q=b(k.typeaheadLoading).assign||angular.noop,r=b(k.typeaheadOnSelect),s=k.typeaheadInputFormatter?b(k.typeaheadInputFormatter):void 0,t=k.typeaheadAppendToBody?i.$eval(k.typeaheadAppendToBody):!1,u=b(k.ngModel).assign,v=g.parse(k.typeahead),w=i.$new();i.$on("$destroy",function(){w.$destroy()});var x="typeahead-"+w.$id+"-"+Math.floor(1e4*Math.random());j.attr({"aria-autocomplete":"list","aria-expanded":!1,"aria-owns":x});var y=angular.element("<div typeahead-popup></div>");y.attr({id:x,matches:"matches",active:"activeIdx",select:"select(activeIdx)",query:"query",position:"position"}),angular.isDefined(k.typeaheadTemplateUrl)&&y.attr("template-url",k.typeaheadTemplateUrl);var z=function(){w.matches=[],w.activeIdx=-1,j.attr("aria-expanded",!1)},A=function(a){return x+"-option-"+a};w.$watch("activeIdx",function(a){0>a?j.removeAttr("aria-activedescendant"):j.attr("aria-activedescendant",A(a))});var B=function(a){var b={$viewValue:a};q(i,!0),c.when(v.source(i,b)).then(function(c){var d=a===l.$viewValue;if(d&&m)if(c.length>0){w.activeIdx=0,w.matches.length=0;for(var e=0;e<c.length;e++)b[v.itemName]=c[e],w.matches.push({id:A(e),label:v.viewMapper(w,b),model:c[e]});w.query=a,w.position=t?f.offset(j):f.position(j),w.position.top=w.position.top+j.prop("offsetHeight"),j.attr("aria-expanded",!0)}else z();d&&q(i,!1)},function(){z(),q(i,!1)})};z(),w.query=void 0;var C;l.$parsers.unshift(function(a){return m=!0,a&&a.length>=n?o>0?(C&&d.cancel(C),C=d(function(){B(a)},o)):B(a):(q(i,!1),z()),p?a:a?void l.$setValidity("editable",!1):(l.$setValidity("editable",!0),a)}),l.$formatters.push(function(a){var b,c,d={};return s?(d.$model=a,s(i,d)):(d[v.itemName]=a,b=v.viewMapper(i,d),d[v.itemName]=void 0,c=v.viewMapper(i,d),b!==c?b:a)}),w.select=function(a){var b,c,e={};e[v.itemName]=c=w.matches[a].model,b=v.modelMapper(i,e),u(i,b),l.$setValidity("editable",!0),r(i,{$item:c,$model:b,$label:v.viewMapper(i,e)}),z(),d(function(){j[0].focus()},0,!1)},j.bind("keydown",function(a){0!==w.matches.length&&-1!==h.indexOf(a.which)&&(a.preventDefault(),40===a.which?(w.activeIdx=(w.activeIdx+1)%w.matches.length,w.$digest()):38===a.which?(w.activeIdx=(w.activeIdx?w.activeIdx:w.matches.length)-1,w.$digest()):13===a.which||9===a.which?w.$apply(function(){w.select(w.activeIdx)}):27===a.which&&(a.stopPropagation(),z(),w.$digest()))}),j.bind("blur",function(){m=!1});var D=function(a){j[0]!==a.target&&(z(),w.$digest())};e.bind("click",D),i.$on("$destroy",function(){e.unbind("click",D)});var E=a(y)(w);t?e.find("body").append(E):j.after(E)}}}]).directive("typeaheadPopup",function(){return{restrict:"EA",scope:{matches:"=",query:"=",active:"=",position:"=",select:"&"},replace:!0,templateUrl:"template/typeahead/typeahead-popup.html",link:function(a,b,c){a.templateUrl=c.templateUrl,a.isOpen=function(){return a.matches.length>0},a.isActive=function(b){return a.active==b},a.selectActive=function(b){a.active=b},a.selectMatch=function(b){a.select({activeIdx:b})}}}}).directive("typeaheadMatch",["$http","$templateCache","$compile","$parse",function(a,b,c,d){return{restrict:"EA",scope:{index:"=",match:"=",query:"="},link:function(e,f,g){var h=d(g.templateUrl)(e.$parent)||"template/typeahead/typeahead-match.html";a.get(h,{cache:b}).success(function(a){f.replaceWith(c(a.trim())(e))})}}}]).filter("typeaheadHighlight",function(){function a(a){return a.replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")}return function(b,c){return c?(""+b).replace(new RegExp(a(c),"gi"),"<strong>$&</strong>"):b}}),angular.module("template/accordion/accordion-group.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion-group.html",'<div class="panel panel-default">\n  <div class="panel-heading">\n    <h4 class="panel-title">\n      <a class="accordion-toggle" ng-click="toggleOpen()" accordion-transclude="heading"><span ng-class="{\'text-muted\': isDisabled}">{{heading}}</span></a>\n    </h4>\n  </div>\n  <div class="panel-collapse" collapse="!isOpen">\n	  <div class="panel-body" ng-transclude></div>\n  </div>\n</div>')}]),angular.module("template/accordion/accordion.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion.html",'<div class="panel-group" ng-transclude></div>')}]),angular.module("template/alert/alert.html",[]).run(["$templateCache",function(a){a.put("template/alert/alert.html",'<div class="alert" ng-class="{\'alert-{{type || \'warning\'}}\': true, \'alert-dismissable\': closeable}" role="alert">\n    <button ng-show="closeable" type="button" class="close" ng-click="close()">\n        <span aria-hidden="true">&times;</span>\n        <span class="sr-only">Close</span>\n    </button>\n    <div ng-transclude></div>\n</div>\n')}]),angular.module("template/carousel/carousel.html",[]).run(["$templateCache",function(a){a.put("template/carousel/carousel.html",'<div ng-mouseenter="pause()" ng-mouseleave="play()" class="carousel" ng-swipe-right="prev()" ng-swipe-left="next()">\n    <ol class="carousel-indicators" ng-show="slides.length > 1">\n        <li ng-repeat="slide in slides track by $index" ng-class="{active: isActive(slide)}" ng-click="select(slide)"></li>\n    </ol>\n    <div class="carousel-inner" ng-transclude></div>\n    <a class="left carousel-control" ng-click="prev()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-left"></span></a>\n    <a class="right carousel-control" ng-click="next()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-right"></span></a>\n</div>\n')}]),angular.module("template/carousel/slide.html",[]).run(["$templateCache",function(a){a.put("template/carousel/slide.html","<div ng-class=\"{\n    'active': leaving || (active && !entering),\n    'prev': (next || active) && direction=='prev',\n    'next': (next || active) && direction=='next',\n    'right': direction=='prev',\n    'left': direction=='next'\n  }\" class=\"item text-center\" ng-transclude></div>\n")}]),angular.module("template/datepicker/datepicker.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/datepicker.html",'<div ng-switch="datepickerMode" role="application" ng-keydown="keydown($event)">\n  <daypicker ng-switch-when="day" tabindex="0"></daypicker>\n  <monthpicker ng-switch-when="month" tabindex="0"></monthpicker>\n  <yearpicker ng-switch-when="year" tabindex="0"></yearpicker>\n</div>')}]),angular.module("template/datepicker/day.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/day.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th colspan="{{5 + showWeeks}}"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n    <tr>\n      <th ng-show="showWeeks" class="text-center"></th>\n      <th ng-repeat="label in labels track by $index" class="text-center"><small aria-label="{{label.full}}">{{label.abbr}}</small></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-show="showWeeks" class="text-center h6"><em>{{ weekNumbers[$index] }}</em></td>\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default btn-sm" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-muted\': dt.secondary, \'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/datepicker/month.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/month.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/datepicker/popup.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/popup.html",'<ul class="dropdown-menu" ng-style="{display: (isOpen && \'block\') || \'none\', top: position.top+\'px\', left: position.left+\'px\'}" ng-keydown="keydown($event)">\n	<li ng-transclude></li>\n	<li ng-if="showButtonBar" style="padding:10px 9px 2px">\n		<span class="btn-group">\n			<button type="button" class="btn btn-sm btn-info" ng-click="select(\'today\')">{{ getText(\'current\') }}</button>\n			<button type="button" class="btn btn-sm btn-danger" ng-click="select(null)">{{ getText(\'clear\') }}</button>\n		</span>\n		<button type="button" class="btn btn-sm btn-success pull-right" ng-click="close()">{{ getText(\'close\') }}</button>\n	</li>\n</ul>\n')}]),angular.module("template/datepicker/year.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/year.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th colspan="3"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/modal/backdrop.html",[]).run(["$templateCache",function(a){a.put("template/modal/backdrop.html",'<div class="modal-backdrop fade"\n     ng-class="{in: animate}"\n     ng-style="{\'z-index\': 1040 + (index && 1 || 0) + index*10}"\n></div>\n')}]),angular.module("template/modal/window.html",[]).run(["$templateCache",function(a){a.put("template/modal/window.html",'<div tabindex="-1" role="dialog" class="modal fade" ng-class="{in: animate}" ng-style="{\'z-index\': 1050 + index*10, display: \'block\'}" ng-click="close($event)">\n    <div class="modal-dialog" ng-class="{\'modal-sm\': size == \'sm\', \'modal-lg\': size == \'lg\'}"><div class="modal-content" ng-transclude></div></div>\n</div>')}]),angular.module("template/pagination/pager.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pager.html",'<ul class="pager">\n  <li ng-class="{disabled: noPrevious(), previous: align}"><a href ng-click="selectPage(page - 1)">{{getText(\'previous\')}}</a></li>\n  <li ng-class="{disabled: noNext(), next: align}"><a href ng-click="selectPage(page + 1)">{{getText(\'next\')}}</a></li>\n</ul>')}]),angular.module("template/pagination/pagination.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pagination.html",'<ul class="pagination">\n  <li ng-if="boundaryLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(1)">{{getText(\'first\')}}</a></li>\n  <li ng-if="directionLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(page - 1)">{{getText(\'previous\')}}</a></li>\n  <li ng-repeat="page in pages track by $index" ng-class="{active: page.active}"><a href ng-click="selectPage(page.number)">{{page.text}}</a></li>\n  <li ng-if="directionLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(page + 1)">{{getText(\'next\')}}</a></li>\n  <li ng-if="boundaryLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(totalPages)">{{getText(\'last\')}}</a></li>\n</ul>')}]),angular.module("template/tooltip/tooltip-html-unsafe-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-html-unsafe-popup.html",'<div class="tooltip {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" bind-html-unsafe="content"></div>\n</div>\n')}]),angular.module("template/tooltip/tooltip-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-popup.html",'<div class="tooltip {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" ng-bind="content"></div>\n</div>\n')}]),angular.module("template/popover/popover.html",[]).run(["$templateCache",function(a){a.put("template/popover/popover.html",'<div class="popover {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">\n  <div class="arrow"></div>\n\n  <div class="popover-inner">\n      <h3 class="popover-title" ng-bind="title" ng-show="title"></h3>\n      <div class="popover-content" ng-bind="content"></div>\n  </div>\n</div>\n')}]),angular.module("template/progressbar/bar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/bar.html",'<div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: percent + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>')}]),angular.module("template/progressbar/progress.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progress.html",'<div class="progress" ng-transclude></div>')}]),angular.module("template/progressbar/progressbar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progressbar.html",'<div class="progress">\n  <div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: percent + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n</div>')}]),angular.module("template/rating/rating.html",[]).run(["$templateCache",function(a){a.put("template/rating/rating.html",'<span ng-mouseleave="reset()" ng-keydown="onKeydown($event)" tabindex="0" role="slider" aria-valuemin="0" aria-valuemax="{{range.length}}" aria-valuenow="{{value}}">\n    <i ng-repeat="r in range track by $index" ng-mouseenter="enter($index + 1)" ng-click="rate($index + 1)" class="glyphicon" ng-class="$index < value && (r.stateOn || \'glyphicon-star\') || (r.stateOff || \'glyphicon-star-empty\')">\n        <span class="sr-only">({{ $index < value ? \'*\' : \' \' }})</span>\n    </i>\n</span>')}]),angular.module("template/tabs/tab.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tab.html",'<li ng-class="{active: active, disabled: disabled}">\n  <a ng-click="select()" tab-heading-transclude>{{heading}}</a>\n</li>\n')}]),angular.module("template/tabs/tabset-titles.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset-titles.html","<ul class=\"nav {{type && 'nav-' + type}}\" ng-class=\"{'nav-stacked': vertical}\">\n</ul>\n")}]),angular.module("template/tabs/tabset.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset.html",'\n<div>\n  <ul class="nav nav-{{type || \'tabs\'}}" ng-class="{\'nav-stacked\': vertical, \'nav-justified\': justified}" ng-transclude></ul>\n  <div class="tab-content">\n    <div class="tab-pane" \n         ng-repeat="tab in tabs" \n         ng-class="{active: tab.active}"\n         tab-content-transclude="tab">\n    </div>\n  </div>\n</div>\n')}]),angular.module("template/timepicker/timepicker.html",[]).run(["$templateCache",function(a){a.put("template/timepicker/timepicker.html",'<table>\n	<tbody>\n		<tr class="text-center">\n			<td><a ng-click="incrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n			<td>&nbsp;</td>\n			<td><a ng-click="incrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n			<td ng-show="showMeridian"></td>\n		</tr>\n		<tr>\n			<td style="width:50px;" class="form-group" ng-class="{\'has-error\': invalidHours}">\n				<input type="text" ng-model="hours" ng-change="updateHours()" class="form-control text-center" ng-mousewheel="incrementHours()" ng-readonly="readonlyInput" maxlength="2">\n			</td>\n			<td>:</td>\n			<td style="width:50px;" class="form-group" ng-class="{\'has-error\': invalidMinutes}">\n				<input type="text" ng-model="minutes" ng-change="updateMinutes()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n			</td>\n			<td ng-show="showMeridian"><button type="button" class="btn btn-default text-center" ng-click="toggleMeridian()">{{meridian}}</button></td>\n		</tr>\n		<tr class="text-center">\n			<td><a ng-click="decrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n			<td>&nbsp;</td>\n			<td><a ng-click="decrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n			<td ng-show="showMeridian"></td>\n		</tr>\n	</tbody>\n</table>\n')}]),angular.module("template/typeahead/typeahead-match.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-match.html",'<a tabindex="-1" bind-html-unsafe="match.label | typeaheadHighlight:query"></a>')}]),angular.module("template/typeahead/typeahead-popup.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-popup.html",'<ul class="dropdown-menu" ng-if="isOpen()" ng-style="{top: position.top+\'px\', left: position.left+\'px\'}" style="display: block;" role="listbox" aria-hidden="{{!isOpen()}}">\n    <li ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index)" role="option" id="{{match.id}}">\n        <div typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div>\n    </li>\n</ul>')
+    return a.replace(b,function(a,b){return(b?c:"")+a.toLowerCase()})}var b={placement:"top",animation:!0,popupDelay:0},c={mouseenter:"mouseleave",click:"click",focus:"blur"},d={};this.options=function(a){angular.extend(d,a)},this.setTriggers=function(a){angular.extend(c,a)},this.$get=["$window","$compile","$timeout","$parse","$document","$position","$interpolate",function(e,f,g,h,i,j,k){return function(e,l,m){function n(a){var b=a||o.trigger||m,d=c[b]||b;return{show:b,hide:d}}var o=angular.extend({},b,d),p=a(e),q=k.startSymbol(),r=k.endSymbol(),s="<div "+p+'-popup title="'+q+"tt_title"+r+'" content="'+q+"tt_content"+r+'" placement="'+q+"tt_placement"+r+'" animation="tt_animation" is-open="tt_isOpen"></div>';return{restrict:"EA",scope:!0,compile:function(){var a=f(s);return function(b,c,d){function f(){b.tt_isOpen?m():k()}function k(){(!y||b.$eval(d[l+"Enable"]))&&(b.tt_popupDelay?v||(v=g(p,b.tt_popupDelay,!1),v.then(function(a){a()})):p()())}function m(){b.$apply(function(){q()})}function p(){return v=null,u&&(g.cancel(u),u=null),b.tt_content?(r(),t.css({top:0,left:0,display:"block"}),w?i.find("body").append(t):c.after(t),z(),b.tt_isOpen=!0,b.$digest(),z):angular.noop}function q(){b.tt_isOpen=!1,g.cancel(v),v=null,b.tt_animation?u||(u=g(s,500)):s()}function r(){t&&s(),t=a(b,function(){}),b.$digest()}function s(){u=null,t&&(t.remove(),t=null)}var t,u,v,w=angular.isDefined(o.appendToBody)?o.appendToBody:!1,x=n(void 0),y=angular.isDefined(d[l+"Enable"]),z=function(){var a=j.positionElements(c,t,b.tt_placement,w);a.top+="px",a.left+="px",t.css(a)};b.tt_isOpen=!1,d.$observe(e,function(a){b.tt_content=a,!a&&b.tt_isOpen&&q()}),d.$observe(l+"Title",function(a){b.tt_title=a}),d.$observe(l+"Placement",function(a){b.tt_placement=angular.isDefined(a)?a:o.placement}),d.$observe(l+"PopupDelay",function(a){var c=parseInt(a,10);b.tt_popupDelay=isNaN(c)?o.popupDelay:c});var A=function(){c.unbind(x.show,k),c.unbind(x.hide,m)};d.$observe(l+"Trigger",function(a){A(),x=n(a),x.show===x.hide?c.bind(x.show,f):(c.bind(x.show,k),c.bind(x.hide,m))});var B=b.$eval(d[l+"Animation"]);b.tt_animation=angular.isDefined(B)?!!B:o.animation,d.$observe(l+"AppendToBody",function(a){w=angular.isDefined(a)?h(a)(b):w}),w&&b.$on("$locationChangeSuccess",function(){b.tt_isOpen&&q()}),b.$on("$destroy",function(){g.cancel(u),g.cancel(v),A(),s()})}}}}}]}).directive("tooltipPopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-popup.html"}}).directive("tooltip",["$tooltip",function(a){return a("tooltip","tooltip","mouseenter")}]).directive("tooltipHtmlUnsafePopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-html-unsafe-popup.html"}}).directive("tooltipHtmlUnsafe",["$tooltip",function(a){return a("tooltipHtmlUnsafe","tooltip","mouseenter")}]),angular.module("ui.bootstrap.popover",["ui.bootstrap.tooltip"]).directive("popoverPopup",function(){return{restrict:"EA",replace:!0,scope:{title:"@",content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/popover/popover.html"}}).directive("popover",["$tooltip",function(a){return a("popover","popover","click")}]),angular.module("ui.bootstrap.progressbar",[]).constant("progressConfig",{animate:!0,max:100}).controller("ProgressController",["$scope","$attrs","progressConfig",function(a,b,c){var d=this,e=angular.isDefined(b.animate)?a.$parent.$eval(b.animate):c.animate;this.bars=[],a.max=angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max,this.addBar=function(b,c){e||c.css({transition:"none"}),this.bars.push(b),b.$watch("value",function(c){b.percent=+(100*c/a.max).toFixed(2)}),b.$on("$destroy",function(){c=null,d.removeBar(b)})},this.removeBar=function(a){this.bars.splice(this.bars.indexOf(a),1)}}]).directive("progress",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",require:"progress",scope:{},templateUrl:"template/progressbar/progress.html"}}).directive("bar",function(){return{restrict:"EA",replace:!0,transclude:!0,require:"^progress",scope:{value:"=",type:"@"},templateUrl:"template/progressbar/bar.html",link:function(a,b,c,d){d.addBar(a,b)}}}).directive("progressbar",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",scope:{value:"=",type:"@"},templateUrl:"template/progressbar/progressbar.html",link:function(a,b,c,d){d.addBar(a,angular.element(b.children()[0]))}}}),angular.module("ui.bootstrap.rating",[]).constant("ratingConfig",{max:5,stateOn:null,stateOff:null}).controller("RatingController",["$scope","$attrs","ratingConfig",function(a,b,c){var d={$setViewValue:angular.noop};this.init=function(e){d=e,d.$render=this.render,this.stateOn=angular.isDefined(b.stateOn)?a.$parent.$eval(b.stateOn):c.stateOn,this.stateOff=angular.isDefined(b.stateOff)?a.$parent.$eval(b.stateOff):c.stateOff;var f=angular.isDefined(b.ratingStates)?a.$parent.$eval(b.ratingStates):new Array(angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max);a.range=this.buildTemplateObjects(f)},this.buildTemplateObjects=function(a){for(var b=0,c=a.length;c>b;b++)a[b]=angular.extend({index:b},{stateOn:this.stateOn,stateOff:this.stateOff},a[b]);return a},a.rate=function(b){!a.readonly&&b>=0&&b<=a.range.length&&(d.$setViewValue(b),d.$render())},a.enter=function(b){a.readonly||(a.value=b),a.onHover({value:b})},a.reset=function(){a.value=d.$viewValue,a.onLeave()},a.onKeydown=function(b){/(37|38|39|40)/.test(b.which)&&(b.preventDefault(),b.stopPropagation(),a.rate(a.value+(38===b.which||39===b.which?1:-1)))},this.render=function(){a.value=d.$viewValue}}]).directive("rating",function(){return{restrict:"EA",require:["rating","ngModel"],scope:{readonly:"=?",onHover:"&",onLeave:"&"},controller:"RatingController",templateUrl:"template/rating/rating.html",replace:!0,link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f)}}}),angular.module("ui.bootstrap.tabs",[]).controller("TabsetController",["$scope",function(a){var b=this,c=b.tabs=a.tabs=[];b.select=function(a){angular.forEach(c,function(b){b.active&&b!==a&&(b.active=!1,b.onDeselect())}),a.active=!0,a.onSelect()},b.addTab=function(a){c.push(a),1===c.length?a.active=!0:a.active&&b.select(a)},b.removeTab=function(a){var d=c.indexOf(a);if(a.active&&c.length>1){var e=d==c.length-1?d-1:d+1;b.select(c[e])}c.splice(d,1)}}]).directive("tabset",function(){return{restrict:"EA",transclude:!0,replace:!0,scope:{type:"@"},controller:"TabsetController",templateUrl:"template/tabs/tabset.html",link:function(a,b,c){a.vertical=angular.isDefined(c.vertical)?a.$parent.$eval(c.vertical):!1,a.justified=angular.isDefined(c.justified)?a.$parent.$eval(c.justified):!1}}}).directive("tab",["$parse",function(a){return{require:"^tabset",restrict:"EA",replace:!0,templateUrl:"template/tabs/tab.html",transclude:!0,scope:{active:"=?",heading:"@",onSelect:"&select",onDeselect:"&deselect"},controller:function(){},compile:function(b,c,d){return function(b,c,e,f){b.$watch("active",function(a){a&&f.select(b)}),b.disabled=!1,e.disabled&&b.$parent.$watch(a(e.disabled),function(a){b.disabled=!!a}),b.select=function(){b.disabled||(b.active=!0)},f.addTab(b),b.$on("$destroy",function(){f.removeTab(b)}),b.$transcludeFn=d}}}}]).directive("tabHeadingTransclude",[function(){return{restrict:"A",require:"^tab",link:function(a,b){a.$watch("headingElement",function(a){a&&(b.html(""),b.append(a))})}}}]).directive("tabContentTransclude",function(){function a(a){return a.tagName&&(a.hasAttribute("tab-heading")||a.hasAttribute("data-tab-heading")||"tab-heading"===a.tagName.toLowerCase()||"data-tab-heading"===a.tagName.toLowerCase())}return{restrict:"A",require:"^tabset",link:function(b,c,d){var e=b.$eval(d.tabContentTransclude);e.$transcludeFn(e.$parent,function(b){angular.forEach(b,function(b){a(b)?e.headingElement=b:c.append(b)})})}}}),angular.module("ui.bootstrap.timepicker",[]).constant("timepickerConfig",{hourStep:1,minuteStep:1,showMeridian:!0,meridians:null,readonlyInput:!1,mousewheel:!0}).controller("TimepickerController",["$scope","$attrs","$parse","$log","$locale","timepickerConfig",function(a,b,c,d,e,f){function g(){var b=parseInt(a.hours,10),c=a.showMeridian?b>0&&13>b:b>=0&&24>b;return c?(a.showMeridian&&(12===b&&(b=0),a.meridian===p[1]&&(b+=12)),b):void 0}function h(){var b=parseInt(a.minutes,10);return b>=0&&60>b?b:void 0}function i(a){return angular.isDefined(a)&&a.toString().length<2?"0"+a:a}function j(a){k(),o.$setViewValue(new Date(n)),l(a)}function k(){o.$setValidity("time",!0),a.invalidHours=!1,a.invalidMinutes=!1}function l(b){var c=n.getHours(),d=n.getMinutes();a.showMeridian&&(c=0===c||12===c?12:c%12),a.hours="h"===b?c:i(c),a.minutes="m"===b?d:i(d),a.meridian=n.getHours()<12?p[0]:p[1]}function m(a){var b=new Date(n.getTime()+6e4*a);n.setHours(b.getHours(),b.getMinutes()),j()}var n=new Date,o={$setViewValue:angular.noop},p=angular.isDefined(b.meridians)?a.$parent.$eval(b.meridians):f.meridians||e.DATETIME_FORMATS.AMPMS;this.init=function(c,d){o=c,o.$render=this.render;var e=d.eq(0),g=d.eq(1),h=angular.isDefined(b.mousewheel)?a.$parent.$eval(b.mousewheel):f.mousewheel;h&&this.setupMousewheelEvents(e,g),a.readonlyInput=angular.isDefined(b.readonlyInput)?a.$parent.$eval(b.readonlyInput):f.readonlyInput,this.setupInputEvents(e,g)};var q=f.hourStep;b.hourStep&&a.$parent.$watch(c(b.hourStep),function(a){q=parseInt(a,10)});var r=f.minuteStep;b.minuteStep&&a.$parent.$watch(c(b.minuteStep),function(a){r=parseInt(a,10)}),a.showMeridian=f.showMeridian,b.showMeridian&&a.$parent.$watch(c(b.showMeridian),function(b){if(a.showMeridian=!!b,o.$error.time){var c=g(),d=h();angular.isDefined(c)&&angular.isDefined(d)&&(n.setHours(c),j())}else l()}),this.setupMousewheelEvents=function(b,c){var d=function(a){a.originalEvent&&(a=a.originalEvent);var b=a.wheelDelta?a.wheelDelta:-a.deltaY;return a.detail||b>0};b.bind("mousewheel wheel",function(b){a.$apply(d(b)?a.incrementHours():a.decrementHours()),b.preventDefault()}),c.bind("mousewheel wheel",function(b){a.$apply(d(b)?a.incrementMinutes():a.decrementMinutes()),b.preventDefault()})},this.setupInputEvents=function(b,c){if(a.readonlyInput)return a.updateHours=angular.noop,void(a.updateMinutes=angular.noop);var d=function(b,c){o.$setViewValue(null),o.$setValidity("time",!1),angular.isDefined(b)&&(a.invalidHours=b),angular.isDefined(c)&&(a.invalidMinutes=c)};a.updateHours=function(){var a=g();angular.isDefined(a)?(n.setHours(a),j("h")):d(!0)},b.bind("blur",function(){!a.invalidHours&&a.hours<10&&a.$apply(function(){a.hours=i(a.hours)})}),a.updateMinutes=function(){var a=h();angular.isDefined(a)?(n.setMinutes(a),j("m")):d(void 0,!0)},c.bind("blur",function(){!a.invalidMinutes&&a.minutes<10&&a.$apply(function(){a.minutes=i(a.minutes)})})},this.render=function(){var a=o.$modelValue?new Date(o.$modelValue):null;isNaN(a)?(o.$setValidity("time",!1),d.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')):(a&&(n=a),k(),l())},a.incrementHours=function(){m(60*q)},a.decrementHours=function(){m(60*-q)},a.incrementMinutes=function(){m(r)},a.decrementMinutes=function(){m(-r)},a.toggleMeridian=function(){m(720*(n.getHours()<12?1:-1))}}]).directive("timepicker",function(){return{restrict:"EA",require:["timepicker","?^ngModel"],controller:"TimepickerController",replace:!0,scope:{},templateUrl:"template/timepicker/timepicker.html",link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f,b.find("input"))}}}),angular.module("ui.bootstrap.typeahead",["ui.bootstrap.position","ui.bootstrap.bindHtml"]).factory("typeaheadParser",["$parse",function(a){var b=/^\s*(.*?)(?:\s+as\s+(.*?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+(.*)$/;return{parse:function(c){var d=c.match(b);if(!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "'+c+'".');return{itemName:d[3],source:a(d[4]),viewMapper:a(d[2]||d[1]),modelMapper:a(d[1])}}}}]).directive("typeahead",["$compile","$parse","$q","$timeout","$document","$position","typeaheadParser",function(a,b,c,d,e,f,g){var h=[9,13,27,38,40];return{require:"ngModel",link:function(i,j,k,l){var m,n=i.$eval(k.typeaheadMinLength)||1,o=i.$eval(k.typeaheadWaitMs)||0,p=i.$eval(k.typeaheadEditable)!==!1,q=b(k.typeaheadLoading).assign||angular.noop,r=b(k.typeaheadOnSelect),s=k.typeaheadInputFormatter?b(k.typeaheadInputFormatter):void 0,t=k.typeaheadAppendToBody?i.$eval(k.typeaheadAppendToBody):!1,u=b(k.ngModel).assign,v=g.parse(k.typeahead),w=i.$new();i.$on("$destroy",function(){w.$destroy()});var x="typeahead-"+w.$id+"-"+Math.floor(1e4*Math.random());j.attr({"aria-autocomplete":"list","aria-expanded":!1,"aria-owns":x});var y=angular.element("<div typeahead-popup></div>");y.attr({id:x,matches:"matches",active:"activeIdx",select:"select(activeIdx)",query:"query",position:"position"}),angular.isDefined(k.typeaheadTemplateUrl)&&y.attr("template-url",k.typeaheadTemplateUrl);var z=function(){w.matches=[],w.activeIdx=-1,j.attr("aria-expanded",!1)},A=function(a){return x+"-option-"+a};w.$watch("activeIdx",function(a){0>a?j.removeAttr("aria-activedescendant"):j.attr("aria-activedescendant",A(a))});var B=function(a){var b={$viewValue:a};q(i,!0),c.when(v.source(i,b)).then(function(c){var d=a===l.$viewValue;if(d&&m)if(c.length>0){w.activeIdx=0,w.matches.length=0;for(var e=0;e<c.length;e++)b[v.itemName]=c[e],w.matches.push({id:A(e),label:v.viewMapper(w,b),model:c[e]});w.query=a,w.position=t?f.offset(j):f.position(j),w.position.top=w.position.top+j.prop("offsetHeight"),j.attr("aria-expanded",!0)}else z();d&&q(i,!1)},function(){z(),q(i,!1)})};z(),w.query=void 0;var C;l.$parsers.unshift(function(a){return m=!0,a&&a.length>=n?o>0?(C&&d.cancel(C),C=d(function(){B(a)},o)):B(a):(q(i,!1),z()),p?a:a?void l.$setValidity("editable",!1):(l.$setValidity("editable",!0),a)}),l.$formatters.push(function(a){var b,c,d={};return s?(d.$model=a,s(i,d)):(d[v.itemName]=a,b=v.viewMapper(i,d),d[v.itemName]=void 0,c=v.viewMapper(i,d),b!==c?b:a)}),w.select=function(a){var b,c,e={};e[v.itemName]=c=w.matches[a].model,b=v.modelMapper(i,e),u(i,b),l.$setValidity("editable",!0),r(i,{$item:c,$model:b,$label:v.viewMapper(i,e)}),z(),d(function(){j[0].focus()},0,!1)},j.bind("keydown",function(a){0!==w.matches.length&&-1!==h.indexOf(a.which)&&(a.preventDefault(),40===a.which?(w.activeIdx=(w.activeIdx+1)%w.matches.length,w.$digest()):38===a.which?(w.activeIdx=(w.activeIdx?w.activeIdx:w.matches.length)-1,w.$digest()):13===a.which||9===a.which?w.$apply(function(){w.select(w.activeIdx)}):27===a.which&&(a.stopPropagation(),z(),w.$digest()))}),j.bind("blur",function(){m=!1});var D=function(a){j[0]!==a.target&&(z(),w.$digest())};e.bind("click",D),i.$on("$destroy",function(){e.unbind("click",D)});var E=a(y)(w);t?e.find("body").append(E):j.after(E)}}}]).directive("typeaheadPopup",function(){return{restrict:"EA",scope:{matches:"=",query:"=",active:"=",position:"=",select:"&"},replace:!0,templateUrl:"template/typeahead/typeahead-popup.html",link:function(a,b,c){a.templateUrl=c.templateUrl,a.isOpen=function(){return a.matches.length>0},a.isActive=function(b){return a.active==b},a.selectActive=function(b){a.active=b},a.selectMatch=function(b){a.select({activeIdx:b})}}}}).directive("typeaheadMatch",["$http","$templateCache","$compile","$parse",function(a,b,c,d){return{restrict:"EA",scope:{index:"=",match:"=",query:"="},link:function(e,f,g){var h=d(g.templateUrl)(e.$parent)||"template/typeahead/typeahead-match.html";a.get(h,{cache:b}).success(function(a){f.replaceWith(c(a.trim())(e))})}}}]).filter("typeaheadHighlight",function(){function a(a){return a.replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")}return function(b,c){return c?(""+b).replace(new RegExp(a(c),"gi"),"<strong>$&</strong>"):b}}),angular.module("template/accordion/accordion-group.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion-group.html",'<div class="panel panel-default">\n  <div class="panel-heading">\n    <h4 class="panel-title">\n      <a class="accordion-toggle" ng-click="toggleOpen()" accordion-transclude="heading"><span ng-class="{\'text-muted\': isDisabled}">{{heading}}</span></a>\n    </h4>\n  </div>\n  <div class="panel-collapse" collapse="!isOpen">\n	  <div class="panel-body" ng-transclude></div>\n  </div>\n</div>')}]),angular.module("template/accordion/accordion.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion.html",'<div class="panel-group" ng-transclude></div>')}]),angular.module("template/alert/alert.html",[]).run(["$templateCache",function(a){a.put("template/alert/alert.html",'<div class="alert" ng-class="{\'alert-{{type || \'warning\'}}\': true, \'alert-dismissable\': closeable}" role="alert">\n    <button ng-show="closeable" type="button" class="close" ng-click="close()">\n        <span aria-hidden="true">&times;</span>\n        <span class="sr-only">Close</span>\n    </button>\n    <div ng-transclude></div>\n</div>\n')}]),angular.module("template/carousel/carousel.html",[]).run(["$templateCache",function(a){a.put("template/carousel/carousel.html",'<div ng-mouseenter="pause()" ng-mouseleave="play()" class="carousel" ng-swipe-right="prev()" ng-swipe-left="next()">\n    <ol class="carousel-indicators" ng-show="slides.length > 1">\n        <li ng-repeat="slide in slides track by $index" ng-class="{active: isActive(slide)}" ng-click="select(slide)"></li>\n    </ol>\n    <div class="carousel-inner" ng-transclude></div>\n    <a class="left carousel-control" ng-click="prev()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-left"></span></a>\n    <a class="right carousel-control" ng-click="next()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-right"></span></a>\n</div>\n')}]),angular.module("template/carousel/slide.html",[]).run(["$templateCache",function(a){a.put("template/carousel/slide.html","<div ng-class=\"{\n    'active': leaving || (active && !entering),\n    'prev': (next || active) && direction=='prev',\n    'next': (next || active) && direction=='next',\n    'right': direction=='prev',\n    'left': direction=='next'\n  }\" class=\"item text-center\" ng-transclude></div>\n")}]),angular.module("template/datepicker/datepicker.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/datepicker.html",'<div ng-switch="datepickerMode" role="application" ng-keydown="keydown($event)">\n  <daypicker ng-switch-when="day" tabindex="0"></daypicker>\n  <monthpicker ng-switch-when="month" tabindex="0"></monthpicker>\n  <yearpicker ng-switch-when="year" tabindex="0"></yearpicker>\n</div>')}]),angular.module("template/datepicker/day.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/day.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th colspan="{{5 + showWeeks}}"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n    <tr>\n      <th ng-show="showWeeks" class="text-center"></th>\n      <th ng-repeat="label in labels track by $index" class="text-center"><small aria-label="{{label.full}}">{{label.abbr}}</small></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-show="showWeeks" class="text-center h6"><em>{{ weekNumbers[$index] }}</em></td>\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default btn-sm" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-muted\': dt.secondary, \'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/datepicker/month.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/month.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/datepicker/popup.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/popup.html",'<ul class="dropdown-menu" ng-style="{display: (isOpen && \'block\') || \'none\', top: position.top+\'px\', left: position.left+\'px\'}" ng-keydown="keydown($event)">\n	<li ng-transclude></li>\n	<li ng-if="showButtonBar" style="padding:10px 9px 2px">\n		<span class="btn-group">\n			<button type="button" class="btn btn-sm btn-info" ng-click="select(\'today\')">{{ getText(\'current\') }}</button>\n			<button type="button" class="btn btn-sm btn-danger" ng-click="select(null)">{{ getText(\'clear\') }}</button>\n		</span>\n		<button type="button" class="btn btn-sm btn-success pull-right" ng-click="close()">{{ getText(\'close\') }}</button>\n	</li>\n</ul>\n')}]),angular.module("template/datepicker/year.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/year.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th colspan="3"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/modal/backdrop.html",[]).run(["$templateCache",function(a){a.put("template/modal/backdrop.html",'<div class="modal-backdrop fade"\n     ng-class="{in: animate}"\n     ng-style="{\'z-index\': 1040 + (index && 1 || 0) + index*10}"\n></div>\n')}]),angular.module("template/modal/window.html",[]).run(["$templateCache",function(a){a.put("template/modal/window.html",'<div tabindex="-1" role="dialog" class="modal fade" ng-class="{in: animate}" ng-style="{\'z-index\': 1050 + index*10, display: \'block\'}" ng-click="close($event)">\n    <div class="modal-dialog" ng-class="{\'modal-sm\': size == \'sm\', \'modal-lg\': size == \'lg\'}"><div class="modal-content" ng-transclude></div></div>\n</div>')}]),angular.module("template/pagination/pager.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pager.html",'<ul class="pager">\n  <li ng-class="{disabled: noPrevious(), previous: align}"><a href ng-click="selectPage(page - 1)">{{getText(\'previous\')}}</a></li>\n  <li ng-class="{disabled: noNext(), next: align}"><a href ng-click="selectPage(page + 1)">{{getText(\'next\')}}</a></li>\n</ul>')}]),angular.module("template/pagination/pagination.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pagination.html",'<ul class="pagination">\n  <li ng-if="boundaryLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(1)">{{getText(\'first\')}}</a></li>\n  <li ng-if="directionLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(page - 1)">{{getText(\'previous\')}}</a></li>\n  <li ng-repeat="page in pages track by $index" ng-class="{active: page.active}"><a href ng-click="selectPage(page.number)">{{page.text}}</a></li>\n  <li ng-if="directionLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(page + 1)">{{getText(\'next\')}}</a></li>\n  <li ng-if="boundaryLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(totalPages)">{{getText(\'last\')}}</a></li>\n</ul>')}]),angular.module("template/tooltip/tooltip-html-unsafe-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-html-unsafe-popup.html",'<div class="tooltip {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" bind-html-unsafe="content"></div>\n</div>\n')}]),angular.module("template/tooltip/tooltip-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-popup.html",'<div class="tooltip {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" ng-bind="content"></div>\n</div>\n')}]),angular.module("template/popover/popover.html",[]).run(["$templateCache",function(a){a.put("template/popover/popover.html",'<div class="popover {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">\n  <div class="arrow"></div>\n\n  <div class="popover-inner">\n      <h3 class="popover-title" ng-bind="title" ng-show="title"></h3>\n      <div class="popover-content" ng-bind="content"></div>\n  </div>\n</div>\n')}]),angular.module("template/progressbar/bar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/bar.html",'<div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: percent + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>')}]),angular.module("template/progressbar/progress.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progress.html",'<div class="progress" ng-transclude></div>')}]),angular.module("template/progressbar/progressbar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progressbar.html",'<div class="progress">\n  <div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: percent + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n</div>')}]),angular.module("template/rating/rating.html",[]).run(["$templateCache",function(a){a.put("template/rating/rating.html",'<span ng-mouseleave="reset()" ng-keydown="onKeydown($event)" tabindex="0" role="slider" aria-valuemin="0" aria-valuemax="{{range.length}}" aria-valuenow="{{value}}">\n    <i ng-repeat="r in range track by $index" ng-mouseenter="enter($index + 1)" ng-click="rate($index + 1)" class="glyphicon" ng-class="$index < value && (r.stateOn || \'glyphicon-star\') || (r.stateOff || \'glyphicon-star-empty\')">\n        <span class="sr-only">({{ $index < value ? \'*\' : \' \' }})</span>\n    </i>\n</span>')}]),angular.module("template/tabs/tab.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tab.html",'<li ng-class="{active: active, disabled: disabled}">\n  <a ng-click="select()" tab-heading-transclude>{{heading}}</a>\n</li>\n')}]),angular.module("template/tabs/tabset-titles.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset-titles.html","<ul class=\"nav {{type && 'nav-' + type}}\" ng-class=\"{'nav-stacked': vertical}\">\n</ul>\n")}]),angular.module("template/tabs/tabset.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset.html",'\n<div>\n  <ul class="nav nav-{{type || \'tabs\'}}" ng-class="{\'nav-stacked\': vertical, \'nav-justified\': justified}" ng-transclude></ul>\n  <div class="tab-content">\n    <div class="tab-pane" \n         ng-repeat="tab in tabs" \n         ng-class="{active: tab.active}"\n         tab-content-transclude="tab">\n    </div>\n  </div>\n</div>\n')}]),angular.module("template/timepicker/timepicker.html",[]).run(["$templateCache",function(a){a.put("template/timepicker/timepicker.html",'<table>\n	<tbody>\n		<tr class="text-center">\n			<td><a ng-click="incrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n			<td>&nbsp;</td>\n			<td><a ng-click="incrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n			<td ng-show="showMeridian"></td>\n		</tr>\n		<tr>\n			<td style="width:50px;" class="form-group" ng-class="{\'has-error\': invalidHours}">\n				<input type="text" ng-model="hours" ng-change="updateHours()" class="form-control text-center" ng-mousewheel="incrementHours()" ng-readonly="readonlyInput" maxlength="2">\n			</td>\n			<td>:</td>\n			<td style="width:50px;" class="form-group" ng-class="{\'has-error\': invalidMinutes}">\n				<input type="text" ng-model="minutes" ng-change="updateMinutes()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n			</td>\n			<td ng-show="showMeridian"><button type="button" class="btn btn-default text-center" ng-click="toggleMeridian()">{{meridian}}</button></td>\n		</tr>\n		<tr class="text-center">\n			<td><a ng-click="decrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n			<td>&nbsp;</td>\n			<td><a ng-click="decrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n			<td ng-show="showMeridian"></td>\n		</tr>\n	</tbody>\n</table>\n')}]),angular.module("template/typeahead/typeahead-match.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-match.html",'<a tabindex="-1" bind-html-unsafe="match.label | typeaheadHighlight:query"></a>')}]),angular.module("template/typeahead/typeahead-popup.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-popup.html",'<ul class="dropdown-menu" ng-if="isOpen()" ng-style="{top: position.top+\'px\', left: position.left+\'px\'}" style="display: block;" role="listbox" aria-hidden="{{!isOpen()}}">\n    <li ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index)" role="option" id="{{match.id}}">\n        <div typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div>\n    </li>\n</ul>')
 }]);
\ No newline at end of file
diff --git a/setup/pub/angular-ui-router/angular-ui-router.min.js b/setup/pub/angular-ui-router/angular-ui-router.min.js
index f065ecc960684..66568f91192ec 100644
--- a/setup/pub/angular-ui-router/angular-ui-router.min.js
+++ b/setup/pub/angular-ui-router/angular-ui-router.min.js
@@ -1,7 +1,7 @@
 /**
  * State-based routing for AngularJS
- * @version v0.2.10
+ * @version v0.4.3
  * @link http://angular-ui.github.com/
  * @license MIT License, http://www.opensource.org/licenses/MIT
  */
-"undefined"!=typeof module&&"undefined"!=typeof exports&&module.exports===exports&&(module.exports="ui.router"),function(a,b,c){"use strict";function d(a,b){return I(new(I(function(){},{prototype:a})),b)}function e(a){return H(arguments,function(b){b!==a&&H(b,function(b,c){a.hasOwnProperty(c)||(a[c]=b)})}),a}function f(a,b){var c=[];for(var d in a.path){if(a.path[d]!==b.path[d])break;c.push(a.path[d])}return c}function g(a,b){if(Array.prototype.indexOf)return a.indexOf(b,Number(arguments[2])||0);var c=a.length>>>0,d=Number(arguments[2])||0;for(d=0>d?Math.ceil(d):Math.floor(d),0>d&&(d+=c);c>d;d++)if(d in a&&a[d]===b)return d;return-1}function h(a,b,c,d){var e,h=f(c,d),i={},j=[];for(var k in h)if(h[k].params&&h[k].params.length){e=h[k].params;for(var l in e)g(j,e[l])>=0||(j.push(e[l]),i[e[l]]=a[e[l]])}return I({},i,b)}function i(a,b){var c={};return H(a,function(a){var d=b[a];c[a]=null!=d?String(d):null}),c}function j(a,b,c){if(!c){c=[];for(var d in a)c.push(d)}for(var e=0;e<c.length;e++){var f=c[e];if(a[f]!=b[f])return!1}return!0}function k(a,b){var c={};return H(a,function(a){c[a]=b[a]}),c}function l(a,b){var d=1,f=2,g={},h=[],i=g,j=I(a.when(g),{$$promises:g,$$values:g});this.study=function(g){function k(a,c){if(o[c]!==f){if(n.push(c),o[c]===d)throw n.splice(0,n.indexOf(c)),new Error("Cyclic dependency: "+n.join(" -> "));if(o[c]=d,E(a))m.push(c,[function(){return b.get(a)}],h);else{var e=b.annotate(a);H(e,function(a){a!==c&&g.hasOwnProperty(a)&&k(g[a],a)}),m.push(c,a,e)}n.pop(),o[c]=f}}function l(a){return F(a)&&a.then&&a.$$promises}if(!F(g))throw new Error("'invocables' must be an object");var m=[],n=[],o={};return H(g,k),g=n=o=null,function(d,f,g){function h(){--s||(t||e(r,f.$$values),p.$$values=r,p.$$promises=!0,o.resolve(r))}function k(a){p.$$failure=a,o.reject(a)}function n(c,e,f){function i(a){l.reject(a),k(a)}function j(){if(!C(p.$$failure))try{l.resolve(b.invoke(e,g,r)),l.promise.then(function(a){r[c]=a,h()},i)}catch(a){i(a)}}var l=a.defer(),m=0;H(f,function(a){q.hasOwnProperty(a)&&!d.hasOwnProperty(a)&&(m++,q[a].then(function(b){r[a]=b,--m||j()},i))}),m||j(),q[c]=l.promise}if(l(d)&&g===c&&(g=f,f=d,d=null),d){if(!F(d))throw new Error("'locals' must be an object")}else d=i;if(f){if(!l(f))throw new Error("'parent' must be a promise returned by $resolve.resolve()")}else f=j;var o=a.defer(),p=o.promise,q=p.$$promises={},r=I({},d),s=1+m.length/3,t=!1;if(C(f.$$failure))return k(f.$$failure),p;f.$$values?(t=e(r,f.$$values),h()):(I(q,f.$$promises),f.then(h,k));for(var u=0,v=m.length;v>u;u+=3)d.hasOwnProperty(m[u])?h():n(m[u],m[u+1],m[u+2]);return p}},this.resolve=function(a,b,c,d){return this.study(a)(b,c,d)}}function m(a,b,c){this.fromConfig=function(a,b,c){return C(a.template)?this.fromString(a.template,b):C(a.templateUrl)?this.fromUrl(a.templateUrl,b):C(a.templateProvider)?this.fromProvider(a.templateProvider,b,c):null},this.fromString=function(a,b){return D(a)?a(b):a},this.fromUrl=function(c,d){return D(c)&&(c=c(d)),null==c?null:a.get(c,{cache:b}).then(function(a){return a.data})},this.fromProvider=function(a,b,d){return c.invoke(a,null,d||{params:b})}}function n(a){function b(b){if(!/^\w+(-+\w+)*$/.test(b))throw new Error("Invalid parameter name '"+b+"' in pattern '"+a+"'");if(f[b])throw new Error("Duplicate parameter name '"+b+"' in pattern '"+a+"'");f[b]=!0,j.push(b)}function c(a){return a.replace(/[\\\[\]\^$*+?.()|{}]/g,"\\$&")}var d,e=/([:*])(\w+)|\{(\w+)(?:\:((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g,f={},g="^",h=0,i=this.segments=[],j=this.params=[];this.source=a;for(var k,l,m;(d=e.exec(a))&&(k=d[2]||d[3],l=d[4]||("*"==d[1]?".*":"[^/]*"),m=a.substring(h,d.index),!(m.indexOf("?")>=0));)g+=c(m)+"("+l+")",b(k),i.push(m),h=e.lastIndex;m=a.substring(h);var n=m.indexOf("?");if(n>=0){var o=this.sourceSearch=m.substring(n);m=m.substring(0,n),this.sourcePath=a.substring(0,h+n),H(o.substring(1).split(/[&?]/),b)}else this.sourcePath=a,this.sourceSearch="";g+=c(m)+"$",i.push(m),this.regexp=new RegExp(g),this.prefix=i[0]}function o(){this.compile=function(a){return new n(a)},this.isMatcher=function(a){return F(a)&&D(a.exec)&&D(a.format)&&D(a.concat)},this.$get=function(){return this}}function p(a){function b(a){var b=/^\^((?:\\[^a-zA-Z0-9]|[^\\\[\]\^$*+?.()|{}]+)*)/.exec(a.source);return null!=b?b[1].replace(/\\(.)/g,"$1"):""}function c(a,b){return a.replace(/\$(\$|\d{1,2})/,function(a,c){return b["$"===c?0:Number(c)]})}function d(a,b,c){if(!c)return!1;var d=a.invoke(b,b,{$match:c});return C(d)?d:!0}var e=[],f=null;this.rule=function(a){if(!D(a))throw new Error("'rule' must be a function");return e.push(a),this},this.otherwise=function(a){if(E(a)){var b=a;a=function(){return b}}else if(!D(a))throw new Error("'rule' must be a function");return f=a,this},this.when=function(e,f){var g,h=E(f);if(E(e)&&(e=a.compile(e)),!h&&!D(f)&&!G(f))throw new Error("invalid 'handler' in when()");var i={matcher:function(b,c){return h&&(g=a.compile(c),c=["$match",function(a){return g.format(a)}]),I(function(a,e){return d(a,c,b.exec(e.path(),e.search()))},{prefix:E(b.prefix)?b.prefix:""})},regex:function(a,e){if(a.global||a.sticky)throw new Error("when() RegExp must not be global or sticky");return h&&(g=e,e=["$match",function(a){return c(g,a)}]),I(function(b,c){return d(b,e,a.exec(c.path()))},{prefix:b(a)})}},j={matcher:a.isMatcher(e),regex:e instanceof RegExp};for(var k in j)if(j[k])return this.rule(i[k](e,f));throw new Error("invalid 'what' in when()")},this.$get=["$location","$rootScope","$injector",function(a,b,c){function d(b){function d(b){var d=b(c,a);return d?(E(d)&&a.replace().url(d),!0):!1}if(!b||!b.defaultPrevented){var g,h=e.length;for(g=0;h>g;g++)if(d(e[g]))return;f&&d(f)}}return b.$on("$locationChangeSuccess",d),{sync:function(){d()}}}]}function q(a,e,f){function g(a){return 0===a.indexOf(".")||0===a.indexOf("^")}function l(a,b){var d=E(a),e=d?a:a.name,f=g(e);if(f){if(!b)throw new Error("No reference point given for path '"+e+"'");for(var h=e.split("."),i=0,j=h.length,k=b;j>i;i++)if(""!==h[i]||0!==i){if("^"!==h[i])break;if(!k.parent)throw new Error("Path '"+e+"' not valid for state '"+b.name+"'");k=k.parent}else k=b;h=h.slice(i).join("."),e=k.name+(k.name&&h?".":"")+h}var l=w[e];return!l||!d&&(d||l!==a&&l.self!==a)?c:l}function m(a,b){x[a]||(x[a]=[]),x[a].push(b)}function n(b){b=d(b,{self:b,resolve:b.resolve||{},toString:function(){return this.name}});var c=b.name;if(!E(c)||c.indexOf("@")>=0)throw new Error("State must have a valid name");if(w.hasOwnProperty(c))throw new Error("State '"+c+"'' is already defined");var e=-1!==c.indexOf(".")?c.substring(0,c.lastIndexOf(".")):E(b.parent)?b.parent:"";if(e&&!w[e])return m(e,b.self);for(var f in z)D(z[f])&&(b[f]=z[f](b,z.$delegates[f]));if(w[c]=b,!b[y]&&b.url&&a.when(b.url,["$match","$stateParams",function(a,c){v.$current.navigable==b&&j(a,c)||v.transitionTo(b,a,{location:!1})}]),x[c])for(var g=0;g<x[c].length;g++)n(x[c][g]);return b}function o(a){return a.indexOf("*")>-1}function p(a){var b=a.split("."),c=v.$current.name.split(".");if("**"===b[0]&&(c=c.slice(c.indexOf(b[1])),c.unshift("**")),"**"===b[b.length-1]&&(c.splice(c.indexOf(b[b.length-2])+1,Number.MAX_VALUE),c.push("**")),b.length!=c.length)return!1;for(var d=0,e=b.length;e>d;d++)"*"===b[d]&&(c[d]="*");return c.join("")===b.join("")}function q(a,b){return E(a)&&!C(b)?z[a]:D(b)&&E(a)?(z[a]&&!z.$delegates[a]&&(z.$delegates[a]=z[a]),z[a]=b,this):this}function r(a,b){return F(a)?b=a:b.name=a,n(b),this}function s(a,e,g,m,n,q,r,s,x){function z(){r.url()!==M&&(r.url(M),r.replace())}function A(a,c,d,f,h){var i=d?c:k(a.params,c),j={$stateParams:i};h.resolve=n.resolve(a.resolve,j,h.resolve,a);var l=[h.resolve.then(function(a){h.globals=a})];return f&&l.push(f),H(a.views,function(c,d){var e=c.resolve&&c.resolve!==a.resolve?c.resolve:{};e.$template=[function(){return g.load(d,{view:c,locals:j,params:i,notify:!1})||""}],l.push(n.resolve(e,j,h.resolve,a).then(function(f){if(D(c.controllerProvider)||G(c.controllerProvider)){var g=b.extend({},e,j);f.$$controller=m.invoke(c.controllerProvider,null,g)}else f.$$controller=c.controller;f.$$state=a,f.$$controllerAs=c.controllerAs,h[d]=f}))}),e.all(l).then(function(){return h})}var B=e.reject(new Error("transition superseded")),F=e.reject(new Error("transition prevented")),K=e.reject(new Error("transition aborted")),L=e.reject(new Error("transition failed")),M=r.url(),N=x.baseHref();return u.locals={resolve:null,globals:{$stateParams:{}}},v={params:{},current:u.self,$current:u,transition:null},v.reload=function(){v.transitionTo(v.current,q,{reload:!0,inherit:!1,notify:!1})},v.go=function(a,b,c){return this.transitionTo(a,b,I({inherit:!0,relative:v.$current},c))},v.transitionTo=function(b,c,f){c=c||{},f=I({location:!0,inherit:!1,relative:null,notify:!0,reload:!1,$retry:!1},f||{});var g,k=v.$current,n=v.params,o=k.path,p=l(b,f.relative);if(!C(p)){var s={to:b,toParams:c,options:f};if(g=a.$broadcast("$stateNotFound",s,k.self,n),g.defaultPrevented)return z(),K;if(g.retry){if(f.$retry)return z(),L;var w=v.transition=e.when(g.retry);return w.then(function(){return w!==v.transition?B:(s.options.$retry=!0,v.transitionTo(s.to,s.toParams,s.options))},function(){return K}),z(),w}if(b=s.to,c=s.toParams,f=s.options,p=l(b,f.relative),!C(p)){if(f.relative)throw new Error("Could not resolve '"+b+"' from state '"+f.relative+"'");throw new Error("No such state '"+b+"'")}}if(p[y])throw new Error("Cannot transition to abstract state '"+b+"'");f.inherit&&(c=h(q,c||{},v.$current,p)),b=p;var x,D,E=b.path,G=u.locals,H=[];for(x=0,D=E[x];D&&D===o[x]&&j(c,n,D.ownParams)&&!f.reload;x++,D=E[x])G=H[x]=D.locals;if(t(b,k,G,f))return b.self.reloadOnSearch!==!1&&z(),v.transition=null,e.when(v.current);if(c=i(b.params,c||{}),f.notify&&(g=a.$broadcast("$stateChangeStart",b.self,c,k.self,n),g.defaultPrevented))return z(),F;for(var N=e.when(G),O=x;O<E.length;O++,D=E[O])G=H[O]=d(G),N=A(D,c,D===b,N,G);var P=v.transition=N.then(function(){var d,e,g;if(v.transition!==P)return B;for(d=o.length-1;d>=x;d--)g=o[d],g.self.onExit&&m.invoke(g.self.onExit,g.self,g.locals.globals),g.locals=null;for(d=x;d<E.length;d++)e=E[d],e.locals=H[d],e.self.onEnter&&m.invoke(e.self.onEnter,e.self,e.locals.globals);if(v.transition!==P)return B;v.$current=b,v.current=b.self,v.params=c,J(v.params,q),v.transition=null;var h=b.navigable;return f.location&&h&&(r.url(h.url.format(h.locals.globals.$stateParams)),"replace"===f.location&&r.replace()),f.notify&&a.$broadcast("$stateChangeSuccess",b.self,c,k.self,n),M=r.url(),v.current},function(d){return v.transition!==P?B:(v.transition=null,a.$broadcast("$stateChangeError",b.self,c,k.self,n,d),z(),e.reject(d))});return P},v.is=function(a,d){var e=l(a);return C(e)?v.$current!==e?!1:C(d)&&null!==d?b.equals(q,d):!0:c},v.includes=function(a,d){if(E(a)&&o(a)){if(!p(a))return!1;a=v.$current.name}var e=l(a);if(!C(e))return c;if(!C(v.$current.includes[e.name]))return!1;var f=!0;return b.forEach(d,function(a,b){C(q[b])&&q[b]===a||(f=!1)}),f},v.href=function(a,b,c){c=I({lossy:!0,inherit:!1,absolute:!1,relative:v.$current},c||{});var d=l(a,c.relative);if(!C(d))return null;b=h(q,b||{},v.$current,d);var e=d&&c.lossy?d.navigable:d,g=e&&e.url?e.url.format(i(d.params,b||{})):null;return!f.html5Mode()&&g&&(g="#"+f.hashPrefix()+g),"/"!==N&&(f.html5Mode()?g=N.slice(0,-1)+g:c.absolute&&(g=N.slice(1)+g)),c.absolute&&g&&(g=r.protocol()+"://"+r.host()+(80==r.port()||443==r.port()?"":":"+r.port())+(!f.html5Mode()&&g?"/":"")+g),g},v.get=function(a,b){if(!C(a)){var c=[];return H(w,function(a){c.push(a.self)}),c}var d=l(a,b);return d&&d.self?d.self:null},v}function t(a,b,c,d){return a!==b||(c!==b.locals||d.reload)&&a.self.reloadOnSearch!==!1?void 0:!0}var u,v,w={},x={},y="abstract",z={parent:function(a){if(C(a.parent)&&a.parent)return l(a.parent);var b=/^(.+)\.[^.]+$/.exec(a.name);return b?l(b[1]):u},data:function(a){return a.parent&&a.parent.data&&(a.data=a.self.data=I({},a.parent.data,a.data)),a.data},url:function(a){var b=a.url;if(E(b))return"^"==b.charAt(0)?e.compile(b.substring(1)):(a.parent.navigable||u).url.concat(b);if(e.isMatcher(b)||null==b)return b;throw new Error("Invalid url '"+b+"' in state '"+a+"'")},navigable:function(a){return a.url?a:a.parent?a.parent.navigable:null},params:function(a){if(!a.params)return a.url?a.url.parameters():a.parent.params;if(!G(a.params))throw new Error("Invalid params in state '"+a+"'");if(a.url)throw new Error("Both params and url specicified in state '"+a+"'");return a.params},views:function(a){var b={};return H(C(a.views)?a.views:{"":a},function(c,d){d.indexOf("@")<0&&(d+="@"+a.parent.name),b[d]=c}),b},ownParams:function(a){if(!a.parent)return a.params;var b={};H(a.params,function(a){b[a]=!0}),H(a.parent.params,function(c){if(!b[c])throw new Error("Missing required parameter '"+c+"' in state '"+a.name+"'");b[c]=!1});var c=[];return H(b,function(a,b){a&&c.push(b)}),c},path:function(a){return a.parent?a.parent.path.concat(a):[]},includes:function(a){var b=a.parent?I({},a.parent.includes):{};return b[a.name]=!0,b},$delegates:{}};u=n({name:"",url:"^",views:null,"abstract":!0}),u.navigable=null,this.decorator=q,this.state=r,this.$get=s,s.$inject=["$rootScope","$q","$view","$injector","$resolve","$stateParams","$location","$urlRouter","$browser"]}function r(){function a(a,b){return{load:function(c,d){var e,f={template:null,controller:null,view:null,locals:null,notify:!0,async:!0,params:{}};return d=I(f,d),d.view&&(e=b.fromConfig(d.view,d.params,d.locals)),e&&d.notify&&a.$broadcast("$viewContentLoading",d),e}}}this.$get=a,a.$inject=["$rootScope","$templateFactory"]}function s(){var a=!1;this.useAnchorScroll=function(){a=!0},this.$get=["$anchorScroll","$timeout",function(b,c){return a?b:function(a){c(function(){a[0].scrollIntoView()},0,!1)}}]}function t(a,c,d){function e(){return c.has?function(a){return c.has(a)?c.get(a):null}:function(a){try{return c.get(a)}catch(b){return null}}}function f(a,b){var c=function(){return{enter:function(a,b,c){b.after(a),c()},leave:function(a,b){a.remove(),b()}}};if(i)return{enter:function(a,b,c){i.enter(a,null,b,c)},leave:function(a,b){i.leave(a,b)}};if(h){var d=h&&h(b,a);return{enter:function(a,b,c){d.enter(a,null,b),c()},leave:function(a,b){d.leave(a),b()}}}return c()}var g=e(),h=g("$animator"),i=g("$animate"),j={restrict:"ECA",terminal:!0,priority:400,transclude:"element",compile:function(c,e,g){return function(c,e,h){function i(){k&&(k.remove(),k=null),m&&(m.$destroy(),m=null),l&&(q.leave(l,function(){k=null}),k=l,l=null)}function j(f){var h=c.$new(),j=l&&l.data("$uiViewName"),k=j&&a.$current&&a.$current.locals[j];if(f||k!==n){var r=g(h,function(a){q.enter(a,e,function(){(b.isDefined(p)&&!p||c.$eval(p))&&d(a)}),i()});n=a.$current.locals[r.data("$uiViewName")],l=r,m=h,m.$emit("$viewContentLoaded"),m.$eval(o)}}var k,l,m,n,o=h.onload||"",p=h.autoscroll,q=f(h,c);c.$on("$stateChangeSuccess",function(){j(!1)}),c.$on("$viewContentLoading",function(){j(!1)}),j(!0)}}};return j}function u(a,b,c){return{restrict:"ECA",priority:-400,compile:function(d){var e=d.html();return function(d,f,g){var h=g.uiView||g.name||"",i=f.inheritedData("$uiView");h.indexOf("@")<0&&(h=h+"@"+(i?i.state.name:"")),f.data("$uiViewName",h);var j=c.$current,k=j&&j.locals[h];if(k){f.data("$uiView",{name:h,state:k.$$state}),f.html(k.$template?k.$template:e);var l=a(f.contents());if(k.$$controller){k.$scope=d;var m=b(k.$$controller,k);k.$$controllerAs&&(d[k.$$controllerAs]=m),f.data("$ngControllerController",m),f.children().data("$ngControllerController",m)}l(d)}}}}}function v(a){var b=a.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!b||4!==b.length)throw new Error("Invalid state ref '"+a+"'");return{state:b[1],paramExpr:b[3]||null}}function w(a){var b=a.parent().inheritedData("$uiView");return b&&b.state&&b.state.name?b.state:void 0}function x(a,c){var d=["location","inherit","reload"];return{restrict:"A",require:"?^uiSrefActive",link:function(e,f,g,h){var i=v(g.uiSref),j=null,k=w(f)||a.$current,l="FORM"===f[0].nodeName,m=l?"action":"href",n=!0,o={relative:k},p=e.$eval(g.uiSrefOpts)||{};b.forEach(d,function(a){a in p&&(o[a]=p[a])});var q=function(b){if(b&&(j=b),n){var c=a.href(i.state,j,o);return h&&h.$$setStateInfo(i.state,j),c?void(f[0][m]=c):(n=!1,!1)}};i.paramExpr&&(e.$watch(i.paramExpr,function(a){a!==j&&q(a)},!0),j=e.$eval(i.paramExpr)),q(),l||f.bind("click",function(b){var d=b.which||b.button;d>1||b.ctrlKey||b.metaKey||b.shiftKey||f.attr("target")||(c(function(){a.go(i.state,j,o)}),b.preventDefault())})}}}function y(a,b,c){return{restrict:"A",controller:["$scope","$element","$attrs",function(d,e,f){function g(){a.$current.self===i&&h()?e.addClass(l):e.removeClass(l)}function h(){return!k||j(k,b)}var i,k,l;l=c(f.uiSrefActive||"",!1)(d),this.$$setStateInfo=function(b,c){i=a.get(b,w(e)),k=c,g()},d.$on("$stateChangeSuccess",g)}]}}function z(a){return function(b){return a.is(b)}}function A(a){return function(b){return a.includes(b)}}function B(a,b){function e(a){this.locals=a.locals.globals,this.params=this.locals.$stateParams}function f(){this.locals=null,this.params=null}function g(c,g){if(null!=g.redirectTo){var h,j=g.redirectTo;if(E(j))h=j;else{if(!D(j))throw new Error("Invalid 'redirectTo' in when()");h=function(a,b){return j(a,b.path(),b.search())}}b.when(c,h)}else a.state(d(g,{parent:null,name:"route:"+encodeURIComponent(c),url:c,onEnter:e,onExit:f}));return i.push(g),this}function h(a,b,d){function e(a){return""!==a.name?a:c}var f={routes:i,params:d,current:c};return b.$on("$stateChangeStart",function(a,c,d,f){b.$broadcast("$routeChangeStart",e(c),e(f))}),b.$on("$stateChangeSuccess",function(a,c,d,g){f.current=e(c),b.$broadcast("$routeChangeSuccess",e(c),e(g)),J(d,f.params)}),b.$on("$stateChangeError",function(a,c,d,f,g,h){b.$broadcast("$routeChangeError",e(c),e(f),h)}),f}var i=[];e.$inject=["$$state"],this.when=g,this.$get=h,h.$inject=["$state","$rootScope","$routeParams"]}var C=b.isDefined,D=b.isFunction,E=b.isString,F=b.isObject,G=b.isArray,H=b.forEach,I=b.extend,J=b.copy;b.module("ui.router.util",["ng"]),b.module("ui.router.router",["ui.router.util"]),b.module("ui.router.state",["ui.router.router","ui.router.util"]),b.module("ui.router",["ui.router.state"]),b.module("ui.router.compat",["ui.router"]),l.$inject=["$q","$injector"],b.module("ui.router.util").service("$resolve",l),m.$inject=["$http","$templateCache","$injector"],b.module("ui.router.util").service("$templateFactory",m),n.prototype.concat=function(a){return new n(this.sourcePath+a+this.sourceSearch)},n.prototype.toString=function(){return this.source},n.prototype.exec=function(a,b){var c=this.regexp.exec(a);if(!c)return null;var d,e=this.params,f=e.length,g=this.segments.length-1,h={};if(g!==c.length-1)throw new Error("Unbalanced capture group in route '"+this.source+"'");for(d=0;g>d;d++)h[e[d]]=c[d+1];for(;f>d;d++)h[e[d]]=b[e[d]];return h},n.prototype.parameters=function(){return this.params},n.prototype.format=function(a){var b=this.segments,c=this.params;if(!a)return b.join("");var d,e,f,g=b.length-1,h=c.length,i=b[0];for(d=0;g>d;d++)f=a[c[d]],null!=f&&(i+=encodeURIComponent(f)),i+=b[d+1];for(;h>d;d++)f=a[c[d]],null!=f&&(i+=(e?"&":"?")+c[d]+"="+encodeURIComponent(f),e=!0);return i},b.module("ui.router.util").provider("$urlMatcherFactory",o),p.$inject=["$urlMatcherFactoryProvider"],b.module("ui.router.router").provider("$urlRouter",p),q.$inject=["$urlRouterProvider","$urlMatcherFactoryProvider","$locationProvider"],b.module("ui.router.state").value("$stateParams",{}).provider("$state",q),r.$inject=[],b.module("ui.router.state").provider("$view",r),b.module("ui.router.state").provider("$uiViewScroll",s),t.$inject=["$state","$injector","$uiViewScroll"],u.$inject=["$compile","$controller","$state"],b.module("ui.router.state").directive("uiView",t),b.module("ui.router.state").directive("uiView",u),x.$inject=["$state","$timeout"],y.$inject=["$state","$stateParams","$interpolate"],b.module("ui.router.state").directive("uiSref",x).directive("uiSrefActive",y),z.$inject=["$state"],A.$inject=["$state"],b.module("ui.router.state").filter("isState",z).filter("includedByState",A),B.$inject=["$stateProvider","$urlRouterProvider"],b.module("ui.router.compat").provider("$route",B).directive("ngView",t)}(window,window.angular);
\ No newline at end of file
+"undefined"!=typeof module&&"undefined"!=typeof exports&&module.exports===exports&&(module.exports="ui.router"),function(a,b,c){"use strict";function d(a,b){return T(new(T(function(){},{prototype:a})),b)}function e(a){return S(arguments,function(b){b!==a&&S(b,function(b,c){a.hasOwnProperty(c)||(a[c]=b)})}),a}function f(a,b){var c=[];for(var d in a.path){if(a.path[d]!==b.path[d])break;c.push(a.path[d])}return c}function g(a){if(Object.keys)return Object.keys(a);var b=[];return S(a,function(a,c){b.push(c)}),b}function h(a,b){if(Array.prototype.indexOf)return a.indexOf(b,Number(arguments[2])||0);var c=a.length>>>0,d=Number(arguments[2])||0;for(d=d<0?Math.ceil(d):Math.floor(d),d<0&&(d+=c);d<c;d++)if(d in a&&a[d]===b)return d;return-1}function i(a,b,c,d){var e,i=f(c,d),j={},k=[];for(var l in i)if(i[l]&&i[l].params&&(e=g(i[l].params),e.length))for(var m in e)h(k,e[m])>=0||(k.push(e[m]),j[e[m]]=a[e[m]]);return T({},j,b)}function j(a,b,c){if(!c){c=[];for(var d in a)c.push(d)}for(var e=0;e<c.length;e++){var f=c[e];if(a[f]!=b[f])return!1}return!0}function k(a,b){var c={};return S(a,function(a){c[a]=b[a]}),c}function l(a){var b={},c=Array.prototype.concat.apply(Array.prototype,Array.prototype.slice.call(arguments,1));return S(c,function(c){c in a&&(b[c]=a[c])}),b}function m(a){var b={},c=Array.prototype.concat.apply(Array.prototype,Array.prototype.slice.call(arguments,1));for(var d in a)-1==h(c,d)&&(b[d]=a[d]);return b}function n(a,b){var c=R(a),d=c?[]:{};return S(a,function(a,e){b(a,e)&&(d[c?d.length:e]=a)}),d}function o(a,b){var c=R(a)?[]:{};return S(a,function(a,d){c[d]=b(a,d)}),c}function p(a){return a.then(c,function(){})&&a}function q(a,b){var d=1,f=2,i={},j=[],k=i,l=T(a.when(i),{$$promises:i,$$values:i});this.study=function(i){function n(a,c){if(t[c]!==f){if(s.push(c),t[c]===d)throw s.splice(0,h(s,c)),new Error("Cyclic dependency: "+s.join(" -> "));if(t[c]=d,P(a))r.push(c,[function(){return b.get(a)}],j);else{var e=b.annotate(a);S(e,function(a){a!==c&&i.hasOwnProperty(a)&&n(i[a],a)}),r.push(c,a,e)}s.pop(),t[c]=f}}function o(a){return Q(a)&&a.then&&a.$$promises}if(!Q(i))throw new Error("'invocables' must be an object");var q=g(i||{}),r=[],s=[],t={};return S(i,n),i=s=t=null,function(d,f,g){function h(){--v||(w||e(u,f.$$values),s.$$values=u,s.$$promises=s.$$promises||!0,delete s.$$inheritedValues,n.resolve(u))}function i(a){s.$$failure=a,n.reject(a)}function j(c,e,f){function j(a){l.reject(a),i(a)}function k(){if(!N(s.$$failure))try{l.resolve(b.invoke(e,g,u)),l.promise.then(function(a){u[c]=a,h()},j)}catch(a){j(a)}}var l=a.defer(),m=0;S(f,function(a){t.hasOwnProperty(a)&&!d.hasOwnProperty(a)&&(m++,t[a].then(function(b){u[a]=b,--m||k()},j))}),m||k(),t[c]=p(l.promise)}if(o(d)&&g===c&&(g=f,f=d,d=null),d){if(!Q(d))throw new Error("'locals' must be an object")}else d=k;if(f){if(!o(f))throw new Error("'parent' must be a promise returned by $resolve.resolve()")}else f=l;var n=a.defer(),s=p(n.promise),t=s.$$promises={},u=T({},d),v=1+r.length/3,w=!1;if(p(s),N(f.$$failure))return i(f.$$failure),s;f.$$inheritedValues&&e(u,m(f.$$inheritedValues,q)),T(t,f.$$promises),f.$$values?(w=e(u,m(f.$$values,q)),s.$$inheritedValues=m(f.$$values,q),h()):(f.$$inheritedValues&&(s.$$inheritedValues=m(f.$$inheritedValues,q)),f.then(h,i));for(var x=0,y=r.length;x<y;x+=3)d.hasOwnProperty(r[x])?h():j(r[x],r[x+1],r[x+2]);return s}},this.resolve=function(a,b,c,d){return this.study(a)(b,c,d)}}function r(){var a=b.version.minor<3;this.shouldUnsafelyUseHttp=function(b){a=!!b},this.$get=["$http","$templateCache","$injector",function(b,c,d){return new s(b,c,d,a)}]}function s(a,b,c,d){this.fromConfig=function(a,b,c){return N(a.template)?this.fromString(a.template,b):N(a.templateUrl)?this.fromUrl(a.templateUrl,b):N(a.templateProvider)?this.fromProvider(a.templateProvider,b,c):null},this.fromString=function(a,b){return O(a)?a(b):a},this.fromUrl=function(e,f){return O(e)&&(e=e(f)),null==e?null:d?a.get(e,{cache:b,headers:{Accept:"text/html"}}).then(function(a){return a.data}):c.get("$templateRequest")(e)},this.fromProvider=function(a,b,d){return c.invoke(a,null,d||{params:b})}}function t(a,b,e){function f(b,c,d,e){if(q.push(b),o[b])return o[b];if(!/^\w+([-.]+\w+)*(?:\[\])?$/.test(b))throw new Error("Invalid parameter name '"+b+"' in pattern '"+a+"'");if(p[b])throw new Error("Duplicate parameter name '"+b+"' in pattern '"+a+"'");return p[b]=new W.Param(b,c,d,e),p[b]}function g(a,b,c,d){var e=["",""],f=a.replace(/[\\\[\]\^$*+?.()|{}]/g,"\\$&");if(!b)return f;switch(c){case!1:e=["(",")"+(d?"?":"")];break;case!0:f=f.replace(/\/$/,""),e=["(?:/(",")|/)?"];break;default:e=["("+c+"|",")?"]}return f+e[0]+b+e[1]}function h(e,f){var g,h,i,j,k;return g=e[2]||e[3],k=b.params[g],i=a.substring(m,e.index),h=f?e[4]:e[4]||("*"==e[1]?".*":null),h&&(j=W.type(h)||d(W.type("string"),{pattern:new RegExp(h,b.caseInsensitive?"i":c)})),{id:g,regexp:h,segment:i,type:j,cfg:k}}b=T({params:{}},Q(b)?b:{});var i,j=/([:*])([\w\[\]]+)|\{([\w\[\]]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g,k=/([:]?)([\w\[\].-]+)|\{([\w\[\].-]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g,l="^",m=0,n=this.segments=[],o=e?e.params:{},p=this.params=e?e.params.$$new():new W.ParamSet,q=[];this.source=a;for(var r,s,t;(i=j.exec(a))&&(r=h(i,!1),!(r.segment.indexOf("?")>=0));)s=f(r.id,r.type,r.cfg,"path"),l+=g(r.segment,s.type.pattern.source,s.squash,s.isOptional),n.push(r.segment),m=j.lastIndex;t=a.substring(m);var u=t.indexOf("?");if(u>=0){var v=this.sourceSearch=t.substring(u);if(t=t.substring(0,u),this.sourcePath=a.substring(0,m+u),v.length>0)for(m=0;i=k.exec(v);)r=h(i,!0),s=f(r.id,r.type,r.cfg,"search"),m=j.lastIndex}else this.sourcePath=a,this.sourceSearch="";l+=g(t)+(!1===b.strict?"/?":"")+"$",n.push(t),this.regexp=new RegExp(l,b.caseInsensitive?"i":c),this.prefix=n[0],this.$$paramNames=q}function u(a){T(this,a)}function v(){function a(a){return null!=a?a.toString().replace(/(~|\/)/g,function(a){return{"~":"~~","/":"~2F"}[a]}):a}function e(a){return null!=a?a.toString().replace(/(~~|~2F)/g,function(a){return{"~~":"~","~2F":"/"}[a]}):a}function f(){return{strict:p,caseInsensitive:m}}function i(a){return O(a)||R(a)&&O(a[a.length-1])}function j(){for(;w.length;){var a=w.shift();if(a.pattern)throw new Error("You cannot override a type's .pattern at runtime.");b.extend(r[a.name],l.invoke(a.def))}}function k(a){T(this,a||{})}W=this;var l,m=!1,p=!0,q=!1,r={},s=!0,w=[],x={string:{encode:a,decode:e,is:function(a){return null==a||!N(a)||"string"==typeof a},pattern:/[^\/]*/},int:{encode:a,decode:function(a){return parseInt(a,10)},is:function(a){return a!==c&&null!==a&&this.decode(a.toString())===a},pattern:/-?\d+/},bool:{encode:function(a){return a?1:0},decode:function(a){return 0!==parseInt(a,10)},is:function(a){return!0===a||!1===a},pattern:/0|1/},date:{encode:function(a){return this.is(a)?[a.getFullYear(),("0"+(a.getMonth()+1)).slice(-2),("0"+a.getDate()).slice(-2)].join("-"):c},decode:function(a){if(this.is(a))return a;var b=this.capture.exec(a);return b?new Date(b[1],b[2]-1,b[3]):c},is:function(a){return a instanceof Date&&!isNaN(a.valueOf())},equals:function(a,b){return this.is(a)&&this.is(b)&&a.toISOString()===b.toISOString()},pattern:/[0-9]{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[1-2][0-9]|3[0-1])/,capture:/([0-9]{4})-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])/},json:{encode:b.toJson,decode:b.fromJson,is:b.isObject,equals:b.equals,pattern:/[^\/]*/},any:{encode:b.identity,decode:b.identity,equals:b.equals,pattern:/.*/}};v.$$getDefaultValue=function(a){if(!i(a.value))return a.value;if(!l)throw new Error("Injectable functions cannot be called at configuration time");return l.invoke(a.value)},this.caseInsensitive=function(a){return N(a)&&(m=a),m},this.strictMode=function(a){return N(a)&&(p=a),p},this.defaultSquashPolicy=function(a){if(!N(a))return q;if(!0!==a&&!1!==a&&!P(a))throw new Error("Invalid squash policy: "+a+". Valid policies: false, true, arbitrary-string");return q=a,a},this.compile=function(a,b){return new t(a,T(f(),b))},this.isMatcher=function(a){if(!Q(a))return!1;var b=!0;return S(t.prototype,function(c,d){O(c)&&(b=b&&N(a[d])&&O(a[d]))}),b},this.type=function(a,b,c){if(!N(b))return r[a];if(r.hasOwnProperty(a))throw new Error("A type named '"+a+"' has already been defined.");return r[a]=new u(T({name:a},b)),c&&(w.push({name:a,def:c}),s||j()),this},S(x,function(a,b){r[b]=new u(T({name:b},a))}),r=d(r,{}),this.$get=["$injector",function(a){return l=a,s=!1,j(),S(x,function(a,b){r[b]||(r[b]=new u(a))}),this}],this.Param=function(a,d,e,f){function j(a){var b=Q(a)?g(a):[];return-1===h(b,"value")&&-1===h(b,"type")&&-1===h(b,"squash")&&-1===h(b,"array")&&(a={value:a}),a.$$fn=i(a.value)?a.value:function(){return a.value},a}function k(c,d,e){if(c.type&&d)throw new Error("Param '"+a+"' has two type configurations.");return d||(c.type?b.isString(c.type)?r[c.type]:c.type instanceof u?c.type:new u(c.type):"config"===e?r.any:r.string)}function m(){var b={array:"search"===f&&"auto"},c=a.match(/\[\]$/)?{array:!0}:{};return T(b,c,e).array}function p(a,b){var c=a.squash;if(!b||!1===c)return!1;if(!N(c)||null==c)return q;if(!0===c||P(c))return c;throw new Error("Invalid squash policy: '"+c+"'. Valid policies: false, true, or arbitrary string")}function s(a,b,d,e){var f,g,i=[{from:"",to:d||b?c:""},{from:null,to:d||b?c:""}];return f=R(a.replace)?a.replace:[],P(e)&&f.push({from:e,to:c}),g=o(f,function(a){return a.from}),n(i,function(a){return-1===h(g,a.from)}).concat(f)}function t(){if(!l)throw new Error("Injectable functions cannot be called at configuration time");var a=l.invoke(e.$$fn);if(null!==a&&a!==c&&!x.type.is(a))throw new Error("Default value ("+a+") for parameter '"+x.id+"' is not an instance of Type ("+x.type.name+")");return a}function v(a){function b(a){return function(b){return b.from===a}}function c(a){var c=o(n(x.replace,b(a)),function(a){return a.to});return c.length?c[0]:a}return a=c(a),N(a)?x.type.$normalize(a):t()}function w(){return"{Param:"+a+" "+d+" squash: '"+A+"' optional: "+z+"}"}var x=this;e=j(e),d=k(e,d,f);var y=m();d=y?d.$asArray(y,"search"===f):d,"string"!==d.name||y||"path"!==f||e.value!==c||(e.value="");var z=e.value!==c,A=p(e,z),B=s(e,y,z,A);T(this,{id:a,type:d,location:f,array:y,squash:A,replace:B,isOptional:z,value:v,dynamic:c,config:e,toString:w})},k.prototype={$$new:function(){return d(this,T(new k,{$$parent:this}))},$$keys:function(){for(var a=[],b=[],c=this,d=g(k.prototype);c;)b.push(c),c=c.$$parent;return b.reverse(),S(b,function(b){S(g(b),function(b){-1===h(a,b)&&-1===h(d,b)&&a.push(b)})}),a},$$values:function(a){var b={},c=this;return S(c.$$keys(),function(d){b[d]=c[d].value(a&&a[d])}),b},$$equals:function(a,b){var c=!0,d=this;return S(d.$$keys(),function(e){var f=a&&a[e],g=b&&b[e];d[e].type.equals(f,g)||(c=!1)}),c},$$validates:function(a){var d,e,f,g,h,i=this.$$keys();for(d=0;d<i.length&&(e=this[i[d]],(f=a[i[d]])!==c&&null!==f||!e.isOptional);d++){if(g=e.type.$normalize(f),!e.type.is(g))return!1;if(h=e.type.encode(g),b.isString(h)&&!e.type.pattern.exec(h))return!1}return!0},$$parent:c},this.ParamSet=k}function w(a,d){function e(a){var b=/^\^((?:\\[^a-zA-Z0-9]|[^\\\[\]\^$*+?.()|{}]+)*)/.exec(a.source);return null!=b?b[1].replace(/\\(.)/g,"$1"):""}function f(a,b){return a.replace(/\$(\$|\d{1,2})/,function(a,c){return b["$"===c?0:Number(c)]})}function g(a,b,c){if(!c)return!1;var d=a.invoke(b,b,{$match:c});return!N(d)||d}function h(d,e,f,g,h){function m(a,b,c){return"/"===q?a:b?q.slice(0,-1)+a:c?q.slice(1)+a:a}function n(a){function b(a){var b=a(f,d);return!!b&&(P(b)&&d.replace().url(b),!0)}if(!a||!a.defaultPrevented){p&&d.url();p=c;var e,g=j.length;for(e=0;e<g;e++)if(b(j[e]))return;k&&b(k)}}function o(){return i=i||e.$on("$locationChangeSuccess",n)}var p,q=g.baseHref(),r=d.url();return l||o(),{sync:function(){n()},listen:function(){return o()},update:function(a){if(a)return void(r=d.url());d.url()!==r&&(d.url(r),d.replace())},push:function(a,b,e){var f=a.format(b||{});null!==f&&b&&b["#"]&&(f+="#"+b["#"]),d.url(f),p=e&&e.$$avoidResync?d.url():c,e&&e.replace&&d.replace()},href:function(c,e,f){if(!c.validates(e))return null;var g=a.html5Mode();b.isObject(g)&&(g=g.enabled),g=g&&h.history;var i=c.format(e);if(f=f||{},g||null===i||(i="#"+a.hashPrefix()+i),null!==i&&e&&e["#"]&&(i+="#"+e["#"]),i=m(i,g,f.absolute),!f.absolute||!i)return i;var j=!g&&i?"/":"",k=d.port();return k=80===k||443===k?"":":"+k,[d.protocol(),"://",d.host(),k,j,i].join("")}}}var i,j=[],k=null,l=!1;this.rule=function(a){if(!O(a))throw new Error("'rule' must be a function");return j.push(a),this},this.otherwise=function(a){if(P(a)){var b=a;a=function(){return b}}else if(!O(a))throw new Error("'rule' must be a function");return k=a,this},this.when=function(a,b){var c,h=P(b);if(P(a)&&(a=d.compile(a)),!h&&!O(b)&&!R(b))throw new Error("invalid 'handler' in when()");var i={matcher:function(a,b){return h&&(c=d.compile(b),b=["$match",function(a){return c.format(a)}]),T(function(c,d){return g(c,b,a.exec(d.path(),d.search()))},{prefix:P(a.prefix)?a.prefix:""})},regex:function(a,b){if(a.global||a.sticky)throw new Error("when() RegExp must not be global or sticky");return h&&(c=b,b=["$match",function(a){return f(c,a)}]),T(function(c,d){return g(c,b,a.exec(d.path()))},{prefix:e(a)})}},j={matcher:d.isMatcher(a),regex:a instanceof RegExp};for(var k in j)if(j[k])return this.rule(i[k](a,b));throw new Error("invalid 'what' in when()")},this.deferIntercept=function(a){a===c&&(a=!0),l=a},this.$get=h,h.$inject=["$location","$rootScope","$injector","$browser","$sniffer"]}function x(a,e){function f(a){return 0===a.indexOf(".")||0===a.indexOf("^")}function m(a,b){if(!a)return c;var d=P(a),e=d?a:a.name;if(f(e)){if(!b)throw new Error("No reference point given for path '"+e+"'");b=m(b);for(var g=e.split("."),h=0,i=g.length,j=b;h<i;h++)if(""!==g[h]||0!==h){if("^"!==g[h])break;if(!j.parent)throw new Error("Path '"+e+"' not valid for state '"+b.name+"'");j=j.parent}else j=b;g=g.slice(h).join("."),e=j.name+(j.name&&g?".":"")+g}var k=A[e];return!k||!d&&(d||k!==a&&k.self!==a)?c:k}function n(a,b){B[a]||(B[a]=[]),B[a].push(b)}function q(a){for(var b=B[a]||[];b.length;)r(b.shift())}function r(b){b=d(b,{self:b,resolve:b.resolve||{},toString:function(){return this.name}});var c=b.name;if(!P(c)||c.indexOf("@")>=0)throw new Error("State must have a valid name");if(A.hasOwnProperty(c))throw new Error("State '"+c+"' is already defined");var e=-1!==c.indexOf(".")?c.substring(0,c.lastIndexOf(".")):P(b.parent)?b.parent:Q(b.parent)&&P(b.parent.name)?b.parent.name:"";if(e&&!A[e])return n(e,b.self);for(var f in D)O(D[f])&&(b[f]=D[f](b,D.$delegates[f]));return A[c]=b,!b[C]&&b.url&&a.when(b.url,["$match","$stateParams",function(a,c){z.$current.navigable==b&&j(a,c)||z.transitionTo(b,a,{inherit:!0,location:!1})}]),q(c),b}function s(a){return a.indexOf("*")>-1}function t(a){for(var b=a.split("."),c=z.$current.name.split("."),d=0,e=b.length;d<e;d++)"*"===b[d]&&(c[d]="*");return"**"===b[0]&&(c=c.slice(h(c,b[1])),c.unshift("**")),"**"===b[b.length-1]&&(c.splice(h(c,b[b.length-2])+1,Number.MAX_VALUE),c.push("**")),b.length==c.length&&c.join("")===b.join("")}function u(a,b){return P(a)&&!N(b)?D[a]:O(b)&&P(a)?(D[a]&&!D.$delegates[a]&&(D.$delegates[a]=D[a]),D[a]=b,this):this}function v(a,b){return Q(a)?b=a:b.name=a,r(b),this}function w(a,e,f,h,j,l,n,q,r){function u(b,c,d,f){var g=a.$broadcast("$stateNotFound",b,c,d);if(g.defaultPrevented)return n.update(),E;if(!g.retry)return null;if(f.$retry)return n.update(),F;var h=z.transition=e.when(g.retry);return h.then(function(){return h!==z.transition?(a.$broadcast("$stateChangeCancel",b.to,b.toParams,c,d),B):(b.options.$retry=!0,z.transitionTo(b.to,b.toParams,b.options))},function(){return E}),n.update(),h}function v(a,c,d,g,i,l){function m(){var c=[];return S(a.views,function(d,e){var g=d.resolve&&d.resolve!==a.resolve?d.resolve:{};g.$template=[function(){return f.load(e,{view:d,locals:i.globals,params:n,notify:l.notify})||""}],c.push(j.resolve(g,i.globals,i.resolve,a).then(function(c){if(O(d.controllerProvider)||R(d.controllerProvider)){var f=b.extend({},g,i.globals);c.$$controller=h.invoke(d.controllerProvider,null,f)}else c.$$controller=d.controller;c.$$state=a,c.$$controllerAs=d.controllerAs,c.$$resolveAs=d.resolveAs,i[e]=c}))}),e.all(c).then(function(){return i.globals})}var n=d?c:k(a.params.$$keys(),c),o={$stateParams:n};i.resolve=j.resolve(a.resolve,o,i.resolve,a);var p=[i.resolve.then(function(a){i.globals=a})];return g&&p.push(g),e.all(p).then(m).then(function(a){return i})}var w=new Error("transition superseded"),B=p(e.reject(w)),D=p(e.reject(new Error("transition prevented"))),E=p(e.reject(new Error("transition aborted"))),F=p(e.reject(new Error("transition failed")));return y.locals={resolve:null,globals:{$stateParams:{}}},z={params:{},current:y.self,$current:y,transition:null},z.reload=function(a){return z.transitionTo(z.current,l,{reload:a||!0,inherit:!1,notify:!0})},z.go=function(a,b,c){return z.transitionTo(a,b,T({inherit:!0,relative:z.$current},c))},z.transitionTo=function(b,c,f){c=c||{},f=T({location:!0,inherit:!1,relative:null,notify:!0,reload:!1,$retry:!1},f||{});var g,j=z.$current,o=z.params,q=j.path,r=m(b,f.relative),s=c["#"];if(!N(r)){var t={to:b,toParams:c,options:f},A=u(t,j.self,o,f);if(A)return A;if(b=t.to,c=t.toParams,f=t.options,r=m(b,f.relative),!N(r)){if(!f.relative)throw new Error("No such state '"+b+"'");throw new Error("Could not resolve '"+b+"' from state '"+f.relative+"'")}}if(r[C])throw new Error("Cannot transition to abstract state '"+b+"'");if(f.inherit&&(c=i(l,c||{},z.$current,r)),!r.params.$$validates(c))return F;c=r.params.$$values(c),b=r;var E=b.path,G=0,H=E[G],I=y.locals,J=[];if(f.reload){if(P(f.reload)||Q(f.reload)){if(Q(f.reload)&&!f.reload.name)throw new Error("Invalid reload state object");var K=!0===f.reload?q[0]:m(f.reload);if(f.reload&&!K)throw new Error("No such reload state '"+(P(f.reload)?f.reload:f.reload.name)+"'");for(;H&&H===q[G]&&H!==K;)I=J[G]=H.locals,G++,H=E[G]}}else for(;H&&H===q[G]&&H.ownParams.$$equals(c,o);)I=J[G]=H.locals,G++,H=E[G];if(x(b,c,j,o,I,f))return s&&(c["#"]=s),z.params=c,U(z.params,l),U(k(b.params.$$keys(),l),b.locals.globals.$stateParams),f.location&&b.navigable&&b.navigable.url&&(n.push(b.navigable.url,c,{$$avoidResync:!0,replace:"replace"===f.location}),n.update(!0)),z.transition=null,e.when(z.current);if(c=k(b.params.$$keys(),c||{}),s&&(c["#"]=s),f.notify&&a.$broadcast("$stateChangeStart",b.self,c,j.self,o,f).defaultPrevented)return a.$broadcast("$stateChangeCancel",b.self,c,j.self,o),null==z.transition&&n.update(),D;for(var L=e.when(I),M=G;M<E.length;M++,H=E[M])I=J[M]=d(I),L=v(H,c,H===b,L,I,f);var O=z.transition=L.then(function(){var d,e,g;if(z.transition!==O)return a.$broadcast("$stateChangeCancel",b.self,c,j.self,o),B;for(d=q.length-1;d>=G;d--)g=q[d],g.self.onExit&&h.invoke(g.self.onExit,g.self,g.locals.globals),g.locals=null;for(d=G;d<E.length;d++)e=E[d],e.locals=J[d],e.self.onEnter&&h.invoke(e.self.onEnter,e.self,e.locals.globals);return z.transition!==O?(a.$broadcast("$stateChangeCancel",b.self,c,j.self,o),B):(z.$current=b,z.current=b.self,z.params=c,U(z.params,l),z.transition=null,f.location&&b.navigable&&n.push(b.navigable.url,b.navigable.locals.globals.$stateParams,{$$avoidResync:!0,replace:"replace"===f.location}),f.notify&&a.$broadcast("$stateChangeSuccess",b.self,c,j.self,o),n.update(!0),z.current)}).then(null,function(d){return d===w?B:z.transition!==O?(a.$broadcast("$stateChangeCancel",b.self,c,j.self,o),B):(z.transition=null,g=a.$broadcast("$stateChangeError",b.self,c,j.self,o,d),g.defaultPrevented||n.update(),e.reject(d))});return p(O),O},z.is=function(a,b,d){d=T({relative:z.$current},d||{});var e=m(a,d.relative);return N(e)?z.$current===e&&(!b||g(b).reduce(function(a,c){var d=e.params[c];return a&&(!d||d.type.equals(l[c],b[c]))},!0)):c},z.includes=function(a,b,d){if(d=T({relative:z.$current},d||{}),P(a)&&s(a)){if(!t(a))return!1;a=z.$current.name}var e=m(a,d.relative);if(!N(e))return c;if(!N(z.$current.includes[e.name]))return!1;if(!b)return!0;for(var f=g(b),h=0;h<f.length;h++){var i=f[h],j=e.params[i];if(j&&!j.type.equals(l[i],b[i]))return!1}return g(b).reduce(function(a,c){var d=e.params[c];return a&&!d||d.type.equals(l[c],b[c])},!0)},z.href=function(a,b,d){d=T({lossy:!0,inherit:!0,absolute:!1,relative:z.$current},d||{});var e=m(a,d.relative);if(!N(e))return null;d.inherit&&(b=i(l,b||{},z.$current,e));var f=e&&d.lossy?e.navigable:e;return f&&f.url!==c&&null!==f.url?n.href(f.url,k(e.params.$$keys().concat("#"),b||{}),{absolute:d.absolute}):null},z.get=function(a,b){if(0===arguments.length)return o(g(A),function(a){return A[a].self});var c=m(a,b||z.$current);return c&&c.self?c.self:null},z}function x(a,b,c,d,e,f){function g(a,b,c){function d(b){return"search"!=a.params[b].location}var e=a.params.$$keys().filter(d),f=l.apply({},[a.params].concat(e));return new W.ParamSet(f).$$equals(b,c)}if(!f.reload&&a===c&&(e===c.locals||!1===a.self.reloadOnSearch&&g(c,d,b)))return!0}var y,z,A={},B={},C="abstract",D={parent:function(a){if(N(a.parent)&&a.parent)return m(a.parent);var b=/^(.+)\.[^.]+$/.exec(a.name);return b?m(b[1]):y},data:function(a){return a.parent&&a.parent.data&&(a.data=a.self.data=d(a.parent.data,a.data)),a.data},url:function(a){var b=a.url,c={params:a.params||{}};if(P(b))return"^"==b.charAt(0)?e.compile(b.substring(1),c):(a.parent.navigable||y).url.concat(b,c);if(!b||e.isMatcher(b))return b;throw new Error("Invalid url '"+b+"' in state '"+a+"'")},navigable:function(a){return a.url?a:a.parent?a.parent.navigable:null},ownParams:function(a){var b=a.url&&a.url.params||new W.ParamSet;return S(a.params||{},function(a,c){b[c]||(b[c]=new W.Param(c,null,a,"config"))}),b},params:function(a){var b=l(a.ownParams,a.ownParams.$$keys());return a.parent&&a.parent.params?T(a.parent.params.$$new(),b):new W.ParamSet},views:function(a){var b={};return S(N(a.views)?a.views:{"":a},function(c,d){d.indexOf("@")<0&&(d+="@"+a.parent.name),c.resolveAs=c.resolveAs||a.resolveAs||"$resolve",b[d]=c}),b},path:function(a){return a.parent?a.parent.path.concat(a):[]},includes:function(a){var b=a.parent?T({},a.parent.includes):{};return b[a.name]=!0,b},$delegates:{}};y=r({name:"",url:"^",views:null,abstract:!0}),y.navigable=null,this.decorator=u,this.state=v,this.$get=w,w.$inject=["$rootScope","$q","$view","$injector","$resolve","$stateParams","$urlRouter","$location","$urlMatcherFactory"]}function y(){function a(a,b){return{load:function(a,c){var d;return c=T({template:null,controller:null,view:null,locals:null,notify:!0,async:!0,params:{}},c),c.view&&(d=b.fromConfig(c.view,c.params,c.locals)),d}}}this.$get=a,a.$inject=["$rootScope","$templateFactory"]}function z(){var a=!1;this.useAnchorScroll=function(){a=!0},this.$get=["$anchorScroll","$timeout",function(b,c){return a?b:function(a){return c(function(){a[0].scrollIntoView()},0,!1)}}]}function A(a,c,d,e,f){function g(){return c.has?function(a){return c.has(a)?c.get(a):null}:function(a){try{return c.get(a)}catch(a){return null}}}function h(a,c){var d=function(){return{enter:function(a,b,c){b.after(a),c()},leave:function(a,b){a.remove(),b()}}};if(k)return{enter:function(a,c,d){b.version.minor>2?k.enter(a,null,c).then(d):k.enter(a,null,c,d)},leave:function(a,c){b.version.minor>2?k.leave(a).then(c):k.leave(a,c)}};if(j){var e=j&&j(c,a);return{enter:function(a,b,c){e.enter(a,null,b),c()},leave:function(a,b){e.leave(a),b()}}}return d()}var i=g(),j=i("$animator"),k=i("$animate");return{restrict:"ECA",terminal:!0,priority:400,transclude:"element",compile:function(c,g,i){return function(c,g,j){function k(){if(m&&(m.remove(),m=null),o&&(o.$destroy(),o=null),n){var a=n.data("$uiViewAnim");s.leave(n,function(){a.$$animLeave.resolve(),m=null}),m=n,n=null}}function l(h){var l,m=C(c,j,g,e),t=m&&a.$current&&a.$current.locals[m];if(h||t!==p){l=c.$new(),p=a.$current.locals[m],l.$emit("$viewContentLoading",m);var u=i(l,function(a){var e=f.defer(),h=f.defer(),i={$animEnter:e.promise,$animLeave:h.promise,$$animLeave:h};a.data("$uiViewAnim",i),s.enter(a,g,function(){e.resolve(),o&&o.$emit("$viewContentAnimationEnded"),(b.isDefined(r)&&!r||c.$eval(r))&&d(a)}),k()});n=u,o=l,o.$emit("$viewContentLoaded",m),o.$eval(q)}}var m,n,o,p,q=j.onload||"",r=j.autoscroll,s=h(j,c);g.inheritedData("$uiView");c.$on("$stateChangeSuccess",function(){l(!1)}),l(!0)}}}}function B(a,c,d,e){return{restrict:"ECA",priority:-400,compile:function(f){var g=f.html();return f.empty?f.empty():f[0].innerHTML=null,function(f,h,i){var j=d.$current,k=C(f,i,h,e),l=j&&j.locals[k];if(!l)return h.html(g),void a(h.contents())(f);h.data("$uiView",{name:k,state:l.$$state}),h.html(l.$template?l.$template:g);var m=b.extend({},l);f[l.$$resolveAs]=m;var n=a(h.contents());if(l.$$controller){l.$scope=f,l.$element=h;var o=c(l.$$controller,l);l.$$controllerAs&&(f[l.$$controllerAs]=o,f[l.$$controllerAs][l.$$resolveAs]=m),O(o.$onInit)&&o.$onInit(),h.data("$ngControllerController",o),h.children().data("$ngControllerController",o)}n(f)}}}}function C(a,b,c,d){var e=d(b.uiView||b.name||"")(a),f=c.inheritedData("$uiView");return e.indexOf("@")>=0?e:e+"@"+(f?f.state.name:"")}function D(a,b){var c,d=a.match(/^\s*({[^}]*})\s*$/);if(d&&(a=b+"("+d[1]+")"),!(c=a.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/))||4!==c.length)throw new Error("Invalid state ref '"+a+"'");return{state:c[1],paramExpr:c[3]||null}}function E(a){var b=a.parent().inheritedData("$uiView");if(b&&b.state&&b.state.name)return b.state}function F(a){var b="[object SVGAnimatedString]"===Object.prototype.toString.call(a.prop("href")),c="FORM"===a[0].nodeName;return{attr:c?"action":b?"xlink:href":"href",isAnchor:"A"===a.prop("tagName").toUpperCase(),clickable:!c}}function G(a,b,c,d,e){return function(f){var g=f.which||f.button,h=e();if(!(g>1||f.ctrlKey||f.metaKey||f.shiftKey||a.attr("target"))){var i=c(function(){b.go(h.state,h.params,h.options)});f.preventDefault();var j=d.isAnchor&&!h.href?1:0;f.preventDefault=function(){j--<=0&&c.cancel(i)}}}}function H(a,b){return{relative:E(a)||b.$current,inherit:!0}}function I(a,c){return{restrict:"A",require:["?^uiSrefActive","?^uiSrefActiveEq"],link:function(d,e,f,g){var h,i=D(f.uiSref,a.current.name),j={state:i.state,href:null,params:null},k=F(e),l=g[1]||g[0],m=null;j.options=T(H(e,a),f.uiSrefOpts?d.$eval(f.uiSrefOpts):{});var n=function(c){c&&(j.params=b.copy(c)),j.href=a.href(i.state,j.params,j.options),m&&m(),l&&(m=l.$$addStateInfo(i.state,j.params)),null!==j.href&&f.$set(k.attr,j.href)};i.paramExpr&&(d.$watch(i.paramExpr,function(a){a!==j.params&&n(a)},!0),j.params=b.copy(d.$eval(i.paramExpr))),n(),k.clickable&&(h=G(e,a,c,k,function(){return j}),e[e.on?"on":"bind"]("click",h),d.$on("$destroy",function(){e[e.off?"off":"unbind"]("click",h)}))}}}function J(a,b){return{restrict:"A",require:["?^uiSrefActive","?^uiSrefActiveEq"],link:function(c,d,e,f){function g(b){m.state=b[0],m.params=b[1],m.options=b[2],m.href=a.href(m.state,m.params,m.options),n&&n(),j&&(n=j.$$addStateInfo(m.state,m.params)),m.href&&e.$set(i.attr,m.href)}var h,i=F(d),j=f[1]||f[0],k=[e.uiState,e.uiStateParams||null,e.uiStateOpts||null],l="["+k.map(function(a){return a||"null"}).join(", ")+"]",m={state:null,params:null,options:null,href:null},n=null;c.$watch(l,g,!0),g(c.$eval(l)),i.clickable&&(h=G(d,a,b,i,function(){return m}),d[d.on?"on":"bind"]("click",h),c.$on("$destroy",function(){d[d.off?"off":"unbind"]("click",h)}))}}}function K(a,b,c){return{restrict:"A",controller:["$scope","$element","$attrs","$timeout",function(b,d,e,f){function g(b,c,e){var f=a.get(b,E(d)),g=h(b,c),i={state:f||{name:b},params:c,hash:g};return p.push(i),q[g]=e,function(){var a=p.indexOf(i);-1!==a&&p.splice(a,1)}}function h(a,c){if(!P(a))throw new Error("state should be a string");return Q(c)?a+V(c):(c=b.$eval(c),Q(c)?a+V(c):a)}function i(){for(var a=0;a<p.length;a++)l(p[a].state,p[a].params)?j(d,q[p[a].hash]):k(d,q[p[a].hash]),m(p[a].state,p[a].params)?j(d,n):k(d,n)}function j(a,b){f(function(){a.addClass(b)})}function k(a,b){a.removeClass(b)}function l(b,c){return a.includes(b.name,c)}function m(b,c){return a.is(b.name,c)}var n,o,p=[],q={};n=c(e.uiSrefActiveEq||"",!1)(b);try{o=b.$eval(e.uiSrefActive)}catch(a){}o=o||c(e.uiSrefActive||"",!1)(b),Q(o)&&S(o,function(c,d){if(P(c)){var e=D(c,a.current.name);g(e.state,b.$eval(e.paramExpr),d)}}),this.$$addStateInfo=function(a,b){if(!(Q(o)&&p.length>0)){var c=g(a,b,o);return i(),c}},b.$on("$stateChangeSuccess",i),i()}]}}function L(a){var b=function(b,c){return a.is(b,c)};return b.$stateful=!0,b}function M(a){var b=function(b,c,d){return a.includes(b,c,d)};return b.$stateful=!0,b}var N=b.isDefined,O=b.isFunction,P=b.isString,Q=b.isObject,R=b.isArray,S=b.forEach,T=b.extend,U=b.copy,V=b.toJson;b.module("ui.router.util",["ng"]),b.module("ui.router.router",["ui.router.util"]),b.module("ui.router.state",["ui.router.router","ui.router.util"]),b.module("ui.router",["ui.router.state"]),b.module("ui.router.compat",["ui.router"]),q.$inject=["$q","$injector"],b.module("ui.router.util").service("$resolve",q),b.module("ui.router.util").provider("$templateFactory",r);var W;t.prototype.concat=function(a,b){var c={caseInsensitive:W.caseInsensitive(),strict:W.strictMode(),squash:W.defaultSquashPolicy()};return new t(this.sourcePath+a+this.sourceSearch,T(c,b),this)},t.prototype.toString=function(){return this.source},t.prototype.exec=function(a,b){function c(a){function b(a){return a.split("").reverse().join("")}function c(a){return a.replace(/\\-/g,"-")}return o(o(b(a).split(/-(?!\\)/),b),c).reverse()}var d=this.regexp.exec(a);if(!d)return null;b=b||{};var e,f,g,h=this.parameters(),i=h.length,j=this.segments.length-1,k={};if(j!==d.length-1)throw new Error("Unbalanced capture group in route '"+this.source+"'");var l,m;for(e=0;e<j;e++){for(g=h[e],l=this.params[g],m=d[e+1],f=0;f<l.replace.length;f++)l.replace[f].from===m&&(m=l.replace[f].to);m&&!0===l.array&&(m=c(m)),N(m)&&(m=l.type.decode(m)),k[g]=l.value(m)}for(;e<i;e++){for(g=h[e],k[g]=this.params[g].value(b[g]),l=this.params[g],m=b[g],f=0;f<l.replace.length;f++)l.replace[f].from===m&&(m=l.replace[f].to);N(m)&&(m=l.type.decode(m)),k[g]=l.value(m)}return k},t.prototype.parameters=function(a){return N(a)?this.params[a]||null:this.$$paramNames},t.prototype.validates=function(a){return this.params.$$validates(a)},t.prototype.format=function(a){function b(a){return encodeURIComponent(a).replace(/-/g,function(a){return"%5C%"+a.charCodeAt(0).toString(16).toUpperCase()})}a=a||{};var c=this.segments,d=this.parameters(),e=this.params;if(!this.validates(a))return null;var f,g=!1,h=c.length-1,i=d.length,j=c[0];for(f=0;f<i;f++){var k=f<h,l=d[f],m=e[l],n=m.value(a[l]),p=m.isOptional&&m.type.equals(m.value(),n),q=!!p&&m.squash,r=m.type.encode(n);if(k){var s=c[f+1],t=f+1===h;if(!1===q)null!=r&&(R(r)?j+=o(r,b).join("-"):j+=encodeURIComponent(r)),j+=s;else if(!0===q){var u=j.match(/\/$/)?/\/?(.*)/:/(.*)/;j+=s.match(u)[1]}else P(q)&&(j+=q+s);t&&!0===m.squash&&"/"===j.slice(-1)&&(j=j.slice(0,-1))}else{if(null==r||p&&!1!==q)continue;if(R(r)||(r=[r]),0===r.length)continue;r=o(r,encodeURIComponent).join("&"+l+"="),j+=(g?"&":"?")+l+"="+r,g=!0}}return j},u.prototype.is=function(a,b){return!0},u.prototype.encode=function(a,b){return a},u.prototype.decode=function(a,b){return a},u.prototype.equals=function(a,b){return a==b},u.prototype.$subPattern=function(){var a=this.pattern.toString();return a.substr(1,a.length-2)},u.prototype.pattern=/.*/,u.prototype.toString=function(){return"{Type:"+this.name+"}"},u.prototype.$normalize=function(a){return this.is(a)?a:this.decode(a)},u.prototype.$asArray=function(a,b){function d(a,b){function d(a,b){return function(){return a[b].apply(a,arguments)}}function e(a){return R(a)?a:N(a)?[a]:[]}function f(a){switch(a.length){case 0:return c;case 1:return"auto"===b?a[0]:a;default:return a}}function g(a){return!a}function h(a,b){return function(c){if(R(c)&&0===c.length)return c;c=e(c);var d=o(c,a);return!0===b?0===n(d,g).length:f(d)}}function i(a){return function(b,c){var d=e(b),f=e(c);if(d.length!==f.length)return!1;for(var g=0;g<d.length;g++)if(!a(d[g],f[g]))return!1;return!0}}this.encode=h(d(a,"encode")),this.decode=h(d(a,"decode")),this.is=h(d(a,"is"),!0),this.equals=i(d(a,"equals")),this.pattern=a.pattern,this.$normalize=h(d(a,"$normalize")),this.name=a.name,this.$arrayMode=b}if(!a)return this;if("auto"===a&&!b)throw new Error("'auto' array mode is for query parameters only");return new d(this,a)},b.module("ui.router.util").provider("$urlMatcherFactory",v),b.module("ui.router.util").run(["$urlMatcherFactory",function(a){}]),w.$inject=["$locationProvider","$urlMatcherFactoryProvider"],b.module("ui.router.router").provider("$urlRouter",w),x.$inject=["$urlRouterProvider","$urlMatcherFactoryProvider"],b.module("ui.router.state").factory("$stateParams",function(){return{}}).constant("$state.runtime",{autoinject:!0}).provider("$state",x).run(["$injector",function(a){a.get("$state.runtime").autoinject&&a.get("$state")}]),y.$inject=[],b.module("ui.router.state").provider("$view",y),b.module("ui.router.state").provider("$uiViewScroll",z),A.$inject=["$state","$injector","$uiViewScroll","$interpolate","$q"],B.$inject=["$compile","$controller","$state","$interpolate"],b.module("ui.router.state").directive("uiView",A),b.module("ui.router.state").directive("uiView",B),I.$inject=["$state","$timeout"],J.$inject=["$state","$timeout"],K.$inject=["$state","$stateParams","$interpolate"],b.module("ui.router.state").directive("uiSref",I).directive("uiSrefActive",K).directive("uiSrefActiveEq",K).directive("uiState",J),L.$inject=["$state"],M.$inject=["$state"],b.module("ui.router.state").filter("isState",L).filter("includedByState",M)}(window,window.angular);
\ No newline at end of file
diff --git a/setup/pub/angular/angular.js b/setup/pub/angular/angular.js
index e3a85e3679ac6..189ff16495b25 100644
--- a/setup/pub/angular/angular.js
+++ b/setup/pub/angular/angular.js
@@ -1,15 +1,65 @@
 /**
- * @license AngularJS v1.2.16
- * (c) 2010-2014 Google, Inc. http://angularjs.org
+ * @license AngularJS v1.6.9
+ * (c) 2010-2018 Google, Inc. http://angularjs.org
  * License: MIT
  */
-(function(window, document, undefined) {'use strict';
+(function(window) {'use strict';
+
+    /* exported
+  minErrConfig,
+  errorHandlingConfig,
+  isValidObjectMaxDepth
+*/
+
+    var minErrConfig = {
+        objectMaxDepth: 5
+    };
+
+    /**
+     * @ngdoc function
+     * @name angular.errorHandlingConfig
+     * @module ng
+     * @kind function
+     *
+     * @description
+     * Configure several aspects of error handling in AngularJS if used as a setter or return the
+     * current configuration if used as a getter. The following options are supported:
+     *
+     * - **objectMaxDepth**: The maximum depth to which objects are traversed when stringified for error messages.
+     *
+     * Omitted or undefined options will leave the corresponding configuration values unchanged.
+     *
+     * @param {Object=} config - The configuration object. May only contain the options that need to be
+     *     updated. Supported keys:
+     *
+     * * `objectMaxDepth`  **{Number}** - The max depth for stringifying objects. Setting to a
+     *   non-positive or non-numeric value, removes the max depth limit.
+     *   Default: 5
+     */
+    function errorHandlingConfig(config) {
+        if (isObject(config)) {
+            if (isDefined(config.objectMaxDepth)) {
+                minErrConfig.objectMaxDepth = isValidObjectMaxDepth(config.objectMaxDepth) ? config.objectMaxDepth : NaN;
+            }
+        } else {
+            return minErrConfig;
+        }
+    }
+
+    /**
+     * @private
+     * @param {Number} maxDepth
+     * @return {boolean}
+     */
+    function isValidObjectMaxDepth(maxDepth) {
+        return isNumber(maxDepth) && maxDepth > 0;
+    }
 
     /**
      * @description
      *
      * This object provides a utility for producing rich Error messages within
-     * Angular. It can be called as follows:
+     * AngularJS. It can be called as follows:
      *
      * var exampleMinErr = minErr('example');
      * throw exampleMinErr('one', 'This {0} is {1}', foo, bar);
@@ -30,140 +80,145 @@
      * should all be static strings, not variables or general expressions.
      *
      * @param {string} module The namespace to use for the new minErr instance.
+     * @param {function} ErrorConstructor Custom error constructor to be instantiated when returning
+     *   error from returned function, for cases when a particular type of error is useful.
      * @returns {function(code:string, template:string, ...templateArgs): Error} minErr instance
      */
 
-    function minErr(module) {
-        return function () {
+    function minErr(module, ErrorConstructor) {
+        ErrorConstructor = ErrorConstructor || Error;
+        return function() {
             var code = arguments[0],
-                prefix = '[' + (module ? module + ':' : '') + code + '] ',
                 template = arguments[1],
-                templateArgs = arguments,
-                stringify = function (obj) {
-                    if (typeof obj === 'function') {
-                        return obj.toString().replace(/ \{[\s\S]*$/, '');
-                    } else if (typeof obj === 'undefined') {
-                        return 'undefined';
-                    } else if (typeof obj !== 'string') {
-                        return JSON.stringify(obj);
-                    }
-                    return obj;
-                },
-                message, i;
+                message = '[' + (module ? module + ':' : '') + code + '] ',
+                templateArgs = sliceArgs(arguments, 2).map(function(arg) {
+                    return toDebugString(arg, minErrConfig.objectMaxDepth);
+                }),
+                paramPrefix, i;
 
-            message = prefix + template.replace(/\{\d+\}/g, function (match) {
-                var index = +match.slice(1, -1), arg;
+            message += template.replace(/\{\d+\}/g, function(match) {
+                var index = +match.slice(1, -1);
 
-                if (index + 2 < templateArgs.length) {
-                    arg = templateArgs[index + 2];
-                    if (typeof arg === 'function') {
-                        return arg.toString().replace(/ ?\{[\s\S]*$/, '');
-                    } else if (typeof arg === 'undefined') {
-                        return 'undefined';
-                    } else if (typeof arg !== 'string') {
-                        return toJson(arg);
-                    }
-                    return arg;
+                if (index < templateArgs.length) {
+                    return templateArgs[index];
                 }
+
                 return match;
             });
 
-            message = message + '\nhttp://errors.angularjs.org/1.2.16/' +
-            (module ? module + '/' : '') + code;
-            for (i = 2; i < arguments.length; i++) {
-                message = message + (i == 2 ? '?' : '&') + 'p' + (i-2) + '=' +
-                encodeURIComponent(stringify(arguments[i]));
+            message += '\nhttp://errors.angularjs.org/1.6.9/' +
+                (module ? module + '/' : '') + code;
+
+            for (i = 0, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
+                message += paramPrefix + 'p' + i + '=' + encodeURIComponent(templateArgs[i]);
             }
 
-            return new Error(message);
+            return new ErrorConstructor(message);
         };
     }
 
-    /* We need to tell jshint what variables are being exported */
-    /* global
-     -angular,
-     -msie,
-     -jqLite,
-     -jQuery,
-     -slice,
-     -push,
-     -toString,
-     -ngMinErr,
-     -_angular,
-     -angularModule,
-     -nodeName_,
-     -uid,
-
-     -lowercase,
-     -uppercase,
-     -manualLowercase,
-     -manualUppercase,
-     -nodeName_,
-     -isArrayLike,
-     -forEach,
-     -sortedKeys,
-     -forEachSorted,
-     -reverseParams,
-     -nextUid,
-     -setHashKey,
-     -extend,
-     -int,
-     -inherit,
-     -noop,
-     -identity,
-     -valueFn,
-     -isUndefined,
-     -isDefined,
-     -isObject,
-     -isString,
-     -isNumber,
-     -isDate,
-     -isArray,
-     -isFunction,
-     -isRegExp,
-     -isWindow,
-     -isScope,
-     -isFile,
-     -isBlob,
-     -isBoolean,
-     -trim,
-     -isElement,
-     -makeMap,
-     -map,
-     -size,
-     -includes,
-     -indexOf,
-     -arrayRemove,
-     -isLeafNode,
-     -copy,
-     -shallowCopy,
-     -equals,
-     -csp,
-     -concat,
-     -sliceArgs,
-     -bind,
-     -toJsonReplacer,
-     -toJson,
-     -fromJson,
-     -toBoolean,
-     -startingTag,
-     -tryDecodeURIComponent,
-     -parseKeyValue,
-     -toKeyValue,
-     -encodeUriSegment,
-     -encodeUriQuery,
-     -angularInit,
-     -bootstrap,
-     -snake_case,
-     -bindJQuery,
-     -assertArg,
-     -assertArgFn,
-     -assertNotHasOwnProperty,
-     -getter,
-     -getBlockElements,
-     -hasOwnProperty,
-
-     */
+    /* We need to tell ESLint what variables are being exported */
+    /* exported
+  angular,
+  msie,
+  jqLite,
+  jQuery,
+  slice,
+  splice,
+  push,
+  toString,
+  minErrConfig,
+  errorHandlingConfig,
+  isValidObjectMaxDepth,
+  ngMinErr,
+  angularModule,
+  uid,
+  REGEX_STRING_REGEXP,
+  VALIDITY_STATE_PROPERTY,
+
+  lowercase,
+  uppercase,
+  manualLowercase,
+  manualUppercase,
+  nodeName_,
+  isArrayLike,
+  forEach,
+  forEachSorted,
+  reverseParams,
+  nextUid,
+  setHashKey,
+  extend,
+  toInt,
+  inherit,
+  merge,
+  noop,
+  identity,
+  valueFn,
+  isUndefined,
+  isDefined,
+  isObject,
+  isBlankObject,
+  isString,
+  isNumber,
+  isNumberNaN,
+  isDate,
+  isError,
+  isArray,
+  isFunction,
+  isRegExp,
+  isWindow,
+  isScope,
+  isFile,
+  isFormData,
+  isBlob,
+  isBoolean,
+  isPromiseLike,
+  trim,
+  escapeForRegexp,
+  isElement,
+  makeMap,
+  includes,
+  arrayRemove,
+  copy,
+  simpleCompare,
+  equals,
+  csp,
+  jq,
+  concat,
+  sliceArgs,
+  bind,
+  toJsonReplacer,
+  toJson,
+  fromJson,
+  convertTimezoneToLocal,
+  timezoneToOffset,
+  startingTag,
+  tryDecodeURIComponent,
+  parseKeyValue,
+  toKeyValue,
+  encodeUriSegment,
+  encodeUriQuery,
+  angularInit,
+  bootstrap,
+  getTestability,
+  snake_case,
+  bindJQuery,
+  assertArg,
+  assertArgFn,
+  assertNotHasOwnProperty,
+  getter,
+  getBlockNodes,
+  hasOwnProperty,
+  createMap,
+  stringify,
+
+  NODE_TYPE_ELEMENT,
+  NODE_TYPE_ATTRIBUTE,
+  NODE_TYPE_TEXT,
+  NODE_TYPE_COMMENT,
+  NODE_TYPE_DOCUMENT,
+  NODE_TYPE_DOCUMENT_FRAGMENT
+*/
 
 ////////////////////////////////////
 
@@ -171,91 +226,107 @@
      * @ngdoc module
      * @name ng
      * @module ng
+     * @installation
      * @description
      *
-     * # ng (core module)
      * The ng module is loaded by default when an AngularJS application is started. The module itself
      * contains the essential components for an AngularJS application to function. The table below
      * lists a high level breakdown of each of the services/factories, filters, directives and testing
      * components available within this core module.
      *
-     * <div doc-module-components="ng"></div>
      */
 
+    var REGEX_STRING_REGEXP = /^\/(.+)\/([a-z]*)$/;
+
+// The name of a form control's ValidityState property.
+// This is used so that it's possible for internal tests to create mock ValidityStates.
+    var VALIDITY_STATE_PROPERTY = 'validity';
+
+
+    var hasOwnProperty = Object.prototype.hasOwnProperty;
+
     /**
      * @ngdoc function
      * @name angular.lowercase
      * @module ng
-     * @function
+     * @kind function
+     *
+     * @deprecated
+     * sinceVersion="1.5.0"
+     * removeVersion="1.7.0"
+     * Use [String.prototype.toLowerCase](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String/toLowerCase) instead.
      *
      * @description Converts the specified string to lowercase.
      * @param {string} string String to be converted to lowercase.
      * @returns {string} Lowercased string.
      */
-    var lowercase = function(string){return isString(string) ? string.toLowerCase() : string;};
-    var hasOwnProperty = Object.prototype.hasOwnProperty;
+    var lowercase = function(string) {return isString(string) ? string.toLowerCase() : string;};
 
     /**
      * @ngdoc function
      * @name angular.uppercase
      * @module ng
-     * @function
+     * @kind function
+     *
+     * @deprecated
+     * sinceVersion="1.5.0"
+     * removeVersion="1.7.0"
+     * Use [String.prototype.toUpperCase](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String/toUpperCase) instead.
      *
      * @description Converts the specified string to uppercase.
      * @param {string} string String to be converted to uppercase.
      * @returns {string} Uppercased string.
      */
-    var uppercase = function(string){return isString(string) ? string.toUpperCase() : string;};
+    var uppercase = function(string) {return isString(string) ? string.toUpperCase() : string;};
 
 
     var manualLowercase = function(s) {
-        /* jshint bitwise: false */
+        /* eslint-disable no-bitwise */
         return isString(s)
             ? s.replace(/[A-Z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) | 32);})
             : s;
+        /* eslint-enable */
     };
     var manualUppercase = function(s) {
-        /* jshint bitwise: false */
+        /* eslint-disable no-bitwise */
         return isString(s)
             ? s.replace(/[a-z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) & ~32);})
             : s;
+        /* eslint-enable */
     };
 
 
 // String#toLowerCase and String#toUpperCase don't produce correct results in browsers with Turkish
 // locale, for this reason we need to detect this case and redefine lowercase/uppercase methods
-// with correct but slower alternatives.
+// with correct but slower alternatives. See https://github.com/angular/angular.js/issues/11387
     if ('i' !== 'I'.toLowerCase()) {
         lowercase = manualLowercase;
         uppercase = manualUppercase;
     }
 
 
-    var /** holds major version number for IE or NaN for real browsers */
-        msie,
+    var
+        msie,             // holds major version number for IE, or NaN if UA is not IE.
         jqLite,           // delay binding since jQuery could be loaded after us.
         jQuery,           // delay binding
         slice             = [].slice,
+        splice            = [].splice,
         push              = [].push,
         toString          = Object.prototype.toString,
+        getPrototypeOf    = Object.getPrototypeOf,
         ngMinErr          = minErr('ng'),
 
-
-        _angular          = window.angular,
         /** @name angular */
         angular           = window.angular || (window.angular = {}),
         angularModule,
-        nodeName_,
-        uid               = ['0', '0', '0'];
+        uid               = 0;
 
+// Support: IE 9-11 only
     /**
-     * IE 11 changed the format of the UserAgent string.
-     * See http://msdn.microsoft.com/en-us/library/ms537503.aspx
+     * documentMode is an IE-only property
+     * http://msdn.microsoft.com/en-us/library/ie/cc196988(v=vs.85).aspx
      */
-    msie = int((/msie (\d+)/.exec(lowercase(navigator.userAgent)) || [])[1]);
-    if (isNaN(msie)) {
-        msie = int((/trident\/.*; rv:(\d+)/.exec(lowercase(navigator.userAgent)) || [])[1]);
-    }
+    msie = window.document.documentMode;
 
 
     /**
@@ -265,39 +336,51 @@
      *                   String ...)
      */
     function isArrayLike(obj) {
-        if (obj == null || isWindow(obj)) {
-            return false;
-        }
 
-        var length = obj.length;
+        // `null`, `undefined` and `window` are not array-like
+        if (obj == null || isWindow(obj)) return false;
 
-        if (obj.nodeType === 1 && length) {
-            return true;
-        }
+        // arrays, strings and jQuery/jqLite objects are array like
+        // * jqLite is either the jQuery or jqLite constructor function
+        // * we have to check the existence of jqLite first as this method is called
+        //   via the forEach method when constructing the jqLite object in the first place
+        if (isArray(obj) || isString(obj) || (jqLite && obj instanceof jqLite)) return true;
+
+        // Support: iOS 8.2 (not reproducible in simulator)
+        // "length" in obj used to prevent JIT error (gh-11508)
+        var length = 'length' in Object(obj) && obj.length;
+
+        // NodeList objects (with `item` method) and
+        // other objects with suitable length characteristics are array-like
+        return isNumber(length) &&
+            (length >= 0 && ((length - 1) in obj || obj instanceof Array) || typeof obj.item === 'function');
 
-        return isString(obj) || isArray(obj) || length === 0 ||
-        typeof length === 'number' && length > 0 && (length - 1) in obj;
     }
 
     /**
      * @ngdoc function
      * @name angular.forEach
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Invokes the `iterator` function once for each item in `obj` collection, which can be either an
-     * object or an array. The `iterator` function is invoked with `iterator(value, key)`, where `value`
-     * is the value of an object property or an array element and `key` is the object property key or
-     * array element index. Specifying a `context` for the function is optional.
+     * object or an array. The `iterator` function is invoked with `iterator(value, key, obj)`, where `value`
+     * is the value of an object property or an array element, `key` is the object property key or
+     * array element index and obj is the `obj` itself. Specifying a `context` for the function is optional.
      *
      * It is worth noting that `.forEach` does not iterate over inherited properties because it filters
      * using the `hasOwnProperty` method.
      *
+     * Unlike ES262's
+     * [Array.prototype.forEach](http://www.ecma-international.org/ecma-262/5.1/#sec-15.4.4.18),
+     * providing 'undefined' or 'null' values for `obj` will not throw a TypeError, but rather just
+     * return the value provided.
+     *
      ```js
      var values = {name: 'misko', gender: 'male'};
      var log = [];
-     angular.forEach(values, function(value, key){
+     angular.forEach(values, function(value, key) {
        this.push(key + ': ' + value);
      }, log);
      expect(log).toEqual(['name: misko', 'gender: male']);
@@ -308,26 +391,42 @@
      * @param {Object=} context Object to become context (`this`) for the iterator function.
      * @returns {Object|Array} Reference to `obj`.
      */
+
     function forEach(obj, iterator, context) {
-        var key;
+        var key, length;
         if (obj) {
-            if (isFunction(obj)){
+            if (isFunction(obj)) {
                 for (key in obj) {
-                    // Need to check if hasOwnProperty exists,
-                    // as on IE8 the result of querySelectorAll is an object without a hasOwnProperty function
-                    if (key != 'prototype' && key != 'length' && key != 'name' && (!obj.hasOwnProperty || obj.hasOwnProperty(key))) {
-                        iterator.call(context, obj[key], key);
+                    if (key !== 'prototype' && key !== 'length' && key !== 'name' && obj.hasOwnProperty(key)) {
+                        iterator.call(context, obj[key], key, obj);
+                    }
+                }
+            } else if (isArray(obj) || isArrayLike(obj)) {
+                var isPrimitive = typeof obj !== 'object';
+                for (key = 0, length = obj.length; key < length; key++) {
+                    if (isPrimitive || key in obj) {
+                        iterator.call(context, obj[key], key, obj);
                     }
                 }
             } else if (obj.forEach && obj.forEach !== forEach) {
-                obj.forEach(iterator, context);
-            } else if (isArrayLike(obj)) {
-                for (key = 0; key < obj.length; key++)
-                    iterator.call(context, obj[key], key);
-            } else {
+                obj.forEach(iterator, context, obj);
+            } else if (isBlankObject(obj)) {
+                // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty
+                for (key in obj) {
+                    iterator.call(context, obj[key], key, obj);
+                }
+            } else if (typeof obj.hasOwnProperty === 'function') {
+                // Slow path for objects inheriting Object.prototype, hasOwnProperty check needed
                 for (key in obj) {
                     if (obj.hasOwnProperty(key)) {
-                        iterator.call(context, obj[key], key);
+                        iterator.call(context, obj[key], key, obj);
+                    }
+                }
+            } else {
+                // Slow path for objects which do not have a method `hasOwnProperty`
+                for (key in obj) {
+                    if (hasOwnProperty.call(obj, key)) {
+                        iterator.call(context, obj[key], key, obj);
                     }
                 }
             }
@@ -335,19 +434,9 @@
         return obj;
     }
 
-    function sortedKeys(obj) {
-        var keys = [];
-        for (var key in obj) {
-            if (obj.hasOwnProperty(key)) {
-                keys.push(key);
-            }
-        }
-        return keys.sort();
-    }
-
     function forEachSorted(obj, iterator, context) {
-        var keys = sortedKeys(obj);
-        for ( var i = 0; i < keys.length; i++) {
+        var keys = Object.keys(obj).sort();
+        for (var i = 0; i < keys.length; i++) {
             iterator.call(context, obj[keys[i]], keys[i]);
         }
         return keys;
@@ -360,37 +449,21 @@
      * @returns {function(*, string)}
      */
     function reverseParams(iteratorFn) {
-        return function(value, key) { iteratorFn(key, value); };
+        return function(value, key) {iteratorFn(key, value);};
     }
 
     /**
-     * A consistent way of creating unique IDs in angular. The ID is a sequence of alpha numeric
-     * characters such as '012ABC'. The reason why we are not using simply a number counter is that
-     * the number string gets longer over time, and it can also overflow, where as the nextId
-     * will grow much slower, it is a string, and it will never overflow.
+     * A consistent way of creating unique IDs in angular.
      *
-     * @returns {string} an unique alpha-numeric string
+     * Using simple numbers allows us to generate 28.6 million unique ids per second for 10 years before
+     * we hit number precision issues in JavaScript.
+     *
+     * Math.pow(2,53) / 60 / 60 / 24 / 365 / 10 = 28.6M
+     *
+     * @returns {number} an unique alpha-numeric string
      */
     function nextUid() {
-        var index = uid.length;
-        var digit;
-
-        while(index) {
-            index--;
-            digit = uid[index].charCodeAt(0);
-            if (digit == 57 /*'9'*/) {
-                uid[index] = 'A';
-                return uid.join('');
-            }
-            if (digit == 90  /*'Z'*/) {
-                uid[index] = '0';
-            } else {
-                uid[index] = String.fromCharCode(digit + 1);
-                return uid.join('');
-            }
-        }
-        uid.unshift('0');
-        return uid.join('');
+        return ++uid;
     }
 
 
@@ -402,54 +475,126 @@
     function setHashKey(obj, h) {
         if (h) {
             obj.$$hashKey = h;
-        }
-        else {
+        } else {
             delete obj.$$hashKey;
         }
     }
 
+
+    function baseExtend(dst, objs, deep) {
+        var h = dst.$$hashKey;
+
+        for (var i = 0, ii = objs.length; i < ii; ++i) {
+            var obj = objs[i];
+            if (!isObject(obj) && !isFunction(obj)) continue;
+            var keys = Object.keys(obj);
+            for (var j = 0, jj = keys.length; j < jj; j++) {
+                var key = keys[j];
+                var src = obj[key];
+
+                if (deep && isObject(src)) {
+                    if (isDate(src)) {
+                        dst[key] = new Date(src.valueOf());
+                    } else if (isRegExp(src)) {
+                        dst[key] = new RegExp(src);
+                    } else if (src.nodeName) {
+                        dst[key] = src.cloneNode(true);
+                    } else if (isElement(src)) {
+                        dst[key] = src.clone();
+                    } else {
+                        if (!isObject(dst[key])) dst[key] = isArray(src) ? [] : {};
+                        baseExtend(dst[key], [src], true);
+                    }
+                } else {
+                    dst[key] = src;
+                }
+            }
+        }
+
+        setHashKey(dst, h);
+        return dst;
+    }
+
     /**
      * @ngdoc function
      * @name angular.extend
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
-     * Extends the destination object `dst` by copying all of the properties from the `src` object(s)
-     * to `dst`. You can specify multiple `src` objects.
+     * Extends the destination object `dst` by copying own enumerable properties from the `src` object(s)
+     * to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so
+     * by passing an empty object as the target: `var object = angular.extend({}, object1, object2)`.
+     *
+     * **Note:** Keep in mind that `angular.extend` does not support recursive merge (deep copy). Use
+     * {@link angular.merge} for this.
      *
      * @param {Object} dst Destination object.
      * @param {...Object} src Source object(s).
      * @returns {Object} Reference to `dst`.
      */
     function extend(dst) {
-        var h = dst.$$hashKey;
-        forEach(arguments, function(obj){
-            if (obj !== dst) {
-                forEach(obj, function(value, key){
-                    dst[key] = value;
-                });
-            }
-        });
+        return baseExtend(dst, slice.call(arguments, 1), false);
+    }
 
-        setHashKey(dst,h);
-        return dst;
+
+    /**
+     * @ngdoc function
+     * @name angular.merge
+     * @module ng
+     * @kind function
+     *
+     * @description
+     * Deeply extends the destination object `dst` by copying own enumerable properties from the `src` object(s)
+     * to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so
+     * by passing an empty object as the target: `var object = angular.merge({}, object1, object2)`.
+     *
+     * Unlike {@link angular.extend extend()}, `merge()` recursively descends into object properties of source
+     * objects, performing a deep copy.
+     *
+     * @deprecated
+     * sinceVersion="1.6.5"
+     * This function is deprecated, but will not be removed in the 1.x lifecycle.
+     * There are edge cases (see {@link angular.merge#known-issues known issues}) that are not
+     * supported by this function. We suggest
+     * using [lodash's merge()](https://lodash.com/docs/4.17.4#merge) instead.
+     *
+     * @knownIssue
+     * This is a list of (known) object types that are not handled correctly by this function:
+     * - [`Blob`](https://developer.mozilla.org/docs/Web/API/Blob)
+     * - [`MediaStream`](https://developer.mozilla.org/docs/Web/API/MediaStream)
+     * - [`CanvasGradient`](https://developer.mozilla.org/docs/Web/API/CanvasGradient)
+     * - AngularJS {@link $rootScope.Scope scopes};
+     *
+     * @param {Object} dst Destination object.
+     * @param {...Object} src Source object(s).
+     * @returns {Object} Reference to `dst`.
+     */
+    function merge(dst) {
+        return baseExtend(dst, slice.call(arguments, 1), true);
     }
 
-    function int(str) {
+
+
+    function toInt(str) {
         return parseInt(str, 10);
     }
 
+    var isNumberNaN = Number.isNaN || function isNumberNaN(num) {
+        // eslint-disable-next-line no-self-compare
+        return num !== num;
+    };
+
 
     function inherit(parent, extra) {
-        return extend(new (extend(function() {}, {prototype:parent}))(), extra);
+        return extend(Object.create(parent), extra);
     }
 
     /**
      * @ngdoc function
      * @name angular.noop
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * A function that performs no operations. This function can be useful when writing code in the
@@ -469,7 +614,7 @@
      * @ngdoc function
      * @name angular.identity
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * A function that returns its first argument. This function is useful when writing code in the
@@ -477,21 +622,38 @@
      *
      ```js
      function transformer(transformationFn, value) {
-       return (transformationFn || angular.identity)(value);
-     };
+     return (transformationFn || angular.identity)(value);
+   };
+
+     // E.g.
+     function getResult(fn, input) {
+     return (fn || angular.identity)(input);
+   };
+
+     getResult(function(n) { return n * 2; }, 21);   // returns 42
+     getResult(null, 21);                            // returns 21
+     getResult(undefined, 21);                       // returns 21
      ```
+     *
+     * @param {*} value to be returned.
+     * @returns {*} the value passed in.
      */
     function identity($) {return $;}
     identity.$inject = [];
 
 
-    function valueFn(value) {return function() {return value;};}
+    function valueFn(value) {return function valueRef() {return value;};}
+
+    function hasCustomToString(obj) {
+        return isFunction(obj.toString) && obj.toString !== toString;
+    }
+
 
     /**
      * @ngdoc function
      * @name angular.isUndefined
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Determines if a reference is undefined.
@@ -499,14 +661,14 @@
      * @param {*} value Reference to check.
      * @returns {boolean} True if `value` is undefined.
      */
-    function isUndefined(value){return typeof value === 'undefined';}
+    function isUndefined(value) {return typeof value === 'undefined';}
 
 
     /**
      * @ngdoc function
      * @name angular.isDefined
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Determines if a reference is defined.
@@ -514,14 +676,14 @@
      * @param {*} value Reference to check.
      * @returns {boolean} True if `value` is defined.
      */
-    function isDefined(value){return typeof value !== 'undefined';}
+    function isDefined(value) {return typeof value !== 'undefined';}
 
 
     /**
      * @ngdoc function
      * @name angular.isObject
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Determines if a reference is an `Object`. Unlike `typeof` in JavaScript, `null`s are not
@@ -530,14 +692,27 @@
      * @param {*} value Reference to check.
      * @returns {boolean} True if `value` is an `Object` but not `null`.
      */
-    function isObject(value){return value != null && typeof value === 'object';}
+    function isObject(value) {
+        // http://jsperf.com/isobject4
+        return value !== null && typeof value === 'object';
+    }
+
+
+    /**
+     * Determine if a value is an object with a null prototype
+     *
+     * @returns {boolean} True if `value` is an `Object` with a null prototype
+     */
+    function isBlankObject(value) {
+        return value !== null && typeof value === 'object' && !getPrototypeOf(value);
+    }
 
 
     /**
      * @ngdoc function
      * @name angular.isString
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Determines if a reference is a `String`.
@@ -545,29 +720,35 @@
      * @param {*} value Reference to check.
      * @returns {boolean} True if `value` is a `String`.
      */
-    function isString(value){return typeof value === 'string';}
+    function isString(value) {return typeof value === 'string';}
 
 
     /**
      * @ngdoc function
      * @name angular.isNumber
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Determines if a reference is a `Number`.
      *
+     * This includes the "special" numbers `NaN`, `+Infinity` and `-Infinity`.
+     *
+     * If you wish to exclude these then you can use the native
+     * [`isFinite'](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/isFinite)
+     * method.
+     *
      * @param {*} value Reference to check.
      * @returns {boolean} True if `value` is a `Number`.
      */
-    function isNumber(value){return typeof value === 'number';}
+    function isNumber(value) {return typeof value === 'number';}
 
 
     /**
      * @ngdoc function
      * @name angular.isDate
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Determines if a value is a date.
@@ -575,7 +756,7 @@
      * @param {*} value Reference to check.
      * @returns {boolean} True if `value` is a `Date`.
      */
-    function isDate(value){
+    function isDate(value) {
         return toString.call(value) === '[object Date]';
     }
 
@@ -584,24 +765,39 @@
      * @ngdoc function
      * @name angular.isArray
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
-     * Determines if a reference is an `Array`.
+     * Determines if a reference is an `Array`. Alias of Array.isArray.
      *
      * @param {*} value Reference to check.
      * @returns {boolean} True if `value` is an `Array`.
      */
-    function isArray(value) {
-        return toString.call(value) === '[object Array]';
-    }
+    var isArray = Array.isArray;
 
+    /**
+     * @description
+     * Determines if a reference is an `Error`.
+     * Loosely based on https://www.npmjs.com/package/iserror
+     *
+     * @param {*} value Reference to check.
+     * @returns {boolean} True if `value` is an `Error`.
+     */
+    function isError(value) {
+        var tag = toString.call(value);
+        switch (tag) {
+            case '[object Error]': return true;
+            case '[object Exception]': return true;
+            case '[object DOMException]': return true;
+            default: return value instanceof Error;
+        }
+    }
 
     /**
      * @ngdoc function
      * @name angular.isFunction
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Determines if a reference is a `Function`.
@@ -609,7 +805,7 @@
      * @param {*} value Reference to check.
      * @returns {boolean} True if `value` is a `Function`.
      */
-    function isFunction(value){return typeof value === 'function';}
+    function isFunction(value) {return typeof value === 'function';}
 
 
     /**
@@ -632,7 +828,7 @@
      * @returns {boolean} True if `obj` is a window obj.
      */
     function isWindow(obj) {
-        return obj && obj.document && obj.location && obj.alert && obj.setInterval;
+        return obj && obj.window === obj;
     }
 
 
@@ -646,6 +842,11 @@
     }
 
 
+    function isFormData(obj) {
+        return toString.call(obj) === '[object FormData]';
+    }
+
+
     function isBlob(obj) {
         return toString.call(obj) === '[object Blob]';
     }
@@ -656,26 +857,41 @@
     }
 
 
-    var trim = (function() {
-        // native trim is way faster: http://jsperf.com/angular-trim-test
-        // but IE doesn't have it... :-(
-        // TODO: we should move this into IE/ES5 polyfill
-        if (!String.prototype.trim) {
-            return function(value) {
-                return isString(value) ? value.replace(/^\s\s*/, '').replace(/\s\s*$/, '') : value;
-            };
-        }
-        return function(value) {
-            return isString(value) ? value.trim() : value;
-        };
-    })();
+    function isPromiseLike(obj) {
+        return obj && isFunction(obj.then);
+    }
+
+
+    var TYPED_ARRAY_REGEXP = /^\[object (?:Uint8|Uint8Clamped|Uint16|Uint32|Int8|Int16|Int32|Float32|Float64)Array]$/;
+    function isTypedArray(value) {
+        return value && isNumber(value.length) && TYPED_ARRAY_REGEXP.test(toString.call(value));
+    }
+
+    function isArrayBuffer(obj) {
+        return toString.call(obj) === '[object ArrayBuffer]';
+    }
+
+
+    var trim = function(value) {
+        return isString(value) ? value.trim() : value;
+    };
+
+// Copied from:
+// http://docs.closure-library.googlecode.com/git/local_closure_goog_string_string.js.source.html#line1021
+// Prereq: s is a string.
+    var escapeForRegexp = function(s) {
+        return s
+            .replace(/([-()[\]{}+?*.$^|,:#<!\\])/g, '\\$1')
+            // eslint-disable-next-line no-control-regex
+            .replace(/\x08/g, '\\x08');
+    };
 
 
     /**
      * @ngdoc function
      * @name angular.isElement
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Determines if a reference is a DOM element (or wrapped jQuery element).
@@ -685,117 +901,59 @@
      */
     function isElement(node) {
         return !!(node &&
-        (node.nodeName  // we are a direct element
-        || (node.prop && node.attr && node.find)));  // we have an on and find method part of jQuery API
+            (node.nodeName  // We are a direct element.
+                || (node.prop && node.attr && node.find)));  // We have an on and find method part of jQuery API.
     }
 
     /**
      * @param str 'key1,key2,...'
      * @returns {object} in the form of {key1:true, key2:true, ...}
      */
-    function makeMap(str){
-        var obj = {}, items = str.split(","), i;
-        for ( i = 0; i < items.length; i++ )
-            obj[ items[i] ] = true;
+    function makeMap(str) {
+        var obj = {}, items = str.split(','), i;
+        for (i = 0; i < items.length; i++) {
+            obj[items[i]] = true;
+        }
         return obj;
     }
 
 
-    if (msie < 9) {
-        nodeName_ = function(element) {
-            element = element.nodeName ? element : element[0];
-            return (element.scopeName && element.scopeName != 'HTML')
-                ? uppercase(element.scopeName + ':' + element.nodeName) : element.nodeName;
-        };
-    } else {
-        nodeName_ = function(element) {
-            return element.nodeName ? element.nodeName : element[0].nodeName;
-        };
-    }
-
-
-    function map(obj, iterator, context) {
-        var results = [];
-        forEach(obj, function(value, index, list) {
-            results.push(iterator.call(context, value, index, list));
-        });
-        return results;
-    }
-
-
-    /**
-     * @description
-     * Determines the number of elements in an array, the number of properties an object has, or
-     * the length of a string.
-     *
-     * Note: This function is used to augment the Object type in Angular expressions. See
-     * {@link angular.Object} for more information about Angular arrays.
-     *
-     * @param {Object|Array|string} obj Object, array, or string to inspect.
-     * @param {boolean} [ownPropsOnly=false] Count only "own" properties in an object
-     * @returns {number} The size of `obj` or `0` if `obj` is neither an object nor an array.
-     */
-    function size(obj, ownPropsOnly) {
-        var count = 0, key;
-
-        if (isArray(obj) || isString(obj)) {
-            return obj.length;
-        } else if (isObject(obj)){
-            for (key in obj)
-                if (!ownPropsOnly || obj.hasOwnProperty(key))
-                    count++;
-        }
-
-        return count;
+    function nodeName_(element) {
+        return lowercase(element.nodeName || (element[0] && element[0].nodeName));
     }
 
-
     function includes(array, obj) {
-        return indexOf(array, obj) != -1;
-    }
-
-    function indexOf(array, obj) {
-        if (array.indexOf) return array.indexOf(obj);
-
-        for (var i = 0; i < array.length; i++) {
-            if (obj === array[i]) return i;
-        }
-        return -1;
+        return Array.prototype.indexOf.call(array, obj) !== -1;
     }
 
     function arrayRemove(array, value) {
-        var index = indexOf(array, value);
-        if (index >=0)
+        var index = array.indexOf(value);
+        if (index >= 0) {
             array.splice(index, 1);
-        return value;
-    }
-
-    function isLeafNode (node) {
-        if (node) {
-            switch (node.nodeName) {
-                case "OPTION":
-                case "PRE":
-                case "TITLE":
-                    return true;
-            }
         }
-        return false;
+        return index;
     }
 
     /**
      * @ngdoc function
      * @name angular.copy
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Creates a deep copy of `source`, which should be an object or an array.
      *
      * * If no destination is supplied, a copy of the object or array is created.
-     * * If a destination is provided, all of its elements (for array) or properties (for objects)
+     * * If a destination is provided, all of its elements (for arrays) or properties (for objects)
      *   are deleted and then all elements/properties from the source are copied to it.
      * * If `source` is not an object or array (inc. `null` and `undefined`), `source` is returned.
-     * * If `source` is identical to 'destination' an exception will be thrown.
+     * * If `source` is identical to `destination` an exception will be thrown.
+     *
+     * <br />
+     * <div class="alert alert-warning">
+     *   Only enumerable properties are taken into account. Non-enumerable properties (both on `source`
+     *   and on `destination`) will be ignored.
+     * </div>
      *
      * @param {*} source The source that will be used to make a copy.
      *                   Can be any type, including primitives, `null`, and `undefined`.
@@ -804,105 +962,198 @@
      * @returns {*} The copy or updated `destination`, if `destination` was specified.
      *
      * @example
-     <example>
+     <example module="copyExample" name="angular-copy">
      <file name="index.html">
-     <div ng-controller="Controller">
+     <div ng-controller="ExampleController">
      <form novalidate class="simple-form">
-     Name: <input type="text" ng-model="user.name" /><br />
-     Email: <input type="email" ng-model="user.email" /><br />
-     Gender: <input type="radio" ng-model="user.gender" value="male" />male
-     <input type="radio" ng-model="user.gender" value="female" />female<br />
+     <label>Name: <input type="text" ng-model="user.name" /></label><br />
+     <label>Age:  <input type="number" ng-model="user.age" /></label><br />
+     Gender: <label><input type="radio" ng-model="user.gender" value="male" />male</label>
+     <label><input type="radio" ng-model="user.gender" value="female" />female</label><br />
      <button ng-click="reset()">RESET</button>
      <button ng-click="update(user)">SAVE</button>
      </form>
      <pre>form = {{user | json}}</pre>
-     <pre>master = {{master | json}}</pre>
+     <pre>leader = {{leader | json}}</pre>
      </div>
+     </file>
+     <file name="script.js">
+     // Module: copyExample
+     angular.
+     module('copyExample', []).
+     controller('ExampleController', ['$scope', function($scope) {
+          $scope.leader = {};
+
+          $scope.reset = function() {
+            // Example with 1 argument
+            $scope.user = angular.copy($scope.leader);
+          };
 
-     <script>
-     function Controller($scope) {
-    $scope.master= {};
-
-    $scope.update = function(user) {
-      // Example with 1 argument
-      $scope.master= angular.copy(user);
-    };
-
-    $scope.reset = function() {
-      // Example with 2 arguments
-      angular.copy($scope.master, $scope.user);
-    };
+          $scope.update = function(user) {
+            // Example with 2 arguments
+            angular.copy(user, $scope.leader);
+          };
 
-    $scope.reset();
-  }
-     </script>
+          $scope.reset();
+        }]);
      </file>
      </example>
      */
-    function copy(source, destination){
-        if (isWindow(source) || isScope(source)) {
-            throw ngMinErr('cpws',
-                "Can't copy! Making copies of Window or Scope instances is not supported.");
+    function copy(source, destination, maxDepth) {
+        var stackSource = [];
+        var stackDest = [];
+        maxDepth = isValidObjectMaxDepth(maxDepth) ? maxDepth : NaN;
+
+        if (destination) {
+            if (isTypedArray(destination) || isArrayBuffer(destination)) {
+                throw ngMinErr('cpta', 'Can\'t copy! TypedArray destination cannot be mutated.');
+            }
+            if (source === destination) {
+                throw ngMinErr('cpi', 'Can\'t copy! Source and destination are identical.');
+            }
+
+            // Empty the destination object
+            if (isArray(destination)) {
+                destination.length = 0;
+            } else {
+                forEach(destination, function(value, key) {
+                    if (key !== '$$hashKey') {
+                        delete destination[key];
+                    }
+                });
+            }
+
+            stackSource.push(source);
+            stackDest.push(destination);
+            return copyRecurse(source, destination, maxDepth);
         }
 
-        if (!destination) {
-            destination = source;
-            if (source) {
-                if (isArray(source)) {
-                    destination = copy(source, []);
-                } else if (isDate(source)) {
-                    destination = new Date(source.getTime());
-                } else if (isRegExp(source)) {
-                    destination = new RegExp(source.source);
-                } else if (isObject(source)) {
-                    destination = copy(source, {});
-                }
+        return copyElement(source, maxDepth);
+
+        function copyRecurse(source, destination, maxDepth) {
+            maxDepth--;
+            if (maxDepth < 0) {
+                return '...';
             }
-        } else {
-            if (source === destination) throw ngMinErr('cpi',
-                "Can't copy! Source and destination are identical.");
+            var h = destination.$$hashKey;
+            var key;
             if (isArray(source)) {
-                destination.length = 0;
-                for ( var i = 0; i < source.length; i++) {
-                    destination.push(copy(source[i]));
+                for (var i = 0, ii = source.length; i < ii; i++) {
+                    destination.push(copyElement(source[i], maxDepth));
+                }
+            } else if (isBlankObject(source)) {
+                // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty
+                for (key in source) {
+                    destination[key] = copyElement(source[key], maxDepth);
+                }
+            } else if (source && typeof source.hasOwnProperty === 'function') {
+                // Slow path, which must rely on hasOwnProperty
+                for (key in source) {
+                    if (source.hasOwnProperty(key)) {
+                        destination[key] = copyElement(source[key], maxDepth);
+                    }
                 }
             } else {
-                var h = destination.$$hashKey;
-                forEach(destination, function(value, key){
-                    delete destination[key];
-                });
-                for ( var key in source) {
-                    destination[key] = copy(source[key]);
+                // Slowest path --- hasOwnProperty can't be called as a method
+                for (key in source) {
+                    if (hasOwnProperty.call(source, key)) {
+                        destination[key] = copyElement(source[key], maxDepth);
+                    }
                 }
-                setHashKey(destination,h);
             }
+            setHashKey(destination, h);
+            return destination;
         }
-        return destination;
-    }
 
-    /**
-     * Create a shallow copy of an object
-     */
-    function shallowCopy(src, dst) {
-        dst = dst || {};
+        function copyElement(source, maxDepth) {
+            // Simple values
+            if (!isObject(source)) {
+                return source;
+            }
+
+            // Already copied values
+            var index = stackSource.indexOf(source);
+            if (index !== -1) {
+                return stackDest[index];
+            }
 
-        for(var key in src) {
-            // shallowCopy is only ever called by $compile nodeLinkFn, which has control over src
-            // so we don't need to worry about using our custom hasOwnProperty here
-            if (src.hasOwnProperty(key) && !(key.charAt(0) === '$' && key.charAt(1) === '$')) {
-                dst[key] = src[key];
+            if (isWindow(source) || isScope(source)) {
+                throw ngMinErr('cpws',
+                    'Can\'t copy! Making copies of Window or Scope instances is not supported.');
             }
+
+            var needsRecurse = false;
+            var destination = copyType(source);
+
+            if (destination === undefined) {
+                destination = isArray(source) ? [] : Object.create(getPrototypeOf(source));
+                needsRecurse = true;
+            }
+
+            stackSource.push(source);
+            stackDest.push(destination);
+
+            return needsRecurse
+                ? copyRecurse(source, destination, maxDepth)
+                : destination;
         }
 
-        return dst;
+        function copyType(source) {
+            switch (toString.call(source)) {
+                case '[object Int8Array]':
+                case '[object Int16Array]':
+                case '[object Int32Array]':
+                case '[object Float32Array]':
+                case '[object Float64Array]':
+                case '[object Uint8Array]':
+                case '[object Uint8ClampedArray]':
+                case '[object Uint16Array]':
+                case '[object Uint32Array]':
+                    return new source.constructor(copyElement(source.buffer), source.byteOffset, source.length);
+
+                case '[object ArrayBuffer]':
+                    // Support: IE10
+                    if (!source.slice) {
+                        // If we're in this case we know the environment supports ArrayBuffer
+                        /* eslint-disable no-undef */
+                        var copied = new ArrayBuffer(source.byteLength);
+                        new Uint8Array(copied).set(new Uint8Array(source));
+                        /* eslint-enable */
+                        return copied;
+                    }
+                    return source.slice(0);
+
+                case '[object Boolean]':
+                case '[object Number]':
+                case '[object String]':
+                case '[object Date]':
+                    return new source.constructor(source.valueOf());
+
+                case '[object RegExp]':
+                    var re = new RegExp(source.source, source.toString().match(/[^/]*$/)[0]);
+                    re.lastIndex = source.lastIndex;
+                    return re;
+
+                case '[object Blob]':
+                    return new source.constructor([source], {type: source.type});
+            }
+
+            if (isFunction(source.cloneNode)) {
+                return source.cloneNode(true);
+            }
+        }
     }
 
 
+// eslint-disable-next-line no-self-compare
+    function simpleCompare(a, b) { return a === b || (a !== a && b !== b); }
+
+
     /**
      * @ngdoc function
      * @name angular.equals
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Determines if two objects or two values are equivalent. Supports value types, regular
@@ -914,7 +1165,7 @@
      * * Both objects or values are of the same type and all of their properties are equal by
      *   comparing them with `angular.equals`.
      * * Both values are NaN. (In JavaScript, NaN == NaN => false. But we consider two NaN as equal)
-     * * Both values represent the same regular expression (In JavasScript,
+     * * Both values represent the same regular expression (In JavaScript,
      *   /abc/ == /abc/ => false. But we consider two regular expressions as equal when their textual
      *   representation matches).
      *
@@ -926,54 +1177,171 @@
      * @param {*} o1 Object or value to compare.
      * @param {*} o2 Object or value to compare.
      * @returns {boolean} True if arguments are equal.
-     */
-    function equals(o1, o2) {
-        if (o1 === o2) return true;
-        if (o1 === null || o2 === null) return false;
-        if (o1 !== o1 && o2 !== o2) return true; // NaN === NaN
-        var t1 = typeof o1, t2 = typeof o2, length, key, keySet;
-        if (t1 == t2) {
-            if (t1 == 'object') {
-                if (isArray(o1)) {
-                    if (!isArray(o2)) return false;
-                    if ((length = o1.length) == o2.length) {
-                        for(key=0; key<length; key++) {
-                            if (!equals(o1[key], o2[key])) return false;
-                        }
-                        return true;
-                    }
-                } else if (isDate(o1)) {
-                    return isDate(o2) && o1.getTime() == o2.getTime();
-                } else if (isRegExp(o1) && isRegExp(o2)) {
-                    return o1.toString() == o2.toString();
-                } else {
-                    if (isScope(o1) || isScope(o2) || isWindow(o1) || isWindow(o2) || isArray(o2)) return false;
-                    keySet = {};
-                    for(key in o1) {
-                        if (key.charAt(0) === '$' || isFunction(o1[key])) continue;
+     *
+     * @example
+     <example module="equalsExample" name="equalsExample">
+     <file name="index.html">
+     <div ng-controller="ExampleController">
+     <form novalidate>
+     <h3>User 1</h3>
+     Name: <input type="text" ng-model="user1.name">
+     Age: <input type="number" ng-model="user1.age">
+
+     <h3>User 2</h3>
+     Name: <input type="text" ng-model="user2.name">
+     Age: <input type="number" ng-model="user2.age">
+
+     <div>
+     <br/>
+     <input type="button" value="Compare" ng-click="compare()">
+     </div>
+     User 1: <pre>{{user1 | json}}</pre>
+     User 2: <pre>{{user2 | json}}</pre>
+     Equal: <pre>{{result}}</pre>
+     </form>
+     </div>
+     </file>
+     <file name="script.js">
+     angular.module('equalsExample', []).controller('ExampleController', ['$scope', function($scope) {
+          $scope.user1 = {};
+          $scope.user2 = {};
+          $scope.compare = function() {
+            $scope.result = angular.equals($scope.user1, $scope.user2);
+          };
+        }]);
+     </file>
+     </example>
+     */
+    function equals(o1, o2) {
+        if (o1 === o2) return true;
+        if (o1 === null || o2 === null) return false;
+        // eslint-disable-next-line no-self-compare
+        if (o1 !== o1 && o2 !== o2) return true; // NaN === NaN
+        var t1 = typeof o1, t2 = typeof o2, length, key, keySet;
+        if (t1 === t2 && t1 === 'object') {
+            if (isArray(o1)) {
+                if (!isArray(o2)) return false;
+                if ((length = o1.length) === o2.length) {
+                    for (key = 0; key < length; key++) {
                         if (!equals(o1[key], o2[key])) return false;
-                        keySet[key] = true;
-                    }
-                    for(key in o2) {
-                        if (!keySet.hasOwnProperty(key) &&
-                            key.charAt(0) !== '$' &&
-                            o2[key] !== undefined &&
-                            !isFunction(o2[key])) return false;
                     }
                     return true;
                 }
+            } else if (isDate(o1)) {
+                if (!isDate(o2)) return false;
+                return simpleCompare(o1.getTime(), o2.getTime());
+            } else if (isRegExp(o1)) {
+                if (!isRegExp(o2)) return false;
+                return o1.toString() === o2.toString();
+            } else {
+                if (isScope(o1) || isScope(o2) || isWindow(o1) || isWindow(o2) ||
+                    isArray(o2) || isDate(o2) || isRegExp(o2)) return false;
+                keySet = createMap();
+                for (key in o1) {
+                    if (key.charAt(0) === '$' || isFunction(o1[key])) continue;
+                    if (!equals(o1[key], o2[key])) return false;
+                    keySet[key] = true;
+                }
+                for (key in o2) {
+                    if (!(key in keySet) &&
+                        key.charAt(0) !== '$' &&
+                        isDefined(o2[key]) &&
+                        !isFunction(o2[key])) return false;
+                }
+                return true;
             }
         }
         return false;
     }
 
+    var csp = function() {
+        if (!isDefined(csp.rules)) {
 
-    function csp() {
-        return (document.securityPolicy && document.securityPolicy.isActive) ||
-        (document.querySelector &&
-        !!(document.querySelector('[ng-csp]') || document.querySelector('[data-ng-csp]')));
-    }
 
+            var ngCspElement = (window.document.querySelector('[ng-csp]') ||
+                window.document.querySelector('[data-ng-csp]'));
+
+            if (ngCspElement) {
+                var ngCspAttribute = ngCspElement.getAttribute('ng-csp') ||
+                    ngCspElement.getAttribute('data-ng-csp');
+                csp.rules = {
+                    noUnsafeEval: !ngCspAttribute || (ngCspAttribute.indexOf('no-unsafe-eval') !== -1),
+                    noInlineStyle: !ngCspAttribute || (ngCspAttribute.indexOf('no-inline-style') !== -1)
+                };
+            } else {
+                csp.rules = {
+                    noUnsafeEval: noUnsafeEval(),
+                    noInlineStyle: false
+                };
+            }
+        }
+
+        return csp.rules;
+
+        function noUnsafeEval() {
+            try {
+                // eslint-disable-next-line no-new, no-new-func
+                new Function('');
+                return false;
+            } catch (e) {
+                return true;
+            }
+        }
+    };
+
+    /**
+     * @ngdoc directive
+     * @module ng
+     * @name ngJq
+     *
+     * @element ANY
+     * @param {string=} ngJq the name of the library available under `window`
+     * to be used for angular.element
+     * @description
+     * Use this directive to force the angular.element library.  This should be
+     * used to force either jqLite by leaving ng-jq blank or setting the name of
+     * the jquery variable under window (eg. jQuery).
+     *
+     * Since AngularJS looks for this directive when it is loaded (doesn't wait for the
+     * DOMContentLoaded event), it must be placed on an element that comes before the script
+     * which loads angular. Also, only the first instance of `ng-jq` will be used and all
+     * others ignored.
+     *
+     * @example
+     * This example shows how to force jqLite using the `ngJq` directive to the `html` tag.
+     ```html
+     <!doctype html>
+     <html ng-app ng-jq>
+     ...
+     ...
+     </html>
+     ```
+     * @example
+     * This example shows how to use a jQuery based library of a different name.
+     * The library name must be available at the top most 'window'.
+     ```html
+     <!doctype html>
+     <html ng-app ng-jq="jQueryLib">
+     ...
+     ...
+     </html>
+     ```
+     */
+    var jq = function() {
+        if (isDefined(jq.name_)) return jq.name_;
+        var el;
+        var i, ii = ngAttrPrefixes.length, prefix, name;
+        for (i = 0; i < ii; ++i) {
+            prefix = ngAttrPrefixes[i];
+            el = window.document.querySelector('[' + prefix.replace(':', '\\:') + 'jq]');
+            if (el) {
+                name = el.getAttribute(prefix + 'jq');
+                break;
+            }
+        }
+
+        return (jq.name_ = name);
+    };
 
     function concat(array1, array2, index) {
         return array1.concat(slice.call(array2, index));
@@ -984,12 +1352,11 @@
     }
 
 
-    /* jshint -W101 */
     /**
      * @ngdoc function
      * @name angular.bind
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Returns a function which calls function `fn` bound to `self` (`self` becomes the `this` for
@@ -1002,23 +1369,22 @@
      * @param {...*} args Optional arguments to be prebound to the `fn` function call.
      * @returns {function()} Function that wraps the `fn` with all the specified bindings.
      */
-    /* jshint +W101 */
     function bind(self, fn) {
         var curryArgs = arguments.length > 2 ? sliceArgs(arguments, 2) : [];
         if (isFunction(fn) && !(fn instanceof RegExp)) {
             return curryArgs.length
                 ? function() {
-                return arguments.length
-                    ? fn.apply(self, curryArgs.concat(slice.call(arguments, 0)))
-                    : fn.apply(self, curryArgs);
-            }
+                    return arguments.length
+                        ? fn.apply(self, concat(curryArgs, arguments, 0))
+                        : fn.apply(self, curryArgs);
+                }
                 : function() {
-                return arguments.length
-                    ? fn.apply(self, arguments)
-                    : fn.call(self);
-            };
+                    return arguments.length
+                        ? fn.apply(self, arguments)
+                        : fn.call(self);
+                };
         } else {
-            // in IE, native methods are not functions so they cannot be bound (note: they don't need to be)
+            // In IE, native methods are not functions so they cannot be bound (note: they don't need to be).
             return fn;
         }
     }
@@ -1027,11 +1393,11 @@
     function toJsonReplacer(key, value) {
         var val = value;
 
-        if (typeof key === 'string' && key.charAt(0) === '$') {
+        if (typeof key === 'string' && key.charAt(0) === '$' && key.charAt(1) === '$') {
             val = undefined;
         } else if (isWindow(value)) {
             val = '$WINDOW';
-        } else if (value &&  document === value) {
+        } else if (value &&  window.document === value) {
             val = '$DOCUMENT';
         } else if (isScope(value)) {
             val = '$SCOPE';
@@ -1045,19 +1411,44 @@
      * @ngdoc function
      * @name angular.toJson
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
-     * Serializes input into a JSON-formatted string. Properties with leading $ characters will be
-     * stripped since angular uses this notation internally.
+     * Serializes input into a JSON-formatted string. Properties with leading $$ characters will be
+     * stripped since AngularJS uses this notation internally.
      *
-     * @param {Object|Array|Date|string|number} obj Input to be serialized into JSON.
-     * @param {boolean=} pretty If set to true, the JSON output will contain newlines and whitespace.
+     * @param {Object|Array|Date|string|number|boolean} obj Input to be serialized into JSON.
+     * @param {boolean|number} [pretty=2] If set to true, the JSON output will contain newlines and whitespace.
+     *    If set to an integer, the JSON output will contain that many spaces per indentation.
      * @returns {string|undefined} JSON-ified string representing `obj`.
+     * @knownIssue
+     *
+     * The Safari browser throws a `RangeError` instead of returning `null` when it tries to stringify a `Date`
+     * object with an invalid date value. The only reliable way to prevent this is to monkeypatch the
+     * `Date.prototype.toJSON` method as follows:
+     *
+     * ```
+     * var _DatetoJSON = Date.prototype.toJSON;
+     * Date.prototype.toJSON = function() {
+     *   try {
+     *     return _DatetoJSON.call(this);
+     *   } catch(e) {
+     *     if (e instanceof RangeError) {
+     *       return null;
+     *     }
+     *     throw e;
+     *   }
+     * };
+     * ```
+     *
+     * See https://github.com/angular/angular.js/pull/14221 for more information.
      */
     function toJson(obj, pretty) {
-        if (typeof obj === 'undefined') return undefined;
-        return JSON.stringify(obj, toJsonReplacer, pretty ? '  ' : null);
+        if (isUndefined(obj)) return undefined;
+        if (!isNumber(pretty)) {
+            pretty = pretty ? 2 : null;
+        }
+        return JSON.stringify(obj, toJsonReplacer, pretty);
     }
 
 
@@ -1065,13 +1456,13 @@
      * @ngdoc function
      * @name angular.fromJson
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Deserializes a JSON string.
      *
      * @param {string} json JSON string to deserialize.
-     * @returns {Object|Array|string|number} Deserialized thingy.
+     * @returns {Object|Array|string|number} Deserialized JSON string.
      */
     function fromJson(json) {
         return isString(json)
@@ -1080,37 +1471,43 @@
     }
 
 
-    function toBoolean(value) {
-        if (typeof value === 'function') {
-            value = true;
-        } else if (value && value.length !== 0) {
-            var v = lowercase("" + value);
-            value = !(v == 'f' || v == '0' || v == 'false' || v == 'no' || v == 'n' || v == '[]');
-        } else {
-            value = false;
-        }
-        return value;
+    var ALL_COLONS = /:/g;
+    function timezoneToOffset(timezone, fallback) {
+        // Support: IE 9-11 only, Edge 13-15+
+        // IE/Edge do not "understand" colon (`:`) in timezone
+        timezone = timezone.replace(ALL_COLONS, '');
+        var requestedTimezoneOffset = Date.parse('Jan 01, 1970 00:00:00 ' + timezone) / 60000;
+        return isNumberNaN(requestedTimezoneOffset) ? fallback : requestedTimezoneOffset;
+    }
+
+
+    function addDateMinutes(date, minutes) {
+        date = new Date(date.getTime());
+        date.setMinutes(date.getMinutes() + minutes);
+        return date;
     }
 
+
+    function convertTimezoneToLocal(date, timezone, reverse) {
+        reverse = reverse ? -1 : 1;
+        var dateTimezoneOffset = date.getTimezoneOffset();
+        var timezoneOffset = timezoneToOffset(timezone, dateTimezoneOffset);
+        return addDateMinutes(date, reverse * (timezoneOffset - dateTimezoneOffset));
+    }
+
+
     /**
      * @returns {string} Returns the string representation of the element.
      */
     function startingTag(element) {
-        element = jqLite(element).clone();
-        try {
-            // turns out IE does not let you set .html() on elements which
-            // are not allowed to have children. So we just ignore it.
-            element.empty();
-        } catch(e) {}
-        // As Per DOM Standards
-        var TEXT_NODE = 3;
+        element = jqLite(element).clone().empty();
         var elemHtml = jqLite('<div>').append(element).html();
         try {
-            return element[0].nodeType === TEXT_NODE ? lowercase(elemHtml) :
+            return element[0].nodeType === NODE_TYPE_TEXT ? lowercase(elemHtml) :
                 elemHtml.
-                    match(/^(<[^>]+>)/)[1].
-                    replace(/^<([\w\-]+)/, function(match, nodeName) { return '<' + lowercase(nodeName); });
-        } catch(e) {
+                match(/^(<[^>]+>)/)[1].
+                replace(/^<([\w-]+)/, function(match, nodeName) {return '<' + lowercase(nodeName);});
+        } catch (e) {
             return lowercase(elemHtml);
         }
 
@@ -1130,8 +1527,8 @@
     function tryDecodeURIComponent(value) {
         try {
             return decodeURIComponent(value);
-        } catch(e) {
-            // Ignore any invalid uri component
+        } catch (e) {
+            // Ignore any invalid uri component.
         }
     }
 
@@ -1141,16 +1538,22 @@
      * @returns {Object.<string,boolean|Array>}
      */
     function parseKeyValue(/**string*/keyValue) {
-        var obj = {}, key_value, key;
-        forEach((keyValue || "").split('&'), function(keyValue){
-            if ( keyValue ) {
-                key_value = keyValue.split('=');
-                key = tryDecodeURIComponent(key_value[0]);
-                if ( isDefined(key) ) {
-                    var val = isDefined(key_value[1]) ? tryDecodeURIComponent(key_value[1]) : true;
-                    if (!obj[key]) {
+        var obj = {};
+        forEach((keyValue || '').split('&'), function(keyValue) {
+            var splitPoint, key, val;
+            if (keyValue) {
+                key = keyValue = keyValue.replace(/\+/g,'%20');
+                splitPoint = keyValue.indexOf('=');
+                if (splitPoint !== -1) {
+                    key = keyValue.substring(0, splitPoint);
+                    val = keyValue.substring(splitPoint + 1);
+                }
+                key = tryDecodeURIComponent(key);
+                if (isDefined(key)) {
+                    val = isDefined(val) ? tryDecodeURIComponent(val) : true;
+                    if (!hasOwnProperty.call(obj, key)) {
                         obj[key] = val;
-                    } else if(isArray(obj[key])) {
+                    } else if (isArray(obj[key])) {
                         obj[key].push(val);
                     } else {
                         obj[key] = [obj[key],val];
@@ -1167,11 +1570,11 @@
             if (isArray(value)) {
                 forEach(value, function(arrayValue) {
                     parts.push(encodeUriQuery(key, true) +
-                    (arrayValue === true ? '' : '=' + encodeUriQuery(arrayValue, true)));
+                        (arrayValue === true ? '' : '=' + encodeUriQuery(arrayValue, true)));
                 });
             } else {
                 parts.push(encodeUriQuery(key, true) +
-                (value === true ? '' : '=' + encodeUriQuery(value, true)));
+                    (value === true ? '' : '=' + encodeUriQuery(value, true)));
             }
         });
         return parts.length ? parts.join('&') : '';
@@ -1191,9 +1594,9 @@
      */
     function encodeUriSegment(val) {
         return encodeUriQuery(val, true).
-            replace(/%26/gi, '&').
-            replace(/%3D/gi, '=').
-            replace(/%2B/gi, '+');
+        replace(/%26/gi, '&').
+        replace(/%3D/gi, '=').
+        replace(/%2B/gi, '+');
     }
 
 
@@ -1201,7 +1604,7 @@
      * This method is intended for encoding *key* or *value* parts of query component. We need a custom
      * method because encodeURIComponent is too aggressive and encodes stuff that doesn't have to be
      * encoded per http://tools.ietf.org/html/rfc3986:
-     *    query       = *( pchar / "/" / "?" )
+     *    query         = *( pchar / "/" / "?" )
      *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
      *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
      *    pct-encoded   = "%" HEXDIG HEXDIG
@@ -1210,13 +1613,78 @@
      */
     function encodeUriQuery(val, pctEncodeSpaces) {
         return encodeURIComponent(val).
-            replace(/%40/gi, '@').
-            replace(/%3A/gi, ':').
-            replace(/%24/g, '$').
-            replace(/%2C/gi, ',').
-            replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
+        replace(/%40/gi, '@').
+        replace(/%3A/gi, ':').
+        replace(/%24/g, '$').
+        replace(/%2C/gi, ',').
+        replace(/%3B/gi, ';').
+        replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
+    }
+
+    var ngAttrPrefixes = ['ng-', 'data-ng-', 'ng:', 'x-ng-'];
+
+    function getNgAttribute(element, ngAttr) {
+        var attr, i, ii = ngAttrPrefixes.length;
+        for (i = 0; i < ii; ++i) {
+            attr = ngAttrPrefixes[i] + ngAttr;
+            if (isString(attr = element.getAttribute(attr))) {
+                return attr;
+            }
+        }
+        return null;
+    }
+
+    function allowAutoBootstrap(document) {
+        var script = document.currentScript;
+
+        if (!script) {
+            // Support: IE 9-11 only
+            // IE does not have `document.currentScript`
+            return true;
+        }
+
+        // If the `currentScript` property has been clobbered just return false, since this indicates a probable attack
+        if (!(script instanceof window.HTMLScriptElement || script instanceof window.SVGScriptElement)) {
+            return false;
+        }
+
+        var attributes = script.attributes;
+        var srcs = [attributes.getNamedItem('src'), attributes.getNamedItem('href'), attributes.getNamedItem('xlink:href')];
+
+        return srcs.every(function(src) {
+            if (!src) {
+                return true;
+            }
+            if (!src.value) {
+                return false;
+            }
+
+            var link = document.createElement('a');
+            link.href = src.value;
+
+            if (document.location.origin === link.origin) {
+                // Same-origin resources are always allowed, even for non-whitelisted schemes.
+                return true;
+            }
+            // Disabled bootstrapping unless angular.js was loaded from a known scheme used on the web.
+            // This is to prevent angular.js bundled with browser extensions from being used to bypass the
+            // content security policy in web pages and other browser extensions.
+            switch (link.protocol) {
+                case 'http:':
+                case 'https:':
+                case 'ftp:':
+                case 'blob:':
+                case 'file:':
+                case 'data:':
+                    return true;
+                default:
+                    return false;
+            }
+        });
     }
 
+// Cached as it has to run during loading so that document.currentScript is available.
+    var isAutoBootstrapAllowed = allowAutoBootstrap(window.document);
 
     /**
      * @ngdoc directive
@@ -1226,6 +1694,11 @@
      * @element ANY
      * @param {angular.Module} ngApp an optional application
      *   {@link angular.module module} name to load.
+     * @param {boolean=} ngStrictDi if this attribute is present on the app element, the injector will be
+     *   created in "strict-di" mode. This means that the application will fail to invoke functions which
+     *   do not use explicit function annotation (and are thus unsuitable for minification), as described
+     *   in {@link guide/di the Dependency Injection guide}, and useful debugging info will assist in
+     *   tracking down the root of these bugs.
      *
      * @description
      *
@@ -1233,13 +1706,20 @@
      * designates the **root element** of the application and is typically placed near the root element
      * of the page - e.g. on the `<body>` or `<html>` tags.
      *
-     * Only one AngularJS application can be auto-bootstrapped per HTML document. The first `ngApp`
-     * found in the document will be used to define the root element to auto-bootstrap as an
-     * application. To run multiple applications in an HTML document you must manually bootstrap them using
-     * {@link angular.bootstrap} instead. AngularJS applications cannot be nested within each other.
+     * There are a few things to keep in mind when using `ngApp`:
+     * - only one AngularJS application can be auto-bootstrapped per HTML document. The first `ngApp`
+     *   found in the document will be used to define the root element to auto-bootstrap as an
+     *   application. To run multiple applications in an HTML document you must manually bootstrap them using
+     *   {@link angular.bootstrap} instead.
+     * - AngularJS applications cannot be nested within each other.
+     * - Do not use a directive that uses {@link ng.$compile#transclusion transclusion} on the same element as `ngApp`.
+     *   This includes directives such as {@link ng.ngIf `ngIf`}, {@link ng.ngInclude `ngInclude`} and
+     *   {@link ngRoute.ngView `ngView`}.
+     *   Doing this misplaces the app {@link ng.$rootElement `$rootElement`} and the app's {@link auto.$injector injector},
+     *   causing animations to stop working and making the injector inaccessible from outside the app.
      *
      * You can specify an **AngularJS module** to be used as the root module for the application.  This
-     * module will be loaded into the {@link auto.$injector} when the application is bootstrapped and
+     * module will be loaded into the {@link auto.$injector} when the application is bootstrapped. It
      * should contain the application code needed or have dependencies on other modules that will
      * contain the code. See {@link angular.module} for more information.
      *
@@ -1247,9 +1727,13 @@
      * document would not be compiled, the `AppController` would not be instantiated and the `{{ a+b }}`
      * would not be resolved to `3`.
      *
-     * `ngApp` is the easiest, and most common, way to bootstrap an application.
+     * @example
+     *
+     * ### Simple Usage
+     *
+     * `ngApp` is the easiest, and most common way to bootstrap an application.
      *
-     <example module="ngAppDemo">
+     <example module="ngAppDemo" name="ng-app">
      <file name="index.html">
      <div ng-controller="ngAppDemoController">
      I can add: {{a}} + {{b}} =  {{ a+b }}
@@ -1263,48 +1747,118 @@
      </file>
      </example>
      *
+     * @example
+     *
+     * ### With `ngStrictDi`
+     *
+     * Using `ngStrictDi`, you would see something like this:
+     *
+     <example ng-app-included="true" name="strict-di">
+     <file name="index.html">
+     <div ng-app="ngAppStrictDemo" ng-strict-di>
+     <div ng-controller="GoodController1">
+     I can add: {{a}} + {{b}} =  {{ a+b }}
+
+     <p>This renders because the controller does not fail to
+     instantiate, by using explicit annotation style (see
+     script.js for details)
+     </p>
+     </div>
+
+     <div ng-controller="GoodController2">
+     Name: <input ng-model="name"><br />
+     Hello, {{name}}!
+
+     <p>This renders because the controller does not fail to
+     instantiate, by using explicit annotation style
+     (see script.js for details)
+     </p>
+     </div>
+
+     <div ng-controller="BadController">
+     I can add: {{a}} + {{b}} =  {{ a+b }}
+
+     <p>The controller could not be instantiated, due to relying
+     on automatic function annotations (which are disabled in
+     strict mode). As such, the content of this section is not
+     interpolated, and there should be an error in your web console.
+     </p>
+     </div>
+     </div>
+     </file>
+     <file name="script.js">
+     angular.module('ngAppStrictDemo', [])
+     // BadController will fail to instantiate, due to relying on automatic function annotation,
+     // rather than an explicit annotation
+     .controller('BadController', function($scope) {
+       $scope.a = 1;
+       $scope.b = 2;
+     })
+     // Unlike BadController, GoodController1 and GoodController2 will not fail to be instantiated,
+     // due to using explicit annotations using the array style and $inject property, respectively.
+     .controller('GoodController1', ['$scope', function($scope) {
+       $scope.a = 1;
+       $scope.b = 2;
+     }])
+     .controller('GoodController2', GoodController2);
+     function GoodController2($scope) {
+       $scope.name = 'World';
+     }
+     GoodController2.$inject = ['$scope'];
+     </file>
+     <file name="style.css">
+     div[ng-controller] {
+       margin-bottom: 1em;
+       -webkit-border-radius: 4px;
+       border-radius: 4px;
+       border: 1px solid;
+       padding: .5em;
+   }
+     div[ng-controller^=Good] {
+       border-color: #d6e9c6;
+       background-color: #dff0d8;
+       color: #3c763d;
+   }
+     div[ng-controller^=Bad] {
+       border-color: #ebccd1;
+       background-color: #f2dede;
+       color: #a94442;
+       margin-bottom: 0;
+   }
+     </file>
+     </example>
      */
     function angularInit(element, bootstrap) {
-        var elements = [element],
-            appElement,
+        var appElement,
             module,
-            names = ['ng:app', 'ng-app', 'x-ng-app', 'data-ng-app'],
-            NG_APP_CLASS_REGEXP = /\sng[:\-]app(:\s*([\w\d_]+);?)?\s/;
+            config = {};
 
-        function append(element) {
-            element && elements.push(element);
-        }
+        // The element `element` has priority over any other element.
+        forEach(ngAttrPrefixes, function(prefix) {
+            var name = prefix + 'app';
 
-        forEach(names, function(name) {
-            names[name] = true;
-            append(document.getElementById(name));
-            name = name.replace(':', '\\:');
-            if (element.querySelectorAll) {
-                forEach(element.querySelectorAll('.' + name), append);
-                forEach(element.querySelectorAll('.' + name + '\\:'), append);
-                forEach(element.querySelectorAll('[' + name + ']'), append);
+            if (!appElement && element.hasAttribute && element.hasAttribute(name)) {
+                appElement = element;
+                module = element.getAttribute(name);
             }
         });
+        forEach(ngAttrPrefixes, function(prefix) {
+            var name = prefix + 'app';
+            var candidate;
 
-        forEach(elements, function(element) {
-            if (!appElement) {
-                var className = ' ' + element.className + ' ';
-                var match = NG_APP_CLASS_REGEXP.exec(className);
-                if (match) {
-                    appElement = element;
-                    module = (match[2] || '').replace(/\s+/g, ',');
-                } else {
-                    forEach(element.attributes, function(attr) {
-                        if (!appElement && names[attr.name]) {
-                            appElement = element;
-                            module = attr.value;
-                        }
-                    });
-                }
+            if (!appElement && (candidate = element.querySelector('[' + name.replace(':', '\\:') + ']'))) {
+                appElement = candidate;
+                module = candidate.getAttribute(name);
             }
         });
         if (appElement) {
-            bootstrap(appElement, module ? [module] : []);
+            if (!isAutoBootstrapAllowed) {
+                window.console.error('AngularJS: disabling automatic bootstrap. <script> protocol indicates ' +
+                    'an extension, document.location.href does not match.');
+                return;
+            }
+            config.strictDi = getNgAttribute(appElement, 'strict-di') !== null;
+            bootstrap(appElement, module ? [module] : [], config);
         }
     }
 
@@ -1313,83 +1867,111 @@
      * @name angular.bootstrap
      * @module ng
      * @description
-     * Use this function to manually start up angular application.
+     * Use this function to manually start up AngularJS application.
+     *
+     * For more information, see the {@link guide/bootstrap Bootstrap guide}.
      *
-     * See: {@link guide/bootstrap Bootstrap}
+     * AngularJS will detect if it has been loaded into the browser more than once and only allow the
+     * first loaded script to be bootstrapped and will report a warning to the browser console for
+     * each of the subsequent scripts. This prevents strange results in applications, where otherwise
+     * multiple instances of AngularJS try to work on the DOM.
      *
-     * Note that ngScenario-based end-to-end tests cannot use this function to bootstrap manually.
+     * <div class="alert alert-warning">
+     * **Note:** Protractor based end-to-end tests cannot use this function to bootstrap manually.
      * They must use {@link ng.directive:ngApp ngApp}.
+     * </div>
      *
-     * Angular will detect if it has been loaded into the browser more than once and only allow the
-     * first loaded script to be bootstrapped and will report a warning to the browser console for
-     * each of the subsequent scripts.   This prevents strange results in applications, where otherwise
-     * multiple instances of Angular try to work on the DOM.
+     * <div class="alert alert-warning">
+     * **Note:** Do not bootstrap the app on an element with a directive that uses {@link ng.$compile#transclusion transclusion},
+     * such as {@link ng.ngIf `ngIf`}, {@link ng.ngInclude `ngInclude`} and {@link ngRoute.ngView `ngView`}.
+     * Doing this misplaces the app {@link ng.$rootElement `$rootElement`} and the app's {@link auto.$injector injector},
+     * causing animations to stop working and making the injector inaccessible from outside the app.
+     * </div>
      *
-     * <example name="multi-bootstrap" module="multi-bootstrap">
-     * <file name="index.html">
-     * <script src="../../../angular.js"></script>
-     * <div ng-controller="BrokenTable">
-     *   <table>
-     *   <tr>
-     *     <th ng-repeat="heading in headings">{{heading}}</th>
-     *   </tr>
-     *   <tr ng-repeat="filling in fillings">
-     *     <td ng-repeat="fill in filling">{{fill}}</td>
-     *   </tr>
-     * </table>
+     * ```html
+     * <!doctype html>
+     * <html>
+     * <body>
+     * <div ng-controller="WelcomeController">
+     *   {{greeting}}
      * </div>
-     * </file>
-     * <file name="controller.js">
-     * var app = angular.module('multi-bootstrap', [])
      *
-     * .controller('BrokenTable', function($scope) {
- *     $scope.headings = ['One', 'Two', 'Three'];
- *     $scope.fillings = [[1, 2, 3], ['A', 'B', 'C'], [7, 8, 9]];
- * });
-     * </file>
-     * <file name="protractor.js" type="protractor">
-     * it('should only insert one table cell for each item in $scope.fillings', function() {
- *  expect(element.all(by.css('td')).count())
- *      .toBe(9);
- * });
-     * </file>
-     * </example>
+     * <script src="angular.js"></script>
+     * <script>
+     *   var app = angular.module('demo', [])
+     *   .controller('WelcomeController', function($scope) {
+     *       $scope.greeting = 'Welcome!';
+     *   });
+     *   angular.bootstrap(document, ['demo']);
+     * </script>
+     * </body>
+     * </html>
+     * ```
      *
-     * @param {DOMElement} element DOM element which is the root of angular application.
+     * @param {DOMElement} element DOM element which is the root of AngularJS application.
      * @param {Array<String|Function|Array>=} modules an array of modules to load into the application.
      *     Each item in the array should be the name of a predefined module or a (DI annotated)
-     *     function that will be invoked by the injector as a run block.
+     *     function that will be invoked by the injector as a `config` block.
      *     See: {@link angular.module modules}
+     * @param {Object=} config an object for defining configuration options for the application. The
+     *     following keys are supported:
+     *
+     * * `strictDi` - disable automatic function annotation for the application. This is meant to
+     *   assist in finding bugs which break minified code. Defaults to `false`.
+     *
      * @returns {auto.$injector} Returns the newly created injector for this app.
      */
-    function bootstrap(element, modules) {
+    function bootstrap(element, modules, config) {
+        if (!isObject(config)) config = {};
+        var defaultConfig = {
+            strictDi: false
+        };
+        config = extend(defaultConfig, config);
         var doBootstrap = function() {
             element = jqLite(element);
 
             if (element.injector()) {
-                var tag = (element[0] === document) ? 'document' : startingTag(element);
-                throw ngMinErr('btstrpd', "App Already Bootstrapped with this Element '{0}'", tag);
+                var tag = (element[0] === window.document) ? 'document' : startingTag(element);
+                // Encode angle brackets to prevent input from being sanitized to empty string #8683.
+                throw ngMinErr(
+                    'btstrpd',
+                    'App already bootstrapped with this element \'{0}\'',
+                    tag.replace(/</,'&lt;').replace(/>/,'&gt;'));
             }
 
             modules = modules || [];
             modules.unshift(['$provide', function($provide) {
                 $provide.value('$rootElement', element);
             }]);
+
+            if (config.debugInfoEnabled) {
+                // Pushing so that this overrides `debugInfoEnabled` setting defined in user's `modules`.
+                modules.push(['$compileProvider', function($compileProvider) {
+                    $compileProvider.debugInfoEnabled(true);
+                }]);
+            }
+
             modules.unshift('ng');
-            var injector = createInjector(modules);
-            injector.invoke(['$rootScope', '$rootElement', '$compile', '$injector', '$animate',
-                    function(scope, element, compile, injector, animate) {
-                        scope.$apply(function() {
-                            element.data('$injector', injector);
-                            compile(element)(scope);
-                        });
-                    }]
+            var injector = createInjector(modules, config.strictDi);
+            injector.invoke(['$rootScope', '$rootElement', '$compile', '$injector',
+                function bootstrapApply(scope, element, compile, injector) {
+                    scope.$apply(function() {
+                        element.data('$injector', injector);
+                        compile(element)(scope);
+                    });
+                }]
             );
             return injector;
         };
 
+        var NG_ENABLE_DEBUG_INFO = /^NG_ENABLE_DEBUG_INFO!/;
         var NG_DEFER_BOOTSTRAP = /^NG_DEFER_BOOTSTRAP!/;
 
+        if (window && NG_ENABLE_DEBUG_INFO.test(window.name)) {
+            config.debugInfoEnabled = true;
+            window.name = window.name.replace(NG_ENABLE_DEBUG_INFO, '');
+        }
+
         if (window && !NG_DEFER_BOOTSTRAP.test(window.name)) {
             return doBootstrap();
         }
@@ -1399,40 +1981,104 @@
             forEach(extraModules, function(module) {
                 modules.push(module);
             });
-            doBootstrap();
+            return doBootstrap();
         };
+
+        if (isFunction(angular.resumeDeferredBootstrap)) {
+            angular.resumeDeferredBootstrap();
+        }
+    }
+
+    /**
+     * @ngdoc function
+     * @name angular.reloadWithDebugInfo
+     * @module ng
+     * @description
+     * Use this function to reload the current application with debug information turned on.
+     * This takes precedence over a call to `$compileProvider.debugInfoEnabled(false)`.
+     *
+     * See {@link ng.$compileProvider#debugInfoEnabled} for more.
+     */
+    function reloadWithDebugInfo() {
+        window.name = 'NG_ENABLE_DEBUG_INFO!' + window.name;
+        window.location.reload();
+    }
+
+    /**
+     * @name angular.getTestability
+     * @module ng
+     * @description
+     * Get the testability service for the instance of AngularJS on the given
+     * element.
+     * @param {DOMElement} element DOM element which is the root of AngularJS application.
+     */
+    function getTestability(rootElement) {
+        var injector = angular.element(rootElement).injector();
+        if (!injector) {
+            throw ngMinErr('test',
+                'no injector found for element argument to getTestability');
+        }
+        return injector.get('$$testability');
     }
 
     var SNAKE_CASE_REGEXP = /[A-Z]/g;
-    function snake_case(name, separator){
+    function snake_case(name, separator) {
         separator = separator || '_';
         return name.replace(SNAKE_CASE_REGEXP, function(letter, pos) {
             return (pos ? separator : '') + letter.toLowerCase();
         });
     }
 
+    var bindJQueryFired = false;
     function bindJQuery() {
+        var originalCleanData;
+
+        if (bindJQueryFired) {
+            return;
+        }
+
         // bind to jQuery if present;
-        jQuery = window.jQuery;
-        // reset to jQuery or default to us.
-        if (jQuery) {
+        var jqName = jq();
+        jQuery = isUndefined(jqName) ? window.jQuery :   // use jQuery (if present)
+            !jqName             ? undefined     :   // use jqLite
+                window[jqName];   // use jQuery specified by `ngJq`
+
+        // Use jQuery if it exists with proper functionality, otherwise default to us.
+        // AngularJS 1.2+ requires jQuery 1.7+ for on()/off() support.
+        // AngularJS 1.3+ technically requires at least jQuery 2.1+ but it may work with older
+        // versions. It will not work for sure with jQuery <1.7, though.
+        if (jQuery && jQuery.fn.on) {
             jqLite = jQuery;
             extend(jQuery.fn, {
                 scope: JQLitePrototype.scope,
                 isolateScope: JQLitePrototype.isolateScope,
-                controller: JQLitePrototype.controller,
+                controller: /** @type {?} */ (JQLitePrototype).controller,
                 injector: JQLitePrototype.injector,
                 inheritedData: JQLitePrototype.inheritedData
             });
-            // Method signature:
-            //     jqLitePatchJQueryRemove(name, dispatchThis, filterElems, getterIfNoArguments)
-            jqLitePatchJQueryRemove('remove', true, true, false);
-            jqLitePatchJQueryRemove('empty', false, false, false);
-            jqLitePatchJQueryRemove('html', false, false, true);
+
+            // All nodes removed from the DOM via various jQuery APIs like .remove()
+            // are passed through jQuery.cleanData. Monkey-patch this method to fire
+            // the $destroy event on all removed nodes.
+            originalCleanData = jQuery.cleanData;
+            jQuery.cleanData = function(elems) {
+                var events;
+                for (var i = 0, elem; (elem = elems[i]) != null; i++) {
+                    events = jQuery._data(elem, 'events');
+                    if (events && events.$destroy) {
+                        jQuery(elem).triggerHandler('$destroy');
+                    }
+                }
+                originalCleanData(elems);
+            };
         } else {
             jqLite = JQLite;
         }
+
         angular.element = jqLite;
+
+        // Prevent double-proxying.
+        bindJQueryFired = true;
     }
 
     /**
@@ -1440,7 +2086,7 @@
      */
     function assertArg(arg, name, reason) {
         if (!arg) {
-            throw ngMinErr('areq', "Argument '{0}' is {1}", (name || '?'), (reason || "required"));
+            throw ngMinErr('areq', 'Argument \'{0}\' is {1}', (name || '?'), (reason || 'required'));
         }
         return arg;
     }
@@ -1451,7 +2097,7 @@
         }
 
         assertArg(isFunction(arg), name, 'not a function, got ' +
-        (arg && typeof arg == 'object' ? arg.constructor.name || 'Object' : typeof arg));
+            (arg && typeof arg === 'object' ? arg.constructor.name || 'Object' : typeof arg));
         return arg;
     }
 
@@ -1462,7 +2108,7 @@
      */
     function assertNotHasOwnProperty(name, context) {
         if (name === 'hasOwnProperty') {
-            throw ngMinErr('badname', "hasOwnProperty is not a valid {0} name", context);
+            throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context);
         }
     }
 
@@ -1496,34 +2142,77 @@
     /**
      * Return the DOM siblings between the first and last node in the given array.
      * @param {Array} array like object
-     * @returns {DOMElement} object containing the elements
+     * @returns {Array} the inputted object or a jqLite collection containing the nodes
      */
-    function getBlockElements(nodes) {
-        var startNode = nodes[0],
-            endNode = nodes[nodes.length - 1];
-        if (startNode === endNode) {
-            return jqLite(startNode);
+    function getBlockNodes(nodes) {
+        // TODO(perf): update `nodes` instead of creating a new object?
+        var node = nodes[0];
+        var endNode = nodes[nodes.length - 1];
+        var blockNodes;
+
+        for (var i = 1; node !== endNode && (node = node.nextSibling); i++) {
+            if (blockNodes || nodes[i] !== node) {
+                if (!blockNodes) {
+                    blockNodes = jqLite(slice.call(nodes, 0, i));
+                }
+                blockNodes.push(node);
+            }
         }
 
-        var element = startNode;
-        var elements = [element];
+        return blockNodes || nodes;
+    }
+
+
+    /**
+     * Creates a new object without a prototype. This object is useful for lookup without having to
+     * guard against prototypically inherited properties via hasOwnProperty.
+     *
+     * Related micro-benchmarks:
+     * - http://jsperf.com/object-create2
+     * - http://jsperf.com/proto-map-lookup/2
+     * - http://jsperf.com/for-in-vs-object-keys2
+     *
+     * @returns {Object}
+     */
+    function createMap() {
+        return Object.create(null);
+    }
 
-        do {
-            element = element.nextSibling;
-            if (!element) break;
-            elements.push(element);
-        } while (element !== endNode);
+    function stringify(value) {
+        if (value == null) { // null || undefined
+            return '';
+        }
+        switch (typeof value) {
+            case 'string':
+                break;
+            case 'number':
+                value = '' + value;
+                break;
+            default:
+                if (hasCustomToString(value) && !isArray(value) && !isDate(value)) {
+                    value = value.toString();
+                } else {
+                    value = toJson(value);
+                }
+        }
 
-        return jqLite(elements);
+        return value;
     }
 
+    var NODE_TYPE_ELEMENT = 1;
+    var NODE_TYPE_ATTRIBUTE = 2;
+    var NODE_TYPE_TEXT = 3;
+    var NODE_TYPE_COMMENT = 8;
+    var NODE_TYPE_DOCUMENT = 9;
+    var NODE_TYPE_DOCUMENT_FRAGMENT = 11;
+
     /**
      * @ngdoc type
      * @name angular.Module
      * @module ng
      * @description
      *
-     * Interface for configuring angular {@link angular.module modules}.
+     * Interface for configuring AngularJS {@link angular.module modules}.
      */
 
     function setupModuleLoader(window) {
@@ -1550,18 +2239,18 @@
              * @module ng
              * @description
              *
-             * The `angular.module` is a global place for creating, registering and retrieving Angular
+             * The `angular.module` is a global place for creating, registering and retrieving AngularJS
              * modules.
-             * All modules (angular core or 3rd party) that should be available to an application must be
+             * All modules (AngularJS core or 3rd party) that should be available to an application must be
              * registered using this mechanism.
              *
-             * When passed two or more arguments, a new module is created.  If passed only one argument, an
-             * existing module (the name passed as the first argument to `module`) is retrieved.
+             * Passing one argument retrieves an existing {@link angular.Module},
+             * whereas passing more than one argument creates a new {@link angular.Module}
              *
              *
              * # Module
              *
-             * A module is a collection of services, directives, filters, and configuration information.
+             * A module is a collection of services, directives, controllers, filters, and configuration information.
              * `angular.module` is used to configure the {@link auto.$injector $injector}.
              *
              * ```js
@@ -1573,9 +2262,9 @@
              *
              * // configure existing services inside initialization blocks.
              * myModule.config(['$locationProvider', function($locationProvider) {
-     *   // Configure existing providers
-     *   $locationProvider.hashPrefix('!');
-     * }]);
+             *   // Configure existing providers
+             *   $locationProvider.hashPrefix('!');
+             * }]);
              * ```
              *
              * Then you can create an injector and load your modules like this:
@@ -1589,13 +2278,16 @@
              * {@link angular.bootstrap} to simplify this process for you.
              *
              * @param {!string} name The name of the module to create or retrieve.
-             <<<<<* @param {!Array.<string>=} requires If specified then new module is being created. If
-             >>>>>*        unspecified then the module is being retrieved for further configuration.
-             * @param {Function} configFn Optional configuration function for the module. Same as
+             * @param {!Array.<string>=} requires If specified then new module is being created. If
+             *        unspecified then the module is being retrieved for further configuration.
+             * @param {Function=} configFn Optional configuration function for the module. Same as
              *        {@link angular.Module#config Module#config()}.
-             * @returns {module} new module with the {@link angular.Module} api.
+             * @returns {angular.Module} new module with the {@link angular.Module} api.
              */
             return function module(name, requires, configFn) {
+
+                var info = {};
+
                 var assertNotHasOwnProperty = function(name, context) {
                     if (name === 'hasOwnProperty') {
                         throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context);
@@ -1608,42 +2300,86 @@
                 }
                 return ensure(modules, name, function() {
                     if (!requires) {
-                        throw $injectorMinErr('nomod', "Module '{0}' is not available! You either misspelled " +
-                        "the module name or forgot to load it. If registering a module ensure that you " +
-                        "specify the dependencies as the second argument.", name);
+                        throw $injectorMinErr('nomod', 'Module \'{0}\' is not available! You either misspelled ' +
+                            'the module name or forgot to load it. If registering a module ensure that you ' +
+                            'specify the dependencies as the second argument.', name);
                     }
 
                     /** @type {!Array.<Array.<*>>} */
                     var invokeQueue = [];
 
+                    /** @type {!Array.<Function>} */
+                    var configBlocks = [];
+
                     /** @type {!Array.<Function>} */
                     var runBlocks = [];
 
-                    var config = invokeLater('$injector', 'invoke');
+                    var config = invokeLater('$injector', 'invoke', 'push', configBlocks);
 
                     /** @type {angular.Module} */
                     var moduleInstance = {
                         // Private state
                         _invokeQueue: invokeQueue,
+                        _configBlocks: configBlocks,
                         _runBlocks: runBlocks,
 
                         /**
-                         * @ngdoc property
-                         * @name angular.Module#requires
+                         * @ngdoc method
+                         * @name angular.Module#info
                          * @module ng
-                         * @returns {Array.<string>} List of module names which must be loaded before this module.
+                         *
+                         * @param {Object=} info Information about the module
+                         * @returns {Object|Module} The current info object for this module if called as a getter,
+                         *                          or `this` if called as a setter.
+                         *
                          * @description
-                         * Holds the list of modules which the injector will load before the current module is
-                         * loaded.
+                         * Read and write custom information about this module.
+                         * For example you could put the version of the module in here.
+                         *
+                         * ```js
+                         * angular.module('myModule', []).info({ version: '1.0.0' });
+                         * ```
+                         *
+                         * The version could then be read back out by accessing the module elsewhere:
+                         *
+                         * ```
+                         * var version = angular.module('myModule').info().version;
+                         * ```
+                         *
+                         * You can also retrieve this information during runtime via the
+                         * {@link $injector#modules `$injector.modules`} property:
+                         *
+                         * ```js
+                         * var version = $injector.modules['myModule'].info().version;
+                         * ```
                          */
-                        requires: requires,
-
+                        info: function(value) {
+                            if (isDefined(value)) {
+                                if (!isObject(value)) throw ngMinErr('aobj', 'Argument \'{0}\' must be an object', 'value');
+                                info = value;
+                                return this;
+                            }
+                            return info;
+                        },
+
+                        /**
+                         * @ngdoc property
+                         * @name angular.Module#requires
+                         * @module ng
+                         *
+                         * @description
+                         * Holds the list of modules which the injector will load before the current module is
+                         * loaded.
+                         */
+                        requires: requires,
+
                         /**
                          * @ngdoc property
                          * @name angular.Module#name
                          * @module ng
-                         * @returns {string} Name of the module.
+                         *
                          * @description
+                         * Name of the module.
                          */
                         name: name,
 
@@ -1658,7 +2394,7 @@
                          * @description
                          * See {@link auto.$provide#provider $provide.provider()}.
                          */
-                        provider: invokeLater('$provide', 'provider'),
+                        provider: invokeLaterAndSetModuleName('$provide', 'provider'),
 
                         /**
                          * @ngdoc method
@@ -1669,7 +2405,7 @@
                          * @description
                          * See {@link auto.$provide#factory $provide.factory()}.
                          */
-                        factory: invokeLater('$provide', 'factory'),
+                        factory: invokeLaterAndSetModuleName('$provide', 'factory'),
 
                         /**
                          * @ngdoc method
@@ -1680,7 +2416,7 @@
                          * @description
                          * See {@link auto.$provide#service $provide.service()}.
                          */
-                        service: invokeLater('$provide', 'service'),
+                        service: invokeLaterAndSetModuleName('$provide', 'service'),
 
                         /**
                          * @ngdoc method
@@ -1700,11 +2436,23 @@
                          * @param {string} name constant name
                          * @param {*} object Constant value.
                          * @description
-                         * Because the constant are fixed, they get applied before other provide methods.
+                         * Because the constants are fixed, they get applied before other provide methods.
                          * See {@link auto.$provide#constant $provide.constant()}.
                          */
                         constant: invokeLater('$provide', 'constant', 'unshift'),
 
+                        /**
+                         * @ngdoc method
+                         * @name angular.Module#decorator
+                         * @module ng
+                         * @param {string} name The name of the service to decorate.
+                         * @param {Function} decorFn This function will be invoked when the service needs to be
+                         *                           instantiated and should return the decorated service instance.
+                         * @description
+                         * See {@link auto.$provide#decorator $provide.decorator()}.
+                         */
+                        decorator: invokeLaterAndSetModuleName('$provide', 'decorator', configBlocks),
+
                         /**
                          * @ngdoc method
                          * @name angular.Module#animation
@@ -1718,37 +2466,44 @@
                          *
                          *
                          * Defines an animation hook that can be later used with
-                         * {@link ngAnimate.$animate $animate} service and directives that use this service.
+                         * {@link $animate $animate} service and directives that use this service.
                          *
                          * ```js
                          * module.animation('.animation-name', function($inject1, $inject2) {
-           *   return {
-           *     eventName : function(element, done) {
-           *       //code to run the animation
-           *       //once complete, then run done()
-           *       return function cancellationFunction(element) {
-           *         //code to cancel the animation
-           *       }
-           *     }
-           *   }
-           * })
+                         *   return {
+                         *     eventName : function(element, done) {
+                         *       //code to run the animation
+                         *       //once complete, then run done()
+                         *       return function cancellationFunction(element) {
+                         *         //code to cancel the animation
+                         *       }
+                         *     }
+                         *   }
+                         * })
                          * ```
                          *
-                         * See {@link ngAnimate.$animateProvider#register $animateProvider.register()} and
+                         * See {@link ng.$animateProvider#register $animateProvider.register()} and
                          * {@link ngAnimate ngAnimate module} for more information.
                          */
-                        animation: invokeLater('$animateProvider', 'register'),
+                        animation: invokeLaterAndSetModuleName('$animateProvider', 'register'),
 
                         /**
                          * @ngdoc method
                          * @name angular.Module#filter
                          * @module ng
-                         * @param {string} name Filter name.
+                         * @param {string} name Filter name - this must be a valid AngularJS expression identifier
                          * @param {Function} filterFactory Factory function for creating new instance of filter.
                          * @description
                          * See {@link ng.$filterProvider#register $filterProvider.register()}.
+                         *
+                         * <div class="alert alert-warning">
+                         * **Note:** Filter names must be valid AngularJS {@link expression} identifiers, such as `uppercase` or `orderBy`.
+                         * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
+                         * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
+                         * (`myapp_subsection_filterx`).
+                         * </div>
                          */
-                        filter: invokeLater('$filterProvider', 'register'),
+                        filter: invokeLaterAndSetModuleName('$filterProvider', 'register'),
 
                         /**
                          * @ngdoc method
@@ -1760,7 +2515,7 @@
                          * @description
                          * See {@link ng.$controllerProvider#register $controllerProvider.register()}.
                          */
-                        controller: invokeLater('$controllerProvider', 'register'),
+                        controller: invokeLaterAndSetModuleName('$controllerProvider', 'register'),
 
                         /**
                          * @ngdoc method
@@ -1773,7 +2528,20 @@
                          * @description
                          * See {@link ng.$compileProvider#directive $compileProvider.directive()}.
                          */
-                        directive: invokeLater('$compileProvider', 'directive'),
+                        directive: invokeLaterAndSetModuleName('$compileProvider', 'directive'),
+
+                        /**
+                         * @ngdoc method
+                         * @name angular.Module#component
+                         * @module ng
+                         * @param {string} name Name of the component in camel-case (i.e. myComp which will match as my-comp)
+                         * @param {Object} options Component definition object (a simplified
+                         *    {@link ng.$compile#directive-definition-object directive definition object})
+                         *
+                         * @description
+                         * See {@link ng.$compileProvider#component $compileProvider.component()}.
+                         */
+                        component: invokeLaterAndSetModuleName('$compileProvider', 'component'),
 
                         /**
                          * @ngdoc method
@@ -1782,7 +2550,15 @@
                          * @param {Function} configFn Execute this function on module load. Useful for service
                          *    configuration.
                          * @description
-                         * Use this method to register work which needs to be performed on module loading.
+                         * Use this method to configure services by injecting their
+                         * {@link angular.Module#provider `providers`}, e.g. for adding routes to the
+                         * {@link ngRoute.$routeProvider $routeProvider}.
+                         *
+                         * Note that you can only inject {@link angular.Module#provider `providers`} and
+                         * {@link angular.Module#constant `constants`} into this function.
+                         *
+                         * For more about how to configure services, see
+                         * {@link providers#provider-recipe Provider Recipe}.
                          */
                         config: config,
 
@@ -1806,7 +2582,7 @@
                         config(configFn);
                     }
 
-                    return  moduleInstance;
+                    return moduleInstance;
 
                     /**
                      * @param {string} provider
@@ -1814,9 +2590,24 @@
                      * @param {String=} insertMethod
                      * @returns {angular.Module}
                      */
-                    function invokeLater(provider, method, insertMethod) {
+                    function invokeLater(provider, method, insertMethod, queue) {
+                        if (!queue) queue = invokeQueue;
                         return function() {
-                            invokeQueue[insertMethod || 'push']([provider, method, arguments]);
+                            queue[insertMethod || 'push']([provider, method, arguments]);
+                            return moduleInstance;
+                        };
+                    }
+
+                    /**
+                     * @param {string} provider
+                     * @param {string} method
+                     * @returns {angular.Module}
+                     */
+                    function invokeLaterAndSetModuleName(provider, method, queue) {
+                        if (!queue) queue = invokeQueue;
+                        return function(recipeName, factoryFunction) {
+                            if (factoryFunction && isFunction(factoryFunction)) factoryFunction.$$moduleName = name;
+                            queue.push([provider, method, arguments]);
                             return moduleInstance;
                         };
                     }
@@ -1826,82 +2617,165 @@
 
     }
 
-    /* global
-     angularModule: true,
-     version: true,
-
-     $LocaleProvider,
-     $CompileProvider,
-
-     htmlAnchorDirective,
-     inputDirective,
-     inputDirective,
-     formDirective,
-     scriptDirective,
-     selectDirective,
-     styleDirective,
-     optionDirective,
-     ngBindDirective,
-     ngBindHtmlDirective,
-     ngBindTemplateDirective,
-     ngClassDirective,
-     ngClassEvenDirective,
-     ngClassOddDirective,
-     ngCspDirective,
-     ngCloakDirective,
-     ngControllerDirective,
-     ngFormDirective,
-     ngHideDirective,
-     ngIfDirective,
-     ngIncludeDirective,
-     ngIncludeFillContentDirective,
-     ngInitDirective,
-     ngNonBindableDirective,
-     ngPluralizeDirective,
-     ngRepeatDirective,
-     ngShowDirective,
-     ngStyleDirective,
-     ngSwitchDirective,
-     ngSwitchWhenDirective,
-     ngSwitchDefaultDirective,
-     ngOptionsDirective,
-     ngTranscludeDirective,
-     ngModelDirective,
-     ngListDirective,
-     ngChangeDirective,
-     requiredDirective,
-     requiredDirective,
-     ngValueDirective,
-     ngAttributeAliasDirectives,
-     ngEventDirectives,
-
-     $AnchorScrollProvider,
-     $AnimateProvider,
-     $BrowserProvider,
-     $CacheFactoryProvider,
-     $ControllerProvider,
-     $DocumentProvider,
-     $ExceptionHandlerProvider,
-     $FilterProvider,
-     $InterpolateProvider,
-     $IntervalProvider,
-     $HttpProvider,
-     $HttpBackendProvider,
-     $LocationProvider,
-     $LogProvider,
-     $ParseProvider,
-     $RootScopeProvider,
-     $QProvider,
-     $$SanitizeUriProvider,
-     $SceProvider,
-     $SceDelegateProvider,
-     $SnifferProvider,
-     $TemplateCacheProvider,
-     $TimeoutProvider,
-     $$RAFProvider,
-     $$AsyncCallbackProvider,
-     $WindowProvider
+    /* global shallowCopy: true */
+
+    /**
+     * Creates a shallow copy of an object, an array or a primitive.
+     *
+     * Assumes that there are no proto properties for objects.
      */
+    function shallowCopy(src, dst) {
+        if (isArray(src)) {
+            dst = dst || [];
+
+            for (var i = 0, ii = src.length; i < ii; i++) {
+                dst[i] = src[i];
+            }
+        } else if (isObject(src)) {
+            dst = dst || {};
+
+            for (var key in src) {
+                if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) {
+                    dst[key] = src[key];
+                }
+            }
+        }
+
+        return dst || src;
+    }
+
+    /* exported toDebugString */
+
+    function serializeObject(obj, maxDepth) {
+        var seen = [];
+
+        // There is no direct way to stringify object until reaching a specific depth
+        // and a very deep object can cause a performance issue, so we copy the object
+        // based on this specific depth and then stringify it.
+        if (isValidObjectMaxDepth(maxDepth)) {
+            // This file is also included in `angular-loader`, so `copy()` might not always be available in
+            // the closure. Therefore, it is lazily retrieved as `angular.copy()` when needed.
+            obj = angular.copy(obj, null, maxDepth);
+        }
+        return JSON.stringify(obj, function(key, val) {
+            val = toJsonReplacer(key, val);
+            if (isObject(val)) {
+
+                if (seen.indexOf(val) >= 0) return '...';
+
+                seen.push(val);
+            }
+            return val;
+        });
+    }
+
+    function toDebugString(obj, maxDepth) {
+        if (typeof obj === 'function') {
+            return obj.toString().replace(/ \{[\s\S]*$/, '');
+        } else if (isUndefined(obj)) {
+            return 'undefined';
+        } else if (typeof obj !== 'string') {
+            return serializeObject(obj, maxDepth);
+        }
+        return obj;
+    }
+
+    /* global angularModule: true,
+  version: true,
+
+  $CompileProvider,
+
+  htmlAnchorDirective,
+  inputDirective,
+  inputDirective,
+  formDirective,
+  scriptDirective,
+  selectDirective,
+  optionDirective,
+  ngBindDirective,
+  ngBindHtmlDirective,
+  ngBindTemplateDirective,
+  ngClassDirective,
+  ngClassEvenDirective,
+  ngClassOddDirective,
+  ngCloakDirective,
+  ngControllerDirective,
+  ngFormDirective,
+  ngHideDirective,
+  ngIfDirective,
+  ngIncludeDirective,
+  ngIncludeFillContentDirective,
+  ngInitDirective,
+  ngNonBindableDirective,
+  ngPluralizeDirective,
+  ngRepeatDirective,
+  ngShowDirective,
+  ngStyleDirective,
+  ngSwitchDirective,
+  ngSwitchWhenDirective,
+  ngSwitchDefaultDirective,
+  ngOptionsDirective,
+  ngTranscludeDirective,
+  ngModelDirective,
+  ngListDirective,
+  ngChangeDirective,
+  patternDirective,
+  patternDirective,
+  requiredDirective,
+  requiredDirective,
+  minlengthDirective,
+  minlengthDirective,
+  maxlengthDirective,
+  maxlengthDirective,
+  ngValueDirective,
+  ngModelOptionsDirective,
+  ngAttributeAliasDirectives,
+  ngEventDirectives,
+
+  $AnchorScrollProvider,
+  $AnimateProvider,
+  $CoreAnimateCssProvider,
+  $$CoreAnimateJsProvider,
+  $$CoreAnimateQueueProvider,
+  $$AnimateRunnerFactoryProvider,
+  $$AnimateAsyncRunFactoryProvider,
+  $BrowserProvider,
+  $CacheFactoryProvider,
+  $ControllerProvider,
+  $DateProvider,
+  $DocumentProvider,
+  $$IsDocumentHiddenProvider,
+  $ExceptionHandlerProvider,
+  $FilterProvider,
+  $$ForceReflowProvider,
+  $InterpolateProvider,
+  $IntervalProvider,
+  $HttpProvider,
+  $HttpParamSerializerProvider,
+  $HttpParamSerializerJQLikeProvider,
+  $HttpBackendProvider,
+  $xhrFactoryProvider,
+  $jsonpCallbacksProvider,
+  $LocationProvider,
+  $LogProvider,
+  $$MapProvider,
+  $ParseProvider,
+  $RootScopeProvider,
+  $QProvider,
+  $$QProvider,
+  $$SanitizeUriProvider,
+  $SceProvider,
+  $SceDelegateProvider,
+  $SnifferProvider,
+  $TemplateCacheProvider,
+  $TemplateRequestProvider,
+  $$TestabilityProvider,
+  $TimeoutProvider,
+  $$RAFProvider,
+  $WindowProvider,
+  $$jqLiteProvider,
+  $$CookieReaderProvider
+*/
 
 
     /**
@@ -1909,8 +2783,9 @@
      * @name angular.version
      * @module ng
      * @description
-     * An object that contains information about the current AngularJS version. This object has the
-     * following properties:
+     * An object that contains information about the current AngularJS version.
+     *
+     * This object has the following properties:
      *
      * - `full` – `{string}` – Full version string, such as "0.9.18".
      * - `major` – `{number}` – Major version number, such as "0".
@@ -1919,28 +2794,32 @@
      * - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat".
      */
     var version = {
-        full: '1.2.16',    // all of these placeholder strings will be replaced by grunt's
-        major: 1,    // package task
-        minor: 2,
-        dot: 16,
-        codeName: 'badger-enumeration'
+        // These placeholder strings will be replaced by grunt's `build` task.
+        // They need to be double- or single-quoted.
+        full: '1.6.9',
+        major: 1,
+        minor: 6,
+        dot: 9,
+        codeName: 'fiery-basilisk'
     };
 
 
-    function publishExternalAPI(angular){
+    function publishExternalAPI(angular) {
         extend(angular, {
+            'errorHandlingConfig': errorHandlingConfig,
             'bootstrap': bootstrap,
             'copy': copy,
             'extend': extend,
+            'merge': merge,
             'equals': equals,
             'element': jqLite,
             'forEach': forEach,
             'injector': createInjector,
-            'noop':noop,
-            'bind':bind,
+            'noop': noop,
+            'bind': bind,
             'toJson': toJson,
             'fromJson': fromJson,
-            'identity':identity,
+            'identity': identity,
             'isUndefined': isUndefined,
             'isDefined': isDefined,
             'isString': isString,
@@ -1953,17 +2832,17 @@
             'isDate': isDate,
             'lowercase': lowercase,
             'uppercase': uppercase,
-            'callbacks': {counter: 0},
+            'callbacks': {$$counter: 0},
+            'getTestability': getTestability,
+            'reloadWithDebugInfo': reloadWithDebugInfo,
             '$$minErr': minErr,
-            '$$csp': csp
+            '$$csp': csp,
+            '$$encodeUriSegment': encodeUriSegment,
+            '$$encodeUriQuery': encodeUriQuery,
+            '$$stringify': stringify
         });
 
         angularModule = setupModuleLoader(window);
-        try {
-            angularModule('ngLocale');
-        } catch (e) {
-            angularModule('ngLocale', []).provider('$locale', $LocaleProvider);
-        }
 
         angularModule('ng', ['ngLocale'], ['$provide',
             function ngModule($provide) {
@@ -1972,88 +2851,120 @@
                     $$sanitizeUri: $$SanitizeUriProvider
                 });
                 $provide.provider('$compile', $CompileProvider).
-                    directive({
-                        a: htmlAnchorDirective,
-                        input: inputDirective,
-                        textarea: inputDirective,
-                        form: formDirective,
-                        script: scriptDirective,
-                        select: selectDirective,
-                        style: styleDirective,
-                        option: optionDirective,
-                        ngBind: ngBindDirective,
-                        ngBindHtml: ngBindHtmlDirective,
-                        ngBindTemplate: ngBindTemplateDirective,
-                        ngClass: ngClassDirective,
-                        ngClassEven: ngClassEvenDirective,
-                        ngClassOdd: ngClassOddDirective,
-                        ngCloak: ngCloakDirective,
-                        ngController: ngControllerDirective,
-                        ngForm: ngFormDirective,
-                        ngHide: ngHideDirective,
-                        ngIf: ngIfDirective,
-                        ngInclude: ngIncludeDirective,
-                        ngInit: ngInitDirective,
-                        ngNonBindable: ngNonBindableDirective,
-                        ngPluralize: ngPluralizeDirective,
-                        ngRepeat: ngRepeatDirective,
-                        ngShow: ngShowDirective,
-                        ngStyle: ngStyleDirective,
-                        ngSwitch: ngSwitchDirective,
-                        ngSwitchWhen: ngSwitchWhenDirective,
-                        ngSwitchDefault: ngSwitchDefaultDirective,
-                        ngOptions: ngOptionsDirective,
-                        ngTransclude: ngTranscludeDirective,
-                        ngModel: ngModelDirective,
-                        ngList: ngListDirective,
-                        ngChange: ngChangeDirective,
-                        required: requiredDirective,
-                        ngRequired: requiredDirective,
-                        ngValue: ngValueDirective
-                    }).
-                    directive({
-                        ngInclude: ngIncludeFillContentDirective
-                    }).
-                    directive(ngAttributeAliasDirectives).
-                    directive(ngEventDirectives);
+                directive({
+                    a: htmlAnchorDirective,
+                    input: inputDirective,
+                    textarea: inputDirective,
+                    form: formDirective,
+                    script: scriptDirective,
+                    select: selectDirective,
+                    option: optionDirective,
+                    ngBind: ngBindDirective,
+                    ngBindHtml: ngBindHtmlDirective,
+                    ngBindTemplate: ngBindTemplateDirective,
+                    ngClass: ngClassDirective,
+                    ngClassEven: ngClassEvenDirective,
+                    ngClassOdd: ngClassOddDirective,
+                    ngCloak: ngCloakDirective,
+                    ngController: ngControllerDirective,
+                    ngForm: ngFormDirective,
+                    ngHide: ngHideDirective,
+                    ngIf: ngIfDirective,
+                    ngInclude: ngIncludeDirective,
+                    ngInit: ngInitDirective,
+                    ngNonBindable: ngNonBindableDirective,
+                    ngPluralize: ngPluralizeDirective,
+                    ngRepeat: ngRepeatDirective,
+                    ngShow: ngShowDirective,
+                    ngStyle: ngStyleDirective,
+                    ngSwitch: ngSwitchDirective,
+                    ngSwitchWhen: ngSwitchWhenDirective,
+                    ngSwitchDefault: ngSwitchDefaultDirective,
+                    ngOptions: ngOptionsDirective,
+                    ngTransclude: ngTranscludeDirective,
+                    ngModel: ngModelDirective,
+                    ngList: ngListDirective,
+                    ngChange: ngChangeDirective,
+                    pattern: patternDirective,
+                    ngPattern: patternDirective,
+                    required: requiredDirective,
+                    ngRequired: requiredDirective,
+                    minlength: minlengthDirective,
+                    ngMinlength: minlengthDirective,
+                    maxlength: maxlengthDirective,
+                    ngMaxlength: maxlengthDirective,
+                    ngValue: ngValueDirective,
+                    ngModelOptions: ngModelOptionsDirective
+                }).
+                directive({
+                    ngInclude: ngIncludeFillContentDirective
+                }).
+                directive(ngAttributeAliasDirectives).
+                directive(ngEventDirectives);
                 $provide.provider({
                     $anchorScroll: $AnchorScrollProvider,
                     $animate: $AnimateProvider,
+                    $animateCss: $CoreAnimateCssProvider,
+                    $$animateJs: $$CoreAnimateJsProvider,
+                    $$animateQueue: $$CoreAnimateQueueProvider,
+                    $$AnimateRunner: $$AnimateRunnerFactoryProvider,
+                    $$animateAsyncRun: $$AnimateAsyncRunFactoryProvider,
                     $browser: $BrowserProvider,
                     $cacheFactory: $CacheFactoryProvider,
                     $controller: $ControllerProvider,
                     $document: $DocumentProvider,
+                    $$isDocumentHidden: $$IsDocumentHiddenProvider,
                     $exceptionHandler: $ExceptionHandlerProvider,
                     $filter: $FilterProvider,
+                    $$forceReflow: $$ForceReflowProvider,
                     $interpolate: $InterpolateProvider,
                     $interval: $IntervalProvider,
                     $http: $HttpProvider,
+                    $httpParamSerializer: $HttpParamSerializerProvider,
+                    $httpParamSerializerJQLike: $HttpParamSerializerJQLikeProvider,
                     $httpBackend: $HttpBackendProvider,
+                    $xhrFactory: $xhrFactoryProvider,
+                    $jsonpCallbacks: $jsonpCallbacksProvider,
                     $location: $LocationProvider,
                     $log: $LogProvider,
                     $parse: $ParseProvider,
                     $rootScope: $RootScopeProvider,
                     $q: $QProvider,
+                    $$q: $$QProvider,
                     $sce: $SceProvider,
                     $sceDelegate: $SceDelegateProvider,
                     $sniffer: $SnifferProvider,
                     $templateCache: $TemplateCacheProvider,
+                    $templateRequest: $TemplateRequestProvider,
+                    $$testability: $$TestabilityProvider,
                     $timeout: $TimeoutProvider,
                     $window: $WindowProvider,
                     $$rAF: $$RAFProvider,
-                    $$asyncCallback : $$AsyncCallbackProvider
+                    $$jqLite: $$jqLiteProvider,
+                    $$Map: $$MapProvider,
+                    $$cookieReader: $$CookieReaderProvider
                 });
             }
-        ]);
+        ])
+            .info({ angularVersion: '1.6.9' });
     }
 
-    /* global
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-     -JQLitePrototype,
-     -addEventListenerFn,
-     -removeEventListenerFn,
-     -BOOLEAN_ATTR
-     */
+    /* global
+  JQLitePrototype: true,
+  BOOLEAN_ATTR: true,
+  ALIASED_ATTR: true
+*/
 
 //////////////////////////////////
 //JQLite
@@ -2063,37 +2974,45 @@
      * @ngdoc function
      * @name angular.element
      * @module ng
-     * @function
+     * @kind function
      *
      * @description
      * Wraps a raw DOM element or HTML string as a [jQuery](http://jquery.com) element.
      *
      * If jQuery is available, `angular.element` is an alias for the
      * [jQuery](http://api.jquery.com/jQuery/) function. If jQuery is not available, `angular.element`
-     * delegates to Angular's built-in subset of jQuery, called "jQuery lite" or "jqLite."
+     * delegates to AngularJS's built-in subset of jQuery, called "jQuery lite" or **jqLite**.
+     *
+     * jqLite is a tiny, API-compatible subset of jQuery that allows
+     * AngularJS to manipulate the DOM in a cross-browser compatible way. jqLite implements only the most
+     * commonly needed functionality with the goal of having a very small footprint.
      *
-     * <div class="alert alert-success">jqLite is a tiny, API-compatible subset of jQuery that allows
-     * Angular to manipulate the DOM in a cross-browser compatible way. **jqLite** implements only the most
-     * commonly needed functionality with the goal of having a very small footprint.</div>
+     * To use `jQuery`, simply ensure it is loaded before the `angular.js` file. You can also use the
+     * {@link ngJq `ngJq`} directive to specify that jqlite should be used over jQuery, or to use a
+     * specific version of jQuery if multiple versions exist on the page.
      *
-     * To use jQuery, simply load it before `DOMContentLoaded` event fired.
+     * <div class="alert alert-info">**Note:** All element references in AngularJS are always wrapped with jQuery or
+     * jqLite (such as the element argument in a directive's compile / link function). They are never raw DOM references.</div>
      *
-     * <div class="alert">**Note:** all element references in Angular are always wrapped with jQuery or
-     * jqLite; they are never raw DOM references.</div>
+     * <div class="alert alert-warning">**Note:** Keep in mind that this function will not find elements
+     * by tag name / CSS selector. For lookups by tag name, try instead `angular.element(document).find(...)`
+     * or `$document.find()`, or use the standard DOM APIs, e.g. `document.querySelectorAll()`.</div>
      *
-     * ## Angular's jqLite
+     * ## AngularJS's jqLite
      * jqLite provides only the following jQuery methods:
      *
-     * - [`addClass()`](http://api.jquery.com/addClass/)
+     * - [`addClass()`](http://api.jquery.com/addClass/) - Does not support a function as first argument
      * - [`after()`](http://api.jquery.com/after/)
      * - [`append()`](http://api.jquery.com/append/)
-     * - [`attr()`](http://api.jquery.com/attr/)
-     * - [`bind()`](http://api.jquery.com/bind/) - Does not support namespaces, selectors or eventData
+     * - [`attr()`](http://api.jquery.com/attr/) - Does not support functions as parameters
+     * - [`bind()`](http://api.jquery.com/bind/) (_deprecated_, use [`on()`](http://api.jquery.com/on/)) - Does not support namespaces, selectors or eventData
      * - [`children()`](http://api.jquery.com/children/) - Does not support selectors
      * - [`clone()`](http://api.jquery.com/clone/)
      * - [`contents()`](http://api.jquery.com/contents/)
-     * - [`css()`](http://api.jquery.com/css/)
+     * - [`css()`](http://api.jquery.com/css/) - Only retrieves inline-styles, does not call `getComputedStyle()`.
+     *   As a setter, does not convert numbers to strings or append 'px', and also does not have automatic property prefixing.
      * - [`data()`](http://api.jquery.com/data/)
+     * - [`detach()`](http://api.jquery.com/detach/)
      * - [`empty()`](http://api.jquery.com/empty/)
      * - [`eq()`](http://api.jquery.com/eq/)
      * - [`find()`](http://api.jquery.com/find/) - Limited to lookups by tag name
@@ -2101,26 +3020,26 @@
      * - [`html()`](http://api.jquery.com/html/)
      * - [`next()`](http://api.jquery.com/next/) - Does not support selectors
      * - [`on()`](http://api.jquery.com/on/) - Does not support namespaces, selectors or eventData
-     * - [`off()`](http://api.jquery.com/off/) - Does not support namespaces or selectors
+     * - [`off()`](http://api.jquery.com/off/) - Does not support namespaces, selectors or event object as parameter
      * - [`one()`](http://api.jquery.com/one/) - Does not support namespaces or selectors
      * - [`parent()`](http://api.jquery.com/parent/) - Does not support selectors
      * - [`prepend()`](http://api.jquery.com/prepend/)
      * - [`prop()`](http://api.jquery.com/prop/)
-     * - [`ready()`](http://api.jquery.com/ready/)
+     * - [`ready()`](http://api.jquery.com/ready/) (_deprecated_, use `angular.element(callback)` instead of `angular.element(document).ready(callback)`)
      * - [`remove()`](http://api.jquery.com/remove/)
-     * - [`removeAttr()`](http://api.jquery.com/removeAttr/)
-     * - [`removeClass()`](http://api.jquery.com/removeClass/)
+     * - [`removeAttr()`](http://api.jquery.com/removeAttr/) - Does not support multiple attributes
+     * - [`removeClass()`](http://api.jquery.com/removeClass/) - Does not support a function as first argument
      * - [`removeData()`](http://api.jquery.com/removeData/)
      * - [`replaceWith()`](http://api.jquery.com/replaceWith/)
      * - [`text()`](http://api.jquery.com/text/)
-     * - [`toggleClass()`](http://api.jquery.com/toggleClass/)
-     * - [`triggerHandler()`](http://api.jquery.com/triggerHandler/) - Passes a dummy event object to handlers.
-     * - [`unbind()`](http://api.jquery.com/unbind/) - Does not support namespaces
+     * - [`toggleClass()`](http://api.jquery.com/toggleClass/) - Does not support a function as first argument
+     * - [`triggerHandler()`](http://api.jquery.com/triggerHandler/) - Passes a dummy event object to handlers
+     * - [`unbind()`](http://api.jquery.com/unbind/) (_deprecated_, use [`off()`](http://api.jquery.com/off/)) - Does not support namespaces or event object as parameter
      * - [`val()`](http://api.jquery.com/val/)
      * - [`wrap()`](http://api.jquery.com/wrap/)
      *
      * ## jQuery/jqLite Extras
-     * Angular also provides the following additional methods and events to both jQuery and jqLite:
+     * AngularJS also provides the following additional methods and events to both jQuery and jqLite:
      *
      * ### Events
      * - `$destroy` - AngularJS intercepts all jqLite/jQuery's DOM destruction apis and fires this event
@@ -2134,31 +3053,31 @@
      *   `'ngModel'`).
      * - `injector()` - retrieves the injector of the current element or its parent.
      * - `scope()` - retrieves the {@link ng.$rootScope.Scope scope} of the current
-     *   element or its parent.
+     *   element or its parent. Requires {@link guide/production#disabling-debug-data Debug Data} to
+     *   be enabled.
      * - `isolateScope()` - retrieves an isolate {@link ng.$rootScope.Scope scope} if one is attached directly to the
      *   current element. This getter should be used only on elements that contain a directive which starts a new isolate
      *   scope. Calling `scope()` on this element always returns the original non-isolate scope.
+     *   Requires {@link guide/production#disabling-debug-data Debug Data} to be enabled.
      * - `inheritedData()` - same as `data()`, but walks up the DOM until a value is found or the top
      *   parent element is reached.
      *
+     * @knownIssue You cannot spy on `angular.element` if you are using Jasmine version 1.x. See
+     * https://github.com/angular/angular.js/issues/14251 for more information.
+     *
      * @param {string|DOMElement} element HTML string or DOMElement to be wrapped into jQuery.
      * @returns {Object} jQuery object.
      */
 
+    JQLite.expando = 'ng339';
+
     var jqCache = JQLite.cache = {},
-        jqName = JQLite.expando = 'ng-' + new Date().getTime(),
-        jqId = 1,
-        addEventListenerFn = (window.document.addEventListener
-            ? function(element, type, fn) {element.addEventListener(type, fn, false);}
-            : function(element, type, fn) {element.attachEvent('on' + type, fn);}),
-        removeEventListenerFn = (window.document.removeEventListener
-            ? function(element, type, fn) {element.removeEventListener(type, fn, false); }
-            : function(element, type, fn) {element.detachEvent('on' + type, fn); });
+        jqId = 1;
 
     /*
-     * !!! This is an undocumented "private" function !!!
-     */
-    var jqData = JQLite._data = function(node) {
+ * !!! This is an undocumented "private" function !!!
+ */
+    JQLite._data = function(node) {
         //jQuery always returns an object on cache miss
         return this.cache[node[this.expando]] || {};
     };
@@ -2166,70 +3085,37 @@
     function jqNextId() { return ++jqId; }
 
 
-    var SPECIAL_CHARS_REGEXP = /([\:\-\_]+(.))/g;
-    var MOZ_HACK_REGEXP = /^moz([A-Z])/;
+    var DASH_LOWERCASE_REGEXP = /-([a-z])/g;
+    var MS_HACK_REGEXP = /^-ms-/;
+    var MOUSE_EVENT_MAP = { mouseleave: 'mouseout', mouseenter: 'mouseover' };
     var jqLiteMinErr = minErr('jqLite');
 
     /**
-     * Converts snake_case to camelCase.
-     * Also there is special case for Moz prefix starting with upper case letter.
+     * Converts kebab-case to camelCase.
+     * There is also a special case for the ms prefix starting with a lowercase letter.
      * @param name Name to normalize
      */
-    function camelCase(name) {
-        return name.
-            replace(SPECIAL_CHARS_REGEXP, function(_, separator, letter, offset) {
-                return offset ? letter.toUpperCase() : letter;
-            }).
-            replace(MOZ_HACK_REGEXP, 'Moz$1');
+    function cssKebabToCamel(name) {
+        return kebabToCamel(name.replace(MS_HACK_REGEXP, 'ms-'));
     }
 
-/////////////////////////////////////////////
-// jQuery mutation patch
-//
-// In conjunction with bindJQuery intercepts all jQuery's DOM destruction apis and fires a
-// $destroy event on all DOM nodes being removed.
-//
-/////////////////////////////////////////////
+    function fnCamelCaseReplace(all, letter) {
+        return letter.toUpperCase();
+    }
 
-    function jqLitePatchJQueryRemove(name, dispatchThis, filterElems, getterIfNoArguments) {
-        var originalJqFn = jQuery.fn[name];
-        originalJqFn = originalJqFn.$original || originalJqFn;
-        removePatch.$original = originalJqFn;
-        jQuery.fn[name] = removePatch;
-
-        function removePatch(param) {
-            // jshint -W040
-            var list = filterElems && param ? [this.filter(param)] : [this],
-                fireEvent = dispatchThis,
-                set, setIndex, setLength,
-                element, childIndex, childLength, children;
-
-            if (!getterIfNoArguments || param != null) {
-                while(list.length) {
-                    set = list.shift();
-                    for(setIndex = 0, setLength = set.length; setIndex < setLength; setIndex++) {
-                        element = jqLite(set[setIndex]);
-                        if (fireEvent) {
-                            element.triggerHandler('$destroy');
-                        } else {
-                            fireEvent = !fireEvent;
-                        }
-                        for(childIndex = 0, childLength = (children = element.children()).length;
-                            childIndex < childLength;
-                            childIndex++) {
-                            list.push(jQuery(children[childIndex]));
-                        }
-                    }
-                }
-            }
-            return originalJqFn.apply(this, arguments);
-        }
+    /**
+     * Converts kebab-case to camelCase.
+     * @param name Name to normalize
+     */
+    function kebabToCamel(name) {
+        return name
+            .replace(DASH_LOWERCASE_REGEXP, fnCamelCaseReplace);
     }
 
-    var SINGLE_TAG_REGEXP = /^<(\w+)\s*\/?>(?:<\/\1>|)$/;
+    var SINGLE_TAG_REGEXP = /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/;
     var HTML_REGEXP = /<|&#?\w+;/;
-    var TAG_NAME_REGEXP = /<([\w:]+)/;
-    var XHTML_TAG_REGEXP = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi;
+    var TAG_NAME_REGEXP = /<([\w:-]+)/;
+    var XHTML_TAG_REGEXP = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi;
 
     var wrapMap = {
         'option': [1, '<select multiple="multiple">', '</select>'],
@@ -2238,33 +3124,46 @@
         'col': [2, '<table><colgroup>', '</colgroup></table>'],
         'tr': [2, '<table><tbody>', '</tbody></table>'],
         'td': [3, '<table><tbody><tr>', '</tr></tbody></table>'],
-        '_default': [0, "", ""]
+        '_default': [0, '', '']
     };
 
     wrapMap.optgroup = wrapMap.option;
     wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
     wrapMap.th = wrapMap.td;
 
+
     function jqLiteIsTextNode(html) {
         return !HTML_REGEXP.test(html);
     }
 
+    function jqLiteAcceptsData(node) {
+        // The window object can accept data but has no nodeType
+        // Otherwise we are only interested in elements (1) and documents (9)
+        var nodeType = node.nodeType;
+        return nodeType === NODE_TYPE_ELEMENT || !nodeType || nodeType === NODE_TYPE_DOCUMENT;
+    }
+
+    function jqLiteHasData(node) {
+        for (var key in jqCache[node.ng339]) {
+            return true;
+        }
+        return false;
+    }
+
     function jqLiteBuildFragment(html, context) {
-        var elem, tmp, tag, wrap,
+        var tmp, tag, wrap,
             fragment = context.createDocumentFragment(),
-            nodes = [], i, j, jj;
+            nodes = [], i;
 
         if (jqLiteIsTextNode(html)) {
             // Convert non-html into a text node
             nodes.push(context.createTextNode(html));
         } else {
-            tmp = fragment.appendChild(context.createElement('div'));
             // Convert html into DOM nodes
-            tag = (TAG_NAME_REGEXP.exec(html) || ["", ""])[1].toLowerCase();
+            tmp = fragment.appendChild(context.createElement('div'));
+            tag = (TAG_NAME_REGEXP.exec(html) || ['', ''])[1].toLowerCase();
             wrap = wrapMap[tag] || wrapMap._default;
-            tmp.innerHTML = '<div>&#160;</div>' +
-            wrap[1] + html.replace(XHTML_TAG_REGEXP, "<$1></$2>") + wrap[2];
-            tmp.removeChild(tmp.firstChild);
+            tmp.innerHTML = wrap[1] + html.replace(XHTML_TAG_REGEXP, '<$1></$2>') + wrap[2];
 
             // Descend through wrappers to the right content
             i = wrap[0];
@@ -2272,48 +3171,77 @@
                 tmp = tmp.lastChild;
             }
 
-            for (j=0, jj=tmp.childNodes.length; j<jj; ++j) nodes.push(tmp.childNodes[j]);
+            nodes = concat(nodes, tmp.childNodes);
 
             tmp = fragment.firstChild;
-            tmp.textContent = "";
+            tmp.textContent = '';
         }
 
         // Remove wrapper from fragment
-        fragment.textContent = "";
-        fragment.innerHTML = ""; // Clear inner HTML
-        return nodes;
+        fragment.textContent = '';
+        fragment.innerHTML = ''; // Clear inner HTML
+        forEach(nodes, function(node) {
+            fragment.appendChild(node);
+        });
+
+        return fragment;
     }
 
     function jqLiteParseHTML(html, context) {
-        context = context || document;
+        context = context || window.document;
         var parsed;
 
         if ((parsed = SINGLE_TAG_REGEXP.exec(html))) {
             return [context.createElement(parsed[1])];
         }
 
-        return jqLiteBuildFragment(html, context);
+        if ((parsed = jqLiteBuildFragment(html, context))) {
+            return parsed.childNodes;
+        }
+
+        return [];
+    }
+
+    function jqLiteWrapNode(node, wrapper) {
+        var parent = node.parentNode;
+
+        if (parent) {
+            parent.replaceChild(wrapper, node);
+        }
+
+        wrapper.appendChild(node);
     }
 
+
+// IE9-11 has no method "contains" in SVG element and in Node.prototype. Bug #10259.
+    var jqLiteContains = window.Node.prototype.contains || /** @this */ function(arg) {
+        // eslint-disable-next-line no-bitwise
+        return !!(this.compareDocumentPosition(arg) & 16);
+    };
+
 /////////////////////////////////////////////
     function JQLite(element) {
         if (element instanceof JQLite) {
             return element;
         }
+
+        var argIsString;
+
         if (isString(element)) {
             element = trim(element);
+            argIsString = true;
         }
         if (!(this instanceof JQLite)) {
-            if (isString(element) && element.charAt(0) != '<') {
+            if (argIsString && element.charAt(0) !== '<') {
                 throw jqLiteMinErr('nosel', 'Looking up elements via selectors is not supported by jqLite! See: http://docs.angularjs.org/api/angular.element');
             }
             return new JQLite(element);
         }
 
-        if (isString(element)) {
+        if (argIsString) {
             jqLiteAddNodes(this, jqLiteParseHTML(element));
-            var fragment = jqLite(document.createDocumentFragment());
-            fragment.append(this);
+        } else if (isFunction(element)) {
+            jqLiteReady(element);
         } else {
             jqLiteAddNodes(this, element);
         }
@@ -2323,206 +3251,265 @@
         return element.cloneNode(true);
     }
 
-    function jqLiteDealoc(element){
-        jqLiteRemoveData(element);
-        for ( var i = 0, children = element.childNodes || []; i < children.length; i++) {
-            jqLiteDealoc(children[i]);
+    function jqLiteDealoc(element, onlyDescendants) {
+        if (!onlyDescendants && jqLiteAcceptsData(element)) jqLite.cleanData([element]);
+
+        if (element.querySelectorAll) {
+            jqLite.cleanData(element.querySelectorAll('*'));
         }
     }
 
     function jqLiteOff(element, type, fn, unsupported) {
         if (isDefined(unsupported)) throw jqLiteMinErr('offargs', 'jqLite#off() does not support the `selector` argument');
 
-        var events = jqLiteExpandoStore(element, 'events'),
-            handle = jqLiteExpandoStore(element, 'handle');
+        var expandoStore = jqLiteExpandoStore(element);
+        var events = expandoStore && expandoStore.events;
+        var handle = expandoStore && expandoStore.handle;
 
         if (!handle) return; //no listeners registered
 
-        if (isUndefined(type)) {
-            forEach(events, function(eventHandler, type) {
-                removeEventListenerFn(element, type, eventHandler);
+        if (!type) {
+            for (type in events) {
+                if (type !== '$destroy') {
+                    element.removeEventListener(type, handle);
+                }
                 delete events[type];
-            });
+            }
         } else {
-            forEach(type.split(' '), function(type) {
-                if (isUndefined(fn)) {
-                    removeEventListenerFn(element, type, events[type]);
+
+            var removeHandler = function(type) {
+                var listenerFns = events[type];
+                if (isDefined(fn)) {
+                    arrayRemove(listenerFns || [], fn);
+                }
+                if (!(isDefined(fn) && listenerFns && listenerFns.length > 0)) {
+                    element.removeEventListener(type, handle);
                     delete events[type];
-                } else {
-                    arrayRemove(events[type] || [], fn);
+                }
+            };
+
+            forEach(type.split(' '), function(type) {
+                removeHandler(type);
+                if (MOUSE_EVENT_MAP[type]) {
+                    removeHandler(MOUSE_EVENT_MAP[type]);
                 }
             });
         }
     }
 
     function jqLiteRemoveData(element, name) {
-        var expandoId = element[jqName],
-            expandoStore = jqCache[expandoId];
+        var expandoId = element.ng339;
+        var expandoStore = expandoId && jqCache[expandoId];
 
         if (expandoStore) {
             if (name) {
-                delete jqCache[expandoId].data[name];
+                delete expandoStore.data[name];
                 return;
             }
 
             if (expandoStore.handle) {
-                expandoStore.events.$destroy && expandoStore.handle({}, '$destroy');
+                if (expandoStore.events.$destroy) {
+                    expandoStore.handle({}, '$destroy');
+                }
                 jqLiteOff(element);
             }
             delete jqCache[expandoId];
-            element[jqName] = undefined; // ie does not allow deletion of attributes on elements.
+            element.ng339 = undefined; // don't delete DOM expandos. IE and Chrome don't like it
         }
     }
 
-    function jqLiteExpandoStore(element, key, value) {
-        var expandoId = element[jqName],
-            expandoStore = jqCache[expandoId || -1];
 
-        if (isDefined(value)) {
-            if (!expandoStore) {
-                element[jqName] = expandoId = jqNextId();
-                expandoStore = jqCache[expandoId] = {};
-            }
-            expandoStore[key] = value;
-        } else {
-            return expandoStore && expandoStore[key];
+    function jqLiteExpandoStore(element, createIfNecessary) {
+        var expandoId = element.ng339,
+            expandoStore = expandoId && jqCache[expandoId];
+
+        if (createIfNecessary && !expandoStore) {
+            element.ng339 = expandoId = jqNextId();
+            expandoStore = jqCache[expandoId] = {events: {}, data: {}, handle: undefined};
         }
+
+        return expandoStore;
     }
 
+
     function jqLiteData(element, key, value) {
-        var data = jqLiteExpandoStore(element, 'data'),
-            isSetter = isDefined(value),
-            keyDefined = !isSetter && isDefined(key),
-            isSimpleGetter = keyDefined && !isObject(key);
+        if (jqLiteAcceptsData(element)) {
+            var prop;
 
-        if (!data && !isSimpleGetter) {
-            jqLiteExpandoStore(element, 'data', data = {});
-        }
+            var isSimpleSetter = isDefined(value);
+            var isSimpleGetter = !isSimpleSetter && key && !isObject(key);
+            var massGetter = !key;
+            var expandoStore = jqLiteExpandoStore(element, !isSimpleGetter);
+            var data = expandoStore && expandoStore.data;
 
-        if (isSetter) {
-            data[key] = value;
-        } else {
-            if (keyDefined) {
-                if (isSimpleGetter) {
-                    // don't create data in this case.
-                    return data && data[key];
+            if (isSimpleSetter) { // data('key', value)
+                data[kebabToCamel(key)] = value;
+            } else {
+                if (massGetter) {  // data()
+                    return data;
                 } else {
-                    extend(data, key);
+                    if (isSimpleGetter) { // data('key')
+                        // don't force creation of expandoStore if it doesn't exist yet
+                        return data && data[kebabToCamel(key)];
+                    } else { // mass-setter: data({key1: val1, key2: val2})
+                        for (prop in key) {
+                            data[kebabToCamel(prop)] = key[prop];
+                        }
+                    }
                 }
-            } else {
-                return data;
             }
         }
     }
 
     function jqLiteHasClass(element, selector) {
         if (!element.getAttribute) return false;
-        return ((" " + (element.getAttribute('class') || '') + " ").replace(/[\n\t]/g, " ").
-            indexOf( " " + selector + " " ) > -1);
+        return ((' ' + (element.getAttribute('class') || '') + ' ').replace(/[\n\t]/g, ' ').
+        indexOf(' ' + selector + ' ') > -1);
     }
 
     function jqLiteRemoveClass(element, cssClasses) {
         if (cssClasses && element.setAttribute) {
+            var existingClasses = (' ' + (element.getAttribute('class') || '') + ' ')
+                .replace(/[\n\t]/g, ' ');
+            var newClasses = existingClasses;
+
             forEach(cssClasses.split(' '), function(cssClass) {
-                element.setAttribute('class', trim(
-                        (" " + (element.getAttribute('class') || '') + " ")
-                            .replace(/[\n\t]/g, " ")
-                            .replace(" " + trim(cssClass) + " ", " "))
-                );
+                cssClass = trim(cssClass);
+                newClasses = newClasses.replace(' ' + cssClass + ' ', ' ');
             });
+
+            if (newClasses !== existingClasses) {
+                element.setAttribute('class', trim(newClasses));
+            }
         }
     }
 
     function jqLiteAddClass(element, cssClasses) {
         if (cssClasses && element.setAttribute) {
             var existingClasses = (' ' + (element.getAttribute('class') || '') + ' ')
-                .replace(/[\n\t]/g, " ");
+                .replace(/[\n\t]/g, ' ');
+            var newClasses = existingClasses;
 
             forEach(cssClasses.split(' '), function(cssClass) {
                 cssClass = trim(cssClass);
-                if (existingClasses.indexOf(' ' + cssClass + ' ') === -1) {
-                    existingClasses += cssClass + ' ';
+                if (newClasses.indexOf(' ' + cssClass + ' ') === -1) {
+                    newClasses += cssClass + ' ';
                 }
             });
 
-            element.setAttribute('class', trim(existingClasses));
+            if (newClasses !== existingClasses) {
+                element.setAttribute('class', trim(newClasses));
+            }
         }
     }
 
+
     function jqLiteAddNodes(root, elements) {
+        // THIS CODE IS VERY HOT. Don't make changes without benchmarking.
+
         if (elements) {
-            elements = (!elements.nodeName && isDefined(elements.length) && !isWindow(elements))
-                ? elements
-                : [ elements ];
-            for(var i=0; i < elements.length; i++) {
-                root.push(elements[i]);
+
+            // if a Node (the most common case)
+            if (elements.nodeType) {
+                root[root.length++] = elements;
+            } else {
+                var length = elements.length;
+
+                // if an Array or NodeList and not a Window
+                if (typeof length === 'number' && elements.window !== elements) {
+                    if (length) {
+                        for (var i = 0; i < length; i++) {
+                            root[root.length++] = elements[i];
+                        }
+                    }
+                } else {
+                    root[root.length++] = elements;
+                }
             }
         }
     }
 
+
     function jqLiteController(element, name) {
-        return jqLiteInheritedData(element, '$' + (name || 'ngController' ) + 'Controller');
+        return jqLiteInheritedData(element, '$' + (name || 'ngController') + 'Controller');
     }
 
     function jqLiteInheritedData(element, name, value) {
-        element = jqLite(element);
-
         // if element is the document object work with the html element instead
         // this makes $(document).scope() possible
-        if(element[0].nodeType == 9) {
-            element = element.find('html');
+        if (element.nodeType === NODE_TYPE_DOCUMENT) {
+            element = element.documentElement;
         }
         var names = isArray(name) ? name : [name];
 
-        while (element.length) {
-            var node = element[0];
+        while (element) {
             for (var i = 0, ii = names.length; i < ii; i++) {
-                if ((value = element.data(names[i])) !== undefined) return value;
+                if (isDefined(value = jqLite.data(element, names[i]))) return value;
             }
 
             // If dealing with a document fragment node with a host element, and no parent, use the host
             // element as the parent. This enables directives within a Shadow DOM or polyfilled Shadow DOM
             // to lookup parent controllers.
-            element = jqLite(node.parentNode || (node.nodeType === 11 && node.host));
+            element = element.parentNode || (element.nodeType === NODE_TYPE_DOCUMENT_FRAGMENT && element.host);
         }
     }
 
     function jqLiteEmpty(element) {
-        for (var i = 0, childNodes = element.childNodes; i < childNodes.length; i++) {
-            jqLiteDealoc(childNodes[i]);
-        }
+        jqLiteDealoc(element, true);
         while (element.firstChild) {
             element.removeChild(element.firstChild);
         }
     }
 
+    function jqLiteRemove(element, keepData) {
+        if (!keepData) jqLiteDealoc(element);
+        var parent = element.parentNode;
+        if (parent) parent.removeChild(element);
+    }
+
+
+    function jqLiteDocumentLoaded(action, win) {
+        win = win || window;
+        if (win.document.readyState === 'complete') {
+            // Force the action to be run async for consistent behavior
+            // from the action's point of view
+            // i.e. it will definitely not be in a $apply
+            win.setTimeout(action);
+        } else {
+            // No need to unbind this handler as load is only ever called once
+            jqLite(win).on('load', action);
+        }
+    }
+
+    function jqLiteReady(fn) {
+        function trigger() {
+            window.document.removeEventListener('DOMContentLoaded', trigger);
+            window.removeEventListener('load', trigger);
+            fn();
+        }
+
+        // check if document is already loaded
+        if (window.document.readyState === 'complete') {
+            window.setTimeout(fn);
+        } else {
+            // We can not use jqLite since we are not done loading and jQuery could be loaded later.
+
+            // Works for modern browsers and IE9
+            window.document.addEventListener('DOMContentLoaded', trigger);
+
+            // Fallback to window.onload for others
+            window.addEventListener('load', trigger);
+        }
+    }
+
 //////////////////////////////////////////
 // Functions which are declared directly.
 //////////////////////////////////////////
     var JQLitePrototype = JQLite.prototype = {
-        ready: function(fn) {
-            var fired = false;
-
-            function trigger() {
-                if (fired) return;
-                fired = true;
-                fn();
-            }
-
-            // check if document already is loaded
-            if (document.readyState === 'complete'){
-                setTimeout(trigger);
-            } else {
-                this.on('DOMContentLoaded', trigger); // works for modern browsers and IE9
-                // we can not use jqLite since we are not done loading and jQuery could be loaded later.
-                // jshint -W064
-                JQLite(window).on('load', trigger); // fallback to window.onload for others
-                // jshint +W064
-            }
-        },
+        ready: jqLiteReady,
         toString: function() {
             var value = [];
-            forEach(this, function(e){ value.push('' + e);});
+            forEach(this, function(e) { value.push('' + e);});
             return '[' + value.join(', ') + ']';
         },
 
@@ -2547,29 +3534,54 @@
     });
     var BOOLEAN_ELEMENTS = {};
     forEach('input,select,option,textarea,button,form,details'.split(','), function(value) {
-        BOOLEAN_ELEMENTS[uppercase(value)] = true;
+        BOOLEAN_ELEMENTS[value] = true;
     });
+    var ALIASED_ATTR = {
+        'ngMinlength': 'minlength',
+        'ngMaxlength': 'maxlength',
+        'ngMin': 'min',
+        'ngMax': 'max',
+        'ngPattern': 'pattern',
+        'ngStep': 'step'
+    };
 
     function getBooleanAttrName(element, name) {
         // check dom last since we will most likely fail on name
         var booleanAttr = BOOLEAN_ATTR[name.toLowerCase()];
 
         // booleanAttr is here twice to minimize DOM access
-        return booleanAttr && BOOLEAN_ELEMENTS[element.nodeName] && booleanAttr;
+        return booleanAttr && BOOLEAN_ELEMENTS[nodeName_(element)] && booleanAttr;
+    }
+
+    function getAliasedAttrName(name) {
+        return ALIASED_ATTR[name];
     }
 
+    forEach({
+        data: jqLiteData,
+        removeData: jqLiteRemoveData,
+        hasData: jqLiteHasData,
+        cleanData: function jqLiteCleanData(nodes) {
+            for (var i = 0, ii = nodes.length; i < ii; i++) {
+                jqLiteRemoveData(nodes[i]);
+            }
+        }
+    }, function(fn, name) {
+        JQLite[name] = fn;
+    });
+
     forEach({
         data: jqLiteData,
         inheritedData: jqLiteInheritedData,
 
         scope: function(element) {
             // Can't use jqLiteData here directly so we stay compatible with jQuery!
-            return jqLite(element).data('$scope') || jqLiteInheritedData(element.parentNode || element, ['$isolateScope', '$scope']);
+            return jqLite.data(element, '$scope') || jqLiteInheritedData(element.parentNode || element, ['$isolateScope', '$scope']);
         },
 
         isolateScope: function(element) {
             // Can't use jqLiteData here directly so we stay compatible with jQuery!
-            return jqLite(element).data('$isolateScope') || jqLite(element).data('$isolateScopeNoTemplate');
+            return jqLite.data(element, '$isolateScope') || jqLite.data(element, '$isolateScopeNoTemplate');
         },
 
         controller: jqLiteController,
@@ -2578,61 +3590,50 @@
             return jqLiteInheritedData(element, '$injector');
         },
 
-        removeAttr: function(element,name) {
+        removeAttr: function(element, name) {
             element.removeAttribute(name);
         },
 
         hasClass: jqLiteHasClass,
 
         css: function(element, name, value) {
-            name = camelCase(name);
+            name = cssKebabToCamel(name);
 
             if (isDefined(value)) {
                 element.style[name] = value;
             } else {
-                var val;
+                return element.style[name];
+            }
+        },
 
-                if (msie <= 8) {
-                    // this is some IE specific weirdness that jQuery 1.6.4 does not sure why
-                    val = element.currentStyle && element.currentStyle[name];
-                    if (val === '') val = 'auto';
-                }
+        attr: function(element, name, value) {
+            var ret;
+            var nodeType = element.nodeType;
+            if (nodeType === NODE_TYPE_TEXT || nodeType === NODE_TYPE_ATTRIBUTE || nodeType === NODE_TYPE_COMMENT ||
+                !element.getAttribute) {
+                return;
+            }
 
-                val = val || element.style[name];
+            var lowercasedName = lowercase(name);
+            var isBooleanAttr = BOOLEAN_ATTR[lowercasedName];
+
+            if (isDefined(value)) {
+                // setter
 
-                if (msie <= 8) {
-                    // jquery weirdness :-/
-                    val = (val === '') ? undefined : val;
+                if (value === null || (value === false && isBooleanAttr)) {
+                    element.removeAttribute(name);
+                } else {
+                    element.setAttribute(name, isBooleanAttr ? lowercasedName : value);
                 }
+            } else {
+                // getter
 
-                return  val;
-            }
-        },
+                ret = element.getAttribute(name);
 
-        attr: function(element, name, value){
-            var lowercasedName = lowercase(name);
-            if (BOOLEAN_ATTR[lowercasedName]) {
-                if (isDefined(value)) {
-                    if (!!value) {
-                        element[name] = true;
-                        element.setAttribute(name, lowercasedName);
-                    } else {
-                        element[name] = false;
-                        element.removeAttribute(lowercasedName);
-                    }
-                } else {
-                    return (element[name] ||
-                    (element.attributes.getNamedItem(name)|| noop).specified)
-                        ? lowercasedName
-                        : undefined;
-                }
-            } else if (isDefined(value)) {
-                element.setAttribute(name, value);
-            } else if (element.getAttribute) {
-                // the extra argument "2" is to get the right thing for a.href in IE, see jQuery code
-                // some elements (e.g. Document) don't have get attribute, so return undefined
-                var ret = element.getAttribute(name, 2);
-                // normalize non-existing attributes to undefined (as jQuery)
+                if (isBooleanAttr && ret !== null) {
+                    ret = lowercasedName;
+                }
+                // Normalize non-existing attributes to undefined (as jQuery).
                 return ret === null ? undefined : ret;
             }
         },
@@ -2646,36 +3647,28 @@
         },
 
         text: (function() {
-            var NODE_TYPE_TEXT_PROPERTY = [];
-            if (msie < 9) {
-                NODE_TYPE_TEXT_PROPERTY[1] = 'innerText';    /** Element **/
-                NODE_TYPE_TEXT_PROPERTY[3] = 'nodeValue';    /** Text **/
-            } else {
-                NODE_TYPE_TEXT_PROPERTY[1] =                 /** Element **/
-                    NODE_TYPE_TEXT_PROPERTY[3] = 'textContent';  /** Text **/
-            }
             getText.$dv = '';
             return getText;
 
             function getText(element, value) {
-                var textProp = NODE_TYPE_TEXT_PROPERTY[element.nodeType];
                 if (isUndefined(value)) {
-                    return textProp ? element[textProp] : '';
+                    var nodeType = element.nodeType;
+                    return (nodeType === NODE_TYPE_ELEMENT || nodeType === NODE_TYPE_TEXT) ? element.textContent : '';
                 }
-                element[textProp] = value;
+                element.textContent = value;
             }
         })(),
 
         val: function(element, value) {
             if (isUndefined(value)) {
-                if (nodeName_(element) === 'SELECT' && element.multiple) {
+                if (element.multiple && nodeName_(element) === 'select') {
                     var result = [];
-                    forEach(element.options, function (option) {
+                    forEach(element.options, function(option) {
                         if (option.selected) {
                             result.push(option.value || option.text);
                         }
                     });
-                    return result.length === 0 ? null : result;
+                    return result;
                 }
                 return element.value;
             }
@@ -2686,29 +3679,28 @@
             if (isUndefined(value)) {
                 return element.innerHTML;
             }
-            for (var i = 0, childNodes = element.childNodes; i < childNodes.length; i++) {
-                jqLiteDealoc(childNodes[i]);
-            }
+            jqLiteDealoc(element, true);
             element.innerHTML = value;
         },
 
         empty: jqLiteEmpty
-    }, function(fn, name){
+    }, function(fn, name) {
         /**
          * Properties: writes return selection, reads return first value
          */
         JQLite.prototype[name] = function(arg1, arg2) {
             var i, key;
+            var nodeCount = this.length;
 
             // jqLiteHasClass has only two arguments, but is a getter-only fn, so we need to special-case it
             // in a way that survives minification.
             // jqLiteEmpty takes no arguments but is a setter.
             if (fn !== jqLiteEmpty &&
-                (((fn.length == 2 && (fn !== jqLiteHasClass && fn !== jqLiteController)) ? arg1 : arg2) === undefined)) {
+                (isUndefined((fn.length === 2 && (fn !== jqLiteHasClass && fn !== jqLiteController)) ? arg1 : arg2))) {
                 if (isObject(arg1)) {
 
                     // we are a write, but the object properties are the key/values
-                    for (i = 0; i < this.length; i++) {
+                    for (i = 0; i < nodeCount; i++) {
                         if (fn === jqLiteData) {
                             // data() takes the whole object in jQuery
                             fn(this[i], arg1);
@@ -2722,9 +3714,10 @@
                     return this;
                 } else {
                     // we are a read, so read the first child.
+                    // TODO: do we still need this?
                     var value = fn.$dv;
                     // Only if we have $dv do we iterate over all, otherwise it is just the first element.
-                    var jj = (value === undefined) ? Math.min(this.length, 1) : this.length;
+                    var jj = (isUndefined(value)) ? Math.min(nodeCount, 1) : nodeCount;
                     for (var j = 0; j < jj; j++) {
                         var nodeValue = fn(this[j], arg1, arg2);
                         value = value ? value + nodeValue : nodeValue;
@@ -2733,7 +3726,7 @@
                 }
             } else {
                 // we are a write, so apply to all children
-                for (i = 0; i < this.length; i++) {
+                for (i = 0; i < nodeCount; i++) {
                     fn(this[i], arg1, arg2);
                 }
                 // return self for chaining
@@ -2743,61 +3736,73 @@
     });
 
     function createEventHandler(element, events) {
-        var eventHandler = function (event, type) {
-            if (!event.preventDefault) {
-                event.preventDefault = function() {
-                    event.returnValue = false; //ie
-                };
-            }
+        var eventHandler = function(event, type) {
+            // jQuery specific api
+            event.isDefaultPrevented = function() {
+                return event.defaultPrevented;
+            };
 
-            if (!event.stopPropagation) {
-                event.stopPropagation = function() {
-                    event.cancelBubble = true; //ie
-                };
-            }
+            var eventFns = events[type || event.type];
+            var eventFnsLength = eventFns ? eventFns.length : 0;
 
-            if (!event.target) {
-                event.target = event.srcElement || document;
-            }
+            if (!eventFnsLength) return;
+
+            if (isUndefined(event.immediatePropagationStopped)) {
+                var originalStopImmediatePropagation = event.stopImmediatePropagation;
+                event.stopImmediatePropagation = function() {
+                    event.immediatePropagationStopped = true;
 
-            if (isUndefined(event.defaultPrevented)) {
-                var prevent = event.preventDefault;
-                event.preventDefault = function() {
-                    event.defaultPrevented = true;
-                    prevent.call(event);
+                    if (event.stopPropagation) {
+                        event.stopPropagation();
+                    }
+
+                    if (originalStopImmediatePropagation) {
+                        originalStopImmediatePropagation.call(event);
+                    }
                 };
-                event.defaultPrevented = false;
             }
 
-            event.isDefaultPrevented = function() {
-                return event.defaultPrevented || event.returnValue === false;
+            event.isImmediatePropagationStopped = function() {
+                return event.immediatePropagationStopped === true;
             };
 
-            // Copy event handlers in case event handlers array is modified during execution.
-            var eventHandlersCopy = shallowCopy(events[type || event.type] || []);
+            // Some events have special handlers that wrap the real handler
+            var handlerWrapper = eventFns.specialHandlerWrapper || defaultHandlerWrapper;
 
-            forEach(eventHandlersCopy, function(fn) {
-                fn.call(element, event);
-            });
+            // Copy event handlers in case event handlers array is modified during execution.
+            if ((eventFnsLength > 1)) {
+                eventFns = shallowCopy(eventFns);
+            }
 
-            // Remove monkey-patched methods (IE),
-            // as they would cause memory leaks in IE8.
-            if (msie <= 8) {
-                // IE7/8 does not allow to delete property on native object
-                event.preventDefault = null;
-                event.stopPropagation = null;
-                event.isDefaultPrevented = null;
-            } else {
-                // It shouldn't affect normal browsers (native methods are defined on prototype).
-                delete event.preventDefault;
-                delete event.stopPropagation;
-                delete event.isDefaultPrevented;
+            for (var i = 0; i < eventFnsLength; i++) {
+                if (!event.isImmediatePropagationStopped()) {
+                    handlerWrapper(element, event, eventFns[i]);
+                }
             }
         };
+
+        // TODO: this is a hack for angularMocks/clearDataCache that makes it possible to deregister all
+        //       events on `element`
         eventHandler.elem = element;
         return eventHandler;
     }
 
+    function defaultHandlerWrapper(element, event, handler) {
+        handler.call(element, event);
+    }
+
+    function specialMouseHandlerWrapper(target, event, handler) {
+        // Refer to jQuery's implementation of mouseenter & mouseleave
+        // Read about mouseenter and mouseleave:
+        // http://www.quirksmode.org/js/events_mouse.html#link8
+        var related = event.relatedTarget;
+        // For mousenter/leave call the handler if related is outside the target.
+        // NB: No relatedTarget if the mouse left/entered the browser window
+        if (!related || (related !== target && !jqLiteContains.call(target, related))) {
+            handler.call(target, event);
+        }
+    }
+
 //////////////////////////////////////////
 // Functions iterating traversal.
 // These functions chain results into a single
@@ -2806,68 +3811,49 @@
     forEach({
         removeData: jqLiteRemoveData,
 
-        dealoc: jqLiteDealoc,
-
-        on: function onFn(element, type, fn, unsupported){
+        on: function jqLiteOn(element, type, fn, unsupported) {
             if (isDefined(unsupported)) throw jqLiteMinErr('onargs', 'jqLite#on() does not support the `selector` or `eventData` parameters');
 
-            var events = jqLiteExpandoStore(element, 'events'),
-                handle = jqLiteExpandoStore(element, 'handle');
+            // Do not add event handlers to non-elements because they will not be cleaned up.
+            if (!jqLiteAcceptsData(element)) {
+                return;
+            }
+
+            var expandoStore = jqLiteExpandoStore(element, true);
+            var events = expandoStore.events;
+            var handle = expandoStore.handle;
 
-            if (!events) jqLiteExpandoStore(element, 'events', events = {});
-            if (!handle) jqLiteExpandoStore(element, 'handle', handle = createEventHandler(element, events));
+            if (!handle) {
+                handle = expandoStore.handle = createEventHandler(element, events);
+            }
+
+            // http://jsperf.com/string-indexof-vs-split
+            var types = type.indexOf(' ') >= 0 ? type.split(' ') : [type];
+            var i = types.length;
 
-            forEach(type.split(' '), function(type){
+            var addHandler = function(type, specialHandlerWrapper, noEventListener) {
                 var eventFns = events[type];
 
                 if (!eventFns) {
-                    if (type == 'mouseenter' || type == 'mouseleave') {
-                        var contains = document.body.contains || document.body.compareDocumentPosition ?
-                            function( a, b ) {
-                                // jshint bitwise: false
-                                var adown = a.nodeType === 9 ? a.documentElement : a,
-                                    bup = b && b.parentNode;
-                                return a === bup || !!( bup && bup.nodeType === 1 && (
-                                    adown.contains ?
-                                        adown.contains( bup ) :
-                                    a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-                                ));
-                            } :
-                            function( a, b ) {
-                                if ( b ) {
-                                    while ( (b = b.parentNode) ) {
-                                        if ( b === a ) {
-                                            return true;
-                                        }
-                                    }
-                                }
-                                return false;
-                            };
-
-                        events[type] = [];
+                    eventFns = events[type] = [];
+                    eventFns.specialHandlerWrapper = specialHandlerWrapper;
+                    if (type !== '$destroy' && !noEventListener) {
+                        element.addEventListener(type, handle);
+                    }
+                }
 
-                        // Refer to jQuery's implementation of mouseenter & mouseleave
-                        // Read about mouseenter and mouseleave:
-                        // http://www.quirksmode.org/js/events_mouse.html#link8
-                        var eventmap = { mouseleave : "mouseout", mouseenter : "mouseover"};
+                eventFns.push(fn);
+            };
 
-                        onFn(element, eventmap[type], function(event) {
-                            var target = this, related = event.relatedTarget;
-                            // For mousenter/leave call the handler if related is outside the target.
-                            // NB: No relatedTarget if the mouse left/entered the browser window
-                            if ( !related || (related !== target && !contains(target, related)) ){
-                                handle(event, type);
-                            }
-                        });
-
-                    } else {
-                        addEventListenerFn(element, type, handle);
-                        events[type] = [];
-                    }
-                    eventFns = events[type];
+            while (i--) {
+                type = types[i];
+                if (MOUSE_EVENT_MAP[type]) {
+                    addHandler(MOUSE_EVENT_MAP[type], specialMouseHandlerWrapper);
+                    addHandler(type, undefined, true);
+                } else {
+                    addHandler(type);
                 }
-                eventFns.push(fn);
-            });
+            }
         },
 
         off: jqLiteOff,
@@ -2888,7 +3874,7 @@
         replaceWith: function(element, replaceNode) {
             var index, parent = element.parentNode;
             jqLiteDealoc(element);
-            forEach(new JQLite(replaceNode), function(node){
+            forEach(new JQLite(replaceNode), function(node) {
                 if (index) {
                     parent.insertBefore(node, index.nextSibling);
                 } else {
@@ -2900,9 +3886,10 @@
 
         children: function(element) {
             var children = [];
-            forEach(element.childNodes, function(element){
-                if (element.nodeType === 1)
+            forEach(element.childNodes, function(element) {
+                if (element.nodeType === NODE_TYPE_ELEMENT) {
                     children.push(element);
+                }
             });
             return children;
         },
@@ -2912,43 +3899,48 @@
         },
 
         append: function(element, node) {
-            forEach(new JQLite(node), function(child){
-                if (element.nodeType === 1 || element.nodeType === 11) {
-                    element.appendChild(child);
-                }
-            });
+            var nodeType = element.nodeType;
+            if (nodeType !== NODE_TYPE_ELEMENT && nodeType !== NODE_TYPE_DOCUMENT_FRAGMENT) return;
+
+            node = new JQLite(node);
+
+            for (var i = 0, ii = node.length; i < ii; i++) {
+                var child = node[i];
+                element.appendChild(child);
+            }
         },
 
         prepend: function(element, node) {
-            if (element.nodeType === 1) {
+            if (element.nodeType === NODE_TYPE_ELEMENT) {
                 var index = element.firstChild;
-                forEach(new JQLite(node), function(child){
+                forEach(new JQLite(node), function(child) {
                     element.insertBefore(child, index);
                 });
             }
         },
 
         wrap: function(element, wrapNode) {
-            wrapNode = jqLite(wrapNode)[0];
-            var parent = element.parentNode;
-            if (parent) {
-                parent.replaceChild(wrapNode, element);
-            }
-            wrapNode.appendChild(element);
+            jqLiteWrapNode(element, jqLite(wrapNode).eq(0).clone()[0]);
         },
 
-        remove: function(element) {
-            jqLiteDealoc(element);
-            var parent = element.parentNode;
-            if (parent) parent.removeChild(element);
+        remove: jqLiteRemove,
+
+        detach: function(element) {
+            jqLiteRemove(element, true);
         },
 
         after: function(element, newElement) {
             var index = element, parent = element.parentNode;
-            forEach(new JQLite(newElement), function(node){
-                parent.insertBefore(node, index.nextSibling);
-                index = node;
-            });
+
+            if (parent) {
+                newElement = new JQLite(newElement);
+
+                for (var i = 0, ii = newElement.length; i < ii; i++) {
+                    var node = newElement[i];
+                    parent.insertBefore(node, index.nextSibling);
+                    index = node;
+                }
+            }
         },
 
         addClass: jqLiteAddClass,
@@ -2956,7 +3948,7 @@
 
         toggleClass: function(element, selector, condition) {
             if (selector) {
-                forEach(selector.split(' '), function(className){
+                forEach(selector.split(' '), function(className) {
                     var classCondition = condition;
                     if (isUndefined(classCondition)) {
                         classCondition = !jqLiteHasClass(element, className);
@@ -2968,20 +3960,11 @@
 
         parent: function(element) {
             var parent = element.parentNode;
-            return parent && parent.nodeType !== 11 ? parent : null;
+            return parent && parent.nodeType !== NODE_TYPE_DOCUMENT_FRAGMENT ? parent : null;
         },
 
         next: function(element) {
-            if (element.nextElementSibling) {
-                return element.nextElementSibling;
-            }
-
-            // IE8 doesn't have nextElementSibling
-            var elm = element.nextSibling;
-            while (elm != null && elm.nodeType !== 1) {
-                elm = elm.nextSibling;
-            }
-            return elm;
+            return element.nextElementSibling;
         },
 
         find: function(element, selector) {
@@ -2994,27 +3977,50 @@
 
         clone: jqLiteClone,
 
-        triggerHandler: function(element, eventName, eventData) {
-            var eventFns = (jqLiteExpandoStore(element, 'events') || {})[eventName];
+        triggerHandler: function(element, event, extraParameters) {
+
+            var dummyEvent, eventFnsCopy, handlerArgs;
+            var eventName = event.type || event;
+            var expandoStore = jqLiteExpandoStore(element);
+            var events = expandoStore && expandoStore.events;
+            var eventFns = events && events[eventName];
+
+            if (eventFns) {
+                // Create a dummy event to pass to the handlers
+                dummyEvent = {
+                    preventDefault: function() { this.defaultPrevented = true; },
+                    isDefaultPrevented: function() { return this.defaultPrevented === true; },
+                    stopImmediatePropagation: function() { this.immediatePropagationStopped = true; },
+                    isImmediatePropagationStopped: function() { return this.immediatePropagationStopped === true; },
+                    stopPropagation: noop,
+                    type: eventName,
+                    target: element
+                };
 
-            eventData = eventData || [];
+                // If a custom event was provided then extend our dummy event with it
+                if (event.type) {
+                    dummyEvent = extend(dummyEvent, event);
+                }
 
-            var event = [{
-                preventDefault: noop,
-                stopPropagation: noop
-            }];
+                // Copy event handlers in case event handlers array is modified during execution.
+                eventFnsCopy = shallowCopy(eventFns);
+                handlerArgs = extraParameters ? [dummyEvent].concat(extraParameters) : [dummyEvent];
 
-            forEach(eventFns, function(fn) {
-                fn.apply(element, event.concat(eventData));
-            });
+                forEach(eventFnsCopy, function(fn) {
+                    if (!dummyEvent.isImmediatePropagationStopped()) {
+                        fn.apply(element, handlerArgs);
+                    }
+                });
+            }
         }
-    }, function(fn, name){
+    }, function(fn, name) {
         /**
          * chaining functions
          */
         JQLite.prototype[name] = function(arg1, arg2, arg3) {
             var value;
-            for(var i=0; i < this.length; i++) {
+
+            for (var i = 0, ii = this.length; i < ii; i++) {
                 if (isUndefined(value)) {
                     value = fn(this[i], arg1, arg2, arg3);
                     if (isDefined(value)) {
@@ -3027,12 +4033,34 @@
             }
             return isDefined(value) ? value : this;
         };
-
-        // bind legacy bind/unbind to on/off
-        JQLite.prototype.bind = JQLite.prototype.on;
-        JQLite.prototype.unbind = JQLite.prototype.off;
     });
 
+// bind legacy bind/unbind to on/off
+    JQLite.prototype.bind = JQLite.prototype.on;
+    JQLite.prototype.unbind = JQLite.prototype.off;
+
+
+// Provider for private $$jqLite service
+    /** @this */
+    function $$jqLiteProvider() {
+        this.$get = function $$jqLite() {
+            return extend(JQLite, {
+                hasClass: function(node, classes) {
+                    if (node.attr) node = node[0];
+                    return jqLiteHasClass(node, classes);
+                },
+                addClass: function(node, classes) {
+                    if (node.attr) node = node[0];
+                    return jqLiteAddClass(node, classes);
+                },
+                removeClass: function(node, classes) {
+                    if (node.attr) node = node[0];
+                    return jqLiteRemoveClass(node, classes);
+                }
+            });
+        };
+    }
+
     /**
      * Computes a hash of an 'obj'.
      * Hash of a:
@@ -3045,73 +4073,108 @@
      * @returns {string} hash string such that the same input will have the same hash string.
      *         The resulting string key is in 'type:hashKey' format.
      */
-    function hashKey(obj) {
-        var objType = typeof obj,
-            key;
+    function hashKey(obj, nextUidFn) {
+        var key = obj && obj.$$hashKey;
 
-        if (objType == 'object' && obj !== null) {
-            if (typeof (key = obj.$$hashKey) == 'function') {
-                // must invoke on object to keep the right this
+        if (key) {
+            if (typeof key === 'function') {
                 key = obj.$$hashKey();
-            } else if (key === undefined) {
-                key = obj.$$hashKey = nextUid();
             }
+            return key;
+        }
+
+        var objType = typeof obj;
+        if (objType === 'function' || (objType === 'object' && obj !== null)) {
+            key = obj.$$hashKey = objType + ':' + (nextUidFn || nextUid)();
         } else {
-            key = obj;
+            key = objType + ':' + obj;
         }
 
-        return objType + ':' + key;
+        return key;
     }
 
-    /**
-     * HashMap which can use objects as keys
-     */
-    function HashMap(array){
-        forEach(array, this.put, this);
+// A minimal ES2015 Map implementation.
+// Should be bug/feature equivalent to the native implementations of supported browsers
+// (for the features required in Angular).
+// See https://kangax.github.io/compat-table/es6/#test-Map
+    var nanKey = Object.create(null);
+    function NgMapShim() {
+        this._keys = [];
+        this._values = [];
+        this._lastKey = NaN;
+        this._lastIndex = -1;
     }
-    HashMap.prototype = {
-        /**
-         * Store key value pair
-         * @param key key to store can be any type
-         * @param value value to store can be any type
-         */
-        put: function(key, value) {
-            this[hashKey(key)] = value;
+    NgMapShim.prototype = {
+        _idx: function(key) {
+            if (key === this._lastKey) {
+                return this._lastIndex;
+            }
+            this._lastKey = key;
+            this._lastIndex = this._keys.indexOf(key);
+            return this._lastIndex;
+        },
+        _transformKey: function(key) {
+            return isNumberNaN(key) ? nanKey : key;
         },
-
-        /**
-         * @param key
-         * @returns {Object} the value for the key
-         */
         get: function(key) {
-            return this[hashKey(key)];
+            key = this._transformKey(key);
+            var idx = this._idx(key);
+            if (idx !== -1) {
+                return this._values[idx];
+            }
         },
+        set: function(key, value) {
+            key = this._transformKey(key);
+            var idx = this._idx(key);
+            if (idx === -1) {
+                idx = this._lastIndex = this._keys.length;
+            }
+            this._keys[idx] = key;
+            this._values[idx] = value;
 
-        /**
-         * Remove the key/value pair
-         * @param key
-         */
-        remove: function(key) {
-            var value = this[key = hashKey(key)];
-            delete this[key];
-            return value;
+            // Support: IE11
+            // Do not `return this` to simulate the partial IE11 implementation
+        },
+        delete: function(key) {
+            key = this._transformKey(key);
+            var idx = this._idx(key);
+            if (idx === -1) {
+                return false;
+            }
+            this._keys.splice(idx, 1);
+            this._values.splice(idx, 1);
+            this._lastKey = NaN;
+            this._lastIndex = -1;
+            return true;
         }
     };
 
+// For now, always use `NgMapShim`, even if `window.Map` is available. Some native implementations
+// are still buggy (often in subtle ways) and can cause hard-to-debug failures. When native `Map`
+// implementations get more stable, we can reconsider switching to `window.Map` (when available).
+    var NgMap = NgMapShim;
+
+    var $$MapProvider = [/** @this */function() {
+        this.$get = [function() {
+            return NgMap;
+        }];
+    }];
+
     /**
      * @ngdoc function
      * @module ng
      * @name angular.injector
-     * @function
+     * @kind function
      *
      * @description
-     * Creates an injector function that can be used for retrieving services as well as for
+     * Creates an injector object that can be used for retrieving services as well as for
      * dependency injection (see {@link guide/di dependency injection}).
      *
-
      * @param {Array.<string|Function>} modules A list of module functions or their aliases. See
-     *        {@link angular.module}. The `ng` module must be explicitly added.
-     * @returns {function()} Injector function. See {@link auto.$injector $injector}.
+     *     {@link angular.module}. The `ng` module must be explicitly added.
+     * @param {boolean=} [strictDi=false] Whether the injector should be in strict mode, which
+     *     disallows argument name annotation inference.
+     * @returns {injector} Injector object. See {@link auto.$injector $injector}.
      *
      * @example
      * Typical usage
@@ -3121,15 +4184,15 @@
      *
      *   // use the injector to kick off your application
      *   // use the type inference to auto inject arguments, or use implicit injection
-     *   $injector.invoke(function($rootScope, $compile, $document){
- *     $compile($document)($rootScope);
- *     $rootScope.$digest();
- *   });
+     *   $injector.invoke(function($rootScope, $compile, $document) {
+     *     $compile($document)($rootScope);
+     *     $rootScope.$digest();
+     *   });
      * ```
      *
-     * Sometimes you want to get access to the injector of a currently running Angular app
-     * from outside Angular. Perhaps, you want to inject and compile some markup after the
-     * application has been bootstrapped. You can do this using extra `injector()` added
+     * Sometimes you want to get access to the injector of a currently running AngularJS app
+     * from outside AngularJS. Perhaps, you want to inject and compile some markup after the
+     * application has been bootstrapped. You can do this using the extra `injector()` added
      * to JQuery/jqLite elements. See {@link angular.element}.
      *
      * *This is fairly rare but could be the case if a third party library is injecting the
@@ -3144,9 +4207,9 @@
      * $(document.body).append($div);
      *
      * angular.element(document).injector().invoke(function($compile) {
- *   var scope = angular.element($div).scope();
- *   $compile($div)(scope);
- * });
+     *   var scope = angular.element($div).scope();
+     *   $compile($div)(scope);
+     * });
      * ```
      */
 
@@ -3154,30 +4217,58 @@
     /**
      * @ngdoc module
      * @name auto
+     * @installation
      * @description
      *
      * Implicit module which gets automatically added to each {@link auto.$injector $injector}.
      */
 
-    var FN_ARGS = /^function\s*[^\(]*\(\s*([^\)]*)\)/m;
+    var ARROW_ARG = /^([^(]+?)=>/;
+    var FN_ARGS = /^[^(]*\(\s*([^)]*)\)/m;
     var FN_ARG_SPLIT = /,/;
     var FN_ARG = /^\s*(_?)(\S+?)\1\s*$/;
     var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
     var $injectorMinErr = minErr('$injector');
-    function annotate(fn) {
+
+    function stringifyFn(fn) {
+        return Function.prototype.toString.call(fn);
+    }
+
+    function extractArgs(fn) {
+        var fnText = stringifyFn(fn).replace(STRIP_COMMENTS, ''),
+            args = fnText.match(ARROW_ARG) || fnText.match(FN_ARGS);
+        return args;
+    }
+
+    function anonFn(fn) {
+        // For anonymous functions, showing at the very least the function signature can help in
+        // debugging.
+        var args = extractArgs(fn);
+        if (args) {
+            return 'function(' + (args[1] || '').replace(/[\s\r\n]+/, ' ') + ')';
+        }
+        return 'fn';
+    }
+
+    function annotate(fn, strictDi, name) {
         var $inject,
-            fnText,
             argDecl,
             last;
 
-        if (typeof fn == 'function') {
+        if (typeof fn === 'function') {
             if (!($inject = fn.$inject)) {
                 $inject = [];
                 if (fn.length) {
-                    fnText = fn.toString().replace(STRIP_COMMENTS, '');
-                    argDecl = fnText.match(FN_ARGS);
-                    forEach(argDecl[1].split(FN_ARG_SPLIT), function(arg){
-                        arg.replace(FN_ARG, function(all, underscore, name){
+                    if (strictDi) {
+                        if (!isString(name) || !name) {
+                            name = fn.name || anonFn(fn);
+                        }
+                        throw $injectorMinErr('strictdi',
+                            '{0} is not using explicit annotation and cannot be invoked in strict mode', name);
+                    }
+                    argDecl = extractArgs(fn);
+                    forEach(argDecl[1].split(FN_ARG_SPLIT), function(arg) {
+                        arg.replace(FN_ARG, function(all, underscore, name) {
                             $inject.push(name);
                         });
                     });
@@ -3199,7 +4290,6 @@
     /**
      * @ngdoc service
      * @name $injector
-     * @function
      *
      * @description
      *
@@ -3212,12 +4302,12 @@
      * ```js
      *   var $injector = angular.injector();
      *   expect($injector.get('$injector')).toBe($injector);
-     *   expect($injector.invoke(function($injector){
- *     return $injector;
- *   }).toBe($injector);
+     *   expect($injector.invoke(function($injector) {
+     *     return $injector;
+     *   })).toBe($injector);
      * ```
      *
-     * # Injection Function Annotation
+     * ## Injection Function Annotation
      *
      * JavaScript does not have annotations, and annotations are needed for dependency injection. The
      * following are all valid ways of annotating function with injection arguments and are equivalent.
@@ -3235,19 +4325,43 @@
      *   $injector.invoke(['serviceA', function(serviceA){}]);
      * ```
      *
-     * ## Inference
+     * ### Inference
      *
      * In JavaScript calling `toString()` on a function returns the function definition. The definition
-     * can then be parsed and the function arguments can be extracted. *NOTE:* This does not work with
-     * minification, and obfuscation tools since these tools change the argument names.
+     * can then be parsed and the function arguments can be extracted. This method of discovering
+     * annotations is disallowed when the injector is in strict mode.
+     * *NOTE:* This does not work with minification, and obfuscation tools since these tools change the
+     * argument names.
      *
-     * ## `$inject` Annotation
-     * By adding a `$inject` property onto a function the injection parameters can be specified.
+     * ### `$inject` Annotation
+     * By adding an `$inject` property onto a function the injection parameters can be specified.
      *
-     * ## Inline
+     * ### Inline
      * As an array of injection names, where the last item in the array is the function to call.
      */
 
+    /**
+     * @ngdoc property
+     * @name $injector#modules
+     * @type {Object}
+     * @description
+     * A hash containing all the modules that have been loaded into the
+     * $injector.
+     *
+     * You can use this property to find out information about a module via the
+     * {@link angular.Module#info `myModule.info(...)`} method.
+     *
+     * For example:
+     *
+     * ```
+     * var info = $injector.modules['ngAnimate'].info();
+     * ```
+     *
+     * **Do not use this property to attempt to modify the modules after the application
+     * has been bootstrapped.**
+     */
+
+
     /**
      * @ngdoc method
      * @name $injector#get
@@ -3256,6 +4370,7 @@
      * Return an instance of the service.
      *
      * @param {string} name The name of the instance to retrieve.
+     * @param {string=} caller An optional string to provide the origin of the function call for error messages.
      * @return {*} The instance.
      */
 
@@ -3266,8 +4381,8 @@
      * @description
      * Invoke the method and supply the method arguments from the `$injector`.
      *
-     * @param {!Function} fn The function to invoke. Function parameters are injected according to the
-     *   {@link guide/di $inject Annotation} rules.
+     * @param {Function|Array.<string|Function>} fn The injectable function to invoke. Function parameters are
+     *   injected according to the {@link guide/di $inject Annotation} rules.
      * @param {Object=} self The `this` for the invoked method.
      * @param {Object=} locals Optional object. If preset then any argument names are read from this
      *                         object first, before the `$injector` is consulted.
@@ -3279,18 +4394,18 @@
      * @name $injector#has
      *
      * @description
-     * Allows the user to query if the particular service exist.
+     * Allows the user to query if the particular service exists.
      *
-     * @param {string} Name of the service to query.
-     * @returns {boolean} returns true if injector has given service.
+     * @param {string} name Name of the service to query.
+     * @returns {boolean} `true` if injector has given service.
      */
 
     /**
      * @ngdoc method
      * @name $injector#instantiate
      * @description
-     * Create a new instance of JS type. The method takes a constructor function invokes the new
-     * operator and supplies all of the arguments to the constructor function as specified by the
+     * Create a new instance of JS type. The method takes a constructor function, invokes the new
+     * operator, and supplies all of the arguments to the constructor function as specified by the
      * constructor annotation.
      *
      * @param {Function} Type Annotated constructor function.
@@ -3309,7 +4424,7 @@
      * function is invoked. There are three ways in which the function can be annotated with the needed
      * dependencies.
      *
-     * # Argument names
+     * #### Argument names
      *
      * The simplest form is to extract the dependencies from the arguments of the function. This is done
      * by converting the function into a string using `toString()` method and extracting the argument
@@ -3317,25 +4432,27 @@
      * ```js
      *   // Given
      *   function MyController($scope, $route) {
- *     // ...
- *   }
+     *     // ...
+     *   }
      *
      *   // Then
      *   expect(injector.annotate(MyController)).toEqual(['$scope', '$route']);
      * ```
      *
+     * You can disallow this method by using strict injection mode.
+     *
      * This method does not work with code minification / obfuscation. For this reason the following
      * annotation strategies are supported.
      *
-     * # The `$inject` property
+     * #### The `$inject` property
      *
      * If a function has an `$inject` property and its value is an array of strings, then the strings
      * represent names of services to be injected into the function.
      * ```js
      *   // Given
      *   var MyController = function(obfuscatedScope, obfuscatedRoute) {
- *     // ...
- *   }
+     *     // ...
+     *   }
      *   // Define function dependencies
      *   MyController['$inject'] = ['$scope', '$route'];
      *
@@ -3343,7 +4460,7 @@
      *   expect(injector.annotate(MyController)).toEqual(['$scope', '$route']);
      * ```
      *
-     * # The array notation
+     * #### The array notation
      *
      * It is often desirable to inline Injected functions and that's when setting the `$inject` property
      * is very inconvenient. In these situations using the array notation to specify the dependencies in
@@ -3352,20 +4469,20 @@
      * ```js
      *   // We wish to write this (not minification / obfuscation safe)
      *   injector.invoke(function($compile, $rootScope) {
- *     // ...
- *   });
+     *     // ...
+     *   });
      *
      *   // We are forced to write break inlining
      *   var tmpFn = function(obfuscatedCompile, obfuscatedRootScope) {
- *     // ...
- *   };
+     *     // ...
+     *   };
      *   tmpFn.$inject = ['$compile', '$rootScope'];
      *   injector.invoke(tmpFn);
      *
      *   // To better support inline function the inline annotation is supported
      *   injector.invoke(['$compile', '$rootScope', function(obfCompile, obfRootScope) {
- *     // ...
- *   }]);
+     *     // ...
+     *   }]);
      *
      *   // Therefore
      *   expect(injector.annotate(
@@ -3376,14 +4493,53 @@
      * @param {Function|Array.<string|Function>} fn Function for which dependent service names need to
      * be retrieved as described above.
      *
+     * @param {boolean=} [strictDi=false] Disallow argument name annotation inference.
+     *
      * @returns {Array.<string>} The names of the services which the function requires.
      */
-
-
+    /**
+     * @ngdoc method
+     * @name $injector#loadNewModules
+     *
+     * @description
+     *
+     * **This is a dangerous API, which you use at your own risk!**
+     *
+     * Add the specified modules to the current injector.
+     *
+     * This method will add each of the injectables to the injector and execute all of the config and run
+     * blocks for each module passed to the method.
+     *
+     * If a module has already been loaded into the injector then it will not be loaded again.
+     *
+     * * The application developer is responsible for loading the code containing the modules; and for
+     * ensuring that lazy scripts are not downloaded and executed more often that desired.
+     * * Previously compiled HTML will not be affected by newly loaded directives, filters and components.
+     * * Modules cannot be unloaded.
+     *
+     * You can use {@link $injector#modules `$injector.modules`} to check whether a module has been loaded
+     * into the injector, which may indicate whether the script has been executed already.
+     *
+     * @example
+     * Here is an example of loading a bundle of modules, with a utility method called `getScript`:
+     *
+     * ```javascript
+     * app.factory('loadModule', function($injector) {
+     *   return function loadModule(moduleName, bundleUrl) {
+     *     return getScript(bundleUrl).then(function() { $injector.loadNewModules([moduleName]); });
+     *   };
+     * })
+     * ```
+     *
+     * @param {Array<String|Function|Array>=} mods an array of modules to load into the application.
+     *     Each item in the array should be the name of a predefined module or a (DI annotated)
+     *     function that will be invoked by the injector as a `config` block.
+     *     See: {@link angular.module modules}
+     */
 
 
     /**
-     * @ngdoc object
+     * @ngdoc service
      * @name $provide
      *
      * @description
@@ -3392,7 +4548,7 @@
      * with the {@link auto.$injector $injector}. Many of these functions are also exposed on
      * {@link angular.Module}.
      *
-     * An Angular **service** is a singleton object created by a **service factory**.  These **service
+     * An AngularJS **service** is a singleton object created by a **service factory**.  These **service
      * factories** are functions which, in turn, are created by a **service provider**.
      * The **service providers** are constructor functions. When instantiated they must contain a
      * property called `$get`, which holds the **service factory** function.
@@ -3406,18 +4562,20 @@
      * these cases the {@link auto.$provide $provide} service has additional helper methods to register
      * services without specifying a provider.
      *
-     * * {@link auto.$provide#provider provider(provider)} - registers a **service provider** with the
+     * * {@link auto.$provide#provider provider(name, provider)} - registers a **service provider** with the
      *     {@link auto.$injector $injector}
-     * * {@link auto.$provide#constant constant(obj)} - registers a value/object that can be accessed by
+     * * {@link auto.$provide#constant constant(name, obj)} - registers a value/object that can be accessed by
      *     providers and services.
-     * * {@link auto.$provide#value value(obj)} - registers a value/object that can only be accessed by
+     * * {@link auto.$provide#value value(name, obj)} - registers a value/object that can only be accessed by
      *     services, not providers.
-     * * {@link auto.$provide#factory factory(fn)} - registers a service **factory function**, `fn`,
+     * * {@link auto.$provide#factory factory(name, fn)} - registers a service **factory function**
      *     that will be wrapped in a **service provider** object, whose `$get` property will contain the
      *     given factory function.
-     * * {@link auto.$provide#service service(class)} - registers a **constructor function**, `class`
+     * * {@link auto.$provide#service service(name, Fn)} - registers a **constructor function**
      *     that will be wrapped in a **service provider** object, whose `$get` property will instantiate
      *      a new object using the given constructor function.
+     * * {@link auto.$provide#decorator decorator(name, decorFn)} - registers a **decorator function** that
+     *      will be able to modify or replace the implementation of another service.
      *
      * See the individual methods for more information and examples.
      */
@@ -3442,6 +4600,9 @@
      * which lets you specify whether the {@link ng.$log $log} service will log debug messages to the
      * console or not.
      *
+     * It is possible to inject other providers into the provider function,
+     * but the injected provider must have been defined before the one that requires it.
+     *
      * @param {string} name The name of the instance. NOTE: the provider will be available under `name +
      'Provider'` key.
      * @param {(Object|function())} provider If the provider is:
@@ -3461,60 +4622,60 @@
      * ```js
      *  // Define the eventTracker provider
      *  function EventTrackerProvider() {
- *    var trackingUrl = '/track';
- *
- *    // A provider method for configuring where the tracked events should been saved
- *    this.setTrackingUrl = function(url) {
- *      trackingUrl = url;
- *    };
- *
- *    // The service factory function
- *    this.$get = ['$http', function($http) {
- *      var trackedEvents = {};
- *      return {
- *        // Call this to track an event
- *        event: function(event) {
- *          var count = trackedEvents[event] || 0;
- *          count += 1;
- *          trackedEvents[event] = count;
- *          return count;
- *        },
- *        // Call this to save the tracked events to the trackingUrl
- *        save: function() {
- *          $http.post(trackingUrl, trackedEvents);
- *        }
- *      };
- *    }];
- *  }
+     *    var trackingUrl = '/track';
+     *
+     *    // A provider method for configuring where the tracked events should been saved
+     *    this.setTrackingUrl = function(url) {
+     *      trackingUrl = url;
+     *    };
+     *
+     *    // The service factory function
+     *    this.$get = ['$http', function($http) {
+     *      var trackedEvents = {};
+     *      return {
+     *        // Call this to track an event
+     *        event: function(event) {
+     *          var count = trackedEvents[event] || 0;
+     *          count += 1;
+     *          trackedEvents[event] = count;
+     *          return count;
+     *        },
+     *        // Call this to save the tracked events to the trackingUrl
+     *        save: function() {
+     *          $http.post(trackingUrl, trackedEvents);
+     *        }
+     *      };
+     *    }];
+     *  }
      *
      *  describe('eventTracker', function() {
- *    var postSpy;
- *
- *    beforeEach(module(function($provide) {
- *      // Register the eventTracker provider
- *      $provide.provider('eventTracker', EventTrackerProvider);
- *    }));
- *
- *    beforeEach(module(function(eventTrackerProvider) {
- *      // Configure eventTracker provider
- *      eventTrackerProvider.setTrackingUrl('/custom-track');
- *    }));
- *
- *    it('tracks events', inject(function(eventTracker) {
- *      expect(eventTracker.event('login')).toEqual(1);
- *      expect(eventTracker.event('login')).toEqual(2);
- *    }));
- *
- *    it('saves to the tracking url', inject(function(eventTracker, $http) {
- *      postSpy = spyOn($http, 'post');
- *      eventTracker.event('login');
- *      eventTracker.save();
- *      expect(postSpy).toHaveBeenCalled();
- *      expect(postSpy.mostRecentCall.args[0]).not.toEqual('/track');
- *      expect(postSpy.mostRecentCall.args[0]).toEqual('/custom-track');
- *      expect(postSpy.mostRecentCall.args[1]).toEqual({ 'login': 1 });
- *    }));
- *  });
+     *    var postSpy;
+     *
+     *    beforeEach(module(function($provide) {
+     *      // Register the eventTracker provider
+     *      $provide.provider('eventTracker', EventTrackerProvider);
+     *    }));
+     *
+     *    beforeEach(module(function(eventTrackerProvider) {
+     *      // Configure eventTracker provider
+     *      eventTrackerProvider.setTrackingUrl('/custom-track');
+     *    }));
+     *
+     *    it('tracks events', inject(function(eventTracker) {
+     *      expect(eventTracker.event('login')).toEqual(1);
+     *      expect(eventTracker.event('login')).toEqual(2);
+     *    }));
+     *
+     *    it('saves to the tracking url', inject(function(eventTracker, $http) {
+     *      postSpy = spyOn($http, 'post');
+     *      eventTracker.event('login');
+     *      eventTracker.save();
+     *      expect(postSpy).toHaveBeenCalled();
+     *      expect(postSpy.mostRecentCall.args[0]).not.toEqual('/track');
+     *      expect(postSpy.mostRecentCall.args[0]).toEqual('/custom-track');
+     *      expect(postSpy.mostRecentCall.args[1]).toEqual({ 'login': 1 });
+     *    }));
+     *  });
      * ```
      */
 
@@ -3530,24 +4691,24 @@
      * configure your service in a provider.
      *
      * @param {string} name The name of the instance.
-     * @param {function()} $getFn The $getFn for the instance creation. Internally this is a short hand
-     *                            for `$provide.provider(name, {$get: $getFn})`.
+     * @param {Function|Array.<string|Function>} $getFn The injectable $getFn for the instance creation.
+     *                      Internally this is a short hand for `$provide.provider(name, {$get: $getFn})`.
      * @returns {Object} registered provider instance
      *
      * @example
      * Here is an example of registering a service
      * ```js
      *   $provide.factory('ping', ['$http', function($http) {
- *     return function ping() {
- *       return $http.send('/ping');
- *     };
- *   }]);
+     *     return function ping() {
+     *       return $http.send('/ping');
+     *     };
+     *   }]);
      * ```
      * You would then inject and use this service like this:
      * ```js
      *   someModule.controller('Ctrl', ['ping', function(ping) {
- *     ping();
- *   }]);
+     *     ping();
+     *   }]);
      * ```
      */
 
@@ -3559,14 +4720,27 @@
      *
      * Register a **service constructor**, which will be invoked with `new` to create the service
      * instance.
-     * This is short for registering a service where its provider's `$get` property is the service
-     * constructor function that will be used to instantiate the service instance.
+     * This is short for registering a service where its provider's `$get` property is a factory
+     * function that returns an instance instantiated by the injector from the service constructor
+     * function.
+     *
+     * Internally it looks a bit like this:
+     *
+     * ```
+     * {
+     *   $get: function() {
+     *     return $injector.instantiate(constructor);
+     *   }
+     * }
+     * ```
+     *
      *
      * You should use {@link auto.$provide#service $provide.service(class)} if you define your service
      * as a type/class.
      *
      * @param {string} name The name of the instance.
-     * @param {Function} constructor A class (constructor function) that will be instantiated.
+     * @param {Function|Array.<string|Function>} constructor An injectable class (constructor function)
+     *     that will be instantiated.
      * @returns {Object} registered provider instance
      *
      * @example
@@ -3574,21 +4748,21 @@
      * {@link auto.$provide#service $provide.service(class)}.
      * ```js
      *   var Ping = function($http) {
- *     this.$http = $http;
- *   };
+     *     this.$http = $http;
+     *   };
      *
      *   Ping.$inject = ['$http'];
      *
      *   Ping.prototype.send = function() {
- *     return this.$http.get('/ping');
- *   };
+     *     return this.$http.get('/ping');
+     *   };
      *   $provide.service('ping', Ping);
      * ```
      * You would then inject and use this service like this:
      * ```js
      *   someModule.controller('Ctrl', ['ping', function(ping) {
- *     ping.send();
- *   }]);
+     *     ping.send();
+     *   }]);
      * ```
      */
 
@@ -3599,14 +4773,13 @@
      * @description
      *
      * Register a **value service** with the {@link auto.$injector $injector}, such as a string, a
-     * number, an array, an object or a function.  This is short for registering a service where its
+     * number, an array, an object or a function. This is short for registering a service where its
      * provider's `$get` property is a factory function that takes no arguments and returns the **value
-     * service**.
+     * service**. That also means it is not possible to inject other services into a value service.
      *
      * Value services are similar to constant services, except that they cannot be injected into a
      * module configuration function (see {@link angular.Module#config}) but they can be overridden by
-     * an Angular
-     * {@link auto.$provide#decorator decorator}.
+     * an AngularJS {@link auto.$provide#decorator decorator}.
      *
      * @param {string} name The name of the instance.
      * @param {*} value The value.
@@ -3620,8 +4793,8 @@
      *   $provide.value('RoleLookup', { admin: 0, writer: 1, reader: 2 });
      *
      *   $provide.value('halfOf', function(value) {
- *     return value / 2;
- *   });
+     *     return value / 2;
+     *   });
      * ```
      */
 
@@ -3631,10 +4804,13 @@
      * @name $provide#constant
      * @description
      *
-     * Register a **constant service**, such as a string, a number, an array, an object or a function,
-     * with the {@link auto.$injector $injector}. Unlike {@link auto.$provide#value value} it can be
+     * Register a **constant service** with the {@link auto.$injector $injector}, such as a string,
+     * a number, an array, an object or a function. Like the {@link auto.$provide#value value}, it is not
+     * possible to inject other services into a constant.
+     *
+     * But unlike {@link auto.$provide#value value}, a constant can be
      * injected into a module configuration function (see {@link angular.Module#config}) and it cannot
-     * be overridden by an Angular {@link auto.$provide#decorator decorator}.
+     * be overridden by an AngularJS {@link auto.$provide#decorator decorator}.
      *
      * @param {string} name The name of the constant.
      * @param {*} value The constant value.
@@ -3648,8 +4824,8 @@
      *   $provide.constant('MY_COLOURS', ['red', 'blue', 'grey']);
      *
      *   $provide.constant('double', function(value) {
- *     return value * 2;
- *   });
+     *     return value * 2;
+     *   });
      * ```
      */
 
@@ -3659,18 +4835,20 @@
      * @name $provide#decorator
      * @description
      *
-     * Register a **service decorator** with the {@link auto.$injector $injector}. A service decorator
-     * intercepts the creation of a service, allowing it to override or modify the behaviour of the
-     * service. The object returned by the decorator may be the original service, or a new service
-     * object which replaces or wraps and delegates to the original service.
+     * Register a **decorator function** with the {@link auto.$injector $injector}. A decorator function
+     * intercepts the creation of a service, allowing it to override or modify the behavior of the
+     * service. The return value of the decorator function may be the original service, or a new service
+     * that replaces (or wraps and delegates to) the original service.
+     *
+     * You can find out more about using decorators in the {@link guide/decorators} guide.
      *
      * @param {string} name The name of the service to decorate.
-     * @param {function()} decorator This function will be invoked when the service needs to be
-     *    instantiated and should return the decorated service instance. The function is called using
+     * @param {Function|Array.<string|Function>} decorator This function will be invoked when the service needs to be
+     *    provided and should return the decorated service instance. The function is called using
      *    the {@link auto.$injector#invoke injector.invoke} method and is therefore fully injectable.
      *    Local injection arguments:
      *
-     *    * `$delegate` - The original service instance, which can be monkey patched, configured,
+     *    * `$delegate` - The original service instance, which can be replaced, monkey patched, configured,
      *      decorated or delegated to.
      *
      * @example
@@ -3678,18 +4856,19 @@
      * calls to {@link ng.$log#error $log.warn()}.
      * ```js
      *   $provide.decorator('$log', ['$delegate', function($delegate) {
- *     $delegate.warn = $delegate.error;
- *     return $delegate;
- *   }]);
+     *     $delegate.warn = $delegate.error;
+     *     return $delegate;
+     *   }]);
      * ```
      */
 
 
-    function createInjector(modulesToLoad) {
+    function createInjector(modulesToLoad, strictDi) {
+        strictDi = (strictDi === true);
         var INSTANTIATING = {},
             providerSuffix = 'Provider',
             path = [],
-            loadedModules = new HashMap(),
+            loadedModules = new NgMap(),
             providerCache = {
                 $provide: {
                     provider: supportObject(provider),
@@ -3701,18 +4880,32 @@
                 }
             },
             providerInjector = (providerCache.$injector =
-                createInternalInjector(providerCache, function() {
-                    throw $injectorMinErr('unpr', "Unknown provider: {0}", path.join(' <- '));
+                createInternalInjector(providerCache, function(serviceName, caller) {
+                    if (angular.isString(caller)) {
+                        path.push(caller);
+                    }
+                    throw $injectorMinErr('unpr', 'Unknown provider: {0}', path.join(' <- '));
                 })),
             instanceCache = {},
-            instanceInjector = (instanceCache.$injector =
-                createInternalInjector(instanceCache, function(servicename) {
-                    var provider = providerInjector.get(servicename + providerSuffix);
-                    return instanceInjector.invoke(provider.$get, provider);
-                }));
+            protoInstanceInjector =
+                createInternalInjector(instanceCache, function(serviceName, caller) {
+                    var provider = providerInjector.get(serviceName + providerSuffix, caller);
+                    return instanceInjector.invoke(
+                        provider.$get, provider, undefined, serviceName);
+                }),
+            instanceInjector = protoInstanceInjector;
+
+        providerCache['$injector' + providerSuffix] = { $get: valueFn(protoInstanceInjector) };
+        instanceInjector.modules = providerInjector.modules = createMap();
+        var runBlocks = loadModules(modulesToLoad);
+        instanceInjector = protoInstanceInjector.get('$injector');
+        instanceInjector.strictDi = strictDi;
+        forEach(runBlocks, function(fn) { if (fn) instanceInjector.invoke(fn); });
 
+        instanceInjector.loadNewModules = function(mods) {
+            forEach(loadModules(mods), function(fn) { if (fn) instanceInjector.invoke(fn); });
+        };
 
-        forEach(loadModules(modulesToLoad), function(fn) { instanceInjector.invoke(fn || noop); });
 
         return instanceInjector;
 
@@ -3736,12 +4929,26 @@
                 provider_ = providerInjector.instantiate(provider_);
             }
             if (!provider_.$get) {
-                throw $injectorMinErr('pget', "Provider '{0}' must define $get factory method.", name);
+                throw $injectorMinErr('pget', 'Provider \'{0}\' must define $get factory method.', name);
             }
-            return providerCache[name + providerSuffix] = provider_;
+            return (providerCache[name + providerSuffix] = provider_);
+        }
+
+        function enforceReturnValue(name, factory) {
+            return /** @this */ function enforcedReturnValue() {
+                var result = instanceInjector.invoke(factory, this);
+                if (isUndefined(result)) {
+                    throw $injectorMinErr('undef', 'Provider \'{0}\' must return a value from $get factory method.', name);
+                }
+                return result;
+            };
         }
 
-        function factory(name, factoryFn) { return provider(name, { $get: factoryFn }); }
+        function factory(name, factoryFn, enforce) {
+            return provider(name, {
+                $get: enforce !== false ? enforceReturnValue(name, factoryFn) : factoryFn
+            });
+        }
 
         function service(name, constructor) {
             return factory(name, ['$injector', function($injector) {
@@ -3749,7 +4956,7 @@
             }]);
         }
 
-        function value(name, val) { return factory(name, valueFn(val)); }
+        function value(name, val) { return factory(name, valueFn(val), false); }
 
         function constant(name, value) {
             assertNotHasOwnProperty(name, 'constant');
@@ -3770,23 +4977,30 @@
         ////////////////////////////////////
         // Module Loading
         ////////////////////////////////////
-        function loadModules(modulesToLoad){
-            var runBlocks = [], moduleFn, invokeQueue, i, ii;
+        function loadModules(modulesToLoad) {
+            assertArg(isUndefined(modulesToLoad) || isArray(modulesToLoad), 'modulesToLoad', 'not an array');
+            var runBlocks = [], moduleFn;
             forEach(modulesToLoad, function(module) {
                 if (loadedModules.get(module)) return;
-                loadedModules.put(module, true);
+                loadedModules.set(module, true);
+
+                function runInvokeQueue(queue) {
+                    var i, ii;
+                    for (i = 0, ii = queue.length; i < ii; i++) {
+                        var invokeArgs = queue[i],
+                            provider = providerInjector.get(invokeArgs[0]);
+
+                        provider[invokeArgs[1]].apply(provider, invokeArgs[2]);
+                    }
+                }
 
                 try {
                     if (isString(module)) {
                         moduleFn = angularModule(module);
+                        instanceInjector.modules[module] = moduleFn;
                         runBlocks = runBlocks.concat(loadModules(moduleFn.requires)).concat(moduleFn._runBlocks);
-
-                        for(invokeQueue = moduleFn._invokeQueue, i = 0, ii = invokeQueue.length; i < ii; i++) {
-                            var invokeArgs = invokeQueue[i],
-                                provider = providerInjector.get(invokeArgs[0]);
-
-                            provider[invokeArgs[1]].apply(provider, invokeArgs[2]);
-                        }
+                        runInvokeQueue(moduleFn._invokeQueue);
+                        runInvokeQueue(moduleFn._configBlocks);
                     } else if (isFunction(module)) {
                         runBlocks.push(providerInjector.invoke(module));
                     } else if (isArray(module)) {
@@ -3798,15 +5012,15 @@
                     if (isArray(module)) {
                         module = module[module.length - 1];
                     }
-                    if (e.message && e.stack && e.stack.indexOf(e.message) == -1) {
+                    if (e.message && e.stack && e.stack.indexOf(e.message) === -1) {
                         // Safari & FF's stack traces don't contain error.message content
                         // unlike those of Chrome and IE
                         // So if stack doesn't contain message, we create a new string that contains both.
                         // Since error.stack is read-only in Safari, I'm overriding e and not e.stack here.
-                        /* jshint -W022 */
+                        // eslint-disable-next-line no-ex-assign
                         e = e.message + '\n' + e.stack;
                     }
-                    throw $injectorMinErr('modulerr', "Failed to instantiate module {0} due to:\n{1}",
+                    throw $injectorMinErr('modulerr', 'Failed to instantiate module {0} due to:\n{1}',
                         module, e.stack || e.message || e);
                 }
             });
@@ -3819,17 +5033,19 @@
 
         function createInternalInjector(cache, factory) {
 
-            function getService(serviceName) {
+            function getService(serviceName, caller) {
                 if (cache.hasOwnProperty(serviceName)) {
                     if (cache[serviceName] === INSTANTIATING) {
-                        throw $injectorMinErr('cdep', 'Circular dependency found: {0}', path.join(' <- '));
+                        throw $injectorMinErr('cdep', 'Circular dependency found: {0}',
+                            serviceName + ' <- ' + path.join(' <- '));
                     }
                     return cache[serviceName];
                 } else {
                     try {
                         path.unshift(serviceName);
                         cache[serviceName] = INSTANTIATING;
-                        return cache[serviceName] = factory(serviceName);
+                        cache[serviceName] = factory(serviceName, caller);
+                        return cache[serviceName];
                     } catch (err) {
                         if (cache[serviceName] === INSTANTIATING) {
                             delete cache[serviceName];
@@ -3841,52 +5057,76 @@
                 }
             }
 
-            function invoke(fn, self, locals){
+
+            function injectionArgs(fn, locals, serviceName) {
                 var args = [],
-                    $inject = annotate(fn),
-                    length, i,
-                    key;
+                    $inject = createInjector.$$annotate(fn, strictDi, serviceName);
 
-                for(i = 0, length = $inject.length; i < length; i++) {
-                    key = $inject[i];
+                for (var i = 0, length = $inject.length; i < length; i++) {
+                    var key = $inject[i];
                     if (typeof key !== 'string') {
                         throw $injectorMinErr('itkn',
                             'Incorrect injection token! Expected service name as string, got {0}', key);
                     }
-                    args.push(
-                        locals && locals.hasOwnProperty(key)
-                            ? locals[key]
-                            : getService(key)
-                    );
+                    args.push(locals && locals.hasOwnProperty(key) ? locals[key] :
+                        getService(key, serviceName));
+                }
+                return args;
+            }
+
+            function isClass(func) {
+                // Support: IE 9-11 only
+                // IE 9-11 do not support classes and IE9 leaks with the code below.
+                if (msie || typeof func !== 'function') {
+                    return false;
+                }
+                var result = func.$$ngIsClass;
+                if (!isBoolean(result)) {
+                    // Support: Edge 12-13 only
+                    // See: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/6156135/
+                    result = func.$$ngIsClass = /^(?:class\b|constructor\()/.test(stringifyFn(func));
                 }
-                if (!fn.$inject) {
-                    // this means that we must be an array.
-                    fn = fn[length];
+                return result;
+            }
+
+            function invoke(fn, self, locals, serviceName) {
+                if (typeof locals === 'string') {
+                    serviceName = locals;
+                    locals = null;
+                }
+
+                var args = injectionArgs(fn, locals, serviceName);
+                if (isArray(fn)) {
+                    fn = fn[fn.length - 1];
                 }
 
-                // http://jsperf.com/angularjs-invoke-apply-vs-switch
-                // #5388
-                return fn.apply(self, args);
+                if (!isClass(fn)) {
+                    // http://jsperf.com/angularjs-invoke-apply-vs-switch
+                    // #5388
+                    return fn.apply(self, args);
+                } else {
+                    args.unshift(null);
+                    return new (Function.prototype.bind.apply(fn, args))();
+                }
             }
 
-            function instantiate(Type, locals) {
-                var Constructor = function() {},
-                    instance, returnedValue;
 
+            function instantiate(Type, locals, serviceName) {
                 // Check if Type is annotated and use just the given function at n-1 as parameter
                 // e.g. someModule.factory('greeter', ['$window', function(renamed$window) {}]);
-                Constructor.prototype = (isArray(Type) ? Type[Type.length - 1] : Type).prototype;
-                instance = new Constructor();
-                returnedValue = invoke(Type, instance, locals);
-
-                return isObject(returnedValue) || isFunction(returnedValue) ? returnedValue : instance;
+                var ctor = (isArray(Type) ? Type[Type.length - 1] : Type);
+                var args = injectionArgs(Type, locals, serviceName);
+                // Empty object at position 0 is ignored for invocation with `new`, but required.
+                args.unshift(null);
+                return new (Function.prototype.bind.apply(ctor, args))();
             }
 
+
             return {
                 invoke: invoke,
                 instantiate: instantiate,
                 get: getService,
-                annotate: annotate,
+                annotate: createInjector.$$annotate,
                 has: function(name) {
                     return providerCache.hasOwnProperty(name + providerSuffix) || cache.hasOwnProperty(name);
                 }
@@ -3894,108 +5134,445 @@
         }
     }
 
+    createInjector.$$annotate = annotate;
+
     /**
-     * @ngdoc service
-     * @name $anchorScroll
-     * @kind function
-     * @requires $window
-     * @requires $location
-     * @requires $rootScope
+     * @ngdoc provider
+     * @name $anchorScrollProvider
+     * @this
      *
      * @description
-     * When called, it checks current value of `$location.hash()` and scroll to related element,
-     * according to rules specified in
-     * [Html5 spec](http://dev.w3.org/html5/spec/Overview.html#the-indicated-part-of-the-document).
-     *
-     * It also watches the `$location.hash()` and scrolls whenever it changes to match any anchor.
-     * This can be disabled by calling `$anchorScrollProvider.disableAutoScrolling()`.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <div id="scrollArea" ng-controller="ScrollCtrl">
-     <a ng-click="gotoBottom()">Go to bottom</a>
-     <a id="bottom"></a> You're at the bottom!
-     </div>
-     </file>
-     <file name="script.js">
-     function ScrollCtrl($scope, $location, $anchorScroll) {
-         $scope.gotoBottom = function (){
-           // set the location.hash to the id of
-           // the element you wish to scroll to.
-           $location.hash('bottom');
-
-           // call $anchorScroll()
-           $anchorScroll();
-         };
-       }
-     </file>
-     <file name="style.css">
-     #scrollArea {
-         height: 350px;
-         overflow: auto;
-       }
-
-     #bottom {
-         display: block;
-         margin-top: 2000px;
-       }
-     </file>
-     </example>
+     * Use `$anchorScrollProvider` to disable automatic scrolling whenever
+     * {@link ng.$location#hash $location.hash()} changes.
      */
     function $AnchorScrollProvider() {
 
         var autoScrollingEnabled = true;
 
+        /**
+         * @ngdoc method
+         * @name $anchorScrollProvider#disableAutoScrolling
+         *
+         * @description
+         * By default, {@link ng.$anchorScroll $anchorScroll()} will automatically detect changes to
+         * {@link ng.$location#hash $location.hash()} and scroll to the element matching the new hash.<br />
+         * Use this method to disable automatic scrolling.
+         *
+         * If automatic scrolling is disabled, one must explicitly call
+         * {@link ng.$anchorScroll $anchorScroll()} in order to scroll to the element related to the
+         * current hash.
+         */
         this.disableAutoScrolling = function() {
             autoScrollingEnabled = false;
         };
 
+        /**
+         * @ngdoc service
+         * @name $anchorScroll
+         * @kind function
+         * @requires $window
+         * @requires $location
+         * @requires $rootScope
+         *
+         * @description
+         * When called, it scrolls to the element related to the specified `hash` or (if omitted) to the
+         * current value of {@link ng.$location#hash $location.hash()}, according to the rules specified
+         * in the
+         * [HTML5 spec](http://www.w3.org/html/wg/drafts/html/master/browsers.html#an-indicated-part-of-the-document).
+         *
+         * It also watches the {@link ng.$location#hash $location.hash()} and automatically scrolls to
+         * match any anchor whenever it changes. This can be disabled by calling
+         * {@link ng.$anchorScrollProvider#disableAutoScrolling $anchorScrollProvider.disableAutoScrolling()}.
+         *
+         * Additionally, you can use its {@link ng.$anchorScroll#yOffset yOffset} property to specify a
+         * vertical scroll-offset (either fixed or dynamic).
+         *
+         * @param {string=} hash The hash specifying the element to scroll to. If omitted, the value of
+         *                       {@link ng.$location#hash $location.hash()} will be used.
+         *
+         * @property {(number|function|jqLite)} yOffset
+         * If set, specifies a vertical scroll-offset. This is often useful when there are fixed
+         * positioned elements at the top of the page, such as navbars, headers etc.
+         *
+         * `yOffset` can be specified in various ways:
+         * - **number**: A fixed number of pixels to be used as offset.<br /><br />
+         * - **function**: A getter function called everytime `$anchorScroll()` is executed. Must return
+         *   a number representing the offset (in pixels).<br /><br />
+         * - **jqLite**: A jqLite/jQuery element to be used for specifying the offset. The distance from
+         *   the top of the page to the element's bottom will be used as offset.<br />
+         *   **Note**: The element will be taken into account only as long as its `position` is set to
+         *   `fixed`. This option is useful, when dealing with responsive navbars/headers that adjust
+         *   their height and/or positioning according to the viewport's size.
+         *
+         * <br />
+         * <div class="alert alert-warning">
+         * In order for `yOffset` to work properly, scrolling should take place on the document's root and
+         * not some child element.
+         * </div>
+         *
+         * @example
+         <example module="anchorScrollExample" name="anchor-scroll">
+         <file name="index.html">
+         <div id="scrollArea" ng-controller="ScrollController">
+         <a ng-click="gotoBottom()">Go to bottom</a>
+         <a id="bottom"></a> You're at the bottom!
+         </div>
+         </file>
+         <file name="script.js">
+         angular.module('anchorScrollExample', [])
+         .controller('ScrollController', ['$scope', '$location', '$anchorScroll',
+         function($scope, $location, $anchorScroll) {
+               $scope.gotoBottom = function() {
+                 // set the location.hash to the id of
+                 // the element you wish to scroll to.
+                 $location.hash('bottom');
+
+                 // call $anchorScroll()
+                 $anchorScroll();
+               };
+             }]);
+         </file>
+         <file name="style.css">
+         #scrollArea {
+           height: 280px;
+           overflow: auto;
+         }
+
+         #bottom {
+           display: block;
+           margin-top: 2000px;
+         }
+         </file>
+         </example>
+         *
+         * <hr />
+         * The example below illustrates the use of a vertical scroll-offset (specified as a fixed value).
+         * See {@link ng.$anchorScroll#yOffset $anchorScroll.yOffset} for more details.
+         *
+         * @example
+         <example module="anchorScrollOffsetExample" name="anchor-scroll-offset">
+         <file name="index.html">
+         <div class="fixed-header" ng-controller="headerCtrl">
+         <a href="" ng-click="gotoAnchor(x)" ng-repeat="x in [1,2,3,4,5]">
+         Go to anchor {{x}}
+         </a>
+         </div>
+         <div id="anchor{{x}}" class="anchor" ng-repeat="x in [1,2,3,4,5]">
+         Anchor {{x}} of 5
+         </div>
+         </file>
+         <file name="script.js">
+         angular.module('anchorScrollOffsetExample', [])
+         .run(['$anchorScroll', function($anchorScroll) {
+             $anchorScroll.yOffset = 50;   // always scroll by 50 extra pixels
+           }])
+         .controller('headerCtrl', ['$anchorScroll', '$location', '$scope',
+         function($anchorScroll, $location, $scope) {
+               $scope.gotoAnchor = function(x) {
+                 var newHash = 'anchor' + x;
+                 if ($location.hash() !== newHash) {
+                   // set the $location.hash to `newHash` and
+                   // $anchorScroll will automatically scroll to it
+                   $location.hash('anchor' + x);
+                 } else {
+                   // call $anchorScroll() explicitly,
+                   // since $location.hash hasn't changed
+                   $anchorScroll();
+                 }
+               };
+             }
+         ]);
+         </file>
+         <file name="style.css">
+         body {
+           padding-top: 50px;
+         }
+
+         .anchor {
+           border: 2px dashed DarkOrchid;
+           padding: 10px 10px 200px 10px;
+         }
+
+         .fixed-header {
+           background-color: rgba(0, 0, 0, 0.2);
+           height: 50px;
+           position: fixed;
+           top: 0; left: 0; right: 0;
+         }
+
+         .fixed-header > a {
+           display: inline-block;
+           margin: 5px 15px;
+         }
+         </file>
+         </example>
+         */
         this.$get = ['$window', '$location', '$rootScope', function($window, $location, $rootScope) {
             var document = $window.document;
 
-            // helper function to get first anchor from a NodeList
-            // can't use filter.filter, as it accepts only instances of Array
-            // and IE can't convert NodeList to an array using [].slice
-            // TODO(vojta): use filter if we change it to accept lists as well
+            // Helper function to get first anchor from a NodeList
+            // (using `Array#some()` instead of `angular#forEach()` since it's more performant
+            //  and working in all supported browsers.)
             function getFirstAnchor(list) {
                 var result = null;
-                forEach(list, function(element) {
-                    if (!result && lowercase(element.nodeName) === 'a') result = element;
+                Array.prototype.some.call(list, function(element) {
+                    if (nodeName_(element) === 'a') {
+                        result = element;
+                        return true;
+                    }
                 });
                 return result;
             }
 
-            function scroll() {
-                var hash = $location.hash(), elm;
-
-                // empty hash, scroll to the top of the page
-                if (!hash) $window.scrollTo(0, 0);
+            function getYOffset() {
 
-                // element with given id
-                else if ((elm = document.getElementById(hash))) elm.scrollIntoView();
+                var offset = scroll.yOffset;
 
-                // first anchor with given name :-D
-                else if ((elm = getFirstAnchor(document.getElementsByName(hash)))) elm.scrollIntoView();
+                if (isFunction(offset)) {
+                    offset = offset();
+                } else if (isElement(offset)) {
+                    var elem = offset[0];
+                    var style = $window.getComputedStyle(elem);
+                    if (style.position !== 'fixed') {
+                        offset = 0;
+                    } else {
+                        offset = elem.getBoundingClientRect().bottom;
+                    }
+                } else if (!isNumber(offset)) {
+                    offset = 0;
+                }
 
-                // no element and hash == 'top', scroll to the top of the page
-                else if (hash === 'top') $window.scrollTo(0, 0);
+                return offset;
             }
 
-            // does not scroll when user clicks on anchor link that is currently on
-            // (no url change, no $location.hash() change), browser native does scroll
-            if (autoScrollingEnabled) {
-                $rootScope.$watch(function autoScrollWatch() {return $location.hash();},
-                    function autoScrollWatchAction() {
-                        $rootScope.$evalAsync(scroll);
-                    });
-            }
+            function scrollTo(elem) {
+                if (elem) {
+                    elem.scrollIntoView();
 
-            return scroll;
+                    var offset = getYOffset();
+
+                    if (offset) {
+                        // `offset` is the number of pixels we should scroll UP in order to align `elem` properly.
+                        // This is true ONLY if the call to `elem.scrollIntoView()` initially aligns `elem` at the
+                        // top of the viewport.
+                        //
+                        // IF the number of pixels from the top of `elem` to the end of the page's content is less
+                        // than the height of the viewport, then `elem.scrollIntoView()` will align the `elem` some
+                        // way down the page.
+                        //
+                        // This is often the case for elements near the bottom of the page.
+                        //
+                        // In such cases we do not need to scroll the whole `offset` up, just the difference between
+                        // the top of the element and the offset, which is enough to align the top of `elem` at the
+                        // desired position.
+                        var elemTop = elem.getBoundingClientRect().top;
+                        $window.scrollBy(0, elemTop - offset);
+                    }
+                } else {
+                    $window.scrollTo(0, 0);
+                }
+            }
+
+            function scroll(hash) {
+                // Allow numeric hashes
+                hash = isString(hash) ? hash : isNumber(hash) ? hash.toString() : $location.hash();
+                var elm;
+
+                // empty hash, scroll to the top of the page
+                if (!hash) scrollTo(null);
+
+                // element with given id
+                else if ((elm = document.getElementById(hash))) scrollTo(elm);
+
+                // first anchor with given name :-D
+                else if ((elm = getFirstAnchor(document.getElementsByName(hash)))) scrollTo(elm);
+
+                // no element and hash === 'top', scroll to the top of the page
+                else if (hash === 'top') scrollTo(null);
+            }
+
+            // does not scroll when user clicks on anchor link that is currently on
+            // (no url change, no $location.hash() change), browser native does scroll
+            if (autoScrollingEnabled) {
+                $rootScope.$watch(function autoScrollWatch() {return $location.hash();},
+                    function autoScrollWatchAction(newVal, oldVal) {
+                        // skip the initial scroll if $location.hash is empty
+                        if (newVal === oldVal && newVal === '') return;
+
+                        jqLiteDocumentLoaded(function() {
+                            $rootScope.$evalAsync(scroll);
+                        });
+                    });
+            }
+
+            return scroll;
         }];
     }
 
     var $animateMinErr = minErr('$animate');
+    var ELEMENT_NODE = 1;
+    var NG_ANIMATE_CLASSNAME = 'ng-animate';
+
+    function mergeClasses(a,b) {
+        if (!a && !b) return '';
+        if (!a) return b;
+        if (!b) return a;
+        if (isArray(a)) a = a.join(' ');
+        if (isArray(b)) b = b.join(' ');
+        return a + ' ' + b;
+    }
+
+    function extractElementNode(element) {
+        for (var i = 0; i < element.length; i++) {
+            var elm = element[i];
+            if (elm.nodeType === ELEMENT_NODE) {
+                return elm;
+            }
+        }
+    }
+
+    function splitClasses(classes) {
+        if (isString(classes)) {
+            classes = classes.split(' ');
+        }
+
+        // Use createMap() to prevent class assumptions involving property names in
+        // Object.prototype
+        var obj = createMap();
+        forEach(classes, function(klass) {
+            // sometimes the split leaves empty string values
+            // incase extra spaces were applied to the options
+            if (klass.length) {
+                obj[klass] = true;
+            }
+        });
+        return obj;
+    }
+
+// if any other type of options value besides an Object value is
+// passed into the $animate.method() animation then this helper code
+// will be run which will ignore it. While this patch is not the
+// greatest solution to this, a lot of existing plugins depend on
+// $animate to either call the callback (< 1.2) or return a promise
+// that can be changed. This helper function ensures that the options
+// are wiped clean incase a callback function is provided.
+    function prepareAnimateOptions(options) {
+        return isObject(options)
+            ? options
+            : {};
+    }
+
+    var $$CoreAnimateJsProvider = /** @this */ function() {
+        this.$get = noop;
+    };
+
+// this is prefixed with Core since it conflicts with
+// the animateQueueProvider defined in ngAnimate/animateQueue.js
+    var $$CoreAnimateQueueProvider = /** @this */ function() {
+        var postDigestQueue = new NgMap();
+        var postDigestElements = [];
+
+        this.$get = ['$$AnimateRunner', '$rootScope',
+            function($$AnimateRunner,   $rootScope) {
+                return {
+                    enabled: noop,
+                    on: noop,
+                    off: noop,
+                    pin: noop,
+
+                    push: function(element, event, options, domOperation) {
+                        if (domOperation) {
+                            domOperation();
+                        }
+
+                        options = options || {};
+                        if (options.from) {
+                            element.css(options.from);
+                        }
+                        if (options.to) {
+                            element.css(options.to);
+                        }
+
+                        if (options.addClass || options.removeClass) {
+                            addRemoveClassesPostDigest(element, options.addClass, options.removeClass);
+                        }
+
+                        var runner = new $$AnimateRunner();
+
+                        // since there are no animations to run the runner needs to be
+                        // notified that the animation call is complete.
+                        runner.complete();
+                        return runner;
+                    }
+                };
+
+
+                function updateData(data, classes, value) {
+                    var changed = false;
+                    if (classes) {
+                        classes = isString(classes) ? classes.split(' ') :
+                            isArray(classes) ? classes : [];
+                        forEach(classes, function(className) {
+                            if (className) {
+                                changed = true;
+                                data[className] = value;
+                            }
+                        });
+                    }
+                    return changed;
+                }
+
+                function handleCSSClassChanges() {
+                    forEach(postDigestElements, function(element) {
+                        var data = postDigestQueue.get(element);
+                        if (data) {
+                            var existing = splitClasses(element.attr('class'));
+                            var toAdd = '';
+                            var toRemove = '';
+                            forEach(data, function(status, className) {
+                                var hasClass = !!existing[className];
+                                if (status !== hasClass) {
+                                    if (status) {
+                                        toAdd += (toAdd.length ? ' ' : '') + className;
+                                    } else {
+                                        toRemove += (toRemove.length ? ' ' : '') + className;
+                                    }
+                                }
+                            });
+
+                            forEach(element, function(elm) {
+                                if (toAdd) {
+                                    jqLiteAddClass(elm, toAdd);
+                                }
+                                if (toRemove) {
+                                    jqLiteRemoveClass(elm, toRemove);
+                                }
+                            });
+                            postDigestQueue.delete(element);
+                        }
+                    });
+                    postDigestElements.length = 0;
+                }
+
+
+                function addRemoveClassesPostDigest(element, add, remove) {
+                    var data = postDigestQueue.get(element) || {};
+
+                    var classesAdded = updateData(data, add, true);
+                    var classesRemoved = updateData(data, remove, false);
+
+                    if (classesAdded || classesRemoved) {
+
+                        postDigestQueue.set(element, data);
+                        postDigestElements.push(element);
+
+                        if (postDigestElements.length === 1) {
+                            $rootScope.$$postDigest(handleCSSClassChanges);
+                        }
+                    }
+                }
+            }];
+    };
 
     /**
      * @ngdoc provider
@@ -4003,18 +5580,18 @@
      *
      * @description
      * Default implementation of $animate that doesn't perform any animations, instead just
-     * synchronously performs DOM
-     * updates and calls done() callbacks.
+     * synchronously performs DOM updates and resolves the returned runner promise.
      *
-     * In order to enable animations the ngAnimate module has to be loaded.
+     * In order to enable animations the `ngAnimate` module has to be loaded.
      *
-     * To see the functional implementation check out src/ngAnimate/animate.js
+     * To see the functional implementation check out `src/ngAnimate/animate.js`.
      */
-    var $AnimateProvider = ['$provide', function($provide) {
-
-
-        this.$$selectors = {};
+    var $AnimateProvider = ['$provide', /** @this */ function($provide) {
+        var provider = this;
+        var classNameFilter = null;
+        var customFilter = null;
 
+        this.$$registeredAnimations = Object.create(null);
 
         /**
          * @ngdoc method
@@ -4025,36 +5602,91 @@
          * animation object which contains callback functions for each event that is expected to be
          * animated.
          *
-         *   * `eventFn`: `function(Element, doneFunction)` The element to animate, the `doneFunction`
-         *   must be called once the element animation is complete. If a function is returned then the
-         *   animation service will use this function to cancel the animation whenever a cancel event is
-         *   triggered.
+         *   * `eventFn`: `function(element, ... , doneFunction, options)`
+         *   The element to animate, the `doneFunction` and the options fed into the animation. Depending
+         *   on the type of animation additional arguments will be injected into the animation function. The
+         *   list below explains the function signatures for the different animation methods:
          *
+         *   - setClass: function(element, addedClasses, removedClasses, doneFunction, options)
+         *   - addClass: function(element, addedClasses, doneFunction, options)
+         *   - removeClass: function(element, removedClasses, doneFunction, options)
+         *   - enter, leave, move: function(element, doneFunction, options)
+         *   - animate: function(element, fromStyles, toStyles, doneFunction, options)
+         *
+         *   Make sure to trigger the `doneFunction` once the animation is fully complete.
          *
          * ```js
          *   return {
-     *     eventFn : function(element, done) {
-     *       //code to run the animation
-     *       //once complete, then run done()
-     *       return function cancellationFunction() {
-     *         //code to cancel the animation
-     *       }
-     *     }
-     *   }
+         *     //enter, leave, move signature
+         *     eventFn : function(element, done, options) {
+         *       //code to run the animation
+         *       //once complete, then run done()
+         *       return function endFunction(wasCancelled) {
+         *         //code to cancel the animation
+         *       }
+         *     }
+         *   }
          * ```
          *
-         * @param {string} name The name of the animation.
+         * @param {string} name The name of the animation (this is what the class-based CSS value will be compared to).
          * @param {Function} factory The factory function that will be executed to return the animation
          *                           object.
          */
         this.register = function(name, factory) {
+            if (name && name.charAt(0) !== '.') {
+                throw $animateMinErr('notcsel', 'Expecting class selector starting with \'.\' got \'{0}\'.', name);
+            }
+
             var key = name + '-animation';
-            if (name && name.charAt(0) != '.') throw $animateMinErr('notcsel',
-                "Expecting class selector starting with '.' got '{0}'.", name);
-            this.$$selectors[name.substr(1)] = key;
+            provider.$$registeredAnimations[name.substr(1)] = key;
             $provide.factory(key, factory);
         };
 
+        /**
+         * @ngdoc method
+         * @name $animateProvider#customFilter
+         *
+         * @description
+         * Sets and/or returns the custom filter function that is used to "filter" animations, i.e.
+         * determine if an animation is allowed or not. When no filter is specified (the default), no
+         * animation will be blocked. Setting the `customFilter` value will only allow animations for
+         * which the filter function's return value is truthy.
+         *
+         * This allows to easily create arbitrarily complex rules for filtering animations, such as
+         * allowing specific events only, or enabling animations on specific subtrees of the DOM, etc.
+         * Filtering animations can also boost performance for low-powered devices, as well as
+         * applications containing a lot of structural operations.
+         *
+         * <div class="alert alert-success">
+         *   **Best Practice:**
+         *   Keep the filtering function as lean as possible, because it will be called for each DOM
+         *   action (e.g. insertion, removal, class change) performed by "animation-aware" directives.
+         *   See {@link guide/animations#which-directives-support-animations- here} for a list of built-in
+         *   directives that support animations.
+         *   Performing computationally expensive or time-consuming operations on each call of the
+         *   filtering function can make your animations sluggish.
+         * </div>
+         *
+         * **Note:** If present, `customFilter` will be checked before
+         * {@link $animateProvider#classNameFilter classNameFilter}.
+         *
+         * @param {Function=} filterFn - The filter function which will be used to filter all animations.
+         *   If a falsy value is returned, no animation will be performed. The function will be called
+         *   with the following arguments:
+         *   - **node** `{DOMElement}` - The DOM element to be animated.
+         *   - **event** `{String}` - The name of the animation event (e.g. `enter`, `leave`, `addClass`
+         *     etc).
+         *   - **options** `{Object}` - A collection of options/styles used for the animation.
+         * @return {Function} The current filter function or `null` if there is none set.
+         */
+        this.customFilter = function(filterFn) {
+            if (arguments.length === 1) {
+                customFilter = isFunction(filterFn) ? filterFn : null;
+            }
+
+            return customFilter;
+        };
+
         /**
          * @ngdoc method
          * @name $animateProvider#classNameFilter
@@ -4062,220 +5694,716 @@
          * @description
          * Sets and/or returns the CSS class regular expression that is checked when performing
          * an animation. Upon bootstrap the classNameFilter value is not set at all and will
-         * therefore enable $animate to attempt to perform an animation on any element.
-         * When setting the classNameFilter value, animations will only be performed on elements
+         * therefore enable $animate to attempt to perform an animation on any element that is triggered.
+         * When setting the `classNameFilter` value, animations will only be performed on elements
          * that successfully match the filter expression. This in turn can boost performance
          * for low-powered devices as well as applications containing a lot of structural operations.
+         *
+         * **Note:** If present, `classNameFilter` will be checked after
+         * {@link $animateProvider#customFilter customFilter}. If `customFilter` is present and returns
+         * false, `classNameFilter` will not be checked.
+         *
          * @param {RegExp=} expression The className expression which will be checked against all animations
          * @return {RegExp} The current CSS className expression value. If null then there is no expression value
          */
         this.classNameFilter = function(expression) {
-            if(arguments.length === 1) {
-                this.$$classNameFilter = (expression instanceof RegExp) ? expression : null;
+            if (arguments.length === 1) {
+                classNameFilter = (expression instanceof RegExp) ? expression : null;
+                if (classNameFilter) {
+                    var reservedRegex = new RegExp('[(\\s|\\/)]' + NG_ANIMATE_CLASSNAME + '[(\\s|\\/)]');
+                    if (reservedRegex.test(classNameFilter.toString())) {
+                        classNameFilter = null;
+                        throw $animateMinErr('nongcls', '$animateProvider.classNameFilter(regex) prohibits accepting a regex value which matches/contains the "{0}" CSS class.', NG_ANIMATE_CLASSNAME);
+                    }
+                }
             }
-            return this.$$classNameFilter;
+            return classNameFilter;
         };
 
-        this.$get = ['$timeout', '$$asyncCallback', function($timeout, $$asyncCallback) {
-
-            function async(fn) {
-                fn && $$asyncCallback(fn);
+        this.$get = ['$$animateQueue', function($$animateQueue) {
+            function domInsert(element, parentElement, afterElement) {
+                // if for some reason the previous element was removed
+                // from the dom sometime before this code runs then let's
+                // just stick to using the parent element as the anchor
+                if (afterElement) {
+                    var afterNode = extractElementNode(afterElement);
+                    if (afterNode && !afterNode.parentNode && !afterNode.previousElementSibling) {
+                        afterElement = null;
+                    }
+                }
+                if (afterElement) {
+                    afterElement.after(element);
+                } else {
+                    parentElement.prepend(element);
+                }
             }
 
             /**
-             *
              * @ngdoc service
              * @name $animate
-             * @description The $animate service provides rudimentary DOM manipulation functions to
-             * insert, remove and move elements within the DOM, as well as adding and removing classes.
-             * This service is the core service used by the ngAnimate $animator service which provides
-             * high-level animation hooks for CSS and JavaScript.
+             * @description The $animate service exposes a series of DOM utility methods that provide support
+             * for animation hooks. The default behavior is the application of DOM operations, however,
+             * when an animation is detected (and animations are enabled), $animate will do the heavy lifting
+             * to ensure that animation runs with the triggered DOM operation.
+             *
+             * By default $animate doesn't trigger any animations. This is because the `ngAnimate` module isn't
+             * included and only when it is active then the animation hooks that `$animate` triggers will be
+             * functional. Once active then all structural `ng-` directives will trigger animations as they perform
+             * their DOM-related operations (enter, leave and move). Other directives such as `ngClass`,
+             * `ngShow`, `ngHide` and `ngMessages` also provide support for animations.
              *
-             * $animate is available in the AngularJS core, however, the ngAnimate module must be included
-             * to enable full out animation support. Otherwise, $animate will only perform simple DOM
-             * manipulation operations.
+             * It is recommended that the`$animate` service is always used when executing DOM-related procedures within directives.
              *
-             * To learn more about enabling animation support, click here to visit the {@link ngAnimate
-     * ngAnimate module page} as well as the {@link ngAnimate.$animate ngAnimate $animate service
-     * page}.
+             * To learn more about enabling animation support, click here to visit the
+             * {@link ngAnimate ngAnimate module page}.
              */
             return {
+                // we don't call it directly since non-existant arguments may
+                // be interpreted as null within the sub enabled function
 
                 /**
                  *
                  * @ngdoc method
-                 * @name $animate#enter
-                 * @function
-                 * @description Inserts the element into the DOM either after the `after` element or within
-                 *   the `parent` element. Once complete, the done() callback will be fired (if provided).
-                 * @param {DOMElement} element the element which will be inserted into the DOM
-                 * @param {DOMElement} parent the parent element which will append the element as
-                 *   a child (if the after element is not present)
-                 * @param {DOMElement} after the sibling element which will append the element
-                 *   after itself
-                 * @param {Function=} done callback function that will be called after the element has been
-                 *   inserted into the DOM
+                 * @name $animate#on
+                 * @kind function
+                 * @description Sets up an event listener to fire whenever the animation event (enter, leave, move, etc...)
+                 *    has fired on the given element or among any of its children. Once the listener is fired, the provided callback
+                 *    is fired with the following params:
+                 *
+                 * ```js
+                 * $animate.on('enter', container,
+                 *    function callback(element, phase) {
+                 *      // cool we detected an enter animation within the container
+                 *    }
+                 * );
+                 * ```
+                 *
+                 * @param {string} event the animation event that will be captured (e.g. enter, leave, move, addClass, removeClass, etc...)
+                 * @param {DOMElement} container the container element that will capture each of the animation events that are fired on itself
+                 *     as well as among its children
+                 * @param {Function} callback the callback function that will be fired when the listener is triggered
+                 *
+                 * The arguments present in the callback function are:
+                 * * `element` - The captured DOM element that the animation was fired on.
+                 * * `phase` - The phase of the animation. The two possible phases are **start** (when the animation starts) and **close** (when it ends).
                  */
-                enter : function(element, parent, after, done) {
-                    if (after) {
-                        after.after(element);
-                    } else {
-                        if (!parent || !parent[0]) {
-                            parent = after.parent();
-                        }
-                        parent.append(element);
+                on: $$animateQueue.on,
+
+                /**
+                 *
+                 * @ngdoc method
+                 * @name $animate#off
+                 * @kind function
+                 * @description Deregisters an event listener based on the event which has been associated with the provided element. This method
+                 * can be used in three different ways depending on the arguments:
+                 *
+                 * ```js
+                 * // remove all the animation event listeners listening for `enter`
+                 * $animate.off('enter');
+                 *
+                 * // remove listeners for all animation events from the container element
+                 * $animate.off(container);
+                 *
+                 * // remove all the animation event listeners listening for `enter` on the given element and its children
+                 * $animate.off('enter', container);
+                 *
+                 * // remove the event listener function provided by `callback` that is set
+                 * // to listen for `enter` on the given `container` as well as its children
+                 * $animate.off('enter', container, callback);
+                 * ```
+                 *
+                 * @param {string|DOMElement} event|container the animation event (e.g. enter, leave, move,
+                 * addClass, removeClass, etc...), or the container element. If it is the element, all other
+                 * arguments are ignored.
+                 * @param {DOMElement=} container the container element the event listener was placed on
+                 * @param {Function=} callback the callback function that was registered as the listener
+                 */
+                off: $$animateQueue.off,
+
+                /**
+                 * @ngdoc method
+                 * @name $animate#pin
+                 * @kind function
+                 * @description Associates the provided element with a host parent element to allow the element to be animated even if it exists
+                 *    outside of the DOM structure of the AngularJS application. By doing so, any animation triggered via `$animate` can be issued on the
+                 *    element despite being outside the realm of the application or within another application. Say for example if the application
+                 *    was bootstrapped on an element that is somewhere inside of the `<body>` tag, but we wanted to allow for an element to be situated
+                 *    as a direct child of `document.body`, then this can be achieved by pinning the element via `$animate.pin(element)`. Keep in mind
+                 *    that calling `$animate.pin(element, parentElement)` will not actually insert into the DOM anywhere; it will just create the association.
+                 *
+                 *    Note that this feature is only active when the `ngAnimate` module is used.
+                 *
+                 * @param {DOMElement} element the external element that will be pinned
+                 * @param {DOMElement} parentElement the host parent element that will be associated with the external element
+                 */
+                pin: $$animateQueue.pin,
+
+                /**
+                 *
+                 * @ngdoc method
+                 * @name $animate#enabled
+                 * @kind function
+                 * @description Used to get and set whether animations are enabled or not on the entire application or on an element and its children. This
+                 * function can be called in four ways:
+                 *
+                 * ```js
+                 * // returns true or false
+                 * $animate.enabled();
+                 *
+                 * // changes the enabled state for all animations
+                 * $animate.enabled(false);
+                 * $animate.enabled(true);
+                 *
+                 * // returns true or false if animations are enabled for an element
+                 * $animate.enabled(element);
+                 *
+                 * // changes the enabled state for an element and its children
+                 * $animate.enabled(element, true);
+                 * $animate.enabled(element, false);
+                 * ```
+                 *
+                 * @param {DOMElement=} element the element that will be considered for checking/setting the enabled state
+                 * @param {boolean=} enabled whether or not the animations will be enabled for the element
+                 *
+                 * @return {boolean} whether or not animations are enabled
+                 */
+                enabled: $$animateQueue.enabled,
+
+                /**
+                 * @ngdoc method
+                 * @name $animate#cancel
+                 * @kind function
+                 * @description Cancels the provided animation.
+                 *
+                 * @param {Promise} animationPromise The animation promise that is returned when an animation is started.
+                 */
+                cancel: function(runner) {
+                    if (runner.end) {
+                        runner.end();
                     }
-                    async(done);
                 },
 
                 /**
                  *
                  * @ngdoc method
-                 * @name $animate#leave
-                 * @function
-                 * @description Removes the element from the DOM. Once complete, the done() callback will be
-                 *   fired (if provided).
-                 * @param {DOMElement} element the element which will be removed from the DOM
-                 * @param {Function=} done callback function that will be called after the element has been
-                 *   removed from the DOM
+                 * @name $animate#enter
+                 * @kind function
+                 * @description Inserts the element into the DOM either after the `after` element (if provided) or
+                 *   as the first child within the `parent` element and then triggers an animation.
+                 *   A promise is returned that will be resolved during the next digest once the animation
+                 *   has completed.
+                 *
+                 * @param {DOMElement} element the element which will be inserted into the DOM
+                 * @param {DOMElement} parent the parent element which will append the element as
+                 *   a child (so long as the after element is not present)
+                 * @param {DOMElement=} after the sibling element after which the element will be appended
+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
+                 *   The object can have the following properties:
+                 *
+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+                 *
+                 * @return {Promise} the animation callback promise
                  */
-                leave : function(element, done) {
-                    element.remove();
-                    async(done);
+                enter: function(element, parent, after, options) {
+                    parent = parent && jqLite(parent);
+                    after = after && jqLite(after);
+                    parent = parent || after.parent();
+                    domInsert(element, parent, after);
+                    return $$animateQueue.push(element, 'enter', prepareAnimateOptions(options));
                 },
 
                 /**
                  *
                  * @ngdoc method
                  * @name $animate#move
-                 * @function
-                 * @description Moves the position of the provided element within the DOM to be placed
-                 * either after the `after` element or inside of the `parent` element. Once complete, the
-                 * done() callback will be fired (if provided).
+                 * @kind function
+                 * @description Inserts (moves) the element into its new position in the DOM either after
+                 *   the `after` element (if provided) or as the first child within the `parent` element
+                 *   and then triggers an animation. A promise is returned that will be resolved
+                 *   during the next digest once the animation has completed.
+                 *
+                 * @param {DOMElement} element the element which will be moved into the new DOM position
+                 * @param {DOMElement} parent the parent element which will append the element as
+                 *   a child (so long as the after element is not present)
+                 * @param {DOMElement=} after the sibling element after which the element will be appended
+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
+                 *   The object can have the following properties:
+                 *
+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
                  *
-                 * @param {DOMElement} element the element which will be moved around within the
-                 *   DOM
-                 * @param {DOMElement} parent the parent element where the element will be
-                 *   inserted into (if the after element is not present)
-                 * @param {DOMElement} after the sibling element where the element will be
-                 *   positioned next to
-                 * @param {Function=} done the callback function (if provided) that will be fired after the
-                 *   element has been moved to its new position
+                 * @return {Promise} the animation callback promise
                  */
-                move : function(element, parent, after, done) {
-                    // Do not remove element before insert. Removing will cause data associated with the
-                    // element to be dropped. Insert will implicitly do the remove.
-                    this.enter(element, parent, after, done);
+                move: function(element, parent, after, options) {
+                    parent = parent && jqLite(parent);
+                    after = after && jqLite(after);
+                    parent = parent || after.parent();
+                    domInsert(element, parent, after);
+                    return $$animateQueue.push(element, 'move', prepareAnimateOptions(options));
                 },
 
                 /**
-                 *
                  * @ngdoc method
-                 * @name $animate#addClass
-                 * @function
-                 * @description Adds the provided className CSS class value to the provided element. Once
-                 * complete, the done() callback will be fired (if provided).
-                 * @param {DOMElement} element the element which will have the className value
-                 *   added to it
-                 * @param {string} className the CSS class which will be added to the element
-                 * @param {Function=} done the callback function (if provided) that will be fired after the
-                 *   className value has been added to the element
+                 * @name $animate#leave
+                 * @kind function
+                 * @description Triggers an animation and then removes the element from the DOM.
+                 * When the function is called a promise is returned that will be resolved during the next
+                 * digest once the animation has completed.
+                 *
+                 * @param {DOMElement} element the element which will be removed from the DOM
+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
+                 *   The object can have the following properties:
+                 *
+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+                 *
+                 * @return {Promise} the animation callback promise
                  */
-                addClass : function(element, className, done) {
-                    className = isString(className) ?
-                        className :
-                        isArray(className) ? className.join(' ') : '';
-                    forEach(element, function (element) {
-                        jqLiteAddClass(element, className);
+                leave: function(element, options) {
+                    return $$animateQueue.push(element, 'leave', prepareAnimateOptions(options), function() {
+                        element.remove();
                     });
-                    async(done);
                 },
 
                 /**
+                 * @ngdoc method
+                 * @name $animate#addClass
+                 * @kind function
+                 *
+                 * @description Triggers an addClass animation surrounding the addition of the provided CSS class(es). Upon
+                 *   execution, the addClass operation will only be handled after the next digest and it will not trigger an
+                 *   animation if element already contains the CSS class or if the class is removed at a later step.
+                 *   Note that class-based animations are treated differently compared to structural animations
+                 *   (like enter, move and leave) since the CSS classes may be added/removed at different points
+                 *   depending if CSS or JavaScript animations are used.
+                 *
+                 * @param {DOMElement} element the element which the CSS classes will be applied to
+                 * @param {string} className the CSS class(es) that will be added (multiple classes are separated via spaces)
+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
+                 *   The object can have the following properties:
+                 *
+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
                  *
+                 * @return {Promise} the animation callback promise
+                 */
+                addClass: function(element, className, options) {
+                    options = prepareAnimateOptions(options);
+                    options.addClass = mergeClasses(options.addclass, className);
+                    return $$animateQueue.push(element, 'addClass', options);
+                },
+
+                /**
                  * @ngdoc method
                  * @name $animate#removeClass
-                 * @function
-                 * @description Removes the provided className CSS class value from the provided element.
-                 * Once complete, the done() callback will be fired (if provided).
-                 * @param {DOMElement} element the element which will have the className value
-                 *   removed from it
-                 * @param {string} className the CSS class which will be removed from the element
-                 * @param {Function=} done the callback function (if provided) that will be fired after the
-                 *   className value has been removed from the element
+                 * @kind function
+                 *
+                 * @description Triggers a removeClass animation surrounding the removal of the provided CSS class(es). Upon
+                 *   execution, the removeClass operation will only be handled after the next digest and it will not trigger an
+                 *   animation if element does not contain the CSS class or if the class is added at a later step.
+                 *   Note that class-based animations are treated differently compared to structural animations
+                 *   (like enter, move and leave) since the CSS classes may be added/removed at different points
+                 *   depending if CSS or JavaScript animations are used.
+                 *
+                 * @param {DOMElement} element the element which the CSS classes will be applied to
+                 * @param {string} className the CSS class(es) that will be removed (multiple classes are separated via spaces)
+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
+                 *   The object can have the following properties:
+                 *
+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+                 *
+                 * @return {Promise} the animation callback promise
                  */
-                removeClass : function(element, className, done) {
-                    className = isString(className) ?
-                        className :
-                        isArray(className) ? className.join(' ') : '';
-                    forEach(element, function (element) {
-                        jqLiteRemoveClass(element, className);
-                    });
-                    async(done);
+                removeClass: function(element, className, options) {
+                    options = prepareAnimateOptions(options);
+                    options.removeClass = mergeClasses(options.removeClass, className);
+                    return $$animateQueue.push(element, 'removeClass', options);
                 },
 
                 /**
-                 *
                  * @ngdoc method
                  * @name $animate#setClass
-                 * @function
-                 * @description Adds and/or removes the given CSS classes to and from the element.
-                 * Once complete, the done() callback will be fired (if provided).
-                 * @param {DOMElement} element the element which will it's CSS classes changed
-                 *   removed from it
-                 * @param {string} add the CSS classes which will be added to the element
-                 * @param {string} remove the CSS class which will be removed from the element
-                 * @param {Function=} done the callback function (if provided) that will be fired after the
-                 *   CSS classes have been set on the element
+                 * @kind function
+                 *
+                 * @description Performs both the addition and removal of a CSS classes on an element and (during the process)
+                 *    triggers an animation surrounding the class addition/removal. Much like `$animate.addClass` and
+                 *    `$animate.removeClass`, `setClass` will only evaluate the classes being added/removed once a digest has
+                 *    passed. Note that class-based animations are treated differently compared to structural animations
+                 *    (like enter, move and leave) since the CSS classes may be added/removed at different points
+                 *    depending if CSS or JavaScript animations are used.
+                 *
+                 * @param {DOMElement} element the element which the CSS classes will be applied to
+                 * @param {string} add the CSS class(es) that will be added (multiple classes are separated via spaces)
+                 * @param {string} remove the CSS class(es) that will be removed (multiple classes are separated via spaces)
+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
+                 *   The object can have the following properties:
+                 *
+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+                 *
+                 * @return {Promise} the animation callback promise
                  */
-                setClass : function(element, add, remove, done) {
-                    forEach(element, function (element) {
-                        jqLiteAddClass(element, add);
-                        jqLiteRemoveClass(element, remove);
-                    });
-                    async(done);
+                setClass: function(element, add, remove, options) {
+                    options = prepareAnimateOptions(options);
+                    options.addClass = mergeClasses(options.addClass, add);
+                    options.removeClass = mergeClasses(options.removeClass, remove);
+                    return $$animateQueue.push(element, 'setClass', options);
                 },
 
-                enabled : noop
+                /**
+                 * @ngdoc method
+                 * @name $animate#animate
+                 * @kind function
+                 *
+                 * @description Performs an inline animation on the element which applies the provided to and from CSS styles to the element.
+                 * If any detected CSS transition, keyframe or JavaScript matches the provided className value, then the animation will take
+                 * on the provided styles. For example, if a transition animation is set for the given className, then the provided `from` and
+                 * `to` styles will be applied alongside the given transition. If the CSS style provided in `from` does not have a corresponding
+                 * style in `to`, the style in `from` is applied immediately, and no animation is run.
+                 * If a JavaScript animation is detected then the provided styles will be given in as function parameters into the `animate`
+                 * method (or as part of the `options` parameter):
+                 *
+                 * ```js
+                 * ngModule.animation('.my-inline-animation', function() {
+                 *   return {
+                 *     animate : function(element, from, to, done, options) {
+                 *       //animation
+                 *       done();
+                 *     }
+                 *   }
+                 * });
+                 * ```
+                 *
+                 * @param {DOMElement} element the element which the CSS styles will be applied to
+                 * @param {object} from the from (starting) CSS styles that will be applied to the element and across the animation.
+                 * @param {object} to the to (destination) CSS styles that will be applied to the element and across the animation.
+                 * @param {string=} className an optional CSS class that will be applied to the element for the duration of the animation. If
+                 *    this value is left as empty then a CSS class of `ng-inline-animate` will be applied to the element.
+                 *    (Note that if no animation is detected then this value will not be applied to the element.)
+                 * @param {object=} options an optional collection of options/styles that will be applied to the element.
+                 *   The object can have the following properties:
+                 *
+                 *   - **addClass** - `{string}` - space-separated CSS classes to add to element
+                 *   - **from** - `{Object}` - CSS properties & values at the beginning of animation. Must have matching `to`
+                 *   - **removeClass** - `{string}` - space-separated CSS classes to remove from element
+                 *   - **to** - `{Object}` - CSS properties & values at end of animation. Must have matching `from`
+                 *
+                 * @return {Promise} the animation callback promise
+                 */
+                animate: function(element, from, to, className, options) {
+                    options = prepareAnimateOptions(options);
+                    options.from = options.from ? extend(options.from, from) : from;
+                    options.to   = options.to   ? extend(options.to, to)     : to;
+
+                    className = className || 'ng-inline-animate';
+                    options.tempClasses = mergeClasses(options.tempClasses, className);
+                    return $$animateQueue.push(element, 'animate', options);
+                }
             };
         }];
     }];
 
-    function $$AsyncCallbackProvider(){
-        this.$get = ['$$rAF', '$timeout', function($$rAF, $timeout) {
-            return $$rAF.supported
-                ? function(fn) { return $$rAF(fn); }
-                : function(fn) {
-                return $timeout(fn, 0, false);
+    var $$AnimateAsyncRunFactoryProvider = /** @this */ function() {
+        this.$get = ['$$rAF', function($$rAF) {
+            var waitQueue = [];
+
+            function waitForTick(fn) {
+                waitQueue.push(fn);
+                if (waitQueue.length > 1) return;
+                $$rAF(function() {
+                    for (var i = 0; i < waitQueue.length; i++) {
+                        waitQueue[i]();
+                    }
+                    waitQueue = [];
+                });
+            }
+
+            return function() {
+                var passed = false;
+                waitForTick(function() {
+                    passed = true;
+                });
+                return function(callback) {
+                    if (passed) {
+                        callback();
+                    } else {
+                        waitForTick(callback);
+                    }
+                };
             };
         }];
-    }
+    };
 
-    /**
-     * ! This is a private undocumented service !
-     *
-     * @name $browser
-     * @requires $log
-     * @description
-     * This object has two goals:
-     *
-     * - hide all the global state in the browser caused by the window object
-     * - abstract away all the browser specific features and inconsistencies
-     *
-     * For tests we provide {@link ngMock.$browser mock implementation} of the `$browser`
-     * service, which can be used for convenient testing of the application without the interaction with
-     * the real browser apis.
-     */
-    /**
-     * @param {object} window The global window object.
-     * @param {object} document jQuery wrapped document.
-     * @param {function()} XHR XMLHttpRequest constructor.
-     * @param {object} $log console.log or an object with the same interface.
-     * @param {object} $sniffer $sniffer service
+    var $$AnimateRunnerFactoryProvider = /** @this */ function() {
+        this.$get = ['$q', '$sniffer', '$$animateAsyncRun', '$$isDocumentHidden', '$timeout',
+            function($q,   $sniffer,   $$animateAsyncRun,   $$isDocumentHidden,   $timeout) {
+
+                var INITIAL_STATE = 0;
+                var DONE_PENDING_STATE = 1;
+                var DONE_COMPLETE_STATE = 2;
+
+                AnimateRunner.chain = function(chain, callback) {
+                    var index = 0;
+
+                    next();
+                    function next() {
+                        if (index === chain.length) {
+                            callback(true);
+                            return;
+                        }
+
+                        chain[index](function(response) {
+                            if (response === false) {
+                                callback(false);
+                                return;
+                            }
+                            index++;
+                            next();
+                        });
+                    }
+                };
+
+                AnimateRunner.all = function(runners, callback) {
+                    var count = 0;
+                    var status = true;
+                    forEach(runners, function(runner) {
+                        runner.done(onProgress);
+                    });
+
+                    function onProgress(response) {
+                        status = status && response;
+                        if (++count === runners.length) {
+                            callback(status);
+                        }
+                    }
+                };
+
+                function AnimateRunner(host) {
+                    this.setHost(host);
+
+                    var rafTick = $$animateAsyncRun();
+                    var timeoutTick = function(fn) {
+                        $timeout(fn, 0, false);
+                    };
+
+                    this._doneCallbacks = [];
+                    this._tick = function(fn) {
+                        if ($$isDocumentHidden()) {
+                            timeoutTick(fn);
+                        } else {
+                            rafTick(fn);
+                        }
+                    };
+                    this._state = 0;
+                }
+
+                AnimateRunner.prototype = {
+                    setHost: function(host) {
+                        this.host = host || {};
+                    },
+
+                    done: function(fn) {
+                        if (this._state === DONE_COMPLETE_STATE) {
+                            fn();
+                        } else {
+                            this._doneCallbacks.push(fn);
+                        }
+                    },
+
+                    progress: noop,
+
+                    getPromise: function() {
+                        if (!this.promise) {
+                            var self = this;
+                            this.promise = $q(function(resolve, reject) {
+                                self.done(function(status) {
+                                    if (status === false) {
+                                        reject();
+                                    } else {
+                                        resolve();
+                                    }
+                                });
+                            });
+                        }
+                        return this.promise;
+                    },
+
+                    then: function(resolveHandler, rejectHandler) {
+                        return this.getPromise().then(resolveHandler, rejectHandler);
+                    },
+
+                    'catch': function(handler) {
+                        return this.getPromise()['catch'](handler);
+                    },
+
+                    'finally': function(handler) {
+                        return this.getPromise()['finally'](handler);
+                    },
+
+                    pause: function() {
+                        if (this.host.pause) {
+                            this.host.pause();
+                        }
+                    },
+
+                    resume: function() {
+                        if (this.host.resume) {
+                            this.host.resume();
+                        }
+                    },
+
+                    end: function() {
+                        if (this.host.end) {
+                            this.host.end();
+                        }
+                        this._resolve(true);
+                    },
+
+                    cancel: function() {
+                        if (this.host.cancel) {
+                            this.host.cancel();
+                        }
+                        this._resolve(false);
+                    },
+
+                    complete: function(response) {
+                        var self = this;
+                        if (self._state === INITIAL_STATE) {
+                            self._state = DONE_PENDING_STATE;
+                            self._tick(function() {
+                                self._resolve(response);
+                            });
+                        }
+                    },
+
+                    _resolve: function(response) {
+                        if (this._state !== DONE_COMPLETE_STATE) {
+                            forEach(this._doneCallbacks, function(fn) {
+                                fn(response);
+                            });
+                            this._doneCallbacks.length = 0;
+                            this._state = DONE_COMPLETE_STATE;
+                        }
+                    }
+                };
+
+                return AnimateRunner;
+            }];
+    };
+
+    /* exported $CoreAnimateCssProvider */
+
+    /**
+     * @ngdoc service
+     * @name $animateCss
+     * @kind object
+     * @this
+     *
+     * @description
+     * This is the core version of `$animateCss`. By default, only when the `ngAnimate` is included,
+     * then the `$animateCss` service will actually perform animations.
+     *
+     * Click here {@link ngAnimate.$animateCss to read the documentation for $animateCss}.
+     */
+    var $CoreAnimateCssProvider = function() {
+        this.$get = ['$$rAF', '$q', '$$AnimateRunner', function($$rAF, $q, $$AnimateRunner) {
+
+            return function(element, initialOptions) {
+                // all of the animation functions should create
+                // a copy of the options data, however, if a
+                // parent service has already created a copy then
+                // we should stick to using that
+                var options = initialOptions || {};
+                if (!options.$$prepared) {
+                    options = copy(options);
+                }
+
+                // there is no point in applying the styles since
+                // there is no animation that goes on at all in
+                // this version of $animateCss.
+                if (options.cleanupStyles) {
+                    options.from = options.to = null;
+                }
+
+                if (options.from) {
+                    element.css(options.from);
+                    options.from = null;
+                }
+
+                var closed, runner = new $$AnimateRunner();
+                return {
+                    start: run,
+                    end: run
+                };
+
+                function run() {
+                    $$rAF(function() {
+                        applyAnimationContents();
+                        if (!closed) {
+                            runner.complete();
+                        }
+                        closed = true;
+                    });
+                    return runner;
+                }
+
+                function applyAnimationContents() {
+                    if (options.addClass) {
+                        element.addClass(options.addClass);
+                        options.addClass = null;
+                    }
+                    if (options.removeClass) {
+                        element.removeClass(options.removeClass);
+                        options.removeClass = null;
+                    }
+                    if (options.to) {
+                        element.css(options.to);
+                        options.to = null;
+                    }
+                }
+            };
+        }];
+    };
+
+    /* global stripHash: true */
+
+    /**
+     * ! This is a private undocumented service !
+     *
+     * @name $browser
+     * @requires $log
+     * @description
+     * This object has two goals:
+     *
+     * - hide all the global state in the browser caused by the window object
+     * - abstract away all the browser specific features and inconsistencies
+     *
+     * For tests we provide {@link ngMock.$browser mock implementation} of the `$browser`
+     * service, which can be used for convenient testing of the application without the interaction with
+     * the real browser apis.
+     */
+    /**
+     * @param {object} window The global window object.
+     * @param {object} document jQuery wrapped document.
+     * @param {object} $log window.console or an object with the same interface.
+     * @param {object} $sniffer $sniffer service
      */
     function Browser(window, document, $log, $sniffer) {
         var self = this,
-            rawDocument = document[0],
             location = window.location,
             history = window.history,
             setTimeout = window.setTimeout,
@@ -4301,7 +6429,7 @@
             } finally {
                 outstandingRequestCount--;
                 if (outstandingRequestCount === 0) {
-                    while(outstandingRequestCallbacks.length) {
+                    while (outstandingRequestCallbacks.length) {
                         try {
                             outstandingRequestCallbacks.pop()();
                         } catch (e) {
@@ -4312,18 +6440,17 @@
             }
         }
 
+        function getHash(url) {
+            var index = url.indexOf('#');
+            return index === -1 ? '' : url.substr(index);
+        }
+
         /**
          * @private
-         * Note: this method is used only by scenario runner
          * TODO(vojta): prefix this method with $$ ?
          * @param {function()} callback Function that will be called when no outstanding request
          */
         self.notifyWhenNoOutstandingRequests = function(callback) {
-            // force browser to execute all pollFns - this is needed so that cookies and other pollers fire
-            // at some deterministic time in respect to the test runner's actions. Leaving things up to the
-            // regular poller would result in flaky tests.
-            forEach(pollFns, function(pollFn){ pollFn(); });
-
             if (outstandingRequestCount === 0) {
                 callback();
             } else {
@@ -4331,51 +6458,23 @@
             }
         };
 
-        //////////////////////////////////////////////////////////////
-        // Poll Watcher API
-        //////////////////////////////////////////////////////////////
-        var pollFns = [],
-            pollTimeout;
-
-        /**
-         * @name $browser#addPollFn
-         *
-         * @param {function()} fn Poll function to add
-         *
-         * @description
-         * Adds a function to the list of functions that poller periodically executes,
-         * and starts polling if not started yet.
-         *
-         * @returns {function()} the added function
-         */
-        self.addPollFn = function(fn) {
-            if (isUndefined(pollTimeout)) startPoller(100, setTimeout);
-            pollFns.push(fn);
-            return fn;
-        };
-
-        /**
-         * @param {number} interval How often should browser call poll functions (ms)
-         * @param {function()} setTimeout Reference to a real or fake `setTimeout` function.
-         *
-         * @description
-         * Configures the poller to run in the specified intervals, using the specified
-         * setTimeout fn and kicks it off.
-         */
-        function startPoller(interval, setTimeout) {
-            (function check() {
-                forEach(pollFns, function(pollFn){ pollFn(); });
-                pollTimeout = setTimeout(check, interval);
-            })();
-        }
-
         //////////////////////////////////////////////////////////////
         // URL API
         //////////////////////////////////////////////////////////////
 
-        var lastBrowserUrl = location.href,
+        var cachedState, lastHistoryState,
+            lastBrowserUrl = location.href,
             baseElement = document.find('base'),
-            newLocation = null;
+            pendingLocation = null,
+            getCurrentState = !$sniffer.history ? noop : function getCurrentState() {
+                try {
+                    return history.state;
+                } catch (e) {
+                    // MSIE can reportedly throw when there is no state (UNCONFIRMED).
+                }
+            };
+
+        cacheState();
 
         /**
          * @name $browser#url
@@ -4394,52 +6493,120 @@
          * {@link ng.$location $location service} to change url.
          *
          * @param {string} url New url (when used as setter)
-         * @param {boolean=} replace Should new url replace current history record ?
+         * @param {boolean=} replace Should new url replace current history record?
+         * @param {object=} state object to use with pushState/replaceState
          */
-        self.url = function(url, replace) {
+        self.url = function(url, replace, state) {
+            // In modern browsers `history.state` is `null` by default; treating it separately
+            // from `undefined` would cause `$browser.url('/foo')` to change `history.state`
+            // to undefined via `pushState`. Instead, let's change `undefined` to `null` here.
+            if (isUndefined(state)) {
+                state = null;
+            }
+
             // Android Browser BFCache causes location, history reference to become stale.
             if (location !== window.location) location = window.location;
             if (history !== window.history) history = window.history;
 
             // setter
             if (url) {
-                if (lastBrowserUrl == url) return;
+                var sameState = lastHistoryState === state;
+
+                // Don't change anything if previous and current URLs and states match. This also prevents
+                // IE<10 from getting into redirect loop when in LocationHashbangInHtml5Url mode.
+                // See https://github.com/angular/angular.js/commit/ffb2701
+                if (lastBrowserUrl === url && (!$sniffer.history || sameState)) {
+                    return self;
+                }
+                var sameBase = lastBrowserUrl && stripHash(lastBrowserUrl) === stripHash(url);
                 lastBrowserUrl = url;
-                if ($sniffer.history) {
-                    if (replace) history.replaceState(null, '', url);
-                    else {
-                        history.pushState(null, '', url);
-                        // Crazy Opera Bug: http://my.opera.com/community/forums/topic.dml?id=1185462
-                        baseElement.attr('href', baseElement.attr('href'));
-                    }
+                lastHistoryState = state;
+                // Don't use history API if only the hash changed
+                // due to a bug in IE10/IE11 which leads
+                // to not firing a `hashchange` nor `popstate` event
+                // in some cases (see #9143).
+                if ($sniffer.history && (!sameBase || !sameState)) {
+                    history[replace ? 'replaceState' : 'pushState'](state, '', url);
+                    cacheState();
                 } else {
-                    newLocation = url;
+                    if (!sameBase) {
+                        pendingLocation = url;
+                    }
                     if (replace) {
                         location.replace(url);
-                    } else {
+                    } else if (!sameBase) {
                         location.href = url;
+                    } else {
+                        location.hash = getHash(url);
                     }
+                    if (location.href !== url) {
+                        pendingLocation = url;
+                    }
+                }
+                if (pendingLocation) {
+                    pendingLocation = url;
                 }
                 return self;
                 // getter
             } else {
-                // - newLocation is a workaround for an IE7-9 issue with location.replace and location.href
-                //   methods not updating location.href synchronously.
+                // - pendingLocation is needed as browsers don't allow to read out
+                //   the new location.href if a reload happened or if there is a bug like in iOS 9 (see
+                //   https://openradar.appspot.com/22186109).
                 // - the replacement is a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=407172
-                return newLocation || location.href.replace(/%27/g,"'");
+                return pendingLocation || location.href.replace(/%27/g,'\'');
             }
         };
 
+        /**
+         * @name $browser#state
+         *
+         * @description
+         * This method is a getter.
+         *
+         * Return history.state or null if history.state is undefined.
+         *
+         * @returns {object} state
+         */
+        self.state = function() {
+            return cachedState;
+        };
+
         var urlChangeListeners = [],
             urlChangeInit = false;
 
-        function fireUrlChange() {
-            newLocation = null;
-            if (lastBrowserUrl == self.url()) return;
+        function cacheStateAndFireUrlChange() {
+            pendingLocation = null;
+            fireStateOrUrlChange();
+        }
+
+        // This variable should be used *only* inside the cacheState function.
+        var lastCachedState = null;
+        function cacheState() {
+            // This should be the only place in $browser where `history.state` is read.
+            cachedState = getCurrentState();
+            cachedState = isUndefined(cachedState) ? null : cachedState;
+
+            // Prevent callbacks fo fire twice if both hashchange & popstate were fired.
+            if (equals(cachedState, lastCachedState)) {
+                cachedState = lastCachedState;
+            }
+
+            lastCachedState = cachedState;
+            lastHistoryState = cachedState;
+        }
+
+        function fireStateOrUrlChange() {
+            var prevLastHistoryState = lastHistoryState;
+            cacheState();
+
+            if (lastBrowserUrl === self.url() && prevLastHistoryState === cachedState) {
+                return;
+            }
 
             lastBrowserUrl = self.url();
+            lastHistoryState = cachedState;
             forEach(urlChangeListeners, function(listener) {
-                listener(self.url());
+                listener(self.url(), cachedState);
             });
         }
 
@@ -4449,7 +6616,7 @@
          * @description
          * Register callback function that will be called, when url changes.
          *
-         * It's only called when the url is changed from outside of angular:
+         * It's only called when the url is changed from outside of AngularJS:
          * - user types different url into address bar
          * - user clicks on history (forward/back) button
          * - user clicks on a link
@@ -4459,7 +6626,7 @@
          * The listener gets called with new url as parameter.
          *
          * NOTE: this api is intended for use only by the $location service. Please use the
-         * {@link ng.$location $location service} to monitor url changes in angular apps.
+         * {@link ng.$location $location service} to monitor url changes in AngularJS apps.
          *
          * @param {function(string)} listener Listener function to be called when url changes.
          * @return {function(string)} Returns the registered listener fn - handy if the fn is anonymous.
@@ -4467,16 +6634,14 @@
         self.onUrlChange = function(callback) {
             // TODO(vojta): refactor to use node's syntax for events
             if (!urlChangeInit) {
-                // We listen on both (hashchange/popstate) when available, as some browsers (e.g. Opera)
-                // don't fire popstate when user change the address bar and don't fire hashchange when url
+                // We listen on both (hashchange/popstate) when available, as some browsers don't
+                // fire popstate when user changes the address bar and don't fire hashchange when url
                 // changed by push/replaceState
 
                 // html5 history api - popstate event
-                if ($sniffer.history) jqLite(window).on('popstate', fireUrlChange);
+                if ($sniffer.history) jqLite(window).on('popstate', cacheStateAndFireUrlChange);
                 // hashchange event
-                if ($sniffer.hashchange) jqLite(window).on('hashchange', fireUrlChange);
-                // polling
-                else self.addPollFn(fireUrlChange);
+                jqLite(window).on('hashchange', cacheStateAndFireUrlChange);
 
                 urlChangeInit = true;
             }
@@ -4485,6 +6650,23 @@
             return callback;
         };
 
+        /**
+         * @private
+         * Remove popstate and hashchange handler from window.
+         *
+         * NOTE: this api is intended for use only by $rootScope.
+         */
+        self.$$applicationDestroyed = function() {
+            jqLite(window).off('hashchange popstate', cacheStateAndFireUrlChange);
+        };
+
+        /**
+         * Checks whether the url has changed outside of AngularJS.
+         * Needs to be exported to be able to check for changes that have been done in sync,
+         * as hashchange/popstate events fire in async.
+         */
+        self.$$checkUrlChange = fireStateOrUrlChange;
+
         //////////////////////////////////////////////////////////////
         // Misc API
         //////////////////////////////////////////////////////////////
@@ -4500,85 +6682,9 @@
          */
         self.baseHref = function() {
             var href = baseElement.attr('href');
-            return href ? href.replace(/^(https?\:)?\/\/[^\/]*/, '') : '';
-        };
-
-        //////////////////////////////////////////////////////////////
-        // Cookies API
-        //////////////////////////////////////////////////////////////
-        var lastCookies = {};
-        var lastCookieString = '';
-        var cookiePath = self.baseHref();
-
-        /**
-         * @name $browser#cookies
-         *
-         * @param {string=} name Cookie name
-         * @param {string=} value Cookie value
-         *
-         * @description
-         * The cookies method provides a 'private' low level access to browser cookies.
-         * It is not meant to be used directly, use the $cookie service instead.
-         *
-         * The return values vary depending on the arguments that the method was called with as follows:
-         *
-         * - cookies() -> hash of all cookies, this is NOT a copy of the internal state, so do not modify
-         *   it
-         * - cookies(name, value) -> set name to value, if value is undefined delete the cookie
-         * - cookies(name) -> the same as (name, undefined) == DELETES (no one calls it right now that
-         *   way)
-         *
-         * @returns {Object} Hash of all cookies (if called without any parameter)
-         */
-        self.cookies = function(name, value) {
-            /* global escape: false, unescape: false */
-            var cookieLength, cookieArray, cookie, i, index;
-
-            if (name) {
-                if (value === undefined) {
-                    rawDocument.cookie = escape(name) + "=;path=" + cookiePath +
-                    ";expires=Thu, 01 Jan 1970 00:00:00 GMT";
-                } else {
-                    if (isString(value)) {
-                        cookieLength = (rawDocument.cookie = escape(name) + '=' + escape(value) +
-                        ';path=' + cookiePath).length + 1;
-
-                        // per http://www.ietf.org/rfc/rfc2109.txt browser must allow at minimum:
-                        // - 300 cookies
-                        // - 20 cookies per unique domain
-                        // - 4096 bytes per cookie
-                        if (cookieLength > 4096) {
-                            $log.warn("Cookie '"+ name +
-                            "' possibly not set or overflowed because it was too large ("+
-                            cookieLength + " > 4096 bytes)!");
-                        }
-                    }
-                }
-            } else {
-                if (rawDocument.cookie !== lastCookieString) {
-                    lastCookieString = rawDocument.cookie;
-                    cookieArray = lastCookieString.split("; ");
-                    lastCookies = {};
-
-                    for (i = 0; i < cookieArray.length; i++) {
-                        cookie = cookieArray[i];
-                        index = cookie.indexOf('=');
-                        if (index > 0) { //ignore nameless cookies
-                            name = unescape(cookie.substring(0, index));
-                            // the first value that is seen for a cookie is the most
-                            // specific one.  values for the same cookie name that
-                            // follow are for less specific paths.
-                            if (lastCookies[name] === undefined) {
-                                lastCookies[name] = unescape(cookie.substring(index + 1));
-                            }
-                        }
-                    }
-                }
-                return lastCookies;
-            }
+            return href ? href.replace(/^(https?:)?\/\/[^/]*/, '') : '';
         };
 
-
         /**
          * @name $browser#defer
          * @param {function()} fn A function, who's execution should be deferred.
@@ -4627,9 +6733,10 @@
 
     }
 
-    function $BrowserProvider(){
+    /** @this */
+    function $BrowserProvider() {
         this.$get = ['$window', '$log', '$sniffer', '$document',
-            function( $window,   $log,   $sniffer,   $document){
+            function($window, $log, $sniffer, $document) {
                 return new Browser($window, $document, $log, $sniffer);
             }];
     }
@@ -4637,6 +6744,7 @@
     /**
      * @ngdoc service
      * @name $cacheFactory
+     * @this
      *
      * @description
      * Factory that constructs {@link $cacheFactory.Cache Cache} objects and gives access to
@@ -4673,7 +6781,7 @@
      * - `{void}` `destroy()` — Removes references to this cache from $cacheFactory.
      *
      * @example
-     <example module="cacheExampleApp">
+     <example module="cacheExampleApp" name="cache-factory">
      <file name="index.html">
      <div ng-controller="CacheController">
      <input ng-model="newCacheKey" placeholder="Key">
@@ -4701,8 +6809,10 @@
            $scope.keys = [];
            $scope.cache = $cacheFactory('cacheId');
            $scope.put = function(key, value) {
-             $scope.cache.put(key, value);
-             $scope.keys.push(key);
+             if (angular.isUndefined($scope.cache.get(key))) {
+               $scope.keys.push(key);
+             }
+             $scope.cache.put(key, angular.isUndefined(value) ? null : value);
            };
          }]);
      </file>
@@ -4720,14 +6830,14 @@
 
             function cacheFactory(cacheId, options) {
                 if (cacheId in caches) {
-                    throw minErr('$cacheFactory')('iid', "CacheId '{0}' is already taken!", cacheId);
+                    throw minErr('$cacheFactory')('iid', 'CacheId \'{0}\' is already taken!', cacheId);
                 }
 
                 var size = 0,
                     stats = extend({}, options, {id: cacheId}),
-                    data = {},
+                    data = createMap(),
                     capacity = (options && options.capacity) || Number.MAX_VALUE,
-                    lruHash = {},
+                    lruHash = createMap(),
                     freshEnd = null,
                     staleEnd = null;
 
@@ -4737,45 +6847,45 @@
                  *
                  * @description
                  * A cache object used to store and retrieve data, primarily used by
-                 * {@link $http $http} and the {@link ng.directive:script script} directive to cache
-                 * templates and other data.
+                 * {@link $templateRequest $templateRequest} and the {@link ng.directive:script script}
+                 * directive to cache templates and other data.
                  *
                  * ```js
                  *  angular.module('superCache')
                  *    .factory('superCache', ['$cacheFactory', function($cacheFactory) {
-       *      return $cacheFactory('super-cache');
-       *    }]);
+                 *      return $cacheFactory('super-cache');
+                 *    }]);
                  * ```
                  *
                  * Example test:
                  *
                  * ```js
                  *  it('should behave like a cache', inject(function(superCache) {
-       *    superCache.put('key', 'value');
-       *    superCache.put('another key', 'another value');
-       *
-       *    expect(superCache.info()).toEqual({
-       *      id: 'super-cache',
-       *      size: 2
-       *    });
-       *
-       *    superCache.remove('another key');
-       *    expect(superCache.get('another key')).toBeUndefined();
-       *
-       *    superCache.removeAll();
-       *    expect(superCache.info()).toEqual({
-       *      id: 'super-cache',
-       *      size: 0
-       *    });
-       *  }));
+                 *    superCache.put('key', 'value');
+                 *    superCache.put('another key', 'another value');
+                 *
+                 *    expect(superCache.info()).toEqual({
+                 *      id: 'super-cache',
+                 *      size: 2
+                 *    });
+                 *
+                 *    superCache.remove('another key');
+                 *    expect(superCache.get('another key')).toBeUndefined();
+                 *
+                 *    superCache.removeAll();
+                 *    expect(superCache.info()).toEqual({
+                 *      id: 'super-cache',
+                 *      size: 0
+                 *    });
+                 *  }));
                  * ```
                  */
-                return caches[cacheId] = {
+                return (caches[cacheId] = {
 
                     /**
                      * @ngdoc method
                      * @name $cacheFactory.Cache#put
-                     * @function
+                     * @kind function
                      *
                      * @description
                      * Inserts a named entry into the {@link $cacheFactory.Cache Cache} object to be
@@ -4791,13 +6901,13 @@
                      * @returns {*} the value stored.
                      */
                     put: function(key, value) {
+                        if (isUndefined(value)) return;
                         if (capacity < Number.MAX_VALUE) {
                             var lruEntry = lruHash[key] || (lruHash[key] = {key: key});
 
                             refresh(lruEntry);
                         }
 
-                        if (isUndefined(value)) return;
                         if (!(key in data)) size++;
                         data[key] = value;
 
@@ -4811,7 +6921,7 @@
                     /**
                      * @ngdoc method
                      * @name $cacheFactory.Cache#get
-                     * @function
+                     * @kind function
                      *
                      * @description
                      * Retrieves named data stored in the {@link $cacheFactory.Cache Cache} object.
@@ -4835,7 +6945,7 @@
                     /**
                      * @ngdoc method
                      * @name $cacheFactory.Cache#remove
-                     * @function
+                     * @kind function
                      *
                      * @description
                      * Removes an entry from the {@link $cacheFactory.Cache Cache} object.
@@ -4848,13 +6958,15 @@
 
                             if (!lruEntry) return;
 
-                            if (lruEntry == freshEnd) freshEnd = lruEntry.p;
-                            if (lruEntry == staleEnd) staleEnd = lruEntry.n;
+                            if (lruEntry === freshEnd) freshEnd = lruEntry.p;
+                            if (lruEntry === staleEnd) staleEnd = lruEntry.n;
                             link(lruEntry.n,lruEntry.p);
 
                             delete lruHash[key];
                         }
 
+                        if (!(key in data)) return;
+
                         delete data[key];
                         size--;
                     },
@@ -4863,15 +6975,15 @@
                     /**
                      * @ngdoc method
                      * @name $cacheFactory.Cache#removeAll
-                     * @function
+                     * @kind function
                      *
                      * @description
                      * Clears the cache object of any entries.
                      */
                     removeAll: function() {
-                        data = {};
+                        data = createMap();
                         size = 0;
-                        lruHash = {};
+                        lruHash = createMap();
                         freshEnd = staleEnd = null;
                     },
 
@@ -4879,7 +6991,7 @@
                     /**
                      * @ngdoc method
                      * @name $cacheFactory.Cache#destroy
-                     * @function
+                     * @kind function
                      *
                      * @description
                      * Destroys the {@link $cacheFactory.Cache Cache} object entirely,
@@ -4896,7 +7008,7 @@
                     /**
                      * @ngdoc method
                      * @name $cacheFactory.Cache#info
-                     * @function
+                     * @kind function
                      *
                      * @description
                      * Retrieve information regarding a particular {@link $cacheFactory.Cache Cache}.
@@ -4912,17 +7024,17 @@
                     info: function() {
                         return extend({}, stats, {size: size});
                     }
-                };
+                });
 
 
                 /**
                  * makes the `entry` the freshEnd of the LRU linked list
                  */
                 function refresh(entry) {
-                    if (entry != freshEnd) {
+                    if (entry !== freshEnd) {
                         if (!staleEnd) {
                             staleEnd = entry;
-                        } else if (staleEnd == entry) {
+                        } else if (staleEnd === entry) {
                             staleEnd = entry.n;
                         }
 
@@ -4938,7 +7050,7 @@
                  * bidirectionally links two entries of the LRU linked list
                  */
                 function link(nextEntry, prevEntry) {
-                    if (nextEntry != prevEntry) {
+                    if (nextEntry !== prevEntry) {
                         if (nextEntry) nextEntry.p = prevEntry; //p stands for previous, 'prev' didn't minify
                         if (prevEntry) prevEntry.n = nextEntry; //n stands for next, 'next' didn't minify
                     }
@@ -4951,7 +7063,7 @@
              * @name $cacheFactory#info
              *
              * @description
-             * Get information about all the of the caches that have been created
+             * Get information about all the caches that have been created
              *
              * @returns {Object} - key-value map of `cacheId` to the result of calling `cache#info`
              */
@@ -4986,11 +7098,15 @@
     /**
      * @ngdoc service
      * @name $templateCache
+     * @this
      *
      * @description
+     * `$templateCache` is a {@link $cacheFactory.Cache Cache object} created by the
+     * {@link ng.$cacheFactory $cacheFactory}.
+     *
      * The first time a template is used, it is loaded in the template cache for quick retrieval. You
-     * can load templates directly into the cache in a `script` tag, or by consuming the
-     * `$templateCache` service directly.
+     * can load templates directly into the cache in a `script` tag, by using {@link $templateRequest},
+     * or by consuming the `$templateCache` service directly.
      *
      * Adding via the `script` tag:
      *
@@ -5001,29 +7117,30 @@
      * ```
      *
      * **Note:** the `script` tag containing the template does not need to be included in the `head` of
-     * the document, but it must be below the `ng-app` definition.
+     * the document, but it must be a descendent of the {@link ng.$rootElement $rootElement} (e.g.
+     * element with {@link ngApp} attribute), otherwise the template will be ignored.
      *
-     * Adding via the $templateCache service:
+     * Adding via the `$templateCache` service:
      *
      * ```js
      * var myApp = angular.module('myApp', []);
      * myApp.run(function($templateCache) {
- *   $templateCache.put('templateId.html', 'This is the content of the template');
- * });
+     *   $templateCache.put('templateId.html', 'This is the content of the template');
+     * });
      * ```
      *
-     * To retrieve the template later, simply use it in your HTML:
-     * ```html
-     * <div ng-include=" 'templateId.html' "></div>
+     * To retrieve the template later, simply use it in your component:
+     * ```js
+     * myApp.component('myComponent', {
+     *    templateUrl: 'templateId.html'
+     * });
      * ```
      *
-     * or get it via Javascript:
+     * or get it via the `$templateCache` service:
      * ```js
      * $templateCache.get('templateId.html')
      * ```
      *
-     * See {@link ng.$cacheFactory $cacheFactory}.
-     *
      */
     function $TemplateCacheProvider() {
         this.$get = ['$cacheFactory', function($cacheFactory) {
@@ -5031,28 +7148,39 @@
         }];
     }
 
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables like document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
     /* ! VARIABLE/FUNCTION NAMING CONVENTIONS THAT APPLY TO THIS FILE!
-     *
-     * DOM-related variables:
-     *
-     * - "node" - DOM Node
-     * - "element" - DOM Element or Node
-     * - "$node" or "$element" - jqLite-wrapped node or element
-     *
-     *
-     * Compiler related stuff:
-     *
-     * - "linkFn" - linking fn of a single directive
-     * - "nodeLinkFn" - function that aggregates all linking fns for a particular node
-     * - "childLinkFn" -  function that aggregates all linking fns for child nodes of a particular node
-     * - "compositeLinkFn" - function that aggregates all linking fns for a compilation root (nodeList)
-     */
+ *
+ * DOM-related variables:
+ *
+ * - "node" - DOM Node
+ * - "element" - DOM Element or Node
+ * - "$node" or "$element" - jqLite-wrapped node or element
+ *
+ *
+ * Compiler related stuff:
+ *
+ * - "linkFn" - linking fn of a single directive
+ * - "nodeLinkFn" - function that aggregates all linking fns for a particular node
+ * - "childLinkFn" -  function that aggregates all linking fns for child nodes of a particular node
+ * - "compositeLinkFn" - function that aggregates all linking fns for a compilation root (nodeList)
+ */
 
 
     /**
      * @ngdoc service
      * @name $compile
-     * @function
+     * @kind function
      *
      * @description
      * Compiles an HTML string or DOM into a template and produces a template function, which
@@ -5072,8 +7200,9 @@
      * There are many different options for a directive.
      *
      * The difference resides in the return value of the factory function.
-     * You can either return a "Directive Definition Object" (see below) that defines the directive properties,
-     * or just the `postLink` function (all other properties will have the default values).
+     * You can either return a {@link $compile#directive-definition-object Directive Definition Object (see below)}
+     * that defines the directive properties, or just the `postLink` function (all other properties will have
+     * the default values).
      *
      * <div class="alert alert-success">
      * **Best Practice:** It's recommended to use the "directive definition object" form.
@@ -5085,36 +7214,38 @@
      *   var myModule = angular.module(...);
      *
      *   myModule.directive('directiveName', function factory(injectables) {
- *     var directiveDefinitionObject = {
- *       priority: 0,
- *       template: '<div></div>', // or // function(tElement, tAttrs) { ... },
- *       // or
- *       // templateUrl: 'directive.html', // or // function(tElement, tAttrs) { ... },
- *       replace: false,
- *       transclude: false,
- *       restrict: 'A',
- *       scope: false,
- *       controller: function($scope, $element, $attrs, $transclude, otherInjectables) { ... },
- *       controllerAs: 'stringAlias',
- *       require: 'siblingDirectiveName', // or // ['^parentDirectiveName', '?optionalDirectiveName', '?^optionalParent'],
- *       compile: function compile(tElement, tAttrs, transclude) {
- *         return {
- *           pre: function preLink(scope, iElement, iAttrs, controller) { ... },
- *           post: function postLink(scope, iElement, iAttrs, controller) { ... }
- *         }
- *         // or
- *         // return function postLink( ... ) { ... }
- *       },
- *       // or
- *       // link: {
- *       //  pre: function preLink(scope, iElement, iAttrs, controller) { ... },
- *       //  post: function postLink(scope, iElement, iAttrs, controller) { ... }
- *       // }
- *       // or
- *       // link: function postLink( ... ) { ... }
- *     };
- *     return directiveDefinitionObject;
- *   });
+     *     var directiveDefinitionObject = {
+     *       {@link $compile#-priority- priority}: 0,
+     *       {@link $compile#-template- template}: '<div></div>', // or // function(tElement, tAttrs) { ... },
+     *       // or
+     *       // {@link $compile#-templateurl- templateUrl}: 'directive.html', // or // function(tElement, tAttrs) { ... },
+     *       {@link $compile#-transclude- transclude}: false,
+     *       {@link $compile#-restrict- restrict}: 'A',
+     *       {@link $compile#-templatenamespace- templateNamespace}: 'html',
+     *       {@link $compile#-scope- scope}: false,
+     *       {@link $compile#-controller- controller}: function($scope, $element, $attrs, $transclude, otherInjectables) { ... },
+     *       {@link $compile#-controlleras- controllerAs}: 'stringIdentifier',
+     *       {@link $compile#-bindtocontroller- bindToController}: false,
+     *       {@link $compile#-require- require}: 'siblingDirectiveName', // or // ['^parentDirectiveName', '?optionalDirectiveName', '?^optionalParent'],
+     *       {@link $compile#-multielement- multiElement}: false,
+     *       {@link $compile#-compile- compile}: function compile(tElement, tAttrs, transclude) {
+     *         return {
+     *            {@link $compile#pre-linking-function pre}: function preLink(scope, iElement, iAttrs, controller) { ... },
+     *            {@link $compile#post-linking-function post}: function postLink(scope, iElement, iAttrs, controller) { ... }
+     *         }
+     *         // or
+     *         // return function postLink( ... ) { ... }
+     *       },
+     *       // or
+     *       // {@link $compile#-link- link}: {
+     *       //  {@link $compile#pre-linking-function pre}: function preLink(scope, iElement, iAttrs, controller) { ... },
+     *       //  {@link $compile#post-linking-function post}: function postLink(scope, iElement, iAttrs, controller) { ... }
+     *       // }
+     *       // or
+     *       // {@link $compile#-link- link}: function postLink( ... ) { ... }
+     *     };
+     *     return directiveDefinitionObject;
+     *   });
      * ```
      *
      * <div class="alert alert-warning">
@@ -5127,21 +7258,148 @@
      *   var myModule = angular.module(...);
      *
      *   myModule.directive('directiveName', function factory(injectables) {
- *     var directiveDefinitionObject = {
- *       link: function postLink(scope, iElement, iAttrs) { ... }
- *     };
- *     return directiveDefinitionObject;
- *     // or
- *     // return function postLink(scope, iElement, iAttrs) { ... }
- *   });
+     *     var directiveDefinitionObject = {
+     *       link: function postLink(scope, iElement, iAttrs) { ... }
+     *     };
+     *     return directiveDefinitionObject;
+     *     // or
+     *     // return function postLink(scope, iElement, iAttrs) { ... }
+     *   });
      * ```
      *
+     * ### Life-cycle hooks
+     * Directive controllers can provide the following methods that are called by AngularJS at points in the life-cycle of the
+     * directive:
+     * * `$onInit()` - Called on each controller after all the controllers on an element have been constructed and
+     *   had their bindings initialized (and before the pre &amp; post linking functions for the directives on
+     *   this element). This is a good place to put initialization code for your controller.
+     * * `$onChanges(changesObj)` - Called whenever one-way (`<`) or interpolation (`@`) bindings are updated. The
+     *   `changesObj` is a hash whose keys are the names of the bound properties that have changed, and the values are an
+     *   object of the form `{ currentValue, previousValue, isFirstChange() }`. Use this hook to trigger updates within a
+     *   component such as cloning the bound value to prevent accidental mutation of the outer value. Note that this will
+     *   also be called when your bindings are initialized.
+     * * `$doCheck()` - Called on each turn of the digest cycle. Provides an opportunity to detect and act on
+     *   changes. Any actions that you wish to take in response to the changes that you detect must be
+     *   invoked from this hook; implementing this has no effect on when `$onChanges` is called. For example, this hook
+     *   could be useful if you wish to perform a deep equality check, or to check a Date object, changes to which would not
+     *   be detected by AngularJS's change detector and thus not trigger `$onChanges`. This hook is invoked with no arguments;
+     *   if detecting changes, you must store the previous value(s) for comparison to the current values.
+     * * `$onDestroy()` - Called on a controller when its containing scope is destroyed. Use this hook for releasing
+     *   external resources, watches and event handlers. Note that components have their `$onDestroy()` hooks called in
+     *   the same order as the `$scope.$broadcast` events are triggered, which is top down. This means that parent
+     *   components will have their `$onDestroy()` hook called before child components.
+     * * `$postLink()` - Called after this controller's element and its children have been linked. Similar to the post-link
+     *   function this hook can be used to set up DOM event handlers and do direct DOM manipulation.
+     *   Note that child elements that contain `templateUrl` directives will not have been compiled and linked since
+     *   they are waiting for their template to load asynchronously and their own compilation and linking has been
+     *   suspended until that occurs.
+     *
+     * #### Comparison with life-cycle hooks in the new Angular
+     * The new Angular also uses life-cycle hooks for its components. While the AngularJS life-cycle hooks are similar there are
+     * some differences that you should be aware of, especially when it comes to moving your code from AngularJS to Angular:
+     *
+     * * AngularJS hooks are prefixed with `$`, such as `$onInit`. Angular hooks are prefixed with `ng`, such as `ngOnInit`.
+     * * AngularJS hooks can be defined on the controller prototype or added to the controller inside its constructor.
+     *   In Angular you can only define hooks on the prototype of the Component class.
+     * * Due to the differences in change-detection, you may get many more calls to `$doCheck` in AngularJS than you would to
+     *   `ngDoCheck` in Angular.
+     * * Changes to the model inside `$doCheck` will trigger new turns of the digest loop, which will cause the changes to be
+     *   propagated throughout the application.
+     *   Angular does not allow the `ngDoCheck` hook to trigger a change outside of the component. It will either throw an
+     *   error or do nothing depending upon the state of `enableProdMode()`.
+     *
+     * #### Life-cycle hook examples
+     *
+     * This example shows how you can check for mutations to a Date object even though the identity of the object
+     * has not changed.
+     *
+     * <example name="doCheckDateExample" module="do-check-module">
+     *   <file name="app.js">
+     *     angular.module('do-check-module', [])
+     *       .component('app', {
+     *         template:
+     *           'Month: <input ng-model="$ctrl.month" ng-change="$ctrl.updateDate()">' +
+     *           'Date: {{ $ctrl.date }}' +
+     *           '<test date="$ctrl.date"></test>',
+     *         controller: function() {
+     *           this.date = new Date();
+     *           this.month = this.date.getMonth();
+     *           this.updateDate = function() {
+     *             this.date.setMonth(this.month);
+     *           };
+     *         }
+     *       })
+     *       .component('test', {
+     *         bindings: { date: '<' },
+     *         template:
+     *           '<pre>{{ $ctrl.log | json }}</pre>',
+     *         controller: function() {
+     *           var previousValue;
+     *           this.log = [];
+     *           this.$doCheck = function() {
+     *             var currentValue = this.date && this.date.valueOf();
+     *             if (previousValue !== currentValue) {
+     *               this.log.push('doCheck: date mutated: ' + this.date);
+     *               previousValue = currentValue;
+     *             }
+     *           };
+     *         }
+     *       });
+     *   </file>
+     *   <file name="index.html">
+     *     <app></app>
+     *   </file>
+     * </example>
      *
+     * This example show how you might use `$doCheck` to trigger changes in your component's inputs even if the
+     * actual identity of the component doesn't change. (Be aware that cloning and deep equality checks on large
+     * arrays or objects can have a negative impact on your application performance)
      *
-     * ### Directive Definition Object
-     *
-     * The directive definition object provides instructions to the {@link ng.$compile
- * compiler}. The attributes are:
+     * <example name="doCheckArrayExample" module="do-check-module">
+     *   <file name="index.html">
+     *     <div ng-init="items = []">
+     *       <button ng-click="items.push(items.length)">Add Item</button>
+     *       <button ng-click="items = []">Reset Items</button>
+     *       <pre>{{ items }}</pre>
+     *       <test items="items"></test>
+     *     </div>
+     *   </file>
+     *   <file name="app.js">
+     *      angular.module('do-check-module', [])
+     *        .component('test', {
+     *          bindings: { items: '<' },
+     *          template:
+     *            '<pre>{{ $ctrl.log | json }}</pre>',
+     *          controller: function() {
+     *            this.log = [];
+     *
+     *            this.$doCheck = function() {
+     *              if (this.items_ref !== this.items) {
+     *                this.log.push('doCheck: items changed');
+     *                this.items_ref = this.items;
+     *              }
+     *              if (!angular.equals(this.items_clone, this.items)) {
+     *                this.log.push('doCheck: items mutated');
+     *                this.items_clone = angular.copy(this.items);
+     *              }
+     *            };
+     *          }
+     *        });
+     *   </file>
+     * </example>
+     *
+     *
+     * ### Directive Definition Object
+     *
+     * The directive definition object provides instructions to the {@link ng.$compile
+ * compiler}. The attributes are:
+     *
+     * #### `multiElement`
+     * When this property is set to true (default is `false`), the HTML compiler will collect DOM nodes between
+     * nodes with the attributes `directive-name-start` and `directive-name-end`, and group them
+     * together as the directive elements. It is recommended that this feature be used on directives
+     * which are not strictly behavioral (such as {@link ngClick}), and which
+     * do not manipulate or replace child nodes (such as {@link ngInclude}).
      *
      * #### `priority`
      * When there are multiple directives defined on a single DOM element, sometimes it
@@ -5154,136 +7412,269 @@
      * #### `terminal`
      * If set to true then the current `priority` will be the last set of directives
      * which will execute (any directives at the current priority will still execute
-     * as the order of execution on same `priority` is undefined).
+     * as the order of execution on same `priority` is undefined). Note that expressions
+     * and other directives used in the directive's template will also be excluded from execution.
      *
      * #### `scope`
-     * **If set to `true`,** then a new scope will be created for this directive. If multiple directives on the
-     * same element request a new scope, only one new scope is created. The new scope rule does not
-     * apply for the root of the template since the root of the template always gets a new scope.
+     * The scope property can be `false`, `true`, or an object:
      *
-     * **If set to `{}` (object hash),** then a new "isolate" scope is created. The 'isolate' scope differs from
-     * normal scope in that it does not prototypically inherit from the parent scope. This is useful
-     * when creating reusable components, which should not accidentally read or modify data in the
-     * parent scope.
+     * * **`false` (default):** No scope will be created for the directive. The directive will use its
+     * parent's scope.
      *
-     * The 'isolate' scope takes an object hash which defines a set of local scope properties
-     * derived from the parent scope. These local properties are useful for aliasing values for
-     * templates. Locals definition is a hash of local scope property to its source:
+     * * **`true`:** A new child scope that prototypically inherits from its parent will be created for
+     * the directive's element. If multiple directives on the same element request a new scope,
+     * only one new scope is created.
+     *
+     * * **`{...}` (an object hash):** A new "isolate" scope is created for the directive's template.
+     * The 'isolate' scope differs from normal scope in that it does not prototypically
+     * inherit from its parent scope. This is useful when creating reusable components, which should not
+     * accidentally read or modify data in the parent scope. Note that an isolate scope
+     * directive without a `template` or `templateUrl` will not apply the isolate scope
+     * to its children elements.
+     *
+     * The 'isolate' scope object hash defines a set of local scope properties derived from attributes on the
+     * directive's element. These local properties are useful for aliasing values for templates. The keys in
+     * the object hash map to the name of the property on the isolate scope; the values define how the property
+     * is bound to the parent scope, via matching attributes on the directive's element:
      *
      * * `@` or `@attr` - bind a local scope property to the value of DOM attribute. The result is
-     *   always a string since DOM attributes are strings. If no `attr` name is specified  then the
-     *   attribute name is assumed to be the same as the local name.
-     *   Given `<widget my-attr="hello {{name}}">` and widget definition
-     *   of `scope: { localName:'@myAttr' }`, then widget scope property `localName` will reflect
-     *   the interpolated value of `hello {{name}}`. As the `name` attribute changes so will the
-     *   `localName` property on the widget scope. The `name` is read from the parent scope (not
-     *   component scope).
-     *
-     * * `=` or `=attr` - set up bi-directional binding between a local scope property and the
-     *   parent scope property of name defined via the value of the `attr` attribute. If no `attr`
-     *   name is specified then the attribute name is assumed to be the same as the local name.
-     *   Given `<widget my-attr="parentModel">` and widget definition of
-     *   `scope: { localModel:'=myAttr' }`, then widget scope property `localModel` will reflect the
+     *   always a string since DOM attributes are strings. If no `attr` name is specified then the
+     *   attribute name is assumed to be the same as the local name. Given `<my-component
+     *   my-attr="hello {{name}}">` and the isolate scope definition `scope: { localName:'@myAttr' }`,
+     *   the directive's scope property `localName` will reflect the interpolated value of `hello
+     *   {{name}}`. As the `name` attribute changes so will the `localName` property on the directive's
+     *   scope. The `name` is read from the parent scope (not the directive's scope).
+     *
+     * * `=` or `=attr` - set up a bidirectional binding between a local scope property and an expression
+     *   passed via the attribute `attr`. The expression is evaluated in the context of the parent scope.
+     *   If no `attr` name is specified then the attribute name is assumed to be the same as the local
+     *   name. Given `<my-component my-attr="parentModel">` and the isolate scope definition `scope: {
+     *   localModel: '=myAttr' }`, the property `localModel` on the directive's scope will reflect the
+     *   value of `parentModel` on the parent scope. Changes to `parentModel` will be reflected in
+     *   `localModel` and vice versa. Optional attributes should be marked as such with a question mark:
+     *   `=?` or `=?attr`. If the binding expression is non-assignable, or if the attribute isn't
+     *   optional and doesn't exist, an exception ({@link error/$compile/nonassign `$compile:nonassign`})
+     *   will be thrown upon discovering changes to the local value, since it will be impossible to sync
+     *   them back to the parent scope. By default, the {@link ng.$rootScope.Scope#$watch `$watch`}
+     *   method is used for tracking changes, and the equality check is based on object identity.
+     *   However, if an object literal or an array literal is passed as the binding expression, the
+     *   equality check is done by value (using the {@link angular.equals} function). It's also possible
+     *   to watch the evaluated value shallowly with {@link ng.$rootScope.Scope#$watchCollection
+ *   `$watchCollection`}: use `=*` or `=*attr` (`=*?` or `=*?attr` if the attribute is optional).
+     *
+     * * `<` or `<attr` - set up a one-way (one-directional) binding between a local scope property and an
+     *   expression passed via the attribute `attr`. The expression is evaluated in the context of the
+     *   parent scope. If no `attr` name is specified then the attribute name is assumed to be the same as the
+     *   local name. You can also make the binding optional by adding `?`: `<?` or `<?attr`.
+     *
+     *   For example, given `<my-component my-attr="parentModel">` and directive definition of
+     *   `scope: { localModel:'<myAttr' }`, then the isolated scope property `localModel` will reflect the
      *   value of `parentModel` on the parent scope. Any changes to `parentModel` will be reflected
-     *   in `localModel` and any changes in `localModel` will reflect in `parentModel`. If the parent
-     *   scope property doesn't exist, it will throw a NON_ASSIGNABLE_MODEL_EXPRESSION exception. You
-     *   can avoid this behavior using `=?` or `=?attr` in order to flag the property as optional.
+     *   in `localModel`, but changes in `localModel` will not reflect in `parentModel`. There are however
+     *   two caveats:
+     *     1. one-way binding does not copy the value from the parent to the isolate scope, it simply
+     *     sets the same value. That means if your bound value is an object, changes to its properties
+     *     in the isolated scope will be reflected in the parent scope (because both reference the same object).
+     *     2. one-way binding watches changes to the **identity** of the parent value. That means the
+     *     {@link ng.$rootScope.Scope#$watch `$watch`} on the parent value only fires if the reference
+     *     to the value has changed. In most cases, this should not be of concern, but can be important
+     *     to know if you one-way bind to an object, and then replace that object in the isolated scope.
+     *     If you now change a property of the object in your parent scope, the change will not be
+     *     propagated to the isolated scope, because the identity of the object on the parent scope
+     *     has not changed. Instead you must assign a new object.
+     *
+     *   One-way binding is useful if you do not plan to propagate changes to your isolated scope bindings
+     *   back to the parent. However, it does not make this completely impossible.
+     *
+     * * `&` or `&attr` - provides a way to execute an expression in the context of the parent scope. If
+     *   no `attr` name is specified then the attribute name is assumed to be the same as the local name.
+     *   Given `<my-component my-attr="count = count + value">` and the isolate scope definition `scope: {
+     *   localFn:'&myAttr' }`, the isolate scope property `localFn` will point to a function wrapper for
+     *   the `count = count + value` expression. Often it's desirable to pass data from the isolated scope
+     *   via an expression to the parent scope. This can be done by passing a map of local variable names
+     *   and values into the expression wrapper fn. For example, if the expression is `increment(amount)`
+     *   then we can specify the amount value by calling the `localFn` as `localFn({amount: 22})`.
+     *
+     * In general it's possible to apply more than one directive to one element, but there might be limitations
+     * depending on the type of scope required by the directives. The following points will help explain these limitations.
+     * For simplicity only two directives are taken into account, but it is also applicable for several directives:
+     *
+     * * **no scope** + **no scope** => Two directives which don't require their own scope will use their parent's scope
+     * * **child scope** + **no scope** =>  Both directives will share one single child scope
+     * * **child scope** + **child scope** =>  Both directives will share one single child scope
+     * * **isolated scope** + **no scope** =>  The isolated directive will use it's own created isolated scope. The other directive will use
+     * its parent's scope
+     * * **isolated scope** + **child scope** =>  **Won't work!** Only one scope can be related to one element. Therefore these directives cannot
+     * be applied to the same element.
+     * * **isolated scope** + **isolated scope**  =>  **Won't work!** Only one scope can be related to one element. Therefore these directives
+     * cannot be applied to the same element.
+     *
+     *
+     * #### `bindToController`
+     * This property is used to bind scope properties directly to the controller. It can be either
+     * `true` or an object hash with the same format as the `scope` property.
+     *
+     * When an isolate scope is used for a directive (see above), `bindToController: true` will
+     * allow a component to have its properties bound to the controller, rather than to scope.
+     *
+     * After the controller is instantiated, the initial values of the isolate scope bindings will be bound to the controller
+     * properties. You can access these bindings once they have been initialized by providing a controller method called
+     * `$onInit`, which is called after all the controllers on an element have been constructed and had their bindings
+     * initialized.
+     *
+     * <div class="alert alert-warning">
+     * **Deprecation warning:** if `$compileProcvider.preAssignBindingsEnabled(true)` was called, bindings for non-ES6 class
+     * controllers are bound to `this` before the controller constructor is called but this use is now deprecated. Please
+     * place initialization code that relies upon bindings inside a `$onInit` method on the controller, instead.
+     * </div>
      *
-     * * `&` or `&attr` - provides a way to execute an expression in the context of the parent scope.
-     *   If no `attr` name is specified then the attribute name is assumed to be the same as the
-     *   local name. Given `<widget my-attr="count = count + value">` and widget definition of
-     *   `scope: { localFn:'&myAttr' }`, then isolate scope property `localFn` will point to
-     *   a function wrapper for the `count = count + value` expression. Often it's desirable to
-     *   pass data from the isolated scope via an expression and to the parent scope, this can be
-     *   done by passing a map of local variable names and values into the expression wrapper fn.
-     *   For example, if the expression is `increment(amount)` then we can specify the amount value
-     *   by calling the `localFn` as `localFn({amount: 22})`.
+     * It is also possible to set `bindToController` to an object hash with the same format as the `scope` property.
+     * This will set up the scope bindings to the controller directly. Note that `scope` can still be used
+     * to define which kind of scope is created. By default, no scope is created. Use `scope: {}` to create an isolate
+     * scope (useful for component directives).
      *
+     * If both `bindToController` and `scope` are defined and have object hashes, `bindToController` overrides `scope`.
      *
      *
      * #### `controller`
      * Controller constructor function. The controller is instantiated before the
-     * pre-linking phase and it is shared with other directives (see
+     * pre-linking phase and can be accessed by other directives (see
      * `require` attribute). This allows the directives to communicate with each other and augment
      * each other's behavior. The controller is injectable (and supports bracket notation) with the following locals:
      *
      * * `$scope` - Current scope associated with the element
      * * `$element` - Current element
      * * `$attrs` - Current attributes object for the element
-     * * `$transclude` - A transclude linking function pre-bound to the correct transclusion scope.
-     *    The scope can be overridden by an optional first argument.
-     *   `function([scope], cloneLinkingFn)`.
-     *
+     * * `$transclude` - A transclude linking function pre-bound to the correct transclusion scope:
+     *   `function([scope], cloneLinkingFn, futureParentElement, slotName)`:
+     *    * `scope`: (optional) override the scope.
+     *    * `cloneLinkingFn`: (optional) argument to create clones of the original transcluded content.
+     *    * `futureParentElement` (optional):
+     *        * defines the parent to which the `cloneLinkingFn` will add the cloned elements.
+     *        * default: `$element.parent()` resp. `$element` for `transclude:'element'` resp. `transclude:true`.
+     *        * only needed for transcludes that are allowed to contain non html elements (e.g. SVG elements)
+     *          and when the `cloneLinkingFn` is passed,
+     *          as those elements need to created and cloned in a special way when they are defined outside their
+     *          usual containers (e.g. like `<svg>`).
+     *        * See also the `directive.templateNamespace` property.
+     *    * `slotName`: (optional) the name of the slot to transclude. If falsy (e.g. `null`, `undefined` or `''`)
+     *      then the default transclusion is provided.
+     *    The `$transclude` function also has a method on it, `$transclude.isSlotFilled(slotName)`, which returns
+     *    `true` if the specified slot contains content (i.e. one or more DOM nodes).
      *
      * #### `require`
      * Require another directive and inject its controller as the fourth argument to the linking function. The
-     * `require` takes a string name (or array of strings) of the directive(s) to pass in. If an array is used, the
-     * injected argument will be an array in corresponding order. If no such directive can be
-     * found, or if the directive does not have a controller, then an error is raised. The name can be prefixed with:
+     * `require` property can be a string, an array or an object:
+     * * a **string** containing the name of the directive to pass to the linking function
+     * * an **array** containing the names of directives to pass to the linking function. The argument passed to the
+     * linking function will be an array of controllers in the same order as the names in the `require` property
+     * * an **object** whose property values are the names of the directives to pass to the linking function. The argument
+     * passed to the linking function will also be an object with matching keys, whose values will hold the corresponding
+     * controllers.
+     *
+     * If the `require` property is an object and `bindToController` is truthy, then the required controllers are
+     * bound to the controller using the keys of the `require` property. This binding occurs after all the controllers
+     * have been constructed but before `$onInit` is called.
+     * If the name of the required controller is the same as the local name (the key), the name can be
+     * omitted. For example, `{parentDir: '^^'}` is equivalent to `{parentDir: '^^parentDir'}`.
+     * See the {@link $compileProvider#component} helper for an example of how this can be used.
+     * If no such required directive(s) can be found, or if the directive does not have a controller, then an error is
+     * raised (unless no link function is specified and the required controllers are not being bound to the directive
+     * controller, in which case error checking is skipped). The name can be prefixed with:
      *
      * * (no prefix) - Locate the required controller on the current element. Throw an error if not found.
      * * `?` - Attempt to locate the required controller or pass `null` to the `link` fn if not found.
-     * * `^` - Locate the required controller by searching the element's parents. Throw an error if not found.
-     * * `?^` - Attempt to locate the required controller by searching the element's parents or pass `null` to the
-     *   `link` fn if not found.
+     * * `^` - Locate the required controller by searching the element and its parents. Throw an error if not found.
+     * * `^^` - Locate the required controller by searching the element's parents. Throw an error if not found.
+     * * `?^` - Attempt to locate the required controller by searching the element and its parents or pass
+     *   `null` to the `link` fn if not found.
+     * * `?^^` - Attempt to locate the required controller by searching the element's parents, or pass
+     *   `null` to the `link` fn if not found.
      *
      *
      * #### `controllerAs`
-     * Controller alias at the directive scope. An alias for the controller so it
-     * can be referenced at the directive template. The directive needs to define a scope for this
-     * configuration to be used. Useful in the case when directive is used as component.
+     * Identifier name for a reference to the controller in the directive's scope.
+     * This allows the controller to be referenced from the directive template. This is especially
+     * useful when a directive is used as component, i.e. with an `isolate` scope. It's also possible
+     * to use it in a directive without an `isolate` / `new` scope, but you need to be aware that the
+     * `controllerAs` reference might overwrite a property that already exists on the parent scope.
      *
      *
      * #### `restrict`
      * String of subset of `EACM` which restricts the directive to a specific directive
-     * declaration style. If omitted, the default (attributes only) is used.
+     * declaration style. If omitted, the defaults (elements and attributes) are used.
      *
-     * * `E` - Element name: `<my-directive></my-directive>`
+     * * `E` - Element name (default): `<my-directive></my-directive>`
      * * `A` - Attribute (default): `<div my-directive="exp"></div>`
      * * `C` - Class: `<div class="my-directive: exp;"></div>`
      * * `M` - Comment: `<!-- directive: my-directive exp -->`
      *
      *
+     * #### `templateNamespace`
+     * String representing the document type used by the markup in the template.
+     * AngularJS needs this information as those elements need to be created and cloned
+     * in a special way when they are defined outside their usual containers like `<svg>` and `<math>`.
+     *
+     * * `html` - All root nodes in the template are HTML. Root nodes may also be
+     *   top-level elements such as `<svg>` or `<math>`.
+     * * `svg` - The root nodes in the template are SVG elements (excluding `<math>`).
+     * * `math` - The root nodes in the template are MathML elements (excluding `<svg>`).
+     *
+     * If no `templateNamespace` is specified, then the namespace is considered to be `html`.
+     *
      * #### `template`
-     * replace the current element with the contents of the HTML. The replacement process
-     * migrates all of the attributes / classes from the old element to the new one. See the
-     * {@link guide/directive#creating-custom-directives_creating-directives_template-expanding-directive
- * Directives Guide} for an example.
+     * HTML markup that may:
+     * * Replace the contents of the directive's element (default).
+     * * Replace the directive's element itself (if `replace` is true - DEPRECATED).
+     * * Wrap the contents of the directive's element (if `transclude` is true).
      *
-     * You can specify `template` as a string representing the template or as a function which takes
-     * two arguments `tElement` and `tAttrs` (described in the `compile` function api below) and
-     * returns a string value representing the template.
+     * Value may be:
+     *
+     * * A string. For example `<div red-on-hover>{{delete_str}}</div>`.
+     * * A function which takes two arguments `tElement` and `tAttrs` (described in the `compile`
+     *   function api below) and returns a string value.
      *
      *
      * #### `templateUrl`
-     * Same as `template` but the template is loaded from the specified URL. Because
-     * the template loading is asynchronous the compilation/linking is suspended until the template
-     * is loaded.
+     * This is similar to `template` but the template is loaded from the specified URL, asynchronously.
+     *
+     * Because template loading is asynchronous the compiler will suspend compilation of directives on that element
+     * for later when the template has been resolved.  In the meantime it will continue to compile and link
+     * sibling and parent elements as though this element had not contained any directives.
+     *
+     * The compiler does not suspend the entire compilation to wait for templates to be loaded because this
+     * would result in the whole app "stalling" until all templates are loaded asynchronously - even in the
+     * case when only one deeply nested directive has `templateUrl`.
+     *
+     * Template loading is asynchronous even if the template has been preloaded into the {@link $templateCache}
      *
      * You can specify `templateUrl` as a string representing the URL or as a function which takes two
      * arguments `tElement` and `tAttrs` (described in the `compile` function api below) and returns
      * a string value representing the url.  In either case, the template URL is passed through {@link
-        * api/ng.$sce#getTrustedResourceUrl $sce.getTrustedResourceUrl}.
+        * $sce#getTrustedResourceUrl $sce.getTrustedResourceUrl}.
      *
      *
-     * #### `replace`
-     * specify where the template should be inserted. Defaults to `false`.
+     * #### `replace` (*DEPRECATED*)
      *
-     * * `true` - the template will replace the current element.
-     * * `false` - the template will replace the contents of the current element.
+     * `replace` will be removed in next major release - i.e. v2.0).
      *
+     * Specifies what the template should replace. Defaults to `false`.
      *
-     * #### `transclude`
-     * compile the content of the element and make it available to the directive.
-     * Typically used with {@link ng.directive:ngTransclude
- * ngTransclude}. The advantage of transclusion is that the linking function receives a
-     * transclusion function which is pre-bound to the correct scope. In a typical setup the widget
-     * creates an `isolate` scope, but the transclusion is not a child, but a sibling of the `isolate`
-     * scope. This makes it possible for the widget to have private state, and the transclusion to
-     * be bound to the parent (pre-`isolate`) scope.
+     * * `true` - the template will replace the directive's element.
+     * * `false` - the template will replace the contents of the directive's element.
+     *
+     * The replacement process migrates all of the attributes / classes from the old element to the new
+     * one. See the {@link guide/directive#template-expanding-directive
+ * Directives Guide} for an example.
+     *
+     * There are very few scenarios where element replacement is required for the application function,
+     * the main one being reusable custom components that are used within SVG contexts
+     * (because SVG doesn't work with custom elements in the DOM tree).
      *
-     * * `true` - transclude the content of the directive.
-     * * `'element'` - transclude the whole element including any directives defined at lower priority.
+     * #### `transclude`
+     * Extract the contents of the element where the directive appears and make it available to the directive.
+     * The contents are compiled and provided to the directive as a **transclusion function**. See the
+     * {@link $compile#transclusion Transclusion} section below.
      *
      *
      * #### `compile`
@@ -5293,11 +7684,7 @@
      * ```
      *
      * The compile function deals with transforming the template DOM. Since most directives do not do
-     * template transformation, it is not used often. Examples that require compile functions are
-     * directives that transform template DOM, such as {@link
-        * api/ng.directive:ngRepeat ngRepeat}, or load the contents
-     * asynchronously, such as {@link ngRoute.directive:ngView ngView}. The
-     * compile function takes the following arguments.
+     * template transformation, it is not used often. The compile function takes the following arguments:
      *
      *   * `tElement` - template element - The element where the directive has been declared. It is
      *     safe to do template transformation on the element and child elements only.
@@ -5316,7 +7703,7 @@
 
      * <div class="alert alert-warning">
      * **Note:** The compile function cannot handle directives that recursively use themselves in their
-     * own templates or compile functions. Compiling these directives results in an infinite loop and a
+     * own templates or compile functions. Compiling these directives results in an infinite loop and
      * stack overflow errors.
      *
      * This can be avoided by manually using $compile in the postLink function to imperatively compile
@@ -5324,7 +7711,7 @@
      * `templateUrl` declaration or manual compilation inside the compile function.
      * </div>
      *
-     * <div class="alert alert-error">
+     * <div class="alert alert-danger">
      * **Note:** The `transclude` function that is passed to the compile function is deprecated, as it
      *   e.g. does not know about the right outer scope. Please use the transclude function that is passed
      *   to the link function instead.
@@ -5361,15 +7748,23 @@
      *   * `iAttrs` - instance attributes - Normalized list of attributes declared on this element shared
      *     between all directive linking functions.
      *
-     *   * `controller` - a controller instance - A controller instance if at least one directive on the
-     *     element defines a controller. The controller is shared among all the directives, which allows
-     *     the directives to use the controllers as a communication channel.
+     *   * `controller` - the directive's required controller instance(s) - Instances are shared
+     *     among all directives, which allows the directives to use the controllers as a communication
+     *     channel. The exact value depends on the directive's `require` property:
+     *       * no controller(s) required: the directive's own controller, or `undefined` if it doesn't have one
+     *       * `string`: the controller instance
+     *       * `array`: array of controller instances
      *
-     *   * `transcludeFn` - A transclude linking function pre-bound to the correct transclusion scope.
-     *     The scope can be overridden by an optional first argument. This is the same as the `$transclude`
-     *     parameter of directive controllers.
-     *     `function([scope], cloneLinkingFn)`.
+     *     If a required controller cannot be found, and it is optional, the instance is `null`,
+     *     otherwise the {@link error:$compile:ctreq Missing Required Controller} error is thrown.
      *
+     *     Note that you can also require the directive's own controller - it will be made available like
+     *     any other controller.
+     *
+     *   * `transcludeFn` - A transclude linking function pre-bound to the correct transclusion scope.
+     *     This is the same as the `$transclude` parameter of directive controllers,
+     *     see {@link ng.$compile#-controller- the controller section for details}.
+     *     `function([scope], cloneLinkingFn, futureParentElement)`.
      *
      * #### Pre-linking function
      *
@@ -5378,18 +7773,166 @@
      *
      * #### Post-linking function
      *
-     * Executed after the child elements are linked. It is safe to do DOM transformation in the post-linking function.
+     * Executed after the child elements are linked.
+     *
+     * Note that child elements that contain `templateUrl` directives will not have been compiled
+     * and linked since they are waiting for their template to load asynchronously and their own
+     * compilation and linking has been suspended until that occurs.
+     *
+     * It is safe to do DOM transformation in the post-linking function on elements that are not waiting
+     * for their async templates to be resolved.
+     *
+     *
+     * ### Transclusion
+     *
+     * Transclusion is the process of extracting a collection of DOM elements from one part of the DOM and
+     * copying them to another part of the DOM, while maintaining their connection to the original AngularJS
+     * scope from where they were taken.
+     *
+     * Transclusion is used (often with {@link ngTransclude}) to insert the
+     * original contents of a directive's element into a specified place in the template of the directive.
+     * The benefit of transclusion, over simply moving the DOM elements manually, is that the transcluded
+     * content has access to the properties on the scope from which it was taken, even if the directive
+     * has isolated scope.
+     * See the {@link guide/directive#creating-a-directive-that-wraps-other-elements Directives Guide}.
+     *
+     * This makes it possible for the widget to have private state for its template, while the transcluded
+     * content has access to its originating scope.
+     *
+     * <div class="alert alert-warning">
+     * **Note:** When testing an element transclude directive you must not place the directive at the root of the
+     * DOM fragment that is being compiled. See {@link guide/unit-testing#testing-transclusion-directives
+ * Testing Transclusion Directives}.
+     * </div>
+     *
+     * There are three kinds of transclusion depending upon whether you want to transclude just the contents of the
+     * directive's element, the entire element or multiple parts of the element contents:
+     *
+     * * `true` - transclude the content (i.e. the child nodes) of the directive's element.
+     * * `'element'` - transclude the whole of the directive's element including any directives on this
+     *   element that defined at a lower priority than this directive. When used, the `template`
+     *   property is ignored.
+     * * **`{...}` (an object hash):** - map elements of the content onto transclusion "slots" in the template.
+     *
+     * **Mult-slot transclusion** is declared by providing an object for the `transclude` property.
+     *
+     * This object is a map where the keys are the name of the slot to fill and the value is an element selector
+     * used to match the HTML to the slot. The element selector should be in normalized form (e.g. `myElement`)
+     * and will match the standard element variants (e.g. `my-element`, `my:element`, `data-my-element`, etc).
+     *
+     * For further information check out the guide on {@link guide/directive#matching-directives Matching Directives}
+     *
+     * If the element selector is prefixed with a `?` then that slot is optional.
+     *
+     * For example, the transclude object `{ slotA: '?myCustomElement' }` maps `<my-custom-element>` elements to
+     * the `slotA` slot, which can be accessed via the `$transclude` function or via the {@link ngTransclude} directive.
+     *
+     * Slots that are not marked as optional (`?`) will trigger a compile time error if there are no matching elements
+     * in the transclude content. If you wish to know if an optional slot was filled with content, then you can call
+     * `$transclude.isSlotFilled(slotName)` on the transclude function passed to the directive's link function and
+     * injectable into the directive's controller.
+     *
+     *
+     * #### Transclusion Functions
+     *
+     * When a directive requests transclusion, the compiler extracts its contents and provides a **transclusion
+     * function** to the directive's `link` function and `controller`. This transclusion function is a special
+     * **linking function** that will return the compiled contents linked to a new transclusion scope.
+     *
+     * <div class="alert alert-info">
+     * If you are just using {@link ngTransclude} then you don't need to worry about this function, since
+     * ngTransclude will deal with it for us.
+     * </div>
+     *
+     * If you want to manually control the insertion and removal of the transcluded content in your directive
+     * then you must use this transclude function. When you call a transclude function it returns a a jqLite/JQuery
+     * object that contains the compiled DOM, which is linked to the correct transclusion scope.
+     *
+     * When you call a transclusion function you can pass in a **clone attach function**. This function accepts
+     * two parameters, `function(clone, scope) { ... }`, where the `clone` is a fresh compiled copy of your transcluded
+     * content and the `scope` is the newly created transclusion scope, which the clone will be linked to.
+     *
+     * <div class="alert alert-info">
+     * **Best Practice**: Always provide a `cloneFn` (clone attach function) when you call a transclude function
+     * since you then get a fresh clone of the original DOM and also have access to the new transclusion scope.
+     * </div>
+     *
+     * It is normal practice to attach your transcluded content (`clone`) to the DOM inside your **clone
+     * attach function**:
+     *
+     * ```js
+     * var transcludedContent, transclusionScope;
+     *
+     * $transclude(function(clone, scope) {
+     *   element.append(clone);
+     *   transcludedContent = clone;
+     *   transclusionScope = scope;
+     * });
+     * ```
+     *
+     * Later, if you want to remove the transcluded content from your DOM then you should also destroy the
+     * associated transclusion scope:
+     *
+     * ```js
+     * transcludedContent.remove();
+     * transclusionScope.$destroy();
+     * ```
+     *
+     * <div class="alert alert-info">
+     * **Best Practice**: if you intend to add and remove transcluded content manually in your directive
+     * (by calling the transclude function to get the DOM and calling `element.remove()` to remove it),
+     * then you are also responsible for calling `$destroy` on the transclusion scope.
+     * </div>
+     *
+     * The built-in DOM manipulation directives, such as {@link ngIf}, {@link ngSwitch} and {@link ngRepeat}
+     * automatically destroy their transcluded clones as necessary so you do not need to worry about this if
+     * you are simply using {@link ngTransclude} to inject the transclusion into your directive.
+     *
+     *
+     * #### Transclusion Scopes
+     *
+     * When you call a transclude function it returns a DOM fragment that is pre-bound to a **transclusion
+     * scope**. This scope is special, in that it is a child of the directive's scope (and so gets destroyed
+     * when the directive's scope gets destroyed) but it inherits the properties of the scope from which it
+     * was taken.
+     *
+     * For example consider a directive that uses transclusion and isolated scope. The DOM hierarchy might look
+     * like this:
+     *
+     * ```html
+     * <div ng-app>
+     *   <div isolate>
+     *     <div transclusion>
+     *     </div>
+     *   </div>
+     * </div>
+     * ```
+     *
+     * The `$parent` scope hierarchy will look like this:
+     *
+     ```
+     - $rootScope
+     - isolate
+     - transclusion
+     ```
+     *
+     * but the scopes will inherit prototypically from different scopes to their `$parent`.
+     *
+     ```
+     - $rootScope
+     - transclusion
+     - isolate
+     ```
+     *
      *
-     * <a name="Attributes"></a>
      * ### Attributes
      *
      * The {@link ng.$compile.directive.Attributes Attributes} object - passed as a parameter in the
      * `link()` or `compile()` functions. It has a variety of uses.
      *
-     * accessing *Normalized attribute names:*
-     * Directives like 'ngBind' can be expressed in many ways: 'ng:bind', `data-ng-bind`, or 'x-ng-bind'.
-     * the attributes object allows for normalized access to
-     *   the attributes.
+     * * *Accessing normalized attribute names:* Directives like 'ngBind' can be expressed in many ways:
+     *   'ng:bind', `data-ng-bind`, or 'x-ng-bind'. The attributes object allows for normalized access
+     *   to the attributes.
      *
      * * *Directive inter-communication:* All directives share the same instance of the attributes
      *   object which allows the directives to use the attributes object as inter directive
@@ -5405,30 +7948,30 @@
      *
      * ```js
      * function linkingFn(scope, elm, attrs, ctrl) {
- *   // get the attribute value
- *   console.log(attrs.ngModel);
- *
- *   // change the attribute
- *   attrs.$set('ngModel', 'new value');
- *
- *   // observe changes to interpolated attribute
- *   attrs.$observe('ngModel', function(value) {
- *     console.log('ngModel has changed value to ' + value);
- *   });
- * }
+     *   // get the attribute value
+     *   console.log(attrs.ngModel);
+     *
+     *   // change the attribute
+     *   attrs.$set('ngModel', 'new value');
+     *
+     *   // observe changes to interpolated attribute
+     *   attrs.$observe('ngModel', function(value) {
+     *     console.log('ngModel has changed value to ' + value);
+     *   });
+     * }
      * ```
      *
-     * Below is an example using `$compileProvider`.
+     * ## Example
      *
      * <div class="alert alert-warning">
      * **Note**: Typically directives are registered with `module.directive`. The example below is
      * to illustrate how `$compile` works.
      * </div>
      *
-     <example module="compile">
+     <example module="compileExample" name="compile">
      <file name="index.html">
      <script>
-     angular.module('compile', [], function($compileProvider) {
+     angular.module('compileExample', [], function($compileProvider) {
         // configure new 'compile' directive by passing a directive
         // factory function. The factory function injects the '$compile'
         $compileProvider.directive('compile', function($compile) {
@@ -5452,17 +7995,16 @@
               }
             );
           };
-        })
-      });
-
-     function Ctrl($scope) {
-        $scope.name = 'Angular';
+        });
+      })
+     .controller('GreeterController', ['$scope', function($scope) {
+        $scope.name = 'AngularJS';
         $scope.html = 'Hello {{name}}';
-      }
+      }]);
      </script>
-     <div ng-controller="Ctrl">
-     <input ng-model="name"> <br>
-     <textarea ng-model="html"></textarea> <br>
+     <div ng-controller="GreeterController">
+     <input ng-model="name"> <br/>
+     <textarea ng-model="html"></textarea> <br/>
      <div compile="html"></div>
      </div>
      </file>
@@ -5470,11 +8012,11 @@
      it('should auto compile', function() {
        var textarea = $('textarea');
        var output = $('div[compile]');
-       // The initial state reads 'Hello Angular'.
-       expect(output.getText()).toBe('Hello Angular');
+       // The initial state reads 'Hello AngularJS'.
+       expect(output.getText()).toBe('Hello AngularJS');
        textarea.clear();
        textarea.sendKeys('{{name}}!');
-       expect(output.getText()).toBe('Angular!');
+       expect(output.getText()).toBe('AngularJS!');
      });
      </file>
      </example>
@@ -5482,26 +8024,53 @@
      *
      *
      * @param {string|DOMElement} element Element or HTML string to compile into a template function.
-     * @param {function(angular.Scope, cloneAttachFn=)} transclude function available to directives.
+     * @param {function(angular.Scope, cloneAttachFn=)} transclude function available to directives - DEPRECATED.
+     *
+     * <div class="alert alert-danger">
+     * **Note:** Passing a `transclude` function to the $compile function is deprecated, as it
+     *   e.g. will not use the right outer scope. Please pass the transclude function as a
+     *   `parentBoundTranscludeFn` to the link function instead.
+     * </div>
+     *
      * @param {number} maxPriority only apply directives lower than given priority (Only effects the
      *                 root element(s), not their children)
-     * @returns {function(scope, cloneAttachFn=)} a link function which is used to bind template
+     * @returns {function(scope, cloneAttachFn=, options=)} a link function which is used to bind template
      * (a DOM element/tree) to a scope. Where:
      *
      *  * `scope` - A {@link ng.$rootScope.Scope Scope} to bind to.
      *  * `cloneAttachFn` - If `cloneAttachFn` is provided, then the link function will clone the
      *  `template` and call the `cloneAttachFn` function allowing the caller to attach the
      *  cloned elements to the DOM document at the appropriate place. The `cloneAttachFn` is
-     *  called as: <br> `cloneAttachFn(clonedElement, scope)` where:
+     *  called as: <br/> `cloneAttachFn(clonedElement, scope)` where:
      *
      *      * `clonedElement` - is a clone of the original `element` passed into the compiler.
      *      * `scope` - is the current scope with which the linking function is working with.
      *
+     *  * `options` - An optional object hash with linking options. If `options` is provided, then the following
+     *  keys may be used to control linking behavior:
+     *
+     *      * `parentBoundTranscludeFn` - the transclude function made available to
+     *        directives; if given, it will be passed through to the link functions of
+     *        directives found in `element` during compilation.
+     *      * `transcludeControllers` - an object hash with keys that map controller names
+     *        to a hash with the key `instance`, which maps to the controller instance;
+     *        if given, it will make the controllers available to directives on the compileNode:
+     *        ```
+     *        {
+     *          parent: {
+     *            instance: parentControllerInstance
+     *          }
+     *        }
+     *        ```
+     *      * `futureParentElement` - defines the parent to which the `cloneAttachFn` will add
+     *        the cloned elements; only needed for transcludes that are allowed to contain non html
+     *        elements (e.g. SVG elements). See also the directive.controller property.
+     *
      * Calling the linking function returns the element of the template. It is either the original
      * element passed in, or the clone of the element if the `cloneAttachFn` is provided.
      *
      * After linking the view is not updated until after a call to $digest which typically is done by
-     * Angular automatically.
+     * AngularJS automatically.
      *
      * If you need access to the bound view, there are two ways to do it:
      *
@@ -5519,42 +8088,158 @@
      *         scope = ....;
      *
      *     var clonedElement = $compile(templateElement)(scope, function(clonedElement, scope) {
- *       //attach the clone to DOM document at the right place
- *     });
+     *       //attach the clone to DOM document at the right place
+     *     });
      *
      *     //now we have reference to the cloned DOM via `clonedElement`
      *   ```
      *
      *
      * For information on how the compiler works, see the
-     * {@link guide/compiler Angular HTML Compiler} section of the Developer Guide.
+     * {@link guide/compiler AngularJS HTML Compiler} section of the Developer Guide.
+     *
+     * @knownIssue
+     *
+     * ### Double Compilation
+     *
+     Double compilation occurs when an already compiled part of the DOM gets
+     compiled again. This is an undesired effect and can lead to misbehaving directives, performance issues,
+     and memory leaks. Refer to the Compiler Guide {@link guide/compiler#double-compilation-and-how-to-avoid-it
+   section on double compilation} for an in-depth explanation and ways to avoid it.
+     *
      */
 
     var $compileMinErr = minErr('$compile');
 
+    function UNINITIALIZED_VALUE() {}
+    var _UNINITIALIZED_VALUE = new UNINITIALIZED_VALUE();
+
     /**
      * @ngdoc provider
      * @name $compileProvider
-     * @function
      *
      * @description
      */
     $CompileProvider.$inject = ['$provide', '$$sanitizeUriProvider'];
+    /** @this */
     function $CompileProvider($provide, $$sanitizeUriProvider) {
         var hasDirectives = {},
             Suffix = 'Directive',
-            COMMENT_DIRECTIVE_REGEXP = /^\s*directive\:\s*([\d\w\-_]+)\s+(.*)$/,
-            CLASS_DIRECTIVE_REGEXP = /(([\d\w\-_]+)(?:\:([^;]+))?;?)/;
+            COMMENT_DIRECTIVE_REGEXP = /^\s*directive:\s*([\w-]+)\s+(.*)$/,
+            CLASS_DIRECTIVE_REGEXP = /(([\w-]+)(?::([^;]+))?;?)/,
+            ALL_OR_NOTHING_ATTRS = makeMap('ngSrc,ngSrcset,src,srcset'),
+            REQUIRE_PREFIX_REGEXP = /^(?:(\^\^?)?(\?)?(\^\^?)?)?/;
 
         // Ref: http://developers.whatwg.org/webappapis.html#event-handler-idl-attributes
         // The assumption is that future DOM event attribute names will begin with
         // 'on' and be composed of only English letters.
         var EVENT_HANDLER_ATTR_REGEXP = /^(on[a-z]+|formaction)$/;
+        var bindingCache = createMap();
+
+        function parseIsolateBindings(scope, directiveName, isController) {
+            var LOCAL_REGEXP = /^\s*([@&<]|=(\*?))(\??)\s*([\w$]*)\s*$/;
+
+            var bindings = createMap();
+
+            forEach(scope, function(definition, scopeName) {
+                if (definition in bindingCache) {
+                    bindings[scopeName] = bindingCache[definition];
+                    return;
+                }
+                var match = definition.match(LOCAL_REGEXP);
+
+                if (!match) {
+                    throw $compileMinErr('iscp',
+                        'Invalid {3} for directive \'{0}\'.' +
+                        ' Definition: {... {1}: \'{2}\' ...}',
+                        directiveName, scopeName, definition,
+                        (isController ? 'controller bindings definition' :
+                            'isolate scope definition'));
+                }
+
+                bindings[scopeName] = {
+                    mode: match[1][0],
+                    collection: match[2] === '*',
+                    optional: match[3] === '?',
+                    attrName: match[4] || scopeName
+                };
+                if (match[4]) {
+                    bindingCache[definition] = bindings[scopeName];
+                }
+            });
+
+            return bindings;
+        }
+
+        function parseDirectiveBindings(directive, directiveName) {
+            var bindings = {
+                isolateScope: null,
+                bindToController: null
+            };
+            if (isObject(directive.scope)) {
+                if (directive.bindToController === true) {
+                    bindings.bindToController = parseIsolateBindings(directive.scope,
+                        directiveName, true);
+                    bindings.isolateScope = {};
+                } else {
+                    bindings.isolateScope = parseIsolateBindings(directive.scope,
+                        directiveName, false);
+                }
+            }
+            if (isObject(directive.bindToController)) {
+                bindings.bindToController =
+                    parseIsolateBindings(directive.bindToController, directiveName, true);
+            }
+            if (bindings.bindToController && !directive.controller) {
+                // There is no controller
+                throw $compileMinErr('noctrl',
+                    'Cannot bind to controller without directive \'{0}\'s controller.',
+                    directiveName);
+            }
+            return bindings;
+        }
+
+        function assertValidDirectiveName(name) {
+            var letter = name.charAt(0);
+            if (!letter || letter !== lowercase(letter)) {
+                throw $compileMinErr('baddir', 'Directive/Component name \'{0}\' is invalid. The first character must be a lowercase letter', name);
+            }
+            if (name !== name.trim()) {
+                throw $compileMinErr('baddir',
+                    'Directive/Component name \'{0}\' is invalid. The name should not contain leading or trailing whitespaces',
+                    name);
+            }
+        }
+
+        function getDirectiveRequire(directive) {
+            var require = directive.require || (directive.controller && directive.name);
+
+            if (!isArray(require) && isObject(require)) {
+                forEach(require, function(value, key) {
+                    var match = value.match(REQUIRE_PREFIX_REGEXP);
+                    var name = value.substring(match[0].length);
+                    if (!name) require[key] = match[0] + key;
+                });
+            }
+
+            return require;
+        }
+
+        function getDirectiveRestrict(restrict, name) {
+            if (restrict && !(isString(restrict) && /[EACM]/.test(restrict))) {
+                throw $compileMinErr('badrestrict',
+                    'Restrict property \'{0}\' of directive \'{1}\' is invalid',
+                    restrict,
+                    name);
+            }
+
+            return restrict || 'EA';
+        }
 
         /**
          * @ngdoc method
          * @name $compileProvider#directive
-         * @function
+         * @kind function
          *
          * @description
          * Register a new directive with the compiler.
@@ -5562,13 +8247,15 @@
          * @param {string|Object} name Name of the directive in camel-case (i.e. <code>ngBind</code> which
          *    will match as <code>ng-bind</code>), or an object map of directives where the keys are the
          *    names and the values are the factories.
-         * @param {Function|Array} directiveFactory An injectable directive factory function. See
-         *    {@link guide/directive} for more info.
+         * @param {Function|Array} directiveFactory An injectable directive factory function. See the
+         *    {@link guide/directive directive guide} and the {@link $compile compile API} for more info.
          * @returns {ng.$compileProvider} Self for chaining.
          */
         this.directive = function registerDirective(name, directiveFactory) {
+            assertArg(name, 'name');
             assertNotHasOwnProperty(name, 'directive');
             if (isString(name)) {
+                assertValidDirectiveName(name);
                 assertArg(directiveFactory, 'directiveFactory');
                 if (!hasDirectives.hasOwnProperty(name)) {
                     hasDirectives[name] = [];
@@ -5586,8 +8273,9 @@
                                     directive.priority = directive.priority || 0;
                                     directive.index = index;
                                     directive.name = directive.name || name;
-                                    directive.require = directive.require || (directive.controller && directive.name);
-                                    directive.restrict = directive.restrict || 'A';
+                                    directive.require = getDirectiveRequire(directive);
+                                    directive.restrict = getDirectiveRestrict(directive.restrict, name);
+                                    directive.$$moduleName = directiveFactory.$$moduleName;
                                     directives.push(directive);
                                 } catch (e) {
                                     $exceptionHandler(e);
@@ -5603,17 +8291,164 @@
             return this;
         };
 
+        /**
+         * @ngdoc method
+         * @name $compileProvider#component
+         * @module ng
+         * @param {string|Object} name Name of the component in camelCase (i.e. `myComp` which will match `<my-comp>`),
+         *    or an object map of components where the keys are the names and the values are the component definition objects.
+         * @param {Object} options Component definition object (a simplified
+         *    {@link ng.$compile#directive-definition-object directive definition object}),
+         *    with the following properties (all optional):
+         *
+         *    - `controller` – `{(string|function()=}` – controller constructor function that should be
+         *      associated with newly created scope or the name of a {@link ng.$compile#-controller-
+   *      registered controller} if passed as a string. An empty `noop` function by default.
+         *    - `controllerAs` – `{string=}` – identifier name for to reference the controller in the component's scope.
+         *      If present, the controller will be published to scope under the `controllerAs` name.
+         *      If not present, this will default to be `$ctrl`.
+         *    - `template` – `{string=|function()=}` – html template as a string or a function that
+         *      returns an html template as a string which should be used as the contents of this component.
+         *      Empty string by default.
+         *
+         *      If `template` is a function, then it is {@link auto.$injector#invoke injected} with
+         *      the following locals:
+         *
+         *      - `$element` - Current element
+         *      - `$attrs` - Current attributes object for the element
+         *
+         *    - `templateUrl` – `{string=|function()=}` – path or function that returns a path to an html
+         *      template that should be used  as the contents of this component.
+         *
+         *      If `templateUrl` is a function, then it is {@link auto.$injector#invoke injected} with
+         *      the following locals:
+         *
+         *      - `$element` - Current element
+         *      - `$attrs` - Current attributes object for the element
+         *
+         *    - `bindings` – `{object=}` – defines bindings between DOM attributes and component properties.
+         *      Component properties are always bound to the component controller and not to the scope.
+         *      See {@link ng.$compile#-bindtocontroller- `bindToController`}.
+         *    - `transclude` – `{boolean=}` – whether {@link $compile#transclusion content transclusion} is enabled.
+         *      Disabled by default.
+         *    - `require` - `{Object<string, string>=}` - requires the controllers of other directives and binds them to
+         *      this component's controller. The object keys specify the property names under which the required
+         *      controllers (object values) will be bound. See {@link ng.$compile#-require- `require`}.
+         *    - `$...` – additional properties to attach to the directive factory function and the controller
+         *      constructor function. (This is used by the component router to annotate)
+         *
+         * @returns {ng.$compileProvider} the compile provider itself, for chaining of function calls.
+         * @description
+         * Register a **component definition** with the compiler. This is a shorthand for registering a special
+         * type of directive, which represents a self-contained UI component in your application. Such components
+         * are always isolated (i.e. `scope: {}`) and are always restricted to elements (i.e. `restrict: 'E'`).
+         *
+         * Component definitions are very simple and do not require as much configuration as defining general
+         * directives. Component definitions usually consist only of a template and a controller backing it.
+         *
+         * In order to make the definition easier, components enforce best practices like use of `controllerAs`,
+         * `bindToController`. They always have **isolate scope** and are restricted to elements.
+         *
+         * Here are a few examples of how you would usually define components:
+         *
+         * ```js
+         *   var myMod = angular.module(...);
+         *   myMod.component('myComp', {
+         *     template: '<div>My name is {{$ctrl.name}}</div>',
+         *     controller: function() {
+         *       this.name = 'shahar';
+         *     }
+         *   });
+         *
+         *   myMod.component('myComp', {
+         *     template: '<div>My name is {{$ctrl.name}}</div>',
+         *     bindings: {name: '@'}
+         *   });
+         *
+         *   myMod.component('myComp', {
+         *     templateUrl: 'views/my-comp.html',
+         *     controller: 'MyCtrl',
+         *     controllerAs: 'ctrl',
+         *     bindings: {name: '@'}
+         *   });
+         *
+         * ```
+         * For more examples, and an in-depth guide, see the {@link guide/component component guide}.
+         *
+         * <br />
+         * See also {@link ng.$compileProvider#directive $compileProvider.directive()}.
+         */
+        this.component = function registerComponent(name, options) {
+            if (!isString(name)) {
+                forEach(name, reverseParams(bind(this, registerComponent)));
+                return this;
+            }
+
+            var controller = options.controller || function() {};
+
+            function factory($injector) {
+                function makeInjectable(fn) {
+                    if (isFunction(fn) || isArray(fn)) {
+                        return /** @this */ function(tElement, tAttrs) {
+                            return $injector.invoke(fn, this, {$element: tElement, $attrs: tAttrs});
+                        };
+                    } else {
+                        return fn;
+                    }
+                }
+
+                var template = (!options.template && !options.templateUrl ? '' : options.template);
+                var ddo = {
+                    controller: controller,
+                    controllerAs: identifierForController(options.controller) || options.controllerAs || '$ctrl',
+                    template: makeInjectable(template),
+                    templateUrl: makeInjectable(options.templateUrl),
+                    transclude: options.transclude,
+                    scope: {},
+                    bindToController: options.bindings || {},
+                    restrict: 'E',
+                    require: options.require
+                };
+
+                // Copy annotations (starting with $) over to the DDO
+                forEach(options, function(val, key) {
+                    if (key.charAt(0) === '$') ddo[key] = val;
+                });
+
+                return ddo;
+            }
+
+            // TODO(pete) remove the following `forEach` before we release 1.6.0
+            // The component-router@0.2.0 looks for the annotations on the controller constructor
+            // Nothing in AngularJS looks for annotations on the factory function but we can't remove
+            // it from 1.5.x yet.
+
+            // Copy any annotation properties (starting with $) over to the factory and controller constructor functions
+            // These could be used by libraries such as the new component router
+            forEach(options, function(val, key) {
+                if (key.charAt(0) === '$') {
+                    factory[key] = val;
+                    // Don't try to copy over annotations to named controller
+                    if (isFunction(controller)) controller[key] = val;
+                }
+            });
+
+            factory.$inject = ['$injector'];
+
+            return this.directive(name, factory);
+        };
+
 
         /**
          * @ngdoc method
          * @name $compileProvider#aHrefSanitizationWhitelist
-         * @function
+         * @kind function
          *
          * @description
          * Retrieves or overrides the default regular expression that is used for whitelisting of safe
          * urls during a[href] sanitization.
          *
-         * The sanitization is a security measure aimed at prevent XSS attacks via html links.
+         * The sanitization is a security measure aimed at preventing XSS attacks via html links.
          *
          * Any url about to be assigned to a[href] via data-binding is first normalized and turned into
          * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist`
@@ -5637,7 +8472,7 @@
         /**
          * @ngdoc method
          * @name $compileProvider#imgSrcSanitizationWhitelist
-         * @function
+         * @kind function
          *
          * @description
          * Retrieves or overrides the default regular expression that is used for whitelisting of safe
@@ -5663,42 +8498,295 @@
             }
         };
 
-        this.$get = [
-            '$injector', '$interpolate', '$exceptionHandler', '$http', '$templateCache', '$parse',
-            '$controller', '$rootScope', '$document', '$sce', '$animate', '$$sanitizeUri',
-            function($injector,   $interpolate,   $exceptionHandler,   $http,   $templateCache,   $parse,
-                     $controller,   $rootScope,   $document,   $sce,   $animate,   $$sanitizeUri) {
-
-                var Attributes = function(element, attr) {
-                    this.$$element = element;
-                    this.$attr = attr || {};
-                };
+        /**
+         * @ngdoc method
+         * @name  $compileProvider#debugInfoEnabled
+         *
+         * @param {boolean=} enabled update the debugInfoEnabled state if provided, otherwise just return the
+         * current debugInfoEnabled state
+         * @returns {*} current value if used as getter or itself (chaining) if used as setter
+         *
+         * @kind function
+         *
+         * @description
+         * Call this method to enable/disable various debug runtime information in the compiler such as adding
+         * binding information and a reference to the current scope on to DOM elements.
+         * If enabled, the compiler will add the following to DOM elements that have been bound to the scope
+         * * `ng-binding` CSS class
+         * * `ng-scope` and `ng-isolated-scope` CSS classes
+         * * `$binding` data property containing an array of the binding expressions
+         * * Data properties used by the {@link angular.element#methods `scope()`/`isolateScope()` methods} to return
+         *   the element's scope.
+         * * Placeholder comments will contain information about what directive and binding caused the placeholder.
+         *   E.g. `<!-- ngIf: shouldShow() -->`.
+         *
+         * You may want to disable this in production for a significant performance boost. See
+         * {@link guide/production#disabling-debug-data Disabling Debug Data} for more.
+         *
+         * The default value is true.
+         */
+        var debugInfoEnabled = true;
+        this.debugInfoEnabled = function(enabled) {
+            if (isDefined(enabled)) {
+                debugInfoEnabled = enabled;
+                return this;
+            }
+            return debugInfoEnabled;
+        };
 
-                Attributes.prototype = {
-                    $normalize: directiveNormalize,
+        /**
+         * @ngdoc method
+         * @name  $compileProvider#preAssignBindingsEnabled
+         *
+         * @param {boolean=} enabled update the preAssignBindingsEnabled state if provided, otherwise just return the
+         * current preAssignBindingsEnabled state
+         * @returns {*} current value if used as getter or itself (chaining) if used as setter
+         *
+         * @kind function
+         *
+         * @description
+         * Call this method to enable/disable whether directive controllers are assigned bindings before
+         * calling the controller's constructor.
+         * If enabled (true), the compiler assigns the value of each of the bindings to the
+         * properties of the controller object before the constructor of this object is called.
+         *
+         * If disabled (false), the compiler calls the constructor first before assigning bindings.
+         *
+         * The default value is false.
+         *
+         * @deprecated
+         * sinceVersion="1.6.0"
+         * removeVersion="1.7.0"
+         *
+         * This method and the option to assign the bindings before calling the controller's constructor
+         * will be removed in v1.7.0.
+         */
+        var preAssignBindingsEnabled = false;
+        this.preAssignBindingsEnabled = function(enabled) {
+            if (isDefined(enabled)) {
+                preAssignBindingsEnabled = enabled;
+                return this;
+            }
+            return preAssignBindingsEnabled;
+        };
 
+        /**
+         * @ngdoc method
+         * @name  $compileProvider#strictComponentBindingsEnabled
+         *
+         * @param {boolean=} enabled update the strictComponentBindingsEnabled state if provided, otherwise just return the
+         * current strictComponentBindingsEnabled state
+         * @returns {*} current value if used as getter or itself (chaining) if used as setter
+         *
+         * @kind function
+         *
+         * @description
+         * Call this method to enable/disable strict component bindings check. If enabled, the compiler will enforce that
+         * for all bindings of a component that are not set as optional with `?`, an attribute needs to be provided
+         * on the component's HTML tag.
+         *
+         * The default value is false.
+         */
+        var strictComponentBindingsEnabled = false;
+        this.strictComponentBindingsEnabled = function(enabled) {
+            if (isDefined(enabled)) {
+                strictComponentBindingsEnabled = enabled;
+                return this;
+            }
+            return strictComponentBindingsEnabled;
+        };
 
-                    /**
-                     * @ngdoc method
-                     * @name $compile.directive.Attributes#$addClass
-                     * @function
-                     *
-                     * @description
-                     * Adds the CSS class value specified by the classVal parameter to the element. If animations
-                     * are enabled then an animation will be triggered for the class addition.
-                     *
-                     * @param {string} classVal The className value that will be added to the element
-                     */
-                    $addClass : function(classVal) {
-                        if(classVal && classVal.length > 0) {
-                            $animate.addClass(this.$$element, classVal);
+        var TTL = 10;
+        /**
+         * @ngdoc method
+         * @name $compileProvider#onChangesTtl
+         * @description
+         *
+         * Sets the number of times `$onChanges` hooks can trigger new changes before giving up and
+         * assuming that the model is unstable.
+         *
+         * The current default is 10 iterations.
+         *
+         * In complex applications it's possible that dependencies between `$onChanges` hooks and bindings will result
+         * in several iterations of calls to these hooks. However if an application needs more than the default 10
+         * iterations to stabilize then you should investigate what is causing the model to continuously change during
+         * the `$onChanges` hook execution.
+         *
+         * Increasing the TTL could have performance implications, so you should not change it without proper justification.
+         *
+         * @param {number} limit The number of `$onChanges` hook iterations.
+         * @returns {number|object} the current limit (or `this` if called as a setter for chaining)
+         */
+        this.onChangesTtl = function(value) {
+            if (arguments.length) {
+                TTL = value;
+                return this;
+            }
+            return TTL;
+        };
+
+        var commentDirectivesEnabledConfig = true;
+        /**
+         * @ngdoc method
+         * @name $compileProvider#commentDirectivesEnabled
+         * @description
+         *
+         * It indicates to the compiler
+         * whether or not directives on comments should be compiled.
+         * Defaults to `true`.
+         *
+         * Calling this function with false disables the compilation of directives
+         * on comments for the whole application.
+         * This results in a compilation performance gain,
+         * as the compiler doesn't have to check comments when looking for directives.
+         * This should however only be used if you are sure that no comment directives are used in
+         * the application (including any 3rd party directives).
+         *
+         * @param {boolean} enabled `false` if the compiler may ignore directives on comments
+         * @returns {boolean|object} the current value (or `this` if called as a setter for chaining)
+         */
+        this.commentDirectivesEnabled = function(value) {
+            if (arguments.length) {
+                commentDirectivesEnabledConfig = value;
+                return this;
+            }
+            return commentDirectivesEnabledConfig;
+        };
+
+
+        var cssClassDirectivesEnabledConfig = true;
+        /**
+         * @ngdoc method
+         * @name $compileProvider#cssClassDirectivesEnabled
+         * @description
+         *
+         * It indicates to the compiler
+         * whether or not directives on element classes should be compiled.
+         * Defaults to `true`.
+         *
+         * Calling this function with false disables the compilation of directives
+         * on element classes for the whole application.
+         * This results in a compilation performance gain,
+         * as the compiler doesn't have to check element classes when looking for directives.
+         * This should however only be used if you are sure that no class directives are used in
+         * the application (including any 3rd party directives).
+         *
+         * @param {boolean} enabled `false` if the compiler may ignore directives on element classes
+         * @returns {boolean|object} the current value (or `this` if called as a setter for chaining)
+         */
+        this.cssClassDirectivesEnabled = function(value) {
+            if (arguments.length) {
+                cssClassDirectivesEnabledConfig = value;
+                return this;
+            }
+            return cssClassDirectivesEnabledConfig;
+        };
+
+        this.$get = [
+            '$injector', '$interpolate', '$exceptionHandler', '$templateRequest', '$parse',
+            '$controller', '$rootScope', '$sce', '$animate', '$$sanitizeUri',
+            function($injector,   $interpolate,   $exceptionHandler,   $templateRequest,   $parse,
+                     $controller,   $rootScope,   $sce,   $animate,   $$sanitizeUri) {
+
+                var SIMPLE_ATTR_NAME = /^\w/;
+                var specialAttrHolder = window.document.createElement('div');
+
+
+                var commentDirectivesEnabled = commentDirectivesEnabledConfig;
+                var cssClassDirectivesEnabled = cssClassDirectivesEnabledConfig;
+
+
+                var onChangesTtl = TTL;
+                // The onChanges hooks should all be run together in a single digest
+                // When changes occur, the call to trigger their hooks will be added to this queue
+                var onChangesQueue;
+
+                // This function is called in a $$postDigest to trigger all the onChanges hooks in a single digest
+                function flushOnChangesQueue() {
+                    try {
+                        if (!(--onChangesTtl)) {
+                            // We have hit the TTL limit so reset everything
+                            onChangesQueue = undefined;
+                            throw $compileMinErr('infchng', '{0} $onChanges() iterations reached. Aborting!\n', TTL);
+                        }
+                        // We must run this hook in an apply since the $$postDigest runs outside apply
+                        $rootScope.$apply(function() {
+                            var errors = [];
+                            for (var i = 0, ii = onChangesQueue.length; i < ii; ++i) {
+                                try {
+                                    onChangesQueue[i]();
+                                } catch (e) {
+                                    errors.push(e);
+                                }
+                            }
+                            // Reset the queue to trigger a new schedule next time there is a change
+                            onChangesQueue = undefined;
+                            if (errors.length) {
+                                throw errors;
+                            }
+                        });
+                    } finally {
+                        onChangesTtl++;
+                    }
+                }
+
+
+                function Attributes(element, attributesToCopy) {
+                    if (attributesToCopy) {
+                        var keys = Object.keys(attributesToCopy);
+                        var i, l, key;
+
+                        for (i = 0, l = keys.length; i < l; i++) {
+                            key = keys[i];
+                            this[key] = attributesToCopy[key];
+                        }
+                    } else {
+                        this.$attr = {};
+                    }
+
+                    this.$$element = element;
+                }
+
+                Attributes.prototype = {
+                    /**
+                     * @ngdoc method
+                     * @name $compile.directive.Attributes#$normalize
+                     * @kind function
+                     *
+                     * @description
+                     * Converts an attribute name (e.g. dash/colon/underscore-delimited string, optionally prefixed with `x-` or
+                     * `data-`) to its normalized, camelCase form.
+                     *
+                     * Also there is special case for Moz prefix starting with upper case letter.
+                     *
+                     * For further information check out the guide on {@link guide/directive#matching-directives Matching Directives}
+                     *
+                     * @param {string} name Name to normalize
+                     */
+                    $normalize: directiveNormalize,
+
+
+                    /**
+                     * @ngdoc method
+                     * @name $compile.directive.Attributes#$addClass
+                     * @kind function
+                     *
+                     * @description
+                     * Adds the CSS class value specified by the classVal parameter to the element. If animations
+                     * are enabled then an animation will be triggered for the class addition.
+                     *
+                     * @param {string} classVal The className value that will be added to the element
+                     */
+                    $addClass: function(classVal) {
+                        if (classVal && classVal.length > 0) {
+                            $animate.addClass(this.$$element, classVal);
                         }
                     },
 
                     /**
                      * @ngdoc method
                      * @name $compile.directive.Attributes#$removeClass
-                     * @function
+                     * @kind function
                      *
                      * @description
                      * Removes the CSS class value specified by the classVal parameter from the element. If
@@ -5706,8 +8794,8 @@
                      *
                      * @param {string} classVal The className value that will be removed from the element
                      */
-                    $removeClass : function(classVal) {
-                        if(classVal && classVal.length > 0) {
+                    $removeClass: function(classVal) {
+                        if (classVal && classVal.length > 0) {
                             $animate.removeClass(this.$$element, classVal);
                         }
                     },
@@ -5715,7 +8803,7 @@
                     /**
                      * @ngdoc method
                      * @name $compile.directive.Attributes#$updateClass
-                     * @function
+                     * @kind function
                      *
                      * @description
                      * Adds and removes the appropriate CSS class values to the element based on the difference
@@ -5724,16 +8812,15 @@
                      * @param {string} newClasses The current CSS className value
                      * @param {string} oldClasses The former CSS className value
                      */
-                    $updateClass : function(newClasses, oldClasses) {
+                    $updateClass: function(newClasses, oldClasses) {
                         var toAdd = tokenDifference(newClasses, oldClasses);
-                        var toRemove = tokenDifference(oldClasses, newClasses);
+                        if (toAdd && toAdd.length) {
+                            $animate.addClass(this.$$element, toAdd);
+                        }
 
-                        if(toAdd.length === 0) {
+                        var toRemove = tokenDifference(oldClasses, newClasses);
+                        if (toRemove && toRemove.length) {
                             $animate.removeClass(this.$$element, toRemove);
-                        } else if(toRemove.length === 0) {
-                            $animate.addClass(this.$$element, toAdd);
-                        } else {
-                            $animate.setClass(this.$$element, toAdd, toRemove);
                         }
                     },
 
@@ -5751,13 +8838,18 @@
                         //is set through this function since it may cause $updateClass to
                         //become unstable.
 
-                        var booleanKey = getBooleanAttrName(this.$$element[0], key),
-                            normalizedVal,
+                        var node = this.$$element[0],
+                            booleanKey = getBooleanAttrName(node, key),
+                            aliasedKey = getAliasedAttrName(key),
+                            observer = key,
                             nodeName;
 
                         if (booleanKey) {
                             this.$$element.prop(key, value);
                             attrName = booleanKey;
+                        } else if (aliasedKey) {
+                            this[aliasedKey] = value;
+                            observer = aliasedKey;
                         }
 
                         this[key] = value;
@@ -5774,36 +8866,76 @@
 
                         nodeName = nodeName_(this.$$element);
 
-                        // sanitize a[href] and img[src] values
-                        if ((nodeName === 'A' && key === 'href') ||
-                            (nodeName === 'IMG' && key === 'src')) {
+                        if ((nodeName === 'a' && (key === 'href' || key === 'xlinkHref')) ||
+                            (nodeName === 'img' && key === 'src')) {
+                            // sanitize a[href] and img[src] values
                             this[key] = value = $$sanitizeUri(value, key === 'src');
+                        } else if (nodeName === 'img' && key === 'srcset' && isDefined(value)) {
+                            // sanitize img[srcset] values
+                            var result = '';
+
+                            // first check if there are spaces because it's not the same pattern
+                            var trimmedSrcset = trim(value);
+                            //                (   999x   ,|   999w   ,|   ,|,   )
+                            var srcPattern = /(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/;
+                            var pattern = /\s/.test(trimmedSrcset) ? srcPattern : /(,)/;
+
+                            // split srcset into tuple of uri and descriptor except for the last item
+                            var rawUris = trimmedSrcset.split(pattern);
+
+                            // for each tuples
+                            var nbrUrisWith2parts = Math.floor(rawUris.length / 2);
+                            for (var i = 0; i < nbrUrisWith2parts; i++) {
+                                var innerIdx = i * 2;
+                                // sanitize the uri
+                                result += $$sanitizeUri(trim(rawUris[innerIdx]), true);
+                                // add the descriptor
+                                result += (' ' + trim(rawUris[innerIdx + 1]));
+                            }
+
+                            // split the last item into uri and descriptor
+                            var lastTuple = trim(rawUris[i * 2]).split(/\s/);
+
+                            // sanitize the last uri
+                            result += $$sanitizeUri(trim(lastTuple[0]), true);
+
+                            // and add the last descriptor if any
+                            if (lastTuple.length === 2) {
+                                result += (' ' + trim(lastTuple[1]));
+                            }
+                            this[key] = value = result;
                         }
 
                         if (writeAttr !== false) {
-                            if (value === null || value === undefined) {
+                            if (value === null || isUndefined(value)) {
                                 this.$$element.removeAttr(attrName);
                             } else {
-                                this.$$element.attr(attrName, value);
+                                if (SIMPLE_ATTR_NAME.test(attrName)) {
+                                    this.$$element.attr(attrName, value);
+                                } else {
+                                    setSpecialAttr(this.$$element[0], attrName, value);
+                                }
                             }
                         }
 
                         // fire observers
                         var $$observers = this.$$observers;
-                        $$observers && forEach($$observers[key], function(fn) {
-                            try {
-                                fn(value);
-                            } catch (e) {
-                                $exceptionHandler(e);
-                            }
-                        });
+                        if ($$observers) {
+                            forEach($$observers[observer], function(fn) {
+                                try {
+                                    fn(value);
+                                } catch (e) {
+                                    $exceptionHandler(e);
+                                }
+                            });
+                        }
                     },
 
 
                     /**
                      * @ngdoc method
                      * @name $compile.directive.Attributes#$observe
-                     * @function
+                     * @kind function
                      *
                      * @description
                      * Observes an interpolated attribute.
@@ -5815,34 +8947,95 @@
                      * @param {string} key Normalized key. (ie ngAttribute) .
                      * @param {function(interpolatedValue)} fn Function that will be called whenever
                      the interpolated value of the attribute changes.
-                     *        See the {@link guide/directive#Attributes Directives} guide for more info.
-                     * @returns {function()} the `fn` parameter.
+                     *        See the {@link guide/interpolation#how-text-and-attribute-bindings-work Interpolation
+       *        guide} for more info.
+                     * @returns {function()} Returns a deregistration function for this observer.
                      */
                     $observe: function(key, fn) {
                         var attrs = this,
-                            $$observers = (attrs.$$observers || (attrs.$$observers = {})),
+                            $$observers = (attrs.$$observers || (attrs.$$observers = createMap())),
                             listeners = ($$observers[key] || ($$observers[key] = []));
 
                         listeners.push(fn);
                         $rootScope.$evalAsync(function() {
-                            if (!listeners.$$inter) {
+                            if (!listeners.$$inter && attrs.hasOwnProperty(key) && !isUndefined(attrs[key])) {
                                 // no one registered attribute interpolation function, so lets call it manually
                                 fn(attrs[key]);
                             }
                         });
-                        return fn;
+
+                        return function() {
+                            arrayRemove(listeners, fn);
+                        };
                     }
                 };
 
+                function setSpecialAttr(element, attrName, value) {
+                    // Attributes names that do not start with letters (such as `(click)`) cannot be set using `setAttribute`
+                    // so we have to jump through some hoops to get such an attribute
+                    // https://github.com/angular/angular.js/pull/13318
+                    specialAttrHolder.innerHTML = '<span ' + attrName + '>';
+                    var attributes = specialAttrHolder.firstChild.attributes;
+                    var attribute = attributes[0];
+                    // We have to remove the attribute from its container element before we can add it to the destination element
+                    attributes.removeNamedItem(attribute.name);
+                    attribute.value = value;
+                    element.attributes.setNamedItem(attribute);
+                }
+
+                function safeAddClass($element, className) {
+                    try {
+                        $element.addClass(className);
+                    } catch (e) {
+                        // ignore, since it means that we are trying to set class on
+                        // SVG element, where class name is read-only.
+                    }
+                }
+
+
                 var startSymbol = $interpolate.startSymbol(),
                     endSymbol = $interpolate.endSymbol(),
-                    denormalizeTemplate = (startSymbol == '{{' || endSymbol  == '}}')
+                    denormalizeTemplate = (startSymbol === '{{' && endSymbol  === '}}')
                         ? identity
                         : function denormalizeTemplate(template) {
-                        return template.replace(/\{\{/g, startSymbol).replace(/}}/g, endSymbol);
-                    },
+                            return template.replace(/\{\{/g, startSymbol).replace(/}}/g, endSymbol);
+                        },
                     NG_ATTR_BINDING = /^ngAttr[A-Z]/;
+                var MULTI_ELEMENT_DIR_RE = /^(.+)Start$/;
+
+                compile.$$addBindingInfo = debugInfoEnabled ? function $$addBindingInfo($element, binding) {
+                    var bindings = $element.data('$binding') || [];
 
+                    if (isArray(binding)) {
+                        bindings = bindings.concat(binding);
+                    } else {
+                        bindings.push(binding);
+                    }
+
+                    $element.data('$binding', bindings);
+                } : noop;
+
+                compile.$$addBindingClass = debugInfoEnabled ? function $$addBindingClass($element) {
+                    safeAddClass($element, 'ng-binding');
+                } : noop;
+
+                compile.$$addScopeInfo = debugInfoEnabled ? function $$addScopeInfo($element, scope, isolated, noTemplate) {
+                    var dataName = isolated ? (noTemplate ? '$isolateScopeNoTemplate' : '$isolateScope') : '$scope';
+                    $element.data(dataName, scope);
+                } : noop;
+
+                compile.$$addScopeClass = debugInfoEnabled ? function $$addScopeClass($element, isolated) {
+                    safeAddClass($element, isolated ? 'ng-isolate-scope' : 'ng-scope');
+                } : noop;
+
+                compile.$$createComment = function(directiveName, comment) {
+                    var content = '';
+                    if (debugInfoEnabled) {
+                        content = ' ' + (directiveName || '') + ': ';
+                        if (comment) content += comment + ' ';
+                    }
+                    return window.document.createComment(content);
+                };
 
                 return compile;
 
@@ -5855,50 +9048,84 @@
                         // modify it.
                         $compileNodes = jqLite($compileNodes);
                     }
-                    // We can not compile top level text elements since text nodes can be merged and we will
-                    // not be able to attach scope data to them, so we will wrap them in <span>
-                    forEach($compileNodes, function(node, index){
-                        if (node.nodeType == 3 /* text node */ && node.nodeValue.match(/\S+/) /* non-empty */ ) {
-                            $compileNodes[index] = node = jqLite(node).wrap('<span></span>').parent()[0];
-                        }
-                    });
                     var compositeLinkFn =
                         compileNodes($compileNodes, transcludeFn, $compileNodes,
                             maxPriority, ignoreDirective, previousCompileContext);
-                    safeAddClass($compileNodes, 'ng-scope');
-                    return function publicLinkFn(scope, cloneConnectFn, transcludeControllers){
+                    compile.$$addScopeClass($compileNodes);
+                    var namespace = null;
+                    return function publicLinkFn(scope, cloneConnectFn, options) {
+                        if (!$compileNodes) {
+                            throw $compileMinErr('multilink', 'This element has already been linked.');
+                        }
                         assertArg(scope, 'scope');
-                        // important!!: we must call our jqLite.clone() since the jQuery one is trying to be smart
-                        // and sometimes changes the structure of the DOM.
-                        var $linkNode = cloneConnectFn
-                            ? JQLitePrototype.clone.call($compileNodes) // IMPORTANT!!!
-                            : $compileNodes;
-
-                        forEach(transcludeControllers, function(instance, name) {
-                            $linkNode.data('$' + name + 'Controller', instance);
-                        });
 
-                        // Attach scope only to non-text nodes.
-                        for(var i = 0, ii = $linkNode.length; i<ii; i++) {
-                            var node = $linkNode[i],
-                                nodeType = node.nodeType;
-                            if (nodeType === 1 /* element */ || nodeType === 9 /* document */) {
-                                $linkNode.eq(i).data('$scope', scope);
+                        if (previousCompileContext && previousCompileContext.needsNewScope) {
+                            // A parent directive did a replace and a directive on this element asked
+                            // for transclusion, which caused us to lose a layer of element on which
+                            // we could hold the new transclusion scope, so we will create it manually
+                            // here.
+                            scope = scope.$parent.$new();
+                        }
+
+                        options = options || {};
+                        var parentBoundTranscludeFn = options.parentBoundTranscludeFn,
+                            transcludeControllers = options.transcludeControllers,
+                            futureParentElement = options.futureParentElement;
+
+                        // When `parentBoundTranscludeFn` is passed, it is a
+                        // `controllersBoundTransclude` function (it was previously passed
+                        // as `transclude` to directive.link) so we must unwrap it to get
+                        // its `boundTranscludeFn`
+                        if (parentBoundTranscludeFn && parentBoundTranscludeFn.$$boundTransclude) {
+                            parentBoundTranscludeFn = parentBoundTranscludeFn.$$boundTransclude;
+                        }
+
+                        if (!namespace) {
+                            namespace = detectNamespaceForChildElements(futureParentElement);
+                        }
+                        var $linkNode;
+                        if (namespace !== 'html') {
+                            // When using a directive with replace:true and templateUrl the $compileNodes
+                            // (or a child element inside of them)
+                            // might change, so we need to recreate the namespace adapted compileNodes
+                            // for call to the link function.
+                            // Note: This will already clone the nodes...
+                            $linkNode = jqLite(
+                                wrapTemplate(namespace, jqLite('<div>').append($compileNodes).html())
+                            );
+                        } else if (cloneConnectFn) {
+                            // important!!: we must call our jqLite.clone() since the jQuery one is trying to be smart
+                            // and sometimes changes the structure of the DOM.
+                            $linkNode = JQLitePrototype.clone.call($compileNodes);
+                        } else {
+                            $linkNode = $compileNodes;
+                        }
+
+                        if (transcludeControllers) {
+                            for (var controllerName in transcludeControllers) {
+                                $linkNode.data('$' + controllerName + 'Controller', transcludeControllers[controllerName].instance);
                             }
                         }
 
+                        compile.$$addScopeInfo($linkNode, scope);
+
                         if (cloneConnectFn) cloneConnectFn($linkNode, scope);
-                        if (compositeLinkFn) compositeLinkFn(scope, $linkNode, $linkNode);
+                        if (compositeLinkFn) compositeLinkFn(scope, $linkNode, $linkNode, parentBoundTranscludeFn);
+
+                        if (!cloneConnectFn) {
+                            $compileNodes = compositeLinkFn = null;
+                        }
                         return $linkNode;
                     };
                 }
 
-                function safeAddClass($element, className) {
-                    try {
-                        $element.addClass(className);
-                    } catch(e) {
-                        // ignore, since it means that we are trying to set class on
-                        // SVG element, where class name is read-only.
+                function detectNamespaceForChildElements(parentElement) {
+                    // TODO: Make this detect MathML as well...
+                    var node = parentElement && parentElement[0];
+                    if (!node) {
+                        return 'html';
+                    } else {
+                        return nodeName_(node) !== 'foreignobject' && toString.call(node).match(/SVG/) ? 'svg' : 'html';
                     }
                 }
 
@@ -5920,33 +9147,50 @@
                 function compileNodes(nodeList, transcludeFn, $rootElement, maxPriority, ignoreDirective,
                                       previousCompileContext) {
                     var linkFns = [],
-                        attrs, directives, nodeLinkFn, childNodes, childLinkFn, linkFnFound;
+                        // `nodeList` can be either an element's `.childNodes` (live NodeList)
+                        // or a jqLite/jQuery collection or an array
+                        notLiveList = isArray(nodeList) || (nodeList instanceof jqLite),
+                        attrs, directives, nodeLinkFn, childNodes, childLinkFn, linkFnFound, nodeLinkFnFound;
+
 
                     for (var i = 0; i < nodeList.length; i++) {
                         attrs = new Attributes();
 
-                        // we must always refer to nodeList[i] since the nodes can be replaced underneath us.
+                        // Support: IE 11 only
+                        // Workaround for #11781 and #14924
+                        if (msie === 11) {
+                            mergeConsecutiveTextNodes(nodeList, i, notLiveList);
+                        }
+
+                        // We must always refer to `nodeList[i]` hereafter,
+                        // since the nodes can be replaced underneath us.
                         directives = collectDirectives(nodeList[i], [], attrs, i === 0 ? maxPriority : undefined,
                             ignoreDirective);
 
                         nodeLinkFn = (directives.length)
                             ? applyDirectivesToNode(directives, nodeList[i], attrs, transcludeFn, $rootElement,
-                            null, [], [], previousCompileContext)
+                                null, [], [], previousCompileContext)
                             : null;
 
                         if (nodeLinkFn && nodeLinkFn.scope) {
-                            safeAddClass(jqLite(nodeList[i]), 'ng-scope');
+                            compile.$$addScopeClass(attrs.$$element);
                         }
 
                         childLinkFn = (nodeLinkFn && nodeLinkFn.terminal ||
-                        !(childNodes = nodeList[i].childNodes) ||
-                        !childNodes.length)
+                            !(childNodes = nodeList[i].childNodes) ||
+                            !childNodes.length)
                             ? null
                             : compileNodes(childNodes,
-                            nodeLinkFn ? nodeLinkFn.transclude : transcludeFn);
+                                nodeLinkFn ? (
+                                    (nodeLinkFn.transcludeOnThisElement || !nodeLinkFn.templateOnThisElement)
+                                    && nodeLinkFn.transclude) : transcludeFn);
+
+                        if (nodeLinkFn || childLinkFn) {
+                            linkFns.push(i, nodeLinkFn, childLinkFn);
+                            linkFnFound = true;
+                            nodeLinkFnFound = nodeLinkFnFound || nodeLinkFn;
+                        }
 
-                        linkFns.push(nodeLinkFn, childLinkFn);
-                        linkFnFound = linkFnFound || nodeLinkFn || childLinkFn;
                         //use the previous context only for the first element in the virtual group
                         previousCompileContext = null;
                     }
@@ -5954,60 +9198,115 @@
                     // return a linking function if we have found anything, null otherwise
                     return linkFnFound ? compositeLinkFn : null;
 
-                    function compositeLinkFn(scope, nodeList, $rootElement, boundTranscludeFn) {
-                        var nodeLinkFn, childLinkFn, node, $node, childScope, childTranscludeFn, i, ii, n;
+                    function compositeLinkFn(scope, nodeList, $rootElement, parentBoundTranscludeFn) {
+                        var nodeLinkFn, childLinkFn, node, childScope, i, ii, idx, childBoundTranscludeFn;
+                        var stableNodeList;
 
-                        // copy nodeList so that linking doesn't break due to live list updates.
-                        var nodeListLength = nodeList.length,
+
+                        if (nodeLinkFnFound) {
+                            // copy nodeList so that if a nodeLinkFn removes or adds an element at this DOM level our
+                            // offsets don't get screwed up
+                            var nodeListLength = nodeList.length;
                             stableNodeList = new Array(nodeListLength);
-                        for (i = 0; i < nodeListLength; i++) {
-                            stableNodeList[i] = nodeList[i];
+
+                            // create a sparse array by only copying the elements which have a linkFn
+                            for (i = 0; i < linkFns.length; i += 3) {
+                                idx = linkFns[i];
+                                stableNodeList[idx] = nodeList[idx];
+                            }
+                        } else {
+                            stableNodeList = nodeList;
                         }
 
-                        for(i = 0, n = 0, ii = linkFns.length; i < ii; n++) {
-                            node = stableNodeList[n];
+                        for (i = 0, ii = linkFns.length; i < ii;) {
+                            node = stableNodeList[linkFns[i++]];
                             nodeLinkFn = linkFns[i++];
                             childLinkFn = linkFns[i++];
-                            $node = jqLite(node);
 
                             if (nodeLinkFn) {
                                 if (nodeLinkFn.scope) {
                                     childScope = scope.$new();
-                                    $node.data('$scope', childScope);
+                                    compile.$$addScopeInfo(jqLite(node), childScope);
                                 } else {
                                     childScope = scope;
                                 }
-                                childTranscludeFn = nodeLinkFn.transclude;
-                                if (childTranscludeFn || (!boundTranscludeFn && transcludeFn)) {
-                                    nodeLinkFn(childLinkFn, childScope, node, $rootElement,
-                                        createBoundTranscludeFn(scope, childTranscludeFn || transcludeFn)
-                                    );
+
+                                if (nodeLinkFn.transcludeOnThisElement) {
+                                    childBoundTranscludeFn = createBoundTranscludeFn(
+                                        scope, nodeLinkFn.transclude, parentBoundTranscludeFn);
+
+                                } else if (!nodeLinkFn.templateOnThisElement && parentBoundTranscludeFn) {
+                                    childBoundTranscludeFn = parentBoundTranscludeFn;
+
+                                } else if (!parentBoundTranscludeFn && transcludeFn) {
+                                    childBoundTranscludeFn = createBoundTranscludeFn(scope, transcludeFn);
+
                                 } else {
-                                    nodeLinkFn(childLinkFn, childScope, node, $rootElement, boundTranscludeFn);
+                                    childBoundTranscludeFn = null;
                                 }
+
+                                nodeLinkFn(childLinkFn, childScope, node, $rootElement, childBoundTranscludeFn);
+
                             } else if (childLinkFn) {
-                                childLinkFn(scope, node.childNodes, undefined, boundTranscludeFn);
+                                childLinkFn(scope, node.childNodes, undefined, parentBoundTranscludeFn);
                             }
                         }
                     }
                 }
 
-                function createBoundTranscludeFn(scope, transcludeFn) {
-                    return function boundTranscludeFn(transcludedScope, cloneFn, controllers) {
-                        var scopeCreated = false;
+                function mergeConsecutiveTextNodes(nodeList, idx, notLiveList) {
+                    var node = nodeList[idx];
+                    var parent = node.parentNode;
+                    var sibling;
+
+                    if (node.nodeType !== NODE_TYPE_TEXT) {
+                        return;
+                    }
+
+                    while (true) {
+                        sibling = parent ? node.nextSibling : nodeList[idx + 1];
+                        if (!sibling || sibling.nodeType !== NODE_TYPE_TEXT) {
+                            break;
+                        }
+
+                        node.nodeValue = node.nodeValue + sibling.nodeValue;
+
+                        if (sibling.parentNode) {
+                            sibling.parentNode.removeChild(sibling);
+                        }
+                        if (notLiveList && sibling === nodeList[idx + 1]) {
+                            nodeList.splice(idx + 1, 1);
+                        }
+                    }
+                }
+
+                function createBoundTranscludeFn(scope, transcludeFn, previousBoundTranscludeFn) {
+                    function boundTranscludeFn(transcludedScope, cloneFn, controllers, futureParentElement, containingScope) {
 
                         if (!transcludedScope) {
-                            transcludedScope = scope.$new();
+                            transcludedScope = scope.$new(false, containingScope);
                             transcludedScope.$$transcluded = true;
-                            scopeCreated = true;
                         }
 
-                        var clone = transcludeFn(transcludedScope, cloneFn, controllers);
-                        if (scopeCreated) {
-                            clone.on('$destroy', bind(transcludedScope, transcludedScope.$destroy));
+                        return transcludeFn(transcludedScope, cloneFn, {
+                            parentBoundTranscludeFn: previousBoundTranscludeFn,
+                            transcludeControllers: controllers,
+                            futureParentElement: futureParentElement
+                        });
+                    }
+
+                    // We need  to attach the transclusion slots onto the `boundTranscludeFn`
+                    // so that they are available inside the `controllersBoundTransclude` function
+                    var boundSlots = boundTranscludeFn.$$slots = createMap();
+                    for (var slotName in transcludeFn.$$slots) {
+                        if (transcludeFn.$$slots[slotName]) {
+                            boundSlots[slotName] = createBoundTranscludeFn(scope, transcludeFn.$$slots[slotName], previousBoundTranscludeFn);
+                        } else {
+                            boundSlots[slotName] = null;
                         }
-                        return clone;
-                    };
+                    }
+
+                    return boundTranscludeFn;
                 }
 
                 /**
@@ -6024,52 +9323,73 @@
                     var nodeType = node.nodeType,
                         attrsMap = attrs.$attr,
                         match,
+                        nodeName,
                         className;
 
-                    switch(nodeType) {
-                        case 1: /* Element */
+                    switch (nodeType) {
+                        case NODE_TYPE_ELEMENT: /* Element */
+
+                            nodeName = nodeName_(node);
+
                             // use the node name: <directive>
                             addDirective(directives,
-                                directiveNormalize(nodeName_(node).toLowerCase()), 'E', maxPriority, ignoreDirective);
+                                directiveNormalize(nodeName), 'E', maxPriority, ignoreDirective);
 
                             // iterate over the attributes
-                            for (var attr, name, nName, ngAttrName, value, nAttrs = node.attributes,
+                            for (var attr, name, nName, ngAttrName, value, isNgAttr, nAttrs = node.attributes,
                                      j = 0, jj = nAttrs && nAttrs.length; j < jj; j++) {
                                 var attrStartName = false;
                                 var attrEndName = false;
 
                                 attr = nAttrs[j];
-                                if (!msie || msie >= 8 || attr.specified) {
-                                    name = attr.name;
-                                    // support ngAttr attribute binding
-                                    ngAttrName = directiveNormalize(name);
-                                    if (NG_ATTR_BINDING.test(ngAttrName)) {
-                                        name = snake_case(ngAttrName.substr(6), '-');
-                                    }
+                                name = attr.name;
+                                value = attr.value;
+
+                                // support ngAttr attribute binding
+                                ngAttrName = directiveNormalize(name);
+                                isNgAttr = NG_ATTR_BINDING.test(ngAttrName);
+                                if (isNgAttr) {
+                                    name = name.replace(PREFIX_REGEXP, '')
+                                        .substr(8).replace(/_(.)/g, function(match, letter) {
+                                            return letter.toUpperCase();
+                                        });
+                                }
 
-                                    var directiveNName = ngAttrName.replace(/(Start|End)$/, '');
-                                    if (ngAttrName === directiveNName + 'Start') {
-                                        attrStartName = name;
-                                        attrEndName = name.substr(0, name.length - 5) + 'end';
-                                        name = name.substr(0, name.length - 6);
-                                    }
+                                var multiElementMatch = ngAttrName.match(MULTI_ELEMENT_DIR_RE);
+                                if (multiElementMatch && directiveIsMultiElement(multiElementMatch[1])) {
+                                    attrStartName = name;
+                                    attrEndName = name.substr(0, name.length - 5) + 'end';
+                                    name = name.substr(0, name.length - 6);
+                                }
 
-                                    nName = directiveNormalize(name.toLowerCase());
-                                    attrsMap[nName] = name;
-                                    attrs[nName] = value = trim(attr.value);
+                                nName = directiveNormalize(name.toLowerCase());
+                                attrsMap[nName] = name;
+                                if (isNgAttr || !attrs.hasOwnProperty(nName)) {
+                                    attrs[nName] = value;
                                     if (getBooleanAttrName(node, nName)) {
                                         attrs[nName] = true; // presence means true
                                     }
-                                    addAttrInterpolateDirective(node, directives, value, nName);
-                                    addDirective(directives, nName, 'A', maxPriority, ignoreDirective, attrStartName,
-                                        attrEndName);
                                 }
+                                addAttrInterpolateDirective(node, directives, value, nName, isNgAttr);
+                                addDirective(directives, nName, 'A', maxPriority, ignoreDirective, attrStartName,
+                                    attrEndName);
+                            }
+
+                            if (nodeName === 'input' && node.getAttribute('type') === 'hidden') {
+                                // Hidden input elements can have strange behaviour when navigating back to the page
+                                // This tells the browser not to try to cache and reinstate previous values
+                                node.setAttribute('autocomplete', 'off');
                             }
 
                             // use class as directive
+                            if (!cssClassDirectivesEnabled) break;
                             className = node.className;
+                            if (isObject(className)) {
+                                // Maybe SVGAnimatedString
+                                className = className.animVal;
+                            }
                             if (isString(className) && className !== '') {
-                                while (match = CLASS_DIRECTIVE_REGEXP.exec(className)) {
+                                while ((match = CLASS_DIRECTIVE_REGEXP.exec(className))) {
                                     nName = directiveNormalize(match[2]);
                                     if (addDirective(directives, nName, 'C', maxPriority, ignoreDirective)) {
                                         attrs[nName] = trim(match[3]);
@@ -6078,23 +9398,12 @@
                                 }
                             }
                             break;
-                        case 3: /* Text Node */
+                        case NODE_TYPE_TEXT: /* Text Node */
                             addTextInterpolateDirective(directives, node.nodeValue);
                             break;
-                        case 8: /* Comment */
-                            try {
-                                match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue);
-                                if (match) {
-                                    nName = directiveNormalize(match[1]);
-                                    if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) {
-                                        attrs[nName] = trim(match[2]);
-                                    }
-                                }
-                            } catch (e) {
-                                // turns out that under some circumstances IE9 throws errors when one attempts to read
-                                // comment's node value.
-                                // Just ignore it and continue. (Can't seem to reproduce in test case.)
-                            }
+                        case NODE_TYPE_COMMENT: /* Comment */
+                            if (!commentDirectivesEnabled) break;
+                            collectCommentDirectives(node, directives, attrs, maxPriority, ignoreDirective);
                             break;
                     }
 
@@ -6102,8 +9411,26 @@
                     return directives;
                 }
 
+                function collectCommentDirectives(node, directives, attrs, maxPriority, ignoreDirective) {
+                    // function created because of performance, try/catch disables
+                    // the optimization of the whole function #14848
+                    try {
+                        var match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue);
+                        if (match) {
+                            var nName = directiveNormalize(match[1]);
+                            if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) {
+                                attrs[nName] = trim(match[2]);
+                            }
+                        }
+                    } catch (e) {
+                        // turns out that under some circumstances IE9 throws errors when one attempts to read
+                        // comment's node value.
+                        // Just ignore it and continue. (Can't seem to reproduce in test case.)
+                    }
+                }
+
                 /**
-                 * Given a node with an directive-start it collects all of the siblings until it finds
+                 * Given a node with a directive-start it collects all of the siblings until it finds
                  * directive-end.
                  * @param node
                  * @param attrStart
@@ -6114,14 +9441,13 @@
                     var nodes = [];
                     var depth = 0;
                     if (attrStart && node.hasAttribute && node.hasAttribute(attrStart)) {
-                        var startNode = node;
                         do {
                             if (!node) {
                                 throw $compileMinErr('uterdir',
-                                    "Unterminated attribute, found '{0}' but no matching '{1}' found.",
+                                    'Unterminated attribute, found \'{0}\' but no matching \'{1}\' found.',
                                     attrStart, attrEnd);
                             }
-                            if (node.nodeType == 1 /** Element **/) {
+                            if (node.nodeType === NODE_TYPE_ELEMENT) {
                                 if (node.hasAttribute(attrStart)) depth++;
                                 if (node.hasAttribute(attrEnd)) depth--;
                             }
@@ -6144,12 +9470,41 @@
                  * @returns {Function}
                  */
                 function groupElementsLinkFnWrapper(linkFn, attrStart, attrEnd) {
-                    return function(scope, element, attrs, controllers, transcludeFn) {
+                    return function groupedElementsLink(scope, element, attrs, controllers, transcludeFn) {
                         element = groupScan(element[0], attrStart, attrEnd);
                         return linkFn(scope, element, attrs, controllers, transcludeFn);
                     };
                 }
 
+                /**
+                 * A function generator that is used to support both eager and lazy compilation
+                 * linking function.
+                 * @param eager
+                 * @param $compileNodes
+                 * @param transcludeFn
+                 * @param maxPriority
+                 * @param ignoreDirective
+                 * @param previousCompileContext
+                 * @returns {Function}
+                 */
+                function compilationGenerator(eager, $compileNodes, transcludeFn, maxPriority, ignoreDirective, previousCompileContext) {
+                    var compiled;
+
+                    if (eager) {
+                        return compile($compileNodes, transcludeFn, maxPriority, ignoreDirective, previousCompileContext);
+                    }
+                    return /** @this */ function lazyCompilation() {
+                        if (!compiled) {
+                            compiled = compile($compileNodes, transcludeFn, maxPriority, ignoreDirective, previousCompileContext);
+
+                            // Null out all of these references in order to make them eligible for garbage collection
+                            // since this is a potentially long lived closure
+                            $compileNodes = transcludeFn = previousCompileContext = null;
+                        }
+                        return compiled.apply(this, arguments);
+                    };
+                }
+
                 /**
                  * Once the directives have been collected, their compile functions are executed. This method
                  * is responsible for inlining directive templates as well as terminating the application
@@ -6179,12 +9534,13 @@
                     previousCompileContext = previousCompileContext || {};
 
                     var terminalPriority = -Number.MAX_VALUE,
-                        newScopeDirective,
+                        newScopeDirective = previousCompileContext.newScopeDirective,
                         controllerDirectives = previousCompileContext.controllerDirectives,
                         newIsolateScopeDirective = previousCompileContext.newIsolateScopeDirective,
                         templateDirective = previousCompileContext.templateDirective,
                         nonTlbTranscludeDirective = previousCompileContext.nonTlbTranscludeDirective,
                         hasTranscludeDirective = false,
+                        hasTemplate = false,
                         hasElementTranscludeDirective = previousCompileContext.hasElementTranscludeDirective,
                         $compileNode = templateAttrs.$$element = jqLite(compileNode),
                         directive,
@@ -6193,10 +9549,12 @@
                         replaceDirective = originalReplaceDirective,
                         childTranscludeFn = transcludeFn,
                         linkFn,
+                        didScanForMultipleTransclusion = false,
+                        mightHaveMultipleTransclusionError = false,
                         directiveValue;
 
                     // executes all directives on the current element
-                    for(var i = 0, ii = directives.length; i < ii; i++) {
+                    for (var i = 0, ii = directives.length; i < ii; i++) {
                         directive = directives[i];
                         var attrStart = directive.$$start;
                         var attrEnd = directive.$$end;
@@ -6211,31 +9569,63 @@
                             break; // prevent further processing of directives
                         }
 
-                        if (directiveValue = directive.scope) {
-                            newScopeDirective = newScopeDirective || directive;
+                        directiveValue = directive.scope;
+
+                        if (directiveValue) {
 
                             // skip the check for directives with async templates, we'll check the derived sync
                             // directive when the template arrives
                             if (!directive.templateUrl) {
-                                assertNoDuplicate('new/isolated scope', newIsolateScopeDirective, directive,
-                                    $compileNode);
                                 if (isObject(directiveValue)) {
+                                    // This directive is trying to add an isolated scope.
+                                    // Check that there is no scope of any kind already
+                                    assertNoDuplicate('new/isolated scope', newIsolateScopeDirective || newScopeDirective,
+                                        directive, $compileNode);
                                     newIsolateScopeDirective = directive;
+                                } else {
+                                    // This directive is trying to add a child scope.
+                                    // Check that there is no isolated scope already
+                                    assertNoDuplicate('new/isolated scope', newIsolateScopeDirective, directive,
+                                        $compileNode);
                                 }
                             }
+
+                            newScopeDirective = newScopeDirective || directive;
                         }
 
                         directiveName = directive.name;
 
+                        // If we encounter a condition that can result in transclusion on the directive,
+                        // then scan ahead in the remaining directives for others that may cause a multiple
+                        // transclusion error to be thrown during the compilation process.  If a matching directive
+                        // is found, then we know that when we encounter a transcluded directive, we need to eagerly
+                        // compile the `transclude` function rather than doing it lazily in order to throw
+                        // exceptions at the correct time
+                        if (!didScanForMultipleTransclusion && ((directive.replace && (directive.templateUrl || directive.template))
+                            || (directive.transclude && !directive.$$tlb))) {
+                            var candidateDirective;
+
+                            for (var scanningIndex = i + 1; (candidateDirective = directives[scanningIndex++]);) {
+                                if ((candidateDirective.transclude && !candidateDirective.$$tlb)
+                                    || (candidateDirective.replace && (candidateDirective.templateUrl || candidateDirective.template))) {
+                                    mightHaveMultipleTransclusionError = true;
+                                    break;
+                                }
+                            }
+
+                            didScanForMultipleTransclusion = true;
+                        }
+
                         if (!directive.templateUrl && directive.controller) {
-                            directiveValue = directive.controller;
-                            controllerDirectives = controllerDirectives || {};
-                            assertNoDuplicate("'" + directiveName + "' controller",
+                            controllerDirectives = controllerDirectives || createMap();
+                            assertNoDuplicate('\'' + directiveName + '\' controller',
                                 controllerDirectives[directiveName], directive, $compileNode);
                             controllerDirectives[directiveName] = directive;
                         }
 
-                        if (directiveValue = directive.transclude) {
+                        directiveValue = directive.transclude;
+
+                        if (directiveValue) {
                             hasTranscludeDirective = true;
 
                             // Special case ngIf and ngRepeat so that we don't complain about duplicate transclusion.
@@ -6246,17 +9636,27 @@
                                 nonTlbTranscludeDirective = directive;
                             }
 
-                            if (directiveValue == 'element') {
+                            if (directiveValue === 'element') {
                                 hasElementTranscludeDirective = true;
                                 terminalPriority = directive.priority;
-                                $template = groupScan(compileNode, attrStart, attrEnd);
+                                $template = $compileNode;
                                 $compileNode = templateAttrs.$$element =
-                                    jqLite(document.createComment(' ' + directiveName + ': ' +
-                                    templateAttrs[directiveName] + ' '));
+                                    jqLite(compile.$$createComment(directiveName, templateAttrs[directiveName]));
                                 compileNode = $compileNode[0];
-                                replaceWith(jqCollection, jqLite(sliceArgs($template)), compileNode);
+                                replaceWith(jqCollection, sliceArgs($template), compileNode);
 
-                                childTranscludeFn = compile($template, transcludeFn, terminalPriority,
+                                // Support: Chrome < 50
+                                // https://github.com/angular/angular.js/issues/14041
+
+                                // In the versions of V8 prior to Chrome 50, the document fragment that is created
+                                // in the `replaceWith` function is improperly garbage collected despite still
+                                // being referenced by the `parentNode` property of all of the child nodes.  By adding
+                                // a reference to the fragment via a different property, we can avoid that incorrect
+                                // behavior.
+                                // TODO: remove this line after Chrome 50 has been released
+                                $template[0].$$parentNode = $template[0].parentNode;
+
+                                childTranscludeFn = compilationGenerator(mightHaveMultipleTransclusionError, $template, transcludeFn, terminalPriority,
                                     replaceDirective && replaceDirective.name, {
                                         // Don't pass in:
                                         // - controllerDirectives - otherwise we'll create duplicates controllers
@@ -6268,19 +9668,80 @@
                                         nonTlbTranscludeDirective: nonTlbTranscludeDirective
                                     });
                             } else {
-                                $template = jqLite(jqLiteClone(compileNode)).contents();
-                                $compileNode.empty(); // clear contents
-                                childTranscludeFn = compile($template, transcludeFn);
-                            }
-                        }
 
-                        if (directive.template) {
-                            assertNoDuplicate('template', templateDirective, directive, $compileNode);
-                            templateDirective = directive;
+                                var slots = createMap();
 
-                            directiveValue = (isFunction(directive.template))
-                                ? directive.template($compileNode, templateAttrs)
-                                : directive.template;
+                                if (!isObject(directiveValue)) {
+                                    $template = jqLite(jqLiteClone(compileNode)).contents();
+                                } else {
+
+                                    // We have transclusion slots,
+                                    // collect them up, compile them and store their transclusion functions
+                                    $template = [];
+
+                                    var slotMap = createMap();
+                                    var filledSlots = createMap();
+
+                                    // Parse the element selectors
+                                    forEach(directiveValue, function(elementSelector, slotName) {
+                                        // If an element selector starts with a ? then it is optional
+                                        var optional = (elementSelector.charAt(0) === '?');
+                                        elementSelector = optional ? elementSelector.substring(1) : elementSelector;
+
+                                        slotMap[elementSelector] = slotName;
+
+                                        // We explicitly assign `null` since this implies that a slot was defined but not filled.
+                                        // Later when calling boundTransclusion functions with a slot name we only error if the
+                                        // slot is `undefined`
+                                        slots[slotName] = null;
+
+                                        // filledSlots contains `true` for all slots that are either optional or have been
+                                        // filled. This is used to check that we have not missed any required slots
+                                        filledSlots[slotName] = optional;
+                                    });
+
+                                    // Add the matching elements into their slot
+                                    forEach($compileNode.contents(), function(node) {
+                                        var slotName = slotMap[directiveNormalize(nodeName_(node))];
+                                        if (slotName) {
+                                            filledSlots[slotName] = true;
+                                            slots[slotName] = slots[slotName] || [];
+                                            slots[slotName].push(node);
+                                        } else {
+                                            $template.push(node);
+                                        }
+                                    });
+
+                                    // Check for required slots that were not filled
+                                    forEach(filledSlots, function(filled, slotName) {
+                                        if (!filled) {
+                                            throw $compileMinErr('reqslot', 'Required transclusion slot `{0}` was not filled.', slotName);
+                                        }
+                                    });
+
+                                    for (var slotName in slots) {
+                                        if (slots[slotName]) {
+                                            // Only define a transclusion function if the slot was filled
+                                            slots[slotName] = compilationGenerator(mightHaveMultipleTransclusionError, slots[slotName], transcludeFn);
+                                        }
+                                    }
+                                }
+
+                                $compileNode.empty(); // clear contents
+                                childTranscludeFn = compilationGenerator(mightHaveMultipleTransclusionError, $template, transcludeFn, undefined,
+                                    undefined, { needsNewScope: directive.$$isolateScope || directive.$$newScope});
+                                childTranscludeFn.$$slots = slots;
+                            }
+                        }
+
+                        if (directive.template) {
+                            hasTemplate = true;
+                            assertNoDuplicate('template', templateDirective, directive, $compileNode);
+                            templateDirective = directive;
+
+                            directiveValue = (isFunction(directive.template))
+                                ? directive.template($compileNode, templateAttrs)
+                                : directive.template;
 
                             directiveValue = denormalizeTemplate(directiveValue);
 
@@ -6289,13 +9750,13 @@
                                 if (jqLiteIsTextNode(directiveValue)) {
                                     $template = [];
                                 } else {
-                                    $template = jqLite(directiveValue);
+                                    $template = removeComments(wrapTemplate(directive.templateNamespace, trim(directiveValue)));
                                 }
                                 compileNode = $template[0];
 
-                                if ($template.length != 1 || compileNode.nodeType !== 1) {
+                                if ($template.length !== 1 || compileNode.nodeType !== NODE_TYPE_ELEMENT) {
                                     throw $compileMinErr('tplrt',
-                                        "Template for directive '{0}' must have exactly one root element. {1}",
+                                        'Template for directive \'{0}\' must have exactly one root element. {1}',
                                         directiveName, '');
                                 }
 
@@ -6311,8 +9772,11 @@
                                 var templateDirectives = collectDirectives(compileNode, [], newTemplateAttrs);
                                 var unprocessedDirectives = directives.splice(i + 1, directives.length - (i + 1));
 
-                                if (newIsolateScopeDirective) {
-                                    markDirectivesAsIsolate(templateDirectives);
+                                if (newIsolateScopeDirective || newScopeDirective) {
+                                    // The original directive caused the current element to be replaced but this element
+                                    // also needs to have a new scope, so we need to tell the template directives
+                                    // that they would need to get their scope from further up, if they require transclusion
+                                    markDirectiveScope(templateDirectives, newIsolateScopeDirective, newScopeDirective);
                                 }
                                 directives = directives.concat(templateDirectives).concat(unprocessedDirectives);
                                 mergeTemplateAttributes(templateAttrs, newTemplateAttrs);
@@ -6324,6 +9788,7 @@
                         }
 
                         if (directive.templateUrl) {
+                            hasTemplate = true;
                             assertNoDuplicate('template', templateDirective, directive, $compileNode);
                             templateDirective = directive;
 
@@ -6331,9 +9796,11 @@
                                 replaceDirective = directive;
                             }
 
+                            // eslint-disable-next-line no-func-assign
                             nodeLinkFn = compileTemplateUrl(directives.splice(i, directives.length - i), $compileNode,
-                                templateAttrs, jqCollection, childTranscludeFn, preLinkFns, postLinkFns, {
+                                templateAttrs, jqCollection, hasTranscludeDirective && childTranscludeFn, preLinkFns, postLinkFns, {
                                     controllerDirectives: controllerDirectives,
+                                    newScopeDirective: (newScopeDirective !== directive) && newScopeDirective,
                                     newIsolateScopeDirective: newIsolateScopeDirective,
                                     templateDirective: templateDirective,
                                     nonTlbTranscludeDirective: nonTlbTranscludeDirective
@@ -6342,10 +9809,11 @@
                         } else if (directive.compile) {
                             try {
                                 linkFn = directive.compile($compileNode, templateAttrs, childTranscludeFn);
+                                var context = directive.$$originalDirective || directive;
                                 if (isFunction(linkFn)) {
-                                    addLinkFns(null, linkFn, attrStart, attrEnd);
+                                    addLinkFns(null, bind(context, linkFn), attrStart, attrEnd);
                                 } else if (linkFn) {
-                                    addLinkFns(linkFn.pre, linkFn.post, attrStart, attrEnd);
+                                    addLinkFns(bind(context, linkFn.pre), bind(context, linkFn.post), attrStart, attrEnd);
                                 }
                             } catch (e) {
                                 $exceptionHandler(e, startingTag($compileNode));
@@ -6360,7 +9828,10 @@
                     }
 
                     nodeLinkFn.scope = newScopeDirective && newScopeDirective.scope === true;
-                    nodeLinkFn.transclude = hasTranscludeDirective && childTranscludeFn;
+                    nodeLinkFn.transcludeOnThisElement = hasTranscludeDirective;
+                    nodeLinkFn.templateOnThisElement = hasTemplate;
+                    nodeLinkFn.transclude = childTranscludeFn;
+
                     previousCompileContext.hasElementTranscludeDirective = hasElementTranscludeDirective;
 
                     // might be normal or delayed nodeLinkFn depending on if templateUrl is present
@@ -6372,6 +9843,7 @@
                         if (pre) {
                             if (attrStart) pre = groupElementsLinkFnWrapper(pre, attrStart, attrEnd);
                             pre.require = directive.require;
+                            pre.directiveName = directiveName;
                             if (newIsolateScopeDirective === directive || directive.$$isolateScope) {
                                 pre = cloneAndAnnotateFn(pre, {isolateScope: true});
                             }
@@ -6380,6 +9852,7 @@
                         if (post) {
                             if (attrStart) post = groupElementsLinkFnWrapper(post, attrStart, attrEnd);
                             post.require = directive.require;
+                            post.directiveName = directiveName;
                             if (newIsolateScopeDirective === directive || directive.$$isolateScope) {
                                 post = cloneAndAnnotateFn(post, {isolateScope: true});
                             }
@@ -6387,180 +9860,135 @@
                         }
                     }
 
-
-                    function getControllers(require, $element, elementControllers) {
-                        var value, retrievalMethod = 'data', optional = false;
-                        if (isString(require)) {
-                            while((value = require.charAt(0)) == '^' || value == '?') {
-                                require = require.substr(1);
-                                if (value == '^') {
-                                    retrievalMethod = 'inheritedData';
-                                }
-                                optional = optional || value == '?';
-                            }
-                            value = null;
-
-                            if (elementControllers && retrievalMethod === 'data') {
-                                value = elementControllers[require];
-                            }
-                            value = value || $element[retrievalMethod]('$' + require + 'Controller');
-
-                            if (!value && !optional) {
-                                throw $compileMinErr('ctreq',
-                                    "Controller '{0}', required by directive '{1}', can't be found!",
-                                    require, directiveName);
-                            }
-                            return value;
-                        } else if (isArray(require)) {
-                            value = [];
-                            forEach(require, function(require) {
-                                value.push(getControllers(require, $element, elementControllers));
-                            });
-                        }
-                        return value;
-                    }
-
-
                     function nodeLinkFn(childLinkFn, scope, linkNode, $rootElement, boundTranscludeFn) {
-                        var attrs, $element, i, ii, linkFn, controller, isolateScope, elementControllers = {}, transcludeFn;
+                        var i, ii, linkFn, isolateScope, controllerScope, elementControllers, transcludeFn, $element,
+                            attrs, scopeBindingInfo;
 
                         if (compileNode === linkNode) {
                             attrs = templateAttrs;
+                            $element = templateAttrs.$$element;
                         } else {
-                            attrs = shallowCopy(templateAttrs, new Attributes(jqLite(linkNode), templateAttrs.$attr));
+                            $element = jqLite(linkNode);
+                            attrs = new Attributes($element, templateAttrs);
                         }
-                        $element = attrs.$$element;
 
+                        controllerScope = scope;
                         if (newIsolateScopeDirective) {
-                            var LOCAL_REGEXP = /^\s*([@=&])(\??)\s*(\w*)\s*$/;
-                            var $linkNode = jqLite(linkNode);
-
                             isolateScope = scope.$new(true);
+                        } else if (newScopeDirective) {
+                            controllerScope = scope.$parent;
+                        }
 
-                            if (templateDirective && (templateDirective === newIsolateScopeDirective.$$originalDirective)) {
-                                $linkNode.data('$isolateScope', isolateScope) ;
-                            } else {
-                                $linkNode.data('$isolateScopeNoTemplate', isolateScope);
-                            }
-
-
-
-                            safeAddClass($linkNode, 'ng-isolate-scope');
+                        if (boundTranscludeFn) {
+                            // track `boundTranscludeFn` so it can be unwrapped if `transcludeFn`
+                            // is later passed as `parentBoundTranscludeFn` to `publicLinkFn`
+                            transcludeFn = controllersBoundTransclude;
+                            transcludeFn.$$boundTransclude = boundTranscludeFn;
+                            // expose the slots on the `$transclude` function
+                            transcludeFn.isSlotFilled = function(slotName) {
+                                return !!boundTranscludeFn.$$slots[slotName];
+                            };
+                        }
 
-                            forEach(newIsolateScopeDirective.scope, function(definition, scopeName) {
-                                var match = definition.match(LOCAL_REGEXP) || [],
-                                    attrName = match[3] || scopeName,
-                                    optional = (match[2] == '?'),
-                                    mode = match[1], // @, =, or &
-                                    lastValue,
-                                    parentGet, parentSet, compare;
+                        if (controllerDirectives) {
+                            elementControllers = setupControllers($element, attrs, transcludeFn, controllerDirectives, isolateScope, scope, newIsolateScopeDirective);
+                        }
 
-                                isolateScope.$$isolateBindings[scopeName] = mode + attrName;
+                        if (newIsolateScopeDirective) {
+                            // Initialize isolate scope bindings for new isolate scope directive.
+                            compile.$$addScopeInfo($element, isolateScope, true, !(templateDirective && (templateDirective === newIsolateScopeDirective ||
+                                templateDirective === newIsolateScopeDirective.$$originalDirective)));
+                            compile.$$addScopeClass($element, true);
+                            isolateScope.$$isolateBindings =
+                                newIsolateScopeDirective.$$isolateBindings;
+                            scopeBindingInfo = initializeDirectiveBindings(scope, attrs, isolateScope,
+                                isolateScope.$$isolateBindings,
+                                newIsolateScopeDirective);
+                            if (scopeBindingInfo.removeWatches) {
+                                isolateScope.$on('$destroy', scopeBindingInfo.removeWatches);
+                            }
+                        }
 
-                                switch (mode) {
+                        // Initialize bindToController bindings
+                        for (var name in elementControllers) {
+                            var controllerDirective = controllerDirectives[name];
+                            var controller = elementControllers[name];
+                            var bindings = controllerDirective.$$bindings.bindToController;
 
-                                    case '@':
-                                        attrs.$observe(attrName, function(value) {
-                                            isolateScope[scopeName] = value;
-                                        });
-                                        attrs.$$observers[attrName].$$scope = scope;
-                                        if( attrs[attrName] ) {
-                                            // If the attribute has been provided then we trigger an interpolation to ensure
-                                            // the value is there for use in the link fn
-                                            isolateScope[scopeName] = $interpolate(attrs[attrName])(scope);
-                                        }
-                                        break;
+                            if (preAssignBindingsEnabled) {
+                                if (bindings) {
+                                    controller.bindingInfo =
+                                        initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective);
+                                } else {
+                                    controller.bindingInfo = {};
+                                }
 
-                                    case '=':
-                                        if (optional && !attrs[attrName]) {
-                                            return;
-                                        }
-                                        parentGet = $parse(attrs[attrName]);
-                                        if (parentGet.literal) {
-                                            compare = equals;
-                                        } else {
-                                            compare = function(a,b) { return a === b; };
-                                        }
-                                        parentSet = parentGet.assign || function() {
-                                            // reset the change, or we will throw this exception on every $digest
-                                            lastValue = isolateScope[scopeName] = parentGet(scope);
-                                            throw $compileMinErr('nonassign',
-                                                "Expression '{0}' used with directive '{1}' is non-assignable!",
-                                                attrs[attrName], newIsolateScopeDirective.name);
-                                        };
-                                        lastValue = isolateScope[scopeName] = parentGet(scope);
-                                        isolateScope.$watch(function parentValueWatch() {
-                                            var parentValue = parentGet(scope);
-                                            if (!compare(parentValue, isolateScope[scopeName])) {
-                                                // we are out of sync and need to copy
-                                                if (!compare(parentValue, lastValue)) {
-                                                    // parent changed and it has precedence
-                                                    isolateScope[scopeName] = parentValue;
-                                                } else {
-                                                    // if the parent can be assigned then do so
-                                                    parentSet(scope, parentValue = isolateScope[scopeName]);
-                                                }
-                                            }
-                                            return lastValue = parentValue;
-                                        }, null, parentGet.literal);
-                                        break;
-
-                                    case '&':
-                                        parentGet = $parse(attrs[attrName]);
-                                        isolateScope[scopeName] = function(locals) {
-                                            return parentGet(scope, locals);
-                                        };
-                                        break;
-
-                                    default:
-                                        throw $compileMinErr('iscp',
-                                            "Invalid isolate scope definition for directive '{0}'." +
-                                            " Definition: {... {1}: '{2}' ...}",
-                                            newIsolateScopeDirective.name, scopeName, definition);
+                                var controllerResult = controller();
+                                if (controllerResult !== controller.instance) {
+                                    // If the controller constructor has a return value, overwrite the instance
+                                    // from setupControllers
+                                    controller.instance = controllerResult;
+                                    $element.data('$' + controllerDirective.name + 'Controller', controllerResult);
+                                    if (controller.bindingInfo.removeWatches) {
+                                        controller.bindingInfo.removeWatches();
+                                    }
+                                    controller.bindingInfo =
+                                        initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective);
                                 }
-                            });
+                            } else {
+                                controller.instance = controller();
+                                $element.data('$' + controllerDirective.name + 'Controller', controller.instance);
+                                controller.bindingInfo =
+                                    initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective);
+                            }
                         }
-                        transcludeFn = boundTranscludeFn && controllersBoundTransclude;
-                        if (controllerDirectives) {
-                            forEach(controllerDirectives, function(directive) {
-                                var locals = {
-                                    $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope,
-                                    $element: $element,
-                                    $attrs: attrs,
-                                    $transclude: transcludeFn
-                                }, controllerInstance;
-
-                                controller = directive.controller;
-                                if (controller == '@') {
-                                    controller = attrs[directive.name];
-                                }
 
-                                controllerInstance = $controller(controller, locals);
-                                // For directives with element transclusion the element is a comment,
-                                // but jQuery .data doesn't support attaching data to comment nodes as it's hard to
-                                // clean up (http://bugs.jquery.com/ticket/8335).
-                                // Instead, we save the controllers for the element in a local hash and attach to .data
-                                // later, once we have the actual element.
-                                elementControllers[directive.name] = controllerInstance;
-                                if (!hasElementTranscludeDirective) {
-                                    $element.data('$' + directive.name + 'Controller', controllerInstance);
-                                }
+                        // Bind the required controllers to the controller, if `require` is an object and `bindToController` is truthy
+                        forEach(controllerDirectives, function(controllerDirective, name) {
+                            var require = controllerDirective.require;
+                            if (controllerDirective.bindToController && !isArray(require) && isObject(require)) {
+                                extend(elementControllers[name].instance, getControllers(name, require, $element, elementControllers));
+                            }
+                        });
 
-                                if (directive.controllerAs) {
-                                    locals.$scope[directive.controllerAs] = controllerInstance;
+                        // Handle the init and destroy lifecycle hooks on all controllers that have them
+                        forEach(elementControllers, function(controller) {
+                            var controllerInstance = controller.instance;
+                            if (isFunction(controllerInstance.$onChanges)) {
+                                try {
+                                    controllerInstance.$onChanges(controller.bindingInfo.initialChanges);
+                                } catch (e) {
+                                    $exceptionHandler(e);
                                 }
-                            });
-                        }
+                            }
+                            if (isFunction(controllerInstance.$onInit)) {
+                                try {
+                                    controllerInstance.$onInit();
+                                } catch (e) {
+                                    $exceptionHandler(e);
+                                }
+                            }
+                            if (isFunction(controllerInstance.$doCheck)) {
+                                controllerScope.$watch(function() { controllerInstance.$doCheck(); });
+                                controllerInstance.$doCheck();
+                            }
+                            if (isFunction(controllerInstance.$onDestroy)) {
+                                controllerScope.$on('$destroy', function callOnDestroyHook() {
+                                    controllerInstance.$onDestroy();
+                                });
+                            }
+                        });
 
                         // PRELINKING
-                        for(i = 0, ii = preLinkFns.length; i < ii; i++) {
-                            try {
-                                linkFn = preLinkFns[i];
-                                linkFn(linkFn.isolateScope ? isolateScope : scope, $element, attrs,
-                                    linkFn.require && getControllers(linkFn.require, $element, elementControllers), transcludeFn);
-                            } catch (e) {
-                                $exceptionHandler(e, startingTag($element));
-                            }
+                        for (i = 0, ii = preLinkFns.length; i < ii; i++) {
+                            linkFn = preLinkFns[i];
+                            invokeLinkFn(linkFn,
+                                linkFn.isolateScope ? isolateScope : scope,
+                                $element,
+                                attrs,
+                                linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers),
+                                transcludeFn
+                            );
                         }
 
                         // RECURSION
@@ -6570,25 +9998,38 @@
                         if (newIsolateScopeDirective && (newIsolateScopeDirective.template || newIsolateScopeDirective.templateUrl === null)) {
                             scopeToChild = isolateScope;
                         }
-                        childLinkFn && childLinkFn(scopeToChild, linkNode.childNodes, undefined, boundTranscludeFn);
+                        if (childLinkFn) {
+                            childLinkFn(scopeToChild, linkNode.childNodes, undefined, boundTranscludeFn);
+                        }
 
                         // POSTLINKING
-                        for(i = postLinkFns.length - 1; i >= 0; i--) {
-                            try {
-                                linkFn = postLinkFns[i];
-                                linkFn(linkFn.isolateScope ? isolateScope : scope, $element, attrs,
-                                    linkFn.require && getControllers(linkFn.require, $element, elementControllers), transcludeFn);
-                            } catch (e) {
-                                $exceptionHandler(e, startingTag($element));
-                            }
+                        for (i = postLinkFns.length - 1; i >= 0; i--) {
+                            linkFn = postLinkFns[i];
+                            invokeLinkFn(linkFn,
+                                linkFn.isolateScope ? isolateScope : scope,
+                                $element,
+                                attrs,
+                                linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers),
+                                transcludeFn
+                            );
                         }
 
+                        // Trigger $postLink lifecycle hooks
+                        forEach(elementControllers, function(controller) {
+                            var controllerInstance = controller.instance;
+                            if (isFunction(controllerInstance.$postLink)) {
+                                controllerInstance.$postLink();
+                            }
+                        });
+
                         // This is the function that is injected as `$transclude`.
-                        function controllersBoundTransclude(scope, cloneAttachFn) {
+                        // Note: all arguments are optional!
+                        function controllersBoundTransclude(scope, cloneAttachFn, futureParentElement, slotName) {
                             var transcludeControllers;
-
-                            // no scope passed
-                            if (arguments.length < 2) {
+                            // No scope passed in:
+                            if (!isScope(scope)) {
+                                slotName = futureParentElement;
+                                futureParentElement = cloneAttachFn;
                                 cloneAttachFn = scope;
                                 scope = undefined;
                             }
@@ -6596,16 +10037,111 @@
                             if (hasElementTranscludeDirective) {
                                 transcludeControllers = elementControllers;
                             }
+                            if (!futureParentElement) {
+                                futureParentElement = hasElementTranscludeDirective ? $element.parent() : $element;
+                            }
+                            if (slotName) {
+                                // slotTranscludeFn can be one of three things:
+                                //  * a transclude function - a filled slot
+                                //  * `null` - an optional slot that was not filled
+                                //  * `undefined` - a slot that was not declared (i.e. invalid)
+                                var slotTranscludeFn = boundTranscludeFn.$$slots[slotName];
+                                if (slotTranscludeFn) {
+                                    return slotTranscludeFn(scope, cloneAttachFn, transcludeControllers, futureParentElement, scopeToChild);
+                                } else if (isUndefined(slotTranscludeFn)) {
+                                    throw $compileMinErr('noslot',
+                                        'No parent directive that requires a transclusion with slot name "{0}". ' +
+                                        'Element: {1}',
+                                        slotName, startingTag($element));
+                                }
+                            } else {
+                                return boundTranscludeFn(scope, cloneAttachFn, transcludeControllers, futureParentElement, scopeToChild);
+                            }
+                        }
+                    }
+                }
+
+                function getControllers(directiveName, require, $element, elementControllers) {
+                    var value;
 
-                            return boundTranscludeFn(scope, cloneAttachFn, transcludeControllers);
+                    if (isString(require)) {
+                        var match = require.match(REQUIRE_PREFIX_REGEXP);
+                        var name = require.substring(match[0].length);
+                        var inheritType = match[1] || match[3];
+                        var optional = match[2] === '?';
+
+                        //If only parents then start at the parent element
+                        if (inheritType === '^^') {
+                            $element = $element.parent();
+                            //Otherwise attempt getting the controller from elementControllers in case
+                            //the element is transcluded (and has no data) and to avoid .data if possible
+                        } else {
+                            value = elementControllers && elementControllers[name];
+                            value = value && value.instance;
+                        }
+
+                        if (!value) {
+                            var dataName = '$' + name + 'Controller';
+                            value = inheritType ? $element.inheritedData(dataName) : $element.data(dataName);
+                        }
+
+                        if (!value && !optional) {
+                            throw $compileMinErr('ctreq',
+                                'Controller \'{0}\', required by directive \'{1}\', can\'t be found!',
+                                name, directiveName);
+                        }
+                    } else if (isArray(require)) {
+                        value = [];
+                        for (var i = 0, ii = require.length; i < ii; i++) {
+                            value[i] = getControllers(directiveName, require[i], $element, elementControllers);
+                        }
+                    } else if (isObject(require)) {
+                        value = {};
+                        forEach(require, function(controller, property) {
+                            value[property] = getControllers(directiveName, controller, $element, elementControllers);
+                        });
+                    }
+
+                    return value || null;
+                }
+
+                function setupControllers($element, attrs, transcludeFn, controllerDirectives, isolateScope, scope, newIsolateScopeDirective) {
+                    var elementControllers = createMap();
+                    for (var controllerKey in controllerDirectives) {
+                        var directive = controllerDirectives[controllerKey];
+                        var locals = {
+                            $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope,
+                            $element: $element,
+                            $attrs: attrs,
+                            $transclude: transcludeFn
+                        };
+
+                        var controller = directive.controller;
+                        if (controller === '@') {
+                            controller = attrs[directive.name];
                         }
+
+                        var controllerInstance = $controller(controller, locals, true, directive.controllerAs);
+
+                        // For directives with element transclusion the element is a comment.
+                        // In this case .data will not attach any data.
+                        // Instead, we save the controllers for the element in a local hash and attach to .data
+                        // later, once we have the actual element.
+                        elementControllers[directive.name] = controllerInstance;
+                        $element.data('$' + directive.name + 'Controller', controllerInstance.instance);
                     }
+                    return elementControllers;
                 }
 
-                function markDirectivesAsIsolate(directives) {
-                    // mark all directives as needing isolate scope.
+                // Depending upon the context in which a directive finds itself it might need to have a new isolated
+                // or child scope created. For instance:
+                // * if the directive has been pulled into a template because another directive with a higher priority
+                // asked for element transclusion
+                // * if the directive itself asks for transclusion but it is at the root of a template and the original
+                // element was replaced. See https://github.com/angular/angular.js/issues/12936
+                function markDirectiveScope(directives, isolateScope, newScope) {
                     for (var j = 0, jj = directives.length; j < jj; j++) {
-                        directives[j] = inherit(directives[j], {$$isolateScope: true});
+                        directives[j] = inherit(directives[j], {$$isolateScope: isolateScope, $$newScope: newScope});
                     }
                 }
 
@@ -6628,25 +10164,51 @@
                     if (name === ignoreDirective) return null;
                     var match = null;
                     if (hasDirectives.hasOwnProperty(name)) {
-                        for(var directive, directives = $injector.get(name + Suffix),
-                                i = 0, ii = directives.length; i<ii; i++) {
-                            try {
-                                directive = directives[i];
-                                if ( (maxPriority === undefined || maxPriority > directive.priority) &&
-                                    directive.restrict.indexOf(location) != -1) {
-                                    if (startAttrName) {
-                                        directive = inherit(directive, {$$start: startAttrName, $$end: endAttrName});
+                        for (var directive, directives = $injector.get(name + Suffix),
+                                 i = 0, ii = directives.length; i < ii; i++) {
+                            directive = directives[i];
+                            if ((isUndefined(maxPriority) || maxPriority > directive.priority) &&
+                                directive.restrict.indexOf(location) !== -1) {
+                                if (startAttrName) {
+                                    directive = inherit(directive, {$$start: startAttrName, $$end: endAttrName});
+                                }
+                                if (!directive.$$bindings) {
+                                    var bindings = directive.$$bindings =
+                                        parseDirectiveBindings(directive, directive.name);
+                                    if (isObject(bindings.isolateScope)) {
+                                        directive.$$isolateBindings = bindings.isolateScope;
                                     }
-                                    tDirectives.push(directive);
-                                    match = directive;
                                 }
-                            } catch(e) { $exceptionHandler(e); }
+                                tDirectives.push(directive);
+                                match = directive;
+                            }
                         }
                     }
                     return match;
                 }
 
 
+                /**
+                 * looks up the directive and returns true if it is a multi-element directive,
+                 * and therefore requires DOM nodes between -start and -end markers to be grouped
+                 * together.
+                 *
+                 * @param {string} name name of the directive to look up.
+                 * @returns true if directive was registered as multi-element.
+                 */
+                function directiveIsMultiElement(name) {
+                    if (hasDirectives.hasOwnProperty(name)) {
+                        for (var directive, directives = $injector.get(name + Suffix),
+                                 i = 0, ii = directives.length; i < ii; i++) {
+                            directive = directives[i];
+                            if (directive.multiElement) {
+                                return true;
+                            }
+                        }
+                    }
+                    return false;
+                }
+
                 /**
                  * When the element is replaced with HTML template then the new attributes
                  * on the template need to be merged with the existing attributes in the DOM.
@@ -6657,14 +10219,17 @@
                  */
                 function mergeTemplateAttributes(dst, src) {
                     var srcAttr = src.$attr,
-                        dstAttr = dst.$attr,
-                        $element = dst.$$element;
+                        dstAttr = dst.$attr;
 
                     // reapply the old attributes to the new element
                     forEach(dst, function(value, key) {
-                        if (key.charAt(0) != '$') {
-                            if (src[key]) {
-                                value += (key === 'style' ? ';' : ' ') + src[key];
+                        if (key.charAt(0) !== '$') {
+                            if (src[key] && src[key] !== value) {
+                                if (value.length) {
+                                    value += (key === 'style' ? ';' : ' ') + src[key];
+                                } else {
+                                    value = src[key];
+                                }
                             }
                             dst.$set(key, value, true, srcAttr[key]);
                         }
@@ -6672,18 +10237,16 @@
 
                     // copy the new attributes on the old attrs object
                     forEach(src, function(value, key) {
-                        if (key == 'class') {
-                            safeAddClass($element, value);
-                            dst['class'] = (dst['class'] ? dst['class'] + ' ' : '') + value;
-                        } else if (key == 'style') {
-                            $element.attr('style', $element.attr('style') + ';' + value);
-                            dst['style'] = (dst['style'] ? dst['style'] + ';' : '') + value;
-                            // `dst` will never contain hasOwnProperty as DOM parser won't let it.
-                            // You will get an "InvalidCharacterError: DOM Exception 5" error if you
-                            // have an attribute like "has-own-property" or "data-has-own-property", etc.
-                        } else if (key.charAt(0) != '$' && !dst.hasOwnProperty(key)) {
+                        // Check if we already set this attribute in the loop above.
+                        // `dst` will never contain hasOwnProperty as DOM parser won't let it.
+                        // You will get an "InvalidCharacterError: DOM Exception 5" error if you
+                        // have an attribute like "has-own-property" or "data-has-own-property", etc.
+                        if (!dst.hasOwnProperty(key) && key.charAt(0) !== '$') {
                             dst[key] = value;
-                            dstAttr[key] = srcAttr[key];
+
+                            if (key !== 'class' && key !== 'style') {
+                                dstAttr[key] = srcAttr[key];
+                            }
                         }
                     });
                 }
@@ -6696,18 +10259,18 @@
                         afterTemplateChildLinkFn,
                         beforeTemplateCompileNode = $compileNode[0],
                         origAsyncDirective = directives.shift(),
-                    // The fact that we have to copy and patch the directive seems wrong!
-                        derivedSyncDirective = extend({}, origAsyncDirective, {
+                        derivedSyncDirective = inherit(origAsyncDirective, {
                             templateUrl: null, transclude: null, replace: null, $$originalDirective: origAsyncDirective
                         }),
                         templateUrl = (isFunction(origAsyncDirective.templateUrl))
                             ? origAsyncDirective.templateUrl($compileNode, tAttrs)
-                            : origAsyncDirective.templateUrl;
+                            : origAsyncDirective.templateUrl,
+                        templateNamespace = origAsyncDirective.templateNamespace;
 
                     $compileNode.empty();
 
-                    $http.get($sce.getTrustedResourceUrl(templateUrl), {cache: $templateCache}).
-                        success(function(content) {
+                    $templateRequest(templateUrl)
+                        .then(function(content) {
                             var compileNode, tempTemplateAttrs, $template, childBoundTranscludeFn;
 
                             content = denormalizeTemplate(content);
@@ -6716,13 +10279,13 @@
                                 if (jqLiteIsTextNode(content)) {
                                     $template = [];
                                 } else {
-                                    $template = jqLite(content);
+                                    $template = removeComments(wrapTemplate(templateNamespace, trim(content)));
                                 }
                                 compileNode = $template[0];
 
-                                if ($template.length != 1 || compileNode.nodeType !== 1) {
+                                if ($template.length !== 1 || compileNode.nodeType !== NODE_TYPE_ELEMENT) {
                                     throw $compileMinErr('tplrt',
-                                        "Template for directive '{0}' must have exactly one root element. {1}",
+                                        'Template for directive \'{0}\' must have exactly one root element. {1}',
                                         origAsyncDirective.name, templateUrl);
                                 }
 
@@ -6731,7 +10294,9 @@
                                 var templateDirectives = collectDirectives(compileNode, [], tempTemplateAttrs);
 
                                 if (isObject(origAsyncDirective.scope)) {
-                                    markDirectivesAsIsolate(templateDirectives);
+                                    // the original directive that caused the template to be loaded async required
+                                    // an isolate scope
+                                    markDirectiveScope(templateDirectives, true);
                                 }
                                 directives = templateDirectives.concat(directives);
                                 mergeTemplateAttributes(tAttrs, tempTemplateAttrs);
@@ -6746,20 +10311,21 @@
                                 childTranscludeFn, $compileNode, origAsyncDirective, preLinkFns, postLinkFns,
                                 previousCompileContext);
                             forEach($rootElement, function(node, i) {
-                                if (node == compileNode) {
+                                if (node === compileNode) {
                                     $rootElement[i] = $compileNode[0];
                                 }
                             });
                             afterTemplateChildLinkFn = compileNodes($compileNode[0].childNodes, childTranscludeFn);
 
-
-                            while(linkQueue.length) {
+                            while (linkQueue.length) {
                                 var scope = linkQueue.shift(),
                                     beforeTemplateLinkNode = linkQueue.shift(),
                                     linkRootElement = linkQueue.shift(),
                                     boundTranscludeFn = linkQueue.shift(),
                                     linkNode = $compileNode[0];
 
+                                if (scope.$$destroyed) continue;
+
                                 if (beforeTemplateLinkNode !== beforeTemplateCompileNode) {
                                     var oldClasses = beforeTemplateLinkNode.className;
 
@@ -6768,14 +10334,13 @@
                                         // it was cloned therefore we have to clone as well.
                                         linkNode = jqLiteClone(compileNode);
                                     }
-
                                     replaceWith(linkRootElement, jqLite(beforeTemplateLinkNode), linkNode);
 
                                     // Copy in CSS classes from original node
                                     safeAddClass(jqLite(linkNode), oldClasses);
                                 }
-                                if (afterTemplateNodeLinkFn.transclude) {
-                                    childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude);
+                                if (afterTemplateNodeLinkFn.transcludeOnThisElement) {
+                                    childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn);
                                 } else {
                                     childBoundTranscludeFn = boundTranscludeFn;
                                 }
@@ -6783,19 +10348,25 @@
                                     childBoundTranscludeFn);
                             }
                             linkQueue = null;
-                        }).
-                        error(function(response, code, headers, config) {
-                            throw $compileMinErr('tpload', 'Failed to load template: {0}', config.url);
-                        });
+                        }).catch(function(error) {
+                        if (isError(error)) {
+                            $exceptionHandler(error);
+                        }
+                    });
 
                     return function delayedNodeLinkFn(ignoreChildLinkFn, scope, node, rootElement, boundTranscludeFn) {
+                        var childBoundTranscludeFn = boundTranscludeFn;
+                        if (scope.$$destroyed) return;
                         if (linkQueue) {
-                            linkQueue.push(scope);
-                            linkQueue.push(node);
-                            linkQueue.push(rootElement);
-                            linkQueue.push(boundTranscludeFn);
+                            linkQueue.push(scope,
+                                node,
+                                rootElement,
+                                childBoundTranscludeFn);
                         } else {
-                            afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, node, rootElement, boundTranscludeFn);
+                            if (afterTemplateNodeLinkFn.transcludeOnThisElement) {
+                                childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn);
+                            }
+                            afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, node, rootElement, childBoundTranscludeFn);
                         }
                     };
                 }
@@ -6811,11 +10382,18 @@
                     return a.index - b.index;
                 }
 
-
                 function assertNoDuplicate(what, previousDirective, directive, element) {
+
+                    function wrapModuleNameIfDefined(moduleName) {
+                        return moduleName ?
+                            (' (module: ' + moduleName + ')') :
+                            '';
+                    }
+
                     if (previousDirective) {
-                        throw $compileMinErr('multidir', 'Multiple directives [{0}, {1}] asking for {2} on: {3}',
-                            previousDirective.name, directive.name, what, startingTag(element));
+                        throw $compileMinErr('multidir', 'Multiple directives [{0}{1}, {2}{3}] asking for {4} on: {5}',
+                            previousDirective.name, wrapModuleNameIfDefined(previousDirective.$$moduleName),
+                            directive.name, wrapModuleNameIfDefined(directive.$$moduleName), what, startingTag(element));
                     }
                 }
 
@@ -6825,87 +10403,127 @@
                     if (interpolateFn) {
                         directives.push({
                             priority: 0,
-                            compile: valueFn(function textInterpolateLinkFn(scope, node) {
-                                var parent = node.parent(),
-                                    bindings = parent.data('$binding') || [];
-                                bindings.push(interpolateFn);
-                                safeAddClass(parent.data('$binding', bindings), 'ng-binding');
-                                scope.$watch(interpolateFn, function interpolateFnWatchAction(value) {
-                                    node[0].nodeValue = value;
-                                });
-                            })
+                            compile: function textInterpolateCompileFn(templateNode) {
+                                var templateNodeParent = templateNode.parent(),
+                                    hasCompileParent = !!templateNodeParent.length;
+
+                                // When transcluding a template that has bindings in the root
+                                // we don't have a parent and thus need to add the class during linking fn.
+                                if (hasCompileParent) compile.$$addBindingClass(templateNodeParent);
+
+                                return function textInterpolateLinkFn(scope, node) {
+                                    var parent = node.parent();
+                                    if (!hasCompileParent) compile.$$addBindingClass(parent);
+                                    compile.$$addBindingInfo(parent, interpolateFn.expressions);
+                                    scope.$watch(interpolateFn, function interpolateFnWatchAction(value) {
+                                        node[0].nodeValue = value;
+                                    });
+                                };
+                            }
                         });
                     }
                 }
 
 
+                function wrapTemplate(type, template) {
+                    type = lowercase(type || 'html');
+                    switch (type) {
+                        case 'svg':
+                        case 'math':
+                            var wrapper = window.document.createElement('div');
+                            wrapper.innerHTML = '<' + type + '>' + template + '</' + type + '>';
+                            return wrapper.childNodes[0].childNodes;
+                        default:
+                            return template;
+                    }
+                }
+
+
                 function getTrustedContext(node, attrNormalizedName) {
-                    if (attrNormalizedName == "srcdoc") {
+                    if (attrNormalizedName === 'srcdoc') {
                         return $sce.HTML;
                     }
                     var tag = nodeName_(node);
-                    // maction[xlink:href] can source SVG.  It's not limited to <maction>.
-                    if (attrNormalizedName == "xlinkHref" ||
-                        (tag == "FORM" && attrNormalizedName == "action") ||
-                        (tag != "IMG" && (attrNormalizedName == "src" ||
-                        attrNormalizedName == "ngSrc"))) {
+                    // All tags with src attributes require a RESOURCE_URL value, except for
+                    // img and various html5 media tags.
+                    if (attrNormalizedName === 'src' || attrNormalizedName === 'ngSrc') {
+                        if (['img', 'video', 'audio', 'source', 'track'].indexOf(tag) === -1) {
+                            return $sce.RESOURCE_URL;
+                        }
+                        // maction[xlink:href] can source SVG.  It's not limited to <maction>.
+                    } else if (attrNormalizedName === 'xlinkHref' ||
+                        (tag === 'form' && attrNormalizedName === 'action') ||
+                        // links can be stylesheets or imports, which can run script in the current origin
+                        (tag === 'link' && attrNormalizedName === 'href')
+                    ) {
                         return $sce.RESOURCE_URL;
                     }
                 }
 
 
-                function addAttrInterpolateDirective(node, directives, value, name) {
-                    var interpolateFn = $interpolate(value, true);
+                function addAttrInterpolateDirective(node, directives, value, name, isNgAttr) {
+                    var trustedContext = getTrustedContext(node, name);
+                    var mustHaveExpression = !isNgAttr;
+                    var allOrNothing = ALL_OR_NOTHING_ATTRS[name] || isNgAttr;
+
+                    var interpolateFn = $interpolate(value, mustHaveExpression, trustedContext, allOrNothing);
 
                     // no interpolation found -> ignore
                     if (!interpolateFn) return;
 
-
-                    if (name === "multiple" && nodeName_(node) === "SELECT") {
-                        throw $compileMinErr("selmulti",
-                            "Binding to the 'multiple' attribute is not supported. Element: {0}",
+                    if (name === 'multiple' && nodeName_(node) === 'select') {
+                        throw $compileMinErr('selmulti',
+                            'Binding to the \'multiple\' attribute is not supported. Element: {0}',
                             startingTag(node));
                     }
 
+                    if (EVENT_HANDLER_ATTR_REGEXP.test(name)) {
+                        throw $compileMinErr('nodomevents',
+                            'Interpolations for HTML DOM event attributes are disallowed.  Please use the ' +
+                            'ng- versions (such as ng-click instead of onclick) instead.');
+                    }
+
                     directives.push({
                         priority: 100,
                         compile: function() {
                             return {
                                 pre: function attrInterpolatePreLinkFn(scope, element, attr) {
-                                    var $$observers = (attr.$$observers || (attr.$$observers = {}));
-
-                                    if (EVENT_HANDLER_ATTR_REGEXP.test(name)) {
-                                        throw $compileMinErr('nodomevents',
-                                            "Interpolations for HTML DOM event attributes are disallowed.  Please use the " +
-                                            "ng- versions (such as ng-click instead of onclick) instead.");
+                                    var $$observers = (attr.$$observers || (attr.$$observers = createMap()));
+
+                                    // If the attribute has changed since last $interpolate()ed
+                                    var newValue = attr[name];
+                                    if (newValue !== value) {
+                                        // we need to interpolate again since the attribute value has been updated
+                                        // (e.g. by another directive's compile function)
+                                        // ensure unset/empty values make interpolateFn falsy
+                                        interpolateFn = newValue && $interpolate(newValue, true, trustedContext, allOrNothing);
+                                        value = newValue;
                                     }
 
-                                    // we need to interpolate again, in case the attribute value has been updated
-                                    // (e.g. by another directive's compile function)
-                                    interpolateFn = $interpolate(attr[name], true, getTrustedContext(node, name));
-
                                     // if attribute was updated so that there is no interpolation going on we don't want to
                                     // register any observers
                                     if (!interpolateFn) return;
 
-                                    // TODO(i): this should likely be attr.$set(name, iterpolateFn(scope) so that we reset the
-                                    // actual attr value
+                                    // initialize attr object so that it's ready in case we need the value for isolate
+                                    // scope initialization, otherwise the value would not be available from isolate
+                                    // directive's linking fn during linking phase
                                     attr[name] = interpolateFn(scope);
+
                                     ($$observers[name] || ($$observers[name] = [])).$$inter = true;
                                     (attr.$$observers && attr.$$observers[name].$$scope || scope).
-                                        $watch(interpolateFn, function interpolateFnWatchAction(newValue, oldValue) {
-                                            //special case for class attribute addition + removal
-                                            //so that class changes can tap into the animation
-                                            //hooks provided by the $animate service. Be sure to
-                                            //skip animations when the first digest occurs (when
-                                            //both the new and the old values are the same) since
-                                            //the CSS classes are the non-interpolated values
-                                            if(name === 'class' && newValue != oldValue) {
-                                                attr.$updateClass(newValue, oldValue);
-                                            } else {
-                                                attr.$set(name, newValue);
-                                            }
-                                        });
+                                    $watch(interpolateFn, function interpolateFnWatchAction(newValue, oldValue) {
+                                        //special case for class attribute addition + removal
+                                        //so that class changes can tap into the animation
+                                        //hooks provided by the $animate service. Be sure to
+                                        //skip animations when the first digest occurs (when
+                                        //both the new and the old values are the same) since
+                                        //the CSS classes are the non-interpolated values
+                                        if (name === 'class' && newValue !== oldValue) {
+                                            attr.$updateClass(newValue, oldValue);
+                                        } else {
+                                            attr.$set(name, newValue);
+                                        }
+                                    });
                                 }
                             };
                         }
@@ -6930,8 +10548,8 @@
                         i, ii;
 
                     if ($rootElement) {
-                        for(i = 0, ii = $rootElement.length; i < ii; i++) {
-                            if ($rootElement[i] == firstElementToRemove) {
+                        for (i = 0, ii = $rootElement.length; i < ii; i++) {
+                            if ($rootElement[i] === firstElementToRemove) {
                                 $rootElement[i++] = newNode;
                                 for (var j = i, j2 = j + removeCount - 1,
                                          jj = $rootElement.length;
@@ -6943,6 +10561,13 @@
                                     }
                                 }
                                 $rootElement.length -= removeCount - 1;
+
+                                // If the replaced element is also the jQuery .context then replace it
+                                // .context is a deprecated jQuery api, so we should set it only when jQuery set it
+                                // http://api.jquery.com/context/
+                                if ($rootElement.context === firstElementToRemove) {
+                                    $rootElement.context = newNode;
+                                }
                                 break;
                             }
                         }
@@ -6951,16 +10576,34 @@
                     if (parent) {
                         parent.replaceChild(newNode, firstElementToRemove);
                     }
-                    var fragment = document.createDocumentFragment();
-                    fragment.appendChild(firstElementToRemove);
-                    newNode[jqLite.expando] = firstElementToRemove[jqLite.expando];
-                    for (var k = 1, kk = elementsToRemove.length; k < kk; k++) {
-                        var element = elementsToRemove[k];
-                        jqLite(element).remove(); // must do this way to clean up expando
-                        fragment.appendChild(element);
-                        delete elementsToRemove[k];
+
+                    // Append all the `elementsToRemove` to a fragment. This will...
+                    // - remove them from the DOM
+                    // - allow them to still be traversed with .nextSibling
+                    // - allow a single fragment.qSA to fetch all elements being removed
+                    var fragment = window.document.createDocumentFragment();
+                    for (i = 0; i < removeCount; i++) {
+                        fragment.appendChild(elementsToRemove[i]);
+                    }
+
+                    if (jqLite.hasData(firstElementToRemove)) {
+                        // Copy over user data (that includes AngularJS's $scope etc.). Don't copy private
+                        // data here because there's no public interface in jQuery to do that and copying over
+                        // event listeners (which is the main use of private data) wouldn't work anyway.
+                        jqLite.data(newNode, jqLite.data(firstElementToRemove));
+
+                        // Remove $destroy event listeners from `firstElementToRemove`
+                        jqLite(firstElementToRemove).off('$destroy');
                     }
 
+                    // Cleanup any data/listeners on the elements and children.
+                    // This includes invoking the $destroy event on any elements with listeners.
+                    jqLite.cleanData(fragment.querySelectorAll('*'));
+
+                    // Update the jqLite collection to only contain the `newNode`
+                    for (i = 1; i < removeCount; i++) {
+                        delete elementsToRemove[i];
+                    }
                     elementsToRemove[0] = newNode;
                     elementsToRemove.length = 1;
                 }
@@ -6969,102 +10612,332 @@
                 function cloneAndAnnotateFn(fn, annotation) {
                     return extend(function() { return fn.apply(null, arguments); }, fn, annotation);
                 }
-            }];
-    }
-
-    var PREFIX_REGEXP = /^(x[\:\-_]|data[\:\-_])/i;
-    /**
-     * Converts all accepted directives format into proper directive name.
-     * All of these will become 'myDirective':
-     *   my:Directive
-     *   my-directive
-     *   x-my-directive
-     *   data-my:directive
-     *
-     * Also there is special case for Moz prefix starting with upper case letter.
-     * @param name Name to normalize
-     */
-    function directiveNormalize(name) {
-        return camelCase(name.replace(PREFIX_REGEXP, ''));
-    }
 
-    /**
-     * @ngdoc type
-     * @name $compile.directive.Attributes
-     *
-     * @description
-     * A shared object between directive compile / linking functions which contains normalized DOM
-     * element attributes. The values reflect current binding state `{{ }}`. The normalization is
-     * needed since all of these are treated as equivalent in Angular:
-     *
-     *    <span ng:bind="a" ng-bind="a" data-ng-bind="a" x-ng-bind="a">
-     */
 
-    /**
-     * @ngdoc property
-     * @name $compile.directive.Attributes#$attr
-     * @returns {object} A map of DOM element attribute names to the normalized name. This is
-     *                   needed to do reverse lookup from normalized name back to actual name.
-     */
+                function invokeLinkFn(linkFn, scope, $element, attrs, controllers, transcludeFn) {
+                    try {
+                        linkFn(scope, $element, attrs, controllers, transcludeFn);
+                    } catch (e) {
+                        $exceptionHandler(e, startingTag($element));
+                    }
+                }
 
+                function strictBindingsCheck(attrName, directiveName) {
+                    if (strictComponentBindingsEnabled) {
+                        throw $compileMinErr('missingattr',
+                            'Attribute \'{0}\' of \'{1}\' is non-optional and must be set!',
+                            attrName, directiveName);
+                    }
+                }
 
-    /**
-     * @ngdoc method
-     * @name $compile.directive.Attributes#$set
-     * @function
-     *
-     * @description
-     * Set DOM element attribute value.
-     *
-     *
-     * @param {string} name Normalized element attribute name of the property to modify. The name is
-     *          reverse-translated using the {@link ng.$compile.directive.Attributes#$attr $attr}
-     *          property to the original name.
-     * @param {string} value Value to set the attribute to. The value can be an interpolated string.
-     */
+                // Set up $watches for isolate scope and controller bindings.
+                function initializeDirectiveBindings(scope, attrs, destination, bindings, directive) {
+                    var removeWatchCollection = [];
+                    var initialChanges = {};
+                    var changes;
 
+                    forEach(bindings, function initializeBinding(definition, scopeName) {
+                        var attrName = definition.attrName,
+                            optional = definition.optional,
+                            mode = definition.mode, // @, =, <, or &
+                            lastValue,
+                            parentGet, parentSet, compare, removeWatch;
 
+                        switch (mode) {
 
-    /**
-     * Closure compiler type information
-     */
+                            case '@':
+                                if (!optional && !hasOwnProperty.call(attrs, attrName)) {
+                                    strictBindingsCheck(attrName, directive.name);
+                                    destination[scopeName] = attrs[attrName] = undefined;
 
-    function nodesetLinkingFn(
-        /* angular.Scope */ scope,
-        /* NodeList */ nodeList,
-        /* Element */ rootElement,
-        /* function(Function) */ boundTranscludeFn
-        ){}
+                                }
+                                removeWatch = attrs.$observe(attrName, function(value) {
+                                    if (isString(value) || isBoolean(value)) {
+                                        var oldValue = destination[scopeName];
+                                        recordChanges(scopeName, value, oldValue);
+                                        destination[scopeName] = value;
+                                    }
+                                });
+                                attrs.$$observers[attrName].$$scope = scope;
+                                lastValue = attrs[attrName];
+                                if (isString(lastValue)) {
+                                    // If the attribute has been provided then we trigger an interpolation to ensure
+                                    // the value is there for use in the link fn
+                                    destination[scopeName] = $interpolate(lastValue)(scope);
+                                } else if (isBoolean(lastValue)) {
+                                    // If the attributes is one of the BOOLEAN_ATTR then AngularJS will have converted
+                                    // the value to boolean rather than a string, so we special case this situation
+                                    destination[scopeName] = lastValue;
+                                }
+                                initialChanges[scopeName] = new SimpleChange(_UNINITIALIZED_VALUE, destination[scopeName]);
+                                removeWatchCollection.push(removeWatch);
+                                break;
 
-    function directiveLinkingFn(
-        /* nodesetLinkingFn */ nodesetLinkingFn,
-        /* angular.Scope */ scope,
-        /* Node */ node,
-        /* Element */ rootElement,
-        /* function(Function) */ boundTranscludeFn
-        ){}
+                            case '=':
+                                if (!hasOwnProperty.call(attrs, attrName)) {
+                                    if (optional) break;
+                                    strictBindingsCheck(attrName, directive.name);
+                                    attrs[attrName] = undefined;
+                                }
+                                if (optional && !attrs[attrName]) break;
 
-    function tokenDifference(str1, str2) {
-        var values = '',
-            tokens1 = str1.split(/\s+/),
-            tokens2 = str2.split(/\s+/);
+                                parentGet = $parse(attrs[attrName]);
+                                if (parentGet.literal) {
+                                    compare = equals;
+                                } else {
+                                    compare = simpleCompare;
+                                }
+                                parentSet = parentGet.assign || function() {
+                                    // reset the change, or we will throw this exception on every $digest
+                                    lastValue = destination[scopeName] = parentGet(scope);
+                                    throw $compileMinErr('nonassign',
+                                        'Expression \'{0}\' in attribute \'{1}\' used with directive \'{2}\' is non-assignable!',
+                                        attrs[attrName], attrName, directive.name);
+                                };
+                                lastValue = destination[scopeName] = parentGet(scope);
+                                var parentValueWatch = function parentValueWatch(parentValue) {
+                                    if (!compare(parentValue, destination[scopeName])) {
+                                        // we are out of sync and need to copy
+                                        if (!compare(parentValue, lastValue)) {
+                                            // parent changed and it has precedence
+                                            destination[scopeName] = parentValue;
+                                        } else {
+                                            // if the parent can be assigned then do so
+                                            parentSet(scope, parentValue = destination[scopeName]);
+                                        }
+                                    }
+                                    lastValue = parentValue;
+                                    return lastValue;
+                                };
+                                parentValueWatch.$stateful = true;
+                                if (definition.collection) {
+                                    removeWatch = scope.$watchCollection(attrs[attrName], parentValueWatch);
+                                } else {
+                                    removeWatch = scope.$watch($parse(attrs[attrName], parentValueWatch), null, parentGet.literal);
+                                }
+                                removeWatchCollection.push(removeWatch);
+                                break;
+
+                            case '<':
+                                if (!hasOwnProperty.call(attrs, attrName)) {
+                                    if (optional) break;
+                                    strictBindingsCheck(attrName, directive.name);
+                                    attrs[attrName] = undefined;
+                                }
+                                if (optional && !attrs[attrName]) break;
+
+                                parentGet = $parse(attrs[attrName]);
+                                var deepWatch = parentGet.literal;
+
+                                var initialValue = destination[scopeName] = parentGet(scope);
+                                initialChanges[scopeName] = new SimpleChange(_UNINITIALIZED_VALUE, destination[scopeName]);
+
+                                removeWatch = scope.$watch(parentGet, function parentValueWatchAction(newValue, oldValue) {
+                                    if (oldValue === newValue) {
+                                        if (oldValue === initialValue || (deepWatch && equals(oldValue, initialValue))) {
+                                            return;
+                                        }
+                                        oldValue = initialValue;
+                                    }
+                                    recordChanges(scopeName, newValue, oldValue);
+                                    destination[scopeName] = newValue;
+                                }, deepWatch);
+
+                                removeWatchCollection.push(removeWatch);
+                                break;
+
+                            case '&':
+                                if (!optional && !hasOwnProperty.call(attrs, attrName)) {
+                                    strictBindingsCheck(attrName, directive.name);
+                                }
+                                // Don't assign Object.prototype method to scope
+                                parentGet = attrs.hasOwnProperty(attrName) ? $parse(attrs[attrName]) : noop;
+
+                                // Don't assign noop to destination if expression is not valid
+                                if (parentGet === noop && optional) break;
+
+                                destination[scopeName] = function(locals) {
+                                    return parentGet(scope, locals);
+                                };
+                                break;
+                        }
+                    });
+
+                    function recordChanges(key, currentValue, previousValue) {
+                        if (isFunction(destination.$onChanges) && !simpleCompare(currentValue, previousValue)) {
+                            // If we have not already scheduled the top level onChangesQueue handler then do so now
+                            if (!onChangesQueue) {
+                                scope.$$postDigest(flushOnChangesQueue);
+                                onChangesQueue = [];
+                            }
+                            // If we have not already queued a trigger of onChanges for this controller then do so now
+                            if (!changes) {
+                                changes = {};
+                                onChangesQueue.push(triggerOnChangesHook);
+                            }
+                            // If the has been a change on this property already then we need to reuse the previous value
+                            if (changes[key]) {
+                                previousValue = changes[key].previousValue;
+                            }
+                            // Store this change
+                            changes[key] = new SimpleChange(previousValue, currentValue);
+                        }
+                    }
+
+                    function triggerOnChangesHook() {
+                        destination.$onChanges(changes);
+                        // Now clear the changes so that we schedule onChanges when more changes arrive
+                        changes = undefined;
+                    }
+
+                    return {
+                        initialChanges: initialChanges,
+                        removeWatches: removeWatchCollection.length && function removeWatches() {
+                            for (var i = 0, ii = removeWatchCollection.length; i < ii; ++i) {
+                                removeWatchCollection[i]();
+                            }
+                        }
+                    };
+                }
+            }];
+    }
+
+    function SimpleChange(previous, current) {
+        this.previousValue = previous;
+        this.currentValue = current;
+    }
+    SimpleChange.prototype.isFirstChange = function() { return this.previousValue === _UNINITIALIZED_VALUE; };
+
+
+    var PREFIX_REGEXP = /^((?:x|data)[:\-_])/i;
+    var SPECIAL_CHARS_REGEXP = /[:\-_]+(.)/g;
+
+    /**
+     * Converts all accepted directives format into proper directive name.
+     * @param name Name to normalize
+     */
+    function directiveNormalize(name) {
+        return name
+            .replace(PREFIX_REGEXP, '')
+            .replace(SPECIAL_CHARS_REGEXP, function(_, letter, offset) {
+                return offset ? letter.toUpperCase() : letter;
+            });
+    }
+
+    /**
+     * @ngdoc type
+     * @name $compile.directive.Attributes
+     *
+     * @description
+     * A shared object between directive compile / linking functions which contains normalized DOM
+     * element attributes. The values reflect current binding state `{{ }}`. The normalization is
+     * needed since all of these are treated as equivalent in AngularJS:
+     *
+     * ```
+     *    <span ng:bind="a" ng-bind="a" data-ng-bind="a" x-ng-bind="a">
+     * ```
+     */
+
+    /**
+     * @ngdoc property
+     * @name $compile.directive.Attributes#$attr
+     *
+     * @description
+     * A map of DOM element attribute names to the normalized name. This is
+     * needed to do reverse lookup from normalized name back to actual name.
+     */
+
+
+    /**
+     * @ngdoc method
+     * @name $compile.directive.Attributes#$set
+     * @kind function
+     *
+     * @description
+     * Set DOM element attribute value.
+     *
+     *
+     * @param {string} name Normalized element attribute name of the property to modify. The name is
+     *          reverse-translated using the {@link ng.$compile.directive.Attributes#$attr $attr}
+     *          property to the original name.
+     * @param {string} value Value to set the attribute to. The value can be an interpolated string.
+     */
+
+
+
+    /**
+     * Closure compiler type information
+     */
+
+    function nodesetLinkingFn(
+        /* angular.Scope */ scope,
+        /* NodeList */ nodeList,
+        /* Element */ rootElement,
+        /* function(Function) */ boundTranscludeFn
+    ) {}
+
+    function directiveLinkingFn(
+        /* nodesetLinkingFn */ nodesetLinkingFn,
+        /* angular.Scope */ scope,
+        /* Node */ node,
+        /* Element */ rootElement,
+        /* function(Function) */ boundTranscludeFn
+    ) {}
+
+    function tokenDifference(str1, str2) {
+        var values = '',
+            tokens1 = str1.split(/\s+/),
+            tokens2 = str2.split(/\s+/);
 
         outer:
-            for(var i = 0; i < tokens1.length; i++) {
+            for (var i = 0; i < tokens1.length; i++) {
                 var token = tokens1[i];
-                for(var j = 0; j < tokens2.length; j++) {
-                    if(token == tokens2[j]) continue outer;
+                for (var j = 0; j < tokens2.length; j++) {
+                    if (token === tokens2[j]) continue outer;
                 }
                 values += (values.length > 0 ? ' ' : '') + token;
             }
         return values;
     }
 
+    function removeComments(jqNodes) {
+        jqNodes = jqLite(jqNodes);
+        var i = jqNodes.length;
+
+        if (i <= 1) {
+            return jqNodes;
+        }
+
+        while (i--) {
+            var node = jqNodes[i];
+            if (node.nodeType === NODE_TYPE_COMMENT ||
+                (node.nodeType === NODE_TYPE_TEXT && node.nodeValue.trim() === '')) {
+                splice.call(jqNodes, i, 1);
+            }
+        }
+        return jqNodes;
+    }
+
+    var $controllerMinErr = minErr('$controller');
+
+
+    var CNTRL_REG = /^(\S+)(\s+as\s+([\w$]+))?$/;
+    function identifierForController(controller, ident) {
+        if (ident && isString(ident)) return ident;
+        if (isString(controller)) {
+            var match = CNTRL_REG.exec(controller);
+            if (match) return match[3];
+        }
+    }
+
+
     /**
      * @ngdoc provider
      * @name $controllerProvider
+     * @this
+     *
      * @description
-     * The {@link ng.$controller $controller service} is used by Angular to create new
+     * The {@link ng.$controller $controller service} is used by AngularJS to create new
      * controllers.
      *
      * This provider allows controller registration via the
@@ -7072,8 +10945,16 @@
      */
     function $ControllerProvider() {
         var controllers = {},
-            CNTRL_REG = /^(\S+)(\s+as\s+(\w+))?$/;
+            globals = false;
 
+        /**
+         * @ngdoc method
+         * @name $controllerProvider#has
+         * @param {string} name Controller name to check.
+         */
+        this.has = function(name) {
+            return controllers.hasOwnProperty(name);
+        };
 
         /**
          * @ngdoc method
@@ -7092,6 +10973,20 @@
             }
         };
 
+        /**
+         * @ngdoc method
+         * @name $controllerProvider#allowGlobals
+         * @description If called, allows `$controller` to find controller constructors on `window`
+         *
+         * @deprecated
+         * sinceVersion="v1.3.0"
+         * removeVersion="v1.7.0"
+         * This method of finding controllers has been deprecated.
+         */
+        this.allowGlobals = function() {
+            globals = true;
+        };
+
 
         this.$get = ['$injector', '$window', function($injector, $window) {
 
@@ -7106,7 +11001,12 @@
              *
              *    * check if a controller with given name is registered via `$controllerProvider`
              *    * check if evaluating the string on the current scope returns a constructor
-             *    * check `window[constructor]` on the global `window` object
+             *    * if $controllerProvider#allowGlobals, check `window[constructor]` on the global
+             *      `window` object (deprecated, not recommended)
+             *
+             *    The string can use the `controller as property` syntax, where the controller instance is published
+             *    as the specified property on the `scope`; the `scope` must be injected into `locals` param for this
+             *    to work correctly.
              *
              * @param {Object} locals Injection locals for Controller.
              * @return {Object} Instance of given controller.
@@ -7117,34 +11017,95 @@
              * It's just a simple call to {@link auto.$injector $injector}, but extracted into
              * a service, so that one can override this service with [BC version](https://gist.github.com/1649788).
              */
-            return function(expression, locals) {
+            return function $controller(expression, locals, later, ident) {
+                // PRIVATE API:
+                //   param `later` --- indicates that the controller's constructor is invoked at a later time.
+                //                     If true, $controller will allocate the object with the correct
+                //                     prototype chain, but will not invoke the controller until a returned
+                //                     callback is invoked.
+                //   param `ident` --- An optional label which overrides the label parsed from the controller
+                //                     expression, if any.
                 var instance, match, constructor, identifier;
+                later = later === true;
+                if (ident && isString(ident)) {
+                    identifier = ident;
+                }
 
-                if(isString(expression)) {
-                    match = expression.match(CNTRL_REG),
-                        constructor = match[1],
-                        identifier = match[3];
+                if (isString(expression)) {
+                    match = expression.match(CNTRL_REG);
+                    if (!match) {
+                        throw $controllerMinErr('ctrlfmt',
+                            'Badly formed controller string \'{0}\'. ' +
+                            'Must match `__name__ as __id__` or `__name__`.', expression);
+                    }
+                    constructor = match[1];
+                    identifier = identifier || match[3];
                     expression = controllers.hasOwnProperty(constructor)
                         ? controllers[constructor]
-                        : getter(locals.$scope, constructor, true) || getter($window, constructor, true);
+                        : getter(locals.$scope, constructor, true) ||
+                        (globals ? getter($window, constructor, true) : undefined);
+
+                    if (!expression) {
+                        throw $controllerMinErr('ctrlreg',
+                            'The controller with the name \'{0}\' is not registered.', constructor);
+                    }
 
                     assertArgFn(expression, constructor, true);
                 }
 
-                instance = $injector.instantiate(expression, locals);
-
-                if (identifier) {
-                    if (!(locals && typeof locals.$scope == 'object')) {
-                        throw minErr('$controller')('noscp',
-                            "Cannot export controller '{0}' as '{1}'! No $scope object provided via `locals`.",
-                            constructor || expression.name, identifier);
+                if (later) {
+                    // Instantiate controller later:
+                    // This machinery is used to create an instance of the object before calling the
+                    // controller's constructor itself.
+                    //
+                    // This allows properties to be added to the controller before the constructor is
+                    // invoked. Primarily, this is used for isolate scope bindings in $compile.
+                    //
+                    // This feature is not intended for use by applications, and is thus not documented
+                    // publicly.
+                    // Object creation: http://jsperf.com/create-constructor/2
+                    var controllerPrototype = (isArray(expression) ?
+                        expression[expression.length - 1] : expression).prototype;
+                    instance = Object.create(controllerPrototype || null);
+
+                    if (identifier) {
+                        addIdentifier(locals, identifier, instance, constructor || expression.name);
                     }
 
-                    locals.$scope[identifier] = instance;
+                    return extend(function $controllerInit() {
+                        var result = $injector.invoke(expression, instance, locals, constructor);
+                        if (result !== instance && (isObject(result) || isFunction(result))) {
+                            instance = result;
+                            if (identifier) {
+                                // If result changed, re-assign controllerAs value to scope.
+                                addIdentifier(locals, identifier, instance, constructor || expression.name);
+                            }
+                        }
+                        return instance;
+                    }, {
+                        instance: instance,
+                        identifier: identifier
+                    });
+                }
+
+                instance = $injector.instantiate(expression, locals, constructor);
+
+                if (identifier) {
+                    addIdentifier(locals, identifier, instance, constructor || expression.name);
                 }
 
                 return instance;
             };
+
+            function addIdentifier(locals, identifier, instance, name) {
+                if (!(locals && isObject(locals.$scope))) {
+                    throw minErr('$controller')('noscp',
+                        'Cannot export controller \'{0}\' as \'{1}\'! No $scope object provided via `locals`.',
+                        name, identifier);
+                }
+
+                locals.$scope[identifier] = instance;
+            }
         }];
     }
 
@@ -7152,39 +11113,69 @@
      * @ngdoc service
      * @name $document
      * @requires $window
+     * @this
      *
      * @description
      * A {@link angular.element jQuery or jqLite} wrapper for the browser's `window.document` object.
      *
      * @example
-     <example>
+     <example module="documentExample" name="document">
      <file name="index.html">
-     <div ng-controller="MainCtrl">
+     <div ng-controller="ExampleController">
      <p>$document title: <b ng-bind="title"></b></p>
      <p>window.document title: <b ng-bind="windowTitle"></b></p>
      </div>
      </file>
      <file name="script.js">
-     function MainCtrl($scope, $document) {
-         $scope.title = $document[0].title;
-         $scope.windowTitle = angular.element(window.document)[0].title;
-       }
+     angular.module('documentExample', [])
+     .controller('ExampleController', ['$scope', '$document', function($scope, $document) {
+           $scope.title = $document[0].title;
+           $scope.windowTitle = angular.element(window.document)[0].title;
+         }]);
      </file>
      </example>
      */
-    function $DocumentProvider(){
-        this.$get = ['$window', function(window){
+    function $DocumentProvider() {
+        this.$get = ['$window', function(window) {
             return jqLite(window.document);
         }];
     }
 
+
+    /**
+     * @private
+     * @this
+     * Listens for document visibility change and makes the current status accessible.
+     */
+    function $$IsDocumentHiddenProvider() {
+        this.$get = ['$document', '$rootScope', function($document, $rootScope) {
+            var doc = $document[0];
+            var hidden = doc && doc.hidden;
+
+            $document.on('visibilitychange', changeListener);
+
+            $rootScope.$on('$destroy', function() {
+                $document.off('visibilitychange', changeListener);
+            });
+
+            function changeListener() {
+                hidden = doc.hidden;
+            }
+
+            return function() {
+                return hidden;
+            };
+        }];
+    }
+
     /**
      * @ngdoc service
      * @name $exceptionHandler
      * @requires ng.$log
+     * @this
      *
      * @description
-     * Any uncaught exception in angular expressions is delegated to this service.
+     * Any uncaught exception in AngularJS expressions is delegated to this service.
      * The default implementation simply delegates to `$log.error` which logs it into
      * the browser console.
      *
@@ -7193,20 +11184,31 @@
      *
      * ## Example:
      *
+     * The example below will overwrite the default `$exceptionHandler` in order to (a) log uncaught
+     * errors to the backend for later inspection by the developers and (b) to use `$log.warn()` instead
+     * of `$log.error()`.
+     *
      * ```js
-     *   angular.module('exceptionOverride', []).factory('$exceptionHandler', function () {
- *     return function (exception, cause) {
- *       exception.message += ' (caused by "' + cause + '")';
- *       throw exception;
- *     };
- *   });
+     *   angular.
+     *     module('exceptionOverwrite', []).
+     *     factory('$exceptionHandler', ['$log', 'logErrorsToBackend', function($log, logErrorsToBackend) {
+     *       return function myExceptionHandler(exception, cause) {
+     *         logErrorsToBackend(exception, cause);
+     *         $log.warn(exception, cause);
+     *       };
+     *     }]);
      * ```
      *
-     * This example will override the normal action of `$exceptionHandler`, to make angular
-     * exceptions fail hard when they happen, instead of just logging to the console.
+     * <hr />
+     * Note, that code executed in event-listeners (even those registered using jqLite's `on`/`bind`
+     * methods) does not delegate exceptions to the {@link ng.$exceptionHandler $exceptionHandler}
+     * (unless executed during a digest).
+     *
+     * If you wish, you can manually delegate exceptions, e.g.
+     * `try { ... } catch(e) { $exceptionHandler(e); }`
      *
      * @param {Error} exception Exception associated with the error.
-     * @param {string=} cause optional information about the context in which
+     * @param {string=} cause Optional information about the context in which
      *       the error was thrown.
      *
      */
@@ -7218,110 +11220,349 @@
         }];
     }
 
-    /**
-     * Parse headers into key value object
-     *
-     * @param {string} headers Raw headers as a string
-     * @returns {Object} Parsed headers as key value object
-     */
-    function parseHeaders(headers) {
-        var parsed = {}, key, val, i;
-
-        if (!headers) return parsed;
-
-        forEach(headers.split('\n'), function(line) {
-            i = line.indexOf(':');
-            key = lowercase(trim(line.substr(0, i)));
-            val = trim(line.substr(i + 1));
-
-            if (key) {
-                if (parsed[key]) {
-                    parsed[key] += ', ' + val;
+    var $$ForceReflowProvider = /** @this */ function() {
+        this.$get = ['$document', function($document) {
+            return function(domNode) {
+                //the line below will force the browser to perform a repaint so
+                //that all the animated elements within the animation frame will
+                //be properly updated and drawn on screen. This is required to
+                //ensure that the preparation animation is properly flushed so that
+                //the active state picks up from there. DO NOT REMOVE THIS LINE.
+                //DO NOT OPTIMIZE THIS LINE. THE MINIFIER WILL REMOVE IT OTHERWISE WHICH
+                //WILL RESULT IN AN UNPREDICTABLE BUG THAT IS VERY HARD TO TRACK DOWN AND
+                //WILL TAKE YEARS AWAY FROM YOUR LIFE.
+                if (domNode) {
+                    if (!domNode.nodeType && domNode instanceof jqLite) {
+                        domNode = domNode[0];
+                    }
                 } else {
-                    parsed[key] = val;
+                    domNode = $document[0].body;
                 }
-            }
-        });
-
-        return parsed;
-    }
-
-
-    /**
-     * Returns a function that provides access to parsed headers.
-     *
-     * Headers are lazy parsed when first requested.
-     * @see parseHeaders
-     *
-     * @param {(string|Object)} headers Headers to provide access to.
-     * @returns {function(string=)} Returns a getter function which if called with:
-     *
-     *   - if called with single an argument returns a single header value or null
-     *   - if called with no arguments returns an object containing all headers.
-     */
-    function headersGetter(headers) {
-        var headersObj = isObject(headers) ? headers : undefined;
-
-        return function(name) {
-            if (!headersObj) headersObj =  parseHeaders(headers);
+                return domNode.offsetWidth + 1;
+            };
+        }];
+    };
 
-            if (name) {
-                return headersObj[lowercase(name)] || null;
-            }
+    var APPLICATION_JSON = 'application/json';
+    var CONTENT_TYPE_APPLICATION_JSON = {'Content-Type': APPLICATION_JSON + ';charset=utf-8'};
+    var JSON_START = /^\[|^\{(?!\{)/;
+    var JSON_ENDS = {
+        '[': /]$/,
+        '{': /}$/
+    };
+    var JSON_PROTECTION_PREFIX = /^\)]\}',?\n/;
+    var $httpMinErr = minErr('$http');
 
-            return headersObj;
-        };
+    function serializeValue(v) {
+        if (isObject(v)) {
+            return isDate(v) ? v.toISOString() : toJson(v);
+        }
+        return v;
     }
 
 
-    /**
-     * Chain all given functions
-     *
-     * This function is used for both request and response transforming
-     *
-     * @param {*} data Data to transform.
-     * @param {function(string=)} headers Http headers getter fn.
-     * @param {(Function|Array.<Function>)} fns Function or an array of functions.
-     * @returns {*} Transformed data.
-     */
-    function transformData(data, headers, fns) {
-        if (isFunction(fns))
-            return fns(data, headers);
-
-        forEach(fns, function(fn) {
-            data = fn(data, headers);
-        });
-
-        return data;
-    }
+    /** @this */
+    function $HttpParamSerializerProvider() {
+        /**
+         * @ngdoc service
+         * @name $httpParamSerializer
+         * @description
+         *
+         * Default {@link $http `$http`} params serializer that converts objects to strings
+         * according to the following rules:
+         *
+         * * `{'foo': 'bar'}` results in `foo=bar`
+         * * `{'foo': Date.now()}` results in `foo=2015-04-01T09%3A50%3A49.262Z` (`toISOString()` and encoded representation of a Date object)
+         * * `{'foo': ['bar', 'baz']}` results in `foo=bar&foo=baz` (repeated key for each array element)
+         * * `{'foo': {'bar':'baz'}}` results in `foo=%7B%22bar%22%3A%22baz%22%7D` (stringified and encoded representation of an object)
+         *
+         * Note that serializer will sort the request parameters alphabetically.
+         * */
 
+        this.$get = function() {
+            return function ngParamSerializer(params) {
+                if (!params) return '';
+                var parts = [];
+                forEachSorted(params, function(value, key) {
+                    if (value === null || isUndefined(value) || isFunction(value)) return;
+                    if (isArray(value)) {
+                        forEach(value, function(v) {
+                            parts.push(encodeUriQuery(key)  + '=' + encodeUriQuery(serializeValue(v)));
+                        });
+                    } else {
+                        parts.push(encodeUriQuery(key) + '=' + encodeUriQuery(serializeValue(value)));
+                    }
+                });
 
-    function isSuccess(status) {
-        return 200 <= status && status < 300;
+                return parts.join('&');
+            };
+        };
     }
 
+    /** @this */
+    function $HttpParamSerializerJQLikeProvider() {
+        /**
+         * @ngdoc service
+         * @name $httpParamSerializerJQLike
+         *
+         * @description
+         *
+         * Alternative {@link $http `$http`} params serializer that follows
+         * jQuery's [`param()`](http://api.jquery.com/jquery.param/) method logic.
+         * The serializer will also sort the params alphabetically.
+         *
+         * To use it for serializing `$http` request parameters, set it as the `paramSerializer` property:
+         *
+         * ```js
+         * $http({
+         *   url: myUrl,
+         *   method: 'GET',
+         *   params: myParams,
+         *   paramSerializer: '$httpParamSerializerJQLike'
+         * });
+         * ```
+         *
+         * It is also possible to set it as the default `paramSerializer` in the
+         * {@link $httpProvider#defaults `$httpProvider`}.
+         *
+         * Additionally, you can inject the serializer and use it explicitly, for example to serialize
+         * form data for submission:
+         *
+         * ```js
+         * .controller(function($http, $httpParamSerializerJQLike) {
+         *   //...
+         *
+         *   $http({
+         *     url: myUrl,
+         *     method: 'POST',
+         *     data: $httpParamSerializerJQLike(myData),
+         *     headers: {
+         *       'Content-Type': 'application/x-www-form-urlencoded'
+         *     }
+         *   });
+         *
+         * });
+         * ```
+         *
+         * */
+        this.$get = function() {
+            return function jQueryLikeParamSerializer(params) {
+                if (!params) return '';
+                var parts = [];
+                serialize(params, '', true);
+                return parts.join('&');
+
+                function serialize(toSerialize, prefix, topLevel) {
+                    if (toSerialize === null || isUndefined(toSerialize)) return;
+                    if (isArray(toSerialize)) {
+                        forEach(toSerialize, function(value, index) {
+                            serialize(value, prefix + '[' + (isObject(value) ? index : '') + ']');
+                        });
+                    } else if (isObject(toSerialize) && !isDate(toSerialize)) {
+                        forEachSorted(toSerialize, function(value, key) {
+                            serialize(value, prefix +
+                                (topLevel ? '' : '[') +
+                                key +
+                                (topLevel ? '' : ']'));
+                        });
+                    } else {
+                        parts.push(encodeUriQuery(prefix) + '=' + encodeUriQuery(serializeValue(toSerialize)));
+                    }
+                }
+            };
+        };
+    }
+
+    function defaultHttpResponseTransform(data, headers) {
+        if (isString(data)) {
+            // Strip json vulnerability protection prefix and trim whitespace
+            var tempData = data.replace(JSON_PROTECTION_PREFIX, '').trim();
+
+            if (tempData) {
+                var contentType = headers('Content-Type');
+                var hasJsonContentType = contentType && (contentType.indexOf(APPLICATION_JSON) === 0);
+
+                if (hasJsonContentType || isJsonLike(tempData)) {
+                    try {
+                        data = fromJson(tempData);
+                    } catch (e) {
+                        if (!hasJsonContentType) {
+                            return data;
+                        }
+                        throw $httpMinErr('baddata', 'Data must be a valid JSON object. Received: "{0}". ' +
+                            'Parse error: "{1}"', data, e);
+                    }
+                }
+            }
+        }
+
+        return data;
+    }
+
+    function isJsonLike(str) {
+        var jsonStart = str.match(JSON_START);
+        return jsonStart && JSON_ENDS[jsonStart[0]].test(str);
+    }
+
+    /**
+     * Parse headers into key value object
+     *
+     * @param {string} headers Raw headers as a string
+     * @returns {Object} Parsed headers as key value object
+     */
+    function parseHeaders(headers) {
+        var parsed = createMap(), i;
+
+        function fillInParsed(key, val) {
+            if (key) {
+                parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
+            }
+        }
+
+        if (isString(headers)) {
+            forEach(headers.split('\n'), function(line) {
+                i = line.indexOf(':');
+                fillInParsed(lowercase(trim(line.substr(0, i))), trim(line.substr(i + 1)));
+            });
+        } else if (isObject(headers)) {
+            forEach(headers, function(headerVal, headerKey) {
+                fillInParsed(lowercase(headerKey), trim(headerVal));
+            });
+        }
+
+        return parsed;
+    }
+
+
+    /**
+     * Returns a function that provides access to parsed headers.
+     *
+     * Headers are lazy parsed when first requested.
+     * @see parseHeaders
+     *
+     * @param {(string|Object)} headers Headers to provide access to.
+     * @returns {function(string=)} Returns a getter function which if called with:
+     *
+     *   - if called with an argument returns a single header value or null
+     *   - if called with no arguments returns an object containing all headers.
+     */
+    function headersGetter(headers) {
+        var headersObj;
+
+        return function(name) {
+            if (!headersObj) headersObj =  parseHeaders(headers);
+
+            if (name) {
+                var value = headersObj[lowercase(name)];
+                if (value === undefined) {
+                    value = null;
+                }
+                return value;
+            }
+
+            return headersObj;
+        };
+    }
+
+
+    /**
+     * Chain all given functions
+     *
+     * This function is used for both request and response transforming
+     *
+     * @param {*} data Data to transform.
+     * @param {function(string=)} headers HTTP headers getter fn.
+     * @param {number} status HTTP status code of the response.
+     * @param {(Function|Array.<Function>)} fns Function or an array of functions.
+     * @returns {*} Transformed data.
+     */
+    function transformData(data, headers, status, fns) {
+        if (isFunction(fns)) {
+            return fns(data, headers, status);
+        }
+
+        forEach(fns, function(fn) {
+            data = fn(data, headers, status);
+        });
+
+        return data;
+    }
+
+
+    function isSuccess(status) {
+        return 200 <= status && status < 300;
+    }
 
-    function $HttpProvider() {
-        var JSON_START = /^\s*(\[|\{[^\{])/,
-            JSON_END = /[\}\]]\s*$/,
-            PROTECTION_PREFIX = /^\)\]\}',?\n/,
-            CONTENT_TYPE_APPLICATION_JSON = {'Content-Type': 'application/json;charset=utf-8'};
-
+
+    /**
+     * @ngdoc provider
+     * @name $httpProvider
+     * @this
+     *
+     * @description
+     * Use `$httpProvider` to change the default behavior of the {@link ng.$http $http} service.
+     * */
+    function $HttpProvider() {
+        /**
+         * @ngdoc property
+         * @name $httpProvider#defaults
+         * @description
+         *
+         * Object containing default values for all {@link ng.$http $http} requests.
+         *
+         * - **`defaults.cache`** - {boolean|Object} - A boolean value or object created with
+         * {@link ng.$cacheFactory `$cacheFactory`} to enable or disable caching of HTTP responses
+         * by default. See {@link $http#caching $http Caching} for more information.
+         *
+         * - **`defaults.headers`** - {Object} - Default headers for all $http requests.
+         * Refer to {@link ng.$http#setting-http-headers $http} for documentation on
+         * setting default headers.
+         *     - **`defaults.headers.common`**
+         *     - **`defaults.headers.post`**
+         *     - **`defaults.headers.put`**
+         *     - **`defaults.headers.patch`**
+         *
+         * - **`defaults.jsonpCallbackParam`** - `{string}` - the name of the query parameter that passes the name of the
+         * callback in a JSONP request. The value of this parameter will be replaced with the expression generated by the
+         * {@link $jsonpCallbacks} service. Defaults to `'callback'`.
+         *
+         * - **`defaults.paramSerializer`** - `{string|function(Object<string,string>):string}` - A function
+         *  used to the prepare string representation of request parameters (specified as an object).
+         *  If specified as string, it is interpreted as a function registered with the {@link auto.$injector $injector}.
+         *  Defaults to {@link ng.$httpParamSerializer $httpParamSerializer}.
+         *
+         * - **`defaults.transformRequest`** -
+         * `{Array<function(data, headersGetter)>|function(data, headersGetter)}` -
+         * An array of functions (or a single function) which are applied to the request data.
+         * By default, this is an array with one request transformation function:
+         *
+         *   - If the `data` property of the request configuration object contains an object, serialize it
+         *     into JSON format.
+         *
+         * - **`defaults.transformResponse`** -
+         * `{Array<function(data, headersGetter, status)>|function(data, headersGetter, status)}` -
+         * An array of functions (or a single function) which are applied to the response data. By default,
+         * this is an array which applies one response transformation function that does two things:
+         *
+         *  - If XSRF prefix is detected, strip it
+         *    (see {@link ng.$http#security-considerations Security Considerations in the $http docs}).
+         *  - If the `Content-Type` is `application/json` or the response looks like JSON,
+         *    deserialize it using a JSON parser.
+         *
+         * - **`defaults.xsrfCookieName`** - {string} - Name of cookie containing the XSRF token.
+         * Defaults value is `'XSRF-TOKEN'`.
+         *
+         * - **`defaults.xsrfHeaderName`** - {string} - Name of HTTP header to populate with the
+         * XSRF token. Defaults value is `'X-XSRF-TOKEN'`.
+         *
+         **/
         var defaults = this.defaults = {
             // transform incoming response data
-            transformResponse: [function(data) {
-                if (isString(data)) {
-                    // strip json vulnerability protection prefix
-                    data = data.replace(PROTECTION_PREFIX, '');
-                    if (JSON_START.test(data) && JSON_END.test(data))
-                        data = fromJson(data);
-                }
-                return data;
-            }],
+            transformResponse: [defaultHttpResponseTransform],
 
             // transform outgoing request data
             transformRequest: [function(d) {
-                return isObject(d) && !isFile(d) && !isBlob(d) ? toJson(d) : d;
+                return isObject(d) && !isFile(d) && !isBlob(d) && !isFormData(d) ? toJson(d) : d;
             }],
 
             // default headers
@@ -7329,32 +11570,73 @@
                 common: {
                     'Accept': 'application/json, text/plain, */*'
                 },
-                post:   copy(CONTENT_TYPE_APPLICATION_JSON),
-                put:    copy(CONTENT_TYPE_APPLICATION_JSON),
-                patch:  copy(CONTENT_TYPE_APPLICATION_JSON)
+                post:   shallowCopy(CONTENT_TYPE_APPLICATION_JSON),
+                put:    shallowCopy(CONTENT_TYPE_APPLICATION_JSON),
+                patch:  shallowCopy(CONTENT_TYPE_APPLICATION_JSON)
             },
 
             xsrfCookieName: 'XSRF-TOKEN',
-            xsrfHeaderName: 'X-XSRF-TOKEN'
+            xsrfHeaderName: 'X-XSRF-TOKEN',
+
+            paramSerializer: '$httpParamSerializer',
+
+            jsonpCallbackParam: 'callback'
         };
 
+        var useApplyAsync = false;
         /**
-         * Are ordered by request, i.e. they are applied in the same order as the
-         * array, on request, but reverse order, on response.
-         */
-        var interceptorFactories = this.interceptors = [];
+         * @ngdoc method
+         * @name $httpProvider#useApplyAsync
+         * @description
+         *
+         * Configure $http service to combine processing of multiple http responses received at around
+         * the same time via {@link ng.$rootScope.Scope#$applyAsync $rootScope.$applyAsync}. This can result in
+         * significant performance improvement for bigger applications that make many HTTP requests
+         * concurrently (common during application bootstrap).
+         *
+         * Defaults to false. If no value is specified, returns the current configured value.
+         *
+         * @param {boolean=} value If true, when requests are loaded, they will schedule a deferred
+         *    "apply" on the next tick, giving time for subsequent requests in a roughly ~10ms window
+         *    to load and share the same digest cycle.
+         *
+         * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining.
+         *    otherwise, returns the current configured value.
+         **/
+        this.useApplyAsync = function(value) {
+            if (isDefined(value)) {
+                useApplyAsync = !!value;
+                return this;
+            }
+            return useApplyAsync;
+        };
 
         /**
-         * For historical reasons, response interceptors are ordered by the order in which
-         * they are applied to the response. (This is the opposite of interceptorFactories)
-         */
-        var responseInterceptorFactories = this.responseInterceptors = [];
+         * @ngdoc property
+         * @name $httpProvider#interceptors
+         * @description
+         *
+         * Array containing service factories for all synchronous or asynchronous {@link ng.$http $http}
+         * pre-processing of request or postprocessing of responses.
+         *
+         * These service factories are ordered by request, i.e. they are applied in the same order as the
+         * array, on request, but reverse order, on response.
+         *
+         * {@link ng.$http#interceptors Interceptors detailed info}
+         **/
+        var interceptorFactories = this.interceptors = [];
 
-        this.$get = ['$httpBackend', '$browser', '$cacheFactory', '$rootScope', '$q', '$injector',
-            function($httpBackend, $browser, $cacheFactory, $rootScope, $q, $injector) {
+        this.$get = ['$browser', '$httpBackend', '$$cookieReader', '$cacheFactory', '$rootScope', '$q', '$injector', '$sce',
+            function($browser, $httpBackend, $$cookieReader, $cacheFactory, $rootScope, $q, $injector, $sce) {
 
                 var defaultCache = $cacheFactory('$http');
 
+                /**
+                 * Make sure that default param serializer is exposed as a function
+                 */
+                defaults.paramSerializer = isString(defaults.paramSerializer) ?
+                    $injector.get(defaults.paramSerializer) : defaults.paramSerializer;
+
                 /**
                  * Interceptors stored in reverse order. Inner interceptors before outer interceptors.
                  * The reversal is needed so that we can build up the interception chain around the
@@ -7367,27 +11649,6 @@
                         ? $injector.get(interceptorFactory) : $injector.invoke(interceptorFactory));
                 });
 
-                forEach(responseInterceptorFactories, function(interceptorFactory, index) {
-                    var responseFn = isString(interceptorFactory)
-                        ? $injector.get(interceptorFactory)
-                        : $injector.invoke(interceptorFactory);
-
-                    /**
-                     * Response interceptors go before "around" interceptors (no real reason, just
-                     * had to pick one.) But they are already reversed, so we can't use unshift, hence
-                     * the splice.
-                     */
-                    reversedInterceptors.splice(index, 0, {
-                        response: function(response) {
-                            return responseFn($q.when(response));
-                        },
-                        responseError: function(response) {
-                            return responseFn($q.reject(response));
-                        }
-                    });
-                });
-
-
                 /**
                  * @ngdoc service
                  * @kind function
@@ -7399,7 +11660,7 @@
                  * @requires $injector
                  *
                  * @description
-                 * The `$http` service is a core Angular service that facilitates communication with the remote
+                 * The `$http` service is a core AngularJS service that facilitates communication with the remote
                  * HTTP servers via the browser's [XMLHttpRequest](https://developer.mozilla.org/en/xmlhttprequest)
                  * object or via [JSONP](http://en.wikipedia.org/wiki/JSONP).
                  *
@@ -7414,52 +11675,52 @@
                  * it is important to familiarize yourself with these APIs and the guarantees they provide.
                  *
                  *
-                 * # General usage
-                 * The `$http` service is a function which takes a single argument — a configuration object —
-                 * that is used to generate an HTTP request and returns  a {@link ng.$q promise}
-                 * with two $http specific methods: `success` and `error`.
+                 * ## General usage
+                 * The `$http` service is a function which takes a single argument — a {@link $http#usage configuration object} —
+                 * that is used to generate an HTTP request and returns  a {@link ng.$q promise}.
                  *
                  * ```js
-                 *   $http({method: 'GET', url: '/someUrl'}).
-                 *     success(function(data, status, headers, config) {
-     *       // this callback will be called asynchronously
-     *       // when the response is available
-     *     }).
-                 *     error(function(data, status, headers, config) {
-     *       // called asynchronously if an error occurs
-     *       // or server returns response with an error status.
-     *     });
+                 *   // Simple GET request example:
+                 *   $http({
+                 *     method: 'GET',
+                 *     url: '/someUrl'
+                 *   }).then(function successCallback(response) {
+                 *       // this callback will be called asynchronously
+                 *       // when the response is available
+                 *     }, function errorCallback(response) {
+                 *       // called asynchronously if an error occurs
+                 *       // or server returns response with an error status.
+                 *     });
                  * ```
                  *
-                 * Since the returned value of calling the $http function is a `promise`, you can also use
-                 * the `then` method to register callbacks, and these callbacks will receive a single argument –
-                 * an object representing the response. See the API signature and type info below for more
-                 * details.
+                 * The response object has these properties:
                  *
-                 * A response status code between 200 and 299 is considered a success status and
-                 * will result in the success callback being called. Note that if the response is a redirect,
-                 * XMLHttpRequest will transparently follow it, meaning that the error callback will not be
-                 * called for such responses.
+                 *   - **data** – `{string|Object}` – The response body transformed with the transform
+                 *     functions.
+                 *   - **status** – `{number}` – HTTP status code of the response.
+                 *   - **headers** – `{function([headerName])}` – Header getter function.
+                 *   - **config** – `{Object}` – The configuration object that was used to generate the request.
+                 *   - **statusText** – `{string}` – HTTP status text of the response.
+                 *   - **xhrStatus** – `{string}` – Status of the XMLHttpRequest (`complete`, `error`, `timeout` or `abort`).
                  *
-                 * # Writing Unit Tests that use $http
-                 * When unit testing (using {@link ngMock ngMock}), it is necessary to call
-                 * {@link ngMock.$httpBackend#flush $httpBackend.flush()} to flush each pending
-                 * request using trained responses.
+                 * A response status code between 200 and 299 is considered a success status and will result in
+                 * the success callback being called. Any response status code outside of that range is
+                 * considered an error status and will result in the error callback being called.
+                 * Also, status codes less than -1 are normalized to zero. -1 usually means the request was
+                 * aborted, e.g. using a `config.timeout`.
+                 * Note that if the response is a redirect, XMLHttpRequest will transparently follow it, meaning
+                 * that the outcome (success or error) will be determined by the final response status code.
                  *
-                 * ```
-                 * $httpBackend.expectGET(...);
-                 * $http.get(...);
-                 * $httpBackend.flush();
-                 * ```
                  *
-                 * # Shortcut methods
+                 * ## Shortcut methods
                  *
                  * Shortcut methods are also available. All shortcut methods require passing in the URL, and
-                 * request data must be passed in for POST/PUT requests.
+                 * request data must be passed in for POST/PUT requests. An optional config can be passed as the
+                 * last argument.
                  *
                  * ```js
-                 *   $http.get('/someUrl').success(successCallback);
-                 *   $http.post('/someUrl', data).success(successCallback);
+                 *   $http.get('/someUrl', config).then(successCallback, errorCallback);
+                 *   $http.post('/someUrl', data, config).then(successCallback, errorCallback);
                  * ```
                  *
                  * Complete list of shortcut methods:
@@ -7470,16 +11731,28 @@
                  * - {@link ng.$http#put $http.put}
                  * - {@link ng.$http#delete $http.delete}
                  * - {@link ng.$http#jsonp $http.jsonp}
+                 * - {@link ng.$http#patch $http.patch}
+                 *
                  *
+                 * ## Writing Unit Tests that use $http
+                 * When unit testing (using {@link ngMock ngMock}), it is necessary to call
+                 * {@link ngMock.$httpBackend#flush $httpBackend.flush()} to flush each pending
+                 * request using trained responses.
+                 *
+                 * ```
+                 * $httpBackend.expectGET(...);
+                 * $http.get(...);
+                 * $httpBackend.flush();
+                 * ```
                  *
-                 * # Setting HTTP Headers
+                 * ## Setting HTTP Headers
                  *
                  * The $http service will automatically add certain HTTP headers to all requests. These defaults
                  * can be fully configured by accessing the `$httpProvider.defaults.headers` configuration
                  * object, which currently contains this default configuration:
                  *
                  * - `$httpProvider.defaults.headers.common` (headers that are common for all requests):
-                 *   - `Accept: application/json, text/plain, * / *`
+                 *   - <code>Accept: application/json, text/plain, \*&#65279;/&#65279;\*</code>
                  * - `$httpProvider.defaults.headers.post`: (header defaults for POST requests)
                  *   - `Content-Type: application/json`
                  * - `$httpProvider.defaults.headers.put` (header defaults for PUT requests)
@@ -7488,74 +11761,143 @@
                  * To add or overwrite these defaults, simply add or remove a property from these configuration
                  * objects. To add headers for an HTTP method other than POST or PUT, simply add a new object
                  * with the lowercased HTTP method name as the key, e.g.
-                 * `$httpProvider.defaults.headers.get = { 'My-Header' : 'value' }.
+                 * `$httpProvider.defaults.headers.get = { 'My-Header' : 'value' }`.
                  *
                  * The defaults can also be set at runtime via the `$http.defaults` object in the same
                  * fashion. For example:
                  *
                  * ```
                  * module.run(function($http) {
-     *   $http.defaults.headers.common.Authorization = 'Basic YmVlcDpib29w'
-     * });
+                 *   $http.defaults.headers.common.Authorization = 'Basic YmVlcDpib29w';
+                 * });
                  * ```
                  *
                  * In addition, you can supply a `headers` property in the config object passed when
                  * calling `$http(config)`, which overrides the defaults without changing them globally.
                  *
+                 * To explicitly remove a header automatically added via $httpProvider.defaults.headers on a per request basis,
+                 * Use the `headers` property, setting the desired header to `undefined`. For example:
+                 *
+                 * ```js
+                 * var req = {
+                 *  method: 'POST',
+                 *  url: 'http://example.com',
+                 *  headers: {
+                 *    'Content-Type': undefined
+                 *  },
+                 *  data: { test: 'test' }
+                 * }
+                 *
+                 * $http(req).then(function(){...}, function(){...});
+                 * ```
+                 *
+                 * ## Transforming Requests and Responses
+                 *
+                 * Both requests and responses can be transformed using transformation functions: `transformRequest`
+                 * and `transformResponse`. These properties can be a single function that returns
+                 * the transformed value (`function(data, headersGetter, status)`) or an array of such transformation functions,
+                 * which allows you to `push` or `unshift` a new transformation function into the transformation chain.
                  *
-                 * # Transforming Requests and Responses
+                 * <div class="alert alert-warning">
+                 * **Note:** AngularJS does not make a copy of the `data` parameter before it is passed into the `transformRequest` pipeline.
+                 * That means changes to the properties of `data` are not local to the transform function (since Javascript passes objects by reference).
+                 * For example, when calling `$http.get(url, $scope.myObject)`, modifications to the object's properties in a transformRequest
+                 * function will be reflected on the scope and in any templates where the object is data-bound.
+                 * To prevent this, transform functions should have no side-effects.
+                 * If you need to modify properties, it is recommended to make a copy of the data, or create new object to return.
+                 * </div>
+                 *
+                 * ### Default Transformations
+                 *
+                 * The `$httpProvider` provider and `$http` service expose `defaults.transformRequest` and
+                 * `defaults.transformResponse` properties. If a request does not provide its own transformations
+                 * then these will be applied.
                  *
-                 * Both requests and responses can be transformed using transform functions. By default, Angular
-                 * applies these transformations:
+                 * You can augment or replace the default transformations by modifying these properties by adding to or
+                 * replacing the array.
                  *
-                 * Request transformations:
+                 * AngularJS provides the following default transformations:
+                 *
+                 * Request transformations (`$httpProvider.defaults.transformRequest` and `$http.defaults.transformRequest`) is
+                 * an array with one function that does the following:
                  *
                  * - If the `data` property of the request configuration object contains an object, serialize it
                  *   into JSON format.
                  *
-                 * Response transformations:
+                 * Response transformations (`$httpProvider.defaults.transformResponse` and `$http.defaults.transformResponse`) is
+                 * an array with one function that does the following:
                  *
                  *  - If XSRF prefix is detected, strip it (see Security Considerations section below).
-                 *  - If JSON response is detected, deserialize it using a JSON parser.
+                 *  - If the `Content-Type` is `application/json` or the response looks like JSON,
+                 *      deserialize it using a JSON parser.
+                 *
                  *
-                 * To globally augment or override the default transforms, modify the
-                 * `$httpProvider.defaults.transformRequest` and `$httpProvider.defaults.transformResponse`
-                 * properties. These properties are by default an array of transform functions, which allows you
-                 * to `push` or `unshift` a new transformation function into the transformation chain. You can
-                 * also decide to completely override any default transformations by assigning your
-                 * transformation functions to these properties directly without the array wrapper.  These defaults
-                 * are again available on the $http factory at run-time, which may be useful if you have run-time
-                 * services you wish to be involved in your transformations.
+                 * ### Overriding the Default Transformations Per Request
                  *
-                 * Similarly, to locally override the request/response transforms, augment the
-                 * `transformRequest` and/or `transformResponse` properties of the configuration object passed
+                 * If you wish to override the request/response transformations only for a single request then provide
+                 * `transformRequest` and/or `transformResponse` properties on the configuration object passed
                  * into `$http`.
                  *
+                 * Note that if you provide these properties on the config object the default transformations will be
+                 * overwritten. If you wish to augment the default transformations then you must include them in your
+                 * local transformation array.
+                 *
+                 * The following code demonstrates adding a new response transformation to be run after the default response
+                 * transformations have been run.
+                 *
+                 * ```js
+                 * function appendTransform(defaults, transform) {
+                 *
+                 *   // We can't guarantee that the default transformation is an array
+                 *   defaults = angular.isArray(defaults) ? defaults : [defaults];
+                 *
+                 *   // Append the new transformation to the defaults
+                 *   return defaults.concat(transform);
+                 * }
+                 *
+                 * $http({
+                 *   url: '...',
+                 *   method: 'GET',
+                 *   transformResponse: appendTransform($http.defaults.transformResponse, function(value) {
+                 *     return doTransform(value);
+                 *   })
+                 * });
+                 * ```
+                 *
+                 *
+                 * ## Caching
+                 *
+                 * {@link ng.$http `$http`} responses are not cached by default. To enable caching, you must
+                 * set the config.cache value or the default cache value to TRUE or to a cache object (created
+                 * with {@link ng.$cacheFactory `$cacheFactory`}). If defined, the value of config.cache takes
+                 * precedence over the default cache value.
                  *
-                 * # Caching
+                 * In order to:
+                 *   * cache all responses - set the default cache value to TRUE or to a cache object
+                 *   * cache a specific response - set config.cache value to TRUE or to a cache object
                  *
-                 * To enable caching, set the request configuration `cache` property to `true` (to use default
-                 * cache) or to a custom cache object (built with {@link ng.$cacheFactory `$cacheFactory`}).
-                 * When the cache is enabled, `$http` stores the response from the server in the specified
-                 * cache. The next time the same request is made, the response is served from the cache without
-                 * sending a request to the server.
+                 * If caching is enabled, but neither the default cache nor config.cache are set to a cache object,
+                 * then the default `$cacheFactory("$http")` object is used.
                  *
-                 * Note that even if the response is served from cache, delivery of the data is asynchronous in
-                 * the same way that real requests are.
+                 * The default cache value can be set by updating the
+                 * {@link ng.$http#defaults `$http.defaults.cache`} property or the
+                 * {@link $httpProvider#defaults `$httpProvider.defaults.cache`} property.
                  *
-                 * If there are multiple GET requests for the same URL that should be cached using the same
-                 * cache, but the cache is not populated yet, only one request to the server will be made and
-                 * the remaining requests will be fulfilled using the response from the first request.
+                 * When caching is enabled, {@link ng.$http `$http`} stores the response from the server using
+                 * the relevant cache object. The next time the same request is made, the response is returned
+                 * from the cache without sending a request to the server.
                  *
-                 * You can change the default cache to a new object (built with
-                 * {@link ng.$cacheFactory `$cacheFactory`}) by updating the
-                 * {@link ng.$http#properties_defaults `$http.defaults.cache`} property. All requests who set
-                 * their `cache` property to `true` will now use this cache object.
+                 * Take note that:
                  *
-                 * If you set the default cache to `false` then only requests that specify their own custom
-                 * cache object will be cached.
+                 *   * Only GET and JSONP requests are cached.
+                 *   * The cache key is the request URL including search parameters; headers are not considered.
+                 *   * Cached responses are returned asynchronously, in the same way as responses from the server.
+                 *   * If multiple identical requests are made using the same cache, which is not yet populated,
+                 *     one request will be made to the server and remaining requests will return the same response.
+                 *   * A cache-control header on the response does not affect if or how responses are cached.
                  *
-                 * # Interceptors
+                 *
+                 * ## Interceptors
                  *
                  * Before you start creating interceptors, be sure to understand the
                  * {@link ng.$q $q and deferred/promise APIs}.
@@ -7573,14 +11915,14 @@
                  *
                  * There are two kinds of interceptors (and two kinds of rejection interceptors):
                  *
-                 *   * `request`: interceptors get called with http `config` object. The function is free to
-                 *     modify the `config` or create a new one. The function needs to return the `config`
-                 *     directly or as a promise.
+                 *   * `request`: interceptors get called with a http {@link $http#usage config} object. The function is free to
+                 *     modify the `config` object or create a new one. The function needs to return the `config`
+                 *     object directly, or a promise containing the `config` or a new `config` object.
                  *   * `requestError`: interceptor gets called when a previous interceptor threw an error or
                  *     resolved with a rejection.
                  *   * `response`: interceptors get called with http `response` object. The function is free to
-                 *     modify the `response` or create a new one. The function needs to return the `response`
-                 *     directly or as a promise.
+                 *     modify the `response` object or create a new one. The function needs to return the `response`
+                 *     object directly, or as a promise containing the `response` or a new `response` object.
                  *   * `responseError`: interceptor gets called when a previous interceptor threw an error or
                  *     resolved with a rejection.
                  *
@@ -7588,121 +11930,76 @@
                  * ```js
                  *   // register the interceptor as a service
                  *   $provide.factory('myHttpInterceptor', function($q, dependency1, dependency2) {
-     *     return {
-     *       // optional method
-     *       'request': function(config) {
-     *         // do something on success
-     *         return config || $q.when(config);
-     *       },
-     *
-     *       // optional method
-     *      'requestError': function(rejection) {
-     *         // do something on error
-     *         if (canRecover(rejection)) {
-     *           return responseOrNewPromise
-     *         }
-     *         return $q.reject(rejection);
-     *       },
-     *
-     *
-     *
-     *       // optional method
-     *       'response': function(response) {
-     *         // do something on success
-     *         return response || $q.when(response);
-     *       },
-     *
-     *       // optional method
-     *      'responseError': function(rejection) {
-     *         // do something on error
-     *         if (canRecover(rejection)) {
-     *           return responseOrNewPromise
-     *         }
-     *         return $q.reject(rejection);
-     *       }
-     *     };
-     *   });
+                 *     return {
+                 *       // optional method
+                 *       'request': function(config) {
+                 *         // do something on success
+                 *         return config;
+                 *       },
+                 *
+                 *       // optional method
+                 *      'requestError': function(rejection) {
+                 *         // do something on error
+                 *         if (canRecover(rejection)) {
+                 *           return responseOrNewPromise
+                 *         }
+                 *         return $q.reject(rejection);
+                 *       },
+                 *
+                 *
+                 *
+                 *       // optional method
+                 *       'response': function(response) {
+                 *         // do something on success
+                 *         return response;
+                 *       },
+                 *
+                 *       // optional method
+                 *      'responseError': function(rejection) {
+                 *         // do something on error
+                 *         if (canRecover(rejection)) {
+                 *           return responseOrNewPromise
+                 *         }
+                 *         return $q.reject(rejection);
+                 *       }
+                 *     };
+                 *   });
                  *
                  *   $httpProvider.interceptors.push('myHttpInterceptor');
                  *
                  *
                  *   // alternatively, register the interceptor via an anonymous factory
                  *   $httpProvider.interceptors.push(function($q, dependency1, dependency2) {
-     *     return {
-     *      'request': function(config) {
-     *          // same as above
-     *       },
-     *
-     *       'response': function(response) {
-     *          // same as above
-     *       }
-     *     };
-     *   });
+                 *     return {
+                 *      'request': function(config) {
+                 *          // same as above
+                 *       },
+                 *
+                 *       'response': function(response) {
+                 *          // same as above
+                 *       }
+                 *     };
+                 *   });
                  * ```
                  *
-                 * # Response interceptors (DEPRECATED)
+                 * ## Security Considerations
                  *
-                 * Before you start creating interceptors, be sure to understand the
-                 * {@link ng.$q $q and deferred/promise APIs}.
+                 * When designing web applications, consider security threats from:
                  *
-                 * For purposes of global error handling, authentication or any kind of synchronous or
-                 * asynchronous preprocessing of received responses, it is desirable to be able to intercept
-                 * responses for http requests before they are handed over to the application code that
-                 * initiated these requests. The response interceptors leverage the {@link ng.$q
-     * promise apis} to fulfil this need for both synchronous and asynchronous preprocessing.
+                 * - [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx)
+                 * - [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery)
                  *
-                 * The interceptors are service factories that are registered with the $httpProvider by
-                 * adding them to the `$httpProvider.responseInterceptors` array. The factory is called and
-                 * injected with dependencies (if specified) and returns the interceptor  — a function that
-                 * takes a {@link ng.$q promise} and returns the original or a new promise.
+                 * Both server and the client must cooperate in order to eliminate these threats. AngularJS comes
+                 * pre-configured with strategies that address these issues, but for this to work backend server
+                 * cooperation is required.
                  *
-                 * ```js
-                 *   // register the interceptor as a service
-                 *   $provide.factory('myHttpInterceptor', function($q, dependency1, dependency2) {
-     *     return function(promise) {
-     *       return promise.then(function(response) {
-     *         // do something on success
-     *         return response;
-     *       }, function(response) {
-     *         // do something on error
-     *         if (canRecover(response)) {
-     *           return responseOrNewPromise
-     *         }
-     *         return $q.reject(response);
-     *       });
-     *     }
-     *   });
-                 *
-                 *   $httpProvider.responseInterceptors.push('myHttpInterceptor');
-                 *
-                 *
-                 *   // register the interceptor via an anonymous factory
-                 *   $httpProvider.responseInterceptors.push(function($q, dependency1, dependency2) {
-     *     return function(promise) {
-     *       // same as above
-     *     }
-     *   });
-                 * ```
-                 *
-                 *
-                 * # Security Considerations
-                 *
-                 * When designing web applications, consider security threats from:
-                 *
-                 * - [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx)
-                 * - [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery)
-                 *
-                 * Both server and the client must cooperate in order to eliminate these threats. Angular comes
-                 * pre-configured with strategies that address these issues, but for this to work backend server
-                 * cooperation is required.
-                 *
-                 * ## JSON Vulnerability Protection
+                 * ### JSON Vulnerability Protection
                  *
                  * A [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx)
                  * allows third party website to turn your JSON resource URL into
                  * [JSONP](http://en.wikipedia.org/wiki/JSONP) request under some conditions. To
                  * counter this your server can prefix all JSON requests with following string `")]}',\n"`.
-                 * Angular will automatically strip the prefix before processing it as JSON.
+                 * AngularJS will automatically strip the prefix before processing it as JSON.
                  *
                  * For example if your server needs to return:
                  * ```js
@@ -7715,18 +12012,18 @@
                  * ['one','two']
                  * ```
                  *
-                 * Angular will strip the prefix, before processing the JSON.
+                 * AngularJS will strip the prefix, before processing the JSON.
                  *
                  *
-                 * ## Cross Site Request Forgery (XSRF) Protection
+                 * ### Cross Site Request Forgery (XSRF) Protection
                  *
-                 * [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery) is a technique by which
-                 * an unauthorized site can gain your user's private data. Angular provides a mechanism
-                 * to counter XSRF. When performing XHR requests, the $http service reads a token from a cookie
-                 * (by default, `XSRF-TOKEN`) and sets it as an HTTP header (`X-XSRF-TOKEN`). Since only
-                 * JavaScript that runs on your domain could read the cookie, your server can be assured that
-                 * the XHR came from JavaScript running on your domain. The header will not be set for
-                 * cross-domain requests.
+                 * [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery) is an attack technique by
+                 * which the attacker can trick an authenticated user into unknowingly executing actions on your
+                 * website. AngularJS provides a mechanism to counter XSRF. When performing XHR requests, the
+                 * $http service reads a token from a cookie (by default, `XSRF-TOKEN`) and sets it as an HTTP
+                 * header (`X-XSRF-TOKEN`). Since only JavaScript that runs on your domain could read the
+                 * cookie, your server can be assured that the XHR came from JavaScript running on your domain.
+                 * The header will not be set for cross-domain requests.
                  *
                  * To take advantage of this, your server needs to set a token in a JavaScript readable session
                  * cookie called `XSRF-TOKEN` on the first HTTP GET request. On subsequent XHR requests the
@@ -7734,85 +12031,92 @@
                  * that only JavaScript running on your domain could have sent the request. The token must be
                  * unique for each user and must be verifiable by the server (to prevent the JavaScript from
                  * making up its own tokens). We recommend that the token is a digest of your site's
-                 * authentication cookie with a [salt](https://en.wikipedia.org/wiki/Salt_(cryptography))
+                 * authentication cookie with a [salt](https://en.wikipedia.org/wiki/Salt_(cryptography&#41;)
                  * for added security.
                  *
                  * The name of the headers can be specified using the xsrfHeaderName and xsrfCookieName
                  * properties of either $httpProvider.defaults at config-time, $http.defaults at run-time,
                  * or the per-request config object.
                  *
+                 * In order to prevent collisions in environments where multiple AngularJS apps share the
+                 * same domain or subdomain, we recommend that each application uses unique cookie name.
                  *
                  * @param {object} config Object describing the request to be made and how it should be
                  *    processed. The object has following properties:
                  *
                  *    - **method** – `{string}` – HTTP method (e.g. 'GET', 'POST', etc)
-                 *    - **url** – `{string}` – Absolute or relative URL of the resource that is being requested.
-                 *    - **params** – `{Object.<string|Object>}` – Map of strings or objects which will be turned
-                 *      to `?key1=value1&key2=value2` after the url. If the value is not a string, it will be
-                 *      JSONified.
+                 *    - **url** – `{string|TrustedObject}` – Absolute or relative URL of the resource that is being requested;
+                 *      or an object created by a call to `$sce.trustAsResourceUrl(url)`.
+                 *    - **params** – `{Object.<string|Object>}` – Map of strings or objects which will be serialized
+                 *      with the `paramSerializer` and appended as GET parameters.
                  *    - **data** – `{string|Object}` – Data to be sent as the request message data.
                  *    - **headers** – `{Object}` – Map of strings or functions which return strings representing
                  *      HTTP headers to send to the server. If the return value of a function is null, the
-                 *      header will not be sent.
+                 *      header will not be sent. Functions accept a config object as an argument.
+                 *    - **eventHandlers** - `{Object}` - Event listeners to be bound to the XMLHttpRequest object.
+                 *      To bind events to the XMLHttpRequest upload object, use `uploadEventHandlers`.
+                 *      The handler will be called in the context of a `$apply` block.
+                 *    - **uploadEventHandlers** - `{Object}` - Event listeners to be bound to the XMLHttpRequest upload
+                 *      object. To bind events to the XMLHttpRequest object, use `eventHandlers`.
+                 *      The handler will be called in the context of a `$apply` block.
                  *    - **xsrfHeaderName** – `{string}` – Name of HTTP header to populate with the XSRF token.
                  *    - **xsrfCookieName** – `{string}` – Name of cookie containing the XSRF token.
                  *    - **transformRequest** –
                  *      `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
                  *      transform function or an array of such functions. The transform function takes the http
                  *      request body and headers and returns its transformed (typically serialized) version.
+                 *      See {@link ng.$http#overriding-the-default-transformations-per-request
+     *      Overriding the Default Transformations}
                  *    - **transformResponse** –
-                 *      `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
+                 *      `{function(data, headersGetter, status)|Array.<function(data, headersGetter, status)>}` –
                  *      transform function or an array of such functions. The transform function takes the http
-                 *      response body and headers and returns its transformed (typically deserialized) version.
-                 *    - **cache** – `{boolean|Cache}` – If true, a default $http cache will be used to cache the
-                 *      GET request, otherwise if a cache instance built with
-                 *      {@link ng.$cacheFactory $cacheFactory}, this cache will be used for
-                 *      caching.
+                 *      response body, headers and status and returns its transformed (typically deserialized) version.
+                 *      See {@link ng.$http#overriding-the-default-transformations-per-request
+     *      Overriding the Default Transformations}
+                 *    - **paramSerializer** - `{string|function(Object<string,string>):string}` - A function used to
+                 *      prepare the string representation of request parameters (specified as an object).
+                 *      If specified as string, it is interpreted as function registered with the
+                 *      {@link $injector $injector}, which means you can create your own serializer
+                 *      by registering it as a {@link auto.$provide#service service}.
+                 *      The default serializer is the {@link $httpParamSerializer $httpParamSerializer};
+                 *      alternatively, you can use the {@link $httpParamSerializerJQLike $httpParamSerializerJQLike}
+                 *    - **cache** – `{boolean|Object}` – A boolean value or object created with
+                 *      {@link ng.$cacheFactory `$cacheFactory`} to enable or disable caching of the HTTP response.
+                 *      See {@link $http#caching $http Caching} for more information.
                  *    - **timeout** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise}
                  *      that should abort the request when resolved.
                  *    - **withCredentials** - `{boolean}` - whether to set the `withCredentials` flag on the
-                 *      XHR object. See [requests with credentials]https://developer.mozilla.org/en/http_access_control#section_5
+                 *      XHR object. See [requests with credentials](https://developer.mozilla.org/docs/Web/HTTP/Access_control_CORS#Requests_with_credentials)
                  *      for more information.
                  *    - **responseType** - `{string}` - see
-                 *      [requestType](https://developer.mozilla.org/en-US/docs/DOM/XMLHttpRequest#responseType).
+                 *      [XMLHttpRequest.responseType](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest#xmlhttprequest-responsetype).
                  *
-                 * @returns {HttpPromise} Returns a {@link ng.$q promise} object with the
-                 *   standard `then` method and two http specific methods: `success` and `error`. The `then`
-                 *   method takes two arguments a success and an error callback which will be called with a
-                 *   response object. The `success` and `error` methods take a single argument - a function that
-                 *   will be called when the request succeeds or fails respectively. The arguments passed into
-                 *   these functions are destructured representation of the response object passed into the
-                 *   `then` method. The response object has these properties:
+                 * @returns {HttpPromise} Returns a {@link ng.$q `Promise}` that will be resolved to a response object
+                 *                        when the request succeeds or fails.
                  *
-                 *   - **data** – `{string|Object}` – The response body transformed with the transform
-                 *     functions.
-                 *   - **status** – `{number}` – HTTP status code of the response.
-                 *   - **headers** – `{function([headerName])}` – Header getter function.
-                 *   - **config** – `{Object}` – The configuration object that was used to generate the request.
-                 *   - **statusText** – `{string}` – HTTP status text of the response.
                  *
                  * @property {Array.<Object>} pendingRequests Array of config objects for currently pending
                  *   requests. This is primarily meant to be used for debugging purposes.
                  *
                  *
                  * @example
-                 <example>
+                 <example module="httpExample" name="http-service">
                  <file name="index.html">
-                 <div ng-controller="FetchCtrl">
-                 <select ng-model="method">
+                 <div ng-controller="FetchController">
+                 <select ng-model="method" aria-label="Request method">
                  <option>GET</option>
                  <option>JSONP</option>
                  </select>
-                 <input type="text" ng-model="url" size="80"/>
+                 <input type="text" ng-model="url" size="80" aria-label="URL" />
                  <button id="fetchbtn" ng-click="fetch()">fetch</button><br>
                  <button id="samplegetbtn" ng-click="updateModel('GET', 'http-hello.html')">Sample GET</button>
                  <button id="samplejsonpbtn"
                  ng-click="updateModel('JSONP',
-                 'http://angularjs.org/greet.php?callback=JSON_CALLBACK&name=Super%20Hero')">
+                 'https://angularjs.org/greet.php?name=Super%20Hero')">
                  Sample JSONP
                  </button>
                  <button id="invalidjsonpbtn"
-                 ng-click="updateModel('JSONP', 'http://angularjs.org/doesntexist&callback=JSON_CALLBACK')">
+                 ng-click="updateModel('JSONP', 'https://angularjs.org/doesntexist')">
                  Invalid JSONP
                  </button>
                  <pre>http status code: {{status}}</pre>
@@ -7820,30 +12124,38 @@
                  </div>
                  </file>
                  <file name="script.js">
-                 function FetchCtrl($scope, $http, $templateCache) {
-    $scope.method = 'GET';
-    $scope.url = 'http-hello.html';
-
-    $scope.fetch = function() {
-      $scope.code = null;
-      $scope.response = null;
-
-      $http({method: $scope.method, url: $scope.url, cache: $templateCache}).
-        success(function(data, status) {
-          $scope.status = status;
-          $scope.data = data;
-        }).
-        error(function(data, status) {
-          $scope.data = data || "Request failed";
-          $scope.status = status;
-      });
-    };
+                 angular.module('httpExample', [])
+                 .config(['$sceDelegateProvider', function($sceDelegateProvider) {
+      // We must whitelist the JSONP endpoint that we are using to show that we trust it
+      $sceDelegateProvider.resourceUrlWhitelist([
+        'self',
+        'https://angularjs.org/**'
+      ]);
+    }])
+                 .controller('FetchController', ['$scope', '$http', '$templateCache',
+                 function($scope, $http, $templateCache) {
+        $scope.method = 'GET';
+        $scope.url = 'http-hello.html';
+
+        $scope.fetch = function() {
+          $scope.code = null;
+          $scope.response = null;
+
+          $http({method: $scope.method, url: $scope.url, cache: $templateCache}).
+            then(function(response) {
+              $scope.status = response.status;
+              $scope.data = response.data;
+            }, function(response) {
+              $scope.data = response.data || 'Request failed';
+              $scope.status = response.status;
+          });
+        };
 
-    $scope.updateModel = function(method, url) {
-      $scope.method = method;
-      $scope.url = url;
-    };
-  }
+        $scope.updateModel = function(method, url) {
+          $scope.method = method;
+          $scope.url = url;
+        };
+      }]);
                  </file>
                  <file name="http-hello.html">
                  Hello, $http!
@@ -7853,7 +12165,6 @@
                  var data = element(by.binding('data'));
                  var fetchBtn = element(by.id('fetchbtn'));
                  var sampleGetBtn = element(by.id('samplegetbtn'));
-                 var sampleJsonpBtn = element(by.id('samplejsonpbtn'));
                  var invalidJsonpBtn = element(by.id('invalidjsonpbtn'));
 
                  it('should make an xhr GET request', function() {
@@ -7863,12 +12174,14 @@
     expect(data.getText()).toMatch(/Hello, \$http!/);
   });
 
-                 it('should make a JSONP request to angularjs.org', function() {
-    sampleJsonpBtn.click();
-    fetchBtn.click();
-    expect(status.getText()).toMatch('200');
-    expect(data.getText()).toMatch(/Super Hero!/);
-  });
+                 // Commented out due to flakes. See https://github.com/angular/angular.js/issues/9185
+                 // it('should make a JSONP request to angularjs.org', function() {
+//   var sampleJsonpBtn = element(by.id('samplejsonpbtn'));
+//   sampleJsonpBtn.click();
+//   fetchBtn.click();
+//   expect(status.getText()).toMatch('200');
+//   expect(data.getText()).toMatch(/Super Hero!/);
+// });
 
                  it('should make JSONP request to invalid URL and invoke the error handler',
                  function() {
@@ -7881,90 +12194,84 @@
                  </example>
                  */
                 function $http(requestConfig) {
-                    var config = {
-                        method: 'get',
-                        transformRequest: defaults.transformRequest,
-                        transformResponse: defaults.transformResponse
-                    };
-                    var headers = mergeHeaders(requestConfig);
-
-                    extend(config, requestConfig);
-                    config.headers = headers;
-                    config.method = uppercase(config.method);
 
-                    var xsrfValue = urlIsSameOrigin(config.url)
-                        ? $browser.cookies()[config.xsrfCookieName || defaults.xsrfCookieName]
-                        : undefined;
-                    if (xsrfValue) {
-                        headers[(config.xsrfHeaderName || defaults.xsrfHeaderName)] = xsrfValue;
+                    if (!isObject(requestConfig)) {
+                        throw minErr('$http')('badreq', 'Http request configuration must be an object.  Received: {0}', requestConfig);
                     }
 
+                    if (!isString($sce.valueOf(requestConfig.url))) {
+                        throw minErr('$http')('badreq', 'Http request configuration url must be a string or a $sce trusted object.  Received: {0}', requestConfig.url);
+                    }
 
-                    var serverRequest = function(config) {
-                        headers = config.headers;
-                        var reqData = transformData(config.data, headersGetter(headers), config.transformRequest);
-
-                        // strip content-type if data is undefined
-                        if (isUndefined(config.data)) {
-                            forEach(headers, function(value, header) {
-                                if (lowercase(header) === 'content-type') {
-                                    delete headers[header];
-                                }
-                            });
-                        }
+                    var config = extend({
+                        method: 'get',
+                        transformRequest: defaults.transformRequest,
+                        transformResponse: defaults.transformResponse,
+                        paramSerializer: defaults.paramSerializer,
+                        jsonpCallbackParam: defaults.jsonpCallbackParam
+                    }, requestConfig);
 
-                        if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) {
-                            config.withCredentials = defaults.withCredentials;
-                        }
+                    config.headers = mergeHeaders(requestConfig);
+                    config.method = uppercase(config.method);
+                    config.paramSerializer = isString(config.paramSerializer) ?
+                        $injector.get(config.paramSerializer) : config.paramSerializer;
 
-                        // send request
-                        return sendReq(config, reqData, headers).then(transformResponse, transformResponse);
-                    };
+                    $browser.$$incOutstandingRequestCount();
 
-                    var chain = [serverRequest, undefined];
-                    var promise = $q.when(config);
+                    var requestInterceptors = [];
+                    var responseInterceptors = [];
+                    var promise = $q.resolve(config);
 
                     // apply interceptors
                     forEach(reversedInterceptors, function(interceptor) {
                         if (interceptor.request || interceptor.requestError) {
-                            chain.unshift(interceptor.request, interceptor.requestError);
+                            requestInterceptors.unshift(interceptor.request, interceptor.requestError);
                         }
                         if (interceptor.response || interceptor.responseError) {
-                            chain.push(interceptor.response, interceptor.responseError);
+                            responseInterceptors.push(interceptor.response, interceptor.responseError);
                         }
                     });
 
-                    while(chain.length) {
-                        var thenFn = chain.shift();
-                        var rejectFn = chain.shift();
+                    promise = chainInterceptors(promise, requestInterceptors);
+                    promise = promise.then(serverRequest);
+                    promise = chainInterceptors(promise, responseInterceptors);
+                    promise = promise.finally(completeOutstandingRequest);
 
-                        promise = promise.then(thenFn, rejectFn);
-                    }
+                    return promise;
 
-                    promise.success = function(fn) {
-                        promise.then(function(response) {
-                            fn(response.data, response.status, response.headers, config);
-                        });
-                        return promise;
-                    };
 
-                    promise.error = function(fn) {
-                        promise.then(null, function(response) {
-                            fn(response.data, response.status, response.headers, config);
-                        });
+                    function chainInterceptors(promise, interceptors) {
+                        for (var i = 0, ii = interceptors.length; i < ii;) {
+                            var thenFn = interceptors[i++];
+                            var rejectFn = interceptors[i++];
+
+                            promise = promise.then(thenFn, rejectFn);
+                        }
+
+                        interceptors.length = 0;
+
                         return promise;
-                    };
+                    }
 
-                    return promise;
+                    function completeOutstandingRequest() {
+                        $browser.$$completeOutstandingRequest(noop);
+                    }
 
-                    function transformResponse(response) {
-                        // make a copy since the response must be cacheable
-                        var resp = extend({}, response, {
-                            data: transformData(response.data, response.headers, config.transformResponse)
+                    function executeHeaderFns(headers, config) {
+                        var headerContent, processedHeaders = {};
+
+                        forEach(headers, function(headerFn, header) {
+                            if (isFunction(headerFn)) {
+                                headerContent = headerFn(config);
+                                if (headerContent != null) {
+                                    processedHeaders[header] = headerContent;
+                                }
+                            } else {
+                                processedHeaders[header] = headerFn;
+                            }
                         });
-                        return (isSuccess(response.status))
-                            ? resp
-                            : $q.reject(resp);
+
+                        return processedHeaders;
                     }
 
                     function mergeHeaders(config) {
@@ -7974,11 +12281,7 @@
 
                         defHeaders = extend({}, defHeaders.common, defHeaders[lowercase(config.method)]);
 
-                        // execute if header value is function
-                        execHeaders(defHeaders);
-                        execHeaders(reqHeaders);
-
-                        // using for-in instead of forEach to avoid unecessary iteration after header has been found
+                        // using for-in instead of forEach to avoid unnecessary iteration after header has been found
                         defaultHeadersIteration:
                             for (defHeaderName in defHeaders) {
                                 lowercaseDefHeaderName = lowercase(defHeaderName);
@@ -7992,22 +12295,39 @@
                                 reqHeaders[defHeaderName] = defHeaders[defHeaderName];
                             }
 
-                        return reqHeaders;
+                        // execute if header value is a function for merged headers
+                        return executeHeaderFns(reqHeaders, shallowCopy(config));
+                    }
 
-                        function execHeaders(headers) {
-                            var headerContent;
+                    function serverRequest(config) {
+                        var headers = config.headers;
+                        var reqData = transformData(config.data, headersGetter(headers), undefined, config.transformRequest);
 
-                            forEach(headers, function(headerFn, header) {
-                                if (isFunction(headerFn)) {
-                                    headerContent = headerFn();
-                                    if (headerContent != null) {
-                                        headers[header] = headerContent;
-                                    } else {
-                                        delete headers[header];
-                                    }
+                        // strip content-type if data is undefined
+                        if (isUndefined(reqData)) {
+                            forEach(headers, function(value, header) {
+                                if (lowercase(header) === 'content-type') {
+                                    delete headers[header];
                                 }
                             });
                         }
+
+                        if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) {
+                            config.withCredentials = defaults.withCredentials;
+                        }
+
+                        // send request
+                        return sendReq(config, reqData).then(transformResponse, transformResponse);
+                    }
+
+                    function transformResponse(response) {
+                        // make a copy since the response must be cacheable
+                        var resp = extend({}, response);
+                        resp.data = transformData(response.data, response.headers, response.status,
+                            config.transformResponse);
+                        return (isSuccess(response.status))
+                            ? resp
+                            : $q.reject(resp);
                     }
                 }
 
@@ -8020,8 +12340,9 @@
                  * @description
                  * Shortcut method to perform `GET` request.
                  *
-                 * @param {string} url Relative or absolute URL specifying the destination of the request
-                 * @param {Object=} config Optional configuration object
+                 * @param {string|TrustedObject} url Absolute or relative URL of the resource that is being requested;
+                 *                                   or an object created by a call to `$sce.trustAsResourceUrl(url)`.
+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
                  * @returns {HttpPromise} Future object
                  */
 
@@ -8032,8 +12353,9 @@
                  * @description
                  * Shortcut method to perform `DELETE` request.
                  *
-                 * @param {string} url Relative or absolute URL specifying the destination of the request
-                 * @param {Object=} config Optional configuration object
+                 * @param {string|TrustedObject} url Absolute or relative URL of the resource that is being requested;
+                 *                                   or an object created by a call to `$sce.trustAsResourceUrl(url)`.
+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
                  * @returns {HttpPromise} Future object
                  */
 
@@ -8044,8 +12366,9 @@
                  * @description
                  * Shortcut method to perform `HEAD` request.
                  *
-                 * @param {string} url Relative or absolute URL specifying the destination of the request
-                 * @param {Object=} config Optional configuration object
+                 * @param {string|TrustedObject} url Absolute or relative URL of the resource that is being requested;
+                 *                                   or an object created by a call to `$sce.trustAsResourceUrl(url)`.
+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
                  * @returns {HttpPromise} Future object
                  */
 
@@ -8056,9 +12379,38 @@
                  * @description
                  * Shortcut method to perform `JSONP` request.
                  *
-                 * @param {string} url Relative or absolute URL specifying the destination of the request.
-                 *                     Should contain `JSON_CALLBACK` string.
-                 * @param {Object=} config Optional configuration object
+                 * Note that, since JSONP requests are sensitive because the response is given full access to the browser,
+                 * the url must be declared, via {@link $sce} as a trusted resource URL.
+                 * You can trust a URL by adding it to the whitelist via
+                 * {@link $sceDelegateProvider#resourceUrlWhitelist  `$sceDelegateProvider.resourceUrlWhitelist`} or
+                 * by explicitly trusting the URL via {@link $sce#trustAsResourceUrl `$sce.trustAsResourceUrl(url)`}.
+                 *
+                 * You should avoid generating the URL for the JSONP request from user provided data.
+                 * Provide additional query parameters via `params` property of the `config` parameter, rather than
+                 * modifying the URL itself.
+                 *
+                 * JSONP requests must specify a callback to be used in the response from the server. This callback
+                 * is passed as a query parameter in the request. You must specify the name of this parameter by
+                 * setting the `jsonpCallbackParam` property on the request config object.
+                 *
+                 * ```
+                 * $http.jsonp('some/trusted/url', {jsonpCallbackParam: 'callback'})
+                 * ```
+                 *
+                 * You can also specify a default callback parameter name in `$http.defaults.jsonpCallbackParam`.
+                 * Initially this is set to `'callback'`.
+                 *
+                 * <div class="alert alert-danger">
+                 * You can no longer use the `JSON_CALLBACK` string as a placeholder for specifying where the callback
+                 * parameter value should go.
+                 * </div>
+                 *
+                 * If you would like to customise where and how the callbacks are stored then try overriding
+                 * or decorating the {@link $jsonpCallbacks} service.
+                 *
+                 * @param {string|TrustedObject} url Absolute or relative URL of the resource that is being requested;
+                 *                                   or an object created by a call to `$sce.trustAsResourceUrl(url)`.
+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
                  * @returns {HttpPromise} Future object
                  */
                 createShortMethods('get', 'delete', 'head', 'jsonp');
@@ -8072,7 +12424,7 @@
                  *
                  * @param {string} url Relative or absolute URL specifying the destination of the request
                  * @param {*} data Request content
-                 * @param {Object=} config Optional configuration object
+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
                  * @returns {HttpPromise} Future object
                  */
 
@@ -8085,10 +12437,23 @@
                  *
                  * @param {string} url Relative or absolute URL specifying the destination of the request
                  * @param {*} data Request content
-                 * @param {Object=} config Optional configuration object
+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
+                 * @returns {HttpPromise} Future object
+                 */
+
+                /**
+                 * @ngdoc method
+                 * @name $http#patch
+                 *
+                 * @description
+                 * Shortcut method to perform `PATCH` request.
+                 *
+                 * @param {string} url Relative or absolute URL specifying the destination of the request
+                 * @param {*} data Request content
+                 * @param {Object=} config Optional configuration object. See https://docs.angularjs.org/api/ng/service/$http#usage
                  * @returns {HttpPromise} Future object
                  */
-                createShortMethodsWithData('post', 'put');
+                createShortMethodsWithData('post', 'put', 'patch');
 
                 /**
                  * @ngdoc property
@@ -8109,7 +12474,7 @@
                 function createShortMethods(names) {
                     forEach(arguments, function(name) {
                         $http[name] = function(url, config) {
-                            return $http(extend(config || {}, {
+                            return $http(extend({}, config || {}, {
                                 method: name,
                                 url: url
                             }));
@@ -8121,7 +12486,7 @@
                 function createShortMethodsWithData(name) {
                     forEach(arguments, function(name) {
                         $http[name] = function(url, data, config) {
-                            return $http(extend(config || {}, {
+                            return $http(extend({}, config || {}, {
                                 method: name,
                                 url: url,
                                 data: data
@@ -8137,36 +12502,54 @@
                  * !!! ACCESSES CLOSURE VARS:
                  * $httpBackend, defaults, $log, $rootScope, defaultCache, $http.pendingRequests
                  */
-                function sendReq(config, reqData, reqHeaders) {
+                function sendReq(config, reqData) {
                     var deferred = $q.defer(),
                         promise = deferred.promise,
                         cache,
                         cachedResp,
-                        url = buildUrl(config.url, config.params);
+                        reqHeaders = config.headers,
+                        isJsonp = lowercase(config.method) === 'jsonp',
+                        url = config.url;
+
+                    if (isJsonp) {
+                        // JSONP is a pretty sensitive operation where we're allowing a script to have full access to
+                        // our DOM and JS space.  So we require that the URL satisfies SCE.RESOURCE_URL.
+                        url = $sce.getTrustedResourceUrl(url);
+                    } else if (!isString(url)) {
+                        // If it is not a string then the URL must be a $sce trusted object
+                        url = $sce.valueOf(url);
+                    }
+
+                    url = buildUrl(url, config.paramSerializer(config.params));
+
+                    if (isJsonp) {
+                        // Check the url and add the JSONP callback placeholder
+                        url = sanitizeJsonpCallbackParam(url, config.jsonpCallbackParam);
+                    }
 
                     $http.pendingRequests.push(config);
                     promise.then(removePendingReq, removePendingReq);
 
-
-                    if ((config.cache || defaults.cache) && config.cache !== false && config.method == 'GET') {
+                    if ((config.cache || defaults.cache) && config.cache !== false &&
+                        (config.method === 'GET' || config.method === 'JSONP')) {
                         cache = isObject(config.cache) ? config.cache
-                            : isObject(defaults.cache) ? defaults.cache
-                            : defaultCache;
+                            : isObject(/** @type {?} */ (defaults).cache)
+                                ? /** @type {?} */ (defaults).cache
+                                : defaultCache;
                     }
 
                     if (cache) {
                         cachedResp = cache.get(url);
                         if (isDefined(cachedResp)) {
-                            if (cachedResp.then) {
+                            if (isPromiseLike(cachedResp)) {
                                 // cached request has already been sent, but there is no response yet
-                                cachedResp.then(removePendingReq, removePendingReq);
-                                return cachedResp;
+                                cachedResp.then(resolvePromiseWithResult, resolvePromiseWithResult);
                             } else {
                                 // serving from cache
                                 if (isArray(cachedResp)) {
-                                    resolvePromise(cachedResp[1], cachedResp[0], copy(cachedResp[2]), cachedResp[3]);
+                                    resolvePromise(cachedResp[1], cachedResp[0], shallowCopy(cachedResp[2]), cachedResp[3], cachedResp[4]);
                                 } else {
-                                    resolvePromise(cachedResp, 200, {}, 'OK');
+                                    resolvePromise(cachedResp, 200, {}, 'OK', 'complete');
                                 }
                             }
                         } else {
@@ -8175,14 +12558,47 @@
                         }
                     }
 
-                    // if we won't have the response in cache, send the request to the backend
+
+                    // if we won't have the response in cache, set the xsrf headers and
+                    // send the request to the backend
                     if (isUndefined(cachedResp)) {
+                        var xsrfValue = urlIsSameOrigin(config.url)
+                            ? $$cookieReader()[config.xsrfCookieName || defaults.xsrfCookieName]
+                            : undefined;
+                        if (xsrfValue) {
+                            reqHeaders[(config.xsrfHeaderName || defaults.xsrfHeaderName)] = xsrfValue;
+                        }
+
                         $httpBackend(config.method, url, reqData, done, reqHeaders, config.timeout,
-                            config.withCredentials, config.responseType);
+                            config.withCredentials, config.responseType,
+                            createApplyHandlers(config.eventHandlers),
+                            createApplyHandlers(config.uploadEventHandlers));
                     }
 
                     return promise;
 
+                    function createApplyHandlers(eventHandlers) {
+                        if (eventHandlers) {
+                            var applyHandlers = {};
+                            forEach(eventHandlers, function(eventHandler, key) {
+                                applyHandlers[key] = function(event) {
+                                    if (useApplyAsync) {
+                                        $rootScope.$applyAsync(callEventHandler);
+                                    } else if ($rootScope.$$phase) {
+                                        callEventHandler();
+                                    } else {
+                                        $rootScope.$apply(callEventHandler);
+                                    }
+
+                                    function callEventHandler() {
+                                        eventHandler(event);
+                                    }
+                                };
+                            });
+                            return applyHandlers;
+                        }
+                    }
+
 
                     /**
                      * Callback registered to $httpBackend():
@@ -8190,89 +12606,127 @@
                      *  - resolves the raw $http promise
                      *  - calls $apply
                      */
-                    function done(status, response, headersString, statusText) {
+                    function done(status, response, headersString, statusText, xhrStatus) {
                         if (cache) {
                             if (isSuccess(status)) {
-                                cache.put(url, [status, response, parseHeaders(headersString), statusText]);
+                                cache.put(url, [status, response, parseHeaders(headersString), statusText, xhrStatus]);
                             } else {
                                 // remove promise from the cache
                                 cache.remove(url);
                             }
                         }
 
-                        resolvePromise(response, status, headersString, statusText);
-                        if (!$rootScope.$$phase) $rootScope.$apply();
+                        function resolveHttpPromise() {
+                            resolvePromise(response, status, headersString, statusText, xhrStatus);
+                        }
+
+                        if (useApplyAsync) {
+                            $rootScope.$applyAsync(resolveHttpPromise);
+                        } else {
+                            resolveHttpPromise();
+                            if (!$rootScope.$$phase) $rootScope.$apply();
+                        }
                     }
 
 
                     /**
                      * Resolves the raw $http promise.
                      */
-                    function resolvePromise(response, status, headers, statusText) {
-                        // normalize internal statuses to 0
-                        status = Math.max(status, 0);
+                    function resolvePromise(response, status, headers, statusText, xhrStatus) {
+                        //status: HTTP response status code, 0, -1 (aborted by timeout / promise)
+                        status = status >= -1 ? status : 0;
 
                         (isSuccess(status) ? deferred.resolve : deferred.reject)({
                             data: response,
                             status: status,
                             headers: headersGetter(headers),
                             config: config,
-                            statusText : statusText
+                            statusText: statusText,
+                            xhrStatus: xhrStatus
                         });
                     }
 
+                    function resolvePromiseWithResult(result) {
+                        resolvePromise(result.data, result.status, shallowCopy(result.headers()), result.statusText, result.xhrStatus);
+                    }
 
                     function removePendingReq() {
-                        var idx = indexOf($http.pendingRequests, config);
+                        var idx = $http.pendingRequests.indexOf(config);
                         if (idx !== -1) $http.pendingRequests.splice(idx, 1);
                     }
                 }
 
 
-                function buildUrl(url, params) {
-                    if (!params) return url;
-                    var parts = [];
-                    forEachSorted(params, function(value, key) {
-                        if (value === null || isUndefined(value)) return;
-                        if (!isArray(value)) value = [value];
-
-                        forEach(value, function(v) {
-                            if (isObject(v)) {
-                                v = toJson(v);
-                            }
-                            parts.push(encodeUriQuery(key) + '=' +
-                            encodeUriQuery(v));
-                        });
-                    });
-                    if(parts.length > 0) {
-                        url += ((url.indexOf('?') == -1) ? '?' : '&') + parts.join('&');
+                function buildUrl(url, serializedParams) {
+                    if (serializedParams.length > 0) {
+                        url += ((url.indexOf('?') === -1) ? '?' : '&') + serializedParams;
                     }
                     return url;
                 }
 
+                function sanitizeJsonpCallbackParam(url, cbKey) {
+                    var parts = url.split('?');
+                    if (parts.length > 2) {
+                        // Throw if the url contains more than one `?` query indicator
+                        throw $httpMinErr('badjsonp', 'Illegal use more than one "?", in url, "{1}"', url);
+                    }
+                    var params = parseKeyValue(parts[1]);
+                    forEach(params, function(value, key) {
+                        if (value === 'JSON_CALLBACK') {
+                            // Throw if the url already contains a reference to JSON_CALLBACK
+                            throw $httpMinErr('badjsonp', 'Illegal use of JSON_CALLBACK in url, "{0}"', url);
+                        }
+                        if (key === cbKey) {
+                            // Throw if the callback param was already provided
+                            throw $httpMinErr('badjsonp', 'Illegal use of callback param, "{0}", in url, "{1}"', cbKey, url);
+                        }
+                    });
+
+                    // Add in the JSON_CALLBACK callback param value
+                    url += ((url.indexOf('?') === -1) ? '?' : '&') + cbKey + '=JSON_CALLBACK';
 
+                    return url;
+                }
             }];
     }
 
-    function createXhr(method) {
-        //if IE and the method is not RFC2616 compliant, or if XMLHttpRequest
-        //is not available, try getting an ActiveXObject. Otherwise, use XMLHttpRequest
-        //if it is available
-        if (msie <= 8 && (!method.match(/^(get|post|head|put|delete|options)$/i) ||
-            !window.XMLHttpRequest)) {
-            return new window.ActiveXObject("Microsoft.XMLHTTP");
-        } else if (window.XMLHttpRequest) {
-            return new window.XMLHttpRequest();
-        }
-
-        throw minErr('$httpBackend')('noxhr', "This browser does not support XMLHttpRequest.");
+    /**
+     * @ngdoc service
+     * @name $xhrFactory
+     * @this
+     *
+     * @description
+     * Factory function used to create XMLHttpRequest objects.
+     *
+     * Replace or decorate this service to create your own custom XMLHttpRequest objects.
+     *
+     * ```
+     * angular.module('myApp', [])
+     * .factory('$xhrFactory', function() {
+     *   return function createXhr(method, url) {
+     *     return new window.XMLHttpRequest({mozSystem: true});
+     *   };
+     * });
+     * ```
+     *
+     * @param {string} method HTTP method of the request (GET, POST, PUT, ..)
+     * @param {string} url URL of the request.
+     */
+    function $xhrFactoryProvider() {
+        this.$get = function() {
+            return function createXhr() {
+                return new window.XMLHttpRequest();
+            };
+        };
     }
 
     /**
      * @ngdoc service
      * @name $httpBackend
-     * @requires $window
+     * @requires $jsonpCallbacks
      * @requires $document
+     * @requires $xhrFactory
+     * @this
      *
      * @description
      * HTTP backend used by the {@link ng.$http service} that delegates to
@@ -8285,38 +12739,27 @@
  * $httpBackend} which can be trained with responses.
      */
     function $HttpBackendProvider() {
-        this.$get = ['$browser', '$window', '$document', function($browser, $window, $document) {
-            return createHttpBackend($browser, createXhr, $browser.defer, $window.angular.callbacks, $document[0]);
+        this.$get = ['$browser', '$jsonpCallbacks', '$document', '$xhrFactory', function($browser, $jsonpCallbacks, $document, $xhrFactory) {
+            return createHttpBackend($browser, $xhrFactory, $browser.defer, $jsonpCallbacks, $document[0]);
         }];
     }
 
     function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDocument) {
-        var ABORTED = -1;
-
         // TODO(vojta): fix the signature
-        return function(method, url, post, callback, headers, timeout, withCredentials, responseType) {
-            var status;
-            $browser.$$incOutstandingRequestCount();
+        return function(method, url, post, callback, headers, timeout, withCredentials, responseType, eventHandlers, uploadEventHandlers) {
             url = url || $browser.url();
 
-            if (lowercase(method) == 'jsonp') {
-                var callbackId = '_' + (callbacks.counter++).toString(36);
-                callbacks[callbackId] = function(data) {
-                    callbacks[callbackId].data = data;
-                };
-
-                var jsonpDone = jsonpReq(url.replace('JSON_CALLBACK', 'angular.callbacks.' + callbackId),
-                    function() {
-                        if (callbacks[callbackId].data) {
-                            completeRequest(callback, 200, callbacks[callbackId].data);
-                        } else {
-                            completeRequest(callback, status || -2);
-                        }
-                        callbacks[callbackId] = angular.noop;
-                    });
+            if (lowercase(method) === 'jsonp') {
+                var callbackPath = callbacks.createCallback(url);
+                var jsonpDone = jsonpReq(url, callbackPath, function(status, text) {
+                    // jsonpReq only ever sets status to 200 (OK), 404 (ERROR) or -1 (WAITING)
+                    var response = (status === 200) && callbacks.getResponse(callbackPath);
+                    completeRequest(callback, status, response, '', text, 'complete');
+                    callbacks.removeCallback(callbackPath);
+                });
             } else {
 
-                var xhr = createXhr(method);
+                var xhr = createXhr(method, url);
 
                 xhr.open(method, url, true);
                 forEach(headers, function(value, key) {
@@ -8325,37 +12768,59 @@
                     }
                 });
 
-                // In IE6 and 7, this might be called synchronously when xhr.send below is called and the
-                // response is in the cache. the promise api will ensure that to the app code the api is
-                // always async
-                xhr.onreadystatechange = function() {
-                    // onreadystatechange might get called multiple times with readyState === 4 on mobile webkit caused by
-                    // xhrs that are resolved while the app is in the background (see #5426).
-                    // since calling completeRequest sets the `xhr` variable to null, we just check if it's not null before
-                    // continuing
-                    //
-                    // we can't set xhr.onreadystatechange to undefined or delete it because that breaks IE8 (method=PATCH) and
-                    // Safari respectively.
-                    if (xhr && xhr.readyState == 4) {
-                        var responseHeaders = null,
-                            response = null;
-
-                        if(status !== ABORTED) {
-                            responseHeaders = xhr.getAllResponseHeaders();
-
-                            // responseText is the old-school way of retrieving response (supported by IE8 & 9)
-                            // response/responseType properties were introduced in XHR Level2 spec (supported by IE10)
-                            response = ('response' in xhr) ? xhr.response : xhr.responseText;
-                        }
+                xhr.onload = function requestLoaded() {
+                    var statusText = xhr.statusText || '';
 
-                        completeRequest(callback,
-                            status || xhr.status,
-                            response,
-                            responseHeaders,
-                            xhr.statusText || '');
+                    // responseText is the old-school way of retrieving response (supported by IE9)
+                    // response/responseType properties were introduced in XHR Level2 spec (supported by IE10)
+                    var response = ('response' in xhr) ? xhr.response : xhr.responseText;
+
+                    // normalize IE9 bug (http://bugs.jquery.com/ticket/1450)
+                    var status = xhr.status === 1223 ? 204 : xhr.status;
+
+                    // fix status code when it is 0 (0 status is undocumented).
+                    // Occurs when accessing file resources or on Android 4.1 stock browser
+                    // while retrieving files from application cache.
+                    if (status === 0) {
+                        status = response ? 200 : urlResolve(url).protocol === 'file' ? 404 : 0;
                     }
+
+                    completeRequest(callback,
+                        status,
+                        response,
+                        xhr.getAllResponseHeaders(),
+                        statusText,
+                        'complete');
+                };
+
+                var requestError = function() {
+                    // The response is always empty
+                    // See https://xhr.spec.whatwg.org/#request-error-steps and https://fetch.spec.whatwg.org/#concept-network-error
+                    completeRequest(callback, -1, null, null, '', 'error');
+                };
+
+                var requestAborted = function() {
+                    completeRequest(callback, -1, null, null, '', 'abort');
+                };
+
+                var requestTimeout = function() {
+                    // The response is always empty
+                    // See https://xhr.spec.whatwg.org/#request-error-steps and https://fetch.spec.whatwg.org/#concept-network-error
+                    completeRequest(callback, -1, null, null, '', 'timeout');
                 };
 
+                xhr.onerror = requestError;
+                xhr.onabort = requestAborted;
+                xhr.ontimeout = requestTimeout;
+
+                forEach(eventHandlers, function(value, key) {
+                    xhr.addEventListener(key, value);
+                });
+
+                forEach(uploadEventHandlers, function(value, key) {
+                    xhr.upload.addEventListener(key, value);
+                });
+
                 if (withCredentials) {
                     xhr.withCredentials = true;
                 }
@@ -8377,87 +12842,105 @@
                     }
                 }
 
-                xhr.send(post || null);
+                xhr.send(isUndefined(post) ? null : post);
             }
 
             if (timeout > 0) {
                 var timeoutId = $browserDefer(timeoutRequest, timeout);
-            } else if (timeout && timeout.then) {
+            } else if (isPromiseLike(timeout)) {
                 timeout.then(timeoutRequest);
             }
 
 
             function timeoutRequest() {
-                status = ABORTED;
-                jsonpDone && jsonpDone();
-                xhr && xhr.abort();
+                if (jsonpDone) {
+                    jsonpDone();
+                }
+                if (xhr) {
+                    xhr.abort();
+                }
             }
 
-            function completeRequest(callback, status, response, headersString, statusText) {
+            function completeRequest(callback, status, response, headersString, statusText, xhrStatus) {
                 // cancel timeout and subsequent timeout promise resolution
-                timeoutId && $browserDefer.cancel(timeoutId);
-                jsonpDone = xhr = null;
-
-                // fix status code when it is 0 (0 status is undocumented).
-                // Occurs when accessing file resources or on Android 4.1 stock browser
-                // while retrieving files from application cache.
-                if (status === 0) {
-                    status = response ? 200 : urlResolve(url).protocol == 'file' ? 404 : 0;
+                if (isDefined(timeoutId)) {
+                    $browserDefer.cancel(timeoutId);
                 }
+                jsonpDone = xhr = null;
 
-                // normalize IE bug (http://bugs.jquery.com/ticket/1450)
-                status = status === 1223 ? 204 : status;
-                statusText = statusText || '';
-
-                callback(status, response, headersString, statusText);
-                $browser.$$completeOutstandingRequest(noop);
+                callback(status, response, headersString, statusText, xhrStatus);
             }
         };
 
-        function jsonpReq(url, done) {
-            // we can't use jQuery/jqLite here because jQuery does crazy shit with script elements, e.g.:
+        function jsonpReq(url, callbackPath, done) {
+            url = url.replace('JSON_CALLBACK', callbackPath);
+            // we can't use jQuery/jqLite here because jQuery does crazy stuff with script elements, e.g.:
             // - fetches local scripts via XHR and evals them
             // - adds and immediately removes script elements from the document
-            var script = rawDocument.createElement('script'),
-                doneWrapper = function() {
-                    script.onreadystatechange = script.onload = script.onerror = null;
-                    rawDocument.body.removeChild(script);
-                    if (done) done();
-                };
-
+            var script = rawDocument.createElement('script'), callback = null;
             script.type = 'text/javascript';
             script.src = url;
-
-            if (msie && msie <= 8) {
-                script.onreadystatechange = function() {
-                    if (/loaded|complete/.test(script.readyState)) {
-                        doneWrapper();
+            script.async = true;
+
+            callback = function(event) {
+                script.removeEventListener('load', callback);
+                script.removeEventListener('error', callback);
+                rawDocument.body.removeChild(script);
+                script = null;
+                var status = -1;
+                var text = 'unknown';
+
+                if (event) {
+                    if (event.type === 'load' && !callbacks.wasCalled(callbackPath)) {
+                        event = { type: 'error' };
                     }
-                };
-            } else {
-                script.onload = script.onerror = function() {
-                    doneWrapper();
-                };
-            }
+                    text = event.type;
+                    status = event.type === 'error' ? 404 : 200;
+                }
 
+                if (done) {
+                    done(status, text);
+                }
+            };
+
+            script.addEventListener('load', callback);
+            script.addEventListener('error', callback);
             rawDocument.body.appendChild(script);
-            return doneWrapper;
+            return callback;
         }
     }
 
-    var $interpolateMinErr = minErr('$interpolate');
+    var $interpolateMinErr = angular.$interpolateMinErr = minErr('$interpolate');
+    $interpolateMinErr.throwNoconcat = function(text) {
+        throw $interpolateMinErr('noconcat',
+            'Error while interpolating: {0}\nStrict Contextual Escaping disallows ' +
+            'interpolations that concatenate multiple expressions when a trusted value is ' +
+            'required.  See http://docs.angularjs.org/api/ng.$sce', text);
+    };
+
+    $interpolateMinErr.interr = function(text, err) {
+        return $interpolateMinErr('interr', 'Can\'t interpolate: {0}\n{1}', text, err.toString());
+    };
 
     /**
      * @ngdoc provider
      * @name $interpolateProvider
-     * @function
+     * @this
      *
      * @description
      *
      * Used for configuring the interpolation markup. Defaults to `{{` and `}}`.
      *
+     * <div class="alert alert-danger">
+     * This feature is sometimes used to mix different markup languages, e.g. to wrap an AngularJS
+     * template within a Python Jinja template (or any other template language). Mixing templating
+     * languages is **very dangerous**. The embedding template language will not safely escape AngularJS
+     * expressions, so any user-controlled values in the template will cause Cross Site Scripting (XSS)
+     * security bugs!
+     * </div>
+     *
      * @example
-     <example module="customInterpolationApp">
+     <example name="custom-interpolation-markup" module="customInterpolationApp">
      <file name="index.html">
      <script>
      var customInterpolationApp = angular.module('customInterpolationApp', []);
@@ -8468,11 +12951,11 @@
   });
 
 
-     customInterpolationApp.controller('DemoController', function DemoController() {
+     customInterpolationApp.controller('DemoController', function() {
       this.label = "This binding is brought you by // interpolation symbols.";
   });
      </script>
-     <div ng-app="App" ng-controller="DemoController as demo">
+     <div ng-controller="DemoController as demo">
      //demo.label//
      </div>
      </file>
@@ -8492,11 +12975,11 @@
          * @name $interpolateProvider#startSymbol
          * @description
          * Symbol to denote start of expression in the interpolated string. Defaults to `{{`.
-   *
-   * @param {string=} value new value to set the starting symbol to.
+         *
+         * @param {string=} value new value to set the starting symbol to.
          * @returns {string|self} Returns the symbol when used as getter and self if used as setter.
          */
-        this.startSymbol = function(value){
+        this.startSymbol = function(value) {
             if (value) {
                 startSymbol = value;
                 return this;
@@ -8514,7 +12997,7 @@
          * @param {string=} value new value to set the ending symbol to.
          * @returns {string|self} Returns the symbol when used as getter and self if used as setter.
          */
-        this.endSymbol = function(value){
+        this.endSymbol = function(value) {
             if (value) {
                 endSymbol = value;
                 return this;
@@ -8526,12 +13009,32 @@
 
         this.$get = ['$parse', '$exceptionHandler', '$sce', function($parse, $exceptionHandler, $sce) {
             var startSymbolLength = startSymbol.length,
-                endSymbolLength = endSymbol.length;
+                endSymbolLength = endSymbol.length,
+                escapedStartRegexp = new RegExp(startSymbol.replace(/./g, escape), 'g'),
+                escapedEndRegexp = new RegExp(endSymbol.replace(/./g, escape), 'g');
+
+            function escape(ch) {
+                return '\\\\\\' + ch;
+            }
+
+            function unescapeText(text) {
+                return text.replace(escapedStartRegexp, startSymbol).
+                replace(escapedEndRegexp, endSymbol);
+            }
+
+            // TODO: this is the same as the constantWatchDelegate in parse.js
+            function constantWatchDelegate(scope, listener, objectEquality, constantInterp) {
+                var unwatch = scope.$watch(function constantInterpolateWatch(scope) {
+                    unwatch();
+                    return constantInterp(scope);
+                }, listener, objectEquality);
+                return unwatch;
+            }
 
             /**
              * @ngdoc service
              * @name $interpolate
-             * @function
+             * @kind function
              *
              * @requires $parse
              * @requires $sce
@@ -8547,9 +13050,89 @@
              * ```js
              *   var $interpolate = ...; // injected
              *   var exp = $interpolate('Hello {{name | uppercase}}!');
-             *   expect(exp({name:'Angular'}).toEqual('Hello ANGULAR!');
+             *   expect(exp({name:'AngularJS'})).toEqual('Hello ANGULAR!');
+             * ```
+             *
+             * `$interpolate` takes an optional fourth argument, `allOrNothing`. If `allOrNothing` is
+             * `true`, the interpolation function will return `undefined` unless all embedded expressions
+             * evaluate to a value other than `undefined`.
+             *
+             * ```js
+             *   var $interpolate = ...; // injected
+             *   var context = {greeting: 'Hello', name: undefined };
+             *
+             *   // default "forgiving" mode
+             *   var exp = $interpolate('{{greeting}} {{name}}!');
+             *   expect(exp(context)).toEqual('Hello !');
+             *
+             *   // "allOrNothing" mode
+             *   exp = $interpolate('{{greeting}} {{name}}!', false, null, true);
+             *   expect(exp(context)).toBeUndefined();
+             *   context.name = 'AngularJS';
+             *   expect(exp(context)).toEqual('Hello AngularJS!');
+             * ```
+             *
+             * `allOrNothing` is useful for interpolating URLs. `ngSrc` and `ngSrcset` use this behavior.
+             *
+             * #### Escaped Interpolation
+             * $interpolate provides a mechanism for escaping interpolation markers. Start and end markers
+             * can be escaped by preceding each of their characters with a REVERSE SOLIDUS U+005C (backslash).
+             * It will be rendered as a regular start/end marker, and will not be interpreted as an expression
+             * or binding.
+             *
+             * This enables web-servers to prevent script injection attacks and defacing attacks, to some
+             * degree, while also enabling code examples to work without relying on the
+             * {@link ng.directive:ngNonBindable ngNonBindable} directive.
+             *
+             * **For security purposes, it is strongly encouraged that web servers escape user-supplied data,
+             * replacing angle brackets (&lt;, &gt;) with &amp;lt; and &amp;gt; respectively, and replacing all
+             * interpolation start/end markers with their escaped counterparts.**
+             *
+             * Escaped interpolation markers are only replaced with the actual interpolation markers in rendered
+             * output when the $interpolate service processes the text. So, for HTML elements interpolated
+             * by {@link ng.$compile $compile}, or otherwise interpolated with the `mustHaveExpression` parameter
+             * set to `true`, the interpolated text must contain an unescaped interpolation expression. As such,
+             * this is typically useful only when user-data is used in rendering a template from the server, or
+             * when otherwise untrusted data is used by a directive.
+             *
+             * <example name="interpolation">
+             *  <file name="index.html">
+             *    <div ng-init="username='A user'">
+             *      <p ng-init="apptitle='Escaping demo'">{{apptitle}}: \{\{ username = "defaced value"; \}\}
+             *        </p>
+             *      <p><strong>{{username}}</strong> attempts to inject code which will deface the
+             *        application, but fails to accomplish their task, because the server has correctly
+             *        escaped the interpolation start/end markers with REVERSE SOLIDUS U+005C (backslash)
+             *        characters.</p>
+             *      <p>Instead, the result of the attempted script injection is visible, and can be removed
+             *        from the database by an administrator.</p>
+             *    </div>
+             *  </file>
+             * </example>
+             *
+             * @knownIssue
+             * It is currently not possible for an interpolated expression to contain the interpolation end
+             * symbol. For example, `{{ '}}' }}` will be incorrectly interpreted as `{{ ' }}` + `' }}`, i.e.
+             * an interpolated expression consisting of a single-quote (`'`) and the `' }}` string.
+             *
+             * @knownIssue
+             * All directives and components must use the standard `{{` `}}` interpolation symbols
+             * in their templates. If you change the application interpolation symbols the {@link $compile}
+             * service will attempt to denormalize the standard symbols to the custom symbols.
+             * The denormalization process is not clever enough to know not to replace instances of the standard
+             * symbols where they would not normally be treated as interpolation symbols. For example in the following
+             * code snippet the closing braces of the literal object will get incorrectly denormalized:
+             *
+             * ```
+             * <div data-context='{"context":{"id":3,"type":"page"}}">
+             * ```
+             *
+             * The workaround is to ensure that such instances are separated by whitespace:
+             * ```
+             * <div data-context='{"context":{"id":3,"type":"page"} }">
              * ```
              *
+             * See https://github.com/angular/angular.js/pull/14610#issuecomment-219401099 for more information.
              *
              * @param {string} text The text with markup to interpolate.
              * @param {boolean=} mustHaveExpression if set to true then the interpolation string must have
@@ -8559,43 +13142,57 @@
              *    result through {@link ng.$sce#getTrusted $sce.getTrusted(interpolatedResult,
      *    trustedContext)} before returning it.  Refer to the {@link ng.$sce $sce} service that
              *    provides Strict Contextual Escaping for details.
+             * @param {boolean=} allOrNothing if `true`, then the returned function returns undefined
+             *    unless all embedded expressions evaluate to a value other than `undefined`.
              * @returns {function(context)} an interpolation function which is used to compute the
              *    interpolated string. The function has these parameters:
              *
-             *    * `context`: an object against which any expressions embedded in the strings are evaluated
-             *      against.
-             *
+             * - `context`: evaluation context for all expressions embedded in the interpolated text
              */
-            function $interpolate(text, mustHaveExpression, trustedContext) {
+            function $interpolate(text, mustHaveExpression, trustedContext, allOrNothing) {
+                // Provide a quick exit and simplified result function for text with no interpolation
+                if (!text.length || text.indexOf(startSymbol) === -1) {
+                    var constantInterp;
+                    if (!mustHaveExpression) {
+                        var unescapedText = unescapeText(text);
+                        constantInterp = valueFn(unescapedText);
+                        constantInterp.exp = text;
+                        constantInterp.expressions = [];
+                        constantInterp.$$watchDelegate = constantWatchDelegate;
+                    }
+                    return constantInterp;
+                }
+
+                allOrNothing = !!allOrNothing;
                 var startIndex,
                     endIndex,
                     index = 0,
-                    parts = [],
-                    length = text.length,
-                    hasInterpolation = false,
-                    fn,
+                    expressions = [],
+                    parseFns = [],
+                    textLength = text.length,
                     exp,
-                    concat = [];
-
-                while(index < length) {
-                    if ( ((startIndex = text.indexOf(startSymbol, index)) != -1) &&
-                        ((endIndex = text.indexOf(endSymbol, startIndex + startSymbolLength)) != -1) ) {
-                        (index != startIndex) && parts.push(text.substring(index, startIndex));
-                        parts.push(fn = $parse(exp = text.substring(startIndex + startSymbolLength, endIndex)));
-                        fn.exp = exp;
+                    concat = [],
+                    expressionPositions = [];
+
+                while (index < textLength) {
+                    if (((startIndex = text.indexOf(startSymbol, index)) !== -1) &&
+                        ((endIndex = text.indexOf(endSymbol, startIndex + startSymbolLength)) !== -1)) {
+                        if (index !== startIndex) {
+                            concat.push(unescapeText(text.substring(index, startIndex)));
+                        }
+                        exp = text.substring(startIndex + startSymbolLength, endIndex);
+                        expressions.push(exp);
+                        parseFns.push($parse(exp, parseStringifyInterceptor));
                         index = endIndex + endSymbolLength;
-                        hasInterpolation = true;
+                        expressionPositions.push(concat.length);
+                        concat.push('');
                     } else {
-                        // we did not find anything, so we have to add the remainder to the parts array
-                        (index != length) && parts.push(text.substring(index));
-                        index = length;
-                    }
-                }
-
-                if (!(length = parts.length)) {
-                    // we added, nothing, must have been an empty string.
-                    parts.push('');
-                    length = 1;
+                        // we did not find an interpolation, so we have to add the remainder to the separators array
+                        if (index !== textLength) {
+                            concat.push(unescapeText(text.substring(index)));
+                        }
+                        break;
+                    }
                 }
 
                 // Concatenating expressions makes it hard to reason about whether some combination of
@@ -8604,44 +13201,62 @@
                 // that's used is assigned or constructed by some JS code somewhere that is more testable or
                 // make it obvious that you bound the value to some user controlled value.  This helps reduce
                 // the load when auditing for XSS issues.
-                if (trustedContext && parts.length > 1) {
-                    throw $interpolateMinErr('noconcat',
-                        "Error while interpolating: {0}\nStrict Contextual Escaping disallows " +
-                        "interpolations that concatenate multiple expressions when a trusted value is " +
-                        "required.  See http://docs.angularjs.org/api/ng.$sce", text);
+                if (trustedContext && concat.length > 1) {
+                    $interpolateMinErr.throwNoconcat(text);
                 }
 
-                if (!mustHaveExpression  || hasInterpolation) {
-                    concat.length = length;
-                    fn = function(context) {
+                if (!mustHaveExpression || expressions.length) {
+                    var compute = function(values) {
+                        for (var i = 0, ii = expressions.length; i < ii; i++) {
+                            if (allOrNothing && isUndefined(values[i])) return;
+                            concat[expressionPositions[i]] = values[i];
+                        }
+                        return concat.join('');
+                    };
+
+                    var getValue = function(value) {
+                        return trustedContext ?
+                            $sce.getTrusted(trustedContext, value) :
+                            $sce.valueOf(value);
+                    };
+
+                    return extend(function interpolationFn(context) {
+                        var i = 0;
+                        var ii = expressions.length;
+                        var values = new Array(ii);
+
                         try {
-                            for(var i = 0, ii = length, part; i<ii; i++) {
-                                if (typeof (part = parts[i]) == 'function') {
-                                    part = part(context);
-                                    if (trustedContext) {
-                                        part = $sce.getTrusted(trustedContext, part);
-                                    } else {
-                                        part = $sce.valueOf(part);
-                                    }
-                                    if (part === null || isUndefined(part)) {
-                                        part = '';
-                                    } else if (typeof part != 'string') {
-                                        part = toJson(part);
-                                    }
-                                }
-                                concat[i] = part;
+                            for (; i < ii; i++) {
+                                values[i] = parseFns[i](context);
                             }
-                            return concat.join('');
+
+                            return compute(values);
+                        } catch (err) {
+                            $exceptionHandler($interpolateMinErr.interr(text, err));
                         }
-                        catch(err) {
-                            var newErr = $interpolateMinErr('interr', "Can't interpolate: {0}\n{1}", text,
-                                err.toString());
-                            $exceptionHandler(newErr);
+
+                    }, {
+                        // all of these properties are undocumented for now
+                        exp: text, //just for compatibility with regular watchers created via $watch
+                        expressions: expressions,
+                        $$watchDelegate: function(scope, listener) {
+                            var lastValue;
+                            return scope.$watchGroup(parseFns, /** @this */ function interpolateFnWatcher(values, oldValues) {
+                                var currValue = compute(values);
+                                listener.call(this, currValue, values !== oldValues ? lastValue : currValue, scope);
+                                lastValue = currValue;
+                            });
                         }
-                    };
-                    fn.exp = text;
-                    fn.parts = parts;
-                    return fn;
+                    });
+                }
+
+                function parseStringifyInterceptor(value) {
+                    try {
+                        value = getValue(value);
+                        return allOrNothing && !isDefined(value) ? value : stringify(value);
+                    } catch (err) {
+                        $exceptionHandler($interpolateMinErr.interr(text, err));
+                    }
                 }
             }
 
@@ -8651,8 +13266,8 @@
              * @name $interpolate#startSymbol
              * @description
              * Symbol to denote the start of expression in the interpolated string. Defaults to `{{`.
-     *
-     * Use {@link ng.$interpolateProvider#startSymbol $interpolateProvider#startSymbol} to change
+             *
+             * Use {@link ng.$interpolateProvider#startSymbol `$interpolateProvider.startSymbol`} to change
              * the symbol.
              *
              * @returns {string} start symbol.
@@ -8668,7 +13283,7 @@
              * @description
              * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`.
              *
-             * Use {@link ng.$interpolateProvider#endSymbol $interpolateProvider#endSymbol} to change
+             * Use {@link ng.$interpolateProvider#endSymbol `$interpolateProvider.endSymbol`} to change
              * the symbol.
              *
              * @returns {string} end symbol.
@@ -8681,9 +13296,10 @@
         }];
     }
 
+    /** @this */
     function $IntervalProvider() {
-        this.$get = ['$rootScope', '$window', '$q',
-            function($rootScope,   $window,   $q) {
+        this.$get = ['$rootScope', '$window', '$q', '$$q', '$browser',
+            function($rootScope,   $window,   $q,   $$q,   $browser) {
                 var intervals = {};
 
 
@@ -8692,7 +13308,7 @@
                  * @name $interval
                  *
                  * @description
-                 * Angular's wrapper for `window.setInterval`. The `fn` function is executed every `delay`
+                 * AngularJS's wrapper for `window.setInterval`. The `fn` function is executed every `delay`
                  * milliseconds.
                  *
                  * The return value of registering an interval function is a promise. This promise will be
@@ -8713,116 +13329,124 @@
                  * appropriate moment.  See the example below for more details on how and when to do this.
                  * </div>
                  *
-                 * @param {function()} fn A function that should be called repeatedly.
+                 * @param {function()} fn A function that should be called repeatedly. If no additional arguments
+                 *   are passed (see below), the function is called with the current iteration count.
                  * @param {number} delay Number of milliseconds between each function call.
                  * @param {number=} [count=0] Number of times to repeat. If not set, or 0, will repeat
                  *   indefinitely.
                  * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
                  *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
-                 * @returns {promise} A promise which will be notified on each iteration.
+                 * @param {...*=} Pass additional parameters to the executed function.
+                 * @returns {promise} A promise which will be notified on each iteration. It will resolve once all iterations of the interval complete.
                  *
                  * @example
-                 * <example module="time">
-                 *   <file name="index.html">
-                 *     <script>
-                 *       function Ctrl2($scope,$interval) {
-      *         $scope.format = 'M/d/yy h:mm:ss a';
-      *         $scope.blood_1 = 100;
-      *         $scope.blood_2 = 120;
-      *
-      *         var stop;
-      *         $scope.fight = function() {
-      *           // Don't start a new fight if we are already fighting
-      *           if ( angular.isDefined(stop) ) return;
-      *
-      *           stop = $interval(function() {
-      *             if ($scope.blood_1 > 0 && $scope.blood_2 > 0) {
-      *                 $scope.blood_1 = $scope.blood_1 - 3;
-      *                 $scope.blood_2 = $scope.blood_2 - 4;
-      *             } else {
-      *                 $scope.stopFight();
-      *             }
-      *           }, 100);
-      *         };
-      *
-      *         $scope.stopFight = function() {
-      *           if (angular.isDefined(stop)) {
-      *             $interval.cancel(stop);
-      *             stop = undefined;
-      *           }
-      *         };
-      *
-      *         $scope.resetFight = function() {
-      *           $scope.blood_1 = 100;
-      *           $scope.blood_2 = 120;
-      *         }
-      *
-      *         $scope.$on('$destroy', function() {
-      *           // Make sure that the interval is destroyed too
-      *           $scope.stopFight();
-      *         });
-      *       }
+                 * <example module="intervalExample" name="interval-service">
+                 * <file name="index.html">
+                 *   <script>
+                 *     angular.module('intervalExample', [])
+                 *       .controller('ExampleController', ['$scope', '$interval',
+                 *         function($scope, $interval) {
+                 *           $scope.format = 'M/d/yy h:mm:ss a';
+                 *           $scope.blood_1 = 100;
+                 *           $scope.blood_2 = 120;
+                 *
+                 *           var stop;
+                 *           $scope.fight = function() {
+                 *             // Don't start a new fight if we are already fighting
+                 *             if ( angular.isDefined(stop) ) return;
+                 *
+                 *             stop = $interval(function() {
+                 *               if ($scope.blood_1 > 0 && $scope.blood_2 > 0) {
+                 *                 $scope.blood_1 = $scope.blood_1 - 3;
+                 *                 $scope.blood_2 = $scope.blood_2 - 4;
+                 *               } else {
+                 *                 $scope.stopFight();
+                 *               }
+                 *             }, 100);
+                 *           };
+                 *
+                 *           $scope.stopFight = function() {
+                 *             if (angular.isDefined(stop)) {
+                 *               $interval.cancel(stop);
+                 *               stop = undefined;
+                 *             }
+                 *           };
+                 *
+                 *           $scope.resetFight = function() {
+                 *             $scope.blood_1 = 100;
+                 *             $scope.blood_2 = 120;
+                 *           };
+                 *
+                 *           $scope.$on('$destroy', function() {
+                 *             // Make sure that the interval is destroyed too
+                 *             $scope.stopFight();
+                 *           });
+                 *         }])
+                 *       // Register the 'myCurrentTime' directive factory method.
+                 *       // We inject $interval and dateFilter service since the factory method is DI.
+                 *       .directive('myCurrentTime', ['$interval', 'dateFilter',
+                 *         function($interval, dateFilter) {
+                 *           // return the directive link function. (compile function not needed)
+                 *           return function(scope, element, attrs) {
+                 *             var format,  // date format
+                 *                 stopTime; // so that we can cancel the time updates
                  *
-                 *       angular.module('time', [])
-                 *         // Register the 'myCurrentTime' directive factory method.
-                 *         // We inject $interval and dateFilter service since the factory method is DI.
-                 *         .directive('myCurrentTime', function($interval, dateFilter) {
-      *           // return the directive link function. (compile function not needed)
-      *           return function(scope, element, attrs) {
-      *             var format,  // date format
-      *             stopTime; // so that we can cancel the time updates
-      *
-      *             // used to update the UI
-      *             function updateTime() {
-      *               element.text(dateFilter(new Date(), format));
-      *             }
-      *
-      *             // watch the expression, and update the UI on change.
-      *             scope.$watch(attrs.myCurrentTime, function(value) {
-      *               format = value;
-      *               updateTime();
-      *             });
-      *
-      *             stopTime = $interval(updateTime, 1000);
-      *
-      *             // listen on DOM destroy (removal) event, and cancel the next UI update
-      *             // to prevent updating time ofter the DOM element was removed.
-      *             element.bind('$destroy', function() {
-      *               $interval.cancel(stopTime);
-      *             });
-      *           }
-      *         });
-                 *     </script>
+                 *             // used to update the UI
+                 *             function updateTime() {
+                 *               element.text(dateFilter(new Date(), format));
+                 *             }
                  *
-                 *     <div>
-                 *       <div ng-controller="Ctrl2">
-                 *         Date format: <input ng-model="format"> <hr/>
-                 *         Current time is: <span my-current-time="format"></span>
-                 *         <hr/>
-                 *         Blood 1 : <font color='red'>{{blood_1}}</font>
-                 *         Blood 2 : <font color='red'>{{blood_2}}</font>
-                 *         <button type="button" data-ng-click="fight()">Fight</button>
-                 *         <button type="button" data-ng-click="stopFight()">StopFight</button>
-                 *         <button type="button" data-ng-click="resetFight()">resetFight</button>
-                 *       </div>
+                 *             // watch the expression, and update the UI on change.
+                 *             scope.$watch(attrs.myCurrentTime, function(value) {
+                 *               format = value;
+                 *               updateTime();
+                 *             });
+                 *
+                 *             stopTime = $interval(updateTime, 1000);
+                 *
+                 *             // listen on DOM destroy (removal) event, and cancel the next UI update
+                 *             // to prevent updating time after the DOM element was removed.
+                 *             element.on('$destroy', function() {
+                 *               $interval.cancel(stopTime);
+                 *             });
+                 *           }
+                 *         }]);
+                 *   </script>
+                 *
+                 *   <div>
+                 *     <div ng-controller="ExampleController">
+                 *       <label>Date format: <input ng-model="format"></label> <hr/>
+                 *       Current time is: <span my-current-time="format"></span>
+                 *       <hr/>
+                 *       Blood 1 : <font color='red'>{{blood_1}}</font>
+                 *       Blood 2 : <font color='red'>{{blood_2}}</font>
+                 *       <button type="button" data-ng-click="fight()">Fight</button>
+                 *       <button type="button" data-ng-click="stopFight()">StopFight</button>
+                 *       <button type="button" data-ng-click="resetFight()">resetFight</button>
                  *     </div>
+                 *   </div>
                  *
-                 *   </file>
+                 * </file>
                  * </example>
                  */
                 function interval(fn, delay, count, invokeApply) {
-                    var setInterval = $window.setInterval,
+                    var hasParams = arguments.length > 4,
+                        args = hasParams ? sliceArgs(arguments, 4) : [],
+                        setInterval = $window.setInterval,
                         clearInterval = $window.clearInterval,
-                        deferred = $q.defer(),
-                        promise = deferred.promise,
                         iteration = 0,
-                        skipApply = (isDefined(invokeApply) && !invokeApply);
+                        skipApply = (isDefined(invokeApply) && !invokeApply),
+                        deferred = (skipApply ? $$q : $q).defer(),
+                        promise = deferred.promise;
 
                     count = isDefined(count) ? count : 0;
 
-                    promise.then(null, null, fn);
-
                     promise.$$intervalId = setInterval(function tick() {
+                        if (skipApply) {
+                            $browser.defer(callback);
+                        } else {
+                            $rootScope.$evalAsync(callback);
+                        }
                         deferred.notify(iteration++);
 
                         if (count > 0 && iteration >= count) {
@@ -8838,6 +13462,14 @@
                     intervals[promise.$$intervalId] = deferred;
 
                     return promise;
+
+                    function callback() {
+                        if (!hasParams) {
+                            fn(iteration);
+                        } else {
+                            fn.apply(null, args);
+                        }
+                    }
                 }
 
 
@@ -8848,13 +13480,15 @@
                  * @description
                  * Cancels a task associated with the `promise`.
                  *
-                 * @param {promise} promise returned by the `$interval` function.
+                 * @param {Promise=} promise returned by the `$interval` function.
                  * @returns {boolean} Returns `true` if the task was successfully canceled.
                  */
                 interval.cancel = function(promise) {
                     if (promise && promise.$$intervalId in intervals) {
+                        // Interval cancels should not report as unhandled promise.
+                        markQExceptionHandled(intervals[promise.$$intervalId].promise);
                         intervals[promise.$$intervalId].reject('canceled');
-                        clearInterval(promise.$$intervalId);
+                        $window.clearInterval(promise.$$intervalId);
                         delete intervals[promise.$$intervalId];
                         return true;
                     }
@@ -8867,77 +13501,97 @@
 
     /**
      * @ngdoc service
-     * @name $locale
-     *
+     * @name $jsonpCallbacks
+     * @requires $window
      * @description
-     * $locale service provides localization rules for various Angular components. As of right now the
-     * only public api is:
-     *
-     * * `id` – `{string}` – locale id formatted as `languageId-countryId` (e.g. `en-us`)
+     * This service handles the lifecycle of callbacks to handle JSONP requests.
+     * Override this service if you wish to customise where the callbacks are stored and
+     * how they vary compared to the requested url.
      */
-    function $LocaleProvider(){
+    var $jsonpCallbacksProvider = /** @this */ function() {
         this.$get = function() {
+            var callbacks = angular.callbacks;
+            var callbackMap = {};
+
+            function createCallback(callbackId) {
+                var callback = function(data) {
+                    callback.data = data;
+                    callback.called = true;
+                };
+                callback.id = callbackId;
+                return callback;
+            }
+
             return {
-                id: 'en-us',
-
-                NUMBER_FORMATS: {
-                    DECIMAL_SEP: '.',
-                    GROUP_SEP: ',',
-                    PATTERNS: [
-                        { // Decimal Pattern
-                            minInt: 1,
-                            minFrac: 0,
-                            maxFrac: 3,
-                            posPre: '',
-                            posSuf: '',
-                            negPre: '-',
-                            negSuf: '',
-                            gSize: 3,
-                            lgSize: 3
-                        },{ //Currency Pattern
-                            minInt: 1,
-                            minFrac: 2,
-                            maxFrac: 2,
-                            posPre: '\u00A4',
-                            posSuf: '',
-                            negPre: '(\u00A4',
-                            negSuf: ')',
-                            gSize: 3,
-                            lgSize: 3
-                        }
-                    ],
-                    CURRENCY_SYM: '$'
+                /**
+                 * @ngdoc method
+                 * @name $jsonpCallbacks#createCallback
+                 * @param {string} url the url of the JSONP request
+                 * @returns {string} the callback path to send to the server as part of the JSONP request
+                 * @description
+                 * {@link $httpBackend} calls this method to create a callback and get hold of the path to the callback
+                 * to pass to the server, which will be used to call the callback with its payload in the JSONP response.
+                 */
+                createCallback: function(url) {
+                    var callbackId = '_' + (callbacks.$$counter++).toString(36);
+                    var callbackPath = 'angular.callbacks.' + callbackId;
+                    var callback = createCallback(callbackId);
+                    callbackMap[callbackPath] = callbacks[callbackId] = callback;
+                    return callbackPath;
                 },
-
-                DATETIME_FORMATS: {
-                    MONTH:
-                        'January,February,March,April,May,June,July,August,September,October,November,December'
-                            .split(','),
-                    SHORTMONTH:  'Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec'.split(','),
-                    DAY: 'Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday'.split(','),
-                    SHORTDAY: 'Sun,Mon,Tue,Wed,Thu,Fri,Sat'.split(','),
-                    AMPMS: ['AM','PM'],
-                    medium: 'MMM d, y h:mm:ss a',
-                    short: 'M/d/yy h:mm a',
-                    fullDate: 'EEEE, MMMM d, y',
-                    longDate: 'MMMM d, y',
-                    mediumDate: 'MMM d, y',
-                    shortDate: 'M/d/yy',
-                    mediumTime: 'h:mm:ss a',
-                    shortTime: 'h:mm a'
+                /**
+                 * @ngdoc method
+                 * @name $jsonpCallbacks#wasCalled
+                 * @param {string} callbackPath the path to the callback that was sent in the JSONP request
+                 * @returns {boolean} whether the callback has been called, as a result of the JSONP response
+                 * @description
+                 * {@link $httpBackend} calls this method to find out whether the JSONP response actually called the
+                 * callback that was passed in the request.
+                 */
+                wasCalled: function(callbackPath) {
+                    return callbackMap[callbackPath].called;
                 },
-
-                pluralCat: function(num) {
-                    if (num === 1) {
-                        return 'one';
-                    }
-                    return 'other';
+                /**
+                 * @ngdoc method
+                 * @name $jsonpCallbacks#getResponse
+                 * @param {string} callbackPath the path to the callback that was sent in the JSONP request
+                 * @returns {*} the data received from the response via the registered callback
+                 * @description
+                 * {@link $httpBackend} calls this method to get hold of the data that was provided to the callback
+                 * in the JSONP response.
+                 */
+                getResponse: function(callbackPath) {
+                    return callbackMap[callbackPath].data;
+                },
+                /**
+                 * @ngdoc method
+                 * @name $jsonpCallbacks#removeCallback
+                 * @param {string} callbackPath the path to the callback that was sent in the JSONP request
+                 * @description
+                 * {@link $httpBackend} calls this method to remove the callback after the JSONP request has
+                 * completed or timed-out.
+                 */
+                removeCallback: function(callbackPath) {
+                    var callback = callbackMap[callbackPath];
+                    delete callbacks[callback.id];
+                    delete callbackMap[callbackPath];
                 }
             };
         };
-    }
+    };
+
+    /**
+     * @ngdoc service
+     * @name $locale
+     *
+     * @description
+     * $locale service provides localization rules for various AngularJS components. As of right now the
+     * only public api is:
+     *
+     * * `id` – `{string}` – locale id formatted as `languageId-countryId` (e.g. `en-us`)
+     */
 
-    var PATH_MATCH = /^([^\?#]*)(\?([^#]*))?(#(.*))?$/,
+    var PATH_MATCH = /^([^?#]*)(\?([^#]*))?(#(.*))?$/,
         DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp': 21};
     var $locationMinErr = minErr('$location');
 
@@ -8953,56 +13607,84 @@
             i = segments.length;
 
         while (i--) {
-            segments[i] = encodeUriSegment(segments[i]);
+            // decode forward slashes to prevent them from being double encoded
+            segments[i] = encodeUriSegment(segments[i].replace(/%2F/g, '/'));
+        }
+
+        return segments.join('/');
+    }
+
+    function decodePath(path, html5Mode) {
+        var segments = path.split('/'),
+            i = segments.length;
+
+        while (i--) {
+            segments[i] = decodeURIComponent(segments[i]);
+            if (html5Mode) {
+                // encode forward slashes to prevent them from being mistaken for path separators
+                segments[i] = segments[i].replace(/\//g, '%2F');
+            }
         }
 
         return segments.join('/');
     }
 
-    function parseAbsoluteUrl(absoluteUrl, locationObj, appBase) {
-        var parsedUrl = urlResolve(absoluteUrl, appBase);
+    function parseAbsoluteUrl(absoluteUrl, locationObj) {
+        var parsedUrl = urlResolve(absoluteUrl);
 
         locationObj.$$protocol = parsedUrl.protocol;
         locationObj.$$host = parsedUrl.hostname;
-        locationObj.$$port = int(parsedUrl.port) || DEFAULT_PORTS[parsedUrl.protocol] || null;
+        locationObj.$$port = toInt(parsedUrl.port) || DEFAULT_PORTS[parsedUrl.protocol] || null;
     }
 
+    var DOUBLE_SLASH_REGEX = /^\s*[\\/]{2,}/;
+    function parseAppUrl(url, locationObj, html5Mode) {
+
+        if (DOUBLE_SLASH_REGEX.test(url)) {
+            throw $locationMinErr('badpath', 'Invalid url "{0}".', url);
+        }
 
-    function parseAppUrl(relativeUrl, locationObj, appBase) {
-        var prefixed = (relativeUrl.charAt(0) !== '/');
+        var prefixed = (url.charAt(0) !== '/');
         if (prefixed) {
-            relativeUrl = '/' + relativeUrl;
+            url = '/' + url;
         }
-        var match = urlResolve(relativeUrl, appBase);
-        locationObj.$$path = decodeURIComponent(prefixed && match.pathname.charAt(0) === '/' ?
-            match.pathname.substring(1) : match.pathname);
+        var match = urlResolve(url);
+        var path = prefixed && match.pathname.charAt(0) === '/' ? match.pathname.substring(1) : match.pathname;
+        locationObj.$$path = decodePath(path, html5Mode);
         locationObj.$$search = parseKeyValue(match.search);
         locationObj.$$hash = decodeURIComponent(match.hash);
 
         // make sure path starts with '/';
-        if (locationObj.$$path && locationObj.$$path.charAt(0) != '/') {
+        if (locationObj.$$path && locationObj.$$path.charAt(0) !== '/') {
             locationObj.$$path = '/' + locationObj.$$path;
         }
     }
 
+    function startsWith(str, search) {
+        return str.slice(0, search.length) === search;
+    }
 
     /**
      *
-     * @param {string} begin
-     * @param {string} whole
-     * @returns {string} returns text from whole after begin or undefined if it does not begin with
-     *                   expected string.
+     * @param {string} base
+     * @param {string} url
+     * @returns {string} returns text from `url` after `base` or `undefined` if it does not begin with
+     *                   the expected string.
      */
-    function beginsWith(begin, whole) {
-        if (whole.indexOf(begin) === 0) {
-            return whole.substr(begin.length);
+    function stripBaseUrl(base, url) {
+        if (startsWith(url, base)) {
+            return url.substr(base.length);
         }
     }
 
 
     function stripHash(url) {
         var index = url.indexOf('#');
-        return index == -1 ? url : url.substr(0, index);
+        return index === -1 ? url : url.substr(0, index);
+    }
+
+    function trimEmptyHash(url) {
+        return url.replace(/(#.+)|#$/, '$1');
     }
 
 
@@ -9017,33 +13699,33 @@
 
 
     /**
-     * LocationHtml5Url represents an url
+     * LocationHtml5Url represents a URL
      * This object is exposed as $location service when HTML5 mode is enabled and supported
      *
      * @constructor
      * @param {string} appBase application base URL
-     * @param {string} basePrefix url path prefix
+     * @param {string} appBaseNoFile application base URL stripped of any filename
+     * @param {string} basePrefix URL path prefix
      */
-    function LocationHtml5Url(appBase, basePrefix) {
+    function LocationHtml5Url(appBase, appBaseNoFile, basePrefix) {
         this.$$html5 = true;
         basePrefix = basePrefix || '';
-        var appBaseNoFile = stripFile(appBase);
-        parseAbsoluteUrl(appBase, this, appBase);
+        parseAbsoluteUrl(appBase, this);
 
 
         /**
-         * Parse given html5 (regular) url string into properties
-         * @param {string} newAbsoluteUrl HTML5 url
+         * Parse given HTML5 (regular) URL string into properties
+         * @param {string} url HTML5 URL
          * @private
          */
         this.$$parse = function(url) {
-            var pathUrl = beginsWith(appBaseNoFile, url);
+            var pathUrl = stripBaseUrl(appBaseNoFile, url);
             if (!isString(pathUrl)) {
                 throw $locationMinErr('ipthprfx', 'Invalid url "{0}", missing path prefix "{1}".', url,
                     appBaseNoFile);
             }
 
-            parseAppUrl(pathUrl, this, appBase);
+            parseAppUrl(pathUrl, this, true);
 
             if (!this.$$path) {
                 this.$$path = '/';
@@ -9062,94 +13744,122 @@
 
             this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
             this.$$absUrl = appBaseNoFile + this.$$url.substr(1); // first char is always '/'
+
+            this.$$urlUpdatedByLocation = true;
         };
 
-        this.$$rewrite = function(url) {
+        this.$$parseLinkUrl = function(url, relHref) {
+            if (relHref && relHref[0] === '#') {
+                // special case for links to hash fragments:
+                // keep the old url and only replace the hash fragment
+                this.hash(relHref.slice(1));
+                return true;
+            }
             var appUrl, prevAppUrl;
+            var rewrittenUrl;
+
 
-            if ( (appUrl = beginsWith(appBase, url)) !== undefined ) {
+            if (isDefined(appUrl = stripBaseUrl(appBase, url))) {
                 prevAppUrl = appUrl;
-                if ( (appUrl = beginsWith(basePrefix, appUrl)) !== undefined ) {
-                    return appBaseNoFile + (beginsWith('/', appUrl) || appUrl);
+                if (basePrefix && isDefined(appUrl = stripBaseUrl(basePrefix, appUrl))) {
+                    rewrittenUrl = appBaseNoFile + (stripBaseUrl('/', appUrl) || appUrl);
                 } else {
-                    return appBase + prevAppUrl;
+                    rewrittenUrl = appBase + prevAppUrl;
                 }
-            } else if ( (appUrl = beginsWith(appBaseNoFile, url)) !== undefined ) {
-                return appBaseNoFile + appUrl;
-            } else if (appBaseNoFile == url + '/') {
-                return appBaseNoFile;
+            } else if (isDefined(appUrl = stripBaseUrl(appBaseNoFile, url))) {
+                rewrittenUrl = appBaseNoFile + appUrl;
+            } else if (appBaseNoFile === url + '/') {
+                rewrittenUrl = appBaseNoFile;
             }
+            if (rewrittenUrl) {
+                this.$$parse(rewrittenUrl);
+            }
+            return !!rewrittenUrl;
         };
     }
 
 
     /**
-     * LocationHashbangUrl represents url
+     * LocationHashbangUrl represents URL
      * This object is exposed as $location service when developer doesn't opt into html5 mode.
      * It also serves as the base class for html5 mode fallback on legacy browsers.
      *
      * @constructor
      * @param {string} appBase application base URL
+     * @param {string} appBaseNoFile application base URL stripped of any filename
      * @param {string} hashPrefix hashbang prefix
      */
-    function LocationHashbangUrl(appBase, hashPrefix) {
-        var appBaseNoFile = stripFile(appBase);
+    function LocationHashbangUrl(appBase, appBaseNoFile, hashPrefix) {
 
-        parseAbsoluteUrl(appBase, this, appBase);
+        parseAbsoluteUrl(appBase, this);
 
 
         /**
-         * Parse given hashbang url into properties
-         * @param {string} url Hashbang url
+         * Parse given hashbang URL into properties
+         * @param {string} url Hashbang URL
          * @private
          */
         this.$$parse = function(url) {
-            var withoutBaseUrl = beginsWith(appBase, url) || beginsWith(appBaseNoFile, url);
-            var withoutHashUrl = withoutBaseUrl.charAt(0) == '#'
-                ? beginsWith(hashPrefix, withoutBaseUrl)
-                : (this.$$html5)
-                ? withoutBaseUrl
-                : '';
+            var withoutBaseUrl = stripBaseUrl(appBase, url) || stripBaseUrl(appBaseNoFile, url);
+            var withoutHashUrl;
+
+            if (!isUndefined(withoutBaseUrl) && withoutBaseUrl.charAt(0) === '#') {
 
-            if (!isString(withoutHashUrl)) {
-                throw $locationMinErr('ihshprfx', 'Invalid url "{0}", missing hash prefix "{1}".', url,
-                    hashPrefix);
+                // The rest of the URL starts with a hash so we have
+                // got either a hashbang path or a plain hash fragment
+                withoutHashUrl = stripBaseUrl(hashPrefix, withoutBaseUrl);
+                if (isUndefined(withoutHashUrl)) {
+                    // There was no hashbang prefix so we just have a hash fragment
+                    withoutHashUrl = withoutBaseUrl;
+                }
+
+            } else {
+                // There was no hashbang path nor hash fragment:
+                // If we are in HTML5 mode we use what is left as the path;
+                // Otherwise we ignore what is left
+                if (this.$$html5) {
+                    withoutHashUrl = withoutBaseUrl;
+                } else {
+                    withoutHashUrl = '';
+                    if (isUndefined(withoutBaseUrl)) {
+                        appBase = url;
+                        /** @type {?} */ (this).replace();
+                    }
+                }
             }
-            parseAppUrl(withoutHashUrl, this, appBase);
+
+            parseAppUrl(withoutHashUrl, this, false);
 
             this.$$path = removeWindowsDriveName(this.$$path, withoutHashUrl, appBase);
 
             this.$$compose();
 
             /*
-             * In Windows, on an anchor node on documents loaded from
-             * the filesystem, the browser will return a pathname
-             * prefixed with the drive name ('/C:/path') when a
-             * pathname without a drive is set:
-             *  * a.setAttribute('href', '/foo')
-             *   * a.pathname === '/C:/foo' //true
-             *
-             * Inside of Angular, we're always using pathnames that
-             * do not include drive names for routing.
-             */
-            function removeWindowsDriveName (path, url, base) {
+     * In Windows, on an anchor node on documents loaded from
+     * the filesystem, the browser will return a pathname
+     * prefixed with the drive name ('/C:/path') when a
+     * pathname without a drive is set:
+     *  * a.setAttribute('href', '/foo')
+     *   * a.pathname === '/C:/foo' //true
+     *
+     * Inside of AngularJS, we're always using pathnames that
+     * do not include drive names for routing.
+     */
+            function removeWindowsDriveName(path, url, base) {
                 /*
-                 Matches paths for file protocol on windows,
-                 such as /C:/foo/bar, and captures only /foo/bar.
-                 */
-                var windowsFilePathExp = /^\/?.*?:(\/.*)/;
+      Matches paths for file protocol on windows,
+      such as /C:/foo/bar, and captures only /foo/bar.
+      */
+                var windowsFilePathExp = /^\/[A-Z]:(\/.*)/;
 
                 var firstPathSegmentMatch;
 
                 //Get the relative path from the input URL.
-                if (url.indexOf(base) === 0) {
+                if (startsWith(url, base)) {
                     url = url.replace(base, '');
                 }
 
-                /*
-                 * The input URL intentionally contains a
-                 * first path segment that ends with a colon.
-                 */
+                // The input URL intentionally contains a first path segment that ends with a colon.
                 if (windowsFilePathExp.exec(url)) {
                     return path;
                 }
@@ -9160,7 +13870,7 @@
         };
 
         /**
-         * Compose hashbang url and update `absUrl` property
+         * Compose hashbang URL and update `absUrl` property
          * @private
          */
         this.$$compose = function() {
@@ -9169,250 +13879,415 @@
 
             this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
             this.$$absUrl = appBase + (this.$$url ? hashPrefix + this.$$url : '');
+
+            this.$$urlUpdatedByLocation = true;
         };
 
-        this.$$rewrite = function(url) {
-            if(stripHash(appBase) == stripHash(url)) {
-                return url;
+        this.$$parseLinkUrl = function(url, relHref) {
+            if (stripHash(appBase) === stripHash(url)) {
+                this.$$parse(url);
+                return true;
             }
+            return false;
         };
     }
 
 
     /**
-     * LocationHashbangUrl represents url
+     * LocationHashbangUrl represents URL
      * This object is exposed as $location service when html5 history api is enabled but the browser
      * does not support it.
      *
      * @constructor
      * @param {string} appBase application base URL
+     * @param {string} appBaseNoFile application base URL stripped of any filename
      * @param {string} hashPrefix hashbang prefix
      */
-    function LocationHashbangInHtml5Url(appBase, hashPrefix) {
+    function LocationHashbangInHtml5Url(appBase, appBaseNoFile, hashPrefix) {
         this.$$html5 = true;
         LocationHashbangUrl.apply(this, arguments);
 
-        var appBaseNoFile = stripFile(appBase);
+        this.$$parseLinkUrl = function(url, relHref) {
+            if (relHref && relHref[0] === '#') {
+                // special case for links to hash fragments:
+                // keep the old url and only replace the hash fragment
+                this.hash(relHref.slice(1));
+                return true;
+            }
 
-        this.$$rewrite = function(url) {
+            var rewrittenUrl;
             var appUrl;
 
-            if ( appBase == stripHash(url) ) {
-                return url;
-            } else if ( (appUrl = beginsWith(appBaseNoFile, url)) ) {
-                return appBase + hashPrefix + appUrl;
-            } else if ( appBaseNoFile === url + '/') {
-                return appBaseNoFile;
+            if (appBase === stripHash(url)) {
+                rewrittenUrl = url;
+            } else if ((appUrl = stripBaseUrl(appBaseNoFile, url))) {
+                rewrittenUrl = appBase + hashPrefix + appUrl;
+            } else if (appBaseNoFile === url + '/') {
+                rewrittenUrl = appBaseNoFile;
             }
+            if (rewrittenUrl) {
+                this.$$parse(rewrittenUrl);
+            }
+            return !!rewrittenUrl;
         };
-    }
 
+        this.$$compose = function() {
+            var search = toKeyValue(this.$$search),
+                hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : '';
 
-    LocationHashbangInHtml5Url.prototype =
-        LocationHashbangUrl.prototype =
-            LocationHtml5Url.prototype = {
+            this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
+            // include hashPrefix in $$absUrl when $$url is empty so IE9 does not reload page because of removal of '#'
+            this.$$absUrl = appBase + hashPrefix + this.$$url;
 
-                /**
-                 * Are we in html5 mode?
-                 * @private
-                 */
-                $$html5: false,
+            this.$$urlUpdatedByLocation = true;
+        };
 
-                /**
-                 * Has any change been replacing ?
-                 * @private
-                 */
-                $$replace: false,
+    }
 
-                /**
-                 * @ngdoc method
-                 * @name $location#absUrl
-                 *
-                 * @description
-                 * This method is getter only.
-                 *
-                 * Return full url representation with all segments encoded according to rules specified in
-                 * [RFC 3986](http://www.ietf.org/rfc/rfc3986.txt).
-                 *
-                 * @return {string} full url
-                 */
-                absUrl: locationGetter('$$absUrl'),
 
-                /**
-                 * @ngdoc method
-                 * @name $location#url
-                 *
-                 * @description
-                 * This method is getter / setter.
-                 *
-                 * Return url (e.g. `/path?a=b#hash`) when called without any parameter.
-                 *
-                 * Change path, search and hash, when called with parameter and return `$location`.
-                 *
-                 * @param {string=} url New url without base prefix (e.g. `/path?a=b#hash`)
-                 * @param {string=} replace The path that will be changed
-                 * @return {string} url
-                 */
-                url: function(url, replace) {
-                    if (isUndefined(url))
-                        return this.$$url;
+    var locationPrototype = {
 
-                    var match = PATH_MATCH.exec(url);
-                    if (match[1]) this.path(decodeURIComponent(match[1]));
-                    if (match[2] || match[1]) this.search(match[3] || '');
-                    this.hash(match[5] || '', replace);
+        /**
+         * Ensure absolute URL is initialized.
+         * @private
+         */
+        $$absUrl:'',
 
-                    return this;
-                },
+        /**
+         * Are we in html5 mode?
+         * @private
+         */
+        $$html5: false,
 
-                /**
-                 * @ngdoc method
-                 * @name $location#protocol
-                 *
-                 * @description
-                 * This method is getter only.
-                 *
-                 * Return protocol of current url.
-                 *
-                 * @return {string} protocol of current url
-                 */
-                protocol: locationGetter('$$protocol'),
+        /**
+         * Has any change been replacing?
+         * @private
+         */
+        $$replace: false,
 
-                /**
-                 * @ngdoc method
-                 * @name $location#host
-                 *
-                 * @description
-                 * This method is getter only.
-                 *
-                 * Return host of current url.
-                 *
-                 * @return {string} host of current url.
-                 */
-                host: locationGetter('$$host'),
+        /**
+         * @ngdoc method
+         * @name $location#absUrl
+         *
+         * @description
+         * This method is getter only.
+         *
+         * Return full URL representation with all segments encoded according to rules specified in
+         * [RFC 3986](http://www.ietf.org/rfc/rfc3986.txt).
+         *
+         *
+         * ```js
+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+         * var absUrl = $location.absUrl();
+         * // => "http://example.com/#/some/path?foo=bar&baz=xoxo"
+         * ```
+         *
+         * @return {string} full URL
+         */
+        absUrl: locationGetter('$$absUrl'),
 
-                /**
-                 * @ngdoc method
-                 * @name $location#port
-                 *
-                 * @description
-                 * This method is getter only.
-                 *
-                 * Return port of current url.
-                 *
-                 * @return {Number} port
-                 */
-                port: locationGetter('$$port'),
+        /**
+         * @ngdoc method
+         * @name $location#url
+         *
+         * @description
+         * This method is getter / setter.
+         *
+         * Return URL (e.g. `/path?a=b#hash`) when called without any parameter.
+         *
+         * Change path, search and hash, when called with parameter and return `$location`.
+         *
+         *
+         * ```js
+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+         * var url = $location.url();
+         * // => "/some/path?foo=bar&baz=xoxo"
+         * ```
+         *
+         * @param {string=} url New URL without base prefix (e.g. `/path?a=b#hash`)
+         * @return {string} url
+         */
+        url: function(url) {
+            if (isUndefined(url)) {
+                return this.$$url;
+            }
 
-                /**
-                 * @ngdoc method
-                 * @name $location#path
-                 *
-                 * @description
-                 * This method is getter / setter.
-                 *
-                 * Return path of current url when called without any parameter.
-                 *
-                 * Change path when called with parameter and return `$location`.
-                 *
-                 * Note: Path should always begin with forward slash (/), this method will add the forward slash
-                 * if it is missing.
-                 *
-                 * @param {string=} path New path
-                 * @return {string} path
-                 */
-                path: locationGetterSetter('$$path', function(path) {
-                    return path.charAt(0) == '/' ? path : '/' + path;
-                }),
+            var match = PATH_MATCH.exec(url);
+            if (match[1] || url === '') this.path(decodeURIComponent(match[1]));
+            if (match[2] || match[1] || url === '') this.search(match[3] || '');
+            this.hash(match[5] || '');
 
-                /**
-                 * @ngdoc method
-                 * @name $location#search
-                 *
-                 * @description
-                 * This method is getter / setter.
-                 *
-                 * Return search part (as object) of current url when called without any parameter.
-                 *
-                 * Change search part when called with parameter and return `$location`.
-                 *
-                 * @param {string|Object.<string>|Object.<Array.<string>>} search New search params - string or
-                 * hash object. Hash object may contain an array of values, which will be decoded as duplicates in
-                 * the url.
-                 *
-                 * @param {(string|Array<string>)=} paramValue If `search` is a string, then `paramValue` will override only a
-                 * single search parameter. If `paramValue` is an array, it will set the parameter as a
-                 * comma-separated value. If `paramValue` is `null`, the parameter will be deleted.
-                 *
-                 * @return {string} search
-                 */
-                search: function(search, paramValue) {
-                    switch (arguments.length) {
-                        case 0:
-                            return this.$$search;
-                        case 1:
-                            if (isString(search)) {
-                                this.$$search = parseKeyValue(search);
-                            } else if (isObject(search)) {
-                                this.$$search = search;
-                            } else {
-                                throw $locationMinErr('isrcharg',
-                                    'The first argument of the `$location#search()` call must be a string or an object.');
-                            }
-                            break;
-                        default:
-                            if (isUndefined(paramValue) || paramValue === null) {
-                                delete this.$$search[search];
-                            } else {
-                                this.$$search[search] = paramValue;
-                            }
-                    }
+            return this;
+        },
 
-                    this.$$compose();
-                    return this;
-                },
+        /**
+         * @ngdoc method
+         * @name $location#protocol
+         *
+         * @description
+         * This method is getter only.
+         *
+         * Return protocol of current URL.
+         *
+         *
+         * ```js
+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+         * var protocol = $location.protocol();
+         * // => "http"
+         * ```
+         *
+         * @return {string} protocol of current URL
+         */
+        protocol: locationGetter('$$protocol'),
 
-                /**
-                 * @ngdoc method
-                 * @name $location#hash
-                 *
-                 * @description
-                 * This method is getter / setter.
-                 *
-                 * Return hash fragment when called without any parameter.
-                 *
-                 * Change hash fragment when called with parameter and return `$location`.
-                 *
-                 * @param {string=} hash New hash fragment
-                 * @return {string} hash
-                 */
-                hash: locationGetterSetter('$$hash', identity),
+        /**
+         * @ngdoc method
+         * @name $location#host
+         *
+         * @description
+         * This method is getter only.
+         *
+         * Return host of current URL.
+         *
+         * Note: compared to the non-AngularJS version `location.host` which returns `hostname:port`, this returns the `hostname` portion only.
+         *
+         *
+         * ```js
+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+         * var host = $location.host();
+         * // => "example.com"
+         *
+         * // given URL http://user:password@example.com:8080/#/some/path?foo=bar&baz=xoxo
+         * host = $location.host();
+         * // => "example.com"
+         * host = location.host;
+         * // => "example.com:8080"
+         * ```
+         *
+         * @return {string} host of current URL.
+         */
+        host: locationGetter('$$host'),
+
+        /**
+         * @ngdoc method
+         * @name $location#port
+         *
+         * @description
+         * This method is getter only.
+         *
+         * Return port of current URL.
+         *
+         *
+         * ```js
+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+         * var port = $location.port();
+         * // => 80
+         * ```
+         *
+         * @return {Number} port
+         */
+        port: locationGetter('$$port'),
+
+        /**
+         * @ngdoc method
+         * @name $location#path
+         *
+         * @description
+         * This method is getter / setter.
+         *
+         * Return path of current URL when called without any parameter.
+         *
+         * Change path when called with parameter and return `$location`.
+         *
+         * Note: Path should always begin with forward slash (/), this method will add the forward slash
+         * if it is missing.
+         *
+         *
+         * ```js
+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+         * var path = $location.path();
+         * // => "/some/path"
+         * ```
+         *
+         * @param {(string|number)=} path New path
+         * @return {(string|object)} path if called with no parameters, or `$location` if called with a parameter
+         */
+        path: locationGetterSetter('$$path', function(path) {
+            path = path !== null ? path.toString() : '';
+            return path.charAt(0) === '/' ? path : '/' + path;
+        }),
+
+        /**
+         * @ngdoc method
+         * @name $location#search
+         *
+         * @description
+         * This method is getter / setter.
+         *
+         * Return search part (as object) of current URL when called without any parameter.
+         *
+         * Change search part when called with parameter and return `$location`.
+         *
+         *
+         * ```js
+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo
+         * var searchObject = $location.search();
+         * // => {foo: 'bar', baz: 'xoxo'}
+         *
+         * // set foo to 'yipee'
+         * $location.search('foo', 'yipee');
+         * // $location.search() => {foo: 'yipee', baz: 'xoxo'}
+         * ```
+         *
+         * @param {string|Object.<string>|Object.<Array.<string>>} search New search params - string or
+         * hash object.
+         *
+         * When called with a single argument the method acts as a setter, setting the `search` component
+         * of `$location` to the specified value.
+         *
+         * If the argument is a hash object containing an array of values, these values will be encoded
+         * as duplicate search parameters in the URL.
+         *
+         * @param {(string|Number|Array<string>|boolean)=} paramValue If `search` is a string or number, then `paramValue`
+         * will override only a single search property.
+         *
+         * If `paramValue` is an array, it will override the property of the `search` component of
+         * `$location` specified via the first argument.
+         *
+         * If `paramValue` is `null`, the property specified via the first argument will be deleted.
+         *
+         * If `paramValue` is `true`, the property specified via the first argument will be added with no
+         * value nor trailing equal sign.
+         *
+         * @return {Object} If called with no arguments returns the parsed `search` object. If called with
+         * one or more arguments returns `$location` object itself.
+         */
+        search: function(search, paramValue) {
+            switch (arguments.length) {
+                case 0:
+                    return this.$$search;
+                case 1:
+                    if (isString(search) || isNumber(search)) {
+                        search = search.toString();
+                        this.$$search = parseKeyValue(search);
+                    } else if (isObject(search)) {
+                        search = copy(search, {});
+                        // remove object undefined or null properties
+                        forEach(search, function(value, key) {
+                            if (value == null) delete search[key];
+                        });
+
+                        this.$$search = search;
+                    } else {
+                        throw $locationMinErr('isrcharg',
+                            'The first argument of the `$location#search()` call must be a string or an object.');
+                    }
+                    break;
+                default:
+                    if (isUndefined(paramValue) || paramValue === null) {
+                        delete this.$$search[search];
+                    } else {
+                        this.$$search[search] = paramValue;
+                    }
+            }
+
+            this.$$compose();
+            return this;
+        },
+
+        /**
+         * @ngdoc method
+         * @name $location#hash
+         *
+         * @description
+         * This method is getter / setter.
+         *
+         * Returns the hash fragment when called without any parameters.
+         *
+         * Changes the hash fragment when called with a parameter and returns `$location`.
+         *
+         *
+         * ```js
+         * // given URL http://example.com/#/some/path?foo=bar&baz=xoxo#hashValue
+         * var hash = $location.hash();
+         * // => "hashValue"
+         * ```
+         *
+         * @param {(string|number)=} hash New hash fragment
+         * @return {string} hash
+         */
+        hash: locationGetterSetter('$$hash', function(hash) {
+            return hash !== null ? hash.toString() : '';
+        }),
+
+        /**
+         * @ngdoc method
+         * @name $location#replace
+         *
+         * @description
+         * If called, all changes to $location during the current `$digest` will replace the current history
+         * record, instead of adding a new one.
+         */
+        replace: function() {
+            this.$$replace = true;
+            return this;
+        }
+    };
+
+    forEach([LocationHashbangInHtml5Url, LocationHashbangUrl, LocationHtml5Url], function(Location) {
+        Location.prototype = Object.create(locationPrototype);
+
+        /**
+         * @ngdoc method
+         * @name $location#state
+         *
+         * @description
+         * This method is getter / setter.
+         *
+         * Return the history state object when called without any parameter.
+         *
+         * Change the history state object when called with one parameter and return `$location`.
+         * The state object is later passed to `pushState` or `replaceState`.
+         *
+         * NOTE: This method is supported only in HTML5 mode and only in browsers supporting
+         * the HTML5 History API (i.e. methods `pushState` and `replaceState`). If you need to support
+         * older browsers (like IE9 or Android < 4.0), don't use this method.
+         *
+         * @param {object=} state State object for pushState or replaceState
+         * @return {object} state
+         */
+        Location.prototype.state = function(state) {
+            if (!arguments.length) {
+                return this.$$state;
+            }
+
+            if (Location !== LocationHtml5Url || !this.$$html5) {
+                throw $locationMinErr('nostate', 'History API state support is available only ' +
+                    'in HTML5 mode and only in browsers supporting HTML5 History API');
+            }
+            // The user might modify `stateObject` after invoking `$location.state(stateObject)`
+            // but we're changing the $$state reference to $browser.state() during the $digest
+            // so the modification window is narrow.
+            this.$$state = isUndefined(state) ? null : state;
+            this.$$urlUpdatedByLocation = true;
+
+            return this;
+        };
+    });
 
-                /**
-                 * @ngdoc method
-                 * @name $location#replace
-                 *
-                 * @description
-                 * If called, all changes to $location during current `$digest` will be replacing current history
-                 * record, instead of adding new one.
-                 */
-                replace: function() {
-                    this.$$replace = true;
-                    return this;
-                }
-            };
 
     function locationGetter(property) {
-        return function() {
+        return /** @this */ function() {
             return this[property];
         };
     }
 
 
     function locationGetterSetter(property, preprocess) {
-        return function(value) {
-            if (isUndefined(value))
+        return /** @this */ function(value) {
+            if (isUndefined(value)) {
                 return this[property];
+            }
 
             this[property] = preprocess(value);
             this.$$compose();
@@ -9451,17 +14326,24 @@
     /**
      * @ngdoc provider
      * @name $locationProvider
+     * @this
+     *
      * @description
      * Use the `$locationProvider` to configure how the application deep linking paths are stored.
      */
-    function $LocationProvider(){
-        var hashPrefix = '',
-            html5Mode = false;
+    function $LocationProvider() {
+        var hashPrefix = '!',
+            html5Mode = {
+                enabled: false,
+                requireBase: true,
+                rewriteLinks: true
+            };
 
         /**
-         * @ngdoc property
+         * @ngdoc method
          * @name $locationProvider#hashPrefix
          * @description
+         * The default value for the prefix is `'!'`.
          * @param {string=} prefix Prefix for hash part (containing path and search)
          * @returns {*} current value if used as getter or itself (chaining) if used as setter
          */
@@ -9475,15 +14357,46 @@
         };
 
         /**
-         * @ngdoc property
+         * @ngdoc method
          * @name $locationProvider#html5Mode
          * @description
-         * @param {boolean=} mode Use HTML5 strategy if available.
-         * @returns {*} current value if used as getter or itself (chaining) if used as setter
+         * @param {(boolean|Object)=} mode If boolean, sets `html5Mode.enabled` to value.
+         *   If object, sets `enabled`, `requireBase` and `rewriteLinks` to respective values. Supported
+         *   properties:
+         *   - **enabled** – `{boolean}` – (default: false) If true, will rely on `history.pushState` to
+         *     change urls where supported. Will fall back to hash-prefixed paths in browsers that do not
+         *     support `pushState`.
+         *   - **requireBase** - `{boolean}` - (default: `true`) When html5Mode is enabled, specifies
+         *     whether or not a <base> tag is required to be present. If `enabled` and `requireBase` are
+         *     true, and a base tag is not present, an error will be thrown when `$location` is injected.
+         *     See the {@link guide/$location $location guide for more information}
+         *   - **rewriteLinks** - `{boolean|string}` - (default: `true`) When html5Mode is enabled,
+         *     enables/disables URL rewriting for relative links. If set to a string, URL rewriting will
+         *     only happen on links with an attribute that matches the given string. For example, if set
+         *     to `'internal-link'`, then the URL will only be rewritten for `<a internal-link>` links.
+         *     Note that [attribute name normalization](guide/directive#normalization) does not apply
+         *     here, so `'internalLink'` will **not** match `'internal-link'`.
+         *
+         * @returns {Object} html5Mode object if used as getter or itself (chaining) if used as setter
          */
         this.html5Mode = function(mode) {
-            if (isDefined(mode)) {
-                html5Mode = mode;
+            if (isBoolean(mode)) {
+                html5Mode.enabled = mode;
+                return this;
+            } else if (isObject(mode)) {
+
+                if (isBoolean(mode.enabled)) {
+                    html5Mode.enabled = mode.enabled;
+                }
+
+                if (isBoolean(mode.requireBase)) {
+                    html5Mode.requireBase = mode.requireBase;
+                }
+
+                if (isBoolean(mode.rewriteLinks) || isString(mode.rewriteLinks)) {
+                    html5Mode.rewriteLinks = mode.rewriteLinks;
+                }
+
                 return this;
             } else {
                 return html5Mode;
@@ -9495,14 +14408,21 @@
          * @name $location#$locationChangeStart
          * @eventType broadcast on root scope
          * @description
-         * Broadcasted before a URL will change. This change can be prevented by calling
+         * Broadcasted before a URL will change.
+         *
+         * This change can be prevented by calling
          * `preventDefault` method of the event. See {@link ng.$rootScope.Scope#$on} for more
          * details about event object. Upon successful change
-         * {@link ng.$location#events_$locationChangeSuccess $locationChangeSuccess} is fired.
+         * {@link ng.$location#$locationChangeSuccess $locationChangeSuccess} is fired.
+         *
+         * The `newState` and `oldState` parameters may be defined only in HTML5 mode and when
+         * the browser supports the HTML5 History API.
          *
          * @param {Object} angularEvent Synthetic event object.
          * @param {string} newUrl New URL
          * @param {string=} oldUrl URL that was before it was changed.
+         * @param {string=} newState New history state object
+         * @param {string=} oldState History state object that was before it was changed.
          */
 
         /**
@@ -9512,44 +14432,84 @@
          * @description
          * Broadcasted after a URL was changed.
          *
+         * The `newState` and `oldState` parameters may be defined only in HTML5 mode and when
+         * the browser supports the HTML5 History API.
+         *
          * @param {Object} angularEvent Synthetic event object.
          * @param {string} newUrl New URL
          * @param {string=} oldUrl URL that was before it was changed.
+         * @param {string=} newState New history state object
+         * @param {string=} oldState History state object that was before it was changed.
          */
 
-        this.$get = ['$rootScope', '$browser', '$sniffer', '$rootElement',
-            function( $rootScope,   $browser,   $sniffer,   $rootElement) {
+        this.$get = ['$rootScope', '$browser', '$sniffer', '$rootElement', '$window',
+            function($rootScope, $browser, $sniffer, $rootElement, $window) {
                 var $location,
                     LocationMode,
                     baseHref = $browser.baseHref(), // if base[href] is undefined, it defaults to ''
                     initialUrl = $browser.url(),
                     appBase;
 
-                if (html5Mode) {
+                if (html5Mode.enabled) {
+                    if (!baseHref && html5Mode.requireBase) {
+                        throw $locationMinErr('nobase',
+                            '$location in HTML5 mode requires a <base> tag to be present!');
+                    }
                     appBase = serverBase(initialUrl) + (baseHref || '/');
                     LocationMode = $sniffer.history ? LocationHtml5Url : LocationHashbangInHtml5Url;
                 } else {
                     appBase = stripHash(initialUrl);
                     LocationMode = LocationHashbangUrl;
                 }
-                $location = new LocationMode(appBase, '#' + hashPrefix);
-                $location.$$parse($location.$$rewrite(initialUrl));
+                var appBaseNoFile = stripFile(appBase);
+
+                $location = new LocationMode(appBase, appBaseNoFile, '#' + hashPrefix);
+                $location.$$parseLinkUrl(initialUrl, initialUrl);
+
+                $location.$$state = $browser.state();
+
+                var IGNORE_URI_REGEXP = /^\s*(javascript|mailto):/i;
+
+                function setBrowserUrlWithFallback(url, replace, state) {
+                    var oldUrl = $location.url();
+                    var oldState = $location.$$state;
+                    try {
+                        $browser.url(url, replace, state);
+
+                        // Make sure $location.state() returns referentially identical (not just deeply equal)
+                        // state object; this makes possible quick checking if the state changed in the digest
+                        // loop. Checking deep equality would be too expensive.
+                        $location.$$state = $browser.state();
+                    } catch (e) {
+                        // Restore old values if pushState fails
+                        $location.url(oldUrl);
+                        $location.$$state = oldState;
+
+                        throw e;
+                    }
+                }
 
                 $rootElement.on('click', function(event) {
+                    var rewriteLinks = html5Mode.rewriteLinks;
                     // TODO(vojta): rewrite link when opening in new tab/window (in legacy browser)
                     // currently we open nice url link and redirect then
 
-                    if (event.ctrlKey || event.metaKey || event.which == 2) return;
+                    if (!rewriteLinks || event.ctrlKey || event.metaKey || event.shiftKey || event.which === 2 || event.button === 2) return;
 
                     var elm = jqLite(event.target);
 
                     // traverse the DOM up to find first A tag
-                    while (lowercase(elm[0].nodeName) !== 'a') {
+                    while (nodeName_(elm[0]) !== 'a') {
                         // ignore rewriting if no A tag (reached root element, or no parent - removed from document)
                         if (elm[0] === $rootElement[0] || !(elm = elm.parent())[0]) return;
                     }
 
+                    if (isString(rewriteLinks) && isUndefined(elm.attr(rewriteLinks))) return;
+
                     var absHref = elm.prop('href');
+                    // get the actual href attribute - see
+                    // http://msdn.microsoft.com/en-us/library/ie/dd347148(v=vs.85).aspx
+                    var relHref = elm.attr('href') || elm.attr('xlink:href');
 
                     if (isObject(absHref) && absHref.toString() === '[object SVGAnimatedString]') {
                         // SVGAnimatedString.animVal should be identical to SVGAnimatedString.baseVal, unless during
@@ -9557,72 +14517,118 @@
                         absHref = urlResolve(absHref.animVal).href;
                     }
 
-                    var rewrittenUrl = $location.$$rewrite(absHref);
+                    // Ignore when url is started with javascript: or mailto:
+                    if (IGNORE_URI_REGEXP.test(absHref)) return;
 
-                    if (absHref && !elm.attr('target') && rewrittenUrl && !event.isDefaultPrevented()) {
-                        event.preventDefault();
-                        if (rewrittenUrl != $browser.url()) {
+                    if (absHref && !elm.attr('target') && !event.isDefaultPrevented()) {
+                        if ($location.$$parseLinkUrl(absHref, relHref)) {
+                            // We do a preventDefault for all urls that are part of the AngularJS application,
+                            // in html5mode and also without, so that we are able to abort navigation without
+                            // getting double entries in the location history.
+                            event.preventDefault();
                             // update location manually
-                            $location.$$parse(rewrittenUrl);
-                            $rootScope.$apply();
-                            // hack to work around FF6 bug 684208 when scenario runner clicks on links
-                            window.angular['ff-684208-preventDefault'] = true;
+                            if ($location.absUrl() !== $browser.url()) {
+                                $rootScope.$apply();
+                                // hack to work around FF6 bug 684208 when scenario runner clicks on links
+                                $window.angular['ff-684208-preventDefault'] = true;
+                            }
                         }
                     }
                 });
 
 
                 // rewrite hashbang url <> html5 url
-                if ($location.absUrl() != initialUrl) {
+                if (trimEmptyHash($location.absUrl()) !== trimEmptyHash(initialUrl)) {
                     $browser.url($location.absUrl(), true);
                 }
 
+                var initializing = true;
+
                 // update $location when $browser url changes
-                $browser.onUrlChange(function(newUrl) {
-                    if ($location.absUrl() != newUrl) {
-                        $rootScope.$evalAsync(function() {
-                            var oldUrl = $location.absUrl();
+                $browser.onUrlChange(function(newUrl, newState) {
 
-                            $location.$$parse(newUrl);
-                            if ($rootScope.$broadcast('$locationChangeStart', newUrl,
-                                    oldUrl).defaultPrevented) {
-                                $location.$$parse(oldUrl);
-                                $browser.url(oldUrl);
-                            } else {
-                                afterLocationChange(oldUrl);
-                            }
-                        });
-                        if (!$rootScope.$$phase) $rootScope.$digest();
+                    if (!startsWith(newUrl, appBaseNoFile)) {
+                        // If we are navigating outside of the app then force a reload
+                        $window.location.href = newUrl;
+                        return;
                     }
+
+                    $rootScope.$evalAsync(function() {
+                        var oldUrl = $location.absUrl();
+                        var oldState = $location.$$state;
+                        var defaultPrevented;
+                        newUrl = trimEmptyHash(newUrl);
+                        $location.$$parse(newUrl);
+                        $location.$$state = newState;
+
+                        defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl,
+                            newState, oldState).defaultPrevented;
+
+                        // if the location was changed by a `$locationChangeStart` handler then stop
+                        // processing this location change
+                        if ($location.absUrl() !== newUrl) return;
+
+                        if (defaultPrevented) {
+                            $location.$$parse(oldUrl);
+                            $location.$$state = oldState;
+                            setBrowserUrlWithFallback(oldUrl, false, oldState);
+                        } else {
+                            initializing = false;
+                            afterLocationChange(oldUrl, oldState);
+                        }
+                    });
+                    if (!$rootScope.$$phase) $rootScope.$digest();
                 });
 
                 // update browser
-                var changeCounter = 0;
                 $rootScope.$watch(function $locationWatch() {
-                    var oldUrl = $browser.url();
-                    var currentReplace = $location.$$replace;
-
-                    if (!changeCounter || oldUrl != $location.absUrl()) {
-                        changeCounter++;
-                        $rootScope.$evalAsync(function() {
-                            if ($rootScope.$broadcast('$locationChangeStart', $location.absUrl(), oldUrl).
-                                    defaultPrevented) {
-                                $location.$$parse(oldUrl);
-                            } else {
-                                $browser.url($location.absUrl(), currentReplace);
-                                afterLocationChange(oldUrl);
-                            }
-                        });
+                    if (initializing || $location.$$urlUpdatedByLocation) {
+                        $location.$$urlUpdatedByLocation = false;
+
+                        var oldUrl = trimEmptyHash($browser.url());
+                        var newUrl = trimEmptyHash($location.absUrl());
+                        var oldState = $browser.state();
+                        var currentReplace = $location.$$replace;
+                        var urlOrStateChanged = oldUrl !== newUrl ||
+                            ($location.$$html5 && $sniffer.history && oldState !== $location.$$state);
+
+                        if (initializing || urlOrStateChanged) {
+                            initializing = false;
+
+                            $rootScope.$evalAsync(function() {
+                                var newUrl = $location.absUrl();
+                                var defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl,
+                                    $location.$$state, oldState).defaultPrevented;
+
+                                // if the location was changed by a `$locationChangeStart` handler then stop
+                                // processing this location change
+                                if ($location.absUrl() !== newUrl) return;
+
+                                if (defaultPrevented) {
+                                    $location.$$parse(oldUrl);
+                                    $location.$$state = oldState;
+                                } else {
+                                    if (urlOrStateChanged) {
+                                        setBrowserUrlWithFallback(newUrl, currentReplace,
+                                            oldState === $location.$$state ? null : $location.$$state);
+                                    }
+                                    afterLocationChange(oldUrl, oldState);
+                                }
+                            });
+                        }
                     }
+
                     $location.$$replace = false;
 
-                    return changeCounter;
+                    // we don't need to return anything because $evalAsync will make the digest loop dirty when
+                    // there is a change
                 });
 
                 return $location;
 
-                function afterLocationChange(oldUrl) {
-                    $rootScope.$broadcast('$locationChangeSuccess', $location.absUrl(), oldUrl);
+                function afterLocationChange(oldUrl, oldState) {
+                    $rootScope.$broadcast('$locationChangeSuccess', $location.absUrl(), oldUrl,
+                        $location.$$state, oldState);
                 }
             }];
     }
@@ -9638,26 +14644,36 @@
      *
      * The main purpose of this service is to simplify debugging and troubleshooting.
      *
+     * To reveal the location of the calls to `$log` in the JavaScript console,
+     * you can "blackbox" the AngularJS source in your browser:
+     *
+     * [Mozilla description of blackboxing](https://developer.mozilla.org/en-US/docs/Tools/Debugger/How_to/Black_box_a_source).
+     * [Chrome description of blackboxing](https://developer.chrome.com/devtools/docs/blackboxing).
+     *
+     * Note: Not all browsers support blackboxing.
+     *
      * The default is to log `debug` messages. You can use
      * {@link ng.$logProvider ng.$logProvider#debugEnabled} to change this.
      *
      * @example
-     <example>
+     <example module="logExample" name="log-service">
      <file name="script.js">
-     function LogCtrl($scope, $log) {
-         $scope.$log = $log;
-         $scope.message = 'Hello World!';
-       }
+     angular.module('logExample', [])
+     .controller('LogController', ['$scope', '$log', function($scope, $log) {
+           $scope.$log = $log;
+           $scope.message = 'Hello World!';
+         }]);
      </file>
      <file name="index.html">
-     <div ng-controller="LogCtrl">
+     <div ng-controller="LogController">
      <p>Reload this page with open console, enter text and hit the log button...</p>
-     Message:
-     <input type="text" ng-model="message"/>
+     <label>Message:
+     <input type="text" ng-model="message" /></label>
      <button ng-click="$log.log(message)">log</button>
      <button ng-click="$log.warn(message)">warn</button>
      <button ng-click="$log.info(message)">info</button>
      <button ng-click="$log.error(message)">error</button>
+     <button ng-click="$log.debug(message)">debug</button>
      </div>
      </file>
      </example>
@@ -9666,15 +14682,17 @@
     /**
      * @ngdoc provider
      * @name $logProvider
+     * @this
+     *
      * @description
      * Use the `$logProvider` to configure how the application logs messages
      */
-    function $LogProvider(){
+    function $LogProvider() {
         var debug = true,
             self = this;
 
         /**
-         * @ngdoc property
+         * @ngdoc method
          * @name $logProvider#debugEnabled
          * @description
          * @param {boolean=} flag enable or disable debug level messages
@@ -9689,7 +14707,16 @@
             }
         };
 
-        this.$get = ['$window', function($window){
+        this.$get = ['$window', function($window) {
+            // Support: IE 9-11, Edge 12-14+
+            // IE/Edge display errors in such a way that it requires the user to click in 4 places
+            // to see the stack trace. There is no way to feature-detect it so there's a chance
+            // of the user agent sniffing to go wrong but since it's only about logging, this shouldn't
+            // break apps. Other browsers display errors in a sensible way and some of them map stack
+            // traces along source maps if available so it makes sense to let browsers display it
+            // as they want.
+            var formatStackTrace = msie || /\bEdge\//.test($window.navigator && $window.navigator.userAgent);
+
             return {
                 /**
                  * @ngdoc method
@@ -9734,7 +14761,7 @@
                  * @description
                  * Write a debug message
                  */
-                debug: (function () {
+                debug: (function() {
                     var fn = consoleLog('debug');
 
                     return function() {
@@ -9742,12 +14769,12 @@
                             fn.apply(self, arguments);
                         }
                     };
-                }())
+                })()
             };
 
             function formatError(arg) {
-                if (arg instanceof Error) {
-                    if (arg.stack) {
+                if (isError(arg)) {
+                    if (arg.stack && formatStackTrace) {
                         arg = (arg.message && arg.stack.indexOf(arg.message) === -1)
                             ? 'Error: ' + arg.message + '\n' + arg.stack
                             : arg.stack;
@@ -9760,139 +14787,74 @@
 
             function consoleLog(type) {
                 var console = $window.console || {},
-                    logFn = console[type] || console.log || noop,
-                    hasApply = false;
-
-                // Note: reading logFn.apply throws an error in IE11 in IE8 document mode.
-                // The reason behind this is that console.log has type "object" in IE8...
-                try {
-                    hasApply = !!logFn.apply;
-                } catch (e) {}
+                    logFn = console[type] || console.log || noop;
 
-                if (hasApply) {
-                    return function() {
-                        var args = [];
-                        forEach(arguments, function(arg) {
-                            args.push(formatError(arg));
-                        });
-                        return logFn.apply(console, args);
-                    };
-                }
-
-                // we are IE which either doesn't have window.console => this is noop and we do nothing,
-                // or we are IE where console.log doesn't have apply so we log at least first 2 args
-                return function(arg1, arg2) {
-                    logFn(arg1, arg2 == null ? '' : arg2);
+                return function() {
+                    var args = [];
+                    forEach(arguments, function(arg) {
+                        args.push(formatError(arg));
+                    });
+                    // Support: IE 9 only
+                    // console methods don't inherit from Function.prototype in IE 9 so we can't
+                    // call `logFn.apply(console, args)` directly.
+                    return Function.prototype.apply.call(logFn, console, args);
                 };
             }
         }];
     }
 
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
     var $parseMinErr = minErr('$parse');
-    var promiseWarningCache = {};
-    var promiseWarning;
 
-// Sandboxing Angular Expressions
+    var objectValueOf = {}.constructor.prototype.valueOf;
+
+// Sandboxing AngularJS Expressions
 // ------------------------------
-// Angular expressions are generally considered safe because these expressions only have direct
-// access to $scope and locals. However, one can obtain the ability to execute arbitrary JS code by
-// obtaining a reference to native JS functions such as the Function constructor.
-//
-// As an example, consider the following Angular expression:
-//
-//   {}.toString.constructor(alert("evil JS code"))
-//
-// We want to prevent this type of access. For the sake of performance, during the lexing phase we
-// disallow any "dotted" access to any member named "constructor".
+// AngularJS expressions are no longer sandboxed. So it is now even easier to access arbitrary JS code by
+// various means such as obtaining a reference to native JS functions like the Function constructor.
 //
-// For reflective calls (a[b]) we check that the value of the lookup is not the Function constructor
-// while evaluating the expression, which is a stronger but more expensive test. Since reflective
-// calls are expensive anyway, this is not such a big deal compared to static dereferencing.
+// As an example, consider the following AngularJS expression:
 //
-// This sandboxing technique is not perfect and doesn't aim to be. The goal is to prevent exploits
-// against the expression language, but not to prevent exploits that were enabled by exposing
-// sensitive JavaScript or browser apis on Scope. Exposing such objects on a Scope is never a good
-// practice and therefore we are not even trying to protect against interaction with an object
-// explicitly exposed in this way.
+//   {}.toString.constructor('alert("evil JS code")')
 //
-// A developer could foil the name check by aliasing the Function constructor under a different
-// name on the scope.
+// It is important to realize that if you create an expression from a string that contains user provided
+// content then it is possible that your application contains a security vulnerability to an XSS style attack.
 //
-// In general, it is not possible to access a Window object from an angular expression unless a
-// window or some DOM object that has a reference to window is published onto a Scope.
-
-    function ensureSafeMemberName(name, fullExpression) {
-        if (name === "constructor") {
-            throw $parseMinErr('isecfld',
-                'Referencing "constructor" field in Angular expressions is disallowed! Expression: {0}',
-                fullExpression);
-        }
-        return name;
+// See https://docs.angularjs.org/guide/security
+
+
+    function getStringValue(name) {
+        // Property names must be strings. This means that non-string objects cannot be used
+        // as keys in an object. Any non-string object, including a number, is typecasted
+        // into a string via the toString method.
+        // -- MDN, https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Operators/Property_accessors#Property_names
+        //
+        // So, to ensure that we are checking the same `name` that JavaScript would use, we cast it
+        // to a string. It's not always possible. If `name` is an object and its `toString` method is
+        // 'broken' (doesn't return a string, isn't a function, etc.), an error will be thrown:
+        //
+        // TypeError: Cannot convert object to primitive value
+        //
+        // For performance reasons, we don't catch this error here and allow it to propagate up the call
+        // stack. Note that you'll get the same error in JavaScript if you try to access a property using
+        // such a 'broken' object as a key.
+        return name + '';
     }
 
-    function ensureSafeObject(obj, fullExpression) {
-        // nifty check if obj is Function that is fast and works across iframes and other contexts
-        if (obj) {
-            if (obj.constructor === obj) {
-                throw $parseMinErr('isecfn',
-                    'Referencing Function in Angular expressions is disallowed! Expression: {0}',
-                    fullExpression);
-            } else if (// isWindow(obj)
-            obj.document && obj.location && obj.alert && obj.setInterval) {
-                throw $parseMinErr('isecwindow',
-                    'Referencing the Window in Angular expressions is disallowed! Expression: {0}',
-                    fullExpression);
-            } else if (// isElement(obj)
-            obj.children && (obj.nodeName || (obj.prop && obj.attr && obj.find))) {
-                throw $parseMinErr('isecdom',
-                    'Referencing DOM nodes in Angular expressions is disallowed! Expression: {0}',
-                    fullExpression);
-            }
-        }
-        return obj;
-    }
 
-    var OPERATORS = {
-        /* jshint bitwise : false */
-        'null':function(){return null;},
-        'true':function(){return true;},
-        'false':function(){return false;},
-        undefined:noop,
-        '+':function(self, locals, a,b){
-            a=a(self, locals); b=b(self, locals);
-            if (isDefined(a)) {
-                if (isDefined(b)) {
-                    return a + b;
-                }
-                return a;
-            }
-            return isDefined(b)?b:undefined;},
-        '-':function(self, locals, a,b){
-            a=a(self, locals); b=b(self, locals);
-            return (isDefined(a)?a:0)-(isDefined(b)?b:0);
-        },
-        '*':function(self, locals, a,b){return a(self, locals)*b(self, locals);},
-        '/':function(self, locals, a,b){return a(self, locals)/b(self, locals);},
-        '%':function(self, locals, a,b){return a(self, locals)%b(self, locals);},
-        '^':function(self, locals, a,b){return a(self, locals)^b(self, locals);},
-        '=':noop,
-        '===':function(self, locals, a, b){return a(self, locals)===b(self, locals);},
-        '!==':function(self, locals, a, b){return a(self, locals)!==b(self, locals);},
-        '==':function(self, locals, a,b){return a(self, locals)==b(self, locals);},
-        '!=':function(self, locals, a,b){return a(self, locals)!=b(self, locals);},
-        '<':function(self, locals, a,b){return a(self, locals)<b(self, locals);},
-        '>':function(self, locals, a,b){return a(self, locals)>b(self, locals);},
-        '<=':function(self, locals, a,b){return a(self, locals)<=b(self, locals);},
-        '>=':function(self, locals, a,b){return a(self, locals)>=b(self, locals);},
-        '&&':function(self, locals, a,b){return a(self, locals)&&b(self, locals);},
-        '||':function(self, locals, a,b){return a(self, locals)||b(self, locals);},
-        '&':function(self, locals, a,b){return a(self, locals)&b(self, locals);},
-//    '|':function(self, locals, a,b){return a|b;},
-        '|':function(self, locals, a,b){return b(self, locals)(self, locals, a(self, locals));},
-        '!':function(self, locals, a){return !a(self, locals);}
-    };
-    /* jshint bitwise: true */
-    var ESCAPE = {"n":"\n", "f":"\f", "r":"\r", "t":"\t", "v":"\v", "'":"'", '"':'"'};
+    var OPERATORS = createMap();
+    forEach('+ - * / % === !== == != < > <= >= && || ! = |'.split(' '), function(operator) { OPERATORS[operator] = true; });
+    var ESCAPE = {'n':'\n', 'f':'\f', 'r':'\r', 't':'\t', 'v':'\v', '\'':'\'', '"':'"'};
 
 
 /////////////////////////////////////////
@@ -9901,85 +14863,51 @@
     /**
      * @constructor
      */
-    var Lexer = function (options) {
+    var Lexer = function Lexer(options) {
         this.options = options;
     };
 
     Lexer.prototype = {
         constructor: Lexer,
 
-        lex: function (text) {
+        lex: function(text) {
             this.text = text;
-
             this.index = 0;
-            this.ch = undefined;
-            this.lastCh = ':'; // can start regexp
-
             this.tokens = [];
 
-            var token;
-            var json = [];
-
             while (this.index < this.text.length) {
-                this.ch = this.text.charAt(this.index);
-                if (this.is('"\'')) {
-                    this.readString(this.ch);
-                } else if (this.isNumber(this.ch) || this.is('.') && this.isNumber(this.peek())) {
+                var ch = this.text.charAt(this.index);
+                if (ch === '"' || ch === '\'') {
+                    this.readString(ch);
+                } else if (this.isNumber(ch) || ch === '.' && this.isNumber(this.peek())) {
                     this.readNumber();
-                } else if (this.isIdent(this.ch)) {
+                } else if (this.isIdentifierStart(this.peekMultichar())) {
                     this.readIdent();
-                    // identifiers can only be if the preceding char was a { or ,
-                    if (this.was('{,') && json[0] === '{' &&
-                        (token = this.tokens[this.tokens.length - 1])) {
-                        token.json = token.text.indexOf('.') === -1;
-                    }
-                } else if (this.is('(){}[].,;:?')) {
-                    this.tokens.push({
-                        index: this.index,
-                        text: this.ch,
-                        json: (this.was(':[,') && this.is('{[')) || this.is('}]:,')
-                    });
-                    if (this.is('{[')) json.unshift(this.ch);
-                    if (this.is('}]')) json.shift();
+                } else if (this.is(ch, '(){}[].,;:?')) {
+                    this.tokens.push({index: this.index, text: ch});
                     this.index++;
-                } else if (this.isWhitespace(this.ch)) {
+                } else if (this.isWhitespace(ch)) {
                     this.index++;
-                    continue;
                 } else {
-                    var ch2 = this.ch + this.peek();
+                    var ch2 = ch + this.peek();
                     var ch3 = ch2 + this.peek(2);
-                    var fn = OPERATORS[this.ch];
-                    var fn2 = OPERATORS[ch2];
-                    var fn3 = OPERATORS[ch3];
-                    if (fn3) {
-                        this.tokens.push({index: this.index, text: ch3, fn: fn3});
-                        this.index += 3;
-                    } else if (fn2) {
-                        this.tokens.push({index: this.index, text: ch2, fn: fn2});
-                        this.index += 2;
-                    } else if (fn) {
-                        this.tokens.push({
-                            index: this.index,
-                            text: this.ch,
-                            fn: fn,
-                            json: (this.was('[,:') && this.is('+-'))
-                        });
-                        this.index += 1;
+                    var op1 = OPERATORS[ch];
+                    var op2 = OPERATORS[ch2];
+                    var op3 = OPERATORS[ch3];
+                    if (op1 || op2 || op3) {
+                        var token = op3 ? ch3 : (op2 ? ch2 : ch);
+                        this.tokens.push({index: this.index, text: token, operator: true});
+                        this.index += token.length;
                     } else {
                         this.throwError('Unexpected next character ', this.index, this.index + 1);
                     }
                 }
-                this.lastCh = this.ch;
             }
             return this.tokens;
         },
 
-        is: function(chars) {
-            return chars.indexOf(this.ch) !== -1;
-        },
-
-        was: function(chars) {
-            return chars.indexOf(this.lastCh) !== -1;
+        is: function(ch, chars) {
+            return chars.indexOf(ch) !== -1;
         },
 
         peek: function(i) {
@@ -9988,19 +14916,55 @@
         },
 
         isNumber: function(ch) {
-            return ('0' <= ch && ch <= '9');
+            return ('0' <= ch && ch <= '9') && typeof ch === 'string';
         },
 
         isWhitespace: function(ch) {
             // IE treats non-breaking space as \u00A0
             return (ch === ' ' || ch === '\r' || ch === '\t' ||
-            ch === '\n' || ch === '\v' || ch === '\u00A0');
+                ch === '\n' || ch === '\v' || ch === '\u00A0');
+        },
+
+        isIdentifierStart: function(ch) {
+            return this.options.isIdentifierStart ?
+                this.options.isIdentifierStart(ch, this.codePointAt(ch)) :
+                this.isValidIdentifierStart(ch);
         },
 
-        isIdent: function(ch) {
+        isValidIdentifierStart: function(ch) {
             return ('a' <= ch && ch <= 'z' ||
-            'A' <= ch && ch <= 'Z' ||
-            '_' === ch || ch === '$');
+                'A' <= ch && ch <= 'Z' ||
+                '_' === ch || ch === '$');
+        },
+
+        isIdentifierContinue: function(ch) {
+            return this.options.isIdentifierContinue ?
+                this.options.isIdentifierContinue(ch, this.codePointAt(ch)) :
+                this.isValidIdentifierContinue(ch);
+        },
+
+        isValidIdentifierContinue: function(ch, cp) {
+            return this.isValidIdentifierStart(ch, cp) || this.isNumber(ch);
+        },
+
+        codePointAt: function(ch) {
+            if (ch.length === 1) return ch.charCodeAt(0);
+            // eslint-disable-next-line no-bitwise
+            return (ch.charCodeAt(0) << 10) + ch.charCodeAt(1) - 0x35FDC00;
+        },
+
+        peekMultichar: function() {
+            var ch = this.text.charAt(this.index);
+            var peek = this.peek();
+            if (!peek) {
+                return ch;
+            }
+            var cp1 = ch.charCodeAt(0);
+            var cp2 = peek.charCodeAt(0);
+            if (cp1 >= 0xD800 && cp1 <= 0xDBFF && cp2 >= 0xDC00 && cp2 <= 0xDFFF) {
+                return ch + peek;
+            }
+            return ch;
         },
 
         isExpOperator: function(ch) {
@@ -10021,19 +14985,19 @@
             var start = this.index;
             while (this.index < this.text.length) {
                 var ch = lowercase(this.text.charAt(this.index));
-                if (ch == '.' || this.isNumber(ch)) {
+                if (ch === '.' || this.isNumber(ch)) {
                     number += ch;
                 } else {
                     var peekCh = this.peek();
-                    if (ch == 'e' && this.isExpOperator(peekCh)) {
+                    if (ch === 'e' && this.isExpOperator(peekCh)) {
                         number += ch;
                     } else if (this.isExpOperator(ch) &&
                         peekCh && this.isNumber(peekCh) &&
-                        number.charAt(number.length - 1) == 'e') {
+                        number.charAt(number.length - 1) === 'e') {
                         number += ch;
                     } else if (this.isExpOperator(ch) &&
                         (!peekCh || !this.isNumber(peekCh)) &&
-                        number.charAt(number.length - 1) == 'e') {
+                        number.charAt(number.length - 1) === 'e') {
                         this.throwError('Invalid exponent');
                     } else {
                         break;
@@ -10041,89 +15005,30 @@
                 }
                 this.index++;
             }
-            number = 1 * number;
             this.tokens.push({
                 index: start,
                 text: number,
-                json: true,
-                fn: function() { return number; }
+                constant: true,
+                value: Number(number)
             });
         },
 
         readIdent: function() {
-            var parser = this;
-
-            var ident = '';
             var start = this.index;
-
-            var lastDot, peekIndex, methodName, ch;
-
+            this.index += this.peekMultichar().length;
             while (this.index < this.text.length) {
-                ch = this.text.charAt(this.index);
-                if (ch === '.' || this.isIdent(ch) || this.isNumber(ch)) {
-                    if (ch === '.') lastDot = this.index;
-                    ident += ch;
-                } else {
+                var ch = this.peekMultichar();
+                if (!this.isIdentifierContinue(ch)) {
                     break;
                 }
-                this.index++;
-            }
-
-            //check if this is not a method invocation and if it is back out to last dot
-            if (lastDot) {
-                peekIndex = this.index;
-                while (peekIndex < this.text.length) {
-                    ch = this.text.charAt(peekIndex);
-                    if (ch === '(') {
-                        methodName = ident.substr(lastDot - start + 1);
-                        ident = ident.substr(0, lastDot - start);
-                        this.index = peekIndex;
-                        break;
-                    }
-                    if (this.isWhitespace(ch)) {
-                        peekIndex++;
-                    } else {
-                        break;
-                    }
-                }
+                this.index += ch.length;
             }
-
-
-            var token = {
+            this.tokens.push({
                 index: start,
-                text: ident
-            };
-
-            // OPERATORS is our own object so we don't need to use special hasOwnPropertyFn
-            if (OPERATORS.hasOwnProperty(ident)) {
-                token.fn = OPERATORS[ident];
-                token.json = OPERATORS[ident];
-            } else {
-                var getter = getterFn(ident, this.options, this.text);
-                token.fn = extend(function(self, locals) {
-                    return (getter(self, locals));
-                }, {
-                    assign: function(self, value) {
-                        return setter(self, ident, value, parser.text, parser.options);
-                    }
-                });
-            }
-
-            this.tokens.push(token);
-
-            if (methodName) {
-                this.tokens.push({
-                    index:lastDot,
-                    text: '.',
-                    json: false
-                });
-                this.tokens.push({
-                    index: lastDot + 1,
-                    text: methodName,
-                    json: false
-                });
-            }
-        },
+                text: this.text.slice(start, this.index),
+                identifier: true
+            });
+        },
 
         readString: function(quote) {
             var start = this.index;
@@ -10137,17 +15042,14 @@
                 if (escape) {
                     if (ch === 'u') {
                         var hex = this.text.substring(this.index + 1, this.index + 5);
-                        if (!hex.match(/[\da-f]{4}/i))
+                        if (!hex.match(/[\da-f]{4}/i)) {
                             this.throwError('Invalid unicode escape [\\u' + hex + ']');
+                        }
                         this.index += 4;
                         string += String.fromCharCode(parseInt(hex, 16));
                     } else {
                         var rep = ESCAPE[ch];
-                        if (rep) {
-                            string += rep;
-                        } else {
-                            string += ch;
-                        }
+                        string = string + (rep || ch);
                     }
                     escape = false;
                 } else if (ch === '\\') {
@@ -10157,9 +15059,8 @@
                     this.tokens.push({
                         index: start,
                         text: rawString,
-                        string: string,
-                        json: true,
-                        fn: function() { return string; }
+                        constant: true,
+                        value: string
                     });
                     return;
                 } else {
@@ -10171,219 +15072,66 @@
         }
     };
 
-
-    /**
-     * @constructor
-     */
-    var Parser = function (lexer, $filter, options) {
+    var AST = function AST(lexer, options) {
         this.lexer = lexer;
-        this.$filter = $filter;
         this.options = options;
     };
 
-    Parser.ZERO = extend(function () {
-        return 0;
-    }, {
-        constant: true
-    });
-
-    Parser.prototype = {
-        constructor: Parser,
-
-        parse: function (text, json) {
+    AST.Program = 'Program';
+    AST.ExpressionStatement = 'ExpressionStatement';
+    AST.AssignmentExpression = 'AssignmentExpression';
+    AST.ConditionalExpression = 'ConditionalExpression';
+    AST.LogicalExpression = 'LogicalExpression';
+    AST.BinaryExpression = 'BinaryExpression';
+    AST.UnaryExpression = 'UnaryExpression';
+    AST.CallExpression = 'CallExpression';
+    AST.MemberExpression = 'MemberExpression';
+    AST.Identifier = 'Identifier';
+    AST.Literal = 'Literal';
+    AST.ArrayExpression = 'ArrayExpression';
+    AST.Property = 'Property';
+    AST.ObjectExpression = 'ObjectExpression';
+    AST.ThisExpression = 'ThisExpression';
+    AST.LocalsExpression = 'LocalsExpression';
+
+// Internal use only
+    AST.NGValueParameter = 'NGValueParameter';
+
+    AST.prototype = {
+        ast: function(text) {
             this.text = text;
-
-            //TODO(i): strip all the obsolte json stuff from this file
-            this.json = json;
-
             this.tokens = this.lexer.lex(text);
 
-            if (json) {
-                // The extra level of aliasing is here, just in case the lexer misses something, so that
-                // we prevent any accidental execution in JSON.
-                this.assignment = this.logicalOR;
-
-                this.functionCall =
-                    this.fieldAccess =
-                        this.objectIndex =
-                            this.filterChain = function() {
-                                this.throwError('is not valid json', {text: text, index: 0});
-                            };
-            }
-
-            var value = json ? this.primary() : this.statements();
+            var value = this.program();
 
             if (this.tokens.length !== 0) {
                 this.throwError('is an unexpected token', this.tokens[0]);
             }
 
-            value.literal = !!value.literal;
-            value.constant = !!value.constant;
-
             return value;
         },
 
-        primary: function () {
-            var primary;
-            if (this.expect('(')) {
-                primary = this.filterChain();
-                this.consume(')');
-            } else if (this.expect('[')) {
-                primary = this.arrayDeclaration();
-            } else if (this.expect('{')) {
-                primary = this.object();
-            } else {
-                var token = this.expect();
-                primary = token.fn;
-                if (!primary) {
-                    this.throwError('not a primary expression', token);
-                }
-                if (token.json) {
-                    primary.constant = true;
-                    primary.literal = true;
-                }
-            }
-
-            var next, context;
-            while ((next = this.expect('(', '[', '.'))) {
-                if (next.text === '(') {
-                    primary = this.functionCall(primary, context);
-                    context = null;
-                } else if (next.text === '[') {
-                    context = primary;
-                    primary = this.objectIndex(primary);
-                } else if (next.text === '.') {
-                    context = primary;
-                    primary = this.fieldAccess(primary);
-                } else {
-                    this.throwError('IMPOSSIBLE');
-                }
-            }
-            return primary;
-        },
-
-        throwError: function(msg, token) {
-            throw $parseMinErr('syntax',
-                'Syntax Error: Token \'{0}\' {1} at column {2} of the expression [{3}] starting at [{4}].',
-                token.text, msg, (token.index + 1), this.text, this.text.substring(token.index));
-        },
-
-        peekToken: function() {
-            if (this.tokens.length === 0)
-                throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text);
-            return this.tokens[0];
-        },
-
-        peek: function(e1, e2, e3, e4) {
-            if (this.tokens.length > 0) {
-                var token = this.tokens[0];
-                var t = token.text;
-                if (t === e1 || t === e2 || t === e3 || t === e4 ||
-                    (!e1 && !e2 && !e3 && !e4)) {
-                    return token;
-                }
-            }
-            return false;
-        },
-
-        expect: function(e1, e2, e3, e4){
-            var token = this.peek(e1, e2, e3, e4);
-            if (token) {
-                if (this.json && !token.json) {
-                    this.throwError('is not valid json', token);
-                }
-                this.tokens.shift();
-                return token;
-            }
-            return false;
-        },
-
-        consume: function(e1){
-            if (!this.expect(e1)) {
-                this.throwError('is unexpected, expecting [' + e1 + ']', this.peek());
-            }
-        },
-
-        unaryFn: function(fn, right) {
-            return extend(function(self, locals) {
-                return fn(self, locals, right);
-            }, {
-                constant:right.constant
-            });
-        },
-
-        ternaryFn: function(left, middle, right){
-            return extend(function(self, locals){
-                return left(self, locals) ? middle(self, locals) : right(self, locals);
-            }, {
-                constant: left.constant && middle.constant && right.constant
-            });
-        },
-
-        binaryFn: function(left, fn, right) {
-            return extend(function(self, locals) {
-                return fn(self, locals, left, right);
-            }, {
-                constant:left.constant && right.constant
-            });
-        },
-
-        statements: function() {
-            var statements = [];
+        program: function() {
+            var body = [];
             while (true) {
                 if (this.tokens.length > 0 && !this.peek('}', ')', ';', ']'))
-                    statements.push(this.filterChain());
+                    body.push(this.expressionStatement());
                 if (!this.expect(';')) {
-                    // optimize for the common case where there is only one statement.
-                    // TODO(size): maybe we should not support multiple statements?
-                    return (statements.length === 1)
-                        ? statements[0]
-                        : function(self, locals) {
-                        var value;
-                        for (var i = 0; i < statements.length; i++) {
-                            var statement = statements[i];
-                            if (statement) {
-                                value = statement(self, locals);
-                            }
-                        }
-                        return value;
-                    };
+                    return { type: AST.Program, body: body};
                 }
             }
         },
 
-        filterChain: function() {
-            var left = this.expression();
-            var token;
-            while (true) {
-                if ((token = this.expect('|'))) {
-                    left = this.binaryFn(left, token.fn, this.filter());
-                } else {
-                    return left;
-                }
-            }
+        expressionStatement: function() {
+            return { type: AST.ExpressionStatement, expression: this.filterChain() };
         },
 
-        filter: function() {
-            var token = this.expect();
-            var fn = this.$filter(token.text);
-            var argsFn = [];
-            while (true) {
-                if ((token = this.expect(':'))) {
-                    argsFn.push(this.expression());
-                } else {
-                    var fnInvoke = function(self, locals, input) {
-                        var args = [input];
-                        for (var i = 0; i < argsFn.length; i++) {
-                            args.push(argsFn[i](self, locals));
-                        }
-                        return fn.apply(self, args);
-                    };
-                    return function() {
-                        return fnInvoke;
-                    };
-                }
+        filterChain: function() {
+            var left = this.expression();
+            while (this.expect('|')) {
+                left = this.filter(left);
             }
+            return left;
         },
 
         expression: function() {
@@ -10391,55 +15139,43 @@
         },
 
         assignment: function() {
-            var left = this.ternary();
-            var right;
-            var token;
-            if ((token = this.expect('='))) {
-                if (!left.assign) {
-                    this.throwError('implies assignment but [' +
-                    this.text.substring(0, token.index) + '] can not be assigned to', token);
-                }
-                right = this.ternary();
-                return function(scope, locals) {
-                    return left.assign(scope, right(scope, locals), locals);
-                };
+            var result = this.ternary();
+            if (this.expect('=')) {
+                if (!isAssignable(result)) {
+                    throw $parseMinErr('lval', 'Trying to assign a value to a non l-value');
+                }
+
+                result = { type: AST.AssignmentExpression, left: result, right: this.assignment(), operator: '='};
             }
-            return left;
+            return result;
         },
 
         ternary: function() {
-            var left = this.logicalOR();
-            var middle;
-            var token;
-            if ((token = this.expect('?'))) {
-                middle = this.ternary();
-                if ((token = this.expect(':'))) {
-                    return this.ternaryFn(left, middle, this.ternary());
-                } else {
-                    this.throwError('expected :', token);
+            var test = this.logicalOR();
+            var alternate;
+            var consequent;
+            if (this.expect('?')) {
+                alternate = this.expression();
+                if (this.consume(':')) {
+                    consequent = this.expression();
+                    return { type: AST.ConditionalExpression, test: test, alternate: alternate, consequent: consequent};
                 }
-            } else {
-                return left;
             }
+            return test;
         },
 
         logicalOR: function() {
             var left = this.logicalAND();
-            var token;
-            while (true) {
-                if ((token = this.expect('||'))) {
-                    left = this.binaryFn(left, token.fn, this.logicalAND());
-                } else {
-                    return left;
-                }
+            while (this.expect('||')) {
+                left = { type: AST.LogicalExpression, operator: '||', left: left, right: this.logicalAND() };
             }
+            return left;
         },
 
         logicalAND: function() {
             var left = this.equality();
-            var token;
-            if ((token = this.expect('&&'))) {
-                left = this.binaryFn(left, token.fn, this.logicalAND());
+            while (this.expect('&&')) {
+                left = { type: AST.LogicalExpression, operator: '&&', left: left, right: this.equality()};
             }
             return left;
         },
@@ -10447,8 +15183,8 @@
         equality: function() {
             var left = this.relational();
             var token;
-            if ((token = this.expect('==','!=','===','!=='))) {
-                left = this.binaryFn(left, token.fn, this.equality());
+            while ((token = this.expect('==','!=','===','!=='))) {
+                left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.relational() };
             }
             return left;
         },
@@ -10456,8 +15192,8 @@
         relational: function() {
             var left = this.additive();
             var token;
-            if ((token = this.expect('<', '>', '<=', '>='))) {
-                left = this.binaryFn(left, token.fn, this.relational());
+            while ((token = this.expect('<', '>', '<=', '>='))) {
+                left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.additive() };
             }
             return left;
         },
@@ -10466,7 +15202,7 @@
             var left = this.multiplicative();
             var token;
             while ((token = this.expect('+','-'))) {
-                left = this.binaryFn(left, token.fn, this.multiplicative());
+                left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.multiplicative() };
             }
             return left;
         },
@@ -10475,9029 +15211,15853 @@
             var left = this.unary();
             var token;
             while ((token = this.expect('*','/','%'))) {
-                left = this.binaryFn(left, token.fn, this.unary());
+                left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.unary() };
             }
             return left;
         },
 
         unary: function() {
             var token;
-            if (this.expect('+')) {
-                return this.primary();
-            } else if ((token = this.expect('-'))) {
-                return this.binaryFn(Parser.ZERO, token.fn, this.unary());
-            } else if ((token = this.expect('!'))) {
-                return this.unaryFn(token.fn, this.unary());
+            if ((token = this.expect('+', '-', '!'))) {
+                return { type: AST.UnaryExpression, operator: token.text, prefix: true, argument: this.unary() };
             } else {
                 return this.primary();
             }
         },
 
-        fieldAccess: function(object) {
-            var parser = this;
-            var field = this.expect().text;
-            var getter = getterFn(field, this.options, this.text);
+        primary: function() {
+            var primary;
+            if (this.expect('(')) {
+                primary = this.filterChain();
+                this.consume(')');
+            } else if (this.expect('[')) {
+                primary = this.arrayDeclaration();
+            } else if (this.expect('{')) {
+                primary = this.object();
+            } else if (this.selfReferential.hasOwnProperty(this.peek().text)) {
+                primary = copy(this.selfReferential[this.consume().text]);
+            } else if (this.options.literals.hasOwnProperty(this.peek().text)) {
+                primary = { type: AST.Literal, value: this.options.literals[this.consume().text]};
+            } else if (this.peek().identifier) {
+                primary = this.identifier();
+            } else if (this.peek().constant) {
+                primary = this.constant();
+            } else {
+                this.throwError('not a primary expression', this.peek());
+            }
 
-            return extend(function(scope, locals, self) {
-                return getter(self || object(scope, locals));
-            }, {
-                assign: function(scope, value, locals) {
-                    return setter(object(scope, locals), field, value, parser.text, parser.options);
+            var next;
+            while ((next = this.expect('(', '[', '.'))) {
+                if (next.text === '(') {
+                    primary = {type: AST.CallExpression, callee: primary, arguments: this.parseArguments() };
+                    this.consume(')');
+                } else if (next.text === '[') {
+                    primary = { type: AST.MemberExpression, object: primary, property: this.expression(), computed: true };
+                    this.consume(']');
+                } else if (next.text === '.') {
+                    primary = { type: AST.MemberExpression, object: primary, property: this.identifier(), computed: false };
+                } else {
+                    this.throwError('IMPOSSIBLE');
                 }
-            });
+            }
+            return primary;
         },
 
-        objectIndex: function(obj) {
-            var parser = this;
+        filter: function(baseExpression) {
+            var args = [baseExpression];
+            var result = {type: AST.CallExpression, callee: this.identifier(), arguments: args, filter: true};
 
-            var indexFn = this.expression();
-            this.consume(']');
+            while (this.expect(':')) {
+                args.push(this.expression());
+            }
 
-            return extend(function(self, locals) {
-                var o = obj(self, locals),
-                    i = indexFn(self, locals),
-                    v, p;
-
-                if (!o) return undefined;
-                v = ensureSafeObject(o[i], parser.text);
-                if (v && v.then && parser.options.unwrapPromises) {
-                    p = v;
-                    if (!('$$v' in v)) {
-                        p.$$v = undefined;
-                        p.then(function(val) { p.$$v = val; });
-                    }
-                    v = v.$$v;
-                }
-                return v;
-            }, {
-                assign: function(self, value, locals) {
-                    var key = indexFn(self, locals);
-                    // prevent overwriting of Function.constructor which would break ensureSafeObject check
-                    var safe = ensureSafeObject(obj(self, locals), parser.text);
-                    return safe[key] = value;
-                }
-            });
+            return result;
         },
 
-        functionCall: function(fn, contextGetter) {
-            var argsFn = [];
+        parseArguments: function() {
+            var args = [];
             if (this.peekToken().text !== ')') {
                 do {
-                    argsFn.push(this.expression());
+                    args.push(this.filterChain());
                 } while (this.expect(','));
             }
-            this.consume(')');
-
-            var parser = this;
-
-            return function(scope, locals) {
-                var args = [];
-                var context = contextGetter ? contextGetter(scope, locals) : scope;
-
-                for (var i = 0; i < argsFn.length; i++) {
-                    args.push(argsFn[i](scope, locals));
-                }
-                var fnPtr = fn(scope, locals, context) || noop;
-
-                ensureSafeObject(context, parser.text);
-                ensureSafeObject(fnPtr, parser.text);
+            return args;
+        },
 
-                // IE stupidity! (IE doesn't have apply for some native functions)
-                var v = fnPtr.apply
-                    ? fnPtr.apply(context, args)
-                    : fnPtr(args[0], args[1], args[2], args[3], args[4]);
+        identifier: function() {
+            var token = this.consume();
+            if (!token.identifier) {
+                this.throwError('is not a valid identifier', token);
+            }
+            return { type: AST.Identifier, name: token.text };
+        },
 
-                return ensureSafeObject(v, parser.text);
-            };
+        constant: function() {
+            // TODO check that it is a constant
+            return { type: AST.Literal, value: this.consume().value };
         },
 
-        // This is used with json array declaration
-        arrayDeclaration: function () {
-            var elementFns = [];
-            var allConstant = true;
+        arrayDeclaration: function() {
+            var elements = [];
             if (this.peekToken().text !== ']') {
                 do {
                     if (this.peek(']')) {
                         // Support trailing commas per ES5.1.
                         break;
                     }
-                    var elementFn = this.expression();
-                    elementFns.push(elementFn);
-                    if (!elementFn.constant) {
-                        allConstant = false;
-                    }
+                    elements.push(this.expression());
                 } while (this.expect(','));
             }
             this.consume(']');
 
-            return extend(function(self, locals) {
-                var array = [];
-                for (var i = 0; i < elementFns.length; i++) {
-                    array.push(elementFns[i](self, locals));
-                }
-                return array;
-            }, {
-                literal: true,
-                constant: allConstant
-            });
+            return { type: AST.ArrayExpression, elements: elements };
         },
 
-        object: function () {
-            var keyValues = [];
-            var allConstant = true;
+        object: function() {
+            var properties = [], property;
             if (this.peekToken().text !== '}') {
                 do {
                     if (this.peek('}')) {
                         // Support trailing commas per ES5.1.
                         break;
                     }
-                    var token = this.expect(),
-                        key = token.string || token.text;
-                    this.consume(':');
-                    var value = this.expression();
-                    keyValues.push({key: key, value: value});
-                    if (!value.constant) {
-                        allConstant = false;
+                    property = {type: AST.Property, kind: 'init'};
+                    if (this.peek().constant) {
+                        property.key = this.constant();
+                        property.computed = false;
+                        this.consume(':');
+                        property.value = this.expression();
+                    } else if (this.peek().identifier) {
+                        property.key = this.identifier();
+                        property.computed = false;
+                        if (this.peek(':')) {
+                            this.consume(':');
+                            property.value = this.expression();
+                        } else {
+                            property.value = property.key;
+                        }
+                    } else if (this.peek('[')) {
+                        this.consume('[');
+                        property.key = this.expression();
+                        this.consume(']');
+                        property.computed = true;
+                        this.consume(':');
+                        property.value = this.expression();
+                    } else {
+                        this.throwError('invalid key', this.peek());
                     }
+                    properties.push(property);
                 } while (this.expect(','));
             }
             this.consume('}');
 
-            return extend(function(self, locals) {
-                var object = {};
-                for (var i = 0; i < keyValues.length; i++) {
-                    var keyValue = keyValues[i];
-                    object[keyValue.key] = keyValue.value(self, locals);
-                }
-                return object;
-            }, {
-                literal: true,
-                constant: allConstant
-            });
-        }
-    };
+            return {type: AST.ObjectExpression, properties: properties };
+        },
 
+        throwError: function(msg, token) {
+            throw $parseMinErr('syntax',
+                'Syntax Error: Token \'{0}\' {1} at column {2} of the expression [{3}] starting at [{4}].',
+                token.text, msg, (token.index + 1), this.text, this.text.substring(token.index));
+        },
 
-//////////////////////////////////////////////////
-// Parser helper functions
-//////////////////////////////////////////////////
+        consume: function(e1) {
+            if (this.tokens.length === 0) {
+                throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text);
+            }
 
-    function setter(obj, path, setValue, fullExp, options) {
-        //needed?
-        options = options || {};
+            var token = this.expect(e1);
+            if (!token) {
+                this.throwError('is unexpected, expecting [' + e1 + ']', this.peek());
+            }
+            return token;
+        },
 
-        var element = path.split('.'), key;
-        for (var i = 0; element.length > 1; i++) {
-            key = ensureSafeMemberName(element.shift(), fullExp);
-            var propertyObj = obj[key];
-            if (!propertyObj) {
-                propertyObj = {};
-                obj[key] = propertyObj;
+        peekToken: function() {
+            if (this.tokens.length === 0) {
+                throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text);
             }
-            obj = propertyObj;
-            if (obj.then && options.unwrapPromises) {
-                promiseWarning(fullExp);
-                if (!("$$v" in obj)) {
-                    (function(promise) {
-                        promise.then(function(val) { promise.$$v = val; }); }
-                    )(obj);
-                }
-                if (obj.$$v === undefined) {
-                    obj.$$v = {};
+            return this.tokens[0];
+        },
+
+        peek: function(e1, e2, e3, e4) {
+            return this.peekAhead(0, e1, e2, e3, e4);
+        },
+
+        peekAhead: function(i, e1, e2, e3, e4) {
+            if (this.tokens.length > i) {
+                var token = this.tokens[i];
+                var t = token.text;
+                if (t === e1 || t === e2 || t === e3 || t === e4 ||
+                    (!e1 && !e2 && !e3 && !e4)) {
+                    return token;
                 }
-                obj = obj.$$v;
             }
+            return false;
+        },
+
+        expect: function(e1, e2, e3, e4) {
+            var token = this.peek(e1, e2, e3, e4);
+            if (token) {
+                this.tokens.shift();
+                return token;
+            }
+            return false;
+        },
+
+        selfReferential: {
+            'this': {type: AST.ThisExpression },
+            '$locals': {type: AST.LocalsExpression }
         }
-        key = ensureSafeMemberName(element.shift(), fullExp);
-        obj[key] = setValue;
-        return setValue;
+    };
+
+    function ifDefined(v, d) {
+        return typeof v !== 'undefined' ? v : d;
+    }
+
+    function plusFn(l, r) {
+        if (typeof l === 'undefined') return r;
+        if (typeof r === 'undefined') return l;
+        return l + r;
     }
 
-    var getterFnCache = {};
+    function isStateless($filter, filterName) {
+        var fn = $filter(filterName);
+        return !fn.$stateful;
+    }
 
-    /**
-     * Implementation of the "Black Hole" variant from:
-     * - http://jsperf.com/angularjs-parse-getter/4
-     * - http://jsperf.com/path-evaluation-simplified/7
-     */
-    function cspSafeGetterFn(key0, key1, key2, key3, key4, fullExp, options) {
-        ensureSafeMemberName(key0, fullExp);
-        ensureSafeMemberName(key1, fullExp);
-        ensureSafeMemberName(key2, fullExp);
-        ensureSafeMemberName(key3, fullExp);
-        ensureSafeMemberName(key4, fullExp);
+    var PURITY_ABSOLUTE = 1;
+    var PURITY_RELATIVE = 2;
 
-        return !options.unwrapPromises
-            ? function cspSafeGetter(scope, locals) {
-            var pathVal = (locals && locals.hasOwnProperty(key0)) ? locals : scope;
+// Detect nodes which could depend on non-shallow state of objects
+    function isPure(node, parentIsPure) {
+        switch (node.type) {
+            // Computed members might invoke a stateful toString()
+            case AST.MemberExpression:
+                if (node.computed) {
+                    return false;
+                }
+                break;
 
-            if (pathVal == null) return pathVal;
-            pathVal = pathVal[key0];
+            // Unary always convert to primative
+            case AST.UnaryExpression:
+                return PURITY_ABSOLUTE;
 
-            if (!key1) return pathVal;
-            if (pathVal == null) return undefined;
-            pathVal = pathVal[key1];
+            // The binary + operator can invoke a stateful toString().
+            case AST.BinaryExpression:
+                return node.operator !== '+' ? PURITY_ABSOLUTE : false;
+
+            // Functions / filters probably read state from within objects
+            case AST.CallExpression:
+                return false;
+        }
 
-            if (!key2) return pathVal;
-            if (pathVal == null) return undefined;
-            pathVal = pathVal[key2];
+        return (undefined === parentIsPure) ? PURITY_RELATIVE : parentIsPure;
+    }
 
-            if (!key3) return pathVal;
-            if (pathVal == null) return undefined;
-            pathVal = pathVal[key3];
+    function findConstantAndWatchExpressions(ast, $filter, parentIsPure) {
+        var allConstants;
+        var argsToWatch;
+        var isStatelessFilter;
 
-            if (!key4) return pathVal;
-            if (pathVal == null) return undefined;
-            pathVal = pathVal[key4];
+        var astIsPure = ast.isPure = isPure(ast, parentIsPure);
 
-            return pathVal;
+        switch (ast.type) {
+            case AST.Program:
+                allConstants = true;
+                forEach(ast.body, function(expr) {
+                    findConstantAndWatchExpressions(expr.expression, $filter, astIsPure);
+                    allConstants = allConstants && expr.expression.constant;
+                });
+                ast.constant = allConstants;
+                break;
+            case AST.Literal:
+                ast.constant = true;
+                ast.toWatch = [];
+                break;
+            case AST.UnaryExpression:
+                findConstantAndWatchExpressions(ast.argument, $filter, astIsPure);
+                ast.constant = ast.argument.constant;
+                ast.toWatch = ast.argument.toWatch;
+                break;
+            case AST.BinaryExpression:
+                findConstantAndWatchExpressions(ast.left, $filter, astIsPure);
+                findConstantAndWatchExpressions(ast.right, $filter, astIsPure);
+                ast.constant = ast.left.constant && ast.right.constant;
+                ast.toWatch = ast.left.toWatch.concat(ast.right.toWatch);
+                break;
+            case AST.LogicalExpression:
+                findConstantAndWatchExpressions(ast.left, $filter, astIsPure);
+                findConstantAndWatchExpressions(ast.right, $filter, astIsPure);
+                ast.constant = ast.left.constant && ast.right.constant;
+                ast.toWatch = ast.constant ? [] : [ast];
+                break;
+            case AST.ConditionalExpression:
+                findConstantAndWatchExpressions(ast.test, $filter, astIsPure);
+                findConstantAndWatchExpressions(ast.alternate, $filter, astIsPure);
+                findConstantAndWatchExpressions(ast.consequent, $filter, astIsPure);
+                ast.constant = ast.test.constant && ast.alternate.constant && ast.consequent.constant;
+                ast.toWatch = ast.constant ? [] : [ast];
+                break;
+            case AST.Identifier:
+                ast.constant = false;
+                ast.toWatch = [ast];
+                break;
+            case AST.MemberExpression:
+                findConstantAndWatchExpressions(ast.object, $filter, astIsPure);
+                if (ast.computed) {
+                    findConstantAndWatchExpressions(ast.property, $filter, astIsPure);
+                }
+                ast.constant = ast.object.constant && (!ast.computed || ast.property.constant);
+                ast.toWatch = ast.constant ? [] : [ast];
+                break;
+            case AST.CallExpression:
+                isStatelessFilter = ast.filter ? isStateless($filter, ast.callee.name) : false;
+                allConstants = isStatelessFilter;
+                argsToWatch = [];
+                forEach(ast.arguments, function(expr) {
+                    findConstantAndWatchExpressions(expr, $filter, astIsPure);
+                    allConstants = allConstants && expr.constant;
+                    argsToWatch.push.apply(argsToWatch, expr.toWatch);
+                });
+                ast.constant = allConstants;
+                ast.toWatch = isStatelessFilter ? argsToWatch : [ast];
+                break;
+            case AST.AssignmentExpression:
+                findConstantAndWatchExpressions(ast.left, $filter, astIsPure);
+                findConstantAndWatchExpressions(ast.right, $filter, astIsPure);
+                ast.constant = ast.left.constant && ast.right.constant;
+                ast.toWatch = [ast];
+                break;
+            case AST.ArrayExpression:
+                allConstants = true;
+                argsToWatch = [];
+                forEach(ast.elements, function(expr) {
+                    findConstantAndWatchExpressions(expr, $filter, astIsPure);
+                    allConstants = allConstants && expr.constant;
+                    argsToWatch.push.apply(argsToWatch, expr.toWatch);
+                });
+                ast.constant = allConstants;
+                ast.toWatch = argsToWatch;
+                break;
+            case AST.ObjectExpression:
+                allConstants = true;
+                argsToWatch = [];
+                forEach(ast.properties, function(property) {
+                    findConstantAndWatchExpressions(property.value, $filter, astIsPure);
+                    allConstants = allConstants && property.value.constant;
+                    argsToWatch.push.apply(argsToWatch, property.value.toWatch);
+                    if (property.computed) {
+                        //`{[key]: value}` implicitly does `key.toString()` which may be non-pure
+                        findConstantAndWatchExpressions(property.key, $filter, /*parentIsPure=*/false);
+                        allConstants = allConstants && property.key.constant;
+                        argsToWatch.push.apply(argsToWatch, property.key.toWatch);
+                    }
+                });
+                ast.constant = allConstants;
+                ast.toWatch = argsToWatch;
+                break;
+            case AST.ThisExpression:
+                ast.constant = false;
+                ast.toWatch = [];
+                break;
+            case AST.LocalsExpression:
+                ast.constant = false;
+                ast.toWatch = [];
+                break;
         }
-            : function cspSafePromiseEnabledGetter(scope, locals) {
-            var pathVal = (locals && locals.hasOwnProperty(key0)) ? locals : scope,
-                promise;
-
-            if (pathVal == null) return pathVal;
-
-            pathVal = pathVal[key0];
-            if (pathVal && pathVal.then) {
-                promiseWarning(fullExp);
-                if (!("$$v" in pathVal)) {
-                    promise = pathVal;
-                    promise.$$v = undefined;
-                    promise.then(function(val) { promise.$$v = val; });
-                }
-                pathVal = pathVal.$$v;
-            }
-
-            if (!key1) return pathVal;
-            if (pathVal == null) return undefined;
-            pathVal = pathVal[key1];
-            if (pathVal && pathVal.then) {
-                promiseWarning(fullExp);
-                if (!("$$v" in pathVal)) {
-                    promise = pathVal;
-                    promise.$$v = undefined;
-                    promise.then(function(val) { promise.$$v = val; });
-                }
-                pathVal = pathVal.$$v;
-            }
-
-            if (!key2) return pathVal;
-            if (pathVal == null) return undefined;
-            pathVal = pathVal[key2];
-            if (pathVal && pathVal.then) {
-                promiseWarning(fullExp);
-                if (!("$$v" in pathVal)) {
-                    promise = pathVal;
-                    promise.$$v = undefined;
-                    promise.then(function(val) { promise.$$v = val; });
-                }
-                pathVal = pathVal.$$v;
-            }
-
-            if (!key3) return pathVal;
-            if (pathVal == null) return undefined;
-            pathVal = pathVal[key3];
-            if (pathVal && pathVal.then) {
-                promiseWarning(fullExp);
-                if (!("$$v" in pathVal)) {
-                    promise = pathVal;
-                    promise.$$v = undefined;
-                    promise.then(function(val) { promise.$$v = val; });
-                }
-                pathVal = pathVal.$$v;
-            }
-
-            if (!key4) return pathVal;
-            if (pathVal == null) return undefined;
-            pathVal = pathVal[key4];
-            if (pathVal && pathVal.then) {
-                promiseWarning(fullExp);
-                if (!("$$v" in pathVal)) {
-                    promise = pathVal;
-                    promise.$$v = undefined;
-                    promise.then(function(val) { promise.$$v = val; });
-                }
-                pathVal = pathVal.$$v;
-            }
-            return pathVal;
-        };
     }
 
-    function simpleGetterFn1(key0, fullExp) {
-        ensureSafeMemberName(key0, fullExp);
+    function getInputs(body) {
+        if (body.length !== 1) return;
+        var lastExpression = body[0].expression;
+        var candidate = lastExpression.toWatch;
+        if (candidate.length !== 1) return candidate;
+        return candidate[0] !== lastExpression ? candidate : undefined;
+    }
 
-        return function simpleGetterFn1(scope, locals) {
-            if (scope == null) return undefined;
-            return ((locals && locals.hasOwnProperty(key0)) ? locals : scope)[key0];
-        };
+    function isAssignable(ast) {
+        return ast.type === AST.Identifier || ast.type === AST.MemberExpression;
     }
 
-    function simpleGetterFn2(key0, key1, fullExp) {
-        ensureSafeMemberName(key0, fullExp);
-        ensureSafeMemberName(key1, fullExp);
+    function assignableAST(ast) {
+        if (ast.body.length === 1 && isAssignable(ast.body[0].expression)) {
+            return {type: AST.AssignmentExpression, left: ast.body[0].expression, right: {type: AST.NGValueParameter}, operator: '='};
+        }
+    }
 
-        return function simpleGetterFn2(scope, locals) {
-            if (scope == null) return undefined;
-            scope = ((locals && locals.hasOwnProperty(key0)) ? locals : scope)[key0];
-            return scope == null ? undefined : scope[key1];
-        };
+    function isLiteral(ast) {
+        return ast.body.length === 0 ||
+            ast.body.length === 1 && (
+                ast.body[0].expression.type === AST.Literal ||
+                ast.body[0].expression.type === AST.ArrayExpression ||
+                ast.body[0].expression.type === AST.ObjectExpression);
     }
 
-    function getterFn(path, options, fullExp) {
-        // Check whether the cache has this getter already.
-        // We can use hasOwnProperty directly on the cache because we ensure,
-        // see below, that the cache never stores a path called 'hasOwnProperty'
-        if (getterFnCache.hasOwnProperty(path)) {
-            return getterFnCache[path];
-        }
+    function isConstant(ast) {
+        return ast.constant;
+    }
 
-        var pathKeys = path.split('.'),
-            pathKeysLength = pathKeys.length,
-            fn;
-
-        // When we have only 1 or 2 tokens, use optimized special case closures.
-        // http://jsperf.com/angularjs-parse-getter/6
-        if (!options.unwrapPromises && pathKeysLength === 1) {
-            fn = simpleGetterFn1(pathKeys[0], fullExp);
-        } else if (!options.unwrapPromises && pathKeysLength === 2) {
-            fn = simpleGetterFn2(pathKeys[0], pathKeys[1], fullExp);
-        } else if (options.csp) {
-            if (pathKeysLength < 6) {
-                fn = cspSafeGetterFn(pathKeys[0], pathKeys[1], pathKeys[2], pathKeys[3], pathKeys[4], fullExp,
-                    options);
-            } else {
-                fn = function(scope, locals) {
-                    var i = 0, val;
-                    do {
-                        val = cspSafeGetterFn(pathKeys[i++], pathKeys[i++], pathKeys[i++], pathKeys[i++],
-                            pathKeys[i++], fullExp, options)(scope, locals);
+    function ASTCompiler($filter) {
+        this.$filter = $filter;
+    }
 
-                        locals = undefined; // clear after first iteration
-                        scope = val;
-                    } while (i < pathKeysLength);
-                    return val;
-                };
+    ASTCompiler.prototype = {
+        compile: function(ast) {
+            var self = this;
+            this.state = {
+                nextId: 0,
+                filters: {},
+                fn: {vars: [], body: [], own: {}},
+                assign: {vars: [], body: [], own: {}},
+                inputs: []
+            };
+            findConstantAndWatchExpressions(ast, self.$filter);
+            var extra = '';
+            var assignable;
+            this.stage = 'assign';
+            if ((assignable = assignableAST(ast))) {
+                this.state.computing = 'assign';
+                var result = this.nextId();
+                this.recurse(assignable, result);
+                this.return_(result);
+                extra = 'fn.assign=' + this.generateFunction('assign', 's,v,l');
             }
-        } else {
-            var code = 'var p;\n';
-            forEach(pathKeys, function(key, index) {
-                ensureSafeMemberName(key, fullExp);
-                code += 'if(s == null) return undefined;\n' +
-                's='+ (index
-                    // we simply dereference 's' on any .dot notation
-                    ? 's'
-                    // but if we are first then we check locals first, and if so read it first
-                    : '((k&&k.hasOwnProperty("' + key + '"))?k:s)') + '["' + key + '"]' + ';\n' +
-                (options.unwrapPromises
-                    ? 'if (s && s.then) {\n' +
-                ' pw("' + fullExp.replace(/(["\r\n])/g, '\\$1') + '");\n' +
-                ' if (!("$$v" in s)) {\n' +
-                ' p=s;\n' +
-                ' p.$$v = undefined;\n' +
-                ' p.then(function(v) {p.$$v=v;});\n' +
-                '}\n' +
-                ' s=s.$$v\n' +
-                '}\n'
-                    : '');
+            var toWatch = getInputs(ast.body);
+            self.stage = 'inputs';
+            forEach(toWatch, function(watch, key) {
+                var fnKey = 'fn' + key;
+                self.state[fnKey] = {vars: [], body: [], own: {}};
+                self.state.computing = fnKey;
+                var intoId = self.nextId();
+                self.recurse(watch, intoId);
+                self.return_(intoId);
+                self.state.inputs.push({name: fnKey, isPure: watch.isPure});
+                watch.watchId = key;
             });
-            code += 'return s;';
-
-            /* jshint -W054 */
-            var evaledFnGetter = new Function('s', 'k', 'pw', code); // s=scope, k=locals, pw=promiseWarning
-            /* jshint +W054 */
-            evaledFnGetter.toString = valueFn(code);
-            fn = options.unwrapPromises ? function(scope, locals) {
-                return evaledFnGetter(scope, locals, promiseWarning);
-            } : evaledFnGetter;
-        }
+            this.state.computing = 'fn';
+            this.stage = 'main';
+            this.recurse(ast);
+            var fnString =
+                // The build and minification steps remove the string "use strict" from the code, but this is done using a regex.
+                // This is a workaround for this until we do a better job at only removing the prefix only when we should.
+                '"' + this.USE + ' ' + this.STRICT + '";\n' +
+                this.filterPrefix() +
+                'var fn=' + this.generateFunction('fn', 's,l,a,i') +
+                extra +
+                this.watchFns() +
+                'return fn;';
+
+            // eslint-disable-next-line no-new-func
+            var fn = (new Function('$filter',
+                'getStringValue',
+                'ifDefined',
+                'plus',
+                fnString))(
+                this.$filter,
+                getStringValue,
+                ifDefined,
+                plusFn);
+            this.state = this.stage = undefined;
+            return fn;
+        },
 
-        // Only cache the value if it's not going to mess up the cache object
-        // This is more performant that using Object.prototype.hasOwnProperty.call
-        if (path !== 'hasOwnProperty') {
-            getterFnCache[path] = fn;
-        }
-        return fn;
-    }
+        USE: 'use',
 
-///////////////////////////////////
+        STRICT: 'strict',
 
-    /**
-     * @ngdoc service
-     * @name $parse
-     * @kind function
-     *
-     * @description
-     *
-     * Converts Angular {@link guide/expression expression} into a function.
-     *
-     * ```js
-     *   var getter = $parse('user.name');
-     *   var setter = getter.assign;
-     *   var context = {user:{name:'angular'}};
-     *   var locals = {user:{name:'local'}};
-     *
-     *   expect(getter(context)).toEqual('angular');
-     *   setter(context, 'newValue');
-     *   expect(context.user.name).toEqual('newValue');
-     *   expect(getter(context, locals)).toEqual('local');
-     * ```
-     *
-     *
-     * @param {string} expression String expression to compile.
-     * @returns {function(context, locals)} a function which represents the compiled expression:
-     *
-     *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-     *      are evaluated against (typically a scope object).
-     *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-     *      `context`.
-     *
-     *    The returned function also has the following properties:
-     *      * `literal` – `{boolean}` – whether the expression's top-level node is a JavaScript
-     *        literal.
-     *      * `constant` – `{boolean}` – whether the expression is made entirely of JavaScript
-     *        constant literals.
-     *      * `assign` – `{?function(context, value)}` – if the expression is assignable, this will be
-     *        set to a function to change its value on the given context.
-     *
-     */
+        watchFns: function() {
+            var result = [];
+            var inputs = this.state.inputs;
+            var self = this;
+            forEach(inputs, function(input) {
+                result.push('var ' + input.name + '=' + self.generateFunction(input.name, 's'));
+                if (input.isPure) {
+                    result.push(input.name, '.isPure=' + JSON.stringify(input.isPure) + ';');
+                }
+            });
+            if (inputs.length) {
+                result.push('fn.inputs=[' + inputs.map(function(i) { return i.name; }).join(',') + '];');
+            }
+            return result.join('');
+        },
 
+        generateFunction: function(name, params) {
+            return 'function(' + params + '){' +
+                this.varsPrefix(name) +
+                this.body(name) +
+                '};';
+        },
 
-    /**
-     * @ngdoc provider
-     * @name $parseProvider
-     * @function
-     *
-     * @description
-     * `$parseProvider` can be used for configuring the default behavior of the {@link ng.$parse $parse}
-     *  service.
-     */
-    function $ParseProvider() {
-        var cache = {};
+        filterPrefix: function() {
+            var parts = [];
+            var self = this;
+            forEach(this.state.filters, function(id, filter) {
+                parts.push(id + '=$filter(' + self.escape(filter) + ')');
+            });
+            if (parts.length) return 'var ' + parts.join(',') + ';';
+            return '';
+        },
 
-        var $parseOptions = {
-            csp: false,
-            unwrapPromises: false,
-            logPromiseWarnings: true
-        };
+        varsPrefix: function(section) {
+            return this.state[section].vars.length ? 'var ' + this.state[section].vars.join(',') + ';' : '';
+        },
 
+        body: function(section) {
+            return this.state[section].body.join('');
+        },
 
-        /**
-         * @deprecated Promise unwrapping via $parse is deprecated and will be removed in the future.
-         *
-         * @ngdoc method
-         * @name $parseProvider#unwrapPromises
-         * @description
-         *
-         * **This feature is deprecated, see deprecation notes below for more info**
-         *
-         * If set to true (default is false), $parse will unwrap promises automatically when a promise is
-         * found at any part of the expression. In other words, if set to true, the expression will always
-         * result in a non-promise value.
-         *
-         * While the promise is unresolved, it's treated as undefined, but once resolved and fulfilled,
-         * the fulfillment value is used in place of the promise while evaluating the expression.
-         *
-         * **Deprecation notice**
-         *
-         * This is a feature that didn't prove to be wildly useful or popular, primarily because of the
-         * dichotomy between data access in templates (accessed as raw values) and controller code
-         * (accessed as promises).
-         *
-         * In most code we ended up resolving promises manually in controllers anyway and thus unifying
-         * the model access there.
-         *
-         * Other downsides of automatic promise unwrapping:
-         *
-         * - when building components it's often desirable to receive the raw promises
-         * - adds complexity and slows down expression evaluation
-         * - makes expression code pre-generation unattractive due to the amount of code that needs to be
-         *   generated
-         * - makes IDE auto-completion and tool support hard
-         *
-         * **Warning Logs**
-         *
-         * If the unwrapping is enabled, Angular will log a warning about each expression that unwraps a
-         * promise (to reduce the noise, each expression is logged only once). To disable this logging use
-         * `$parseProvider.logPromiseWarnings(false)` api.
-         *
-         *
-         * @param {boolean=} value New value.
-         * @returns {boolean|self} Returns the current setting when used as getter and self if used as
-         *                         setter.
-         */
-        this.unwrapPromises = function(value) {
-            if (isDefined(value)) {
-                $parseOptions.unwrapPromises = !!value;
-                return this;
+        recurse: function(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck) {
+            var left, right, self = this, args, expression, computed;
+            recursionFn = recursionFn || noop;
+            if (!skipWatchIdCheck && isDefined(ast.watchId)) {
+                intoId = intoId || this.nextId();
+                this.if_('i',
+                    this.lazyAssign(intoId, this.computedMember('i', ast.watchId)),
+                    this.lazyRecurse(ast, intoId, nameId, recursionFn, create, true)
+                );
+                return;
+            }
+            switch (ast.type) {
+                case AST.Program:
+                    forEach(ast.body, function(expression, pos) {
+                        self.recurse(expression.expression, undefined, undefined, function(expr) { right = expr; });
+                        if (pos !== ast.body.length - 1) {
+                            self.current().body.push(right, ';');
+                        } else {
+                            self.return_(right);
+                        }
+                    });
+                    break;
+                case AST.Literal:
+                    expression = this.escape(ast.value);
+                    this.assign(intoId, expression);
+                    recursionFn(intoId || expression);
+                    break;
+                case AST.UnaryExpression:
+                    this.recurse(ast.argument, undefined, undefined, function(expr) { right = expr; });
+                    expression = ast.operator + '(' + this.ifDefined(right, 0) + ')';
+                    this.assign(intoId, expression);
+                    recursionFn(expression);
+                    break;
+                case AST.BinaryExpression:
+                    this.recurse(ast.left, undefined, undefined, function(expr) { left = expr; });
+                    this.recurse(ast.right, undefined, undefined, function(expr) { right = expr; });
+                    if (ast.operator === '+') {
+                        expression = this.plus(left, right);
+                    } else if (ast.operator === '-') {
+                        expression = this.ifDefined(left, 0) + ast.operator + this.ifDefined(right, 0);
+                    } else {
+                        expression = '(' + left + ')' + ast.operator + '(' + right + ')';
+                    }
+                    this.assign(intoId, expression);
+                    recursionFn(expression);
+                    break;
+                case AST.LogicalExpression:
+                    intoId = intoId || this.nextId();
+                    self.recurse(ast.left, intoId);
+                    self.if_(ast.operator === '&&' ? intoId : self.not(intoId), self.lazyRecurse(ast.right, intoId));
+                    recursionFn(intoId);
+                    break;
+                case AST.ConditionalExpression:
+                    intoId = intoId || this.nextId();
+                    self.recurse(ast.test, intoId);
+                    self.if_(intoId, self.lazyRecurse(ast.alternate, intoId), self.lazyRecurse(ast.consequent, intoId));
+                    recursionFn(intoId);
+                    break;
+                case AST.Identifier:
+                    intoId = intoId || this.nextId();
+                    if (nameId) {
+                        nameId.context = self.stage === 'inputs' ? 's' : this.assign(this.nextId(), this.getHasOwnProperty('l', ast.name) + '?l:s');
+                        nameId.computed = false;
+                        nameId.name = ast.name;
+                    }
+                    self.if_(self.stage === 'inputs' || self.not(self.getHasOwnProperty('l', ast.name)),
+                        function() {
+                            self.if_(self.stage === 'inputs' || 's', function() {
+                                if (create && create !== 1) {
+                                    self.if_(
+                                        self.isNull(self.nonComputedMember('s', ast.name)),
+                                        self.lazyAssign(self.nonComputedMember('s', ast.name), '{}'));
+                                }
+                                self.assign(intoId, self.nonComputedMember('s', ast.name));
+                            });
+                        }, intoId && self.lazyAssign(intoId, self.nonComputedMember('l', ast.name))
+                    );
+                    recursionFn(intoId);
+                    break;
+                case AST.MemberExpression:
+                    left = nameId && (nameId.context = this.nextId()) || this.nextId();
+                    intoId = intoId || this.nextId();
+                    self.recurse(ast.object, left, undefined, function() {
+                        self.if_(self.notNull(left), function() {
+                            if (ast.computed) {
+                                right = self.nextId();
+                                self.recurse(ast.property, right);
+                                self.getStringValue(right);
+                                if (create && create !== 1) {
+                                    self.if_(self.not(self.computedMember(left, right)), self.lazyAssign(self.computedMember(left, right), '{}'));
+                                }
+                                expression = self.computedMember(left, right);
+                                self.assign(intoId, expression);
+                                if (nameId) {
+                                    nameId.computed = true;
+                                    nameId.name = right;
+                                }
+                            } else {
+                                if (create && create !== 1) {
+                                    self.if_(self.isNull(self.nonComputedMember(left, ast.property.name)), self.lazyAssign(self.nonComputedMember(left, ast.property.name), '{}'));
+                                }
+                                expression = self.nonComputedMember(left, ast.property.name);
+                                self.assign(intoId, expression);
+                                if (nameId) {
+                                    nameId.computed = false;
+                                    nameId.name = ast.property.name;
+                                }
+                            }
+                        }, function() {
+                            self.assign(intoId, 'undefined');
+                        });
+                        recursionFn(intoId);
+                    }, !!create);
+                    break;
+                case AST.CallExpression:
+                    intoId = intoId || this.nextId();
+                    if (ast.filter) {
+                        right = self.filter(ast.callee.name);
+                        args = [];
+                        forEach(ast.arguments, function(expr) {
+                            var argument = self.nextId();
+                            self.recurse(expr, argument);
+                            args.push(argument);
+                        });
+                        expression = right + '(' + args.join(',') + ')';
+                        self.assign(intoId, expression);
+                        recursionFn(intoId);
+                    } else {
+                        right = self.nextId();
+                        left = {};
+                        args = [];
+                        self.recurse(ast.callee, right, left, function() {
+                            self.if_(self.notNull(right), function() {
+                                forEach(ast.arguments, function(expr) {
+                                    self.recurse(expr, ast.constant ? undefined : self.nextId(), undefined, function(argument) {
+                                        args.push(argument);
+                                    });
+                                });
+                                if (left.name) {
+                                    expression = self.member(left.context, left.name, left.computed) + '(' + args.join(',') + ')';
+                                } else {
+                                    expression = right + '(' + args.join(',') + ')';
+                                }
+                                self.assign(intoId, expression);
+                            }, function() {
+                                self.assign(intoId, 'undefined');
+                            });
+                            recursionFn(intoId);
+                        });
+                    }
+                    break;
+                case AST.AssignmentExpression:
+                    right = this.nextId();
+                    left = {};
+                    this.recurse(ast.left, undefined, left, function() {
+                        self.if_(self.notNull(left.context), function() {
+                            self.recurse(ast.right, right);
+                            expression = self.member(left.context, left.name, left.computed) + ast.operator + right;
+                            self.assign(intoId, expression);
+                            recursionFn(intoId || expression);
+                        });
+                    }, 1);
+                    break;
+                case AST.ArrayExpression:
+                    args = [];
+                    forEach(ast.elements, function(expr) {
+                        self.recurse(expr, ast.constant ? undefined : self.nextId(), undefined, function(argument) {
+                            args.push(argument);
+                        });
+                    });
+                    expression = '[' + args.join(',') + ']';
+                    this.assign(intoId, expression);
+                    recursionFn(intoId || expression);
+                    break;
+                case AST.ObjectExpression:
+                    args = [];
+                    computed = false;
+                    forEach(ast.properties, function(property) {
+                        if (property.computed) {
+                            computed = true;
+                        }
+                    });
+                    if (computed) {
+                        intoId = intoId || this.nextId();
+                        this.assign(intoId, '{}');
+                        forEach(ast.properties, function(property) {
+                            if (property.computed) {
+                                left = self.nextId();
+                                self.recurse(property.key, left);
+                            } else {
+                                left = property.key.type === AST.Identifier ?
+                                    property.key.name :
+                                    ('' + property.key.value);
+                            }
+                            right = self.nextId();
+                            self.recurse(property.value, right);
+                            self.assign(self.member(intoId, left, property.computed), right);
+                        });
+                    } else {
+                        forEach(ast.properties, function(property) {
+                            self.recurse(property.value, ast.constant ? undefined : self.nextId(), undefined, function(expr) {
+                                args.push(self.escape(
+                                    property.key.type === AST.Identifier ? property.key.name :
+                                        ('' + property.key.value)) +
+                                    ':' + expr);
+                            });
+                        });
+                        expression = '{' + args.join(',') + '}';
+                        this.assign(intoId, expression);
+                    }
+                    recursionFn(intoId || expression);
+                    break;
+                case AST.ThisExpression:
+                    this.assign(intoId, 's');
+                    recursionFn(intoId || 's');
+                    break;
+                case AST.LocalsExpression:
+                    this.assign(intoId, 'l');
+                    recursionFn(intoId || 'l');
+                    break;
+                case AST.NGValueParameter:
+                    this.assign(intoId, 'v');
+                    recursionFn(intoId || 'v');
+                    break;
+            }
+        },
+
+        getHasOwnProperty: function(element, property) {
+            var key = element + '.' + property;
+            var own = this.current().own;
+            if (!own.hasOwnProperty(key)) {
+                own[key] = this.nextId(false, element + '&&(' + this.escape(property) + ' in ' + element + ')');
+            }
+            return own[key];
+        },
+
+        assign: function(id, value) {
+            if (!id) return;
+            this.current().body.push(id, '=', value, ';');
+            return id;
+        },
+
+        filter: function(filterName) {
+            if (!this.state.filters.hasOwnProperty(filterName)) {
+                this.state.filters[filterName] = this.nextId(true);
+            }
+            return this.state.filters[filterName];
+        },
+
+        ifDefined: function(id, defaultValue) {
+            return 'ifDefined(' + id + ',' + this.escape(defaultValue) + ')';
+        },
+
+        plus: function(left, right) {
+            return 'plus(' + left + ',' + right + ')';
+        },
+
+        return_: function(id) {
+            this.current().body.push('return ', id, ';');
+        },
+
+        if_: function(test, alternate, consequent) {
+            if (test === true) {
+                alternate();
             } else {
-                return $parseOptions.unwrapPromises;
+                var body = this.current().body;
+                body.push('if(', test, '){');
+                alternate();
+                body.push('}');
+                if (consequent) {
+                    body.push('else{');
+                    consequent();
+                    body.push('}');
+                }
             }
-        };
+        },
 
+        not: function(expression) {
+            return '!(' + expression + ')';
+        },
 
-        /**
-         * @deprecated Promise unwrapping via $parse is deprecated and will be removed in the future.
-         *
-         * @ngdoc method
-         * @name $parseProvider#logPromiseWarnings
-         * @description
-         *
-         * Controls whether Angular should log a warning on any encounter of a promise in an expression.
-         *
-         * The default is set to `true`.
-         *
-         * This setting applies only if `$parseProvider.unwrapPromises` setting is set to true as well.
-         *
-         * @param {boolean=} value New value.
-         * @returns {boolean|self} Returns the current setting when used as getter and self if used as
-         *                         setter.
-         */
-        this.logPromiseWarnings = function(value) {
-            if (isDefined(value)) {
-                $parseOptions.logPromiseWarnings = value;
-                return this;
+        isNull: function(expression) {
+            return expression + '==null';
+        },
+
+        notNull: function(expression) {
+            return expression + '!=null';
+        },
+
+        nonComputedMember: function(left, right) {
+            var SAFE_IDENTIFIER = /^[$_a-zA-Z][$_a-zA-Z0-9]*$/;
+            var UNSAFE_CHARACTERS = /[^$_a-zA-Z0-9]/g;
+            if (SAFE_IDENTIFIER.test(right)) {
+                return left + '.' + right;
             } else {
-                return $parseOptions.logPromiseWarnings;
+                return left  + '["' + right.replace(UNSAFE_CHARACTERS, this.stringEscapeFn) + '"]';
             }
-        };
+        },
+
+        computedMember: function(left, right) {
+            return left + '[' + right + ']';
+        },
 
+        member: function(left, right, computed) {
+            if (computed) return this.computedMember(left, right);
+            return this.nonComputedMember(left, right);
+        },
 
-        this.$get = ['$filter', '$sniffer', '$log', function($filter, $sniffer, $log) {
-            $parseOptions.csp = $sniffer.csp;
+        getStringValue: function(item) {
+            this.assign(item, 'getStringValue(' + item + ')');
+        },
 
-            promiseWarning = function promiseWarningFn(fullExp) {
-                if (!$parseOptions.logPromiseWarnings || promiseWarningCache.hasOwnProperty(fullExp)) return;
-                promiseWarningCache[fullExp] = true;
-                $log.warn('[$parse] Promise found in the expression `' + fullExp + '`. ' +
-                'Automatic unwrapping of promises in Angular expressions is deprecated.');
+        lazyRecurse: function(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck) {
+            var self = this;
+            return function() {
+                self.recurse(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck);
             };
+        },
 
-            return function(exp) {
-                var parsedExpression;
+        lazyAssign: function(id, value) {
+            var self = this;
+            return function() {
+                self.assign(id, value);
+            };
+        },
 
-                switch (typeof exp) {
-                    case 'string':
+        stringEscapeRegex: /[^ a-zA-Z0-9]/g,
 
-                        if (cache.hasOwnProperty(exp)) {
-                            return cache[exp];
-                        }
+        stringEscapeFn: function(c) {
+            return '\\u' + ('0000' + c.charCodeAt(0).toString(16)).slice(-4);
+        },
 
-                        var lexer = new Lexer($parseOptions);
-                        var parser = new Parser(lexer, $filter, $parseOptions);
-                        parsedExpression = parser.parse(exp, false);
+        escape: function(value) {
+            if (isString(value)) return '\'' + value.replace(this.stringEscapeRegex, this.stringEscapeFn) + '\'';
+            if (isNumber(value)) return value.toString();
+            if (value === true) return 'true';
+            if (value === false) return 'false';
+            if (value === null) return 'null';
+            if (typeof value === 'undefined') return 'undefined';
 
-                        if (exp !== 'hasOwnProperty') {
-                            // Only cache the value if it's not going to mess up the cache object
-                            // This is more performant that using Object.prototype.hasOwnProperty.call
-                            cache[exp] = parsedExpression;
-                        }
+            throw $parseMinErr('esc', 'IMPOSSIBLE');
+        },
 
-                        return parsedExpression;
+        nextId: function(skip, init) {
+            var id = 'v' + (this.state.nextId++);
+            if (!skip) {
+                this.current().vars.push(id + (init ? '=' + init : ''));
+            }
+            return id;
+        },
 
-                    case 'function':
-                        return exp;
+        current: function() {
+            return this.state[this.state.computing];
+        }
+    };
 
-                    default:
-                        return noop;
-                }
-            };
-        }];
+
+    function ASTInterpreter($filter) {
+        this.$filter = $filter;
     }
 
-    /**
-     * @ngdoc service
-     * @name $q
-     * @requires $rootScope
-     *
-     * @description
-     * A promise/deferred implementation inspired by [Kris Kowal's Q](https://github.com/kriskowal/q).
-     *
-     * [The CommonJS Promise proposal](http://wiki.commonjs.org/wiki/Promises) describes a promise as an
-     * interface for interacting with an object that represents the result of an action that is
-     * performed asynchronously, and may or may not be finished at any given point in time.
-     *
-     * From the perspective of dealing with error handling, deferred and promise APIs are to
-     * asynchronous programming what `try`, `catch` and `throw` keywords are to synchronous programming.
-     *
-     * ```js
-     *   // for the purpose of this example let's assume that variables `$q`, `scope` and `okToGreet`
-     *   // are available in the current lexical scope (they could have been injected or passed in).
-     *
-     *   function asyncGreet(name) {
- *     var deferred = $q.defer();
- *
- *     setTimeout(function() {
- *       // since this fn executes async in a future turn of the event loop, we need to wrap
- *       // our code into an $apply call so that the model changes are properly observed.
- *       scope.$apply(function() {
- *         deferred.notify('About to greet ' + name + '.');
- *
- *         if (okToGreet(name)) {
- *           deferred.resolve('Hello, ' + name + '!');
- *         } else {
- *           deferred.reject('Greeting ' + name + ' is not allowed.');
- *         }
- *       });
- *     }, 1000);
- *
- *     return deferred.promise;
- *   }
-     *
-     *   var promise = asyncGreet('Robin Hood');
-     *   promise.then(function(greeting) {
- *     alert('Success: ' + greeting);
- *   }, function(reason) {
- *     alert('Failed: ' + reason);
- *   }, function(update) {
- *     alert('Got notification: ' + update);
- *   });
-     * ```
-     *
-     * At first it might not be obvious why this extra complexity is worth the trouble. The payoff
-     * comes in the way of guarantees that promise and deferred APIs make, see
-     * https://github.com/kriskowal/uncommonjs/blob/master/promises/specification.md.
-     *
-     * Additionally the promise api allows for composition that is very hard to do with the
-     * traditional callback ([CPS](http://en.wikipedia.org/wiki/Continuation-passing_style)) approach.
-     * For more on this please see the [Q documentation](https://github.com/kriskowal/q) especially the
-     * section on serial or parallel joining of promises.
-     *
-     *
-     * # The Deferred API
-     *
-     * A new instance of deferred is constructed by calling `$q.defer()`.
-     *
-     * The purpose of the deferred object is to expose the associated Promise instance as well as APIs
-     * that can be used for signaling the successful or unsuccessful completion, as well as the status
-     * of the task.
-     *
-     * **Methods**
-     *
-     * - `resolve(value)` – resolves the derived promise with the `value`. If the value is a rejection
-     *   constructed via `$q.reject`, the promise will be rejected instead.
-     * - `reject(reason)` – rejects the derived promise with the `reason`. This is equivalent to
-     *   resolving it with a rejection constructed via `$q.reject`.
-     * - `notify(value)` - provides updates on the status of the promise's execution. This may be called
-     *   multiple times before the promise is either resolved or rejected.
-     *
-     * **Properties**
-     *
-     * - promise – `{Promise}` – promise object associated with this deferred.
-     *
-     *
-     * # The Promise API
-     *
-     * A new promise instance is created when a deferred instance is created and can be retrieved by
-     * calling `deferred.promise`.
-     *
-     * The purpose of the promise object is to allow for interested parties to get access to the result
-     * of the deferred task when it completes.
-     *
-     * **Methods**
-     *
-     * - `then(successCallback, errorCallback, notifyCallback)` – regardless of when the promise was or
-     *   will be resolved or rejected, `then` calls one of the success or error callbacks asynchronously
-     *   as soon as the result is available. The callbacks are called with a single argument: the result
-     *   or rejection reason. Additionally, the notify callback may be called zero or more times to
-     *   provide a progress indication, before the promise is resolved or rejected.
-     *
-     *   This method *returns a new promise* which is resolved or rejected via the return value of the
-     *   `successCallback`, `errorCallback`. It also notifies via the return value of the
-     *   `notifyCallback` method. The promise can not be resolved or rejected from the notifyCallback
-     *   method.
-     *
-     * - `catch(errorCallback)` – shorthand for `promise.then(null, errorCallback)`
-     *
-     * - `finally(callback)` – allows you to observe either the fulfillment or rejection of a promise,
-     *   but to do so without modifying the final value. This is useful to release resources or do some
-     *   clean-up that needs to be done whether the promise was rejected or resolved. See the [full
-     *   specification](https://github.com/kriskowal/q/wiki/API-Reference#promisefinallycallback) for
-     *   more information.
-     *
-     *   Because `finally` is a reserved word in JavaScript and reserved keywords are not supported as
-     *   property names by ES3, you'll need to invoke the method like `promise['finally'](callback)` to
-     *   make your code IE8 and Android 2.x compatible.
+    ASTInterpreter.prototype = {
+        compile: function(ast) {
+            var self = this;
+            findConstantAndWatchExpressions(ast, self.$filter);
+            var assignable;
+            var assign;
+            if ((assignable = assignableAST(ast))) {
+                assign = this.recurse(assignable);
+            }
+            var toWatch = getInputs(ast.body);
+            var inputs;
+            if (toWatch) {
+                inputs = [];
+                forEach(toWatch, function(watch, key) {
+                    var input = self.recurse(watch);
+                    input.isPure = watch.isPure;
+                    watch.input = input;
+                    inputs.push(input);
+                    watch.watchId = key;
+                });
+            }
+            var expressions = [];
+            forEach(ast.body, function(expression) {
+                expressions.push(self.recurse(expression.expression));
+            });
+            var fn = ast.body.length === 0 ? noop :
+                ast.body.length === 1 ? expressions[0] :
+                    function(scope, locals) {
+                        var lastValue;
+                        forEach(expressions, function(exp) {
+                            lastValue = exp(scope, locals);
+                        });
+                        return lastValue;
+                    };
+            if (assign) {
+                fn.assign = function(scope, value, locals) {
+                    return assign(scope, locals, value);
+                };
+            }
+            if (inputs) {
+                fn.inputs = inputs;
+            }
+            return fn;
+        },
+
+        recurse: function(ast, context, create) {
+            var left, right, self = this, args;
+            if (ast.input) {
+                return this.inputs(ast.input, ast.watchId);
+            }
+            switch (ast.type) {
+                case AST.Literal:
+                    return this.value(ast.value, context);
+                case AST.UnaryExpression:
+                    right = this.recurse(ast.argument);
+                    return this['unary' + ast.operator](right, context);
+                case AST.BinaryExpression:
+                    left = this.recurse(ast.left);
+                    right = this.recurse(ast.right);
+                    return this['binary' + ast.operator](left, right, context);
+                case AST.LogicalExpression:
+                    left = this.recurse(ast.left);
+                    right = this.recurse(ast.right);
+                    return this['binary' + ast.operator](left, right, context);
+                case AST.ConditionalExpression:
+                    return this['ternary?:'](
+                        this.recurse(ast.test),
+                        this.recurse(ast.alternate),
+                        this.recurse(ast.consequent),
+                        context
+                    );
+                case AST.Identifier:
+                    return self.identifier(ast.name, context, create);
+                case AST.MemberExpression:
+                    left = this.recurse(ast.object, false, !!create);
+                    if (!ast.computed) {
+                        right = ast.property.name;
+                    }
+                    if (ast.computed) right = this.recurse(ast.property);
+                    return ast.computed ?
+                        this.computedMember(left, right, context, create) :
+                        this.nonComputedMember(left, right, context, create);
+                case AST.CallExpression:
+                    args = [];
+                    forEach(ast.arguments, function(expr) {
+                        args.push(self.recurse(expr));
+                    });
+                    if (ast.filter) right = this.$filter(ast.callee.name);
+                    if (!ast.filter) right = this.recurse(ast.callee, true);
+                    return ast.filter ?
+                        function(scope, locals, assign, inputs) {
+                            var values = [];
+                            for (var i = 0; i < args.length; ++i) {
+                                values.push(args[i](scope, locals, assign, inputs));
+                            }
+                            var value = right.apply(undefined, values, inputs);
+                            return context ? {context: undefined, name: undefined, value: value} : value;
+                        } :
+                        function(scope, locals, assign, inputs) {
+                            var rhs = right(scope, locals, assign, inputs);
+                            var value;
+                            if (rhs.value != null) {
+                                var values = [];
+                                for (var i = 0; i < args.length; ++i) {
+                                    values.push(args[i](scope, locals, assign, inputs));
+                                }
+                                value = rhs.value.apply(rhs.context, values);
+                            }
+                            return context ? {value: value} : value;
+                        };
+                case AST.AssignmentExpression:
+                    left = this.recurse(ast.left, true, 1);
+                    right = this.recurse(ast.right);
+                    return function(scope, locals, assign, inputs) {
+                        var lhs = left(scope, locals, assign, inputs);
+                        var rhs = right(scope, locals, assign, inputs);
+                        lhs.context[lhs.name] = rhs;
+                        return context ? {value: rhs} : rhs;
+                    };
+                case AST.ArrayExpression:
+                    args = [];
+                    forEach(ast.elements, function(expr) {
+                        args.push(self.recurse(expr));
+                    });
+                    return function(scope, locals, assign, inputs) {
+                        var value = [];
+                        for (var i = 0; i < args.length; ++i) {
+                            value.push(args[i](scope, locals, assign, inputs));
+                        }
+                        return context ? {value: value} : value;
+                    };
+                case AST.ObjectExpression:
+                    args = [];
+                    forEach(ast.properties, function(property) {
+                        if (property.computed) {
+                            args.push({key: self.recurse(property.key),
+                                computed: true,
+                                value: self.recurse(property.value)
+                            });
+                        } else {
+                            args.push({key: property.key.type === AST.Identifier ?
+                                    property.key.name :
+                                    ('' + property.key.value),
+                                computed: false,
+                                value: self.recurse(property.value)
+                            });
+                        }
+                    });
+                    return function(scope, locals, assign, inputs) {
+                        var value = {};
+                        for (var i = 0; i < args.length; ++i) {
+                            if (args[i].computed) {
+                                value[args[i].key(scope, locals, assign, inputs)] = args[i].value(scope, locals, assign, inputs);
+                            } else {
+                                value[args[i].key] = args[i].value(scope, locals, assign, inputs);
+                            }
+                        }
+                        return context ? {value: value} : value;
+                    };
+                case AST.ThisExpression:
+                    return function(scope) {
+                        return context ? {value: scope} : scope;
+                    };
+                case AST.LocalsExpression:
+                    return function(scope, locals) {
+                        return context ? {value: locals} : locals;
+                    };
+                case AST.NGValueParameter:
+                    return function(scope, locals, assign) {
+                        return context ? {value: assign} : assign;
+                    };
+            }
+        },
+
+        'unary+': function(argument, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = argument(scope, locals, assign, inputs);
+                if (isDefined(arg)) {
+                    arg = +arg;
+                } else {
+                    arg = 0;
+                }
+                return context ? {value: arg} : arg;
+            };
+        },
+        'unary-': function(argument, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = argument(scope, locals, assign, inputs);
+                if (isDefined(arg)) {
+                    arg = -arg;
+                } else {
+                    arg = -0;
+                }
+                return context ? {value: arg} : arg;
+            };
+        },
+        'unary!': function(argument, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = !argument(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary+': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var lhs = left(scope, locals, assign, inputs);
+                var rhs = right(scope, locals, assign, inputs);
+                var arg = plusFn(lhs, rhs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary-': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var lhs = left(scope, locals, assign, inputs);
+                var rhs = right(scope, locals, assign, inputs);
+                var arg = (isDefined(lhs) ? lhs : 0) - (isDefined(rhs) ? rhs : 0);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary*': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) * right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary/': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) / right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary%': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) % right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary===': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) === right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary!==': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) !== right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary==': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                // eslint-disable-next-line eqeqeq
+                var arg = left(scope, locals, assign, inputs) == right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary!=': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                // eslint-disable-next-line eqeqeq
+                var arg = left(scope, locals, assign, inputs) != right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary<': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) < right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary>': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) > right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary<=': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) <= right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary>=': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) >= right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary&&': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) && right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'binary||': function(left, right, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = left(scope, locals, assign, inputs) || right(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        'ternary?:': function(test, alternate, consequent, context) {
+            return function(scope, locals, assign, inputs) {
+                var arg = test(scope, locals, assign, inputs) ? alternate(scope, locals, assign, inputs) : consequent(scope, locals, assign, inputs);
+                return context ? {value: arg} : arg;
+            };
+        },
+        value: function(value, context) {
+            return function() { return context ? {context: undefined, name: undefined, value: value} : value; };
+        },
+        identifier: function(name, context, create) {
+            return function(scope, locals, assign, inputs) {
+                var base = locals && (name in locals) ? locals : scope;
+                if (create && create !== 1 && base && base[name] == null) {
+                    base[name] = {};
+                }
+                var value = base ? base[name] : undefined;
+                if (context) {
+                    return {context: base, name: name, value: value};
+                } else {
+                    return value;
+                }
+            };
+        },
+        computedMember: function(left, right, context, create) {
+            return function(scope, locals, assign, inputs) {
+                var lhs = left(scope, locals, assign, inputs);
+                var rhs;
+                var value;
+                if (lhs != null) {
+                    rhs = right(scope, locals, assign, inputs);
+                    rhs = getStringValue(rhs);
+                    if (create && create !== 1) {
+                        if (lhs && !(lhs[rhs])) {
+                            lhs[rhs] = {};
+                        }
+                    }
+                    value = lhs[rhs];
+                }
+                if (context) {
+                    return {context: lhs, name: rhs, value: value};
+                } else {
+                    return value;
+                }
+            };
+        },
+        nonComputedMember: function(left, right, context, create) {
+            return function(scope, locals, assign, inputs) {
+                var lhs = left(scope, locals, assign, inputs);
+                if (create && create !== 1) {
+                    if (lhs && lhs[right] == null) {
+                        lhs[right] = {};
+                    }
+                }
+                var value = lhs != null ? lhs[right] : undefined;
+                if (context) {
+                    return {context: lhs, name: right, value: value};
+                } else {
+                    return value;
+                }
+            };
+        },
+        inputs: function(input, watchId) {
+            return function(scope, value, locals, inputs) {
+                if (inputs) return inputs[watchId];
+                return input(scope, value, locals);
+            };
+        }
+    };
+
+    /**
+     * @constructor
+     */
+    function Parser(lexer, $filter, options) {
+        this.ast = new AST(lexer, options);
+        this.astCompiler = options.csp ? new ASTInterpreter($filter) :
+            new ASTCompiler($filter);
+    }
+
+    Parser.prototype = {
+        constructor: Parser,
+
+        parse: function(text) {
+            var ast = this.getAst(text);
+            var fn = this.astCompiler.compile(ast.ast);
+            fn.literal = isLiteral(ast.ast);
+            fn.constant = isConstant(ast.ast);
+            fn.oneTime = ast.oneTime;
+            return fn;
+        },
+
+        getAst: function(exp) {
+            var oneTime = false;
+            exp = exp.trim();
+
+            if (exp.charAt(0) === ':' && exp.charAt(1) === ':') {
+                oneTime = true;
+                exp = exp.substring(2);
+            }
+            return {
+                ast: this.ast.ast(exp),
+                oneTime: oneTime
+            };
+        }
+    };
+
+    function getValueOf(value) {
+        return isFunction(value.valueOf) ? value.valueOf() : objectValueOf.call(value);
+    }
+
+///////////////////////////////////
+
+    /**
+     * @ngdoc service
+     * @name $parse
+     * @kind function
      *
-     * # Chaining promises
+     * @description
      *
-     * Because calling the `then` method of a promise returns a new derived promise, it is easily
-     * possible to create a chain of promises:
+     * Converts AngularJS {@link guide/expression expression} into a function.
      *
      * ```js
-     *   promiseB = promiseA.then(function(result) {
- *     return result + 1;
- *   });
+     *   var getter = $parse('user.name');
+     *   var setter = getter.assign;
+     *   var context = {user:{name:'AngularJS'}};
+     *   var locals = {user:{name:'local'}};
      *
-     *   // promiseB will be resolved immediately after promiseA is resolved and its value
-     *   // will be the result of promiseA incremented by 1
+     *   expect(getter(context)).toEqual('AngularJS');
+     *   setter(context, 'newValue');
+     *   expect(context.user.name).toEqual('newValue');
+     *   expect(getter(context, locals)).toEqual('local');
      * ```
      *
-     * It is possible to create chains of any length and since a promise can be resolved with another
-     * promise (which will defer its resolution further), it is possible to pause/defer resolution of
-     * the promises at any point in the chain. This makes it possible to implement powerful APIs like
-     * $http's response interceptors.
      *
+     * @param {string} expression String expression to compile.
+     * @returns {function(context, locals)} a function which represents the compiled expression:
      *
-     * # Differences between Kris Kowal's Q and $q
-     *
-     *  There are two main differences:
-     *
-     * - $q is integrated with the {@link ng.$rootScope.Scope} Scope model observation
-     *   mechanism in angular, which means faster propagation of resolution or rejection into your
-     *   models and avoiding unnecessary browser repaints, which would result in flickering UI.
-     * - Q has many more features than $q, but that comes at a cost of bytes. $q is tiny, but contains
-     *   all the important functionality needed for common async tasks.
+     *    * `context` – `{object}` – an object against which any expressions embedded in the strings
+     *      are evaluated against (typically a scope object).
+     *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
+     *      `context`.
      *
-     *  # Testing
+     *    The returned function also has the following properties:
+     *      * `literal` – `{boolean}` – whether the expression's top-level node is a JavaScript
+     *        literal.
+     *      * `constant` – `{boolean}` – whether the expression is made entirely of JavaScript
+     *        constant literals.
+     *      * `assign` – `{?function(context, value)}` – if the expression is assignable, this will be
+     *        set to a function to change its value on the given context.
      *
-     *  ```js
-     *    it('should simulate promise', inject(function($q, $rootScope) {
- *      var deferred = $q.defer();
- *      var promise = deferred.promise;
- *      var resolvedValue;
- *
- *      promise.then(function(value) { resolvedValue = value; });
- *      expect(resolvedValue).toBeUndefined();
- *
- *      // Simulate resolving of promise
- *      deferred.resolve(123);
- *      // Note that the 'then' function does not get called synchronously.
- *      // This is because we want the promise API to always be async, whether or not
- *      // it got called synchronously or asynchronously.
- *      expect(resolvedValue).toBeUndefined();
- *
- *      // Propagate promise resolution to 'then' functions using $apply().
- *      $rootScope.$apply();
- *      expect(resolvedValue).toEqual(123);
- *    }));
-     *  ```
      */
-    function $QProvider() {
-
-        this.$get = ['$rootScope', '$exceptionHandler', function($rootScope, $exceptionHandler) {
-            return qFactory(function(callback) {
-                $rootScope.$evalAsync(callback);
-            }, $exceptionHandler);
-        }];
-    }
 
 
     /**
-     * Constructs a promise manager.
+     * @ngdoc provider
+     * @name $parseProvider
+     * @this
      *
-     * @param {function(Function)} nextTick Function for executing functions in the next turn.
-     * @param {function(...*)} exceptionHandler Function into which unexpected exceptions are passed for
-     *     debugging purposes.
-     * @returns {object} Promise manager.
+     * @description
+     * `$parseProvider` can be used for configuring the default behavior of the {@link ng.$parse $parse}
+     *  service.
      */
-    function qFactory(nextTick, exceptionHandler) {
+    function $ParseProvider() {
+        var cache = createMap();
+        var literals = {
+            'true': true,
+            'false': false,
+            'null': null,
+            'undefined': undefined
+        };
+        var identStart, identContinue;
+
+        /**
+         * @ngdoc method
+         * @name $parseProvider#addLiteral
+         * @description
+         *
+         * Configure $parse service to add literal values that will be present as literal at expressions.
+         *
+         * @param {string} literalName Token for the literal value. The literal name value must be a valid literal name.
+         * @param {*} literalValue Value for this literal. All literal values must be primitives or `undefined`.
+         *
+         **/
+        this.addLiteral = function(literalName, literalValue) {
+            literals[literalName] = literalValue;
+        };
 
         /**
          * @ngdoc method
-         * @name $q#defer
-         * @function
+         * @name $parseProvider#setIdentifierFns
          *
          * @description
-         * Creates a `Deferred` object which represents a task which will finish in the future.
          *
-         * @returns {Deferred} Returns a new instance of deferred.
+         * Allows defining the set of characters that are allowed in AngularJS expressions. The function
+         * `identifierStart` will get called to know if a given character is a valid character to be the
+         * first character for an identifier. The function `identifierContinue` will get called to know if
+         * a given character is a valid character to be a follow-up identifier character. The functions
+         * `identifierStart` and `identifierContinue` will receive as arguments the single character to be
+         * identifier and the character code point. These arguments will be `string` and `numeric`. Keep in
+         * mind that the `string` parameter can be two characters long depending on the character
+         * representation. It is expected for the function to return `true` or `false`, whether that
+         * character is allowed or not.
+         *
+         * Since this function will be called extensively, keep the implementation of these functions fast,
+         * as the performance of these functions have a direct impact on the expressions parsing speed.
+         *
+         * @param {function=} identifierStart The function that will decide whether the given character is
+         *   a valid identifier start character.
+         * @param {function=} identifierContinue The function that will decide whether the given character is
+         *   a valid identifier continue character.
          */
-        var defer = function() {
-            var pending = [],
-                value, deferred;
-
-            deferred = {
-
-                resolve: function(val) {
-                    if (pending) {
-                        var callbacks = pending;
-                        pending = undefined;
-                        value = ref(val);
-
-                        if (callbacks.length) {
-                            nextTick(function() {
-                                var callback;
-                                for (var i = 0, ii = callbacks.length; i < ii; i++) {
-                                    callback = callbacks[i];
-                                    value.then(callback[0], callback[1], callback[2]);
-                                }
-                            });
+        this.setIdentifierFns = function(identifierStart, identifierContinue) {
+            identStart = identifierStart;
+            identContinue = identifierContinue;
+            return this;
+        };
+
+        this.$get = ['$filter', function($filter) {
+            var noUnsafeEval = csp().noUnsafeEval;
+            var $parseOptions = {
+                csp: noUnsafeEval,
+                literals: copy(literals),
+                isIdentifierStart: isFunction(identStart) && identStart,
+                isIdentifierContinue: isFunction(identContinue) && identContinue
+            };
+            $parse.$$getAst = $$getAst;
+            return $parse;
+
+            function $parse(exp, interceptorFn) {
+                var parsedExpression, cacheKey;
+
+                switch (typeof exp) {
+                    case 'string':
+                        exp = exp.trim();
+                        cacheKey = exp;
+
+                        parsedExpression = cache[cacheKey];
+
+                        if (!parsedExpression) {
+                            var lexer = new Lexer($parseOptions);
+                            var parser = new Parser(lexer, $filter, $parseOptions);
+                            parsedExpression = parser.parse(exp);
+                            if (parsedExpression.constant) {
+                                parsedExpression.$$watchDelegate = constantWatchDelegate;
+                            } else if (parsedExpression.oneTime) {
+                                parsedExpression.$$watchDelegate = parsedExpression.literal ?
+                                    oneTimeLiteralWatchDelegate : oneTimeWatchDelegate;
+                            } else if (parsedExpression.inputs) {
+                                parsedExpression.$$watchDelegate = inputsWatchDelegate;
+                            }
+                            cache[cacheKey] = parsedExpression;
                         }
-                    }
-                },
+                        return addInterceptor(parsedExpression, interceptorFn);
 
+                    case 'function':
+                        return addInterceptor(exp, interceptorFn);
 
-                reject: function(reason) {
-                    deferred.resolve(createInternalRejectedPromise(reason));
-                },
+                    default:
+                        return addInterceptor(noop, interceptorFn);
+                }
+            }
 
+            function $$getAst(exp) {
+                var lexer = new Lexer($parseOptions);
+                var parser = new Parser(lexer, $filter, $parseOptions);
+                return parser.getAst(exp).ast;
+            }
 
-                notify: function(progress) {
-                    if (pending) {
-                        var callbacks = pending;
+            function expressionInputDirtyCheck(newValue, oldValueOfValue, compareObjectIdentity) {
 
-                        if (pending.length) {
-                            nextTick(function() {
-                                var callback;
-                                for (var i = 0, ii = callbacks.length; i < ii; i++) {
-                                    callback = callbacks[i];
-                                    callback[2](progress);
-                                }
-                            });
-                        }
-                    }
-                },
+                if (newValue == null || oldValueOfValue == null) { // null/undefined
+                    return newValue === oldValueOfValue;
+                }
 
+                if (typeof newValue === 'object') {
 
-                promise: {
-                    then: function(callback, errback, progressback) {
-                        var result = defer();
+                    // attempt to convert the value to a primitive type
+                    // TODO(docs): add a note to docs that by implementing valueOf even objects and arrays can
+                    //             be cheaply dirty-checked
+                    newValue = getValueOf(newValue);
 
-                        var wrappedCallback = function(value) {
-                            try {
-                                result.resolve((isFunction(callback) ? callback : defaultCallback)(value));
-                            } catch(e) {
-                                result.reject(e);
-                                exceptionHandler(e);
-                            }
-                        };
+                    if (typeof newValue === 'object' && !compareObjectIdentity) {
+                        // objects/arrays are not supported - deep-watching them would be too expensive
+                        return false;
+                    }
 
-                        var wrappedErrback = function(reason) {
-                            try {
-                                result.resolve((isFunction(errback) ? errback : defaultErrback)(reason));
-                            } catch(e) {
-                                result.reject(e);
-                                exceptionHandler(e);
-                            }
-                        };
+                    // fall-through to the primitive equality check
+                }
 
-                        var wrappedProgressback = function(progress) {
-                            try {
-                                result.notify((isFunction(progressback) ? progressback : defaultCallback)(progress));
-                            } catch(e) {
-                                exceptionHandler(e);
-                            }
-                        };
+                //Primitive or NaN
+                // eslint-disable-next-line no-self-compare
+                return newValue === oldValueOfValue || (newValue !== newValue && oldValueOfValue !== oldValueOfValue);
+            }
 
-                        if (pending) {
-                            pending.push([wrappedCallback, wrappedErrback, wrappedProgressback]);
-                        } else {
-                            value.then(wrappedCallback, wrappedErrback, wrappedProgressback);
+            function inputsWatchDelegate(scope, listener, objectEquality, parsedExpression, prettyPrintExpression) {
+                var inputExpressions = parsedExpression.inputs;
+                var lastResult;
+
+                if (inputExpressions.length === 1) {
+                    var oldInputValueOf = expressionInputDirtyCheck; // init to something unique so that equals check fails
+                    inputExpressions = inputExpressions[0];
+                    return scope.$watch(function expressionInputWatch(scope) {
+                        var newInputValue = inputExpressions(scope);
+                        if (!expressionInputDirtyCheck(newInputValue, oldInputValueOf, inputExpressions.isPure)) {
+                            lastResult = parsedExpression(scope, undefined, undefined, [newInputValue]);
+                            oldInputValueOf = newInputValue && getValueOf(newInputValue);
                         }
+                        return lastResult;
+                    }, listener, objectEquality, prettyPrintExpression);
+                }
 
-                        return result.promise;
-                    },
-
-                    "catch": function(callback) {
-                        return this.then(null, callback);
-                    },
+                var oldInputValueOfValues = [];
+                var oldInputValues = [];
+                for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
+                    oldInputValueOfValues[i] = expressionInputDirtyCheck; // init to something unique so that equals check fails
+                    oldInputValues[i] = null;
+                }
 
-                    "finally": function(callback) {
+                return scope.$watch(function expressionInputsWatch(scope) {
+                    var changed = false;
 
-                        function makePromise(value, resolved) {
-                            var result = defer();
-                            if (resolved) {
-                                result.resolve(value);
-                            } else {
-                                result.reject(value);
-                            }
-                            return result.promise;
-                        }
-
-                        function handleCallback(value, isResolved) {
-                            var callbackOutput = null;
-                            try {
-                                callbackOutput = (callback ||defaultCallback)();
-                            } catch(e) {
-                                return makePromise(e, false);
-                            }
-                            if (callbackOutput && isFunction(callbackOutput.then)) {
-                                return callbackOutput.then(function() {
-                                    return makePromise(value, isResolved);
-                                }, function(error) {
-                                    return makePromise(error, false);
-                                });
-                            } else {
-                                return makePromise(value, isResolved);
-                            }
+                    for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
+                        var newInputValue = inputExpressions[i](scope);
+                        if (changed || (changed = !expressionInputDirtyCheck(newInputValue, oldInputValueOfValues[i], inputExpressions[i].isPure))) {
+                            oldInputValues[i] = newInputValue;
+                            oldInputValueOfValues[i] = newInputValue && getValueOf(newInputValue);
                         }
+                    }
 
-                        return this.then(function(value) {
-                            return handleCallback(value, true);
-                        }, function(error) {
-                            return handleCallback(error, false);
-                        });
+                    if (changed) {
+                        lastResult = parsedExpression(scope, undefined, undefined, oldInputValues);
                     }
-                }
-            };
 
-            return deferred;
-        };
+                    return lastResult;
+                }, listener, objectEquality, prettyPrintExpression);
+            }
 
+            function oneTimeWatchDelegate(scope, listener, objectEquality, parsedExpression, prettyPrintExpression) {
+                var unwatch, lastValue;
+                if (parsedExpression.inputs) {
+                    unwatch = inputsWatchDelegate(scope, oneTimeListener, objectEquality, parsedExpression, prettyPrintExpression);
+                } else {
+                    unwatch = scope.$watch(oneTimeWatch, oneTimeListener, objectEquality);
+                }
+                return unwatch;
 
-        var ref = function(value) {
-            if (value && isFunction(value.then)) return value;
-            return {
-                then: function(callback) {
-                    var result = defer();
-                    nextTick(function() {
-                        result.resolve(callback(value));
-                    });
-                    return result.promise;
+                function oneTimeWatch(scope) {
+                    return parsedExpression(scope);
                 }
-            };
-        };
+                function oneTimeListener(value, old, scope) {
+                    lastValue = value;
+                    if (isFunction(listener)) {
+                        listener(value, old, scope);
+                    }
+                    if (isDefined(value)) {
+                        scope.$$postDigest(function() {
+                            if (isDefined(lastValue)) {
+                                unwatch();
+                            }
+                        });
+                    }
+                }
+            }
 
+            function oneTimeLiteralWatchDelegate(scope, listener, objectEquality, parsedExpression) {
+                var unwatch, lastValue;
+                unwatch = scope.$watch(function oneTimeWatch(scope) {
+                    return parsedExpression(scope);
+                }, function oneTimeListener(value, old, scope) {
+                    lastValue = value;
+                    if (isFunction(listener)) {
+                        listener(value, old, scope);
+                    }
+                    if (isAllDefined(value)) {
+                        scope.$$postDigest(function() {
+                            if (isAllDefined(lastValue)) unwatch();
+                        });
+                    }
+                }, objectEquality);
 
-        /**
-         * @ngdoc method
-         * @name $q#reject
-         * @function
-         *
-         * @description
-         * Creates a promise that is resolved as rejected with the specified `reason`. This api should be
-         * used to forward rejection in a chain of promises. If you are dealing with the last promise in
-         * a promise chain, you don't need to worry about it.
-         *
-         * When comparing deferreds/promises to the familiar behavior of try/catch/throw, think of
-         * `reject` as the `throw` keyword in JavaScript. This also means that if you "catch" an error via
-         * a promise error callback and you want to forward the error to the promise derived from the
-         * current promise, you have to "rethrow" the error by returning a rejection constructed via
-         * `reject`.
-         *
-         * ```js
-         *   promiseB = promiseA.then(function(result) {
-   *     // success: do something and resolve promiseB
-   *     //          with the old or a new result
-   *     return result;
-   *   }, function(reason) {
-   *     // error: handle the error if possible and
-   *     //        resolve promiseB with newPromiseOrValue,
-   *     //        otherwise forward the rejection to promiseB
-   *     if (canHandle(reason)) {
-   *      // handle the error and recover
-   *      return newPromiseOrValue;
-   *     }
-   *     return $q.reject(reason);
-   *   });
-         * ```
-         *
-         * @param {*} reason Constant, message, exception or an object representing the rejection reason.
-         * @returns {Promise} Returns a promise that was already resolved as rejected with the `reason`.
-         */
-        var reject = function(reason) {
-            var result = defer();
-            result.reject(reason);
-            return result.promise;
-        };
+                return unwatch;
 
-        var createInternalRejectedPromise = function(reason) {
-            return {
-                then: function(callback, errback) {
-                    var result = defer();
-                    nextTick(function() {
-                        try {
-                            result.resolve((isFunction(errback) ? errback : defaultErrback)(reason));
-                        } catch(e) {
-                            result.reject(e);
-                            exceptionHandler(e);
-                        }
+                function isAllDefined(value) {
+                    var allDefined = true;
+                    forEach(value, function(val) {
+                        if (!isDefined(val)) allDefined = false;
                     });
-                    return result.promise;
+                    return allDefined;
                 }
-            };
-        };
-
+            }
 
-        /**
-         * @ngdoc method
-         * @name $q#when
-         * @function
-         *
-         * @description
-         * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise.
-         * This is useful when you are dealing with an object that might or might not be a promise, or if
-         * the promise comes from a source that can't be trusted.
-         *
-         * @param {*} value Value or a promise
-         * @returns {Promise} Returns a promise of the passed value or promise
-         */
-        var when = function(value, callback, errback, progressback) {
-            var result = defer(),
-                done;
+            function constantWatchDelegate(scope, listener, objectEquality, parsedExpression) {
+                var unwatch = scope.$watch(function constantWatch(scope) {
+                    unwatch();
+                    return parsedExpression(scope);
+                }, listener, objectEquality);
+                return unwatch;
+            }
 
-            var wrappedCallback = function(value) {
-                try {
-                    return (isFunction(callback) ? callback : defaultCallback)(value);
-                } catch (e) {
-                    exceptionHandler(e);
-                    return reject(e);
-                }
-            };
+            function addInterceptor(parsedExpression, interceptorFn) {
+                if (!interceptorFn) return parsedExpression;
+                var watchDelegate = parsedExpression.$$watchDelegate;
+                var useInputs = false;
+
+                var regularWatch =
+                    watchDelegate !== oneTimeLiteralWatchDelegate &&
+                    watchDelegate !== oneTimeWatchDelegate;
+
+                var fn = regularWatch ? function regularInterceptedExpression(scope, locals, assign, inputs) {
+                    var value = useInputs && inputs ? inputs[0] : parsedExpression(scope, locals, assign, inputs);
+                    return interceptorFn(value, scope, locals);
+                } : function oneTimeInterceptedExpression(scope, locals, assign, inputs) {
+                    var value = parsedExpression(scope, locals, assign, inputs);
+                    var result = interceptorFn(value, scope, locals);
+                    // we only return the interceptor's result if the
+                    // initial value is defined (for bind-once)
+                    return isDefined(value) ? result : value;
+                };
 
-            var wrappedErrback = function(reason) {
-                try {
-                    return (isFunction(errback) ? errback : defaultErrback)(reason);
-                } catch (e) {
-                    exceptionHandler(e);
-                    return reject(e);
+                // Propagate $$watchDelegates other then inputsWatchDelegate
+                useInputs = !parsedExpression.inputs;
+                if (watchDelegate && watchDelegate !== inputsWatchDelegate) {
+                    fn.$$watchDelegate = watchDelegate;
+                    fn.inputs = parsedExpression.inputs;
+                } else if (!interceptorFn.$stateful) {
+                    // Treat interceptor like filters - assume non-stateful by default and use the inputsWatchDelegate
+                    fn.$$watchDelegate = inputsWatchDelegate;
+                    fn.inputs = parsedExpression.inputs ? parsedExpression.inputs : [parsedExpression];
                 }
-            };
 
-            var wrappedProgressback = function(progress) {
-                try {
-                    return (isFunction(progressback) ? progressback : defaultCallback)(progress);
-                } catch (e) {
-                    exceptionHandler(e);
+                if (fn.inputs) {
+                    fn.inputs = fn.inputs.map(function(e) {
+                        // Remove the isPure flag of inputs when it is not absolute because they are now wrapped in a
+                        // potentially non-pure interceptor function.
+                        if (e.isPure === PURITY_RELATIVE) {
+                            return function depurifier(s) { return e(s); };
+                        }
+                        return e;
+                    });
                 }
-            };
-
-            nextTick(function() {
-                ref(value).then(function(value) {
-                    if (done) return;
-                    done = true;
-                    result.resolve(ref(value).then(wrappedCallback, wrappedErrback, wrappedProgressback));
-                }, function(reason) {
-                    if (done) return;
-                    done = true;
-                    result.resolve(wrappedErrback(reason));
-                }, function(progress) {
-                    if (done) return;
-                    result.notify(wrappedProgressback(progress));
-                });
-            });
-
-            return result.promise;
-        };
-
-
-        function defaultCallback(value) {
-            return value;
-        }
-
-
-        function defaultErrback(reason) {
-            return reject(reason);
-        }
-
-
-        /**
-         * @ngdoc method
-         * @name $q#all
-         * @function
-         *
-         * @description
-         * Combines multiple promises into a single promise that is resolved when all of the input
-         * promises are resolved.
-         *
-         * @param {Array.<Promise>|Object.<Promise>} promises An array or hash of promises.
-         * @returns {Promise} Returns a single promise that will be resolved with an array/hash of values,
-         *   each value corresponding to the promise at the same index/key in the `promises` array/hash.
-         *   If any of the promises is resolved with a rejection, this resulting promise will be rejected
-         *   with the same rejection value.
-         */
-        function all(promises) {
-            var deferred = defer(),
-                counter = 0,
-                results = isArray(promises) ? [] : {};
-
-            forEach(promises, function(promise, key) {
-                counter++;
-                ref(promise).then(function(value) {
-                    if (results.hasOwnProperty(key)) return;
-                    results[key] = value;
-                    if (!(--counter)) deferred.resolve(results);
-                }, function(reason) {
-                    if (results.hasOwnProperty(key)) return;
-                    deferred.reject(reason);
-                });
-            });
-
-            if (counter === 0) {
-                deferred.resolve(results);
-            }
-
-            return deferred.promise;
-        }
-
-        return {
-            defer: defer,
-            reject: reject,
-            when: when,
-            all: all
-        };
-    }
-
-    function $$RAFProvider(){ //rAF
-        this.$get = ['$window', '$timeout', function($window, $timeout) {
-            var requestAnimationFrame = $window.requestAnimationFrame ||
-                $window.webkitRequestAnimationFrame ||
-                $window.mozRequestAnimationFrame;
-
-            var cancelAnimationFrame = $window.cancelAnimationFrame ||
-                $window.webkitCancelAnimationFrame ||
-                $window.mozCancelAnimationFrame ||
-                $window.webkitCancelRequestAnimationFrame;
 
-            var rafSupported = !!requestAnimationFrame;
-            var raf = rafSupported
-                ? function(fn) {
-                var id = requestAnimationFrame(fn);
-                return function() {
-                    cancelAnimationFrame(id);
-                };
+                return fn;
             }
-                : function(fn) {
-                var timer = $timeout(fn, 16.66, false); // 1000 / 60 = 16.666
-                return function() {
-                    $timeout.cancel(timer);
-                };
-            };
-
-            raf.supported = rafSupported;
-
-            return raf;
         }];
     }
 
     /**
-     * DESIGN NOTES
+     * @ngdoc service
+     * @name $q
+     * @requires $rootScope
      *
-     * The design decisions behind the scope are heavily favored for speed and memory consumption.
+     * @description
+     * A service that helps you run functions asynchronously, and use their return values (or exceptions)
+     * when they are done processing.
      *
-     * The typical use of scope is to watch the expressions, which most of the time return the same
-     * value as last time so we optimize the operation.
+     * This is a [Promises/A+](https://promisesaplus.com/)-compliant implementation of promises/deferred
+     * objects inspired by [Kris Kowal's Q](https://github.com/kriskowal/q).
      *
-     * Closures construction is expensive in terms of speed as well as memory:
-     *   - No closures, instead use prototypical inheritance for API
-     *   - Internal state needs to be stored on scope directly, which means that private state is
-     *     exposed as $$____ properties
+     * $q can be used in two fashions --- one which is more similar to Kris Kowal's Q or jQuery's Deferred
+     * implementations, and the other which resembles ES6 (ES2015) promises to some degree.
      *
-     * Loop operations are optimized by using while(count--) { ... }
-     *   - this means that in order to keep the same order of execution as addition we have to add
-     *     items to the array at the beginning (shift) instead of at the end (push)
+     * ## $q constructor
      *
-     * Child scopes are created and removed often
-     *   - Using an array would be slow since inserts in middle are expensive so we use linked list
+     * The streamlined ES6 style promise is essentially just using $q as a constructor which takes a `resolver`
+     * function as the first argument. This is similar to the native Promise implementation from ES6,
+     * see [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise).
      *
-     * There are few watches then a lot of observers. This is why you don't want the observer to be
-     * implemented in the same way as watch. Watch requires return of initialization function which
-     * are expensive to construct.
-     */
-
-
-    /**
-     * @ngdoc provider
-     * @name $rootScopeProvider
-     * @description
+     * While the constructor-style use is supported, not all of the supporting methods from ES6 promises are
+     * available yet.
      *
-     * Provider for the $rootScope service.
-     */
-
-    /**
-     * @ngdoc method
-     * @name $rootScopeProvider#digestTtl
-     * @description
+     * It can be used like so:
      *
-     * Sets the number of `$digest` iterations the scope should attempt to execute before giving up and
-     * assuming that the model is unstable.
+     * ```js
+     *   // for the purpose of this example let's assume that variables `$q` and `okToGreet`
+     *   // are available in the current lexical scope (they could have been injected or passed in).
      *
-     * The current default is 10 iterations.
+     *   function asyncGreet(name) {
+     *     // perform some asynchronous operation, resolve or reject the promise when appropriate.
+     *     return $q(function(resolve, reject) {
+     *       setTimeout(function() {
+     *         if (okToGreet(name)) {
+     *           resolve('Hello, ' + name + '!');
+     *         } else {
+     *           reject('Greeting ' + name + ' is not allowed.');
+     *         }
+     *       }, 1000);
+     *     });
+     *   }
      *
-     * In complex applications it's possible that the dependencies between `$watch`s will result in
-     * several digest iterations. However if an application needs more than the default 10 digest
-     * iterations for its model to stabilize then you should investigate what is causing the model to
-     * continuously change during the digest.
+     *   var promise = asyncGreet('Robin Hood');
+     *   promise.then(function(greeting) {
+     *     alert('Success: ' + greeting);
+     *   }, function(reason) {
+     *     alert('Failed: ' + reason);
+     *   });
+     * ```
      *
-     * Increasing the TTL could have performance implications, so you should not change it without
-     * proper justification.
+     * Note: progress/notify callbacks are not currently supported via the ES6-style interface.
      *
-     * @param {number} limit The number of digest iterations.
-     */
-
-
-    /**
-     * @ngdoc service
-     * @name $rootScope
-     * @description
+     * Note: unlike ES6 behavior, an exception thrown in the constructor function will NOT implicitly reject the promise.
      *
-     * Every application has a single root {@link ng.$rootScope.Scope scope}.
-     * All other scopes are descendant scopes of the root scope. Scopes provide separation
-     * between the model and the view, via a mechanism for watching the model for changes.
-     * They also provide an event emission/broadcast and subscription facility. See the
-     * {@link guide/scope developer guide on scopes}.
-     */
-    function $RootScopeProvider(){
-        var TTL = 10;
-        var $rootScopeMinErr = minErr('$rootScope');
-        var lastDirtyWatch = null;
-
-        this.digestTtl = function(value) {
-            if (arguments.length) {
-                TTL = value;
-            }
-            return TTL;
-        };
-
-        this.$get = ['$injector', '$exceptionHandler', '$parse', '$browser',
-            function( $injector,   $exceptionHandler,   $parse,   $browser) {
-
-                /**
-                 * @ngdoc type
-                 * @name $rootScope.Scope
-                 *
-                 * @description
-                 * A root scope can be retrieved using the {@link ng.$rootScope $rootScope} key from the
-                 * {@link auto.$injector $injector}. Child scopes are created using the
-                 * {@link ng.$rootScope.Scope#$new $new()} method. (Most scopes are created automatically when
-                 * compiled HTML template is executed.)
-                 *
-                 * Here is a simple scope snippet to show how you can interact with the scope.
-                 * ```html
-                 * <file src="./test/ng/rootScopeSpec.js" tag="docs1" />
-                 * ```
-                 *
-                 * # Inheritance
-                 * A scope can inherit from a parent scope, as in this example:
-                 * ```js
-                 var parent = $rootScope;
-                 var child = parent.$new();
-
-                 parent.salutation = "Hello";
-                 child.name = "World";
-                 expect(child.salutation).toEqual('Hello');
-
-                 child.salutation = "Welcome";
-                 expect(child.salutation).toEqual('Welcome');
-                 expect(parent.salutation).toEqual('Hello');
-                 * ```
-                 *
-                 *
-                 * @param {Object.<string, function()>=} providers Map of service factory which need to be
-                 *                                       provided for the current scope. Defaults to {@link ng}.
-                 * @param {Object.<string, *>=} instanceCache Provides pre-instantiated services which should
-                 *                              append/override services provided by `providers`. This is handy
-                 *                              when unit-testing and having the need to override a default
-                 *                              service.
-                 * @returns {Object} Newly created scope.
-                 *
-                 */
-                function Scope() {
-                    this.$id = nextUid();
-                    this.$$phase = this.$parent = this.$$watchers =
-                        this.$$nextSibling = this.$$prevSibling =
-                            this.$$childHead = this.$$childTail = null;
-                    this['this'] = this.$root =  this;
-                    this.$$destroyed = false;
-                    this.$$asyncQueue = [];
-                    this.$$postDigestQueue = [];
-                    this.$$listeners = {};
-                    this.$$listenerCount = {};
-                    this.$$isolateBindings = {};
-                }
+     * However, the more traditional CommonJS-style usage is still available, and documented below.
+     *
+     * [The CommonJS Promise proposal](http://wiki.commonjs.org/wiki/Promises) describes a promise as an
+     * interface for interacting with an object that represents the result of an action that is
+     * performed asynchronously, and may or may not be finished at any given point in time.
+     *
+     * From the perspective of dealing with error handling, deferred and promise APIs are to
+     * asynchronous programming what `try`, `catch` and `throw` keywords are to synchronous programming.
+     *
+     * ```js
+     *   // for the purpose of this example let's assume that variables `$q` and `okToGreet`
+     *   // are available in the current lexical scope (they could have been injected or passed in).
+     *
+     *   function asyncGreet(name) {
+     *     var deferred = $q.defer();
+     *
+     *     setTimeout(function() {
+     *       deferred.notify('About to greet ' + name + '.');
+     *
+     *       if (okToGreet(name)) {
+     *         deferred.resolve('Hello, ' + name + '!');
+     *       } else {
+     *         deferred.reject('Greeting ' + name + ' is not allowed.');
+     *       }
+     *     }, 1000);
+     *
+     *     return deferred.promise;
+     *   }
+     *
+     *   var promise = asyncGreet('Robin Hood');
+     *   promise.then(function(greeting) {
+     *     alert('Success: ' + greeting);
+     *   }, function(reason) {
+     *     alert('Failed: ' + reason);
+     *   }, function(update) {
+     *     alert('Got notification: ' + update);
+     *   });
+     * ```
+     *
+     * At first it might not be obvious why this extra complexity is worth the trouble. The payoff
+     * comes in the way of guarantees that promise and deferred APIs make, see
+     * https://github.com/kriskowal/uncommonjs/blob/master/promises/specification.md.
+     *
+     * Additionally the promise api allows for composition that is very hard to do with the
+     * traditional callback ([CPS](http://en.wikipedia.org/wiki/Continuation-passing_style)) approach.
+     * For more on this please see the [Q documentation](https://github.com/kriskowal/q) especially the
+     * section on serial or parallel joining of promises.
+     *
+     * ## The Deferred API
+     *
+     * A new instance of deferred is constructed by calling `$q.defer()`.
+     *
+     * The purpose of the deferred object is to expose the associated Promise instance as well as APIs
+     * that can be used for signaling the successful or unsuccessful completion, as well as the status
+     * of the task.
+     *
+     * **Methods**
+     *
+     * - `resolve(value)` – resolves the derived promise with the `value`. If the value is a rejection
+     *   constructed via `$q.reject`, the promise will be rejected instead.
+     * - `reject(reason)` – rejects the derived promise with the `reason`. This is equivalent to
+     *   resolving it with a rejection constructed via `$q.reject`.
+     * - `notify(value)` - provides updates on the status of the promise's execution. This may be called
+     *   multiple times before the promise is either resolved or rejected.
+     *
+     * **Properties**
+     *
+     * - promise – `{Promise}` – promise object associated with this deferred.
+     *
+     *
+     * ## The Promise API
+     *
+     * A new promise instance is created when a deferred instance is created and can be retrieved by
+     * calling `deferred.promise`.
+     *
+     * The purpose of the promise object is to allow for interested parties to get access to the result
+     * of the deferred task when it completes.
+     *
+     * **Methods**
+     *
+     * - `then(successCallback, [errorCallback], [notifyCallback])` – regardless of when the promise was or
+     *   will be resolved or rejected, `then` calls one of the success or error callbacks asynchronously
+     *   as soon as the result is available. The callbacks are called with a single argument: the result
+     *   or rejection reason. Additionally, the notify callback may be called zero or more times to
+     *   provide a progress indication, before the promise is resolved or rejected.
+     *
+     *   This method *returns a new promise* which is resolved or rejected via the return value of the
+     *   `successCallback`, `errorCallback` (unless that value is a promise, in which case it is resolved
+     *   with the value which is resolved in that promise using
+     *   [promise chaining](http://www.html5rocks.com/en/tutorials/es6/promises/#toc-promises-queues)).
+     *   It also notifies via the return value of the `notifyCallback` method. The promise cannot be
+     *   resolved or rejected from the notifyCallback method. The errorCallback and notifyCallback
+     *   arguments are optional.
+     *
+     * - `catch(errorCallback)` – shorthand for `promise.then(null, errorCallback)`
+     *
+     * - `finally(callback, notifyCallback)` – allows you to observe either the fulfillment or rejection of a promise,
+     *   but to do so without modifying the final value. This is useful to release resources or do some
+     *   clean-up that needs to be done whether the promise was rejected or resolved. See the [full
+     *   specification](https://github.com/kriskowal/q/wiki/API-Reference#promisefinallycallback) for
+     *   more information.
+     *
+     * ## Chaining promises
+     *
+     * Because calling the `then` method of a promise returns a new derived promise, it is easily
+     * possible to create a chain of promises:
+     *
+     * ```js
+     *   promiseB = promiseA.then(function(result) {
+     *     return result + 1;
+     *   });
+     *
+     *   // promiseB will be resolved immediately after promiseA is resolved and its value
+     *   // will be the result of promiseA incremented by 1
+     * ```
+     *
+     * It is possible to create chains of any length and since a promise can be resolved with another
+     * promise (which will defer its resolution further), it is possible to pause/defer resolution of
+     * the promises at any point in the chain. This makes it possible to implement powerful APIs like
+     * $http's response interceptors.
+     *
+     *
+     * ## Differences between Kris Kowal's Q and $q
+     *
+     *  There are two main differences:
+     *
+     * - $q is integrated with the {@link ng.$rootScope.Scope} Scope model observation
+     *   mechanism in AngularJS, which means faster propagation of resolution or rejection into your
+     *   models and avoiding unnecessary browser repaints, which would result in flickering UI.
+     * - Q has many more features than $q, but that comes at a cost of bytes. $q is tiny, but contains
+     *   all the important functionality needed for common async tasks.
+     *
+     * ## Testing
+     *
+     *  ```js
+     *    it('should simulate promise', inject(function($q, $rootScope) {
+     *      var deferred = $q.defer();
+     *      var promise = deferred.promise;
+     *      var resolvedValue;
+     *
+     *      promise.then(function(value) { resolvedValue = value; });
+     *      expect(resolvedValue).toBeUndefined();
+     *
+     *      // Simulate resolving of promise
+     *      deferred.resolve(123);
+     *      // Note that the 'then' function does not get called synchronously.
+     *      // This is because we want the promise API to always be async, whether or not
+     *      // it got called synchronously or asynchronously.
+     *      expect(resolvedValue).toBeUndefined();
+     *
+     *      // Propagate promise resolution to 'then' functions using $apply().
+     *      $rootScope.$apply();
+     *      expect(resolvedValue).toEqual(123);
+     *    }));
+     *  ```
+     *
+     * @param {function(function, function)} resolver Function which is responsible for resolving or
+     *   rejecting the newly created promise. The first parameter is a function which resolves the
+     *   promise, the second parameter is a function which rejects the promise.
+     *
+     * @returns {Promise} The newly created promise.
+     */
+    /**
+     * @ngdoc provider
+     * @name $qProvider
+     * @this
+     *
+     * @description
+     */
+    function $QProvider() {
+        var errorOnUnhandledRejections = true;
+        this.$get = ['$rootScope', '$exceptionHandler', function($rootScope, $exceptionHandler) {
+            return qFactory(function(callback) {
+                $rootScope.$evalAsync(callback);
+            }, $exceptionHandler, errorOnUnhandledRejections);
+        }];
 
-                /**
-                 * @ngdoc property
-                 * @name $rootScope.Scope#$id
-                 * @returns {number} Unique scope ID (monotonically increasing alphanumeric sequence) useful for
-                 *   debugging.
-                 */
+        /**
+         * @ngdoc method
+         * @name $qProvider#errorOnUnhandledRejections
+         * @kind function
+         *
+         * @description
+         * Retrieves or overrides whether to generate an error when a rejected promise is not handled.
+         * This feature is enabled by default.
+         *
+         * @param {boolean=} value Whether to generate an error when a rejected promise is not handled.
+         * @returns {boolean|ng.$qProvider} Current value when called without a new value or self for
+         *    chaining otherwise.
+         */
+        this.errorOnUnhandledRejections = function(value) {
+            if (isDefined(value)) {
+                errorOnUnhandledRejections = value;
+                return this;
+            } else {
+                return errorOnUnhandledRejections;
+            }
+        };
+    }
 
+    /** @this */
+    function $$QProvider() {
+        var errorOnUnhandledRejections = true;
+        this.$get = ['$browser', '$exceptionHandler', function($browser, $exceptionHandler) {
+            return qFactory(function(callback) {
+                $browser.defer(callback);
+            }, $exceptionHandler, errorOnUnhandledRejections);
+        }];
 
-                Scope.prototype = {
-                    constructor: Scope,
-                    /**
-                     * @ngdoc method
-                     * @name $rootScope.Scope#$new
-                     * @function
-                     *
-                     * @description
-                     * Creates a new child {@link ng.$rootScope.Scope scope}.
-                     *
-                     * The parent scope will propagate the {@link ng.$rootScope.Scope#$digest $digest()} and
-                     * {@link ng.$rootScope.Scope#$digest $digest()} events. The scope can be removed from the
-                     * scope hierarchy using {@link ng.$rootScope.Scope#$destroy $destroy()}.
-                     *
-                     * {@link ng.$rootScope.Scope#$destroy $destroy()} must be called on a scope when it is
-                     * desired for the scope and its child scopes to be permanently detached from the parent and
-                     * thus stop participating in model change detection and listener notification by invoking.
-                     *
-                     * @param {boolean} isolate If true, then the scope does not prototypically inherit from the
-                     *         parent scope. The scope is isolated, as it can not see parent scope properties.
-                     *         When creating widgets, it is useful for the widget to not accidentally read parent
-                     *         state.
-                     *
-                     * @returns {Object} The newly created child scope.
-                     *
-                     */
-                    $new: function(isolate) {
-                        var ChildScope,
-                            child;
+        this.errorOnUnhandledRejections = function(value) {
+            if (isDefined(value)) {
+                errorOnUnhandledRejections = value;
+                return this;
+            } else {
+                return errorOnUnhandledRejections;
+            }
+        };
+    }
 
-                        if (isolate) {
-                            child = new Scope();
-                            child.$root = this.$root;
-                            // ensure that there is just one async queue per $rootScope and its children
-                            child.$$asyncQueue = this.$$asyncQueue;
-                            child.$$postDigestQueue = this.$$postDigestQueue;
-                        } else {
-                            ChildScope = function() {}; // should be anonymous; This is so that when the minifier munges
-                            // the name it does not become random set of chars. This will then show up as class
-                            // name in the web inspector.
-                            ChildScope.prototype = this;
-                            child = new ChildScope();
-                            child.$id = nextUid();
-                        }
-                        child['this'] = child;
-                        child.$$listeners = {};
-                        child.$$listenerCount = {};
-                        child.$parent = this;
-                        child.$$watchers = child.$$nextSibling = child.$$childHead = child.$$childTail = null;
-                        child.$$prevSibling = this.$$childTail;
-                        if (this.$$childHead) {
-                            this.$$childTail.$$nextSibling = child;
-                            this.$$childTail = child;
-                        } else {
-                            this.$$childHead = this.$$childTail = child;
-                        }
-                        return child;
-                    },
+    /**
+     * Constructs a promise manager.
+     *
+     * @param {function(function)} nextTick Function for executing functions in the next turn.
+     * @param {function(...*)} exceptionHandler Function into which unexpected exceptions are passed for
+     *     debugging purposes.
+     * @param {boolean=} errorOnUnhandledRejections Whether an error should be generated on unhandled
+     *     promises rejections.
+     * @returns {object} Promise manager.
+     */
+    function qFactory(nextTick, exceptionHandler, errorOnUnhandledRejections) {
+        var $qMinErr = minErr('$q', TypeError);
+        var queueSize = 0;
+        var checkQueue = [];
 
-                    /**
-                     * @ngdoc method
-                     * @name $rootScope.Scope#$watch
-                     * @function
-                     *
-                     * @description
-                     * Registers a `listener` callback to be executed whenever the `watchExpression` changes.
-                     *
-                     * - The `watchExpression` is called on every call to {@link ng.$rootScope.Scope#$digest
-       *   $digest()} and should return the value that will be watched. (Since
-                     *   {@link ng.$rootScope.Scope#$digest $digest()} reruns when it detects changes the
-                     *   `watchExpression` can execute multiple times per
-                     *   {@link ng.$rootScope.Scope#$digest $digest()} and should be idempotent.)
-                     * - The `listener` is called only when the value from the current `watchExpression` and the
-                     *   previous call to `watchExpression` are not equal (with the exception of the initial run,
-                     *   see below). The inequality is determined according to
-                     *   {@link angular.equals} function. To save the value of the object for later comparison,
-                     *   the {@link angular.copy} function is used. It also means that watching complex options
-                     *   will have adverse memory and performance implications.
-                     * - The watch `listener` may change the model, which may trigger other `listener`s to fire.
-                     *   This is achieved by rerunning the watchers until no changes are detected. The rerun
-                     *   iteration limit is 10 to prevent an infinite loop deadlock.
-                     *
-                     *
-                     * If you want to be notified whenever {@link ng.$rootScope.Scope#$digest $digest} is called,
-                     * you can register a `watchExpression` function with no `listener`. (Since `watchExpression`
-                     * can execute multiple times per {@link ng.$rootScope.Scope#$digest $digest} cycle when a
-                     * change is detected, be prepared for multiple calls to your listener.)
-                     *
-                     * After a watcher is registered with the scope, the `listener` fn is called asynchronously
-                     * (via {@link ng.$rootScope.Scope#$evalAsync $evalAsync}) to initialize the
-                     * watcher. In rare cases, this is undesirable because the listener is called when the result
-                     * of `watchExpression` didn't change. To detect this scenario within the `listener` fn, you
-                     * can compare the `newVal` and `oldVal`. If these two values are identical (`===`) then the
-                     * listener was called due to initialization.
-                     *
-                     * The example below contains an illustration of using a function as your $watch listener
-                     *
-                     *
-                     * # Example
-                     * ```js
-                     // let's assume that scope was dependency injected as the $rootScope
-                     var scope = $rootScope;
-                     scope.name = 'misko';
-                     scope.counter = 0;
+        /**
+         * @ngdoc method
+         * @name ng.$q#defer
+         * @kind function
+         *
+         * @description
+         * Creates a `Deferred` object which represents a task which will finish in the future.
+         *
+         * @returns {Deferred} Returns a new instance of deferred.
+         */
+        function defer() {
+            return new Deferred();
+        }
 
-                     expect(scope.counter).toEqual(0);
-                     scope.$watch('name', function(newValue, oldValue) {
-             scope.counter = scope.counter + 1;
-           });
-                     expect(scope.counter).toEqual(0);
+        function Deferred() {
+            var promise = this.promise = new Promise();
+            //Non prototype methods necessary to support unbound execution :/
+            this.resolve = function(val) { resolvePromise(promise, val); };
+            this.reject = function(reason) { rejectPromise(promise, reason); };
+            this.notify = function(progress) { notifyPromise(promise, progress); };
+        }
 
-                     scope.$digest();
-                     // no variable change
-                     expect(scope.counter).toEqual(0);
 
-                     scope.name = 'adam';
-                     scope.$digest();
-                     expect(scope.counter).toEqual(1);
+        function Promise() {
+            this.$$state = { status: 0 };
+        }
 
+        extend(Promise.prototype, {
+            then: function(onFulfilled, onRejected, progressBack) {
+                if (isUndefined(onFulfilled) && isUndefined(onRejected) && isUndefined(progressBack)) {
+                    return this;
+                }
+                var result = new Promise();
 
+                this.$$state.pending = this.$$state.pending || [];
+                this.$$state.pending.push([result, onFulfilled, onRejected, progressBack]);
+                if (this.$$state.status > 0) scheduleProcessQueue(this.$$state);
 
-                     // Using a listener function
-                     var food;
-                     scope.foodCounter = 0;
-                     expect(scope.foodCounter).toEqual(0);
-                     scope.$watch(
-                     // This is the listener function
-                     function() { return food; },
-                     // This is the change handler
-                     function(newValue, oldValue) {
-               if ( newValue !== oldValue ) {
-                 // Only increment the counter if the value changed
-                 scope.foodCounter = scope.foodCounter + 1;
-               }
-             }
-                     );
-                     // No digest has been run so the counter will be zero
-                     expect(scope.foodCounter).toEqual(0);
-
-                     // Run the digest but since food has not changed count will still be zero
-                     scope.$digest();
-                     expect(scope.foodCounter).toEqual(0);
+                return result;
+            },
 
-                     // Update food and run digest.  Now the counter will increment
-                     food = 'cheeseburger';
-                     scope.$digest();
-                     expect(scope.foodCounter).toEqual(1);
+            'catch': function(callback) {
+                return this.then(null, callback);
+            },
 
-                     * ```
-                     *
-                     *
-                     *
-                     * @param {(function()|string)} watchExpression Expression that is evaluated on each
-                     *    {@link ng.$rootScope.Scope#$digest $digest} cycle. A change in the return value triggers
-                     *    a call to the `listener`.
-                     *
-                     *    - `string`: Evaluated as {@link guide/expression expression}
-                     *    - `function(scope)`: called with current `scope` as a parameter.
-                     * @param {(function()|string)=} listener Callback called whenever the return value of
-                     *   the `watchExpression` changes.
-                     *
-                     *    - `string`: Evaluated as {@link guide/expression expression}
-                     *    - `function(newValue, oldValue, scope)`: called with current and previous values as
-                     *      parameters.
-                     *
-                     * @param {boolean=} objectEquality Compare for object equality using {@link angular.equals} instead of
-                     *     comparing for reference equality.
-                     * @returns {function()} Returns a deregistration function for this listener.
-                     */
-                    $watch: function(watchExp, listener, objectEquality) {
-                        var scope = this,
-                            get = compileToFn(watchExp, 'watch'),
-                            array = scope.$$watchers,
-                            watcher = {
-                                fn: listener,
-                                last: initWatchVal,
-                                get: get,
-                                exp: watchExp,
-                                eq: !!objectEquality
-                            };
+            'finally': function(callback, progressBack) {
+                return this.then(function(value) {
+                    return handleCallback(value, resolve, callback);
+                }, function(error) {
+                    return handleCallback(error, reject, callback);
+                }, progressBack);
+            }
+        });
 
-                        lastDirtyWatch = null;
+        function processQueue(state) {
+            var fn, promise, pending;
 
-                        // in the case user pass string, we need to compile it, do we really need this ?
-                        if (!isFunction(listener)) {
-                            var listenFn = compileToFn(listener || noop, 'listener');
-                            watcher.fn = function(newVal, oldVal, scope) {listenFn(scope);};
+            pending = state.pending;
+            state.processScheduled = false;
+            state.pending = undefined;
+            try {
+                for (var i = 0, ii = pending.length; i < ii; ++i) {
+                    markQStateExceptionHandled(state);
+                    promise = pending[i][0];
+                    fn = pending[i][state.status];
+                    try {
+                        if (isFunction(fn)) {
+                            resolvePromise(promise, fn(state.value));
+                        } else if (state.status === 1) {
+                            resolvePromise(promise, state.value);
+                        } else {
+                            rejectPromise(promise, state.value);
                         }
-
-                        if (typeof watchExp == 'string' && get.constant) {
-                            var originalFn = watcher.fn;
-                            watcher.fn = function(newVal, oldVal, scope) {
-                                originalFn.call(this, newVal, oldVal, scope);
-                                arrayRemove(array, watcher);
-                            };
+                    } catch (e) {
+                        rejectPromise(promise, e);
+                        // This error is explicitly marked for being passed to the $exceptionHandler
+                        if (e && e.$$passToExceptionHandler === true) {
+                            exceptionHandler(e);
                         }
+                    }
+                }
+            } finally {
+                --queueSize;
+                if (errorOnUnhandledRejections && queueSize === 0) {
+                    nextTick(processChecks);
+                }
+            }
+        }
 
-                        if (!array) {
-                            array = scope.$$watchers = [];
-                        }
-                        // we use unshift since we use a while loop in $digest for speed.
-                        // the while loop reads in reverse order.
-                        array.unshift(watcher);
+        function processChecks() {
+            // eslint-disable-next-line no-unmodified-loop-condition
+            while (!queueSize && checkQueue.length) {
+                var toCheck = checkQueue.shift();
+                if (!isStateExceptionHandled(toCheck)) {
+                    markQStateExceptionHandled(toCheck);
+                    var errorMessage = 'Possibly unhandled rejection: ' + toDebugString(toCheck.value);
+                    if (isError(toCheck.value)) {
+                        exceptionHandler(toCheck.value, errorMessage);
+                    } else {
+                        exceptionHandler(errorMessage);
+                    }
+                }
+            }
+        }
 
-                        return function() {
-                            arrayRemove(array, watcher);
-                            lastDirtyWatch = null;
-                        };
-                    },
+        function scheduleProcessQueue(state) {
+            if (errorOnUnhandledRejections && !state.pending && state.status === 2 && !isStateExceptionHandled(state)) {
+                if (queueSize === 0 && checkQueue.length === 0) {
+                    nextTick(processChecks);
+                }
+                checkQueue.push(state);
+            }
+            if (state.processScheduled || !state.pending) return;
+            state.processScheduled = true;
+            ++queueSize;
+            nextTick(function() { processQueue(state); });
+        }
 
+        function resolvePromise(promise, val) {
+            if (promise.$$state.status) return;
+            if (val === promise) {
+                $$reject(promise, $qMinErr(
+                    'qcycle',
+                    'Expected promise to be resolved with value other than itself \'{0}\'',
+                    val));
+            } else {
+                $$resolve(promise, val);
+            }
 
-                    /**
-                     * @ngdoc method
-                     * @name $rootScope.Scope#$watchCollection
-                     * @function
-                     *
-                     * @description
-                     * Shallow watches the properties of an object and fires whenever any of the properties change
-                     * (for arrays, this implies watching the array items; for object maps, this implies watching
-                     * the properties). If a change is detected, the `listener` callback is fired.
-                     *
-                     * - The `obj` collection is observed via standard $watch operation and is examined on every
-                     *   call to $digest() to see if any items have been added, removed, or moved.
-                     * - The `listener` is called whenever anything within the `obj` has changed. Examples include
-                     *   adding, removing, and moving items belonging to an object or array.
-                     *
-                     *
-                     * # Example
-                     * ```js
-                     $scope.names = ['igor', 'matias', 'misko', 'james'];
-                     $scope.dataCount = 4;
+        }
 
-                     $scope.$watchCollection('names', function(newNames, oldNames) {
-            $scope.dataCount = newNames.length;
-          });
+        function $$resolve(promise, val) {
+            var then;
+            var done = false;
+            try {
+                if (isObject(val) || isFunction(val)) then = val.then;
+                if (isFunction(then)) {
+                    promise.$$state.status = -1;
+                    then.call(val, doResolve, doReject, doNotify);
+                } else {
+                    promise.$$state.value = val;
+                    promise.$$state.status = 1;
+                    scheduleProcessQueue(promise.$$state);
+                }
+            } catch (e) {
+                doReject(e);
+            }
 
-                     expect($scope.dataCount).toEqual(4);
-                     $scope.$digest();
+            function doResolve(val) {
+                if (done) return;
+                done = true;
+                $$resolve(promise, val);
+            }
+            function doReject(val) {
+                if (done) return;
+                done = true;
+                $$reject(promise, val);
+            }
+            function doNotify(progress) {
+                notifyPromise(promise, progress);
+            }
+        }
 
-                     //still at 4 ... no changes
-                     expect($scope.dataCount).toEqual(4);
+        function rejectPromise(promise, reason) {
+            if (promise.$$state.status) return;
+            $$reject(promise, reason);
+        }
 
-                     $scope.names.pop();
-                     $scope.$digest();
+        function $$reject(promise, reason) {
+            promise.$$state.value = reason;
+            promise.$$state.status = 2;
+            scheduleProcessQueue(promise.$$state);
+        }
 
-                     //now there's been a change
-                     expect($scope.dataCount).toEqual(3);
-                     * ```
-                     *
-                     *
-                     * @param {string|function(scope)} obj Evaluated as {@link guide/expression expression}. The
-                     *    expression value should evaluate to an object or an array which is observed on each
-                     *    {@link ng.$rootScope.Scope#$digest $digest} cycle. Any shallow change within the
-                     *    collection will trigger a call to the `listener`.
-                     *
-                     * @param {function(newCollection, oldCollection, scope)} listener a callback function called
-                     *    when a change is detected.
-                     *    - The `newCollection` object is the newly modified data obtained from the `obj` expression
-                     *    - The `oldCollection` object is a copy of the former collection data.
-                     *      Due to performance considerations, the`oldCollection` value is computed only if the
-                     *      `listener` function declares two or more arguments.
-                     *    - The `scope` argument refers to the current scope.
-                     *
-                     * @returns {function()} Returns a de-registration function for this listener. When the
-                     *    de-registration function is executed, the internal watch operation is terminated.
-                     */
-                    $watchCollection: function(obj, listener) {
-                        var self = this;
-                        // the current value, updated on each dirty-check run
-                        var newValue;
-                        // a shallow copy of the newValue from the last dirty-check run,
-                        // updated to match newValue during dirty-check run
-                        var oldValue;
-                        // a shallow copy of the newValue from when the last change happened
-                        var veryOldValue;
-                        // only track veryOldValue if the listener is asking for it
-                        var trackVeryOldValue = (listener.length > 1);
-                        var changeDetected = 0;
-                        var objGetter = $parse(obj);
-                        var internalArray = [];
-                        var internalObject = {};
-                        var initRun = true;
-                        var oldLength = 0;
+        function notifyPromise(promise, progress) {
+            var callbacks = promise.$$state.pending;
 
-                        function $watchCollectionWatch() {
-                            newValue = objGetter(self);
-                            var newLength, key;
+            if ((promise.$$state.status <= 0) && callbacks && callbacks.length) {
+                nextTick(function() {
+                    var callback, result;
+                    for (var i = 0, ii = callbacks.length; i < ii; i++) {
+                        result = callbacks[i][0];
+                        callback = callbacks[i][3];
+                        try {
+                            notifyPromise(result, isFunction(callback) ? callback(progress) : progress);
+                        } catch (e) {
+                            exceptionHandler(e);
+                        }
+                    }
+                });
+            }
+        }
 
-                            if (!isObject(newValue)) { // if primitive
-                                if (oldValue !== newValue) {
-                                    oldValue = newValue;
-                                    changeDetected++;
-                                }
-                            } else if (isArrayLike(newValue)) {
-                                if (oldValue !== internalArray) {
-                                    // we are transitioning from something which was not an array into array.
-                                    oldValue = internalArray;
-                                    oldLength = oldValue.length = 0;
-                                    changeDetected++;
-                                }
+        /**
+         * @ngdoc method
+         * @name $q#reject
+         * @kind function
+         *
+         * @description
+         * Creates a promise that is resolved as rejected with the specified `reason`. This api should be
+         * used to forward rejection in a chain of promises. If you are dealing with the last promise in
+         * a promise chain, you don't need to worry about it.
+         *
+         * When comparing deferreds/promises to the familiar behavior of try/catch/throw, think of
+         * `reject` as the `throw` keyword in JavaScript. This also means that if you "catch" an error via
+         * a promise error callback and you want to forward the error to the promise derived from the
+         * current promise, you have to "rethrow" the error by returning a rejection constructed via
+         * `reject`.
+         *
+         * ```js
+         *   promiseB = promiseA.then(function(result) {
+         *     // success: do something and resolve promiseB
+         *     //          with the old or a new result
+         *     return result;
+         *   }, function(reason) {
+         *     // error: handle the error if possible and
+         *     //        resolve promiseB with newPromiseOrValue,
+         *     //        otherwise forward the rejection to promiseB
+         *     if (canHandle(reason)) {
+         *      // handle the error and recover
+         *      return newPromiseOrValue;
+         *     }
+         *     return $q.reject(reason);
+         *   });
+         * ```
+         *
+         * @param {*} reason Constant, message, exception or an object representing the rejection reason.
+         * @returns {Promise} Returns a promise that was already resolved as rejected with the `reason`.
+         */
+        function reject(reason) {
+            var result = new Promise();
+            rejectPromise(result, reason);
+            return result;
+        }
 
-                                newLength = newValue.length;
+        function handleCallback(value, resolver, callback) {
+            var callbackOutput = null;
+            try {
+                if (isFunction(callback)) callbackOutput = callback();
+            } catch (e) {
+                return reject(e);
+            }
+            if (isPromiseLike(callbackOutput)) {
+                return callbackOutput.then(function() {
+                    return resolver(value);
+                }, reject);
+            } else {
+                return resolver(value);
+            }
+        }
 
-                                if (oldLength !== newLength) {
-                                    // if lengths do not match we need to trigger change notification
-                                    changeDetected++;
-                                    oldValue.length = oldLength = newLength;
-                                }
-                                // copy the items to oldValue and look for changes.
-                                for (var i = 0; i < newLength; i++) {
-                                    var bothNaN = (oldValue[i] !== oldValue[i]) &&
-                                        (newValue[i] !== newValue[i]);
-                                    if (!bothNaN && (oldValue[i] !== newValue[i])) {
-                                        changeDetected++;
-                                        oldValue[i] = newValue[i];
-                                    }
-                                }
-                            } else {
-                                if (oldValue !== internalObject) {
-                                    // we are transitioning from something which was not an object into object.
-                                    oldValue = internalObject = {};
-                                    oldLength = 0;
-                                    changeDetected++;
-                                }
-                                // copy the items to oldValue and look for changes.
-                                newLength = 0;
-                                for (key in newValue) {
-                                    if (newValue.hasOwnProperty(key)) {
-                                        newLength++;
-                                        if (oldValue.hasOwnProperty(key)) {
-                                            if (oldValue[key] !== newValue[key]) {
-                                                changeDetected++;
-                                                oldValue[key] = newValue[key];
-                                            }
-                                        } else {
-                                            oldLength++;
-                                            oldValue[key] = newValue[key];
-                                            changeDetected++;
-                                        }
-                                    }
-                                }
-                                if (oldLength > newLength) {
-                                    // we used to have more keys, need to find them and destroy them.
-                                    changeDetected++;
-                                    for(key in oldValue) {
-                                        if (oldValue.hasOwnProperty(key) && !newValue.hasOwnProperty(key)) {
-                                            oldLength--;
-                                            delete oldValue[key];
-                                        }
-                                    }
-                                }
-                            }
-                            return changeDetected;
-                        }
+        /**
+         * @ngdoc method
+         * @name $q#when
+         * @kind function
+         *
+         * @description
+         * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise.
+         * This is useful when you are dealing with an object that might or might not be a promise, or if
+         * the promise comes from a source that can't be trusted.
+         *
+         * @param {*} value Value or a promise
+         * @param {Function=} successCallback
+         * @param {Function=} errorCallback
+         * @param {Function=} progressCallback
+         * @returns {Promise} Returns a promise of the passed value or promise
+         */
 
-                        function $watchCollectionAction() {
-                            if (initRun) {
-                                initRun = false;
-                                listener(newValue, newValue, self);
-                            } else {
-                                listener(newValue, veryOldValue, self);
-                            }
-
-                            // make a copy for the next time a collection is changed
-                            if (trackVeryOldValue) {
-                                if (!isObject(newValue)) {
-                                    //primitive
-                                    veryOldValue = newValue;
-                                } else if (isArrayLike(newValue)) {
-                                    veryOldValue = new Array(newValue.length);
-                                    for (var i = 0; i < newValue.length; i++) {
-                                        veryOldValue[i] = newValue[i];
-                                    }
-                                } else { // if object
-                                    veryOldValue = {};
-                                    for (var key in newValue) {
-                                        if (hasOwnProperty.call(newValue, key)) {
-                                            veryOldValue[key] = newValue[key];
-                                        }
-                                    }
-                                }
-                            }
-                        }
 
-                        return this.$watch($watchCollectionWatch, $watchCollectionAction);
-                    },
-
-                    /**
-                     * @ngdoc method
-                     * @name $rootScope.Scope#$digest
-                     * @function
-                     *
-                     * @description
-                     * Processes all of the {@link ng.$rootScope.Scope#$watch watchers} of the current scope and
-                     * its children. Because a {@link ng.$rootScope.Scope#$watch watcher}'s listener can change
-                     * the model, the `$digest()` keeps calling the {@link ng.$rootScope.Scope#$watch watchers}
-                     * until no more listeners are firing. This means that it is possible to get into an infinite
-                     * loop. This function will throw `'Maximum iteration limit exceeded.'` if the number of
-                     * iterations exceeds 10.
-                     *
-                     * Usually, you don't call `$digest()` directly in
-                     * {@link ng.directive:ngController controllers} or in
-                     * {@link ng.$compileProvider#directive directives}.
-                     * Instead, you should call {@link ng.$rootScope.Scope#$apply $apply()} (typically from within
-                     * a {@link ng.$compileProvider#directive directives}), which will force a `$digest()`.
-                     *
-                     * If you want to be notified whenever `$digest()` is called,
-                     * you can register a `watchExpression` function with
-                     * {@link ng.$rootScope.Scope#$watch $watch()} with no `listener`.
-                     *
-                     * In unit tests, you may need to call `$digest()` to simulate the scope life cycle.
-                     *
-                     * # Example
-                     * ```js
-                     var scope = ...;
-                     scope.name = 'misko';
-                     scope.counter = 0;
+        function when(value, callback, errback, progressBack) {
+            var result = new Promise();
+            resolvePromise(result, value);
+            return result.then(callback, errback, progressBack);
+        }
 
-                     expect(scope.counter).toEqual(0);
-                     scope.$watch('name', function(newValue, oldValue) {
-             scope.counter = scope.counter + 1;
-           });
-                     expect(scope.counter).toEqual(0);
+        /**
+         * @ngdoc method
+         * @name $q#resolve
+         * @kind function
+         *
+         * @description
+         * Alias of {@link ng.$q#when when} to maintain naming consistency with ES6.
+         *
+         * @param {*} value Value or a promise
+         * @param {Function=} successCallback
+         * @param {Function=} errorCallback
+         * @param {Function=} progressCallback
+         * @returns {Promise} Returns a promise of the passed value or promise
+         */
+        var resolve = when;
 
-                     scope.$digest();
-                     // no variable change
-                     expect(scope.counter).toEqual(0);
+        /**
+         * @ngdoc method
+         * @name $q#all
+         * @kind function
+         *
+         * @description
+         * Combines multiple promises into a single promise that is resolved when all of the input
+         * promises are resolved.
+         *
+         * @param {Array.<Promise>|Object.<Promise>} promises An array or hash of promises.
+         * @returns {Promise} Returns a single promise that will be resolved with an array/hash of values,
+         *   each value corresponding to the promise at the same index/key in the `promises` array/hash.
+         *   If any of the promises is resolved with a rejection, this resulting promise will be rejected
+         *   with the same rejection value.
+         */
 
-                     scope.name = 'adam';
-                     scope.$digest();
-                     expect(scope.counter).toEqual(1);
-                     * ```
-                     *
-                     */
-                    $digest: function() {
-                        var watch, value, last,
-                            watchers,
-                            asyncQueue = this.$$asyncQueue,
-                            postDigestQueue = this.$$postDigestQueue,
-                            length,
-                            dirty, ttl = TTL,
-                            next, current, target = this,
-                            watchLog = [],
-                            logIdx, logMsg, asyncTask;
+        function all(promises) {
+            var result = new Promise(),
+                counter = 0,
+                results = isArray(promises) ? [] : {};
 
-                        beginPhase('$digest');
+            forEach(promises, function(promise, key) {
+                counter++;
+                when(promise).then(function(value) {
+                    results[key] = value;
+                    if (!(--counter)) resolvePromise(result, results);
+                }, function(reason) {
+                    rejectPromise(result, reason);
+                });
+            });
 
-                        lastDirtyWatch = null;
+            if (counter === 0) {
+                resolvePromise(result, results);
+            }
 
-                        do { // "while dirty" loop
-                            dirty = false;
-                            current = target;
+            return result;
+        }
 
-                            while(asyncQueue.length) {
-                                try {
-                                    asyncTask = asyncQueue.shift();
-                                    asyncTask.scope.$eval(asyncTask.expression);
-                                } catch (e) {
-                                    clearPhase();
-                                    $exceptionHandler(e);
-                                }
-                                lastDirtyWatch = null;
-                            }
+        /**
+         * @ngdoc method
+         * @name $q#race
+         * @kind function
+         *
+         * @description
+         * Returns a promise that resolves or rejects as soon as one of those promises
+         * resolves or rejects, with the value or reason from that promise.
+         *
+         * @param {Array.<Promise>|Object.<Promise>} promises An array or hash of promises.
+         * @returns {Promise} a promise that resolves or rejects as soon as one of the `promises`
+         * resolves or rejects, with the value or reason from that promise.
+         */
 
-                            traverseScopesLoop:
-                                do { // "traverse the scopes" loop
-                                    if ((watchers = current.$$watchers)) {
-                                        // process our watches
-                                        length = watchers.length;
-                                        while (length--) {
-                                            try {
-                                                watch = watchers[length];
-                                                // Most common watches are on primitives, in which case we can short
-                                                // circuit it with === operator, only when === fails do we use .equals
-                                                if (watch) {
-                                                    if ((value = watch.get(current)) !== (last = watch.last) &&
-                                                        !(watch.eq
-                                                            ? equals(value, last)
-                                                            : (typeof value == 'number' && typeof last == 'number'
-                                                        && isNaN(value) && isNaN(last)))) {
-                                                        dirty = true;
-                                                        lastDirtyWatch = watch;
-                                                        watch.last = watch.eq ? copy(value) : value;
-                                                        watch.fn(value, ((last === initWatchVal) ? value : last), current);
-                                                        if (ttl < 5) {
-                                                            logIdx = 4 - ttl;
-                                                            if (!watchLog[logIdx]) watchLog[logIdx] = [];
-                                                            logMsg = (isFunction(watch.exp))
-                                                                ? 'fn: ' + (watch.exp.name || watch.exp.toString())
-                                                                : watch.exp;
-                                                            logMsg += '; newVal: ' + toJson(value) + '; oldVal: ' + toJson(last);
-                                                            watchLog[logIdx].push(logMsg);
-                                                        }
-                                                    } else if (watch === lastDirtyWatch) {
-                                                        // If the most recently dirty watcher is now clean, short circuit since the remaining watchers
-                                                        // have already been tested.
-                                                        dirty = false;
-                                                        break traverseScopesLoop;
-                                                    }
-                                                }
-                                            } catch (e) {
-                                                clearPhase();
-                                                $exceptionHandler(e);
-                                            }
-                                        }
-                                    }
+        function race(promises) {
+            var deferred = defer();
 
-                                    // Insanity Warning: scope depth-first traversal
-                                    // yes, this code is a bit crazy, but it works and we have tests to prove it!
-                                    // this piece should be kept in sync with the traversal in $broadcast
-                                    if (!(next = (current.$$childHead ||
-                                        (current !== target && current.$$nextSibling)))) {
-                                        while(current !== target && !(next = current.$$nextSibling)) {
-                                            current = current.$parent;
-                                        }
-                                    }
-                                } while ((current = next));
+            forEach(promises, function(promise) {
+                when(promise).then(deferred.resolve, deferred.reject);
+            });
 
-                            // `break traverseScopesLoop;` takes us to here
+            return deferred.promise;
+        }
 
-                            if((dirty || asyncQueue.length) && !(ttl--)) {
-                                clearPhase();
-                                throw $rootScopeMinErr('infdig',
-                                    '{0} $digest() iterations reached. Aborting!\n' +
-                                    'Watchers fired in the last 5 iterations: {1}',
-                                    TTL, toJson(watchLog));
-                            }
+        function $Q(resolver) {
+            if (!isFunction(resolver)) {
+                throw $qMinErr('norslvr', 'Expected resolverFn, got \'{0}\'', resolver);
+            }
 
-                        } while (dirty || asyncQueue.length);
+            var promise = new Promise();
 
-                        clearPhase();
+            function resolveFn(value) {
+                resolvePromise(promise, value);
+            }
 
-                        while(postDigestQueue.length) {
-                            try {
-                                postDigestQueue.shift()();
-                            } catch (e) {
-                                $exceptionHandler(e);
-                            }
-                        }
-                    },
+            function rejectFn(reason) {
+                rejectPromise(promise, reason);
+            }
 
+            resolver(resolveFn, rejectFn);
 
-                    /**
-                     * @ngdoc event
-                     * @name $rootScope.Scope#$destroy
-                     * @eventType broadcast on scope being destroyed
-                     *
-                     * @description
-                     * Broadcasted when a scope and its children are being destroyed.
-                     *
-                     * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
-                     * clean up DOM bindings before an element is removed from the DOM.
-                     */
+            return promise;
+        }
 
-                    /**
-                     * @ngdoc method
-                     * @name $rootScope.Scope#$destroy
-                     * @function
-                     *
-                     * @description
-                     * Removes the current scope (and all of its children) from the parent scope. Removal implies
-                     * that calls to {@link ng.$rootScope.Scope#$digest $digest()} will no longer
-                     * propagate to the current scope and its children. Removal also implies that the current
-                     * scope is eligible for garbage collection.
-                     *
-                     * The `$destroy()` is usually used by directives such as
-                     * {@link ng.directive:ngRepeat ngRepeat} for managing the
-                     * unrolling of the loop.
-                     *
-                     * Just before a scope is destroyed, a `$destroy` event is broadcasted on this scope.
-                     * Application code can register a `$destroy` event handler that will give it a chance to
-                     * perform any necessary cleanup.
-                     *
-                     * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
-                     * clean up DOM bindings before an element is removed from the DOM.
-                     */
-                    $destroy: function() {
-                        // we can't destroy the root scope or a scope that has been already destroyed
-                        if (this.$$destroyed) return;
-                        var parent = this.$parent;
+        // Let's make the instanceof operator work for promises, so that
+        // `new $q(fn) instanceof $q` would evaluate to true.
+        $Q.prototype = Promise.prototype;
 
-                        this.$broadcast('$destroy');
-                        this.$$destroyed = true;
-                        if (this === $rootScope) return;
+        $Q.defer = defer;
+        $Q.reject = reject;
+        $Q.when = when;
+        $Q.resolve = resolve;
+        $Q.all = all;
+        $Q.race = race;
 
-                        forEach(this.$$listenerCount, bind(null, decrementListenerCount, this));
+        return $Q;
+    }
 
-                        // sever all the references to parent scopes (after this cleanup, the current scope should
-                        // not be retained by any of our references and should be eligible for garbage collection)
-                        if (parent.$$childHead == this) parent.$$childHead = this.$$nextSibling;
-                        if (parent.$$childTail == this) parent.$$childTail = this.$$prevSibling;
-                        if (this.$$prevSibling) this.$$prevSibling.$$nextSibling = this.$$nextSibling;
-                        if (this.$$nextSibling) this.$$nextSibling.$$prevSibling = this.$$prevSibling;
+    function isStateExceptionHandled(state) {
+        return !!state.pur;
+    }
+    function markQStateExceptionHandled(state) {
+        state.pur = true;
+    }
+    function markQExceptionHandled(q) {
+        markQStateExceptionHandled(q.$$state);
+    }
 
+    /** @this */
+    function $$RAFProvider() { //rAF
+        this.$get = ['$window', '$timeout', function($window, $timeout) {
+            var requestAnimationFrame = $window.requestAnimationFrame ||
+                $window.webkitRequestAnimationFrame;
 
-                        // All of the code below is bogus code that works around V8's memory leak via optimized code
-                        // and inline caches.
-                        //
-                        // see:
-                        // - https://code.google.com/p/v8/issues/detail?id=2073#c26
-                        // - https://github.com/angular/angular.js/issues/6794#issuecomment-38648909
-                        // - https://github.com/angular/angular.js/issues/1313#issuecomment-10378451
+            var cancelAnimationFrame = $window.cancelAnimationFrame ||
+                $window.webkitCancelAnimationFrame ||
+                $window.webkitCancelRequestAnimationFrame;
 
-                        this.$parent = this.$$nextSibling = this.$$prevSibling = this.$$childHead =
-                            this.$$childTail = this.$root = null;
+            var rafSupported = !!requestAnimationFrame;
+            var raf = rafSupported
+                ? function(fn) {
+                    var id = requestAnimationFrame(fn);
+                    return function() {
+                        cancelAnimationFrame(id);
+                    };
+                }
+                : function(fn) {
+                    var timer = $timeout(fn, 16.66, false); // 1000 / 60 = 16.666
+                    return function() {
+                        $timeout.cancel(timer);
+                    };
+                };
 
-                        // don't reset these to null in case some async task tries to register a listener/watch/task
-                        this.$$listeners = {};
-                        this.$$watchers = this.$$asyncQueue = this.$$postDigestQueue = [];
+            raf.supported = rafSupported;
 
-                        // prevent NPEs since these methods have references to properties we nulled out
-                        this.$destroy = this.$digest = this.$apply = noop;
-                        this.$on = this.$watch = function() { return noop; };
-                    },
+            return raf;
+        }];
+    }
 
-                    /**
-                     * @ngdoc method
-                     * @name $rootScope.Scope#$eval
-                     * @function
-                     *
-                     * @description
-                     * Executes the `expression` on the current scope and returns the result. Any exceptions in
-                     * the expression are propagated (uncaught). This is useful when evaluating Angular
-                     * expressions.
-                     *
-                     * # Example
-                     * ```js
-                     var scope = ng.$rootScope.Scope();
-                     scope.a = 1;
-                     scope.b = 2;
+    /**
+     * DESIGN NOTES
+     *
+     * The design decisions behind the scope are heavily favored for speed and memory consumption.
+     *
+     * The typical use of scope is to watch the expressions, which most of the time return the same
+     * value as last time so we optimize the operation.
+     *
+     * Closures construction is expensive in terms of speed as well as memory:
+     *   - No closures, instead use prototypical inheritance for API
+     *   - Internal state needs to be stored on scope directly, which means that private state is
+     *     exposed as $$____ properties
+     *
+     * Loop operations are optimized by using while(count--) { ... }
+     *   - This means that in order to keep the same order of execution as addition we have to add
+     *     items to the array at the beginning (unshift) instead of at the end (push)
+     *
+     * Child scopes are created and removed often
+     *   - Using an array would be slow since inserts in the middle are expensive; so we use linked lists
+     *
+     * There are fewer watches than observers. This is why you don't want the observer to be implemented
+     * in the same way as watch. Watch requires return of the initialization function which is expensive
+     * to construct.
+     */
 
-                     expect(scope.$eval('a+b')).toEqual(3);
-                     expect(scope.$eval(function(scope){ return scope.a + scope.b; })).toEqual(3);
-                     * ```
-                     *
-                     * @param {(string|function())=} expression An angular expression to be executed.
-                     *
-                     *    - `string`: execute using the rules as defined in  {@link guide/expression expression}.
-                     *    - `function(scope)`: execute the function with the current `scope` parameter.
-                     *
-                     * @param {(object)=} locals Local variables object, useful for overriding values in scope.
-                     * @returns {*} The result of evaluating the expression.
-                     */
-                    $eval: function(expr, locals) {
-                        return $parse(expr)(this, locals);
-                    },
 
+    /**
+     * @ngdoc provider
+     * @name $rootScopeProvider
+     * @description
+     *
+     * Provider for the $rootScope service.
+     */
+
+    /**
+     * @ngdoc method
+     * @name $rootScopeProvider#digestTtl
+     * @description
+     *
+     * Sets the number of `$digest` iterations the scope should attempt to execute before giving up and
+     * assuming that the model is unstable.
+     *
+     * The current default is 10 iterations.
+     *
+     * In complex applications it's possible that the dependencies between `$watch`s will result in
+     * several digest iterations. However if an application needs more than the default 10 digest
+     * iterations for its model to stabilize then you should investigate what is causing the model to
+     * continuously change during the digest.
+     *
+     * Increasing the TTL could have performance implications, so you should not change it without
+     * proper justification.
+     *
+     * @param {number} limit The number of digest iterations.
+     */
+
+
+    /**
+     * @ngdoc service
+     * @name $rootScope
+     * @this
+     *
+     * @description
+     *
+     * Every application has a single root {@link ng.$rootScope.Scope scope}.
+     * All other scopes are descendant scopes of the root scope. Scopes provide separation
+     * between the model and the view, via a mechanism for watching the model for changes.
+     * They also provide event emission/broadcast and subscription facility. See the
+     * {@link guide/scope developer guide on scopes}.
+     */
+    function $RootScopeProvider() {
+        var TTL = 10;
+        var $rootScopeMinErr = minErr('$rootScope');
+        var lastDirtyWatch = null;
+        var applyAsyncId = null;
+
+        this.digestTtl = function(value) {
+            if (arguments.length) {
+                TTL = value;
+            }
+            return TTL;
+        };
+
+        function createChildScopeClass(parent) {
+            function ChildScope() {
+                this.$$watchers = this.$$nextSibling =
+                    this.$$childHead = this.$$childTail = null;
+                this.$$listeners = {};
+                this.$$listenerCount = {};
+                this.$$watchersCount = 0;
+                this.$id = nextUid();
+                this.$$ChildScope = null;
+            }
+            ChildScope.prototype = parent;
+            return ChildScope;
+        }
+
+        this.$get = ['$exceptionHandler', '$parse', '$browser',
+            function($exceptionHandler, $parse, $browser) {
+
+                function destroyChildScope($event) {
+                    $event.currentScope.$$destroyed = true;
+                }
+
+                function cleanUpScope($scope) {
+
+                    // Support: IE 9 only
+                    if (msie === 9) {
+                        // There is a memory leak in IE9 if all child scopes are not disconnected
+                        // completely when a scope is destroyed. So this code will recurse up through
+                        // all this scopes children
+                        //
+                        // See issue https://github.com/angular/angular.js/issues/10706
+                        if ($scope.$$childHead) {
+                            cleanUpScope($scope.$$childHead);
+                        }
+                        if ($scope.$$nextSibling) {
+                            cleanUpScope($scope.$$nextSibling);
+                        }
+                    }
+
+                    // The code below works around IE9 and V8's memory leaks
+                    //
+                    // See:
+                    // - https://code.google.com/p/v8/issues/detail?id=2073#c26
+                    // - https://github.com/angular/angular.js/issues/6794#issuecomment-38648909
+                    // - https://github.com/angular/angular.js/issues/1313#issuecomment-10378451
+
+                    $scope.$parent = $scope.$$nextSibling = $scope.$$prevSibling = $scope.$$childHead =
+                        $scope.$$childTail = $scope.$root = $scope.$$watchers = null;
+                }
+
+                /**
+                 * @ngdoc type
+                 * @name $rootScope.Scope
+                 *
+                 * @description
+                 * A root scope can be retrieved using the {@link ng.$rootScope $rootScope} key from the
+                 * {@link auto.$injector $injector}. Child scopes are created using the
+                 * {@link ng.$rootScope.Scope#$new $new()} method. (Most scopes are created automatically when
+                 * compiled HTML template is executed.) See also the {@link guide/scope Scopes guide} for
+                 * an in-depth introduction and usage examples.
+                 *
+                 *
+                 * ## Inheritance
+                 * A scope can inherit from a parent scope, as in this example:
+                 * ```js
+                 var parent = $rootScope;
+                 var child = parent.$new();
+
+                 parent.salutation = "Hello";
+                 expect(child.salutation).toEqual('Hello');
+
+                 child.salutation = "Welcome";
+                 expect(child.salutation).toEqual('Welcome');
+                 expect(parent.salutation).toEqual('Hello');
+                 * ```
+                 *
+                 * When interacting with `Scope` in tests, additional helper methods are available on the
+                 * instances of `Scope` type. See {@link ngMock.$rootScope.Scope ngMock Scope} for additional
+                 * details.
+                 *
+                 *
+                 * @param {Object.<string, function()>=} providers Map of service factory which need to be
+                 *                                       provided for the current scope. Defaults to {@link ng}.
+                 * @param {Object.<string, *>=} instanceCache Provides pre-instantiated services which should
+                 *                              append/override services provided by `providers`. This is handy
+                 *                              when unit-testing and having the need to override a default
+                 *                              service.
+                 * @returns {Object} Newly created scope.
+                 *
+                 */
+                function Scope() {
+                    this.$id = nextUid();
+                    this.$$phase = this.$parent = this.$$watchers =
+                        this.$$nextSibling = this.$$prevSibling =
+                            this.$$childHead = this.$$childTail = null;
+                    this.$root = this;
+                    this.$$destroyed = false;
+                    this.$$listeners = {};
+                    this.$$listenerCount = {};
+                    this.$$watchersCount = 0;
+                    this.$$isolateBindings = null;
+                }
+
+                /**
+                 * @ngdoc property
+                 * @name $rootScope.Scope#$id
+                 *
+                 * @description
+                 * Unique scope ID (monotonically increasing) useful for debugging.
+                 */
+
+                /**
+                 * @ngdoc property
+                 * @name $rootScope.Scope#$parent
+                 *
+                 * @description
+                 * Reference to the parent scope.
+                 */
+
+                /**
+                 * @ngdoc property
+                 * @name $rootScope.Scope#$root
+                 *
+                 * @description
+                 * Reference to the root scope.
+                 */
+
+                Scope.prototype = {
+                    constructor: Scope,
                     /**
                      * @ngdoc method
-                     * @name $rootScope.Scope#$evalAsync
-                     * @function
+                     * @name $rootScope.Scope#$new
+                     * @kind function
                      *
                      * @description
-                     * Executes the expression on the current scope at a later point in time.
-                     *
-                     * The `$evalAsync` makes no guarantees as to when the `expression` will be executed, only
-                     * that:
+                     * Creates a new child {@link ng.$rootScope.Scope scope}.
                      *
-                     *   - it will execute after the function that scheduled the evaluation (preferably before DOM
-                     *     rendering).
-                     *   - at least one {@link ng.$rootScope.Scope#$digest $digest cycle} will be performed after
-                     *     `expression` execution.
+                     * The parent scope will propagate the {@link ng.$rootScope.Scope#$digest $digest()} event.
+                     * The scope can be removed from the scope hierarchy using {@link ng.$rootScope.Scope#$destroy $destroy()}.
                      *
-                     * Any exceptions from the execution of the expression are forwarded to the
-                     * {@link ng.$exceptionHandler $exceptionHandler} service.
+                     * {@link ng.$rootScope.Scope#$destroy $destroy()} must be called on a scope when it is
+                     * desired for the scope and its child scopes to be permanently detached from the parent and
+                     * thus stop participating in model change detection and listener notification by invoking.
                      *
-                     * __Note:__ if this function is called outside of a `$digest` cycle, a new `$digest` cycle
-                     * will be scheduled. However, it is encouraged to always call code that changes the model
-                     * from within an `$apply` call. That includes code evaluated via `$evalAsync`.
+                     * @param {boolean} isolate If true, then the scope does not prototypically inherit from the
+                     *         parent scope. The scope is isolated, as it can not see parent scope properties.
+                     *         When creating widgets, it is useful for the widget to not accidentally read parent
+                     *         state.
                      *
-                     * @param {(string|function())=} expression An angular expression to be executed.
+                     * @param {Scope} [parent=this] The {@link ng.$rootScope.Scope `Scope`} that will be the `$parent`
+                     *                              of the newly created scope. Defaults to `this` scope if not provided.
+                     *                              This is used when creating a transclude scope to correctly place it
+                     *                              in the scope hierarchy while maintaining the correct prototypical
+                     *                              inheritance.
                      *
-                     *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
-                     *    - `function(scope)`: execute the function with the current `scope` parameter.
+                     * @returns {Object} The newly created child scope.
                      *
                      */
-                    $evalAsync: function(expr) {
-                        // if we are outside of an $digest loop and this is the first time we are scheduling async
-                        // task also schedule async auto-flush
-                        if (!$rootScope.$$phase && !$rootScope.$$asyncQueue.length) {
-                            $browser.defer(function() {
-                                if ($rootScope.$$asyncQueue.length) {
-                                    $rootScope.$digest();
-                                }
-                            });
+                    $new: function(isolate, parent) {
+                        var child;
+
+                        parent = parent || this;
+
+                        if (isolate) {
+                            child = new Scope();
+                            child.$root = this.$root;
+                        } else {
+                            // Only create a child scope class if somebody asks for one,
+                            // but cache it to allow the VM to optimize lookups.
+                            if (!this.$$ChildScope) {
+                                this.$$ChildScope = createChildScopeClass(this);
+                            }
+                            child = new this.$$ChildScope();
+                        }
+                        child.$parent = parent;
+                        child.$$prevSibling = parent.$$childTail;
+                        if (parent.$$childHead) {
+                            parent.$$childTail.$$nextSibling = child;
+                            parent.$$childTail = child;
+                        } else {
+                            parent.$$childHead = parent.$$childTail = child;
                         }
 
-                        this.$$asyncQueue.push({scope: this, expression: expr});
-                    },
+                        // When the new scope is not isolated or we inherit from `this`, and
+                        // the parent scope is destroyed, the property `$$destroyed` is inherited
+                        // prototypically. In all other cases, this property needs to be set
+                        // when the parent scope is destroyed.
+                        // The listener needs to be added after the parent is set
+                        if (isolate || parent !== this) child.$on('$destroy', destroyChildScope);
 
-                    $$postDigest : function(fn) {
-                        this.$$postDigestQueue.push(fn);
+                        return child;
                     },
 
                     /**
                      * @ngdoc method
-                     * @name $rootScope.Scope#$apply
-                     * @function
+                     * @name $rootScope.Scope#$watch
+                     * @kind function
                      *
                      * @description
-                     * `$apply()` is used to execute an expression in angular from outside of the angular
-                     * framework. (For example from browser DOM events, setTimeout, XHR or third party libraries).
-                     * Because we are calling into the angular framework we need to perform proper scope life
-                     * cycle of {@link ng.$exceptionHandler exception handling},
-                     * {@link ng.$rootScope.Scope#$digest executing watches}.
-                     *
-                     * ## Life cycle
+                     * Registers a `listener` callback to be executed whenever the `watchExpression` changes.
                      *
-                     * # Pseudo-Code of `$apply()`
-                     * ```js
-                     function $apply(expr) {
-             try {
-               return $eval(expr);
-             } catch (e) {
-               $exceptionHandler(e);
-             } finally {
-               $root.$digest();
-             }
-           }
-                     * ```
+                     * - The `watchExpression` is called on every call to {@link ng.$rootScope.Scope#$digest
+       *   $digest()} and should return the value that will be watched. (`watchExpression` should not change
+                     *   its value when executed multiple times with the same input because it may be executed multiple
+                     *   times by {@link ng.$rootScope.Scope#$digest $digest()}. That is, `watchExpression` should be
+                     *   [idempotent](http://en.wikipedia.org/wiki/Idempotence).)
+                     * - The `listener` is called only when the value from the current `watchExpression` and the
+                     *   previous call to `watchExpression` are not equal (with the exception of the initial run,
+                     *   see below). Inequality is determined according to reference inequality,
+                     *   [strict comparison](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Comparison_Operators)
+                     *    via the `!==` Javascript operator, unless `objectEquality == true`
+                     *   (see next point)
+                     * - When `objectEquality == true`, inequality of the `watchExpression` is determined
+                     *   according to the {@link angular.equals} function. To save the value of the object for
+                     *   later comparison, the {@link angular.copy} function is used. This therefore means that
+                     *   watching complex objects will have adverse memory and performance implications.
+                     * - This should not be used to watch for changes in objects that are
+                     *   or contain [File](https://developer.mozilla.org/docs/Web/API/File) objects due to limitations with {@link angular.copy `angular.copy`}.
+                     * - The watch `listener` may change the model, which may trigger other `listener`s to fire.
+                     *   This is achieved by rerunning the watchers until no changes are detected. The rerun
+                     *   iteration limit is 10 to prevent an infinite loop deadlock.
                      *
                      *
-                     * Scope's `$apply()` method transitions through the following stages:
+                     * If you want to be notified whenever {@link ng.$rootScope.Scope#$digest $digest} is called,
+                     * you can register a `watchExpression` function with no `listener`. (Be prepared for
+                     * multiple calls to your `watchExpression` because it will execute multiple times in a
+                     * single {@link ng.$rootScope.Scope#$digest $digest} cycle if a change is detected.)
                      *
-                     * 1. The {@link guide/expression expression} is executed using the
-                     *    {@link ng.$rootScope.Scope#$eval $eval()} method.
-                     * 2. Any exceptions from the execution of the expression are forwarded to the
-                     *    {@link ng.$exceptionHandler $exceptionHandler} service.
-                     * 3. The {@link ng.$rootScope.Scope#$watch watch} listeners are fired immediately after the
-                     *    expression was executed using the {@link ng.$rootScope.Scope#$digest $digest()} method.
+                     * After a watcher is registered with the scope, the `listener` fn is called asynchronously
+                     * (via {@link ng.$rootScope.Scope#$evalAsync $evalAsync}) to initialize the
+                     * watcher. In rare cases, this is undesirable because the listener is called when the result
+                     * of `watchExpression` didn't change. To detect this scenario within the `listener` fn, you
+                     * can compare the `newVal` and `oldVal`. If these two values are identical (`===`) then the
+                     * listener was called due to initialization.
                      *
                      *
-                     * @param {(string|function())=} exp An angular expression to be executed.
                      *
-                     *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
-                     *    - `function(scope)`: execute the function with current `scope` parameter.
-                     *
-                     * @returns {*} The result of evaluating the expression.
-                     */
-                    $apply: function(expr) {
-                        try {
-                            beginPhase('$apply');
-                            return this.$eval(expr);
-                        } catch (e) {
-                            $exceptionHandler(e);
-                        } finally {
-                            clearPhase();
-                            try {
-                                $rootScope.$digest();
-                            } catch (e) {
-                                $exceptionHandler(e);
-                                throw e;
-                            }
-                        }
-                    },
+                     * @example
+                     * ```js
+                     // let's assume that scope was dependency injected as the $rootScope
+                     var scope = $rootScope;
+                     scope.name = 'misko';
+                     scope.counter = 0;
 
-                    /**
-                     * @ngdoc method
-                     * @name $rootScope.Scope#$on
-                     * @function
+                     expect(scope.counter).toEqual(0);
+                     scope.$watch('name', function(newValue, oldValue) {
+             scope.counter = scope.counter + 1;
+           });
+                     expect(scope.counter).toEqual(0);
+
+                     scope.$digest();
+                     // the listener is always called during the first $digest loop after it was registered
+                     expect(scope.counter).toEqual(1);
+
+                     scope.$digest();
+                     // but now it will not be called unless the value changes
+                     expect(scope.counter).toEqual(1);
+
+                     scope.name = 'adam';
+                     scope.$digest();
+                     expect(scope.counter).toEqual(2);
+
+
+
+                     // Using a function as a watchExpression
+                     var food;
+                     scope.foodCounter = 0;
+                     expect(scope.foodCounter).toEqual(0);
+                     scope.$watch(
+                     // This function returns the value being watched. It is called for each turn of the $digest loop
+                     function() { return food; },
+                     // This is the change listener, called when the value returned from the above function changes
+                     function(newValue, oldValue) {
+               if ( newValue !== oldValue ) {
+                 // Only increment the counter if the value changed
+                 scope.foodCounter = scope.foodCounter + 1;
+               }
+             }
+                     );
+                     // No digest has been run so the counter will be zero
+                     expect(scope.foodCounter).toEqual(0);
+
+                     // Run the digest but since food has not changed count will still be zero
+                     scope.$digest();
+                     expect(scope.foodCounter).toEqual(0);
+
+                     // Update food and run digest.  Now the counter will increment
+                     food = 'cheeseburger';
+                     scope.$digest();
+                     expect(scope.foodCounter).toEqual(1);
+
+                     * ```
                      *
-                     * @description
-                     * Listens on events of a given type. See {@link ng.$rootScope.Scope#$emit $emit} for
-                     * discussion of event life cycle.
                      *
-                     * The event listener function format is: `function(event, args...)`. The `event` object
-                     * passed into the listener has the following attributes:
                      *
-                     *   - `targetScope` - `{Scope}`: the scope on which the event was `$emit`-ed or
-                     *     `$broadcast`-ed.
-                     *   - `currentScope` - `{Scope}`: the current scope which is handling the event.
-                     *   - `name` - `{string}`: name of the event.
-                     *   - `stopPropagation` - `{function=}`: calling `stopPropagation` function will cancel
-                     *     further event propagation (available only for events that were `$emit`-ed).
-                     *   - `preventDefault` - `{function}`: calling `preventDefault` sets `defaultPrevented` flag
-                     *     to true.
-                     *   - `defaultPrevented` - `{boolean}`: true if `preventDefault` was called.
+                     * @param {(function()|string)} watchExpression Expression that is evaluated on each
+                     *    {@link ng.$rootScope.Scope#$digest $digest} cycle. A change in the return value triggers
+                     *    a call to the `listener`.
                      *
-                     * @param {string} name Event name to listen on.
-                     * @param {function(event, ...args)} listener Function to call when the event is emitted.
+                     *    - `string`: Evaluated as {@link guide/expression expression}
+                     *    - `function(scope)`: called with current `scope` as a parameter.
+                     * @param {function(newVal, oldVal, scope)} listener Callback called whenever the value
+                     *    of `watchExpression` changes.
+                     *
+                     *    - `newVal` contains the current value of the `watchExpression`
+                     *    - `oldVal` contains the previous value of the `watchExpression`
+                     *    - `scope` refers to the current scope
+                     * @param {boolean=} [objectEquality=false] Compare for object equality using {@link angular.equals} instead of
+                     *     comparing for reference equality.
                      * @returns {function()} Returns a deregistration function for this listener.
                      */
-                    $on: function(name, listener) {
-                        var namedListeners = this.$$listeners[name];
-                        if (!namedListeners) {
-                            this.$$listeners[name] = namedListeners = [];
+                    $watch: function(watchExp, listener, objectEquality, prettyPrintExpression) {
+                        var get = $parse(watchExp);
+                        var fn = isFunction(listener) ? listener : noop;
+
+                        if (get.$$watchDelegate) {
+                            return get.$$watchDelegate(this, fn, objectEquality, get, watchExp);
                         }
-                        namedListeners.push(listener);
+                        var scope = this,
+                            array = scope.$$watchers,
+                            watcher = {
+                                fn: fn,
+                                last: initWatchVal,
+                                get: get,
+                                exp: prettyPrintExpression || watchExp,
+                                eq: !!objectEquality
+                            };
 
-                        var current = this;
-                        do {
-                            if (!current.$$listenerCount[name]) {
-                                current.$$listenerCount[name] = 0;
-                            }
-                            current.$$listenerCount[name]++;
-                        } while ((current = current.$parent));
+                        lastDirtyWatch = null;
 
-                        var self = this;
-                        return function() {
-                            namedListeners[indexOf(namedListeners, listener)] = null;
-                            decrementListenerCount(self, 1, name);
+                        if (!array) {
+                            array = scope.$$watchers = [];
+                            array.$$digestWatchIndex = -1;
+                        }
+                        // we use unshift since we use a while loop in $digest for speed.
+                        // the while loop reads in reverse order.
+                        array.unshift(watcher);
+                        array.$$digestWatchIndex++;
+                        incrementWatchersCount(this, 1);
+
+                        return function deregisterWatch() {
+                            var index = arrayRemove(array, watcher);
+                            if (index >= 0) {
+                                incrementWatchersCount(scope, -1);
+                                if (index < array.$$digestWatchIndex) {
+                                    array.$$digestWatchIndex--;
+                                }
+                            }
+                            lastDirtyWatch = null;
                         };
                     },
 
-
                     /**
                      * @ngdoc method
-                     * @name $rootScope.Scope#$emit
-                     * @function
+                     * @name $rootScope.Scope#$watchGroup
+                     * @kind function
                      *
                      * @description
-                     * Dispatches an event `name` upwards through the scope hierarchy notifying the
-                     * registered {@link ng.$rootScope.Scope#$on} listeners.
+                     * A variant of {@link ng.$rootScope.Scope#$watch $watch()} where it watches an array of `watchExpressions`.
+                     * If any one expression in the collection changes the `listener` is executed.
                      *
-                     * The event life cycle starts at the scope on which `$emit` was called. All
-                     * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get
-                     * notified. Afterwards, the event traverses upwards toward the root scope and calls all
-                     * registered listeners along the way. The event will stop propagating if one of the listeners
-                     * cancels it.
+                     * - The items in the `watchExpressions` array are observed via the standard `$watch` operation. Their return
+                     *   values are examined for changes on every call to `$digest`.
+                     * - The `listener` is called whenever any expression in the `watchExpressions` array changes.
                      *
-                     * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed
-                     * onto the {@link ng.$exceptionHandler $exceptionHandler} service.
+                     * `$watchGroup` is more performant than watching each expression individually, and should be
+                     * used when the listener does not need to know which expression has changed.
+                     * If the listener needs to know which expression has changed,
+                     * {@link ng.$rootScope.Scope#$watch $watch()} or
+                     * {@link ng.$rootScope.Scope#$watchCollection $watchCollection()} should be used.
                      *
-                     * @param {string} name Event name to emit.
-                     * @param {...*} args Optional one or more arguments which will be passed onto the event listeners.
-                     * @return {Object} Event object (see {@link ng.$rootScope.Scope#$on}).
+                     * @param {Array.<string|Function(scope)>} watchExpressions Array of expressions that will be individually
+                     * watched using {@link ng.$rootScope.Scope#$watch $watch()}
+                     *
+                     * @param {function(newValues, oldValues, scope)} listener Callback called whenever the return value of any
+                     *    expression in `watchExpressions` changes
+                     *    The `newValues` array contains the current values of the `watchExpressions`, with the indexes matching
+                     *    those of `watchExpression`
+                     *    and the `oldValues` array contains the previous values of the `watchExpressions`, with the indexes matching
+                     *    those of `watchExpression`.
+                     *
+                     *    Note that `newValues` and `oldValues` reflect the differences in each **individual**
+                     *    expression, and not the difference of the values between each call of the listener.
+                     *    That means the difference between `newValues` and `oldValues` cannot be used to determine
+                     *    which expression has changed / remained stable:
+                     *
+                     *    ```js
+                     *
+                     *    $scope.$watchGroup(['v1', 'v2'], function(newValues, oldValues) {
+                     *      console.log(newValues, oldValues);
+                     *    });
+                     *
+                     *    // newValues, oldValues initially
+                     *    // [undefined, undefined], [undefined, undefined]
+                     *
+                     *    $scope.v1 = 'a';
+                     *    $scope.v2 = 'a';
+                     *
+                     *    // ['a', 'a'], [undefined, undefined]
+                     *
+                     *    $scope.v2 = 'b'
+                     *
+                     *    // v1 hasn't changed since it became `'a'`, therefore its oldValue is still `undefined`
+                     *    // ['a', 'b'], [undefined, 'a']
+                     *
+                     *    ```
+                     *
+                     *    The `scope` refers to the current scope.
+                     * @returns {function()} Returns a de-registration function for all listeners.
                      */
-                    $emit: function(name, args) {
-                        var empty = [],
-                            namedListeners,
-                            scope = this,
-                            stopPropagation = false,
-                            event = {
-                                name: name,
-                                targetScope: scope,
-                                stopPropagation: function() {stopPropagation = true;},
-                                preventDefault: function() {
-                                    event.defaultPrevented = true;
-                                },
-                                defaultPrevented: false
-                            },
-                            listenerArgs = concat([event], arguments, 1),
-                            i, length;
+                    $watchGroup: function(watchExpressions, listener) {
+                        var oldValues = new Array(watchExpressions.length);
+                        var newValues = new Array(watchExpressions.length);
+                        var deregisterFns = [];
+                        var self = this;
+                        var changeReactionScheduled = false;
+                        var firstRun = true;
+
+                        if (!watchExpressions.length) {
+                            // No expressions means we call the listener ASAP
+                            var shouldCall = true;
+                            self.$evalAsync(function() {
+                                if (shouldCall) listener(newValues, newValues, self);
+                            });
+                            return function deregisterWatchGroup() {
+                                shouldCall = false;
+                            };
+                        }
 
-                        do {
-                            namedListeners = scope.$$listeners[name] || empty;
-                            event.currentScope = scope;
-                            for (i=0, length=namedListeners.length; i<length; i++) {
+                        if (watchExpressions.length === 1) {
+                            // Special case size of one
+                            return this.$watch(watchExpressions[0], function watchGroupAction(value, oldValue, scope) {
+                                newValues[0] = value;
+                                oldValues[0] = oldValue;
+                                listener(newValues, (value === oldValue) ? newValues : oldValues, scope);
+                            });
+                        }
 
-                                // if listeners were deregistered, defragment the array
-                                if (!namedListeners[i]) {
-                                    namedListeners.splice(i, 1);
-                                    i--;
-                                    length--;
-                                    continue;
-                                }
-                                try {
-                                    //allow all listeners attached to the current scope to run
-                                    namedListeners[i].apply(null, listenerArgs);
-                                } catch (e) {
-                                    $exceptionHandler(e);
+                        forEach(watchExpressions, function(expr, i) {
+                            var unwatchFn = self.$watch(expr, function watchGroupSubAction(value, oldValue) {
+                                newValues[i] = value;
+                                oldValues[i] = oldValue;
+                                if (!changeReactionScheduled) {
+                                    changeReactionScheduled = true;
+                                    self.$evalAsync(watchGroupAction);
                                 }
+                            });
+                            deregisterFns.push(unwatchFn);
+                        });
+
+                        function watchGroupAction() {
+                            changeReactionScheduled = false;
+
+                            if (firstRun) {
+                                firstRun = false;
+                                listener(newValues, newValues, self);
+                            } else {
+                                listener(newValues, oldValues, self);
                             }
-                            //if any listener on the current scope stops propagation, prevent bubbling
-                            if (stopPropagation) return event;
-                            //traverse upwards
-                            scope = scope.$parent;
-                        } while (scope);
+                        }
 
-                        return event;
+                        return function deregisterWatchGroup() {
+                            while (deregisterFns.length) {
+                                deregisterFns.shift()();
+                            }
+                        };
                     },
 
 
                     /**
                      * @ngdoc method
-                     * @name $rootScope.Scope#$broadcast
-                     * @function
+                     * @name $rootScope.Scope#$watchCollection
+                     * @kind function
                      *
                      * @description
-                     * Dispatches an event `name` downwards to all child scopes (and their children) notifying the
-                     * registered {@link ng.$rootScope.Scope#$on} listeners.
+                     * Shallow watches the properties of an object and fires whenever any of the properties change
+                     * (for arrays, this implies watching the array items; for object maps, this implies watching
+                     * the properties). If a change is detected, the `listener` callback is fired.
                      *
-                     * The event life cycle starts at the scope on which `$broadcast` was called. All
-                     * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get
-                     * notified. Afterwards, the event propagates to all direct and indirect scopes of the current
-                     * scope and calls all registered listeners along the way. The event cannot be canceled.
+                     * - The `obj` collection is observed via standard $watch operation and is examined on every
+                     *   call to $digest() to see if any items have been added, removed, or moved.
+                     * - The `listener` is called whenever anything within the `obj` has changed. Examples include
+                     *   adding, removing, and moving items belonging to an object or array.
                      *
-                     * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed
-                     * onto the {@link ng.$exceptionHandler $exceptionHandler} service.
                      *
-                     * @param {string} name Event name to broadcast.
-                     * @param {...*} args Optional one or more arguments which will be passed onto the event listeners.
-                     * @return {Object} Event object, see {@link ng.$rootScope.Scope#$on}
-                     */
-                    $broadcast: function(name, args) {
-                        console.debug(name);
-                        var target = this,
-                            current = target,
-                            next = target,
-                            event = {
-                                name: name,
-                                targetScope: target,
-                                preventDefault: function() {
-                                    event.defaultPrevented = true;
-                                },
-                                defaultPrevented: false
-                            },
-                            listenerArgs = concat([event], arguments, 1),
-                            listeners, i, length;
+                     * @example
+                     * ```js
+                     $scope.names = ['igor', 'matias', 'misko', 'james'];
+                     $scope.dataCount = 4;
 
-                        //down while you can, then up and next sibling or up and next sibling until back at root
-                        while ((current = next)) {
-                            event.currentScope = current;
-                            listeners = current.$$listeners[name] || [];
-                            for (i=0, length = listeners.length; i<length; i++) {
-                                // if listeners were deregistered, defragment the array
-                                if (!listeners[i]) {
-                                    listeners.splice(i, 1);
-                                    i--;
-                                    length--;
-                                    continue;
-                                }
+                     $scope.$watchCollection('names', function(newNames, oldNames) {
+            $scope.dataCount = newNames.length;
+          });
 
-                                try {
-                                    listeners[i].apply(null, listenerArgs);
-                                } catch(e) {
-                                    $exceptionHandler(e);
-                                }
-                            }
+                     expect($scope.dataCount).toEqual(4);
+                     $scope.$digest();
 
-                            // Insanity Warning: scope depth-first traversal
-                            // yes, this code is a bit crazy, but it works and we have tests to prove it!
-                            // this piece should be kept in sync with the traversal in $digest
-                            // (though it differs due to having the extra check for $$listenerCount)
-                            if (!(next = ((current.$$listenerCount[name] && current.$$childHead) ||
-                                (current !== target && current.$$nextSibling)))) {
-                                while(current !== target && !(next = current.$$nextSibling)) {
-                                    current = current.$parent;
-                                }
-                            }
-                        }
+                     //still at 4 ... no changes
+                     expect($scope.dataCount).toEqual(4);
 
-                        return event;
-                    }
-                };
+                     $scope.names.pop();
+                     $scope.$digest();
 
-                var $rootScope = new Scope();
+                     //now there's been a change
+                     expect($scope.dataCount).toEqual(3);
+                     * ```
+                     *
+                     *
+                     * @param {string|function(scope)} obj Evaluated as {@link guide/expression expression}. The
+                     *    expression value should evaluate to an object or an array which is observed on each
+                     *    {@link ng.$rootScope.Scope#$digest $digest} cycle. Any shallow change within the
+                     *    collection will trigger a call to the `listener`.
+                     *
+                     * @param {function(newCollection, oldCollection, scope)} listener a callback function called
+                     *    when a change is detected.
+                     *    - The `newCollection` object is the newly modified data obtained from the `obj` expression
+                     *    - The `oldCollection` object is a copy of the former collection data.
+                     *      Due to performance considerations, the`oldCollection` value is computed only if the
+                     *      `listener` function declares two or more arguments.
+                     *    - The `scope` argument refers to the current scope.
+                     *
+                     * @returns {function()} Returns a de-registration function for this listener. When the
+                     *    de-registration function is executed, the internal watch operation is terminated.
+                     */
+                    $watchCollection: function(obj, listener) {
+                        $watchCollectionInterceptor.$stateful = true;
 
-                return $rootScope;
+                        var self = this;
+                        // the current value, updated on each dirty-check run
+                        var newValue;
+                        // a shallow copy of the newValue from the last dirty-check run,
+                        // updated to match newValue during dirty-check run
+                        var oldValue;
+                        // a shallow copy of the newValue from when the last change happened
+                        var veryOldValue;
+                        // only track veryOldValue if the listener is asking for it
+                        var trackVeryOldValue = (listener.length > 1);
+                        var changeDetected = 0;
+                        var changeDetector = $parse(obj, $watchCollectionInterceptor);
+                        var internalArray = [];
+                        var internalObject = {};
+                        var initRun = true;
+                        var oldLength = 0;
 
+                        function $watchCollectionInterceptor(_value) {
+                            newValue = _value;
+                            var newLength, key, bothNaN, newItem, oldItem;
 
-                function beginPhase(phase) {
-                    if ($rootScope.$$phase) {
-                        throw $rootScopeMinErr('inprog', '{0} already in progress', $rootScope.$$phase);
-                    }
+                            // If the new value is undefined, then return undefined as the watch may be a one-time watch
+                            if (isUndefined(newValue)) return;
 
-                    $rootScope.$$phase = phase;
-                }
+                            if (!isObject(newValue)) { // if primitive
+                                if (oldValue !== newValue) {
+                                    oldValue = newValue;
+                                    changeDetected++;
+                                }
+                            } else if (isArrayLike(newValue)) {
+                                if (oldValue !== internalArray) {
+                                    // we are transitioning from something which was not an array into array.
+                                    oldValue = internalArray;
+                                    oldLength = oldValue.length = 0;
+                                    changeDetected++;
+                                }
 
-                function clearPhase() {
-                    $rootScope.$$phase = null;
-                }
+                                newLength = newValue.length;
 
-                function compileToFn(exp, name) {
-                    var fn = $parse(exp);
-                    assertArgFn(fn, name);
-                    return fn;
-                }
+                                if (oldLength !== newLength) {
+                                    // if lengths do not match we need to trigger change notification
+                                    changeDetected++;
+                                    oldValue.length = oldLength = newLength;
+                                }
+                                // copy the items to oldValue and look for changes.
+                                for (var i = 0; i < newLength; i++) {
+                                    oldItem = oldValue[i];
+                                    newItem = newValue[i];
 
-                function decrementListenerCount(current, count, name) {
-                    do {
-                        current.$$listenerCount[name] -= count;
+                                    // eslint-disable-next-line no-self-compare
+                                    bothNaN = (oldItem !== oldItem) && (newItem !== newItem);
+                                    if (!bothNaN && (oldItem !== newItem)) {
+                                        changeDetected++;
+                                        oldValue[i] = newItem;
+                                    }
+                                }
+                            } else {
+                                if (oldValue !== internalObject) {
+                                    // we are transitioning from something which was not an object into object.
+                                    oldValue = internalObject = {};
+                                    oldLength = 0;
+                                    changeDetected++;
+                                }
+                                // copy the items to oldValue and look for changes.
+                                newLength = 0;
+                                for (key in newValue) {
+                                    if (hasOwnProperty.call(newValue, key)) {
+                                        newLength++;
+                                        newItem = newValue[key];
+                                        oldItem = oldValue[key];
 
-                        if (current.$$listenerCount[name] === 0) {
-                            delete current.$$listenerCount[name];
+                                        if (key in oldValue) {
+                                            // eslint-disable-next-line no-self-compare
+                                            bothNaN = (oldItem !== oldItem) && (newItem !== newItem);
+                                            if (!bothNaN && (oldItem !== newItem)) {
+                                                changeDetected++;
+                                                oldValue[key] = newItem;
+                                            }
+                                        } else {
+                                            oldLength++;
+                                            oldValue[key] = newItem;
+                                            changeDetected++;
+                                        }
+                                    }
+                                }
+                                if (oldLength > newLength) {
+                                    // we used to have more keys, need to find them and destroy them.
+                                    changeDetected++;
+                                    for (key in oldValue) {
+                                        if (!hasOwnProperty.call(newValue, key)) {
+                                            oldLength--;
+                                            delete oldValue[key];
+                                        }
+                                    }
+                                }
+                            }
+                            return changeDetected;
                         }
-                    } while ((current = current.$parent));
-                }
 
-                /**
-                 * function used as an initial value for watchers.
-                 * because it's unique we can easily tell it apart from other values
-                 */
-                function initWatchVal() {}
-            }];
-    }
+                        function $watchCollectionAction() {
+                            if (initRun) {
+                                initRun = false;
+                                listener(newValue, newValue, self);
+                            } else {
+                                listener(newValue, veryOldValue, self);
+                            }
 
-    /**
-     * @description
-     * Private service to sanitize uris for links and images. Used by $compile and $sanitize.
-     */
-    function $$SanitizeUriProvider() {
-        var aHrefSanitizationWhitelist = /^\s*(https?|ftp|mailto|tel|file):/,
-            imgSrcSanitizationWhitelist = /^\s*(https?|ftp|file):|data:image\//;
+                            // make a copy for the next time a collection is changed
+                            if (trackVeryOldValue) {
+                                if (!isObject(newValue)) {
+                                    //primitive
+                                    veryOldValue = newValue;
+                                } else if (isArrayLike(newValue)) {
+                                    veryOldValue = new Array(newValue.length);
+                                    for (var i = 0; i < newValue.length; i++) {
+                                        veryOldValue[i] = newValue[i];
+                                    }
+                                } else { // if object
+                                    veryOldValue = {};
+                                    for (var key in newValue) {
+                                        if (hasOwnProperty.call(newValue, key)) {
+                                            veryOldValue[key] = newValue[key];
+                                        }
+                                    }
+                                }
+                            }
+                        }
 
-        /**
-         * @description
-         * Retrieves or overrides the default regular expression that is used for whitelisting of safe
-         * urls during a[href] sanitization.
-         *
-         * The sanitization is a security measure aimed at prevent XSS attacks via html links.
-         *
-         * Any url about to be assigned to a[href] via data-binding is first normalized and turned into
-         * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist`
-         * regular expression. If a match is found, the original url is written into the dom. Otherwise,
-         * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
-         *
-         * @param {RegExp=} regexp New regexp to whitelist urls with.
-         * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
-         *    chaining otherwise.
-         */
-        this.aHrefSanitizationWhitelist = function(regexp) {
-            if (isDefined(regexp)) {
-                aHrefSanitizationWhitelist = regexp;
-                return this;
-            }
-            return aHrefSanitizationWhitelist;
-        };
+                        return this.$watch(changeDetector, $watchCollectionAction);
+                    },
 
+                    /**
+                     * @ngdoc method
+                     * @name $rootScope.Scope#$digest
+                     * @kind function
+                     *
+                     * @description
+                     * Processes all of the {@link ng.$rootScope.Scope#$watch watchers} of the current scope and
+                     * its children. Because a {@link ng.$rootScope.Scope#$watch watcher}'s listener can change
+                     * the model, the `$digest()` keeps calling the {@link ng.$rootScope.Scope#$watch watchers}
+                     * until no more listeners are firing. This means that it is possible to get into an infinite
+                     * loop. This function will throw `'Maximum iteration limit exceeded.'` if the number of
+                     * iterations exceeds 10.
+                     *
+                     * Usually, you don't call `$digest()` directly in
+                     * {@link ng.directive:ngController controllers} or in
+                     * {@link ng.$compileProvider#directive directives}.
+                     * Instead, you should call {@link ng.$rootScope.Scope#$apply $apply()} (typically from within
+                     * a {@link ng.$compileProvider#directive directive}), which will force a `$digest()`.
+                     *
+                     * If you want to be notified whenever `$digest()` is called,
+                     * you can register a `watchExpression` function with
+                     * {@link ng.$rootScope.Scope#$watch $watch()} with no `listener`.
+                     *
+                     * In unit tests, you may need to call `$digest()` to simulate the scope life cycle.
+                     *
+                     * @example
+                     * ```js
+                     var scope = ...;
+                     scope.name = 'misko';
+                     scope.counter = 0;
 
-        /**
-         * @description
-         * Retrieves or overrides the default regular expression that is used for whitelisting of safe
-         * urls during img[src] sanitization.
-         *
-         * The sanitization is a security measure aimed at prevent XSS attacks via html links.
-         *
-         * Any url about to be assigned to img[src] via data-binding is first normalized and turned into
-         * an absolute url. Afterwards, the url is matched against the `imgSrcSanitizationWhitelist`
-         * regular expression. If a match is found, the original url is written into the dom. Otherwise,
-         * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
-         *
-         * @param {RegExp=} regexp New regexp to whitelist urls with.
-         * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
-         *    chaining otherwise.
-         */
-        this.imgSrcSanitizationWhitelist = function(regexp) {
-            if (isDefined(regexp)) {
-                imgSrcSanitizationWhitelist = regexp;
-                return this;
-            }
-            return imgSrcSanitizationWhitelist;
-        };
+                     expect(scope.counter).toEqual(0);
+                     scope.$watch('name', function(newValue, oldValue) {
+             scope.counter = scope.counter + 1;
+           });
+                     expect(scope.counter).toEqual(0);
 
-        this.$get = function() {
-            return function sanitizeUri(uri, isImage) {
-                var regex = isImage ? imgSrcSanitizationWhitelist : aHrefSanitizationWhitelist;
-                var normalizedVal;
-                // NOTE: urlResolve() doesn't support IE < 8 so we don't sanitize for that case.
-                if (!msie || msie >= 8 ) {
-                    normalizedVal = urlResolve(uri).href;
-                    if (normalizedVal !== '' && !normalizedVal.match(regex)) {
-                        return 'unsafe:'+normalizedVal;
-                    }
-                }
-                return uri;
-            };
-        };
-    }
+                     scope.$digest();
+                     // the listener is always called during the first $digest loop after it was registered
+                     expect(scope.counter).toEqual(1);
 
-    var $sceMinErr = minErr('$sce');
-
-    var SCE_CONTEXTS = {
-        HTML: 'html',
-        CSS: 'css',
-        URL: 'url',
-        // RESOURCE_URL is a subtype of URL used in contexts where a privileged resource is sourced from a
-        // url.  (e.g. ng-include, script src, templateUrl)
-        RESOURCE_URL: 'resourceUrl',
-        JS: 'js'
-    };
-
-// Helper functions follow.
-
-// Copied from:
-// http://docs.closure-library.googlecode.com/git/closure_goog_string_string.js.source.html#line962
-// Prereq: s is a string.
-    function escapeForRegexp(s) {
-        return s.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g, '\\$1').
-            replace(/\x08/g, '\\x08');
-    }
-
-
-    function adjustMatcher(matcher) {
-        if (matcher === 'self') {
-            return matcher;
-        } else if (isString(matcher)) {
-            // Strings match exactly except for 2 wildcards - '*' and '**'.
-            // '*' matches any character except those from the set ':/.?&'.
-            // '**' matches any character (like .* in a RegExp).
-            // More than 2 *'s raises an error as it's ill defined.
-            if (matcher.indexOf('***') > -1) {
-                throw $sceMinErr('iwcard',
-                    'Illegal sequence *** in string matcher.  String: {0}', matcher);
-            }
-            matcher = escapeForRegexp(matcher).
-                replace('\\*\\*', '.*').
-                replace('\\*', '[^:/.?&;]*');
-            return new RegExp('^' + matcher + '$');
-        } else if (isRegExp(matcher)) {
-            // The only other type of matcher allowed is a Regexp.
-            // Match entire URL / disallow partial matches.
-            // Flags are reset (i.e. no global, ignoreCase or multiline)
-            return new RegExp('^' + matcher.source + '$');
-        } else {
-            throw $sceMinErr('imatcher',
-                'Matchers may only be "self", string patterns or RegExp objects');
-        }
-    }
+                     scope.$digest();
+                     // but now it will not be called unless the value changes
+                     expect(scope.counter).toEqual(1);
 
+                     scope.name = 'adam';
+                     scope.$digest();
+                     expect(scope.counter).toEqual(2);
+                     * ```
+                     *
+                     */
+                    $digest: function() {
+                        var watch, value, last, fn, get,
+                            watchers,
+                            dirty, ttl = TTL,
+                            next, current, target = this,
+                            watchLog = [],
+                            logIdx, asyncTask;
 
-    function adjustMatchers(matchers) {
-        var adjustedMatchers = [];
-        if (isDefined(matchers)) {
-            forEach(matchers, function(matcher) {
-                adjustedMatchers.push(adjustMatcher(matcher));
-            });
-        }
-        return adjustedMatchers;
-    }
+                        beginPhase('$digest');
+                        // Check for changes to browser url that happened in sync before the call to $digest
+                        $browser.$$checkUrlChange();
+
+                        if (this === $rootScope && applyAsyncId !== null) {
+                            // If this is the root scope, and $applyAsync has scheduled a deferred $apply(), then
+                            // cancel the scheduled $apply and flush the queue of expressions to be evaluated.
+                            $browser.defer.cancel(applyAsyncId);
+                            flushApplyAsync();
+                        }
 
+                        lastDirtyWatch = null;
 
-    /**
-     * @ngdoc service
-     * @name $sceDelegate
-     * @function
-     *
-     * @description
-     *
-     * `$sceDelegate` is a service that is used by the `$sce` service to provide {@link ng.$sce Strict
- * Contextual Escaping (SCE)} services to AngularJS.
-     *
-     * Typically, you would configure or override the {@link ng.$sceDelegate $sceDelegate} instead of
-     * the `$sce` service to customize the way Strict Contextual Escaping works in AngularJS.  This is
-     * because, while the `$sce` provides numerous shorthand methods, etc., you really only need to
-     * override 3 core functions (`trustAs`, `getTrusted` and `valueOf`) to replace the way things
-     * work because `$sce` delegates to `$sceDelegate` for these operations.
-     *
-     * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} to configure this service.
-     *
-     * The default instance of `$sceDelegate` should work out of the box with little pain.  While you
-     * can override it completely to change the behavior of `$sce`, the common case would
-     * involve configuring the {@link ng.$sceDelegateProvider $sceDelegateProvider} instead by setting
-     * your own whitelists and blacklists for trusting URLs used for loading AngularJS resources such as
-     * templates.  Refer {@link ng.$sceDelegateProvider#resourceUrlWhitelist
- * $sceDelegateProvider.resourceUrlWhitelist} and {@link
-        * ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist}
-     */
+                        do { // "while dirty" loop
+                            dirty = false;
+                            current = target;
 
-    /**
-     * @ngdoc provider
-     * @name $sceDelegateProvider
-     * @description
-     *
-     * The `$sceDelegateProvider` provider allows developers to configure the {@link ng.$sceDelegate
- * $sceDelegate} service.  This allows one to get/set the whitelists and blacklists used to ensure
-     * that the URLs used for sourcing Angular templates are safe.  Refer {@link
-        * ng.$sceDelegateProvider#resourceUrlWhitelist $sceDelegateProvider.resourceUrlWhitelist} and
-     * {@link ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist}
-     *
-     * For the general details about this service in Angular, read the main page for {@link ng.$sce
- * Strict Contextual Escaping (SCE)}.
-     *
-     * **Example**:  Consider the following case. <a name="example"></a>
-     *
-     * - your app is hosted at url `http://myapp.example.com/`
-     * - but some of your templates are hosted on other domains you control such as
-     *   `http://srv01.assets.example.com/`,  `http://srv02.assets.example.com/`, etc.
-     * - and you have an open redirect at `http://myapp.example.com/clickThru?...`.
-     *
-     * Here is what a secure configuration for this scenario might look like:
-     *
-     * <pre class="prettyprint">
-     *    angular.module('myApp', []).config(function($sceDelegateProvider) {
- *      $sceDelegateProvider.resourceUrlWhitelist([
- *        // Allow same origin resource loads.
- *        'self',
- *        // Allow loading from our assets domain.  Notice the difference between * and **.
- *        'http://srv*.assets.example.com/**']);
- *
- *      // The blacklist overrides the whitelist so the open redirect here is blocked.
- *      $sceDelegateProvider.resourceUrlBlacklist([
- *        'http://myapp.example.com/clickThru**']);
- *      });
-     * </pre>
-     */
+                            // It's safe for asyncQueuePosition to be a local variable here because this loop can't
+                            // be reentered recursively. Calling $digest from a function passed to $evalAsync would
+                            // lead to a '$digest already in progress' error.
+                            for (var asyncQueuePosition = 0; asyncQueuePosition < asyncQueue.length; asyncQueuePosition++) {
+                                try {
+                                    asyncTask = asyncQueue[asyncQueuePosition];
+                                    fn = asyncTask.fn;
+                                    fn(asyncTask.scope, asyncTask.locals);
+                                } catch (e) {
+                                    $exceptionHandler(e);
+                                }
+                                lastDirtyWatch = null;
+                            }
+                            asyncQueue.length = 0;
 
-    function $SceDelegateProvider() {
-        this.SCE_CONTEXTS = SCE_CONTEXTS;
+                            traverseScopesLoop:
+                                do { // "traverse the scopes" loop
+                                    if ((watchers = current.$$watchers)) {
+                                        // process our watches
+                                        watchers.$$digestWatchIndex = watchers.length;
+                                        while (watchers.$$digestWatchIndex--) {
+                                            try {
+                                                watch = watchers[watchers.$$digestWatchIndex];
+                                                // Most common watches are on primitives, in which case we can short
+                                                // circuit it with === operator, only when === fails do we use .equals
+                                                if (watch) {
+                                                    get = watch.get;
+                                                    if ((value = get(current)) !== (last = watch.last) &&
+                                                        !(watch.eq
+                                                            ? equals(value, last)
+                                                            : (isNumberNaN(value) && isNumberNaN(last)))) {
+                                                        dirty = true;
+                                                        lastDirtyWatch = watch;
+                                                        watch.last = watch.eq ? copy(value, null) : value;
+                                                        fn = watch.fn;
+                                                        fn(value, ((last === initWatchVal) ? value : last), current);
+                                                        if (ttl < 5) {
+                                                            logIdx = 4 - ttl;
+                                                            if (!watchLog[logIdx]) watchLog[logIdx] = [];
+                                                            watchLog[logIdx].push({
+                                                                msg: isFunction(watch.exp) ? 'fn: ' + (watch.exp.name || watch.exp.toString()) : watch.exp,
+                                                                newVal: value,
+                                                                oldVal: last
+                                                            });
+                                                        }
+                                                    } else if (watch === lastDirtyWatch) {
+                                                        // If the most recently dirty watcher is now clean, short circuit since the remaining watchers
+                                                        // have already been tested.
+                                                        dirty = false;
+                                                        break traverseScopesLoop;
+                                                    }
+                                                }
+                                            } catch (e) {
+                                                $exceptionHandler(e);
+                                            }
+                                        }
+                                    }
 
-        // Resource URLs can also be trusted by policy.
-        var resourceUrlWhitelist = ['self'],
-            resourceUrlBlacklist = [];
+                                    // Insanity Warning: scope depth-first traversal
+                                    // yes, this code is a bit crazy, but it works and we have tests to prove it!
+                                    // this piece should be kept in sync with the traversal in $broadcast
+                                    if (!(next = ((current.$$watchersCount && current.$$childHead) ||
+                                        (current !== target && current.$$nextSibling)))) {
+                                        while (current !== target && !(next = current.$$nextSibling)) {
+                                            current = current.$parent;
+                                        }
+                                    }
+                                } while ((current = next));
 
-        /**
-         * @ngdoc method
-         * @name $sceDelegateProvider#resourceUrlWhitelist
-         * @function
-         *
-         * @param {Array=} whitelist When provided, replaces the resourceUrlWhitelist with the value
-         *     provided.  This must be an array or null.  A snapshot of this array is used so further
-         *     changes to the array are ignored.
-         *
-         *     Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items
-         *     allowed in this array.
-         *
-         *     Note: **an empty whitelist array will block all URLs**!
-         *
-         * @return {Array} the currently set whitelist array.
-         *
-         * The **default value** when no whitelist has been explicitly set is `['self']` allowing only
-         * same origin resource requests.
-         *
-         * @description
-         * Sets/Gets the whitelist of trusted resource URLs.
-         */
-        this.resourceUrlWhitelist = function (value) {
-            if (arguments.length) {
-                resourceUrlWhitelist = adjustMatchers(value);
-            }
-            return resourceUrlWhitelist;
-        };
+                            // `break traverseScopesLoop;` takes us to here
 
-        /**
-         * @ngdoc method
-         * @name $sceDelegateProvider#resourceUrlBlacklist
-         * @function
-         *
-         * @param {Array=} blacklist When provided, replaces the resourceUrlBlacklist with the value
-         *     provided.  This must be an array or null.  A snapshot of this array is used so further
-         *     changes to the array are ignored.
-         *
-         *     Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items
-         *     allowed in this array.
-         *
-         *     The typical usage for the blacklist is to **block
-         *     [open redirects](http://cwe.mitre.org/data/definitions/601.html)** served by your domain as
-         *     these would otherwise be trusted but actually return content from the redirected domain.
-         *
-         *     Finally, **the blacklist overrides the whitelist** and has the final say.
-         *
-         * @return {Array} the currently set blacklist array.
-         *
-         * The **default value** when no whitelist has been explicitly set is the empty array (i.e. there
-         * is no blacklist.)
-         *
-         * @description
-         * Sets/Gets the blacklist of trusted resource URLs.
-         */
+                            if ((dirty || asyncQueue.length) && !(ttl--)) {
+                                clearPhase();
+                                throw $rootScopeMinErr('infdig',
+                                    '{0} $digest() iterations reached. Aborting!\n' +
+                                    'Watchers fired in the last 5 iterations: {1}',
+                                    TTL, watchLog);
+                            }
 
-        this.resourceUrlBlacklist = function (value) {
-            if (arguments.length) {
-                resourceUrlBlacklist = adjustMatchers(value);
-            }
-            return resourceUrlBlacklist;
-        };
+                        } while (dirty || asyncQueue.length);
 
-        this.$get = ['$injector', function($injector) {
+                        clearPhase();
 
-            var htmlSanitizer = function htmlSanitizer(html) {
-                throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.');
-            };
+                        // postDigestQueuePosition isn't local here because this loop can be reentered recursively.
+                        while (postDigestQueuePosition < postDigestQueue.length) {
+                            try {
+                                postDigestQueue[postDigestQueuePosition++]();
+                            } catch (e) {
+                                $exceptionHandler(e);
+                            }
+                        }
+                        postDigestQueue.length = postDigestQueuePosition = 0;
 
-            if ($injector.has('$sanitize')) {
-                htmlSanitizer = $injector.get('$sanitize');
-            }
+                        // Check for changes to browser url that happened during the $digest
+                        // (for which no event is fired; e.g. via `history.pushState()`)
+                        $browser.$$checkUrlChange();
+                    },
 
 
-            function matchUrl(matcher, parsedUrl) {
-                if (matcher === 'self') {
-                    return urlIsSameOrigin(parsedUrl);
-                } else {
-                    // definitely a regex.  See adjustMatchers()
-                    return !!matcher.exec(parsedUrl.href);
-                }
-            }
+                    /**
+                     * @ngdoc event
+                     * @name $rootScope.Scope#$destroy
+                     * @eventType broadcast on scope being destroyed
+                     *
+                     * @description
+                     * Broadcasted when a scope and its children are being destroyed.
+                     *
+                     * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
+                     * clean up DOM bindings before an element is removed from the DOM.
+                     */
 
-            function isResourceUrlAllowedByPolicy(url) {
-                var parsedUrl = urlResolve(url.toString());
-                var i, n, allowed = false;
-                // Ensure that at least one item from the whitelist allows this url.
-                for (i = 0, n = resourceUrlWhitelist.length; i < n; i++) {
-                    if (matchUrl(resourceUrlWhitelist[i], parsedUrl)) {
-                        allowed = true;
-                        break;
-                    }
-                }
-                if (allowed) {
-                    // Ensure that no item from the blacklist blocked this url.
-                    for (i = 0, n = resourceUrlBlacklist.length; i < n; i++) {
-                        if (matchUrl(resourceUrlBlacklist[i], parsedUrl)) {
-                            allowed = false;
-                            break;
-                        }
-                    }
-                }
-                return allowed;
-            }
+                    /**
+                     * @ngdoc method
+                     * @name $rootScope.Scope#$destroy
+                     * @kind function
+                     *
+                     * @description
+                     * Removes the current scope (and all of its children) from the parent scope. Removal implies
+                     * that calls to {@link ng.$rootScope.Scope#$digest $digest()} will no longer
+                     * propagate to the current scope and its children. Removal also implies that the current
+                     * scope is eligible for garbage collection.
+                     *
+                     * The `$destroy()` is usually used by directives such as
+                     * {@link ng.directive:ngRepeat ngRepeat} for managing the
+                     * unrolling of the loop.
+                     *
+                     * Just before a scope is destroyed, a `$destroy` event is broadcasted on this scope.
+                     * Application code can register a `$destroy` event handler that will give it a chance to
+                     * perform any necessary cleanup.
+                     *
+                     * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
+                     * clean up DOM bindings before an element is removed from the DOM.
+                     */
+                    $destroy: function() {
+                        // We can't destroy a scope that has been already destroyed.
+                        if (this.$$destroyed) return;
+                        var parent = this.$parent;
 
-            function generateHolderType(Base) {
-                var holderType = function TrustedValueHolderType(trustedValue) {
-                    this.$$unwrapTrustedValue = function() {
-                        return trustedValue;
-                    };
-                };
-                if (Base) {
-                    holderType.prototype = new Base();
-                }
-                holderType.prototype.valueOf = function sceValueOf() {
-                    return this.$$unwrapTrustedValue();
-                };
-                holderType.prototype.toString = function sceToString() {
-                    return this.$$unwrapTrustedValue().toString();
-                };
-                return holderType;
-            }
+                        this.$broadcast('$destroy');
+                        this.$$destroyed = true;
 
-            var trustedValueHolderBase = generateHolderType(),
-                byType = {};
+                        if (this === $rootScope) {
+                            //Remove handlers attached to window when $rootScope is removed
+                            $browser.$$applicationDestroyed();
+                        }
 
-            byType[SCE_CONTEXTS.HTML] = generateHolderType(trustedValueHolderBase);
-            byType[SCE_CONTEXTS.CSS] = generateHolderType(trustedValueHolderBase);
-            byType[SCE_CONTEXTS.URL] = generateHolderType(trustedValueHolderBase);
-            byType[SCE_CONTEXTS.JS] = generateHolderType(trustedValueHolderBase);
-            byType[SCE_CONTEXTS.RESOURCE_URL] = generateHolderType(byType[SCE_CONTEXTS.URL]);
+                        incrementWatchersCount(this, -this.$$watchersCount);
+                        for (var eventName in this.$$listenerCount) {
+                            decrementListenerCount(this, this.$$listenerCount[eventName], eventName);
+                        }
 
-            /**
-             * @ngdoc method
-             * @name $sceDelegate#trustAs
-             *
-             * @description
-             * Returns an object that is trusted by angular for use in specified strict
-             * contextual escaping contexts (such as ng-bind-html, ng-include, any src
-             * attribute interpolation, any dom event binding attribute interpolation
-             * such as for onclick,  etc.) that uses the provided value.
-             * See {@link ng.$sce $sce} for enabling strict contextual escaping.
-             *
-             * @param {string} type The kind of context in which this value is safe for use.  e.g. url,
-             *   resourceUrl, html, js and css.
-             * @param {*} value The value that that should be considered trusted/safe.
-             * @returns {*} A value that can be used to stand in for the provided `value` in places
-             * where Angular expects a $sce.trustAs() return value.
-             */
-            function trustAs(type, trustedValue) {
-                var Constructor = (byType.hasOwnProperty(type) ? byType[type] : null);
-                if (!Constructor) {
-                    throw $sceMinErr('icontext',
-                        'Attempted to trust a value in invalid context. Context: {0}; Value: {1}',
-                        type, trustedValue);
-                }
-                if (trustedValue === null || trustedValue === undefined || trustedValue === '') {
-                    return trustedValue;
-                }
-                // All the current contexts in SCE_CONTEXTS happen to be strings.  In order to avoid trusting
-                // mutable objects, we ensure here that the value passed in is actually a string.
-                if (typeof trustedValue !== 'string') {
-                    throw $sceMinErr('itype',
-                        'Attempted to trust a non-string value in a content requiring a string: Context: {0}',
-                        type);
-                }
-                return new Constructor(trustedValue);
-            }
+                        // sever all the references to parent scopes (after this cleanup, the current scope should
+                        // not be retained by any of our references and should be eligible for garbage collection)
+                        if (parent && parent.$$childHead === this) parent.$$childHead = this.$$nextSibling;
+                        if (parent && parent.$$childTail === this) parent.$$childTail = this.$$prevSibling;
+                        if (this.$$prevSibling) this.$$prevSibling.$$nextSibling = this.$$nextSibling;
+                        if (this.$$nextSibling) this.$$nextSibling.$$prevSibling = this.$$prevSibling;
 
-            /**
-             * @ngdoc method
-             * @name $sceDelegate#valueOf
-             *
-             * @description
-             * If the passed parameter had been returned by a prior call to {@link ng.$sceDelegate#trustAs
-     * `$sceDelegate.trustAs`}, returns the value that had been passed to {@link
-                * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}.
-             *
-             * If the passed parameter is not a value that had been returned by {@link
-                * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}, returns it as-is.
-             *
-             * @param {*} value The result of a prior {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}
-             *      call or anything else.
-             * @returns {*} The `value` that was originally provided to {@link ng.$sceDelegate#trustAs
-     *     `$sceDelegate.trustAs`} if `value` is the result of such a call.  Otherwise, returns
-             *     `value` unchanged.
-             */
-            function valueOf(maybeTrusted) {
-                if (maybeTrusted instanceof trustedValueHolderBase) {
-                    return maybeTrusted.$$unwrapTrustedValue();
-                } else {
-                    return maybeTrusted;
-                }
-            }
+                        // Disable listeners, watchers and apply/digest methods
+                        this.$destroy = this.$digest = this.$apply = this.$evalAsync = this.$applyAsync = noop;
+                        this.$on = this.$watch = this.$watchGroup = function() { return noop; };
+                        this.$$listeners = {};
 
-            /**
-             * @ngdoc method
-             * @name $sceDelegate#getTrusted
-             *
-             * @description
-             * Takes the result of a {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`} call and
-             * returns the originally supplied value if the queried context type is a supertype of the
-             * created type.  If this condition isn't satisfied, throws an exception.
-             *
-             * @param {string} type The kind of context in which this value is to be used.
-             * @param {*} maybeTrusted The result of a prior {@link ng.$sceDelegate#trustAs
-     *     `$sceDelegate.trustAs`} call.
-             * @returns {*} The value the was originally provided to {@link ng.$sceDelegate#trustAs
-     *     `$sceDelegate.trustAs`} if valid in this context.  Otherwise, throws an exception.
-             */
-            function getTrusted(type, maybeTrusted) {
-                if (maybeTrusted === null || maybeTrusted === undefined || maybeTrusted === '') {
-                    return maybeTrusted;
-                }
-                var constructor = (byType.hasOwnProperty(type) ? byType[type] : null);
-                if (constructor && maybeTrusted instanceof constructor) {
-                    return maybeTrusted.$$unwrapTrustedValue();
-                }
-                // If we get here, then we may only take one of two actions.
-                // 1. sanitize the value for the requested type, or
-                // 2. throw an exception.
-                if (type === SCE_CONTEXTS.RESOURCE_URL) {
-                    if (isResourceUrlAllowedByPolicy(maybeTrusted)) {
-                        return maybeTrusted;
-                    } else {
-                        throw $sceMinErr('insecurl',
-                            'Blocked loading resource from url not allowed by $sceDelegate policy.  URL: {0}',
-                            maybeTrusted.toString());
-                    }
-                } else if (type === SCE_CONTEXTS.HTML) {
-                    return htmlSanitizer(maybeTrusted);
-                }
-                throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.');
-            }
+                        // Disconnect the next sibling to prevent `cleanUpScope` destroying those too
+                        this.$$nextSibling = null;
+                        cleanUpScope(this);
+                    },
 
-            return { trustAs: trustAs,
-                getTrusted: getTrusted,
-                valueOf: valueOf };
-        }];
-    }
+                    /**
+                     * @ngdoc method
+                     * @name $rootScope.Scope#$eval
+                     * @kind function
+                     *
+                     * @description
+                     * Executes the `expression` on the current scope and returns the result. Any exceptions in
+                     * the expression are propagated (uncaught). This is useful when evaluating AngularJS
+                     * expressions.
+                     *
+                     * @example
+                     * ```js
+                     var scope = ng.$rootScope.Scope();
+                     scope.a = 1;
+                     scope.b = 2;
 
+                     expect(scope.$eval('a+b')).toEqual(3);
+                     expect(scope.$eval(function(scope){ return scope.a + scope.b; })).toEqual(3);
+                     * ```
+                     *
+                     * @param {(string|function())=} expression An AngularJS expression to be executed.
+                     *
+                     *    - `string`: execute using the rules as defined in  {@link guide/expression expression}.
+                     *    - `function(scope)`: execute the function with the current `scope` parameter.
+                     *
+                     * @param {(object)=} locals Local variables object, useful for overriding values in scope.
+                     * @returns {*} The result of evaluating the expression.
+                     */
+                    $eval: function(expr, locals) {
+                        return $parse(expr)(this, locals);
+                    },
 
-    /**
-     * @ngdoc provider
-     * @name $sceProvider
-     * @description
-     *
-     * The $sceProvider provider allows developers to configure the {@link ng.$sce $sce} service.
-     * -   enable/disable Strict Contextual Escaping (SCE) in a module
-     * -   override the default implementation with a custom delegate
-     *
-     * Read more about {@link ng.$sce Strict Contextual Escaping (SCE)}.
-     */
+                    /**
+                     * @ngdoc method
+                     * @name $rootScope.Scope#$evalAsync
+                     * @kind function
+                     *
+                     * @description
+                     * Executes the expression on the current scope at a later point in time.
+                     *
+                     * The `$evalAsync` makes no guarantees as to when the `expression` will be executed, only
+                     * that:
+                     *
+                     *   - it will execute after the function that scheduled the evaluation (preferably before DOM
+                     *     rendering).
+                     *   - at least one {@link ng.$rootScope.Scope#$digest $digest cycle} will be performed after
+                     *     `expression` execution.
+                     *
+                     * Any exceptions from the execution of the expression are forwarded to the
+                     * {@link ng.$exceptionHandler $exceptionHandler} service.
+                     *
+                     * __Note:__ if this function is called outside of a `$digest` cycle, a new `$digest` cycle
+                     * will be scheduled. However, it is encouraged to always call code that changes the model
+                     * from within an `$apply` call. That includes code evaluated via `$evalAsync`.
+                     *
+                     * @param {(string|function())=} expression An AngularJS expression to be executed.
+                     *
+                     *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
+                     *    - `function(scope)`: execute the function with the current `scope` parameter.
+                     *
+                     * @param {(object)=} locals Local variables object, useful for overriding values in scope.
+                     */
+                    $evalAsync: function(expr, locals) {
+                        // if we are outside of an $digest loop and this is the first time we are scheduling async
+                        // task also schedule async auto-flush
+                        if (!$rootScope.$$phase && !asyncQueue.length) {
+                            $browser.defer(function() {
+                                if (asyncQueue.length) {
+                                    $rootScope.$digest();
+                                }
+                            });
+                        }
 
-    /* jshint maxlen: false*/
+                        asyncQueue.push({scope: this, fn: $parse(expr), locals: locals});
+                    },
 
-    /**
-     * @ngdoc service
-     * @name $sce
-     * @function
-     *
-     * @description
-     *
-     * `$sce` is a service that provides Strict Contextual Escaping services to AngularJS.
-     *
-     * # Strict Contextual Escaping
-     *
-     * Strict Contextual Escaping (SCE) is a mode in which AngularJS requires bindings in certain
-     * contexts to result in a value that is marked as safe to use for that context.  One example of
-     * such a context is binding arbitrary html controlled by the user via `ng-bind-html`.  We refer
-     * to these contexts as privileged or SCE contexts.
-     *
-     * As of version 1.2, Angular ships with SCE enabled by default.
-     *
-     * Note:  When enabled (the default), IE8 in quirks mode is not supported.  In this mode, IE8 allows
-     * one to execute arbitrary javascript by the use of the expression() syntax.  Refer
-     * <http://blogs.msdn.com/b/ie/archive/2008/10/16/ending-expressions.aspx> to learn more about them.
-     * You can ensure your document is in standards mode and not quirks mode by adding `<!doctype html>`
-     * to the top of your HTML document.
-     *
-     * SCE assists in writing code in way that (a) is secure by default and (b) makes auditing for
-     * security vulnerabilities such as XSS, clickjacking, etc. a lot easier.
-     *
-     * Here's an example of a binding in a privileged context:
-     *
-     * <pre class="prettyprint">
-     *     <input ng-model="userHtml">
-     *     <div ng-bind-html="userHtml">
-     * </pre>
-     *
-     * Notice that `ng-bind-html` is bound to `userHtml` controlled by the user.  With SCE
-     * disabled, this application allows the user to render arbitrary HTML into the DIV.
-     * In a more realistic example, one may be rendering user comments, blog articles, etc. via
-     * bindings.  (HTML is just one example of a context where rendering user controlled input creates
-     * security vulnerabilities.)
-     *
-     * For the case of HTML, you might use a library, either on the client side, or on the server side,
-     * to sanitize unsafe HTML before binding to the value and rendering it in the document.
-     *
-     * How would you ensure that every place that used these types of bindings was bound to a value that
-     * was sanitized by your library (or returned as safe for rendering by your server?)  How can you
-     * ensure that you didn't accidentally delete the line that sanitized the value, or renamed some
-     * properties/fields and forgot to update the binding to the sanitized value?
+                    $$postDigest: function(fn) {
+                        postDigestQueue.push(fn);
+                    },
+
+                    /**
+                     * @ngdoc method
+                     * @name $rootScope.Scope#$apply
+                     * @kind function
+                     *
+                     * @description
+                     * `$apply()` is used to execute an expression in AngularJS from outside of the AngularJS
+                     * framework. (For example from browser DOM events, setTimeout, XHR or third party libraries).
+                     * Because we are calling into the AngularJS framework we need to perform proper scope life
+                     * cycle of {@link ng.$exceptionHandler exception handling},
+                     * {@link ng.$rootScope.Scope#$digest executing watches}.
+                     *
+                     * **Life cycle: Pseudo-Code of `$apply()`**
+                     *
+                     * ```js
+                     function $apply(expr) {
+             try {
+               return $eval(expr);
+             } catch (e) {
+               $exceptionHandler(e);
+             } finally {
+               $root.$digest();
+             }
+           }
+                     * ```
+                     *
+                     *
+                     * Scope's `$apply()` method transitions through the following stages:
+                     *
+                     * 1. The {@link guide/expression expression} is executed using the
+                     *    {@link ng.$rootScope.Scope#$eval $eval()} method.
+                     * 2. Any exceptions from the execution of the expression are forwarded to the
+                     *    {@link ng.$exceptionHandler $exceptionHandler} service.
+                     * 3. The {@link ng.$rootScope.Scope#$watch watch} listeners are fired immediately after the
+                     *    expression was executed using the {@link ng.$rootScope.Scope#$digest $digest()} method.
+                     *
+                     *
+                     * @param {(string|function())=} exp An AngularJS expression to be executed.
+                     *
+                     *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
+                     *    - `function(scope)`: execute the function with current `scope` parameter.
+                     *
+                     * @returns {*} The result of evaluating the expression.
+                     */
+                    $apply: function(expr) {
+                        try {
+                            beginPhase('$apply');
+                            try {
+                                return this.$eval(expr);
+                            } finally {
+                                clearPhase();
+                            }
+                        } catch (e) {
+                            $exceptionHandler(e);
+                        } finally {
+                            try {
+                                $rootScope.$digest();
+                            } catch (e) {
+                                $exceptionHandler(e);
+                                // eslint-disable-next-line no-unsafe-finally
+                                throw e;
+                            }
+                        }
+                    },
+
+                    /**
+                     * @ngdoc method
+                     * @name $rootScope.Scope#$applyAsync
+                     * @kind function
+                     *
+                     * @description
+                     * Schedule the invocation of $apply to occur at a later time. The actual time difference
+                     * varies across browsers, but is typically around ~10 milliseconds.
+                     *
+                     * This can be used to queue up multiple expressions which need to be evaluated in the same
+                     * digest.
+                     *
+                     * @param {(string|function())=} exp An AngularJS expression to be executed.
+                     *
+                     *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
+                     *    - `function(scope)`: execute the function with current `scope` parameter.
+                     */
+                    $applyAsync: function(expr) {
+                        var scope = this;
+                        if (expr) {
+                            applyAsyncQueue.push($applyAsyncExpression);
+                        }
+                        expr = $parse(expr);
+                        scheduleApplyAsync();
+
+                        function $applyAsyncExpression() {
+                            scope.$eval(expr);
+                        }
+                    },
+
+                    /**
+                     * @ngdoc method
+                     * @name $rootScope.Scope#$on
+                     * @kind function
+                     *
+                     * @description
+                     * Listens on events of a given type. See {@link ng.$rootScope.Scope#$emit $emit} for
+                     * discussion of event life cycle.
+                     *
+                     * The event listener function format is: `function(event, args...)`. The `event` object
+                     * passed into the listener has the following attributes:
+                     *
+                     *   - `targetScope` - `{Scope}`: the scope on which the event was `$emit`-ed or
+                     *     `$broadcast`-ed.
+                     *   - `currentScope` - `{Scope}`: the scope that is currently handling the event. Once the
+                     *     event propagates through the scope hierarchy, this property is set to null.
+                     *   - `name` - `{string}`: name of the event.
+                     *   - `stopPropagation` - `{function=}`: calling `stopPropagation` function will cancel
+                     *     further event propagation (available only for events that were `$emit`-ed).
+                     *   - `preventDefault` - `{function}`: calling `preventDefault` sets `defaultPrevented` flag
+                     *     to true.
+                     *   - `defaultPrevented` - `{boolean}`: true if `preventDefault` was called.
+                     *
+                     * @param {string} name Event name to listen on.
+                     * @param {function(event, ...args)} listener Function to call when the event is emitted.
+                     * @returns {function()} Returns a deregistration function for this listener.
+                     */
+                    $on: function(name, listener) {
+                        var namedListeners = this.$$listeners[name];
+                        if (!namedListeners) {
+                            this.$$listeners[name] = namedListeners = [];
+                        }
+                        namedListeners.push(listener);
+
+                        var current = this;
+                        do {
+                            if (!current.$$listenerCount[name]) {
+                                current.$$listenerCount[name] = 0;
+                            }
+                            current.$$listenerCount[name]++;
+                        } while ((current = current.$parent));
+
+                        var self = this;
+                        return function() {
+                            var indexOfListener = namedListeners.indexOf(listener);
+                            if (indexOfListener !== -1) {
+                                // Use delete in the hope of the browser deallocating the memory for the array entry,
+                                // while not shifting the array indexes of other listeners.
+                                // See issue https://github.com/angular/angular.js/issues/16135
+                                delete namedListeners[indexOfListener];
+                                decrementListenerCount(self, 1, name);
+                            }
+                        };
+                    },
+
+
+                    /**
+                     * @ngdoc method
+                     * @name $rootScope.Scope#$emit
+                     * @kind function
+                     *
+                     * @description
+                     * Dispatches an event `name` upwards through the scope hierarchy notifying the
+                     * registered {@link ng.$rootScope.Scope#$on} listeners.
+                     *
+                     * The event life cycle starts at the scope on which `$emit` was called. All
+                     * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get
+                     * notified. Afterwards, the event traverses upwards toward the root scope and calls all
+                     * registered listeners along the way. The event will stop propagating if one of the listeners
+                     * cancels it.
+                     *
+                     * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed
+                     * onto the {@link ng.$exceptionHandler $exceptionHandler} service.
+                     *
+                     * @param {string} name Event name to emit.
+                     * @param {...*} args Optional one or more arguments which will be passed onto the event listeners.
+                     * @return {Object} Event object (see {@link ng.$rootScope.Scope#$on}).
+                     */
+                    $emit: function(name, args) {
+                        var empty = [],
+                            namedListeners,
+                            scope = this,
+                            stopPropagation = false,
+                            event = {
+                                name: name,
+                                targetScope: scope,
+                                stopPropagation: function() {stopPropagation = true;},
+                                preventDefault: function() {
+                                    event.defaultPrevented = true;
+                                },
+                                defaultPrevented: false
+                            },
+                            listenerArgs = concat([event], arguments, 1),
+                            i, length;
+
+                        do {
+                            namedListeners = scope.$$listeners[name] || empty;
+                            event.currentScope = scope;
+                            for (i = 0, length = namedListeners.length; i < length; i++) {
+
+                                // if listeners were deregistered, defragment the array
+                                if (!namedListeners[i]) {
+                                    namedListeners.splice(i, 1);
+                                    i--;
+                                    length--;
+                                    continue;
+                                }
+                                try {
+                                    //allow all listeners attached to the current scope to run
+                                    namedListeners[i].apply(null, listenerArgs);
+                                } catch (e) {
+                                    $exceptionHandler(e);
+                                }
+                            }
+                            //if any listener on the current scope stops propagation, prevent bubbling
+                            if (stopPropagation) {
+                                break;
+                            }
+                            //traverse upwards
+                            scope = scope.$parent;
+                        } while (scope);
+
+                        event.currentScope = null;
+
+                        return event;
+                    },
+
+
+                    /**
+                     * @ngdoc method
+                     * @name $rootScope.Scope#$broadcast
+                     * @kind function
+                     *
+                     * @description
+                     * Dispatches an event `name` downwards to all child scopes (and their children) notifying the
+                     * registered {@link ng.$rootScope.Scope#$on} listeners.
+                     *
+                     * The event life cycle starts at the scope on which `$broadcast` was called. All
+                     * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get
+                     * notified. Afterwards, the event propagates to all direct and indirect scopes of the current
+                     * scope and calls all registered listeners along the way. The event cannot be canceled.
+                     *
+                     * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed
+                     * onto the {@link ng.$exceptionHandler $exceptionHandler} service.
+                     *
+                     * @param {string} name Event name to broadcast.
+                     * @param {...*} args Optional one or more arguments which will be passed onto the event listeners.
+                     * @return {Object} Event object, see {@link ng.$rootScope.Scope#$on}
+                     */
+                    $broadcast: function(name, args) {
+                        var target = this,
+                            current = target,
+                            next = target,
+                            event = {
+                                name: name,
+                                targetScope: target,
+                                preventDefault: function() {
+                                    event.defaultPrevented = true;
+                                },
+                                defaultPrevented: false
+                            };
+
+                        if (!target.$$listenerCount[name]) return event;
+
+                        var listenerArgs = concat([event], arguments, 1),
+                            listeners, i, length;
+
+                        //down while you can, then up and next sibling or up and next sibling until back at root
+                        while ((current = next)) {
+                            event.currentScope = current;
+                            listeners = current.$$listeners[name] || [];
+                            for (i = 0, length = listeners.length; i < length; i++) {
+                                // if listeners were deregistered, defragment the array
+                                if (!listeners[i]) {
+                                    listeners.splice(i, 1);
+                                    i--;
+                                    length--;
+                                    continue;
+                                }
+
+                                try {
+                                    listeners[i].apply(null, listenerArgs);
+                                } catch (e) {
+                                    $exceptionHandler(e);
+                                }
+                            }
+
+                            // Insanity Warning: scope depth-first traversal
+                            // yes, this code is a bit crazy, but it works and we have tests to prove it!
+                            // this piece should be kept in sync with the traversal in $digest
+                            // (though it differs due to having the extra check for $$listenerCount)
+                            if (!(next = ((current.$$listenerCount[name] && current.$$childHead) ||
+                                (current !== target && current.$$nextSibling)))) {
+                                while (current !== target && !(next = current.$$nextSibling)) {
+                                    current = current.$parent;
+                                }
+                            }
+                        }
+
+                        event.currentScope = null;
+                        return event;
+                    }
+                };
+
+                var $rootScope = new Scope();
+
+                //The internal queues. Expose them on the $rootScope for debugging/testing purposes.
+                var asyncQueue = $rootScope.$$asyncQueue = [];
+                var postDigestQueue = $rootScope.$$postDigestQueue = [];
+                var applyAsyncQueue = $rootScope.$$applyAsyncQueue = [];
+
+                var postDigestQueuePosition = 0;
+
+                return $rootScope;
+
+
+                function beginPhase(phase) {
+                    if ($rootScope.$$phase) {
+                        throw $rootScopeMinErr('inprog', '{0} already in progress', $rootScope.$$phase);
+                    }
+
+                    $rootScope.$$phase = phase;
+                }
+
+                function clearPhase() {
+                    $rootScope.$$phase = null;
+                }
+
+                function incrementWatchersCount(current, count) {
+                    do {
+                        current.$$watchersCount += count;
+                    } while ((current = current.$parent));
+                }
+
+                function decrementListenerCount(current, count, name) {
+                    do {
+                        current.$$listenerCount[name] -= count;
+
+                        if (current.$$listenerCount[name] === 0) {
+                            delete current.$$listenerCount[name];
+                        }
+                    } while ((current = current.$parent));
+                }
+
+                /**
+                 * function used as an initial value for watchers.
+                 * because it's unique we can easily tell it apart from other values
+                 */
+                function initWatchVal() {}
+
+                function flushApplyAsync() {
+                    while (applyAsyncQueue.length) {
+                        try {
+                            applyAsyncQueue.shift()();
+                        } catch (e) {
+                            $exceptionHandler(e);
+                        }
+                    }
+                    applyAsyncId = null;
+                }
+
+                function scheduleApplyAsync() {
+                    if (applyAsyncId === null) {
+                        applyAsyncId = $browser.defer(function() {
+                            $rootScope.$apply(flushApplyAsync);
+                        });
+                    }
+                }
+            }];
+    }
+
+    /**
+     * @ngdoc service
+     * @name $rootElement
+     *
+     * @description
+     * The root element of AngularJS application. This is either the element where {@link
+        * ng.directive:ngApp ngApp} was declared or the element passed into
+     * {@link angular.bootstrap}. The element represents the root element of application. It is also the
+     * location where the application's {@link auto.$injector $injector} service gets
+     * published, and can be retrieved using `$rootElement.injector()`.
+     */
+
+
+// the implementation is in angular.bootstrap
+
+    /**
+     * @this
+     * @description
+     * Private service to sanitize uris for links and images. Used by $compile and $sanitize.
+     */
+    function $$SanitizeUriProvider() {
+        var aHrefSanitizationWhitelist = /^\s*(https?|s?ftp|mailto|tel|file):/,
+            imgSrcSanitizationWhitelist = /^\s*((https?|ftp|file|blob):|data:image\/)/;
+
+        /**
+         * @description
+         * Retrieves or overrides the default regular expression that is used for whitelisting of safe
+         * urls during a[href] sanitization.
+         *
+         * The sanitization is a security measure aimed at prevent XSS attacks via html links.
+         *
+         * Any url about to be assigned to a[href] via data-binding is first normalized and turned into
+         * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist`
+         * regular expression. If a match is found, the original url is written into the dom. Otherwise,
+         * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
+         *
+         * @param {RegExp=} regexp New regexp to whitelist urls with.
+         * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
+         *    chaining otherwise.
+         */
+        this.aHrefSanitizationWhitelist = function(regexp) {
+            if (isDefined(regexp)) {
+                aHrefSanitizationWhitelist = regexp;
+                return this;
+            }
+            return aHrefSanitizationWhitelist;
+        };
+
+
+        /**
+         * @description
+         * Retrieves or overrides the default regular expression that is used for whitelisting of safe
+         * urls during img[src] sanitization.
+         *
+         * The sanitization is a security measure aimed at prevent XSS attacks via html links.
+         *
+         * Any url about to be assigned to img[src] via data-binding is first normalized and turned into
+         * an absolute url. Afterwards, the url is matched against the `imgSrcSanitizationWhitelist`
+         * regular expression. If a match is found, the original url is written into the dom. Otherwise,
+         * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
+         *
+         * @param {RegExp=} regexp New regexp to whitelist urls with.
+         * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
+         *    chaining otherwise.
+         */
+        this.imgSrcSanitizationWhitelist = function(regexp) {
+            if (isDefined(regexp)) {
+                imgSrcSanitizationWhitelist = regexp;
+                return this;
+            }
+            return imgSrcSanitizationWhitelist;
+        };
+
+        this.$get = function() {
+            return function sanitizeUri(uri, isImage) {
+                var regex = isImage ? imgSrcSanitizationWhitelist : aHrefSanitizationWhitelist;
+                var normalizedVal;
+                normalizedVal = urlResolve(uri && uri.trim()).href;
+                if (normalizedVal !== '' && !normalizedVal.match(regex)) {
+                    return 'unsafe:' + normalizedVal;
+                }
+                return uri;
+            };
+        };
+    }
+
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+    /* exported $SceProvider, $SceDelegateProvider */
+
+    var $sceMinErr = minErr('$sce');
+
+    var SCE_CONTEXTS = {
+        // HTML is used when there's HTML rendered (e.g. ng-bind-html, iframe srcdoc binding).
+        HTML: 'html',
+
+        // Style statements or stylesheets. Currently unused in AngularJS.
+        CSS: 'css',
+
+        // An URL used in a context where it does not refer to a resource that loads code. Currently
+        // unused in AngularJS.
+        URL: 'url',
+
+        // RESOURCE_URL is a subtype of URL used where the referred-to resource could be interpreted as
+        // code. (e.g. ng-include, script src binding, templateUrl)
+        RESOURCE_URL: 'resourceUrl',
+
+        // Script. Currently unused in AngularJS.
+        JS: 'js'
+    };
+
+// Helper functions follow.
+
+    var UNDERSCORE_LOWERCASE_REGEXP = /_([a-z])/g;
+
+    function snakeToCamel(name) {
+        return name
+            .replace(UNDERSCORE_LOWERCASE_REGEXP, fnCamelCaseReplace);
+    }
+
+    function adjustMatcher(matcher) {
+        if (matcher === 'self') {
+            return matcher;
+        } else if (isString(matcher)) {
+            // Strings match exactly except for 2 wildcards - '*' and '**'.
+            // '*' matches any character except those from the set ':/.?&'.
+            // '**' matches any character (like .* in a RegExp).
+            // More than 2 *'s raises an error as it's ill defined.
+            if (matcher.indexOf('***') > -1) {
+                throw $sceMinErr('iwcard',
+                    'Illegal sequence *** in string matcher.  String: {0}', matcher);
+            }
+            matcher = escapeForRegexp(matcher).
+            replace(/\\\*\\\*/g, '.*').
+            replace(/\\\*/g, '[^:/.?&;]*');
+            return new RegExp('^' + matcher + '$');
+        } else if (isRegExp(matcher)) {
+            // The only other type of matcher allowed is a Regexp.
+            // Match entire URL / disallow partial matches.
+            // Flags are reset (i.e. no global, ignoreCase or multiline)
+            return new RegExp('^' + matcher.source + '$');
+        } else {
+            throw $sceMinErr('imatcher',
+                'Matchers may only be "self", string patterns or RegExp objects');
+        }
+    }
+
+
+    function adjustMatchers(matchers) {
+        var adjustedMatchers = [];
+        if (isDefined(matchers)) {
+            forEach(matchers, function(matcher) {
+                adjustedMatchers.push(adjustMatcher(matcher));
+            });
+        }
+        return adjustedMatchers;
+    }
+
+
+    /**
+     * @ngdoc service
+     * @name $sceDelegate
+     * @kind function
+     *
+     * @description
+     *
+     * `$sceDelegate` is a service that is used by the `$sce` service to provide {@link ng.$sce Strict
+ * Contextual Escaping (SCE)} services to AngularJS.
+     *
+     * For an overview of this service and the functionnality it provides in AngularJS, see the main
+     * page for {@link ng.$sce SCE}. The current page is targeted for developers who need to alter how
+     * SCE works in their application, which shouldn't be needed in most cases.
+     *
+     * <div class="alert alert-danger">
+     * AngularJS strongly relies on contextual escaping for the security of bindings: disabling or
+     * modifying this might cause cross site scripting (XSS) vulnerabilities. For libraries owners,
+     * changes to this service will also influence users, so be extra careful and document your changes.
+     * </div>
+     *
+     * Typically, you would configure or override the {@link ng.$sceDelegate $sceDelegate} instead of
+     * the `$sce` service to customize the way Strict Contextual Escaping works in AngularJS.  This is
+     * because, while the `$sce` provides numerous shorthand methods, etc., you really only need to
+     * override 3 core functions (`trustAs`, `getTrusted` and `valueOf`) to replace the way things
+     * work because `$sce` delegates to `$sceDelegate` for these operations.
+     *
+     * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} to configure this service.
+     *
+     * The default instance of `$sceDelegate` should work out of the box with little pain.  While you
+     * can override it completely to change the behavior of `$sce`, the common case would
+     * involve configuring the {@link ng.$sceDelegateProvider $sceDelegateProvider} instead by setting
+     * your own whitelists and blacklists for trusting URLs used for loading AngularJS resources such as
+     * templates.  Refer {@link ng.$sceDelegateProvider#resourceUrlWhitelist
+ * $sceDelegateProvider.resourceUrlWhitelist} and {@link
+        * ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist}
+     */
+
+    /**
+     * @ngdoc provider
+     * @name $sceDelegateProvider
+     * @this
+     *
+     * @description
+     *
+     * The `$sceDelegateProvider` provider allows developers to configure the {@link ng.$sceDelegate
+ * $sceDelegate service}, used as a delegate for {@link ng.$sce Strict Contextual Escaping (SCE)}.
+     *
+     * The `$sceDelegateProvider` allows one to get/set the whitelists and blacklists used to ensure
+     * that the URLs used for sourcing AngularJS templates and other script-running URLs are safe (all
+     * places that use the `$sce.RESOURCE_URL` context). See
+     * {@link ng.$sceDelegateProvider#resourceUrlWhitelist $sceDelegateProvider.resourceUrlWhitelist}
+     * and
+     * {@link ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist},
+     *
+     * For the general details about this service in AngularJS, read the main page for {@link ng.$sce
+ * Strict Contextual Escaping (SCE)}.
+     *
+     * **Example**:  Consider the following case. <a name="example"></a>
+     *
+     * - your app is hosted at url `http://myapp.example.com/`
+     * - but some of your templates are hosted on other domains you control such as
+     *   `http://srv01.assets.example.com/`, `http://srv02.assets.example.com/`, etc.
+     * - and you have an open redirect at `http://myapp.example.com/clickThru?...`.
+     *
+     * Here is what a secure configuration for this scenario might look like:
+     *
+     * ```
+     *  angular.module('myApp', []).config(function($sceDelegateProvider) {
+     *    $sceDelegateProvider.resourceUrlWhitelist([
+     *      // Allow same origin resource loads.
+     *      'self',
+     *      // Allow loading from our assets domain.  Notice the difference between * and **.
+     *      'http://srv*.assets.example.com/**'
+     *    ]);
+     *
+     *    // The blacklist overrides the whitelist so the open redirect here is blocked.
+     *    $sceDelegateProvider.resourceUrlBlacklist([
+     *      'http://myapp.example.com/clickThru**'
+     *    ]);
+     *  });
+     * ```
+     * Note that an empty whitelist will block every resource URL from being loaded, and will require
+     * you to manually mark each one as trusted with `$sce.trustAsResourceUrl`. However, templates
+     * requested by {@link ng.$templateRequest $templateRequest} that are present in
+     * {@link ng.$templateCache $templateCache} will not go through this check. If you have a mechanism
+     * to populate your templates in that cache at config time, then it is a good idea to remove 'self'
+     * from that whitelist. This helps to mitigate the security impact of certain types of issues, like
+     * for instance attacker-controlled `ng-includes`.
+     */
+
+    function $SceDelegateProvider() {
+        this.SCE_CONTEXTS = SCE_CONTEXTS;
+
+        // Resource URLs can also be trusted by policy.
+        var resourceUrlWhitelist = ['self'],
+            resourceUrlBlacklist = [];
+
+        /**
+         * @ngdoc method
+         * @name $sceDelegateProvider#resourceUrlWhitelist
+         * @kind function
+         *
+         * @param {Array=} whitelist When provided, replaces the resourceUrlWhitelist with the value
+         *     provided.  This must be an array or null.  A snapshot of this array is used so further
+         *     changes to the array are ignored.
+         *     Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items
+         *     allowed in this array.
+         *
+         * @return {Array} The currently set whitelist array.
+         *
+         * @description
+         * Sets/Gets the whitelist of trusted resource URLs.
+         *
+         * The **default value** when no whitelist has been explicitly set is `['self']` allowing only
+         * same origin resource requests.
+         *
+         * <div class="alert alert-warning">
+         * **Note:** the default whitelist of 'self' is not recommended if your app shares its origin
+         * with other apps! It is a good idea to limit it to only your application's directory.
+         * </div>
+         */
+        this.resourceUrlWhitelist = function(value) {
+            if (arguments.length) {
+                resourceUrlWhitelist = adjustMatchers(value);
+            }
+            return resourceUrlWhitelist;
+        };
+
+        /**
+         * @ngdoc method
+         * @name $sceDelegateProvider#resourceUrlBlacklist
+         * @kind function
+         *
+         * @param {Array=} blacklist When provided, replaces the resourceUrlBlacklist with the value
+         *     provided.  This must be an array or null.  A snapshot of this array is used so further
+         *     changes to the array are ignored.</p><p>
+         *     Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items
+         *     allowed in this array.</p><p>
+         *     The typical usage for the blacklist is to **block
+         *     [open redirects](http://cwe.mitre.org/data/definitions/601.html)** served by your domain as
+         *     these would otherwise be trusted but actually return content from the redirected domain.
+         *     </p><p>
+         *     Finally, **the blacklist overrides the whitelist** and has the final say.
+         *
+         * @return {Array} The currently set blacklist array.
+         *
+         * @description
+         * Sets/Gets the blacklist of trusted resource URLs.
+         *
+         * The **default value** when no whitelist has been explicitly set is the empty array (i.e. there
+         * is no blacklist.)
+         */
+
+        this.resourceUrlBlacklist = function(value) {
+            if (arguments.length) {
+                resourceUrlBlacklist = adjustMatchers(value);
+            }
+            return resourceUrlBlacklist;
+        };
+
+        this.$get = ['$injector', function($injector) {
+
+            var htmlSanitizer = function htmlSanitizer(html) {
+                throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.');
+            };
+
+            if ($injector.has('$sanitize')) {
+                htmlSanitizer = $injector.get('$sanitize');
+            }
+
+
+            function matchUrl(matcher, parsedUrl) {
+                if (matcher === 'self') {
+                    return urlIsSameOrigin(parsedUrl);
+                } else {
+                    // definitely a regex.  See adjustMatchers()
+                    return !!matcher.exec(parsedUrl.href);
+                }
+            }
+
+            function isResourceUrlAllowedByPolicy(url) {
+                var parsedUrl = urlResolve(url.toString());
+                var i, n, allowed = false;
+                // Ensure that at least one item from the whitelist allows this url.
+                for (i = 0, n = resourceUrlWhitelist.length; i < n; i++) {
+                    if (matchUrl(resourceUrlWhitelist[i], parsedUrl)) {
+                        allowed = true;
+                        break;
+                    }
+                }
+                if (allowed) {
+                    // Ensure that no item from the blacklist blocked this url.
+                    for (i = 0, n = resourceUrlBlacklist.length; i < n; i++) {
+                        if (matchUrl(resourceUrlBlacklist[i], parsedUrl)) {
+                            allowed = false;
+                            break;
+                        }
+                    }
+                }
+                return allowed;
+            }
+
+            function generateHolderType(Base) {
+                var holderType = function TrustedValueHolderType(trustedValue) {
+                    this.$$unwrapTrustedValue = function() {
+                        return trustedValue;
+                    };
+                };
+                if (Base) {
+                    holderType.prototype = new Base();
+                }
+                holderType.prototype.valueOf = function sceValueOf() {
+                    return this.$$unwrapTrustedValue();
+                };
+                holderType.prototype.toString = function sceToString() {
+                    return this.$$unwrapTrustedValue().toString();
+                };
+                return holderType;
+            }
+
+            var trustedValueHolderBase = generateHolderType(),
+                byType = {};
+
+            byType[SCE_CONTEXTS.HTML] = generateHolderType(trustedValueHolderBase);
+            byType[SCE_CONTEXTS.CSS] = generateHolderType(trustedValueHolderBase);
+            byType[SCE_CONTEXTS.URL] = generateHolderType(trustedValueHolderBase);
+            byType[SCE_CONTEXTS.JS] = generateHolderType(trustedValueHolderBase);
+            byType[SCE_CONTEXTS.RESOURCE_URL] = generateHolderType(byType[SCE_CONTEXTS.URL]);
+
+            /**
+             * @ngdoc method
+             * @name $sceDelegate#trustAs
+             *
+             * @description
+             * Returns a trusted representation of the parameter for the specified context. This trusted
+             * object will later on be used as-is, without any security check, by bindings or directives
+             * that require this security context.
+             * For instance, marking a string as trusted for the `$sce.HTML` context will entirely bypass
+             * the potential `$sanitize` call in corresponding `$sce.HTML` bindings or directives, such as
+             * `ng-bind-html`. Note that in most cases you won't need to call this function: if you have the
+             * sanitizer loaded, passing the value itself will render all the HTML that does not pose a
+             * security risk.
+             *
+             * See {@link ng.$sceDelegate#getTrusted getTrusted} for the function that will consume those
+             * trusted values, and {@link ng.$sce $sce} for general documentation about strict contextual
+             * escaping.
+             *
+             * @param {string} type The context in which this value is safe for use, e.g. `$sce.URL`,
+             *     `$sce.RESOURCE_URL`, `$sce.HTML`, `$sce.JS` or `$sce.CSS`.
+             *
+             * @param {*} value The value that should be considered trusted.
+             * @return {*} A trusted representation of value, that can be used in the given context.
+             */
+            function trustAs(type, trustedValue) {
+                var Constructor = (byType.hasOwnProperty(type) ? byType[type] : null);
+                if (!Constructor) {
+                    throw $sceMinErr('icontext',
+                        'Attempted to trust a value in invalid context. Context: {0}; Value: {1}',
+                        type, trustedValue);
+                }
+                if (trustedValue === null || isUndefined(trustedValue) || trustedValue === '') {
+                    return trustedValue;
+                }
+                // All the current contexts in SCE_CONTEXTS happen to be strings.  In order to avoid trusting
+                // mutable objects, we ensure here that the value passed in is actually a string.
+                if (typeof trustedValue !== 'string') {
+                    throw $sceMinErr('itype',
+                        'Attempted to trust a non-string value in a content requiring a string: Context: {0}',
+                        type);
+                }
+                return new Constructor(trustedValue);
+            }
+
+            /**
+             * @ngdoc method
+             * @name $sceDelegate#valueOf
+             *
+             * @description
+             * If the passed parameter had been returned by a prior call to {@link ng.$sceDelegate#trustAs
+     * `$sceDelegate.trustAs`}, returns the value that had been passed to {@link
+                * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}.
+             *
+             * If the passed parameter is not a value that had been returned by {@link
+                * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}, it must be returned as-is.
+             *
+             * @param {*} value The result of a prior {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}
+             *     call or anything else.
+             * @return {*} The `value` that was originally provided to {@link ng.$sceDelegate#trustAs
+     *     `$sceDelegate.trustAs`} if `value` is the result of such a call.  Otherwise, returns
+             *     `value` unchanged.
+             */
+            function valueOf(maybeTrusted) {
+                if (maybeTrusted instanceof trustedValueHolderBase) {
+                    return maybeTrusted.$$unwrapTrustedValue();
+                } else {
+                    return maybeTrusted;
+                }
+            }
+
+            /**
+             * @ngdoc method
+             * @name $sceDelegate#getTrusted
+             *
+             * @description
+             * Takes any input, and either returns a value that's safe to use in the specified context, or
+             * throws an exception.
+             *
+             * In practice, there are several cases. When given a string, this function runs checks
+             * and sanitization to make it safe without prior assumptions. When given the result of a {@link
+                * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`} call, it returns the originally supplied
+             * value if that value's context is valid for this call's context. Finally, this function can
+             * also throw when there is no way to turn `maybeTrusted` in a safe value (e.g., no sanitization
+             * is available or possible.)
+             *
+             * @param {string} type The context in which this value is to be used (such as `$sce.HTML`).
+             * @param {*} maybeTrusted The result of a prior {@link ng.$sceDelegate#trustAs
+     *     `$sceDelegate.trustAs`} call, or anything else (which will not be considered trusted.)
+             * @return {*} A version of the value that's safe to use in the given context, or throws an
+             *     exception if this is impossible.
+             */
+            function getTrusted(type, maybeTrusted) {
+                if (maybeTrusted === null || isUndefined(maybeTrusted) || maybeTrusted === '') {
+                    return maybeTrusted;
+                }
+                var constructor = (byType.hasOwnProperty(type) ? byType[type] : null);
+                // If maybeTrusted is a trusted class instance or subclass instance, then unwrap and return
+                // as-is.
+                if (constructor && maybeTrusted instanceof constructor) {
+                    return maybeTrusted.$$unwrapTrustedValue();
+                }
+                // Otherwise, if we get here, then we may either make it safe, or throw an exception. This
+                // depends on the context: some are sanitizatible (HTML), some use whitelists (RESOURCE_URL),
+                // some are impossible to do (JS). This step isn't implemented for CSS and URL, as AngularJS
+                // has no corresponding sinks.
+                if (type === SCE_CONTEXTS.RESOURCE_URL) {
+                    // RESOURCE_URL uses a whitelist.
+                    if (isResourceUrlAllowedByPolicy(maybeTrusted)) {
+                        return maybeTrusted;
+                    } else {
+                        throw $sceMinErr('insecurl',
+                            'Blocked loading resource from url not allowed by $sceDelegate policy.  URL: {0}',
+                            maybeTrusted.toString());
+                    }
+                } else if (type === SCE_CONTEXTS.HTML) {
+                    // htmlSanitizer throws its own error when no sanitizer is available.
+                    return htmlSanitizer(maybeTrusted);
+                }
+                // Default error when the $sce service has no way to make the input safe.
+                throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.');
+            }
+
+            return { trustAs: trustAs,
+                getTrusted: getTrusted,
+                valueOf: valueOf };
+        }];
+    }
+
+
+    /**
+     * @ngdoc provider
+     * @name $sceProvider
+     * @this
+     *
+     * @description
+     *
+     * The $sceProvider provider allows developers to configure the {@link ng.$sce $sce} service.
+     * -   enable/disable Strict Contextual Escaping (SCE) in a module
+     * -   override the default implementation with a custom delegate
+     *
+     * Read more about {@link ng.$sce Strict Contextual Escaping (SCE)}.
+     */
+
+    /**
+     * @ngdoc service
+     * @name $sce
+     * @kind function
+     *
+     * @description
+     *
+     * `$sce` is a service that provides Strict Contextual Escaping services to AngularJS.
+     *
+     * ## Strict Contextual Escaping
+     *
+     * Strict Contextual Escaping (SCE) is a mode in which AngularJS constrains bindings to only render
+     * trusted values. Its goal is to assist in writing code in a way that (a) is secure by default, and
+     * (b) makes auditing for security vulnerabilities such as XSS, clickjacking, etc. a lot easier.
+     *
+     * ### Overview
+     *
+     * To systematically block XSS security bugs, AngularJS treats all values as untrusted by default in
+     * HTML or sensitive URL bindings. When binding untrusted values, AngularJS will automatically
+     * run security checks on them (sanitizations, whitelists, depending on context), or throw when it
+     * cannot guarantee the security of the result. That behavior depends strongly on contexts: HTML
+     * can be sanitized, but template URLs cannot, for instance.
+     *
+     * To illustrate this, consider the `ng-bind-html` directive. It renders its value directly as HTML:
+     * we call that the *context*. When given an untrusted input, AngularJS will attempt to sanitize it
+     * before rendering if a sanitizer is available, and throw otherwise. To bypass sanitization and
+     * render the input as-is, you will need to mark it as trusted for that context before attempting
+     * to bind it.
+     *
+     * As of version 1.2, AngularJS ships with SCE enabled by default.
+     *
+     * ### In practice
+     *
+     * Here's an example of a binding in a privileged context:
+     *
+     * ```
+     * <input ng-model="userHtml" aria-label="User input">
+     * <div ng-bind-html="userHtml"></div>
+     * ```
+     *
+     * Notice that `ng-bind-html` is bound to `userHtml` controlled by the user.  With SCE
+     * disabled, this application allows the user to render arbitrary HTML into the DIV, which would
+     * be an XSS security bug. In a more realistic example, one may be rendering user comments, blog
+     * articles, etc. via bindings. (HTML is just one example of a context where rendering user
+     * controlled input creates security vulnerabilities.)
+     *
+     * For the case of HTML, you might use a library, either on the client side, or on the server side,
+     * to sanitize unsafe HTML before binding to the value and rendering it in the document.
+     *
+     * How would you ensure that every place that used these types of bindings was bound to a value that
+     * was sanitized by your library (or returned as safe for rendering by your server?)  How can you
+     * ensure that you didn't accidentally delete the line that sanitized the value, or renamed some
+     * properties/fields and forgot to update the binding to the sanitized value?
+     *
+     * To be secure by default, AngularJS makes sure bindings go through that sanitization, or
+     * any similar validation process, unless there's a good reason to trust the given value in this
+     * context.  That trust is formalized with a function call. This means that as a developer, you
+     * can assume all untrusted bindings are safe. Then, to audit your code for binding security issues,
+     * you just need to ensure the values you mark as trusted indeed are safe - because they were
+     * received from your server, sanitized by your library, etc. You can organize your codebase to
+     * help with this - perhaps allowing only the files in a specific directory to do this.
+     * Ensuring that the internal API exposed by that code doesn't markup arbitrary values as safe then
+     * becomes a more manageable task.
+     *
+     * In the case of AngularJS' SCE service, one uses {@link ng.$sce#trustAs $sce.trustAs}
+     * (and shorthand methods such as {@link ng.$sce#trustAsHtml $sce.trustAsHtml}, etc.) to
+     * build the trusted versions of your values.
+     *
+     * ### How does it work?
+     *
+     * In privileged contexts, directives and code will bind to the result of {@link ng.$sce#getTrusted
+ * $sce.getTrusted(context, value)} rather than to the value directly.  Think of this function as
+     * a way to enforce the required security context in your data sink. Directives use {@link
+        * ng.$sce#parseAs $sce.parseAs} rather than `$parse` to watch attribute bindings, which performs
+     * the {@link ng.$sce#getTrusted $sce.getTrusted} behind the scenes on non-constant literals. Also,
+     * when binding without directives, AngularJS will understand the context of your bindings
+     * automatically.
+     *
+     * As an example, {@link ng.directive:ngBindHtml ngBindHtml} uses {@link
+        * ng.$sce#parseAsHtml $sce.parseAsHtml(binding expression)}.  Here's the actual code (slightly
+     * simplified):
+     *
+     * ```
+     * var ngBindHtmlDirective = ['$sce', function($sce) {
+     *   return function(scope, element, attr) {
+     *     scope.$watch($sce.parseAsHtml(attr.ngBindHtml), function(value) {
+     *       element.html(value || '');
+     *     });
+     *   };
+     * }];
+     * ```
+     *
+     * ### Impact on loading templates
+     *
+     * This applies both to the {@link ng.directive:ngInclude `ng-include`} directive as well as
+     * `templateUrl`'s specified by {@link guide/directive directives}.
+     *
+     * By default, AngularJS only loads templates from the same domain and protocol as the application
+     * document.  This is done by calling {@link ng.$sce#getTrustedResourceUrl
+ * $sce.getTrustedResourceUrl} on the template URL.  To load templates from other domains and/or
+     * protocols, you may either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist
+ * them} or {@link ng.$sce#trustAsResourceUrl wrap it} into a trusted value.
+     *
+     * *Please note*:
+     * The browser's
+     * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest)
+     * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/)
+     * policy apply in addition to this and may further restrict whether the template is successfully
+     * loaded.  This means that without the right CORS policy, loading templates from a different domain
+     * won't work on all browsers.  Also, loading templates from `file://` URL does not work on some
+     * browsers.
+     *
+     * ### This feels like too much overhead
+     *
+     * It's important to remember that SCE only applies to interpolation expressions.
+     *
+     * If your expressions are constant literals, they're automatically trusted and you don't need to
+     * call `$sce.trustAs` on them (e.g.
+     * `<div ng-bind-html="'<b>implicitly trusted</b>'"></div>`) just works. The `$sceDelegate` will
+     * also use the `$sanitize` service if it is available when binding untrusted values to
+     * `$sce.HTML` context. AngularJS provides an implementation in `angular-sanitize.js`, and if you
+     * wish to use it, you will also need to depend on the {@link ngSanitize `ngSanitize`} module in
+     * your application.
+     *
+     * The included {@link ng.$sceDelegate $sceDelegate} comes with sane defaults to allow you to load
+     * templates in `ng-include` from your application's domain without having to even know about SCE.
+     * It blocks loading templates from other domains or loading templates over http from an https
+     * served document.  You can change these by setting your own custom {@link
+        * ng.$sceDelegateProvider#resourceUrlWhitelist whitelists} and {@link
+        * ng.$sceDelegateProvider#resourceUrlBlacklist blacklists} for matching such URLs.
+     *
+     * This significantly reduces the overhead.  It is far easier to pay the small overhead and have an
+     * application that's secure and can be audited to verify that with much more ease than bolting
+     * security onto an application later.
+     *
+     * <a name="contexts"></a>
+     * ### What trusted context types are supported?
+     *
+     * | Context             | Notes          |
+     * |---------------------|----------------|
+     * | `$sce.HTML`         | For HTML that's safe to source into the application.  The {@link ng.directive:ngBindHtml ngBindHtml} directive uses this context for bindings. If an unsafe value is encountered, and the {@link ngSanitize.$sanitize $sanitize} service is available (implemented by the {@link ngSanitize ngSanitize} module) this will sanitize the value instead of throwing an error. |
+     * | `$sce.CSS`          | For CSS that's safe to source into the application.  Currently, no bindings require this context. Feel free to use it in your own directives. |
+     * | `$sce.URL`          | For URLs that are safe to follow as links.  Currently unused (`<a href=`, `<img src=`, and some others sanitize their urls and don't constitute an SCE context.) |
+     * | `$sce.RESOURCE_URL` | For URLs that are not only safe to follow as links, but whose contents are also safe to include in your application.  Examples include `ng-include`, `src` / `ngSrc` bindings for tags other than `IMG`, `VIDEO`, `AUDIO`, `SOURCE`, and `TRACK` (e.g. `IFRAME`, `OBJECT`, etc.)  <br><br>Note that `$sce.RESOURCE_URL` makes a stronger statement about the URL than `$sce.URL` does (it's not just the URL that matters, but also what is at the end of it), and therefore contexts requiring values trusted for `$sce.RESOURCE_URL` can be used anywhere that values trusted for `$sce.URL` are required. |
+     * | `$sce.JS`           | For JavaScript that is safe to execute in your application's context.  Currently, no bindings require this context.  Feel free to use it in your own directives. |
+     *
+     *
+     * Be aware that `a[href]` and `img[src]` automatically sanitize their URLs and do not pass them
+     * through {@link ng.$sce#getTrusted $sce.getTrusted}. There's no CSS-, URL-, or JS-context bindings
+     * in AngularJS currently, so their corresponding `$sce.trustAs` functions aren't useful yet. This
+     * might evolve.
+     *
+     * ### Format of items in {@link ng.$sceDelegateProvider#resourceUrlWhitelist resourceUrlWhitelist}/{@link ng.$sceDelegateProvider#resourceUrlBlacklist Blacklist} <a name="resourceUrlPatternItem"></a>
+     *
+     *  Each element in these arrays must be one of the following:
+     *
+     *  - **'self'**
+     *    - The special **string**, `'self'`, can be used to match against all URLs of the **same
+     *      domain** as the application document using the **same protocol**.
+     *  - **String** (except the special value `'self'`)
+     *    - The string is matched against the full *normalized / absolute URL* of the resource
+     *      being tested (substring matches are not good enough.)
+     *    - There are exactly **two wildcard sequences** - `*` and `**`.  All other characters
+     *      match themselves.
+     *    - `*`: matches zero or more occurrences of any character other than one of the following 6
+     *      characters: '`:`', '`/`', '`.`', '`?`', '`&`' and '`;`'.  It's a useful wildcard for use
+     *      in a whitelist.
+     *    - `**`: matches zero or more occurrences of *any* character.  As such, it's not
+     *      appropriate for use in a scheme, domain, etc. as it would match too much.  (e.g.
+     *      http://**.example.com/ would match http://evil.com/?ignore=.example.com/ and that might
+     *      not have been the intention.)  Its usage at the very end of the path is ok.  (e.g.
+     *      http://foo.example.com/templates/**).
+     *  - **RegExp** (*see caveat below*)
+     *    - *Caveat*:  While regular expressions are powerful and offer great flexibility,  their syntax
+     *      (and all the inevitable escaping) makes them *harder to maintain*.  It's easy to
+     *      accidentally introduce a bug when one updates a complex expression (imho, all regexes should
+     *      have good test coverage).  For instance, the use of `.` in the regex is correct only in a
+     *      small number of cases.  A `.` character in the regex used when matching the scheme or a
+     *      subdomain could be matched against a `:` or literal `.` that was likely not intended.   It
+     *      is highly recommended to use the string patterns and only fall back to regular expressions
+     *      as a last resort.
+     *    - The regular expression must be an instance of RegExp (i.e. not a string.)  It is
+     *      matched against the **entire** *normalized / absolute URL* of the resource being tested
+     *      (even when the RegExp did not have the `^` and `$` codes.)  In addition, any flags
+     *      present on the RegExp (such as multiline, global, ignoreCase) are ignored.
+     *    - If you are generating your JavaScript from some other templating engine (not
+     *      recommended, e.g. in issue [#4006](https://github.com/angular/angular.js/issues/4006)),
+     *      remember to escape your regular expression (and be aware that you might need more than
+     *      one level of escaping depending on your templating engine and the way you interpolated
+     *      the value.)  Do make use of your platform's escaping mechanism as it might be good
+     *      enough before coding your own.  E.g. Ruby has
+     *      [Regexp.escape(str)](http://www.ruby-doc.org/core-2.0.0/Regexp.html#method-c-escape)
+     *      and Python has [re.escape](http://docs.python.org/library/re.html#re.escape).
+     *      Javascript lacks a similar built in function for escaping.  Take a look at Google
+     *      Closure library's [goog.string.regExpEscape(s)](
+     *      http://docs.closure-library.googlecode.com/git/closure_goog_string_string.js.source.html#line962).
+     *
+     * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} for an example.
+     *
+     * ### Show me an example using SCE.
+     *
+     * <example module="mySceApp" deps="angular-sanitize.js" name="sce-service">
+     * <file name="index.html">
+     *   <div ng-controller="AppController as myCtrl">
+     *     <i ng-bind-html="myCtrl.explicitlyTrustedHtml" id="explicitlyTrustedHtml"></i><br><br>
+     *     <b>User comments</b><br>
+     *     By default, HTML that isn't explicitly trusted (e.g. Alice's comment) is sanitized when
+     *     $sanitize is available.  If $sanitize isn't available, this results in an error instead of an
+     *     exploit.
+     *     <div class="well">
+     *       <div ng-repeat="userComment in myCtrl.userComments">
+     *         <b>{{userComment.name}}</b>:
+     *         <span ng-bind-html="userComment.htmlComment" class="htmlComment"></span>
+     *         <br>
+     *       </div>
+     *     </div>
+     *   </div>
+     * </file>
+     *
+     * <file name="script.js">
+     *   angular.module('mySceApp', ['ngSanitize'])
+     *     .controller('AppController', ['$http', '$templateCache', '$sce',
+     *       function AppController($http, $templateCache, $sce) {
+     *         var self = this;
+     *         $http.get('test_data.json', {cache: $templateCache}).then(function(response) {
+     *           self.userComments = response.data;
+     *         });
+     *         self.explicitlyTrustedHtml = $sce.trustAsHtml(
+     *             '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
+     *             'sanitization.&quot;">Hover over this text.</span>');
+     *       }]);
+     * </file>
+     *
+     * <file name="test_data.json">
+     * [
+     *   { "name": "Alice",
+     *     "htmlComment":
+     *         "<span onmouseover='this.textContent=\"PWN3D!\"'>Is <i>anyone</i> reading this?</span>"
+     *   },
+     *   { "name": "Bob",
+     *     "htmlComment": "<i>Yes!</i>  Am I the only other one?"
+     *   }
+     * ]
+     * </file>
+     *
+     * <file name="protractor.js" type="protractor">
+     *   describe('SCE doc demo', function() {
+     *     it('should sanitize untrusted values', function() {
+     *       expect(element.all(by.css('.htmlComment')).first().getAttribute('innerHTML'))
+     *           .toBe('<span>Is <i>anyone</i> reading this?</span>');
+     *     });
+     *
+     *     it('should NOT sanitize explicitly trusted values', function() {
+     *       expect(element(by.id('explicitlyTrustedHtml')).getAttribute('innerHTML')).toBe(
+     *           '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
+     *           'sanitization.&quot;">Hover over this text.</span>');
+     *     });
+     *   });
+     * </file>
+     * </example>
+     *
+     *
+     *
+     * ## Can I disable SCE completely?
+     *
+     * Yes, you can.  However, this is strongly discouraged.  SCE gives you a lot of security benefits
+     * for little coding overhead.  It will be much harder to take an SCE disabled application and
+     * either secure it on your own or enable SCE at a later stage.  It might make sense to disable SCE
+     * for cases where you have a lot of existing code that was written before SCE was introduced and
+     * you're migrating them a module at a time. Also do note that this is an app-wide setting, so if
+     * you are writing a library, you will cause security bugs applications using it.
+     *
+     * That said, here's how you can completely disable SCE:
+     *
+     * ```
+     * angular.module('myAppWithSceDisabledmyApp', []).config(function($sceProvider) {
+     *   // Completely disable SCE.  For demonstration purposes only!
+     *   // Do not use in new projects or libraries.
+     *   $sceProvider.enabled(false);
+     * });
+     * ```
+     *
+     */
+
+    function $SceProvider() {
+        var enabled = true;
+
+        /**
+         * @ngdoc method
+         * @name $sceProvider#enabled
+         * @kind function
+         *
+         * @param {boolean=} value If provided, then enables/disables SCE application-wide.
+         * @return {boolean} True if SCE is enabled, false otherwise.
+         *
+         * @description
+         * Enables/disables SCE and returns the current value.
+         */
+        this.enabled = function(value) {
+            if (arguments.length) {
+                enabled = !!value;
+            }
+            return enabled;
+        };
+
+
+        /* Design notes on the default implementation for SCE.
+   *
+   * The API contract for the SCE delegate
+   * -------------------------------------
+   * The SCE delegate object must provide the following 3 methods:
+   *
+   * - trustAs(contextEnum, value)
+   *     This method is used to tell the SCE service that the provided value is OK to use in the
+   *     contexts specified by contextEnum.  It must return an object that will be accepted by
+   *     getTrusted() for a compatible contextEnum and return this value.
+   *
+   * - valueOf(value)
+   *     For values that were not produced by trustAs(), return them as is.  For values that were
+   *     produced by trustAs(), return the corresponding input value to trustAs.  Basically, if
+   *     trustAs is wrapping the given values into some type, this operation unwraps it when given
+   *     such a value.
+   *
+   * - getTrusted(contextEnum, value)
+   *     This function should return the a value that is safe to use in the context specified by
+   *     contextEnum or throw and exception otherwise.
+   *
+   * NOTE: This contract deliberately does NOT state that values returned by trustAs() must be
+   * opaque or wrapped in some holder object.  That happens to be an implementation detail.  For
+   * instance, an implementation could maintain a registry of all trusted objects by context.  In
+   * such a case, trustAs() would return the same object that was passed in.  getTrusted() would
+   * return the same object passed in if it was found in the registry under a compatible context or
+   * throw an exception otherwise.  An implementation might only wrap values some of the time based
+   * on some criteria.  getTrusted() might return a value and not throw an exception for special
+   * constants or objects even if not wrapped.  All such implementations fulfill this contract.
+   *
+   *
+   * A note on the inheritance model for SCE contexts
+   * ------------------------------------------------
+   * I've used inheritance and made RESOURCE_URL wrapped types a subtype of URL wrapped types.  This
+   * is purely an implementation details.
+   *
+   * The contract is simply this:
+   *
+   *     getTrusted($sce.RESOURCE_URL, value) succeeding implies that getTrusted($sce.URL, value)
+   *     will also succeed.
+   *
+   * Inheritance happens to capture this in a natural way. In some future, we may not use
+   * inheritance anymore. That is OK because no code outside of sce.js and sceSpecs.js would need to
+   * be aware of this detail.
+   */
+
+        this.$get = ['$parse', '$sceDelegate', function(
+            $parse,   $sceDelegate) {
+            // Support: IE 9-11 only
+            // Prereq: Ensure that we're not running in IE<11 quirks mode.  In that mode, IE < 11 allow
+            // the "expression(javascript expression)" syntax which is insecure.
+            if (enabled && msie < 8) {
+                throw $sceMinErr('iequirks',
+                    'Strict Contextual Escaping does not support Internet Explorer version < 11 in quirks ' +
+                    'mode.  You can fix this by adding the text <!doctype html> to the top of your HTML ' +
+                    'document.  See http://docs.angularjs.org/api/ng.$sce for more information.');
+            }
+
+            var sce = shallowCopy(SCE_CONTEXTS);
+
+            /**
+             * @ngdoc method
+             * @name $sce#isEnabled
+             * @kind function
+             *
+             * @return {Boolean} True if SCE is enabled, false otherwise.  If you want to set the value, you
+             *     have to do it at module config time on {@link ng.$sceProvider $sceProvider}.
+             *
+             * @description
+             * Returns a boolean indicating if SCE is enabled.
+             */
+            sce.isEnabled = function() {
+                return enabled;
+            };
+            sce.trustAs = $sceDelegate.trustAs;
+            sce.getTrusted = $sceDelegate.getTrusted;
+            sce.valueOf = $sceDelegate.valueOf;
+
+            if (!enabled) {
+                sce.trustAs = sce.getTrusted = function(type, value) { return value; };
+                sce.valueOf = identity;
+            }
+
+            /**
+             * @ngdoc method
+             * @name $sce#parseAs
+             *
+             * @description
+             * Converts AngularJS {@link guide/expression expression} into a function.  This is like {@link
+                * ng.$parse $parse} and is identical when the expression is a literal constant.  Otherwise, it
+             * wraps the expression in a call to {@link ng.$sce#getTrusted $sce.getTrusted(*type*,
+     * *result*)}
+             *
+             * @param {string} type The SCE context in which this result will be used.
+             * @param {string} expression String expression to compile.
+             * @return {function(context, locals)} A function which represents the compiled expression:
+             *
+             *    * `context` – `{object}` – an object against which any expressions embedded in the
+             *      strings are evaluated against (typically a scope object).
+             *    * `locals` – `{object=}` – local variables context object, useful for overriding values
+             *      in `context`.
+             */
+            sce.parseAs = function sceParseAs(type, expr) {
+                var parsed = $parse(expr);
+                if (parsed.literal && parsed.constant) {
+                    return parsed;
+                } else {
+                    return $parse(expr, function(value) {
+                        return sce.getTrusted(type, value);
+                    });
+                }
+            };
+
+            /**
+             * @ngdoc method
+             * @name $sce#trustAs
+             *
+             * @description
+             * Delegates to {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}. As such, returns a
+             * wrapped object that represents your value, and the trust you have in its safety for the given
+             * context. AngularJS can then use that value as-is in bindings of the specified secure context.
+             * This is used in bindings for `ng-bind-html`, `ng-include`, and most `src` attribute
+             * interpolations. See {@link ng.$sce $sce} for strict contextual escaping.
+             *
+             * @param {string} type The context in which this value is safe for use, e.g. `$sce.URL`,
+             *     `$sce.RESOURCE_URL`, `$sce.HTML`, `$sce.JS` or `$sce.CSS`.
+             *
+             * @param {*} value The value that that should be considered trusted.
+             * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
+             *     in the context you specified.
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#trustAsHtml
+             *
+             * @description
+             * Shorthand method.  `$sce.trustAsHtml(value)` →
+             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.HTML, value)`}
+             *
+             * @param {*} value The value to mark as trusted for `$sce.HTML` context.
+             * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
+             *     in `$sce.HTML` context (like `ng-bind-html`).
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#trustAsCss
+             *
+             * @description
+             * Shorthand method.  `$sce.trustAsCss(value)` →
+             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.CSS, value)`}
+             *
+             * @param {*} value The value to mark as trusted for `$sce.CSS` context.
+             * @return {*} A wrapped version of value that can be used as a trusted variant
+             *     of your `value` in `$sce.CSS` context. This context is currently unused, so there are
+             *     almost no reasons to use this function so far.
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#trustAsUrl
+             *
+             * @description
+             * Shorthand method.  `$sce.trustAsUrl(value)` →
+             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.URL, value)`}
+             *
+             * @param {*} value The value to mark as trusted for `$sce.URL` context.
+             * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
+             *     in `$sce.URL` context. That context is currently unused, so there are almost no reasons
+             *     to use this function so far.
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#trustAsResourceUrl
+             *
+             * @description
+             * Shorthand method.  `$sce.trustAsResourceUrl(value)` →
+             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.RESOURCE_URL, value)`}
+             *
+             * @param {*} value The value to mark as trusted for `$sce.RESOURCE_URL` context.
+             * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
+             *     in `$sce.RESOURCE_URL` context (template URLs in `ng-include`, most `src` attribute
+             *     bindings, ...)
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#trustAsJs
+             *
+             * @description
+             * Shorthand method.  `$sce.trustAsJs(value)` →
+             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.JS, value)`}
+             *
+             * @param {*} value The value to mark as trusted for `$sce.JS` context.
+             * @return {*} A wrapped version of value that can be used as a trusted variant of your `value`
+             *     in `$sce.JS` context. That context is currently unused, so there are almost no reasons to
+             *     use this function so far.
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#getTrusted
+             *
+             * @description
+             * Delegates to {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted`}.  As such,
+             * takes any input, and either returns a value that's safe to use in the specified context,
+             * or throws an exception. This function is aware of trusted values created by the `trustAs`
+             * function and its shorthands, and when contexts are appropriate, returns the unwrapped value
+             * as-is. Finally, this function can also throw when there is no way to turn `maybeTrusted` in a
+             * safe value (e.g., no sanitization is available or possible.)
+             *
+             * @param {string} type The context in which this value is to be used.
+             * @param {*} maybeTrusted The result of a prior {@link ng.$sce#trustAs
+     *     `$sce.trustAs`} call, or anything else (which will not be considered trusted.)
+             * @return {*} A version of the value that's safe to use in the given context, or throws an
+             *     exception if this is impossible.
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#getTrustedHtml
+             *
+             * @description
+             * Shorthand method.  `$sce.getTrustedHtml(value)` →
+             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.HTML, value)`}
+             *
+             * @param {*} value The value to pass to `$sce.getTrusted`.
+             * @return {*} The return value of `$sce.getTrusted($sce.HTML, value)`
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#getTrustedCss
+             *
+             * @description
+             * Shorthand method.  `$sce.getTrustedCss(value)` →
+             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.CSS, value)`}
+             *
+             * @param {*} value The value to pass to `$sce.getTrusted`.
+             * @return {*} The return value of `$sce.getTrusted($sce.CSS, value)`
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#getTrustedUrl
+             *
+             * @description
+             * Shorthand method.  `$sce.getTrustedUrl(value)` →
+             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.URL, value)`}
+             *
+             * @param {*} value The value to pass to `$sce.getTrusted`.
+             * @return {*} The return value of `$sce.getTrusted($sce.URL, value)`
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#getTrustedResourceUrl
+             *
+             * @description
+             * Shorthand method.  `$sce.getTrustedResourceUrl(value)` →
+             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.RESOURCE_URL, value)`}
+             *
+             * @param {*} value The value to pass to `$sceDelegate.getTrusted`.
+             * @return {*} The return value of `$sce.getTrusted($sce.RESOURCE_URL, value)`
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#getTrustedJs
+             *
+             * @description
+             * Shorthand method.  `$sce.getTrustedJs(value)` →
+             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.JS, value)`}
+             *
+             * @param {*} value The value to pass to `$sce.getTrusted`.
+             * @return {*} The return value of `$sce.getTrusted($sce.JS, value)`
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#parseAsHtml
+             *
+             * @description
+             * Shorthand method.  `$sce.parseAsHtml(expression string)` →
+             *     {@link ng.$sce#parseAs `$sce.parseAs($sce.HTML, value)`}
+             *
+             * @param {string} expression String expression to compile.
+             * @return {function(context, locals)} A function which represents the compiled expression:
+             *
+             *    * `context` – `{object}` – an object against which any expressions embedded in the
+             *      strings are evaluated against (typically a scope object).
+             *    * `locals` – `{object=}` – local variables context object, useful for overriding values
+             *      in `context`.
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#parseAsCss
+             *
+             * @description
+             * Shorthand method.  `$sce.parseAsCss(value)` →
+             *     {@link ng.$sce#parseAs `$sce.parseAs($sce.CSS, value)`}
+             *
+             * @param {string} expression String expression to compile.
+             * @return {function(context, locals)} A function which represents the compiled expression:
+             *
+             *    * `context` – `{object}` – an object against which any expressions embedded in the
+             *      strings are evaluated against (typically a scope object).
+             *    * `locals` – `{object=}` – local variables context object, useful for overriding values
+             *      in `context`.
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#parseAsUrl
+             *
+             * @description
+             * Shorthand method.  `$sce.parseAsUrl(value)` →
+             *     {@link ng.$sce#parseAs `$sce.parseAs($sce.URL, value)`}
+             *
+             * @param {string} expression String expression to compile.
+             * @return {function(context, locals)} A function which represents the compiled expression:
+             *
+             *    * `context` – `{object}` – an object against which any expressions embedded in the
+             *      strings are evaluated against (typically a scope object).
+             *    * `locals` – `{object=}` – local variables context object, useful for overriding values
+             *      in `context`.
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#parseAsResourceUrl
+             *
+             * @description
+             * Shorthand method.  `$sce.parseAsResourceUrl(value)` →
+             *     {@link ng.$sce#parseAs `$sce.parseAs($sce.RESOURCE_URL, value)`}
+             *
+             * @param {string} expression String expression to compile.
+             * @return {function(context, locals)} A function which represents the compiled expression:
+             *
+             *    * `context` – `{object}` – an object against which any expressions embedded in the
+             *      strings are evaluated against (typically a scope object).
+             *    * `locals` – `{object=}` – local variables context object, useful for overriding values
+             *      in `context`.
+             */
+
+            /**
+             * @ngdoc method
+             * @name $sce#parseAsJs
+             *
+             * @description
+             * Shorthand method.  `$sce.parseAsJs(value)` →
+             *     {@link ng.$sce#parseAs `$sce.parseAs($sce.JS, value)`}
+             *
+             * @param {string} expression String expression to compile.
+             * @return {function(context, locals)} A function which represents the compiled expression:
+             *
+             *    * `context` – `{object}` – an object against which any expressions embedded in the
+             *      strings are evaluated against (typically a scope object).
+             *    * `locals` – `{object=}` – local variables context object, useful for overriding values
+             *      in `context`.
+             */
+
+                // Shorthand delegations.
+            var parse = sce.parseAs,
+                getTrusted = sce.getTrusted,
+                trustAs = sce.trustAs;
+
+            forEach(SCE_CONTEXTS, function(enumValue, name) {
+                var lName = lowercase(name);
+                sce[snakeToCamel('parse_as_' + lName)] = function(expr) {
+                    return parse(enumValue, expr);
+                };
+                sce[snakeToCamel('get_trusted_' + lName)] = function(value) {
+                    return getTrusted(enumValue, value);
+                };
+                sce[snakeToCamel('trust_as_' + lName)] = function(value) {
+                    return trustAs(enumValue, value);
+                };
+            });
+
+            return sce;
+        }];
+    }
+
+    /* exported $SnifferProvider */
+
+    /**
+     * !!! This is an undocumented "private" service !!!
+     *
+     * @name $sniffer
+     * @requires $window
+     * @requires $document
+     * @this
+     *
+     * @property {boolean} history Does the browser support html5 history api ?
+     * @property {boolean} transitions Does the browser support CSS transition events ?
+     * @property {boolean} animations Does the browser support CSS animation events ?
+     *
+     * @description
+     * This is very simple implementation of testing browser's features.
+     */
+    function $SnifferProvider() {
+        this.$get = ['$window', '$document', function($window, $document) {
+            var eventSupport = {},
+                // Chrome Packaged Apps are not allowed to access `history.pushState`.
+                // If not sandboxed, they can be detected by the presence of `chrome.app.runtime`
+                // (see https://developer.chrome.com/apps/api_index). If sandboxed, they can be detected by
+                // the presence of an extension runtime ID and the absence of other Chrome runtime APIs
+                // (see https://developer.chrome.com/apps/manifest/sandbox).
+                // (NW.js apps have access to Chrome APIs, but do support `history`.)
+                isNw = $window.nw && $window.nw.process,
+                isChromePackagedApp =
+                    !isNw &&
+                    $window.chrome &&
+                    ($window.chrome.app && $window.chrome.app.runtime ||
+                        !$window.chrome.app && $window.chrome.runtime && $window.chrome.runtime.id),
+                hasHistoryPushState = !isChromePackagedApp && $window.history && $window.history.pushState,
+                android =
+                    toInt((/android (\d+)/.exec(lowercase(($window.navigator || {}).userAgent)) || [])[1]),
+                boxee = /Boxee/i.test(($window.navigator || {}).userAgent),
+                document = $document[0] || {},
+                bodyStyle = document.body && document.body.style,
+                transitions = false,
+                animations = false;
+
+            if (bodyStyle) {
+                // Support: Android <5, Blackberry Browser 10, default Chrome in Android 4.4.x
+                // Mentioned browsers need a -webkit- prefix for transitions & animations.
+                transitions = !!('transition' in bodyStyle || 'webkitTransition' in bodyStyle);
+                animations = !!('animation' in bodyStyle || 'webkitAnimation' in bodyStyle);
+            }
+
+
+            return {
+                // Android has history.pushState, but it does not update location correctly
+                // so let's not use the history API at all.
+                // http://code.google.com/p/android/issues/detail?id=17471
+                // https://github.com/angular/angular.js/issues/904
+
+                // older webkit browser (533.9) on Boxee box has exactly the same problem as Android has
+                // so let's not use the history API also
+                // We are purposefully using `!(android < 4)` to cover the case when `android` is undefined
+                history: !!(hasHistoryPushState && !(android < 4) && !boxee),
+                hasEvent: function(event) {
+                    // Support: IE 9-11 only
+                    // IE9 implements 'input' event it's so fubared that we rather pretend that it doesn't have
+                    // it. In particular the event is not fired when backspace or delete key are pressed or
+                    // when cut operation is performed.
+                    // IE10+ implements 'input' event but it erroneously fires under various situations,
+                    // e.g. when placeholder changes, or a form is focused.
+                    if (event === 'input' && msie) return false;
+
+                    if (isUndefined(eventSupport[event])) {
+                        var divElm = document.createElement('div');
+                        eventSupport[event] = 'on' + event in divElm;
+                    }
+
+                    return eventSupport[event];
+                },
+                csp: csp(),
+                transitions: transitions,
+                animations: animations,
+                android: android
+            };
+        }];
+    }
+
+    var $templateRequestMinErr = minErr('$compile');
+
+    /**
+     * @ngdoc provider
+     * @name $templateRequestProvider
+     * @this
+     *
+     * @description
+     * Used to configure the options passed to the {@link $http} service when making a template request.
+     *
+     * For example, it can be used for specifying the "Accept" header that is sent to the server, when
+     * requesting a template.
+     */
+    function $TemplateRequestProvider() {
+
+        var httpOptions;
+
+        /**
+         * @ngdoc method
+         * @name $templateRequestProvider#httpOptions
+         * @description
+         * The options to be passed to the {@link $http} service when making the request.
+         * You can use this to override options such as the "Accept" header for template requests.
+         *
+         * The {@link $templateRequest} will set the `cache` and the `transformResponse` properties of the
+         * options if not overridden here.
+         *
+         * @param {string=} value new value for the {@link $http} options.
+         * @returns {string|self} Returns the {@link $http} options when used as getter and self if used as setter.
+         */
+        this.httpOptions = function(val) {
+            if (val) {
+                httpOptions = val;
+                return this;
+            }
+            return httpOptions;
+        };
+
+        /**
+         * @ngdoc service
+         * @name $templateRequest
+         *
+         * @description
+         * The `$templateRequest` service runs security checks then downloads the provided template using
+         * `$http` and, upon success, stores the contents inside of `$templateCache`. If the HTTP request
+         * fails or the response data of the HTTP request is empty, a `$compile` error will be thrown (the
+         * exception can be thwarted by setting the 2nd parameter of the function to true). Note that the
+         * contents of `$templateCache` are trusted, so the call to `$sce.getTrustedUrl(tpl)` is omitted
+         * when `tpl` is of type string and `$templateCache` has the matching entry.
+         *
+         * If you want to pass custom options to the `$http` service, such as setting the Accept header you
+         * can configure this via {@link $templateRequestProvider#httpOptions}.
+         *
+         * `$templateRequest` is used internally by {@link $compile}, {@link ngRoute.$route}, and directives such
+         * as {@link ngInclude} to download and cache templates.
+         *
+         * 3rd party modules should use `$templateRequest` if their services or directives are loading
+         * templates.
+         *
+         * @param {string|TrustedResourceUrl} tpl The HTTP request template URL
+         * @param {boolean=} ignoreRequestError Whether or not to ignore the exception when the request fails or the template is empty
+         *
+         * @return {Promise} a promise for the HTTP response data of the given URL.
+         *
+         * @property {number} totalPendingRequests total amount of pending template requests being downloaded.
+         */
+        this.$get = ['$exceptionHandler', '$templateCache', '$http', '$q', '$sce',
+            function($exceptionHandler, $templateCache, $http, $q, $sce) {
+
+                function handleRequestFn(tpl, ignoreRequestError) {
+                    handleRequestFn.totalPendingRequests++;
+
+                    // We consider the template cache holds only trusted templates, so
+                    // there's no need to go through whitelisting again for keys that already
+                    // are included in there. This also makes AngularJS accept any script
+                    // directive, no matter its name. However, we still need to unwrap trusted
+                    // types.
+                    if (!isString(tpl) || isUndefined($templateCache.get(tpl))) {
+                        tpl = $sce.getTrustedResourceUrl(tpl);
+                    }
+
+                    var transformResponse = $http.defaults && $http.defaults.transformResponse;
+
+                    if (isArray(transformResponse)) {
+                        transformResponse = transformResponse.filter(function(transformer) {
+                            return transformer !== defaultHttpResponseTransform;
+                        });
+                    } else if (transformResponse === defaultHttpResponseTransform) {
+                        transformResponse = null;
+                    }
+
+                    return $http.get(tpl, extend({
+                        cache: $templateCache,
+                        transformResponse: transformResponse
+                    }, httpOptions))
+                        .finally(function() {
+                            handleRequestFn.totalPendingRequests--;
+                        })
+                        .then(function(response) {
+                            $templateCache.put(tpl, response.data);
+                            return response.data;
+                        }, handleError);
+
+                    function handleError(resp) {
+                        if (!ignoreRequestError) {
+                            resp = $templateRequestMinErr('tpload',
+                                'Failed to load template: {0} (HTTP status: {1} {2})',
+                                tpl, resp.status, resp.statusText);
+
+                            $exceptionHandler(resp);
+                        }
+
+                        return $q.reject(resp);
+                    }
+                }
+
+                handleRequestFn.totalPendingRequests = 0;
+
+                return handleRequestFn;
+            }
+        ];
+    }
+
+    /** @this */
+    function $$TestabilityProvider() {
+        this.$get = ['$rootScope', '$browser', '$location',
+            function($rootScope,   $browser,   $location) {
+
+                /**
+                 * @name $testability
+                 *
+                 * @description
+                 * The private $$testability service provides a collection of methods for use when debugging
+                 * or by automated test and debugging tools.
+                 */
+                var testability = {};
+
+                /**
+                 * @name $$testability#findBindings
+                 *
+                 * @description
+                 * Returns an array of elements that are bound (via ng-bind or {{}})
+                 * to expressions matching the input.
+                 *
+                 * @param {Element} element The element root to search from.
+                 * @param {string} expression The binding expression to match.
+                 * @param {boolean} opt_exactMatch If true, only returns exact matches
+                 *     for the expression. Filters and whitespace are ignored.
+                 */
+                testability.findBindings = function(element, expression, opt_exactMatch) {
+                    var bindings = element.getElementsByClassName('ng-binding');
+                    var matches = [];
+                    forEach(bindings, function(binding) {
+                        var dataBinding = angular.element(binding).data('$binding');
+                        if (dataBinding) {
+                            forEach(dataBinding, function(bindingName) {
+                                if (opt_exactMatch) {
+                                    var matcher = new RegExp('(^|\\s)' + escapeForRegexp(expression) + '(\\s|\\||$)');
+                                    if (matcher.test(bindingName)) {
+                                        matches.push(binding);
+                                    }
+                                } else {
+                                    if (bindingName.indexOf(expression) !== -1) {
+                                        matches.push(binding);
+                                    }
+                                }
+                            });
+                        }
+                    });
+                    return matches;
+                };
+
+                /**
+                 * @name $$testability#findModels
+                 *
+                 * @description
+                 * Returns an array of elements that are two-way found via ng-model to
+                 * expressions matching the input.
+                 *
+                 * @param {Element} element The element root to search from.
+                 * @param {string} expression The model expression to match.
+                 * @param {boolean} opt_exactMatch If true, only returns exact matches
+                 *     for the expression.
+                 */
+                testability.findModels = function(element, expression, opt_exactMatch) {
+                    var prefixes = ['ng-', 'data-ng-', 'ng\\:'];
+                    for (var p = 0; p < prefixes.length; ++p) {
+                        var attributeEquals = opt_exactMatch ? '=' : '*=';
+                        var selector = '[' + prefixes[p] + 'model' + attributeEquals + '"' + expression + '"]';
+                        var elements = element.querySelectorAll(selector);
+                        if (elements.length) {
+                            return elements;
+                        }
+                    }
+                };
+
+                /**
+                 * @name $$testability#getLocation
+                 *
+                 * @description
+                 * Shortcut for getting the location in a browser agnostic way. Returns
+                 *     the path, search, and hash. (e.g. /path?a=b#hash)
+                 */
+                testability.getLocation = function() {
+                    return $location.url();
+                };
+
+                /**
+                 * @name $$testability#setLocation
+                 *
+                 * @description
+                 * Shortcut for navigating to a location without doing a full page reload.
+                 *
+                 * @param {string} url The location url (path, search and hash,
+                 *     e.g. /path?a=b#hash) to go to.
+                 */
+                testability.setLocation = function(url) {
+                    if (url !== $location.url()) {
+                        $location.url(url);
+                        $rootScope.$digest();
+                    }
+                };
+
+                /**
+                 * @name $$testability#whenStable
+                 *
+                 * @description
+                 * Calls the callback when $timeout and $http requests are completed.
+                 *
+                 * @param {function} callback
+                 */
+                testability.whenStable = function(callback) {
+                    $browser.notifyWhenNoOutstandingRequests(callback);
+                };
+
+                return testability;
+            }];
+    }
+
+    /** @this */
+    function $TimeoutProvider() {
+        this.$get = ['$rootScope', '$browser', '$q', '$$q', '$exceptionHandler',
+            function($rootScope,   $browser,   $q,   $$q,   $exceptionHandler) {
+
+                var deferreds = {};
+
+
+                /**
+                 * @ngdoc service
+                 * @name $timeout
+                 *
+                 * @description
+                 * AngularJS's wrapper for `window.setTimeout`. The `fn` function is wrapped into a try/catch
+                 * block and delegates any exceptions to
+                 * {@link ng.$exceptionHandler $exceptionHandler} service.
+                 *
+                 * The return value of calling `$timeout` is a promise, which will be resolved when
+                 * the delay has passed and the timeout function, if provided, is executed.
+                 *
+                 * To cancel a timeout request, call `$timeout.cancel(promise)`.
+                 *
+                 * In tests you can use {@link ngMock.$timeout `$timeout.flush()`} to
+                 * synchronously flush the queue of deferred functions.
+                 *
+                 * If you only want a promise that will be resolved after some specified delay
+                 * then you can call `$timeout` without the `fn` function.
+                 *
+                 * @param {function()=} fn A function, whose execution should be delayed.
+                 * @param {number=} [delay=0] Delay in milliseconds.
+                 * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
+                 *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
+                 * @param {...*=} Pass additional parameters to the executed function.
+                 * @returns {Promise} Promise that will be resolved when the timeout is reached. The promise
+                 *   will be resolved with the return value of the `fn` function.
+                 *
+                 */
+                function timeout(fn, delay, invokeApply) {
+                    if (!isFunction(fn)) {
+                        invokeApply = delay;
+                        delay = fn;
+                        fn = noop;
+                    }
+
+                    var args = sliceArgs(arguments, 3),
+                        skipApply = (isDefined(invokeApply) && !invokeApply),
+                        deferred = (skipApply ? $$q : $q).defer(),
+                        promise = deferred.promise,
+                        timeoutId;
+
+                    timeoutId = $browser.defer(function() {
+                        try {
+                            deferred.resolve(fn.apply(null, args));
+                        } catch (e) {
+                            deferred.reject(e);
+                            $exceptionHandler(e);
+                        } finally {
+                            delete deferreds[promise.$$timeoutId];
+                        }
+
+                        if (!skipApply) $rootScope.$apply();
+                    }, delay);
+
+                    promise.$$timeoutId = timeoutId;
+                    deferreds[timeoutId] = deferred;
+
+                    return promise;
+                }
+
+
+                /**
+                 * @ngdoc method
+                 * @name $timeout#cancel
+                 *
+                 * @description
+                 * Cancels a task associated with the `promise`. As a result of this, the promise will be
+                 * resolved with a rejection.
+                 *
+                 * @param {Promise=} promise Promise returned by the `$timeout` function.
+                 * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully
+                 *   canceled.
+                 */
+                timeout.cancel = function(promise) {
+                    if (promise && promise.$$timeoutId in deferreds) {
+                        // Timeout cancels should not report an unhandled promise.
+                        markQExceptionHandled(deferreds[promise.$$timeoutId].promise);
+                        deferreds[promise.$$timeoutId].reject('canceled');
+                        delete deferreds[promise.$$timeoutId];
+                        return $browser.defer.cancel(promise.$$timeoutId);
+                    }
+                    return false;
+                };
+
+                return timeout;
+            }];
+    }
+
+// NOTE:  The usage of window and document instead of $window and $document here is
+// deliberate.  This service depends on the specific behavior of anchor nodes created by the
+// browser (resolving and parsing URLs) that is unlikely to be provided by mock objects and
+// cause us to break tests.  In addition, when the browser resolves a URL for XHR, it
+// doesn't know about mocked locations and resolves URLs to the real document - which is
+// exactly the behavior needed here.  There is little value is mocking these out for this
+// service.
+    var urlParsingNode = window.document.createElement('a');
+    var originUrl = urlResolve(window.location.href);
+
+
+    /**
+     *
+     * Implementation Notes for non-IE browsers
+     * ----------------------------------------
+     * Assigning a URL to the href property of an anchor DOM node, even one attached to the DOM,
+     * results both in the normalizing and parsing of the URL.  Normalizing means that a relative
+     * URL will be resolved into an absolute URL in the context of the application document.
+     * Parsing means that the anchor node's host, hostname, protocol, port, pathname and related
+     * properties are all populated to reflect the normalized URL.  This approach has wide
+     * compatibility - Safari 1+, Mozilla 1+ etc.  See
+     * http://www.aptana.com/reference/html/api/HTMLAnchorElement.html
+     *
+     * Implementation Notes for IE
+     * ---------------------------
+     * IE <= 10 normalizes the URL when assigned to the anchor node similar to the other
+     * browsers.  However, the parsed components will not be set if the URL assigned did not specify
+     * them.  (e.g. if you assign a.href = "foo", then a.protocol, a.host, etc. will be empty.)  We
+     * work around that by performing the parsing in a 2nd step by taking a previously normalized
+     * URL (e.g. by assigning to a.href) and assigning it a.href again.  This correctly populates the
+     * properties such as protocol, hostname, port, etc.
+     *
+     * References:
+     *   http://developer.mozilla.org/en-US/docs/Web/API/HTMLAnchorElement
+     *   http://www.aptana.com/reference/html/api/HTMLAnchorElement.html
+     *   http://url.spec.whatwg.org/#urlutils
+     *   https://github.com/angular/angular.js/pull/2902
+     *   http://james.padolsey.com/javascript/parsing-urls-with-the-dom/
+     *
+     * @kind function
+     * @param {string} url The URL to be parsed.
+     * @description Normalizes and parses a URL.
+     * @returns {object} Returns the normalized URL as a dictionary.
+     *
+     *   | member name   | Description    |
+     *   |---------------|----------------|
+     *   | href          | A normalized version of the provided URL if it was not an absolute URL |
+     *   | protocol      | The protocol including the trailing colon                              |
+     *   | host          | The host and port (if the port is non-default) of the normalizedUrl    |
+     *   | search        | The search params, minus the question mark                             |
+     *   | hash          | The hash string, minus the hash symbol
+     *   | hostname      | The hostname
+     *   | port          | The port, without ":"
+     *   | pathname      | The pathname, beginning with "/"
+     *
+     */
+    function urlResolve(url) {
+        var href = url;
+
+        // Support: IE 9-11 only
+        if (msie) {
+            // Normalize before parse.  Refer Implementation Notes on why this is
+            // done in two steps on IE.
+            urlParsingNode.setAttribute('href', href);
+            href = urlParsingNode.href;
+        }
+
+        urlParsingNode.setAttribute('href', href);
+
+        // urlParsingNode provides the UrlUtils interface - http://url.spec.whatwg.org/#urlutils
+        return {
+            href: urlParsingNode.href,
+            protocol: urlParsingNode.protocol ? urlParsingNode.protocol.replace(/:$/, '') : '',
+            host: urlParsingNode.host,
+            search: urlParsingNode.search ? urlParsingNode.search.replace(/^\?/, '') : '',
+            hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '',
+            hostname: urlParsingNode.hostname,
+            port: urlParsingNode.port,
+            pathname: (urlParsingNode.pathname.charAt(0) === '/')
+                ? urlParsingNode.pathname
+                : '/' + urlParsingNode.pathname
+        };
+    }
+
+    /**
+     * Parse a request URL and determine whether this is a same-origin request as the application document.
+     *
+     * @param {string|object} requestUrl The url of the request as a string that will be resolved
+     * or a parsed URL object.
+     * @returns {boolean} Whether the request is for the same origin as the application document.
+     */
+    function urlIsSameOrigin(requestUrl) {
+        var parsed = (isString(requestUrl)) ? urlResolve(requestUrl) : requestUrl;
+        return (parsed.protocol === originUrl.protocol &&
+            parsed.host === originUrl.host);
+    }
+
+    /**
+     * @ngdoc service
+     * @name $window
+     * @this
+     *
+     * @description
+     * A reference to the browser's `window` object. While `window`
+     * is globally available in JavaScript, it causes testability problems, because
+     * it is a global variable. In AngularJS we always refer to it through the
+     * `$window` service, so it may be overridden, removed or mocked for testing.
+     *
+     * Expressions, like the one defined for the `ngClick` directive in the example
+     * below, are evaluated with respect to the current scope.  Therefore, there is
+     * no risk of inadvertently coding in a dependency on a global value in such an
+     * expression.
+     *
+     * @example
+     <example module="windowExample" name="window-service">
+     <file name="index.html">
+     <script>
+     angular.module('windowExample', [])
+     .controller('ExampleController', ['$scope', '$window', function($scope, $window) {
+             $scope.greeting = 'Hello, World!';
+             $scope.doGreeting = function(greeting) {
+               $window.alert(greeting);
+             };
+           }]);
+     </script>
+     <div ng-controller="ExampleController">
+     <input type="text" ng-model="greeting" aria-label="greeting" />
+     <button ng-click="doGreeting(greeting)">ALERT</button>
+     </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should display the greeting in the input box', function() {
+       element(by.model('greeting')).sendKeys('Hello, E2E Tests');
+       // If we click the button it will block the test runner
+       // element(':button').click();
+      });
+     </file>
+     </example>
+     */
+    function $WindowProvider() {
+        this.$get = valueFn(window);
+    }
+
+    /**
+     * @name $$cookieReader
+     * @requires $document
+     *
+     * @description
+     * This is a private service for reading cookies used by $http and ngCookies
+     *
+     * @return {Object} a key/value map of the current cookies
+     */
+    function $$CookieReader($document) {
+        var rawDocument = $document[0] || {};
+        var lastCookies = {};
+        var lastCookieString = '';
+
+        function safeGetCookie(rawDocument) {
+            try {
+                return rawDocument.cookie || '';
+            } catch (e) {
+                return '';
+            }
+        }
+
+        function safeDecodeURIComponent(str) {
+            try {
+                return decodeURIComponent(str);
+            } catch (e) {
+                return str;
+            }
+        }
+
+        return function() {
+            var cookieArray, cookie, i, index, name;
+            var currentCookieString = safeGetCookie(rawDocument);
+
+            if (currentCookieString !== lastCookieString) {
+                lastCookieString = currentCookieString;
+                cookieArray = lastCookieString.split('; ');
+                lastCookies = {};
+
+                for (i = 0; i < cookieArray.length; i++) {
+                    cookie = cookieArray[i];
+                    index = cookie.indexOf('=');
+                    if (index > 0) { //ignore nameless cookies
+                        name = safeDecodeURIComponent(cookie.substring(0, index));
+                        // the first value that is seen for a cookie is the most
+                        // specific one.  values for the same cookie name that
+                        // follow are for less specific paths.
+                        if (isUndefined(lastCookies[name])) {
+                            lastCookies[name] = safeDecodeURIComponent(cookie.substring(index + 1));
+                        }
+                    }
+                }
+            }
+            return lastCookies;
+        };
+    }
+
+    $$CookieReader.$inject = ['$document'];
+
+    /** @this */
+    function $$CookieReaderProvider() {
+        this.$get = $$CookieReader;
+    }
+
+    /* global currencyFilter: true,
+ dateFilter: true,
+ filterFilter: true,
+ jsonFilter: true,
+ limitToFilter: true,
+ lowercaseFilter: true,
+ numberFilter: true,
+ orderByFilter: true,
+ uppercaseFilter: true,
+ */
+
+    /**
+     * @ngdoc provider
+     * @name $filterProvider
+     * @description
+     *
+     * Filters are just functions which transform input to an output. However filters need to be
+     * Dependency Injected. To achieve this a filter definition consists of a factory function which is
+     * annotated with dependencies and is responsible for creating a filter function.
+     *
+     * <div class="alert alert-warning">
+     * **Note:** Filter names must be valid AngularJS {@link expression} identifiers, such as `uppercase` or `orderBy`.
+     * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
+     * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
+     * (`myapp_subsection_filterx`).
+     * </div>
+     *
+     * ```js
+     *   // Filter registration
+     *   function MyModule($provide, $filterProvider) {
+     *     // create a service to demonstrate injection (not always needed)
+     *     $provide.value('greet', function(name){
+     *       return 'Hello ' + name + '!';
+     *     });
+     *
+     *     // register a filter factory which uses the
+     *     // greet service to demonstrate DI.
+     *     $filterProvider.register('greet', function(greet){
+     *       // return the filter function which uses the greet service
+     *       // to generate salutation
+     *       return function(text) {
+     *         // filters need to be forgiving so check input validity
+     *         return text && greet(text) || text;
+     *       };
+     *     });
+     *   }
+     * ```
+     *
+     * The filter function is registered with the `$injector` under the filter name suffix with
+     * `Filter`.
+     *
+     * ```js
+     *   it('should be the same instance', inject(
+     *     function($filterProvider) {
+     *       $filterProvider.register('reverse', function(){
+     *         return ...;
+     *       });
+     *     },
+     *     function($filter, reverseFilter) {
+     *       expect($filter('reverse')).toBe(reverseFilter);
+     *     });
+     * ```
+     *
+     *
+     * For more information about how AngularJS filters work, and how to create your own filters, see
+     * {@link guide/filter Filters} in the AngularJS Developer Guide.
+     */
+
+    /**
+     * @ngdoc service
+     * @name $filter
+     * @kind function
+     * @description
+     * Filters are used for formatting data displayed to the user.
+     *
+     * They can be used in view templates, controllers or services. AngularJS comes
+     * with a collection of [built-in filters](api/ng/filter), but it is easy to
+     * define your own as well.
+     *
+     * The general syntax in templates is as follows:
+     *
+     * ```html
+     * {{ expression [| filter_name[:parameter_value] ... ] }}
+     * ```
+     *
+     * @param {String} name Name of the filter function to retrieve
+     * @return {Function} the filter function
+     * @example
+     <example name="$filter" module="filterExample">
+     <file name="index.html">
+     <div ng-controller="MainCtrl">
+     <h3>{{ originalText }}</h3>
+     <h3>{{ filteredText }}</h3>
+     </div>
+     </file>
+
+     <file name="script.js">
+     angular.module('filterExample', [])
+     .controller('MainCtrl', function($scope, $filter) {
+        $scope.originalText = 'hello';
+        $scope.filteredText = $filter('uppercase')($scope.originalText);
+      });
+     </file>
+     </example>
+     */
+    $FilterProvider.$inject = ['$provide'];
+    /** @this */
+    function $FilterProvider($provide) {
+        var suffix = 'Filter';
+
+        /**
+         * @ngdoc method
+         * @name $filterProvider#register
+         * @param {string|Object} name Name of the filter function, or an object map of filters where
+         *    the keys are the filter names and the values are the filter factories.
+         *
+         *    <div class="alert alert-warning">
+         *    **Note:** Filter names must be valid AngularJS {@link expression} identifiers, such as `uppercase` or `orderBy`.
+         *    Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
+         *    your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
+         *    (`myapp_subsection_filterx`).
+         *    </div>
+         * @param {Function} factory If the first argument was a string, a factory function for the filter to be registered.
+         * @returns {Object} Registered filter instance, or if a map of filters was provided then a map
+         *    of the registered filter instances.
+         */
+        function register(name, factory) {
+            if (isObject(name)) {
+                var filters = {};
+                forEach(name, function(filter, key) {
+                    filters[key] = register(key, filter);
+                });
+                return filters;
+            } else {
+                return $provide.factory(name + suffix, factory);
+            }
+        }
+        this.register = register;
+
+        this.$get = ['$injector', function($injector) {
+            return function(name) {
+                return $injector.get(name + suffix);
+            };
+        }];
+
+        ////////////////////////////////////////
+
+        /* global
+    currencyFilter: false,
+    dateFilter: false,
+    filterFilter: false,
+    jsonFilter: false,
+    limitToFilter: false,
+    lowercaseFilter: false,
+    numberFilter: false,
+    orderByFilter: false,
+    uppercaseFilter: false
+  */
+
+        register('currency', currencyFilter);
+        register('date', dateFilter);
+        register('filter', filterFilter);
+        register('json', jsonFilter);
+        register('limitTo', limitToFilter);
+        register('lowercase', lowercaseFilter);
+        register('number', numberFilter);
+        register('orderBy', orderByFilter);
+        register('uppercase', uppercaseFilter);
+    }
+
+    /**
+     * @ngdoc filter
+     * @name filter
+     * @kind function
+     *
+     * @description
+     * Selects a subset of items from `array` and returns it as a new array.
+     *
+     * @param {Array} array The source array.
+     * <div class="alert alert-info">
+     *   **Note**: If the array contains objects that reference themselves, filtering is not possible.
+     * </div>
+     * @param {string|Object|function()} expression The predicate to be used for selecting items from
+     *   `array`.
+     *
+     *   Can be one of:
+     *
+     *   - `string`: The string is used for matching against the contents of the `array`. All strings or
+     *     objects with string properties in `array` that match this string will be returned. This also
+     *     applies to nested object properties.
+     *     The predicate can be negated by prefixing the string with `!`.
+     *
+     *   - `Object`: A pattern object can be used to filter specific properties on objects contained
+     *     by `array`. For example `{name:"M", phone:"1"}` predicate will return an array of items
+     *     which have property `name` containing "M" and property `phone` containing "1". A special
+     *     property name (`$` by default) can be used (e.g. as in `{$: "text"}`) to accept a match
+     *     against any property of the object or its nested object properties. That's equivalent to the
+     *     simple substring match with a `string` as described above. The special property name can be
+     *     overwritten, using the `anyPropertyKey` parameter.
+     *     The predicate can be negated by prefixing the string with `!`.
+     *     For example `{name: "!M"}` predicate will return an array of items which have property `name`
+     *     not containing "M".
+     *
+     *     Note that a named property will match properties on the same level only, while the special
+     *     `$` property will match properties on the same level or deeper. E.g. an array item like
+     *     `{name: {first: 'John', last: 'Doe'}}` will **not** be matched by `{name: 'John'}`, but
+     *     **will** be matched by `{$: 'John'}`.
+     *
+     *   - `function(value, index, array)`: A predicate function can be used to write arbitrary filters.
+     *     The function is called for each element of the array, with the element, its index, and
+     *     the entire array itself as arguments.
+     *
+     *     The final result is an array of those elements that the predicate returned true for.
+     *
+     * @param {function(actual, expected)|true|false} [comparator] Comparator which is used in
+     *     determining if values retrieved using `expression` (when it is not a function) should be
+     *     considered a match based on the expected value (from the filter expression) and actual
+     *     value (from the object in the array).
+     *
+     *   Can be one of:
+     *
+     *   - `function(actual, expected)`:
+     *     The function will be given the object value and the predicate value to compare and
+     *     should return true if both values should be considered equal.
+     *
+     *   - `true`: A shorthand for `function(actual, expected) { return angular.equals(actual, expected)}`.
+     *     This is essentially strict comparison of expected and actual.
+     *
+     *   - `false`: A short hand for a function which will look for a substring match in a case
+     *     insensitive way. Primitive values are converted to strings. Objects are not compared against
+     *     primitives, unless they have a custom `toString` method (e.g. `Date` objects).
+     *
+     *
+     *   Defaults to `false`.
+     *
+     * @param {string} [anyPropertyKey] The special property name that matches against any property.
+     *     By default `$`.
+     *
+     * @example
+     <example name="filter-filter">
+     <file name="index.html">
+     <div ng-init="friends = [{name:'John', phone:'555-1276'},
+     {name:'Mary', phone:'800-BIG-MARY'},
+     {name:'Mike', phone:'555-4321'},
+     {name:'Adam', phone:'555-5678'},
+     {name:'Julie', phone:'555-8765'},
+     {name:'Juliette', phone:'555-5678'}]"></div>
+
+     <label>Search: <input ng-model="searchText"></label>
+     <table id="searchTextResults">
+     <tr><th>Name</th><th>Phone</th></tr>
+     <tr ng-repeat="friend in friends | filter:searchText">
+     <td>{{friend.name}}</td>
+     <td>{{friend.phone}}</td>
+     </tr>
+     </table>
+     <hr>
+     <label>Any: <input ng-model="search.$"></label> <br>
+     <label>Name only <input ng-model="search.name"></label><br>
+     <label>Phone only <input ng-model="search.phone"></label><br>
+     <label>Equality <input type="checkbox" ng-model="strict"></label><br>
+     <table id="searchObjResults">
+     <tr><th>Name</th><th>Phone</th></tr>
+     <tr ng-repeat="friendObj in friends | filter:search:strict">
+     <td>{{friendObj.name}}</td>
+     <td>{{friendObj.phone}}</td>
+     </tr>
+     </table>
+     </file>
+     <file name="protractor.js" type="protractor">
+     var expectFriendNames = function(expectedNames, key) {
+         element.all(by.repeater(key + ' in friends').column(key + '.name')).then(function(arr) {
+           arr.forEach(function(wd, i) {
+             expect(wd.getText()).toMatch(expectedNames[i]);
+           });
+         });
+       };
+
+     it('should search across all fields when filtering with a string', function() {
+         var searchText = element(by.model('searchText'));
+         searchText.clear();
+         searchText.sendKeys('m');
+         expectFriendNames(['Mary', 'Mike', 'Adam'], 'friend');
+
+         searchText.clear();
+         searchText.sendKeys('76');
+         expectFriendNames(['John', 'Julie'], 'friend');
+       });
+
+     it('should search in specific fields when filtering with a predicate object', function() {
+         var searchAny = element(by.model('search.$'));
+         searchAny.clear();
+         searchAny.sendKeys('i');
+         expectFriendNames(['Mary', 'Mike', 'Julie', 'Juliette'], 'friendObj');
+       });
+     it('should use a equal comparison when comparator is true', function() {
+         var searchName = element(by.model('search.name'));
+         var strict = element(by.model('strict'));
+         searchName.clear();
+         searchName.sendKeys('Julie');
+         strict.click();
+         expectFriendNames(['Julie'], 'friendObj');
+       });
+     </file>
+     </example>
+     */
+
+    function filterFilter() {
+        return function(array, expression, comparator, anyPropertyKey) {
+            if (!isArrayLike(array)) {
+                if (array == null) {
+                    return array;
+                } else {
+                    throw minErr('filter')('notarray', 'Expected array but received: {0}', array);
+                }
+            }
+
+            anyPropertyKey = anyPropertyKey || '$';
+            var expressionType = getTypeForFilter(expression);
+            var predicateFn;
+            var matchAgainstAnyProp;
+
+            switch (expressionType) {
+                case 'function':
+                    predicateFn = expression;
+                    break;
+                case 'boolean':
+                case 'null':
+                case 'number':
+                case 'string':
+                    matchAgainstAnyProp = true;
+                // falls through
+                case 'object':
+                    predicateFn = createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstAnyProp);
+                    break;
+                default:
+                    return array;
+            }
+
+            return Array.prototype.filter.call(array, predicateFn);
+        };
+    }
+
+// Helper functions for `filterFilter`
+    function createPredicateFn(expression, comparator, anyPropertyKey, matchAgainstAnyProp) {
+        var shouldMatchPrimitives = isObject(expression) && (anyPropertyKey in expression);
+        var predicateFn;
+
+        if (comparator === true) {
+            comparator = equals;
+        } else if (!isFunction(comparator)) {
+            comparator = function(actual, expected) {
+                if (isUndefined(actual)) {
+                    // No substring matching against `undefined`
+                    return false;
+                }
+                if ((actual === null) || (expected === null)) {
+                    // No substring matching against `null`; only match against `null`
+                    return actual === expected;
+                }
+                if (isObject(expected) || (isObject(actual) && !hasCustomToString(actual))) {
+                    // Should not compare primitives against objects, unless they have custom `toString` method
+                    return false;
+                }
+
+                actual = lowercase('' + actual);
+                expected = lowercase('' + expected);
+                return actual.indexOf(expected) !== -1;
+            };
+        }
+
+        predicateFn = function(item) {
+            if (shouldMatchPrimitives && !isObject(item)) {
+                return deepCompare(item, expression[anyPropertyKey], comparator, anyPropertyKey, false);
+            }
+            return deepCompare(item, expression, comparator, anyPropertyKey, matchAgainstAnyProp);
+        };
+
+        return predicateFn;
+    }
+
+    function deepCompare(actual, expected, comparator, anyPropertyKey, matchAgainstAnyProp, dontMatchWholeObject) {
+        var actualType = getTypeForFilter(actual);
+        var expectedType = getTypeForFilter(expected);
+
+        if ((expectedType === 'string') && (expected.charAt(0) === '!')) {
+            return !deepCompare(actual, expected.substring(1), comparator, anyPropertyKey, matchAgainstAnyProp);
+        } else if (isArray(actual)) {
+            // In case `actual` is an array, consider it a match
+            // if ANY of it's items matches `expected`
+            return actual.some(function(item) {
+                return deepCompare(item, expected, comparator, anyPropertyKey, matchAgainstAnyProp);
+            });
+        }
+
+        switch (actualType) {
+            case 'object':
+                var key;
+                if (matchAgainstAnyProp) {
+                    for (key in actual) {
+                        // Under certain, rare, circumstances, key may not be a string and `charAt` will be undefined
+                        // See: https://github.com/angular/angular.js/issues/15644
+                        if (key.charAt && (key.charAt(0) !== '$') &&
+                            deepCompare(actual[key], expected, comparator, anyPropertyKey, true)) {
+                            return true;
+                        }
+                    }
+                    return dontMatchWholeObject ? false : deepCompare(actual, expected, comparator, anyPropertyKey, false);
+                } else if (expectedType === 'object') {
+                    for (key in expected) {
+                        var expectedVal = expected[key];
+                        if (isFunction(expectedVal) || isUndefined(expectedVal)) {
+                            continue;
+                        }
+
+                        var matchAnyProperty = key === anyPropertyKey;
+                        var actualVal = matchAnyProperty ? actual : actual[key];
+                        if (!deepCompare(actualVal, expectedVal, comparator, anyPropertyKey, matchAnyProperty, matchAnyProperty)) {
+                            return false;
+                        }
+                    }
+                    return true;
+                } else {
+                    return comparator(actual, expected);
+                }
+            case 'function':
+                return false;
+            default:
+                return comparator(actual, expected);
+        }
+    }
+
+// Used for easily differentiating between `null` and actual `object`
+    function getTypeForFilter(val) {
+        return (val === null) ? 'null' : typeof val;
+    }
+
+    var MAX_DIGITS = 22;
+    var DECIMAL_SEP = '.';
+    var ZERO_CHAR = '0';
+
+    /**
+     * @ngdoc filter
+     * @name currency
+     * @kind function
+     *
+     * @description
+     * Formats a number as a currency (ie $1,234.56). When no currency symbol is provided, default
+     * symbol for current locale is used.
+     *
+     * @param {number} amount Input to filter.
+     * @param {string=} symbol Currency symbol or identifier to be displayed.
+     * @param {number=} fractionSize Number of decimal places to round the amount to, defaults to default max fraction size for current locale
+     * @returns {string} Formatted number.
+     *
+     *
+     * @example
+     <example module="currencyExample" name="currency-filter">
+     <file name="index.html">
+     <script>
+     angular.module('currencyExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+             $scope.amount = 1234.56;
+           }]);
+     </script>
+     <div ng-controller="ExampleController">
+     <input type="number" ng-model="amount" aria-label="amount"> <br>
+     default currency symbol ($): <span id="currency-default">{{amount | currency}}</span><br>
+     custom currency identifier (USD$): <span id="currency-custom">{{amount | currency:"USD$"}}</span><br>
+     no fractions (0): <span id="currency-no-fractions">{{amount | currency:"USD$":0}}</span>
+     </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should init with 1234.56', function() {
+         expect(element(by.id('currency-default')).getText()).toBe('$1,234.56');
+         expect(element(by.id('currency-custom')).getText()).toBe('USD$1,234.56');
+         expect(element(by.id('currency-no-fractions')).getText()).toBe('USD$1,235');
+       });
+     it('should update', function() {
+         if (browser.params.browser === 'safari') {
+           // Safari does not understand the minus key. See
+           // https://github.com/angular/protractor/issues/481
+           return;
+         }
+         element(by.model('amount')).clear();
+         element(by.model('amount')).sendKeys('-1234');
+         expect(element(by.id('currency-default')).getText()).toBe('-$1,234.00');
+         expect(element(by.id('currency-custom')).getText()).toBe('-USD$1,234.00');
+         expect(element(by.id('currency-no-fractions')).getText()).toBe('-USD$1,234');
+       });
+     </file>
+     </example>
+     */
+    currencyFilter.$inject = ['$locale'];
+    function currencyFilter($locale) {
+        var formats = $locale.NUMBER_FORMATS;
+        return function(amount, currencySymbol, fractionSize) {
+            if (isUndefined(currencySymbol)) {
+                currencySymbol = formats.CURRENCY_SYM;
+            }
+
+            if (isUndefined(fractionSize)) {
+                fractionSize = formats.PATTERNS[1].maxFrac;
+            }
+
+            // If the currency symbol is empty, trim whitespace around the symbol
+            var currencySymbolRe = !currencySymbol ? /\s*\u00A4\s*/g : /\u00A4/g;
+
+            // if null or undefined pass it through
+            return (amount == null)
+                ? amount
+                : formatNumber(amount, formats.PATTERNS[1], formats.GROUP_SEP, formats.DECIMAL_SEP, fractionSize).
+                replace(currencySymbolRe, currencySymbol);
+        };
+    }
+
+    /**
+     * @ngdoc filter
+     * @name number
+     * @kind function
+     *
+     * @description
+     * Formats a number as text.
+     *
+     * If the input is null or undefined, it will just be returned.
+     * If the input is infinite (Infinity or -Infinity), the Infinity symbol '∞' or '-∞' is returned, respectively.
+     * If the input is not a number an empty string is returned.
+     *
+     *
+     * @param {number|string} number Number to format.
+     * @param {(number|string)=} fractionSize Number of decimal places to round the number to.
+     * If this is not provided then the fraction size is computed from the current locale's number
+     * formatting pattern. In the case of the default locale, it will be 3.
+     * @returns {string} Number rounded to `fractionSize` appropriately formatted based on the current
+     *                   locale (e.g., in the en_US locale it will have "." as the decimal separator and
+     *                   include "," group separators after each third digit).
+     *
+     * @example
+     <example module="numberFilterExample" name="number-filter">
+     <file name="index.html">
+     <script>
+     angular.module('numberFilterExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+             $scope.val = 1234.56789;
+           }]);
+     </script>
+     <div ng-controller="ExampleController">
+     <label>Enter number: <input ng-model='val'></label><br>
+     Default formatting: <span id='number-default'>{{val | number}}</span><br>
+     No fractions: <span>{{val | number:0}}</span><br>
+     Negative number: <span>{{-val | number:4}}</span>
+     </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should format numbers', function() {
+         expect(element(by.id('number-default')).getText()).toBe('1,234.568');
+         expect(element(by.binding('val | number:0')).getText()).toBe('1,235');
+         expect(element(by.binding('-val | number:4')).getText()).toBe('-1,234.5679');
+       });
+
+     it('should update', function() {
+         element(by.model('val')).clear();
+         element(by.model('val')).sendKeys('3374.333');
+         expect(element(by.id('number-default')).getText()).toBe('3,374.333');
+         expect(element(by.binding('val | number:0')).getText()).toBe('3,374');
+         expect(element(by.binding('-val | number:4')).getText()).toBe('-3,374.3330');
+      });
+     </file>
+     </example>
+     */
+    numberFilter.$inject = ['$locale'];
+    function numberFilter($locale) {
+        var formats = $locale.NUMBER_FORMATS;
+        return function(number, fractionSize) {
+
+            // if null or undefined pass it through
+            return (number == null)
+                ? number
+                : formatNumber(number, formats.PATTERNS[0], formats.GROUP_SEP, formats.DECIMAL_SEP,
+                    fractionSize);
+        };
+    }
+
+    /**
+     * Parse a number (as a string) into three components that can be used
+     * for formatting the number.
+     *
+     * (Significant bits of this parse algorithm came from https://github.com/MikeMcl/big.js/)
+     *
+     * @param  {string} numStr The number to parse
+     * @return {object} An object describing this number, containing the following keys:
+     *  - d : an array of digits containing leading zeros as necessary
+     *  - i : the number of the digits in `d` that are to the left of the decimal point
+     *  - e : the exponent for numbers that would need more than `MAX_DIGITS` digits in `d`
+     *
+     */
+    function parse(numStr) {
+        var exponent = 0, digits, numberOfIntegerDigits;
+        var i, j, zeros;
+
+        // Decimal point?
+        if ((numberOfIntegerDigits = numStr.indexOf(DECIMAL_SEP)) > -1) {
+            numStr = numStr.replace(DECIMAL_SEP, '');
+        }
+
+        // Exponential form?
+        if ((i = numStr.search(/e/i)) > 0) {
+            // Work out the exponent.
+            if (numberOfIntegerDigits < 0) numberOfIntegerDigits = i;
+            numberOfIntegerDigits += +numStr.slice(i + 1);
+            numStr = numStr.substring(0, i);
+        } else if (numberOfIntegerDigits < 0) {
+            // There was no decimal point or exponent so it is an integer.
+            numberOfIntegerDigits = numStr.length;
+        }
+
+        // Count the number of leading zeros.
+        for (i = 0; numStr.charAt(i) === ZERO_CHAR; i++) { /* empty */ }
+
+        if (i === (zeros = numStr.length)) {
+            // The digits are all zero.
+            digits = [0];
+            numberOfIntegerDigits = 1;
+        } else {
+            // Count the number of trailing zeros
+            zeros--;
+            while (numStr.charAt(zeros) === ZERO_CHAR) zeros--;
+
+            // Trailing zeros are insignificant so ignore them
+            numberOfIntegerDigits -= i;
+            digits = [];
+            // Convert string to array of digits without leading/trailing zeros.
+            for (j = 0; i <= zeros; i++, j++) {
+                digits[j] = +numStr.charAt(i);
+            }
+        }
+
+        // If the number overflows the maximum allowed digits then use an exponent.
+        if (numberOfIntegerDigits > MAX_DIGITS) {
+            digits = digits.splice(0, MAX_DIGITS - 1);
+            exponent = numberOfIntegerDigits - 1;
+            numberOfIntegerDigits = 1;
+        }
+
+        return { d: digits, e: exponent, i: numberOfIntegerDigits };
+    }
+
+    /**
+     * Round the parsed number to the specified number of decimal places
+     * This function changed the parsedNumber in-place
+     */
+    function roundNumber(parsedNumber, fractionSize, minFrac, maxFrac) {
+        var digits = parsedNumber.d;
+        var fractionLen = digits.length - parsedNumber.i;
+
+        // determine fractionSize if it is not specified; `+fractionSize` converts it to a number
+        fractionSize = (isUndefined(fractionSize)) ? Math.min(Math.max(minFrac, fractionLen), maxFrac) : +fractionSize;
+
+        // The index of the digit to where rounding is to occur
+        var roundAt = fractionSize + parsedNumber.i;
+        var digit = digits[roundAt];
+
+        if (roundAt > 0) {
+            // Drop fractional digits beyond `roundAt`
+            digits.splice(Math.max(parsedNumber.i, roundAt));
+
+            // Set non-fractional digits beyond `roundAt` to 0
+            for (var j = roundAt; j < digits.length; j++) {
+                digits[j] = 0;
+            }
+        } else {
+            // We rounded to zero so reset the parsedNumber
+            fractionLen = Math.max(0, fractionLen);
+            parsedNumber.i = 1;
+            digits.length = Math.max(1, roundAt = fractionSize + 1);
+            digits[0] = 0;
+            for (var i = 1; i < roundAt; i++) digits[i] = 0;
+        }
+
+        if (digit >= 5) {
+            if (roundAt - 1 < 0) {
+                for (var k = 0; k > roundAt; k--) {
+                    digits.unshift(0);
+                    parsedNumber.i++;
+                }
+                digits.unshift(1);
+                parsedNumber.i++;
+            } else {
+                digits[roundAt - 1]++;
+            }
+        }
+
+        // Pad out with zeros to get the required fraction length
+        for (; fractionLen < Math.max(0, fractionSize); fractionLen++) digits.push(0);
+
+
+        // Do any carrying, e.g. a digit was rounded up to 10
+        var carry = digits.reduceRight(function(carry, d, i, digits) {
+            d = d + carry;
+            digits[i] = d % 10;
+            return Math.floor(d / 10);
+        }, 0);
+        if (carry) {
+            digits.unshift(carry);
+            parsedNumber.i++;
+        }
+    }
+
+    /**
+     * Format a number into a string
+     * @param  {number} number       The number to format
+     * @param  {{
+     *           minFrac, // the minimum number of digits required in the fraction part of the number
+     *           maxFrac, // the maximum number of digits required in the fraction part of the number
+     *           gSize,   // number of digits in each group of separated digits
+     *           lgSize,  // number of digits in the last group of digits before the decimal separator
+     *           negPre,  // the string to go in front of a negative number (e.g. `-` or `(`))
+     *           posPre,  // the string to go in front of a positive number
+     *           negSuf,  // the string to go after a negative number (e.g. `)`)
+     *           posSuf   // the string to go after a positive number
+     *         }} pattern
+     * @param  {string} groupSep     The string to separate groups of number (e.g. `,`)
+     * @param  {string} decimalSep   The string to act as the decimal separator (e.g. `.`)
+     * @param  {[type]} fractionSize The size of the fractional part of the number
+     * @return {string}              The number formatted as a string
+     */
+    function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) {
+
+        if (!(isString(number) || isNumber(number)) || isNaN(number)) return '';
+
+        var isInfinity = !isFinite(number);
+        var isZero = false;
+        var numStr = Math.abs(number) + '',
+            formattedText = '',
+            parsedNumber;
+
+        if (isInfinity) {
+            formattedText = '\u221e';
+        } else {
+            parsedNumber = parse(numStr);
+
+            roundNumber(parsedNumber, fractionSize, pattern.minFrac, pattern.maxFrac);
+
+            var digits = parsedNumber.d;
+            var integerLen = parsedNumber.i;
+            var exponent = parsedNumber.e;
+            var decimals = [];
+            isZero = digits.reduce(function(isZero, d) { return isZero && !d; }, true);
+
+            // pad zeros for small numbers
+            while (integerLen < 0) {
+                digits.unshift(0);
+                integerLen++;
+            }
+
+            // extract decimals digits
+            if (integerLen > 0) {
+                decimals = digits.splice(integerLen, digits.length);
+            } else {
+                decimals = digits;
+                digits = [0];
+            }
+
+            // format the integer digits with grouping separators
+            var groups = [];
+            if (digits.length >= pattern.lgSize) {
+                groups.unshift(digits.splice(-pattern.lgSize, digits.length).join(''));
+            }
+            while (digits.length > pattern.gSize) {
+                groups.unshift(digits.splice(-pattern.gSize, digits.length).join(''));
+            }
+            if (digits.length) {
+                groups.unshift(digits.join(''));
+            }
+            formattedText = groups.join(groupSep);
+
+            // append the decimal digits
+            if (decimals.length) {
+                formattedText += decimalSep + decimals.join('');
+            }
+
+            if (exponent) {
+                formattedText += 'e+' + exponent;
+            }
+        }
+        if (number < 0 && !isZero) {
+            return pattern.negPre + formattedText + pattern.negSuf;
+        } else {
+            return pattern.posPre + formattedText + pattern.posSuf;
+        }
+    }
+
+    function padNumber(num, digits, trim, negWrap) {
+        var neg = '';
+        if (num < 0 || (negWrap && num <= 0)) {
+            if (negWrap) {
+                num = -num + 1;
+            } else {
+                num = -num;
+                neg = '-';
+            }
+        }
+        num = '' + num;
+        while (num.length < digits) num = ZERO_CHAR + num;
+        if (trim) {
+            num = num.substr(num.length - digits);
+        }
+        return neg + num;
+    }
+
+
+    function dateGetter(name, size, offset, trim, negWrap) {
+        offset = offset || 0;
+        return function(date) {
+            var value = date['get' + name]();
+            if (offset > 0 || value > -offset) {
+                value += offset;
+            }
+            if (value === 0 && offset === -12) value = 12;
+            return padNumber(value, size, trim, negWrap);
+        };
+    }
+
+    function dateStrGetter(name, shortForm, standAlone) {
+        return function(date, formats) {
+            var value = date['get' + name]();
+            var propPrefix = (standAlone ? 'STANDALONE' : '') + (shortForm ? 'SHORT' : '');
+            var get = uppercase(propPrefix + name);
+
+            return formats[get][value];
+        };
+    }
+
+    function timeZoneGetter(date, formats, offset) {
+        var zone = -1 * offset;
+        var paddedZone = (zone >= 0) ? '+' : '';
+
+        paddedZone += padNumber(Math[zone > 0 ? 'floor' : 'ceil'](zone / 60), 2) +
+            padNumber(Math.abs(zone % 60), 2);
+
+        return paddedZone;
+    }
+
+    function getFirstThursdayOfYear(year) {
+        // 0 = index of January
+        var dayOfWeekOnFirst = (new Date(year, 0, 1)).getDay();
+        // 4 = index of Thursday (+1 to account for 1st = 5)
+        // 11 = index of *next* Thursday (+1 account for 1st = 12)
+        return new Date(year, 0, ((dayOfWeekOnFirst <= 4) ? 5 : 12) - dayOfWeekOnFirst);
+    }
+
+    function getThursdayThisWeek(datetime) {
+        return new Date(datetime.getFullYear(), datetime.getMonth(),
+            // 4 = index of Thursday
+            datetime.getDate() + (4 - datetime.getDay()));
+    }
+
+    function weekGetter(size) {
+        return function(date) {
+            var firstThurs = getFirstThursdayOfYear(date.getFullYear()),
+                thisThurs = getThursdayThisWeek(date);
+
+            var diff = +thisThurs - +firstThurs,
+                result = 1 + Math.round(diff / 6.048e8); // 6.048e8 ms per week
+
+            return padNumber(result, size);
+        };
+    }
+
+    function ampmGetter(date, formats) {
+        return date.getHours() < 12 ? formats.AMPMS[0] : formats.AMPMS[1];
+    }
+
+    function eraGetter(date, formats) {
+        return date.getFullYear() <= 0 ? formats.ERAS[0] : formats.ERAS[1];
+    }
+
+    function longEraGetter(date, formats) {
+        return date.getFullYear() <= 0 ? formats.ERANAMES[0] : formats.ERANAMES[1];
+    }
+
+    var DATE_FORMATS = {
+        yyyy: dateGetter('FullYear', 4, 0, false, true),
+        yy: dateGetter('FullYear', 2, 0, true, true),
+        y: dateGetter('FullYear', 1, 0, false, true),
+        MMMM: dateStrGetter('Month'),
+        MMM: dateStrGetter('Month', true),
+        MM: dateGetter('Month', 2, 1),
+        M: dateGetter('Month', 1, 1),
+        LLLL: dateStrGetter('Month', false, true),
+        dd: dateGetter('Date', 2),
+        d: dateGetter('Date', 1),
+        HH: dateGetter('Hours', 2),
+        H: dateGetter('Hours', 1),
+        hh: dateGetter('Hours', 2, -12),
+        h: dateGetter('Hours', 1, -12),
+        mm: dateGetter('Minutes', 2),
+        m: dateGetter('Minutes', 1),
+        ss: dateGetter('Seconds', 2),
+        s: dateGetter('Seconds', 1),
+        // while ISO 8601 requires fractions to be prefixed with `.` or `,`
+        // we can be just safely rely on using `sss` since we currently don't support single or two digit fractions
+        sss: dateGetter('Milliseconds', 3),
+        EEEE: dateStrGetter('Day'),
+        EEE: dateStrGetter('Day', true),
+        a: ampmGetter,
+        Z: timeZoneGetter,
+        ww: weekGetter(2),
+        w: weekGetter(1),
+        G: eraGetter,
+        GG: eraGetter,
+        GGG: eraGetter,
+        GGGG: longEraGetter
+    };
+
+    var DATE_FORMATS_SPLIT = /((?:[^yMLdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|L+|d+|H+|h+|m+|s+|a|Z|G+|w+))([\s\S]*)/,
+        NUMBER_STRING = /^-?\d+$/;
+
+    /**
+     * @ngdoc filter
+     * @name date
+     * @kind function
+     *
+     * @description
+     *   Formats `date` to a string based on the requested `format`.
+     *
+     *   `format` string can be composed of the following elements:
+     *
+     *   * `'yyyy'`: 4 digit representation of year (e.g. AD 1 => 0001, AD 2010 => 2010)
+     *   * `'yy'`: 2 digit representation of year, padded (00-99). (e.g. AD 2001 => 01, AD 2010 => 10)
+     *   * `'y'`: 1 digit representation of year, e.g. (AD 1 => 1, AD 199 => 199)
+     *   * `'MMMM'`: Month in year (January-December)
+     *   * `'MMM'`: Month in year (Jan-Dec)
+     *   * `'MM'`: Month in year, padded (01-12)
+     *   * `'M'`: Month in year (1-12)
+     *   * `'LLLL'`: Stand-alone month in year (January-December)
+     *   * `'dd'`: Day in month, padded (01-31)
+     *   * `'d'`: Day in month (1-31)
+     *   * `'EEEE'`: Day in Week,(Sunday-Saturday)
+     *   * `'EEE'`: Day in Week, (Sun-Sat)
+     *   * `'HH'`: Hour in day, padded (00-23)
+     *   * `'H'`: Hour in day (0-23)
+     *   * `'hh'`: Hour in AM/PM, padded (01-12)
+     *   * `'h'`: Hour in AM/PM, (1-12)
+     *   * `'mm'`: Minute in hour, padded (00-59)
+     *   * `'m'`: Minute in hour (0-59)
+     *   * `'ss'`: Second in minute, padded (00-59)
+     *   * `'s'`: Second in minute (0-59)
+     *   * `'sss'`: Millisecond in second, padded (000-999)
+     *   * `'a'`: AM/PM marker
+     *   * `'Z'`: 4 digit (+sign) representation of the timezone offset (-1200-+1200)
+     *   * `'ww'`: Week of year, padded (00-53). Week 01 is the week with the first Thursday of the year
+     *   * `'w'`: Week of year (0-53). Week 1 is the week with the first Thursday of the year
+     *   * `'G'`, `'GG'`, `'GGG'`: The abbreviated form of the era string (e.g. 'AD')
+     *   * `'GGGG'`: The long form of the era string (e.g. 'Anno Domini')
+     *
+     *   `format` string can also be one of the following predefined
+     *   {@link guide/i18n localizable formats}:
+     *
+     *   * `'medium'`: equivalent to `'MMM d, y h:mm:ss a'` for en_US locale
+     *     (e.g. Sep 3, 2010 12:05:08 PM)
+     *   * `'short'`: equivalent to `'M/d/yy h:mm a'` for en_US  locale (e.g. 9/3/10 12:05 PM)
+     *   * `'fullDate'`: equivalent to `'EEEE, MMMM d, y'` for en_US  locale
+     *     (e.g. Friday, September 3, 2010)
+     *   * `'longDate'`: equivalent to `'MMMM d, y'` for en_US  locale (e.g. September 3, 2010)
+     *   * `'mediumDate'`: equivalent to `'MMM d, y'` for en_US  locale (e.g. Sep 3, 2010)
+     *   * `'shortDate'`: equivalent to `'M/d/yy'` for en_US locale (e.g. 9/3/10)
+     *   * `'mediumTime'`: equivalent to `'h:mm:ss a'` for en_US locale (e.g. 12:05:08 PM)
+     *   * `'shortTime'`: equivalent to `'h:mm a'` for en_US locale (e.g. 12:05 PM)
+     *
+     *   `format` string can contain literal values. These need to be escaped by surrounding with single quotes (e.g.
+     *   `"h 'in the morning'"`). In order to output a single quote, escape it - i.e., two single quotes in a sequence
+     *   (e.g. `"h 'o''clock'"`).
+     *
+     *   Any other characters in the `format` string will be output as-is.
+     *
+     * @param {(Date|number|string)} date Date to format either as Date object, milliseconds (string or
+     *    number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.sssZ and its
+     *    shorter versions like yyyy-MM-ddTHH:mmZ, yyyy-MM-dd or yyyyMMddTHHmmssZ). If no timezone is
+     *    specified in the string input, the time is considered to be in the local timezone.
+     * @param {string=} format Formatting rules (see Description). If not specified,
+     *    `mediumDate` is used.
+     * @param {string=} timezone Timezone to be used for formatting. It understands UTC/GMT and the
+     *    continental US time zone abbreviations, but for general use, use a time zone offset, for
+     *    example, `'+0430'` (4 hours, 30 minutes east of the Greenwich meridian)
+     *    If not specified, the timezone of the browser will be used.
+     * @returns {string} Formatted string or the input if input is not recognized as date/millis.
+     *
+     * @example
+     <example name="filter-date">
+     <file name="index.html">
+     <span ng-non-bindable>{{1288323623006 | date:'medium'}}</span>:
+     <span>{{1288323623006 | date:'medium'}}</span><br>
+     <span ng-non-bindable>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span>:
+     <span>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span><br>
+     <span ng-non-bindable>{{1288323623006 | date:'MM/dd/yyyy @ h:mma'}}</span>:
+     <span>{{'1288323623006' | date:'MM/dd/yyyy @ h:mma'}}</span><br>
+     <span ng-non-bindable>{{1288323623006 | date:"MM/dd/yyyy 'at' h:mma"}}</span>:
+     <span>{{'1288323623006' | date:"MM/dd/yyyy 'at' h:mma"}}</span><br>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should format date', function() {
+         expect(element(by.binding("1288323623006 | date:'medium'")).getText()).
+            toMatch(/Oct 2\d, 2010 \d{1,2}:\d{2}:\d{2} (AM|PM)/);
+         expect(element(by.binding("1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'")).getText()).
+            toMatch(/2010-10-2\d \d{2}:\d{2}:\d{2} (-|\+)?\d{4}/);
+         expect(element(by.binding("'1288323623006' | date:'MM/dd/yyyy @ h:mma'")).getText()).
+            toMatch(/10\/2\d\/2010 @ \d{1,2}:\d{2}(AM|PM)/);
+         expect(element(by.binding("'1288323623006' | date:\"MM/dd/yyyy 'at' h:mma\"")).getText()).
+            toMatch(/10\/2\d\/2010 at \d{1,2}:\d{2}(AM|PM)/);
+       });
+     </file>
+     </example>
+     */
+    dateFilter.$inject = ['$locale'];
+    function dateFilter($locale) {
+
+
+        var R_ISO8601_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;
+        // 1        2       3         4          5          6          7          8  9     10      11
+        function jsonStringToDate(string) {
+            var match;
+            if ((match = string.match(R_ISO8601_STR))) {
+                var date = new Date(0),
+                    tzHour = 0,
+                    tzMin  = 0,
+                    dateSetter = match[8] ? date.setUTCFullYear : date.setFullYear,
+                    timeSetter = match[8] ? date.setUTCHours : date.setHours;
+
+                if (match[9]) {
+                    tzHour = toInt(match[9] + match[10]);
+                    tzMin = toInt(match[9] + match[11]);
+                }
+                dateSetter.call(date, toInt(match[1]), toInt(match[2]) - 1, toInt(match[3]));
+                var h = toInt(match[4] || 0) - tzHour;
+                var m = toInt(match[5] || 0) - tzMin;
+                var s = toInt(match[6] || 0);
+                var ms = Math.round(parseFloat('0.' + (match[7] || 0)) * 1000);
+                timeSetter.call(date, h, m, s, ms);
+                return date;
+            }
+            return string;
+        }
+
+
+        return function(date, format, timezone) {
+            var text = '',
+                parts = [],
+                fn, match;
+
+            format = format || 'mediumDate';
+            format = $locale.DATETIME_FORMATS[format] || format;
+            if (isString(date)) {
+                date = NUMBER_STRING.test(date) ? toInt(date) : jsonStringToDate(date);
+            }
+
+            if (isNumber(date)) {
+                date = new Date(date);
+            }
+
+            if (!isDate(date) || !isFinite(date.getTime())) {
+                return date;
+            }
+
+            while (format) {
+                match = DATE_FORMATS_SPLIT.exec(format);
+                if (match) {
+                    parts = concat(parts, match, 1);
+                    format = parts.pop();
+                } else {
+                    parts.push(format);
+                    format = null;
+                }
+            }
+
+            var dateTimezoneOffset = date.getTimezoneOffset();
+            if (timezone) {
+                dateTimezoneOffset = timezoneToOffset(timezone, dateTimezoneOffset);
+                date = convertTimezoneToLocal(date, timezone, true);
+            }
+            forEach(parts, function(value) {
+                fn = DATE_FORMATS[value];
+                text += fn ? fn(date, $locale.DATETIME_FORMATS, dateTimezoneOffset)
+                    : value === '\'\'' ? '\'' : value.replace(/(^'|'$)/g, '').replace(/''/g, '\'');
+            });
+
+            return text;
+        };
+    }
+
+
+    /**
+     * @ngdoc filter
+     * @name json
+     * @kind function
+     *
+     * @description
+     *   Allows you to convert a JavaScript object into JSON string.
+     *
+     *   This filter is mostly useful for debugging. When using the double curly {{value}} notation
+     *   the binding is automatically converted to JSON.
+     *
+     * @param {*} object Any JavaScript object (including arrays and primitive types) to filter.
+     * @param {number=} spacing The number of spaces to use per indentation, defaults to 2.
+     * @returns {string} JSON string.
+     *
+     *
+     * @example
+     <example name="filter-json">
+     <file name="index.html">
+     <pre id="default-spacing">{{ {'name':'value'} | json }}</pre>
+     <pre id="custom-spacing">{{ {'name':'value'} | json:4 }}</pre>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should jsonify filtered objects', function() {
+         expect(element(by.id('default-spacing')).getText()).toMatch(/\{\n {2}"name": ?"value"\n}/);
+         expect(element(by.id('custom-spacing')).getText()).toMatch(/\{\n {4}"name": ?"value"\n}/);
+       });
+     </file>
+     </example>
+     *
+     */
+    function jsonFilter() {
+        return function(object, spacing) {
+            if (isUndefined(spacing)) {
+                spacing = 2;
+            }
+            return toJson(object, spacing);
+        };
+    }
+
+
+    /**
+     * @ngdoc filter
+     * @name lowercase
+     * @kind function
+     * @description
+     * Converts string to lowercase.
+     *
+     * See the {@link ng.uppercase uppercase filter documentation} for a functionally identical example.
+     *
+     * @see angular.lowercase
+     */
+    var lowercaseFilter = valueFn(lowercase);
+
+
+    /**
+     * @ngdoc filter
+     * @name uppercase
+     * @kind function
+     * @description
+     * Converts string to uppercase.
+     * @example
+     <example module="uppercaseFilterExample" name="filter-uppercase">
+     <file name="index.html">
+     <script>
+     angular.module('uppercaseFilterExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+             $scope.title = 'This is a title';
+           }]);
+     </script>
+     <div ng-controller="ExampleController">
+     <!-- This title should be formatted normally -->
+     <h1>{{title}}</h1>
+     <!-- This title should be capitalized -->
+     <h1>{{title | uppercase}}</h1>
+     </div>
+     </file>
+     </example>
+     */
+    var uppercaseFilter = valueFn(uppercase);
+
+    /**
+     * @ngdoc filter
+     * @name limitTo
+     * @kind function
+     *
+     * @description
+     * Creates a new array or string containing only a specified number of elements. The elements are
+     * taken from either the beginning or the end of the source array, string or number, as specified by
+     * the value and sign (positive or negative) of `limit`. Other array-like objects are also supported
+     * (e.g. array subclasses, NodeLists, jqLite/jQuery collections etc). If a number is used as input,
+     * it is converted to a string.
+     *
+     * @param {Array|ArrayLike|string|number} input - Array/array-like, string or number to be limited.
+     * @param {string|number} limit - The length of the returned array or string. If the `limit` number
+     *     is positive, `limit` number of items from the beginning of the source array/string are copied.
+     *     If the number is negative, `limit` number  of items from the end of the source array/string
+     *     are copied. The `limit` will be trimmed if it exceeds `array.length`. If `limit` is undefined,
+     *     the input will be returned unchanged.
+     * @param {(string|number)=} begin - Index at which to begin limitation. As a negative index,
+     *     `begin` indicates an offset from the end of `input`. Defaults to `0`.
+     * @returns {Array|string} A new sub-array or substring of length `limit` or less if the input had
+     *     less than `limit` elements.
+     *
+     * @example
+     <example module="limitToExample" name="limit-to-filter">
+     <file name="index.html">
+     <script>
+     angular.module('limitToExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+             $scope.numbers = [1,2,3,4,5,6,7,8,9];
+             $scope.letters = "abcdefghi";
+             $scope.longNumber = 2345432342;
+             $scope.numLimit = 3;
+             $scope.letterLimit = 3;
+             $scope.longNumberLimit = 3;
+           }]);
+     </script>
+     <div ng-controller="ExampleController">
+     <label>
+     Limit {{numbers}} to:
+     <input type="number" step="1" ng-model="numLimit">
+     </label>
+     <p>Output numbers: {{ numbers | limitTo:numLimit }}</p>
+     <label>
+     Limit {{letters}} to:
+     <input type="number" step="1" ng-model="letterLimit">
+     </label>
+     <p>Output letters: {{ letters | limitTo:letterLimit }}</p>
+     <label>
+     Limit {{longNumber}} to:
+     <input type="number" step="1" ng-model="longNumberLimit">
+     </label>
+     <p>Output long number: {{ longNumber | limitTo:longNumberLimit }}</p>
+     </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+     var numLimitInput = element(by.model('numLimit'));
+     var letterLimitInput = element(by.model('letterLimit'));
+     var longNumberLimitInput = element(by.model('longNumberLimit'));
+     var limitedNumbers = element(by.binding('numbers | limitTo:numLimit'));
+     var limitedLetters = element(by.binding('letters | limitTo:letterLimit'));
+     var limitedLongNumber = element(by.binding('longNumber | limitTo:longNumberLimit'));
+
+     it('should limit the number array to first three items', function() {
+         expect(numLimitInput.getAttribute('value')).toBe('3');
+         expect(letterLimitInput.getAttribute('value')).toBe('3');
+         expect(longNumberLimitInput.getAttribute('value')).toBe('3');
+         expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3]');
+         expect(limitedLetters.getText()).toEqual('Output letters: abc');
+         expect(limitedLongNumber.getText()).toEqual('Output long number: 234');
+       });
+
+     // There is a bug in safari and protractor that doesn't like the minus key
+     // it('should update the output when -3 is entered', function() {
+       //   numLimitInput.clear();
+       //   numLimitInput.sendKeys('-3');
+       //   letterLimitInput.clear();
+       //   letterLimitInput.sendKeys('-3');
+       //   longNumberLimitInput.clear();
+       //   longNumberLimitInput.sendKeys('-3');
+       //   expect(limitedNumbers.getText()).toEqual('Output numbers: [7,8,9]');
+       //   expect(limitedLetters.getText()).toEqual('Output letters: ghi');
+       //   expect(limitedLongNumber.getText()).toEqual('Output long number: 342');
+       // });
+
+     it('should not exceed the maximum size of input array', function() {
+         numLimitInput.clear();
+         numLimitInput.sendKeys('100');
+         letterLimitInput.clear();
+         letterLimitInput.sendKeys('100');
+         longNumberLimitInput.clear();
+         longNumberLimitInput.sendKeys('100');
+         expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3,4,5,6,7,8,9]');
+         expect(limitedLetters.getText()).toEqual('Output letters: abcdefghi');
+         expect(limitedLongNumber.getText()).toEqual('Output long number: 2345432342');
+       });
+     </file>
+     </example>
+     */
+    function limitToFilter() {
+        return function(input, limit, begin) {
+            if (Math.abs(Number(limit)) === Infinity) {
+                limit = Number(limit);
+            } else {
+                limit = toInt(limit);
+            }
+            if (isNumberNaN(limit)) return input;
+
+            if (isNumber(input)) input = input.toString();
+            if (!isArrayLike(input)) return input;
+
+            begin = (!begin || isNaN(begin)) ? 0 : toInt(begin);
+            begin = (begin < 0) ? Math.max(0, input.length + begin) : begin;
+
+            if (limit >= 0) {
+                return sliceFn(input, begin, begin + limit);
+            } else {
+                if (begin === 0) {
+                    return sliceFn(input, limit, input.length);
+                } else {
+                    return sliceFn(input, Math.max(0, begin + limit), begin);
+                }
+            }
+        };
+    }
+
+    function sliceFn(input, begin, end) {
+        if (isString(input)) return input.slice(begin, end);
+
+        return slice.call(input, begin, end);
+    }
+
+    /**
+     * @ngdoc filter
+     * @name orderBy
+     * @kind function
+     *
+     * @description
+     * Returns an array containing the items from the specified `collection`, ordered by a `comparator`
+     * function based on the values computed using the `expression` predicate.
+     *
+     * For example, `[{id: 'foo'}, {id: 'bar'}] | orderBy:'id'` would result in
+     * `[{id: 'bar'}, {id: 'foo'}]`.
+     *
+     * The `collection` can be an Array or array-like object (e.g. NodeList, jQuery object, TypedArray,
+     * String, etc).
+     *
+     * The `expression` can be a single predicate, or a list of predicates each serving as a tie-breaker
+     * for the preceding one. The `expression` is evaluated against each item and the output is used
+     * for comparing with other items.
+     *
+     * You can change the sorting order by setting `reverse` to `true`. By default, items are sorted in
+     * ascending order.
+     *
+     * The comparison is done using the `comparator` function. If none is specified, a default, built-in
+     * comparator is used (see below for details - in a nutshell, it compares numbers numerically and
+     * strings alphabetically).
+     *
+     * ### Under the hood
+     *
+     * Ordering the specified `collection` happens in two phases:
+     *
+     * 1. All items are passed through the predicate (or predicates), and the returned values are saved
+     *    along with their type (`string`, `number` etc). For example, an item `{label: 'foo'}`, passed
+     *    through a predicate that extracts the value of the `label` property, would be transformed to:
+     *    ```
+     *    {
+     *      value: 'foo',
+     *      type: 'string',
+     *      index: ...
+     *    }
+     *    ```
+     * 2. The comparator function is used to sort the items, based on the derived values, types and
+     *    indices.
+     *
+     * If you use a custom comparator, it will be called with pairs of objects of the form
+     * `{value: ..., type: '...', index: ...}` and is expected to return `0` if the objects are equal
+     * (as far as the comparator is concerned), `-1` if the 1st one should be ranked higher than the
+     * second, or `1` otherwise.
+     *
+     * In order to ensure that the sorting will be deterministic across platforms, if none of the
+     * specified predicates can distinguish between two items, `orderBy` will automatically introduce a
+     * dummy predicate that returns the item's index as `value`.
+     * (If you are using a custom comparator, make sure it can handle this predicate as well.)
+     *
+     * If a custom comparator still can't distinguish between two items, then they will be sorted based
+     * on their index using the built-in comparator.
+     *
+     * Finally, in an attempt to simplify things, if a predicate returns an object as the extracted
+     * value for an item, `orderBy` will try to convert that object to a primitive value, before passing
+     * it to the comparator. The following rules govern the conversion:
+     *
+     * 1. If the object has a `valueOf()` method that returns a primitive, its return value will be
+     *    used instead.<br />
+     *    (If the object has a `valueOf()` method that returns another object, then the returned object
+     *    will be used in subsequent steps.)
+     * 2. If the object has a custom `toString()` method (i.e. not the one inherited from `Object`) that
+     *    returns a primitive, its return value will be used instead.<br />
+     *    (If the object has a `toString()` method that returns another object, then the returned object
+     *    will be used in subsequent steps.)
+     * 3. No conversion; the object itself is used.
+     *
+     * ### The default comparator
+     *
+     * The default, built-in comparator should be sufficient for most usecases. In short, it compares
+     * numbers numerically, strings alphabetically (and case-insensitively), for objects falls back to
+     * using their index in the original collection, and sorts values of different types by type.
+     *
+     * More specifically, it follows these steps to determine the relative order of items:
+     *
+     * 1. If the compared values are of different types, compare the types themselves alphabetically.
+     * 2. If both values are of type `string`, compare them alphabetically in a case- and
+     *    locale-insensitive way.
+     * 3. If both values are objects, compare their indices instead.
+     * 4. Otherwise, return:
+     *    -  `0`, if the values are equal (by strict equality comparison, i.e. using `===`).
+     *    - `-1`, if the 1st value is "less than" the 2nd value (compared using the `<` operator).
+     *    -  `1`, otherwise.
+     *
+     * **Note:** If you notice numbers not being sorted as expected, make sure they are actually being
+     *           saved as numbers and not strings.
+     * **Note:** For the purpose of sorting, `null` values are treated as the string `'null'` (i.e.
+     *           `type: 'string'`, `value: 'null'`). This may cause unexpected sort order relative to
+     *           other values.
+     *
+     * @param {Array|ArrayLike} collection - The collection (array or array-like object) to sort.
+     * @param {(Function|string|Array.<Function|string>)=} expression - A predicate (or list of
+     *    predicates) to be used by the comparator to determine the order of elements.
+     *
+     *    Can be one of:
+     *
+     *    - `Function`: A getter function. This function will be called with each item as argument and
+     *      the return value will be used for sorting.
+     *    - `string`: An AngularJS expression. This expression will be evaluated against each item and the
+     *      result will be used for sorting. For example, use `'label'` to sort by a property called
+     *      `label` or `'label.substring(0, 3)'` to sort by the first 3 characters of the `label`
+     *      property.<br />
+     *      (The result of a constant expression is interpreted as a property name to be used for
+     *      comparison. For example, use `'"special name"'` (note the extra pair of quotes) to sort by a
+     *      property called `special name`.)<br />
+     *      An expression can be optionally prefixed with `+` or `-` to control the sorting direction,
+     *      ascending or descending. For example, `'+label'` or `'-label'`. If no property is provided,
+     *      (e.g. `'+'` or `'-'`), the collection element itself is used in comparisons.
+     *    - `Array`: An array of function and/or string predicates. If a predicate cannot determine the
+     *      relative order of two items, the next predicate is used as a tie-breaker.
+     *
+     * **Note:** If the predicate is missing or empty then it defaults to `'+'`.
+     *
+     * @param {boolean=} reverse - If `true`, reverse the sorting order.
+     * @param {(Function)=} comparator - The comparator function used to determine the relative order of
+     *    value pairs. If omitted, the built-in comparator will be used.
+     *
+     * @returns {Array} - The sorted array.
+     *
+     *
+     * @example
+     * ### Ordering a table with `ngRepeat`
+     *
+     * The example below demonstrates a simple {@link ngRepeat ngRepeat}, where the data is sorted by
+     * age in descending order (expression is set to `'-age'`). The `comparator` is not set, which means
+     * it defaults to the built-in comparator.
+     *
+     <example name="orderBy-static" module="orderByExample1">
+     <file name="index.html">
+     <div ng-controller="ExampleController">
+     <table class="friends">
+     <tr>
+     <th>Name</th>
+     <th>Phone Number</th>
+     <th>Age</th>
+     </tr>
+     <tr ng-repeat="friend in friends | orderBy:'-age'">
+     <td>{{friend.name}}</td>
+     <td>{{friend.phone}}</td>
+     <td>{{friend.age}}</td>
+     </tr>
+     </table>
+     </div>
+     </file>
+     <file name="script.js">
+     angular.module('orderByExample1', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+           $scope.friends = [
+             {name: 'John',   phone: '555-1212',  age: 10},
+             {name: 'Mary',   phone: '555-9876',  age: 19},
+             {name: 'Mike',   phone: '555-4321',  age: 21},
+             {name: 'Adam',   phone: '555-5678',  age: 35},
+             {name: 'Julie',  phone: '555-8765',  age: 29}
+           ];
+         }]);
+     </file>
+     <file name="style.css">
+     .friends {
+         border-collapse: collapse;
+       }
+
+     .friends th {
+         border-bottom: 1px solid;
+       }
+     .friends td, .friends th {
+         border-left: 1px solid;
+         padding: 5px 10px;
+       }
+     .friends td:first-child, .friends th:first-child {
+         border-left: none;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+     // Element locators
+     var names = element.all(by.repeater('friends').column('friend.name'));
+
+     it('should sort friends by age in reverse order', function() {
+         expect(names.get(0).getText()).toBe('Adam');
+         expect(names.get(1).getText()).toBe('Julie');
+         expect(names.get(2).getText()).toBe('Mike');
+         expect(names.get(3).getText()).toBe('Mary');
+         expect(names.get(4).getText()).toBe('John');
+       });
+     </file>
+     </example>
+     * <hr />
      *
-     * To be secure by default, you want to ensure that any such bindings are disallowed unless you can
-     * determine that something explicitly says it's safe to use a value for binding in that
-     * context.  You can then audit your code (a simple grep would do) to ensure that this is only done
-     * for those values that you can easily tell are safe - because they were received from your server,
-     * sanitized by your library, etc.  You can organize your codebase to help with this - perhaps
-     * allowing only the files in a specific directory to do this.  Ensuring that the internal API
-     * exposed by that code doesn't markup arbitrary values as safe then becomes a more manageable task.
+     * @example
+     * ### Changing parameters dynamically
      *
-     * In the case of AngularJS' SCE service, one uses {@link ng.$sce#trustAs $sce.trustAs}
-     * (and shorthand methods such as {@link ng.$sce#trustAsHtml $sce.trustAsHtml}, etc.) to
-     * obtain values that will be accepted by SCE / privileged contexts.
+     * All parameters can be changed dynamically. The next example shows how you can make the columns of
+     * a table sortable, by binding the `expression` and `reverse` parameters to scope properties.
+     *
+     <example name="orderBy-dynamic" module="orderByExample2">
+     <file name="index.html">
+     <div ng-controller="ExampleController">
+     <pre>Sort by = {{propertyName}}; reverse = {{reverse}}</pre>
+     <hr/>
+     <button ng-click="propertyName = null; reverse = false">Set to unsorted</button>
+     <hr/>
+     <table class="friends">
+     <tr>
+     <th>
+     <button ng-click="sortBy('name')">Name</button>
+     <span class="sortorder" ng-show="propertyName === 'name'" ng-class="{reverse: reverse}"></span>
+     </th>
+     <th>
+     <button ng-click="sortBy('phone')">Phone Number</button>
+     <span class="sortorder" ng-show="propertyName === 'phone'" ng-class="{reverse: reverse}"></span>
+     </th>
+     <th>
+     <button ng-click="sortBy('age')">Age</button>
+     <span class="sortorder" ng-show="propertyName === 'age'" ng-class="{reverse: reverse}"></span>
+     </th>
+     </tr>
+     <tr ng-repeat="friend in friends | orderBy:propertyName:reverse">
+     <td>{{friend.name}}</td>
+     <td>{{friend.phone}}</td>
+     <td>{{friend.age}}</td>
+     </tr>
+     </table>
+     </div>
+     </file>
+     <file name="script.js">
+     angular.module('orderByExample2', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+           var friends = [
+             {name: 'John',   phone: '555-1212',  age: 10},
+             {name: 'Mary',   phone: '555-9876',  age: 19},
+             {name: 'Mike',   phone: '555-4321',  age: 21},
+             {name: 'Adam',   phone: '555-5678',  age: 35},
+             {name: 'Julie',  phone: '555-8765',  age: 29}
+           ];
+
+           $scope.propertyName = 'age';
+           $scope.reverse = true;
+           $scope.friends = friends;
+
+           $scope.sortBy = function(propertyName) {
+             $scope.reverse = ($scope.propertyName === propertyName) ? !$scope.reverse : false;
+             $scope.propertyName = propertyName;
+           };
+         }]);
+     </file>
+     <file name="style.css">
+     .friends {
+         border-collapse: collapse;
+       }
+
+     .friends th {
+         border-bottom: 1px solid;
+       }
+     .friends td, .friends th {
+         border-left: 1px solid;
+         padding: 5px 10px;
+       }
+     .friends td:first-child, .friends th:first-child {
+         border-left: none;
+       }
+
+     .sortorder:after {
+         content: '\25b2';   // BLACK UP-POINTING TRIANGLE
+       }
+     .sortorder.reverse:after {
+         content: '\25bc';   // BLACK DOWN-POINTING TRIANGLE
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+     // Element locators
+     var unsortButton = element(by.partialButtonText('unsorted'));
+     var nameHeader = element(by.partialButtonText('Name'));
+     var phoneHeader = element(by.partialButtonText('Phone'));
+     var ageHeader = element(by.partialButtonText('Age'));
+     var firstName = element(by.repeater('friends').column('friend.name').row(0));
+     var lastName = element(by.repeater('friends').column('friend.name').row(4));
+
+     it('should sort friends by some property, when clicking on the column header', function() {
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+
+         phoneHeader.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Mary');
+
+         nameHeader.click();
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('Mike');
+
+         ageHeader.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Adam');
+       });
+
+     it('should sort friends in reverse order, when clicking on the same column', function() {
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+
+         ageHeader.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Adam');
+
+         ageHeader.click();
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+       });
+
+     it('should restore the original order, when clicking "Set to unsorted"', function() {
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+
+         unsortButton.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Julie');
+       });
+     </file>
+     </example>
+     * <hr />
+     *
+     * @example
+     * ### Using `orderBy` inside a controller
+     *
+     * It is also possible to call the `orderBy` filter manually, by injecting `orderByFilter`, and
+     * calling it with the desired parameters. (Alternatively, you could inject the `$filter` factory
+     * and retrieve the `orderBy` filter with `$filter('orderBy')`.)
+     *
+     <example name="orderBy-call-manually" module="orderByExample3">
+     <file name="index.html">
+     <div ng-controller="ExampleController">
+     <pre>Sort by = {{propertyName}}; reverse = {{reverse}}</pre>
+     <hr/>
+     <button ng-click="sortBy(null)">Set to unsorted</button>
+     <hr/>
+     <table class="friends">
+     <tr>
+     <th>
+     <button ng-click="sortBy('name')">Name</button>
+     <span class="sortorder" ng-show="propertyName === 'name'" ng-class="{reverse: reverse}"></span>
+     </th>
+     <th>
+     <button ng-click="sortBy('phone')">Phone Number</button>
+     <span class="sortorder" ng-show="propertyName === 'phone'" ng-class="{reverse: reverse}"></span>
+     </th>
+     <th>
+     <button ng-click="sortBy('age')">Age</button>
+     <span class="sortorder" ng-show="propertyName === 'age'" ng-class="{reverse: reverse}"></span>
+     </th>
+     </tr>
+     <tr ng-repeat="friend in friends">
+     <td>{{friend.name}}</td>
+     <td>{{friend.phone}}</td>
+     <td>{{friend.age}}</td>
+     </tr>
+     </table>
+     </div>
+     </file>
+     <file name="script.js">
+     angular.module('orderByExample3', [])
+     .controller('ExampleController', ['$scope', 'orderByFilter', function($scope, orderBy) {
+           var friends = [
+             {name: 'John',   phone: '555-1212',  age: 10},
+             {name: 'Mary',   phone: '555-9876',  age: 19},
+             {name: 'Mike',   phone: '555-4321',  age: 21},
+             {name: 'Adam',   phone: '555-5678',  age: 35},
+             {name: 'Julie',  phone: '555-8765',  age: 29}
+           ];
+
+           $scope.propertyName = 'age';
+           $scope.reverse = true;
+           $scope.friends = orderBy(friends, $scope.propertyName, $scope.reverse);
+
+           $scope.sortBy = function(propertyName) {
+             $scope.reverse = (propertyName !== null && $scope.propertyName === propertyName)
+                 ? !$scope.reverse : false;
+             $scope.propertyName = propertyName;
+             $scope.friends = orderBy(friends, $scope.propertyName, $scope.reverse);
+           };
+         }]);
+     </file>
+     <file name="style.css">
+     .friends {
+         border-collapse: collapse;
+       }
+
+     .friends th {
+         border-bottom: 1px solid;
+       }
+     .friends td, .friends th {
+         border-left: 1px solid;
+         padding: 5px 10px;
+       }
+     .friends td:first-child, .friends th:first-child {
+         border-left: none;
+       }
+
+     .sortorder:after {
+         content: '\25b2';   // BLACK UP-POINTING TRIANGLE
+       }
+     .sortorder.reverse:after {
+         content: '\25bc';   // BLACK DOWN-POINTING TRIANGLE
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+     // Element locators
+     var unsortButton = element(by.partialButtonText('unsorted'));
+     var nameHeader = element(by.partialButtonText('Name'));
+     var phoneHeader = element(by.partialButtonText('Phone'));
+     var ageHeader = element(by.partialButtonText('Age'));
+     var firstName = element(by.repeater('friends').column('friend.name').row(0));
+     var lastName = element(by.repeater('friends').column('friend.name').row(4));
+
+     it('should sort friends by some property, when clicking on the column header', function() {
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+
+         phoneHeader.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Mary');
+
+         nameHeader.click();
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('Mike');
+
+         ageHeader.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Adam');
+       });
+
+     it('should sort friends in reverse order, when clicking on the same column', function() {
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+
+         ageHeader.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Adam');
+
+         ageHeader.click();
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+       });
+
+     it('should restore the original order, when clicking "Set to unsorted"', function() {
+         expect(firstName.getText()).toBe('Adam');
+         expect(lastName.getText()).toBe('John');
+
+         unsortButton.click();
+         expect(firstName.getText()).toBe('John');
+         expect(lastName.getText()).toBe('Julie');
+       });
+     </file>
+     </example>
+     * <hr />
+     *
+     * @example
+     * ### Using a custom comparator
+     *
+     * If you have very specific requirements about the way items are sorted, you can pass your own
+     * comparator function. For example, you might need to compare some strings in a locale-sensitive
+     * way. (When specifying a custom comparator, you also need to pass a value for the `reverse`
+     * argument - passing `false` retains the default sorting order, i.e. ascending.)
+     *
+     <example name="orderBy-custom-comparator" module="orderByExample4">
+     <file name="index.html">
+     <div ng-controller="ExampleController">
+     <div class="friends-container custom-comparator">
+     <h3>Locale-sensitive Comparator</h3>
+     <table class="friends">
+     <tr>
+     <th>Name</th>
+     <th>Favorite Letter</th>
+     </tr>
+     <tr ng-repeat="friend in friends | orderBy:'favoriteLetter':false:localeSensitiveComparator">
+     <td>{{friend.name}}</td>
+     <td>{{friend.favoriteLetter}}</td>
+     </tr>
+     </table>
+     </div>
+     <div class="friends-container default-comparator">
+     <h3>Default Comparator</h3>
+     <table class="friends">
+     <tr>
+     <th>Name</th>
+     <th>Favorite Letter</th>
+     </tr>
+     <tr ng-repeat="friend in friends | orderBy:'favoriteLetter'">
+     <td>{{friend.name}}</td>
+     <td>{{friend.favoriteLetter}}</td>
+     </tr>
+     </table>
+     </div>
+     </div>
+     </file>
+     <file name="script.js">
+     angular.module('orderByExample4', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+           $scope.friends = [
+             {name: 'John',   favoriteLetter: 'Ä'},
+             {name: 'Mary',   favoriteLetter: 'Ü'},
+             {name: 'Mike',   favoriteLetter: 'Ö'},
+             {name: 'Adam',   favoriteLetter: 'H'},
+             {name: 'Julie',  favoriteLetter: 'Z'}
+           ];
+
+           $scope.localeSensitiveComparator = function(v1, v2) {
+             // If we don't get strings, just compare by index
+             if (v1.type !== 'string' || v2.type !== 'string') {
+               return (v1.index < v2.index) ? -1 : 1;
+             }
+
+             // Compare strings alphabetically, taking locale into account
+             return v1.value.localeCompare(v2.value);
+           };
+         }]);
+     </file>
+     <file name="style.css">
+     .friends-container {
+         display: inline-block;
+         margin: 0 30px;
+       }
+
+     .friends {
+         border-collapse: collapse;
+       }
+
+     .friends th {
+         border-bottom: 1px solid;
+       }
+     .friends td, .friends th {
+         border-left: 1px solid;
+         padding: 5px 10px;
+       }
+     .friends td:first-child, .friends th:first-child {
+         border-left: none;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+     // Element locators
+     var container = element(by.css('.custom-comparator'));
+     var names = container.all(by.repeater('friends').column('friend.name'));
+
+     it('should sort friends by favorite letter (in correct alphabetical order)', function() {
+         expect(names.get(0).getText()).toBe('John');
+         expect(names.get(1).getText()).toBe('Adam');
+         expect(names.get(2).getText()).toBe('Mike');
+         expect(names.get(3).getText()).toBe('Mary');
+         expect(names.get(4).getText()).toBe('Julie');
+       });
+     </file>
+     </example>
      *
+     */
+    orderByFilter.$inject = ['$parse'];
+    function orderByFilter($parse) {
+        return function(array, sortPredicate, reverseOrder, compareFn) {
+
+            if (array == null) return array;
+            if (!isArrayLike(array)) {
+                throw minErr('orderBy')('notarray', 'Expected array but received: {0}', array);
+            }
+
+            if (!isArray(sortPredicate)) { sortPredicate = [sortPredicate]; }
+            if (sortPredicate.length === 0) { sortPredicate = ['+']; }
+
+            var predicates = processPredicates(sortPredicate);
+
+            var descending = reverseOrder ? -1 : 1;
+
+            // Define the `compare()` function. Use a default comparator if none is specified.
+            var compare = isFunction(compareFn) ? compareFn : defaultCompare;
+
+            // The next three lines are a version of a Swartzian Transform idiom from Perl
+            // (sometimes called the Decorate-Sort-Undecorate idiom)
+            // See https://en.wikipedia.org/wiki/Schwartzian_transform
+            var compareValues = Array.prototype.map.call(array, getComparisonObject);
+            compareValues.sort(doComparison);
+            array = compareValues.map(function(item) { return item.value; });
+
+            return array;
+
+            function getComparisonObject(value, index) {
+                // NOTE: We are adding an extra `tieBreaker` value based on the element's index.
+                // This will be used to keep the sort stable when none of the input predicates can
+                // distinguish between two elements.
+                return {
+                    value: value,
+                    tieBreaker: {value: index, type: 'number', index: index},
+                    predicateValues: predicates.map(function(predicate) {
+                        return getPredicateValue(predicate.get(value), index);
+                    })
+                };
+            }
+
+            function doComparison(v1, v2) {
+                for (var i = 0, ii = predicates.length; i < ii; i++) {
+                    var result = compare(v1.predicateValues[i], v2.predicateValues[i]);
+                    if (result) {
+                        return result * predicates[i].descending * descending;
+                    }
+                }
+
+                return (compare(v1.tieBreaker, v2.tieBreaker) || defaultCompare(v1.tieBreaker, v2.tieBreaker)) * descending;
+            }
+        };
+
+        function processPredicates(sortPredicates) {
+            return sortPredicates.map(function(predicate) {
+                var descending = 1, get = identity;
+
+                if (isFunction(predicate)) {
+                    get = predicate;
+                } else if (isString(predicate)) {
+                    if ((predicate.charAt(0) === '+' || predicate.charAt(0) === '-')) {
+                        descending = predicate.charAt(0) === '-' ? -1 : 1;
+                        predicate = predicate.substring(1);
+                    }
+                    if (predicate !== '') {
+                        get = $parse(predicate);
+                        if (get.constant) {
+                            var key = get();
+                            get = function(value) { return value[key]; };
+                        }
+                    }
+                }
+                return {get: get, descending: descending};
+            });
+        }
+
+        function isPrimitive(value) {
+            switch (typeof value) {
+                case 'number': /* falls through */
+                case 'boolean': /* falls through */
+                case 'string':
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        function objectValue(value) {
+            // If `valueOf` is a valid function use that
+            if (isFunction(value.valueOf)) {
+                value = value.valueOf();
+                if (isPrimitive(value)) return value;
+            }
+            // If `toString` is a valid function and not the one from `Object.prototype` use that
+            if (hasCustomToString(value)) {
+                value = value.toString();
+                if (isPrimitive(value)) return value;
+            }
+
+            return value;
+        }
+
+        function getPredicateValue(value, index) {
+            var type = typeof value;
+            if (value === null) {
+                type = 'string';
+                value = 'null';
+            } else if (type === 'object') {
+                value = objectValue(value);
+            }
+            return {value: value, type: type, index: index};
+        }
+
+        function defaultCompare(v1, v2) {
+            var result = 0;
+            var type1 = v1.type;
+            var type2 = v2.type;
+
+            if (type1 === type2) {
+                var value1 = v1.value;
+                var value2 = v2.value;
+
+                if (type1 === 'string') {
+                    // Compare strings case-insensitively
+                    value1 = value1.toLowerCase();
+                    value2 = value2.toLowerCase();
+                } else if (type1 === 'object') {
+                    // For basic objects, use the position of the object
+                    // in the collection instead of the value
+                    if (isObject(value1)) value1 = v1.index;
+                    if (isObject(value2)) value2 = v2.index;
+                }
+
+                if (value1 !== value2) {
+                    result = value1 < value2 ? -1 : 1;
+                }
+            } else {
+                result = type1 < type2 ? -1 : 1;
+            }
+
+            return result;
+        }
+    }
+
+    function ngDirective(directive) {
+        if (isFunction(directive)) {
+            directive = {
+                link: directive
+            };
+        }
+        directive.restrict = directive.restrict || 'AC';
+        return valueFn(directive);
+    }
+
+    /**
+     * @ngdoc directive
+     * @name a
+     * @restrict E
+     *
+     * @description
+     * Modifies the default behavior of the html a tag so that the default action is prevented when
+     * the href attribute is empty.
+     *
+     * For dynamically creating `href` attributes for a tags, see the {@link ng.ngHref `ngHref`} directive.
+     */
+    var htmlAnchorDirective = valueFn({
+        restrict: 'E',
+        compile: function(element, attr) {
+            if (!attr.href && !attr.xlinkHref) {
+                return function(scope, element) {
+                    // If the linked element is not an anchor tag anymore, do nothing
+                    if (element[0].nodeName.toLowerCase() !== 'a') return;
+
+                    // SVGAElement does not use the href attribute, but rather the 'xlinkHref' attribute.
+                    var href = toString.call(element.prop('href')) === '[object SVGAnimatedString]' ?
+                        'xlink:href' : 'href';
+                    element.on('click', function(event) {
+                        // if we have no href url, then don't navigate anywhere.
+                        if (!element.attr(href)) {
+                            event.preventDefault();
+                        }
+                    });
+                };
+            }
+        }
+    });
+
+    /**
+     * @ngdoc directive
+     * @name ngHref
+     * @restrict A
+     * @priority 99
+     *
+     * @description
+     * Using AngularJS markup like `{{hash}}` in an href attribute will
+     * make the link go to the wrong URL if the user clicks it before
+     * AngularJS has a chance to replace the `{{hash}}` markup with its
+     * value. Until AngularJS replaces the markup the link will be broken
+     * and will most likely return a 404 error. The `ngHref` directive
+     * solves this problem.
+     *
+     * The wrong way to write it:
+     * ```html
+     * <a href="http://www.gravatar.com/avatar/{{hash}}">link1</a>
+     * ```
+     *
+     * The correct way to write it:
+     * ```html
+     * <a ng-href="http://www.gravatar.com/avatar/{{hash}}">link1</a>
+     * ```
+     *
+     * @element A
+     * @param {template} ngHref any string which can contain `{{}}` markup.
+     *
+     * @example
+     * This example shows various combinations of `href`, `ng-href` and `ng-click` attributes
+     * in links and their different behaviors:
+     <example name="ng-href">
+     <file name="index.html">
+     <input ng-model="value" /><br />
+     <a id="link-1" href ng-click="value = 1">link 1</a> (link, don't reload)<br />
+     <a id="link-2" href="" ng-click="value = 2">link 2</a> (link, don't reload)<br />
+     <a id="link-3" ng-href="/{{'123'}}">link 3</a> (link, reload!)<br />
+     <a id="link-4" href="" name="xx" ng-click="value = 4">anchor</a> (link, don't reload)<br />
+     <a id="link-5" name="xxx" ng-click="value = 5">anchor</a> (no link)<br />
+     <a id="link-6" ng-href="{{value}}">link</a> (link, change location)
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should execute ng-click but not reload when href without value', function() {
+          element(by.id('link-1')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('1');
+          expect(element(by.id('link-1')).getAttribute('href')).toBe('');
+        });
+
+     it('should execute ng-click but not reload when href empty string', function() {
+          element(by.id('link-2')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('2');
+          expect(element(by.id('link-2')).getAttribute('href')).toBe('');
+        });
+
+     it('should execute ng-click and change url when ng-href specified', function() {
+          expect(element(by.id('link-3')).getAttribute('href')).toMatch(/\/123$/);
+
+          element(by.id('link-3')).click();
+
+          // At this point, we navigate away from an AngularJS page, so we need
+          // to use browser.driver to get the base webdriver.
+
+          browser.wait(function() {
+            return browser.driver.getCurrentUrl().then(function(url) {
+              return url.match(/\/123$/);
+            });
+          }, 5000, 'page should navigate to /123');
+        });
+
+     it('should execute ng-click but not reload when href empty string and name specified', function() {
+          element(by.id('link-4')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('4');
+          expect(element(by.id('link-4')).getAttribute('href')).toBe('');
+        });
+
+     it('should execute ng-click but not reload when no href but name specified', function() {
+          element(by.id('link-5')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('5');
+          expect(element(by.id('link-5')).getAttribute('href')).toBe(null);
+        });
+
+     it('should only change url when only ng-href', function() {
+          element(by.model('value')).clear();
+          element(by.model('value')).sendKeys('6');
+          expect(element(by.id('link-6')).getAttribute('href')).toMatch(/\/6$/);
+
+          element(by.id('link-6')).click();
+
+          // At this point, we navigate away from an AngularJS page, so we need
+          // to use browser.driver to get the base webdriver.
+          browser.wait(function() {
+            return browser.driver.getCurrentUrl().then(function(url) {
+              return url.match(/\/6$/);
+            });
+          }, 5000, 'page should navigate to /6');
+        });
+     </file>
+     </example>
+     */
+
+    /**
+     * @ngdoc directive
+     * @name ngSrc
+     * @restrict A
+     * @priority 99
      *
-     * ## How does it work?
+     * @description
+     * Using AngularJS markup like `{{hash}}` in a `src` attribute doesn't
+     * work right: The browser will fetch from the URL with the literal
+     * text `{{hash}}` until AngularJS replaces the expression inside
+     * `{{hash}}`. The `ngSrc` directive solves this problem.
      *
-     * In privileged contexts, directives and code will bind to the result of {@link ng.$sce#getTrusted
- * $sce.getTrusted(context, value)} rather than to the value directly.  Directives use {@link
-        * ng.$sce#parse $sce.parseAs} rather than `$parse` to watch attribute bindings, which performs the
-     * {@link ng.$sce#getTrusted $sce.getTrusted} behind the scenes on non-constant literals.
+     * The buggy way to write it:
+     * ```html
+     * <img src="http://www.gravatar.com/avatar/{{hash}}" alt="Description"/>
+     * ```
      *
-     * As an example, {@link ng.directive:ngBindHtml ngBindHtml} uses {@link
-        * ng.$sce#parseAsHtml $sce.parseAsHtml(binding expression)}.  Here's the actual code (slightly
-     * simplified):
+     * The correct way to write it:
+     * ```html
+     * <img ng-src="http://www.gravatar.com/avatar/{{hash}}" alt="Description" />
+     * ```
      *
-     * <pre class="prettyprint">
-     *   var ngBindHtmlDirective = ['$sce', function($sce) {
- *     return function(scope, element, attr) {
- *       scope.$watch($sce.parseAsHtml(attr.ngBindHtml), function(value) {
- *         element.html(value || '');
- *       });
- *     };
- *   }];
-     * </pre>
+     * @element IMG
+     * @param {template} ngSrc any string which can contain `{{}}` markup.
+     */
+
+    /**
+     * @ngdoc directive
+     * @name ngSrcset
+     * @restrict A
+     * @priority 99
      *
-     * ## Impact on loading templates
+     * @description
+     * Using AngularJS markup like `{{hash}}` in a `srcset` attribute doesn't
+     * work right: The browser will fetch from the URL with the literal
+     * text `{{hash}}` until AngularJS replaces the expression inside
+     * `{{hash}}`. The `ngSrcset` directive solves this problem.
      *
-     * This applies both to the {@link ng.directive:ngInclude `ng-include`} directive as well as
-     * `templateUrl`'s specified by {@link guide/directive directives}.
+     * The buggy way to write it:
+     * ```html
+     * <img srcset="http://www.gravatar.com/avatar/{{hash}} 2x" alt="Description"/>
+     * ```
      *
-     * By default, Angular only loads templates from the same domain and protocol as the application
-     * document.  This is done by calling {@link ng.$sce#getTrustedResourceUrl
- * $sce.getTrustedResourceUrl} on the template URL.  To load templates from other domains and/or
-     * protocols, you may either either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist
- * them} or {@link ng.$sce#trustAsResourceUrl wrap it} into a trusted value.
+     * The correct way to write it:
+     * ```html
+     * <img ng-srcset="http://www.gravatar.com/avatar/{{hash}} 2x" alt="Description" />
+     * ```
      *
-     * *Please note*:
-     * The browser's
-     * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest)
-     * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/)
-     * policy apply in addition to this and may further restrict whether the template is successfully
-     * loaded.  This means that without the right CORS policy, loading templates from a different domain
-     * won't work on all browsers.  Also, loading templates from `file://` URL does not work on some
-     * browsers.
+     * @element IMG
+     * @param {template} ngSrcset any string which can contain `{{}}` markup.
+     */
+
+    /**
+     * @ngdoc directive
+     * @name ngDisabled
+     * @restrict A
+     * @priority 100
      *
-     * ## This feels like too much overhead for the developer?
+     * @description
      *
-     * It's important to remember that SCE only applies to interpolation expressions.
+     * This directive sets the `disabled` attribute on the element (typically a form control,
+     * e.g. `input`, `button`, `select` etc.) if the
+     * {@link guide/expression expression} inside `ngDisabled` evaluates to truthy.
      *
-     * If your expressions are constant literals, they're automatically trusted and you don't need to
-     * call `$sce.trustAs` on them (remember to include the `ngSanitize` module) (e.g.
-     * `<div ng-bind-html="'<b>implicitly trusted</b>'"></div>`) just works.
+     * A special directive is necessary because we cannot use interpolation inside the `disabled`
+     * attribute. See the {@link guide/interpolation interpolation guide} for more info.
      *
-     * Additionally, `a[href]` and `img[src]` automatically sanitize their URLs and do not pass them
-     * through {@link ng.$sce#getTrusted $sce.getTrusted}.  SCE doesn't play a role here.
+     * @example
+     <example name="ng-disabled">
+     <file name="index.html">
+     <label>Click me to toggle: <input type="checkbox" ng-model="checked"></label><br/>
+     <button ng-model="button" ng-disabled="checked">Button</button>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should toggle button', function() {
+          expect(element(by.css('button')).getAttribute('disabled')).toBeFalsy();
+          element(by.model('checked')).click();
+          expect(element(by.css('button')).getAttribute('disabled')).toBeTruthy();
+        });
+     </file>
+     </example>
      *
-     * The included {@link ng.$sceDelegate $sceDelegate} comes with sane defaults to allow you to load
-     * templates in `ng-include` from your application's domain without having to even know about SCE.
-     * It blocks loading templates from other domains or loading templates over http from an https
-     * served document.  You can change these by setting your own custom {@link
-        * ng.$sceDelegateProvider#resourceUrlWhitelist whitelists} and {@link
-        * ng.$sceDelegateProvider#resourceUrlBlacklist blacklists} for matching such URLs.
+     * @element INPUT
+     * @param {expression} ngDisabled If the {@link guide/expression expression} is truthy,
+     *     then the `disabled` attribute will be set on the element
+     */
+
+
+    /**
+     * @ngdoc directive
+     * @name ngChecked
+     * @restrict A
+     * @priority 100
      *
-     * This significantly reduces the overhead.  It is far easier to pay the small overhead and have an
-     * application that's secure and can be audited to verify that with much more ease than bolting
-     * security onto an application later.
+     * @description
+     * Sets the `checked` attribute on the element, if the expression inside `ngChecked` is truthy.
      *
-     * <a name="contexts"></a>
-     * ## What trusted context types are supported?
+     * Note that this directive should not be used together with {@link ngModel `ngModel`},
+     * as this can lead to unexpected behavior.
      *
-     * | Context             | Notes          |
-     * |---------------------|----------------|
-     * | `$sce.HTML`         | For HTML that's safe to source into the application.  The {@link ng.directive:ngBindHtml ngBindHtml} directive uses this context for bindings. |
-     * | `$sce.CSS`          | For CSS that's safe to source into the application.  Currently unused.  Feel free to use it in your own directives. |
-     * | `$sce.URL`          | For URLs that are safe to follow as links.  Currently unused (`<a href=` and `<img src=` sanitize their urls and don't constitute an SCE context. |
-     * | `$sce.RESOURCE_URL` | For URLs that are not only safe to follow as links, but whose contents are also safe to include in your application.  Examples include `ng-include`, `src` / `ngSrc` bindings for tags other than `IMG` (e.g. `IFRAME`, `OBJECT`, etc.)  <br><br>Note that `$sce.RESOURCE_URL` makes a stronger statement about the URL than `$sce.URL` does and therefore contexts requiring values trusted for `$sce.RESOURCE_URL` can be used anywhere that values trusted for `$sce.URL` are required. |
-     * | `$sce.JS`           | For JavaScript that is safe to execute in your application's context.  Currently unused.  Feel free to use it in your own directives. |
+     * A special directive is necessary because we cannot use interpolation inside the `checked`
+     * attribute. See the {@link guide/interpolation interpolation guide} for more info.
      *
-     * ## Format of items in {@link ng.$sceDelegateProvider#resourceUrlWhitelist resourceUrlWhitelist}/{@link ng.$sceDelegateProvider#resourceUrlBlacklist Blacklist} <a name="resourceUrlPatternItem"></a>
+     * @example
+     <example name="ng-checked">
+     <file name="index.html">
+     <label>Check me to check both: <input type="checkbox" ng-model="leader"></label><br/>
+     <input id="checkFollower" type="checkbox" ng-checked="leader" aria-label="Follower input">
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check both checkBoxes', function() {
+          expect(element(by.id('checkFollower')).getAttribute('checked')).toBeFalsy();
+          element(by.model('leader')).click();
+          expect(element(by.id('checkFollower')).getAttribute('checked')).toBeTruthy();
+        });
+     </file>
+     </example>
      *
-     *  Each element in these arrays must be one of the following:
+     * @element INPUT
+     * @param {expression} ngChecked If the {@link guide/expression expression} is truthy,
+     *     then the `checked` attribute will be set on the element
+     */
+
+
+    /**
+     * @ngdoc directive
+     * @name ngReadonly
+     * @restrict A
+     * @priority 100
      *
-     *  - **'self'**
-     *    - The special **string**, `'self'`, can be used to match against all URLs of the **same
-     *      domain** as the application document using the **same protocol**.
-     *  - **String** (except the special value `'self'`)
-     *    - The string is matched against the full *normalized / absolute URL* of the resource
-     *      being tested (substring matches are not good enough.)
-     *    - There are exactly **two wildcard sequences** - `*` and `**`.  All other characters
-     *      match themselves.
-     *    - `*`: matches zero or more occurrences of any character other than one of the following 6
-     *      characters: '`:`', '`/`', '`.`', '`?`', '`&`' and ';'.  It's a useful wildcard for use
-     *      in a whitelist.
-     *    - `**`: matches zero or more occurrences of *any* character.  As such, it's not
-     *      not appropriate to use in for a scheme, domain, etc. as it would match too much.  (e.g.
-     *      http://**.example.com/ would match http://evil.com/?ignore=.example.com/ and that might
-     *      not have been the intention.)  It's usage at the very end of the path is ok.  (e.g.
-     *      http://foo.example.com/templates/**).
-     *  - **RegExp** (*see caveat below*)
-     *    - *Caveat*:  While regular expressions are powerful and offer great flexibility,  their syntax
-     *      (and all the inevitable escaping) makes them *harder to maintain*.  It's easy to
-     *      accidentally introduce a bug when one updates a complex expression (imho, all regexes should
-     *      have good test coverage.).  For instance, the use of `.` in the regex is correct only in a
-     *      small number of cases.  A `.` character in the regex used when matching the scheme or a
-     *      subdomain could be matched against a `:` or literal `.` that was likely not intended.   It
-     *      is highly recommended to use the string patterns and only fall back to regular expressions
-     *      if they as a last resort.
-     *    - The regular expression must be an instance of RegExp (i.e. not a string.)  It is
-     *      matched against the **entire** *normalized / absolute URL* of the resource being tested
-     *      (even when the RegExp did not have the `^` and `$` codes.)  In addition, any flags
-     *      present on the RegExp (such as multiline, global, ignoreCase) are ignored.
-     *    - If you are generating your JavaScript from some other templating engine (not
-     *      recommended, e.g. in issue [#4006](https://github.com/angular/angular.js/issues/4006)),
-     *      remember to escape your regular expression (and be aware that you might need more than
-     *      one level of escaping depending on your templating engine and the way you interpolated
-     *      the value.)  Do make use of your platform's escaping mechanism as it might be good
-     *      enough before coding your own.  e.g. Ruby has
-     *      [Regexp.escape(str)](http://www.ruby-doc.org/core-2.0.0/Regexp.html#method-c-escape)
-     *      and Python has [re.escape](http://docs.python.org/library/re.html#re.escape).
-     *      Javascript lacks a similar built in function for escaping.  Take a look at Google
-     *      Closure library's [goog.string.regExpEscape(s)](
-     *      http://docs.closure-library.googlecode.com/git/closure_goog_string_string.js.source.html#line962).
+     * @description
      *
-     * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} for an example.
+     * Sets the `readonly` attribute on the element, if the expression inside `ngReadonly` is truthy.
+     * Note that `readonly` applies only to `input` elements with specific types. [See the input docs on
+     * MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-readonly) for more information.
      *
-     * ## Show me an example using SCE.
+     * A special directive is necessary because we cannot use interpolation inside the `readonly`
+     * attribute. See the {@link guide/interpolation interpolation guide} for more info.
      *
      * @example
-     <example module="mySceApp" deps="angular-sanitize.js">
+     <example name="ng-readonly">
      <file name="index.html">
-     <div ng-controller="myAppController as myCtrl">
-     <i ng-bind-html="myCtrl.explicitlyTrustedHtml" id="explicitlyTrustedHtml"></i><br><br>
-     <b>User comments</b><br>
-     By default, HTML that isn't explicitly trusted (e.g. Alice's comment) is sanitized when
-     $sanitize is available.  If $sanitize isn't available, this results in an error instead of an
-     exploit.
-     <div class="well">
-     <div ng-repeat="userComment in myCtrl.userComments">
-     <b>{{userComment.name}}</b>:
-     <span ng-bind-html="userComment.htmlComment" class="htmlComment"></span>
-     <br>
-     </div>
-     </div>
-     </div>
+     <label>Check me to make text readonly: <input type="checkbox" ng-model="checked"></label><br/>
+     <input type="text" ng-readonly="checked" value="I'm AngularJS" aria-label="Readonly field" />
      </file>
-
-     <file name="script.js">
-     var mySceApp = angular.module('mySceApp', ['ngSanitize']);
-
-     mySceApp.controller("myAppController", function myAppController($http, $templateCache, $sce) {
-    var self = this;
-    $http.get("test_data.json", {cache: $templateCache}).success(function(userComments) {
-      self.userComments = userComments;
-    });
-    self.explicitlyTrustedHtml = $sce.trustAsHtml(
-        '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
-        'sanitization.&quot;">Hover over this text.</span>');
-  });
+     <file name="protractor.js" type="protractor">
+     it('should toggle readonly attr', function() {
+          expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeFalsy();
+          element(by.model('checked')).click();
+          expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeTruthy();
+        });
      </file>
+     </example>
+     *
+     * @element INPUT
+     * @param {expression} ngReadonly If the {@link guide/expression expression} is truthy,
+     *     then special attribute "readonly" will be set on the element
+     */
 
-     <file name="test_data.json">
-     [
-     { "name": "Alice",
-    "htmlComment":
-        "<span onmouseover='this.textContent=\"PWN3D!\"'>Is <i>anyone</i> reading this?</span>"
-  },
-     { "name": "Bob",
-    "htmlComment": "<i>Yes!</i>  Am I the only other one?"
-  }
-     ]
-     </file>
 
+    /**
+     * @ngdoc directive
+     * @name ngSelected
+     * @restrict A
+     * @priority 100
+     *
+     * @description
+     *
+     * Sets the `selected` attribute on the element, if the expression inside `ngSelected` is truthy.
+     *
+     * A special directive is necessary because we cannot use interpolation inside the `selected`
+     * attribute. See the {@link guide/interpolation interpolation guide} for more info.
+     *
+     * <div class="alert alert-warning">
+     *   **Note:** `ngSelected` does not interact with the `select` and `ngModel` directives, it only
+     *   sets the `selected` attribute on the element. If you are using `ngModel` on the select, you
+     *   should not use `ngSelected` on the options, as `ngModel` will set the select value and
+     *   selected options.
+     * </div>
+     *
+     * @example
+     <example name="ng-selected">
+     <file name="index.html">
+     <label>Check me to select: <input type="checkbox" ng-model="selected"></label><br/>
+     <select aria-label="ngSelected demo">
+     <option>Hello!</option>
+     <option id="greet" ng-selected="selected">Greetings!</option>
+     </select>
+     </file>
      <file name="protractor.js" type="protractor">
-     describe('SCE doc demo', function() {
-    it('should sanitize untrusted values', function() {
-      expect(element(by.css('.htmlComment')).getInnerHtml())
-          .toBe('<span>Is <i>anyone</i> reading this?</span>');
-    });
-
-    it('should NOT sanitize explicitly trusted values', function() {
-      expect(element(by.id('explicitlyTrustedHtml')).getInnerHtml()).toBe(
-          '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
-          'sanitization.&quot;">Hover over this text.</span>');
-    });
-  });
+     it('should select Greetings!', function() {
+          expect(element(by.id('greet')).getAttribute('selected')).toBeFalsy();
+          element(by.model('selected')).click();
+          expect(element(by.id('greet')).getAttribute('selected')).toBeTruthy();
+        });
      </file>
      </example>
      *
+     * @element OPTION
+     * @param {expression} ngSelected If the {@link guide/expression expression} is truthy,
+     *     then special attribute "selected" will be set on the element
+     */
+
+    /**
+     * @ngdoc directive
+     * @name ngOpen
+     * @restrict A
+     * @priority 100
+     *
+     * @description
      *
+     * Sets the `open` attribute on the element, if the expression inside `ngOpen` is truthy.
      *
-     * ## Can I disable SCE completely?
+     * A special directive is necessary because we cannot use interpolation inside the `open`
+     * attribute. See the {@link guide/interpolation interpolation guide} for more info.
      *
-     * Yes, you can.  However, this is strongly discouraged.  SCE gives you a lot of security benefits
-     * for little coding overhead.  It will be much harder to take an SCE disabled application and
-     * either secure it on your own or enable SCE at a later stage.  It might make sense to disable SCE
-     * for cases where you have a lot of existing code that was written before SCE was introduced and
-     * you're migrating them a module at a time.
+     * ## A note about browser compatibility
      *
-     * That said, here's how you can completely disable SCE:
+     * Internet Explorer and Edge do not support the `details` element, it is
+     * recommended to use {@link ng.ngShow} and {@link ng.ngHide} instead.
      *
-     * <pre class="prettyprint">
-     *   angular.module('myAppWithSceDisabledmyApp', []).config(function($sceProvider) {
- *     // Completely disable SCE.  For demonstration purposes only!
- *     // Do not use in new projects.
- *     $sceProvider.enabled(false);
- *   });
-     * </pre>
+     * @example
+     <example name="ng-open">
+     <file name="index.html">
+     <label>Toggle details: <input type="checkbox" ng-model="open"></label><br/>
+     <details id="details" ng-open="open">
+     <summary>List</summary>
+     <ul>
+     <li>Apple</li>
+     <li>Orange</li>
+     <li>Durian</li>
+     </ul>
+     </details>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should toggle open', function() {
+           expect(element(by.id('details')).getAttribute('open')).toBeFalsy();
+           element(by.model('open')).click();
+           expect(element(by.id('details')).getAttribute('open')).toBeTruthy();
+         });
+     </file>
+     </example>
      *
+     * @element DETAILS
+     * @param {expression} ngOpen If the {@link guide/expression expression} is truthy,
+     *     then special attribute "open" will be set on the element
      */
-    /* jshint maxlen: 100 */
-
-    function $SceProvider() {
-        var enabled = true;
-
-        /**
-         * @ngdoc method
-         * @name $sceProvider#enabled
-         * @function
-         *
-         * @param {boolean=} value If provided, then enables/disables SCE.
-         * @return {boolean} true if SCE is enabled, false otherwise.
-         *
-         * @description
-         * Enables/disables SCE and returns the current value.
-         */
-        this.enabled = function (value) {
-            if (arguments.length) {
-                enabled = !!value;
-            }
-            return enabled;
-        };
-
-
-        /* Design notes on the default implementation for SCE.
-         *
-         * The API contract for the SCE delegate
-         * -------------------------------------
-         * The SCE delegate object must provide the following 3 methods:
-         *
-         * - trustAs(contextEnum, value)
-         *     This method is used to tell the SCE service that the provided value is OK to use in the
-         *     contexts specified by contextEnum.  It must return an object that will be accepted by
-         *     getTrusted() for a compatible contextEnum and return this value.
-         *
-         * - valueOf(value)
-         *     For values that were not produced by trustAs(), return them as is.  For values that were
-         *     produced by trustAs(), return the corresponding input value to trustAs.  Basically, if
-         *     trustAs is wrapping the given values into some type, this operation unwraps it when given
-         *     such a value.
-         *
-         * - getTrusted(contextEnum, value)
-         *     This function should return the a value that is safe to use in the context specified by
-         *     contextEnum or throw and exception otherwise.
-         *
-         * NOTE: This contract deliberately does NOT state that values returned by trustAs() must be
-         * opaque or wrapped in some holder object.  That happens to be an implementation detail.  For
-         * instance, an implementation could maintain a registry of all trusted objects by context.  In
-         * such a case, trustAs() would return the same object that was passed in.  getTrusted() would
-         * return the same object passed in if it was found in the registry under a compatible context or
-         * throw an exception otherwise.  An implementation might only wrap values some of the time based
-         * on some criteria.  getTrusted() might return a value and not throw an exception for special
-         * constants or objects even if not wrapped.  All such implementations fulfill this contract.
-         *
-         *
-         * A note on the inheritance model for SCE contexts
-         * ------------------------------------------------
-         * I've used inheritance and made RESOURCE_URL wrapped types a subtype of URL wrapped types.  This
-         * is purely an implementation details.
-         *
-         * The contract is simply this:
-         *
-         *     getTrusted($sce.RESOURCE_URL, value) succeeding implies that getTrusted($sce.URL, value)
-         *     will also succeed.
-         *
-         * Inheritance happens to capture this in a natural way.  In some future, we
-         * may not use inheritance anymore.  That is OK because no code outside of
-         * sce.js and sceSpecs.js would need to be aware of this detail.
-         */
 
-        this.$get = ['$parse', '$sniffer', '$sceDelegate', function(
-            $parse,   $sniffer,   $sceDelegate) {
-            // Prereq: Ensure that we're not running in IE8 quirks mode.  In that mode, IE allows
-            // the "expression(javascript expression)" syntax which is insecure.
-            if (enabled && $sniffer.msie && $sniffer.msieDocumentMode < 8) {
-                throw $sceMinErr('iequirks',
-                    'Strict Contextual Escaping does not support Internet Explorer version < 9 in quirks ' +
-                    'mode.  You can fix this by adding the text <!doctype html> to the top of your HTML ' +
-                    'document.  See http://docs.angularjs.org/api/ng.$sce for more information.');
-            }
+    var ngAttributeAliasDirectives = {};
 
-            var sce = copy(SCE_CONTEXTS);
+// boolean attrs are evaluated
+    forEach(BOOLEAN_ATTR, function(propName, attrName) {
+        // binding to multiple is not supported
+        if (propName === 'multiple') return;
 
-            /**
-             * @ngdoc method
-             * @name $sce#isEnabled
-             * @function
-             *
-             * @return {Boolean} true if SCE is enabled, false otherwise.  If you want to set the value, you
-             * have to do it at module config time on {@link ng.$sceProvider $sceProvider}.
-             *
-             * @description
-             * Returns a boolean indicating if SCE is enabled.
-             */
-            sce.isEnabled = function () {
-                return enabled;
-            };
-            sce.trustAs = $sceDelegate.trustAs;
-            sce.getTrusted = $sceDelegate.getTrusted;
-            sce.valueOf = $sceDelegate.valueOf;
+        function defaultLinkFn(scope, element, attr) {
+            scope.$watch(attr[normalized], function ngBooleanAttrWatchAction(value) {
+                attr.$set(attrName, !!value);
+            });
+        }
 
-            if (!enabled) {
-                sce.trustAs = sce.getTrusted = function(type, value) { return value; };
-                sce.valueOf = identity;
-            }
+        var normalized = directiveNormalize('ng-' + attrName);
+        var linkFn = defaultLinkFn;
 
-            /**
-             * @ngdoc method
-             * @name $sce#parse
-             *
-             * @description
-             * Converts Angular {@link guide/expression expression} into a function.  This is like {@link
-                * ng.$parse $parse} and is identical when the expression is a literal constant.  Otherwise, it
-             * wraps the expression in a call to {@link ng.$sce#getTrusted $sce.getTrusted(*type*,
-     * *result*)}
-             *
-             * @param {string} type The kind of SCE context in which this result will be used.
-             * @param {string} expression String expression to compile.
-             * @returns {function(context, locals)} a function which represents the compiled expression:
-             *
-             *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-             *      are evaluated against (typically a scope object).
-             *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-             *      `context`.
-             */
-            sce.parseAs = function sceParseAs(type, expr) {
-                var parsed = $parse(expr);
-                if (parsed.literal && parsed.constant) {
-                    return parsed;
-                } else {
-                    return function sceParseAsTrusted(self, locals) {
-                        return sce.getTrusted(type, parsed(self, locals));
-                    };
+        if (propName === 'checked') {
+            linkFn = function(scope, element, attr) {
+                // ensuring ngChecked doesn't interfere with ngModel when both are set on the same input
+                if (attr.ngModel !== attr[normalized]) {
+                    defaultLinkFn(scope, element, attr);
                 }
             };
+        }
 
-            /**
-             * @ngdoc method
-             * @name $sce#trustAs
-             *
-             * @description
-             * Delegates to {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}.  As such,
-             * returns an object that is trusted by angular for use in specified strict contextual
-             * escaping contexts (such as ng-bind-html, ng-include, any src attribute
-             * interpolation, any dom event binding attribute interpolation such as for onclick,  etc.)
-             * that uses the provided value.  See * {@link ng.$sce $sce} for enabling strict contextual
-             * escaping.
-             *
-             * @param {string} type The kind of context in which this value is safe for use.  e.g. url,
-             *   resource_url, html, js and css.
-             * @param {*} value The value that that should be considered trusted/safe.
-             * @returns {*} A value that can be used to stand in for the provided `value` in places
-             * where Angular expects a $sce.trustAs() return value.
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#trustAsHtml
-             *
-             * @description
-             * Shorthand method.  `$sce.trustAsHtml(value)` →
-             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.HTML, value)`}
-             *
-             * @param {*} value The value to trustAs.
-             * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedHtml
-     *     $sce.getTrustedHtml(value)} to obtain the original value.  (privileged directives
-             *     only accept expressions that are either literal constants or are the
-             *     return value of {@link ng.$sce#trustAs $sce.trustAs}.)
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#trustAsUrl
-             *
-             * @description
-             * Shorthand method.  `$sce.trustAsUrl(value)` →
-             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.URL, value)`}
-             *
-             * @param {*} value The value to trustAs.
-             * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedUrl
-     *     $sce.getTrustedUrl(value)} to obtain the original value.  (privileged directives
-             *     only accept expressions that are either literal constants or are the
-             *     return value of {@link ng.$sce#trustAs $sce.trustAs}.)
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#trustAsResourceUrl
-             *
-             * @description
-             * Shorthand method.  `$sce.trustAsResourceUrl(value)` →
-             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.RESOURCE_URL, value)`}
-             *
-             * @param {*} value The value to trustAs.
-             * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedResourceUrl
-     *     $sce.getTrustedResourceUrl(value)} to obtain the original value.  (privileged directives
-             *     only accept expressions that are either literal constants or are the return
-             *     value of {@link ng.$sce#trustAs $sce.trustAs}.)
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#trustAsJs
-             *
-             * @description
-             * Shorthand method.  `$sce.trustAsJs(value)` →
-             *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.JS, value)`}
-             *
-             * @param {*} value The value to trustAs.
-             * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedJs
-     *     $sce.getTrustedJs(value)} to obtain the original value.  (privileged directives
-             *     only accept expressions that are either literal constants or are the
-             *     return value of {@link ng.$sce#trustAs $sce.trustAs}.)
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#getTrusted
-             *
-             * @description
-             * Delegates to {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted`}.  As such,
-             * takes the result of a {@link ng.$sce#trustAs `$sce.trustAs`}() call and returns the
-             * originally supplied value if the queried context type is a supertype of the created type.
-             * If this condition isn't satisfied, throws an exception.
-             *
-             * @param {string} type The kind of context in which this value is to be used.
-             * @param {*} maybeTrusted The result of a prior {@link ng.$sce#trustAs `$sce.trustAs`}
-             *                         call.
-             * @returns {*} The value the was originally provided to
-             *              {@link ng.$sce#trustAs `$sce.trustAs`} if valid in this context.
-             *              Otherwise, throws an exception.
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#getTrustedHtml
-             *
-             * @description
-             * Shorthand method.  `$sce.getTrustedHtml(value)` →
-             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.HTML, value)`}
-             *
-             * @param {*} value The value to pass to `$sce.getTrusted`.
-             * @returns {*} The return value of `$sce.getTrusted($sce.HTML, value)`
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#getTrustedCss
-             *
-             * @description
-             * Shorthand method.  `$sce.getTrustedCss(value)` →
-             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.CSS, value)`}
-             *
-             * @param {*} value The value to pass to `$sce.getTrusted`.
-             * @returns {*} The return value of `$sce.getTrusted($sce.CSS, value)`
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#getTrustedUrl
-             *
-             * @description
-             * Shorthand method.  `$sce.getTrustedUrl(value)` →
-             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.URL, value)`}
-             *
-             * @param {*} value The value to pass to `$sce.getTrusted`.
-             * @returns {*} The return value of `$sce.getTrusted($sce.URL, value)`
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#getTrustedResourceUrl
-             *
-             * @description
-             * Shorthand method.  `$sce.getTrustedResourceUrl(value)` →
-             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.RESOURCE_URL, value)`}
-             *
-             * @param {*} value The value to pass to `$sceDelegate.getTrusted`.
-             * @returns {*} The return value of `$sce.getTrusted($sce.RESOURCE_URL, value)`
-             */
-
-            /**
-             * @ngdoc method
-             * @name $sce#getTrustedJs
-             *
-             * @description
-             * Shorthand method.  `$sce.getTrustedJs(value)` →
-             *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.JS, value)`}
-             *
-             * @param {*} value The value to pass to `$sce.getTrusted`.
-             * @returns {*} The return value of `$sce.getTrusted($sce.JS, value)`
-             */
+        ngAttributeAliasDirectives[normalized] = function() {
+            return {
+                restrict: 'A',
+                priority: 100,
+                link: linkFn
+            };
+        };
+    });
 
-            /**
-             * @ngdoc method
-             * @name $sce#parseAsHtml
-             *
-             * @description
-             * Shorthand method.  `$sce.parseAsHtml(expression string)` →
-             *     {@link ng.$sce#parse `$sce.parseAs($sce.HTML, value)`}
-             *
-             * @param {string} expression String expression to compile.
-             * @returns {function(context, locals)} a function which represents the compiled expression:
-             *
-             *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-             *      are evaluated against (typically a scope object).
-             *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-             *      `context`.
-             */
+// aliased input attrs are evaluated
+    forEach(ALIASED_ATTR, function(htmlAttr, ngAttr) {
+        ngAttributeAliasDirectives[ngAttr] = function() {
+            return {
+                priority: 100,
+                link: function(scope, element, attr) {
+                    //special case ngPattern when a literal regular expression value
+                    //is used as the expression (this way we don't have to watch anything).
+                    if (ngAttr === 'ngPattern' && attr.ngPattern.charAt(0) === '/') {
+                        var match = attr.ngPattern.match(REGEX_STRING_REGEXP);
+                        if (match) {
+                            attr.$set('ngPattern', new RegExp(match[1], match[2]));
+                            return;
+                        }
+                    }
 
-            /**
-             * @ngdoc method
-             * @name $sce#parseAsCss
-             *
-             * @description
-             * Shorthand method.  `$sce.parseAsCss(value)` →
-             *     {@link ng.$sce#parse `$sce.parseAs($sce.CSS, value)`}
-             *
-             * @param {string} expression String expression to compile.
-             * @returns {function(context, locals)} a function which represents the compiled expression:
-             *
-             *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-             *      are evaluated against (typically a scope object).
-             *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-             *      `context`.
-             */
+                    scope.$watch(attr[ngAttr], function ngAttrAliasWatchAction(value) {
+                        attr.$set(ngAttr, value);
+                    });
+                }
+            };
+        };
+    });
 
-            /**
-             * @ngdoc method
-             * @name $sce#parseAsUrl
-             *
-             * @description
-             * Shorthand method.  `$sce.parseAsUrl(value)` →
-             *     {@link ng.$sce#parse `$sce.parseAs($sce.URL, value)`}
-             *
-             * @param {string} expression String expression to compile.
-             * @returns {function(context, locals)} a function which represents the compiled expression:
-             *
-             *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-             *      are evaluated against (typically a scope object).
-             *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-             *      `context`.
-             */
+// ng-src, ng-srcset, ng-href are interpolated
+    forEach(['src', 'srcset', 'href'], function(attrName) {
+        var normalized = directiveNormalize('ng-' + attrName);
+        ngAttributeAliasDirectives[normalized] = function() {
+            return {
+                priority: 99, // it needs to run after the attributes are interpolated
+                link: function(scope, element, attr) {
+                    var propName = attrName,
+                        name = attrName;
 
-            /**
-             * @ngdoc method
-             * @name $sce#parseAsResourceUrl
-             *
-             * @description
-             * Shorthand method.  `$sce.parseAsResourceUrl(value)` →
-             *     {@link ng.$sce#parse `$sce.parseAs($sce.RESOURCE_URL, value)`}
-             *
-             * @param {string} expression String expression to compile.
-             * @returns {function(context, locals)} a function which represents the compiled expression:
-             *
-             *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-             *      are evaluated against (typically a scope object).
-             *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-             *      `context`.
-             */
+                    if (attrName === 'href' &&
+                        toString.call(element.prop('href')) === '[object SVGAnimatedString]') {
+                        name = 'xlinkHref';
+                        attr.$attr[name] = 'xlink:href';
+                        propName = null;
+                    }
 
-            /**
-             * @ngdoc method
-             * @name $sce#parseAsJs
-             *
-             * @description
-             * Shorthand method.  `$sce.parseAsJs(value)` →
-             *     {@link ng.$sce#parse `$sce.parseAs($sce.JS, value)`}
-             *
-             * @param {string} expression String expression to compile.
-             * @returns {function(context, locals)} a function which represents the compiled expression:
-             *
-             *    * `context` – `{object}` – an object against which any expressions embedded in the strings
-             *      are evaluated against (typically a scope object).
-             *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
-             *      `context`.
-             */
+                    attr.$observe(normalized, function(value) {
+                        if (!value) {
+                            if (attrName === 'href') {
+                                attr.$set(name, null);
+                            }
+                            return;
+                        }
 
-            // Shorthand delegations.
-            var parse = sce.parseAs,
-                getTrusted = sce.getTrusted,
-                trustAs = sce.trustAs;
+                        attr.$set(name, value);
 
-            forEach(SCE_CONTEXTS, function (enumValue, name) {
-                var lName = lowercase(name);
-                sce[camelCase("parse_as_" + lName)] = function (expr) {
-                    return parse(enumValue, expr);
-                };
-                sce[camelCase("get_trusted_" + lName)] = function (value) {
-                    return getTrusted(enumValue, value);
-                };
-                sce[camelCase("trust_as_" + lName)] = function (value) {
-                    return trustAs(enumValue, value);
-                };
-            });
+                        // Support: IE 9-11 only
+                        // On IE, if "ng:src" directive declaration is used and "src" attribute doesn't exist
+                        // then calling element.setAttribute('src', 'foo') doesn't do anything, so we need
+                        // to set the property as well to achieve the desired effect.
+                        // We use attr[attrName] value since $set can sanitize the url.
+                        if (msie && propName) element.prop(propName, attr[name]);
+                    });
+                }
+            };
+        };
+    });
 
-            return sce;
-        }];
+    /* global -nullFormCtrl, -PENDING_CLASS, -SUBMITTED_CLASS
+ */
+    var nullFormCtrl = {
+            $addControl: noop,
+            $$renameControl: nullFormRenameControl,
+            $removeControl: noop,
+            $setValidity: noop,
+            $setDirty: noop,
+            $setPristine: noop,
+            $setSubmitted: noop
+        },
+        PENDING_CLASS = 'ng-pending',
+        SUBMITTED_CLASS = 'ng-submitted';
+
+    function nullFormRenameControl(control, name) {
+        control.$name = name;
     }
 
     /**
-     * !!! This is an undocumented "private" service !!!
+     * @ngdoc type
+     * @name form.FormController
      *
-     * @name $sniffer
-     * @requires $window
-     * @requires $document
+     * @property {boolean} $pristine True if user has not interacted with the form yet.
+     * @property {boolean} $dirty True if user has already interacted with the form.
+     * @property {boolean} $valid True if all of the containing forms and controls are valid.
+     * @property {boolean} $invalid True if at least one containing control or form is invalid.
+     * @property {boolean} $submitted True if user has submitted the form even if its invalid.
      *
-     * @property {boolean} history Does the browser support html5 history api ?
-     * @property {boolean} hashchange Does the browser support hashchange event ?
-     * @property {boolean} transitions Does the browser support CSS transition events ?
-     * @property {boolean} animations Does the browser support CSS animation events ?
+     * @property {Object} $pending An object hash, containing references to controls or forms with
+     *  pending validators, where:
+     *
+     *  - keys are validations tokens (error names).
+     *  - values are arrays of controls or forms that have a pending validator for the given error name.
+     *
+     * See {@link form.FormController#$error $error} for a list of built-in validation tokens.
+     *
+     * @property {Object} $error An object hash, containing references to controls or forms with failing
+     *  validators, where:
+     *
+     *  - keys are validation tokens (error names),
+     *  - values are arrays of controls or forms that have a failing validator for the given error name.
+     *
+     *  Built-in validation tokens:
+     *  - `email`
+     *  - `max`
+     *  - `maxlength`
+     *  - `min`
+     *  - `minlength`
+     *  - `number`
+     *  - `pattern`
+     *  - `required`
+     *  - `url`
+     *  - `date`
+     *  - `datetimelocal`
+     *  - `time`
+     *  - `week`
+     *  - `month`
      *
      * @description
-     * This is very simple implementation of testing browser's features.
+     * `FormController` keeps track of all its controls and nested forms as well as the state of them,
+     * such as being valid/invalid or dirty/pristine.
+     *
+     * Each {@link ng.directive:form form} directive creates an instance
+     * of `FormController`.
+     *
      */
-    function $SnifferProvider() {
-        this.$get = ['$window', '$document', function($window, $document) {
-            var eventSupport = {},
-                android =
-                    int((/android (\d+)/.exec(lowercase(($window.navigator || {}).userAgent)) || [])[1]),
-                boxee = /Boxee/i.test(($window.navigator || {}).userAgent),
-                document = $document[0] || {},
-                documentMode = document.documentMode,
-                vendorPrefix,
-                vendorRegex = /^(Moz|webkit|O|ms)(?=[A-Z])/,
-                bodyStyle = document.body && document.body.style,
-                transitions = false,
-                animations = false,
-                match;
-
-            if (bodyStyle) {
-                for(var prop in bodyStyle) {
-                    if(match = vendorRegex.exec(prop)) {
-                        vendorPrefix = match[0];
-                        vendorPrefix = vendorPrefix.substr(0, 1).toUpperCase() + vendorPrefix.substr(1);
-                        break;
-                    }
-                }
-
-                if(!vendorPrefix) {
-                    vendorPrefix = ('WebkitOpacity' in bodyStyle) && 'webkit';
-                }
+//asks for $scope to fool the BC controller module
+    FormController.$inject = ['$element', '$attrs', '$scope', '$animate', '$interpolate'];
+    function FormController($element, $attrs, $scope, $animate, $interpolate) {
+        this.$$controls = [];
 
-                transitions = !!(('transition' in bodyStyle) || (vendorPrefix + 'Transition' in bodyStyle));
-                animations  = !!(('animation' in bodyStyle) || (vendorPrefix + 'Animation' in bodyStyle));
+        // init state
+        this.$error = {};
+        this.$$success = {};
+        this.$pending = undefined;
+        this.$name = $interpolate($attrs.name || $attrs.ngForm || '')($scope);
+        this.$dirty = false;
+        this.$pristine = true;
+        this.$valid = true;
+        this.$invalid = false;
+        this.$submitted = false;
+        this.$$parentForm = nullFormCtrl;
+
+        this.$$element = $element;
+        this.$$animate = $animate;
+
+        setupValidity(this);
+    }
 
-                if (android && (!transitions||!animations)) {
-                    transitions = isString(document.body.style.webkitTransition);
-                    animations = isString(document.body.style.webkitAnimation);
-                }
-            }
+    FormController.prototype = {
+        /**
+         * @ngdoc method
+         * @name form.FormController#$rollbackViewValue
+         *
+         * @description
+         * Rollback all form controls pending updates to the `$modelValue`.
+         *
+         * Updates may be pending by a debounced event or because the input is waiting for a some future
+         * event defined in `ng-model-options`. This method is typically needed by the reset button of
+         * a form that uses `ng-model-options` to pend updates.
+         */
+        $rollbackViewValue: function() {
+            forEach(this.$$controls, function(control) {
+                control.$rollbackViewValue();
+            });
+        },
 
+        /**
+         * @ngdoc method
+         * @name form.FormController#$commitViewValue
+         *
+         * @description
+         * Commit all form controls pending updates to the `$modelValue`.
+         *
+         * Updates may be pending by a debounced event or because the input is waiting for a some future
+         * event defined in `ng-model-options`. This method is rarely needed as `NgModelController`
+         * usually handles calling this in response to input events.
+         */
+        $commitViewValue: function() {
+            forEach(this.$$controls, function(control) {
+                control.$commitViewValue();
+            });
+        },
 
-            return {
-                // Android has history.pushState, but it does not update location correctly
-                // so let's not use the history API at all.
-                // http://code.google.com/p/android/issues/detail?id=17471
-                // https://github.com/angular/angular.js/issues/904
+        /**
+         * @ngdoc method
+         * @name form.FormController#$addControl
+         * @param {object} control control object, either a {@link form.FormController} or an
+         * {@link ngModel.NgModelController}
+         *
+         * @description
+         * Register a control with the form. Input elements using ngModelController do this automatically
+         * when they are linked.
+         *
+         * Note that the current state of the control will not be reflected on the new parent form. This
+         * is not an issue with normal use, as freshly compiled and linked controls are in a `$pristine`
+         * state.
+         *
+         * However, if the method is used programmatically, for example by adding dynamically created controls,
+         * or controls that have been previously removed without destroying their corresponding DOM element,
+         * it's the developers responsibility to make sure the current state propagates to the parent form.
+         *
+         * For example, if an input control is added that is already `$dirty` and has `$error` properties,
+         * calling `$setDirty()` and `$validate()` afterwards will propagate the state to the parent form.
+         */
+        $addControl: function(control) {
+            // Breaking change - before, inputs whose name was "hasOwnProperty" were quietly ignored
+            // and not added to the scope.  Now we throw an error.
+            assertNotHasOwnProperty(control.$name, 'input');
+            this.$$controls.push(control);
 
-                // older webkit browser (533.9) on Boxee box has exactly the same problem as Android has
-                // so let's not use the history API also
-                // We are purposefully using `!(android < 4)` to cover the case when `android` is undefined
-                // jshint -W018
-                history: !!($window.history && $window.history.pushState && !(android < 4) && !boxee),
-                // jshint +W018
-                hashchange: 'onhashchange' in $window &&
-                    // IE8 compatible mode lies
-                (!documentMode || documentMode > 7),
-                hasEvent: function(event) {
-                    // IE9 implements 'input' event it's so fubared that we rather pretend that it doesn't have
-                    // it. In particular the event is not fired when backspace or delete key are pressed or
-                    // when cut operation is performed.
-                    if (event == 'input' && msie == 9) return false;
+            if (control.$name) {
+                this[control.$name] = control;
+            }
 
-                    if (isUndefined(eventSupport[event])) {
-                        var divElm = document.createElement('div');
-                        eventSupport[event] = 'on' + event in divElm;
-                    }
+            control.$$parentForm = this;
+        },
 
-                    return eventSupport[event];
-                },
-                csp: csp(),
-                vendorPrefix: vendorPrefix,
-                transitions : transitions,
-                animations : animations,
-                android: android,
-                msie : msie,
-                msieDocumentMode: documentMode
-            };
-        }];
-    }
+        // Private API: rename a form control
+        $$renameControl: function(control, newName) {
+            var oldName = control.$name;
 
-    function $TimeoutProvider() {
-        this.$get = ['$rootScope', '$browser', '$q', '$exceptionHandler',
-            function($rootScope,   $browser,   $q,   $exceptionHandler) {
-                var deferreds = {};
+            if (this[oldName] === control) {
+                delete this[oldName];
+            }
+            this[newName] = control;
+            control.$name = newName;
+        },
 
+        /**
+         * @ngdoc method
+         * @name form.FormController#$removeControl
+         * @param {object} control control object, either a {@link form.FormController} or an
+         * {@link ngModel.NgModelController}
+         *
+         * @description
+         * Deregister a control from the form.
+         *
+         * Input elements using ngModelController do this automatically when they are destroyed.
+         *
+         * Note that only the removed control's validation state (`$errors`etc.) will be removed from the
+         * form. `$dirty`, `$submitted` states will not be changed, because the expected behavior can be
+         * different from case to case. For example, removing the only `$dirty` control from a form may or
+         * may not mean that the form is still `$dirty`.
+         */
+        $removeControl: function(control) {
+            if (control.$name && this[control.$name] === control) {
+                delete this[control.$name];
+            }
+            forEach(this.$pending, function(value, name) {
+                // eslint-disable-next-line no-invalid-this
+                this.$setValidity(name, null, control);
+            }, this);
+            forEach(this.$error, function(value, name) {
+                // eslint-disable-next-line no-invalid-this
+                this.$setValidity(name, null, control);
+            }, this);
+            forEach(this.$$success, function(value, name) {
+                // eslint-disable-next-line no-invalid-this
+                this.$setValidity(name, null, control);
+            }, this);
+
+            arrayRemove(this.$$controls, control);
+            control.$$parentForm = nullFormCtrl;
+        },
 
-                /**
-                 * @ngdoc service
-                 * @name $timeout
-                 *
-                 * @description
-                 * Angular's wrapper for `window.setTimeout`. The `fn` function is wrapped into a try/catch
-                 * block and delegates any exceptions to
-                 * {@link ng.$exceptionHandler $exceptionHandler} service.
-                 *
-                 * The return value of registering a timeout function is a promise, which will be resolved when
-                 * the timeout is reached and the timeout function is executed.
-                 *
-                 * To cancel a timeout request, call `$timeout.cancel(promise)`.
-                 *
-                 * In tests you can use {@link ngMock.$timeout `$timeout.flush()`} to
-                 * synchronously flush the queue of deferred functions.
-                 *
-                 * @param {function()} fn A function, whose execution should be delayed.
-                 * @param {number=} [delay=0] Delay in milliseconds.
-                 * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
-                 *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
-                 * @returns {Promise} Promise that will be resolved when the timeout is reached. The value this
-                 *   promise will be resolved with is the return value of the `fn` function.
-                 *
-                 */
-                function timeout(fn, delay, invokeApply) {
-                    var deferred = $q.defer(),
-                        promise = deferred.promise,
-                        skipApply = (isDefined(invokeApply) && !invokeApply),
-                        timeoutId;
+        /**
+         * @ngdoc method
+         * @name form.FormController#$setDirty
+         *
+         * @description
+         * Sets the form to a dirty state.
+         *
+         * This method can be called to add the 'ng-dirty' class and set the form to a dirty
+         * state (ng-dirty class). This method will also propagate to parent forms.
+         */
+        $setDirty: function() {
+            this.$$animate.removeClass(this.$$element, PRISTINE_CLASS);
+            this.$$animate.addClass(this.$$element, DIRTY_CLASS);
+            this.$dirty = true;
+            this.$pristine = false;
+            this.$$parentForm.$setDirty();
+        },
 
-                    timeoutId = $browser.defer(function() {
-                        try {
-                            deferred.resolve(fn());
-                        } catch(e) {
-                            deferred.reject(e);
-                            $exceptionHandler(e);
-                        }
-                        finally {
-                            delete deferreds[promise.$$timeoutId];
-                        }
+        /**
+         * @ngdoc method
+         * @name form.FormController#$setPristine
+         *
+         * @description
+         * Sets the form to its pristine state.
+         *
+         * This method sets the form's `$pristine` state to true, the `$dirty` state to false, removes
+         * the `ng-dirty` class and adds the `ng-pristine` class. Additionally, it sets the `$submitted`
+         * state to false.
+         *
+         * This method will also propagate to all the controls contained in this form.
+         *
+         * Setting a form back to a pristine state is often useful when we want to 'reuse' a form after
+         * saving or resetting it.
+         */
+        $setPristine: function() {
+            this.$$animate.setClass(this.$$element, PRISTINE_CLASS, DIRTY_CLASS + ' ' + SUBMITTED_CLASS);
+            this.$dirty = false;
+            this.$pristine = true;
+            this.$submitted = false;
+            forEach(this.$$controls, function(control) {
+                control.$setPristine();
+            });
+        },
 
-                        if (!skipApply) $rootScope.$apply();
-                    }, delay);
+        /**
+         * @ngdoc method
+         * @name form.FormController#$setUntouched
+         *
+         * @description
+         * Sets the form to its untouched state.
+         *
+         * This method can be called to remove the 'ng-touched' class and set the form controls to their
+         * untouched state (ng-untouched class).
+         *
+         * Setting a form controls back to their untouched state is often useful when setting the form
+         * back to its pristine state.
+         */
+        $setUntouched: function() {
+            forEach(this.$$controls, function(control) {
+                control.$setUntouched();
+            });
+        },
 
-                    promise.$$timeoutId = timeoutId;
-                    deferreds[timeoutId] = deferred;
+        /**
+         * @ngdoc method
+         * @name form.FormController#$setSubmitted
+         *
+         * @description
+         * Sets the form to its submitted state.
+         */
+        $setSubmitted: function() {
+            this.$$animate.addClass(this.$$element, SUBMITTED_CLASS);
+            this.$submitted = true;
+            this.$$parentForm.$setSubmitted();
+        }
+    };
 
-                    return promise;
+    /**
+     * @ngdoc method
+     * @name form.FormController#$setValidity
+     *
+     * @description
+     * Change the validity state of the form, and notify the parent form (if any).
+     *
+     * Application developers will rarely need to call this method directly. It is used internally, by
+     * {@link ngModel.NgModelController#$setValidity NgModelController.$setValidity()}, to propagate a
+     * control's validity state to the parent `FormController`.
+     *
+     * @param {string} validationErrorKey Name of the validator. The `validationErrorKey` will be
+     *        assigned to either `$error[validationErrorKey]` or `$pending[validationErrorKey]` (for
+     *        unfulfilled `$asyncValidators`), so that it is available for data-binding. The
+     *        `validationErrorKey` should be in camelCase and will get converted into dash-case for
+     *        class name. Example: `myError` will result in `ng-valid-my-error` and
+     *        `ng-invalid-my-error` classes and can be bound to as `{{ someForm.$error.myError }}`.
+     * @param {boolean} isValid Whether the current state is valid (true), invalid (false), pending
+     *        (undefined),  or skipped (null). Pending is used for unfulfilled `$asyncValidators`.
+     *        Skipped is used by AngularJS when validators do not run because of parse errors and when
+     *        `$asyncValidators` do not run because any of the `$validators` failed.
+     * @param {NgModelController | FormController} controller - The controller whose validity state is
+     *        triggering the change.
+     */
+    addSetValidityMethod({
+        clazz: FormController,
+        set: function(object, property, controller) {
+            var list = object[property];
+            if (!list) {
+                object[property] = [controller];
+            } else {
+                var index = list.indexOf(controller);
+                if (index === -1) {
+                    list.push(controller);
                 }
+            }
+        },
+        unset: function(object, property, controller) {
+            var list = object[property];
+            if (!list) {
+                return;
+            }
+            arrayRemove(list, controller);
+            if (list.length === 0) {
+                delete object[property];
+            }
+        }
+    });
 
-
-                /**
-                 * @ngdoc method
-                 * @name $timeout#cancel
-                 *
-                 * @description
-                 * Cancels a task associated with the `promise`. As a result of this, the promise will be
-                 * resolved with a rejection.
-                 *
-                 * @param {Promise=} promise Promise returned by the `$timeout` function.
-                 * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully
-                 *   canceled.
-                 */
-                timeout.cancel = function(promise) {
-                    if (promise && promise.$$timeoutId in deferreds) {
-                        deferreds[promise.$$timeoutId].reject('canceled');
-                        delete deferreds[promise.$$timeoutId];
-                        return $browser.defer.cancel(promise.$$timeoutId);
-                    }
-                    return false;
-                };
-
-                return timeout;
-            }];
-    }
-
-// NOTE:  The usage of window and document instead of $window and $document here is
-// deliberate.  This service depends on the specific behavior of anchor nodes created by the
-// browser (resolving and parsing URLs) that is unlikely to be provided by mock objects and
-// cause us to break tests.  In addition, when the browser resolves a URL for XHR, it
-// doesn't know about mocked locations and resolves URLs to the real document - which is
-// exactly the behavior needed here.  There is little value is mocking these out for this
-// service.
-    var urlParsingNode = document.createElement("a");
-    var originUrl = urlResolve(window.location.href, true);
-
+    /**
+     * @ngdoc directive
+     * @name ngForm
+     * @restrict EAC
+     *
+     * @description
+     * Nestable alias of {@link ng.directive:form `form`} directive. HTML
+     * does not allow nesting of form elements. It is useful to nest forms, for example if the validity of a
+     * sub-group of controls needs to be determined.
+     *
+     * Note: the purpose of `ngForm` is to group controls,
+     * but not to be a replacement for the `<form>` tag with all of its capabilities
+     * (e.g. posting to the server, ...).
+     *
+     * @param {string=} ngForm|name Name of the form. If specified, the form controller will be published into
+     *                       related scope, under this name.
+     *
+     */
 
     /**
+     * @ngdoc directive
+     * @name form
+     * @restrict E
      *
-     * Implementation Notes for non-IE browsers
-     * ----------------------------------------
-     * Assigning a URL to the href property of an anchor DOM node, even one attached to the DOM,
-     * results both in the normalizing and parsing of the URL.  Normalizing means that a relative
-     * URL will be resolved into an absolute URL in the context of the application document.
-     * Parsing means that the anchor node's host, hostname, protocol, port, pathname and related
-     * properties are all populated to reflect the normalized URL.  This approach has wide
-     * compatibility - Safari 1+, Mozilla 1+, Opera 7+,e etc.  See
-     * http://www.aptana.com/reference/html/api/HTMLAnchorElement.html
+     * @description
+     * Directive that instantiates
+     * {@link form.FormController FormController}.
      *
-     * Implementation Notes for IE
-     * ---------------------------
-     * IE >= 8 and <= 10 normalizes the URL when assigned to the anchor node similar to the other
-     * browsers.  However, the parsed components will not be set if the URL assigned did not specify
-     * them.  (e.g. if you assign a.href = "foo", then a.protocol, a.host, etc. will be empty.)  We
-     * work around that by performing the parsing in a 2nd step by taking a previously normalized
-     * URL (e.g. by assigning to a.href) and assigning it a.href again.  This correctly populates the
-     * properties such as protocol, hostname, port, etc.
+     * If the `name` attribute is specified, the form controller is published onto the current scope under
+     * this name.
      *
-     * IE7 does not normalize the URL when assigned to an anchor node.  (Apparently, it does, if one
-     * uses the inner HTML approach to assign the URL as part of an HTML snippet -
-     * http://stackoverflow.com/a/472729)  However, setting img[src] does normalize the URL.
-     * Unfortunately, setting img[src] to something like "javascript:foo" on IE throws an exception.
-     * Since the primary usage for normalizing URLs is to sanitize such URLs, we can't use that
-     * method and IE < 8 is unsupported.
+     * ## Alias: {@link ng.directive:ngForm `ngForm`}
      *
-     * References:
-     *   http://developer.mozilla.org/en-US/docs/Web/API/HTMLAnchorElement
-     *   http://www.aptana.com/reference/html/api/HTMLAnchorElement.html
-     *   http://url.spec.whatwg.org/#urlutils
-     *   https://github.com/angular/angular.js/pull/2902
-     *   http://james.padolsey.com/javascript/parsing-urls-with-the-dom/
+     * In AngularJS, forms can be nested. This means that the outer form is valid when all of the child
+     * forms are valid as well. However, browsers do not allow nesting of `<form>` elements, so
+     * AngularJS provides the {@link ng.directive:ngForm `ngForm`} directive, which behaves identically to
+     * `form` but can be nested. Nested forms can be useful, for example, if the validity of a sub-group
+     * of controls needs to be determined.
      *
-     * @function
-     * @param {string} url The URL to be parsed.
-     * @description Normalizes and parses a URL.
-     * @returns {object} Returns the normalized URL as a dictionary.
+     * ## CSS classes
+     *  - `ng-valid` is set if the form is valid.
+     *  - `ng-invalid` is set if the form is invalid.
+     *  - `ng-pending` is set if the form is pending.
+     *  - `ng-pristine` is set if the form is pristine.
+     *  - `ng-dirty` is set if the form is dirty.
+     *  - `ng-submitted` is set if the form was submitted.
      *
-     *   | member name   | Description    |
-     *   |---------------|----------------|
-     *   | href          | A normalized version of the provided URL if it was not an absolute URL |
-     *   | protocol      | The protocol including the trailing colon                              |
-     *   | host          | The host and port (if the port is non-default) of the normalizedUrl    |
-     *   | search        | The search params, minus the question mark                             |
-     *   | hash          | The hash string, minus the hash symbol
-     *   | hostname      | The hostname
-     *   | port          | The port, without ":"
-     *   | pathname      | The pathname, beginning with "/"
+     * Keep in mind that ngAnimate can detect each of these classes when added and removed.
+     *
+     *
+     * ## Submitting a form and preventing the default action
+     *
+     * Since the role of forms in client-side AngularJS applications is different than in classical
+     * roundtrip apps, it is desirable for the browser not to translate the form submission into a full
+     * page reload that sends the data to the server. Instead some javascript logic should be triggered
+     * to handle the form submission in an application-specific way.
+     *
+     * For this reason, AngularJS prevents the default action (form submission to the server) unless the
+     * `<form>` element has an `action` attribute specified.
+     *
+     * You can use one of the following two ways to specify what javascript method should be called when
+     * a form is submitted:
+     *
+     * - {@link ng.directive:ngSubmit ngSubmit} directive on the form element
+     * - {@link ng.directive:ngClick ngClick} directive on the first
+     *  button or input field of type submit (input[type=submit])
+     *
+     * To prevent double execution of the handler, use only one of the {@link ng.directive:ngSubmit ngSubmit}
+     * or {@link ng.directive:ngClick ngClick} directives.
+     * This is because of the following form submission rules in the HTML specification:
+     *
+     * - If a form has only one input field then hitting enter in this field triggers form submit
+     * (`ngSubmit`)
+     * - if a form has 2+ input fields and no buttons or input[type=submit] then hitting enter
+     * doesn't trigger submit
+     * - if a form has one or more input fields and one or more buttons or input[type=submit] then
+     * hitting enter in any of the input fields will trigger the click handler on the *first* button or
+     * input[type=submit] (`ngClick`) *and* a submit handler on the enclosing form (`ngSubmit`)
+     *
+     * Any pending `ngModelOptions` changes will take place immediately when an enclosing form is
+     * submitted. Note that `ngClick` events will occur before the model is updated. Use `ngSubmit`
+     * to have access to the updated model.
+     *
+     * @animations
+     * Animations in ngForm are triggered when any of the associated CSS classes are added and removed.
+     * These classes are: `.ng-pristine`, `.ng-dirty`, `.ng-invalid` and `.ng-valid` as well as any
+     * other validations that are performed within the form. Animations in ngForm are similar to how
+     * they work in ngClass and animations can be hooked into using CSS transitions, keyframes as well
+     * as JS animations.
+     *
+     * The following example shows a simple way to utilize CSS transitions to style a form element
+     * that has been rendered as invalid after it has been validated:
+     *
+     * <pre>
+     * //be sure to include ngAnimate as a module to hook into more
+     * //advanced animations
+     * .my-form {
+     *   transition:0.5s linear all;
+     *   background: white;
+     * }
+     * .my-form.ng-invalid {
+     *   background: red;
+     *   color:white;
+     * }
+     * </pre>
+     *
+     * @example
+     <example name="ng-form" deps="angular-animate.js" animations="true" fixBase="true" module="formExample">
+     <file name="index.html">
+     <script>
+     angular.module('formExample', [])
+     .controller('FormController', ['$scope', function($scope) {
+             $scope.userType = 'guest';
+           }]);
+     </script>
+     <style>
+     .my-form {
+          transition:all linear 0.5s;
+          background: transparent;
+        }
+     .my-form.ng-invalid {
+          background: red;
+        }
+     </style>
+     <form name="myForm" ng-controller="FormController" class="my-form">
+     userType: <input name="input" ng-model="userType" required>
+     <span class="error" ng-show="myForm.input.$error.required">Required!</span><br>
+     <code>userType = {{userType}}</code><br>
+     <code>myForm.input.$valid = {{myForm.input.$valid}}</code><br>
+     <code>myForm.input.$error = {{myForm.input.$error}}</code><br>
+     <code>myForm.$valid = {{myForm.$valid}}</code><br>
+     <code>myForm.$error.required = {{!!myForm.$error.required}}</code><br>
+     </form>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should initialize to model', function() {
+          var userType = element(by.binding('userType'));
+          var valid = element(by.binding('myForm.input.$valid'));
+
+          expect(userType.getText()).toContain('guest');
+          expect(valid.getText()).toContain('true');
+        });
+
+     it('should be invalid if empty', function() {
+          var userType = element(by.binding('userType'));
+          var valid = element(by.binding('myForm.input.$valid'));
+          var userInput = element(by.model('userType'));
+
+          userInput.clear();
+          userInput.sendKeys('');
+
+          expect(userType.getText()).toEqual('userType =');
+          expect(valid.getText()).toContain('false');
+        });
+     </file>
+     </example>
      *
+     * @param {string=} name Name of the form. If specified, the form controller will be published into
+     *                       related scope, under this name.
      */
-    function urlResolve(url, base) {
-        var href = url;
+    var formDirectiveFactory = function(isNgForm) {
+        return ['$timeout', '$parse', function($timeout, $parse) {
+            var formDirective = {
+                name: 'form',
+                restrict: isNgForm ? 'EAC' : 'E',
+                require: ['form', '^^?form'], //first is the form's own ctrl, second is an optional parent form
+                controller: FormController,
+                compile: function ngFormCompile(formElement, attr) {
+                    // Setup initial state of the control
+                    formElement.addClass(PRISTINE_CLASS).addClass(VALID_CLASS);
+
+                    var nameAttr = attr.name ? 'name' : (isNgForm && attr.ngForm ? 'ngForm' : false);
+
+                    return {
+                        pre: function ngFormPreLink(scope, formElement, attr, ctrls) {
+                            var controller = ctrls[0];
+
+                            // if `action` attr is not present on the form, prevent the default action (submission)
+                            if (!('action' in attr)) {
+                                // we can't use jq events because if a form is destroyed during submission the default
+                                // action is not prevented. see #1238
+                                //
+                                // IE 9 is not affected because it doesn't fire a submit event and try to do a full
+                                // page reload if the form was destroyed by submission of the form via a click handler
+                                // on a button in the form. Looks like an IE9 specific bug.
+                                var handleFormSubmission = function(event) {
+                                    scope.$apply(function() {
+                                        controller.$commitViewValue();
+                                        controller.$setSubmitted();
+                                    });
+
+                                    event.preventDefault();
+                                };
+
+                                formElement[0].addEventListener('submit', handleFormSubmission);
+
+                                // unregister the preventDefault listener so that we don't not leak memory but in a
+                                // way that will achieve the prevention of the default action.
+                                formElement.on('$destroy', function() {
+                                    $timeout(function() {
+                                        formElement[0].removeEventListener('submit', handleFormSubmission);
+                                    }, 0, false);
+                                });
+                            }
 
-        if (msie) {
-            // Normalize before parse.  Refer Implementation Notes on why this is
-            // done in two steps on IE.
-            urlParsingNode.setAttribute("href", href);
-            href = urlParsingNode.href;
-        }
+                            var parentFormCtrl = ctrls[1] || controller.$$parentForm;
+                            parentFormCtrl.$addControl(controller);
 
-        urlParsingNode.setAttribute('href', href);
+                            var setter = nameAttr ? getSetter(controller.$name) : noop;
 
-        // urlParsingNode provides the UrlUtils interface - http://url.spec.whatwg.org/#urlutils
-        return {
-            href: urlParsingNode.href,
-            protocol: urlParsingNode.protocol ? urlParsingNode.protocol.replace(/:$/, '') : '',
-            host: urlParsingNode.host,
-            search: urlParsingNode.search ? urlParsingNode.search.replace(/^\?/, '') : '',
-            hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '',
-            hostname: urlParsingNode.hostname,
-            port: urlParsingNode.port,
-            pathname: (urlParsingNode.pathname.charAt(0) === '/')
-                ? urlParsingNode.pathname
-                : '/' + urlParsingNode.pathname
-        };
-    }
+                            if (nameAttr) {
+                                setter(scope, controller);
+                                attr.$observe(nameAttr, function(newValue) {
+                                    if (controller.$name === newValue) return;
+                                    setter(scope, undefined);
+                                    controller.$$parentForm.$$renameControl(controller, newValue);
+                                    setter = getSetter(controller.$name);
+                                    setter(scope, controller);
+                                });
+                            }
+                            formElement.on('$destroy', function() {
+                                controller.$$parentForm.$removeControl(controller);
+                                setter(scope, undefined);
+                                extend(controller, nullFormCtrl); //stop propagating child destruction handlers upwards
+                            });
+                        }
+                    };
+                }
+            };
 
-    /**
-     * Parse a request URL and determine whether this is a same-origin request as the application document.
-     *
-     * @param {string|object} requestUrl The url of the request as a string that will be resolved
-     * or a parsed URL object.
-     * @returns {boolean} Whether the request is for the same origin as the application document.
-     */
-    function urlIsSameOrigin(requestUrl) {
-        var parsed = (isString(requestUrl)) ? urlResolve(requestUrl) : requestUrl;
-        return (parsed.protocol === originUrl.protocol &&
-        parsed.host === originUrl.host);
+            return formDirective;
+
+            function getSetter(expression) {
+                if (expression === '') {
+                    //create an assignable expression, so forms with an empty name can be renamed later
+                    return $parse('this[""]').assign;
+                }
+                return $parse(expression).assign || noop;
+            }
+        }];
+    };
+
+    var formDirective = formDirectiveFactory();
+    var ngFormDirective = formDirectiveFactory(true);
+
+
+
+// helper methods
+    function setupValidity(instance) {
+        instance.$$classCache = {};
+        instance.$$classCache[INVALID_CLASS] = !(instance.$$classCache[VALID_CLASS] = instance.$$element.hasClass(VALID_CLASS));
     }
+    function addSetValidityMethod(context) {
+        var clazz = context.clazz,
+            set = context.set,
+            unset = context.unset;
+
+        clazz.prototype.$setValidity = function(validationErrorKey, state, controller) {
+            if (isUndefined(state)) {
+                createAndSet(this, '$pending', validationErrorKey, controller);
+            } else {
+                unsetAndCleanup(this, '$pending', validationErrorKey, controller);
+            }
+            if (!isBoolean(state)) {
+                unset(this.$error, validationErrorKey, controller);
+                unset(this.$$success, validationErrorKey, controller);
+            } else {
+                if (state) {
+                    unset(this.$error, validationErrorKey, controller);
+                    set(this.$$success, validationErrorKey, controller);
+                } else {
+                    set(this.$error, validationErrorKey, controller);
+                    unset(this.$$success, validationErrorKey, controller);
+                }
+            }
+            if (this.$pending) {
+                cachedToggleClass(this, PENDING_CLASS, true);
+                this.$valid = this.$invalid = undefined;
+                toggleValidationCss(this, '', null);
+            } else {
+                cachedToggleClass(this, PENDING_CLASS, false);
+                this.$valid = isObjectEmpty(this.$error);
+                this.$invalid = !this.$valid;
+                toggleValidationCss(this, '', this.$valid);
+            }
 
-    /**
-     * @ngdoc service
-     * @name $window
-     *
-     * @description
-     * A reference to the browser's `window` object. While `window`
-     * is globally available in JavaScript, it causes testability problems, because
-     * it is a global variable. In angular we always refer to it through the
-     * `$window` service, so it may be overridden, removed or mocked for testing.
-     *
-     * Expressions, like the one defined for the `ngClick` directive in the example
-     * below, are evaluated with respect to the current scope.  Therefore, there is
-     * no risk of inadvertently coding in a dependency on a global value in such an
-     * expression.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <script>
-     function Ctrl($scope, $window) {
-           $scope.greeting = 'Hello, World!';
-           $scope.doGreeting = function(greeting) {
-               $window.alert(greeting);
-           };
-         }
-     </script>
-     <div ng-controller="Ctrl">
-     <input type="text" ng-model="greeting" />
-     <button ng-click="doGreeting(greeting)">ALERT</button>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should display the greeting in the input box', function() {
-       element(by.model('greeting')).sendKeys('Hello, E2E Tests');
-       // If we click the button it will block the test runner
-       // element(':button').click();
-      });
-     </file>
-     </example>
-     */
-    function $WindowProvider(){
-        this.$get = valueFn(window);
+            // re-read the state as the set/unset methods could have
+            // combined state in this.$error[validationError] (used for forms),
+            // where setting/unsetting only increments/decrements the value,
+            // and does not replace it.
+            var combinedState;
+            if (this.$pending && this.$pending[validationErrorKey]) {
+                combinedState = undefined;
+            } else if (this.$error[validationErrorKey]) {
+                combinedState = false;
+            } else if (this.$$success[validationErrorKey]) {
+                combinedState = true;
+            } else {
+                combinedState = null;
+            }
+
+            toggleValidationCss(this, validationErrorKey, combinedState);
+            this.$$parentForm.$setValidity(validationErrorKey, combinedState, this);
+        };
+
+        function createAndSet(ctrl, name, value, controller) {
+            if (!ctrl[name]) {
+                ctrl[name] = {};
+            }
+            set(ctrl[name], value, controller);
+        }
+
+        function unsetAndCleanup(ctrl, name, value, controller) {
+            if (ctrl[name]) {
+                unset(ctrl[name], value, controller);
+            }
+            if (isObjectEmpty(ctrl[name])) {
+                ctrl[name] = undefined;
+            }
+        }
+
+        function cachedToggleClass(ctrl, className, switchValue) {
+            if (switchValue && !ctrl.$$classCache[className]) {
+                ctrl.$$animate.addClass(ctrl.$$element, className);
+                ctrl.$$classCache[className] = true;
+            } else if (!switchValue && ctrl.$$classCache[className]) {
+                ctrl.$$animate.removeClass(ctrl.$$element, className);
+                ctrl.$$classCache[className] = false;
+            }
+        }
+
+        function toggleValidationCss(ctrl, validationErrorKey, isValid) {
+            validationErrorKey = validationErrorKey ? '-' + snake_case(validationErrorKey, '-') : '';
+
+            cachedToggleClass(ctrl, VALID_CLASS + validationErrorKey, isValid === true);
+            cachedToggleClass(ctrl, INVALID_CLASS + validationErrorKey, isValid === false);
+        }
     }
 
-    /**
-     * @ngdoc provider
-     * @name $filterProvider
-     * @description
-     *
-     * Filters are just functions which transform input to an output. However filters need to be
-     * Dependency Injected. To achieve this a filter definition consists of a factory function which is
-     * annotated with dependencies and is responsible for creating a filter function.
-     *
-     * ```js
-     *   // Filter registration
-     *   function MyModule($provide, $filterProvider) {
- *     // create a service to demonstrate injection (not always needed)
- *     $provide.value('greet', function(name){
- *       return 'Hello ' + name + '!';
- *     });
- *
- *     // register a filter factory which uses the
- *     // greet service to demonstrate DI.
- *     $filterProvider.register('greet', function(greet){
- *       // return the filter function which uses the greet service
- *       // to generate salutation
- *       return function(text) {
- *         // filters need to be forgiving so check input validity
- *         return text && greet(text) || text;
- *       };
- *     });
- *   }
-     * ```
-     *
-     * The filter function is registered with the `$injector` under the filter name suffix with
-     * `Filter`.
-     *
-     * ```js
-     *   it('should be the same instance', inject(
-     *     function($filterProvider) {
- *       $filterProvider.register('reverse', function(){
- *         return ...;
- *       });
- *     },
-     *     function($filter, reverseFilter) {
- *       expect($filter('reverse')).toBe(reverseFilter);
- *     });
-     * ```
-     *
-     *
-     * For more information about how angular filters work, and how to create your own filters, see
-     * {@link guide/filter Filters} in the Angular Developer Guide.
-     */
-    /**
-     * @ngdoc method
-     * @name $filterProvider#register
-     * @description
-     * Register filter factory function.
-     *
-     * @param {String} name Name of the filter.
-     * @param {Function} fn The filter factory function which is injectable.
-     */
+    function isObjectEmpty(obj) {
+        if (obj) {
+            for (var prop in obj) {
+                if (obj.hasOwnProperty(prop)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
 
+    /* global
+  VALID_CLASS: false,
+  INVALID_CLASS: false,
+  PRISTINE_CLASS: false,
+  DIRTY_CLASS: false,
+  ngModelMinErr: false
+*/
+
+// Regex code was initially obtained from SO prior to modification: https://stackoverflow.com/questions/3143070/javascript-regex-iso-datetime#answer-3143231
+    var ISO_DATE_REGEXP = /^\d{4,}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+(?:[+-][0-2]\d:[0-5]\d|Z)$/;
+// See valid URLs in RFC3987 (http://tools.ietf.org/html/rfc3987)
+// Note: We are being more lenient, because browsers are too.
+//   1. Scheme
+//   2. Slashes
+//   3. Username
+//   4. Password
+//   5. Hostname
+//   6. Port
+//   7. Path
+//   8. Query
+//   9. Fragment
+//                 1111111111111111 222   333333    44444        55555555555555555555555     666     77777777     8888888     999
+    var URL_REGEXP = /^[a-z][a-z\d.+-]*:\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:/?#]+|\[[a-f\d:]+])(?::\d+)?(?:\/[^?#]*)?(?:\?[^#]*)?(?:#.*)?$/i;
+// eslint-disable-next-line max-len
+    var EMAIL_REGEXP = /^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+(\.[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$/;
+    var NUMBER_REGEXP = /^\s*(-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/;
+    var DATE_REGEXP = /^(\d{4,})-(\d{2})-(\d{2})$/;
+    var DATETIMELOCAL_REGEXP = /^(\d{4,})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
+    var WEEK_REGEXP = /^(\d{4,})-W(\d\d)$/;
+    var MONTH_REGEXP = /^(\d{4,})-(\d\d)$/;
+    var TIME_REGEXP = /^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
+
+    var PARTIAL_VALIDATION_EVENTS = 'keydown wheel mousedown';
+    var PARTIAL_VALIDATION_TYPES = createMap();
+    forEach('date,datetime-local,month,time,week'.split(','), function(type) {
+        PARTIAL_VALIDATION_TYPES[type] = true;
+    });
 
-    /**
-     * @ngdoc service
-     * @name $filter
-     * @function
-     * @description
-     * Filters are used for formatting data displayed to the user.
-     *
-     * The general syntax in templates is as follows:
-     *
-     *         {{ expression [| filter_name[:parameter_value] ... ] }}
-     *
-     * @param {String} name Name of the filter function to retrieve
-     * @return {Function} the filter function
-     */
-    $FilterProvider.$inject = ['$provide'];
-    function $FilterProvider($provide) {
-        var suffix = 'Filter';
+    var inputType = {
 
         /**
-         * @ngdoc method
-         * @name $controllerProvider#register
-         * @param {string|Object} name Name of the filter function, or an object map of filters where
-         *    the keys are the filter names and the values are the filter factories.
-         * @returns {Object} Registered filter instance, or if a map of filters was provided then a map
-         *    of the registered filter instances.
+         * @ngdoc input
+         * @name input[text]
+         *
+         * @description
+         * Standard HTML text input with AngularJS data binding, inherited by most of the `input` elements.
+         *
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} required Adds `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+         *    minlength.
+         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+         *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+         *    any length.
+         * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+         *    that contains the regular expression body that will be converted to a regular expression
+         *    as in the ngPattern directive.
+         * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+         *    does not match a RegExp found by evaluating the AngularJS expression given in the attribute value.
+         *    If the expression evaluates to a RegExp object, then this is used directly.
+         *    If the expression evaluates to a string, then it will be converted to a RegExp
+         *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+         *    `new RegExp('^abc$')`.<br />
+         *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+         *    start at the index of the last search's match, thus not taking the whole input value into
+         *    account.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         * @param {boolean=} [ngTrim=true] If set to false AngularJS will not automatically trim the input.
+         *    This parameter is ignored for input[type=password] controls, which will never trim the
+         *    input.
+         *
+         * @example
+         <example name="text-input-directive" module="textInputExample">
+         <file name="index.html">
+         <script>
+         angular.module('textInputExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+               $scope.example = {
+                 text: 'guest',
+                 word: /^\s*\w*\s*$/
+               };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+         <label>Single word:
+         <input type="text" name="input" ng-model="example.text"
+         ng-pattern="example.word" required ng-trim="false">
+         </label>
+         <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+         Required!</span>
+         <span class="error" ng-show="myForm.input.$error.pattern">
+         Single word only!</span>
+         </div>
+         <code>text = {{example.text}}</code><br/>
+         <code>myForm.input.$valid = {{myForm.input.$valid}}</code><br/>
+         <code>myForm.input.$error = {{myForm.input.$error}}</code><br/>
+         <code>myForm.$valid = {{myForm.$valid}}</code><br/>
+         <code>myForm.$error.required = {{!!myForm.$error.required}}</code><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         var text = element(by.binding('example.text'));
+         var valid = element(by.binding('myForm.input.$valid'));
+         var input = element(by.model('example.text'));
+
+         it('should initialize to model', function() {
+            expect(text.getText()).toContain('guest');
+            expect(valid.getText()).toContain('true');
+          });
+
+         it('should be invalid if empty', function() {
+            input.clear();
+            input.sendKeys('');
+
+            expect(text.getText()).toEqual('text =');
+            expect(valid.getText()).toContain('false');
+          });
+
+         it('should be invalid if multi word', function() {
+            input.clear();
+            input.sendKeys('hello world');
+
+            expect(valid.getText()).toContain('false');
+          });
+         </file>
+         </example>
          */
-        function register(name, factory) {
-            if(isObject(name)) {
-                var filters = {};
-                forEach(name, function(filter, key) {
-                    filters[key] = register(key, filter);
-                });
-                return filters;
-            } else {
-                return $provide.factory(name + suffix, factory);
-            }
+        'text': textInputType,
+
+        /**
+         * @ngdoc input
+         * @name input[date]
+         *
+         * @description
+         * Input with date validation and transformation. In browsers that do not yet support
+         * the HTML5 date input, a text element will be used. In that case, text must be entered in a valid ISO-8601
+         * date format (yyyy-MM-dd), for example: `2009-01-06`. Since many
+         * modern browsers do not yet support this input type, it is important to provide cues to users on the
+         * expected input format via a placeholder or label.
+         *
+         * The model must always be a Date object, otherwise AngularJS will throw an error.
+         * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+         *
+         * The timezone to be used to read/write the `Date` instance in the model can be defined using
+         * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`. This must be a
+         *   valid ISO date string (yyyy-MM-dd). You can also use interpolation inside this attribute
+         *   (e.g. `min="{{minDate | date:'yyyy-MM-dd'}}"`). Note that `min` will also add native HTML5
+         *   constraint validation.
+         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`. This must be
+         *   a valid ISO date string (yyyy-MM-dd). You can also use interpolation inside this attribute
+         *   (e.g. `max="{{maxDate | date:'yyyy-MM-dd'}}"`). Note that `max` will also add native HTML5
+         *   constraint validation.
+         * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO date string
+         *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+         * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO date string
+         *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
+         * @param {string=} required Sets `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         <example name="date-input-directive" module="dateInputExample">
+         <file name="index.html">
+         <script>
+         angular.module('dateInputExample', [])
+         .controller('DateController', ['$scope', function($scope) {
+              $scope.example = {
+                value: new Date(2013, 9, 22)
+              };
+            }]);
+         </script>
+         <form name="myForm" ng-controller="DateController as dateCtrl">
+         <label for="exampleInput">Pick a date in 2013:</label>
+         <input type="date" id="exampleInput" name="input" ng-model="example.value"
+         placeholder="yyyy-MM-dd" min="2013-01-01" max="2013-12-31" required />
+         <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+         Required!</span>
+         <span class="error" ng-show="myForm.input.$error.date">
+         Not a valid date!</span>
+         </div>
+         <tt>value = {{example.value | date: "yyyy-MM-dd"}}</tt><br/>
+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         var value = element(by.binding('example.value | date: "yyyy-MM-dd"'));
+         var valid = element(by.binding('myForm.input.$valid'));
+
+         // currently protractor/webdriver does not support
+         // sending keys to all known HTML5 input controls
+         // for various browsers (see https://github.com/angular/protractor/issues/562).
+         function setInput(val) {
+          // set the value of the element and force validation.
+          var scr = "var ipt = document.getElementById('exampleInput'); " +
+          "ipt.value = '" + val + "';" +
+          "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+          browser.executeScript(scr);
         }
-        this.register = register;
 
-        this.$get = ['$injector', function($injector) {
-            return function(name) {
-                return $injector.get(name + suffix);
-            };
-        }];
+         it('should initialize to model', function() {
+          expect(value.getText()).toContain('2013-10-22');
+          expect(valid.getText()).toContain('myForm.input.$valid = true');
+        });
 
-        ////////////////////////////////////////
+         it('should be invalid if empty', function() {
+          setInput('');
+          expect(value.getText()).toEqual('value =');
+          expect(valid.getText()).toContain('myForm.input.$valid = false');
+        });
 
-        /* global
-         currencyFilter: false,
-         dateFilter: false,
-         filterFilter: false,
-         jsonFilter: false,
-         limitToFilter: false,
-         lowercaseFilter: false,
-         numberFilter: false,
-         orderByFilter: false,
-         uppercaseFilter: false,
+         it('should be invalid if over max', function() {
+          setInput('2015-01-01');
+          expect(value.getText()).toContain('');
+          expect(valid.getText()).toContain('myForm.input.$valid = false');
+        });
+         </file>
+         </example>
          */
+        'date': createDateInputType('date', DATE_REGEXP,
+            createDateParser(DATE_REGEXP, ['yyyy', 'MM', 'dd']),
+            'yyyy-MM-dd'),
 
-        register('currency', currencyFilter);
-        register('date', dateFilter);
-        register('filter', filterFilter);
-        register('json', jsonFilter);
-        register('limitTo', limitToFilter);
-        register('lowercase', lowercaseFilter);
-        register('number', numberFilter);
-        register('orderBy', orderByFilter);
-        register('uppercase', uppercaseFilter);
-    }
+        /**
+         * @ngdoc input
+         * @name input[datetime-local]
+         *
+         * @description
+         * Input with datetime validation and transformation. In browsers that do not yet support
+         * the HTML5 date input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+         * local datetime format (yyyy-MM-ddTHH:mm:ss), for example: `2010-12-28T14:57:00`.
+         *
+         * The model must always be a Date object, otherwise AngularJS will throw an error.
+         * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+         *
+         * The timezone to be used to read/write the `Date` instance in the model can be defined using
+         * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+         *   This must be a valid ISO datetime format (yyyy-MM-ddTHH:mm:ss). You can also use interpolation
+         *   inside this attribute (e.g. `min="{{minDatetimeLocal | date:'yyyy-MM-ddTHH:mm:ss'}}"`).
+         *   Note that `min` will also add native HTML5 constraint validation.
+         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+         *   This must be a valid ISO datetime format (yyyy-MM-ddTHH:mm:ss). You can also use interpolation
+         *   inside this attribute (e.g. `max="{{maxDatetimeLocal | date:'yyyy-MM-ddTHH:mm:ss'}}"`).
+         *   Note that `max` will also add native HTML5 constraint validation.
+         * @param {(date|string)=} ngMin Sets the `min` validation error key to the Date / ISO datetime string
+         *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+         * @param {(date|string)=} ngMax Sets the `max` validation error key to the Date / ISO datetime string
+         *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
+         * @param {string=} required Sets `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         <example name="datetimelocal-input-directive" module="dateExample">
+         <file name="index.html">
+         <script>
+         angular.module('dateExample', [])
+         .controller('DateController', ['$scope', function($scope) {
+            $scope.example = {
+              value: new Date(2010, 11, 28, 14, 57)
+            };
+          }]);
+         </script>
+         <form name="myForm" ng-controller="DateController as dateCtrl">
+         <label for="exampleInput">Pick a date between in 2013:</label>
+         <input type="datetime-local" id="exampleInput" name="input" ng-model="example.value"
+         placeholder="yyyy-MM-ddTHH:mm:ss" min="2001-01-01T00:00:00" max="2013-12-31T00:00:00" required />
+         <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+         Required!</span>
+         <span class="error" ng-show="myForm.input.$error.datetimelocal">
+         Not a valid date!</span>
+         </div>
+         <tt>value = {{example.value | date: "yyyy-MM-ddTHH:mm:ss"}}</tt><br/>
+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         var value = element(by.binding('example.value | date: "yyyy-MM-ddTHH:mm:ss"'));
+         var valid = element(by.binding('myForm.input.$valid'));
 
-    /**
-     * @ngdoc filter
-     * @name filter
-     * @function
-     *
-     * @description
-     * Selects a subset of items from `array` and returns it as a new array.
-     *
-     * @param {Array} array The source array.
-     * @param {string|Object|function()} expression The predicate to be used for selecting items from
-     *   `array`.
-     *
-     *   Can be one of:
-     *
-     *   - `string`: The string is evaluated as an expression and the resulting value is used for substring match against
-     *     the contents of the `array`. All strings or objects with string properties in `array` that contain this string
-     *     will be returned. The predicate can be negated by prefixing the string with `!`.
-     *
-     *   - `Object`: A pattern object can be used to filter specific properties on objects contained
-     *     by `array`. For example `{name:"M", phone:"1"}` predicate will return an array of items
-     *     which have property `name` containing "M" and property `phone` containing "1". A special
-     *     property name `$` can be used (as in `{$:"text"}`) to accept a match against any
-     *     property of the object. That's equivalent to the simple substring match with a `string`
-     *     as described above.
-     *
-     *   - `function(value)`: A predicate function can be used to write arbitrary filters. The function is
-     *     called for each element of `array`. The final result is an array of those elements that
-     *     the predicate returned true for.
-     *
-     * @param {function(actual, expected)|true|undefined} comparator Comparator which is used in
-     *     determining if the expected value (from the filter expression) and actual value (from
-     *     the object in the array) should be considered a match.
-     *
-     *   Can be one of:
-     *
-     *     - `function(actual, expected)`:
-     *       The function will be given the object value and the predicate value to compare and
-     *       should return true if the item should be included in filtered result.
-     *
-     *     - `true`: A shorthand for `function(actual, expected) { return angular.equals(expected, actual)}`.
-     *       this is essentially strict comparison of expected and actual.
-     *
-     *     - `false|undefined`: A short hand for a function which will look for a substring match in case
-     *       insensitive way.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <div ng-init="friends = [{name:'John', phone:'555-1276'},
-     {name:'Mary', phone:'800-BIG-MARY'},
-     {name:'Mike', phone:'555-4321'},
-     {name:'Adam', phone:'555-5678'},
-     {name:'Julie', phone:'555-8765'},
-     {name:'Juliette', phone:'555-5678'}]"></div>
+         // currently protractor/webdriver does not support
+         // sending keys to all known HTML5 input controls
+         // for various browsers (https://github.com/angular/protractor/issues/562).
+         function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
 
-     Search: <input ng-model="searchText">
-     <table id="searchTextResults">
-     <tr><th>Name</th><th>Phone</th></tr>
-     <tr ng-repeat="friend in friends | filter:searchText">
-     <td>{{friend.name}}</td>
-     <td>{{friend.phone}}</td>
-     </tr>
-     </table>
-     <hr>
-     Any: <input ng-model="search.$"> <br>
-     Name only <input ng-model="search.name"><br>
-     Phone only <input ng-model="search.phone"><br>
-     Equality <input type="checkbox" ng-model="strict"><br>
-     <table id="searchObjResults">
-     <tr><th>Name</th><th>Phone</th></tr>
-     <tr ng-repeat="friendObj in friends | filter:search:strict">
-     <td>{{friendObj.name}}</td>
-     <td>{{friendObj.phone}}</td>
-     </tr>
-     </table>
-     </file>
-     <file name="protractor.js" type="protractor">
-     var expectFriendNames = function(expectedNames, key) {
-         element.all(by.repeater(key + ' in friends').column(key + '.name')).then(function(arr) {
-           arr.forEach(function(wd, i) {
-             expect(wd.getText()).toMatch(expectedNames[i]);
-           });
-         });
-       };
+         it('should initialize to model', function() {
+        expect(value.getText()).toContain('2010-12-28T14:57:00');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
 
-     it('should search across all fields when filtering with a string', function() {
-         var searchText = element(by.model('searchText'));
-         searchText.clear();
-         searchText.sendKeys('m');
-         expectFriendNames(['Mary', 'Mike', 'Adam'], 'friend');
+         it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
 
-         searchText.clear();
-         searchText.sendKeys('76');
-         expectFriendNames(['John', 'Julie'], 'friend');
-       });
+         it('should be invalid if over max', function() {
+        setInput('2015-01-01T23:59:00');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+         </file>
+         </example>
+         */
+        'datetime-local': createDateInputType('datetimelocal', DATETIMELOCAL_REGEXP,
+            createDateParser(DATETIMELOCAL_REGEXP, ['yyyy', 'MM', 'dd', 'HH', 'mm', 'ss', 'sss']),
+            'yyyy-MM-ddTHH:mm:ss.sss'),
 
-     it('should search in specific fields when filtering with a predicate object', function() {
-         var searchAny = element(by.model('search.$'));
-         searchAny.clear();
-         searchAny.sendKeys('i');
-         expectFriendNames(['Mary', 'Mike', 'Julie', 'Juliette'], 'friendObj');
-       });
-     it('should use a equal comparison when comparator is true', function() {
-         var searchName = element(by.model('search.name'));
-         var strict = element(by.model('strict'));
-         searchName.clear();
-         searchName.sendKeys('Julie');
-         strict.click();
-         expectFriendNames(['Julie'], 'friendObj');
-       });
-     </file>
-     </example>
-     */
-    function filterFilter() {
-        return function(array, expression, comparator) {
-            if (!isArray(array)) return array;
+        /**
+         * @ngdoc input
+         * @name input[time]
+         *
+         * @description
+         * Input with time validation and transformation. In browsers that do not yet support
+         * the HTML5 time input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+         * local time format (HH:mm:ss), for example: `14:57:00`. Model must be a Date object. This binding will always output a
+         * Date object to the model of January 1, 1970, or local date `new Date(1970, 0, 1, HH, mm, ss)`.
+         *
+         * The model must always be a Date object, otherwise AngularJS will throw an error.
+         * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+         *
+         * The timezone to be used to read/write the `Date` instance in the model can be defined using
+         * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+         *   This must be a valid ISO time format (HH:mm:ss). You can also use interpolation inside this
+         *   attribute (e.g. `min="{{minTime | date:'HH:mm:ss'}}"`). Note that `min` will also add
+         *   native HTML5 constraint validation.
+         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+         *   This must be a valid ISO time format (HH:mm:ss). You can also use interpolation inside this
+         *   attribute (e.g. `max="{{maxTime | date:'HH:mm:ss'}}"`). Note that `max` will also add
+         *   native HTML5 constraint validation.
+         * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO time string the
+         *   `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+         * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO time string the
+         *   `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
+         * @param {string=} required Sets `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         <example name="time-input-directive" module="timeExample">
+         <file name="index.html">
+         <script>
+         angular.module('timeExample', [])
+         .controller('DateController', ['$scope', function($scope) {
+          $scope.example = {
+            value: new Date(1970, 0, 1, 14, 57, 0)
+          };
+        }]);
+         </script>
+         <form name="myForm" ng-controller="DateController as dateCtrl">
+         <label for="exampleInput">Pick a time between 8am and 5pm:</label>
+         <input type="time" id="exampleInput" name="input" ng-model="example.value"
+         placeholder="HH:mm:ss" min="08:00:00" max="17:00:00" required />
+         <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+         Required!</span>
+         <span class="error" ng-show="myForm.input.$error.time">
+         Not a valid date!</span>
+         </div>
+         <tt>value = {{example.value | date: "HH:mm:ss"}}</tt><br/>
+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         var value = element(by.binding('example.value | date: "HH:mm:ss"'));
+         var valid = element(by.binding('myForm.input.$valid'));
 
-            var comparatorType = typeof(comparator),
-                predicates = [];
+         // currently protractor/webdriver does not support
+         // sending keys to all known HTML5 input controls
+         // for various browsers (https://github.com/angular/protractor/issues/562).
+         function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
 
-            predicates.check = function(value) {
-                for (var j = 0; j < predicates.length; j++) {
-                    if(!predicates[j](value)) {
-                        return false;
-                    }
-                }
-                return true;
-            };
+         it('should initialize to model', function() {
+        expect(value.getText()).toContain('14:57:00');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
 
-            if (comparatorType !== 'function') {
-                if (comparatorType === 'boolean' && comparator) {
-                    comparator = function(obj, text) {
-                        return angular.equals(obj, text);
-                    };
-                } else {
-                    comparator = function(obj, text) {
-                        if (obj && text && typeof obj === 'object' && typeof text === 'object') {
-                            for (var objKey in obj) {
-                                if (objKey.charAt(0) !== '$' && hasOwnProperty.call(obj, objKey) &&
-                                    comparator(obj[objKey], text[objKey])) {
-                                    return true;
-                                }
-                            }
-                            return false;
-                        }
-                        text = (''+text).toLowerCase();
-                        return (''+obj).toLowerCase().indexOf(text) > -1;
-                    };
-                }
-            }
+         it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
 
-            var search = function(obj, text){
-                if (typeof text == 'string' && text.charAt(0) === '!') {
-                    return !search(obj, text.substr(1));
-                }
-                switch (typeof obj) {
-                    case "boolean":
-                    case "number":
-                    case "string":
-                        return comparator(obj, text);
-                    case "object":
-                        switch (typeof text) {
-                            case "object":
-                                return comparator(obj, text);
-                            default:
-                                for ( var objKey in obj) {
-                                    if (objKey.charAt(0) !== '$' && search(obj[objKey], text)) {
-                                        return true;
-                                    }
-                                }
-                                break;
-                        }
-                        return false;
-                    case "array":
-                        for ( var i = 0; i < obj.length; i++) {
-                            if (search(obj[i], text)) {
-                                return true;
-                            }
-                        }
-                        return false;
-                    default:
-                        return false;
-                }
-            };
-            switch (typeof expression) {
-                case "boolean":
-                case "number":
-                case "string":
-                    // Set up expression object and fall through
-                    expression = {$:expression};
-                // jshint -W086
-                case "object":
-                    // jshint +W086
-                    for (var key in expression) {
-                        (function(path) {
-                            if (typeof expression[path] == 'undefined') return;
-                            predicates.push(function(value) {
-                                return search(path == '$' ? value : (value && value[path]), expression[path]);
-                            });
-                        })(key);
-                    }
-                    break;
-                case 'function':
-                    predicates.push(expression);
-                    break;
-                default:
-                    return array;
-            }
-            var filtered = [];
-            for ( var j = 0; j < array.length; j++) {
-                var value = array[j];
-                if (predicates.check(value)) {
-                    filtered.push(value);
-                }
-            }
-            return filtered;
-        };
-    }
+         it('should be invalid if over max', function() {
+        setInput('23:59:00');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+         </file>
+         </example>
+         */
+        'time': createDateInputType('time', TIME_REGEXP,
+            createDateParser(TIME_REGEXP, ['HH', 'mm', 'ss', 'sss']),
+            'HH:mm:ss.sss'),
+
+        /**
+         * @ngdoc input
+         * @name input[week]
+         *
+         * @description
+         * Input with week-of-the-year validation and transformation to Date. In browsers that do not yet support
+         * the HTML5 week input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+         * week format (yyyy-W##), for example: `2013-W02`.
+         *
+         * The model must always be a Date object, otherwise AngularJS will throw an error.
+         * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+         *
+         * The timezone to be used to read/write the `Date` instance in the model can be defined using
+         * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+         *   This must be a valid ISO week format (yyyy-W##). You can also use interpolation inside this
+         *   attribute (e.g. `min="{{minWeek | date:'yyyy-Www'}}"`). Note that `min` will also add
+         *   native HTML5 constraint validation.
+         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+         *   This must be a valid ISO week format (yyyy-W##). You can also use interpolation inside this
+         *   attribute (e.g. `max="{{maxWeek | date:'yyyy-Www'}}"`). Note that `max` will also add
+         *   native HTML5 constraint validation.
+         * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO week string
+         *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+         * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO week string
+         *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
+         * @param {string=} required Sets `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         <example name="week-input-directive" module="weekExample">
+         <file name="index.html">
+         <script>
+         angular.module('weekExample', [])
+         .controller('DateController', ['$scope', function($scope) {
+          $scope.example = {
+            value: new Date(2013, 0, 3)
+          };
+        }]);
+         </script>
+         <form name="myForm" ng-controller="DateController as dateCtrl">
+         <label>Pick a date between in 2013:
+         <input id="exampleInput" type="week" name="input" ng-model="example.value"
+         placeholder="YYYY-W##" min="2012-W32"
+         max="2013-W52" required />
+         </label>
+         <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+         Required!</span>
+         <span class="error" ng-show="myForm.input.$error.week">
+         Not a valid date!</span>
+         </div>
+         <tt>value = {{example.value | date: "yyyy-Www"}}</tt><br/>
+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         var value = element(by.binding('example.value | date: "yyyy-Www"'));
+         var valid = element(by.binding('myForm.input.$valid'));
 
-    /**
-     * @ngdoc filter
-     * @name currency
-     * @function
-     *
-     * @description
-     * Formats a number as a currency (ie $1,234.56). When no currency symbol is provided, default
-     * symbol for current locale is used.
-     *
-     * @param {number} amount Input to filter.
-     * @param {string=} symbol Currency symbol or identifier to be displayed.
-     * @returns {string} Formatted number.
-     *
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-           $scope.amount = 1234.56;
-         }
-     </script>
-     <div ng-controller="Ctrl">
-     <input type="number" ng-model="amount"> <br>
-     default currency symbol ($): <span id="currency-default">{{amount | currency}}</span><br>
-     custom currency identifier (USD$): <span>{{amount | currency:"USD$"}}</span>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should init with 1234.56', function() {
-         expect(element(by.id('currency-default')).getText()).toBe('$1,234.56');
-         expect(element(by.binding('amount | currency:"USD$"')).getText()).toBe('USD$1,234.56');
-       });
-     it('should update', function() {
-         if (browser.params.browser == 'safari') {
-           // Safari does not understand the minus key. See
-           // https://github.com/angular/protractor/issues/481
-           return;
-         }
-         element(by.model('amount')).clear();
-         element(by.model('amount')).sendKeys('-1234');
-         expect(element(by.id('currency-default')).getText()).toBe('($1,234.00)');
-         expect(element(by.binding('amount | currency:"USD$"')).getText()).toBe('(USD$1,234.00)');
-       });
-     </file>
-     </example>
-     */
-    currencyFilter.$inject = ['$locale'];
-    function currencyFilter($locale) {
-        var formats = $locale.NUMBER_FORMATS;
-        return function(amount, currencySymbol){
-            if (isUndefined(currencySymbol)) currencySymbol = formats.CURRENCY_SYM;
-            return formatNumber(amount, formats.PATTERNS[1], formats.GROUP_SEP, formats.DECIMAL_SEP, 2).
-                replace(/\u00A4/g, currencySymbol);
-        };
-    }
+         // currently protractor/webdriver does not support
+         // sending keys to all known HTML5 input controls
+         // for various browsers (https://github.com/angular/protractor/issues/562).
+         function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
 
-    /**
-     * @ngdoc filter
-     * @name number
-     * @function
-     *
-     * @description
-     * Formats a number as text.
-     *
-     * If the input is not a number an empty string is returned.
-     *
-     * @param {number|string} number Number to format.
-     * @param {(number|string)=} fractionSize Number of decimal places to round the number to.
-     * If this is not provided then the fraction size is computed from the current locale's number
-     * formatting pattern. In the case of the default locale, it will be 3.
-     * @returns {string} Number rounded to decimalPlaces and places a “,” after each third digit.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-           $scope.val = 1234.56789;
-         }
-     </script>
-     <div ng-controller="Ctrl">
-     Enter number: <input ng-model='val'><br>
-     Default formatting: <span id='number-default'>{{val | number}}</span><br>
-     No fractions: <span>{{val | number:0}}</span><br>
-     Negative number: <span>{{-val | number:4}}</span>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should format numbers', function() {
-         expect(element(by.id('number-default')).getText()).toBe('1,234.568');
-         expect(element(by.binding('val | number:0')).getText()).toBe('1,235');
-         expect(element(by.binding('-val | number:4')).getText()).toBe('-1,234.5679');
-       });
+         it('should initialize to model', function() {
+        expect(value.getText()).toContain('2013-W01');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
 
-     it('should update', function() {
-         element(by.model('val')).clear();
-         element(by.model('val')).sendKeys('3374.333');
-         expect(element(by.id('number-default')).getText()).toBe('3,374.333');
-         expect(element(by.binding('val | number:0')).getText()).toBe('3,374');
-         expect(element(by.binding('-val | number:4')).getText()).toBe('-3,374.3330');
+         it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
       });
-     </file>
-     </example>
-     */
 
+         it('should be invalid if over max', function() {
+        setInput('2015-W01');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+         </file>
+         </example>
+         */
+        'week': createDateInputType('week', WEEK_REGEXP, weekParser, 'yyyy-Www'),
 
-    numberFilter.$inject = ['$locale'];
-    function numberFilter($locale) {
-        var formats = $locale.NUMBER_FORMATS;
-        return function(number, fractionSize) {
-            return formatNumber(number, formats.PATTERNS[0], formats.GROUP_SEP, formats.DECIMAL_SEP,
-                fractionSize);
-        };
-    }
+        /**
+         * @ngdoc input
+         * @name input[month]
+         *
+         * @description
+         * Input with month validation and transformation. In browsers that do not yet support
+         * the HTML5 month input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+         * month format (yyyy-MM), for example: `2009-01`.
+         *
+         * The model must always be a Date object, otherwise AngularJS will throw an error.
+         * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+         * If the model is not set to the first of the month, the next view to model update will set it
+         * to the first of the month.
+         *
+         * The timezone to be used to read/write the `Date` instance in the model can be defined using
+         * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+         *   This must be a valid ISO month format (yyyy-MM). You can also use interpolation inside this
+         *   attribute (e.g. `min="{{minMonth | date:'yyyy-MM'}}"`). Note that `min` will also add
+         *   native HTML5 constraint validation.
+         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+         *   This must be a valid ISO month format (yyyy-MM). You can also use interpolation inside this
+         *   attribute (e.g. `max="{{maxMonth | date:'yyyy-MM'}}"`). Note that `max` will also add
+         *   native HTML5 constraint validation.
+         * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO week string
+         *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+         * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO week string
+         *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
 
-    var DECIMAL_SEP = '.';
-    function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) {
-        if (number == null || !isFinite(number) || isObject(number)) return '';
-
-        var isNegative = number < 0;
-        number = Math.abs(number);
-        var numStr = number + '',
-            formatedText = '',
-            parts = [];
-
-        var hasExponent = false;
-        if (numStr.indexOf('e') !== -1) {
-            var match = numStr.match(/([\d\.]+)e(-?)(\d+)/);
-            if (match && match[2] == '-' && match[3] > fractionSize + 1) {
-                numStr = '0';
-            } else {
-                formatedText = numStr;
-                hasExponent = true;
-            }
-        }
+         * @param {string=} required Sets `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         <example name="month-input-directive" module="monthExample">
+         <file name="index.html">
+         <script>
+         angular.module('monthExample', [])
+         .controller('DateController', ['$scope', function($scope) {
+          $scope.example = {
+            value: new Date(2013, 9, 1)
+          };
+        }]);
+         </script>
+         <form name="myForm" ng-controller="DateController as dateCtrl">
+         <label for="exampleInput">Pick a month in 2013:</label>
+         <input id="exampleInput" type="month" name="input" ng-model="example.value"
+         placeholder="yyyy-MM" min="2013-01" max="2013-12" required />
+         <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+         Required!</span>
+         <span class="error" ng-show="myForm.input.$error.month">
+         Not a valid month!</span>
+         </div>
+         <tt>value = {{example.value | date: "yyyy-MM"}}</tt><br/>
+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         var value = element(by.binding('example.value | date: "yyyy-MM"'));
+         var valid = element(by.binding('myForm.input.$valid'));
 
-        if (!hasExponent) {
-            var fractionLen = (numStr.split(DECIMAL_SEP)[1] || '').length;
+         // currently protractor/webdriver does not support
+         // sending keys to all known HTML5 input controls
+         // for various browsers (https://github.com/angular/protractor/issues/562).
+         function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
 
-            // determine fractionSize if it is not specified
-            if (isUndefined(fractionSize)) {
-                fractionSize = Math.min(Math.max(pattern.minFrac, fractionLen), pattern.maxFrac);
-            }
+         it('should initialize to model', function() {
+        expect(value.getText()).toContain('2013-10');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
 
-            var pow = Math.pow(10, fractionSize);
-            number = Math.round(number * pow) / pow;
-            var fraction = ('' + number).split(DECIMAL_SEP);
-            var whole = fraction[0];
-            fraction = fraction[1] || '';
+         it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
 
-            var i, pos = 0,
-                lgroup = pattern.lgSize,
-                group = pattern.gSize;
+         it('should be invalid if over max', function() {
+        setInput('2015-01');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+         </file>
+         </example>
+         */
+        'month': createDateInputType('month', MONTH_REGEXP,
+            createDateParser(MONTH_REGEXP, ['yyyy', 'MM']),
+            'yyyy-MM'),
 
-            if (whole.length >= (lgroup + group)) {
-                pos = whole.length - lgroup;
-                for (i = 0; i < pos; i++) {
-                    if ((pos - i)%group === 0 && i !== 0) {
-                        formatedText += groupSep;
-                    }
-                    formatedText += whole.charAt(i);
-                }
-            }
+        /**
+         * @ngdoc input
+         * @name input[number]
+         *
+         * @description
+         * Text input with number validation and transformation. Sets the `number` validation
+         * error if not a valid number.
+         *
+         * <div class="alert alert-warning">
+         * The model must always be of type `number` otherwise AngularJS will throw an error.
+         * Be aware that a string containing a number is not enough. See the {@link ngModel:numfmt}
+         * error docs for more information and an example of how to convert your model if necessary.
+         * </div>
+         *
+         * ## Issues with HTML5 constraint validation
+         *
+         * In browsers that follow the
+         * [HTML5 specification](https://html.spec.whatwg.org/multipage/forms.html#number-state-%28type=number%29),
+         * `input[number]` does not work as expected with {@link ngModelOptions `ngModelOptions.allowInvalid`}.
+         * If a non-number is entered in the input, the browser will report the value as an empty string,
+         * which means the view / model values in `ngModel` and subsequently the scope value
+         * will also be an empty string.
+         *
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+         *    Can be interpolated.
+         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+         *    Can be interpolated.
+         * @param {string=} ngMin Like `min`, sets the `min` validation error key if the value entered is less than `ngMin`,
+         *    but does not trigger HTML5 native validation. Takes an expression.
+         * @param {string=} ngMax Like `max`, sets the `max` validation error key if the value entered is greater than `ngMax`,
+         *    but does not trigger HTML5 native validation. Takes an expression.
+         * @param {string=} step Sets the `step` validation error key if the value entered does not fit the `step` constraint.
+         *    Can be interpolated.
+         * @param {string=} ngStep Like `step`, sets the `step` validation error key if the value entered does not fit the `ngStep` constraint,
+         *    but does not trigger HTML5 native validation. Takes an expression.
+         * @param {string=} required Sets `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+         *    minlength.
+         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+         *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+         *    any length.
+         * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+         *    that contains the regular expression body that will be converted to a regular expression
+         *    as in the ngPattern directive.
+         * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+         *    does not match a RegExp found by evaluating the AngularJS expression given in the attribute value.
+         *    If the expression evaluates to a RegExp object, then this is used directly.
+         *    If the expression evaluates to a string, then it will be converted to a RegExp
+         *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+         *    `new RegExp('^abc$')`.<br />
+         *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+         *    start at the index of the last search's match, thus not taking the whole input value into
+         *    account.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         <example name="number-input-directive" module="numberExample">
+         <file name="index.html">
+         <script>
+         angular.module('numberExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+               $scope.example = {
+                 value: 12
+               };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+         <label>Number:
+         <input type="number" name="input" ng-model="example.value"
+         min="0" max="99" required>
+         </label>
+         <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+         Required!</span>
+         <span class="error" ng-show="myForm.input.$error.number">
+         Not valid number!</span>
+         </div>
+         <tt>value = {{example.value}}</tt><br/>
+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         var value = element(by.binding('example.value'));
+         var valid = element(by.binding('myForm.input.$valid'));
+         var input = element(by.model('example.value'));
 
-            for (i = pos; i < whole.length; i++) {
-                if ((whole.length - i)%lgroup === 0 && i !== 0) {
-                    formatedText += groupSep;
-                }
-                formatedText += whole.charAt(i);
-            }
+         it('should initialize to model', function() {
+            expect(value.getText()).toContain('12');
+            expect(valid.getText()).toContain('true');
+          });
 
-            // format fraction part.
-            while(fraction.length < fractionSize) {
-                fraction += '0';
-            }
+         it('should be invalid if empty', function() {
+            input.clear();
+            input.sendKeys('');
+            expect(value.getText()).toEqual('value =');
+            expect(valid.getText()).toContain('false');
+          });
 
-            if (fractionSize && fractionSize !== "0") formatedText += decimalSep + fraction.substr(0, fractionSize);
-        } else {
+         it('should be invalid if over max', function() {
+            input.clear();
+            input.sendKeys('123');
+            expect(value.getText()).toEqual('value =');
+            expect(valid.getText()).toContain('false');
+          });
+         </file>
+         </example>
+         */
+        'number': numberInputType,
 
-            if (fractionSize > 0 && number > -1 && number < 1) {
-                formatedText = number.toFixed(fractionSize);
-            }
-        }
 
-        parts.push(isNegative ? pattern.negPre : pattern.posPre);
-        parts.push(formatedText);
-        parts.push(isNegative ? pattern.negSuf : pattern.posSuf);
-        return parts.join('');
-    }
+        /**
+         * @ngdoc input
+         * @name input[url]
+         *
+         * @description
+         * Text input with URL validation. Sets the `url` validation error key if the content is not a
+         * valid URL.
+         *
+         * <div class="alert alert-warning">
+         * **Note:** `input[url]` uses a regex to validate urls that is derived from the regex
+         * used in Chromium. If you need stricter validation, you can use `ng-pattern` or modify
+         * the built-in validators (see the {@link guide/forms Forms guide})
+         * </div>
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} required Sets `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+         *    minlength.
+         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+         *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+         *    any length.
+         * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+         *    that contains the regular expression body that will be converted to a regular expression
+         *    as in the ngPattern directive.
+         * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+         *    does not match a RegExp found by evaluating the AngularJS expression given in the attribute value.
+         *    If the expression evaluates to a RegExp object, then this is used directly.
+         *    If the expression evaluates to a string, then it will be converted to a RegExp
+         *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+         *    `new RegExp('^abc$')`.<br />
+         *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+         *    start at the index of the last search's match, thus not taking the whole input value into
+         *    account.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         <example name="url-input-directive" module="urlExample">
+         <file name="index.html">
+         <script>
+         angular.module('urlExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+               $scope.url = {
+                 text: 'http://google.com'
+               };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+         <label>URL:
+         <input type="url" name="input" ng-model="url.text" required>
+         <label>
+         <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+         Required!</span>
+         <span class="error" ng-show="myForm.input.$error.url">
+         Not valid url!</span>
+         </div>
+         <tt>text = {{url.text}}</tt><br/>
+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+         <tt>myForm.$error.url = {{!!myForm.$error.url}}</tt><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         var text = element(by.binding('url.text'));
+         var valid = element(by.binding('myForm.input.$valid'));
+         var input = element(by.model('url.text'));
+
+         it('should initialize to model', function() {
+            expect(text.getText()).toContain('http://google.com');
+            expect(valid.getText()).toContain('true');
+          });
 
-    function padNumber(num, digits, trim) {
-        var neg = '';
-        if (num < 0) {
-            neg =  '-';
-            num = -num;
-        }
-        num = '' + num;
-        while(num.length < digits) num = '0' + num;
-        if (trim)
-            num = num.substr(num.length - digits);
-        return neg + num;
-    }
+         it('should be invalid if empty', function() {
+            input.clear();
+            input.sendKeys('');
 
+            expect(text.getText()).toEqual('text =');
+            expect(valid.getText()).toContain('false');
+          });
 
-    function dateGetter(name, size, offset, trim) {
-        offset = offset || 0;
-        return function(date) {
-            var value = date['get' + name]();
-            if (offset > 0 || value > -offset)
-                value += offset;
-            if (value === 0 && offset == -12 ) value = 12;
-            return padNumber(value, size, trim);
-        };
-    }
+         it('should be invalid if not url', function() {
+            input.clear();
+            input.sendKeys('box');
 
-    function dateStrGetter(name, shortForm) {
-        return function(date, formats) {
-            var value = date['get' + name]();
-            var get = uppercase(shortForm ? ('SHORT' + name) : name);
+            expect(valid.getText()).toContain('false');
+          });
+         </file>
+         </example>
+         */
+        'url': urlInputType,
 
-            return formats[get][value];
-        };
-    }
 
-    function timeZoneGetter(date) {
-        var zone = -1 * date.getTimezoneOffset();
-        var paddedZone = (zone >= 0) ? "+" : "";
+        /**
+         * @ngdoc input
+         * @name input[email]
+         *
+         * @description
+         * Text input with email validation. Sets the `email` validation error key if not a valid email
+         * address.
+         *
+         * <div class="alert alert-warning">
+         * **Note:** `input[email]` uses a regex to validate email addresses that is derived from the regex
+         * used in Chromium. If you need stricter validation (e.g. requiring a top-level domain), you can
+         * use `ng-pattern` or modify the built-in validators (see the {@link guide/forms Forms guide})
+         * </div>
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} required Sets `required` validation error key if the value is not entered.
+         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+         *    `required` when you want to data-bind to the `required` attribute.
+         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+         *    minlength.
+         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+         *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+         *    any length.
+         * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+         *    that contains the regular expression body that will be converted to a regular expression
+         *    as in the ngPattern directive.
+         * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+         *    does not match a RegExp found by evaluating the AngularJS expression given in the attribute value.
+         *    If the expression evaluates to a RegExp object, then this is used directly.
+         *    If the expression evaluates to a string, then it will be converted to a RegExp
+         *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+         *    `new RegExp('^abc$')`.<br />
+         *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+         *    start at the index of the last search's match, thus not taking the whole input value into
+         *    account.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         <example name="email-input-directive" module="emailExample">
+         <file name="index.html">
+         <script>
+         angular.module('emailExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+               $scope.email = {
+                 text: 'me@example.com'
+               };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+         <label>Email:
+         <input type="email" name="input" ng-model="email.text" required>
+         </label>
+         <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+         Required!</span>
+         <span class="error" ng-show="myForm.input.$error.email">
+         Not valid email!</span>
+         </div>
+         <tt>text = {{email.text}}</tt><br/>
+         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+         <tt>myForm.$error.email = {{!!myForm.$error.email}}</tt><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         var text = element(by.binding('email.text'));
+         var valid = element(by.binding('myForm.input.$valid'));
+         var input = element(by.model('email.text'));
 
-        paddedZone += padNumber(Math[zone > 0 ? 'floor' : 'ceil'](zone / 60), 2) +
-        padNumber(Math.abs(zone % 60), 2);
+         it('should initialize to model', function() {
+            expect(text.getText()).toContain('me@example.com');
+            expect(valid.getText()).toContain('true');
+          });
 
-        return paddedZone;
-    }
+         it('should be invalid if empty', function() {
+            input.clear();
+            input.sendKeys('');
+            expect(text.getText()).toEqual('text =');
+            expect(valid.getText()).toContain('false');
+          });
 
-    function ampmGetter(date, formats) {
-        return date.getHours() < 12 ? formats.AMPMS[0] : formats.AMPMS[1];
-    }
+         it('should be invalid if not email', function() {
+            input.clear();
+            input.sendKeys('xxx');
 
-    var DATE_FORMATS = {
-        yyyy: dateGetter('FullYear', 4),
-        yy: dateGetter('FullYear', 2, 0, true),
-        y: dateGetter('FullYear', 1),
-        MMMM: dateStrGetter('Month'),
-        MMM: dateStrGetter('Month', true),
-        MM: dateGetter('Month', 2, 1),
-        M: dateGetter('Month', 1, 1),
-        dd: dateGetter('Date', 2),
-        d: dateGetter('Date', 1),
-        HH: dateGetter('Hours', 2),
-        H: dateGetter('Hours', 1),
-        hh: dateGetter('Hours', 2, -12),
-        h: dateGetter('Hours', 1, -12),
-        mm: dateGetter('Minutes', 2),
-        m: dateGetter('Minutes', 1),
-        ss: dateGetter('Seconds', 2),
-        s: dateGetter('Seconds', 1),
-        // while ISO 8601 requires fractions to be prefixed with `.` or `,`
-        // we can be just safely rely on using `sss` since we currently don't support single or two digit fractions
-        sss: dateGetter('Milliseconds', 3),
-        EEEE: dateStrGetter('Day'),
-        EEE: dateStrGetter('Day', true),
-        a: ampmGetter,
-        Z: timeZoneGetter
-    };
+            expect(valid.getText()).toContain('false');
+          });
+         </file>
+         </example>
+         */
+        'email': emailInputType,
 
-    var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z))(.*)/,
-        NUMBER_STRING = /^\-?\d+$/;
 
-    /**
-     * @ngdoc filter
-     * @name date
-     * @function
-     *
-     * @description
-     *   Formats `date` to a string based on the requested `format`.
-     *
-     *   `format` string can be composed of the following elements:
-     *
-     *   * `'yyyy'`: 4 digit representation of year (e.g. AD 1 => 0001, AD 2010 => 2010)
-     *   * `'yy'`: 2 digit representation of year, padded (00-99). (e.g. AD 2001 => 01, AD 2010 => 10)
-     *   * `'y'`: 1 digit representation of year, e.g. (AD 1 => 1, AD 199 => 199)
-     *   * `'MMMM'`: Month in year (January-December)
-     *   * `'MMM'`: Month in year (Jan-Dec)
-     *   * `'MM'`: Month in year, padded (01-12)
-     *   * `'M'`: Month in year (1-12)
-     *   * `'dd'`: Day in month, padded (01-31)
-     *   * `'d'`: Day in month (1-31)
-     *   * `'EEEE'`: Day in Week,(Sunday-Saturday)
-     *   * `'EEE'`: Day in Week, (Sun-Sat)
-     *   * `'HH'`: Hour in day, padded (00-23)
-     *   * `'H'`: Hour in day (0-23)
-     *   * `'hh'`: Hour in am/pm, padded (01-12)
-     *   * `'h'`: Hour in am/pm, (1-12)
-     *   * `'mm'`: Minute in hour, padded (00-59)
-     *   * `'m'`: Minute in hour (0-59)
-     *   * `'ss'`: Second in minute, padded (00-59)
-     *   * `'s'`: Second in minute (0-59)
-     *   * `'.sss' or ',sss'`: Millisecond in second, padded (000-999)
-     *   * `'a'`: am/pm marker
-     *   * `'Z'`: 4 digit (+sign) representation of the timezone offset (-1200-+1200)
-     *
-     *   `format` string can also be one of the following predefined
-     *   {@link guide/i18n localizable formats}:
-     *
-     *   * `'medium'`: equivalent to `'MMM d, y h:mm:ss a'` for en_US locale
-     *     (e.g. Sep 3, 2010 12:05:08 pm)
-     *   * `'short'`: equivalent to `'M/d/yy h:mm a'` for en_US  locale (e.g. 9/3/10 12:05 pm)
-     *   * `'fullDate'`: equivalent to `'EEEE, MMMM d,y'` for en_US  locale
-     *     (e.g. Friday, September 3, 2010)
-     *   * `'longDate'`: equivalent to `'MMMM d, y'` for en_US  locale (e.g. September 3, 2010)
-     *   * `'mediumDate'`: equivalent to `'MMM d, y'` for en_US  locale (e.g. Sep 3, 2010)
-     *   * `'shortDate'`: equivalent to `'M/d/yy'` for en_US locale (e.g. 9/3/10)
-     *   * `'mediumTime'`: equivalent to `'h:mm:ss a'` for en_US locale (e.g. 12:05:08 pm)
-     *   * `'shortTime'`: equivalent to `'h:mm a'` for en_US locale (e.g. 12:05 pm)
-     *
-     *   `format` string can contain literal values. These need to be quoted with single quotes (e.g.
-     *   `"h 'in the morning'"`). In order to output single quote, use two single quotes in a sequence
-     *   (e.g. `"h 'o''clock'"`).
-     *
-     * @param {(Date|number|string)} date Date to format either as Date object, milliseconds (string or
-     *    number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.SSSZ and its
-     *    shorter versions like yyyy-MM-ddTHH:mmZ, yyyy-MM-dd or yyyyMMddTHHmmssZ). If no timezone is
-     *    specified in the string input, the time is considered to be in the local timezone.
-     * @param {string=} format Formatting rules (see Description). If not specified,
-     *    `mediumDate` is used.
-     * @returns {string} Formatted string or the input if input is not recognized as date/millis.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <span ng-non-bindable>{{1288323623006 | date:'medium'}}</span>:
-     <span>{{1288323623006 | date:'medium'}}</span><br>
-     <span ng-non-bindable>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span>:
-     <span>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span><br>
-     <span ng-non-bindable>{{1288323623006 | date:'MM/dd/yyyy @ h:mma'}}</span>:
-     <span>{{'1288323623006' | date:'MM/dd/yyyy @ h:mma'}}</span><br>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should format date', function() {
-         expect(element(by.binding("1288323623006 | date:'medium'")).getText()).
-            toMatch(/Oct 2\d, 2010 \d{1,2}:\d{2}:\d{2} (AM|PM)/);
-         expect(element(by.binding("1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'")).getText()).
-            toMatch(/2010\-10\-2\d \d{2}:\d{2}:\d{2} (\-|\+)?\d{4}/);
-         expect(element(by.binding("'1288323623006' | date:'MM/dd/yyyy @ h:mma'")).getText()).
-     toMatch(/10\/2\d\/2010 @ \d{1,2}:\d{2}(AM|PM)/);
-     });
-     </file>
-     </example>
-     */
-    dateFilter.$inject = ['$locale'];
-    function dateFilter($locale) {
+        /**
+         * @ngdoc input
+         * @name input[radio]
+         *
+         * @description
+         * HTML radio button.
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string} value The value to which the `ngModel` expression should be set when selected.
+         *    Note that `value` only supports `string` values, i.e. the scope model needs to be a string,
+         *    too. Use `ngValue` if you need complex models (`number`, `object`, ...).
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         * @param {string} ngValue AngularJS expression to which `ngModel` will be be set when the radio
+         *    is selected. Should be used instead of the `value` attribute if you need
+         *    a non-string `ngModel` (`boolean`, `array`, ...).
+         *
+         * @example
+         <example name="radio-input-directive" module="radioExample">
+         <file name="index.html">
+         <script>
+         angular.module('radioExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+               $scope.color = {
+                 name: 'blue'
+               };
+               $scope.specialValue = {
+                 "id": "12345",
+                 "value": "green"
+               };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+         <label>
+         <input type="radio" ng-model="color.name" value="red">
+         Red
+         </label><br/>
+         <label>
+         <input type="radio" ng-model="color.name" ng-value="specialValue">
+         Green
+         </label><br/>
+         <label>
+         <input type="radio" ng-model="color.name" value="blue">
+         Blue
+         </label><br/>
+         <tt>color = {{color.name | json}}</tt><br/>
+         </form>
+         Note that `ng-value="specialValue"` sets radio item's value to be the value of `$scope.specialValue`.
+         </file>
+         <file name="protractor.js" type="protractor">
+         it('should change state', function() {
+            var inputs = element.all(by.model('color.name'));
+            var color = element(by.binding('color.name'));
 
+            expect(color.getText()).toContain('blue');
 
-        var R_ISO8601_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;
-        // 1        2       3         4          5          6          7          8  9     10      11
-        function jsonStringToDate(string) {
-            var match;
-            if (match = string.match(R_ISO8601_STR)) {
-                var date = new Date(0),
-                    tzHour = 0,
-                    tzMin  = 0,
-                    dateSetter = match[8] ? date.setUTCFullYear : date.setFullYear,
-                    timeSetter = match[8] ? date.setUTCHours : date.setHours;
+            inputs.get(0).click();
+            expect(color.getText()).toContain('red');
 
-                if (match[9]) {
-                    tzHour = int(match[9] + match[10]);
-                    tzMin = int(match[9] + match[11]);
-                }
-                dateSetter.call(date, int(match[1]), int(match[2]) - 1, int(match[3]));
-                var h = int(match[4]||0) - tzHour;
-                var m = int(match[5]||0) - tzMin;
-                var s = int(match[6]||0);
-                var ms = Math.round(parseFloat('0.' + (match[7]||0)) * 1000);
-                timeSetter.call(date, h, m, s, ms);
-                return date;
-            }
-            return string;
-        }
+            inputs.get(1).click();
+            expect(color.getText()).toContain('green');
+          });
+         </file>
+         </example>
+         */
+        'radio': radioInputType,
 
+        /**
+         * @ngdoc input
+         * @name input[range]
+         *
+         * @description
+         * Native range input with validation and transformation.
+         *
+         * The model for the range input must always be a `Number`.
+         *
+         * IE9 and other browsers that do not support the `range` type fall back
+         * to a text input without any default values for `min`, `max` and `step`. Model binding,
+         * validation and number parsing are nevertheless supported.
+         *
+         * Browsers that support range (latest Chrome, Safari, Firefox, Edge) treat `input[range]`
+         * in a way that never allows the input to hold an invalid value. That means:
+         * - any non-numerical value is set to `(max + min) / 2`.
+         * - any numerical value that is less than the current min val, or greater than the current max val
+         * is set to the min / max val respectively.
+         * - additionally, the current `step` is respected, so the nearest value that satisfies a step
+         * is used.
+         *
+         * See the [HTML Spec on input[type=range]](https://www.w3.org/TR/html5/forms.html#range-state-(type=range))
+         * for more info.
+         *
+         * This has the following consequences for AngularJS:
+         *
+         * Since the element value should always reflect the current model value, a range input
+         * will set the bound ngModel expression to the value that the browser has set for the
+         * input element. For example, in the following input `<input type="range" ng-model="model.value">`,
+         * if the application sets `model.value = null`, the browser will set the input to `'50'`.
+         * AngularJS will then set the model to `50`, to prevent input and model value being out of sync.
+         *
+         * That means the model for range will immediately be set to `50` after `ngModel` has been
+         * initialized. It also means a range input can never have the required error.
+         *
+         * This does not only affect changes to the model value, but also to the values of the `min`,
+         * `max`, and `step` attributes. When these change in a way that will cause the browser to modify
+         * the input value, AngularJS will also update the model value.
+         *
+         * Automatic value adjustment also means that a range input element can never have the `required`,
+         * `min`, or `max` errors.
+         *
+         * However, `step` is currently only fully implemented by Firefox. Other browsers have problems
+         * when the step value changes dynamically - they do not adjust the element value correctly, but
+         * instead may set the `stepMismatch` error. If that's the case, the AngularJS will set the `step`
+         * error on the input, and set the model to `undefined`.
+         *
+         * Note that `input[range]` is not compatible with`ngMax`, `ngMin`, and `ngStep`, because they do
+         * not set the `min` and `max` attributes, which means that the browser won't automatically adjust
+         * the input value based on their values, and will always assume min = 0, max = 100, and step = 1.
+         *
+         * @param {string}  ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {string=} min Sets the `min` validation to ensure that the value entered is greater
+         *                  than `min`. Can be interpolated.
+         * @param {string=} max Sets the `max` validation to ensure that the value entered is less than `max`.
+         *                  Can be interpolated.
+         * @param {string=} step Sets the `step` validation to ensure that the value entered matches the `step`
+         *                  Can be interpolated.
+         * @param {string=} ngChange AngularJS expression to be executed when the ngModel value changes due
+         *                  to user interaction with the input element.
+         * @param {expression=} ngChecked If the expression is truthy, then the `checked` attribute will be set on the
+         *                      element. **Note** : `ngChecked` should not be used alongside `ngModel`.
+         *                      Checkout {@link ng.directive:ngChecked ngChecked} for usage.
+         *
+         * @example
+         <example name="range-input-directive" module="rangeExample">
+         <file name="index.html">
+         <script>
+         angular.module('rangeExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+                $scope.value = 75;
+                $scope.min = 10;
+                $scope.max = 90;
+              }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+
+         Model as range: <input type="range" name="range" ng-model="value" min="{{min}}"  max="{{max}}">
+         <hr>
+         Model as number: <input type="number" ng-model="value"><br>
+         Min: <input type="number" ng-model="min"><br>
+         Max: <input type="number" ng-model="max"><br>
+         value = <code>{{value}}</code><br/>
+         myForm.range.$valid = <code>{{myForm.range.$valid}}</code><br/>
+         myForm.range.$error = <code>{{myForm.range.$error}}</code>
+         </form>
+         </file>
+         </example>
 
-        return function(date, format) {
-            var text = '',
-                parts = [],
-                fn, match;
+         * ## Range Input with ngMin & ngMax attributes
 
-            format = format || 'mediumDate';
-            format = $locale.DATETIME_FORMATS[format] || format;
-            if (isString(date)) {
-                if (NUMBER_STRING.test(date)) {
-                    date = int(date);
-                } else {
-                    date = jsonStringToDate(date);
-                }
-            }
+         * @example
+         <example name="range-input-directive-ng" module="rangeExample">
+         <file name="index.html">
+         <script>
+         angular.module('rangeExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+                $scope.value = 75;
+                $scope.min = 10;
+                $scope.max = 90;
+              }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+         Model as range: <input type="range" name="range" ng-model="value" ng-min="min" ng-max="max">
+         <hr>
+         Model as number: <input type="number" ng-model="value"><br>
+         Min: <input type="number" ng-model="min"><br>
+         Max: <input type="number" ng-model="max"><br>
+         value = <code>{{value}}</code><br/>
+         myForm.range.$valid = <code>{{myForm.range.$valid}}</code><br/>
+         myForm.range.$error = <code>{{myForm.range.$error}}</code>
+         </form>
+         </file>
+         </example>
 
-            if (isNumber(date)) {
-                date = new Date(date);
-            }
+         */
+        'range': rangeInputType,
 
-            if (!isDate(date)) {
-                return date;
-            }
+        /**
+         * @ngdoc input
+         * @name input[checkbox]
+         *
+         * @description
+         * HTML checkbox.
+         *
+         * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+         * @param {string=} name Property name of the form under which the control is published.
+         * @param {expression=} ngTrueValue The value to which the expression should be set when selected.
+         * @param {expression=} ngFalseValue The value to which the expression should be set when not selected.
+         * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+         *    interaction with the input element.
+         *
+         * @example
+         <example name="checkbox-input-directive" module="checkboxExample">
+         <file name="index.html">
+         <script>
+         angular.module('checkboxExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+               $scope.checkboxModel = {
+                value1 : true,
+                value2 : 'YES'
+              };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+         <label>Value1:
+         <input type="checkbox" ng-model="checkboxModel.value1">
+         </label><br/>
+         <label>Value2:
+         <input type="checkbox" ng-model="checkboxModel.value2"
+         ng-true-value="'YES'" ng-false-value="'NO'">
+         </label><br/>
+         <tt>value1 = {{checkboxModel.value1}}</tt><br/>
+         <tt>value2 = {{checkboxModel.value2}}</tt><br/>
+         </form>
+         </file>
+         <file name="protractor.js" type="protractor">
+         it('should change state', function() {
+            var value1 = element(by.binding('checkboxModel.value1'));
+            var value2 = element(by.binding('checkboxModel.value2'));
 
-            while(format) {
-                match = DATE_FORMATS_SPLIT.exec(format);
-                if (match) {
-                    parts = concat(parts, match, 1);
-                    format = parts.pop();
-                } else {
-                    parts.push(format);
-                    format = null;
-                }
-            }
+            expect(value1.getText()).toContain('true');
+            expect(value2.getText()).toContain('YES');
 
-            forEach(parts, function(value){
-                fn = DATE_FORMATS[value];
-                text += fn ? fn(date, $locale.DATETIME_FORMATS)
-                    : value.replace(/(^'|'$)/g, '').replace(/''/g, "'");
-            });
+            element(by.model('checkboxModel.value1')).click();
+            element(by.model('checkboxModel.value2')).click();
 
-            return text;
-        };
-    }
+            expect(value1.getText()).toContain('false');
+            expect(value2.getText()).toContain('NO');
+          });
+         </file>
+         </example>
+         */
+        'checkbox': checkboxInputType,
 
+        'hidden': noop,
+        'button': noop,
+        'submit': noop,
+        'reset': noop,
+        'file': noop
+    };
 
-    /**
-     * @ngdoc filter
-     * @name json
-     * @function
-     *
-     * @description
-     *   Allows you to convert a JavaScript object into JSON string.
-     *
-     *   This filter is mostly useful for debugging. When using the double curly {{value}} notation
-     *   the binding is automatically converted to JSON.
-     *
-     * @param {*} object Any JavaScript object (including arrays and primitive types) to filter.
-     * @returns {string} JSON string.
-     *
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <pre>{{ {'name':'value'} | json }}</pre>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should jsonify filtered objects', function() {
-         expect(element(by.binding("{'name':'value'}")).getText()).toMatch(/\{\n  "name": ?"value"\n}/);
-       });
-     </file>
-     </example>
-     *
-     */
-    function jsonFilter() {
-        return function(object) {
-            return toJson(object, true);
-        };
+    function stringBasedInputType(ctrl) {
+        ctrl.$formatters.push(function(value) {
+            return ctrl.$isEmpty(value) ? value : value.toString();
+        });
     }
 
+    function textInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+        baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+        stringBasedInputType(ctrl);
+    }
 
-    /**
-     * @ngdoc filter
-     * @name lowercase
-     * @function
-     * @description
-     * Converts string to lowercase.
-     * @see angular.lowercase
-     */
-    var lowercaseFilter = valueFn(lowercase);
-
-
-    /**
-     * @ngdoc filter
-     * @name uppercase
-     * @function
-     * @description
-     * Converts string to uppercase.
-     * @see angular.uppercase
-     */
-    var uppercaseFilter = valueFn(uppercase);
-
-    /**
-     * @ngdoc filter
-     * @name limitTo
-     * @function
-     *
-     * @description
-     * Creates a new array or string containing only a specified number of elements. The elements
-     * are taken from either the beginning or the end of the source array or string, as specified by
-     * the value and sign (positive or negative) of `limit`.
-     *
-     * @param {Array|string} input Source array or string to be limited.
-     * @param {string|number} limit The length of the returned array or string. If the `limit` number
-     *     is positive, `limit` number of items from the beginning of the source array/string are copied.
-     *     If the number is negative, `limit` number  of items from the end of the source array/string
-     *     are copied. The `limit` will be trimmed if it exceeds `array.length`
-     * @returns {Array|string} A new sub-array or substring of length `limit` or less if input array
-     *     had less than `limit` elements.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-           $scope.numbers = [1,2,3,4,5,6,7,8,9];
-           $scope.letters = "abcdefghi";
-           $scope.numLimit = 3;
-           $scope.letterLimit = 3;
-         }
-     </script>
-     <div ng-controller="Ctrl">
-     Limit {{numbers}} to: <input type="integer" ng-model="numLimit">
-     <p>Output numbers: {{ numbers | limitTo:numLimit }}</p>
-     Limit {{letters}} to: <input type="integer" ng-model="letterLimit">
-     <p>Output letters: {{ letters | limitTo:letterLimit }}</p>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     var numLimitInput = element(by.model('numLimit'));
-     var letterLimitInput = element(by.model('letterLimit'));
-     var limitedNumbers = element(by.binding('numbers | limitTo:numLimit'));
-     var limitedLetters = element(by.binding('letters | limitTo:letterLimit'));
+    function baseInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+        var type = lowercase(element[0].type);
 
-     it('should limit the number array to first three items', function() {
-         expect(numLimitInput.getAttribute('value')).toBe('3');
-         expect(letterLimitInput.getAttribute('value')).toBe('3');
-         expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3]');
-         expect(limitedLetters.getText()).toEqual('Output letters: abc');
-       });
+        // In composition mode, users are still inputting intermediate text buffer,
+        // hold the listener until composition is done.
+        // More about composition events: https://developer.mozilla.org/en-US/docs/Web/API/CompositionEvent
+        if (!$sniffer.android) {
+            var composing = false;
 
-     it('should update the output when -3 is entered', function() {
-         numLimitInput.clear();
-         numLimitInput.sendKeys('-3');
-         letterLimitInput.clear();
-         letterLimitInput.sendKeys('-3');
-         expect(limitedNumbers.getText()).toEqual('Output numbers: [7,8,9]');
-         expect(limitedLetters.getText()).toEqual('Output letters: ghi');
-       });
+            element.on('compositionstart', function() {
+                composing = true;
+            });
 
-     it('should not exceed the maximum size of input array', function() {
-         numLimitInput.clear();
-         numLimitInput.sendKeys('100');
-         letterLimitInput.clear();
-         letterLimitInput.sendKeys('100');
-         expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3,4,5,6,7,8,9]');
-         expect(limitedLetters.getText()).toEqual('Output letters: abcdefghi');
-       });
-     </file>
-     </example>
-     */
-    function limitToFilter(){
-        return function(input, limit) {
-            if (!isArray(input) && !isString(input)) return input;
+            element.on('compositionend', function() {
+                composing = false;
+                listener();
+            });
+        }
 
-            limit = int(limit);
+        var timeout;
 
-            if (isString(input)) {
-                //NaN check on limit
-                if (limit) {
-                    return limit >= 0 ? input.slice(0, limit) : input.slice(limit, input.length);
-                } else {
-                    return "";
-                }
+        var listener = function(ev) {
+            if (timeout) {
+                $browser.defer.cancel(timeout);
+                timeout = null;
             }
+            if (composing) return;
+            var value = element.val(),
+                event = ev && ev.type;
 
-            var out = [],
-                i, n;
-
-            // if abs(limit) exceeds maximum length, trim it
-            if (limit > input.length)
-                limit = input.length;
-            else if (limit < -input.length)
-                limit = -input.length;
-
-            if (limit > 0) {
-                i = 0;
-                n = limit;
-            } else {
-                i = input.length + limit;
-                n = input.length;
+            // By default we will trim the value
+            // If the attribute ng-trim exists we will avoid trimming
+            // If input type is 'password', the value is never trimmed
+            if (type !== 'password' && (!attr.ngTrim || attr.ngTrim !== 'false')) {
+                value = trim(value);
             }
 
-            for (; i<n; i++) {
-                out.push(input[i]);
+            // If a control is suffering from bad input (due to native validators), browsers discard its
+            // value, so it may be necessary to revalidate (by calling $setViewValue again) even if the
+            // control's value is the same empty value twice in a row.
+            if (ctrl.$viewValue !== value || (value === '' && ctrl.$$hasNativeValidators)) {
+                ctrl.$setViewValue(value, event);
             }
-
-            return out;
         };
-    }
 
-    /**
-     * @ngdoc filter
-     * @name orderBy
-     * @function
-     *
-     * @description
-     * Orders a specified `array` by the `expression` predicate.
-     *
-     * @param {Array} array The array to sort.
-     * @param {function(*)|string|Array.<(function(*)|string)>} expression A predicate to be
-     *    used by the comparator to determine the order of elements.
-     *
-     *    Can be one of:
-     *
-     *    - `function`: Getter function. The result of this function will be sorted using the
-     *      `<`, `=`, `>` operator.
-     *    - `string`: An Angular expression which evaluates to an object to order by, such as 'name'
-     *      to sort by a property called 'name'. Optionally prefixed with `+` or `-` to control
-     *      ascending or descending sort order (for example, +name or -name).
-     *    - `Array`: An array of function or string predicates. The first predicate in the array
-     *      is used for sorting, but when two items are equivalent, the next predicate is used.
-     *
-     * @param {boolean=} reverse Reverse the order of the array.
-     * @returns {Array} Sorted copy of the source array.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-           $scope.friends =
-               [{name:'John', phone:'555-1212', age:10},
-                {name:'Mary', phone:'555-9876', age:19},
-                {name:'Mike', phone:'555-4321', age:21},
-                {name:'Adam', phone:'555-5678', age:35},
-                {name:'Julie', phone:'555-8765', age:29}]
-           $scope.predicate = '-age';
-         }
-     </script>
-     <div ng-controller="Ctrl">
-     <pre>Sorting predicate = {{predicate}}; reverse = {{reverse}}</pre>
-     <hr/>
-     [ <a href="" ng-click="predicate=''">unsorted</a> ]
-     <table class="friend">
-     <tr>
-     <th><a href="" ng-click="predicate = 'name'; reverse=false">Name</a>
-     (<a href="" ng-click="predicate = '-name'; reverse=false">^</a>)</th>
-     <th><a href="" ng-click="predicate = 'phone'; reverse=!reverse">Phone Number</a></th>
-     <th><a href="" ng-click="predicate = 'age'; reverse=!reverse">Age</a></th>
-     </tr>
-     <tr ng-repeat="friend in friends | orderBy:predicate:reverse">
-     <td>{{friend.name}}</td>
-     <td>{{friend.phone}}</td>
-     <td>{{friend.age}}</td>
-     </tr>
-     </table>
-     </div>
-     </file>
-     </example>
-     */
-    orderByFilter.$inject = ['$parse'];
-    function orderByFilter($parse){
-        return function(array, sortPredicate, reverseOrder) {
-            if (!isArray(array)) return array;
-            if (!sortPredicate) return array;
-            sortPredicate = isArray(sortPredicate) ? sortPredicate: [sortPredicate];
-            sortPredicate = map(sortPredicate, function(predicate){
-                var descending = false, get = predicate || identity;
-                if (isString(predicate)) {
-                    if ((predicate.charAt(0) == '+' || predicate.charAt(0) == '-')) {
-                        descending = predicate.charAt(0) == '-';
-                        predicate = predicate.substring(1);
-                    }
-                    get = $parse(predicate);
-                    if (get.constant) {
-                        var key = get();
-                        return reverseComparator(function(a,b) {
-                            return compare(a[key], b[key]);
-                        }, descending);
-                    }
-                }
-                return reverseComparator(function(a,b){
-                    return compare(get(a),get(b));
-                }, descending);
-            });
-            var arrayCopy = [];
-            for ( var i = 0; i < array.length; i++) { arrayCopy.push(array[i]); }
-            return arrayCopy.sort(reverseComparator(comparator, reverseOrder));
-
-            function comparator(o1, o2){
-                for ( var i = 0; i < sortPredicate.length; i++) {
-                    var comp = sortPredicate[i](o1, o2);
-                    if (comp !== 0) return comp;
-                }
-                return 0;
-            }
-            function reverseComparator(comp, descending) {
-                return toBoolean(descending)
-                    ? function(a,b){return comp(b,a);}
-                    : comp;
-            }
-            function compare(v1, v2){
-                var t1 = typeof v1;
-                var t2 = typeof v2;
-                if (t1 == t2) {
-                    if (t1 == "string") {
-                        v1 = v1.toLowerCase();
-                        v2 = v2.toLowerCase();
-                    }
-                    if (v1 === v2) return 0;
-                    return v1 < v2 ? -1 : 1;
-                } else {
-                    return t1 < t2 ? -1 : 1;
+        // if the browser does support "input" event, we are fine - except on IE9 which doesn't fire the
+        // input event on backspace, delete or cut
+        if ($sniffer.hasEvent('input')) {
+            element.on('input', listener);
+        } else {
+            var deferListener = function(ev, input, origValue) {
+                if (!timeout) {
+                    timeout = $browser.defer(function() {
+                        timeout = null;
+                        if (!input || input.value !== origValue) {
+                            listener(ev);
+                        }
+                    });
                 }
-            }
-        };
-    }
-
-    function ngDirective(directive) {
-        if (isFunction(directive)) {
-            directive = {
-                link: directive
             };
-        }
-        directive.restrict = directive.restrict || 'AC';
-        return valueFn(directive);
-    }
 
-    /**
-     * @ngdoc directive
-     * @name a
-     * @restrict E
-     *
-     * @description
-     * Modifies the default behavior of the html A tag so that the default action is prevented when
-     * the href attribute is empty.
-     *
-     * This change permits the easy creation of action links with the `ngClick` directive
-     * without changing the location or causing page reloads, e.g.:
-     * `<a href="" ng-click="list.addItem()">Add Item</a>`
-     */
-    var htmlAnchorDirective = valueFn({
-        restrict: 'E',
-        compile: function(element, attr) {
+            element.on('keydown', /** @this */ function(event) {
+                var key = event.keyCode;
 
-            if (msie <= 8) {
+                // ignore
+                //    command            modifiers                   arrows
+                if (key === 91 || (15 < key && key < 19) || (37 <= key && key <= 40)) return;
 
-                // turn <a href ng-click="..">link</a> into a stylable link in IE
-                // but only if it doesn't have name attribute, in which case it's an anchor
-                if (!attr.href && !attr.name) {
-                    attr.$set('href', '');
-                }
+                deferListener(event, this, this.value);
+            });
 
-                // add a comment node to anchors to workaround IE bug that causes element content to be reset
-                // to new attribute content if attribute is updated with value containing @ and element also
-                // contains value with @
-                // see issue #1949
-                element.append(document.createComment('IE fix'));
+            // if user modifies input value using context menu in IE, we need "paste", "cut" and "drop" events to catch it
+            if ($sniffer.hasEvent('paste')) {
+                element.on('paste cut drop', deferListener);
             }
+        }
 
-            if (!attr.href && !attr.xlinkHref && !attr.name) {
-                return function(scope, element) {
-                    // SVGAElement does not use the href attribute, but rather the 'xlinkHref' attribute.
-                    var href = toString.call(element.prop('href')) === '[object SVGAnimatedString]' ?
-                        'xlink:href' : 'href';
-                    element.on('click', function(event){
-                        // if we have no href url, then don't navigate anywhere.
-                        if (!element.attr(href)) {
-                            event.preventDefault();
+        // if user paste into input using mouse on older browser
+        // or form autocomplete on newer browser, we need "change" event to catch it
+        element.on('change', listener);
+
+        // Some native input types (date-family) have the ability to change validity without
+        // firing any input/change events.
+        // For these event types, when native validators are present and the browser supports the type,
+        // check for validity changes on various DOM events.
+        if (PARTIAL_VALIDATION_TYPES[type] && ctrl.$$hasNativeValidators && type === attr.type) {
+            element.on(PARTIAL_VALIDATION_EVENTS, /** @this */ function(ev) {
+                if (!timeout) {
+                    var validity = this[VALIDITY_STATE_PROPERTY];
+                    var origBadInput = validity.badInput;
+                    var origTypeMismatch = validity.typeMismatch;
+                    timeout = $browser.defer(function() {
+                        timeout = null;
+                        if (validity.badInput !== origBadInput || validity.typeMismatch !== origTypeMismatch) {
+                            listener(ev);
                         }
                     });
-                };
-            }
+                }
+            });
         }
-    });
 
-    /**
-     * @ngdoc directive
-     * @name ngHref
-     * @restrict A
-     * @priority 99
-     *
-     * @description
-     * Using Angular markup like `{{hash}}` in an href attribute will
-     * make the link go to the wrong URL if the user clicks it before
-     * Angular has a chance to replace the `{{hash}}` markup with its
-     * value. Until Angular replaces the markup the link will be broken
-     * and will most likely return a 404 error.
-     *
-     * The `ngHref` directive solves this problem.
-     *
-     * The wrong way to write it:
-     * ```html
-     * <a href="http://www.gravatar.com/avatar/{{hash}}"/>
-     * ```
-     *
-     * The correct way to write it:
-     * ```html
-     * <a ng-href="http://www.gravatar.com/avatar/{{hash}}"/>
-     * ```
-     *
-     * @element A
-     * @param {template} ngHref any string which can contain `{{}}` markup.
-     *
-     * @example
-     * This example shows various combinations of `href`, `ng-href` and `ng-click` attributes
-     * in links and their different behaviors:
-     <example>
-     <file name="index.html">
-     <input ng-model="value" /><br />
-     <a id="link-1" href ng-click="value = 1">link 1</a> (link, don't reload)<br />
-     <a id="link-2" href="" ng-click="value = 2">link 2</a> (link, don't reload)<br />
-     <a id="link-3" ng-href="/{{'123'}}">link 3</a> (link, reload!)<br />
-     <a id="link-4" href="" name="xx" ng-click="value = 4">anchor</a> (link, don't reload)<br />
-     <a id="link-5" name="xxx" ng-click="value = 5">anchor</a> (no link)<br />
-     <a id="link-6" ng-href="{{value}}">link</a> (link, change location)
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should execute ng-click but not reload when href without value', function() {
-          element(by.id('link-1')).click();
-          expect(element(by.model('value')).getAttribute('value')).toEqual('1');
-          expect(element(by.id('link-1')).getAttribute('href')).toBe('');
-        });
+        ctrl.$render = function() {
+            // Workaround for Firefox validation #12102.
+            var value = ctrl.$isEmpty(ctrl.$viewValue) ? '' : ctrl.$viewValue;
+            if (element.val() !== value) {
+                element.val(value);
+            }
+        };
+    }
 
-     it('should execute ng-click but not reload when href empty string', function() {
-          element(by.id('link-2')).click();
-          expect(element(by.model('value')).getAttribute('value')).toEqual('2');
-          expect(element(by.id('link-2')).getAttribute('href')).toBe('');
-        });
+    function weekParser(isoWeek, existingDate) {
+        if (isDate(isoWeek)) {
+            return isoWeek;
+        }
 
-     it('should execute ng-click and change url when ng-href specified', function() {
-          expect(element(by.id('link-3')).getAttribute('href')).toMatch(/\/123$/);
+        if (isString(isoWeek)) {
+            WEEK_REGEXP.lastIndex = 0;
+            var parts = WEEK_REGEXP.exec(isoWeek);
+            if (parts) {
+                var year = +parts[1],
+                    week = +parts[2],
+                    hours = 0,
+                    minutes = 0,
+                    seconds = 0,
+                    milliseconds = 0,
+                    firstThurs = getFirstThursdayOfYear(year),
+                    addDays = (week - 1) * 7;
+
+                if (existingDate) {
+                    hours = existingDate.getHours();
+                    minutes = existingDate.getMinutes();
+                    seconds = existingDate.getSeconds();
+                    milliseconds = existingDate.getMilliseconds();
+                }
 
-          element(by.id('link-3')).click();
+                return new Date(year, 0, firstThurs.getDate() + addDays, hours, minutes, seconds, milliseconds);
+            }
+        }
 
-          // At this point, we navigate away from an Angular page, so we need
-          // to use browser.driver to get the base webdriver.
+        return NaN;
+    }
 
-          browser.wait(function() {
-            return browser.driver.getCurrentUrl().then(function(url) {
-              return url.match(/\/123$/);
-            });
-          }, 1000, 'page should navigate to /123');
-        });
+    function createDateParser(regexp, mapping) {
+        return function(iso, date) {
+            var parts, map;
 
-     xit('should execute ng-click but not reload when href empty string and name specified', function() {
-          element(by.id('link-4')).click();
-          expect(element(by.model('value')).getAttribute('value')).toEqual('4');
-          expect(element(by.id('link-4')).getAttribute('href')).toBe('');
-        });
+            if (isDate(iso)) {
+                return iso;
+            }
 
-     it('should execute ng-click but not reload when no href but name specified', function() {
-          element(by.id('link-5')).click();
-          expect(element(by.model('value')).getAttribute('value')).toEqual('5');
-          expect(element(by.id('link-5')).getAttribute('href')).toBe(null);
-        });
+            if (isString(iso)) {
+                // When a date is JSON'ified to wraps itself inside of an extra
+                // set of double quotes. This makes the date parsing code unable
+                // to match the date string and parse it as a date.
+                if (iso.charAt(0) === '"' && iso.charAt(iso.length - 1) === '"') {
+                    iso = iso.substring(1, iso.length - 1);
+                }
+                if (ISO_DATE_REGEXP.test(iso)) {
+                    return new Date(iso);
+                }
+                regexp.lastIndex = 0;
+                parts = regexp.exec(iso);
+
+                if (parts) {
+                    parts.shift();
+                    if (date) {
+                        map = {
+                            yyyy: date.getFullYear(),
+                            MM: date.getMonth() + 1,
+                            dd: date.getDate(),
+                            HH: date.getHours(),
+                            mm: date.getMinutes(),
+                            ss: date.getSeconds(),
+                            sss: date.getMilliseconds() / 1000
+                        };
+                    } else {
+                        map = { yyyy: 1970, MM: 1, dd: 1, HH: 0, mm: 0, ss: 0, sss: 0 };
+                    }
 
-     it('should only change url when only ng-href', function() {
-          element(by.model('value')).clear();
-          element(by.model('value')).sendKeys('6');
-          expect(element(by.id('link-6')).getAttribute('href')).toMatch(/\/6$/);
+                    forEach(parts, function(part, index) {
+                        if (index < mapping.length) {
+                            map[mapping[index]] = +part;
+                        }
+                    });
+                    return new Date(map.yyyy, map.MM - 1, map.dd, map.HH, map.mm, map.ss || 0, map.sss * 1000 || 0);
+                }
+            }
 
-          element(by.id('link-6')).click();
+            return NaN;
+        };
+    }
 
-          // At this point, we navigate away from an Angular page, so we need
-          // to use browser.driver to get the base webdriver.
-          browser.wait(function() {
-            return browser.driver.getCurrentUrl().then(function(url) {
-              return url.match(/\/6$/);
+    function createDateInputType(type, regexp, parseDate, format) {
+        return function dynamicDateInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter) {
+            badInputChecker(scope, element, attr, ctrl);
+            baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+            var timezone = ctrl && ctrl.$options.getOption('timezone');
+            var previousDate;
+
+            ctrl.$$parserName = type;
+            ctrl.$parsers.push(function(value) {
+                if (ctrl.$isEmpty(value)) return null;
+                if (regexp.test(value)) {
+                    // Note: We cannot read ctrl.$modelValue, as there might be a different
+                    // parser/formatter in the processing chain so that the model
+                    // contains some different data format!
+                    var parsedDate = parseDate(value, previousDate);
+                    if (timezone) {
+                        parsedDate = convertTimezoneToLocal(parsedDate, timezone);
+                    }
+                    return parsedDate;
+                }
+                return undefined;
             });
-          }, 1000, 'page should navigate to /6');
-        });
-     </file>
-     </example>
-     */
-
-    /**
-     * @ngdoc directive
-     * @name ngSrc
-     * @restrict A
-     * @priority 99
-     *
-     * @description
-     * Using Angular markup like `{{hash}}` in a `src` attribute doesn't
-     * work right: The browser will fetch from the URL with the literal
-     * text `{{hash}}` until Angular replaces the expression inside
-     * `{{hash}}`. The `ngSrc` directive solves this problem.
-     *
-     * The buggy way to write it:
-     * ```html
-     * <img src="http://www.gravatar.com/avatar/{{hash}}"/>
-     * ```
-     *
-     * The correct way to write it:
-     * ```html
-     * <img ng-src="http://www.gravatar.com/avatar/{{hash}}"/>
-     * ```
-     *
-     * @element IMG
-     * @param {template} ngSrc any string which can contain `{{}}` markup.
-     */
-
-    /**
-     * @ngdoc directive
-     * @name ngSrcset
-     * @restrict A
-     * @priority 99
-     *
-     * @description
-     * Using Angular markup like `{{hash}}` in a `srcset` attribute doesn't
-     * work right: The browser will fetch from the URL with the literal
-     * text `{{hash}}` until Angular replaces the expression inside
-     * `{{hash}}`. The `ngSrcset` directive solves this problem.
-     *
-     * The buggy way to write it:
-     * ```html
-     * <img srcset="http://www.gravatar.com/avatar/{{hash}} 2x"/>
-     * ```
-     *
-     * The correct way to write it:
-     * ```html
-     * <img ng-srcset="http://www.gravatar.com/avatar/{{hash}} 2x"/>
-     * ```
-     *
-     * @element IMG
-     * @param {template} ngSrcset any string which can contain `{{}}` markup.
-     */
 
-    /**
-     * @ngdoc directive
-     * @name ngDisabled
-     * @restrict A
-     * @priority 100
-     *
-     * @description
-     *
-     * The following markup will make the button enabled on Chrome/Firefox but not on IE8 and older IEs:
-     * ```html
-     * <div ng-init="scope = { isDisabled: false }">
-     *  <button disabled="{{scope.isDisabled}}">Disabled</button>
-     * </div>
-     * ```
-     *
-     * The HTML specification does not require browsers to preserve the values of boolean attributes
-     * such as disabled. (Their presence means true and their absence means false.)
-     * If we put an Angular interpolation expression into such an attribute then the
-     * binding information would be lost when the browser removes the attribute.
-     * The `ngDisabled` directive solves this problem for the `disabled` attribute.
-     * This complementary directive is not removed by the browser and so provides
-     * a permanent reliable place to store the binding information.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     Click me to toggle: <input type="checkbox" ng-model="checked"><br/>
-     <button ng-model="button" ng-disabled="checked">Button</button>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should toggle button', function() {
-          expect(element(by.css('button')).getAttribute('disabled')).toBeFalsy();
-          element(by.model('checked')).click();
-          expect(element(by.css('button')).getAttribute('disabled')).toBeTruthy();
-        });
-     </file>
-     </example>
-     *
-     * @element INPUT
-     * @param {expression} ngDisabled If the {@link guide/expression expression} is truthy,
-     *     then special attribute "disabled" will be set on the element
-     */
+            ctrl.$formatters.push(function(value) {
+                if (value && !isDate(value)) {
+                    throw ngModelMinErr('datefmt', 'Expected `{0}` to be a date', value);
+                }
+                if (isValidDate(value)) {
+                    previousDate = value;
+                    if (previousDate && timezone) {
+                        previousDate = convertTimezoneToLocal(previousDate, timezone, true);
+                    }
+                    return $filter('date')(value, format, timezone);
+                } else {
+                    previousDate = null;
+                    return '';
+                }
+            });
 
+            if (isDefined(attr.min) || attr.ngMin) {
+                var minVal;
+                ctrl.$validators.min = function(value) {
+                    return !isValidDate(value) || isUndefined(minVal) || parseDate(value) >= minVal;
+                };
+                attr.$observe('min', function(val) {
+                    minVal = parseObservedDateValue(val);
+                    ctrl.$validate();
+                });
+            }
 
-    /**
-     * @ngdoc directive
-     * @name ngChecked
-     * @restrict A
-     * @priority 100
-     *
-     * @description
-     * The HTML specification does not require browsers to preserve the values of boolean attributes
-     * such as checked. (Their presence means true and their absence means false.)
-     * If we put an Angular interpolation expression into such an attribute then the
-     * binding information would be lost when the browser removes the attribute.
-     * The `ngChecked` directive solves this problem for the `checked` attribute.
-     * This complementary directive is not removed by the browser and so provides
-     * a permanent reliable place to store the binding information.
-     * @example
-     <example>
-     <file name="index.html">
-     Check me to check both: <input type="checkbox" ng-model="master"><br/>
-     <input id="checkSlave" type="checkbox" ng-checked="master">
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check both checkBoxes', function() {
-          expect(element(by.id('checkSlave')).getAttribute('checked')).toBeFalsy();
-          element(by.model('master')).click();
-          expect(element(by.id('checkSlave')).getAttribute('checked')).toBeTruthy();
-        });
-     </file>
-     </example>
-     *
-     * @element INPUT
-     * @param {expression} ngChecked If the {@link guide/expression expression} is truthy,
-     *     then special attribute "checked" will be set on the element
-     */
+            if (isDefined(attr.max) || attr.ngMax) {
+                var maxVal;
+                ctrl.$validators.max = function(value) {
+                    return !isValidDate(value) || isUndefined(maxVal) || parseDate(value) <= maxVal;
+                };
+                attr.$observe('max', function(val) {
+                    maxVal = parseObservedDateValue(val);
+                    ctrl.$validate();
+                });
+            }
 
+            function isValidDate(value) {
+                // Invalid Date: getTime() returns NaN
+                return value && !(value.getTime && value.getTime() !== value.getTime());
+            }
 
-    /**
-     * @ngdoc directive
-     * @name ngReadonly
-     * @restrict A
-     * @priority 100
-     *
-     * @description
-     * The HTML specification does not require browsers to preserve the values of boolean attributes
-     * such as readonly. (Their presence means true and their absence means false.)
-     * If we put an Angular interpolation expression into such an attribute then the
-     * binding information would be lost when the browser removes the attribute.
-     * The `ngReadonly` directive solves this problem for the `readonly` attribute.
-     * This complementary directive is not removed by the browser and so provides
-     * a permanent reliable place to store the binding information.
-     * @example
-     <example>
-     <file name="index.html">
-     Check me to make text readonly: <input type="checkbox" ng-model="checked"><br/>
-     <input type="text" ng-readonly="checked" value="I'm Angular"/>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should toggle readonly attr', function() {
-          expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeFalsy();
-          element(by.model('checked')).click();
-          expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeTruthy();
-        });
-     </file>
-     </example>
-     *
-     * @element INPUT
-     * @param {expression} ngReadonly If the {@link guide/expression expression} is truthy,
-     *     then special attribute "readonly" will be set on the element
-     */
+            function parseObservedDateValue(val) {
+                return isDefined(val) && !isDate(val) ? parseDate(val) || undefined : val;
+            }
+        };
+    }
 
+    function badInputChecker(scope, element, attr, ctrl) {
+        var node = element[0];
+        var nativeValidation = ctrl.$$hasNativeValidators = isObject(node.validity);
+        if (nativeValidation) {
+            ctrl.$parsers.push(function(value) {
+                var validity = element.prop(VALIDITY_STATE_PROPERTY) || {};
+                return validity.badInput || validity.typeMismatch ? undefined : value;
+            });
+        }
+    }
 
-    /**
-     * @ngdoc directive
-     * @name ngSelected
-     * @restrict A
-     * @priority 100
-     *
-     * @description
-     * The HTML specification does not require browsers to preserve the values of boolean attributes
-     * such as selected. (Their presence means true and their absence means false.)
-     * If we put an Angular interpolation expression into such an attribute then the
-     * binding information would be lost when the browser removes the attribute.
-     * The `ngSelected` directive solves this problem for the `selected` attribute.
-     * This complementary directive is not removed by the browser and so provides
-     * a permanent reliable place to store the binding information.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     Check me to select: <input type="checkbox" ng-model="selected"><br/>
-     <select>
-     <option>Hello!</option>
-     <option id="greet" ng-selected="selected">Greetings!</option>
-     </select>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should select Greetings!', function() {
-          expect(element(by.id('greet')).getAttribute('selected')).toBeFalsy();
-          element(by.model('selected')).click();
-          expect(element(by.id('greet')).getAttribute('selected')).toBeTruthy();
+    function numberFormatterParser(ctrl) {
+        ctrl.$$parserName = 'number';
+        ctrl.$parsers.push(function(value) {
+            if (ctrl.$isEmpty(value))      return null;
+            if (NUMBER_REGEXP.test(value)) return parseFloat(value);
+            return undefined;
         });
-     </file>
-     </example>
-     *
-     * @element OPTION
-     * @param {expression} ngSelected If the {@link guide/expression expression} is truthy,
-     *     then special attribute "selected" will be set on the element
-     */
 
-    /**
-     * @ngdoc directive
-     * @name ngOpen
-     * @restrict A
-     * @priority 100
-     *
-     * @description
-     * The HTML specification does not require browsers to preserve the values of boolean attributes
-     * such as open. (Their presence means true and their absence means false.)
-     * If we put an Angular interpolation expression into such an attribute then the
-     * binding information would be lost when the browser removes the attribute.
-     * The `ngOpen` directive solves this problem for the `open` attribute.
-     * This complementary directive is not removed by the browser and so provides
-     * a permanent reliable place to store the binding information.
-     * @example
-     <example>
-     <file name="index.html">
-     Check me check multiple: <input type="checkbox" ng-model="open"><br/>
-     <details id="details" ng-open="open">
-     <summary>Show/Hide me</summary>
-     </details>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should toggle open', function() {
-           expect(element(by.id('details')).getAttribute('open')).toBeFalsy();
-           element(by.model('open')).click();
-           expect(element(by.id('details')).getAttribute('open')).toBeTruthy();
-         });
-     </file>
-     </example>
-     *
-     * @element DETAILS
-     * @param {expression} ngOpen If the {@link guide/expression expression} is truthy,
-     *     then special attribute "open" will be set on the element
-     */
+        ctrl.$formatters.push(function(value) {
+            if (!ctrl.$isEmpty(value)) {
+                if (!isNumber(value)) {
+                    throw ngModelMinErr('numfmt', 'Expected `{0}` to be a number', value);
+                }
+                value = value.toString();
+            }
+            return value;
+        });
+    }
 
-    var ngAttributeAliasDirectives = {};
+    function parseNumberAttrVal(val) {
+        if (isDefined(val) && !isNumber(val)) {
+            val = parseFloat(val);
+        }
+        return !isNumberNaN(val) ? val : undefined;
+    }
 
+    function isNumberInteger(num) {
+        // See http://stackoverflow.com/questions/14636536/how-to-check-if-a-variable-is-an-integer-in-javascript#14794066
+        // (minus the assumption that `num` is a number)
 
-// boolean attrs are evaluated
-    forEach(BOOLEAN_ATTR, function(propName, attrName) {
-        // binding to multiple is not supported
-        if (propName == "multiple") return;
+        // eslint-disable-next-line no-bitwise
+        return (num | 0) === num;
+    }
 
-        var normalized = directiveNormalize('ng-' + attrName);
-        ngAttributeAliasDirectives[normalized] = function() {
-            return {
-                priority: 100,
-                link: function(scope, element, attr) {
-                    scope.$watch(attr[normalized], function ngBooleanAttrWatchAction(value) {
-                        attr.$set(attrName, !!value);
-                    });
+    function countDecimals(num) {
+        var numString = num.toString();
+        var decimalSymbolIndex = numString.indexOf('.');
+
+        if (decimalSymbolIndex === -1) {
+            if (-1 < num && num < 1) {
+                // It may be in the exponential notation format (`1e-X`)
+                var match = /e-(\d+)$/.exec(numString);
+
+                if (match) {
+                    return Number(match[1]);
                 }
-            };
-        };
-    });
+            }
 
+            return 0;
+        }
 
-// ng-src, ng-srcset, ng-href are interpolated
-    forEach(['src', 'srcset', 'href'], function(attrName) {
-        var normalized = directiveNormalize('ng-' + attrName);
-        ngAttributeAliasDirectives[normalized] = function() {
-            return {
-                priority: 99, // it needs to run after the attributes are interpolated
-                link: function(scope, element, attr) {
-                    var propName = attrName,
-                        name = attrName;
+        return numString.length - decimalSymbolIndex - 1;
+    }
 
-                    if (attrName === 'href' &&
-                        toString.call(element.prop('href')) === '[object SVGAnimatedString]') {
-                        name = 'xlinkHref';
-                        attr.$attr[name] = 'xlink:href';
-                        propName = null;
-                    }
+    function isValidForStep(viewValue, stepBase, step) {
+        // At this point `stepBase` and `step` are expected to be non-NaN values
+        // and `viewValue` is expected to be a valid stringified number.
+        var value = Number(viewValue);
 
-                    attr.$observe(normalized, function(value) {
-                        if (!value)
-                            return;
+        var isNonIntegerValue = !isNumberInteger(value);
+        var isNonIntegerStepBase = !isNumberInteger(stepBase);
+        var isNonIntegerStep = !isNumberInteger(step);
 
-                        attr.$set(name, value);
+        // Due to limitations in Floating Point Arithmetic (e.g. `0.3 - 0.2 !== 0.1` or
+        // `0.5 % 0.1 !== 0`), we need to convert all numbers to integers.
+        if (isNonIntegerValue || isNonIntegerStepBase || isNonIntegerStep) {
+            var valueDecimals = isNonIntegerValue ? countDecimals(value) : 0;
+            var stepBaseDecimals = isNonIntegerStepBase ? countDecimals(stepBase) : 0;
+            var stepDecimals = isNonIntegerStep ? countDecimals(step) : 0;
 
-                        // on IE, if "ng:src" directive declaration is used and "src" attribute doesn't exist
-                        // then calling element.setAttribute('src', 'foo') doesn't do anything, so we need
-                        // to set the property as well to achieve the desired effect.
-                        // we use attr[attrName] value since $set can sanitize the url.
-                        if (msie && propName) element.prop(propName, attr[name]);
-                    });
-                }
+            var decimalCount = Math.max(valueDecimals, stepBaseDecimals, stepDecimals);
+            var multiplier = Math.pow(10, decimalCount);
+
+            value = value * multiplier;
+            stepBase = stepBase * multiplier;
+            step = step * multiplier;
+
+            if (isNonIntegerValue) value = Math.round(value);
+            if (isNonIntegerStepBase) stepBase = Math.round(stepBase);
+            if (isNonIntegerStep) step = Math.round(step);
+        }
+
+        return (value - stepBase) % step === 0;
+    }
+
+    function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+        badInputChecker(scope, element, attr, ctrl);
+        numberFormatterParser(ctrl);
+        baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+
+        var minVal;
+        var maxVal;
+
+        if (isDefined(attr.min) || attr.ngMin) {
+            ctrl.$validators.min = function(value) {
+                return ctrl.$isEmpty(value) || isUndefined(minVal) || value >= minVal;
             };
-        };
-    });
 
-    /* global -nullFormCtrl */
-    var nullFormCtrl = {
-        $addControl: noop,
-        $removeControl: noop,
-        $setValidity: noop,
-        $setDirty: noop,
-        $setPristine: noop
-    };
+            attr.$observe('min', function(val) {
+                minVal = parseNumberAttrVal(val);
+                // TODO(matsko): implement validateLater to reduce number of validations
+                ctrl.$validate();
+            });
+        }
 
-    /**
-     * @ngdoc type
-     * @name form.FormController
-     *
-     * @property {boolean} $pristine True if user has not interacted with the form yet.
-     * @property {boolean} $dirty True if user has already interacted with the form.
-     * @property {boolean} $valid True if all of the containing forms and controls are valid.
-     * @property {boolean} $invalid True if at least one containing control or form is invalid.
-     *
-     * @property {Object} $error Is an object hash, containing references to all invalid controls or
-     *  forms, where:
-     *
-     *  - keys are validation tokens (error names),
-     *  - values are arrays of controls or forms that are invalid for given error name.
-     *
-     *
-     *  Built-in validation tokens:
-     *
-     *  - `email`
-     *  - `max`
-     *  - `maxlength`
-     *  - `min`
-     *  - `minlength`
-     *  - `number`
-     *  - `pattern`
-     *  - `required`
-     *  - `url`
-     *
-     * @description
-     * `FormController` keeps track of all its controls and nested forms as well as state of them,
-     * such as being valid/invalid or dirty/pristine.
-     *
-     * Each {@link ng.directive:form form} directive creates an instance
-     * of `FormController`.
-     *
-     */
-//asks for $scope to fool the BC controller module
-    FormController.$inject = ['$element', '$attrs', '$scope', '$animate'];
-    function FormController(element, attrs, $scope, $animate) {
-        var form = this,
-            parentForm = element.parent().controller('form') || nullFormCtrl,
-            invalidCount = 0, // used to easily determine if we are valid
-            errors = form.$error = {},
-            controls = [];
+        if (isDefined(attr.max) || attr.ngMax) {
+            ctrl.$validators.max = function(value) {
+                return ctrl.$isEmpty(value) || isUndefined(maxVal) || value <= maxVal;
+            };
 
-        // init state
-        form.$name = attrs.name || attrs.ngForm;
-        form.$dirty = false;
-        form.$pristine = true;
-        form.$valid = true;
-        form.$invalid = false;
+            attr.$observe('max', function(val) {
+                maxVal = parseNumberAttrVal(val);
+                // TODO(matsko): implement validateLater to reduce number of validations
+                ctrl.$validate();
+            });
+        }
+
+        if (isDefined(attr.step) || attr.ngStep) {
+            var stepVal;
+            ctrl.$validators.step = function(modelValue, viewValue) {
+                return ctrl.$isEmpty(viewValue) || isUndefined(stepVal) ||
+                    isValidForStep(viewValue, minVal || 0, stepVal);
+            };
 
-        parentForm.$addControl(form);
+            attr.$observe('step', function(val) {
+                stepVal = parseNumberAttrVal(val);
+                // TODO(matsko): implement validateLater to reduce number of validations
+                ctrl.$validate();
+            });
+        }
+    }
 
-        // Setup initial state of the control
-        element.addClass(PRISTINE_CLASS);
-        toggleValidCss(true);
+    function rangeInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+        badInputChecker(scope, element, attr, ctrl);
+        numberFormatterParser(ctrl);
+        baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+
+        var supportsRange = ctrl.$$hasNativeValidators && element[0].type === 'range',
+            minVal = supportsRange ? 0 : undefined,
+            maxVal = supportsRange ? 100 : undefined,
+            stepVal = supportsRange ? 1 : undefined,
+            validity = element[0].validity,
+            hasMinAttr = isDefined(attr.min),
+            hasMaxAttr = isDefined(attr.max),
+            hasStepAttr = isDefined(attr.step);
+
+        var originalRender = ctrl.$render;
+
+        ctrl.$render = supportsRange && isDefined(validity.rangeUnderflow) && isDefined(validity.rangeOverflow) ?
+            //Browsers that implement range will set these values automatically, but reading the adjusted values after
+            //$render would cause the min / max validators to be applied with the wrong value
+            function rangeRender() {
+                originalRender();
+                ctrl.$setViewValue(element.val());
+            } :
+            originalRender;
+
+        if (hasMinAttr) {
+            ctrl.$validators.min = supportsRange ?
+                // Since all browsers set the input to a valid value, we don't need to check validity
+                function noopMinValidator() { return true; } :
+                // non-support browsers validate the min val
+                function minValidator(modelValue, viewValue) {
+                    return ctrl.$isEmpty(viewValue) || isUndefined(minVal) || viewValue >= minVal;
+                };
 
-        // convenience method for easy toggling of classes
-        function toggleValidCss(isValid, validationErrorKey) {
-            validationErrorKey = validationErrorKey ? '-' + snake_case(validationErrorKey, '-') : '';
-            $animate.removeClass(element, (isValid ? INVALID_CLASS : VALID_CLASS) + validationErrorKey);
-            $animate.addClass(element, (isValid ? VALID_CLASS : INVALID_CLASS) + validationErrorKey);
+            setInitialValueAndObserver('min', minChange);
         }
 
-        /**
-         * @ngdoc method
-         * @name form.FormController#$addControl
-         *
-         * @description
-         * Register a control with the form.
-         *
-         * Input elements using ngModelController do this automatically when they are linked.
-         */
-        form.$addControl = function(control) {
-            // Breaking change - before, inputs whose name was "hasOwnProperty" were quietly ignored
-            // and not added to the scope.  Now we throw an error.
-            assertNotHasOwnProperty(control.$name, 'input');
-            controls.push(control);
+        if (hasMaxAttr) {
+            ctrl.$validators.max = supportsRange ?
+                // Since all browsers set the input to a valid value, we don't need to check validity
+                function noopMaxValidator() { return true; } :
+                // non-support browsers validate the max val
+                function maxValidator(modelValue, viewValue) {
+                    return ctrl.$isEmpty(viewValue) || isUndefined(maxVal) || viewValue <= maxVal;
+                };
 
-            if (control.$name) {
-                form[control.$name] = control;
+            setInitialValueAndObserver('max', maxChange);
+        }
+
+        if (hasStepAttr) {
+            ctrl.$validators.step = supportsRange ?
+                function nativeStepValidator() {
+                    // Currently, only FF implements the spec on step change correctly (i.e. adjusting the
+                    // input element value to a valid value). It's possible that other browsers set the stepMismatch
+                    // validity error instead, so we can at least report an error in that case.
+                    return !validity.stepMismatch;
+                } :
+                // ngStep doesn't set the setp attr, so the browser doesn't adjust the input value as setting step would
+                function stepValidator(modelValue, viewValue) {
+                    return ctrl.$isEmpty(viewValue) || isUndefined(stepVal) ||
+                        isValidForStep(viewValue, minVal || 0, stepVal);
+                };
+
+            setInitialValueAndObserver('step', stepChange);
+        }
+
+        function setInitialValueAndObserver(htmlAttrName, changeFn) {
+            // interpolated attributes set the attribute value only after a digest, but we need the
+            // attribute value when the input is first rendered, so that the browser can adjust the
+            // input value based on the min/max value
+            element.attr(htmlAttrName, attr[htmlAttrName]);
+            attr.$observe(htmlAttrName, changeFn);
+        }
+
+        function minChange(val) {
+            minVal = parseNumberAttrVal(val);
+            // ignore changes before model is initialized
+            if (isNumberNaN(ctrl.$modelValue)) {
+                return;
             }
-        };
 
-        /**
-         * @ngdoc method
-         * @name form.FormController#$removeControl
-         *
-         * @description
-         * Deregister a control from the form.
-         *
-         * Input elements using ngModelController do this automatically when they are destroyed.
-         */
-        form.$removeControl = function(control) {
-            if (control.$name && form[control.$name] === control) {
-                delete form[control.$name];
+            if (supportsRange) {
+                var elVal = element.val();
+                // IE11 doesn't set the el val correctly if the minVal is greater than the element value
+                if (minVal > elVal) {
+                    elVal = minVal;
+                    element.val(elVal);
+                }
+                ctrl.$setViewValue(elVal);
+            } else {
+                // TODO(matsko): implement validateLater to reduce number of validations
+                ctrl.$validate();
             }
-            forEach(errors, function(queue, validationToken) {
-                form.$setValidity(validationToken, true, control);
-            });
+        }
 
-            arrayRemove(controls, control);
-        };
+        function maxChange(val) {
+            maxVal = parseNumberAttrVal(val);
+            // ignore changes before model is initialized
+            if (isNumberNaN(ctrl.$modelValue)) {
+                return;
+            }
 
-        /**
-         * @ngdoc method
-         * @name form.FormController#$setValidity
-         *
-         * @description
-         * Sets the validity of a form control.
-         *
-         * This method will also propagate to parent forms.
-         */
-        form.$setValidity = function(validationToken, isValid, control) {
-            var queue = errors[validationToken];
-
-            if (isValid) {
-                if (queue) {
-                    arrayRemove(queue, control);
-                    if (!queue.length) {
-                        invalidCount--;
-                        if (!invalidCount) {
-                            toggleValidCss(isValid);
-                            form.$valid = true;
-                            form.$invalid = false;
-                        }
-                        errors[validationToken] = false;
-                        toggleValidCss(true, validationToken);
-                        parentForm.$setValidity(validationToken, true, form);
-                    }
+            if (supportsRange) {
+                var elVal = element.val();
+                // IE11 doesn't set the el val correctly if the maxVal is less than the element value
+                if (maxVal < elVal) {
+                    element.val(maxVal);
+                    // IE11 and Chrome don't set the value to the minVal when max < min
+                    elVal = maxVal < minVal ? minVal : maxVal;
                 }
+                ctrl.$setViewValue(elVal);
+            } else {
+                // TODO(matsko): implement validateLater to reduce number of validations
+                ctrl.$validate();
+            }
+        }
+
+        function stepChange(val) {
+            stepVal = parseNumberAttrVal(val);
+            // ignore changes before model is initialized
+            if (isNumberNaN(ctrl.$modelValue)) {
+                return;
+            }
 
+            // Some browsers don't adjust the input value correctly, but set the stepMismatch error
+            if (supportsRange && ctrl.$viewValue !== element.val()) {
+                ctrl.$setViewValue(element.val());
             } else {
-                if (!invalidCount) {
-                    toggleValidCss(isValid);
-                }
-                if (queue) {
-                    if (includes(queue, control)) return;
-                } else {
-                    errors[validationToken] = queue = [];
-                    invalidCount++;
-                    toggleValidCss(false, validationToken);
-                    parentForm.$setValidity(validationToken, false, form);
+                // TODO(matsko): implement validateLater to reduce number of validations
+                ctrl.$validate();
+            }
+        }
+    }
+
+    function urlInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+        // Note: no badInputChecker here by purpose as `url` is only a validation
+        // in browsers, i.e. we can always read out input.value even if it is not valid!
+        baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+        stringBasedInputType(ctrl);
+
+        ctrl.$$parserName = 'url';
+        ctrl.$validators.url = function(modelValue, viewValue) {
+            var value = modelValue || viewValue;
+            return ctrl.$isEmpty(value) || URL_REGEXP.test(value);
+        };
+    }
+
+    function emailInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+        // Note: no badInputChecker here by purpose as `url` is only a validation
+        // in browsers, i.e. we can always read out input.value even if it is not valid!
+        baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+        stringBasedInputType(ctrl);
+
+        ctrl.$$parserName = 'email';
+        ctrl.$validators.email = function(modelValue, viewValue) {
+            var value = modelValue || viewValue;
+            return ctrl.$isEmpty(value) || EMAIL_REGEXP.test(value);
+        };
+    }
+
+    function radioInputType(scope, element, attr, ctrl) {
+        var doTrim = !attr.ngTrim || trim(attr.ngTrim) !== 'false';
+        // make the name unique, if not defined
+        if (isUndefined(attr.name)) {
+            element.attr('name', nextUid());
+        }
+
+        var listener = function(ev) {
+            var value;
+            if (element[0].checked) {
+                value = attr.value;
+                if (doTrim) {
+                    value = trim(value);
                 }
-                queue.push(control);
+                ctrl.$setViewValue(value, ev && ev.type);
+            }
+        };
+
+        element.on('click', listener);
+
+        ctrl.$render = function() {
+            var value = attr.value;
+            if (doTrim) {
+                value = trim(value);
+            }
+            element[0].checked = (value === ctrl.$viewValue);
+        };
 
-                form.$valid = false;
-                form.$invalid = true;
+        attr.$observe('value', ctrl.$render);
+    }
+
+    function parseConstantExpr($parse, context, name, expression, fallback) {
+        var parseFn;
+        if (isDefined(expression)) {
+            parseFn = $parse(expression);
+            if (!parseFn.constant) {
+                throw ngModelMinErr('constexpr', 'Expected constant expression for `{0}`, but saw ' +
+                    '`{1}`.', name, expression);
             }
+            return parseFn(context);
+        }
+        return fallback;
+    }
+
+    function checkboxInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter, $parse) {
+        var trueValue = parseConstantExpr($parse, scope, 'ngTrueValue', attr.ngTrueValue, true);
+        var falseValue = parseConstantExpr($parse, scope, 'ngFalseValue', attr.ngFalseValue, false);
+
+        var listener = function(ev) {
+            ctrl.$setViewValue(element[0].checked, ev && ev.type);
         };
 
-        /**
-         * @ngdoc method
-         * @name form.FormController#$setDirty
-         *
-         * @description
-         * Sets the form to a dirty state.
-         *
-         * This method can be called to add the 'ng-dirty' class and set the form to a dirty
-         * state (ng-dirty class). This method will also propagate to parent forms.
-         */
-        form.$setDirty = function() {
-            $animate.removeClass(element, PRISTINE_CLASS);
-            $animate.addClass(element, DIRTY_CLASS);
-            form.$dirty = true;
-            form.$pristine = false;
-            parentForm.$setDirty();
+        element.on('click', listener);
+
+        ctrl.$render = function() {
+            element[0].checked = ctrl.$viewValue;
         };
 
-        /**
-         * @ngdoc method
-         * @name form.FormController#$setPristine
-         *
-         * @description
-         * Sets the form to its pristine state.
-         *
-         * This method can be called to remove the 'ng-dirty' class and set the form to its pristine
-         * state (ng-pristine class). This method will also propagate to all the controls contained
-         * in this form.
-         *
-         * Setting a form back to a pristine state is often useful when we want to 'reuse' a form after
-         * saving or resetting it.
-         */
-        form.$setPristine = function () {
-            $animate.removeClass(element, DIRTY_CLASS);
-            $animate.addClass(element, PRISTINE_CLASS);
-            form.$dirty = false;
-            form.$pristine = true;
-            forEach(controls, function(control) {
-                control.$setPristine();
-            });
+        // Override the standard `$isEmpty` because the $viewValue of an empty checkbox is always set to `false`
+        // This is because of the parser below, which compares the `$modelValue` with `trueValue` to convert
+        // it to a boolean.
+        ctrl.$isEmpty = function(value) {
+            return value === false;
         };
+
+        ctrl.$formatters.push(function(value) {
+            return equals(value, trueValue);
+        });
+
+        ctrl.$parsers.push(function(value) {
+            return value ? trueValue : falseValue;
+        });
     }
 
 
     /**
      * @ngdoc directive
-     * @name ngForm
-     * @restrict EAC
+     * @name textarea
+     * @restrict E
      *
      * @description
-     * Nestable alias of {@link ng.directive:form `form`} directive. HTML
-     * does not allow nesting of form elements. It is useful to nest forms, for example if the validity of a
-     * sub-group of controls needs to be determined.
+     * HTML textarea element control with AngularJS data-binding. The data-binding and validation
+     * properties of this element are exactly the same as those of the
+     * {@link ng.directive:input input element}.
      *
-     * Note: the purpose of `ngForm` is to group controls,
-     * but not to be a replacement for the `<form>` tag with all of its capabilities
-     * (e.g. posting to the server, ...).
+     * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+     * @param {string=} name Property name of the form under which the control is published.
+     * @param {string=} required Sets `required` validation error key if the value is not entered.
+     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+     *    `required` when you want to data-bind to the `required` attribute.
+     * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+     *    minlength.
+     * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+     *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of any
+     *    length.
+     * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+     *    does not match a RegExp found by evaluating the AngularJS expression given in the attribute value.
+     *    If the expression evaluates to a RegExp object, then this is used directly.
+     *    If the expression evaluates to a string, then it will be converted to a RegExp
+     *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+     *    `new RegExp('^abc$')`.<br />
+     *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+     *    start at the index of the last search's match, thus not taking the whole input value into
+     *    account.
+     * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+     *    interaction with the input element.
+     * @param {boolean=} [ngTrim=true] If set to false AngularJS will not automatically trim the input.
      *
-     * @param {string=} ngForm|name Name of the form. If specified, the form controller will be published into
-     *                       related scope, under this name.
+     * @knownIssue
      *
+     * When specifying the `placeholder` attribute of `<textarea>`, Internet Explorer will temporarily
+     * insert the placeholder value as the textarea's content. If the placeholder value contains
+     * interpolation (`{{ ... }}`), an error will be logged in the console when AngularJS tries to update
+     * the value of the by-then-removed text node. This doesn't affect the functionality of the
+     * textarea, but can be undesirable.
+     *
+     * You can work around this Internet Explorer issue by using `ng-attr-placeholder` instead of
+     * `placeholder` on textareas, whenever you need interpolation in the placeholder value. You can
+     * find more details on `ngAttr` in the
+     * [Interpolation](guide/interpolation#-ngattr-for-binding-to-arbitrary-attributes) section of the
+     * Developer Guide.
      */
 
+
     /**
      * @ngdoc directive
-     * @name form
+     * @name input
      * @restrict E
      *
      * @description
-     * Directive that instantiates
-     * {@link form.FormController FormController}.
-     *
-     * If the `name` attribute is specified, the form controller is published onto the current scope under
-     * this name.
-     *
-     * # Alias: {@link ng.directive:ngForm `ngForm`}
-     *
-     * In Angular forms can be nested. This means that the outer form is valid when all of the child
-     * forms are valid as well. However, browsers do not allow nesting of `<form>` elements, so
-     * Angular provides the {@link ng.directive:ngForm `ngForm`} directive which behaves identically to
-     * `<form>` but can be nested.  This allows you to have nested forms, which is very useful when
-     * using Angular validation directives in forms that are dynamically generated using the
-     * {@link ng.directive:ngRepeat `ngRepeat`} directive. Since you cannot dynamically generate the `name`
-     * attribute of input elements using interpolation, you have to wrap each set of repeated inputs in an
-     * `ngForm` directive and nest these in an outer `form` element.
-     *
-     *
-     * # CSS classes
-     *  - `ng-valid` is set if the form is valid.
-     *  - `ng-invalid` is set if the form is invalid.
-     *  - `ng-pristine` is set if the form is pristine.
-     *  - `ng-dirty` is set if the form is dirty.
+     * HTML input element control. When used together with {@link ngModel `ngModel`}, it provides data-binding,
+     * input state control, and validation.
+     * Input control follows HTML5 input types and polyfills the HTML5 validation behavior for older browsers.
      *
-     * Keep in mind that ngAnimate can detect each of these classes when added and removed.
+     * <div class="alert alert-warning">
+     * **Note:** Not every feature offered is available for all input types.
+     * Specifically, data binding and event handling via `ng-model` is unsupported for `input[file]`.
+     * </div>
      *
+     * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+     * @param {string=} name Property name of the form under which the control is published.
+     * @param {string=} required Sets `required` validation error key if the value is not entered.
+     * @param {boolean=} ngRequired Sets `required` attribute if set to true
+     * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+     *    minlength.
+     * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+     *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of any
+     *    length.
+     * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel {@link ngModel.NgModelController#$viewValue $viewValue}
+     *    value does not match a RegExp found by evaluating the AngularJS expression given in the attribute value.
+     *    If the expression evaluates to a RegExp object, then this is used directly.
+     *    If the expression evaluates to a string, then it will be converted to a RegExp
+     *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+     *    `new RegExp('^abc$')`.<br />
+     *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+     *    start at the index of the last search's match, thus not taking the whole input value into
+     *    account.
+     * @param {string=} ngChange AngularJS expression to be executed when input changes due to user
+     *    interaction with the input element.
+     * @param {boolean=} [ngTrim=true] If set to false AngularJS will not automatically trim the input.
+     *    This parameter is ignored for input[type=password] controls, which will never trim the
+     *    input.
      *
-     * # Submitting a form and preventing the default action
+     * @example
+     <example name="input-directive" module="inputExample">
+     <file name="index.html">
+     <script>
+     angular.module('inputExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+              $scope.user = {name: 'guest', last: 'visitor'};
+            }]);
+     </script>
+     <div ng-controller="ExampleController">
+     <form name="myForm">
+     <label>
+     User name:
+     <input type="text" name="userName" ng-model="user.name" required>
+     </label>
+     <div role="alert">
+     <span class="error" ng-show="myForm.userName.$error.required">
+     Required!</span>
+     </div>
+     <label>
+     Last name:
+     <input type="text" name="lastName" ng-model="user.last"
+     ng-minlength="3" ng-maxlength="10">
+     </label>
+     <div role="alert">
+     <span class="error" ng-show="myForm.lastName.$error.minlength">
+     Too short!</span>
+     <span class="error" ng-show="myForm.lastName.$error.maxlength">
+     Too long!</span>
+     </div>
+     </form>
+     <hr>
+     <tt>user = {{user}}</tt><br/>
+     <tt>myForm.userName.$valid = {{myForm.userName.$valid}}</tt><br/>
+     <tt>myForm.userName.$error = {{myForm.userName.$error}}</tt><br/>
+     <tt>myForm.lastName.$valid = {{myForm.lastName.$valid}}</tt><br/>
+     <tt>myForm.lastName.$error = {{myForm.lastName.$error}}</tt><br/>
+     <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+     <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+     <tt>myForm.$error.minlength = {{!!myForm.$error.minlength}}</tt><br/>
+     <tt>myForm.$error.maxlength = {{!!myForm.$error.maxlength}}</tt><br/>
+     </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+     var user = element(by.exactBinding('user'));
+     var userNameValid = element(by.binding('myForm.userName.$valid'));
+     var lastNameValid = element(by.binding('myForm.lastName.$valid'));
+     var lastNameError = element(by.binding('myForm.lastName.$error'));
+     var formValid = element(by.binding('myForm.$valid'));
+     var userNameInput = element(by.model('user.name'));
+     var userLastInput = element(by.model('user.last'));
+
+     it('should initialize to model', function() {
+          expect(user.getText()).toContain('{"name":"guest","last":"visitor"}');
+          expect(userNameValid.getText()).toContain('true');
+          expect(formValid.getText()).toContain('true');
+        });
+
+     it('should be invalid if empty when required', function() {
+          userNameInput.clear();
+          userNameInput.sendKeys('');
+
+          expect(user.getText()).toContain('{"last":"visitor"}');
+          expect(userNameValid.getText()).toContain('false');
+          expect(formValid.getText()).toContain('false');
+        });
+
+     it('should be valid if empty when min length is set', function() {
+          userLastInput.clear();
+          userLastInput.sendKeys('');
+
+          expect(user.getText()).toContain('{"name":"guest","last":""}');
+          expect(lastNameValid.getText()).toContain('true');
+          expect(formValid.getText()).toContain('true');
+        });
+
+     it('should be invalid if less than required min length', function() {
+          userLastInput.clear();
+          userLastInput.sendKeys('xx');
+
+          expect(user.getText()).toContain('{"name":"guest"}');
+          expect(lastNameValid.getText()).toContain('false');
+          expect(lastNameError.getText()).toContain('minlength');
+          expect(formValid.getText()).toContain('false');
+        });
+
+     it('should be invalid if longer than max length', function() {
+          userLastInput.clear();
+          userLastInput.sendKeys('some ridiculously long name');
+
+          expect(user.getText()).toContain('{"name":"guest"}');
+          expect(lastNameValid.getText()).toContain('false');
+          expect(lastNameError.getText()).toContain('maxlength');
+          expect(formValid.getText()).toContain('false');
+        });
+     </file>
+     </example>
+     */
+    var inputDirective = ['$browser', '$sniffer', '$filter', '$parse',
+        function($browser, $sniffer, $filter, $parse) {
+            return {
+                restrict: 'E',
+                require: ['?ngModel'],
+                link: {
+                    pre: function(scope, element, attr, ctrls) {
+                        if (ctrls[0]) {
+                            (inputType[lowercase(attr.type)] || inputType.text)(scope, element, attr, ctrls[0], $sniffer,
+                                $browser, $filter, $parse);
+                        }
+                    }
+                }
+            };
+        }];
+
+
+
+    var CONSTANT_VALUE_REGEXP = /^(true|false|\d+)$/;
+    /**
+     * @ngdoc directive
+     * @name ngValue
+     * @restrict A
+     * @priority 100
      *
-     * Since the role of forms in client-side Angular applications is different than in classical
-     * roundtrip apps, it is desirable for the browser not to translate the form submission into a full
-     * page reload that sends the data to the server. Instead some javascript logic should be triggered
-     * to handle the form submission in an application-specific way.
+     * @description
+     * Binds the given expression to the value of the element.
      *
-     * For this reason, Angular prevents the default action (form submission to the server) unless the
-     * `<form>` element has an `action` attribute specified.
+     * It is mainly used on {@link input[radio] `input[radio]`} and option elements,
+     * so that when the element is selected, the {@link ngModel `ngModel`} of that element (or its
+     * {@link select `select`} parent element) is set to the bound value. It is especially useful
+     * for dynamically generated lists using {@link ngRepeat `ngRepeat`}, as shown below.
      *
-     * You can use one of the following two ways to specify what javascript method should be called when
-     * a form is submitted:
+     * It can also be used to achieve one-way binding of a given expression to an input element
+     * such as an `input[text]` or a `textarea`, when that element does not use ngModel.
      *
-     * - {@link ng.directive:ngSubmit ngSubmit} directive on the form element
-     * - {@link ng.directive:ngClick ngClick} directive on the first
-     *  button or input field of type submit (input[type=submit])
+     * @element ANY
+     * @param {string=} ngValue AngularJS expression, whose value will be bound to the `value` attribute
+     * and `value` property of the element.
      *
-     * To prevent double execution of the handler, use only one of the {@link ng.directive:ngSubmit ngSubmit}
-     * or {@link ng.directive:ngClick ngClick} directives.
-     * This is because of the following form submission rules in the HTML specification:
+     * @example
+     <example name="ngValue-directive" module="valueExample">
+     <file name="index.html">
+     <script>
+     angular.module('valueExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+              $scope.names = ['pizza', 'unicorns', 'robots'];
+              $scope.my = { favorite: 'unicorns' };
+            }]);
+     </script>
+     <form ng-controller="ExampleController">
+     <h2>Which is your favorite?</h2>
+     <label ng-repeat="name in names" for="{{name}}">
+     {{name}}
+     <input type="radio"
+     ng-model="my.favorite"
+     ng-value="name"
+     id="{{name}}"
+     name="favorite">
+     </label>
+     <div>You chose {{my.favorite}}</div>
+     </form>
+     </file>
+     <file name="protractor.js" type="protractor">
+     var favorite = element(by.binding('my.favorite'));
+
+     it('should initialize to model', function() {
+          expect(favorite.getText()).toContain('unicorns');
+        });
+     it('should bind the values to the inputs', function() {
+          element.all(by.model('my.favorite')).get(0).click();
+          expect(favorite.getText()).toContain('pizza');
+        });
+     </file>
+     </example>
+     */
+    var ngValueDirective = function() {
+        /**
+         *  inputs use the value attribute as their default value if the value property is not set.
+         *  Once the value property has been set (by adding input), it will not react to changes to
+         *  the value attribute anymore. Setting both attribute and property fixes this behavior, and
+         *  makes it possible to use ngValue as a sort of one-way bind.
+         */
+        function updateElementValue(element, attr, value) {
+            // Support: IE9 only
+            // In IE9 values are converted to string (e.g. `input.value = null` results in `input.value === 'null'`).
+            var propValue = isDefined(value) ? value : (msie === 9) ? '' : null;
+            element.prop('value', propValue);
+            attr.$set('value', value);
+        }
+
+        return {
+            restrict: 'A',
+            priority: 100,
+            compile: function(tpl, tplAttr) {
+                if (CONSTANT_VALUE_REGEXP.test(tplAttr.ngValue)) {
+                    return function ngValueConstantLink(scope, elm, attr) {
+                        var value = scope.$eval(attr.ngValue);
+                        updateElementValue(elm, attr, value);
+                    };
+                } else {
+                    return function ngValueLink(scope, elm, attr) {
+                        scope.$watch(attr.ngValue, function valueWatchAction(value) {
+                            updateElementValue(elm, attr, value);
+                        });
+                    };
+                }
+            }
+        };
+    };
+
+    /**
+     * @ngdoc directive
+     * @name ngBind
+     * @restrict AC
      *
-     * - If a form has only one input field then hitting enter in this field triggers form submit
-     * (`ngSubmit`)
-     * - if a form has 2+ input fields and no buttons or input[type=submit] then hitting enter
-     * doesn't trigger submit
-     * - if a form has one or more input fields and one or more buttons or input[type=submit] then
-     * hitting enter in any of the input fields will trigger the click handler on the *first* button or
-     * input[type=submit] (`ngClick`) *and* a submit handler on the enclosing form (`ngSubmit`)
+     * @description
+     * The `ngBind` attribute tells AngularJS to replace the text content of the specified HTML element
+     * with the value of a given expression, and to update the text content when the value of that
+     * expression changes.
      *
-     * @param {string=} name Name of the form. If specified, the form controller will be published into
-     *                       related scope, under this name.
+     * Typically, you don't use `ngBind` directly, but instead you use the double curly markup like
+     * `{{ expression }}` which is similar but less verbose.
      *
-     * ## Animation Hooks
+     * It is preferable to use `ngBind` instead of `{{ expression }}` if a template is momentarily
+     * displayed by the browser in its raw state before AngularJS compiles it. Since `ngBind` is an
+     * element attribute, it makes the bindings invisible to the user while the page is loading.
      *
-     * Animations in ngForm are triggered when any of the associated CSS classes are added and removed.
-     * These classes are: `.ng-pristine`, `.ng-dirty`, `.ng-invalid` and `.ng-valid` as well as any
-     * other validations that are performed within the form. Animations in ngForm are similar to how
-     * they work in ngClass and animations can be hooked into using CSS transitions, keyframes as well
-     * as JS animations.
+     * An alternative solution to this problem would be using the
+     * {@link ng.directive:ngCloak ngCloak} directive.
      *
-     * The following example shows a simple way to utilize CSS transitions to style a form element
-     * that has been rendered as invalid after it has been validated:
      *
-     * <pre>
-     * //be sure to include ngAnimate as a module to hook into more
-     * //advanced animations
-     * .my-form {
- *   transition:0.5s linear all;
- *   background: white;
- * }
-     * .my-form.ng-invalid {
- *   background: red;
- *   color:white;
- * }
-     * </pre>
+     * @element ANY
+     * @param {expression} ngBind {@link guide/expression Expression} to evaluate.
      *
      * @example
-     <example deps="angular-animate.js" animations="true" fixBase="true">
+     * Enter a name in the Live Preview text box; the greeting below the text box changes instantly.
+     <example module="bindExample" name="ng-bind">
      <file name="index.html">
      <script>
-     function Ctrl($scope) {
-           $scope.userType = 'guest';
-         }
+     angular.module('bindExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+             $scope.name = 'Whirled';
+           }]);
      </script>
-     <style>
-     .my-form {
-          -webkit-transition:all linear 0.5s;
-          transition:all linear 0.5s;
-          background: transparent;
-        }
-     .my-form.ng-invalid {
-          background: red;
-        }
-     </style>
-     <form name="myForm" ng-controller="Ctrl" class="my-form">
-     userType: <input name="input" ng-model="userType" required>
-     <span class="error" ng-show="myForm.input.$error.required">Required!</span><br>
-     <tt>userType = {{userType}}</tt><br>
-     <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br>
-     <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br>
-     <tt>myForm.$valid = {{myForm.$valid}}</tt><br>
-     <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br>
-     </form>
+     <div ng-controller="ExampleController">
+     <label>Enter name: <input type="text" ng-model="name"></label><br>
+     Hello <span ng-bind="name"></span>!
+     </div>
      </file>
      <file name="protractor.js" type="protractor">
-     it('should initialize to model', function() {
-          var userType = element(by.binding('userType'));
-          var valid = element(by.binding('myForm.input.$valid'));
-
-          expect(userType.getText()).toContain('guest');
-          expect(valid.getText()).toContain('true');
-        });
-
-     it('should be invalid if empty', function() {
-          var userType = element(by.binding('userType'));
-          var valid = element(by.binding('myForm.input.$valid'));
-          var userInput = element(by.model('userType'));
-
-          userInput.clear();
-          userInput.sendKeys('');
+     it('should check ng-bind', function() {
+         var nameInput = element(by.model('name'));
 
-          expect(userType.getText()).toEqual('userType =');
-          expect(valid.getText()).toContain('false');
-        });
+         expect(element(by.binding('name')).getText()).toBe('Whirled');
+         nameInput.clear();
+         nameInput.sendKeys('world');
+         expect(element(by.binding('name')).getText()).toBe('world');
+       });
      </file>
      </example>
-     *
      */
-    var formDirectiveFactory = function(isNgForm) {
-        return ['$timeout', function($timeout) {
-            var formDirective = {
-                name: 'form',
-                restrict: isNgForm ? 'EAC' : 'E',
-                controller: FormController,
-                compile: function() {
-                    return {
-                        pre: function(scope, formElement, attr, controller) {
-                            if (!attr.action) {
-                                // we can't use jq events because if a form is destroyed during submission the default
-                                // action is not prevented. see #1238
-                                //
-                                // IE 9 is not affected because it doesn't fire a submit event and try to do a full
-                                // page reload if the form was destroyed by submission of the form via a click handler
-                                // on a button in the form. Looks like an IE9 specific bug.
-                                var preventDefaultListener = function(event) {
-                                    event.preventDefault
-                                        ? event.preventDefault()
-                                        : event.returnValue = false; // IE
-                                };
-
-                                addEventListenerFn(formElement[0], 'submit', preventDefaultListener);
-
-                                // unregister the preventDefault listener so that we don't not leak memory but in a
-                                // way that will achieve the prevention of the default action.
-                                formElement.on('$destroy', function() {
-                                    $timeout(function() {
-                                        removeEventListenerFn(formElement[0], 'submit', preventDefaultListener);
-                                    }, 0, false);
-                                });
-                            }
-
-                            var parentFormCtrl = formElement.parent().controller('form'),
-                                alias = attr.name || attr.ngForm;
+    var ngBindDirective = ['$compile', function($compile) {
+        return {
+            restrict: 'AC',
+            compile: function ngBindCompile(templateElement) {
+                $compile.$$addBindingClass(templateElement);
+                return function ngBindLink(scope, element, attr) {
+                    $compile.$$addBindingInfo(element, attr.ngBind);
+                    element = element[0];
+                    scope.$watch(attr.ngBind, function ngBindWatchAction(value) {
+                        element.textContent = stringify(value);
+                    });
+                };
+            }
+        };
+    }];
 
-                            if (alias) {
-                                setter(scope, alias, controller, alias);
-                            }
-                            if (parentFormCtrl) {
-                                formElement.on('$destroy', function() {
-                                    parentFormCtrl.$removeControl(controller);
-                                    if (alias) {
-                                        setter(scope, alias, undefined, alias);
-                                    }
-                                    extend(controller, nullFormCtrl); //stop propagating child destruction handlers upwards
-                                });
-                            }
-                        }
-                    };
-                }
-            };
 
-            return formDirective;
-        }];
-    };
+    /**
+     * @ngdoc directive
+     * @name ngBindTemplate
+     *
+     * @description
+     * The `ngBindTemplate` directive specifies that the element
+     * text content should be replaced with the interpolation of the template
+     * in the `ngBindTemplate` attribute.
+     * Unlike `ngBind`, the `ngBindTemplate` can contain multiple `{{` `}}`
+     * expressions. This directive is needed since some HTML elements
+     * (such as TITLE and OPTION) cannot contain SPAN elements.
+     *
+     * @element ANY
+     * @param {string} ngBindTemplate template of form
+     *   <tt>{{</tt> <tt>expression</tt> <tt>}}</tt> to eval.
+     *
+     * @example
+     * Try it here: enter text in text box and watch the greeting change.
+     <example module="bindExample" name="ng-bind-template">
+     <file name="index.html">
+     <script>
+     angular.module('bindExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+             $scope.salutation = 'Hello';
+             $scope.name = 'World';
+           }]);
+     </script>
+     <div ng-controller="ExampleController">
+     <label>Salutation: <input type="text" ng-model="salutation"></label><br>
+     <label>Name: <input type="text" ng-model="name"></label><br>
+     <pre ng-bind-template="{{salutation}} {{name}}!"></pre>
+     </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check ng-bind', function() {
+         var salutationElem = element(by.binding('salutation'));
+         var salutationInput = element(by.model('salutation'));
+         var nameInput = element(by.model('name'));
 
-    var formDirective = formDirectiveFactory();
-    var ngFormDirective = formDirectiveFactory(true);
+         expect(salutationElem.getText()).toBe('Hello World!');
 
-    /* global
+         salutationInput.clear();
+         salutationInput.sendKeys('Greetings');
+         nameInput.clear();
+         nameInput.sendKeys('user');
 
-     -VALID_CLASS,
-     -INVALID_CLASS,
-     -PRISTINE_CLASS,
-     -DIRTY_CLASS
+         expect(salutationElem.getText()).toBe('Greetings user!');
+       });
+     </file>
+     </example>
      */
+    var ngBindTemplateDirective = ['$interpolate', '$compile', function($interpolate, $compile) {
+        return {
+            compile: function ngBindTemplateCompile(templateElement) {
+                $compile.$$addBindingClass(templateElement);
+                return function ngBindTemplateLink(scope, element, attr) {
+                    var interpolateFn = $interpolate(element.attr(attr.$attr.ngBindTemplate));
+                    $compile.$$addBindingInfo(element, interpolateFn.expressions);
+                    element = element[0];
+                    attr.$observe('ngBindTemplate', function(value) {
+                        element.textContent = isUndefined(value) ? '' : value;
+                    });
+                };
+            }
+        };
+    }];
 
-    var URL_REGEXP = /^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/;
-    var EMAIL_REGEXP = /^[a-z0-9!#$%&'*+/=?^_`{|}~.-]+@[a-z0-9-]+(\.[a-z0-9-]+)*$/i;
-    var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/;
 
-    var inputType = {
+    /**
+     * @ngdoc directive
+     * @name ngBindHtml
+     *
+     * @description
+     * Evaluates the expression and inserts the resulting HTML into the element in a secure way. By default,
+     * the resulting HTML content will be sanitized using the {@link ngSanitize.$sanitize $sanitize} service.
+     * To utilize this functionality, ensure that `$sanitize` is available, for example, by including {@link
+        * ngSanitize} in your module's dependencies (not in core AngularJS). In order to use {@link ngSanitize}
+     * in your module's dependencies, you need to include "angular-sanitize.js" in your application.
+     *
+     * You may also bypass sanitization for values you know are safe. To do so, bind to
+     * an explicitly trusted value via {@link ng.$sce#trustAsHtml $sce.trustAsHtml}.  See the example
+     * under {@link ng.$sce#show-me-an-example-using-sce- Strict Contextual Escaping (SCE)}.
+     *
+     * Note: If a `$sanitize` service is unavailable and the bound value isn't explicitly trusted, you
+     * will have an exception (instead of an exploit.)
+     *
+     * @element ANY
+     * @param {expression} ngBindHtml {@link guide/expression Expression} to evaluate.
+     *
+     * @example
 
-        /**
-         * @ngdoc input
-         * @name input[text]
-         *
-         * @description
-         * Standard HTML text input with angular data binding.
-         *
-         * @param {string} ngModel Assignable angular expression to data-bind to.
-         * @param {string=} name Property name of the form under which the control is published.
-         * @param {string=} required Adds `required` validation error key if the value is not entered.
-         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-         *    `required` when you want to data-bind to the `required` attribute.
-         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-         *    minlength.
-         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-         *    maxlength.
-         * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
-         *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
-         *    patterns defined as scope expressions.
-         * @param {string=} ngChange Angular expression to be executed when input changes due to user
-         *    interaction with the input element.
-         * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
-         *
-         * @example
-         <example name="text-input-directive">
-         <file name="index.html">
-         <script>
-         function Ctrl($scope) {
-             $scope.text = 'guest';
-             $scope.word = /^\s*\w*\s*$/;
-           }
-         </script>
-         <form name="myForm" ng-controller="Ctrl">
-         Single word: <input type="text" name="input" ng-model="text"
-         ng-pattern="word" required ng-trim="false">
-         <span class="error" ng-show="myForm.input.$error.required">
-         Required!</span>
-         <span class="error" ng-show="myForm.input.$error.pattern">
-         Single word only!</span>
+     <example module="bindHtmlExample" deps="angular-sanitize.js" name="ng-bind-html">
+     <file name="index.html">
+     <div ng-controller="ExampleController">
+     <p ng-bind-html="myHTML"></p>
+     </div>
+     </file>
 
-         <tt>text = {{text}}</tt><br/>
-         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
-         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
-         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-         </form>
-         </file>
-         <file name="protractor.js" type="protractor">
-         var text = element(by.binding('text'));
-         var valid = element(by.binding('myForm.input.$valid'));
-         var input = element(by.model('text'));
+     <file name="script.js">
+     angular.module('bindHtmlExample', ['ngSanitize'])
+     .controller('ExampleController', ['$scope', function($scope) {
+           $scope.myHTML =
+              'I am an <code>HTML</code>string with ' +
+              '<a href="#">links!</a> and other <em>stuff</em>';
+         }]);
+     </file>
 
-         it('should initialize to model', function() {
-            expect(text.getText()).toContain('guest');
-            expect(valid.getText()).toContain('true');
-          });
+     <file name="protractor.js" type="protractor">
+     it('should check ng-bind-html', function() {
+         expect(element(by.binding('myHTML')).getText()).toBe(
+             'I am an HTMLstring with links! and other stuff');
+       });
+     </file>
+     </example>
+     */
+    var ngBindHtmlDirective = ['$sce', '$parse', '$compile', function($sce, $parse, $compile) {
+        return {
+            restrict: 'A',
+            compile: function ngBindHtmlCompile(tElement, tAttrs) {
+                var ngBindHtmlGetter = $parse(tAttrs.ngBindHtml);
+                var ngBindHtmlWatch = $parse(tAttrs.ngBindHtml, function sceValueOf(val) {
+                    // Unwrap the value to compare the actual inner safe value, not the wrapper object.
+                    return $sce.valueOf(val);
+                });
+                $compile.$$addBindingClass(tElement);
 
-         it('should be invalid if empty', function() {
-            input.clear();
-            input.sendKeys('');
+                return function ngBindHtmlLink(scope, element, attr) {
+                    $compile.$$addBindingInfo(element, attr.ngBindHtml);
 
-            expect(text.getText()).toEqual('text =');
-            expect(valid.getText()).toContain('false');
-          });
+                    scope.$watch(ngBindHtmlWatch, function ngBindHtmlWatchAction() {
+                        // The watched value is the unwrapped value. To avoid re-escaping, use the direct getter.
+                        var value = ngBindHtmlGetter(scope);
+                        element.html($sce.getTrustedHtml(value) || '');
+                    });
+                };
+            }
+        };
+    }];
+
+    /**
+     * @ngdoc directive
+     * @name ngChange
+     * @restrict A
+     *
+     * @description
+     * Evaluate the given expression when the user changes the input.
+     * The expression is evaluated immediately, unlike the JavaScript onchange event
+     * which only triggers at the end of a change (usually, when the user leaves the
+     * form element or presses the return key).
+     *
+     * The `ngChange` expression is only evaluated when a change in the input value causes
+     * a new value to be committed to the model.
+     *
+     * It will not be evaluated:
+     * * if the value returned from the `$parsers` transformation pipeline has not changed
+     * * if the input has continued to be invalid since the model will stay `null`
+     * * if the model is changed programmatically and not by a change to the input value
+     *
+     *
+     * Note, this directive requires `ngModel` to be present.
+     *
+     * @element ANY
+     * @param {expression} ngChange {@link guide/expression Expression} to evaluate upon change
+     * in input value.
+     *
+     * @example
+     * <example name="ngChange-directive" module="changeExample">
+     *   <file name="index.html">
+     *     <script>
+     *       angular.module('changeExample', [])
+     *         .controller('ExampleController', ['$scope', function($scope) {
+     *           $scope.counter = 0;
+     *           $scope.change = function() {
+     *             $scope.counter++;
+     *           };
+     *         }]);
+     *     </script>
+     *     <div ng-controller="ExampleController">
+     *       <input type="checkbox" ng-model="confirmed" ng-change="change()" id="ng-change-example1" />
+     *       <input type="checkbox" ng-model="confirmed" id="ng-change-example2" />
+     *       <label for="ng-change-example2">Confirmed</label><br />
+     *       <tt>debug = {{confirmed}}</tt><br/>
+     *       <tt>counter = {{counter}}</tt><br/>
+     *     </div>
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     *     var counter = element(by.binding('counter'));
+     *     var debug = element(by.binding('confirmed'));
+     *
+     *     it('should evaluate the expression if changing from view', function() {
+     *       expect(counter.getText()).toContain('0');
+     *
+     *       element(by.id('ng-change-example1')).click();
+     *
+     *       expect(counter.getText()).toContain('1');
+     *       expect(debug.getText()).toContain('true');
+     *     });
+     *
+     *     it('should not evaluate the expression if changing from model', function() {
+     *       element(by.id('ng-change-example2')).click();
 
-         it('should be invalid if multi word', function() {
-            input.clear();
-            input.sendKeys('hello world');
+     *       expect(counter.getText()).toContain('0');
+     *       expect(debug.getText()).toContain('true');
+     *     });
+     *   </file>
+     * </example>
+     */
+    var ngChangeDirective = valueFn({
+        restrict: 'A',
+        require: 'ngModel',
+        link: function(scope, element, attr, ctrl) {
+            ctrl.$viewChangeListeners.push(function() {
+                scope.$eval(attr.ngChange);
+            });
+        }
+    });
 
-            expect(valid.getText()).toContain('false');
-          });
-         </file>
-         </example>
-         */
-        'text': textInputType,
+    /* exported
+  ngClassDirective,
+  ngClassEvenDirective,
+  ngClassOddDirective
+*/
 
+    function classDirective(name, selector) {
+        name = 'ngClass' + name;
+        var indexWatchExpression;
 
-        /**
-         * @ngdoc input
-         * @name input[number]
-         *
-         * @description
-         * Text input with number validation and transformation. Sets the `number` validation
-         * error if not a valid number.
-         *
-         * @param {string} ngModel Assignable angular expression to data-bind to.
-         * @param {string=} name Property name of the form under which the control is published.
-         * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
-         * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
-         * @param {string=} required Sets `required` validation error key if the value is not entered.
-         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-         *    `required` when you want to data-bind to the `required` attribute.
-         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-         *    minlength.
-         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-         *    maxlength.
-         * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
-         *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
-         *    patterns defined as scope expressions.
-         * @param {string=} ngChange Angular expression to be executed when input changes due to user
-         *    interaction with the input element.
-         *
-         * @example
-         <example name="number-input-directive">
-         <file name="index.html">
-         <script>
-         function Ctrl($scope) {
-             $scope.value = 12;
-           }
-         </script>
-         <form name="myForm" ng-controller="Ctrl">
-         Number: <input type="number" name="input" ng-model="value"
-         min="0" max="99" required>
-         <span class="error" ng-show="myForm.input.$error.required">
-         Required!</span>
-         <span class="error" ng-show="myForm.input.$error.number">
-         Not valid number!</span>
-         <tt>value = {{value}}</tt><br/>
-         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
-         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
-         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-         </form>
-         </file>
-         <file name="protractor.js" type="protractor">
-         var value = element(by.binding('value'));
-         var valid = element(by.binding('myForm.input.$valid'));
-         var input = element(by.model('value'));
+        return ['$parse', function($parse) {
+            return {
+                restrict: 'AC',
+                link: function(scope, element, attr) {
+                    var expression = attr[name].trim();
+                    var isOneTime = (expression.charAt(0) === ':') && (expression.charAt(1) === ':');
 
-         it('should initialize to model', function() {
-            expect(value.getText()).toContain('12');
-            expect(valid.getText()).toContain('true');
-          });
+                    var watchInterceptor = isOneTime ? toFlatValue : toClassString;
+                    var watchExpression = $parse(expression, watchInterceptor);
+                    var watchAction = isOneTime ? ngClassOneTimeWatchAction : ngClassWatchAction;
 
-         it('should be invalid if empty', function() {
-            input.clear();
-            input.sendKeys('');
-            expect(value.getText()).toEqual('value =');
-            expect(valid.getText()).toContain('false');
-          });
+                    var classCounts = element.data('$classCounts');
+                    var oldModulo = true;
+                    var oldClassString;
 
-         it('should be invalid if over max', function() {
-            input.clear();
-            input.sendKeys('123');
-            expect(value.getText()).toEqual('value =');
-            expect(valid.getText()).toContain('false');
-          });
-         </file>
-         </example>
-         */
-        'number': numberInputType,
+                    if (!classCounts) {
+                        // Use createMap() to prevent class assumptions involving property
+                        // names in Object.prototype
+                        classCounts = createMap();
+                        element.data('$classCounts', classCounts);
+                    }
 
+                    if (name !== 'ngClass') {
+                        if (!indexWatchExpression) {
+                            indexWatchExpression = $parse('$index', function moduloTwo($index) {
+                                // eslint-disable-next-line no-bitwise
+                                return $index & 1;
+                            });
+                        }
 
-        /**
-         * @ngdoc input
-         * @name input[url]
-         *
-         * @description
-         * Text input with URL validation. Sets the `url` validation error key if the content is not a
-         * valid URL.
-         *
-         * @param {string} ngModel Assignable angular expression to data-bind to.
-         * @param {string=} name Property name of the form under which the control is published.
-         * @param {string=} required Sets `required` validation error key if the value is not entered.
-         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-         *    `required` when you want to data-bind to the `required` attribute.
-         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-         *    minlength.
-         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-         *    maxlength.
-         * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
-         *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
-         *    patterns defined as scope expressions.
-         * @param {string=} ngChange Angular expression to be executed when input changes due to user
-         *    interaction with the input element.
-         *
-         * @example
-         <example name="url-input-directive">
-         <file name="index.html">
-         <script>
-         function Ctrl($scope) {
-             $scope.text = 'http://google.com';
-           }
-         </script>
-         <form name="myForm" ng-controller="Ctrl">
-         URL: <input type="url" name="input" ng-model="text" required>
-         <span class="error" ng-show="myForm.input.$error.required">
-         Required!</span>
-         <span class="error" ng-show="myForm.input.$error.url">
-         Not valid url!</span>
-         <tt>text = {{text}}</tt><br/>
-         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
-         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
-         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-         <tt>myForm.$error.url = {{!!myForm.$error.url}}</tt><br/>
-         </form>
-         </file>
-         <file name="protractor.js" type="protractor">
-         var text = element(by.binding('text'));
-         var valid = element(by.binding('myForm.input.$valid'));
-         var input = element(by.model('text'));
+                        scope.$watch(indexWatchExpression, ngClassIndexWatchAction);
+                    }
 
-         it('should initialize to model', function() {
-            expect(text.getText()).toContain('http://google.com');
-            expect(valid.getText()).toContain('true');
-          });
+                    scope.$watch(watchExpression, watchAction, isOneTime);
 
-         it('should be invalid if empty', function() {
-            input.clear();
-            input.sendKeys('');
+                    function addClasses(classString) {
+                        classString = digestClassCounts(split(classString), 1);
+                        attr.$addClass(classString);
+                    }
 
-            expect(text.getText()).toEqual('text =');
-            expect(valid.getText()).toContain('false');
-          });
+                    function removeClasses(classString) {
+                        classString = digestClassCounts(split(classString), -1);
+                        attr.$removeClass(classString);
+                    }
 
-         it('should be invalid if not url', function() {
-            input.clear();
-            input.sendKeys('box');
+                    function updateClasses(oldClassString, newClassString) {
+                        var oldClassArray = split(oldClassString);
+                        var newClassArray = split(newClassString);
 
-            expect(valid.getText()).toContain('false');
-          });
-         </file>
-         </example>
-         */
-        'url': urlInputType,
+                        var toRemoveArray = arrayDifference(oldClassArray, newClassArray);
+                        var toAddArray = arrayDifference(newClassArray, oldClassArray);
 
+                        var toRemoveString = digestClassCounts(toRemoveArray, -1);
+                        var toAddString = digestClassCounts(toAddArray, 1);
 
-        /**
-         * @ngdoc input
-         * @name input[email]
-         *
-         * @description
-         * Text input with email validation. Sets the `email` validation error key if not a valid email
-         * address.
-         *
-         * @param {string} ngModel Assignable angular expression to data-bind to.
-         * @param {string=} name Property name of the form under which the control is published.
-         * @param {string=} required Sets `required` validation error key if the value is not entered.
-         * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-         *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-         *    `required` when you want to data-bind to the `required` attribute.
-         * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-         *    minlength.
-         * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-         *    maxlength.
-         * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
-         *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
-         *    patterns defined as scope expressions.
-         * @param {string=} ngChange Angular expression to be executed when input changes due to user
-         *    interaction with the input element.
-         *
-         * @example
-         <example name="email-input-directive">
-         <file name="index.html">
-         <script>
-         function Ctrl($scope) {
-             $scope.text = 'me@example.com';
-         }
-         </script>
-         <form name="myForm" ng-controller="Ctrl">
-         Email: <input type="email" name="input" ng-model="text" required>
-         <span class="error" ng-show="myForm.input.$error.required">
-         Required!</span>
-         <span class="error" ng-show="myForm.input.$error.email">
-         Not valid email!</span>
-         <tt>text = {{text}}</tt><br/>
-         <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
-         <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
-         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-         <tt>myForm.$error.email = {{!!myForm.$error.email}}</tt><br/>
-         </form>
-         </file>
-         <file name="protractor.js" type="protractor">
-         var text = element(by.binding('text'));
-         var valid = element(by.binding('myForm.input.$valid'));
-         var input = element(by.model('text'));
+                        attr.$addClass(toAddString);
+                        attr.$removeClass(toRemoveString);
+                    }
 
-         it('should initialize to model', function() {
-            expect(text.getText()).toContain('me@example.com');
-         expect(valid.getText()).toContain('true');
-         });
+                    function digestClassCounts(classArray, count) {
+                        var classesToUpdate = [];
 
-         it('should be invalid if empty', function() {
-            input.clear();
-            input.sendKeys('');
-            expect(text.getText()).toEqual('text =');
-            expect(valid.getText()).toContain('false');
-          });
+                        forEach(classArray, function(className) {
+                            if (count > 0 || classCounts[className]) {
+                                classCounts[className] = (classCounts[className] || 0) + count;
+                                if (classCounts[className] === +(count > 0)) {
+                                    classesToUpdate.push(className);
+                                }
+                            }
+                        });
 
-         it('should be invalid if not email', function() {
-            input.clear();
-            input.sendKeys('xxx');
+                        return classesToUpdate.join(' ');
+                    }
 
-            expect(valid.getText()).toContain('false');
-          });
-         </file>
-         </example>
-         */
-        'email': emailInputType,
+                    function ngClassIndexWatchAction(newModulo) {
+                        // This watch-action should run before the `ngClass[OneTime]WatchAction()`, thus it
+                        // adds/removes `oldClassString`. If the `ngClass` expression has changed as well, the
+                        // `ngClass[OneTime]WatchAction()` will update the classes.
+                        if (newModulo === selector) {
+                            addClasses(oldClassString);
+                        } else {
+                            removeClasses(oldClassString);
+                        }
 
+                        oldModulo = newModulo;
+                    }
 
-        /**
-         * @ngdoc input
-         * @name input[radio]
-         *
-         * @description
-         * HTML radio button.
-         *
-         * @param {string} ngModel Assignable angular expression to data-bind to.
-         * @param {string} value The value to which the expression should be set when selected.
-         * @param {string=} name Property name of the form under which the control is published.
-         * @param {string=} ngChange Angular expression to be executed when input changes due to user
-         *    interaction with the input element.
-         * @param {string} ngValue Angular expression which sets the value to which the expression should
-         *    be set when selected.
-         *
-         * @example
-         <example name="radio-input-directive">
-         <file name="index.html">
-         <script>
-         function Ctrl($scope) {
-             $scope.color = 'blue';
-             $scope.specialValue = {
-               "id": "12345",
-               "value": "green"
-             };
-           }
-         </script>
-         <form name="myForm" ng-controller="Ctrl">
-         <input type="radio" ng-model="color" value="red">  Red <br/>
-         <input type="radio" ng-model="color" ng-value="specialValue"> Green <br/>
-         <input type="radio" ng-model="color" value="blue"> Blue <br/>
-         <tt>color = {{color | json}}</tt><br/>
-         </form>
-         Note that `ng-value="specialValue"` sets radio item's value to be the value of `$scope.specialValue`.
-         </file>
-         <file name="protractor.js" type="protractor">
-         it('should change state', function() {
-            var color = element(by.binding('color'));
+                    function ngClassOneTimeWatchAction(newClassValue) {
+                        var newClassString = toClassString(newClassValue);
 
-            expect(color.getText()).toContain('blue');
+                        if (newClassString !== oldClassString) {
+                            ngClassWatchAction(newClassString);
+                        }
+                    }
 
-            element.all(by.model('color')).get(0).click();
+                    function ngClassWatchAction(newClassString) {
+                        if (oldModulo === selector) {
+                            updateClasses(oldClassString, newClassString);
+                        }
 
-            expect(color.getText()).toContain('red');
-          });
-         </file>
-         </example>
-         */
-        'radio': radioInputType,
+                        oldClassString = newClassString;
+                    }
+                }
+            };
+        }];
 
+        // Helpers
+        function arrayDifference(tokens1, tokens2) {
+            if (!tokens1 || !tokens1.length) return [];
+            if (!tokens2 || !tokens2.length) return tokens1;
 
-        /**
-         * @ngdoc input
-         * @name input[checkbox]
-         *
-         * @description
-         * HTML checkbox.
-         *
-         * @param {string} ngModel Assignable angular expression to data-bind to.
-         * @param {string=} name Property name of the form under which the control is published.
-         * @param {string=} ngTrueValue The value to which the expression should be set when selected.
-         * @param {string=} ngFalseValue The value to which the expression should be set when not selected.
-         * @param {string=} ngChange Angular expression to be executed when input changes due to user
-         *    interaction with the input element.
-         *
-         * @example
-         <example name="checkbox-input-directive">
-         <file name="index.html">
-         <script>
-         function Ctrl($scope) {
-             $scope.value1 = true;
-             $scope.value2 = 'YES'
-           }
-         </script>
-         <form name="myForm" ng-controller="Ctrl">
-         Value1: <input type="checkbox" ng-model="value1"> <br/>
-         Value2: <input type="checkbox" ng-model="value2"
-         ng-true-value="YES" ng-false-value="NO"> <br/>
-         <tt>value1 = {{value1}}</tt><br/>
-         <tt>value2 = {{value2}}</tt><br/>
-         </form>
-         </file>
-         <file name="protractor.js" type="protractor">
-         it('should change state', function() {
-            var value1 = element(by.binding('value1'));
-            var value2 = element(by.binding('value2'));
+            var values = [];
 
-            expect(value1.getText()).toContain('true');
-            expect(value2.getText()).toContain('YES');
+            outer:
+                for (var i = 0; i < tokens1.length; i++) {
+                    var token = tokens1[i];
+                    for (var j = 0; j < tokens2.length; j++) {
+                        if (token === tokens2[j]) continue outer;
+                    }
+                    values.push(token);
+                }
 
-            element(by.model('value1')).click();
-            element(by.model('value2')).click();
+            return values;
+        }
 
-            expect(value1.getText()).toContain('false');
-            expect(value2.getText()).toContain('NO');
-          });
-         </file>
-         </example>
-         */
-        'checkbox': checkboxInputType,
+        function split(classString) {
+            return classString && classString.split(' ');
+        }
 
-        'hidden': noop,
-        'button': noop,
-        'submit': noop,
-        'reset': noop,
-        'file': noop
-    };
+        function toClassString(classValue) {
+            var classString = classValue;
 
-// A helper function to call $setValidity and return the value / undefined,
-// a pattern that is repeated a lot in the input validation logic.
-    function validate(ctrl, validatorName, validity, value){
-        ctrl.$setValidity(validatorName, validity);
-        return validity ? value : undefined;
-    }
+            if (isArray(classValue)) {
+                classString = classValue.map(toClassString).join(' ');
+            } else if (isObject(classValue)) {
+                classString = Object.keys(classValue).
+                filter(function(key) { return classValue[key]; }).
+                join(' ');
+            }
 
+            return classString;
+        }
 
-    function addNativeHtml5Validators(ctrl, validatorName, element) {
-        var validity = element.prop('validity');
-        if (isObject(validity)) {
-            var validator = function(value) {
-                // Don't overwrite previous validation, don't consider valueMissing to apply (ng-required can
-                // perform the required validation)
-                if (!ctrl.$error[validatorName] && (validity.badInput || validity.customError ||
-                    validity.typeMismatch) && !validity.valueMissing) {
-                    ctrl.$setValidity(validatorName, false);
-                    return;
+        function toFlatValue(classValue) {
+            var flatValue = classValue;
+
+            if (isArray(classValue)) {
+                flatValue = classValue.map(toFlatValue);
+            } else if (isObject(classValue)) {
+                var hasUndefined = false;
+
+                flatValue = Object.keys(classValue).filter(function(key) {
+                    var value = classValue[key];
+
+                    if (!hasUndefined && isUndefined(value)) {
+                        hasUndefined = true;
+                    }
+
+                    return value;
+                });
+
+                if (hasUndefined) {
+                    // Prevent the `oneTimeLiteralWatchInterceptor` from unregistering
+                    // the watcher, by including at least one `undefined` value.
+                    flatValue.push(undefined);
                 }
-                return value;
-            };
-            ctrl.$parsers.push(validator);
+            }
+
+            return flatValue;
         }
     }
 
-    function textInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-        var validity = element.prop('validity');
-        // In composition mode, users are still inputing intermediate text buffer,
-        // hold the listener until composition is done.
-        // More about composition events: https://developer.mozilla.org/en-US/docs/Web/API/CompositionEvent
-        if (!$sniffer.android) {
-            var composing = false;
+    /**
+     * @ngdoc directive
+     * @name ngClass
+     * @restrict AC
+     * @element ANY
+     *
+     * @description
+     * The `ngClass` directive allows you to dynamically set CSS classes on an HTML element by databinding
+     * an expression that represents all classes to be added.
+     *
+     * The directive operates in three different ways, depending on which of three types the expression
+     * evaluates to:
+     *
+     * 1. If the expression evaluates to a string, the string should be one or more space-delimited class
+     * names.
+     *
+     * 2. If the expression evaluates to an object, then for each key-value pair of the
+     * object with a truthy value the corresponding key is used as a class name.
+     *
+     * 3. If the expression evaluates to an array, each element of the array should either be a string as in
+     * type 1 or an object as in type 2. This means that you can mix strings and objects together in an array
+     * to give you more control over what CSS classes appear. See the code below for an example of this.
+     *
+     *
+     * The directive won't add duplicate classes if a particular class was already set.
+     *
+     * When the expression changes, the previously added classes are removed and only then are the
+     * new classes added.
+     *
+     * @knownIssue
+     * You should not use {@link guide/interpolation interpolation} in the value of the `class`
+     * attribute, when using the `ngClass` directive on the same element.
+     * See {@link guide/interpolation#known-issues here} for more info.
+     *
+     * @animations
+     * | Animation                        | Occurs                              |
+     * |----------------------------------|-------------------------------------|
+     * | {@link ng.$animate#addClass addClass}       | just before the class is applied to the element   |
+     * | {@link ng.$animate#removeClass removeClass} | just before the class is removed from the element |
+     *
+     * ### ngClass and pre-existing CSS3 Transitions/Animations
+     The ngClass directive still supports CSS3 Transitions/Animations even if they do not follow the ngAnimate CSS naming structure.
+     Upon animation ngAnimate will apply supplementary CSS classes to track the start and end of an animation, but this will not hinder
+     any pre-existing CSS transitions already on the element. To get an idea of what happens during a class-based animation, be sure
+     to view the step by step details of {@link $animate#addClass $animate.addClass} and
+     {@link $animate#removeClass $animate.removeClass}.
+     *
+     * @param {expression} ngClass {@link guide/expression Expression} to eval. The result
+     *   of the evaluation can be a string representing space delimited class
+     *   names, an array, or a map of class names to boolean values. In the case of a map, the
+     *   names of the properties whose values are truthy will be added as css classes to the
+     *   element.
+     *
+     * @example
+     * ### Basic
+     <example name="ng-class">
+     <file name="index.html">
+     <p ng-class="{strike: deleted, bold: important, 'has-error': error}">Map Syntax Example</p>
+     <label>
+     <input type="checkbox" ng-model="deleted">
+     deleted (apply "strike" class)
+     </label><br>
+     <label>
+     <input type="checkbox" ng-model="important">
+     important (apply "bold" class)
+     </label><br>
+     <label>
+     <input type="checkbox" ng-model="error">
+     error (apply "has-error" class)
+     </label>
+     <hr>
+     <p ng-class="style">Using String Syntax</p>
+     <input type="text" ng-model="style"
+     placeholder="Type: bold strike red" aria-label="Type: bold strike red">
+     <hr>
+     <p ng-class="[style1, style2, style3]">Using Array Syntax</p>
+     <input ng-model="style1"
+     placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red"><br>
+     <input ng-model="style2"
+     placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red 2"><br>
+     <input ng-model="style3"
+     placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red 3"><br>
+     <hr>
+     <p ng-class="[style4, {orange: warning}]">Using Array and Map Syntax</p>
+     <input ng-model="style4" placeholder="Type: bold, strike" aria-label="Type: bold, strike"><br>
+     <label><input type="checkbox" ng-model="warning"> warning (apply "orange" class)</label>
+     </file>
+     <file name="style.css">
+     .strike {
+           text-decoration: line-through;
+       }
+     .bold {
+           font-weight: bold;
+       }
+     .red {
+           color: red;
+       }
+     .has-error {
+           color: red;
+           background-color: yellow;
+       }
+     .orange {
+           color: orange;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+     var ps = element.all(by.css('p'));
 
-            element.on('compositionstart', function(data) {
-                composing = true;
-            });
+     it('should let you toggle the class', function() {
 
-            element.on('compositionend', function() {
-                composing = false;
-                listener();
-            });
-        }
+         expect(ps.first().getAttribute('class')).not.toMatch(/bold/);
+         expect(ps.first().getAttribute('class')).not.toMatch(/has-error/);
 
-        var listener = function() {
-            if (composing) return;
-            var value = element.val();
+         element(by.model('important')).click();
+         expect(ps.first().getAttribute('class')).toMatch(/bold/);
 
-            // By default we will trim the value
-            // If the attribute ng-trim exists we will avoid trimming
-            // e.g. <input ng-model="foo" ng-trim="false">
-            if (toBoolean(attr.ngTrim || 'T')) {
-                value = trim(value);
-            }
+         element(by.model('error')).click();
+         expect(ps.first().getAttribute('class')).toMatch(/has-error/);
+       });
 
-            if (ctrl.$viewValue !== value ||
-                    // If the value is still empty/falsy, and there is no `required` error, run validators
-                    // again. This enables HTML5 constraint validation errors to affect Angular validation
-                    // even when the first character entered causes an error.
-                (validity && value === '' && !validity.valueMissing)) {
-                if (scope.$$phase) {
-                    ctrl.$setViewValue(value);
-                } else {
-                    scope.$apply(function() {
-                        ctrl.$setViewValue(value);
-                    });
-                }
-            }
-        };
+     it('should let you toggle string example', function() {
+         expect(ps.get(1).getAttribute('class')).toBe('');
+         element(by.model('style')).clear();
+         element(by.model('style')).sendKeys('red');
+         expect(ps.get(1).getAttribute('class')).toBe('red');
+       });
 
-        // if the browser does support "input" event, we are fine - except on IE9 which doesn't fire the
-        // input event on backspace, delete or cut
-        if ($sniffer.hasEvent('input')) {
-            element.on('input', listener);
-        } else {
-            var timeout;
+     it('array example should have 3 classes', function() {
+         expect(ps.get(2).getAttribute('class')).toBe('');
+         element(by.model('style1')).sendKeys('bold');
+         element(by.model('style2')).sendKeys('strike');
+         element(by.model('style3')).sendKeys('red');
+         expect(ps.get(2).getAttribute('class')).toBe('bold strike red');
+       });
 
-            var deferListener = function() {
-                if (!timeout) {
-                    timeout = $browser.defer(function() {
-                        listener();
-                        timeout = null;
-                    });
-                }
-            };
+     it('array with map example should have 2 classes', function() {
+         expect(ps.last().getAttribute('class')).toBe('');
+         element(by.model('style4')).sendKeys('bold');
+         element(by.model('warning')).click();
+         expect(ps.last().getAttribute('class')).toBe('bold orange');
+       });
+     </file>
+     </example>
 
-            element.on('keydown', function(event) {
-                var key = event.keyCode;
+     @example
+     ### Animations
 
-                // ignore
-                //    command            modifiers                   arrows
-                if (key === 91 || (15 < key && key < 19) || (37 <= key && key <= 40)) return;
+     The example below demonstrates how to perform animations using ngClass.
+
+     <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-class">
+     <file name="index.html">
+     <input id="setbtn" type="button" value="set" ng-click="myVar='my-class'">
+     <input id="clearbtn" type="button" value="clear" ng-click="myVar=''">
+     <br>
+     <span class="base-class" ng-class="myVar">Sample Text</span>
+     </file>
+     <file name="style.css">
+     .base-class {
+         transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+       }
+
+     .base-class.my-class {
+         color: red;
+         font-size:3em;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check ng-class', function() {
+         expect(element(by.css('.base-class')).getAttribute('class')).not.
+           toMatch(/my-class/);
+
+         element(by.id('setbtn')).click();
+
+         expect(element(by.css('.base-class')).getAttribute('class')).
+           toMatch(/my-class/);
+
+         element(by.id('clearbtn')).click();
+
+         expect(element(by.css('.base-class')).getAttribute('class')).not.
+           toMatch(/my-class/);
+       });
+     </file>
+     </example>
+     */
+    var ngClassDirective = classDirective('', true);
+
+    /**
+     * @ngdoc directive
+     * @name ngClassOdd
+     * @restrict AC
+     *
+     * @description
+     * The `ngClassOdd` and `ngClassEven` directives work exactly as
+     * {@link ng.directive:ngClass ngClass}, except they work in
+     * conjunction with `ngRepeat` and take effect only on odd (even) rows.
+     *
+     * This directive can be applied only within the scope of an
+     * {@link ng.directive:ngRepeat ngRepeat}.
+     *
+     * @element ANY
+     * @param {expression} ngClassOdd {@link guide/expression Expression} to eval. The result
+     *   of the evaluation can be a string representing space delimited class names or an array.
+     *
+     * @example
+     <example name="ng-class-odd">
+     <file name="index.html">
+     <ol ng-init="names=['John', 'Mary', 'Cate', 'Suz']">
+     <li ng-repeat="name in names">
+     <span ng-class-odd="'odd'" ng-class-even="'even'">
+     {{name}}
+     </span>
+     </li>
+     </ol>
+     </file>
+     <file name="style.css">
+     .odd {
+         color: red;
+       }
+     .even {
+         color: blue;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check ng-class-odd and ng-class-even', function() {
+         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
+           toMatch(/odd/);
+         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
+           toMatch(/even/);
+       });
+     </file>
+     </example>
+     */
+    var ngClassOddDirective = classDirective('Odd', 0);
 
-                deferListener();
-            });
+    /**
+     * @ngdoc directive
+     * @name ngClassEven
+     * @restrict AC
+     *
+     * @description
+     * The `ngClassOdd` and `ngClassEven` directives work exactly as
+     * {@link ng.directive:ngClass ngClass}, except they work in
+     * conjunction with `ngRepeat` and take effect only on odd (even) rows.
+     *
+     * This directive can be applied only within the scope of an
+     * {@link ng.directive:ngRepeat ngRepeat}.
+     *
+     * @element ANY
+     * @param {expression} ngClassEven {@link guide/expression Expression} to eval. The
+     *   result of the evaluation can be a string representing space delimited class names or an array.
+     *
+     * @example
+     <example name="ng-class-even">
+     <file name="index.html">
+     <ol ng-init="names=['John', 'Mary', 'Cate', 'Suz']">
+     <li ng-repeat="name in names">
+     <span ng-class-odd="'odd'" ng-class-even="'even'">
+     {{name}} &nbsp; &nbsp; &nbsp;
+     </span>
+     </li>
+     </ol>
+     </file>
+     <file name="style.css">
+     .odd {
+         color: red;
+       }
+     .even {
+         color: blue;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check ng-class-odd and ng-class-even', function() {
+         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
+           toMatch(/odd/);
+         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
+           toMatch(/even/);
+       });
+     </file>
+     </example>
+     */
+    var ngClassEvenDirective = classDirective('Even', 1);
 
-            // if user modifies input value using context menu in IE, we need "paste" and "cut" events to catch it
-            if ($sniffer.hasEvent('paste')) {
-                element.on('paste cut', deferListener);
-            }
+    /**
+     * @ngdoc directive
+     * @name ngCloak
+     * @restrict AC
+     *
+     * @description
+     * The `ngCloak` directive is used to prevent the AngularJS html template from being briefly
+     * displayed by the browser in its raw (uncompiled) form while your application is loading. Use this
+     * directive to avoid the undesirable flicker effect caused by the html template display.
+     *
+     * The directive can be applied to the `<body>` element, but the preferred usage is to apply
+     * multiple `ngCloak` directives to small portions of the page to permit progressive rendering
+     * of the browser view.
+     *
+     * `ngCloak` works in cooperation with the following css rule embedded within `angular.js` and
+     * `angular.min.js`.
+     * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
+     *
+     * ```css
+     * [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
+     *   display: none !important;
+     * }
+     * ```
+     *
+     * When this css rule is loaded by the browser, all html elements (including their children) that
+     * are tagged with the `ngCloak` directive are hidden. When AngularJS encounters this directive
+     * during the compilation of the template it deletes the `ngCloak` element attribute, making
+     * the compiled element visible.
+     *
+     * For the best result, the `angular.js` script must be loaded in the head section of the html
+     * document; alternatively, the css rule above must be included in the external stylesheet of the
+     * application.
+     *
+     * @element ANY
+     *
+     * @example
+     <example name="ng-cloak">
+     <file name="index.html">
+     <div id="template1" ng-cloak>{{ 'hello' }}</div>
+     <div id="template2" class="ng-cloak">{{ 'world' }}</div>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should remove the template directive and css class', function() {
+         expect($('#template1').getAttribute('ng-cloak')).
+           toBeNull();
+         expect($('#template2').getAttribute('ng-cloak')).
+           toBeNull();
+       });
+     </file>
+     </example>
+     *
+     */
+    var ngCloakDirective = ngDirective({
+        compile: function(element, attr) {
+            attr.$set('ngCloak', undefined);
+            element.removeClass('ng-cloak');
         }
+    });
 
-        // if user paste into input using mouse on older browser
-        // or form autocomplete on newer browser, we need "change" event to catch it
-        element.on('change', listener);
+    /**
+     * @ngdoc directive
+     * @name ngController
+     *
+     * @description
+     * The `ngController` directive attaches a controller class to the view. This is a key aspect of how angular
+     * supports the principles behind the Model-View-Controller design pattern.
+     *
+     * MVC components in angular:
+     *
+     * * Model — Models are the properties of a scope; scopes are attached to the DOM where scope properties
+     *   are accessed through bindings.
+     * * View — The template (HTML with data bindings) that is rendered into the View.
+     * * Controller — The `ngController` directive specifies a Controller class; the class contains business
+     *   logic behind the application to decorate the scope with functions and values
+     *
+     * Note that you can also attach controllers to the DOM by declaring it in a route definition
+     * via the {@link ngRoute.$route $route} service. A common mistake is to declare the controller
+     * again using `ng-controller` in the template itself.  This will cause the controller to be attached
+     * and executed twice.
+     *
+     * @element ANY
+     * @scope
+     * @priority 500
+     * @param {expression} ngController Name of a constructor function registered with the current
+     * {@link ng.$controllerProvider $controllerProvider} or an {@link guide/expression expression}
+     * that on the current scope evaluates to a constructor function.
+     *
+     * The controller instance can be published into a scope property by specifying
+     * `ng-controller="as propertyName"`.
+     *
+     * If the current `$controllerProvider` is configured to use globals (via
+     * {@link ng.$controllerProvider#allowGlobals `$controllerProvider.allowGlobals()` }), this may
+     * also be the name of a globally accessible constructor function (deprecated, not recommended).
+     *
+     * @example
+     * Here is a simple form for editing user contact information. Adding, removing, clearing, and
+     * greeting are methods declared on the controller (see source tab). These methods can
+     * easily be called from the AngularJS markup. Any changes to the data are automatically reflected
+     * in the View without the need for a manual update.
+     *
+     * Two different declaration styles are included below:
+     *
+     * * one binds methods and properties directly onto the controller using `this`:
+     * `ng-controller="SettingsController1 as settings"`
+     * * one injects `$scope` into the controller:
+     * `ng-controller="SettingsController2"`
+     *
+     * The second option is more common in the AngularJS community, and is generally used in boilerplates
+     * and in this guide. However, there are advantages to binding properties directly to the controller
+     * and avoiding scope.
+     *
+     * * Using `controller as` makes it obvious which controller you are accessing in the template when
+     * multiple controllers apply to an element.
+     * * If you are writing your controllers as classes you have easier access to the properties and
+     * methods, which will appear on the scope, from inside the controller code.
+     * * Since there is always a `.` in the bindings, you don't have to worry about prototypal
+     * inheritance masking primitives.
+     *
+     * This example demonstrates the `controller as` syntax.
+     *
+     * <example name="ngControllerAs" module="controllerAsExample">
+     *   <file name="index.html">
+     *    <div id="ctrl-as-exmpl" ng-controller="SettingsController1 as settings">
+     *      <label>Name: <input type="text" ng-model="settings.name"/></label>
+     *      <button ng-click="settings.greet()">greet</button><br/>
+     *      Contact:
+     *      <ul>
+     *        <li ng-repeat="contact in settings.contacts">
+     *          <select ng-model="contact.type" aria-label="Contact method" id="select_{{$index}}">
+     *             <option>phone</option>
+     *             <option>email</option>
+     *          </select>
+     *          <input type="text" ng-model="contact.value" aria-labelledby="select_{{$index}}" />
+     *          <button ng-click="settings.clearContact(contact)">clear</button>
+     *          <button ng-click="settings.removeContact(contact)" aria-label="Remove">X</button>
+     *        </li>
+     *        <li><button ng-click="settings.addContact()">add</button></li>
+     *     </ul>
+     *    </div>
+     *   </file>
+     *   <file name="app.js">
+     *    angular.module('controllerAsExample', [])
+     *      .controller('SettingsController1', SettingsController1);
+     *
+     *    function SettingsController1() {
+     *      this.name = 'John Smith';
+     *      this.contacts = [
+     *        {type: 'phone', value: '408 555 1212'},
+     *        {type: 'email', value: 'john.smith@example.org'}
+     *      ];
+     *    }
+     *
+     *    SettingsController1.prototype.greet = function() {
+     *      alert(this.name);
+     *    };
+     *
+     *    SettingsController1.prototype.addContact = function() {
+     *      this.contacts.push({type: 'email', value: 'yourname@example.org'});
+     *    };
+     *
+     *    SettingsController1.prototype.removeContact = function(contactToRemove) {
+     *     var index = this.contacts.indexOf(contactToRemove);
+     *      this.contacts.splice(index, 1);
+     *    };
+     *
+     *    SettingsController1.prototype.clearContact = function(contact) {
+     *      contact.type = 'phone';
+     *      contact.value = '';
+     *    };
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     *     it('should check controller as', function() {
+     *       var container = element(by.id('ctrl-as-exmpl'));
+     *         expect(container.element(by.model('settings.name'))
+     *           .getAttribute('value')).toBe('John Smith');
+     *
+     *       var firstRepeat =
+     *           container.element(by.repeater('contact in settings.contacts').row(0));
+     *       var secondRepeat =
+     *           container.element(by.repeater('contact in settings.contacts').row(1));
+     *
+     *       expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+     *           .toBe('408 555 1212');
+     *
+     *       expect(secondRepeat.element(by.model('contact.value')).getAttribute('value'))
+     *           .toBe('john.smith@example.org');
+     *
+     *       firstRepeat.element(by.buttonText('clear')).click();
+     *
+     *       expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+     *           .toBe('');
+     *
+     *       container.element(by.buttonText('add')).click();
+     *
+     *       expect(container.element(by.repeater('contact in settings.contacts').row(2))
+     *           .element(by.model('contact.value'))
+     *           .getAttribute('value'))
+     *           .toBe('yourname@example.org');
+     *     });
+     *   </file>
+     * </example>
+     *
+     * This example demonstrates the "attach to `$scope`" style of controller.
+     *
+     * <example name="ngController" module="controllerExample">
+     *  <file name="index.html">
+     *   <div id="ctrl-exmpl" ng-controller="SettingsController2">
+     *     <label>Name: <input type="text" ng-model="name"/></label>
+     *     <button ng-click="greet()">greet</button><br/>
+     *     Contact:
+     *     <ul>
+     *       <li ng-repeat="contact in contacts">
+     *         <select ng-model="contact.type" id="select_{{$index}}">
+     *            <option>phone</option>
+     *            <option>email</option>
+     *         </select>
+     *         <input type="text" ng-model="contact.value" aria-labelledby="select_{{$index}}" />
+     *         <button ng-click="clearContact(contact)">clear</button>
+     *         <button ng-click="removeContact(contact)">X</button>
+     *       </li>
+     *       <li>[ <button ng-click="addContact()">add</button> ]</li>
+     *    </ul>
+     *   </div>
+     *  </file>
+     *  <file name="app.js">
+     *   angular.module('controllerExample', [])
+     *     .controller('SettingsController2', ['$scope', SettingsController2]);
+     *
+     *   function SettingsController2($scope) {
+     *     $scope.name = 'John Smith';
+     *     $scope.contacts = [
+     *       {type:'phone', value:'408 555 1212'},
+     *       {type:'email', value:'john.smith@example.org'}
+     *     ];
+     *
+     *     $scope.greet = function() {
+     *       alert($scope.name);
+     *     };
+     *
+     *     $scope.addContact = function() {
+     *       $scope.contacts.push({type:'email', value:'yourname@example.org'});
+     *     };
+     *
+     *     $scope.removeContact = function(contactToRemove) {
+     *       var index = $scope.contacts.indexOf(contactToRemove);
+     *       $scope.contacts.splice(index, 1);
+     *     };
+     *
+     *     $scope.clearContact = function(contact) {
+     *       contact.type = 'phone';
+     *       contact.value = '';
+     *     };
+     *   }
+     *  </file>
+     *  <file name="protractor.js" type="protractor">
+     *    it('should check controller', function() {
+     *      var container = element(by.id('ctrl-exmpl'));
+     *
+     *      expect(container.element(by.model('name'))
+     *          .getAttribute('value')).toBe('John Smith');
+     *
+     *      var firstRepeat =
+     *          container.element(by.repeater('contact in contacts').row(0));
+     *      var secondRepeat =
+     *          container.element(by.repeater('contact in contacts').row(1));
+     *
+     *      expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+     *          .toBe('408 555 1212');
+     *      expect(secondRepeat.element(by.model('contact.value')).getAttribute('value'))
+     *          .toBe('john.smith@example.org');
+     *
+     *      firstRepeat.element(by.buttonText('clear')).click();
+     *
+     *      expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+     *          .toBe('');
+     *
+     *      container.element(by.buttonText('add')).click();
+     *
+     *      expect(container.element(by.repeater('contact in contacts').row(2))
+     *          .element(by.model('contact.value'))
+     *          .getAttribute('value'))
+     *          .toBe('yourname@example.org');
+     *    });
+     *  </file>
+     *</example>
 
-        ctrl.$render = function() {
-            element.val(ctrl.$isEmpty(ctrl.$viewValue) ? '' : ctrl.$viewValue);
+     */
+    var ngControllerDirective = [function() {
+        return {
+            restrict: 'A',
+            scope: true,
+            controller: '@',
+            priority: 500
         };
+    }];
 
-        // pattern validator
-        var pattern = attr.ngPattern,
-            patternValidator,
-            match;
-
-        if (pattern) {
-            var validateRegex = function(regexp, value) {
-                return validate(ctrl, 'pattern', ctrl.$isEmpty(value) || regexp.test(value), value);
-            };
-            match = pattern.match(/^\/(.*)\/([gim]*)$/);
-            if (match) {
-                pattern = new RegExp(match[1], match[2]);
-                patternValidator = function(value) {
-                    return validateRegex(pattern, value);
-                };
-            } else {
-                patternValidator = function(value) {
-                    var patternObj = scope.$eval(pattern);
-
-                    if (!patternObj || !patternObj.test) {
-                        throw minErr('ngPattern')('noregexp',
-                            'Expected {0} to be a RegExp but was {1}. Element: {2}', pattern,
-                            patternObj, startingTag(element));
-                    }
-                    return validateRegex(patternObj, value);
-                };
-            }
-
-            ctrl.$formatters.push(patternValidator);
-            ctrl.$parsers.push(patternValidator);
-        }
-
-        // min length validator
-        if (attr.ngMinlength) {
-            var minlength = int(attr.ngMinlength);
-            var minLengthValidator = function(value) {
-                return validate(ctrl, 'minlength', ctrl.$isEmpty(value) || value.length >= minlength, value);
-            };
-
-            ctrl.$parsers.push(minLengthValidator);
-            ctrl.$formatters.push(minLengthValidator);
-        }
-
-        // max length validator
-        if (attr.ngMaxlength) {
-            var maxlength = int(attr.ngMaxlength);
-            var maxLengthValidator = function(value) {
-                return validate(ctrl, 'maxlength', ctrl.$isEmpty(value) || value.length <= maxlength, value);
-            };
-
-            ctrl.$parsers.push(maxLengthValidator);
-            ctrl.$formatters.push(maxLengthValidator);
-        }
-    }
-
-    function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-        textInputType(scope, element, attr, ctrl, $sniffer, $browser);
-
-        ctrl.$parsers.push(function(value) {
-            var empty = ctrl.$isEmpty(value);
-            if (empty || NUMBER_REGEXP.test(value)) {
-                ctrl.$setValidity('number', true);
-                return value === '' ? null : (empty ? value : parseFloat(value));
-            } else {
-                ctrl.$setValidity('number', false);
-                return undefined;
-            }
-        });
-
-        addNativeHtml5Validators(ctrl, 'number', element);
+    /**
+     * @ngdoc directive
+     * @name ngCsp
+     *
+     * @restrict A
+     * @element ANY
+     * @description
+     *
+     * AngularJS has some features that can conflict with certain restrictions that are applied when using
+     * [CSP (Content Security Policy)](https://developer.mozilla.org/en/Security/CSP) rules.
+     *
+     * If you intend to implement CSP with these rules then you must tell AngularJS not to use these
+     * features.
+     *
+     * This is necessary when developing things like Google Chrome Extensions or Universal Windows Apps.
+     *
+     *
+     * The following default rules in CSP affect AngularJS:
+     *
+     * * The use of `eval()`, `Function(string)` and similar functions to dynamically create and execute
+     * code from strings is forbidden. AngularJS makes use of this in the {@link $parse} service to
+     * provide a 30% increase in the speed of evaluating AngularJS expressions. (This CSP rule can be
+     * disabled with the CSP keyword `unsafe-eval`, but it is generally not recommended as it would
+     * weaken the protections offered by CSP.)
+     *
+     * * The use of inline resources, such as inline `<script>` and `<style>` elements, are forbidden.
+     * This prevents apps from injecting custom styles directly into the document. AngularJS makes use of
+     * this to include some CSS rules (e.g. {@link ngCloak} and {@link ngHide}). To make these
+     * directives work when a CSP rule is blocking inline styles, you must link to the `angular-csp.css`
+     * in your HTML manually. (This CSP rule can be disabled with the CSP keyword `unsafe-inline`, but
+     * it is generally not recommended as it would weaken the protections offered by CSP.)
+     *
+     * If you do not provide `ngCsp` then AngularJS tries to autodetect if CSP is blocking dynamic code
+     * creation from strings (e.g., `unsafe-eval` not specified in CSP header) and automatically
+     * deactivates this feature in the {@link $parse} service. This autodetection, however, triggers a
+     * CSP error to be logged in the console:
+     *
+     * ```
+     * Refused to evaluate a string as JavaScript because 'unsafe-eval' is not an allowed source of
+     * script in the following Content Security Policy directive: "default-src 'self'". Note that
+     * 'script-src' was not explicitly set, so 'default-src' is used as a fallback.
+     * ```
+     *
+     * This error is harmless but annoying. To prevent the error from showing up, put the `ngCsp`
+     * directive on an element of the HTML document that appears before the `<script>` tag that loads
+     * the `angular.js` file.
+     *
+     * *Note: This directive is only available in the `ng-csp` and `data-ng-csp` attribute form.*
+     *
+     * You can specify which of the CSP related AngularJS features should be deactivated by providing
+     * a value for the `ng-csp` attribute. The options are as follows:
+     *
+     * * no-inline-style: this stops AngularJS from injecting CSS styles into the DOM
+     *
+     * * no-unsafe-eval: this stops AngularJS from optimizing $parse with unsafe eval of strings
+     *
+     * You can use these values in the following combinations:
+     *
+     *
+     * * No declaration means that AngularJS will assume that you can do inline styles, but it will do
+     * a runtime check for unsafe-eval. E.g. `<body>`. This is backwardly compatible with previous
+     * versions of AngularJS.
+     *
+     * * A simple `ng-csp` (or `data-ng-csp`) attribute will tell AngularJS to deactivate both inline
+     * styles and unsafe eval. E.g. `<body ng-csp>`. This is backwardly compatible with previous
+     * versions of AngularJS.
+     *
+     * * Specifying only `no-unsafe-eval` tells AngularJS that we must not use eval, but that we can
+     * inject inline styles. E.g. `<body ng-csp="no-unsafe-eval">`.
+     *
+     * * Specifying only `no-inline-style` tells AngularJS that we must not inject styles, but that we can
+     * run eval - no automatic check for unsafe eval will occur. E.g. `<body ng-csp="no-inline-style">`
+     *
+     * * Specifying both `no-unsafe-eval` and `no-inline-style` tells AngularJS that we must not inject
+     * styles nor use eval, which is the same as an empty: ng-csp.
+     * E.g.`<body ng-csp="no-inline-style;no-unsafe-eval">`
+     *
+     * @example
+     *
+     * This example shows how to apply the `ngCsp` directive to the `html` tag.
+     ```html
+     <!doctype html>
+     <html ng-app ng-csp>
+     ...
+     ...
+     </html>
+     ```
 
-        ctrl.$formatters.push(function(value) {
-            return ctrl.$isEmpty(value) ? '' : '' + value;
-        });
+     <!-- Note: the `.csp` suffix in the example name triggers CSP mode in our http server! -->
+     <example name="example.csp" module="cspExample" ng-csp="true">
+     <file name="index.html">
+     <div ng-controller="MainController as ctrl">
+     <div>
+     <button ng-click="ctrl.inc()" id="inc">Increment</button>
+     <span id="counter">
+     {{ctrl.counter}}
+     </span>
+     </div>
 
-        if (attr.min) {
-            var minValidator = function(value) {
-                var min = parseFloat(attr.min);
-                return validate(ctrl, 'min', ctrl.$isEmpty(value) || value >= min, value);
+     <div>
+     <button ng-click="ctrl.evil()" id="evil">Evil</button>
+     <span id="evilError">
+     {{ctrl.evilError}}
+     </span>
+     </div>
+     </div>
+     </file>
+     <file name="script.js">
+     angular.module('cspExample', [])
+     .controller('MainController', function MainController() {
+            this.counter = 0;
+            this.inc = function() {
+              this.counter++;
             };
-
-            ctrl.$parsers.push(minValidator);
-            ctrl.$formatters.push(minValidator);
-        }
-
-        if (attr.max) {
-            var maxValidator = function(value) {
-                var max = parseFloat(attr.max);
-                return validate(ctrl, 'max', ctrl.$isEmpty(value) || value <= max, value);
+            this.evil = function() {
+              try {
+                eval('1+2'); // eslint-disable-line no-eval
+              } catch (e) {
+                this.evilError = e.message;
+              }
             };
+          });
+     </file>
+     <file name="protractor.js" type="protractor">
+     var util, webdriver;
 
-            ctrl.$parsers.push(maxValidator);
-            ctrl.$formatters.push(maxValidator);
-        }
+     var incBtn = element(by.id('inc'));
+     var counter = element(by.id('counter'));
+     var evilBtn = element(by.id('evil'));
+     var evilError = element(by.id('evilError'));
 
-        ctrl.$formatters.push(function(value) {
-            return validate(ctrl, 'number', ctrl.$isEmpty(value) || isNumber(value), value);
+     function getAndClearSevereErrors() {
+        return browser.manage().logs().get('browser').then(function(browserLog) {
+          return browserLog.filter(function(logEntry) {
+            return logEntry.level.value > webdriver.logging.Level.WARNING.value;
+          });
         });
-    }
-
-    function urlInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-        textInputType(scope, element, attr, ctrl, $sniffer, $browser);
-
-        var urlValidator = function(value) {
-            return validate(ctrl, 'url', ctrl.$isEmpty(value) || URL_REGEXP.test(value), value);
-        };
-
-        ctrl.$formatters.push(urlValidator);
-        ctrl.$parsers.push(urlValidator);
-    }
-
-    function emailInputType(scope, element, attr, ctrl, $sniffer, $browser) {
-        textInputType(scope, element, attr, ctrl, $sniffer, $browser);
-
-        var emailValidator = function(value) {
-            return validate(ctrl, 'email', ctrl.$isEmpty(value) || EMAIL_REGEXP.test(value), value);
-        };
+      }
 
-        ctrl.$formatters.push(emailValidator);
-        ctrl.$parsers.push(emailValidator);
-    }
+     function clearErrors() {
+        getAndClearSevereErrors();
+      }
 
-    function radioInputType(scope, element, attr, ctrl) {
-        // make the name unique, if not defined
-        if (isUndefined(attr.name)) {
-            element.attr('name', nextUid());
-        }
+     function expectNoErrors() {
+        getAndClearSevereErrors().then(function(filteredLog) {
+          expect(filteredLog.length).toEqual(0);
+          if (filteredLog.length) {
+            console.log('browser console errors: ' + util.inspect(filteredLog));
+          }
+        });
+      }
 
-        element.on('click', function() {
-            if (element[0].checked) {
-                scope.$apply(function() {
-                    ctrl.$setViewValue(attr.value);
-                });
+     function expectError(regex) {
+        getAndClearSevereErrors().then(function(filteredLog) {
+          var found = false;
+          filteredLog.forEach(function(log) {
+            if (log.message.match(regex)) {
+              found = true;
             }
+          });
+          if (!found) {
+            throw new Error('expected an error that matches ' + regex);
+          }
         });
+      }
 
-        ctrl.$render = function() {
-            var value = attr.value;
-            element[0].checked = (value == ctrl.$viewValue);
-        };
-
-        attr.$observe('value', ctrl.$render);
-    }
-
-    function checkboxInputType(scope, element, attr, ctrl) {
-        var trueValue = attr.ngTrueValue,
-            falseValue = attr.ngFalseValue;
+     beforeEach(function() {
+        util = require('util');
+        webdriver = require('selenium-webdriver');
+      });
 
-        if (!isString(trueValue)) trueValue = true;
-        if (!isString(falseValue)) falseValue = false;
+     // For now, we only test on Chrome,
+     // as Safari does not load the page with Protractor's injected scripts,
+     // and Firefox webdriver always disables content security policy (#6358)
+     if (browser.params.browser !== 'chrome') {
+        return;
+      }
 
-        element.on('click', function() {
-            scope.$apply(function() {
-                ctrl.$setViewValue(element[0].checked);
-            });
+     it('should not report errors when the page is loaded', function() {
+        // clear errors so we are not dependent on previous tests
+        clearErrors();
+        // Need to reload the page as the page is already loaded when
+        // we come here
+        browser.driver.getCurrentUrl().then(function(url) {
+          browser.get(url);
         });
+        expectNoErrors();
+      });
 
-        ctrl.$render = function() {
-            element[0].checked = ctrl.$viewValue;
-        };
-
-        // Override the standard `$isEmpty` because a value of `false` means empty in a checkbox.
-        ctrl.$isEmpty = function(value) {
-            return value !== trueValue;
-        };
-
-        ctrl.$formatters.push(function(value) {
-            return value === trueValue;
-        });
+     it('should evaluate expressions', function() {
+        expect(counter.getText()).toEqual('0');
+        incBtn.click();
+        expect(counter.getText()).toEqual('1');
+        expectNoErrors();
+      });
 
-        ctrl.$parsers.push(function(value) {
-            return value ? trueValue : falseValue;
-        });
-    }
+     it('should throw and report an error when using "eval"', function() {
+        evilBtn.click();
+        expect(evilError.getText()).toMatch(/Content Security Policy/);
+        expectError(/Content Security Policy/);
+      });
+     </file>
+     </example>
+     */
 
+// `ngCsp` is not implemented as a proper directive any more, because we need it be processed while
+// we bootstrap the app (before `$parse` is instantiated). For this reason, we just have the `csp()`
+// fn that looks for the `ng-csp` attribute anywhere in the current doc.
 
     /**
      * @ngdoc directive
-     * @name textarea
-     * @restrict E
+     * @name ngClick
+     * @restrict A
+     * @element ANY
+     * @priority 0
      *
      * @description
-     * HTML textarea element control with angular data-binding. The data-binding and validation
-     * properties of this element are exactly the same as those of the
-     * {@link ng.directive:input input element}.
+     * The ngClick directive allows you to specify custom behavior when
+     * an element is clicked.
      *
-     * @param {string} ngModel Assignable angular expression to data-bind to.
-     * @param {string=} name Property name of the form under which the control is published.
-     * @param {string=} required Sets `required` validation error key if the value is not entered.
-     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-     *    `required` when you want to data-bind to the `required` attribute.
-     * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-     *    minlength.
-     * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-     *    maxlength.
-     * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
-     *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
-     *    patterns defined as scope expressions.
-     * @param {string=} ngChange Angular expression to be executed when input changes due to user
-     *    interaction with the input element.
+     * @param {expression} ngClick {@link guide/expression Expression} to evaluate upon
+     * click. ({@link guide/expression#-event- Event object is available as `$event`})
+     *
+     * @example
+     <example name="ng-click">
+     <file name="index.html">
+     <button ng-click="count = count + 1" ng-init="count=0">
+     Increment
+     </button>
+     <span>
+     count: {{count}}
+     </span>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check ng-click', function() {
+         expect(element(by.binding('count')).getText()).toMatch('0');
+         element(by.css('button')).click();
+         expect(element(by.binding('count')).getText()).toMatch('1');
+       });
+     </file>
+     </example>
      */
+    /*
+ * A collection of directives that allows creation of custom event handlers that are defined as
+ * AngularJS expressions and are compiled and executed within the current scope.
+ */
+    var ngEventDirectives = {};
 
+// For events that might fire synchronously during DOM manipulation
+// we need to execute their event handlers asynchronously using $evalAsync,
+// so that they are not executed in an inconsistent state.
+    var forceAsyncEvents = {
+        'blur': true,
+        'focus': true
+    };
+    forEach(
+        'click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste'.split(' '),
+        function(eventName) {
+            var directiveName = directiveNormalize('ng-' + eventName);
+            ngEventDirectives[directiveName] = ['$parse', '$rootScope', function($parse, $rootScope) {
+                return {
+                    restrict: 'A',
+                    compile: function($element, attr) {
+                        // NOTE:
+                        // We expose the powerful `$event` object on the scope that provides access to the Window,
+                        // etc. This is OK, because expressions are not sandboxed any more (and the expression
+                        // sandbox was never meant to be a security feature anyway).
+                        var fn = $parse(attr[directiveName]);
+                        return function ngEventHandler(scope, element) {
+                            element.on(eventName, function(event) {
+                                var callback = function() {
+                                    fn(scope, {$event: event});
+                                };
+                                if (forceAsyncEvents[eventName] && $rootScope.$$phase) {
+                                    scope.$evalAsync(callback);
+                                } else {
+                                    scope.$apply(callback);
+                                }
+                            });
+                        };
+                    }
+                };
+            }];
+        }
+    );
 
     /**
      * @ngdoc directive
-     * @name input
-     * @restrict E
+     * @name ngDblclick
+     * @restrict A
+     * @element ANY
+     * @priority 0
      *
      * @description
-     * HTML input element control with angular data-binding. Input control follows HTML5 input types
-     * and polyfills the HTML5 validation behavior for older browsers.
+     * The `ngDblclick` directive allows you to specify custom behavior on a dblclick event.
      *
-     * @param {string} ngModel Assignable angular expression to data-bind to.
-     * @param {string=} name Property name of the form under which the control is published.
-     * @param {string=} required Sets `required` validation error key if the value is not entered.
-     * @param {boolean=} ngRequired Sets `required` attribute if set to true
-     * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
-     *    minlength.
-     * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
-     *    maxlength.
-     * @param {string=} ngPattern Sets `pattern` validation error key if the value does not match the
-     *    RegExp pattern expression. Expected value is `/regexp/` for inline patterns or `regexp` for
-     *    patterns defined as scope expressions.
-     * @param {string=} ngChange Angular expression to be executed when input changes due to user
-     *    interaction with the input element.
+     * @param {expression} ngDblclick {@link guide/expression Expression} to evaluate upon
+     * a dblclick. (The Event object is available as `$event`)
      *
      * @example
-     <example name="input-directive">
+     <example name="ng-dblclick">
      <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-           $scope.user = {name: 'guest', last: 'visitor'};
-         }
-     </script>
-     <div ng-controller="Ctrl">
-     <form name="myForm">
-     User name: <input type="text" name="userName" ng-model="user.name" required>
-     <span class="error" ng-show="myForm.userName.$error.required">
-     Required!</span><br>
-     Last name: <input type="text" name="lastName" ng-model="user.last"
-     ng-minlength="3" ng-maxlength="10">
-     <span class="error" ng-show="myForm.lastName.$error.minlength">
-     Too short!</span>
-     <span class="error" ng-show="myForm.lastName.$error.maxlength">
-     Too long!</span><br>
-     </form>
-     <hr>
-     <tt>user = {{user}}</tt><br/>
-     <tt>myForm.userName.$valid = {{myForm.userName.$valid}}</tt><br>
-     <tt>myForm.userName.$error = {{myForm.userName.$error}}</tt><br>
-     <tt>myForm.lastName.$valid = {{myForm.lastName.$valid}}</tt><br>
-     <tt>myForm.lastName.$error = {{myForm.lastName.$error}}</tt><br>
-     <tt>myForm.$valid = {{myForm.$valid}}</tt><br>
-     <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br>
-     <tt>myForm.$error.minlength = {{!!myForm.$error.minlength}}</tt><br>
-     <tt>myForm.$error.maxlength = {{!!myForm.$error.maxlength}}</tt><br>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     var user = element(by.binding('{{user}}'));
-     var userNameValid = element(by.binding('myForm.userName.$valid'));
-     var lastNameValid = element(by.binding('myForm.lastName.$valid'));
-     var lastNameError = element(by.binding('myForm.lastName.$error'));
-     var formValid = element(by.binding('myForm.$valid'));
-     var userNameInput = element(by.model('user.name'));
-     var userLastInput = element(by.model('user.last'));
-
-     it('should initialize to model', function() {
-          expect(user.getText()).toContain('{"name":"guest","last":"visitor"}');
-          expect(userNameValid.getText()).toContain('true');
-          expect(formValid.getText()).toContain('true');
-        });
-
-     it('should be invalid if empty when required', function() {
-          userNameInput.clear();
-          userNameInput.sendKeys('');
-
-          expect(user.getText()).toContain('{"last":"visitor"}');
-          expect(userNameValid.getText()).toContain('false');
-          expect(formValid.getText()).toContain('false');
-        });
-
-     it('should be valid if empty when min length is set', function() {
-          userLastInput.clear();
-          userLastInput.sendKeys('');
-
-          expect(user.getText()).toContain('{"name":"guest","last":""}');
-          expect(lastNameValid.getText()).toContain('true');
-          expect(formValid.getText()).toContain('true');
-        });
-
-     it('should be invalid if less than required min length', function() {
-          userLastInput.clear();
-          userLastInput.sendKeys('xx');
-
-          expect(user.getText()).toContain('{"name":"guest"}');
-          expect(lastNameValid.getText()).toContain('false');
-          expect(lastNameError.getText()).toContain('minlength');
-          expect(formValid.getText()).toContain('false');
-        });
-
-     it('should be invalid if longer than max length', function() {
-          userLastInput.clear();
-          userLastInput.sendKeys('some ridiculously long name');
-
-          expect(user.getText()).toContain('{"name":"guest"}');
-          expect(lastNameValid.getText()).toContain('false');
-          expect(lastNameError.getText()).toContain('maxlength');
-          expect(formValid.getText()).toContain('false');
-        });
+     <button ng-dblclick="count = count + 1" ng-init="count=0">
+     Increment (on double click)
+     </button>
+     count: {{count}}
+     </file>
+     </example>
+     */
+
+
+    /**
+     * @ngdoc directive
+     * @name ngMousedown
+     * @restrict A
+     * @element ANY
+     * @priority 0
+     *
+     * @description
+     * The ngMousedown directive allows you to specify custom behavior on mousedown event.
+     *
+     * @param {expression} ngMousedown {@link guide/expression Expression} to evaluate upon
+     * mousedown. ({@link guide/expression#-event- Event object is available as `$event`})
+     *
+     * @example
+     <example name="ng-mousedown">
+     <file name="index.html">
+     <button ng-mousedown="count = count + 1" ng-init="count=0">
+     Increment (on mouse down)
+     </button>
+     count: {{count}}
      </file>
      </example>
      */
-    var inputDirective = ['$browser', '$sniffer', function($browser, $sniffer) {
-        return {
-            restrict: 'E',
-            require: '?ngModel',
-            link: function(scope, element, attr, ctrl) {
-                if (ctrl) {
-                    (inputType[lowercase(attr.type)] || inputType.text)(scope, element, attr, ctrl, $sniffer,
-                        $browser);
-                }
-            }
-        };
-    }];
 
-    var VALID_CLASS = 'ng-valid',
-        INVALID_CLASS = 'ng-invalid',
-        PRISTINE_CLASS = 'ng-pristine',
-        DIRTY_CLASS = 'ng-dirty';
 
     /**
-     * @ngdoc type
-     * @name ngModel.NgModelController
-     *
-     * @property {string} $viewValue Actual string value in the view.
-     * @property {*} $modelValue The value in the model, that the control is bound to.
-     * @property {Array.<Function>} $parsers Array of functions to execute, as a pipeline, whenever
-     the control reads value from the DOM.  Each function is called, in turn, passing the value
-     through to the next. The last return value is used to populate the model.
-     Used to sanitize / convert the value as well as validation. For validation,
-     the parsers should update the validity state using
-     {@link ngModel.NgModelController#$setValidity $setValidity()},
-     and return `undefined` for invalid values.
-
+     * @ngdoc directive
+     * @name ngMouseup
+     * @restrict A
+     * @element ANY
+     * @priority 0
      *
-     * @property {Array.<Function>} $formatters Array of functions to execute, as a pipeline, whenever
-     the model value changes. Each function is called, in turn, passing the value through to the
-     next. Used to format / convert values for display in the control and validation.
-     *      ```js
-     *      function formatter(value) {
- *        if (value) {
- *          return value.toUpperCase();
- *        }
- *      }
-     *      ngModel.$formatters.push(formatter);
-     *      ```
-     *
-     * @property {Array.<Function>} $viewChangeListeners Array of functions to execute whenever the
-     *     view value has changed. It is called with no arguments, and its return value is ignored.
-     *     This can be used in place of additional $watches against the model value.
+     * @description
+     * Specify custom behavior on mouseup event.
      *
-     * @property {Object} $error An object hash with all errors as keys.
+     * @param {expression} ngMouseup {@link guide/expression Expression} to evaluate upon
+     * mouseup. ({@link guide/expression#-event- Event object is available as `$event`})
      *
-     * @property {boolean} $pristine True if user has not interacted with the control yet.
-     * @property {boolean} $dirty True if user has already interacted with the control.
-     * @property {boolean} $valid True if there is no error.
-     * @property {boolean} $invalid True if at least one error on the control.
+     * @example
+     <example name="ng-mouseup">
+     <file name="index.html">
+     <button ng-mouseup="count = count + 1" ng-init="count=0">
+     Increment (on mouse up)
+     </button>
+     count: {{count}}
+     </file>
+     </example>
+     */
+
+    /**
+     * @ngdoc directive
+     * @name ngMouseover
+     * @restrict A
+     * @element ANY
+     * @priority 0
      *
      * @description
+     * Specify custom behavior on mouseover event.
      *
-     * `NgModelController` provides API for the `ng-model` directive. The controller contains
-     * services for data-binding, validation, CSS updates, and value formatting and parsing. It
-     * purposefully does not contain any logic which deals with DOM rendering or listening to
-     * DOM events. Such DOM related logic should be provided by other directives which make use of
-     * `NgModelController` for data-binding.
-     *
-     * ## Custom Control Example
-     * This example shows how to use `NgModelController` with a custom control to achieve
-     * data-binding. Notice how different directives (`contenteditable`, `ng-model`, and `required`)
-     * collaborate together to achieve the desired result.
-     *
-     * Note that `contenteditable` is an HTML5 attribute, which tells the browser to let the element
-     * contents be edited in place by the user.  This will not work on older browsers.
+     * @param {expression} ngMouseover {@link guide/expression Expression} to evaluate upon
+     * mouseover. ({@link guide/expression#-event- Event object is available as `$event`})
      *
-     * <example name="NgModelController" module="customControl">
-     <file name="style.css">
-     [contenteditable] {
-        border: 1px solid black;
-        background-color: white;
-        min-height: 20px;
-      }
-
-     .ng-invalid {
-        border: 1px solid red;
-      }
-
+     * @example
+     <example name="ng-mouseover">
+     <file name="index.html">
+     <button ng-mouseover="count = count + 1" ng-init="count=0">
+     Increment (when mouse is over)
+     </button>
+     count: {{count}}
      </file>
-     <file name="script.js">
-     angular.module('customControl', []).
-     directive('contenteditable', function() {
-          return {
-            restrict: 'A', // only activate on element attribute
-            require: '?ngModel', // get a hold of NgModelController
-            link: function(scope, element, attrs, ngModel) {
-              if(!ngModel) return; // do nothing if no ng-model
-
-              // Specify how UI should be updated
-              ngModel.$render = function() {
-                element.html(ngModel.$viewValue || '');
-              };
+     </example>
+     */
 
-              // Listen for change events to enable binding
-              element.on('blur keyup change', function() {
-                scope.$apply(read);
-              });
-              read(); // initialize
 
-              // Write data to the model
-              function read() {
-                var html = element.html();
-                // When we clear the content editable the browser leaves a <br> behind
-                // If strip-br attribute is provided then we strip this out
-                if( attrs.stripBr && html == '<br>' ) {
-                  html = '';
-                }
-                ngModel.$setViewValue(html);
-              }
-            }
-          };
-        });
-     </file>
+    /**
+     * @ngdoc directive
+     * @name ngMouseenter
+     * @restrict A
+     * @element ANY
+     * @priority 0
+     *
+     * @description
+     * Specify custom behavior on mouseenter event.
+     *
+     * @param {expression} ngMouseenter {@link guide/expression Expression} to evaluate upon
+     * mouseenter. ({@link guide/expression#-event- Event object is available as `$event`})
+     *
+     * @example
+     <example name="ng-mouseenter">
      <file name="index.html">
-     <form name="myForm">
-     <div contenteditable
-     name="myWidget" ng-model="userContent"
-     strip-br="true"
-     required>Change me!</div>
-     <span ng-show="myForm.myWidget.$error.required">Required!</span>
-     <hr>
-     <textarea ng-model="userContent"></textarea>
-     </form>
+     <button ng-mouseenter="count = count + 1" ng-init="count=0">
+     Increment (when mouse enters)
+     </button>
+     count: {{count}}
      </file>
-     <file name="protractor.js" type="protractor">
-     it('should data-bind and become invalid', function() {
-      if (browser.params.browser == 'safari' || browser.params.browser == 'firefox') {
-        // SafariDriver can't handle contenteditable
-        // and Firefox driver can't clear contenteditables very well
-        return;
-      }
-      var contentEditable = element(by.css('[contenteditable]'));
-      var content = 'Change me!';
+     </example>
+     */
 
-      expect(contentEditable.getText()).toEqual(content);
 
-      contentEditable.clear();
-      contentEditable.sendKeys(protractor.Key.BACK_SPACE);
-      expect(contentEditable.getText()).toEqual('');
-      expect(contentEditable.getAttribute('class')).toMatch(/ng-invalid-required/);
-    });
-     </file>
-     * </example>
+    /**
+     * @ngdoc directive
+     * @name ngMouseleave
+     * @restrict A
+     * @element ANY
+     * @priority 0
+     *
+     * @description
+     * Specify custom behavior on mouseleave event.
      *
+     * @param {expression} ngMouseleave {@link guide/expression Expression} to evaluate upon
+     * mouseleave. ({@link guide/expression#-event- Event object is available as `$event`})
      *
+     * @example
+     <example name="ng-mouseleave">
+     <file name="index.html">
+     <button ng-mouseleave="count = count + 1" ng-init="count=0">
+     Increment (when mouse leaves)
+     </button>
+     count: {{count}}
+     </file>
+     </example>
      */
-    var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$parse', '$animate',
-        function($scope, $exceptionHandler, $attr, $element, $parse, $animate) {
-            this.$viewValue = Number.NaN;
-            this.$modelValue = Number.NaN;
-            this.$parsers = [];
-            this.$formatters = [];
-            this.$viewChangeListeners = [];
-            this.$pristine = true;
-            this.$dirty = false;
-            this.$valid = true;
-            this.$invalid = false;
-            this.$name = $attr.name;
-
-            var ngModelGet = $parse($attr.ngModel),
-                ngModelSet = ngModelGet.assign;
-
-            if (!ngModelSet) {
-                throw minErr('ngModel')('nonassign', "Expression '{0}' is non-assignable. Element: {1}",
-                    $attr.ngModel, startingTag($element));
-            }
-
-            /**
-             * @ngdoc method
-             * @name ngModel.NgModelController#$render
-             *
-             * @description
-             * Called when the view needs to be updated. It is expected that the user of the ng-model
-             * directive will implement this method.
-             */
-            this.$render = noop;
-
-            /**
-             * @ngdoc method
-             * @name ngModel.NgModelController#$isEmpty
-             *
-             * @description
-             * This is called when we need to determine if the value of the input is empty.
-             *
-             * For instance, the required directive does this to work out if the input has data or not.
-             * The default `$isEmpty` function checks whether the value is `undefined`, `''`, `null` or `NaN`.
-             *
-             * You can override this for input directives whose concept of being empty is different to the
-             * default. The `checkboxInputType` directive does this because in its case a value of `false`
-             * implies empty.
-             *
-             * @param {*} value Reference to check.
-             * @returns {boolean} True if `value` is empty.
-             */
-            this.$isEmpty = function(value) {
-                return isUndefined(value) || value === '' || value === null || value !== value;
-            };
-
-            var parentForm = $element.inheritedData('$formController') || nullFormCtrl,
-                invalidCount = 0, // used to easily determine if we are valid
-                $error = this.$error = {}; // keep invalid keys here
-
-
-            // Setup initial state of the control
-            $element.addClass(PRISTINE_CLASS);
-            toggleValidCss(true);
-
-            // convenience method for easy toggling of classes
-            function toggleValidCss(isValid, validationErrorKey) {
-                validationErrorKey = validationErrorKey ? '-' + snake_case(validationErrorKey, '-') : '';
-                $animate.removeClass($element, (isValid ? INVALID_CLASS : VALID_CLASS) + validationErrorKey);
-                $animate.addClass($element, (isValid ? VALID_CLASS : INVALID_CLASS) + validationErrorKey);
-            }
-
-            /**
-             * @ngdoc method
-             * @name ngModel.NgModelController#$setValidity
-             *
-             * @description
-             * Change the validity state, and notifies the form when the control changes validity. (i.e. it
-             * does not notify form if given validator is already marked as invalid).
-             *
-             * This method should be called by validators - i.e. the parser or formatter functions.
-             *
-             * @param {string} validationErrorKey Name of the validator. the `validationErrorKey` will assign
-             *        to `$error[validationErrorKey]=isValid` so that it is available for data-binding.
-             *        The `validationErrorKey` should be in camelCase and will get converted into dash-case
-             *        for class name. Example: `myError` will result in `ng-valid-my-error` and `ng-invalid-my-error`
-             *        class and can be bound to as  `{{someForm.someControl.$error.myError}}` .
-             * @param {boolean} isValid Whether the current state is valid (true) or invalid (false).
-             */
-            this.$setValidity = function(validationErrorKey, isValid) {
-                // Purposeful use of ! here to cast isValid to boolean in case it is undefined
-                // jshint -W018
-                if ($error[validationErrorKey] === !isValid) return;
-                // jshint +W018
-
-                if (isValid) {
-                    if ($error[validationErrorKey]) invalidCount--;
-                    if (!invalidCount) {
-                        toggleValidCss(true);
-                        this.$valid = true;
-                        this.$invalid = false;
-                    }
-                } else {
-                    toggleValidCss(false);
-                    this.$invalid = true;
-                    this.$valid = false;
-                    invalidCount++;
-                }
-
-                $error[validationErrorKey] = !isValid;
-                toggleValidCss(isValid, validationErrorKey);
-
-                parentForm.$setValidity(validationErrorKey, isValid, this);
-            };
-
-            /**
-             * @ngdoc method
-             * @name ngModel.NgModelController#$setPristine
-             *
-             * @description
-             * Sets the control to its pristine state.
-             *
-             * This method can be called to remove the 'ng-dirty' class and set the control to its pristine
-             * state (ng-pristine class).
-             */
-            this.$setPristine = function () {
-                this.$dirty = false;
-                this.$pristine = true;
-                $animate.removeClass($element, DIRTY_CLASS);
-                $animate.addClass($element, PRISTINE_CLASS);
-            };
 
-            /**
-             * @ngdoc method
-             * @name ngModel.NgModelController#$setViewValue
-             *
-             * @description
-             * Update the view value.
-             *
-             * This method should be called when the view value changes, typically from within a DOM event handler.
-             * For example {@link ng.directive:input input} and
-             * {@link ng.directive:select select} directives call it.
-             *
-             * It will update the $viewValue, then pass this value through each of the functions in `$parsers`,
-             * which includes any validators. The value that comes out of this `$parsers` pipeline, be applied to
-             * `$modelValue` and the **expression** specified in the `ng-model` attribute.
-             *
-             * Lastly, all the registered change listeners, in the `$viewChangeListeners` list, are called.
-             *
-             * Note that calling this function does not trigger a `$digest`.
-             *
-             * @param {string} value Value from the view.
-             */
-            this.$setViewValue = function(value) {
-                this.$viewValue = value;
-
-                // change to dirty
-                if (this.$pristine) {
-                    this.$dirty = true;
-                    this.$pristine = false;
-                    $animate.removeClass($element, PRISTINE_CLASS);
-                    $animate.addClass($element, DIRTY_CLASS);
-                    parentForm.$setDirty();
-                }
 
-                forEach(this.$parsers, function(fn) {
-                    value = fn(value);
-                });
-
-                if (this.$modelValue !== value) {
-                    this.$modelValue = value;
-                    ngModelSet($scope, value);
-                    forEach(this.$viewChangeListeners, function(listener) {
-                        try {
-                            listener();
-                        } catch(e) {
-                            $exceptionHandler(e);
-                        }
-                    });
-                }
-            };
+    /**
+     * @ngdoc directive
+     * @name ngMousemove
+     * @restrict A
+     * @element ANY
+     * @priority 0
+     *
+     * @description
+     * Specify custom behavior on mousemove event.
+     *
+     * @param {expression} ngMousemove {@link guide/expression Expression} to evaluate upon
+     * mousemove. ({@link guide/expression#-event- Event object is available as `$event`})
+     *
+     * @example
+     <example name="ng-mousemove">
+     <file name="index.html">
+     <button ng-mousemove="count = count + 1" ng-init="count=0">
+     Increment (when mouse moves)
+     </button>
+     count: {{count}}
+     </file>
+     </example>
+     */
 
-            // model -> value
-            var ctrl = this;
 
-            $scope.$watch(function ngModelWatch() {
-                var value = ngModelGet($scope);
+    /**
+     * @ngdoc directive
+     * @name ngKeydown
+     * @restrict A
+     * @element ANY
+     * @priority 0
+     *
+     * @description
+     * Specify custom behavior on keydown event.
+     *
+     * @param {expression} ngKeydown {@link guide/expression Expression} to evaluate upon
+     * keydown. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
+     *
+     * @example
+     <example name="ng-keydown">
+     <file name="index.html">
+     <input ng-keydown="count = count + 1" ng-init="count=0">
+     key down count: {{count}}
+     </file>
+     </example>
+     */
 
-                // if scope model value and ngModel value are out of sync
-                if (ctrl.$modelValue !== value) {
 
-                    var formatters = ctrl.$formatters,
-                        idx = formatters.length;
+    /**
+     * @ngdoc directive
+     * @name ngKeyup
+     * @restrict A
+     * @element ANY
+     * @priority 0
+     *
+     * @description
+     * Specify custom behavior on keyup event.
+     *
+     * @param {expression} ngKeyup {@link guide/expression Expression} to evaluate upon
+     * keyup. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
+     *
+     * @example
+     <example name="ng-keyup">
+     <file name="index.html">
+     <p>Typing in the input box below updates the key count</p>
+     <input ng-keyup="count = count + 1" ng-init="count=0"> key up count: {{count}}
 
-                    ctrl.$modelValue = value;
-                    while(idx--) {
-                        value = formatters[idx](value);
-                    }
+     <p>Typing in the input box below updates the keycode</p>
+     <input ng-keyup="event=$event">
+     <p>event keyCode: {{ event.keyCode }}</p>
+     <p>event altKey: {{ event.altKey }}</p>
+     </file>
+     </example>
+     */
 
-                    if (ctrl.$viewValue !== value) {
-                        ctrl.$viewValue = value;
-                        ctrl.$render();
-                    }
-                }
 
-                return value;
-            });
-        }];
+    /**
+     * @ngdoc directive
+     * @name ngKeypress
+     * @restrict A
+     * @element ANY
+     *
+     * @description
+     * Specify custom behavior on keypress event.
+     *
+     * @param {expression} ngKeypress {@link guide/expression Expression} to evaluate upon
+     * keypress. ({@link guide/expression#-event- Event object is available as `$event`}
+     * and can be interrogated for keyCode, altKey, etc.)
+     *
+     * @example
+     <example name="ng-keypress">
+     <file name="index.html">
+     <input ng-keypress="count = count + 1" ng-init="count=0">
+     key press count: {{count}}
+     </file>
+     </example>
+     */
 
 
     /**
      * @ngdoc directive
-     * @name ngModel
-     *
-     * @element input
+     * @name ngSubmit
+     * @restrict A
+     * @element form
+     * @priority 0
      *
      * @description
-     * The `ngModel` directive binds an `input`,`select`, `textarea` (or custom form control) to a
-     * property on the scope using {@link ngModel.NgModelController NgModelController},
-     * which is created and exposed by this directive.
+     * Enables binding AngularJS expressions to onsubmit events.
      *
-     * `ngModel` is responsible for:
+     * Additionally it prevents the default action (which for form means sending the request to the
+     * server and reloading the current page), but only if the form does not contain `action`,
+     * `data-action`, or `x-action` attributes.
      *
-     * - Binding the view into the model, which other directives such as `input`, `textarea` or `select`
-     *   require.
-     * - Providing validation behavior (i.e. required, number, email, url).
-     * - Keeping the state of the control (valid/invalid, dirty/pristine, validation errors).
-     * - Setting related css classes on the element (`ng-valid`, `ng-invalid`, `ng-dirty`, `ng-pristine`) including animations.
-     * - Registering the control with its parent {@link ng.directive:form form}.
+     * <div class="alert alert-warning">
+     * **Warning:** Be careful not to cause "double-submission" by using both the `ngClick` and
+     * `ngSubmit` handlers together. See the
+     * {@link form#submitting-a-form-and-preventing-the-default-action `form` directive documentation}
+     * for a detailed discussion of when `ngSubmit` may be triggered.
+     * </div>
      *
-     * Note: `ngModel` will try to bind to the property given by evaluating the expression on the
-     * current scope. If the property doesn't already exist on this scope, it will be created
-     * implicitly and added to the scope.
+     * @param {expression} ngSubmit {@link guide/expression Expression} to eval.
+     * ({@link guide/expression#-event- Event object is available as `$event`})
      *
-     * For best practices on using `ngModel`, see:
+     * @example
+     <example module="submitExample" name="ng-submit">
+     <file name="index.html">
+     <script>
+     angular.module('submitExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+            $scope.list = [];
+            $scope.text = 'hello';
+            $scope.submit = function() {
+              if ($scope.text) {
+                $scope.list.push(this.text);
+                $scope.text = '';
+              }
+            };
+          }]);
+     </script>
+     <form ng-submit="submit()" ng-controller="ExampleController">
+     Enter text and hit enter:
+     <input type="text" ng-model="text" name="text" />
+     <input type="submit" id="submit" value="Submit" />
+     <pre>list={{list}}</pre>
+     </form>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check ng-submit', function() {
+         expect(element(by.binding('list')).getText()).toBe('list=[]');
+         element(by.css('#submit')).click();
+         expect(element(by.binding('list')).getText()).toContain('hello');
+         expect(element(by.model('text')).getAttribute('value')).toBe('');
+       });
+     it('should ignore empty strings', function() {
+         expect(element(by.binding('list')).getText()).toBe('list=[]');
+         element(by.css('#submit')).click();
+         element(by.css('#submit')).click();
+         expect(element(by.binding('list')).getText()).toContain('hello');
+        });
+     </file>
+     </example>
+     */
+
+    /**
+     * @ngdoc directive
+     * @name ngFocus
+     * @restrict A
+     * @element window, input, select, textarea, a
+     * @priority 0
      *
-     *  - [https://github.com/angular/angular.js/wiki/Understanding-Scopes]
+     * @description
+     * Specify custom behavior on focus event.
      *
-     * For basic examples, how to use `ngModel`, see:
+     * Note: As the `focus` event is executed synchronously when calling `input.focus()`
+     * AngularJS executes the expression using `scope.$evalAsync` if the event is fired
+     * during an `$apply` to ensure a consistent state.
      *
-     *  - {@link ng.directive:input input}
-     *    - {@link input[text] text}
-     *    - {@link input[checkbox] checkbox}
-     *    - {@link input[radio] radio}
-     *    - {@link input[number] number}
-     *    - {@link input[email] email}
-     *    - {@link input[url] url}
-     *  - {@link ng.directive:select select}
-     *  - {@link ng.directive:textarea textarea}
+     * @param {expression} ngFocus {@link guide/expression Expression} to evaluate upon
+     * focus. ({@link guide/expression#-event- Event object is available as `$event`})
      *
-     * # CSS classes
-     * The following CSS classes are added and removed on the associated input/select/textarea element
-     * depending on the validity of the model.
+     * @example
+     * See {@link ng.directive:ngClick ngClick}
+     */
+
+    /**
+     * @ngdoc directive
+     * @name ngBlur
+     * @restrict A
+     * @element window, input, select, textarea, a
+     * @priority 0
      *
-     *  - `ng-valid` is set if the model is valid.
-     *  - `ng-invalid` is set if the model is invalid.
-     *  - `ng-pristine` is set if the model is pristine.
-     *  - `ng-dirty` is set if the model is dirty.
+     * @description
+     * Specify custom behavior on blur event.
      *
-     * Keep in mind that ngAnimate can detect each of these classes when added and removed.
+     * A [blur event](https://developer.mozilla.org/en-US/docs/Web/Events/blur) fires when
+     * an element has lost focus.
      *
-     * ## Animation Hooks
+     * Note: As the `blur` event is executed synchronously also during DOM manipulations
+     * (e.g. removing a focussed input),
+     * AngularJS executes the expression using `scope.$evalAsync` if the event is fired
+     * during an `$apply` to ensure a consistent state.
      *
-     * Animations within models are triggered when any of the associated CSS classes are added and removed
-     * on the input element which is attached to the model. These classes are: `.ng-pristine`, `.ng-dirty`,
-     * `.ng-invalid` and `.ng-valid` as well as any other validations that are performed on the model itself.
-     * The animations that are triggered within ngModel are similar to how they work in ngClass and
-     * animations can be hooked into using CSS transitions, keyframes as well as JS animations.
+     * @param {expression} ngBlur {@link guide/expression Expression} to evaluate upon
+     * blur. ({@link guide/expression#-event- Event object is available as `$event`})
      *
-     * The following example shows a simple way to utilize CSS transitions to style an input element
-     * that has been rendered as invalid after it has been validated:
+     * @example
+     * See {@link ng.directive:ngClick ngClick}
+     */
+
+    /**
+     * @ngdoc directive
+     * @name ngCopy
+     * @restrict A
+     * @element window, input, select, textarea, a
+     * @priority 0
      *
-     * <pre>
-     * //be sure to include ngAnimate as a module to hook into more
-     * //advanced animations
-     * .my-input {
- *   transition:0.5s linear all;
- *   background: white;
- * }
-     * .my-input.ng-invalid {
- *   background: red;
- *   color:white;
- * }
-     * </pre>
+     * @description
+     * Specify custom behavior on copy event.
+     *
+     * @param {expression} ngCopy {@link guide/expression Expression} to evaluate upon
+     * copy. ({@link guide/expression#-event- Event object is available as `$event`})
      *
      * @example
-     * <example deps="angular-animate.js" animations="true" fixBase="true">
+     <example name="ng-copy">
      <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-          $scope.val = '1';
-        }
-     </script>
-     <style>
-     .my-input {
-           -webkit-transition:all linear 0.5s;
-           transition:all linear 0.5s;
-           background: transparent;
-         }
-     .my-input.ng-invalid {
-           color:white;
-           background: red;
-         }
-     </style>
-     Update input to see transitions when valid/invalid.
-     Integer is a valid value.
-     <form name="testForm" ng-controller="Ctrl">
-     <input ng-model="val" ng-pattern="/^\d+$/" name="anim" class="my-input" />
-     </form>
+     <input ng-copy="copied=true" ng-init="copied=false; value='copy me'" ng-model="value">
+     copied: {{copied}}
      </file>
-     * </example>
+     </example>
      */
-    var ngModelDirective = function() {
-        return {
-            require: ['ngModel', '^?form'],
-            controller: NgModelController,
-            link: function(scope, element, attr, ctrls) {
-                // notify others, especially parent forms
-
-                var modelCtrl = ctrls[0],
-                    formCtrl = ctrls[1] || nullFormCtrl;
 
-                formCtrl.$addControl(modelCtrl);
-
-                scope.$on('$destroy', function() {
-                    formCtrl.$removeControl(modelCtrl);
-                });
-            }
-        };
-    };
+    /**
+     * @ngdoc directive
+     * @name ngCut
+     * @restrict A
+     * @element window, input, select, textarea, a
+     * @priority 0
+     *
+     * @description
+     * Specify custom behavior on cut event.
+     *
+     * @param {expression} ngCut {@link guide/expression Expression} to evaluate upon
+     * cut. ({@link guide/expression#-event- Event object is available as `$event`})
+     *
+     * @example
+     <example name="ng-cut">
+     <file name="index.html">
+     <input ng-cut="cut=true" ng-init="cut=false; value='cut me'" ng-model="value">
+     cut: {{cut}}
+     </file>
+     </example>
+     */
 
+    /**
+     * @ngdoc directive
+     * @name ngPaste
+     * @restrict A
+     * @element window, input, select, textarea, a
+     * @priority 0
+     *
+     * @description
+     * Specify custom behavior on paste event.
+     *
+     * @param {expression} ngPaste {@link guide/expression Expression} to evaluate upon
+     * paste. ({@link guide/expression#-event- Event object is available as `$event`})
+     *
+     * @example
+     <example name="ng-paste">
+     <file name="index.html">
+     <input ng-paste="paste=true" ng-init="paste=false" placeholder='paste here'>
+     pasted: {{paste}}
+     </file>
+     </example>
+     */
 
     /**
      * @ngdoc directive
-     * @name ngChange
+     * @name ngIf
+     * @restrict A
+     * @multiElement
      *
      * @description
-     * Evaluate the given expression when the user changes the input.
-     * The expression is evaluated immediately, unlike the JavaScript onchange event
-     * which only triggers at the end of a change (usually, when the user leaves the
-     * form element or presses the return key).
-     * The expression is not evaluated when the value change is coming from the model.
+     * The `ngIf` directive removes or recreates a portion of the DOM tree based on an
+     * {expression}. If the expression assigned to `ngIf` evaluates to a false
+     * value then the element is removed from the DOM, otherwise a clone of the
+     * element is reinserted into the DOM.
+     *
+     * `ngIf` differs from `ngShow` and `ngHide` in that `ngIf` completely removes and recreates the
+     * element in the DOM rather than changing its visibility via the `display` css property.  A common
+     * case when this difference is significant is when using css selectors that rely on an element's
+     * position within the DOM, such as the `:first-child` or `:last-child` pseudo-classes.
      *
-     * Note, this directive requires `ngModel` to be present.
+     * Note that when an element is removed using `ngIf` its scope is destroyed and a new scope
+     * is created when the element is restored.  The scope created within `ngIf` inherits from
+     * its parent scope using
+     * [prototypal inheritance](https://github.com/angular/angular.js/wiki/Understanding-Scopes#javascript-prototypal-inheritance).
+     * An important implication of this is if `ngModel` is used within `ngIf` to bind to
+     * a javascript primitive defined in the parent scope. In this case any modifications made to the
+     * variable within the child scope will override (hide) the value in the parent scope.
      *
-     * @element input
-     * @param {expression} ngChange {@link guide/expression Expression} to evaluate upon change
-     * in input value.
+     * Also, `ngIf` recreates elements using their compiled state. An example of this behavior
+     * is if an element's class attribute is directly modified after it's compiled, using something like
+     * jQuery's `.addClass()` method, and the element is later removed. When `ngIf` recreates the element
+     * the added class will be lost because the original compiled state is used to regenerate the element.
      *
-     * @example
-     * <example name="ngChange-directive">
-     *   <file name="index.html">
-     *     <script>
-     *       function Controller($scope) {
- *         $scope.counter = 0;
- *         $scope.change = function() {
- *           $scope.counter++;
- *         };
- *       }
-     *     </script>
-     *     <div ng-controller="Controller">
-     *       <input type="checkbox" ng-model="confirmed" ng-change="change()" id="ng-change-example1" />
-     *       <input type="checkbox" ng-model="confirmed" id="ng-change-example2" />
-     *       <label for="ng-change-example2">Confirmed</label><br />
-     *       <tt>debug = {{confirmed}}</tt><br/>
-     *       <tt>counter = {{counter}}</tt><br/>
-     *     </div>
-     *   </file>
-     *   <file name="protractor.js" type="protractor">
-     *     var counter = element(by.binding('counter'));
-     *     var debug = element(by.binding('confirmed'));
+     * Additionally, you can provide animations via the `ngAnimate` module to animate the `enter`
+     * and `leave` effects.
      *
-     *     it('should evaluate the expression if changing from view', function() {
- *       expect(counter.getText()).toContain('0');
- *
- *       element(by.id('ng-change-example1')).click();
- *
- *       expect(counter.getText()).toContain('1');
- *       expect(debug.getText()).toContain('true');
- *     });
+     * @animations
+     * | Animation                        | Occurs                               |
+     * |----------------------------------|-------------------------------------|
+     * | {@link ng.$animate#enter enter}  | just after the `ngIf` contents change and a new DOM element is created and injected into the `ngIf` container |
+     * | {@link ng.$animate#leave leave}  | just before the `ngIf` contents are removed from the DOM |
      *
-     *     it('should not evaluate the expression if changing from model', function() {
- *       element(by.id('ng-change-example2')).click();
+     * @element ANY
+     * @scope
+     * @priority 600
+     * @param {expression} ngIf If the {@link guide/expression expression} is falsy then
+     *     the element is removed from the DOM tree. If it is truthy a copy of the compiled
+     *     element is added to the DOM tree.
+     *
+     * @example
+     <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-if">
+     <file name="index.html">
+     <label>Click me: <input type="checkbox" ng-model="checked" ng-init="checked=true" /></label><br/>
+     Show when checked:
+     <span ng-if="checked" class="animate-if">
+     This is removed when the checkbox is unchecked.
+     </span>
+     </file>
+     <file name="animations.css">
+     .animate-if {
+        background:white;
+        border:1px solid black;
+        padding:10px;
+      }
 
- *       expect(counter.getText()).toContain('0');
- *       expect(debug.getText()).toContain('true');
- *     });
-     *   </file>
-     * </example>
-     */
-    var ngChangeDirective = valueFn({
-        require: 'ngModel',
-        link: function(scope, element, attr, ctrl) {
-            ctrl.$viewChangeListeners.push(function() {
-                scope.$eval(attr.ngChange);
-            });
-        }
-    });
+     .animate-if.ng-enter, .animate-if.ng-leave {
+        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+      }
 
+     .animate-if.ng-enter,
+     .animate-if.ng-leave.ng-leave-active {
+        opacity:0;
+      }
 
-    var requiredDirective = function() {
+     .animate-if.ng-leave,
+     .animate-if.ng-enter.ng-enter-active {
+        opacity:1;
+      }
+     </file>
+     </example>
+     */
+    var ngIfDirective = ['$animate', '$compile', function($animate, $compile) {
         return {
-            require: '?ngModel',
-            link: function(scope, elm, attr, ctrl) {
-                if (!ctrl) return;
-                attr.required = true; // force truthy in case we are on non input element
+            multiElement: true,
+            transclude: 'element',
+            priority: 600,
+            terminal: true,
+            restrict: 'A',
+            $$tlb: true,
+            link: function($scope, $element, $attr, ctrl, $transclude) {
+                var block, childScope, previousElements;
+                $scope.$watch($attr.ngIf, function ngIfWatchAction(value) {
 
-                var validator = function(value) {
-                    if (attr.required && ctrl.$isEmpty(value)) {
-                        ctrl.$setValidity('required', false);
-                        return;
+                    if (value) {
+                        if (!childScope) {
+                            $transclude(function(clone, newScope) {
+                                childScope = newScope;
+                                clone[clone.length++] = $compile.$$createComment('end ngIf', $attr.ngIf);
+                                // Note: We only need the first/last node of the cloned nodes.
+                                // However, we need to keep the reference to the jqlite wrapper as it might be changed later
+                                // by a directive with templateUrl when its template arrives.
+                                block = {
+                                    clone: clone
+                                };
+                                $animate.enter(clone, $element.parent(), $element);
+                            });
+                        }
                     } else {
-                        ctrl.$setValidity('required', true);
-                        return value;
+                        if (previousElements) {
+                            previousElements.remove();
+                            previousElements = null;
+                        }
+                        if (childScope) {
+                            childScope.$destroy();
+                            childScope = null;
+                        }
+                        if (block) {
+                            previousElements = getBlockNodes(block.clone);
+                            $animate.leave(previousElements).done(function(response) {
+                                if (response !== false) previousElements = null;
+                            });
+                            block = null;
+                        }
                     }
-                };
-
-                ctrl.$formatters.push(validator);
-                ctrl.$parsers.unshift(validator);
-
-                attr.$observe('required', function() {
-                    validator(ctrl.$viewValue);
                 });
             }
         };
-    };
-
+    }];
 
     /**
      * @ngdoc directive
-     * @name ngList
+     * @name ngInclude
+     * @restrict ECA
+     * @scope
+     * @priority -400
      *
      * @description
-     * Text input that converts between a delimited string and an array of strings. The delimiter
-     * can be a fixed string (by default a comma) or a regular expression.
+     * Fetches, compiles and includes an external HTML fragment.
+     *
+     * By default, the template URL is restricted to the same domain and protocol as the
+     * application document. This is done by calling {@link $sce#getTrustedResourceUrl
+ * $sce.getTrustedResourceUrl} on it. To load templates from other domains or protocols
+     * you may either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist them} or
+     * {@link $sce#trustAsResourceUrl wrap them} as trusted values. Refer to AngularJS's {@link
+        * ng.$sce Strict Contextual Escaping}.
+     *
+     * In addition, the browser's
+     * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest)
+     * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/)
+     * policy may further restrict whether the template is successfully loaded.
+     * For example, `ngInclude` won't work for cross-domain requests on all browsers and for `file://`
+     * access on some browsers.
+     *
+     * @animations
+     * | Animation                        | Occurs                              |
+     * |----------------------------------|-------------------------------------|
+     * | {@link ng.$animate#enter enter}  | when the expression changes, on the new include |
+     * | {@link ng.$animate#leave leave}  | when the expression changes, on the old include |
+     *
+     * The enter and leave animation occur concurrently.
+     *
+     * @param {string} ngInclude|src AngularJS expression evaluating to URL. If the source is a string constant,
+     *                 make sure you wrap it in **single** quotes, e.g. `src="'myPartialTemplate.html'"`.
+     * @param {string=} onload Expression to evaluate when a new partial is loaded.
+     *                  <div class="alert alert-warning">
+     *                  **Note:** When using onload on SVG elements in IE11, the browser will try to call
+     *                  a function with the name on the window element, which will usually throw a
+     *                  "function is undefined" error. To fix this, you can instead use `data-onload` or a
+     *                  different form that {@link guide/directive#normalization matches} `onload`.
+     *                  </div>
      *
-     * @element input
-     * @param {string=} ngList optional delimiter that should be used to split the value. If
-     *   specified in form `/something/` then the value will be converted into a regular expression.
+     * @param {string=} autoscroll Whether `ngInclude` should call {@link ng.$anchorScroll
+ *                  $anchorScroll} to scroll the viewport after the content is loaded.
+     *
+     *                  - If the attribute is not set, disable scrolling.
+     *                  - If the attribute is set without value, enable scrolling.
+     *                  - Otherwise enable scrolling only if the expression evaluates to truthy value.
      *
      * @example
-     <example name="ngList-directive">
+     <example module="includeExample" deps="angular-animate.js" animations="true" name="ng-include">
      <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-           $scope.names = ['igor', 'misko', 'vojta'];
-         }
-     </script>
-     <form name="myForm" ng-controller="Ctrl">
-     List: <input name="namesInput" ng-model="names" ng-list required>
-     <span class="error" ng-show="myForm.namesInput.$error.required">
-     Required!</span>
-     <br>
-     <tt>names = {{names}}</tt><br/>
-     <tt>myForm.namesInput.$valid = {{myForm.namesInput.$valid}}</tt><br/>
-     <tt>myForm.namesInput.$error = {{myForm.namesInput.$error}}</tt><br/>
-     <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
-     <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
-     </form>
+     <div ng-controller="ExampleController">
+     <select ng-model="template" ng-options="t.name for t in templates">
+     <option value="">(blank)</option>
+     </select>
+     url of the template: <code>{{template.url}}</code>
+     <hr/>
+     <div class="slide-animate-container">
+     <div class="slide-animate" ng-include="template.url"></div>
+     </div>
+     </div>
+     </file>
+     <file name="script.js">
+     angular.module('includeExample', ['ngAnimate'])
+     .controller('ExampleController', ['$scope', function($scope) {
+          $scope.templates =
+            [{ name: 'template1.html', url: 'template1.html'},
+             { name: 'template2.html', url: 'template2.html'}];
+          $scope.template = $scope.templates[0];
+        }]);
+     </file>
+     <file name="template1.html">
+     Content of template1.html
+     </file>
+     <file name="template2.html">
+     Content of template2.html
+     </file>
+     <file name="animations.css">
+     .slide-animate-container {
+        position:relative;
+        background:white;
+        border:1px solid black;
+        height:40px;
+        overflow:hidden;
+      }
+
+     .slide-animate {
+        padding:10px;
+      }
+
+     .slide-animate.ng-enter, .slide-animate.ng-leave {
+        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+
+        position:absolute;
+        top:0;
+        left:0;
+        right:0;
+        bottom:0;
+        display:block;
+        padding:10px;
+      }
+
+     .slide-animate.ng-enter {
+        top:-50px;
+      }
+     .slide-animate.ng-enter.ng-enter-active {
+        top:0;
+      }
+
+     .slide-animate.ng-leave {
+        top:0;
+      }
+     .slide-animate.ng-leave.ng-leave-active {
+        top:50px;
+      }
      </file>
      <file name="protractor.js" type="protractor">
-     var listInput = element(by.model('names'));
-     var names = element(by.binding('{{names}}'));
-     var valid = element(by.binding('myForm.namesInput.$valid'));
-     var error = element(by.css('span.error'));
+     var templateSelect = element(by.model('template'));
+     var includeElem = element(by.css('[ng-include]'));
 
-     it('should initialize to model', function() {
-          expect(names.getText()).toContain('["igor","misko","vojta"]');
-          expect(valid.getText()).toContain('true');
-          expect(error.getCssValue('display')).toBe('none');
-        });
+     it('should load template1.html', function() {
+        expect(includeElem.getText()).toMatch(/Content of template1.html/);
+      });
 
-     it('should be invalid if empty', function() {
-          listInput.clear();
-          listInput.sendKeys('');
+     it('should load template2.html', function() {
+        if (browser.params.browser === 'firefox') {
+          // Firefox can't handle using selects
+          // See https://github.com/angular/protractor/issues/480
+          return;
+        }
+        templateSelect.click();
+        templateSelect.all(by.css('option')).get(2).click();
+        expect(includeElem.getText()).toMatch(/Content of template2.html/);
+      });
 
-          expect(names.getText()).toContain('');
-          expect(valid.getText()).toContain('false');
-          expect(error.getCssValue('display')).not.toBe('none');        });
+     it('should change to blank', function() {
+        if (browser.params.browser === 'firefox') {
+          // Firefox can't handle using selects
+          return;
+        }
+        templateSelect.click();
+        templateSelect.all(by.css('option')).get(0).click();
+        expect(includeElem.isPresent()).toBe(false);
+      });
      </file>
      </example>
      */
-    var ngListDirective = function() {
-        return {
-            require: 'ngModel',
-            link: function(scope, element, attr, ctrl) {
-                var match = /\/(.*)\//.exec(attr.ngList),
-                    separator = match && new RegExp(match[1]) || attr.ngList || ',';
 
-                var parse = function(viewValue) {
-                    // If the viewValue is invalid (say required but empty) it will be `undefined`
-                    if (isUndefined(viewValue)) return;
 
-                    var list = [];
+    /**
+     * @ngdoc event
+     * @name ngInclude#$includeContentRequested
+     * @eventType emit on the scope ngInclude was declared in
+     * @description
+     * Emitted every time the ngInclude content is requested.
+     *
+     * @param {Object} angularEvent Synthetic event object.
+     * @param {String} src URL of content to load.
+     */
+
+
+    /**
+     * @ngdoc event
+     * @name ngInclude#$includeContentLoaded
+     * @eventType emit on the current ngInclude scope
+     * @description
+     * Emitted every time the ngInclude content is reloaded.
+     *
+     * @param {Object} angularEvent Synthetic event object.
+     * @param {String} src URL of content to load.
+     */
+
+
+    /**
+     * @ngdoc event
+     * @name ngInclude#$includeContentError
+     * @eventType emit on the scope ngInclude was declared in
+     * @description
+     * Emitted when a template HTTP request yields an erroneous response (status < 200 || status > 299)
+     *
+     * @param {Object} angularEvent Synthetic event object.
+     * @param {String} src URL of content to load.
+     */
+    var ngIncludeDirective = ['$templateRequest', '$anchorScroll', '$animate',
+        function($templateRequest,   $anchorScroll,   $animate) {
+            return {
+                restrict: 'ECA',
+                priority: 400,
+                terminal: true,
+                transclude: 'element',
+                controller: angular.noop,
+                compile: function(element, attr) {
+                    var srcExp = attr.ngInclude || attr.src,
+                        onloadExp = attr.onload || '',
+                        autoScrollExp = attr.autoscroll;
 
-                    if (viewValue) {
-                        forEach(viewValue.split(separator), function(value) {
-                            if (value) list.push(trim(value));
-                        });
-                    }
+                    return function(scope, $element, $attr, ctrl, $transclude) {
+                        var changeCounter = 0,
+                            currentScope,
+                            previousElement,
+                            currentElement;
 
-                    return list;
-                };
+                        var cleanupLastIncludeContent = function() {
+                            if (previousElement) {
+                                previousElement.remove();
+                                previousElement = null;
+                            }
+                            if (currentScope) {
+                                currentScope.$destroy();
+                                currentScope = null;
+                            }
+                            if (currentElement) {
+                                $animate.leave(currentElement).done(function(response) {
+                                    if (response !== false) previousElement = null;
+                                });
+                                previousElement = currentElement;
+                                currentElement = null;
+                            }
+                        };
 
-                ctrl.$parsers.push(parse);
-                ctrl.$formatters.push(function(value) {
-                    if (isArray(value)) {
-                        return value.join(', ');
-                    }
+                        scope.$watch(srcExp, function ngIncludeWatchAction(src) {
+                            var afterAnimation = function(response) {
+                                if (response !== false && isDefined(autoScrollExp) &&
+                                    (!autoScrollExp || scope.$eval(autoScrollExp))) {
+                                    $anchorScroll();
+                                }
+                            };
+                            var thisChangeId = ++changeCounter;
 
-                    return undefined;
-                });
+                            if (src) {
+                                //set the 2nd param to true to ignore the template request error so that the inner
+                                //contents and scope can be cleaned up.
+                                $templateRequest(src, true).then(function(response) {
+                                    if (scope.$$destroyed) return;
 
-                // Override the standard $isEmpty because an empty array means the input is empty.
-                ctrl.$isEmpty = function(value) {
-                    return !value || !value.length;
-                };
-            }
-        };
-    };
+                                    if (thisChangeId !== changeCounter) return;
+                                    var newScope = scope.$new();
+                                    ctrl.template = response;
 
+                                    // Note: This will also link all children of ng-include that were contained in the original
+                                    // html. If that content contains controllers, ... they could pollute/change the scope.
+                                    // However, using ng-include on an element with additional content does not make sense...
+                                    // Note: We can't remove them in the cloneAttchFn of $transclude as that
+                                    // function is called before linking the content, which would apply child
+                                    // directives to non existing elements.
+                                    var clone = $transclude(newScope, function(clone) {
+                                        cleanupLastIncludeContent();
+                                        $animate.enter(clone, null, $element).done(afterAnimation);
+                                    });
 
-    var CONSTANT_VALUE_REGEXP = /^(true|false|\d+)$/;
-    /**
-     * @ngdoc directive
-     * @name ngValue
-     *
-     * @description
-     * Binds the given expression to the value of `input[select]` or `input[radio]`, so
-     * that when the element is selected, the `ngModel` of that element is set to the
-     * bound value.
-     *
-     * `ngValue` is useful when dynamically generating lists of radio buttons using `ng-repeat`, as
-     * shown below.
-     *
-     * @element input
-     * @param {string=} ngValue angular expression, whose value will be bound to the `value` attribute
-     *   of the `input` element
-     *
-     * @example
-     <example name="ngValue-directive">
-     <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-            $scope.names = ['pizza', 'unicorns', 'robots'];
-            $scope.my = { favorite: 'unicorns' };
-          }
-     </script>
-     <form ng-controller="Ctrl">
-     <h2>Which is your favorite?</h2>
-     <label ng-repeat="name in names" for="{{name}}">
-     {{name}}
-     <input type="radio"
-     ng-model="my.favorite"
-     ng-value="name"
-     id="{{name}}"
-     name="favorite">
-     </label>
-     <div>You chose {{my.favorite}}</div>
-     </form>
-     </file>
-     <file name="protractor.js" type="protractor">
-     var favorite = element(by.binding('my.favorite'));
+                                    currentScope = newScope;
+                                    currentElement = clone;
 
-     it('should initialize to model', function() {
-          expect(favorite.getText()).toContain('unicorns');
-        });
-     it('should bind the values to the inputs', function() {
-          element.all(by.model('my.favorite')).get(0).click();
-          expect(favorite.getText()).toContain('pizza');
-        });
-     </file>
-     </example>
-     */
-    var ngValueDirective = function() {
-        return {
-            priority: 100,
-            compile: function(tpl, tplAttr) {
-                if (CONSTANT_VALUE_REGEXP.test(tplAttr.ngValue)) {
-                    return function ngValueConstantLink(scope, elm, attr) {
-                        attr.$set('value', scope.$eval(attr.ngValue));
-                    };
-                } else {
-                    return function ngValueLink(scope, elm, attr) {
-                        scope.$watch(attr.ngValue, function valueWatchAction(value) {
-                            attr.$set('value', value);
+                                    currentScope.$emit('$includeContentLoaded', src);
+                                    scope.$eval(onloadExp);
+                                }, function() {
+                                    if (scope.$$destroyed) return;
+
+                                    if (thisChangeId === changeCounter) {
+                                        cleanupLastIncludeContent();
+                                        scope.$emit('$includeContentError', src);
+                                    }
+                                });
+                                scope.$emit('$includeContentRequested', src);
+                            } else {
+                                cleanupLastIncludeContent();
+                                ctrl.template = null;
+                            }
                         });
                     };
                 }
-            }
-        };
-    };
+            };
+        }];
+
+// This directive is called during the $transclude call of the first `ngInclude` directive.
+// It will replace and compile the content of the element with the loaded template.
+// We need this directive so that the element content is already filled when
+// the link function of another directive on the same element as ngInclude
+// is called.
+    var ngIncludeFillContentDirective = ['$compile',
+        function($compile) {
+            return {
+                restrict: 'ECA',
+                priority: -400,
+                require: 'ngInclude',
+                link: function(scope, $element, $attr, ctrl) {
+                    if (toString.call($element[0]).match(/SVG/)) {
+                        // WebKit: https://bugs.webkit.org/show_bug.cgi?id=135698 --- SVG elements do not
+                        // support innerHTML, so detect this here and try to generate the contents
+                        // specially.
+                        $element.empty();
+                        $compile(jqLiteBuildFragment(ctrl.template, window.document).childNodes)(scope,
+                            function namespaceAdaptedClone(clone) {
+                                $element.append(clone);
+                            }, {futureParentElement: $element});
+                        return;
+                    }
+
+                    $element.html(ctrl.template);
+                    $compile($element.contents())(scope);
+                }
+            };
+        }];
 
     /**
      * @ngdoc directive
-     * @name ngBind
+     * @name ngInit
      * @restrict AC
-     *
-     * @description
-     * The `ngBind` attribute tells Angular to replace the text content of the specified HTML element
-     * with the value of a given expression, and to update the text content when the value of that
-     * expression changes.
-     *
-     * Typically, you don't use `ngBind` directly, but instead you use the double curly markup like
-     * `{{ expression }}` which is similar but less verbose.
-     *
-     * It is preferable to use `ngBind` instead of `{{ expression }}` when a template is momentarily
-     * displayed by the browser in its raw state before Angular compiles it. Since `ngBind` is an
-     * element attribute, it makes the bindings invisible to the user while the page is loading.
-     *
-     * An alternative solution to this problem would be using the
-     * {@link ng.directive:ngCloak ngCloak} directive.
-     *
-     *
+     * @priority 450
      * @element ANY
-     * @param {expression} ngBind {@link guide/expression Expression} to evaluate.
      *
-     * @example
-     * Enter a name in the Live Preview text box; the greeting below the text box changes instantly.
-     <example>
-     <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-           $scope.name = 'Whirled';
-         }
-     </script>
-     <div ng-controller="Ctrl">
-     Enter name: <input type="text" ng-model="name"><br>
-     Hello <span ng-bind="name"></span>!
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check ng-bind', function() {
-         var nameInput = element(by.model('name'));
-
-         expect(element(by.binding('name')).getText()).toBe('Whirled');
-         nameInput.clear();
-         nameInput.sendKeys('world');
-         expect(element(by.binding('name')).getText()).toBe('world');
-       });
-     </file>
-     </example>
-     */
-    var ngBindDirective = ngDirective(function(scope, element, attr) {
-        element.addClass('ng-binding').data('$binding', attr.ngBind);
-        scope.$watch(attr.ngBind, function ngBindWatchAction(value) {
-            // We are purposefully using == here rather than === because we want to
-            // catch when value is "null or undefined"
-            // jshint -W041
-            element.text(value == undefined ? '' : value);
-        });
-    });
-
-
-    /**
-     * @ngdoc directive
-     * @name ngBindTemplate
+     * @param {expression} ngInit {@link guide/expression Expression} to eval.
      *
      * @description
-     * The `ngBindTemplate` directive specifies that the element
-     * text content should be replaced with the interpolation of the template
-     * in the `ngBindTemplate` attribute.
-     * Unlike `ngBind`, the `ngBindTemplate` can contain multiple `{{` `}}`
-     * expressions. This directive is needed since some HTML elements
-     * (such as TITLE and OPTION) cannot contain SPAN elements.
+     * The `ngInit` directive allows you to evaluate an expression in the
+     * current scope.
      *
-     * @element ANY
-     * @param {string} ngBindTemplate template of form
-     *   <tt>{{</tt> <tt>expression</tt> <tt>}}</tt> to eval.
+     * <div class="alert alert-danger">
+     * This directive can be abused to add unnecessary amounts of logic into your templates.
+     * There are only a few appropriate uses of `ngInit`:
+     * <ul>
+     *   <li>aliasing special properties of {@link ng.directive:ngRepeat `ngRepeat`},
+     *     as seen in the demo below.</li>
+     *   <li>initializing data during development, or for examples, as seen throughout these docs.</li>
+     *   <li>injecting data via server side scripting.</li>
+     * </ul>
+     *
+     * Besides these few cases, you should use {@link guide/component Components} or
+     * {@link guide/controller Controllers} rather than `ngInit` to initialize values on a scope.
+     * </div>
+     *
+     * <div class="alert alert-warning">
+     * **Note**: If you have assignment in `ngInit` along with a {@link ng.$filter `filter`}, make
+     * sure you have parentheses to ensure correct operator precedence:
+     * <pre class="prettyprint">
+     * `<div ng-init="test1 = ($index | toString)"></div>`
+     * </pre>
+     * </div>
      *
      * @example
-     * Try it here: enter text in text box and watch the greeting change.
-     <example>
+     <example module="initExample" name="ng-init">
      <file name="index.html">
      <script>
-     function Ctrl($scope) {
-           $scope.salutation = 'Hello';
-           $scope.name = 'World';
-         }
+     angular.module('initExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+         $scope.list = [['a', 'b'], ['c', 'd']];
+       }]);
      </script>
-     <div ng-controller="Ctrl">
-     Salutation: <input type="text" ng-model="salutation"><br>
-     Name: <input type="text" ng-model="name"><br>
-     <pre ng-bind-template="{{salutation}} {{name}}!"></pre>
+     <div ng-controller="ExampleController">
+     <div ng-repeat="innerList in list" ng-init="outerIndex = $index">
+     <div ng-repeat="value in innerList" ng-init="innerIndex = $index">
+     <span class="example-init">list[ {{outerIndex}} ][ {{innerIndex}} ] = {{value}};</span>
+     </div>
+     </div>
      </div>
      </file>
      <file name="protractor.js" type="protractor">
-     it('should check ng-bind', function() {
-         var salutationElem = element(by.binding('salutation'));
-         var salutationInput = element(by.model('salutation'));
-         var nameInput = element(by.model('name'));
-
-         expect(salutationElem.getText()).toBe('Hello World!');
-
-         salutationInput.clear();
-         salutationInput.sendKeys('Greetings');
-         nameInput.clear();
-         nameInput.sendKeys('user');
-
-         expect(salutationElem.getText()).toBe('Greetings user!');
+     it('should alias index positions', function() {
+         var elements = element.all(by.css('.example-init'));
+         expect(elements.get(0).getText()).toBe('list[ 0 ][ 0 ] = a;');
+         expect(elements.get(1).getText()).toBe('list[ 0 ][ 1 ] = b;');
+         expect(elements.get(2).getText()).toBe('list[ 1 ][ 0 ] = c;');
+         expect(elements.get(3).getText()).toBe('list[ 1 ][ 1 ] = d;');
        });
      </file>
      </example>
      */
-    var ngBindTemplateDirective = ['$interpolate', function($interpolate) {
-        return function(scope, element, attr) {
-            // TODO: move this to scenario runner
-            var interpolateFn = $interpolate(element.attr(attr.$attr.ngBindTemplate));
-            element.addClass('ng-binding').data('$binding', interpolateFn);
-            attr.$observe('ngBindTemplate', function(value) {
-                element.text(value);
-            });
-        };
-    }];
-
+    var ngInitDirective = ngDirective({
+        priority: 450,
+        compile: function() {
+            return {
+                pre: function(scope, element, attrs) {
+                    scope.$eval(attrs.ngInit);
+                }
+            };
+        }
+    });
 
     /**
      * @ngdoc directive
-     * @name ngBindHtml
+     * @name ngList
+     * @restrict A
+     * @priority 100
+     *
+     * @param {string=} ngList optional delimiter that should be used to split the value.
      *
      * @description
-     * Creates a binding that will innerHTML the result of evaluating the `expression` into the current
-     * element in a secure way.  By default, the innerHTML-ed content will be sanitized using the {@link
-        * ngSanitize.$sanitize $sanitize} service.  To utilize this functionality, ensure that `$sanitize`
-     * is available, for example, by including {@link ngSanitize} in your module's dependencies (not in
-     * core Angular.)  You may also bypass sanitization for values you know are safe. To do so, bind to
-     * an explicitly trusted value via {@link ng.$sce#trustAsHtml $sce.trustAsHtml}.  See the example
-     * under {@link ng.$sce#Example Strict Contextual Escaping (SCE)}.
+     * Text input that converts between a delimited string and an array of strings. The default
+     * delimiter is a comma followed by a space - equivalent to `ng-list=", "`. You can specify a custom
+     * delimiter as the value of the `ngList` attribute - for example, `ng-list=" | "`.
+     *
+     * The behaviour of the directive is affected by the use of the `ngTrim` attribute.
+     * * If `ngTrim` is set to `"false"` then whitespace around both the separator and each
+     *   list item is respected. This implies that the user of the directive is responsible for
+     *   dealing with whitespace but also allows you to use whitespace as a delimiter, such as a
+     *   tab or newline character.
+     * * Otherwise whitespace around the delimiter is ignored when splitting (although it is respected
+     *   when joining the list items back together) and whitespace around each list item is stripped
+     *   before it is added to the model.
      *
-     * Note: If a `$sanitize` service is unavailable and the bound value isn't explicitly trusted, you
-     * will have an exception (instead of an exploit.)
+     * @example
+     * ### Validation
+     *
+     * <example name="ngList-directive" module="listExample">
+     *   <file name="app.js">
+     *      angular.module('listExample', [])
+     *        .controller('ExampleController', ['$scope', function($scope) {
+     *          $scope.names = ['morpheus', 'neo', 'trinity'];
+     *        }]);
+     *   </file>
+     *   <file name="index.html">
+     *    <form name="myForm" ng-controller="ExampleController">
+     *      <label>List: <input name="namesInput" ng-model="names" ng-list required></label>
+     *      <span role="alert">
+     *        <span class="error" ng-show="myForm.namesInput.$error.required">
+     *        Required!</span>
+     *      </span>
+     *      <br>
+     *      <tt>names = {{names}}</tt><br/>
+     *      <tt>myForm.namesInput.$valid = {{myForm.namesInput.$valid}}</tt><br/>
+     *      <tt>myForm.namesInput.$error = {{myForm.namesInput.$error}}</tt><br/>
+     *      <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+     *      <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+     *     </form>
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     *     var listInput = element(by.model('names'));
+     *     var names = element(by.exactBinding('names'));
+     *     var valid = element(by.binding('myForm.namesInput.$valid'));
+     *     var error = element(by.css('span.error'));
+     *
+     *     it('should initialize to model', function() {
+     *       expect(names.getText()).toContain('["morpheus","neo","trinity"]');
+     *       expect(valid.getText()).toContain('true');
+     *       expect(error.getCssValue('display')).toBe('none');
+     *     });
      *
-     * @element ANY
-     * @param {expression} ngBindHtml {@link guide/expression Expression} to evaluate.
+     *     it('should be invalid if empty', function() {
+     *       listInput.clear();
+     *       listInput.sendKeys('');
+     *
+     *       expect(names.getText()).toContain('');
+     *       expect(valid.getText()).toContain('false');
+     *       expect(error.getCssValue('display')).not.toBe('none');
+     *     });
+     *   </file>
+     * </example>
      *
      * @example
-     Try it here: enter text in text box and watch the greeting change.
+     * ### Splitting on newline
+     *
+     * <example name="ngList-directive-newlines">
+     *   <file name="index.html">
+     *    <textarea ng-model="list" ng-list="&#10;" ng-trim="false"></textarea>
+     *    <pre>{{ list | json }}</pre>
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     *     it("should split the text by newlines", function() {
+     *       var listInput = element(by.model('list'));
+     *       var output = element(by.binding('list | json'));
+     *       listInput.sendKeys('abc\ndef\nghi');
+     *       expect(output.getText()).toContain('[\n  "abc",\n  "def",\n  "ghi"\n]');
+     *     });
+     *   </file>
+     * </example>
+     *
+     */
+    var ngListDirective = function() {
+        return {
+            restrict: 'A',
+            priority: 100,
+            require: 'ngModel',
+            link: function(scope, element, attr, ctrl) {
+                var ngList = attr.ngList || ', ';
+                var trimValues = attr.ngTrim !== 'false';
+                var separator = trimValues ? trim(ngList) : ngList;
 
-     <example module="ngBindHtmlExample" deps="angular-sanitize.js">
-     <file name="index.html">
-     <div ng-controller="ngBindHtmlCtrl">
-     <p ng-bind-html="myHTML"></p>
-     </div>
-     </file>
+                var parse = function(viewValue) {
+                    // If the viewValue is invalid (say required but empty) it will be `undefined`
+                    if (isUndefined(viewValue)) return;
 
-     <file name="script.js">
-     angular.module('ngBindHtmlExample', ['ngSanitize'])
+                    var list = [];
 
-     .controller('ngBindHtmlCtrl', ['$scope', function ngBindHtmlCtrl($scope) {
-         $scope.myHTML =
-            'I am an <code>HTML</code>string with <a href="#">links!</a> and other <em>stuff</em>';
-       }]);
-     </file>
+                    if (viewValue) {
+                        forEach(viewValue.split(separator), function(value) {
+                            if (value) list.push(trimValues ? trim(value) : value);
+                        });
+                    }
 
-     <file name="protractor.js" type="protractor">
-     it('should check ng-bind-html', function() {
-         expect(element(by.binding('myHTML')).getText()).toBe(
-             'I am an HTMLstring with links! and other stuff');
-       });
-     </file>
-     </example>
-     */
-    var ngBindHtmlDirective = ['$sce', '$parse', function($sce, $parse) {
-        return function(scope, element, attr) {
-            element.addClass('ng-binding').data('$binding', attr.ngBindHtml);
+                    return list;
+                };
 
-            var parsed = $parse(attr.ngBindHtml);
-            function getStringValue() { return (parsed(scope) || '').toString(); }
+                ctrl.$parsers.push(parse);
+                ctrl.$formatters.push(function(value) {
+                    if (isArray(value)) {
+                        return value.join(ngList);
+                    }
 
-            scope.$watch(getStringValue, function ngBindHtmlWatchAction(value) {
-                element.html($sce.getTrustedHtml(parsed(scope)) || '');
-            });
-        };
-    }];
+                    return undefined;
+                });
 
-    function classDirective(name, selector) {
-        name = 'ngClass' + name;
-        return ['$animate', function($animate) {
-            return {
-                restrict: 'AC',
-                link: function(scope, element, attr) {
-                    var oldVal;
+                // Override the standard $isEmpty because an empty array means the input is empty.
+                ctrl.$isEmpty = function(value) {
+                    return !value || !value.length;
+                };
+            }
+        };
+    };
 
-                    scope.$watch(attr[name], ngClassWatchAction, true);
+    /* global VALID_CLASS: true,
+  INVALID_CLASS: true,
+  PRISTINE_CLASS: true,
+  DIRTY_CLASS: true,
+  UNTOUCHED_CLASS: true,
+  TOUCHED_CLASS: true,
+  PENDING_CLASS: true,
+  addSetValidityMethod: true,
+  setupValidity: true,
+  defaultModelOptions: false
+*/
 
-                    attr.$observe('class', function(value) {
-                        ngClassWatchAction(scope.$eval(attr[name]));
-                    });
 
+    var VALID_CLASS = 'ng-valid',
+        INVALID_CLASS = 'ng-invalid',
+        PRISTINE_CLASS = 'ng-pristine',
+        DIRTY_CLASS = 'ng-dirty',
+        UNTOUCHED_CLASS = 'ng-untouched',
+        TOUCHED_CLASS = 'ng-touched',
+        EMPTY_CLASS = 'ng-empty',
+        NOT_EMPTY_CLASS = 'ng-not-empty';
 
-                    if (name !== 'ngClass') {
-                        scope.$watch('$index', function($index, old$index) {
-                            // jshint bitwise: false
-                            var mod = $index & 1;
-                            if (mod !== old$index & 1) {
-                                var classes = arrayClasses(scope.$eval(attr[name]));
-                                mod === selector ?
-                                    addClasses(classes) :
-                                    removeClasses(classes);
-                            }
-                        });
-                    }
+    var ngModelMinErr = minErr('ngModel');
 
-                    function addClasses(classes) {
-                        var newClasses = digestClassCounts(classes, 1);
-                        attr.$addClass(newClasses);
-                    }
+    /**
+     * @ngdoc type
+     * @name ngModel.NgModelController
+     * @property {*} $viewValue The actual value from the control's view. For `input` elements, this is a
+     * String. See {@link ngModel.NgModelController#$setViewValue} for information about when the $viewValue
+     * is set.
+     *
+     * @property {*} $modelValue The value in the model that the control is bound to.
+     *
+     * @property {Array.<Function>} $parsers Array of functions to execute, as a pipeline, whenever
+     *  the control updates the ngModelController with a new {@link ngModel.NgModelController#$viewValue
+    `$viewValue`} from the DOM, usually via user input.
+     See {@link ngModel.NgModelController#$setViewValue `$setViewValue()`} for a detailed lifecycle explanation.
+     Note that the `$parsers` are not called when the bound ngModel expression changes programmatically.
 
-                    function removeClasses(classes) {
-                        var newClasses = digestClassCounts(classes, -1);
-                        attr.$removeClass(newClasses);
-                    }
+     The functions are called in array order, each passing
+     its return value through to the next. The last return value is forwarded to the
+     {@link ngModel.NgModelController#$validators `$validators`} collection.
 
-                    function digestClassCounts (classes, count) {
-                        var classCounts = element.data('$classCounts') || {};
-                        var classesToUpdate = [];
-                        forEach(classes, function (className) {
-                            if (count > 0 || classCounts[className]) {
-                                classCounts[className] = (classCounts[className] || 0) + count;
-                                if (classCounts[className] === +(count > 0)) {
-                                    classesToUpdate.push(className);
-                                }
-                            }
-                        });
-                        element.data('$classCounts', classCounts);
-                        return classesToUpdate.join(' ');
-                    }
+     Parsers are used to sanitize / convert the {@link ngModel.NgModelController#$viewValue
+    `$viewValue`}.
 
-                    function updateClasses (oldClasses, newClasses) {
-                        var toAdd = arrayDifference(newClasses, oldClasses);
-                        var toRemove = arrayDifference(oldClasses, newClasses);
-                        toRemove = digestClassCounts(toRemove, -1);
-                        toAdd = digestClassCounts(toAdd, 1);
+     Returning `undefined` from a parser means a parse error occurred. In that case,
+     no {@link ngModel.NgModelController#$validators `$validators`} will run and the `ngModel`
+     will be set to `undefined` unless {@link ngModelOptions `ngModelOptions.allowInvalid`}
+     is set to `true`. The parse error is stored in `ngModel.$error.parse`.
 
-                        if (toAdd.length === 0) {
-                            $animate.removeClass(element, toRemove);
-                        } else if (toRemove.length === 0) {
-                            $animate.addClass(element, toAdd);
-                        } else {
-                            $animate.setClass(element, toAdd, toRemove);
-                        }
-                    }
+     This simple example shows a parser that would convert text input value to lowercase:
+     * ```js
+     * function parse(value) {
+     *   if (value) {
+     *     return value.toLowerCase();
+     *   }
+     * }
+     * ngModelController.$parsers.push(parse);
+     * ```
 
-                    function ngClassWatchAction(newVal) {
-                        if (selector === true || scope.$index % 2 === selector) {
-                            var newClasses = arrayClasses(newVal || []);
-                            if (!oldVal) {
-                                addClasses(newClasses);
-                            } else if (!equals(newVal,oldVal)) {
-                                var oldClasses = arrayClasses(oldVal);
-                                updateClasses(oldClasses, newClasses);
-                            }
-                        }
-                        oldVal = copy(newVal);
-                    }
-                }
-            };
+     *
+     * @property {Array.<Function>} $formatters Array of functions to execute, as a pipeline, whenever
+     the bound ngModel expression changes programmatically. The `$formatters` are not called when the
+     value of the control is changed by user interaction.
 
-            function arrayDifference(tokens1, tokens2) {
-                var values = [];
+     Formatters are used to format / convert the {@link ngModel.NgModelController#$modelValue
+    `$modelValue`} for display in the control.
 
-                outer:
-                    for(var i = 0; i < tokens1.length; i++) {
-                        var token = tokens1[i];
-                        for(var j = 0; j < tokens2.length; j++) {
-                            if(token == tokens2[j]) continue outer;
-                        }
-                        values.push(token);
-                    }
-                return values;
-            }
+     The functions are called in reverse array order, each passing the value through to the
+     next. The last return value is used as the actual DOM value.
 
-            function arrayClasses (classVal) {
-                if (isArray(classVal)) {
-                    return classVal;
-                } else if (isString(classVal)) {
-                    return classVal.split(' ');
-                } else if (isObject(classVal)) {
-                    var classes = [], i = 0;
-                    forEach(classVal, function(v, k) {
-                        if (v) {
-                            classes.push(k);
-                        }
-                    });
-                    return classes;
-                }
-                return classVal;
-            }
-        }];
-    }
+     This simple example shows a formatter that would convert the model value to uppercase:
 
-    /**
-     * @ngdoc directive
-     * @name ngClass
-     * @restrict AC
+     * ```js
+     * function format(value) {
+     *   if (value) {
+     *     return value.toUpperCase();
+     *   }
+     * }
+     * ngModel.$formatters.push(format);
+     * ```
      *
-     * @description
-     * The `ngClass` directive allows you to dynamically set CSS classes on an HTML element by databinding
-     * an expression that represents all classes to be added.
+     * @property {Object.<string, function>} $validators A collection of validators that are applied
+     *      whenever the model value changes. The key value within the object refers to the name of the
+     *      validator while the function refers to the validation operation. The validation operation is
+     *      provided with the model value as an argument and must return a true or false value depending
+     *      on the response of that validation.
      *
-     * The directive operates in three different ways, depending on which of three types the expression
-     * evaluates to:
+     * ```js
+     * ngModel.$validators.validCharacters = function(modelValue, viewValue) {
+     *   var value = modelValue || viewValue;
+     *   return /[0-9]+/.test(value) &&
+     *          /[a-z]+/.test(value) &&
+     *          /[A-Z]+/.test(value) &&
+     *          /\W+/.test(value);
+     * };
+     * ```
      *
-     * 1. If the expression evaluates to a string, the string should be one or more space-delimited class
-     * names.
+     * @property {Object.<string, function>} $asyncValidators A collection of validations that are expected to
+     *      perform an asynchronous validation (e.g. a HTTP request). The validation function that is provided
+     *      is expected to return a promise when it is run during the model validation process. Once the promise
+     *      is delivered then the validation status will be set to true when fulfilled and false when rejected.
+     *      When the asynchronous validators are triggered, each of the validators will run in parallel and the model
+     *      value will only be updated once all validators have been fulfilled. As long as an asynchronous validator
+     *      is unfulfilled, its key will be added to the controllers `$pending` property. Also, all asynchronous validators
+     *      will only run once all synchronous validators have passed.
      *
-     * 2. If the expression evaluates to an array, each element of the array should be a string that is
-     * one or more space-delimited class names.
+     * Please note that if $http is used then it is important that the server returns a success HTTP response code
+     * in order to fulfill the validation and a status level of `4xx` in order to reject the validation.
      *
-     * 3. If the expression evaluates to an object, then for each key-value pair of the
-     * object with a truthy value the corresponding key is used as a class name.
+     * ```js
+     * ngModel.$asyncValidators.uniqueUsername = function(modelValue, viewValue) {
+     *   var value = modelValue || viewValue;
+     *
+     *   // Lookup user by username
+     *   return $http.get('/api/users/' + value).
+     *      then(function resolved() {
+     *        //username exists, this means validation fails
+     *        return $q.reject('exists');
+     *      }, function rejected() {
+     *        //username does not exist, therefore this validation passes
+     *        return true;
+     *      });
+     * };
+     * ```
      *
-     * The directive won't add duplicate classes if a particular class was already set.
+     * @property {Array.<Function>} $viewChangeListeners Array of functions to execute whenever
+     *     a change to {@link ngModel.NgModelController#$viewValue `$viewValue`} has caused a change
+     *     to {@link ngModel.NgModelController#$modelValue `$modelValue`}.
+     *     It is called with no arguments, and its return value is ignored.
+     *     This can be used in place of additional $watches against the model value.
      *
-     * When the expression changes, the previously added classes are removed and only then the
-     * new classes are added.
+     * @property {Object} $error An object hash with all failing validator ids as keys.
+     * @property {Object} $pending An object hash with all pending validator ids as keys.
      *
-     * @animations
-     * add - happens just before the class is applied to the element
-     * remove - happens just before the class is removed from the element
+     * @property {boolean} $untouched True if control has not lost focus yet.
+     * @property {boolean} $touched True if control has lost focus.
+     * @property {boolean} $pristine True if user has not interacted with the control yet.
+     * @property {boolean} $dirty True if user has already interacted with the control.
+     * @property {boolean} $valid True if there is no error.
+     * @property {boolean} $invalid True if at least one error on the control.
+     * @property {string} $name The name attribute of the control.
      *
-     * @element ANY
-     * @param {expression} ngClass {@link guide/expression Expression} to eval. The result
-     *   of the evaluation can be a string representing space delimited class
-     *   names, an array, or a map of class names to boolean values. In the case of a map, the
-     *   names of the properties whose values are truthy will be added as css classes to the
-     *   element.
+     * @description
+     *
+     * `NgModelController` provides API for the {@link ngModel `ngModel`} directive.
+     * The controller contains services for data-binding, validation, CSS updates, and value formatting
+     * and parsing. It purposefully does not contain any logic which deals with DOM rendering or
+     * listening to DOM events.
+     * Such DOM related logic should be provided by other directives which make use of
+     * `NgModelController` for data-binding to control elements.
+     * AngularJS provides this DOM logic for most {@link input `input`} elements.
+     * At the end of this page you can find a {@link ngModel.NgModelController#custom-control-example
+ * custom control example} that uses `ngModelController` to bind to `contenteditable` elements.
+     *
+     * @example
+     * ### Custom Control Example
+     * This example shows how to use `NgModelController` with a custom control to achieve
+     * data-binding. Notice how different directives (`contenteditable`, `ng-model`, and `required`)
+     * collaborate together to achieve the desired result.
+     *
+     * `contenteditable` is an HTML5 attribute, which tells the browser to let the element
+     * contents be edited in place by the user.
      *
-     * @example Example that demonstrates basic bindings via ngClass directive.
-     <example>
+     * We are using the {@link ng.service:$sce $sce} service here and include the {@link ngSanitize $sanitize}
+     * module to automatically remove "bad" content like inline event listener (e.g. `<span onclick="...">`).
+     * However, as we are using `$sce` the model can still decide to provide unsafe content if it marks
+     * that content using the `$sce` service.
+     *
+     * <example name="NgModelController" module="customControl" deps="angular-sanitize.js">
+     <file name="style.css">
+     [contenteditable] {
+        border: 1px solid black;
+        background-color: white;
+        min-height: 20px;
+      }
+
+     .ng-invalid {
+        border: 1px solid red;
+      }
+
+     </file>
+     <file name="script.js">
+     angular.module('customControl', ['ngSanitize']).
+     directive('contenteditable', ['$sce', function($sce) {
+          return {
+            restrict: 'A', // only activate on element attribute
+            require: '?ngModel', // get a hold of NgModelController
+            link: function(scope, element, attrs, ngModel) {
+              if (!ngModel) return; // do nothing if no ng-model
+
+              // Specify how UI should be updated
+              ngModel.$render = function() {
+                element.html($sce.getTrustedHtml(ngModel.$viewValue || ''));
+              };
+
+              // Listen for change events to enable binding
+              element.on('blur keyup change', function() {
+                scope.$evalAsync(read);
+              });
+              read(); // initialize
+
+              // Write data to the model
+              function read() {
+                var html = element.html();
+                // When we clear the content editable the browser leaves a <br> behind
+                // If strip-br attribute is provided then we strip this out
+                if (attrs.stripBr && html === '<br>') {
+                  html = '';
+                }
+                ngModel.$setViewValue(html);
+              }
+            }
+          };
+        }]);
+     </file>
      <file name="index.html">
-     <p ng-class="{strike: deleted, bold: important, red: error}">Map Syntax Example</p>
-     <input type="checkbox" ng-model="deleted"> deleted (apply "strike" class)<br>
-     <input type="checkbox" ng-model="important"> important (apply "bold" class)<br>
-     <input type="checkbox" ng-model="error"> error (apply "red" class)
-     <hr>
-     <p ng-class="style">Using String Syntax</p>
-     <input type="text" ng-model="style" placeholder="Type: bold strike red">
+     <form name="myForm">
+     <div contenteditable
+     name="myWidget" ng-model="userContent"
+     strip-br="true"
+     required>Change me!</div>
+     <span ng-show="myForm.myWidget.$error.required">Required!</span>
      <hr>
-     <p ng-class="[style1, style2, style3]">Using Array Syntax</p>
-     <input ng-model="style1" placeholder="Type: bold, strike or red"><br>
-     <input ng-model="style2" placeholder="Type: bold, strike or red"><br>
-     <input ng-model="style3" placeholder="Type: bold, strike or red"><br>
+     <textarea ng-model="userContent" aria-label="Dynamic textarea"></textarea>
+     </form>
      </file>
-     <file name="style.css">
-     .strike {
-         text-decoration: line-through;
-       }
-     .bold {
-           font-weight: bold;
-       }
-     .red {
-           color: red;
-       }
+     <file name="protractor.js" type="protractor">
+     it('should data-bind and become invalid', function() {
+      if (browser.params.browser === 'safari' || browser.params.browser === 'firefox') {
+        // SafariDriver can't handle contenteditable
+        // and Firefox driver can't clear contenteditables very well
+        return;
+      }
+      var contentEditable = element(by.css('[contenteditable]'));
+      var content = 'Change me!';
+
+      expect(contentEditable.getText()).toEqual(content);
+
+      contentEditable.clear();
+      contentEditable.sendKeys(protractor.Key.BACK_SPACE);
+      expect(contentEditable.getText()).toEqual('');
+      expect(contentEditable.getAttribute('class')).toMatch(/ng-invalid-required/);
+    });
      </file>
-     <file name="protractor.js" type="protractor">
-     var ps = element.all(by.css('p'));
+     * </example>
+     *
+     *
+     */
+    NgModelController.$inject = ['$scope', '$exceptionHandler', '$attrs', '$element', '$parse', '$animate', '$timeout', '$q', '$interpolate'];
+    function NgModelController($scope, $exceptionHandler, $attr, $element, $parse, $animate, $timeout, $q, $interpolate) {
+        this.$viewValue = Number.NaN;
+        this.$modelValue = Number.NaN;
+        this.$$rawModelValue = undefined; // stores the parsed modelValue / model set from scope regardless of validity.
+        this.$validators = {};
+        this.$asyncValidators = {};
+        this.$parsers = [];
+        this.$formatters = [];
+        this.$viewChangeListeners = [];
+        this.$untouched = true;
+        this.$touched = false;
+        this.$pristine = true;
+        this.$dirty = false;
+        this.$valid = true;
+        this.$invalid = false;
+        this.$error = {}; // keep invalid keys here
+        this.$$success = {}; // keep valid keys here
+        this.$pending = undefined; // keep pending keys here
+        this.$name = $interpolate($attr.name || '', false)($scope);
+        this.$$parentForm = nullFormCtrl;
+        this.$options = defaultModelOptions;
+        this.$$updateEvents = '';
+        // Attach the correct context to the event handler function for updateOn
+        this.$$updateEventHandler = this.$$updateEventHandler.bind(this);
+
+        this.$$parsedNgModel = $parse($attr.ngModel);
+        this.$$parsedNgModelAssign = this.$$parsedNgModel.assign;
+        this.$$ngModelGet = this.$$parsedNgModel;
+        this.$$ngModelSet = this.$$parsedNgModelAssign;
+        this.$$pendingDebounce = null;
+        this.$$parserValid = undefined;
+
+        this.$$currentValidationRunId = 0;
+
+        // https://github.com/angular/angular.js/issues/15833
+        // Prevent `$$scope` from being iterated over by `copy` when NgModelController is deep watched
+        Object.defineProperty(this, '$$scope', {value: $scope});
+        this.$$attr = $attr;
+        this.$$element = $element;
+        this.$$animate = $animate;
+        this.$$timeout = $timeout;
+        this.$$parse = $parse;
+        this.$$q = $q;
+        this.$$exceptionHandler = $exceptionHandler;
+
+        setupValidity(this);
+        setupModelWatcher(this);
+    }
 
-     it('should let you toggle the class', function() {
+    NgModelController.prototype = {
+        $$initGetterSetters: function() {
+            if (this.$options.getOption('getterSetter')) {
+                var invokeModelGetter = this.$$parse(this.$$attr.ngModel + '()'),
+                    invokeModelSetter = this.$$parse(this.$$attr.ngModel + '($$$p)');
 
-         expect(ps.first().getAttribute('class')).not.toMatch(/bold/);
-         expect(ps.first().getAttribute('class')).not.toMatch(/red/);
+                this.$$ngModelGet = function($scope) {
+                    var modelValue = this.$$parsedNgModel($scope);
+                    if (isFunction(modelValue)) {
+                        modelValue = invokeModelGetter($scope);
+                    }
+                    return modelValue;
+                };
+                this.$$ngModelSet = function($scope, newValue) {
+                    if (isFunction(this.$$parsedNgModel($scope))) {
+                        invokeModelSetter($scope, {$$$p: newValue});
+                    } else {
+                        this.$$parsedNgModelAssign($scope, newValue);
+                    }
+                };
+            } else if (!this.$$parsedNgModel.assign) {
+                throw ngModelMinErr('nonassign', 'Expression \'{0}\' is non-assignable. Element: {1}',
+                    this.$$attr.ngModel, startingTag(this.$$element));
+            }
+        },
 
-         element(by.model('important')).click();
-         expect(ps.first().getAttribute('class')).toMatch(/bold/);
 
-         element(by.model('error')).click();
-         expect(ps.first().getAttribute('class')).toMatch(/red/);
-       });
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$render
+         *
+         * @description
+         * Called when the view needs to be updated. It is expected that the user of the ng-model
+         * directive will implement this method.
+         *
+         * The `$render()` method is invoked in the following situations:
+         *
+         * * `$rollbackViewValue()` is called.  If we are rolling back the view value to the last
+         *   committed value then `$render()` is called to update the input control.
+         * * The value referenced by `ng-model` is changed programmatically and both the `$modelValue` and
+         *   the `$viewValue` are different from last time.
+         *
+         * Since `ng-model` does not do a deep watch, `$render()` is only invoked if the values of
+         * `$modelValue` and `$viewValue` are actually different from their previous values. If `$modelValue`
+         * or `$viewValue` are objects (rather than a string or number) then `$render()` will not be
+         * invoked if you only change a property on the objects.
+         */
+        $render: noop,
 
-     it('should let you toggle string example', function() {
-         expect(ps.get(1).getAttribute('class')).toBe('');
-         element(by.model('style')).clear();
-         element(by.model('style')).sendKeys('red');
-         expect(ps.get(1).getAttribute('class')).toBe('red');
-       });
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$isEmpty
+         *
+         * @description
+         * This is called when we need to determine if the value of an input is empty.
+         *
+         * For instance, the required directive does this to work out if the input has data or not.
+         *
+         * The default `$isEmpty` function checks whether the value is `undefined`, `''`, `null` or `NaN`.
+         *
+         * You can override this for input directives whose concept of being empty is different from the
+         * default. The `checkboxInputType` directive does this because in its case a value of `false`
+         * implies empty.
+         *
+         * @param {*} value The value of the input to check for emptiness.
+         * @returns {boolean} True if `value` is "empty".
+         */
+        $isEmpty: function(value) {
+            // eslint-disable-next-line no-self-compare
+            return isUndefined(value) || value === '' || value === null || value !== value;
+        },
 
-     it('array example should have 3 classes', function() {
-         expect(ps.last().getAttribute('class')).toBe('');
-         element(by.model('style1')).sendKeys('bold');
-         element(by.model('style2')).sendKeys('strike');
-         element(by.model('style3')).sendKeys('red');
-         expect(ps.last().getAttribute('class')).toBe('bold strike red');
-       });
-     </file>
-     </example>
+        $$updateEmptyClasses: function(value) {
+            if (this.$isEmpty(value)) {
+                this.$$animate.removeClass(this.$$element, NOT_EMPTY_CLASS);
+                this.$$animate.addClass(this.$$element, EMPTY_CLASS);
+            } else {
+                this.$$animate.removeClass(this.$$element, EMPTY_CLASS);
+                this.$$animate.addClass(this.$$element, NOT_EMPTY_CLASS);
+            }
+        },
 
-     ## Animations
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$setPristine
+         *
+         * @description
+         * Sets the control to its pristine state.
+         *
+         * This method can be called to remove the `ng-dirty` class and set the control to its pristine
+         * state (`ng-pristine` class). A model is considered to be pristine when the control
+         * has not been changed from when first compiled.
+         */
+        $setPristine: function() {
+            this.$dirty = false;
+            this.$pristine = true;
+            this.$$animate.removeClass(this.$$element, DIRTY_CLASS);
+            this.$$animate.addClass(this.$$element, PRISTINE_CLASS);
+        },
 
-     The example below demonstrates how to perform animations using ngClass.
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$setDirty
+         *
+         * @description
+         * Sets the control to its dirty state.
+         *
+         * This method can be called to remove the `ng-pristine` class and set the control to its dirty
+         * state (`ng-dirty` class). A model is considered to be dirty when the control has been changed
+         * from when first compiled.
+         */
+        $setDirty: function() {
+            this.$dirty = true;
+            this.$pristine = false;
+            this.$$animate.removeClass(this.$$element, PRISTINE_CLASS);
+            this.$$animate.addClass(this.$$element, DIRTY_CLASS);
+            this.$$parentForm.$setDirty();
+        },
 
-     <example module="ngAnimate" deps="angular-animate.js" animations="true">
-     <file name="index.html">
-     <input id="setbtn" type="button" value="set" ng-click="myVar='my-class'">
-     <input id="clearbtn" type="button" value="clear" ng-click="myVar=''">
-     <br>
-     <span class="base-class" ng-class="myVar">Sample Text</span>
-     </file>
-     <file name="style.css">
-     .base-class {
-         -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-         transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-       }
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$setUntouched
+         *
+         * @description
+         * Sets the control to its untouched state.
+         *
+         * This method can be called to remove the `ng-touched` class and set the control to its
+         * untouched state (`ng-untouched` class). Upon compilation, a model is set as untouched
+         * by default, however this function can be used to restore that state if the model has
+         * already been touched by the user.
+         */
+        $setUntouched: function() {
+            this.$touched = false;
+            this.$untouched = true;
+            this.$$animate.setClass(this.$$element, UNTOUCHED_CLASS, TOUCHED_CLASS);
+        },
 
-     .base-class.my-class {
-         color: red;
-         font-size:3em;
-       }
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check ng-class', function() {
-         expect(element(by.css('.base-class')).getAttribute('class')).not.
-           toMatch(/my-class/);
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$setTouched
+         *
+         * @description
+         * Sets the control to its touched state.
+         *
+         * This method can be called to remove the `ng-untouched` class and set the control to its
+         * touched state (`ng-touched` class). A model is considered to be touched when the user has
+         * first focused the control element and then shifted focus away from the control (blur event).
+         */
+        $setTouched: function() {
+            this.$touched = true;
+            this.$untouched = false;
+            this.$$animate.setClass(this.$$element, TOUCHED_CLASS, UNTOUCHED_CLASS);
+        },
 
-         element(by.id('setbtn')).click();
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$rollbackViewValue
+         *
+         * @description
+         * Cancel an update and reset the input element's value to prevent an update to the `$modelValue`,
+         * which may be caused by a pending debounced event or because the input is waiting for some
+         * future event.
+         *
+         * If you have an input that uses `ng-model-options` to set up debounced updates or updates that
+         * depend on special events such as `blur`, there can be a period when the `$viewValue` is out of
+         * sync with the ngModel's `$modelValue`.
+         *
+         * In this case, you can use `$rollbackViewValue()` to manually cancel the debounced / future update
+         * and reset the input to the last committed view value.
+         *
+         * It is also possible that you run into difficulties if you try to update the ngModel's `$modelValue`
+         * programmatically before these debounced/future events have resolved/occurred, because AngularJS's
+         * dirty checking mechanism is not able to tell whether the model has actually changed or not.
+         *
+         * The `$rollbackViewValue()` method should be called before programmatically changing the model of an
+         * input which may have such events pending. This is important in order to make sure that the
+         * input field will be updated with the new model value and any pending operations are cancelled.
+         *
+         * @example
+         * <example name="ng-model-cancel-update" module="cancel-update-example">
+         *   <file name="app.js">
+         *     angular.module('cancel-update-example', [])
+         *
+         *     .controller('CancelUpdateController', ['$scope', function($scope) {
+         *       $scope.model = {value1: '', value2: ''};
+         *
+         *       $scope.setEmpty = function(e, value, rollback) {
+         *         if (e.keyCode === 27) {
+         *           e.preventDefault();
+         *           if (rollback) {
+         *             $scope.myForm[value].$rollbackViewValue();
+         *           }
+         *           $scope.model[value] = '';
+         *         }
+         *       };
+         *     }]);
+         *   </file>
+         *   <file name="index.html">
+         *     <div ng-controller="CancelUpdateController">
+         *       <p>Both of these inputs are only updated if they are blurred. Hitting escape should
+         *       empty them. Follow these steps and observe the difference:</p>
+         *       <ol>
+         *         <li>Type something in the input. You will see that the model is not yet updated</li>
+         *         <li>Press the Escape key.
+         *           <ol>
+         *             <li> In the first example, nothing happens, because the model is already '', and no
+         *             update is detected. If you blur the input, the model will be set to the current view.
+         *             </li>
+         *             <li> In the second example, the pending update is cancelled, and the input is set back
+         *             to the last committed view value (''). Blurring the input does nothing.
+         *             </li>
+         *           </ol>
+         *         </li>
+         *       </ol>
+         *
+         *       <form name="myForm" ng-model-options="{ updateOn: 'blur' }">
+         *         <div>
+         *           <p id="inputDescription1">Without $rollbackViewValue():</p>
+         *           <input name="value1" aria-describedby="inputDescription1" ng-model="model.value1"
+         *                  ng-keydown="setEmpty($event, 'value1')">
+         *           value1: "{{ model.value1 }}"
+         *         </div>
+         *
+         *         <div>
+         *           <p id="inputDescription2">With $rollbackViewValue():</p>
+         *           <input name="value2" aria-describedby="inputDescription2" ng-model="model.value2"
+         *                  ng-keydown="setEmpty($event, 'value2', true)">
+         *           value2: "{{ model.value2 }}"
+         *         </div>
+         *       </form>
+         *     </div>
+         *   </file>
+         <file name="style.css">
+         div {
+            display: table-cell;
+          }
+         div:nth-child(1) {
+            padding-right: 30px;
+          }
 
-         expect(element(by.css('.base-class')).getAttribute('class')).
-           toMatch(/my-class/);
+         </file>
+         * </example>
+         */
+        $rollbackViewValue: function() {
+            this.$$timeout.cancel(this.$$pendingDebounce);
+            this.$viewValue = this.$$lastCommittedViewValue;
+            this.$render();
+        },
 
-         element(by.id('clearbtn')).click();
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$validate
+         *
+         * @description
+         * Runs each of the registered validators (first synchronous validators and then
+         * asynchronous validators).
+         * If the validity changes to invalid, the model will be set to `undefined`,
+         * unless {@link ngModelOptions `ngModelOptions.allowInvalid`} is `true`.
+         * If the validity changes to valid, it will set the model to the last available valid
+         * `$modelValue`, i.e. either the last parsed value or the last value set from the scope.
+         */
+        $validate: function() {
+            // ignore $validate before model is initialized
+            if (isNumberNaN(this.$modelValue)) {
+                return;
+            }
 
-         expect(element(by.css('.base-class')).getAttribute('class')).not.
-           toMatch(/my-class/);
-       });
-     </file>
-     </example>
+            var viewValue = this.$$lastCommittedViewValue;
+            // Note: we use the $$rawModelValue as $modelValue might have been
+            // set to undefined during a view -> model update that found validation
+            // errors. We can't parse the view here, since that could change
+            // the model although neither viewValue nor the model on the scope changed
+            var modelValue = this.$$rawModelValue;
+
+            var prevValid = this.$valid;
+            var prevModelValue = this.$modelValue;
+
+            var allowInvalid = this.$options.getOption('allowInvalid');
+
+            var that = this;
+            this.$$runValidators(modelValue, viewValue, function(allValid) {
+                // If there was no change in validity, don't update the model
+                // This prevents changing an invalid modelValue to undefined
+                if (!allowInvalid && prevValid !== allValid) {
+                    // Note: Don't check this.$valid here, as we could have
+                    // external validators (e.g. calculated on the server),
+                    // that just call $setValidity and need the model value
+                    // to calculate their validity.
+                    that.$modelValue = allValid ? modelValue : undefined;
+
+                    if (that.$modelValue !== prevModelValue) {
+                        that.$$writeModelToScope();
+                    }
+                }
+            });
+        },
 
+        $$runValidators: function(modelValue, viewValue, doneCallback) {
+            this.$$currentValidationRunId++;
+            var localValidationRunId = this.$$currentValidationRunId;
+            var that = this;
 
-     ## ngClass and pre-existing CSS3 Transitions/Animations
-     The ngClass directive still supports CSS3 Transitions/Animations even if they do not follow the ngAnimate CSS naming structure.
-     Upon animation ngAnimate will apply supplementary CSS classes to track the start and end of an animation, but this will not hinder
-     any pre-existing CSS transitions already on the element. To get an idea of what happens during a class-based animation, be sure
-     to view the step by step details of {@link ngAnimate.$animate#addclass $animate.addClass} and
-     {@link ngAnimate.$animate#removeclass $animate.removeClass}.
-     */
-    var ngClassDirective = classDirective('', true);
+            // check parser error
+            if (!processParseErrors()) {
+                validationDone(false);
+                return;
+            }
+            if (!processSyncValidators()) {
+                validationDone(false);
+                return;
+            }
+            processAsyncValidators();
 
-    /**
-     * @ngdoc directive
-     * @name ngClassOdd
-     * @restrict AC
-     *
-     * @description
-     * The `ngClassOdd` and `ngClassEven` directives work exactly as
-     * {@link ng.directive:ngClass ngClass}, except they work in
-     * conjunction with `ngRepeat` and take effect only on odd (even) rows.
-     *
-     * This directive can be applied only within the scope of an
-     * {@link ng.directive:ngRepeat ngRepeat}.
-     *
-     * @element ANY
-     * @param {expression} ngClassOdd {@link guide/expression Expression} to eval. The result
-     *   of the evaluation can be a string representing space delimited class names or an array.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <ol ng-init="names=['John', 'Mary', 'Cate', 'Suz']">
-     <li ng-repeat="name in names">
-     <span ng-class-odd="'odd'" ng-class-even="'even'">
-     {{name}}
-     </span>
-     </li>
-     </ol>
-     </file>
-     <file name="style.css">
-     .odd {
-         color: red;
-       }
-     .even {
-         color: blue;
-       }
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check ng-class-odd and ng-class-even', function() {
-         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
-           toMatch(/odd/);
-         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
-           toMatch(/even/);
-       });
-     </file>
-     </example>
-     */
-    var ngClassOddDirective = classDirective('Odd', 0);
+            function processParseErrors() {
+                var errorKey = that.$$parserName || 'parse';
+                if (isUndefined(that.$$parserValid)) {
+                    setValidity(errorKey, null);
+                } else {
+                    if (!that.$$parserValid) {
+                        forEach(that.$validators, function(v, name) {
+                            setValidity(name, null);
+                        });
+                        forEach(that.$asyncValidators, function(v, name) {
+                            setValidity(name, null);
+                        });
+                    }
+                    // Set the parse error last, to prevent unsetting it, should a $validators key == parserName
+                    setValidity(errorKey, that.$$parserValid);
+                    return that.$$parserValid;
+                }
+                return true;
+            }
 
-    /**
-     * @ngdoc directive
-     * @name ngClassEven
-     * @restrict AC
-     *
-     * @description
-     * The `ngClassOdd` and `ngClassEven` directives work exactly as
-     * {@link ng.directive:ngClass ngClass}, except they work in
-     * conjunction with `ngRepeat` and take effect only on odd (even) rows.
-     *
-     * This directive can be applied only within the scope of an
-     * {@link ng.directive:ngRepeat ngRepeat}.
-     *
-     * @element ANY
-     * @param {expression} ngClassEven {@link guide/expression Expression} to eval. The
-     *   result of the evaluation can be a string representing space delimited class names or an array.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <ol ng-init="names=['John', 'Mary', 'Cate', 'Suz']">
-     <li ng-repeat="name in names">
-     <span ng-class-odd="'odd'" ng-class-even="'even'">
-     {{name}} &nbsp; &nbsp; &nbsp;
-     </span>
-     </li>
-     </ol>
-     </file>
-     <file name="style.css">
-     .odd {
-         color: red;
-       }
-     .even {
-         color: blue;
-       }
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check ng-class-odd and ng-class-even', function() {
-         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
-           toMatch(/odd/);
-         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
-           toMatch(/even/);
-       });
-     </file>
-     </example>
-     */
-    var ngClassEvenDirective = classDirective('Even', 1);
+            function processSyncValidators() {
+                var syncValidatorsValid = true;
+                forEach(that.$validators, function(validator, name) {
+                    var result = Boolean(validator(modelValue, viewValue));
+                    syncValidatorsValid = syncValidatorsValid && result;
+                    setValidity(name, result);
+                });
+                if (!syncValidatorsValid) {
+                    forEach(that.$asyncValidators, function(v, name) {
+                        setValidity(name, null);
+                    });
+                    return false;
+                }
+                return true;
+            }
 
-    /**
-     * @ngdoc directive
-     * @name ngCloak
-     * @restrict AC
-     *
-     * @description
-     * The `ngCloak` directive is used to prevent the Angular html template from being briefly
-     * displayed by the browser in its raw (uncompiled) form while your application is loading. Use this
-     * directive to avoid the undesirable flicker effect caused by the html template display.
-     *
-     * The directive can be applied to the `<body>` element, but the preferred usage is to apply
-     * multiple `ngCloak` directives to small portions of the page to permit progressive rendering
-     * of the browser view.
-     *
-     * `ngCloak` works in cooperation with the following css rule embedded within `angular.js` and
-     * `angular.min.js`.
-     * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
-     *
-     * ```css
-     * [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
- *   display: none !important;
- * }
-     * ```
-     *
-     * When this css rule is loaded by the browser, all html elements (including their children) that
-     * are tagged with the `ngCloak` directive are hidden. When Angular encounters this directive
-     * during the compilation of the template it deletes the `ngCloak` element attribute, making
-     * the compiled element visible.
-     *
-     * For the best result, the `angular.js` script must be loaded in the head section of the html
-     * document; alternatively, the css rule above must be included in the external stylesheet of the
-     * application.
-     *
-     * Legacy browsers, like IE7, do not provide attribute selector support (added in CSS 2.1) so they
-     * cannot match the `[ng\:cloak]` selector. To work around this limitation, you must add the css
-     * class `ng-cloak` in addition to the `ngCloak` directive as shown in the example below.
-     *
-     * @element ANY
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <div id="template1" ng-cloak>{{ 'hello' }}</div>
-     <div id="template2" ng-cloak class="ng-cloak">{{ 'hello IE7' }}</div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should remove the template directive and css class', function() {
-         expect($('#template1').getAttribute('ng-cloak')).
-           toBeNull();
-         expect($('#template2').getAttribute('ng-cloak')).
-           toBeNull();
-       });
-     </file>
-     </example>
-     *
-     */
-    var ngCloakDirective = ngDirective({
-        compile: function(element, attr) {
-            attr.$set('ngCloak', undefined);
-            element.removeClass('ng-cloak');
-        }
-    });
+            function processAsyncValidators() {
+                var validatorPromises = [];
+                var allValid = true;
+                forEach(that.$asyncValidators, function(validator, name) {
+                    var promise = validator(modelValue, viewValue);
+                    if (!isPromiseLike(promise)) {
+                        throw ngModelMinErr('nopromise',
+                            'Expected asynchronous validator to return a promise but got \'{0}\' instead.', promise);
+                    }
+                    setValidity(name, undefined);
+                    validatorPromises.push(promise.then(function() {
+                        setValidity(name, true);
+                    }, function() {
+                        allValid = false;
+                        setValidity(name, false);
+                    }));
+                });
+                if (!validatorPromises.length) {
+                    validationDone(true);
+                } else {
+                    that.$$q.all(validatorPromises).then(function() {
+                        validationDone(allValid);
+                    }, noop);
+                }
+            }
 
-    /**
-     * @ngdoc directive
-     * @name ngController
-     *
-     * @description
-     * The `ngController` directive attaches a controller class to the view. This is a key aspect of how angular
-     * supports the principles behind the Model-View-Controller design pattern.
-     *
-     * MVC components in angular:
-     *
-     * * Model — The Model is scope properties; scopes are attached to the DOM where scope properties
-     *   are accessed through bindings.
-     * * View — The template (HTML with data bindings) that is rendered into the View.
-     * * Controller — The `ngController` directive specifies a Controller class; the class contains business
-     *   logic behind the application to decorate the scope with functions and values
-     *
-     * Note that you can also attach controllers to the DOM by declaring it in a route definition
-     * via the {@link ngRoute.$route $route} service. A common mistake is to declare the controller
-     * again using `ng-controller` in the template itself.  This will cause the controller to be attached
-     * and executed twice.
-     *
-     * @element ANY
-     * @scope
-     * @param {expression} ngController Name of a globally accessible constructor function or an
-     *     {@link guide/expression expression} that on the current scope evaluates to a
-     *     constructor function. The controller instance can be published into a scope property
-     *     by specifying `as propertyName`.
-     *
-     * @example
-     * Here is a simple form for editing user contact information. Adding, removing, clearing, and
-     * greeting are methods declared on the controller (see source tab). These methods can
-     * easily be called from the angular markup. Notice that the scope becomes the `this` for the
-     * controller's instance. This allows for easy access to the view data from the controller. Also
-     * notice that any changes to the data are automatically reflected in the View without the need
-     * for a manual update. The example is shown in two different declaration styles you may use
-     * according to preference.
-     <example>
-     <file name="index.html">
-     <script>
-     function SettingsController1() {
-          this.name = "John Smith";
-          this.contacts = [
-            {type: 'phone', value: '408 555 1212'},
-            {type: 'email', value: 'john.smith@example.org'} ];
-     };
-
-     SettingsController1.prototype.greet = function() {
-          alert(this.name);
-        };
+            function setValidity(name, isValid) {
+                if (localValidationRunId === that.$$currentValidationRunId) {
+                    that.$setValidity(name, isValid);
+                }
+            }
 
-     SettingsController1.prototype.addContact = function() {
-          this.contacts.push({type: 'email', value: 'yourname@example.org'});
-     };
+            function validationDone(allValid) {
+                if (localValidationRunId === that.$$currentValidationRunId) {
 
-     SettingsController1.prototype.removeContact = function(contactToRemove) {
-         var index = this.contacts.indexOf(contactToRemove);
-          this.contacts.splice(index, 1);
-        };
+                    doneCallback(allValid);
+                }
+            }
+        },
 
-     SettingsController1.prototype.clearContact = function(contact) {
-          contact.type = 'phone';
-          contact.value = '';
-        };
-     </script>
-     <div id="ctrl-as-exmpl" ng-controller="SettingsController1 as settings">
-     Name: <input type="text" ng-model="settings.name"/>
-     [ <a href="" ng-click="settings.greet()">greet</a> ]<br/>
-     Contact:
-     <ul>
-     <li ng-repeat="contact in settings.contacts">
-     <select ng-model="contact.type">
-     <option>phone</option>
-     <option>email</option>
-     </select>
-     <input type="text" ng-model="contact.value"/>
-     [ <a href="" ng-click="settings.clearContact(contact)">clear</a>
-     | <a href="" ng-click="settings.removeContact(contact)">X</a> ]
-     </li>
-     <li>[ <a href="" ng-click="settings.addContact()">add</a> ]</li>
-     </ul>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check controller as', function() {
-         var container = element(by.id('ctrl-as-exmpl'));
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$commitViewValue
+         *
+         * @description
+         * Commit a pending update to the `$modelValue`.
+         *
+         * Updates may be pending by a debounced event or because the input is waiting for a some future
+         * event defined in `ng-model-options`. this method is rarely needed as `NgModelController`
+         * usually handles calling this in response to input events.
+         */
+        $commitViewValue: function() {
+            var viewValue = this.$viewValue;
 
-         expect(container.findElement(by.model('settings.name'))
-             .getAttribute('value')).toBe('John Smith');
+            this.$$timeout.cancel(this.$$pendingDebounce);
 
-         var firstRepeat =
-             container.findElement(by.repeater('contact in settings.contacts').row(0));
-         var secondRepeat =
-             container.findElement(by.repeater('contact in settings.contacts').row(1));
+            // If the view value has not changed then we should just exit, except in the case where there is
+            // a native validator on the element. In this case the validation state may have changed even though
+            // the viewValue has stayed empty.
+            if (this.$$lastCommittedViewValue === viewValue && (viewValue !== '' || !this.$$hasNativeValidators)) {
+                return;
+            }
+            this.$$updateEmptyClasses(viewValue);
+            this.$$lastCommittedViewValue = viewValue;
 
-         expect(firstRepeat.findElement(by.model('contact.value')).getAttribute('value'))
-             .toBe('408 555 1212');
-         expect(secondRepeat.findElement(by.model('contact.value')).getAttribute('value'))
-             .toBe('john.smith@example.org');
+            // change to dirty
+            if (this.$pristine) {
+                this.$setDirty();
+            }
+            this.$$parseAndValidate();
+        },
 
-     firstRepeat.findElement(by.linkText('clear')).click();
+        $$parseAndValidate: function() {
+            var viewValue = this.$$lastCommittedViewValue;
+            var modelValue = viewValue;
+            var that = this;
 
-     expect(firstRepeat.findElement(by.model('contact.value')).getAttribute('value'))
-     .toBe('');
+            this.$$parserValid = isUndefined(modelValue) ? undefined : true;
 
-     container.findElement(by.linkText('add')).click();
+            if (this.$$parserValid) {
+                for (var i = 0; i < this.$parsers.length; i++) {
+                    modelValue = this.$parsers[i](modelValue);
+                    if (isUndefined(modelValue)) {
+                        this.$$parserValid = false;
+                        break;
+                    }
+                }
+            }
+            if (isNumberNaN(this.$modelValue)) {
+                // this.$modelValue has not been touched yet...
+                this.$modelValue = this.$$ngModelGet(this.$$scope);
+            }
+            var prevModelValue = this.$modelValue;
+            var allowInvalid = this.$options.getOption('allowInvalid');
+            this.$$rawModelValue = modelValue;
 
-     expect(container.findElement(by.repeater('contact in settings.contacts').row(2))
-     .findElement(by.model('contact.value'))
-     .getAttribute('value'))
-     .toBe('yourname@example.org');
-     });
-     </file>
-     </example>
-     <example>
-     <file name="index.html">
-     <script>
-     function SettingsController2($scope) {
-          $scope.name = "John Smith";
-          $scope.contacts = [
-            {type:'phone', value:'408 555 1212'},
-            {type:'email', value:'john.smith@example.org'} ];
-
-     $scope.greet = function() {
-           alert(this.name);
-          };
+            if (allowInvalid) {
+                this.$modelValue = modelValue;
+                writeToModelIfNeeded();
+            }
 
-     $scope.addContact = function() {
-           this.contacts.push({type:'email', value:'yourname@example.org'});
-     };
+            // Pass the $$lastCommittedViewValue here, because the cached viewValue might be out of date.
+            // This can happen if e.g. $setViewValue is called from inside a parser
+            this.$$runValidators(modelValue, this.$$lastCommittedViewValue, function(allValid) {
+                if (!allowInvalid) {
+                    // Note: Don't check this.$valid here, as we could have
+                    // external validators (e.g. calculated on the server),
+                    // that just call $setValidity and need the model value
+                    // to calculate their validity.
+                    that.$modelValue = allValid ? modelValue : undefined;
+                    writeToModelIfNeeded();
+                }
+            });
 
-     $scope.removeContact = function(contactToRemove) {
-           var index = this.contacts.indexOf(contactToRemove);
-           this.contacts.splice(index, 1);
-          };
+            function writeToModelIfNeeded() {
+                if (that.$modelValue !== prevModelValue) {
+                    that.$$writeModelToScope();
+                }
+            }
+        },
 
-     $scope.clearContact = function(contact) {
-           contact.type = 'phone';
-           contact.value = '';
-          };
-     }
-     </script>
-     <div id="ctrl-exmpl" ng-controller="SettingsController2">
-     Name: <input type="text" ng-model="name"/>
-     [ <a href="" ng-click="greet()">greet</a> ]<br/>
-     Contact:
-     <ul>
-     <li ng-repeat="contact in contacts">
-     <select ng-model="contact.type">
-     <option>phone</option>
-     <option>email</option>
-     </select>
-     <input type="text" ng-model="contact.value"/>
-     [ <a href="" ng-click="clearContact(contact)">clear</a>
-     | <a href="" ng-click="removeContact(contact)">X</a> ]
-     </li>
-     <li>[ <a href="" ng-click="addContact()">add</a> ]</li>
-     </ul>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check controller', function() {
-         var container = element(by.id('ctrl-exmpl'));
+        $$writeModelToScope: function() {
+            this.$$ngModelSet(this.$$scope, this.$modelValue);
+            forEach(this.$viewChangeListeners, function(listener) {
+                try {
+                    listener();
+                } catch (e) {
+                    // eslint-disable-next-line no-invalid-this
+                    this.$$exceptionHandler(e);
+                }
+            }, this);
+        },
 
-         expect(container.findElement(by.model('name'))
-             .getAttribute('value')).toBe('John Smith');
+        /**
+         * @ngdoc method
+         * @name ngModel.NgModelController#$setViewValue
+         *
+         * @description
+         * Update the view value.
+         *
+         * This method should be called when a control wants to change the view value; typically,
+         * this is done from within a DOM event handler. For example, the {@link ng.directive:input input}
+         * directive calls it when the value of the input changes and {@link ng.directive:select select}
+         * calls it when an option is selected.
+         *
+         * When `$setViewValue` is called, the new `value` will be staged for committing through the `$parsers`
+         * and `$validators` pipelines. If there are no special {@link ngModelOptions} specified then the staged
+         * value is sent directly for processing through the `$parsers` pipeline. After this, the `$validators` and
+         * `$asyncValidators` are called and the value is applied to `$modelValue`.
+         * Finally, the value is set to the **expression** specified in the `ng-model` attribute and
+         * all the registered change listeners, in the `$viewChangeListeners` list are called.
+         *
+         * In case the {@link ng.directive:ngModelOptions ngModelOptions} directive is used with `updateOn`
+         * and the `default` trigger is not listed, all those actions will remain pending until one of the
+         * `updateOn` events is triggered on the DOM element.
+         * All these actions will be debounced if the {@link ng.directive:ngModelOptions ngModelOptions}
+         * directive is used with a custom debounce for this particular event.
+         * Note that a `$digest` is only triggered once the `updateOn` events are fired, or if `debounce`
+         * is specified, once the timer runs out.
+         *
+         * When used with standard inputs, the view value will always be a string (which is in some cases
+         * parsed into another type, such as a `Date` object for `input[date]`.)
+         * However, custom controls might also pass objects to this method. In this case, we should make
+         * a copy of the object before passing it to `$setViewValue`. This is because `ngModel` does not
+         * perform a deep watch of objects, it only looks for a change of identity. If you only change
+         * the property of the object then ngModel will not realize that the object has changed and
+         * will not invoke the `$parsers` and `$validators` pipelines. For this reason, you should
+         * not change properties of the copy once it has been passed to `$setViewValue`.
+         * Otherwise you may cause the model value on the scope to change incorrectly.
+         *
+         * <div class="alert alert-info">
+         * In any case, the value passed to the method should always reflect the current value
+         * of the control. For example, if you are calling `$setViewValue` for an input element,
+         * you should pass the input DOM value. Otherwise, the control and the scope model become
+         * out of sync. It's also important to note that `$setViewValue` does not call `$render` or change
+         * the control's DOM value in any way. If we want to change the control's DOM value
+         * programmatically, we should update the `ngModel` scope expression. Its new value will be
+         * picked up by the model controller, which will run it through the `$formatters`, `$render` it
+         * to update the DOM, and finally call `$validate` on it.
+         * </div>
+         *
+         * @param {*} value value from the view.
+         * @param {string} trigger Event that triggered the update.
+         */
+        $setViewValue: function(value, trigger) {
+            this.$viewValue = value;
+            if (this.$options.getOption('updateOnDefault')) {
+                this.$$debounceViewValueCommit(trigger);
+            }
+        },
 
-         var firstRepeat =
-             container.findElement(by.repeater('contact in contacts').row(0));
-         var secondRepeat =
-             container.findElement(by.repeater('contact in contacts').row(1));
+        $$debounceViewValueCommit: function(trigger) {
+            var debounceDelay = this.$options.getOption('debounce');
 
-         expect(firstRepeat.findElement(by.model('contact.value')).getAttribute('value'))
-             .toBe('408 555 1212');
-         expect(secondRepeat.findElement(by.model('contact.value')).getAttribute('value'))
-             .toBe('john.smith@example.org');
+            if (isNumber(debounceDelay[trigger])) {
+                debounceDelay = debounceDelay[trigger];
+            } else if (isNumber(debounceDelay['default'])) {
+                debounceDelay = debounceDelay['default'];
+            }
 
-     firstRepeat.findElement(by.linkText('clear')).click();
+            this.$$timeout.cancel(this.$$pendingDebounce);
+            var that = this;
+            if (debounceDelay > 0) { // this fails if debounceDelay is an object
+                this.$$pendingDebounce = this.$$timeout(function() {
+                    that.$commitViewValue();
+                }, debounceDelay);
+            } else if (this.$$scope.$root.$$phase) {
+                this.$commitViewValue();
+            } else {
+                this.$$scope.$apply(function() {
+                    that.$commitViewValue();
+                });
+            }
+        },
 
-     expect(firstRepeat.findElement(by.model('contact.value')).getAttribute('value'))
-     .toBe('');
+        /**
+         * @ngdoc method
+         *
+         * @name ngModel.NgModelController#$overrideModelOptions
+         *
+         * @description
+         *
+         * Override the current model options settings programmatically.
+         *
+         * The previous `ModelOptions` value will not be modified. Instead, a
+         * new `ModelOptions` object will inherit from the previous one overriding
+         * or inheriting settings that are defined in the given parameter.
+         *
+         * See {@link ngModelOptions} for information about what options can be specified
+         * and how model option inheritance works.
+         *
+         * <div class="alert alert-warning">
+         * **Note:** this function only affects the options set on the `ngModelController`,
+         * and not the options on the {@link ngModelOptions} directive from which they might have been
+         * obtained initially.
+         * </div>
+         *
+         * <div class="alert alert-danger">
+         * **Note:** it is not possible to override the `getterSetter` option.
+         * </div>
+         *
+         * @param {Object} options a hash of settings to override the previous options
+         *
+         */
+        $overrideModelOptions: function(options) {
+            this.$options = this.$options.createChild(options);
+            this.$$setUpdateOnEvents();
+        },
 
-     container.findElement(by.linkText('add')).click();
+        /**
+         * @ngdoc method
+         *
+         * @name  ngModel.NgModelController#$processModelValue
 
-     expect(container.findElement(by.repeater('contact in contacts').row(2))
-     .findElement(by.model('contact.value'))
-     .getAttribute('value'))
-     .toBe('yourname@example.org');
-     });
-     </file>
-     </example>
+         * @description
+         *
+         * Runs the model -> view pipeline on the current
+         * {@link ngModel.NgModelController#$modelValue $modelValue}.
+         *
+         * The following actions are performed by this method:
+         *
+         * - the `$modelValue` is run through the {@link ngModel.NgModelController#$formatters $formatters}
+         * and the result is set to the {@link ngModel.NgModelController#$viewValue $viewValue}
+         * - the `ng-empty` or `ng-not-empty` class is set on the element
+         * - if the `$viewValue` has changed:
+         *   - {@link ngModel.NgModelController#$render $render} is called on the control
+         *   - the {@link ngModel.NgModelController#$validators $validators} are run and
+         *   the validation status is set.
+         *
+         * This method is called by ngModel internally when the bound scope value changes.
+         * Application developers usually do not have to call this function themselves.
+         *
+         * This function can be used when the `$viewValue` or the rendered DOM value are not correctly
+         * formatted and the `$modelValue` must be run through the `$formatters` again.
+         *
+         * @example
+         * Consider a text input with an autocomplete list (for fruit), where the items are
+         * objects with a name and an id.
+         * A user enters `ap` and then selects `Apricot` from the list.
+         * Based on this, the autocomplete widget will call `$setViewValue({name: 'Apricot', id: 443})`,
+         * but the rendered value will still be `ap`.
+         * The widget can then call `ctrl.$processModelValue()` to run the model -> view
+         * pipeline again, which formats the object to the string `Apricot`,
+         * then updates the `$viewValue`, and finally renders it in the DOM.
+         *
+         * <example module="inputExample" name="ng-model-process">
+         <file name="index.html">
+         <div ng-controller="inputController" style="display: flex;">
+         <div style="margin-right: 30px;">
+         Search Fruit:
+         <basic-autocomplete items="items" on-select="selectedFruit = item"></basic-autocomplete>
+         </div>
+         <div>
+         Model:<br>
+         <pre>{{selectedFruit | json}}</pre>
+         </div>
+         </div>
+         </file>
+         <file name="app.js">
+         angular.module('inputExample', [])
+         .controller('inputController', function($scope) {
+          $scope.items = [
+            {name: 'Apricot', id: 443},
+            {name: 'Clementine', id: 972},
+            {name: 'Durian', id: 169},
+            {name: 'Jackfruit', id: 982},
+            {name: 'Strawberry', id: 863}
+          ];
+        })
+         .component('basicAutocomplete', {
+          bindings: {
+            items: '<',
+            onSelect: '&'
+          },
+          templateUrl: 'autocomplete.html',
+          controller: function($element, $scope) {
+            var that = this;
+            var ngModel;
+
+            that.$postLink = function() {
+              ngModel = $element.find('input').controller('ngModel');
+
+              ngModel.$formatters.push(function(value) {
+                return (value && value.name) || value;
+              });
+
+              ngModel.$parsers.push(function(value) {
+                var match = value;
+                for (var i = 0; i < that.items.length; i++) {
+                  if (that.items[i].name === value) {
+                    match = that.items[i];
+                    break;
+                  }
+                }
+
+                return match;
+              });
+            };
+
+            that.selectItem = function(item) {
+              ngModel.$setViewValue(item);
+              ngModel.$processModelValue();
+              that.onSelect({item: item});
+            };
+          }
+        });
+         </file>
+         <file name="autocomplete.html">
+         <div>
+         <input type="search" ng-model="$ctrl.searchTerm" />
+         <ul>
+         <li ng-repeat="item in $ctrl.items | filter:$ctrl.searchTerm">
+         <button ng-click="$ctrl.selectItem(item)">{{ item.name }}</button>
+         </li>
+         </ul>
+         </div>
+         </file>
+         * </example>
+         *
+         */
+        $processModelValue: function() {
+            var viewValue = this.$$format();
+
+            if (this.$viewValue !== viewValue) {
+                this.$$updateEmptyClasses(viewValue);
+                this.$viewValue = this.$$lastCommittedViewValue = viewValue;
+                this.$render();
+                // It is possible that model and view value have been updated during render
+                this.$$runValidators(this.$modelValue, this.$viewValue, noop);
+            }
+        },
+
+        /**
+         * This method is called internally to run the $formatters on the $modelValue
+         */
+        $$format: function() {
+            var formatters = this.$formatters,
+                idx = formatters.length;
+
+            var viewValue = this.$modelValue;
+            while (idx--) {
+                viewValue = formatters[idx](viewValue);
+            }
+
+            return viewValue;
+        },
+
+        /**
+         * This method is called internally when the bound scope value changes.
+         */
+        $$setModelValue: function(modelValue) {
+            this.$modelValue = this.$$rawModelValue = modelValue;
+            this.$$parserValid = undefined;
+            this.$processModelValue();
+        },
+
+        $$setUpdateOnEvents: function() {
+            if (this.$$updateEvents) {
+                this.$$element.off(this.$$updateEvents, this.$$updateEventHandler);
+            }
+
+            this.$$updateEvents = this.$options.getOption('updateOn');
+            if (this.$$updateEvents) {
+                this.$$element.on(this.$$updateEvents, this.$$updateEventHandler);
+            }
+        },
+
+        $$updateEventHandler: function(ev) {
+            this.$$debounceViewValueCommit(ev && ev.type);
+        }
+    };
+
+    function setupModelWatcher(ctrl) {
+        // model -> value
+        // Note: we cannot use a normal scope.$watch as we want to detect the following:
+        // 1. scope value is 'a'
+        // 2. user enters 'b'
+        // 3. ng-change kicks in and reverts scope value to 'a'
+        //    -> scope value did not change since the last digest as
+        //       ng-change executes in apply phase
+        // 4. view should be changed back to 'a'
+        ctrl.$$scope.$watch(function ngModelWatch(scope) {
+            var modelValue = ctrl.$$ngModelGet(scope);
+
+            // if scope model value and ngModel value are out of sync
+            // This cannot be moved to the action function, because it would not catch the
+            // case where the model is changed in the ngChange function or the model setter
+            if (modelValue !== ctrl.$modelValue &&
+                // checks for NaN is needed to allow setting the model to NaN when there's an asyncValidator
+                // eslint-disable-next-line no-self-compare
+                (ctrl.$modelValue === ctrl.$modelValue || modelValue === modelValue)
+            ) {
+                ctrl.$$setModelValue(modelValue);
+            }
+
+            return modelValue;
+        });
+    }
 
+    /**
+     * @ngdoc method
+     * @name ngModel.NgModelController#$setValidity
+     *
+     * @description
+     * Change the validity state, and notify the form.
+     *
+     * This method can be called within $parsers/$formatters or a custom validation implementation.
+     * However, in most cases it should be sufficient to use the `ngModel.$validators` and
+     * `ngModel.$asyncValidators` collections which will call `$setValidity` automatically.
+     *
+     * @param {string} validationErrorKey Name of the validator. The `validationErrorKey` will be assigned
+     *        to either `$error[validationErrorKey]` or `$pending[validationErrorKey]`
+     *        (for unfulfilled `$asyncValidators`), so that it is available for data-binding.
+     *        The `validationErrorKey` should be in camelCase and will get converted into dash-case
+     *        for class name. Example: `myError` will result in `ng-valid-my-error` and `ng-invalid-my-error`
+     *        classes and can be bound to as `{{ someForm.someControl.$error.myError }}`.
+     * @param {boolean} isValid Whether the current state is valid (true), invalid (false), pending (undefined),
+     *                          or skipped (null). Pending is used for unfulfilled `$asyncValidators`.
+     *                          Skipped is used by AngularJS when validators do not run because of parse errors and
+     *                          when `$asyncValidators` do not run because any of the `$validators` failed.
      */
-    var ngControllerDirective = [function() {
-        return {
-            scope: true,
-            controller: '@',
-            priority: 500
-        };
-    }];
+    addSetValidityMethod({
+        clazz: NgModelController,
+        set: function(object, property) {
+            object[property] = true;
+        },
+        unset: function(object, property) {
+            delete object[property];
+        }
+    });
+
 
     /**
      * @ngdoc directive
-     * @name ngCsp
+     * @name ngModel
+     * @restrict A
+     * @priority 1
+     * @param {expression} ngModel assignable {@link guide/expression Expression} to bind to.
      *
-     * @element html
      * @description
-     * Enables [CSP (Content Security Policy)](https://developer.mozilla.org/en/Security/CSP) support.
+     * The `ngModel` directive binds an `input`,`select`, `textarea` (or custom form control) to a
+     * property on the scope using {@link ngModel.NgModelController NgModelController},
+     * which is created and exposed by this directive.
      *
-     * This is necessary when developing things like Google Chrome Extensions.
+     * `ngModel` is responsible for:
      *
-     * CSP forbids apps to use `eval` or `Function(string)` generated functions (among other things).
-     * For us to be compatible, we just need to implement the "getterFn" in $parse without violating
-     * any of these restrictions.
+     * - Binding the view into the model, which other directives such as `input`, `textarea` or `select`
+     *   require.
+     * - Providing validation behavior (i.e. required, number, email, url).
+     * - Keeping the state of the control (valid/invalid, dirty/pristine, touched/untouched, validation errors).
+     * - Setting related css classes on the element (`ng-valid`, `ng-invalid`, `ng-dirty`, `ng-pristine`, `ng-touched`,
+     *   `ng-untouched`, `ng-empty`, `ng-not-empty`) including animations.
+     * - Registering the control with its parent {@link ng.directive:form form}.
      *
-     * AngularJS uses `Function(string)` generated functions as a speed optimization. Applying the `ngCsp`
-     * directive will cause Angular to use CSP compatibility mode. When this mode is on AngularJS will
-     * evaluate all expressions up to 30% slower than in non-CSP mode, but no security violations will
-     * be raised.
+     * Note: `ngModel` will try to bind to the property given by evaluating the expression on the
+     * current scope. If the property doesn't already exist on this scope, it will be created
+     * implicitly and added to the scope.
      *
-     * CSP forbids JavaScript to inline stylesheet rules. In non CSP mode Angular automatically
-     * includes some CSS rules (e.g. {@link ng.directive:ngCloak ngCloak}).
-     * To make those directives work in CSP mode, include the `angular-csp.css` manually.
+     * For best practices on using `ngModel`, see:
      *
-     * In order to use this feature put the `ngCsp` directive on the root element of the application.
+     *  - [Understanding Scopes](https://github.com/angular/angular.js/wiki/Understanding-Scopes)
      *
-     * *Note: This directive is only available in the `ng-csp` and `data-ng-csp` attribute form.*
+     * For basic examples, how to use `ngModel`, see:
      *
-     * @example
-     * This example shows how to apply the `ngCsp` directive to the `html` tag.
-     ```html
-     <!doctype html>
-     <html ng-app ng-csp>
-     ...
-     ...
-     </html>
-     ```
-     */
-
-// ngCsp is not implemented as a proper directive any more, because we need it be processed while we bootstrap
-// the system (before $parse is instantiated), for this reason we just have a csp() fn that looks for ng-csp attribute
-// anywhere in the current doc
-
-    /**
-     * @ngdoc directive
-     * @name ngClick
+     *  - {@link ng.directive:input input}
+     *    - {@link input[text] text}
+     *    - {@link input[checkbox] checkbox}
+     *    - {@link input[radio] radio}
+     *    - {@link input[number] number}
+     *    - {@link input[email] email}
+     *    - {@link input[url] url}
+     *    - {@link input[date] date}
+     *    - {@link input[datetime-local] datetime-local}
+     *    - {@link input[time] time}
+     *    - {@link input[month] month}
+     *    - {@link input[week] week}
+     *  - {@link ng.directive:select select}
+     *  - {@link ng.directive:textarea textarea}
      *
-     * @description
-     * The ngClick directive allows you to specify custom behavior when
-     * an element is clicked.
+     * ## Complex Models (objects or collections)
      *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngClick {@link guide/expression Expression} to evaluate upon
-     * click. ({@link guide/expression#-event- Event object is available as `$event`})
+     * By default, `ngModel` watches the model by reference, not value. This is important to know when
+     * binding inputs to models that are objects (e.g. `Date`) or collections (e.g. arrays). If only properties of the
+     * object or collection change, `ngModel` will not be notified and so the input will not be  re-rendered.
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <button ng-click="count = count + 1" ng-init="count=0">
-     Increment
-     </button>
-     count: {{count}}
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check ng-click', function() {
-         expect(element(by.binding('count')).getText()).toMatch('0');
-         element(by.css('button')).click();
-         expect(element(by.binding('count')).getText()).toMatch('1');
-       });
-     </file>
-     </example>
-     */
-    /*
-     * A directive that allows creation of custom onclick handlers that are defined as angular
-     * expressions and are compiled and executed within the current scope.
+     * The model must be assigned an entirely new object or collection before a re-rendering will occur.
      *
-     * Events that are handled via these handler are always configured not to propagate further.
-     */
-    var ngEventDirectives = {};
-    forEach(
-        'click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste'.split(' '),
-        function(name) {
-            var directiveName = directiveNormalize('ng-' + name);
-            ngEventDirectives[directiveName] = ['$parse', function($parse) {
-                return {
-                    compile: function($element, attr) {
-                        var fn = $parse(attr[directiveName]);
-                        return function(scope, element, attr) {
-                            element.on(lowercase(name), function(event) {
-                                scope.$apply(function() {
-                                    fn(scope, {$event:event});
-                                });
-                            });
-                        };
-                    }
-                };
-            }];
-        }
-    );
-
-    /**
-     * @ngdoc directive
-     * @name ngDblclick
+     * Some directives have options that will cause them to use a custom `$watchCollection` on the model expression
+     * - for example, `ngOptions` will do so when a `track by` clause is included in the comprehension expression or
+     * if the select is given the `multiple` attribute.
      *
-     * @description
-     * The `ngDblclick` directive allows you to specify custom behavior on a dblclick event.
+     * The `$watchCollection()` method only does a shallow comparison, meaning that changing properties deeper than the
+     * first level of the object (or only changing the properties of an item in the collection if it's an array) will still
+     * not trigger a re-rendering of the model.
      *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngDblclick {@link guide/expression Expression} to evaluate upon
-     * a dblclick. (The Event object is available as `$event`)
+     * ## CSS classes
+     * The following CSS classes are added and removed on the associated input/select/textarea element
+     * depending on the validity of the model.
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <button ng-dblclick="count = count + 1" ng-init="count=0">
-     Increment (on double click)
-     </button>
-     count: {{count}}
-     </file>
-     </example>
-     */
-
-
-    /**
-     * @ngdoc directive
-     * @name ngMousedown
+     *  - `ng-valid`: the model is valid
+     *  - `ng-invalid`: the model is invalid
+     *  - `ng-valid-[key]`: for each valid key added by `$setValidity`
+     *  - `ng-invalid-[key]`: for each invalid key added by `$setValidity`
+     *  - `ng-pristine`: the control hasn't been interacted with yet
+     *  - `ng-dirty`: the control has been interacted with
+     *  - `ng-touched`: the control has been blurred
+     *  - `ng-untouched`: the control hasn't been blurred
+     *  - `ng-pending`: any `$asyncValidators` are unfulfilled
+     *  - `ng-empty`: the view does not contain a value or the value is deemed "empty", as defined
+     *     by the {@link ngModel.NgModelController#$isEmpty} method
+     *  - `ng-not-empty`: the view contains a non-empty value
      *
-     * @description
-     * The ngMousedown directive allows you to specify custom behavior on mousedown event.
+     * Keep in mind that ngAnimate can detect each of these classes when added and removed.
      *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngMousedown {@link guide/expression Expression} to evaluate upon
-     * mousedown. ({@link guide/expression#-event- Event object is available as `$event`})
+     * @animations
+     * Animations within models are triggered when any of the associated CSS classes are added and removed
+     * on the input element which is attached to the model. These classes include: `.ng-pristine`, `.ng-dirty`,
+     * `.ng-invalid` and `.ng-valid` as well as any other validations that are performed on the model itself.
+     * The animations that are triggered within ngModel are similar to how they work in ngClass and
+     * animations can be hooked into using CSS transitions, keyframes as well as JS animations.
+     *
+     * The following example shows a simple way to utilize CSS transitions to style an input element
+     * that has been rendered as invalid after it has been validated:
+     *
+     * <pre>
+     * //be sure to include ngAnimate as a module to hook into more
+     * //advanced animations
+     * .my-input {
+     *   transition:0.5s linear all;
+     *   background: white;
+     * }
+     * .my-input.ng-invalid {
+     *   background: red;
+     *   color:white;
+     * }
+     * </pre>
      *
      * @example
-     <example>
+     * ### Basic Usage
+     * <example deps="angular-animate.js" animations="true" fixBase="true" module="inputExample" name="ng-model">
      <file name="index.html">
-     <button ng-mousedown="count = count + 1" ng-init="count=0">
-     Increment (on mouse down)
-     </button>
-     count: {{count}}
+     <script>
+     angular.module('inputExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+            $scope.val = '1';
+          }]);
+     </script>
+     <style>
+     .my-input {
+           transition:all linear 0.5s;
+           background: transparent;
+         }
+     .my-input.ng-invalid {
+           color:white;
+           background: red;
+         }
+     </style>
+     <p id="inputDescription">
+     Update input to see transitions when valid/invalid.
+     Integer is a valid value.
+     </p>
+     <form name="testForm" ng-controller="ExampleController">
+     <input ng-model="val" ng-pattern="/^\d+$/" name="anim" class="my-input"
+     aria-describedby="inputDescription" />
+     </form>
      </file>
-     </example>
-     */
-
-
-    /**
-     * @ngdoc directive
-     * @name ngMouseup
+     * </example>
      *
-     * @description
-     * Specify custom behavior on mouseup event.
+     * @example
+     * ### Binding to a getter/setter
      *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngMouseup {@link guide/expression Expression} to evaluate upon
-     * mouseup. ({@link guide/expression#-event- Event object is available as `$event`})
+     * Sometimes it's helpful to bind `ngModel` to a getter/setter function.  A getter/setter is a
+     * function that returns a representation of the model when called with zero arguments, and sets
+     * the internal state of a model when called with an argument. It's sometimes useful to use this
+     * for models that have an internal representation that's different from what the model exposes
+     * to the view.
+     *
+     * <div class="alert alert-success">
+     * **Best Practice:** It's best to keep getters fast because AngularJS is likely to call them more
+     * frequently than other parts of your code.
+     * </div>
+     *
+     * You use this behavior by adding `ng-model-options="{ getterSetter: true }"` to an element that
+     * has `ng-model` attached to it. You can also add `ng-model-options="{ getterSetter: true }"` to
+     * a `<form>`, which will enable this behavior for all `<input>`s within it. See
+     * {@link ng.directive:ngModelOptions `ngModelOptions`} for more.
+     *
+     * The following example shows how to use `ngModel` with a getter/setter:
      *
      * @example
-     <example>
+     * <example name="ngModel-getter-setter" module="getterSetterExample">
      <file name="index.html">
-     <button ng-mouseup="count = count + 1" ng-init="count=0">
-     Increment (on mouse up)
-     </button>
-     count: {{count}}
+     <div ng-controller="ExampleController">
+     <form name="userForm">
+     <label>Name:
+     <input type="text" name="userName"
+     ng-model="user.name"
+     ng-model-options="{ getterSetter: true }" />
+     </label>
+     </form>
+     <pre>user.name = <span ng-bind="user.name()"></span></pre>
+     </div>
      </file>
-     </example>
+     <file name="app.js">
+     angular.module('getterSetterExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+           var _name = 'Brian';
+           $scope.user = {
+             name: function(newName) {
+              // Note that newName can be undefined for two reasons:
+              // 1. Because it is called as a getter and thus called with no arguments
+              // 2. Because the property should actually be set to undefined. This happens e.g. if the
+              //    input is invalid
+              return arguments.length ? (_name = newName) : _name;
+             }
+           };
+         }]);
+     </file>
+     * </example>
      */
+    var ngModelDirective = ['$rootScope', function($rootScope) {
+        return {
+            restrict: 'A',
+            require: ['ngModel', '^?form', '^?ngModelOptions'],
+            controller: NgModelController,
+            // Prelink needs to run before any input directive
+            // so that we can set the NgModelOptions in NgModelController
+            // before anyone else uses it.
+            priority: 1,
+            compile: function ngModelCompile(element) {
+                // Setup initial state of the control
+                element.addClass(PRISTINE_CLASS).addClass(UNTOUCHED_CLASS).addClass(VALID_CLASS);
+
+                return {
+                    pre: function ngModelPreLink(scope, element, attr, ctrls) {
+                        var modelCtrl = ctrls[0],
+                            formCtrl = ctrls[1] || modelCtrl.$$parentForm,
+                            optionsCtrl = ctrls[2];
+
+                        if (optionsCtrl) {
+                            modelCtrl.$options = optionsCtrl.$options;
+                        }
+
+                        modelCtrl.$$initGetterSetters();
+
+                        // notify others, especially parent forms
+                        formCtrl.$addControl(modelCtrl);
+
+                        attr.$observe('name', function(newValue) {
+                            if (modelCtrl.$name !== newValue) {
+                                modelCtrl.$$parentForm.$$renameControl(modelCtrl, newValue);
+                            }
+                        });
+
+                        scope.$on('$destroy', function() {
+                            modelCtrl.$$parentForm.$removeControl(modelCtrl);
+                        });
+                    },
+                    post: function ngModelPostLink(scope, element, attr, ctrls) {
+                        var modelCtrl = ctrls[0];
+                        modelCtrl.$$setUpdateOnEvents();
+
+                        function setTouched() {
+                            modelCtrl.$setTouched();
+                        }
+
+                        element.on('blur', function() {
+                            if (modelCtrl.$touched) return;
+
+                            if ($rootScope.$$phase) {
+                                scope.$evalAsync(setTouched);
+                            } else {
+                                scope.$apply(setTouched);
+                            }
+                        });
+                    }
+                };
+            }
+        };
+    }];
+
+    /* exported defaultModelOptions */
+    var defaultModelOptions;
+    var DEFAULT_REGEXP = /(\s+|^)default(\s+|$)/;
 
     /**
-     * @ngdoc directive
-     * @name ngMouseover
-     *
+     * @ngdoc type
+     * @name ModelOptions
      * @description
-     * Specify custom behavior on mouseover event.
-     *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngMouseover {@link guide/expression Expression} to evaluate upon
-     * mouseover. ({@link guide/expression#-event- Event object is available as `$event`})
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <button ng-mouseover="count = count + 1" ng-init="count=0">
-     Increment (when mouse is over)
-     </button>
-     count: {{count}}
-     </file>
-     </example>
+     * A container for the options set by the {@link ngModelOptions} directive
      */
+    function ModelOptions(options) {
+        this.$$options = options;
+    }
+
+    ModelOptions.prototype = {
+
+        /**
+         * @ngdoc method
+         * @name ModelOptions#getOption
+         * @param {string} name the name of the option to retrieve
+         * @returns {*} the value of the option
+         * @description
+         * Returns the value of the given option
+         */
+        getOption: function(name) {
+            return this.$$options[name];
+        },
+
+        /**
+         * @ngdoc method
+         * @name ModelOptions#createChild
+         * @param {Object} options a hash of options for the new child that will override the parent's options
+         * @return {ModelOptions} a new `ModelOptions` object initialized with the given options.
+         */
+        createChild: function(options) {
+            var inheritAll = false;
+
+            // make a shallow copy
+            options = extend({}, options);
+
+            // Inherit options from the parent if specified by the value `"$inherit"`
+            forEach(options, /* @this */ function(option, key) {
+                if (option === '$inherit') {
+                    if (key === '*') {
+                        inheritAll = true;
+                    } else {
+                        options[key] = this.$$options[key];
+                        // `updateOn` is special so we must also inherit the `updateOnDefault` option
+                        if (key === 'updateOn') {
+                            options.updateOnDefault = this.$$options.updateOnDefault;
+                        }
+                    }
+                } else {
+                    if (key === 'updateOn') {
+                        // If the `updateOn` property contains the `default` event then we have to remove
+                        // it from the event list and set the `updateOnDefault` flag.
+                        options.updateOnDefault = false;
+                        options[key] = trim(option.replace(DEFAULT_REGEXP, function() {
+                            options.updateOnDefault = true;
+                            return ' ';
+                        }));
+                    }
+                }
+            }, this);
+
+            if (inheritAll) {
+                // We have a property of the form: `"*": "$inherit"`
+                delete options['*'];
+                defaults(options, this.$$options);
+            }
+
+            // Finally add in any missing defaults
+            defaults(options, defaultModelOptions.$$options);
+
+            return new ModelOptions(options);
+        }
+    };
+
+
+    defaultModelOptions = new ModelOptions({
+        updateOn: '',
+        updateOnDefault: true,
+        debounce: 0,
+        getterSetter: false,
+        allowInvalid: false,
+        timezone: null
+    });
 
 
     /**
      * @ngdoc directive
-     * @name ngMouseenter
+     * @name ngModelOptions
+     * @restrict A
+     * @priority 10
      *
      * @description
-     * Specify custom behavior on mouseenter event.
+     * This directive allows you to modify the behaviour of {@link ngModel} directives within your
+     * application. You can specify an `ngModelOptions` directive on any element. All {@link ngModel}
+     * directives will use the options of their nearest `ngModelOptions` ancestor.
      *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngMouseenter {@link guide/expression Expression} to evaluate upon
-     * mouseenter. ({@link guide/expression#-event- Event object is available as `$event`})
+     * The `ngModelOptions` settings are found by evaluating the value of the attribute directive as
+     * an AngularJS expression. This expression should evaluate to an object, whose properties contain
+     * the settings. For example: `<div ng-model-options="{ debounce: 100 }"`.
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <button ng-mouseenter="count = count + 1" ng-init="count=0">
-     Increment (when mouse enters)
-     </button>
-     count: {{count}}
-     </file>
-     </example>
-     */
-
-
-    /**
-     * @ngdoc directive
-     * @name ngMouseleave
+     * ## Inheriting Options
      *
-     * @description
-     * Specify custom behavior on mouseleave event.
+     * You can specify that an `ngModelOptions` setting should be inherited from a parent `ngModelOptions`
+     * directive by giving it the value of `"$inherit"`.
+     * Then it will inherit that setting from the first `ngModelOptions` directive found by traversing up the
+     * DOM tree. If there is no ancestor element containing an `ngModelOptions` directive then default settings
+     * will be used.
      *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngMouseleave {@link guide/expression Expression} to evaluate upon
-     * mouseleave. ({@link guide/expression#-event- Event object is available as `$event`})
+     * For example given the following fragment of HTML
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <button ng-mouseleave="count = count + 1" ng-init="count=0">
-     Increment (when mouse leaves)
-     </button>
-     count: {{count}}
-     </file>
-     </example>
-     */
-
-
-    /**
-     * @ngdoc directive
-     * @name ngMousemove
      *
-     * @description
-     * Specify custom behavior on mousemove event.
+     * ```html
+     * <div ng-model-options="{ allowInvalid: true, debounce: 200 }">
+     *   <form ng-model-options="{ updateOn: 'blur', allowInvalid: '$inherit' }">
+     *     <input ng-model-options="{ updateOn: 'default', allowInvalid: '$inherit' }" />
+     *   </form>
+     * </div>
+     * ```
      *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngMousemove {@link guide/expression Expression} to evaluate upon
-     * mousemove. ({@link guide/expression#-event- Event object is available as `$event`})
+     * the `input` element will have the following settings
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <button ng-mousemove="count = count + 1" ng-init="count=0">
-     Increment (when mouse moves)
-     </button>
-     count: {{count}}
-     </file>
-     </example>
-     */
-
-
-    /**
-     * @ngdoc directive
-     * @name ngKeydown
+     * ```js
+     * { allowInvalid: true, updateOn: 'default', debounce: 0 }
+     * ```
      *
-     * @description
-     * Specify custom behavior on keydown event.
+     * Notice that the `debounce` setting was not inherited and used the default value instead.
      *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngKeydown {@link guide/expression Expression} to evaluate upon
-     * keydown. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
+     * You can specify that all undefined settings are automatically inherited from an ancestor by
+     * including a property with key of `"*"` and value of `"$inherit"`.
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <input ng-keydown="count = count + 1" ng-init="count=0">
-     key down count: {{count}}
-     </file>
-     </example>
-     */
-
-
-    /**
-     * @ngdoc directive
-     * @name ngKeyup
+     * For example given the following fragment of HTML
      *
-     * @description
-     * Specify custom behavior on keyup event.
      *
-     * @element ANY
-     * @priority 0
-     * @param {expression} ngKeyup {@link guide/expression Expression} to evaluate upon
-     * keyup. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
+     * ```html
+     * <div ng-model-options="{ allowInvalid: true, debounce: 200 }">
+     *   <form ng-model-options="{ updateOn: 'blur', "*": '$inherit' }">
+     *     <input ng-model-options="{ updateOn: 'default', "*": '$inherit' }" />
+     *   </form>
+     * </div>
+     * ```
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <input ng-keyup="count = count + 1" ng-init="count=0">
-     key up count: {{count}}
-     </file>
-     </example>
-     */
-
-
-    /**
-     * @ngdoc directive
-     * @name ngKeypress
+     * the `input` element will have the following settings
      *
-     * @description
-     * Specify custom behavior on keypress event.
+     * ```js
+     * { allowInvalid: true, updateOn: 'default', debounce: 200 }
+     * ```
      *
-     * @element ANY
-     * @param {expression} ngKeypress {@link guide/expression Expression} to evaluate upon
-     * keypress. ({@link guide/expression#-event- Event object is available as `$event`}
-     * and can be interrogated for keyCode, altKey, etc.)
+     * Notice that the `debounce` setting now inherits the value from the outer `<div>` element.
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <input ng-keypress="count = count + 1" ng-init="count=0">
-     key press count: {{count}}
-     </file>
-     </example>
-     */
-
-
-    /**
-     * @ngdoc directive
-     * @name ngSubmit
+     * If you are creating a reusable component then you should be careful when using `"*": "$inherit"`
+     * since you may inadvertently inherit a setting in the future that changes the behavior of your component.
      *
-     * @description
-     * Enables binding angular expressions to onsubmit events.
      *
-     * Additionally it prevents the default action (which for form means sending the request to the
-     * server and reloading the current page), but only if the form does not contain `action`,
-     * `data-action`, or `x-action` attributes.
+     * ## Triggering and debouncing model updates
      *
-     * @element form
-     * @priority 0
-     * @param {expression} ngSubmit {@link guide/expression Expression} to eval.
-     * ({@link guide/expression#-event- Event object is available as `$event`})
+     * The `updateOn` and `debounce` properties allow you to specify a custom list of events that will
+     * trigger a model update and/or a debouncing delay so that the actual update only takes place when
+     * a timer expires; this timer will be reset after another change takes place.
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-          $scope.list = [];
-          $scope.text = 'hello';
-          $scope.submit = function() {
-            if ($scope.text) {
-              $scope.list.push(this.text);
-              $scope.text = '';
-            }
-          };
-        }
-     </script>
-     <form ng-submit="submit()" ng-controller="Ctrl">
-     Enter text and hit enter:
-     <input type="text" ng-model="text" name="text" />
-     <input type="submit" id="submit" value="Submit" />
-     <pre>list={{list}}</pre>
-     </form>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check ng-submit', function() {
-         expect(element(by.binding('list')).getText()).toBe('list=[]');
-         element(by.css('#submit')).click();
-         expect(element(by.binding('list')).getText()).toContain('hello');
-         expect(element(by.input('text')).getAttribute('value')).toBe('');
-       });
-     it('should ignore empty strings', function() {
-         expect(element(by.binding('list')).getText()).toBe('list=[]');
-         element(by.css('#submit')).click();
-         element(by.css('#submit')).click();
-         expect(element(by.binding('list')).getText()).toContain('hello');
-        });
-     </file>
-     </example>
-     */
-
-    /**
-     * @ngdoc directive
-     * @name ngFocus
+     * Given the nature of `ngModelOptions`, the value displayed inside input fields in the view might
+     * be different from the value in the actual model. This means that if you update the model you
+     * should also invoke {@link ngModel.NgModelController#$rollbackViewValue} on the relevant input field in
+     * order to make sure it is synchronized with the model and that any debounced action is canceled.
      *
-     * @description
-     * Specify custom behavior on focus event.
+     * The easiest way to reference the control's {@link ngModel.NgModelController#$rollbackViewValue}
+     * method is by making sure the input is placed inside a form that has a `name` attribute. This is
+     * important because `form` controllers are published to the related scope under the name in their
+     * `name` attribute.
      *
-     * @element window, input, select, textarea, a
-     * @priority 0
-     * @param {expression} ngFocus {@link guide/expression Expression} to evaluate upon
-     * focus. ({@link guide/expression#-event- Event object is available as `$event`})
+     * Any pending changes will take place immediately when an enclosing form is submitted via the
+     * `submit` event. Note that `ngClick` events will occur before the model is updated. Use `ngSubmit`
+     * to have access to the updated model.
      *
-     * @example
-     * See {@link ng.directive:ngClick ngClick}
-     */
-
-    /**
-     * @ngdoc directive
-     * @name ngBlur
+     * ### Overriding immediate updates
      *
-     * @description
-     * Specify custom behavior on blur event.
+     * The following example shows how to override immediate updates. Changes on the inputs within the
+     * form will update the model only when the control loses focus (blur event). If `escape` key is
+     * pressed while the input field is focused, the value is reset to the value in the current model.
      *
-     * @element window, input, select, textarea, a
-     * @priority 0
-     * @param {expression} ngBlur {@link guide/expression Expression} to evaluate upon
-     * blur. ({@link guide/expression#-event- Event object is available as `$event`})
+     * <example name="ngModelOptions-directive-blur" module="optionsExample">
+     *   <file name="index.html">
+     *     <div ng-controller="ExampleController">
+     *       <form name="userForm">
+     *         <label>
+     *           Name:
+     *           <input type="text" name="userName"
+     *                  ng-model="user.name"
+     *                  ng-model-options="{ updateOn: 'blur' }"
+     *                  ng-keyup="cancel($event)" />
+     *         </label><br />
+     *         <label>
+     *           Other data:
+     *           <input type="text" ng-model="user.data" />
+     *         </label><br />
+     *       </form>
+     *       <pre>user.name = <span ng-bind="user.name"></span></pre>
+     *     </div>
+     *   </file>
+     *   <file name="app.js">
+     *     angular.module('optionsExample', [])
+     *       .controller('ExampleController', ['$scope', function($scope) {
+     *         $scope.user = { name: 'say', data: '' };
+     *
+     *         $scope.cancel = function(e) {
+     *           if (e.keyCode === 27) {
+     *             $scope.userForm.userName.$rollbackViewValue();
+     *           }
+     *         };
+     *       }]);
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     *     var model = element(by.binding('user.name'));
+     *     var input = element(by.model('user.name'));
+     *     var other = element(by.model('user.data'));
+     *
+     *     it('should allow custom events', function() {
+     *       input.sendKeys(' hello');
+     *       input.click();
+     *       expect(model.getText()).toEqual('say');
+     *       other.click();
+     *       expect(model.getText()).toEqual('say hello');
+     *     });
      *
-     * @example
-     * See {@link ng.directive:ngClick ngClick}
-     */
-
-    /**
-     * @ngdoc directive
-     * @name ngCopy
+     *     it('should $rollbackViewValue when model changes', function() {
+     *       input.sendKeys(' hello');
+     *       expect(input.getAttribute('value')).toEqual('say hello');
+     *       input.sendKeys(protractor.Key.ESCAPE);
+     *       expect(input.getAttribute('value')).toEqual('say');
+     *       other.click();
+     *       expect(model.getText()).toEqual('say');
+     *     });
+     *   </file>
+     * </example>
      *
-     * @description
-     * Specify custom behavior on copy event.
+     * ### Debouncing updates
      *
-     * @element window, input, select, textarea, a
-     * @priority 0
-     * @param {expression} ngCopy {@link guide/expression Expression} to evaluate upon
-     * copy. ({@link guide/expression#-event- Event object is available as `$event`})
+     * The next example shows how to debounce model changes. Model will be updated only 1 sec after last change.
+     * If the `Clear` button is pressed, any debounced action is canceled and the value becomes empty.
+     *
+     * <example name="ngModelOptions-directive-debounce" module="optionsExample">
+     *   <file name="index.html">
+     *     <div ng-controller="ExampleController">
+     *       <form name="userForm">
+     *         Name:
+     *         <input type="text" name="userName"
+     *                ng-model="user.name"
+     *                ng-model-options="{ debounce: 1000 }" />
+     *         <button ng-click="userForm.userName.$rollbackViewValue(); user.name=''">Clear</button><br />
+     *       </form>
+     *       <pre>user.name = <span ng-bind="user.name"></span></pre>
+     *     </div>
+     *   </file>
+     *   <file name="app.js">
+     *     angular.module('optionsExample', [])
+     *       .controller('ExampleController', ['$scope', function($scope) {
+     *         $scope.user = { name: 'say' };
+     *       }]);
+     *   </file>
+     * </example>
+     *
+     *
+     * ## Model updates and validation
+     *
+     * The default behaviour in `ngModel` is that the model value is set to `undefined` when the
+     * validation determines that the value is invalid. By setting the `allowInvalid` property to true,
+     * the model will still be updated even if the value is invalid.
+     *
+     *
+     * ## Connecting to the scope
+     *
+     * By setting the `getterSetter` property to true you are telling ngModel that the `ngModel` expression
+     * on the scope refers to a "getter/setter" function rather than the value itself.
+     *
+     * The following example shows how to bind to getter/setters:
+     *
+     * <example name="ngModelOptions-directive-getter-setter" module="getterSetterExample">
+     *   <file name="index.html">
+     *     <div ng-controller="ExampleController">
+     *       <form name="userForm">
+     *         <label>
+     *           Name:
+     *           <input type="text" name="userName"
+     *                  ng-model="user.name"
+     *                  ng-model-options="{ getterSetter: true }" />
+     *         </label>
+     *       </form>
+     *       <pre>user.name = <span ng-bind="user.name()"></span></pre>
+     *     </div>
+     *   </file>
+     *   <file name="app.js">
+     *     angular.module('getterSetterExample', [])
+     *       .controller('ExampleController', ['$scope', function($scope) {
+     *         var _name = 'Brian';
+     *         $scope.user = {
+     *           name: function(newName) {
+     *             return angular.isDefined(newName) ? (_name = newName) : _name;
+     *           }
+     *         };
+     *       }]);
+     *   </file>
+     * </example>
+     *
+     *
+     * ## Specifying timezones
+     *
+     * You can specify the timezone that date/time input directives expect by providing its name in the
+     * `timezone` property.
+     *
+     *
+     * ## Programmatically changing options
+     *
+     * The `ngModelOptions` expression is only evaluated once when the directive is linked; it is not
+     * watched for changes. However, it is possible to override the options on a single
+     * {@link ngModel.NgModelController} instance with
+     * {@link ngModel.NgModelController#$overrideModelOptions `NgModelController#$overrideModelOptions()`}.
+     *
+     *
+     * @param {Object} ngModelOptions options to apply to {@link ngModel} directives on this element and
+     *   and its descendents. Valid keys are:
+     *   - `updateOn`: string specifying which event should the input be bound to. You can set several
+     *     events using an space delimited list. There is a special event called `default` that
+     *     matches the default events belonging to the control. These are the events that are bound to
+     *     the control, and when fired, update the `$viewValue` via `$setViewValue`.
+     *
+     *     `ngModelOptions` considers every event that is not listed in `updateOn` a "default" event,
+     *     since different control types use different default events.
+     *
+     *     See also the section {@link ngModelOptions#triggering-and-debouncing-model-updates
+ *     Triggering and debouncing model updates}.
+     *
+     *   - `debounce`: integer value which contains the debounce model update value in milliseconds. A
+     *     value of 0 triggers an immediate update. If an object is supplied instead, you can specify a
+     *     custom value for each event. For example:
+     *     ```
+     *     ng-model-options="{
+     *       updateOn: 'default blur click',
+     *       debounce: { 'default': 500, 'blur': 0 }
+     *     }"
+     *     ```
+     *
+     *     "default" also applies to all events that are listed in `updateOn` but are not
+     *     listed in `debounce`, i.e. "click" would also be debounced by 500 milliseconds.
+     *
+     *   - `allowInvalid`: boolean value which indicates that the model can be set with values that did
+     *     not validate correctly instead of the default behavior of setting the model to undefined.
+     *   - `getterSetter`: boolean value which determines whether or not to treat functions bound to
+     *     `ngModel` as getters/setters.
+     *   - `timezone`: Defines the timezone to be used to read/write the `Date` instance in the model for
+     *     `<input type="date" />`, `<input type="time" />`, ... . It understands UTC/GMT and the
+     *     continental US time zone abbreviations, but for general use, use a time zone offset, for
+     *     example, `'+0430'` (4 hours, 30 minutes east of the Greenwich meridian)
+     *     If not specified, the timezone of the browser will be used.
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <input ng-copy="copied=true" ng-init="copied=false; value='copy me'" ng-model="value">
-     copied: {{copied}}
-     </file>
-     </example>
      */
+    var ngModelOptionsDirective = function() {
+        NgModelOptionsController.$inject = ['$attrs', '$scope'];
+        function NgModelOptionsController($attrs, $scope) {
+            this.$$attrs = $attrs;
+            this.$$scope = $scope;
+        }
+        NgModelOptionsController.prototype = {
+            $onInit: function() {
+                var parentOptions = this.parentCtrl ? this.parentCtrl.$options : defaultModelOptions;
+                var modelOptionsDefinition = this.$$scope.$eval(this.$$attrs.ngModelOptions);
+
+                this.$options = parentOptions.createChild(modelOptionsDefinition);
+            }
+        };
+
+        return {
+            restrict: 'A',
+            // ngModelOptions needs to run before ngModel and input directives
+            priority: 10,
+            require: {parentCtrl: '?^^ngModelOptions'},
+            bindToController: true,
+            controller: NgModelOptionsController
+        };
+    };
+
+
+// shallow copy over values from `src` that are not already specified on `dst`
+    function defaults(dst, src) {
+        forEach(src, function(value, key) {
+            if (!isDefined(dst[key])) {
+                dst[key] = value;
+            }
+        });
+    }
 
     /**
      * @ngdoc directive
-     * @name ngCut
+     * @name ngNonBindable
+     * @restrict AC
+     * @priority 1000
+     * @element ANY
      *
      * @description
-     * Specify custom behavior on cut event.
-     *
-     * @element window, input, select, textarea, a
-     * @priority 0
-     * @param {expression} ngCut {@link guide/expression Expression} to evaluate upon
-     * cut. ({@link guide/expression#-event- Event object is available as `$event`})
+     * The `ngNonBindable` directive tells AngularJS not to compile or bind the contents of the current
+     * DOM element, including directives on the element itself that have a lower priority than
+     * `ngNonBindable`. This is useful if the element contains what appears to be AngularJS directives
+     * and bindings but which should be ignored by AngularJS. This could be the case if you have a site
+     * that displays snippets of code, for instance.
      *
      * @example
-     <example>
+     * In this example there are two locations where a simple interpolation binding (`{{}}`) is present,
+     * but the one wrapped in `ngNonBindable` is left alone.
+     *
+     <example name="ng-non-bindable">
      <file name="index.html">
-     <input ng-cut="cut=true" ng-init="cut=false; value='cut me'" ng-model="value">
-     cut: {{cut}}
+     <div>Normal: {{1 + 2}}</div>
+     <div ng-non-bindable>Ignored: {{1 + 2}}</div>
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check ng-non-bindable', function() {
+       expect(element(by.binding('1 + 2')).getText()).toContain('3');
+       expect(element.all(by.css('div')).last().getText()).toMatch(/1 \+ 2/);
+     });
      </file>
      </example>
      */
+    var ngNonBindableDirective = ngDirective({ terminal: true, priority: 1000 });
+
+    /* exported ngOptionsDirective */
+
+    /* global jqLiteRemove */
+
+    var ngOptionsMinErr = minErr('ngOptions');
 
     /**
      * @ngdoc directive
-     * @name ngPaste
+     * @name ngOptions
+     * @restrict A
      *
      * @description
-     * Specify custom behavior on paste event.
      *
-     * @element window, input, select, textarea, a
-     * @priority 0
-     * @param {expression} ngPaste {@link guide/expression Expression} to evaluate upon
-     * paste. ({@link guide/expression#-event- Event object is available as `$event`})
+     * The `ngOptions` attribute can be used to dynamically generate a list of `<option>`
+     * elements for the `<select>` element using the array or object obtained by evaluating the
+     * `ngOptions` comprehension expression.
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <input ng-paste="paste=true" ng-init="paste=false" placeholder='paste here'>
-     pasted: {{paste}}
-     </file>
-     </example>
-     */
-
-    /**
-     * @ngdoc directive
-     * @name ngIf
-     * @restrict A
+     * In many cases, {@link ng.directive:ngRepeat ngRepeat} can be used on `<option>` elements instead of
+     * `ngOptions` to achieve a similar result. However, `ngOptions` provides some benefits:
+     * - more flexibility in how the `<select>`'s model is assigned via the `select` **`as`** part of the
+     * comprehension expression
+     * - reduced memory consumption by not creating a new scope for each repeated instance
+     * - increased render speed by creating the options in a documentFragment instead of individually
      *
-     * @description
-     * The `ngIf` directive removes or recreates a portion of the DOM tree based on an
-     * {expression}. If the expression assigned to `ngIf` evaluates to a false
-     * value then the element is removed from the DOM, otherwise a clone of the
-     * element is reinserted into the DOM.
+     * When an item in the `<select>` menu is selected, the array element or object property
+     * represented by the selected option will be bound to the model identified by the `ngModel`
+     * directive.
      *
-     * `ngIf` differs from `ngShow` and `ngHide` in that `ngIf` completely removes and recreates the
-     * element in the DOM rather than changing its visibility via the `display` css property.  A common
-     * case when this difference is significant is when using css selectors that rely on an element's
-     * position within the DOM, such as the `:first-child` or `:last-child` pseudo-classes.
+     * Optionally, a single hard-coded `<option>` element, with the value set to an empty string, can
+     * be nested into the `<select>` element. This element will then represent the `null` or "not selected"
+     * option. See example below for demonstration.
      *
-     * Note that when an element is removed using `ngIf` its scope is destroyed and a new scope
-     * is created when the element is restored.  The scope created within `ngIf` inherits from
-     * its parent scope using
-     * [prototypal inheritance](https://github.com/angular/angular.js/wiki/The-Nuances-of-Scope-Prototypal-Inheritance).
-     * An important implication of this is if `ngModel` is used within `ngIf` to bind to
-     * a javascript primitive defined in the parent scope. In this case any modifications made to the
-     * variable within the child scope will override (hide) the value in the parent scope.
+     * ## Complex Models (objects or collections)
      *
-     * Also, `ngIf` recreates elements using their compiled state. An example of this behavior
-     * is if an element's class attribute is directly modified after it's compiled, using something like
-     * jQuery's `.addClass()` method, and the element is later removed. When `ngIf` recreates the element
-     * the added class will be lost because the original compiled state is used to regenerate the element.
+     * By default, `ngModel` watches the model by reference, not value. This is important to know when
+     * binding the select to a model that is an object or a collection.
      *
-     * Additionally, you can provide animations via the `ngAnimate` module to animate the `enter`
-     * and `leave` effects.
+     * One issue occurs if you want to preselect an option. For example, if you set
+     * the model to an object that is equal to an object in your collection, `ngOptions` won't be able to set the selection,
+     * because the objects are not identical. So by default, you should always reference the item in your collection
+     * for preselections, e.g.: `$scope.selected = $scope.collection[3]`.
      *
-     * @animations
-     * enter - happens just after the ngIf contents change and a new DOM element is created and injected into the ngIf container
-     * leave - happens just before the ngIf contents are removed from the DOM
+     * Another solution is to use a `track by` clause, because then `ngOptions` will track the identity
+     * of the item not by reference, but by the result of the `track by` expression. For example, if your
+     * collection items have an id property, you would `track by item.id`.
      *
-     * @element ANY
-     * @scope
-     * @priority 600
-     * @param {expression} ngIf If the {@link guide/expression expression} is falsy then
-     *     the element is removed from the DOM tree. If it is truthy a copy of the compiled
-     *     element is added to the DOM tree.
+     * A different issue with objects or collections is that ngModel won't detect if an object property or
+     * a collection item changes. For that reason, `ngOptions` additionally watches the model using
+     * `$watchCollection`, when the expression contains a `track by` clause or the the select has the `multiple` attribute.
+     * This allows ngOptions to trigger a re-rendering of the options even if the actual object/collection
+     * has not changed identity, but only a property on the object or an item in the collection changes.
      *
-     * @example
-     <example module="ngAnimate" deps="angular-animate.js" animations="true">
-     <file name="index.html">
-     Click me: <input type="checkbox" ng-model="checked" ng-init="checked=true" /><br/>
-     Show when checked:
-     <span ng-if="checked" class="animate-if">
-     I'm removed when the checkbox is unchecked.
-     </span>
-     </file>
-     <file name="animations.css">
-     .animate-if {
-        background:white;
-        border:1px solid black;
-        padding:10px;
-      }
-
-     .animate-if.ng-enter, .animate-if.ng-leave {
-        -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-      }
-
-     .animate-if.ng-enter,
-     .animate-if.ng-leave.ng-leave-active {
-        opacity:0;
-      }
-
-     .animate-if.ng-leave,
-     .animate-if.ng-enter.ng-enter-active {
-        opacity:1;
-      }
-     </file>
-     </example>
-     */
-    var ngIfDirective = ['$animate', function($animate) {
-        return {
-            transclude: 'element',
-            priority: 600,
-            terminal: true,
-            restrict: 'A',
-            $$tlb: true,
-            link: function ($scope, $element, $attr, ctrl, $transclude) {
-                var block, childScope, previousElements;
-                $scope.$watch($attr.ngIf, function ngIfWatchAction(value) {
-
-                    if (toBoolean(value)) {
-                        if (!childScope) {
-                            childScope = $scope.$new();
-                            $transclude(childScope, function (clone) {
-                                clone[clone.length++] = document.createComment(' end ngIf: ' + $attr.ngIf + ' ');
-                                // Note: We only need the first/last node of the cloned nodes.
-                                // However, we need to keep the reference to the jqlite wrapper as it might be changed later
-                                // by a directive with templateUrl when it's template arrives.
-                                block = {
-                                    clone: clone
-                                };
-                                $animate.enter(clone, $element.parent(), $element);
-                            });
-                        }
-                    } else {
-                        if(previousElements) {
-                            previousElements.remove();
-                            previousElements = null;
-                        }
-                        if(childScope) {
-                            childScope.$destroy();
-                            childScope = null;
-                        }
-                        if(block) {
-                            previousElements = getBlockElements(block.clone);
-                            $animate.leave(previousElements, function() {
-                                previousElements = null;
-                            });
-                            block = null;
-                        }
-                    }
-                });
-            }
-        };
-    }];
-
-    /**
-     * @ngdoc directive
-     * @name ngInclude
-     * @restrict ECA
+     * Note that `$watchCollection` does a shallow comparison of the properties of the object (or the items in the collection
+     * if the model is an array). This means that changing a property deeper than the first level inside the
+     * object/collection will not trigger a re-rendering.
      *
-     * @description
-     * Fetches, compiles and includes an external HTML fragment.
+     * ## `select` **`as`**
      *
-     * By default, the template URL is restricted to the same domain and protocol as the
-     * application document. This is done by calling {@link ng.$sce#getTrustedResourceUrl
- * $sce.getTrustedResourceUrl} on it. To load templates from other domains or protocols
-     * you may either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist them} or
-     * [wrap them](ng.$sce#trustAsResourceUrl) as trusted values. Refer to Angular's {@link
-        * ng.$sce Strict Contextual Escaping}.
+     * Using `select` **`as`** will bind the result of the `select` expression to the model, but
+     * the value of the `<select>` and `<option>` html elements will be either the index (for array data sources)
+     * or property name (for object data sources) of the value within the collection. If a **`track by`** expression
+     * is used, the result of that expression will be set as the value of the `option` and `select` elements.
      *
-     * In addition, the browser's
-     * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest)
-     * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/)
-     * policy may further restrict whether the template is successfully loaded.
-     * For example, `ngInclude` won't work for cross-domain requests on all browsers and for `file://`
-     * access on some browsers.
      *
-     * @animations
-     * enter - animation is used to bring new content into the browser.
-     * leave - animation is used to animate existing content away.
+     * ### `select` **`as`** and **`track by`**
      *
-     * The enter and leave animation occur concurrently.
+     * <div class="alert alert-warning">
+     * Be careful when using `select` **`as`** and **`track by`** in the same expression.
+     * </div>
      *
-     * @scope
-     * @priority 400
+     * Given this array of items on the $scope:
      *
-     * @param {string} ngInclude|src angular expression evaluating to URL. If the source is a string constant,
-     *                 make sure you wrap it in **single** quotes, e.g. `src="'myPartialTemplate.html'"`.
-     * @param {string=} onload Expression to evaluate when a new partial is loaded.
+     * ```js
+     * $scope.items = [{
+     *   id: 1,
+     *   label: 'aLabel',
+     *   subItem: { name: 'aSubItem' }
+     * }, {
+     *   id: 2,
+     *   label: 'bLabel',
+     *   subItem: { name: 'bSubItem' }
+     * }];
+     * ```
      *
-     * @param {string=} autoscroll Whether `ngInclude` should call {@link ng.$anchorScroll
- *                  $anchorScroll} to scroll the viewport after the content is loaded.
+     * This will work:
      *
-     *                  - If the attribute is not set, disable scrolling.
-     *                  - If the attribute is set without value, enable scrolling.
-     *                  - Otherwise enable scrolling only if the expression evaluates to truthy value.
+     * ```html
+     * <select ng-options="item as item.label for item in items track by item.id" ng-model="selected"></select>
+     * ```
+     * ```js
+     * $scope.selected = $scope.items[0];
+     * ```
+     *
+     * but this will not work:
+     *
+     * ```html
+     * <select ng-options="item.subItem as item.label for item in items track by item.id" ng-model="selected"></select>
+     * ```
+     * ```js
+     * $scope.selected = $scope.items[0].subItem;
+     * ```
+     *
+     * In both examples, the **`track by`** expression is applied successfully to each `item` in the
+     * `items` array. Because the selected option has been set programmatically in the controller, the
+     * **`track by`** expression is also applied to the `ngModel` value. In the first example, the
+     * `ngModel` value is `items[0]` and the **`track by`** expression evaluates to `items[0].id` with
+     * no issue. In the second example, the `ngModel` value is `items[0].subItem` and the **`track by`**
+     * expression evaluates to `items[0].subItem.id` (which is undefined). As a result, the model value
+     * is not matched against any `<option>` and the `<select>` appears as having no selected value.
+     *
+     *
+     * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+     * @param {comprehension_expression} ngOptions in one of the following forms:
+     *
+     *   * for array data sources:
+     *     * `label` **`for`** `value` **`in`** `array`
+     *     * `select` **`as`** `label` **`for`** `value` **`in`** `array`
+     *     * `label` **`group by`** `group` **`for`** `value` **`in`** `array`
+     *     * `label` **`disable when`** `disable` **`for`** `value` **`in`** `array`
+     *     * `label` **`group by`** `group` **`for`** `value` **`in`** `array` **`track by`** `trackexpr`
+     *     * `label` **`disable when`** `disable` **`for`** `value` **`in`** `array` **`track by`** `trackexpr`
+     *     * `label` **`for`** `value` **`in`** `array` | orderBy:`orderexpr` **`track by`** `trackexpr`
+     *        (for including a filter with `track by`)
+     *   * for object data sources:
+     *     * `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
+     *     * `select` **`as`** `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
+     *     * `label` **`group by`** `group` **`for (`**`key`**`,`** `value`**`) in`** `object`
+     *     * `label` **`disable when`** `disable` **`for (`**`key`**`,`** `value`**`) in`** `object`
+     *     * `select` **`as`** `label` **`group by`** `group`
+     *         **`for` `(`**`key`**`,`** `value`**`) in`** `object`
+     *     * `select` **`as`** `label` **`disable when`** `disable`
+     *         **`for` `(`**`key`**`,`** `value`**`) in`** `object`
+     *
+     * Where:
+     *
+     *   * `array` / `object`: an expression which evaluates to an array / object to iterate over.
+     *   * `value`: local variable which will refer to each item in the `array` or each property value
+     *      of `object` during iteration.
+     *   * `key`: local variable which will refer to a property name in `object` during iteration.
+     *   * `label`: The result of this expression will be the label for `<option>` element. The
+     *     `expression` will most likely refer to the `value` variable (e.g. `value.propertyName`).
+     *   * `select`: The result of this expression will be bound to the model of the parent `<select>`
+     *      element. If not specified, `select` expression will default to `value`.
+     *   * `group`: The result of this expression will be used to group options using the `<optgroup>`
+     *      DOM element.
+     *   * `disable`: The result of this expression will be used to disable the rendered `<option>`
+     *      element. Return `true` to disable.
+     *   * `trackexpr`: Used when working with an array of objects. The result of this expression will be
+     *      used to identify the objects in the array. The `trackexpr` will most likely refer to the
+     *     `value` variable (e.g. `value.propertyName`). With this the selection is preserved
+     *      even when the options are recreated (e.g. reloaded from the server).
+     * @param {string=} name Property name of the form under which the control is published.
+     * @param {string=} required The control is considered valid only if value is entered.
+     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+     *    `required` when you want to data-bind to the `required` attribute.
+     * @param {string=} ngAttrSize sets the size of the select element dynamically. Uses the
+     * {@link guide/interpolation#-ngattr-for-binding-to-arbitrary-attributes ngAttr} directive.
      *
      * @example
-     <example module="ngAnimate" deps="angular-animate.js" animations="true">
+     <example module="selectExample" name="select">
      <file name="index.html">
-     <div ng-controller="Ctrl">
-     <select ng-model="template" ng-options="t.name for t in templates">
-     <option value="">(blank)</option>
-     </select>
-     url of the template: <tt>{{template.url}}</tt>
+     <script>
+     angular.module('selectExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+            $scope.colors = [
+              {name:'black', shade:'dark'},
+              {name:'white', shade:'light', notAnOption: true},
+              {name:'red', shade:'dark'},
+              {name:'blue', shade:'dark', notAnOption: true},
+              {name:'yellow', shade:'light', notAnOption: false}
+            ];
+            $scope.myColor = $scope.colors[2]; // red
+          }]);
+     </script>
+     <div ng-controller="ExampleController">
+     <ul>
+     <li ng-repeat="color in colors">
+     <label>Name: <input ng-model="color.name"></label>
+     <label><input type="checkbox" ng-model="color.notAnOption"> Disabled?</label>
+     <button ng-click="colors.splice($index, 1)" aria-label="Remove">X</button>
+     </li>
+     <li>
+     <button ng-click="colors.push({})">add</button>
+     </li>
+     </ul>
      <hr/>
-     <div class="slide-animate-container">
-     <div class="slide-animate" ng-include="template.url"></div>
-     </div>
-     </div>
-     </file>
-     <file name="script.js">
-     function Ctrl($scope) {
-        $scope.templates =
-          [ { name: 'template1.html', url: 'template1.html'},
-            { name: 'template2.html', url: 'template2.html'} ];
-        $scope.template = $scope.templates[0];
-      }
-     </file>
-     <file name="template1.html">
-     Content of template1.html
-     </file>
-     <file name="template2.html">
-     Content of template2.html
-     </file>
-     <file name="animations.css">
-     .slide-animate-container {
-        position:relative;
-        background:white;
-        border:1px solid black;
-        height:40px;
-        overflow:hidden;
-      }
+     <label>Color (null not allowed):
+     <select ng-model="myColor" ng-options="color.name for color in colors"></select>
+     </label><br/>
+     <label>Color (null allowed):
+     <span  class="nullable">
+     <select ng-model="myColor" ng-options="color.name for color in colors">
+     <option value="">-- choose color --</option>
+     </select>
+     </span></label><br/>
 
-     .slide-animate {
-        padding:10px;
-      }
+     <label>Color grouped by shade:
+     <select ng-model="myColor" ng-options="color.name group by color.shade for color in colors">
+     </select>
+     </label><br/>
 
-     .slide-animate.ng-enter, .slide-animate.ng-leave {
-        -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+     <label>Color grouped by shade, with some disabled:
+     <select ng-model="myColor"
+     ng-options="color.name group by color.shade disable when color.notAnOption for color in colors">
+     </select>
+     </label><br/>
 
-        position:absolute;
-        top:0;
-        left:0;
-        right:0;
-        bottom:0;
-        display:block;
-        padding:10px;
-      }
 
-     .slide-animate.ng-enter {
-        top:-50px;
-      }
-     .slide-animate.ng-enter.ng-enter-active {
-        top:0;
-      }
 
-     .slide-animate.ng-leave {
-        top:0;
-      }
-     .slide-animate.ng-leave.ng-leave-active {
-        top:50px;
-      }
+     Select <button ng-click="myColor = { name:'not in list', shade: 'other' }">bogus</button>.
+     <br/>
+     <hr/>
+     Currently selected: {{ {selected_color:myColor} }}
+     <div style="border:solid 1px black; height:20px"
+     ng-style="{'background-color':myColor.name}">
+     </div>
+     </div>
      </file>
      <file name="protractor.js" type="protractor">
-     var templateSelect = element(by.model('template'));
-     var includeElem = element(by.css('[ng-include]'));
-
-     it('should load template1.html', function() {
-        expect(includeElem.getText()).toMatch(/Content of template1.html/);
-      });
-
-     it('should load template2.html', function() {
-        if (browser.params.browser == 'firefox') {
-          // Firefox can't handle using selects
-          // See https://github.com/angular/protractor/issues/480
-          return;
-        }
-        templateSelect.click();
-        templateSelect.element.all(by.css('option')).get(2).click();
-        expect(includeElem.getText()).toMatch(/Content of template2.html/);
-      });
-
-     it('should change to blank', function() {
-        if (browser.params.browser == 'firefox') {
-          // Firefox can't handle using selects
-          return;
-        }
-        templateSelect.click();
-        templateSelect.element.all(by.css('option')).get(0).click();
-        expect(includeElem.isPresent()).toBe(false);
-      });
+     it('should check ng-options', function() {
+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('red');
+           element.all(by.model('myColor')).first().click();
+           element.all(by.css('select[ng-model="myColor"] option')).first().click();
+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('black');
+           element(by.css('.nullable select[ng-model="myColor"]')).click();
+           element.all(by.css('.nullable select[ng-model="myColor"] option')).first().click();
+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('null');
+         });
      </file>
      </example>
      */
 
+    /* eslint-disable max-len */
+//                     //00001111111111000000000002222222222000000000000000000000333333333300000000000000000000000004444444444400000000000005555555555555000000000666666666666600000007777777777777000000000000000888888888800000000000000000009999999999
+    var NG_OPTIONS_REGEXP = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([$\w][$\w]*)|(?:\(\s*([$\w][$\w]*)\s*,\s*([$\w][$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/;
+    // 1: value expression (valueFn)
+    // 2: label expression (displayFn)
+    // 3: group by expression (groupByFn)
+    // 4: disable when expression (disableWhenFn)
+    // 5: array item variable name
+    // 6: object item key variable name
+    // 7: object item value variable name
+    // 8: collection expression
+    // 9: track by expression
+    /* eslint-enable */
+
+
+    var ngOptionsDirective = ['$compile', '$document', '$parse', function($compile, $document, $parse) {
+
+        function parseOptionsExpression(optionsExp, selectElement, scope) {
+
+            var match = optionsExp.match(NG_OPTIONS_REGEXP);
+            if (!(match)) {
+                throw ngOptionsMinErr('iexp',
+                    'Expected expression in form of ' +
+                    '\'_select_ (as _label_)? for (_key_,)?_value_ in _collection_\'' +
+                    ' but got \'{0}\'. Element: {1}',
+                    optionsExp, startingTag(selectElement));
+            }
 
-    /**
-     * @ngdoc event
-     * @name ngInclude#$includeContentRequested
-     * @eventType emit on the scope ngInclude was declared in
-     * @description
-     * Emitted every time the ngInclude content is requested.
-     */
+            // Extract the parts from the ngOptions expression
+
+            // The variable name for the value of the item in the collection
+            var valueName = match[5] || match[7];
+            // The variable name for the key of the item in the collection
+            var keyName = match[6];
+
+            // An expression that generates the viewValue for an option if there is a label expression
+            var selectAs = / as /.test(match[0]) && match[1];
+            // An expression that is used to track the id of each object in the options collection
+            var trackBy = match[9];
+            // An expression that generates the viewValue for an option if there is no label expression
+            var valueFn = $parse(match[2] ? match[1] : valueName);
+            var selectAsFn = selectAs && $parse(selectAs);
+            var viewValueFn = selectAsFn || valueFn;
+            var trackByFn = trackBy && $parse(trackBy);
+
+            // Get the value by which we are going to track the option
+            // if we have a trackFn then use that (passing scope and locals)
+            // otherwise just hash the given viewValue
+            var getTrackByValueFn = trackBy ?
+                function(value, locals) { return trackByFn(scope, locals); } :
+                function getHashOfValue(value) { return hashKey(value); };
+            var getTrackByValue = function(value, key) {
+                return getTrackByValueFn(value, getLocals(value, key));
+            };
 
+            var displayFn = $parse(match[2] || match[1]);
+            var groupByFn = $parse(match[3] || '');
+            var disableWhenFn = $parse(match[4] || '');
+            var valuesFn = $parse(match[8]);
+
+            var locals = {};
+            var getLocals = keyName ? function(value, key) {
+                locals[keyName] = key;
+                locals[valueName] = value;
+                return locals;
+            } : function(value) {
+                locals[valueName] = value;
+                return locals;
+            };
 
-    /**
-     * @ngdoc event
-     * @name ngInclude#$includeContentLoaded
-     * @eventType emit on the current ngInclude scope
-     * @description
-     * Emitted every time the ngInclude content is reloaded.
-     */
-    var ngIncludeDirective = ['$http', '$templateCache', '$anchorScroll', '$animate', '$sce',
-        function($http,   $templateCache,   $anchorScroll,   $animate,   $sce) {
-            return {
-                restrict: 'ECA',
-                priority: 400,
-                terminal: true,
-                transclude: 'element',
-                controller: angular.noop,
-                compile: function(element, attr) {
-                    var srcExp = attr.ngInclude || attr.src,
-                        onloadExp = attr.onload || '',
-                        autoScrollExp = attr.autoscroll;
 
-                    return function(scope, $element, $attr, ctrl, $transclude) {
-                        var changeCounter = 0,
-                            currentScope,
-                            previousElement,
-                            currentElement;
+            function Option(selectValue, viewValue, label, group, disabled) {
+                this.selectValue = selectValue;
+                this.viewValue = viewValue;
+                this.label = label;
+                this.group = group;
+                this.disabled = disabled;
+            }
 
-                        var cleanupLastIncludeContent = function() {
-                            if(previousElement) {
-                                previousElement.remove();
-                                previousElement = null;
-                            }
-                            if(currentScope) {
-                                currentScope.$destroy();
-                                currentScope = null;
-                            }
-                            if(currentElement) {
-                                $animate.leave(currentElement, function() {
-                                    previousElement = null;
-                                });
-                                previousElement = currentElement;
-                                currentElement = null;
-                            }
-                        };
+            function getOptionValuesKeys(optionValues) {
+                var optionValuesKeys;
 
-                        scope.$watch($sce.parseAsResourceUrl(srcExp), function ngIncludeWatchAction(src) {
-                            var afterAnimation = function() {
-                                if (isDefined(autoScrollExp) && (!autoScrollExp || scope.$eval(autoScrollExp))) {
-                                    $anchorScroll();
-                                }
-                            };
-                            var thisChangeId = ++changeCounter;
+                if (!keyName && isArrayLike(optionValues)) {
+                    optionValuesKeys = optionValues;
+                } else {
+                    // if object, extract keys, in enumeration order, unsorted
+                    optionValuesKeys = [];
+                    for (var itemKey in optionValues) {
+                        if (optionValues.hasOwnProperty(itemKey) && itemKey.charAt(0) !== '$') {
+                            optionValuesKeys.push(itemKey);
+                        }
+                    }
+                }
+                return optionValuesKeys;
+            }
 
-                            if (src) {
-                                $http.get(src, {cache: $templateCache}).success(function(response) {
-                                    if (thisChangeId !== changeCounter) return;
-                                    var newScope = scope.$new();
-                                    ctrl.template = response;
+            return {
+                trackBy: trackBy,
+                getTrackByValue: getTrackByValue,
+                getWatchables: $parse(valuesFn, function(optionValues) {
+                    // Create a collection of things that we would like to watch (watchedArray)
+                    // so that they can all be watched using a single $watchCollection
+                    // that only runs the handler once if anything changes
+                    var watchedArray = [];
+                    optionValues = optionValues || [];
+
+                    var optionValuesKeys = getOptionValuesKeys(optionValues);
+                    var optionValuesLength = optionValuesKeys.length;
+                    for (var index = 0; index < optionValuesLength; index++) {
+                        var key = (optionValues === optionValuesKeys) ? index : optionValuesKeys[index];
+                        var value = optionValues[key];
+
+                        var locals = getLocals(value, key);
+                        var selectValue = getTrackByValueFn(value, locals);
+                        watchedArray.push(selectValue);
+
+                        // Only need to watch the displayFn if there is a specific label expression
+                        if (match[2] || match[1]) {
+                            var label = displayFn(scope, locals);
+                            watchedArray.push(label);
+                        }
 
-                                    // Note: This will also link all children of ng-include that were contained in the original
-                                    // html. If that content contains controllers, ... they could pollute/change the scope.
-                                    // However, using ng-include on an element with additional content does not make sense...
-                                    // Note: We can't remove them in the cloneAttchFn of $transclude as that
-                                    // function is called before linking the content, which would apply child
-                                    // directives to non existing elements.
-                                    var clone = $transclude(newScope, function(clone) {
-                                        cleanupLastIncludeContent();
-                                        $animate.enter(clone, null, $element, afterAnimation);
-                                    });
+                        // Only need to watch the disableWhenFn if there is a specific disable expression
+                        if (match[4]) {
+                            var disableWhen = disableWhenFn(scope, locals);
+                            watchedArray.push(disableWhen);
+                        }
+                    }
+                    return watchedArray;
+                }),
 
-                                    currentScope = newScope;
-                                    currentElement = clone;
+                getOptions: function() {
+
+                    var optionItems = [];
+                    var selectValueMap = {};
+
+                    // The option values were already computed in the `getWatchables` fn,
+                    // which must have been called to trigger `getOptions`
+                    var optionValues = valuesFn(scope) || [];
+                    var optionValuesKeys = getOptionValuesKeys(optionValues);
+                    var optionValuesLength = optionValuesKeys.length;
+
+                    for (var index = 0; index < optionValuesLength; index++) {
+                        var key = (optionValues === optionValuesKeys) ? index : optionValuesKeys[index];
+                        var value = optionValues[key];
+                        var locals = getLocals(value, key);
+                        var viewValue = viewValueFn(scope, locals);
+                        var selectValue = getTrackByValueFn(viewValue, locals);
+                        var label = displayFn(scope, locals);
+                        var group = groupByFn(scope, locals);
+                        var disabled = disableWhenFn(scope, locals);
+                        var optionItem = new Option(selectValue, viewValue, label, group, disabled);
+
+                        optionItems.push(optionItem);
+                        selectValueMap[selectValue] = optionItem;
+                    }
 
-                                    currentScope.$emit('$includeContentLoaded');
-                                    scope.$eval(onloadExp);
-                                }).error(function() {
-                                    if (thisChangeId === changeCounter) cleanupLastIncludeContent();
-                                });
-                                scope.$emit('$includeContentRequested');
-                            } else {
-                                cleanupLastIncludeContent();
-                                ctrl.template = null;
-                            }
-                        });
+                    return {
+                        items: optionItems,
+                        selectValueMap: selectValueMap,
+                        getOptionFromViewValue: function(value) {
+                            return selectValueMap[getTrackByValue(value)];
+                        },
+                        getViewValueFromOption: function(option) {
+                            // If the viewValue could be an object that may be mutated by the application,
+                            // we need to make a copy and not return the reference to the value on the option.
+                            return trackBy ? copy(option.viewValue) : option.viewValue;
+                        }
                     };
                 }
             };
-        }];
+        }
 
-// This directive is called during the $transclude call of the first `ngInclude` directive.
-// It will replace and compile the content of the element with the loaded template.
-// We need this directive so that the element content is already filled when
-// the link function of another directive on the same element as ngInclude
-// is called.
-    var ngIncludeFillContentDirective = ['$compile',
-        function($compile) {
-            return {
-                restrict: 'ECA',
-                priority: -400,
-                require: 'ngInclude',
-                link: function(scope, $element, $attr, ctrl) {
-                    $element.html(ctrl.template);
-                    $compile($element.contents())(scope);
+
+        // Support: IE 9 only
+        // We can't just jqLite('<option>') since jqLite is not smart enough
+        // to create it in <select> and IE barfs otherwise.
+        var optionTemplate = window.document.createElement('option'),
+            optGroupTemplate = window.document.createElement('optgroup');
+
+        function ngOptionsPostLink(scope, selectElement, attr, ctrls) {
+
+            var selectCtrl = ctrls[0];
+            var ngModelCtrl = ctrls[1];
+            var multiple = attr.multiple;
+
+            // The emptyOption allows the application developer to provide their own custom "empty"
+            // option when the viewValue does not match any of the option values.
+            for (var i = 0, children = selectElement.children(), ii = children.length; i < ii; i++) {
+                if (children[i].value === '') {
+                    selectCtrl.hasEmptyOption = true;
+                    selectCtrl.emptyOption = children.eq(i);
+                    break;
                 }
+            }
+
+            // The empty option will be compiled and rendered before we first generate the options
+            selectElement.empty();
+
+            var providedEmptyOption = !!selectCtrl.emptyOption;
+
+            var unknownOption = jqLite(optionTemplate.cloneNode(false));
+            unknownOption.val('?');
+
+            var options;
+            var ngOptions = parseOptionsExpression(attr.ngOptions, selectElement, scope);
+            // This stores the newly created options before they are appended to the select.
+            // Since the contents are removed from the fragment when it is appended,
+            // we only need to create it once.
+            var listFragment = $document[0].createDocumentFragment();
+
+            // Overwrite the implementation. ngOptions doesn't use hashes
+            selectCtrl.generateUnknownOptionValue = function(val) {
+                return '?';
             };
-        }];
 
-    /**
-     * @ngdoc directive
-     * @name ngInit
-     * @restrict AC
-     *
-     * @description
-     * The `ngInit` directive allows you to evaluate an expression in the
-     * current scope.
-     *
-     * <div class="alert alert-error">
-     * The only appropriate use of `ngInit` is for aliasing special properties of
-     * {@link ng.directive:ngRepeat `ngRepeat`}, as seen in the demo below. Besides this case, you
-     * should use {@link guide/controller controllers} rather than `ngInit`
-     * to initialize values on a scope.
-     * </div>
-     * <div class="alert alert-warning">
-     * **Note**: If you have assignment in `ngInit` along with {@link ng.$filter `$filter`}, make
-     * sure you have parenthesis for correct precedence:
-     * <pre class="prettyprint">
-     *   <div ng-init="test1 = (data | orderBy:'name')"></div>
-     * </pre>
-     * </div>
-     *
-     * @priority 450
-     *
-     * @element ANY
-     * @param {expression} ngInit {@link guide/expression Expression} to eval.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-       $scope.list = [['a', 'b'], ['c', 'd']];
-     }
-     </script>
-     <div ng-controller="Ctrl">
-     <div ng-repeat="innerList in list" ng-init="outerIndex = $index">
-     <div ng-repeat="value in innerList" ng-init="innerIndex = $index">
-     <span class="example-init">list[ {{outerIndex}} ][ {{innerIndex}} ] = {{value}};</span>
-     </div>
-     </div>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should alias index positions', function() {
-         var elements = element.all(by.css('.example-init'));
-         expect(elements.get(0).getText()).toBe('list[ 0 ][ 0 ] = a;');
-         expect(elements.get(1).getText()).toBe('list[ 0 ][ 1 ] = b;');
-         expect(elements.get(2).getText()).toBe('list[ 1 ][ 0 ] = c;');
-         expect(elements.get(3).getText()).toBe('list[ 1 ][ 1 ] = d;');
-       });
-     </file>
-     </example>
-     */
-    var ngInitDirective = ngDirective({
-        priority: 450,
-        compile: function() {
-            return {
-                pre: function(scope, element, attrs) {
-                    scope.$eval(attrs.ngInit);
+            // Update the controller methods for multiple selectable options
+            if (!multiple) {
+
+                selectCtrl.writeValue = function writeNgOptionsValue(value) {
+                    // The options might not be defined yet when ngModel tries to render
+                    if (!options) return;
+
+                    var selectedOption = selectElement[0].options[selectElement[0].selectedIndex];
+                    var option = options.getOptionFromViewValue(value);
+
+                    // Make sure to remove the selected attribute from the previously selected option
+                    // Otherwise, screen readers might get confused
+                    if (selectedOption) selectedOption.removeAttribute('selected');
+
+                    if (option) {
+                        // Don't update the option when it is already selected.
+                        // For example, the browser will select the first option by default. In that case,
+                        // most properties are set automatically - except the `selected` attribute, which we
+                        // set always
+
+                        if (selectElement[0].value !== option.selectValue) {
+                            selectCtrl.removeUnknownOption();
+
+                            selectElement[0].value = option.selectValue;
+                            option.element.selected = true;
+                        }
+
+                        option.element.setAttribute('selected', 'selected');
+                    } else {
+                        selectCtrl.selectUnknownOrEmptyOption(value);
+                    }
+                };
+
+                selectCtrl.readValue = function readNgOptionsValue() {
+
+                    var selectedOption = options.selectValueMap[selectElement.val()];
+
+                    if (selectedOption && !selectedOption.disabled) {
+                        selectCtrl.unselectEmptyOption();
+                        selectCtrl.removeUnknownOption();
+                        return options.getViewValueFromOption(selectedOption);
+                    }
+                    return null;
+                };
+
+                // If we are using `track by` then we must watch the tracked value on the model
+                // since ngModel only watches for object identity change
+                // FIXME: When a user selects an option, this watch will fire needlessly
+                if (ngOptions.trackBy) {
+                    scope.$watch(
+                        function() { return ngOptions.getTrackByValue(ngModelCtrl.$viewValue); },
+                        function() { ngModelCtrl.$render(); }
+                    );
+                }
+
+            } else {
+
+                selectCtrl.writeValue = function writeNgOptionsMultiple(values) {
+                    // The options might not be defined yet when ngModel tries to render
+                    if (!options) return;
+
+                    // Only set `<option>.selected` if necessary, in order to prevent some browsers from
+                    // scrolling to `<option>` elements that are outside the `<select>` element's viewport.
+                    var selectedOptions = values && values.map(getAndUpdateSelectedOption) || [];
+
+                    options.items.forEach(function(option) {
+                        if (option.element.selected && !includes(selectedOptions, option)) {
+                            option.element.selected = false;
+                        }
+                    });
+                };
+
+
+                selectCtrl.readValue = function readNgOptionsMultiple() {
+                    var selectedValues = selectElement.val() || [],
+                        selections = [];
+
+                    forEach(selectedValues, function(value) {
+                        var option = options.selectValueMap[value];
+                        if (option && !option.disabled) selections.push(options.getViewValueFromOption(option));
+                    });
+
+                    return selections;
+                };
+
+                // If we are using `track by` then we must watch these tracked values on the model
+                // since ngModel only watches for object identity change
+                if (ngOptions.trackBy) {
+
+                    scope.$watchCollection(function() {
+                        if (isArray(ngModelCtrl.$viewValue)) {
+                            return ngModelCtrl.$viewValue.map(function(value) {
+                                return ngOptions.getTrackByValue(value);
+                            });
+                        }
+                    }, function() {
+                        ngModelCtrl.$render();
+                    });
+
+                }
+            }
+
+            if (providedEmptyOption) {
+
+                // compile the element since there might be bindings in it
+                $compile(selectCtrl.emptyOption)(scope);
+
+                selectElement.prepend(selectCtrl.emptyOption);
+
+                if (selectCtrl.emptyOption[0].nodeType === NODE_TYPE_COMMENT) {
+                    // This means the empty option has currently no actual DOM node, probably because
+                    // it has been modified by a transclusion directive.
+                    selectCtrl.hasEmptyOption = false;
+
+                    // Redefine the registerOption function, which will catch
+                    // options that are added by ngIf etc. (rendering of the node is async because of
+                    // lazy transclusion)
+                    selectCtrl.registerOption = function(optionScope, optionEl) {
+                        if (optionEl.val() === '') {
+                            selectCtrl.hasEmptyOption = true;
+                            selectCtrl.emptyOption = optionEl;
+                            selectCtrl.emptyOption.removeClass('ng-scope');
+                            // This ensures the new empty option is selected if previously no option was selected
+                            ngModelCtrl.$render();
+
+                            optionEl.on('$destroy', function() {
+                                var needsRerender = selectCtrl.$isEmptyOptionSelected();
+
+                                selectCtrl.hasEmptyOption = false;
+                                selectCtrl.emptyOption = undefined;
+
+                                if (needsRerender) ngModelCtrl.$render();
+                            });
+                        }
+                    };
+
+                } else {
+                    // remove the class, which is added automatically because we recompile the element and it
+                    // becomes the compilation root
+                    selectCtrl.emptyOption.removeClass('ng-scope');
+                }
+
+            }
+
+            // We will re-render the option elements if the option values or labels change
+            scope.$watchCollection(ngOptions.getWatchables, updateOptions);
+
+            // ------------------------------------------------------------------ //
+
+            function addOptionElement(option, parent) {
+                var optionElement = optionTemplate.cloneNode(false);
+                parent.appendChild(optionElement);
+                updateOptionElement(option, optionElement);
+            }
+
+            function getAndUpdateSelectedOption(viewValue) {
+                var option = options.getOptionFromViewValue(viewValue);
+                var element = option && option.element;
+
+                if (element && !element.selected) element.selected = true;
+
+                return option;
+            }
+
+            function updateOptionElement(option, element) {
+                option.element = element;
+                element.disabled = option.disabled;
+                // Support: IE 11 only, Edge 12-13 only
+                // NOTE: The label must be set before the value, otherwise IE 11 & Edge create unresponsive
+                // selects in certain circumstances when multiple selects are next to each other and display
+                // the option list in listbox style, i.e. the select is [multiple], or specifies a [size].
+                // See https://github.com/angular/angular.js/issues/11314 for more info.
+                // This is unfortunately untestable with unit / e2e tests
+                if (option.label !== element.label) {
+                    element.label = option.label;
+                    element.textContent = option.label;
+                }
+                element.value = option.selectValue;
+            }
+
+            function updateOptions() {
+                var previousValue = options && selectCtrl.readValue();
+
+                // We must remove all current options, but cannot simply set innerHTML = null
+                // since the providedEmptyOption might have an ngIf on it that inserts comments which we
+                // must preserve.
+                // Instead, iterate over the current option elements and remove them or their optgroup
+                // parents
+                if (options) {
+
+                    for (var i = options.items.length - 1; i >= 0; i--) {
+                        var option = options.items[i];
+                        if (isDefined(option.group)) {
+                            jqLiteRemove(option.element.parentNode);
+                        } else {
+                            jqLiteRemove(option.element);
+                        }
+                    }
+                }
+
+                options = ngOptions.getOptions();
+
+                var groupElementMap = {};
+
+                options.items.forEach(function addOption(option) {
+                    var groupElement;
+
+                    if (isDefined(option.group)) {
+
+                        // This option is to live in a group
+                        // See if we have already created this group
+                        groupElement = groupElementMap[option.group];
+
+                        if (!groupElement) {
+
+                            groupElement = optGroupTemplate.cloneNode(false);
+                            listFragment.appendChild(groupElement);
+
+                            // Update the label on the group element
+                            // "null" is special cased because of Safari
+                            groupElement.label = option.group === null ? 'null' : option.group;
+
+                            // Store it for use later
+                            groupElementMap[option.group] = groupElement;
+                        }
+
+                        addOptionElement(option, groupElement);
+
+                    } else {
+
+                        // This option is not in a group
+                        addOptionElement(option, listFragment);
+                    }
+                });
+
+                selectElement[0].appendChild(listFragment);
+
+                ngModelCtrl.$render();
+
+                // Check to see if the value has changed due to the update to the options
+                if (!ngModelCtrl.$isEmpty(previousValue)) {
+                    var nextValue = selectCtrl.readValue();
+                    var isNotPrimitive = ngOptions.trackBy || multiple;
+                    if (isNotPrimitive ? !equals(previousValue, nextValue) : previousValue !== nextValue) {
+                        ngModelCtrl.$setViewValue(nextValue);
+                        ngModelCtrl.$render();
+                    }
                 }
-            };
+            }
         }
-    });
 
-    /**
-     * @ngdoc directive
-     * @name ngNonBindable
-     * @restrict AC
-     * @priority 1000
-     *
-     * @description
-     * The `ngNonBindable` directive tells Angular not to compile or bind the contents of the current
-     * DOM element. This is useful if the element contains what appears to be Angular directives and
-     * bindings but which should be ignored by Angular. This could be the case if you have a site that
-     * displays snippets of code, for instance.
-     *
-     * @element ANY
-     *
-     * @example
-     * In this example there are two locations where a simple interpolation binding (`{{}}`) is present,
-     * but the one wrapped in `ngNonBindable` is left alone.
-     *
-     * @example
-     <example>
-     <file name="index.html">
-     <div>Normal: {{1 + 2}}</div>
-     <div ng-non-bindable>Ignored: {{1 + 2}}</div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check ng-non-bindable', function() {
-         expect(element(by.binding('1 + 2')).getText()).toContain('3');
-         expect(element.all(by.css('div')).last().getText()).toMatch(/1 \+ 2/);
-       });
-     </file>
-     </example>
-     */
-    var ngNonBindableDirective = ngDirective({ terminal: true, priority: 1000 });
+        return {
+            restrict: 'A',
+            terminal: true,
+            require: ['select', 'ngModel'],
+            link: {
+                pre: function ngOptionsPreLink(scope, selectElement, attr, ctrls) {
+                    // Deactivate the SelectController.register method to prevent
+                    // option directives from accidentally registering themselves
+                    // (and unwanted $destroy handlers etc.)
+                    ctrls[0].registerOption = noop;
+                },
+                post: ngOptionsPostLink
+            }
+        };
+    }];
 
     /**
      * @ngdoc directive
@@ -19507,27 +31067,27 @@
      * @description
      * `ngPluralize` is a directive that displays messages according to en-US localization rules.
      * These rules are bundled with angular.js, but can be overridden
-     * (see {@link guide/i18n Angular i18n} dev guide). You configure ngPluralize directive
+     * (see {@link guide/i18n AngularJS i18n} dev guide). You configure ngPluralize directive
      * by specifying the mappings between
      * [plural categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html)
      * and the strings to be displayed.
      *
-     * # Plural categories and explicit number rules
+     * ## Plural categories and explicit number rules
      * There are two
      * [plural categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html)
-     * in Angular's default en-US locale: "one" and "other".
+     * in AngularJS's default en-US locale: "one" and "other".
      *
      * While a plural category may match many numbers (for example, in en-US locale, "other" can match
      * any number that is not 1), an explicit number rule can only match one number. For example, the
      * explicit number rule for "3" matches the number 3. There are examples of plural categories
      * and explicit number rules throughout the rest of this documentation.
      *
-     * # Configuring ngPluralize
+     * ## Configuring ngPluralize
      * You configure ngPluralize by providing 2 attributes: `count` and `when`.
      * You can also provide an optional attribute, `offset`.
      *
      * The value of the `count` attribute can be either a string or an {@link guide/expression
- * Angular expression}; these are evaluated on the current scope for its bound value.
+ * AngularJS expression}; these are evaluated on the current scope for its bound value.
      *
      * The `when` attribute specifies the mappings between plural categories and the actual
      * string to be displayed. The value of the attribute should be a JSON object.
@@ -19537,8 +31097,8 @@
      * ```html
      * <ng-pluralize count="personCount"
      when="{'0': 'Nobody is viewing.',
- *                      'one': '1 person is viewing.',
- *                      'other': '{} people are viewing.'}">
+     *                      'one': '1 person is viewing.',
+     *                      'other': '{} people are viewing.'}">
      * </ng-pluralize>
      *```
      *
@@ -19549,11 +31109,14 @@
      * show "a dozen people are viewing".
      *
      * You can use a set of closed braces (`{}`) as a placeholder for the number that you want substituted
-     * into pluralized strings. In the previous example, Angular will replace `{}` with
+     * into pluralized strings. In the previous example, AngularJS will replace `{}` with
      * <span ng-non-bindable>`{{personCount}}`</span>. The closed braces `{}` is a placeholder
      * for <span ng-non-bindable>{{numberExpression}}</span>.
      *
-     * # Configuring ngPluralize with offset
+     * If no rule is defined for a category, then an empty string is displayed and a warning is generated.
+     * Note that some locales define more categories than `one` and `other`. For example, fr-fr defines `few` and `many`.
+     *
+     * ## Configuring ngPluralize with offset
      * The `offset` attribute allows further customization of pluralized text, which can result in
      * a better user experience. For example, instead of the message "4 people are viewing this document",
      * you might display "John, Kate and 2 others are viewing this document".
@@ -19563,10 +31126,10 @@
      * ```html
      * <ng-pluralize count="personCount" offset=2
      *               when="{'0': 'Nobody is viewing.',
- *                      '1': '{{person1}} is viewing.',
- *                      '2': '{{person1}} and {{person2}} are viewing.',
- *                      'one': '{{person1}}, {{person2}} and one other person are viewing.',
- *                      'other': '{{person1}}, {{person2}} and {} other people are viewing.'}">
+     *                      '1': '{{person1}} is viewing.',
+     *                      '2': '{{person1}} and {{person2}} are viewing.',
+     *                      'one': '{{person1}}, {{person2}} and one other person are viewing.',
+     *                      'other': '{{person1}}, {{person2}} and {} other people are viewing.'}">
      * </ng-pluralize>
      * ```
      *
@@ -19574,8 +31137,8 @@
      * three explicit number rules 0, 1 and 2.
      * When one person, perhaps John, views the document, "John is viewing" will be shown.
      * When three people view the document, no explicit number rule is found, so
-     * an offset of 2 is taken off 3, and Angular uses 1 to decide the plural category.
-     * In this case, plural category 'one' is matched and "John, Marry and one other person are viewing"
+     * an offset of 2 is taken off 3, and AngularJS uses 1 to decide the plural category.
+     * In this case, plural category 'one' is matched and "John, Mary and one other person are viewing"
      * is shown.
      *
      * Note that when you specify offsets, you must provide explicit number rules for
@@ -19588,19 +31151,20 @@
      * @param {number=} offset Offset to deduct from the total number.
      *
      * @example
-     <example>
+     <example module="pluralizeExample" name="ng-pluralize">
      <file name="index.html">
      <script>
-     function Ctrl($scope) {
-            $scope.person1 = 'Igor';
-            $scope.person2 = 'Misko';
-            $scope.personCount = 1;
-          }
+     angular.module('pluralizeExample', [])
+     .controller('ExampleController', ['$scope', function($scope) {
+              $scope.person1 = 'Igor';
+              $scope.person2 = 'Misko';
+              $scope.personCount = 1;
+            }]);
      </script>
-     <div ng-controller="Ctrl">
-     Person 1:<input type="text" ng-model="person1" value="Igor" /><br/>
-     Person 2:<input type="text" ng-model="person2" value="Misko" /><br/>
-     Number of People:<input type="text" ng-model="personCount" value="1" /><br/>
+     <div ng-controller="ExampleController">
+     <label>Person 1:<input type="text" ng-model="person1" value="Igor" /></label><br/>
+     <label>Person 2:<input type="text" ng-model="person2" value="Misko" /></label><br/>
+     <label>Number of People:<input type="text" ng-model="personCount" value="1" /></label><br/>
 
      <!--- Example with simple pluralization rules for en locale --->
      Without Offset:
@@ -19670,10 +31234,11 @@
      </file>
      </example>
      */
-    var ngPluralizeDirective = ['$locale', '$interpolate', function($locale, $interpolate) {
-        var BRACE = /{}/g;
+    var ngPluralizeDirective = ['$locale', '$interpolate', '$log', function($locale, $interpolate, $log) {
+        var BRACE = /{}/g,
+            IS_WHEN = /^when(Minus)?(.+)$/;
+
         return {
-            restrict: 'EA',
             link: function(scope, element, attr) {
                 var numberExp = attr.count,
                     whenExp = attr.$attr.when && element.attr(attr.$attr.when), // we have {{}} in attrs
@@ -19682,41 +31247,64 @@
                     whensExpFns = {},
                     startSymbol = $interpolate.startSymbol(),
                     endSymbol = $interpolate.endSymbol(),
-                    isWhen = /^when(Minus)?(.+)$/;
+                    braceReplacement = startSymbol + numberExp + '-' + offset + endSymbol,
+                    watchRemover = angular.noop,
+                    lastCount;
 
                 forEach(attr, function(expression, attributeName) {
-                    if (isWhen.test(attributeName)) {
-                        whens[lowercase(attributeName.replace('when', '').replace('Minus', '-'))] =
-                            element.attr(attr.$attr[attributeName]);
+                    var tmpMatch = IS_WHEN.exec(attributeName);
+                    if (tmpMatch) {
+                        var whenKey = (tmpMatch[1] ? '-' : '') + lowercase(tmpMatch[2]);
+                        whens[whenKey] = element.attr(attr.$attr[attributeName]);
                     }
                 });
                 forEach(whens, function(expression, key) {
-                    whensExpFns[key] =
-                        $interpolate(expression.replace(BRACE, startSymbol + numberExp + '-' +
-                        offset + endSymbol));
+                    whensExpFns[key] = $interpolate(expression.replace(BRACE, braceReplacement));
+
                 });
 
-                scope.$watch(function ngPluralizeWatch() {
-                    var value = parseFloat(scope.$eval(numberExp));
+                scope.$watch(numberExp, function ngPluralizeWatchAction(newVal) {
+                    var count = parseFloat(newVal);
+                    var countIsNaN = isNumberNaN(count);
 
-                    if (!isNaN(value)) {
-                        //if explicit number rule such as 1, 2, 3... is defined, just use it. Otherwise,
-                        //check it against pluralization rules in $locale service
-                        if (!(value in whens)) value = $locale.pluralCat(value - offset);
-                        return whensExpFns[value](scope, element, true);
-                    } else {
-                        return '';
+                    if (!countIsNaN && !(count in whens)) {
+                        // If an explicit number rule such as 1, 2, 3... is defined, just use it.
+                        // Otherwise, check it against pluralization rules in $locale service.
+                        count = $locale.pluralCat(count - offset);
+                    }
+
+                    // If both `count` and `lastCount` are NaN, we don't need to re-register a watch.
+                    // In JS `NaN !== NaN`, so we have to explicitly check.
+                    if ((count !== lastCount) && !(countIsNaN && isNumberNaN(lastCount))) {
+                        watchRemover();
+                        var whenExpFn = whensExpFns[count];
+                        if (isUndefined(whenExpFn)) {
+                            if (newVal != null) {
+                                $log.debug('ngPluralize: no rule defined for \'' + count + '\' in ' + whenExp);
+                            }
+                            watchRemover = noop;
+                            updateElementText();
+                        } else {
+                            watchRemover = scope.$watch(whenExpFn, updateElementText);
+                        }
+                        lastCount = count;
                     }
-                }, function ngPluralizeWatchAction(newVal) {
-                    element.text(newVal);
                 });
+
+                function updateElementText(newText) {
+                    element.text(newText || '');
+                }
             }
         };
     }];
 
+    /* exported ngRepeatDirective */
+
     /**
      * @ngdoc directive
      * @name ngRepeat
+     * @multiElement
+     * @restrict A
      *
      * @description
      * The `ngRepeat` directive instantiates a template once per item from a collection. Each template
@@ -19734,10 +31322,200 @@
      * | `$even`   | {@type boolean} | true if the iterator position `$index` is even (otherwise false).           |
      * | `$odd`    | {@type boolean} | true if the iterator position `$index` is odd (otherwise false).            |
      *
-     * Creating aliases for these properties is possible with {@link ng.directive:ngInit `ngInit`}.
-     * This may be useful when, for instance, nesting ngRepeats.
+     * <div class="alert alert-info">
+     *   Creating aliases for these properties is possible with {@link ng.directive:ngInit `ngInit`}.
+     *   This may be useful when, for instance, nesting ngRepeats.
+     * </div>
+     *
+     *
+     * ## Iterating over object properties
+     *
+     * It is possible to get `ngRepeat` to iterate over the properties of an object using the following
+     * syntax:
+     *
+     * ```js
+     * <div ng-repeat="(key, value) in myObj"> ... </div>
+     * ```
+     *
+     * However, there are a few limitations compared to array iteration:
+     *
+     * - The JavaScript specification does not define the order of keys
+     *   returned for an object, so AngularJS relies on the order returned by the browser
+     *   when running `for key in myObj`. Browsers generally follow the strategy of providing
+     *   keys in the order in which they were defined, although there are exceptions when keys are deleted
+     *   and reinstated. See the
+     *   [MDN page on `delete` for more info](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/delete#Cross-browser_notes).
+     *
+     * - `ngRepeat` will silently *ignore* object keys starting with `$`, because
+     *   it's a prefix used by AngularJS for public (`$`) and private (`$$`) properties.
+     *
+     * - The built-in filters {@link ng.orderBy orderBy} and {@link ng.filter filter} do not work with
+     *   objects, and will throw an error if used with one.
+     *
+     * If you are hitting any of these limitations, the recommended workaround is to convert your object into an array
+     * that is sorted into the order that you prefer before providing it to `ngRepeat`. You could
+     * do this with a filter such as [toArrayFilter](http://ngmodules.org/modules/angular-toArrayFilter)
+     * or implement a `$watch` on the object yourself.
+     *
+     *
+     * ## Tracking and Duplicates
+     *
+     * `ngRepeat` uses {@link $rootScope.Scope#$watchCollection $watchCollection} to detect changes in
+     * the collection. When a change happens, `ngRepeat` then makes the corresponding changes to the DOM:
+     *
+     * * When an item is added, a new instance of the template is added to the DOM.
+     * * When an item is removed, its template instance is removed from the DOM.
+     * * When items are reordered, their respective templates are reordered in the DOM.
+     *
+     * To minimize creation of DOM elements, `ngRepeat` uses a function
+     * to "keep track" of all items in the collection and their corresponding DOM elements.
+     * For example, if an item is added to the collection, `ngRepeat` will know that all other items
+     * already have DOM elements, and will not re-render them.
+     *
+     * All different types of tracking functions, their syntax, and and their support for duplicate
+     * items in collections can be found in the
+     * {@link ngRepeat#ngRepeat-arguments ngRepeat expression description}.
      *
-     * # Special repeat start and end points
+     * <div class="alert alert-success">
+     * **Best Practice:** If you are working with objects that have a unique identifier property, you
+     * should track by this identifier instead of the object instance,
+     * e.g. `item in items track by item.id`.
+     * Should you reload your data later, `ngRepeat` will not have to rebuild the DOM elements for items
+     * it has already rendered, even if the JavaScript objects in the collection have been substituted
+     * for new ones. For large collections, this significantly improves rendering performance.
+     * </div>
+     *
+     * ### Effects of DOM Element re-use
+     *
+     * When DOM elements are re-used, ngRepeat updates the scope for the element, which will
+     * automatically update any active bindings on the template. However, other
+     * functionality will not be updated, because the element is not re-created:
+     *
+     * - Directives are not re-compiled
+     * - {@link guide/expression#one-time-binding one-time expressions} on the repeated template are not
+     * updated if they have stabilized.
+     *
+     * The above affects all kinds of element re-use due to tracking, but may be especially visible
+     * when tracking by `$index` due to the way ngRepeat re-uses elements.
+     *
+     * The following example shows the effects of different actions with tracking:
+
+     <example module="ngRepeat" name="ngRepeat-tracking" deps="angular-animate.js" animations="true">
+     <file name="script.js">
+     angular.module('ngRepeat', ['ngAnimate']).controller('repeatController', function($scope) {
+        var friends = [
+          {name:'John', age:25},
+          {name:'Mary', age:40},
+          {name:'Peter', age:85}
+        ];
+
+        $scope.removeFirst = function() {
+          $scope.friends.shift();
+        };
+
+        $scope.updateAge = function() {
+          $scope.friends.forEach(function(el) {
+            el.age = el.age + 5;
+          });
+        };
+
+        $scope.copy = function() {
+          $scope.friends = angular.copy($scope.friends);
+        };
+
+        $scope.reset = function() {
+          $scope.friends = angular.copy(friends);
+        };
+
+        $scope.reset();
+      });
+     </file>
+     <file name="index.html">
+     <div ng-controller="repeatController">
+     <ol>
+     <li>When you click "Update Age", only the first list updates the age, because all others have
+     a one-time binding on the age property. If you then click "Copy", the current friend list
+     is copied, and now the second list updates the age, because the identity of the collection items
+     has changed and the list must be re-rendered. The 3rd and 4th list stay the same, because all the
+     items are already known according to their tracking functions.
+     </li>
+     <li>When you click "Remove First", the 4th list has the wrong age on both remaining items. This is
+     due to tracking by $index: when the first collection item is removed, ngRepeat reuses the first
+     DOM element for the new first collection item, and so on. Since the age property is one-time
+     bound, the value remains from the collection item which was previously at this index.
+     </li>
+     </ol>
+
+     <button ng-click="removeFirst()">Remove First</button>
+     <button ng-click="updateAge()">Update Age</button>
+     <button ng-click="copy()">Copy</button>
+     <br><button ng-click="reset()">Reset List</button>
+     <br>
+     <code>track by $id(friend)</code> (default):
+     <ul class="example-animate-container">
+     <li class="animate-repeat" ng-repeat="friend in friends">
+     {{friend.name}} is {{friend.age}} years old.
+     </li>
+     </ul>
+     <code>track by $id(friend)</code> (default), with age one-time binding:
+     <ul class="example-animate-container">
+     <li class="animate-repeat" ng-repeat="friend in friends">
+     {{friend.name}} is {{::friend.age}} years old.
+     </li>
+     </ul>
+     <code>track by friend.name</code>, with age one-time binding:
+     <ul class="example-animate-container">
+     <li class="animate-repeat" ng-repeat="friend in friends track by friend.name">
+     {{friend.name}}  is {{::friend.age}} years old.
+     </li>
+     </ul>
+     <code>track by $index</code>, with age one-time binding:
+     <ul class="example-animate-container">
+     <li class="animate-repeat" ng-repeat="friend in friends track by $index">
+     {{friend.name}} is {{::friend.age}} years old.
+     </li>
+     </ul>
+     </div>
+     </file>
+     <file name="animations.css">
+     .example-animate-container {
+        background:white;
+        border:1px solid black;
+        list-style:none;
+        margin:0;
+        padding:0 10px;
+      }
+
+     .animate-repeat {
+        line-height:30px;
+        list-style:none;
+        box-sizing:border-box;
+      }
+
+     .animate-repeat.ng-move,
+     .animate-repeat.ng-enter,
+     .animate-repeat.ng-leave {
+        transition:all linear 0.5s;
+      }
+
+     .animate-repeat.ng-leave.ng-leave-active,
+     .animate-repeat.ng-move,
+     .animate-repeat.ng-enter {
+        opacity:0;
+        max-height:0;
+      }
+
+     .animate-repeat.ng-leave,
+     .animate-repeat.ng-move.ng-move-active,
+     .animate-repeat.ng-enter.ng-enter-active {
+        opacity:1;
+        max-height:30px;
+      }
+     </file>
+     </example>
+
+     *
+     * ## Special repeat start and end points
      * To repeat a series of elements instead of just one parent element, ngRepeat (as well as other ng directives) supports extending
      * the range of the repeater by defining explicit start and end points by using **ng-repeat-start** and **ng-repeat-end** respectively.
      * The **ng-repeat-start** directive works the same as **ng-repeat**, but will repeat all the HTML code (including the tag it's defined on)
@@ -19782,11 +31560,13 @@
      * as **data-ng-repeat-start**, **x-ng-repeat-start** and **ng:repeat-start**).
      *
      * @animations
-     * **.enter** - when a new item is added to the list or when an item is revealed after a filter
+     * | Animation                        | Occurs                              |
+     * |----------------------------------|-------------------------------------|
+     * | {@link ng.$animate#enter enter} | when a new item is added to the list or when an item is revealed after a filter |
+     * | {@link ng.$animate#leave leave} | when an item is removed from the list or when an item is filtered out |
+     * | {@link ng.$animate#move move } | when an adjacent item is filtered out causing a reorder or when the item contents are reordered |
      *
-     * **.leave** - when an item is removed from the list or when an item is filtered out
-     *
-     * **.move** - when an adjacent item is filtered out causing a reorder or when the item contents are reordered
+     * See the example below for defining CSS animations with ngRepeat.
      *
      * @element ANY
      * @scope
@@ -19804,54 +31584,91 @@
      *
      *     For example: `(name, age) in {'adam':10, 'amalie':12}`.
      *
-     *   * `variable in expression track by tracking_expression` – You can also provide an optional tracking function
-     *     which can be used to associate the objects in the collection with the DOM elements. If no tracking function
-     *     is specified the ng-repeat associates elements by identity in the collection. It is an error to have
-     *     more than one tracking function to resolve to the same key. (This would mean that two distinct objects are
-     *     mapped to the same DOM element, which is not possible.)  Filters should be applied to the expression,
-     *     before specifying a tracking expression.
+     *   * `variable in expression track by tracking_expression` – You can also provide an optional tracking expression
+     *     which can be used to associate the objects in the collection with the DOM elements. If no tracking expression
+     *     is specified, ng-repeat associates elements by identity. It is an error to have
+     *     more than one tracking expression value resolve to the same key. (This would mean that two distinct objects are
+     *     mapped to the same DOM element, which is not possible.)
+     *
+     *     *Default tracking: $id()*: `item in items` is equivalent to `item in items track by $id(item)`.
+     *     This implies that the DOM elements will be associated by item identity in the collection.
+     *
+     *     The built-in `$id()` function can be used to assign a unique
+     *     `$$hashKey` property to each item in the collection. This property is then used as a key to associated DOM elements
+     *     with the corresponding item in the collection by identity. Moving the same object would move
+     *     the DOM element in the same way in the DOM.
+     *     Note that the default id function does not support duplicate primitive values (`number`, `string`),
+     *     but supports duplictae non-primitive values (`object`) that are *equal* in shape.
+     *
+     *     *Custom Expression*: It is possible to use any AngularJS expression to compute the tracking
+     *     id, for example with a function, or using a property on the collection items.
+     *     `item in items track by item.id` is a typical pattern when the items have a unique identifier,
+     *     e.g. database id. In this case the object identity does not matter. Two objects are considered
+     *     equivalent as long as their `id` property is same.
+     *     Tracking by unique identifier is the most performant way and should be used whenever possible.
+     *
+     *     *$index*: This special property tracks the collection items by their index, and
+     *     re-uses the DOM elements that match that index, e.g. `item in items track by $index`. This can
+     *     be used for a performance improvement if no unique identfier is available and the identity of
+     *     the collection items cannot be easily computed. It also allows duplicates.
+     *
+     *     <div class="alert alert-warning">
+     *       <strong>Note:</strong> Re-using DOM elements can have unforeseen effects. Read the
+     *       {@link ngRepeat#tracking-and-duplicates section on tracking and duplicates} for
+     *       more info.
+     *     </div>
+     *
+     *     <div class="alert alert-warning">
+     *       <strong>Note:</strong> the `track by` expression must come last - after any filters, and the alias expression:
+     *       `item in items | filter:searchText as results  track by item.id`
+     *     </div>
      *
-     *     For example: `item in items` is equivalent to `item in items track by $id(item)'. This implies that the DOM elements
-     *     will be associated by item identity in the array.
+     *   * `variable in expression as alias_expression` – You can also provide an optional alias expression which will then store the
+     *     intermediate results of the repeater after the filters have been applied. Typically this is used to render a special message
+     *     when a filter is active on the repeater, but the filtered result set is empty.
      *
-     *     For example: `item in items track by $id(item)`. A built in `$id()` function can be used to assign a unique
-     *     `$$hashKey` property to each item in the array. This property is then used as a key to associated DOM elements
-     *     with the corresponding item in the array by identity. Moving the same object in array would move the DOM
-     *     element in the same way in the DOM.
+     *     For example: `item in items | filter:x as results` will store the fragment of the repeated items as `results`, but only after
+     *     the items have been processed through the filter.
      *
-     *     For example: `item in items track by item.id` is a typical pattern when the items come from the database. In this
-     *     case the object identity does not matter. Two objects are considered equivalent as long as their `id`
-     *     property is same.
+     *     Please note that `as [variable name] is not an operator but rather a part of ngRepeat
+     *     micro-syntax so it can be used only after all filters (and not as operator, inside an expression).
      *
-     *     For example: `item in items | filter:searchText track by item.id` is a pattern that might be used to apply a filter
-     *     to items in conjunction with a tracking expression.
+     *     For example: `item in items | filter : x | orderBy : order | limitTo : limit as results track by item.id` .
      *
      * @example
-     * This example initializes the scope to a list of names and
-     * then uses `ngRepeat` to display every person:
-     <example module="ngAnimate" deps="angular-animate.js" animations="true">
+     * This example uses `ngRepeat` to display a list of people. A filter is used to restrict the displayed
+     * results by name or by age. New (entering) and removed (leaving) items are animated.
+     <example module="ngRepeat" name="ngRepeat" deps="angular-animate.js" animations="true">
      <file name="index.html">
-     <div ng-init="friends = [
-     {name:'John', age:25, gender:'boy'},
-     {name:'Jessie', age:30, gender:'girl'},
-     {name:'Johanna', age:28, gender:'girl'},
-     {name:'Joy', age:15, gender:'girl'},
-     {name:'Mary', age:28, gender:'girl'},
-     {name:'Peter', age:95, gender:'boy'},
-     {name:'Sebastian', age:50, gender:'boy'},
-     {name:'Erika', age:27, gender:'girl'},
-     {name:'Patrick', age:40, gender:'boy'},
-     {name:'Samantha', age:60, gender:'girl'}
-     ]">
+     <div ng-controller="repeatController">
      I have {{friends.length}} friends. They are:
-     <input type="search" ng-model="q" placeholder="filter friends..." />
+     <input type="search" ng-model="q" placeholder="filter friends..." aria-label="filter friends" />
      <ul class="example-animate-container">
-     <li class="animate-repeat" ng-repeat="friend in friends | filter:q">
+     <li class="animate-repeat" ng-repeat="friend in friends | filter:q as results track by friend.name">
      [{{$index + 1}}] {{friend.name}} who is {{friend.age}} years old.
      </li>
+     <li class="animate-repeat" ng-if="results.length === 0">
+     <strong>No results found...</strong>
+     </li>
      </ul>
      </div>
      </file>
+     <file name="script.js">
+     angular.module('ngRepeat', ['ngAnimate']).controller('repeatController', function($scope) {
+        $scope.friends = [
+          {name:'John', age:25, gender:'boy'},
+          {name:'Jessie', age:30, gender:'girl'},
+          {name:'Johanna', age:28, gender:'girl'},
+          {name:'Joy', age:15, gender:'girl'},
+          {name:'Mary', age:28, gender:'girl'},
+          {name:'Peter', age:95, gender:'boy'},
+          {name:'Sebastian', age:50, gender:'boy'},
+          {name:'Erika', age:27, gender:'girl'},
+          {name:'Patrick', age:40, gender:'boy'},
+          {name:'Samantha', age:60, gender:'girl'}
+        ];
+      });
+     </file>
      <file name="animations.css">
      .example-animate-container {
         background:white;
@@ -19862,7 +31679,7 @@
       }
 
      .animate-repeat {
-        line-height:40px;
+        line-height:30px;
         list-style:none;
         box-sizing:border-box;
       }
@@ -19870,7 +31687,6 @@
      .animate-repeat.ng-move,
      .animate-repeat.ng-enter,
      .animate-repeat.ng-leave {
-        -webkit-transition:all linear 0.5s;
         transition:all linear 0.5s;
       }
 
@@ -19885,7 +31701,7 @@
      .animate-repeat.ng-move.ng-move-active,
      .animate-repeat.ng-enter.ng-enter-active {
         opacity:1;
-        max-height:40px;
+        max-height:30px;
       }
      </file>
      <file name="protractor.js" type="protractor">
@@ -19912,39 +31728,74 @@
      </file>
      </example>
      */
-    var ngRepeatDirective = ['$parse', '$animate', function($parse, $animate) {
+    var ngRepeatDirective = ['$parse', '$animate', '$compile', function($parse, $animate, $compile) {
         var NG_REMOVED = '$$NG_REMOVED';
         var ngRepeatMinErr = minErr('ngRepeat');
+
+        var updateScope = function(scope, index, valueIdentifier, value, keyIdentifier, key, arrayLength) {
+            // TODO(perf): generate setters to shave off ~40ms or 1-1.5%
+            scope[valueIdentifier] = value;
+            if (keyIdentifier) scope[keyIdentifier] = key;
+            scope.$index = index;
+            scope.$first = (index === 0);
+            scope.$last = (index === (arrayLength - 1));
+            scope.$middle = !(scope.$first || scope.$last);
+            // eslint-disable-next-line no-bitwise
+            scope.$odd = !(scope.$even = (index & 1) === 0);
+        };
+
+        var getBlockStart = function(block) {
+            return block.clone[0];
+        };
+
+        var getBlockEnd = function(block) {
+            return block.clone[block.clone.length - 1];
+        };
+
+
         return {
+            restrict: 'A',
+            multiElement: true,
             transclude: 'element',
             priority: 1000,
             terminal: true,
             $$tlb: true,
-            link: function($scope, $element, $attr, ctrl, $transclude){
+            compile: function ngRepeatCompile($element, $attr) {
                 var expression = $attr.ngRepeat;
-                var match = expression.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?\s*$/),
-                    trackByExp, trackByExpGetter, trackByIdExpFn, trackByIdArrayFn, trackByIdObjFn,
-                    lhs, rhs, valueIdentifier, keyIdentifier,
-                    hashFnLocals = {$id: hashKey};
+                var ngRepeatEndComment = $compile.$$createComment('end ngRepeat', expression);
+
+                var match = expression.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+track\s+by\s+([\s\S]+?))?\s*$/);
 
                 if (!match) {
-                    throw ngRepeatMinErr('iexp', "Expected expression in form of '_item_ in _collection_[ track by _id_]' but got '{0}'.",
+                    throw ngRepeatMinErr('iexp', 'Expected expression in form of \'_item_ in _collection_[ track by _id_]\' but got \'{0}\'.',
                         expression);
                 }
 
-                lhs = match[1];
-                rhs = match[2];
-                trackByExp = match[3];
+                var lhs = match[1];
+                var rhs = match[2];
+                var aliasAs = match[3];
+                var trackByExp = match[4];
+
+                match = lhs.match(/^(?:(\s*[$\w]+)|\(\s*([$\w]+)\s*,\s*([$\w]+)\s*\))$/);
+
+                if (!match) {
+                    throw ngRepeatMinErr('iidexp', '\'_item_\' in \'_item_ in _collection_\' should be an identifier or \'(_key_, _value_)\' expression, but got \'{0}\'.',
+                        lhs);
+                }
+                var valueIdentifier = match[3] || match[1];
+                var keyIdentifier = match[2];
+
+                if (aliasAs && (!/^[$a-zA-Z_][$a-zA-Z0-9_]*$/.test(aliasAs) ||
+                    /^(null|undefined|this|\$index|\$first|\$middle|\$last|\$even|\$odd|\$parent|\$root|\$id)$/.test(aliasAs))) {
+                    throw ngRepeatMinErr('badident', 'alias \'{0}\' is invalid --- must be a valid JS identifier which is not a reserved name.',
+                        aliasAs);
+                }
+
+                var trackByExpGetter, trackByIdExpFn, trackByIdArrayFn, trackByIdObjFn;
+                var hashFnLocals = {$id: hashKey};
 
                 if (trackByExp) {
                     trackByExpGetter = $parse(trackByExp);
-                    trackByIdExpFn = function(key, value, index) {
-                        // assign key, value, and $index to the locals so that they can be used in hash functions
-                        if (keyIdentifier) hashFnLocals[keyIdentifier] = key;
-                        hashFnLocals[valueIdentifier] = value;
-                        hashFnLocals.$index = index;
-                        return trackByExpGetter($scope, hashFnLocals);
-                    };
                 } else {
                     trackByIdArrayFn = function(key, value) {
                         return hashKey(value);
@@ -19954,171 +31805,172 @@
                     };
                 }
 
-                match = lhs.match(/^(?:([\$\w]+)|\(([\$\w]+)\s*,\s*([\$\w]+)\))$/);
-                if (!match) {
-                    throw ngRepeatMinErr('iidexp', "'_item_' in '_item_ in _collection_' should be an identifier or '(_key_, _value_)' expression, but got '{0}'.",
-                        lhs);
-                }
-                valueIdentifier = match[3] || match[1];
-                keyIdentifier = match[2];
-
-                // Store a list of elements from previous run. This is a hash where key is the item from the
-                // iterator, and the value is objects with following properties.
-                //   - scope: bound scope
-                //   - element: previous element.
-                //   - index: position
-                var lastBlockMap = {};
-
-                //watch props
-                $scope.$watchCollection(rhs, function ngRepeatAction(collection){
-                    var index, length,
-                        previousNode = $element[0],     // current position of the node
-                        nextNode,
-                    // Same as lastBlockMap but it has the current state. It will become the
-                    // lastBlockMap on the next iteration.
-                        nextBlockMap = {},
-                        arrayLength,
-                        childScope,
-                        key, value, // key/value of iteration
-                        trackById,
-                        trackByIdFn,
-                        collectionKeys,
-                        block,       // last object information {scope, element, id}
-                        nextBlockOrder = [],
-                        elementsToRemove;
-
-
-                    if (isArrayLike(collection)) {
-                        collectionKeys = collection;
-                        trackByIdFn = trackByIdExpFn || trackByIdArrayFn;
-                    } else {
-                        trackByIdFn = trackByIdExpFn || trackByIdObjFn;
-                        // if object, extract keys, sort them and use to determine order of iteration over obj props
-                        collectionKeys = [];
-                        for (key in collection) {
-                            if (collection.hasOwnProperty(key) && key.charAt(0) != '$') {
-                                collectionKeys.push(key);
-                            }
+                return function ngRepeatLink($scope, $element, $attr, ctrl, $transclude) {
+
+                    if (trackByExpGetter) {
+                        trackByIdExpFn = function(key, value, index) {
+                            // assign key, value, and $index to the locals so that they can be used in hash functions
+                            if (keyIdentifier) hashFnLocals[keyIdentifier] = key;
+                            hashFnLocals[valueIdentifier] = value;
+                            hashFnLocals.$index = index;
+                            return trackByExpGetter($scope, hashFnLocals);
+                        };
+                    }
+
+                    // Store a list of elements from previous run. This is a hash where key is the item from the
+                    // iterator, and the value is objects with following properties.
+                    //   - scope: bound scope
+                    //   - clone: previous element.
+                    //   - index: position
+                    //
+                    // We are using no-proto object so that we don't need to guard against inherited props via
+                    // hasOwnProperty.
+                    var lastBlockMap = createMap();
+
+                    //watch props
+                    $scope.$watchCollection(rhs, function ngRepeatAction(collection) {
+                        var index, length,
+                            previousNode = $element[0],     // node that cloned nodes should be inserted after
+                                                            // initialized to the comment node anchor
+                            nextNode,
+                            // Same as lastBlockMap but it has the current state. It will become the
+                            // lastBlockMap on the next iteration.
+                            nextBlockMap = createMap(),
+                            collectionLength,
+                            key, value, // key/value of iteration
+                            trackById,
+                            trackByIdFn,
+                            collectionKeys,
+                            block,       // last object information {scope, element, id}
+                            nextBlockOrder,
+                            elementsToRemove;
+
+                        if (aliasAs) {
+                            $scope[aliasAs] = collection;
                         }
-                        collectionKeys.sort();
-                    }
-
-                    arrayLength = collectionKeys.length;
-
-                    // locate existing items
-                    length = nextBlockOrder.length = collectionKeys.length;
-                    for(index = 0; index < length; index++) {
-                        key = (collection === collectionKeys) ? index : collectionKeys[index];
-                        value = collection[key];
-                        trackById = trackByIdFn(key, value, index);
-                        assertNotHasOwnProperty(trackById, '`track by` id');
-                        if(lastBlockMap.hasOwnProperty(trackById)) {
-                            block = lastBlockMap[trackById];
-                            delete lastBlockMap[trackById];
-                            nextBlockMap[trackById] = block;
-                            nextBlockOrder[index] = block;
-                        } else if (nextBlockMap.hasOwnProperty(trackById)) {
-                            // restore lastBlockMap
-                            forEach(nextBlockOrder, function(block) {
-                                if (block && block.scope) lastBlockMap[block.id] = block;
-                            });
-                            // This is a duplicate and we need to throw an error
-                            throw ngRepeatMinErr('dupes', "Duplicates in a repeater are not allowed. Use 'track by' expression to specify unique keys. Repeater: {0}, Duplicate key: {1}",
-                                expression,       trackById);
+
+                        if (isArrayLike(collection)) {
+                            collectionKeys = collection;
+                            trackByIdFn = trackByIdExpFn || trackByIdArrayFn;
                         } else {
-                            // new never before seen block
-                            nextBlockOrder[index] = { id: trackById };
-                            nextBlockMap[trackById] = false;
+                            trackByIdFn = trackByIdExpFn || trackByIdObjFn;
+                            // if object, extract keys, in enumeration order, unsorted
+                            collectionKeys = [];
+                            for (var itemKey in collection) {
+                                if (hasOwnProperty.call(collection, itemKey) && itemKey.charAt(0) !== '$') {
+                                    collectionKeys.push(itemKey);
+                                }
+                            }
                         }
-                    }
 
-                    // remove existing items
-                    for (key in lastBlockMap) {
-                        // lastBlockMap is our own object so we don't need to use special hasOwnPropertyFn
-                        if (lastBlockMap.hasOwnProperty(key)) {
-                            block = lastBlockMap[key];
-                            elementsToRemove = getBlockElements(block.clone);
+                        collectionLength = collectionKeys.length;
+                        nextBlockOrder = new Array(collectionLength);
+
+                        // locate existing items
+                        for (index = 0; index < collectionLength; index++) {
+                            key = (collection === collectionKeys) ? index : collectionKeys[index];
+                            value = collection[key];
+                            trackById = trackByIdFn(key, value, index);
+                            if (lastBlockMap[trackById]) {
+                                // found previously seen block
+                                block = lastBlockMap[trackById];
+                                delete lastBlockMap[trackById];
+                                nextBlockMap[trackById] = block;
+                                nextBlockOrder[index] = block;
+                            } else if (nextBlockMap[trackById]) {
+                                // if collision detected. restore lastBlockMap and throw an error
+                                forEach(nextBlockOrder, function(block) {
+                                    if (block && block.scope) lastBlockMap[block.id] = block;
+                                });
+                                throw ngRepeatMinErr('dupes',
+                                    'Duplicates in a repeater are not allowed. Use \'track by\' expression to specify unique keys. Repeater: {0}, Duplicate key: {1}, Duplicate value: {2}',
+                                    expression, trackById, value);
+                            } else {
+                                // new never before seen block
+                                nextBlockOrder[index] = {id: trackById, scope: undefined, clone: undefined};
+                                nextBlockMap[trackById] = true;
+                            }
+                        }
+
+                        // remove leftover items
+                        for (var blockKey in lastBlockMap) {
+                            block = lastBlockMap[blockKey];
+                            elementsToRemove = getBlockNodes(block.clone);
                             $animate.leave(elementsToRemove);
-                            forEach(elementsToRemove, function(element) { element[NG_REMOVED] = true; });
+                            if (elementsToRemove[0].parentNode) {
+                                // if the element was not removed yet because of pending animation, mark it as deleted
+                                // so that we can ignore it later
+                                for (index = 0, length = elementsToRemove.length; index < length; index++) {
+                                    elementsToRemove[index][NG_REMOVED] = true;
+                                }
+                            }
                             block.scope.$destroy();
                         }
-                    }
 
-                    // we are not using forEach for perf reasons (trying to avoid #call)
-                    for (index = 0, length = collectionKeys.length; index < length; index++) {
-                        key = (collection === collectionKeys) ? index : collectionKeys[index];
-                        value = collection[key];
-                        block = nextBlockOrder[index];
-                        if (nextBlockOrder[index - 1]) previousNode = getBlockEnd(nextBlockOrder[index - 1]);
+                        // we are not using forEach for perf reasons (trying to avoid #call)
+                        for (index = 0; index < collectionLength; index++) {
+                            key = (collection === collectionKeys) ? index : collectionKeys[index];
+                            value = collection[key];
+                            block = nextBlockOrder[index];
 
-                        if (block.scope) {
-                            // if we have already seen this object, then we need to reuse the
-                            // associated scope/element
-                            childScope = block.scope;
+                            if (block.scope) {
+                                // if we have already seen this object, then we need to reuse the
+                                // associated scope/element
 
-                            nextNode = previousNode;
-                            do {
-                                nextNode = nextNode.nextSibling;
-                            } while(nextNode && nextNode[NG_REMOVED]);
+                                nextNode = previousNode;
 
-                            if (getBlockStart(block) != nextNode) {
-                                // existing item which got moved
-                                $animate.move(getBlockElements(block.clone), null, jqLite(previousNode));
-                            }
-                            previousNode = getBlockEnd(block);
-                        } else {
-                            // new item which we don't know about
-                            childScope = $scope.$new();
-                        }
+                                // skip nodes that are already pending removal via leave animation
+                                do {
+                                    nextNode = nextNode.nextSibling;
+                                } while (nextNode && nextNode[NG_REMOVED]);
 
-                        childScope[valueIdentifier] = value;
-                        if (keyIdentifier) childScope[keyIdentifier] = key;
-                        childScope.$index = index;
-                        childScope.$first = (index === 0);
-                        childScope.$last = (index === (arrayLength - 1));
-                        childScope.$middle = !(childScope.$first || childScope.$last);
-                        // jshint bitwise: false
-                        childScope.$odd = !(childScope.$even = (index&1) === 0);
-                        // jshint bitwise: true
-
-                        if (!block.scope) {
-                            $transclude(childScope, function(clone) {
-                                clone[clone.length++] = document.createComment(' end ngRepeat: ' + expression + ' ');
-                                $animate.enter(clone, null, jqLite(previousNode));
-                                previousNode = clone;
-                                block.scope = childScope;
-                                // Note: We only need the first/last node of the cloned nodes.
-                                // However, we need to keep the reference to the jqlite wrapper as it might be changed later
-                                // by a directive with templateUrl when it's template arrives.
-                                block.clone = clone;
-                                nextBlockMap[block.id] = block;
-                            });
+                                if (getBlockStart(block) !== nextNode) {
+                                    // existing item which got moved
+                                    $animate.move(getBlockNodes(block.clone), null, previousNode);
+                                }
+                                previousNode = getBlockEnd(block);
+                                updateScope(block.scope, index, valueIdentifier, value, keyIdentifier, key, collectionLength);
+                            } else {
+                                // new item which we don't know about
+                                $transclude(function ngRepeatTransclude(clone, scope) {
+                                    block.scope = scope;
+                                    // http://jsperf.com/clone-vs-createcomment
+                                    var endNode = ngRepeatEndComment.cloneNode(false);
+                                    clone[clone.length++] = endNode;
+
+                                    $animate.enter(clone, null, previousNode);
+                                    previousNode = endNode;
+                                    // Note: We only need the first/last node of the cloned nodes.
+                                    // However, we need to keep the reference to the jqlite wrapper as it might be changed later
+                                    // by a directive with templateUrl when its template arrives.
+                                    block.clone = clone;
+                                    nextBlockMap[block.id] = block;
+                                    updateScope(block.scope, index, valueIdentifier, value, keyIdentifier, key, collectionLength);
+                                });
+                            }
                         }
-                    }
-                    lastBlockMap = nextBlockMap;
-                });
+                        lastBlockMap = nextBlockMap;
+                    });
+                };
             }
         };
-
-        function getBlockStart(block) {
-            return block.clone[0];
-        }
-
-        function getBlockEnd(block) {
-            return block.clone[block.clone.length - 1];
-        }
     }];
 
+    var NG_HIDE_CLASS = 'ng-hide';
+    var NG_HIDE_IN_PROGRESS_CLASS = 'ng-hide-animate';
     /**
      * @ngdoc directive
      * @name ngShow
+     * @multiElement
      *
      * @description
-     * The `ngShow` directive shows or hides the given HTML element based on the expression
-     * provided to the ngShow attribute. The element is shown or hidden by removing or adding
-     * the `ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
-     * in AngularJS and sets the display style to none (using an !important flag).
-     * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
+     * The `ngShow` directive shows or hides the given HTML element based on the expression provided to
+     * the `ngShow` attribute.
+     *
+     * The element is shown or hidden by removing or adding the `.ng-hide` CSS class onto the element.
+     * The `.ng-hide` CSS class is predefined in AngularJS and sets the display style to none (using an
+     * `!important` flag). For CSP mode please add `angular-csp.css` to your HTML file (see
+     * {@link ng.directive:ngCsp ngCsp}).
      *
      * ```html
      * <!-- when $scope.myValue is truthy (element is visible) -->
@@ -20128,59 +31980,58 @@
      * <div ng-show="myValue" class="ng-hide"></div>
      * ```
      *
-     * When the ngShow expression evaluates to false then the ng-hide CSS class is added to the class attribute
-     * on the element causing it to become hidden. When true, the ng-hide CSS class is removed
-     * from the element causing the element not to appear hidden.
+     * When the `ngShow` expression evaluates to a falsy value then the `.ng-hide` CSS class is added
+     * to the class attribute on the element causing it to become hidden. When truthy, the `.ng-hide`
+     * CSS class is removed from the element causing the element not to appear hidden.
      *
-     * ## Why is !important used?
+     * ## Why is `!important` used?
      *
-     * You may be wondering why !important is used for the .ng-hide CSS class. This is because the `.ng-hide` selector
-     * can be easily overridden by heavier selectors. For example, something as simple
-     * as changing the display style on a HTML list item would make hidden elements appear visible.
-     * This also becomes a bigger issue when dealing with CSS frameworks.
+     * You may be wondering why `!important` is used for the `.ng-hide` CSS class. This is because the
+     * `.ng-hide` selector can be easily overridden by heavier selectors. For example, something as
+     * simple as changing the display style on a HTML list item would make hidden elements appear
+     * visible. This also becomes a bigger issue when dealing with CSS frameworks.
      *
-     * By using !important, the show and hide behavior will work as expected despite any clash between CSS selector
-     * specificity (when !important isn't used with any conflicting styles). If a developer chooses to override the
-     * styling to change how to hide an element then it is just a matter of using !important in their own CSS code.
+     * By using `!important`, the show and hide behavior will work as expected despite any clash between
+     * CSS selector specificity (when `!important` isn't used with any conflicting styles). If a
+     * developer chooses to override the styling to change how to hide an element then it is just a
+     * matter of using `!important` in their own CSS code.
      *
-     * ### Overriding .ng-hide
+     * ### Overriding `.ng-hide`
+     *
+     * By default, the `.ng-hide` class will style the element with `display: none !important`. If you
+     * wish to change the hide behavior with `ngShow`/`ngHide`, you can simply overwrite the styles for
+     * the `.ng-hide` CSS class. Note that the selector that needs to be used is actually
+     * `.ng-hide:not(.ng-hide-animate)` to cope with extra animation classes that can be added.
      *
-     * If you wish to change the hide behavior with ngShow/ngHide then this can be achieved by
-     * restating the styles for the .ng-hide class in CSS:
      * ```css
-     * .ng-hide {
- *   //!annotate CSS Specificity|Not to worry, this will override the AngularJS default...
- *   display:block!important;
- *
- *   //this is just another form of hiding an element
- *   position:absolute;
- *   top:-9999px;
- *   left:-9999px;
- * }
+     * .ng-hide:not(.ng-hide-animate) {
+     *   /&#42; These are just alternative ways of hiding an element &#42;/
+     *   display: block!important;
+     *   position: absolute;
+     *   top: -9999px;
+     *   left: -9999px;
+     * }
      * ```
      *
-     * Just remember to include the important flag so the CSS override will function.
+     * By default you don't need to override anything in CSS and the animations will work around the
+     * display style.
      *
-     * <div class="alert alert-warning">
-     * **Note:** Here is a list of values that ngShow will consider as a falsy value (case insensitive):<br />
-     * "f" / "0" / "false" / "no" / "n" / "[]"
-     * </div>
-     *
-     * ## A note about animations with ngShow
+     * @animations
+     * | Animation                                           | Occurs                                                                                                        |
+     * |-----------------------------------------------------|---------------------------------------------------------------------------------------------------------------|
+     * | {@link $animate#addClass addClass} `.ng-hide`       | After the `ngShow` expression evaluates to a non truthy value and just before the contents are set to hidden. |
+     * | {@link $animate#removeClass removeClass} `.ng-hide` | After the `ngShow` expression evaluates to a truthy value and just before contents are set to visible.        |
      *
-     * Animations in ngShow/ngHide work with the show and hide events that are triggered when the directive expression
-     * is true and false. This system works like the animation system present with ngClass except that
-     * you must also include the !important flag to override the display property
-     * so that you can perform an animation when the element is hidden during the time of the animation.
+     * Animations in `ngShow`/`ngHide` work with the show and hide events that are triggered when the
+     * directive expression is true and false. This system works like the animation system present with
+     * `ngClass` except that you must also include the `!important` flag to override the display
+     * property so that the elements are not actually hidden during the animation.
      *
      * ```css
-     * //
-     * //a working example can be found at the bottom of this page
-     * //
+     * /&#42; A working example can be found at the bottom of this page. &#42;/
      * .my-element.ng-hide-add, .my-element.ng-hide-remove {
- *   transition:0.5s linear all;
- *   display:block!important;
- * }
+     *   transition: all 0.5s linear;
+     * }
      *
      * .my-element.ng-hide-add { ... }
      * .my-element.ng-hide-add.ng-hide-add-active { ... }
@@ -20188,83 +32039,121 @@
      * .my-element.ng-hide-remove.ng-hide-remove-active { ... }
      * ```
      *
-     * @animations
-     * addClass: .ng-hide - happens after the ngShow expression evaluates to a truthy value and the just before contents are set to visible
-     * removeClass: .ng-hide - happens after the ngShow expression evaluates to a non truthy value and just before the contents are set to hidden
+     * Keep in mind that, as of AngularJS version 1.3, there is no need to change the display property
+     * to block during animation states - ngAnimate will automatically handle the style toggling for you.
      *
      * @element ANY
-     * @param {expression} ngShow If the {@link guide/expression expression} is truthy
-     *     then the element is shown or hidden respectively.
+     * @param {expression} ngShow If the {@link guide/expression expression} is truthy/falsy then the
+     *                            element is shown/hidden respectively.
      *
      * @example
-     <example module="ngAnimate" deps="angular-animate.js" animations="true">
+     * A simple example, animating the element's opacity:
+     *
+     <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-show-simple">
      <file name="index.html">
-     Click me: <input type="checkbox" ng-model="checked"><br/>
-     <div>
-     Show:
-     <div class="check-element animate-show" ng-show="checked">
-     <span class="glyphicon glyphicon-thumbs-up"></span> I show up when your checkbox is checked.
-     </div>
-     </div>
-     <div>
-     Hide:
-     <div class="check-element animate-show" ng-hide="checked">
-     <span class="glyphicon glyphicon-thumbs-down"></span> I hide when your checkbox is checked.
-     </div>
+     Show: <input type="checkbox" ng-model="checked" aria-label="Toggle ngShow"><br />
+     <div class="check-element animate-show-hide" ng-show="checked">
+     I show up when your checkbox is checked.
      </div>
      </file>
-     <file name="glyphicons.css">
-     @import url(//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-glyphicons.css);
+     <file name="animations.css">
+     .animate-show-hide.ng-hide {
+        opacity: 0;
+      }
+
+     .animate-show-hide.ng-hide-add,
+     .animate-show-hide.ng-hide-remove {
+        transition: all linear 0.5s;
+      }
+
+     .check-element {
+        border: 1px solid black;
+        opacity: 1;
+        padding: 10px;
+      }
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check ngShow', function() {
+        var checkbox = element(by.model('checked'));
+        var checkElem = element(by.css('.check-element'));
+
+        expect(checkElem.isDisplayed()).toBe(false);
+        checkbox.click();
+        expect(checkElem.isDisplayed()).toBe(true);
+      });
+     </file>
+     </example>
+     *
+     * <hr />
+     * @example
+     * A more complex example, featuring different show/hide animations:
+     *
+     <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-show-complex">
+     <file name="index.html">
+     Show: <input type="checkbox" ng-model="checked" aria-label="Toggle ngShow"><br />
+     <div class="check-element funky-show-hide" ng-show="checked">
+     I show up when your checkbox is checked.
+     </div>
      </file>
      <file name="animations.css">
-     .animate-show {
-        -webkit-transition:all linear 0.5s;
-        transition:all linear 0.5s;
-        line-height:20px;
-        opacity:1;
-        padding:10px;
-        border:1px solid black;
-        background:white;
+     body {
+        overflow: hidden;
+        perspective: 1000px;
       }
 
-     .animate-show.ng-hide-add,
-     .animate-show.ng-hide-remove {
-        display:block!important;
+     .funky-show-hide.ng-hide-add {
+        transform: rotateZ(0);
+        transform-origin: right;
+        transition: all 0.5s ease-in-out;
       }
 
-     .animate-show.ng-hide {
-        line-height:0;
-        opacity:0;
-        padding:0 10px;
+     .funky-show-hide.ng-hide-add.ng-hide-add-active {
+        transform: rotateZ(-135deg);
+      }
+
+     .funky-show-hide.ng-hide-remove {
+        transform: rotateY(90deg);
+        transform-origin: left;
+        transition: all 0.5s ease;
+      }
+
+     .funky-show-hide.ng-hide-remove.ng-hide-remove-active {
+        transform: rotateY(0);
       }
 
      .check-element {
-        padding:10px;
-        border:1px solid black;
-        background:white;
+        border: 1px solid black;
+        opacity: 1;
+        padding: 10px;
       }
      </file>
      <file name="protractor.js" type="protractor">
-     var thumbsUp = element(by.css('span.glyphicon-thumbs-up'));
-     var thumbsDown = element(by.css('span.glyphicon-thumbs-down'));
-
-     it('should check ng-show / ng-hide', function() {
-        expect(thumbsUp.isDisplayed()).toBeFalsy();
-        expect(thumbsDown.isDisplayed()).toBeTruthy();
+     it('should check ngShow', function() {
+        var checkbox = element(by.model('checked'));
+        var checkElem = element(by.css('.check-element'));
 
-        element(by.model('checked')).click();
-
-        expect(thumbsUp.isDisplayed()).toBeTruthy();
-        expect(thumbsDown.isDisplayed()).toBeFalsy();
+        expect(checkElem.isDisplayed()).toBe(false);
+        checkbox.click();
+        expect(checkElem.isDisplayed()).toBe(true);
       });
      </file>
      </example>
      */
     var ngShowDirective = ['$animate', function($animate) {
-        return function(scope, element, attr) {
-            scope.$watch(attr.ngShow, function ngShowWatchAction(value){
-                $animate[toBoolean(value) ? 'removeClass' : 'addClass'](element, 'ng-hide');
-            });
+        return {
+            restrict: 'A',
+            multiElement: true,
+            link: function(scope, element, attr) {
+                scope.$watch(attr.ngShow, function ngShowWatchAction(value) {
+                    // we're adding a temporary, animation-specific class for ng-hide since this way
+                    // we can control when the element is actually displayed on screen without having
+                    // to have a global/greedy CSS selector that breaks when other animations are run.
+                    // Read: https://github.com/angular/angular.js/issues/9103#issuecomment-58335845
+                    $animate[value ? 'removeClass' : 'addClass'](element, NG_HIDE_CLASS, {
+                        tempClasses: NG_HIDE_IN_PROGRESS_CLASS
+                    });
+                });
+            }
         };
     }];
 
@@ -20272,75 +32161,77 @@
     /**
      * @ngdoc directive
      * @name ngHide
+     * @multiElement
      *
      * @description
-     * The `ngHide` directive shows or hides the given HTML element based on the expression
-     * provided to the ngHide attribute. The element is shown or hidden by removing or adding
-     * the `ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
-     * in AngularJS and sets the display style to none (using an !important flag).
-     * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
+     * The `ngHide` directive shows or hides the given HTML element based on the expression provided to
+     * the `ngHide` attribute.
+     *
+     * The element is shown or hidden by removing or adding the `.ng-hide` CSS class onto the element.
+     * The `.ng-hide` CSS class is predefined in AngularJS and sets the display style to none (using an
+     * `!important` flag). For CSP mode please add `angular-csp.css` to your HTML file (see
+     * {@link ng.directive:ngCsp ngCsp}).
      *
      * ```html
      * <!-- when $scope.myValue is truthy (element is hidden) -->
-     * <div ng-hide="myValue"></div>
+     * <div ng-hide="myValue" class="ng-hide"></div>
      *
      * <!-- when $scope.myValue is falsy (element is visible) -->
-     * <div ng-hide="myValue" class="ng-hide"></div>
+     * <div ng-hide="myValue"></div>
      * ```
      *
-     * When the ngHide expression evaluates to true then the .ng-hide CSS class is added to the class attribute
-     * on the element causing it to become hidden. When false, the ng-hide CSS class is removed
-     * from the element causing the element not to appear hidden.
+     * When the `ngHide` expression evaluates to a truthy value then the `.ng-hide` CSS class is added
+     * to the class attribute on the element causing it to become hidden. When falsy, the `.ng-hide`
+     * CSS class is removed from the element causing the element not to appear hidden.
      *
-     * ## Why is !important used?
+     * ## Why is `!important` used?
      *
-     * You may be wondering why !important is used for the .ng-hide CSS class. This is because the `.ng-hide` selector
-     * can be easily overridden by heavier selectors. For example, something as simple
-     * as changing the display style on a HTML list item would make hidden elements appear visible.
-     * This also becomes a bigger issue when dealing with CSS frameworks.
+     * You may be wondering why `!important` is used for the `.ng-hide` CSS class. This is because the
+     * `.ng-hide` selector can be easily overridden by heavier selectors. For example, something as
+     * simple as changing the display style on a HTML list item would make hidden elements appear
+     * visible. This also becomes a bigger issue when dealing with CSS frameworks.
      *
-     * By using !important, the show and hide behavior will work as expected despite any clash between CSS selector
-     * specificity (when !important isn't used with any conflicting styles). If a developer chooses to override the
-     * styling to change how to hide an element then it is just a matter of using !important in their own CSS code.
+     * By using `!important`, the show and hide behavior will work as expected despite any clash between
+     * CSS selector specificity (when `!important` isn't used with any conflicting styles). If a
+     * developer chooses to override the styling to change how to hide an element then it is just a
+     * matter of using `!important` in their own CSS code.
      *
-     * ### Overriding .ng-hide
+     * ### Overriding `.ng-hide`
+     *
+     * By default, the `.ng-hide` class will style the element with `display: none !important`. If you
+     * wish to change the hide behavior with `ngShow`/`ngHide`, you can simply overwrite the styles for
+     * the `.ng-hide` CSS class. Note that the selector that needs to be used is actually
+     * `.ng-hide:not(.ng-hide-animate)` to cope with extra animation classes that can be added.
      *
-     * If you wish to change the hide behavior with ngShow/ngHide then this can be achieved by
-     * restating the styles for the .ng-hide class in CSS:
      * ```css
-     * .ng-hide {
- *   //!annotate CSS Specificity|Not to worry, this will override the AngularJS default...
- *   display:block!important;
- *
- *   //this is just another form of hiding an element
- *   position:absolute;
- *   top:-9999px;
- *   left:-9999px;
- * }
+     * .ng-hide:not(.ng-hide-animate) {
+     *   /&#42; These are just alternative ways of hiding an element &#42;/
+     *   display: block!important;
+     *   position: absolute;
+     *   top: -9999px;
+     *   left: -9999px;
+     * }
      * ```
      *
-     * Just remember to include the important flag so the CSS override will function.
-     *
-     * <div class="alert alert-warning">
-     * **Note:** Here is a list of values that ngHide will consider as a falsy value (case insensitive):<br />
-     * "f" / "0" / "false" / "no" / "n" / "[]"
-     * </div>
+     * By default you don't need to override in CSS anything and the animations will work around the
+     * display style.
      *
-     * ## A note about animations with ngHide
+     * @animations
+     * | Animation                                           | Occurs                                                                                                     |
+     * |-----------------------------------------------------|------------------------------------------------------------------------------------------------------------|
+     * | {@link $animate#addClass addClass} `.ng-hide`       | After the `ngHide` expression evaluates to a truthy value and just before the contents are set to hidden.  |
+     * | {@link $animate#removeClass removeClass} `.ng-hide` | After the `ngHide` expression evaluates to a non truthy value and just before contents are set to visible. |
      *
-     * Animations in ngShow/ngHide work with the show and hide events that are triggered when the directive expression
-     * is true and false. This system works like the animation system present with ngClass, except that
-     * you must also include the !important flag to override the display property so
-     * that you can perform an animation when the element is hidden during the time of the animation.
+     * Animations in `ngShow`/`ngHide` work with the show and hide events that are triggered when the
+     * directive expression is true and false. This system works like the animation system present with
+     * `ngClass` except that you must also include the `!important` flag to override the display
+     * property so that the elements are not actually hidden during the animation.
      *
      * ```css
-     * //
-     * //a working example can be found at the bottom of this page
-     * //
+     * /&#42; A working example can be found at the bottom of this page. &#42;/
      * .my-element.ng-hide-add, .my-element.ng-hide-remove {
- *   transition:0.5s linear all;
- *   display:block!important;
- * }
+     *   transition: all 0.5s linear;
+     * }
      *
      * .my-element.ng-hide-add { ... }
      * .my-element.ng-hide-add.ng-hide-add-active { ... }
@@ -20348,83 +32239,119 @@
      * .my-element.ng-hide-remove.ng-hide-remove-active { ... }
      * ```
      *
-     * @animations
-     * removeClass: .ng-hide - happens after the ngHide expression evaluates to a truthy value and just before the contents are set to hidden
-     * addClass: .ng-hide - happens after the ngHide expression evaluates to a non truthy value and just before the contents are set to visible
+     * Keep in mind that, as of AngularJS version 1.3, there is no need to change the display property
+     * to block during animation states - ngAnimate will automatically handle the style toggling for you.
      *
      * @element ANY
-     * @param {expression} ngHide If the {@link guide/expression expression} is truthy then
-     *     the element is shown or hidden respectively.
+     * @param {expression} ngHide If the {@link guide/expression expression} is truthy/falsy then the
+     *                            element is hidden/shown respectively.
      *
      * @example
-     <example module="ngAnimate" deps="angular-animate.js" animations="true">
+     * A simple example, animating the element's opacity:
+     *
+     <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-hide-simple">
      <file name="index.html">
-     Click me: <input type="checkbox" ng-model="checked"><br/>
-     <div>
-     Show:
-     <div class="check-element animate-hide" ng-show="checked">
-     <span class="glyphicon glyphicon-thumbs-up"></span> I show up when your checkbox is checked.
-     </div>
-     </div>
-     <div>
-     Hide:
-     <div class="check-element animate-hide" ng-hide="checked">
-     <span class="glyphicon glyphicon-thumbs-down"></span> I hide when your checkbox is checked.
-     </div>
+     Hide: <input type="checkbox" ng-model="checked" aria-label="Toggle ngHide"><br />
+     <div class="check-element animate-show-hide" ng-hide="checked">
+     I hide when your checkbox is checked.
      </div>
      </file>
-     <file name="glyphicons.css">
-     @import url(//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-glyphicons.css);
+     <file name="animations.css">
+     .animate-show-hide.ng-hide {
+        opacity: 0;
+      }
+
+     .animate-show-hide.ng-hide-add,
+     .animate-show-hide.ng-hide-remove {
+        transition: all linear 0.5s;
+      }
+
+     .check-element {
+        border: 1px solid black;
+        opacity: 1;
+        padding: 10px;
+      }
+     </file>
+     <file name="protractor.js" type="protractor">
+     it('should check ngHide', function() {
+        var checkbox = element(by.model('checked'));
+        var checkElem = element(by.css('.check-element'));
+
+        expect(checkElem.isDisplayed()).toBe(true);
+        checkbox.click();
+        expect(checkElem.isDisplayed()).toBe(false);
+      });
+     </file>
+     </example>
+     *
+     * <hr />
+     * @example
+     * A more complex example, featuring different show/hide animations:
+     *
+     <example module="ngAnimate" deps="angular-animate.js" animations="true" name="ng-hide-complex">
+     <file name="index.html">
+     Hide: <input type="checkbox" ng-model="checked" aria-label="Toggle ngHide"><br />
+     <div class="check-element funky-show-hide" ng-hide="checked">
+     I hide when your checkbox is checked.
+     </div>
      </file>
      <file name="animations.css">
-     .animate-hide {
-        -webkit-transition:all linear 0.5s;
-        transition:all linear 0.5s;
-        line-height:20px;
-        opacity:1;
-        padding:10px;
-        border:1px solid black;
-        background:white;
+     body {
+        overflow: hidden;
+        perspective: 1000px;
       }
 
-     .animate-hide.ng-hide-add,
-     .animate-hide.ng-hide-remove {
-        display:block!important;
+     .funky-show-hide.ng-hide-add {
+        transform: rotateZ(0);
+        transform-origin: right;
+        transition: all 0.5s ease-in-out;
       }
 
-     .animate-hide.ng-hide {
-        line-height:0;
-        opacity:0;
-        padding:0 10px;
+     .funky-show-hide.ng-hide-add.ng-hide-add-active {
+        transform: rotateZ(-135deg);
+      }
+
+     .funky-show-hide.ng-hide-remove {
+        transform: rotateY(90deg);
+        transform-origin: left;
+        transition: all 0.5s ease;
+      }
+
+     .funky-show-hide.ng-hide-remove.ng-hide-remove-active {
+        transform: rotateY(0);
       }
 
      .check-element {
-        padding:10px;
-        border:1px solid black;
-        background:white;
+        border: 1px solid black;
+        opacity: 1;
+        padding: 10px;
       }
      </file>
      <file name="protractor.js" type="protractor">
-     var thumbsUp = element(by.css('span.glyphicon-thumbs-up'));
-     var thumbsDown = element(by.css('span.glyphicon-thumbs-down'));
-
-     it('should check ng-show / ng-hide', function() {
-        expect(thumbsUp.isDisplayed()).toBeFalsy();
-        expect(thumbsDown.isDisplayed()).toBeTruthy();
+     it('should check ngHide', function() {
+        var checkbox = element(by.model('checked'));
+        var checkElem = element(by.css('.check-element'));
 
-        element(by.model('checked')).click();
-
-        expect(thumbsUp.isDisplayed()).toBeTruthy();
-        expect(thumbsDown.isDisplayed()).toBeFalsy();
+        expect(checkElem.isDisplayed()).toBe(true);
+        checkbox.click();
+        expect(checkElem.isDisplayed()).toBe(false);
       });
      </file>
      </example>
      */
     var ngHideDirective = ['$animate', function($animate) {
-        return function(scope, element, attr) {
-            scope.$watch(attr.ngHide, function ngHideWatchAction(value){
-                $animate[toBoolean(value) ? 'addClass' : 'removeClass'](element, 'ng-hide');
-            });
+        return {
+            restrict: 'A',
+            multiElement: true,
+            link: function(scope, element, attr) {
+                scope.$watch(attr.ngHide, function ngHideWatchAction(value) {
+                    // The comment inside of the ngShowDirective explains why we add and
+                    // remove a temporary class for the show/hide animation
+                    $animate[value ? 'addClass' : 'removeClass'](element,NG_HIDE_CLASS, {
+                        tempClasses: NG_HIDE_IN_PROGRESS_CLASS
+                    });
+                });
+            }
         };
     }];
 
@@ -20436,15 +32363,26 @@
      * @description
      * The `ngStyle` directive allows you to set CSS style on an HTML element conditionally.
      *
+     * @knownIssue
+     * You should not use {@link guide/interpolation interpolation} in the value of the `style`
+     * attribute, when using the `ngStyle` directive on the same element.
+     * See {@link guide/interpolation#known-issues here} for more info.
+     *
      * @element ANY
-     * @param {expression} ngStyle {@link guide/expression Expression} which evals to an
-     *      object whose keys are CSS style names and values are corresponding values for those CSS
-     *      keys.
+     * @param {expression} ngStyle
+     *
+     * {@link guide/expression Expression} which evals to an
+     * object whose keys are CSS style names and values are corresponding values for those CSS
+     * keys.
+     *
+     * Since some CSS style names are not valid keys for an object, they must be quoted.
+     * See the 'background-color' style in the example below.
      *
      * @example
-     <example>
+     <example name="ng-style">
      <file name="index.html">
-     <input type="button" value="set" ng-click="myStyle={color:'red'}">
+     <input type="button" value="set color" ng-click="myStyle={color:'red'}">
+     <input type="button" value="set background" ng-click="myStyle={'background-color':'blue'}">
      <input type="button" value="clear" ng-click="myStyle={}">
      <br/>
      <span ng-style="myStyle">Sample Text</span>
@@ -20460,7 +32398,7 @@
 
      it('should check ng-style', function() {
          expect(colorSpan.getCssValue('color')).toBe('rgba(0, 0, 0, 1)');
-         element(by.css('input[value=set]')).click();
+         element(by.css('input[value=\'set color\']')).click();
          expect(colorSpan.getCssValue('color')).toBe('rgba(255, 0, 0, 1)');
          element(by.css('input[value=clear]')).click();
          expect(colorSpan.getCssValue('color')).toBe('rgba(0, 0, 0, 1)');
@@ -20504,51 +32442,61 @@
      * </div>
 
      * @animations
-     * enter - happens after the ngSwitch contents change and the matched child element is placed inside the container
-     * leave - happens just after the ngSwitch contents change and just before the former contents are removed from the DOM
+     * | Animation                        | Occurs                              |
+     * |----------------------------------|-------------------------------------|
+     * | {@link ng.$animate#enter enter}  | after the ngSwitch contents change and the matched child element is placed inside the container |
+     * | {@link ng.$animate#leave leave}  | after the ngSwitch contents change and just before the former contents are removed from the DOM |
      *
      * @usage
+     *
+     * ```
      * <ANY ng-switch="expression">
      *   <ANY ng-switch-when="matchValue1">...</ANY>
      *   <ANY ng-switch-when="matchValue2">...</ANY>
      *   <ANY ng-switch-default>...</ANY>
      * </ANY>
+     * ```
      *
      *
      * @scope
-     * @priority 800
-     * @param {*} ngSwitch|on expression to match against <tt>ng-switch-when</tt>.
+     * @priority 1200
+     * @param {*} ngSwitch|on expression to match against <code>ng-switch-when</code>.
      * On child elements add:
      *
      * * `ngSwitchWhen`: the case statement to match against. If match then this
      *   case will be displayed. If the same match appears multiple times, all the
-     *   elements will be displayed.
+     *   elements will be displayed. It is possible to associate multiple values to
+     *   the same `ngSwitchWhen` by defining the optional attribute
+     *   `ngSwitchWhenSeparator`. The separator will be used to split the value of
+     *   the `ngSwitchWhen` attribute into multiple tokens, and the element will show
+     *   if any of the `ngSwitch` evaluates to any of these tokens.
      * * `ngSwitchDefault`: the default case when no other case match. If there
      *   are multiple default cases, all of them will be displayed when no other
      *   case match.
      *
      *
      * @example
-     <example module="ngAnimate" deps="angular-animate.js" animations="true">
+     <example module="switchExample" deps="angular-animate.js" animations="true" name="ng-switch">
      <file name="index.html">
-     <div ng-controller="Ctrl">
+     <div ng-controller="ExampleController">
      <select ng-model="selection" ng-options="item for item in items">
      </select>
-     <tt>selection={{selection}}</tt>
+     <code>selection={{selection}}</code>
      <hr/>
      <div class="animate-switch-container"
      ng-switch on="selection">
-     <div class="animate-switch" ng-switch-when="settings">Settings Div</div>
+     <div class="animate-switch" ng-switch-when="settings|options" ng-switch-when-separator="|">Settings Div</div>
      <div class="animate-switch" ng-switch-when="home">Home Span</div>
      <div class="animate-switch" ng-switch-default>default</div>
      </div>
      </div>
      </file>
      <file name="script.js">
-     function Ctrl($scope) {
-        $scope.items = ['settings', 'home', 'other'];
-        $scope.selection = $scope.items[0];
-      }
+     angular.module('switchExample', ['ngAnimate'])
+     .controller('ExampleController', ['$scope', function($scope) {
+          $scope.items = ['settings', 'home', 'options', 'other'];
+          $scope.selection = $scope.items[0];
+        }]);
      </file>
      <file name="animations.css">
      .animate-switch-container {
@@ -20564,7 +32512,6 @@
       }
 
      .animate-switch.ng-animate {
-        -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
         transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
 
         position:absolute;
@@ -20591,68 +32538,68 @@
         expect(switchElem.getText()).toMatch(/Settings Div/);
       });
      it('should change to home', function() {
-        select.element.all(by.css('option')).get(1).click();
+        select.all(by.css('option')).get(1).click();
         expect(switchElem.getText()).toMatch(/Home Span/);
       });
+     it('should change to settings via "options"', function() {
+        select.all(by.css('option')).get(2).click();
+        expect(switchElem.getText()).toMatch(/Settings Div/);
+      });
      it('should select default', function() {
-        select.element.all(by.css('option')).get(2).click();
+        select.all(by.css('option')).get(3).click();
         expect(switchElem.getText()).toMatch(/default/);
       });
      </file>
      </example>
      */
-    var ngSwitchDirective = ['$animate', function($animate) {
+    var ngSwitchDirective = ['$animate', '$compile', function($animate, $compile) {
         return {
-            restrict: 'EA',
             require: 'ngSwitch',
 
             // asks for $scope to fool the BC controller module
-            controller: ['$scope', function ngSwitchController() {
+            controller: ['$scope', function NgSwitchController() {
                 this.cases = {};
             }],
             link: function(scope, element, attr, ngSwitchController) {
                 var watchExpr = attr.ngSwitch || attr.on,
-                    selectedTranscludes,
-                    selectedElements,
-                    previousElements,
+                    selectedTranscludes = [],
+                    selectedElements = [],
+                    previousLeaveAnimations = [],
                     selectedScopes = [];
 
+                var spliceFactory = function(array, index) {
+                    return function(response) {
+                        if (response !== false) array.splice(index, 1);
+                    };
+                };
+
                 scope.$watch(watchExpr, function ngSwitchWatchAction(value) {
-                    var i, ii = selectedScopes.length;
-                    if(ii > 0) {
-                        if(previousElements) {
-                            for (i = 0; i < ii; i++) {
-                                previousElements[i].remove();
-                            }
-                            previousElements = null;
-                        }
+                    var i, ii;
 
-                        previousElements = [];
-                        for (i= 0; i<ii; i++) {
-                            var selected = selectedElements[i];
-                            selectedScopes[i].$destroy();
-                            previousElements[i] = selected;
-                            $animate.leave(selected, function() {
-                                previousElements.splice(i, 1);
-                                if(previousElements.length === 0) {
-                                    previousElements = null;
-                                }
-                            });
-                        }
+                    // Start with the last, in case the array is modified during the loop
+                    while (previousLeaveAnimations.length) {
+                        $animate.cancel(previousLeaveAnimations.pop());
                     }
 
-                    selectedElements = [];
-                    selectedScopes = [];
+                    for (i = 0, ii = selectedScopes.length; i < ii; ++i) {
+                        var selected = getBlockNodes(selectedElements[i].clone);
+                        selectedScopes[i].$destroy();
+                        var runner = previousLeaveAnimations[i] = $animate.leave(selected);
+                        runner.done(spliceFactory(previousLeaveAnimations, i));
+                    }
+
+                    selectedElements.length = 0;
+                    selectedScopes.length = 0;
 
                     if ((selectedTranscludes = ngSwitchController.cases['!' + value] || ngSwitchController.cases['?'])) {
-                        scope.$eval(attr.change);
                         forEach(selectedTranscludes, function(selectedTransclude) {
-                            var selectedScope = scope.$new();
-                            selectedScopes.push(selectedScope);
-                            selectedTransclude.transclude(selectedScope, function(caseElement) {
+                            selectedTransclude.transclude(function(caseElement, selectedScope) {
+                                selectedScopes.push(selectedScope);
                                 var anchor = selectedTransclude.element;
+                                caseElement[caseElement.length++] = $compile.$$createComment('end ngSwitchWhen');
+                                var block = { clone: caseElement };
 
-                                selectedElements.push(caseElement);
+                                selectedElements.push(block);
                                 $animate.enter(caseElement, anchor.parent(), anchor);
                             });
                         });
@@ -20664,18 +32611,28 @@
 
     var ngSwitchWhenDirective = ngDirective({
         transclude: 'element',
-        priority: 800,
+        priority: 1200,
         require: '^ngSwitch',
+        multiElement: true,
         link: function(scope, element, attrs, ctrl, $transclude) {
-            ctrl.cases['!' + attrs.ngSwitchWhen] = (ctrl.cases['!' + attrs.ngSwitchWhen] || []);
-            ctrl.cases['!' + attrs.ngSwitchWhen].push({ transclude: $transclude, element: element });
+
+            var cases = attrs.ngSwitchWhen.split(attrs.ngSwitchWhenSeparator).sort().filter(
+                // Filter duplicate cases
+                function(element, index, array) { return array[index - 1] !== element; }
+            );
+
+            forEach(cases, function(whenCase) {
+                ctrl.cases['!' + whenCase] = (ctrl.cases['!' + whenCase] || []);
+                ctrl.cases['!' + whenCase].push({ transclude: $transclude, element: element });
+            });
         }
     });
 
     var ngSwitchDefaultDirective = ngDirective({
         transclude: 'element',
-        priority: 800,
+        priority: 1200,
         require: '^ngSwitch',
+        multiElement: true,
         link: function(scope, element, attr, ctrl, $transclude) {
             ctrl.cases['?'] = (ctrl.cases['?'] || []);
             ctrl.cases['?'].push({ transclude: $transclude, element: element });
@@ -20685,74 +32642,227 @@
     /**
      * @ngdoc directive
      * @name ngTransclude
-     * @restrict AC
+     * @restrict EAC
      *
      * @description
      * Directive that marks the insertion point for the transcluded DOM of the nearest parent directive that uses transclusion.
      *
-     * Any existing content of the element that this directive is placed on will be removed before the transcluded content is inserted.
+     * You can specify that you want to insert a named transclusion slot, instead of the default slot, by providing the slot name
+     * as the value of the `ng-transclude` or `ng-transclude-slot` attribute.
+     *
+     * If the transcluded content is not empty (i.e. contains one or more DOM nodes, including whitespace text nodes), any existing
+     * content of this element will be removed before the transcluded content is inserted.
+     * If the transcluded content is empty (or only whitespace), the existing content is left intact. This lets you provide fallback
+     * content in the case that no transcluded content is provided.
      *
      * @element ANY
      *
+     * @param {string} ngTransclude|ngTranscludeSlot the name of the slot to insert at this point. If this is not provided, is empty
+     *                                               or its value is the same as the name of the attribute then the default slot is used.
+     *
      * @example
-     <example module="transclude">
-     <file name="index.html">
-     <script>
-     function Ctrl($scope) {
-           $scope.title = 'Lorem Ipsum';
-           $scope.text = 'Neque porro quisquam est qui dolorem ipsum quia dolor...';
-         }
-
-     angular.module('transclude', [])
-     .directive('pane', function(){
-             return {
-               restrict: 'E',
-               transclude: true,
-               scope: { title:'@' },
-     template: '<div style="border: 1px solid black;">' +
-     '<div style="background-color: gray">{{title}}</div>' +
-     '<div ng-transclude></div>' +
-     '</div>'
-     };
-     });
-     </script>
-     <div ng-controller="Ctrl">
-     <input ng-model="title"><br>
-     <textarea ng-model="text"></textarea> <br/>
-     <pane title="{{title}}">{{text}}</pane>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should have transcluded', function() {
-          var titleElement = element(by.model('title'));
-          titleElement.clear();
-          titleElement.sendKeys('TITLE');
-          var textElement = element(by.model('text'));
-          textElement.clear();
-          textElement.sendKeys('TEXT');
-          expect(element(by.binding('title')).getText()).toEqual('TITLE');
-          expect(element(by.binding('text')).getText()).toEqual('TEXT');
-        });
-     </file>
-     </example>
+     * ### Basic transclusion
+     * This example demonstrates basic transclusion of content into a component directive.
+     * <example name="simpleTranscludeExample" module="transcludeExample">
+     *   <file name="index.html">
+     *     <script>
+     *       angular.module('transcludeExample', [])
+     *        .directive('pane', function(){
+     *           return {
+     *             restrict: 'E',
+     *             transclude: true,
+     *             scope: { title:'@' },
+     *             template: '<div style="border: 1px solid black;">' +
+     *                         '<div style="background-color: gray">{{title}}</div>' +
+     *                         '<ng-transclude></ng-transclude>' +
+     *                       '</div>'
+     *           };
+     *       })
+     *       .controller('ExampleController', ['$scope', function($scope) {
+     *         $scope.title = 'Lorem Ipsum';
+     *         $scope.text = 'Neque porro quisquam est qui dolorem ipsum quia dolor...';
+     *       }]);
+     *     </script>
+     *     <div ng-controller="ExampleController">
+     *       <input ng-model="title" aria-label="title"> <br/>
+     *       <textarea ng-model="text" aria-label="text"></textarea> <br/>
+     *       <pane title="{{title}}"><span>{{text}}</span></pane>
+     *     </div>
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     *      it('should have transcluded', function() {
+     *        var titleElement = element(by.model('title'));
+     *        titleElement.clear();
+     *        titleElement.sendKeys('TITLE');
+     *        var textElement = element(by.model('text'));
+     *        textElement.clear();
+     *        textElement.sendKeys('TEXT');
+     *        expect(element(by.binding('title')).getText()).toEqual('TITLE');
+     *        expect(element(by.binding('text')).getText()).toEqual('TEXT');
+     *      });
+     *   </file>
+     * </example>
+     *
+     * @example
+     * ### Transclude fallback content
+     * This example shows how to use `NgTransclude` with fallback content, that
+     * is displayed if no transcluded content is provided.
+     *
+     * <example module="transcludeFallbackContentExample" name="ng-transclude">
+     * <file name="index.html">
+     * <script>
+     * angular.module('transcludeFallbackContentExample', [])
+     * .directive('myButton', function(){
+     *             return {
+     *               restrict: 'E',
+     *               transclude: true,
+     *               scope: true,
+     *               template: '<button style="cursor: pointer;">' +
+     *                           '<ng-transclude>' +
+     *                             '<b style="color: red;">Button1</b>' +
+     *                           '</ng-transclude>' +
+     *                         '</button>'
+     *             };
+     *         });
+     * </script>
+     * <!-- fallback button content -->
+     * <my-button id="fallback"></my-button>
+     * <!-- modified button content -->
+     * <my-button id="modified">
+     *   <i style="color: green;">Button2</i>
+     * </my-button>
+     * </file>
+     * <file name="protractor.js" type="protractor">
+     * it('should have different transclude element content', function() {
+     *          expect(element(by.id('fallback')).getText()).toBe('Button1');
+     *          expect(element(by.id('modified')).getText()).toBe('Button2');
+     *        });
+     * </file>
+     * </example>
      *
+     * @example
+     * ### Multi-slot transclusion
+     * This example demonstrates using multi-slot transclusion in a component directive.
+     * <example name="multiSlotTranscludeExample" module="multiSlotTranscludeExample">
+     *   <file name="index.html">
+     *    <style>
+     *      .title, .footer {
+     *        background-color: gray
+     *      }
+     *    </style>
+     *    <div ng-controller="ExampleController">
+     *      <input ng-model="title" aria-label="title"> <br/>
+     *      <textarea ng-model="text" aria-label="text"></textarea> <br/>
+     *      <pane>
+     *        <pane-title><a ng-href="{{link}}">{{title}}</a></pane-title>
+     *        <pane-body><p>{{text}}</p></pane-body>
+     *      </pane>
+     *    </div>
+     *   </file>
+     *   <file name="app.js">
+     *    angular.module('multiSlotTranscludeExample', [])
+     *     .directive('pane', function() {
+     *        return {
+     *          restrict: 'E',
+     *          transclude: {
+     *            'title': '?paneTitle',
+     *            'body': 'paneBody',
+     *            'footer': '?paneFooter'
+     *          },
+     *          template: '<div style="border: 1px solid black;">' +
+     *                      '<div class="title" ng-transclude="title">Fallback Title</div>' +
+     *                      '<div ng-transclude="body"></div>' +
+     *                      '<div class="footer" ng-transclude="footer">Fallback Footer</div>' +
+     *                    '</div>'
+     *        };
+     *    })
+     *    .controller('ExampleController', ['$scope', function($scope) {
+     *      $scope.title = 'Lorem Ipsum';
+     *      $scope.link = 'https://google.com';
+     *      $scope.text = 'Neque porro quisquam est qui dolorem ipsum quia dolor...';
+     *    }]);
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     *      it('should have transcluded the title and the body', function() {
+     *        var titleElement = element(by.model('title'));
+     *        titleElement.clear();
+     *        titleElement.sendKeys('TITLE');
+     *        var textElement = element(by.model('text'));
+     *        textElement.clear();
+     *        textElement.sendKeys('TEXT');
+     *        expect(element(by.css('.title')).getText()).toEqual('TITLE');
+     *        expect(element(by.binding('text')).getText()).toEqual('TEXT');
+     *        expect(element(by.css('.footer')).getText()).toEqual('Fallback Footer');
+     *      });
+     *   </file>
+     * </example>
      */
-    var ngTranscludeDirective = ngDirective({
-        link: function($scope, $element, $attrs, controller, $transclude) {
-            if (!$transclude) {
-                throw minErr('ngTransclude')('orphan',
-                    'Illegal use of ngTransclude directive in the template! ' +
-                    'No parent directive that requires a transclusion found. ' +
-                    'Element: {0}',
-                    startingTag($element));
-            }
-
-            $transclude(function(clone) {
-                $element.empty();
-                $element.append(clone);
-            });
-        }
-    });
+    var ngTranscludeMinErr = minErr('ngTransclude');
+    var ngTranscludeDirective = ['$compile', function($compile) {
+        return {
+            restrict: 'EAC',
+            compile: function ngTranscludeCompile(tElement) {
+
+                // Remove and cache any original content to act as a fallback
+                var fallbackLinkFn = $compile(tElement.contents());
+                tElement.empty();
+
+                return function ngTranscludePostLink($scope, $element, $attrs, controller, $transclude) {
+
+                    if (!$transclude) {
+                        throw ngTranscludeMinErr('orphan',
+                            'Illegal use of ngTransclude directive in the template! ' +
+                            'No parent directive that requires a transclusion found. ' +
+                            'Element: {0}',
+                            startingTag($element));
+                    }
+
+
+                    // If the attribute is of the form: `ng-transclude="ng-transclude"` then treat it like the default
+                    if ($attrs.ngTransclude === $attrs.$attr.ngTransclude) {
+                        $attrs.ngTransclude = '';
+                    }
+                    var slotName = $attrs.ngTransclude || $attrs.ngTranscludeSlot;
+
+                    // If the slot is required and no transclusion content is provided then this call will throw an error
+                    $transclude(ngTranscludeCloneAttachFn, null, slotName);
+
+                    // If the slot is optional and no transclusion content is provided then use the fallback content
+                    if (slotName && !$transclude.isSlotFilled(slotName)) {
+                        useFallbackContent();
+                    }
+
+                    function ngTranscludeCloneAttachFn(clone, transcludedScope) {
+                        if (clone.length && notWhitespace(clone)) {
+                            $element.append(clone);
+                        } else {
+                            useFallbackContent();
+                            // There is nothing linked against the transcluded scope since no content was available,
+                            // so it should be safe to clean up the generated scope.
+                            transcludedScope.$destroy();
+                        }
+                    }
+
+                    function useFallbackContent() {
+                        // Since this is the fallback content rather than the transcluded content,
+                        // we link against the scope of this directive rather than the transcluded scope
+                        fallbackLinkFn($scope, function(clone) {
+                            $element.append(clone);
+                        });
+                    }
+
+                    function notWhitespace(nodes) {
+                        for (var i = 0, ii = nodes.length; i < ii; i++) {
+                            var node = nodes[i];
+                            if (node.nodeType !== NODE_TYPE_TEXT || node.nodeValue.trim()) {
+                                return true;
+                            }
+                        }
+                    }
+                };
+            }
+        };
+    }];
 
     /**
      * @ngdoc directive
@@ -20770,7 +32880,7 @@
      * @param {string} id Cache name of the template.
      *
      * @example
-     <example>
+     <example  name="script-tag">
      <file name="index.html">
      <script type="text/ng-template" id="/tpl.html">
      Content of the template.
@@ -20792,9 +32902,8 @@
             restrict: 'E',
             terminal: true,
             compile: function(element, attr) {
-                if (attr.type == 'text/ng-template') {
+                if (attr.type === 'text/ng-template') {
                     var templateUrl = attr.id,
-                    // IE is not consistent, in scripts we have to read .text but in other nodes we have to read .textContent
                         text = element[0].text;
 
                     $templateCache.put(templateUrl, text);
@@ -20803,663 +32912,1448 @@
         };
     }];
 
-    var ngOptionsMinErr = minErr('ngOptions');
+    /* exported selectDirective, optionDirective */
+
+    var noopNgModelController = { $setViewValue: noop, $render: noop };
+
+    function setOptionSelectedStatus(optionEl, value) {
+        optionEl.prop('selected', value);
+        /**
+         * When unselecting an option, setting the property to null / false should be enough
+         * However, screenreaders might react to the selected attribute instead, see
+         * https://github.com/angular/angular.js/issues/14419
+         * Note: "selected" is a boolean attr and will be removed when the "value" arg in attr() is false
+         * or null
+         */
+        optionEl.attr('selected', value);
+    }
+
     /**
-     * @ngdoc directive
-     * @name select
-     * @restrict E
+     * @ngdoc type
+     * @name  select.SelectController
      *
      * @description
-     * HTML `SELECT` element with angular data-binding.
+     * The controller for the {@link ng.select select} directive. The controller exposes
+     * a few utility methods that can be used to augment the behavior of a regular or an
+     * {@link ng.ngOptions ngOptions} select element.
      *
-     * # `ngOptions`
+     * @example
+     * ### Set a custom error when the unknown option is selected
      *
-     * The `ngOptions` attribute can be used to dynamically generate a list of `<option>`
-     * elements for the `<select>` element using the array or object obtained by evaluating the
-     * `ngOptions` comprehension_expression.
+     * This example sets a custom error "unknownValue" on the ngModelController
+     * when the select element's unknown option is selected, i.e. when the model is set to a value
+     * that is not matched by any option.
+     *
+     * <example name="select-unknown-value-error" module="staticSelect">
+     * <file name="index.html">
+     * <div ng-controller="ExampleController">
+     *   <form name="myForm">
+     *     <label for="testSelect"> Single select: </label><br>
+     *     <select name="testSelect" ng-model="selected" unknown-value-error>
+     *       <option value="option-1">Option 1</option>
+     *       <option value="option-2">Option 2</option>
+     *     </select><br>
+     *     <span class="error" ng-if="myForm.testSelect.$error.unknownValue">
+     *       Error: The current model doesn't match any option</span><br>
+     *
+     *     <button ng-click="forceUnknownOption()">Force unknown option</button><br>
+     *   </form>
+     * </div>
+     * </file>
+     * <file name="app.js">
+     *  angular.module('staticSelect', [])
+     *    .controller('ExampleController', ['$scope', function($scope) {
+     *      $scope.selected = null;
+     *
+     *      $scope.forceUnknownOption = function() {
+     *        $scope.selected = 'nonsense';
+     *      };
+     *   }])
+     *   .directive('unknownValueError', function() {
+     *     return {
+     *       require: ['ngModel', 'select'],
+     *       link: function(scope, element, attrs, ctrls) {
+     *         var ngModelCtrl = ctrls[0];
+     *         var selectCtrl = ctrls[1];
+     *
+     *         ngModelCtrl.$validators.unknownValue = function(modelValue, viewValue) {
+     *           if (selectCtrl.$isUnknownOptionSelected()) {
+     *             return false;
+     *           }
+     *
+     *           return true;
+     *         };
+     *       }
+     *
+     *     };
+     *   });
+     * </file>
+     *</example>
      *
-     * When an item in the `<select>` menu is selected, the array element or object property
-     * represented by the selected option will be bound to the model identified by the `ngModel`
-     * directive.
      *
-     * <div class="alert alert-warning">
-     * **Note:** `ngModel` compares by reference, not value. This is important when binding to an
-     * array of objects. See an example [in this jsfiddle](http://jsfiddle.net/qWzTb/).
-     * </div>
+     * @example
+     * ### Set the "required" error when the unknown option is selected.
      *
-     * Optionally, a single hard-coded `<option>` element, with the value set to an empty string, can
-     * be nested into the `<select>` element. This element will then represent the `null` or "not selected"
-     * option. See example below for demonstration.
+     * By default, the "required" error on the ngModelController is only set on a required select
+     * when the empty option is selected. This example adds a custom directive that also sets the
+     * error when the unknown option is selected.
      *
-     * <div class="alert alert-warning">
-     * **Note:** `ngOptions` provides an iterator facility for the `<option>` element which should be used instead
-     * of {@link ng.directive:ngRepeat ngRepeat} when you want the
-     * `select` model to be bound to a non-string value. This is because an option element can only
-     * be bound to string values at present.
+     * <example name="select-unknown-value-required" module="staticSelect">
+     * <file name="index.html">
+     * <div ng-controller="ExampleController">
+     *   <form name="myForm">
+     *     <label for="testSelect"> Select: </label><br>
+     *     <select name="testSelect" ng-model="selected" required unknown-value-required>
+     *       <option value="option-1">Option 1</option>
+     *       <option value="option-2">Option 2</option>
+     *     </select><br>
+     *     <span class="error" ng-if="myForm.testSelect.$error.required">Error: Please select a value</span><br>
+     *
+     *     <button ng-click="forceUnknownOption()">Force unknown option</button><br>
+     *   </form>
      * </div>
+     * </file>
+     * <file name="app.js">
+     *  angular.module('staticSelect', [])
+     *    .controller('ExampleController', ['$scope', function($scope) {
+     *      $scope.selected = null;
+     *
+     *      $scope.forceUnknownOption = function() {
+     *        $scope.selected = 'nonsense';
+     *      };
+     *   }])
+     *   .directive('unknownValueRequired', function() {
+     *     return {
+     *       priority: 1, // This directive must run after the required directive has added its validator
+     *       require: ['ngModel', 'select'],
+     *       link: function(scope, element, attrs, ctrls) {
+     *         var ngModelCtrl = ctrls[0];
+     *         var selectCtrl = ctrls[1];
      *
-     * @param {string} ngModel Assignable angular expression to data-bind to.
-     * @param {string=} name Property name of the form under which the control is published.
-     * @param {string=} required The control is considered valid only if value is entered.
-     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
-     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
-     *    `required` when you want to data-bind to the `required` attribute.
-     * @param {comprehension_expression=} ngOptions in one of the following forms:
+     *         var originalRequiredValidator = ngModelCtrl.$validators.required;
      *
-     *   * for array data sources:
-     *     * `label` **`for`** `value` **`in`** `array`
-     *     * `select` **`as`** `label` **`for`** `value` **`in`** `array`
-     *     * `label`  **`group by`** `group` **`for`** `value` **`in`** `array`
-     *     * `select` **`as`** `label` **`group by`** `group` **`for`** `value` **`in`** `array` **`track by`** `trackexpr`
-     *   * for object data sources:
-     *     * `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
-     *     * `select` **`as`** `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
-     *     * `label` **`group by`** `group` **`for (`**`key`**`,`** `value`**`) in`** `object`
-     *     * `select` **`as`** `label` **`group by`** `group`
-     *         **`for` `(`**`key`**`,`** `value`**`) in`** `object`
+     *         ngModelCtrl.$validators.required = function() {
+     *           if (attrs.required && selectCtrl.$isUnknownOptionSelected()) {
+     *             return false;
+     *           }
      *
-     * Where:
+     *           return originalRequiredValidator.apply(this, arguments);
+     *         };
+     *       }
+     *     };
+     *   });
+     * </file>
+     * <file name="protractor.js" type="protractor">
+     *  it('should show the error message when the unknown option is selected', function() {
+
+      var error = element(by.className('error'));
+
+      expect(error.getText()).toBe('Error: Please select a value');
+
+      element(by.cssContainingText('option', 'Option 1')).click();
+
+      expect(error.isPresent()).toBe(false);
+
+      element(by.tagName('button')).click();
+
+      expect(error.getText()).toBe('Error: Please select a value');
+    });
+     * </file>
+     *</example>
      *
-     *   * `array` / `object`: an expression which evaluates to an array / object to iterate over.
-     *   * `value`: local variable which will refer to each item in the `array` or each property value
-     *      of `object` during iteration.
-     *   * `key`: local variable which will refer to a property name in `object` during iteration.
-     *   * `label`: The result of this expression will be the label for `<option>` element. The
-     *     `expression` will most likely refer to the `value` variable (e.g. `value.propertyName`).
-     *   * `select`: The result of this expression will be bound to the model of the parent `<select>`
-     *      element. If not specified, `select` expression will default to `value`.
-     *   * `group`: The result of this expression will be used to group options using the `<optgroup>`
-     *      DOM element.
-     *   * `trackexpr`: Used when working with an array of objects. The result of this expression will be
-     *      used to identify the objects in the array. The `trackexpr` will most likely refer to the
-     *     `value` variable (e.g. `value.propertyName`).
      *
-     * @example
-     <example>
-     <file name="index.html">
-     <script>
-     function MyCntrl($scope) {
-          $scope.colors = [
-            {name:'black', shade:'dark'},
-            {name:'white', shade:'light'},
-            {name:'red', shade:'dark'},
-            {name:'blue', shade:'dark'},
-            {name:'yellow', shade:'light'}
-          ];
-          $scope.color = $scope.colors[2]; // red
-        }
-     </script>
-     <div ng-controller="MyCntrl">
-     <ul>
-     <li ng-repeat="color in colors">
-     Name: <input ng-model="color.name">
-     [<a href ng-click="colors.splice($index, 1)">X</a>]
-     </li>
-     <li>
-     [<a href ng-click="colors.push({})">add</a>]
-     </li>
-     </ul>
-     <hr/>
-     Color (null not allowed):
-     <select ng-model="color" ng-options="c.name for c in colors"></select><br>
+     */
+    var SelectController =
+        ['$element', '$scope', /** @this */ function($element, $scope) {
+
+            var self = this,
+                optionsMap = new NgMap();
+
+            self.selectValueMap = {}; // Keys are the hashed values, values the original values
+
+            // If the ngModel doesn't get provided then provide a dummy noop version to prevent errors
+            self.ngModelCtrl = noopNgModelController;
+            self.multiple = false;
+
+            // The "unknown" option is one that is prepended to the list if the viewValue
+            // does not match any of the options. When it is rendered the value of the unknown
+            // option is '? XXX ?' where XXX is the hashKey of the value that is not known.
+            //
+            // Support: IE 9 only
+            // We can't just jqLite('<option>') since jqLite is not smart enough
+            // to create it in <select> and IE barfs otherwise.
+            self.unknownOption = jqLite(window.document.createElement('option'));
+
+            // The empty option is an option with the value '' that the application developer can
+            // provide inside the select. It is always selectable and indicates that a "null" selection has
+            // been made by the user.
+            // If the select has an empty option, and the model of the select is set to "undefined" or "null",
+            // the empty option is selected.
+            // If the model is set to a different unmatched value, the unknown option is rendered and
+            // selected, i.e both are present, because a "null" selection and an unknown value are different.
+            self.hasEmptyOption = false;
+            self.emptyOption = undefined;
+
+            self.renderUnknownOption = function(val) {
+                var unknownVal = self.generateUnknownOptionValue(val);
+                self.unknownOption.val(unknownVal);
+                $element.prepend(self.unknownOption);
+                setOptionSelectedStatus(self.unknownOption, true);
+                $element.val(unknownVal);
+            };
 
-     Color (null allowed):
-     <span  class="nullable">
-     <select ng-model="color" ng-options="c.name for c in colors">
-     <option value="">-- choose color --</option>
-     </select>
-     </span><br/>
+            self.updateUnknownOption = function(val) {
+                var unknownVal = self.generateUnknownOptionValue(val);
+                self.unknownOption.val(unknownVal);
+                setOptionSelectedStatus(self.unknownOption, true);
+                $element.val(unknownVal);
+            };
 
-     Color grouped by shade:
-     <select ng-model="color" ng-options="c.name group by c.shade for c in colors">
-     </select><br/>
+            self.generateUnknownOptionValue = function(val) {
+                return '? ' + hashKey(val) + ' ?';
+            };
 
+            self.removeUnknownOption = function() {
+                if (self.unknownOption.parent()) self.unknownOption.remove();
+            };
 
-     Select <a href ng-click="color={name:'not in list'}">bogus</a>.<br>
-     <hr/>
-     Currently selected: {{ {selected_color:color}  }}
-     <div style="border:solid 1px black; height:20px"
-     ng-style="{'background-color':color.name}">
-     </div>
-     </div>
-     </file>
-     <file name="protractor.js" type="protractor">
-     it('should check ng-options', function() {
-           expect(element(by.binding('{selected_color:color}')).getText()).toMatch('red');
-           element.all(by.select('color')).first().click();
-           element.all(by.css('select[ng-model="color"] option')).first().click();
-           expect(element(by.binding('{selected_color:color}')).getText()).toMatch('black');
-           element(by.css('.nullable select[ng-model="color"]')).click();
-           element.all(by.css('.nullable select[ng-model="color"] option')).first().click();
-           expect(element(by.binding('{selected_color:color}')).getText()).toMatch('null');
-         });
-     </file>
-     </example>
-     */
+            self.selectEmptyOption = function() {
+                if (self.emptyOption) {
+                    $element.val('');
+                    setOptionSelectedStatus(self.emptyOption, true);
+                }
+            };
 
-    var ngOptionsDirective = valueFn({ terminal: true });
-// jshint maxlen: false
-    var selectDirective = ['$compile', '$parse', function($compile,   $parse) {
-        //000011111111110000000000022222222220000000000000000000003333333333000000000000004444444444444440000000005555555555555550000000666666666666666000000000000000777777777700000000000000000008888888888
-        var NG_OPTIONS_REGEXP = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,
-            nullModelCtrl = {$setViewValue: noop};
-// jshint maxlen: 100
+            self.unselectEmptyOption = function() {
+                if (self.hasEmptyOption) {
+                    setOptionSelectedStatus(self.emptyOption, false);
+                }
+            };
 
-        return {
-            restrict: 'E',
-            require: ['select', '?ngModel'],
-            controller: ['$element', '$scope', '$attrs', function($element, $scope, $attrs) {
-                var self = this,
-                    optionsMap = {},
-                    ngModelCtrl = nullModelCtrl,
-                    nullOption,
-                    unknownOption;
+            $scope.$on('$destroy', function() {
+                // disable unknown option so that we don't do work when the whole select is being destroyed
+                self.renderUnknownOption = noop;
+            });
+
+            // Read the value of the select control, the implementation of this changes depending
+            // upon whether the select can have multiple values and whether ngOptions is at work.
+            self.readValue = function readSingleValue() {
+                var val = $element.val();
+                // ngValue added option values are stored in the selectValueMap, normal interpolations are not
+                var realVal = val in self.selectValueMap ? self.selectValueMap[val] : val;
 
+                if (self.hasOption(realVal)) {
+                    return realVal;
+                }
 
-                self.databound = $attrs.ngModel;
+                return null;
+            };
 
 
-                self.init = function(ngModelCtrl_, nullOption_, unknownOption_) {
-                    ngModelCtrl = ngModelCtrl_;
-                    nullOption = nullOption_;
-                    unknownOption = unknownOption_;
-                };
+            // Write the value to the select control, the implementation of this changes depending
+            // upon whether the select can have multiple values and whether ngOptions is at work.
+            self.writeValue = function writeSingleValue(value) {
+                // Make sure to remove the selected attribute from the previously selected option
+                // Otherwise, screen readers might get confused
+                var currentlySelectedOption = $element[0].options[$element[0].selectedIndex];
+                if (currentlySelectedOption) setOptionSelectedStatus(jqLite(currentlySelectedOption), false);
 
+                if (self.hasOption(value)) {
+                    self.removeUnknownOption();
 
-                self.addOption = function(value) {
-                    assertNotHasOwnProperty(value, '"option value"');
-                    optionsMap[value] = true;
+                    var hashedVal = hashKey(value);
+                    $element.val(hashedVal in self.selectValueMap ? hashedVal : value);
 
-                    if (ngModelCtrl.$viewValue == value) {
-                        $element.val(value);
-                        if (unknownOption.parent()) unknownOption.remove();
-                    }
-                };
+                    // Set selected attribute and property on selected option for screen readers
+                    var selectedOption = $element[0].options[$element[0].selectedIndex];
+                    setOptionSelectedStatus(jqLite(selectedOption), true);
+                } else {
+                    self.selectUnknownOrEmptyOption(value);
+                }
+            };
 
 
-                self.removeOption = function(value) {
-                    if (this.hasOption(value)) {
-                        delete optionsMap[value];
-                        if (ngModelCtrl.$viewValue == value) {
-                            this.renderUnknownOption(value);
+            // Tell the select control that an option, with the given value, has been added
+            self.addOption = function(value, element) {
+                // Skip comment nodes, as they only pollute the `optionsMap`
+                if (element[0].nodeType === NODE_TYPE_COMMENT) return;
+
+                assertNotHasOwnProperty(value, '"option value"');
+                if (value === '') {
+                    self.hasEmptyOption = true;
+                    self.emptyOption = element;
+                }
+                var count = optionsMap.get(value) || 0;
+                optionsMap.set(value, count + 1);
+                // Only render at the end of a digest. This improves render performance when many options
+                // are added during a digest and ensures all relevant options are correctly marked as selected
+                scheduleRender();
+            };
+
+            // Tell the select control that an option, with the given value, has been removed
+            self.removeOption = function(value) {
+                var count = optionsMap.get(value);
+                if (count) {
+                    if (count === 1) {
+                        optionsMap.delete(value);
+                        if (value === '') {
+                            self.hasEmptyOption = false;
+                            self.emptyOption = undefined;
                         }
+                    } else {
+                        optionsMap.set(value, count - 1);
                     }
-                };
+                }
+            };
 
+            // Check whether the select control has an option matching the given value
+            self.hasOption = function(value) {
+                return !!optionsMap.get(value);
+            };
 
-                self.renderUnknownOption = function(val) {
-                    var unknownVal = '? ' + hashKey(val) + ' ?';
-                    unknownOption.val(unknownVal);
-                    $element.prepend(unknownOption);
-                    $element.val(unknownVal);
-                    unknownOption.prop('selected', true); // needed for IE
-                };
+            /**
+             * @ngdoc method
+             * @name select.SelectController#$hasEmptyOption
+             *
+             * @description
+             *
+             * Returns `true` if the select element currently has an empty option
+             * element, i.e. an option that signifies that the select is empty / the selection is null.
+             *
+             */
+            self.$hasEmptyOption = function() {
+                return self.hasEmptyOption;
+            };
+
+            /**
+             * @ngdoc method
+             * @name select.SelectController#$isUnknownOptionSelected
+             *
+             * @description
+             *
+             * Returns `true` if the select element's unknown option is selected. The unknown option is added
+             * and automatically selected whenever the select model doesn't match any option.
+             *
+             */
+            self.$isUnknownOptionSelected = function() {
+                // Presence of the unknown option means it is selected
+                return $element[0].options[0] === self.unknownOption[0];
+            };
 
+            /**
+             * @ngdoc method
+             * @name select.SelectController#$isEmptyOptionSelected
+             *
+             * @description
+             *
+             * Returns `true` if the select element has an empty option and this empty option is currently
+             * selected. Returns `false` if the select element has no empty option or it is not selected.
+             *
+             */
+            self.$isEmptyOptionSelected = function() {
+                return self.hasEmptyOption && $element[0].options[$element[0].selectedIndex] === self.emptyOption[0];
+            };
 
-                self.hasOption = function(value) {
-                    return optionsMap.hasOwnProperty(value);
-                };
+            self.selectUnknownOrEmptyOption = function(value) {
+                if (value == null && self.emptyOption) {
+                    self.removeUnknownOption();
+                    self.selectEmptyOption();
+                } else if (self.unknownOption.parent().length) {
+                    self.updateUnknownOption(value);
+                } else {
+                    self.renderUnknownOption(value);
+                }
+            };
 
-                $scope.$on('$destroy', function() {
-                    // disable unknown option so that we don't do work when the whole select is being destroyed
-                    self.renderUnknownOption = noop;
+            var renderScheduled = false;
+            function scheduleRender() {
+                if (renderScheduled) return;
+                renderScheduled = true;
+                $scope.$$postDigest(function() {
+                    renderScheduled = false;
+                    self.ngModelCtrl.$render();
                 });
-            }],
+            }
 
-            link: function(scope, element, attr, ctrls) {
-                // if ngModel is not defined, we don't need to do anything
-                if (!ctrls[1]) return;
-
-                var selectCtrl = ctrls[0],
-                    ngModelCtrl = ctrls[1],
-                    multiple = attr.multiple,
-                    optionsExp = attr.ngOptions,
-                    nullOption = false, // if false, user will not be able to select it (used by ngOptions)
-                    emptyOption,
-                // we can't just jqLite('<option>') since jqLite is not smart enough
-                // to create it in <select> and IE barfs otherwise.
-                    optionTemplate = jqLite(document.createElement('option')),
-                    optGroupTemplate =jqLite(document.createElement('optgroup')),
-                    unknownOption = optionTemplate.clone();
-
-                // find "null" option
-                for(var i = 0, children = element.children(), ii = children.length; i < ii; i++) {
-                    if (children[i].value === '') {
-                        emptyOption = nullOption = children.eq(i);
-                        break;
-                    }
-                }
+            var updateScheduled = false;
+            function scheduleViewValueUpdate(renderAfter) {
+                if (updateScheduled) return;
 
-                selectCtrl.init(ngModelCtrl, nullOption, unknownOption);
+                updateScheduled = true;
 
-                // required validator
-                if (multiple) {
-                    ngModelCtrl.$isEmpty = function(value) {
-                        return !value || value.length === 0;
-                    };
-                }
+                $scope.$$postDigest(function() {
+                    if ($scope.$$destroyed) return;
 
-                if (optionsExp) setupAsOptions(scope, element, ngModelCtrl);
-                else if (multiple) setupAsMultiple(scope, element, ngModelCtrl);
-                else setupAsSingle(scope, element, ngModelCtrl, selectCtrl);
+                    updateScheduled = false;
+                    self.ngModelCtrl.$setViewValue(self.readValue());
+                    if (renderAfter) self.ngModelCtrl.$render();
+                });
+            }
 
 
-                ////////////////////////////
+            self.registerOption = function(optionScope, optionElement, optionAttrs, interpolateValueFn, interpolateTextFn) {
 
+                if (optionAttrs.$attr.ngValue) {
+                    // The value attribute is set by ngValue
+                    var oldVal, hashedVal = NaN;
+                    optionAttrs.$observe('value', function valueAttributeObserveAction(newVal) {
 
+                        var removal;
+                        var previouslySelected = optionElement.prop('selected');
 
-                function setupAsSingle(scope, selectElement, ngModelCtrl, selectCtrl) {
-                    ngModelCtrl.$render = function() {
-                        var viewValue = ngModelCtrl.$viewValue;
+                        if (isDefined(hashedVal)) {
+                            self.removeOption(oldVal);
+                            delete self.selectValueMap[hashedVal];
+                            removal = true;
+                        }
 
-                        if (selectCtrl.hasOption(viewValue)) {
-                            if (unknownOption.parent()) unknownOption.remove();
-                            selectElement.val(viewValue);
-                            if (viewValue === '') emptyOption.prop('selected', true); // to make IE9 happy
-                        } else {
-                            if (isUndefined(viewValue) && emptyOption) {
-                                selectElement.val('');
-                            } else {
-                                selectCtrl.renderUnknownOption(viewValue);
-                            }
+                        hashedVal = hashKey(newVal);
+                        oldVal = newVal;
+                        self.selectValueMap[hashedVal] = newVal;
+                        self.addOption(newVal, optionElement);
+                        // Set the attribute directly instead of using optionAttrs.$set - this stops the observer
+                        // from firing a second time. Other $observers on value will also get the result of the
+                        // ngValue expression, not the hashed value
+                        optionElement.attr('value', hashedVal);
+
+                        if (removal && previouslySelected) {
+                            scheduleViewValueUpdate();
                         }
-                    };
 
-                    selectElement.on('change', function() {
-                        scope.$apply(function() {
-                            if (unknownOption.parent()) unknownOption.remove();
-                            ngModelCtrl.$setViewValue(selectElement.val());
-                        });
                     });
-                }
-
-                function setupAsMultiple(scope, selectElement, ctrl) {
-                    var lastView;
-                    ctrl.$render = function() {
-                        var items = new HashMap(ctrl.$viewValue);
-                        forEach(selectElement.find('option'), function(option) {
-                            option.selected = isDefined(items.get(option.value));
-                        });
-                    };
+                } else if (interpolateValueFn) {
+                    // The value attribute is interpolated
+                    optionAttrs.$observe('value', function valueAttributeObserveAction(newVal) {
+                        // This method is overwritten in ngOptions and has side-effects!
+                        self.readValue();
+
+                        var removal;
+                        var previouslySelected = optionElement.prop('selected');
+
+                        if (isDefined(oldVal)) {
+                            self.removeOption(oldVal);
+                            removal = true;
+                        }
+                        oldVal = newVal;
+                        self.addOption(newVal, optionElement);
 
-                    // we have to do it on each watch since ngModel watches reference, but
-                    // we need to work of an array, so we need to see if anything was inserted/removed
-                    scope.$watch(function selectMultipleWatch() {
-                        if (!equals(lastView, ctrl.$viewValue)) {
-                            lastView = copy(ctrl.$viewValue);
-                            ctrl.$render();
+                        if (removal && previouslySelected) {
+                            scheduleViewValueUpdate();
                         }
                     });
+                } else if (interpolateTextFn) {
+                    // The text content is interpolated
+                    optionScope.$watch(interpolateTextFn, function interpolateWatchAction(newVal, oldVal) {
+                        optionAttrs.$set('value', newVal);
+                        var previouslySelected = optionElement.prop('selected');
+                        if (oldVal !== newVal) {
+                            self.removeOption(oldVal);
+                        }
+                        self.addOption(newVal, optionElement);
 
-                    selectElement.on('change', function() {
-                        scope.$apply(function() {
-                            var array = [];
-                            forEach(selectElement.find('option'), function(option) {
-                                if (option.selected) {
-                                    array.push(option.value);
-                                }
-                            });
-                            ctrl.$setViewValue(array);
-                        });
+                        if (oldVal && previouslySelected) {
+                            scheduleViewValueUpdate();
+                        }
                     });
+                } else {
+                    // The value attribute is static
+                    self.addOption(optionAttrs.value, optionElement);
                 }
 
-                function setupAsOptions(scope, selectElement, ctrl) {
-                    var match;
-
-                    if (!(match = optionsExp.match(NG_OPTIONS_REGEXP))) {
-                        throw ngOptionsMinErr('iexp',
-                            "Expected expression in form of " +
-                            "'_select_ (as _label_)? for (_key_,)?_value_ in _collection_'" +
-                            " but got '{0}'. Element: {1}",
-                            optionsExp, startingTag(selectElement));
-                    }
-
-                    var displayFn = $parse(match[2] || match[1]),
-                        valueName = match[4] || match[6],
-                        keyName = match[5],
-                        groupByFn = $parse(match[3] || ''),
-                        valueFn = $parse(match[2] ? match[1] : valueName),
-                        valuesFn = $parse(match[7]),
-                        track = match[8],
-                        trackFn = track ? $parse(match[8]) : null,
-                    // This is an array of array of existing option groups in DOM.
-                    // We try to reuse these if possible
-                    // - optionGroupsCache[0] is the options with no option group
-                    // - optionGroupsCache[?][0] is the parent: either the SELECT or OPTGROUP element
-                        optionGroupsCache = [[{element: selectElement, label:''}]];
-
-                    if (nullOption) {
-                        // compile the element since there might be bindings in it
-                        $compile(nullOption)(scope);
-
-                        // remove the class, which is added automatically because we recompile the element and it
-                        // becomes the compilation root
-                        nullOption.removeClass('ng-scope');
-
-                        // we need to remove it before calling selectElement.empty() because otherwise IE will
-                        // remove the label from the element. wtf?
-                        nullOption.remove();
-                    }
-
-                    // clear contents, we'll add what's needed based on the model
-                    selectElement.empty();
-
-                    selectElement.on('change', function() {
-                        scope.$apply(function() {
-                            var optionGroup,
-                                collection = valuesFn(scope) || [],
-                                locals = {},
-                                key, value, optionElement, index, groupIndex, length, groupLength, trackIndex;
-
-                            if (multiple) {
-                                value = [];
-                                for (groupIndex = 0, groupLength = optionGroupsCache.length;
-                                     groupIndex < groupLength;
-                                     groupIndex++) {
-                                    // list of options for that group. (first item has the parent)
-                                    optionGroup = optionGroupsCache[groupIndex];
-
-                                    for(index = 1, length = optionGroup.length; index < length; index++) {
-                                        if ((optionElement = optionGroup[index].element)[0].selected) {
-                                            key = optionElement.val();
-                                            if (keyName) locals[keyName] = key;
-                                            if (trackFn) {
-                                                for (trackIndex = 0; trackIndex < collection.length; trackIndex++) {
-                                                    locals[valueName] = collection[trackIndex];
-                                                    if (trackFn(scope, locals) == key) break;
-                                                }
-                                            } else {
-                                                locals[valueName] = collection[key];
-                                            }
-                                            value.push(valueFn(scope, locals));
-                                        }
-                                    }
-                                }
-                            } else {
-                                key = selectElement.val();
-                                if (key == '?') {
-                                    value = undefined;
-                                } else if (key === ''){
-                                    value = null;
-                                } else {
-                                    if (trackFn) {
-                                        for (trackIndex = 0; trackIndex < collection.length; trackIndex++) {
-                                            locals[valueName] = collection[trackIndex];
-                                            if (trackFn(scope, locals) == key) {
-                                                value = valueFn(scope, locals);
-                                                break;
-                                            }
-                                        }
-                                    } else {
-                                        locals[valueName] = collection[key];
-                                        if (keyName) locals[keyName] = key;
-                                        value = valueFn(scope, locals);
-                                    }
-                                }
-                                // Update the null option's selected property here so $render cleans it up correctly
-                                if (optionGroupsCache[0].length > 1) {
-                                    if (optionGroupsCache[0][1].id !== key) {
-                                        optionGroupsCache[0][1].selected = false;
-                                    }
-                                }
-                            }
-                            ctrl.$setViewValue(value);
-                        });
-                    });
 
-                    ctrl.$render = render;
-
-                    // TODO(vojta): can't we optimize this ?
-                    scope.$watch(render);
-
-                    function render() {
-                        // Temporary location for the option groups before we render them
-                        var optionGroups = {'':[]},
-                            optionGroupNames = [''],
-                            optionGroupName,
-                            optionGroup,
-                            option,
-                            existingParent, existingOptions, existingOption,
-                            modelValue = ctrl.$modelValue,
-                            values = valuesFn(scope) || [],
-                            keys = keyName ? sortedKeys(values) : values,
-                            key,
-                            groupLength, length,
-                            groupIndex, index,
-                            locals = {},
-                            selected,
-                            selectedSet = false, // nothing is selected yet
-                            lastElement,
-                            element,
-                            label;
-
-                        if (multiple) {
-                            if (trackFn && isArray(modelValue)) {
-                                selectedSet = new HashMap([]);
-                                for (var trackIndex = 0; trackIndex < modelValue.length; trackIndex++) {
-                                    locals[valueName] = modelValue[trackIndex];
-                                    selectedSet.put(trackFn(scope, locals), modelValue[trackIndex]);
-                                }
-                            } else {
-                                selectedSet = new HashMap(modelValue);
-                            }
+                optionAttrs.$observe('disabled', function(newVal) {
+
+                    // Since model updates will also select disabled options (like ngOptions),
+                    // we only have to handle options becoming disabled, not enabled
+
+                    if (newVal === 'true' || newVal && optionElement.prop('selected')) {
+                        if (self.multiple) {
+                            scheduleViewValueUpdate(true);
+                        } else {
+                            self.ngModelCtrl.$setViewValue(null);
+                            self.ngModelCtrl.$render();
                         }
+                    }
+                });
+
+                optionElement.on('$destroy', function() {
+                    var currentValue = self.readValue();
+                    var removeValue = optionAttrs.value;
+
+                    self.removeOption(removeValue);
+                    scheduleRender();
+
+                    if (self.multiple && currentValue && currentValue.indexOf(removeValue) !== -1 ||
+                        currentValue === removeValue
+                    ) {
+                        // When multiple (selected) options are destroyed at the same time, we don't want
+                        // to run a model update for each of them. Instead, run a single update in the $$postDigest
+                        scheduleViewValueUpdate(true);
+                    }
+                });
+            };
+        }];
 
-                        // We now build up the list of options we need (we merge later)
-                        for (index = 0; length = keys.length, index < length; index++) {
+    /**
+     * @ngdoc directive
+     * @name select
+     * @restrict E
+     *
+     * @description
+     * HTML `select` element with AngularJS data-binding.
+     *
+     * The `select` directive is used together with {@link ngModel `ngModel`} to provide data-binding
+     * between the scope and the `<select>` control (including setting default values).
+     * It also handles dynamic `<option>` elements, which can be added using the {@link ngRepeat `ngRepeat}` or
+     * {@link ngOptions `ngOptions`} directives.
+     *
+     * When an item in the `<select>` menu is selected, the value of the selected option will be bound
+     * to the model identified by the `ngModel` directive. With static or repeated options, this is
+     * the content of the `value` attribute or the textContent of the `<option>`, if the value attribute is missing.
+     * Value and textContent can be interpolated.
+     *
+     * The {@link select.SelectController select controller} exposes utility functions that can be used
+     * to manipulate the select's behavior.
+     *
+     * ## Matching model and option values
+     *
+     * In general, the match between the model and an option is evaluated by strictly comparing the model
+     * value against the value of the available options.
+     *
+     * If you are setting the option value with the option's `value` attribute, or textContent, the
+     * value will always be a `string` which means that the model value must also be a string.
+     * Otherwise the `select` directive cannot match them correctly.
+     *
+     * To bind the model to a non-string value, you can use one of the following strategies:
+     * - the {@link ng.ngOptions `ngOptions`} directive
+     *   ({@link ng.select#using-select-with-ngoptions-and-setting-a-default-value})
+     * - the {@link ng.ngValue `ngValue`} directive, which allows arbitrary expressions to be
+     *   option values ({@link ng.select#using-ngvalue-to-bind-the-model-to-an-array-of-objects Example})
+     * - model $parsers / $formatters to convert the string value
+     *   ({@link ng.select#binding-select-to-a-non-string-value-via-ngmodel-parsing-formatting Example})
+     *
+     * If the viewValue of `ngModel` does not match any of the options, then the control
+     * will automatically add an "unknown" option, which it then removes when the mismatch is resolved.
+     *
+     * Optionally, a single hard-coded `<option>` element, with the value set to an empty string, can
+     * be nested into the `<select>` element. This element will then represent the `null` or "not selected"
+     * option. See example below for demonstration.
+     *
+     * ## Choosing between `ngRepeat` and `ngOptions`
+     *
+     * In many cases, `ngRepeat` can be used on `<option>` elements instead of {@link ng.directive:ngOptions
+ * ngOptions} to achieve a similar result. However, `ngOptions` provides some benefits:
+     * - more flexibility in how the `<select>`'s model is assigned via the `select` **`as`** part of the
+     * comprehension expression
+     * - reduced memory consumption by not creating a new scope for each repeated instance
+     * - increased render speed by creating the options in a documentFragment instead of individually
+     *
+     * Specifically, select with repeated options slows down significantly starting at 2000 options in
+     * Chrome and Internet Explorer / Edge.
+     *
+     *
+     * @param {string} ngModel Assignable AngularJS expression to data-bind to.
+     * @param {string=} name Property name of the form under which the control is published.
+     * @param {string=} multiple Allows multiple options to be selected. The selected values will be
+     *     bound to the model as an array.
+     * @param {string=} required Sets `required` validation error key if the value is not entered.
+     * @param {string=} ngRequired Adds required attribute and required validation constraint to
+     * the element when the ngRequired expression evaluates to true. Use ngRequired instead of required
+     * when you want to data-bind to the required attribute.
+     * @param {string=} ngChange AngularJS expression to be executed when selected option(s) changes due to user
+     *    interaction with the select element.
+     * @param {string=} ngOptions sets the options that the select is populated with and defines what is
+     * set on the model on selection. See {@link ngOptions `ngOptions`}.
+     * @param {string=} ngAttrSize sets the size of the select element dynamically. Uses the
+     * {@link guide/interpolation#-ngattr-for-binding-to-arbitrary-attributes ngAttr} directive.
+     *
+     *
+     * @knownIssue
+     *
+     * In Firefox, the select model is only updated when the select element is blurred. For example,
+     * when switching between options with the keyboard, the select model is only set to the
+     * currently selected option when the select is blurred, e.g via tab key or clicking the mouse
+     * outside the select.
+     *
+     * This is due to an ambiguity in the select element specification. See the
+     * [issue on the Firefox bug tracker](https://bugzilla.mozilla.org/show_bug.cgi?id=126379)
+     * for more information, and this
+     * [Github comment for a workaround](https://github.com/angular/angular.js/issues/9134#issuecomment-130800488)
+     *
+     * @example
+     * ### Simple `select` elements with static options
+     *
+     * <example name="static-select" module="staticSelect">
+     * <file name="index.html">
+     * <div ng-controller="ExampleController">
+     *   <form name="myForm">
+     *     <label for="singleSelect"> Single select: </label><br>
+     *     <select name="singleSelect" ng-model="data.singleSelect">
+     *       <option value="option-1">Option 1</option>
+     *       <option value="option-2">Option 2</option>
+     *     </select><br>
+     *
+     *     <label for="singleSelect"> Single select with "not selected" option and dynamic option values: </label><br>
+     *     <select name="singleSelect" id="singleSelect" ng-model="data.singleSelect">
+     *       <option value="">---Please select---</option> <!-- not selected / blank option -->
+     *       <option value="{{data.option1}}">Option 1</option> <!-- interpolation -->
+     *       <option value="option-2">Option 2</option>
+     *     </select><br>
+     *     <button ng-click="forceUnknownOption()">Force unknown option</button><br>
+     *     <tt>singleSelect = {{data.singleSelect}}</tt>
+     *
+     *     <hr>
+     *     <label for="multipleSelect"> Multiple select: </label><br>
+     *     <select name="multipleSelect" id="multipleSelect" ng-model="data.multipleSelect" multiple>
+     *       <option value="option-1">Option 1</option>
+     *       <option value="option-2">Option 2</option>
+     *       <option value="option-3">Option 3</option>
+     *     </select><br>
+     *     <tt>multipleSelect = {{data.multipleSelect}}</tt><br/>
+     *   </form>
+     * </div>
+     * </file>
+     * <file name="app.js">
+     *  angular.module('staticSelect', [])
+     *    .controller('ExampleController', ['$scope', function($scope) {
+     *      $scope.data = {
+     *       singleSelect: null,
+     *       multipleSelect: [],
+     *       option1: 'option-1'
+     *      };
+     *
+     *      $scope.forceUnknownOption = function() {
+     *        $scope.data.singleSelect = 'nonsense';
+     *      };
+     *   }]);
+     * </file>
+     *</example>
+     *
+     * @example
+     * ### Using `ngRepeat` to generate `select` options
+     * <example name="select-ngrepeat" module="ngrepeatSelect">
+     * <file name="index.html">
+     * <div ng-controller="ExampleController">
+     *   <form name="myForm">
+     *     <label for="repeatSelect"> Repeat select: </label>
+     *     <select name="repeatSelect" id="repeatSelect" ng-model="data.model">
+     *       <option ng-repeat="option in data.availableOptions" value="{{option.id}}">{{option.name}}</option>
+     *     </select>
+     *   </form>
+     *   <hr>
+     *   <tt>model = {{data.model}}</tt><br/>
+     * </div>
+     * </file>
+     * <file name="app.js">
+     *  angular.module('ngrepeatSelect', [])
+     *    .controller('ExampleController', ['$scope', function($scope) {
+     *      $scope.data = {
+     *       model: null,
+     *       availableOptions: [
+     *         {id: '1', name: 'Option A'},
+     *         {id: '2', name: 'Option B'},
+     *         {id: '3', name: 'Option C'}
+     *       ]
+     *      };
+     *   }]);
+     * </file>
+     *</example>
+     *
+     * @example
+     * ### Using `ngValue` to bind the model to an array of objects
+     * <example name="select-ngvalue" module="ngvalueSelect">
+     * <file name="index.html">
+     * <div ng-controller="ExampleController">
+     *   <form name="myForm">
+     *     <label for="ngvalueselect"> ngvalue select: </label>
+     *     <select size="6" name="ngvalueselect" ng-model="data.model" multiple>
+     *       <option ng-repeat="option in data.availableOptions" ng-value="option.value">{{option.name}}</option>
+     *     </select>
+     *   </form>
+     *   <hr>
+     *   <pre>model = {{data.model | json}}</pre><br/>
+     * </div>
+     * </file>
+     * <file name="app.js">
+     *  angular.module('ngvalueSelect', [])
+     *    .controller('ExampleController', ['$scope', function($scope) {
+     *      $scope.data = {
+     *       model: null,
+     *       availableOptions: [
+           {value: 'myString', name: 'string'},
+           {value: 1, name: 'integer'},
+           {value: true, name: 'boolean'},
+           {value: null, name: 'null'},
+           {value: {prop: 'value'}, name: 'object'},
+           {value: ['a'], name: 'array'}
+     *       ]
+     *      };
+     *   }]);
+     * </file>
+     *</example>
+     *
+     * @example
+     * ### Using `select` with `ngOptions` and setting a default value
+     * See the {@link ngOptions ngOptions documentation} for more `ngOptions` usage examples.
+     *
+     * <example name="select-with-default-values" module="defaultValueSelect">
+     * <file name="index.html">
+     * <div ng-controller="ExampleController">
+     *   <form name="myForm">
+     *     <label for="mySelect">Make a choice:</label>
+     *     <select name="mySelect" id="mySelect"
+     *       ng-options="option.name for option in data.availableOptions track by option.id"
+     *       ng-model="data.selectedOption"></select>
+     *   </form>
+     *   <hr>
+     *   <tt>option = {{data.selectedOption}}</tt><br/>
+     * </div>
+     * </file>
+     * <file name="app.js">
+     *  angular.module('defaultValueSelect', [])
+     *    .controller('ExampleController', ['$scope', function($scope) {
+     *      $scope.data = {
+     *       availableOptions: [
+     *         {id: '1', name: 'Option A'},
+     *         {id: '2', name: 'Option B'},
+     *         {id: '3', name: 'Option C'}
+     *       ],
+     *       selectedOption: {id: '3', name: 'Option C'} //This sets the default value of the select in the ui
+     *       };
+     *   }]);
+     * </file>
+     *</example>
+     *
+     * @example
+     * ### Binding `select` to a non-string value via `ngModel` parsing / formatting
+     *
+     * <example name="select-with-non-string-options" module="nonStringSelect">
+     *   <file name="index.html">
+     *     <select ng-model="model.id" convert-to-number>
+     *       <option value="0">Zero</option>
+     *       <option value="1">One</option>
+     *       <option value="2">Two</option>
+     *     </select>
+     *     {{ model }}
+     *   </file>
+     *   <file name="app.js">
+     *     angular.module('nonStringSelect', [])
+     *       .run(function($rootScope) {
+     *         $rootScope.model = { id: 2 };
+     *       })
+     *       .directive('convertToNumber', function() {
+     *         return {
+     *           require: 'ngModel',
+     *           link: function(scope, element, attrs, ngModel) {
+     *             ngModel.$parsers.push(function(val) {
+     *               return parseInt(val, 10);
+     *             });
+     *             ngModel.$formatters.push(function(val) {
+     *               return '' + val;
+     *             });
+     *           }
+     *         };
+     *       });
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     *     it('should initialize to model', function() {
+     *       expect(element(by.model('model.id')).$('option:checked').getText()).toEqual('Two');
+     *     });
+     *   </file>
+     * </example>
+     *
+     */
+    var selectDirective = function() {
 
-                            key = index;
-                            if (keyName) {
-                                key = keys[index];
-                                if ( key.charAt(0) === '$' ) continue;
-                                locals[keyName] = key;
-                            }
+        return {
+            restrict: 'E',
+            require: ['select', '?ngModel'],
+            controller: SelectController,
+            priority: 1,
+            link: {
+                pre: selectPreLink,
+                post: selectPostLink
+            }
+        };
 
-                            locals[valueName] = values[key];
+        function selectPreLink(scope, element, attr, ctrls) {
 
-                            optionGroupName = groupByFn(scope, locals) || '';
-                            if (!(optionGroup = optionGroups[optionGroupName])) {
-                                optionGroup = optionGroups[optionGroupName] = [];
-                                optionGroupNames.push(optionGroupName);
-                            }
-                            if (multiple) {
-                                selected = isDefined(
-                                    selectedSet.remove(trackFn ? trackFn(scope, locals) : valueFn(scope, locals))
-                                );
-                            } else {
-                                if (trackFn) {
-                                    var modelCast = {};
-                                    modelCast[valueName] = modelValue;
-                                    selected = trackFn(scope, modelCast) === trackFn(scope, locals);
-                                } else {
-                                    selected = modelValue === valueFn(scope, locals);
-                                }
-                                selectedSet = selectedSet || selected; // see if at least one item is selected
-                            }
-                            label = displayFn(scope, locals); // what will be seen by the user
-
-                            // doing displayFn(scope, locals) || '' overwrites zero values
-                            label = isDefined(label) ? label : '';
-                            optionGroup.push({
-                                // either the index into array or key from object
-                                id: trackFn ? trackFn(scope, locals) : (keyName ? keys[index] : index),
-                                label: label,
-                                selected: selected                   // determine if we should be selected
-                            });
-                        }
-                        if (!multiple) {
-                            if (nullOption || modelValue === null) {
-                                // insert null option if we have a placeholder, or the model is null
-                                optionGroups[''].unshift({id:'', label:'', selected:!selectedSet});
-                            } else if (!selectedSet) {
-                                // option could not be found, we have to insert the undefined item
-                                optionGroups[''].unshift({id:'?', label:'', selected:true});
-                            }
-                        }
+            var selectCtrl = ctrls[0];
+            var ngModelCtrl = ctrls[1];
 
-                        // Now we need to update the list of DOM nodes to match the optionGroups we computed above
-                        for (groupIndex = 0, groupLength = optionGroupNames.length;
-                             groupIndex < groupLength;
-                             groupIndex++) {
-                            // current option group name or '' if no group
-                            optionGroupName = optionGroupNames[groupIndex];
-
-                            // list of options for that group. (first item has the parent)
-                            optionGroup = optionGroups[optionGroupName];
-
-                            if (optionGroupsCache.length <= groupIndex) {
-                                // we need to grow the optionGroups
-                                existingParent = {
-                                    element: optGroupTemplate.clone().attr('label', optionGroupName),
-                                    label: optionGroup.label
-                                };
-                                existingOptions = [existingParent];
-                                optionGroupsCache.push(existingOptions);
-                                selectElement.append(existingParent.element);
-                            } else {
-                                existingOptions = optionGroupsCache[groupIndex];
-                                existingParent = existingOptions[0];  // either SELECT (no group) or OPTGROUP element
+            // if ngModel is not defined, we don't need to do anything but set the registerOption
+            // function to noop, so options don't get added internally
+            if (!ngModelCtrl) {
+                selectCtrl.registerOption = noop;
+                return;
+            }
 
-                                // update the OPTGROUP label if not the same.
-                                if (existingParent.label != optionGroupName) {
-                                    existingParent.element.attr('label', existingParent.label = optionGroupName);
-                                }
-                            }
 
-                            lastElement = null;  // start at the beginning
-                            for(index = 0, length = optionGroup.length; index < length; index++) {
-                                option = optionGroup[index];
-                                if ((existingOption = existingOptions[index+1])) {
-                                    // reuse elements
-                                    lastElement = existingOption.element;
-                                    if (existingOption.label !== option.label) {
-                                        lastElement.text(existingOption.label = option.label);
-                                    }
-                                    if (existingOption.id !== option.id) {
-                                        lastElement.val(existingOption.id = option.id);
-                                    }
-                                    // lastElement.prop('selected') provided by jQuery has side-effects
-                                    if (existingOption.selected !== option.selected) {
-                                        lastElement.prop('selected', (existingOption.selected = option.selected));
-                                    }
-                                } else {
-                                    // grow elements
+            selectCtrl.ngModelCtrl = ngModelCtrl;
 
-                                    // if it's a null option
-                                    if (option.id === '' && nullOption) {
-                                        // put back the pre-compiled element
-                                        element = nullOption;
-                                    } else {
-                                        // jQuery(v1.4.2) Bug: We should be able to chain the method calls, but
-                                        // in this version of jQuery on some browser the .text() returns a string
-                                        // rather then the element.
-                                        (element = optionTemplate.clone())
-                                            .val(option.id)
-                                            .attr('selected', option.selected)
-                                            .text(option.label);
-                                    }
+            // When the selected item(s) changes we delegate getting the value of the select control
+            // to the `readValue` method, which can be changed if the select can have multiple
+            // selected values or if the options are being generated by `ngOptions`
+            element.on('change', function() {
+                selectCtrl.removeUnknownOption();
+                scope.$apply(function() {
+                    ngModelCtrl.$setViewValue(selectCtrl.readValue());
+                });
+            });
 
-                                    existingOptions.push(existingOption = {
-                                        element: element,
-                                        label: option.label,
-                                        id: option.id,
-                                        selected: option.selected
-                                    });
-                                    if (lastElement) {
-                                        lastElement.after(element);
-                                    } else {
-                                        existingParent.element.append(element);
-                                    }
-                                    lastElement = element;
-                                }
-                            }
-                            // remove any excessive OPTIONs in a group
-                            index++; // increment since the existingOptions[0] is parent element not OPTION
-                            while(existingOptions.length > index) {
-                                existingOptions.pop().element.remove();
-                            }
+            // If the select allows multiple values then we need to modify how we read and write
+            // values from and to the control; also what it means for the value to be empty and
+            // we have to add an extra watch since ngModel doesn't work well with arrays - it
+            // doesn't trigger rendering if only an item in the array changes.
+            if (attr.multiple) {
+                selectCtrl.multiple = true;
+
+                // Read value now needs to check each option to see if it is selected
+                selectCtrl.readValue = function readMultipleValue() {
+                    var array = [];
+                    forEach(element.find('option'), function(option) {
+                        if (option.selected && !option.disabled) {
+                            var val = option.value;
+                            array.push(val in selectCtrl.selectValueMap ? selectCtrl.selectValueMap[val] : val);
                         }
-                        // remove any excessive OPTGROUPs from select
-                        while(optionGroupsCache.length > groupIndex) {
-                            optionGroupsCache.pop()[0].element.remove();
+                    });
+                    return array;
+                };
+
+                // Write value now needs to set the selected property of each matching option
+                selectCtrl.writeValue = function writeMultipleValue(value) {
+                    forEach(element.find('option'), function(option) {
+                        var shouldBeSelected = !!value && (includes(value, option.value) ||
+                            includes(value, selectCtrl.selectValueMap[option.value]));
+                        var currentlySelected = option.selected;
+
+                        // Support: IE 9-11 only, Edge 12-15+
+                        // In IE and Edge adding options to the selection via shift+click/UP/DOWN
+                        // will de-select already selected options if "selected" on those options was set
+                        // more than once (i.e. when the options were already selected)
+                        // So we only modify the selected property if necessary.
+                        // Note: this behavior cannot be replicated via unit tests because it only shows in the
+                        // actual user interface.
+                        if (shouldBeSelected !== currentlySelected) {
+                            setOptionSelectedStatus(jqLite(option), shouldBeSelected);
                         }
+
+                    });
+                };
+
+                // we have to do it on each watch since ngModel watches reference, but
+                // we need to work of an array, so we need to see if anything was inserted/removed
+                var lastView, lastViewRef = NaN;
+                scope.$watch(function selectMultipleWatch() {
+                    if (lastViewRef === ngModelCtrl.$viewValue && !equals(lastView, ngModelCtrl.$viewValue)) {
+                        lastView = shallowCopy(ngModelCtrl.$viewValue);
+                        ngModelCtrl.$render();
                     }
-                }
+                    lastViewRef = ngModelCtrl.$viewValue;
+                });
+
+                // If we are a multiple select then value is now a collection
+                // so the meaning of $isEmpty changes
+                ngModelCtrl.$isEmpty = function(value) {
+                    return !value || value.length === 0;
+                };
+
             }
-        };
-    }];
+        }
 
-    var optionDirective = ['$interpolate', function($interpolate) {
-        var nullSelectCtrl = {
-            addOption: noop,
-            removeOption: noop
-        };
+        function selectPostLink(scope, element, attrs, ctrls) {
+            // if ngModel is not defined, we don't need to do anything
+            var ngModelCtrl = ctrls[1];
+            if (!ngModelCtrl) return;
+
+            var selectCtrl = ctrls[0];
+
+            // We delegate rendering to the `writeValue` method, which can be changed
+            // if the select can have multiple selected values or if the options are being
+            // generated by `ngOptions`.
+            // This must be done in the postLink fn to prevent $render to be called before
+            // all nodes have been linked correctly.
+            ngModelCtrl.$render = function() {
+                selectCtrl.writeValue(ngModelCtrl.$viewValue);
+            };
+        }
+    };
 
+
+// The option directive is purely designed to communicate the existence (or lack of)
+// of dynamically created (and destroyed) option elements to their containing select
+// directive via its controller.
+    var optionDirective = ['$interpolate', function($interpolate) {
         return {
             restrict: 'E',
             priority: 100,
             compile: function(element, attr) {
-                if (isUndefined(attr.value)) {
-                    var interpolateFn = $interpolate(element.text(), true);
-                    if (!interpolateFn) {
+                var interpolateValueFn, interpolateTextFn;
+
+                if (isDefined(attr.ngValue)) {
+                    // Will be handled by registerOption
+                } else if (isDefined(attr.value)) {
+                    // If the value attribute is defined, check if it contains an interpolation
+                    interpolateValueFn = $interpolate(attr.value, true);
+                } else {
+                    // If the value attribute is not defined then we fall back to the
+                    // text content of the option element, which may be interpolated
+                    interpolateTextFn = $interpolate(element.text(), true);
+                    if (!interpolateTextFn) {
                         attr.$set('value', element.text());
                     }
                 }
 
-                return function (scope, element, attr) {
+                return function(scope, element, attr) {
+                    // This is an optimization over using ^^ since we don't want to have to search
+                    // all the way to the root of the DOM for every single option element
                     var selectCtrlName = '$selectController',
                         parent = element.parent(),
                         selectCtrl = parent.data(selectCtrlName) ||
                             parent.parent().data(selectCtrlName); // in case we are in optgroup
 
-                    if (selectCtrl && selectCtrl.databound) {
-                        // For some reason Opera defaults to true and if not overridden this messes up the repeater.
-                        // We don't want the view to drive the initialization of the model anyway.
-                        element.prop('selected', false);
-                    } else {
-                        selectCtrl = nullSelectCtrl;
+                    if (selectCtrl) {
+                        selectCtrl.registerOption(scope, element, attr, interpolateValueFn, interpolateTextFn);
                     }
+                };
+            }
+        };
+    }];
 
-                    if (interpolateFn) {
-                        scope.$watch(interpolateFn, function interpolateWatchAction(newVal, oldVal) {
-                            attr.$set('value', newVal);
-                            if (newVal !== oldVal) selectCtrl.removeOption(oldVal);
-                            selectCtrl.addOption(newVal);
-                        });
-                    } else {
-                        selectCtrl.addOption(attr.value);
+    /**
+     * @ngdoc directive
+     * @name ngRequired
+     * @restrict A
+     *
+     * @param {expression} ngRequired AngularJS expression. If it evaluates to `true`, it sets the
+     *                                `required` attribute to the element and adds the `required`
+     *                                {@link ngModel.NgModelController#$validators `validator`}.
+     *
+     * @description
+     *
+     * ngRequired adds the required {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
+     * It is most often used for {@link input `input`} and {@link select `select`} controls, but can also be
+     * applied to custom controls.
+     *
+     * The directive sets the `required` attribute on the element if the AngularJS expression inside
+     * `ngRequired` evaluates to true. A special directive for setting `required` is necessary because we
+     * cannot use interpolation inside `required`. See the {@link guide/interpolation interpolation guide}
+     * for more info.
+     *
+     * The validator will set the `required` error key to true if the `required` attribute is set and
+     * calling {@link ngModel.NgModelController#$isEmpty `NgModelController.$isEmpty`} with the
+     * {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`} returns `true`. For example, the
+     * `$isEmpty()` implementation for `input[text]` checks the length of the `$viewValue`. When developing
+     * custom controls, `$isEmpty()` can be overwritten to account for a $viewValue that is not string-based.
+     *
+     * @example
+     * <example name="ngRequiredDirective" module="ngRequiredExample">
+     *   <file name="index.html">
+     *     <script>
+     *       angular.module('ngRequiredExample', [])
+     *         .controller('ExampleController', ['$scope', function($scope) {
+     *           $scope.required = true;
+     *         }]);
+     *     </script>
+     *     <div ng-controller="ExampleController">
+     *       <form name="form">
+     *         <label for="required">Toggle required: </label>
+     *         <input type="checkbox" ng-model="required" id="required" />
+     *         <br>
+     *         <label for="input">This input must be filled if `required` is true: </label>
+     *         <input type="text" ng-model="model" id="input" name="input" ng-required="required" /><br>
+     *         <hr>
+     *         required error set? = <code>{{form.input.$error.required}}</code><br>
+     *         model = <code>{{model}}</code>
+     *       </form>
+     *     </div>
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     var required = element(by.binding('form.input.$error.required'));
+     var model = element(by.binding('model'));
+     var input = element(by.id('input'));
+
+     it('should set the required error', function() {
+         expect(required.getText()).toContain('true');
+
+         input.sendKeys('123');
+         expect(required.getText()).not.toContain('true');
+         expect(model.getText()).toContain('123');
+       });
+     *   </file>
+     * </example>
+     */
+    var requiredDirective = function() {
+        return {
+            restrict: 'A',
+            require: '?ngModel',
+            link: function(scope, elm, attr, ctrl) {
+                if (!ctrl) return;
+                attr.required = true; // force truthy in case we are on non input element
+
+                ctrl.$validators.required = function(modelValue, viewValue) {
+                    return !attr.required || !ctrl.$isEmpty(viewValue);
+                };
+
+                attr.$observe('required', function() {
+                    ctrl.$validate();
+                });
+            }
+        };
+    };
+
+    /**
+     * @ngdoc directive
+     * @name ngPattern
+     * @restrict A
+     *
+     * @param {expression|RegExp} ngPattern AngularJS expression that must evaluate to a `RegExp` or a `String`
+     *                                      parsable into a `RegExp`, or a `RegExp` literal. See above for
+     *                                      more details.
+     *
+     * @description
+     *
+     * ngPattern adds the pattern {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
+     * It is most often used for text-based {@link input `input`} controls, but can also be applied to custom text-based controls.
+     *
+     * The validator sets the `pattern` error key if the {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`}
+     * does not match a RegExp which is obtained from the `ngPattern` attribute value:
+     * - the value is an AngularJS expression:
+     *   - If the expression evaluates to a RegExp object, then this is used directly.
+     *   - If the expression evaluates to a string, then it will be converted to a RegExp after wrapping it
+     *     in `^` and `$` characters. For instance, `"abc"` will be converted to `new RegExp('^abc$')`.
+     * - If the value is a RegExp literal, e.g. `ngPattern="/^\d+$/"`, it is used directly.
+     *
+     * <div class="alert alert-info">
+     * **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+     * start at the index of the last search's match, thus not taking the whole input value into
+     * account.
+     * </div>
+     *
+     * <div class="alert alert-info">
+     * **Note:** This directive is also added when the plain `pattern` attribute is used, with two
+     * differences:
+     * <ol>
+     *   <li>
+     *     `ngPattern` does not set the `pattern` attribute and therefore HTML5 constraint validation is
+     *     not available.
+     *   </li>
+     *   <li>
+     *     The `ngPattern` attribute must be an expression, while the `pattern` value must be
+     *     interpolated.
+     *   </li>
+     * </ol>
+     * </div>
+     *
+     * @example
+     * <example name="ngPatternDirective" module="ngPatternExample">
+     *   <file name="index.html">
+     *     <script>
+     *       angular.module('ngPatternExample', [])
+     *         .controller('ExampleController', ['$scope', function($scope) {
+     *           $scope.regex = '\\d+';
+     *         }]);
+     *     </script>
+     *     <div ng-controller="ExampleController">
+     *       <form name="form">
+     *         <label for="regex">Set a pattern (regex string): </label>
+     *         <input type="text" ng-model="regex" id="regex" />
+     *         <br>
+     *         <label for="input">This input is restricted by the current pattern: </label>
+     *         <input type="text" ng-model="model" id="input" name="input" ng-pattern="regex" /><br>
+     *         <hr>
+     *         input valid? = <code>{{form.input.$valid}}</code><br>
+     *         model = <code>{{model}}</code>
+     *       </form>
+     *     </div>
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     var model = element(by.binding('model'));
+     var input = element(by.id('input'));
+
+     it('should validate the input with the default pattern', function() {
+         input.sendKeys('aaa');
+         expect(model.getText()).not.toContain('aaa');
+
+         input.clear().then(function() {
+           input.sendKeys('123');
+           expect(model.getText()).toContain('123');
+         });
+       });
+     *   </file>
+     * </example>
+     */
+    var patternDirective = function() {
+        return {
+            restrict: 'A',
+            require: '?ngModel',
+            link: function(scope, elm, attr, ctrl) {
+                if (!ctrl) return;
+
+                var regexp, patternExp = attr.ngPattern || attr.pattern;
+                attr.$observe('pattern', function(regex) {
+                    if (isString(regex) && regex.length > 0) {
+                        regex = new RegExp('^' + regex + '$');
                     }
 
-                    element.on('$destroy', function() {
-                        selectCtrl.removeOption(attr.value);
-                    });
+                    if (regex && !regex.test) {
+                        throw minErr('ngPattern')('noregexp',
+                            'Expected {0} to be a RegExp but was {1}. Element: {2}', patternExp,
+                            regex, startingTag(elm));
+                    }
+
+                    regexp = regex || undefined;
+                    ctrl.$validate();
+                });
+
+                ctrl.$validators.pattern = function(modelValue, viewValue) {
+                    // HTML5 pattern constraint validates the input value, so we validate the viewValue
+                    return ctrl.$isEmpty(viewValue) || isUndefined(regexp) || regexp.test(viewValue);
                 };
             }
         };
-    }];
+    };
 
-    var styleDirective = valueFn({
-        restrict: 'E',
-        terminal: true
-    });
+    /**
+     * @ngdoc directive
+     * @name ngMaxlength
+     * @restrict A
+     *
+     * @param {expression} ngMaxlength AngularJS expression that must evaluate to a `Number` or `String`
+     *                                 parsable into a `Number`. Used as value for the `maxlength`
+     *                                 {@link ngModel.NgModelController#$validators validator}.
+     *
+     * @description
+     *
+     * ngMaxlength adds the maxlength {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
+     * It is most often used for text-based {@link input `input`} controls, but can also be applied to custom text-based controls.
+     *
+     * The validator sets the `maxlength` error key if the {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`}
+     * is longer than the integer obtained by evaluating the AngularJS expression given in the
+     * `ngMaxlength` attribute value.
+     *
+     * <div class="alert alert-info">
+     * **Note:** This directive is also added when the plain `maxlength` attribute is used, with two
+     * differences:
+     * <ol>
+     *   <li>
+     *     `ngMaxlength` does not set the `maxlength` attribute and therefore HTML5 constraint
+     *     validation is not available.
+     *   </li>
+     *   <li>
+     *     The `ngMaxlength` attribute must be an expression, while the `maxlength` value must be
+     *     interpolated.
+     *   </li>
+     * </ol>
+     * </div>
+     *
+     * @example
+     * <example name="ngMaxlengthDirective" module="ngMaxlengthExample">
+     *   <file name="index.html">
+     *     <script>
+     *       angular.module('ngMaxlengthExample', [])
+     *         .controller('ExampleController', ['$scope', function($scope) {
+     *           $scope.maxlength = 5;
+     *         }]);
+     *     </script>
+     *     <div ng-controller="ExampleController">
+     *       <form name="form">
+     *         <label for="maxlength">Set a maxlength: </label>
+     *         <input type="number" ng-model="maxlength" id="maxlength" />
+     *         <br>
+     *         <label for="input">This input is restricted by the current maxlength: </label>
+     *         <input type="text" ng-model="model" id="input" name="input" ng-maxlength="maxlength" /><br>
+     *         <hr>
+     *         input valid? = <code>{{form.input.$valid}}</code><br>
+     *         model = <code>{{model}}</code>
+     *       </form>
+     *     </div>
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     var model = element(by.binding('model'));
+     var input = element(by.id('input'));
+
+     it('should validate the input with the default maxlength', function() {
+         input.sendKeys('abcdef');
+         expect(model.getText()).not.toContain('abcdef');
+
+         input.clear().then(function() {
+           input.sendKeys('abcde');
+           expect(model.getText()).toContain('abcde');
+         });
+       });
+     *   </file>
+     * </example>
+     */
+    var maxlengthDirective = function() {
+        return {
+            restrict: 'A',
+            require: '?ngModel',
+            link: function(scope, elm, attr, ctrl) {
+                if (!ctrl) return;
+
+                var maxlength = -1;
+                attr.$observe('maxlength', function(value) {
+                    var intVal = toInt(value);
+                    maxlength = isNumberNaN(intVal) ? -1 : intVal;
+                    ctrl.$validate();
+                });
+                ctrl.$validators.maxlength = function(modelValue, viewValue) {
+                    return (maxlength < 0) || ctrl.$isEmpty(viewValue) || (viewValue.length <= maxlength);
+                };
+            }
+        };
+    };
+
+    /**
+     * @ngdoc directive
+     * @name ngMinlength
+     * @restrict A
+     *
+     * @param {expression} ngMinlength AngularJS expression that must evaluate to a `Number` or `String`
+     *                                 parsable into a `Number`. Used as value for the `minlength`
+     *                                 {@link ngModel.NgModelController#$validators validator}.
+     *
+     * @description
+     *
+     * ngMinlength adds the minlength {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
+     * It is most often used for text-based {@link input `input`} controls, but can also be applied to custom text-based controls.
+     *
+     * The validator sets the `minlength` error key if the {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`}
+     * is shorter than the integer obtained by evaluating the AngularJS expression given in the
+     * `ngMinlength` attribute value.
+     *
+     * <div class="alert alert-info">
+     * **Note:** This directive is also added when the plain `minlength` attribute is used, with two
+     * differences:
+     * <ol>
+     *   <li>
+     *     `ngMinlength` does not set the `minlength` attribute and therefore HTML5 constraint
+     *     validation is not available.
+     *   </li>
+     *   <li>
+     *     The `ngMinlength` value must be an expression, while the `minlength` value must be
+     *     interpolated.
+     *   </li>
+     * </ol>
+     * </div>
+     *
+     * @example
+     * <example name="ngMinlengthDirective" module="ngMinlengthExample">
+     *   <file name="index.html">
+     *     <script>
+     *       angular.module('ngMinlengthExample', [])
+     *         .controller('ExampleController', ['$scope', function($scope) {
+     *           $scope.minlength = 3;
+     *         }]);
+     *     </script>
+     *     <div ng-controller="ExampleController">
+     *       <form name="form">
+     *         <label for="minlength">Set a minlength: </label>
+     *         <input type="number" ng-model="minlength" id="minlength" />
+     *         <br>
+     *         <label for="input">This input is restricted by the current minlength: </label>
+     *         <input type="text" ng-model="model" id="input" name="input" ng-minlength="minlength" /><br>
+     *         <hr>
+     *         input valid? = <code>{{form.input.$valid}}</code><br>
+     *         model = <code>{{model}}</code>
+     *       </form>
+     *     </div>
+     *   </file>
+     *   <file name="protractor.js" type="protractor">
+     var model = element(by.binding('model'));
+     var input = element(by.id('input'));
+
+     it('should validate the input with the default minlength', function() {
+         input.sendKeys('ab');
+         expect(model.getText()).not.toContain('ab');
+
+         input.sendKeys('abc');
+         expect(model.getText()).toContain('abc');
+       });
+     *   </file>
+     * </example>
+     */
+    var minlengthDirective = function() {
+        return {
+            restrict: 'A',
+            require: '?ngModel',
+            link: function(scope, elm, attr, ctrl) {
+                if (!ctrl) return;
+
+                var minlength = 0;
+                attr.$observe('minlength', function(value) {
+                    minlength = toInt(value) || 0;
+                    ctrl.$validate();
+                });
+                ctrl.$validators.minlength = function(modelValue, viewValue) {
+                    return ctrl.$isEmpty(viewValue) || viewValue.length >= minlength;
+                };
+            }
+        };
+    };
 
     if (window.angular.bootstrap) {
-        //AngularJS is already loaded, so we can return here...
-        console.log('WARNING: Tried to load angular more than once.');
+        // AngularJS is already loaded, so we can return here...
+        if (window.console) {
+            console.log('WARNING: Tried to load AngularJS more than once.');
+        }
         return;
     }
 
-    //try to bind to jquery now so that one can write angular.element().read()
-    //but we will rebind on bootstrap again.
+// try to bind to jquery now so that one can write jqLite(fn)
+// but we will rebind on bootstrap again.
     bindJQuery();
 
     publishExternalAPI(angular);
 
-    jqLite(document).ready(function() {
-        angularInit(document, bootstrap);
+    angular.module("ngLocale", [], ["$provide", function($provide) {
+        var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "many", OTHER: "other"};
+        function getDecimals(n) {
+            n = n + '';
+            var i = n.indexOf('.');
+            return (i == -1) ? 0 : n.length - i - 1;
+        }
+
+        function getVF(n, opt_precision) {
+            var v = opt_precision;
+
+            if (undefined === v) {
+                v = Math.min(getDecimals(n), 3);
+            }
+
+            var base = Math.pow(10, v);
+            var f = ((n * base) | 0) % base;
+            return {v: v, f: f};
+        }
+
+        $provide.value("$locale", {
+            "DATETIME_FORMATS": {
+                "AMPMS": [
+                    "AM",
+                    "PM"
+                ],
+                "DAY": [
+                    "Sunday",
+                    "Monday",
+                    "Tuesday",
+                    "Wednesday",
+                    "Thursday",
+                    "Friday",
+                    "Saturday"
+                ],
+                "ERANAMES": [
+                    "Before Christ",
+                    "Anno Domini"
+                ],
+                "ERAS": [
+                    "BC",
+                    "AD"
+                ],
+                "FIRSTDAYOFWEEK": 6,
+                "MONTH": [
+                    "January",
+                    "February",
+                    "March",
+                    "April",
+                    "May",
+                    "June",
+                    "July",
+                    "August",
+                    "September",
+                    "October",
+                    "November",
+                    "December"
+                ],
+                "SHORTDAY": [
+                    "Sun",
+                    "Mon",
+                    "Tue",
+                    "Wed",
+                    "Thu",
+                    "Fri",
+                    "Sat"
+                ],
+                "SHORTMONTH": [
+                    "Jan",
+                    "Feb",
+                    "Mar",
+                    "Apr",
+                    "May",
+                    "Jun",
+                    "Jul",
+                    "Aug",
+                    "Sep",
+                    "Oct",
+                    "Nov",
+                    "Dec"
+                ],
+                "STANDALONEMONTH": [
+                    "January",
+                    "February",
+                    "March",
+                    "April",
+                    "May",
+                    "June",
+                    "July",
+                    "August",
+                    "September",
+                    "October",
+                    "November",
+                    "December"
+                ],
+                "WEEKENDRANGE": [
+                    5,
+                    6
+                ],
+                "fullDate": "EEEE, MMMM d, y",
+                "longDate": "MMMM d, y",
+                "medium": "MMM d, y h:mm:ss a",
+                "mediumDate": "MMM d, y",
+                "mediumTime": "h:mm:ss a",
+                "short": "M/d/yy h:mm a",
+                "shortDate": "M/d/yy",
+                "shortTime": "h:mm a"
+            },
+            "NUMBER_FORMATS": {
+                "CURRENCY_SYM": "$",
+                "DECIMAL_SEP": ".",
+                "GROUP_SEP": ",",
+                "PATTERNS": [
+                    {
+                        "gSize": 3,
+                        "lgSize": 3,
+                        "maxFrac": 3,
+                        "minFrac": 0,
+                        "minInt": 1,
+                        "negPre": "-",
+                        "negSuf": "",
+                        "posPre": "",
+                        "posSuf": ""
+                    },
+                    {
+                        "gSize": 3,
+                        "lgSize": 3,
+                        "maxFrac": 2,
+                        "minFrac": 2,
+                        "minInt": 1,
+                        "negPre": "-\u00a4",
+                        "negSuf": "",
+                        "posPre": "\u00a4",
+                        "posSuf": ""
+                    }
+                ]
+            },
+            "id": "en-us",
+            "localeID": "en_US",
+            "pluralCat": function(n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (i == 1 && vf.v == 0) {    return PLURAL_CATEGORY.ONE;  }  return PLURAL_CATEGORY.OTHER;}
+        });
+    }]);
+
+    jqLite(function() {
+        angularInit(window.document, bootstrap);
     });
 
-})(window, document);
+})(window);
 
-!angular.$$csp() && angular.element(document).find('head').prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide{display:none !important;}ng\\:form{display:block;}.ng-animate-block-transitions{transition:0s all!important;-webkit-transition:0s all!important;}</style>');
\ No newline at end of file
+!window.angular.$$csp().noInlineStyle && window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
\ No newline at end of file
diff --git a/setup/pub/angular/angular.min.js b/setup/pub/angular/angular.min.js
index c7d2ea7388e33..4c57937335798 100644
--- a/setup/pub/angular/angular.min.js
+++ b/setup/pub/angular/angular.min.js
@@ -1,212 +1,337 @@
 /*
- AngularJS v1.2.17-build.178+sha.2406084
- (c) 2010-2014 Google, Inc. http://angularjs.org
+ AngularJS v1.6.9
+ (c) 2010-2018 Google, Inc. http://angularjs.org
  License: MIT
 */
-(function(P,U,s){'use strict';function u(b){return function(){var a=arguments[0],c,a="["+(b?b+":":"")+a+"] http://errors.angularjs.org/1.2.17-build.178+sha.2406084/"+(b?b+"/":"")+a;for(c=1;c<arguments.length;c++)a=a+(1==c?"?":"&")+"p"+(c-1)+"="+encodeURIComponent("function"==typeof arguments[c]?arguments[c].toString().replace(/ \{[\s\S]*$/,""):"undefined"==typeof arguments[c]?"undefined":"string"!=typeof arguments[c]?JSON.stringify(arguments[c]):arguments[c]);return Error(a)}}function bb(b){if(null==
-b||Da(b))return!1;var a=b.length;return 1===b.nodeType&&a?!0:C(b)||L(b)||0===a||"number"===typeof a&&0<a&&a-1 in b}function q(b,a,c){var d;if(b)if(Q(b))for(d in b)"prototype"==d||("length"==d||"name"==d||b.hasOwnProperty&&!b.hasOwnProperty(d))||a.call(c,b[d],d);else if(b.forEach&&b.forEach!==q)b.forEach(a,c);else if(bb(b))for(d=0;d<b.length;d++)a.call(c,b[d],d);else for(d in b)b.hasOwnProperty(d)&&a.call(c,b[d],d);return b}function Ub(b){var a=[],c;for(c in b)b.hasOwnProperty(c)&&a.push(c);return a.sort()}
-function Sc(b,a,c){for(var d=Ub(b),e=0;e<d.length;e++)a.call(c,b[d[e]],d[e]);return d}function Vb(b){return function(a,c){b(c,a)}}function cb(){for(var b=ka.length,a;b;){b--;a=ka[b].charCodeAt(0);if(57==a)return ka[b]="A",ka.join("");if(90==a)ka[b]="0";else return ka[b]=String.fromCharCode(a+1),ka.join("")}ka.unshift("0");return ka.join("")}function Wb(b,a){a?b.$$hashKey=a:delete b.$$hashKey}function E(b){var a=b.$$hashKey;q(arguments,function(a){a!==b&&q(a,function(a,c){b[c]=a})});Wb(b,a);return b}
-function Y(b){return parseInt(b,10)}function Xb(b,a){return E(new (E(function(){},{prototype:b})),a)}function w(){}function Ea(b){return b}function aa(b){return function(){return b}}function H(b){return"undefined"===typeof b}function z(b){return"undefined"!==typeof b}function X(b){return null!=b&&"object"===typeof b}function C(b){return"string"===typeof b}function yb(b){return"number"===typeof b}function Ma(b){return"[object Date]"===wa.call(b)}function L(b){return"[object Array]"===wa.call(b)}function Q(b){return"function"===
-typeof b}function db(b){return"[object RegExp]"===wa.call(b)}function Da(b){return b&&b.document&&b.location&&b.alert&&b.setInterval}function Tc(b){return!(!b||!(b.nodeName||b.prop&&b.attr&&b.find))}function Uc(b,a,c){var d=[];q(b,function(b,g,f){d.push(a.call(c,b,g,f))});return d}function eb(b,a){if(b.indexOf)return b.indexOf(a);for(var c=0;c<b.length;c++)if(a===b[c])return c;return-1}function Na(b,a){var c=eb(b,a);0<=c&&b.splice(c,1);return a}function ca(b,a){if(Da(b)||b&&b.$evalAsync&&b.$watch)throw Oa("cpws");
-if(a){if(b===a)throw Oa("cpi");if(L(b))for(var c=a.length=0;c<b.length;c++)a.push(ca(b[c]));else{c=a.$$hashKey;q(a,function(b,c){delete a[c]});for(var d in b)a[d]=ca(b[d]);Wb(a,c)}}else(a=b)&&(L(b)?a=ca(b,[]):Ma(b)?a=new Date(b.getTime()):db(b)?a=RegExp(b.source):X(b)&&(a=ca(b,{})));return a}function Yb(b,a){a=a||{};for(var c in b)!b.hasOwnProperty(c)||"$"===c.charAt(0)&&"$"===c.charAt(1)||(a[c]=b[c]);return a}function xa(b,a){if(b===a)return!0;if(null===b||null===a)return!1;if(b!==b&&a!==a)return!0;
-var c=typeof b,d;if(c==typeof a&&"object"==c)if(L(b)){if(!L(a))return!1;if((c=b.length)==a.length){for(d=0;d<c;d++)if(!xa(b[d],a[d]))return!1;return!0}}else{if(Ma(b))return Ma(a)&&b.getTime()==a.getTime();if(db(b)&&db(a))return b.toString()==a.toString();if(b&&b.$evalAsync&&b.$watch||a&&a.$evalAsync&&a.$watch||Da(b)||Da(a)||L(a))return!1;c={};for(d in b)if("$"!==d.charAt(0)&&!Q(b[d])){if(!xa(b[d],a[d]))return!1;c[d]=!0}for(d in a)if(!c.hasOwnProperty(d)&&"$"!==d.charAt(0)&&a[d]!==s&&!Q(a[d]))return!1;
-return!0}return!1}function Zb(){return U.securityPolicy&&U.securityPolicy.isActive||U.querySelector&&!(!U.querySelector("[ng-csp]")&&!U.querySelector("[data-ng-csp]"))}function fb(b,a){var c=2<arguments.length?ya.call(arguments,2):[];return!Q(a)||a instanceof RegExp?a:c.length?function(){return arguments.length?a.apply(b,c.concat(ya.call(arguments,0))):a.apply(b,c)}:function(){return arguments.length?a.apply(b,arguments):a.call(b)}}function Vc(b,a){var c=a;"string"===typeof b&&"$"===b.charAt(0)?c=
-s:Da(a)?c="$WINDOW":a&&U===a?c="$DOCUMENT":a&&(a.$evalAsync&&a.$watch)&&(c="$SCOPE");return c}function qa(b,a){return"undefined"===typeof b?s:JSON.stringify(b,Vc,a?"  ":null)}function $b(b){return C(b)?JSON.parse(b):b}function Pa(b){"function"===typeof b?b=!0:b&&0!==b.length?(b=J(""+b),b=!("f"==b||"0"==b||"false"==b||"no"==b||"n"==b||"[]"==b)):b=!1;return b}function ia(b){b=y(b).clone();try{b.empty()}catch(a){}var c=y("<div>").append(b).html();try{return 3===b[0].nodeType?J(c):c.match(/^(<[^>]+>)/)[1].replace(/^<([\w\-]+)/,
-function(a,b){return"<"+J(b)})}catch(d){return J(c)}}function ac(b){try{return decodeURIComponent(b)}catch(a){}}function bc(b){var a={},c,d;q((b||"").split("&"),function(b){b&&(c=b.split("="),d=ac(c[0]),z(d)&&(b=z(c[1])?ac(c[1]):!0,a[d]?L(a[d])?a[d].push(b):a[d]=[a[d],b]:a[d]=b))});return a}function zb(b){var a=[];q(b,function(b,d){L(b)?q(b,function(b){a.push(za(d,!0)+(!0===b?"":"="+za(b,!0)))}):a.push(za(d,!0)+(!0===b?"":"="+za(b,!0)))});return a.length?a.join("&"):""}function gb(b){return za(b,
-!0).replace(/%26/gi,"&").replace(/%3D/gi,"=").replace(/%2B/gi,"+")}function za(b,a){return encodeURIComponent(b).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,a?"%20":"+")}function Wc(b,a){function c(a){a&&d.push(a)}var d=[b],e,g,f=["ng:app","ng-app","x-ng-app","data-ng-app"],h=/\sng[:\-]app(:\s*([\w\d_]+);?)?\s/;q(f,function(a){f[a]=!0;c(U.getElementById(a));a=a.replace(":","\\:");b.querySelectorAll&&(q(b.querySelectorAll("."+a),c),q(b.querySelectorAll("."+
-a+"\\:"),c),q(b.querySelectorAll("["+a+"]"),c))});q(d,function(a){if(!e){var b=h.exec(" "+a.className+" ");b?(e=a,g=(b[2]||"").replace(/\s+/g,",")):q(a.attributes,function(b){!e&&f[b.name]&&(e=a,g=b.value)})}});e&&a(e,g?[g]:[])}function cc(b,a){var c=function(){b=y(b);if(b.injector()){var c=b[0]===U?"document":ia(b);throw Oa("btstrpd",c);}a=a||[];a.unshift(["$provide",function(a){a.value("$rootElement",b)}]);a.unshift("ng");c=dc(a);c.invoke(["$rootScope","$rootElement","$compile","$injector","$animate",
-function(a,b,c,d,e){a.$apply(function(){b.data("$injector",d);c(b)(a)})}]);return c},d=/^NG_DEFER_BOOTSTRAP!/;if(P&&!d.test(P.name))return c();P.name=P.name.replace(d,"");Qa.resumeBootstrap=function(b){q(b,function(b){a.push(b)});c()}}function hb(b,a){a=a||"_";return b.replace(Xc,function(b,d){return(d?a:"")+b.toLowerCase()})}function Ab(b,a,c){if(!b)throw Oa("areq",a||"?",c||"required");return b}function Ra(b,a,c){c&&L(b)&&(b=b[b.length-1]);Ab(Q(b),a,"not a function, got "+(b&&"object"==typeof b?
-b.constructor.name||"Object":typeof b));return b}function Aa(b,a){if("hasOwnProperty"===b)throw Oa("badname",a);}function ec(b,a,c){if(!a)return b;a=a.split(".");for(var d,e=b,g=a.length,f=0;f<g;f++)d=a[f],b&&(b=(e=b)[d]);return!c&&Q(b)?fb(e,b):b}function Bb(b){var a=b[0];b=b[b.length-1];if(a===b)return y(a);var c=[a];do{a=a.nextSibling;if(!a)break;c.push(a)}while(a!==b);return y(c)}function Yc(b){var a=u("$injector"),c=u("ng");b=b.angular||(b.angular={});b.$$minErr=b.$$minErr||u;return b.module||
-(b.module=function(){var b={};return function(e,g,f){if("hasOwnProperty"===e)throw c("badname","module");g&&b.hasOwnProperty(e)&&(b[e]=null);return b[e]||(b[e]=function(){function b(a,d,e){return function(){c[e||"push"]([a,d,arguments]);return n}}if(!g)throw a("nomod",e);var c=[],d=[],l=b("$injector","invoke"),n={_invokeQueue:c,_runBlocks:d,requires:g,name:e,provider:b("$provide","provider"),factory:b("$provide","factory"),service:b("$provide","service"),value:b("$provide","value"),constant:b("$provide",
-"constant","unshift"),animation:b("$animateProvider","register"),filter:b("$filterProvider","register"),controller:b("$controllerProvider","register"),directive:b("$compileProvider","directive"),config:l,run:function(a){d.push(a);return this}};f&&l(f);return n}())}}())}function Zc(b){E(b,{bootstrap:cc,copy:ca,extend:E,equals:xa,element:y,forEach:q,injector:dc,noop:w,bind:fb,toJson:qa,fromJson:$b,identity:Ea,isUndefined:H,isDefined:z,isString:C,isFunction:Q,isObject:X,isNumber:yb,isElement:Tc,isArray:L,
-version:$c,isDate:Ma,lowercase:J,uppercase:Fa,callbacks:{counter:0},$$minErr:u,$$csp:Zb});Sa=Yc(P);try{Sa("ngLocale")}catch(a){Sa("ngLocale",[]).provider("$locale",ad)}Sa("ng",["ngLocale"],["$provide",function(a){a.provider({$$sanitizeUri:bd});a.provider("$compile",fc).directive({a:cd,input:gc,textarea:gc,form:dd,script:ed,select:fd,style:gd,option:hd,ngBind:id,ngBindHtml:jd,ngBindTemplate:kd,ngClass:ld,ngClassEven:md,ngClassOdd:nd,ngCloak:od,ngController:pd,ngForm:qd,ngHide:rd,ngIf:sd,ngInclude:td,
-ngInit:ud,ngNonBindable:vd,ngPluralize:wd,ngRepeat:xd,ngShow:yd,ngStyle:zd,ngSwitch:Ad,ngSwitchWhen:Bd,ngSwitchDefault:Cd,ngOptions:Dd,ngTransclude:Ed,ngModel:Fd,ngList:Gd,ngChange:Hd,required:hc,ngRequired:hc,ngValue:Id}).directive({ngInclude:Jd}).directive(Cb).directive(ic);a.provider({$anchorScroll:Kd,$animate:Ld,$browser:Md,$cacheFactory:Nd,$controller:Od,$document:Pd,$exceptionHandler:Qd,$filter:jc,$interpolate:Rd,$interval:Sd,$http:Td,$httpBackend:Ud,$location:Vd,$log:Wd,$parse:Xd,$rootScope:Yd,
-$q:Zd,$sce:$d,$sceDelegate:ae,$sniffer:be,$templateCache:ce,$timeout:de,$window:ee,$$rAF:fe,$$asyncCallback:ge})}])}function Ta(b){return b.replace(he,function(a,b,d,e){return e?d.toUpperCase():d}).replace(ie,"Moz$1")}function Db(b,a,c,d){function e(b){var e=c&&b?[this.filter(b)]:[this],m=a,k,l,n,p,r,A;if(!d||null!=b)for(;e.length;)for(k=e.shift(),l=0,n=k.length;l<n;l++)for(p=y(k[l]),m?p.triggerHandler("$destroy"):m=!m,r=0,p=(A=p.children()).length;r<p;r++)e.push(Ba(A[r]));return g.apply(this,arguments)}
-var g=Ba.fn[b],g=g.$original||g;e.$original=g;Ba.fn[b]=e}function M(b){if(b instanceof M)return b;C(b)&&(b=ba(b));if(!(this instanceof M)){if(C(b)&&"<"!=b.charAt(0))throw Eb("nosel");return new M(b)}if(C(b)){var a=b;b=U;var c;if(c=je.exec(a))b=[b.createElement(c[1])];else{var d=b,e;b=d.createDocumentFragment();c=[];if(Fb.test(a)){d=b.appendChild(d.createElement("div"));e=(ke.exec(a)||["",""])[1].toLowerCase();e=ea[e]||ea._default;d.innerHTML="<div>&#160;</div>"+e[1]+a.replace(le,"<$1></$2>")+e[2];
-d.removeChild(d.firstChild);for(a=e[0];a--;)d=d.lastChild;a=0;for(e=d.childNodes.length;a<e;++a)c.push(d.childNodes[a]);d=b.firstChild;d.textContent=""}else c.push(d.createTextNode(a));b.textContent="";b.innerHTML="";b=c}Gb(this,b);y(U.createDocumentFragment()).append(this)}else Gb(this,b)}function Hb(b){return b.cloneNode(!0)}function Ga(b){kc(b);var a=0;for(b=b.childNodes||[];a<b.length;a++)Ga(b[a])}function lc(b,a,c,d){if(z(d))throw Eb("offargs");var e=la(b,"events");la(b,"handle")&&(H(a)?q(e,
-function(a,c){Ua(b,c,a);delete e[c]}):q(a.split(" "),function(a){H(c)?(Ua(b,a,e[a]),delete e[a]):Na(e[a]||[],c)}))}function kc(b,a){var c=b[ib],d=Va[c];d&&(a?delete Va[c].data[a]:(d.handle&&(d.events.$destroy&&d.handle({},"$destroy"),lc(b)),delete Va[c],b[ib]=s))}function la(b,a,c){var d=b[ib],d=Va[d||-1];if(z(c))d||(b[ib]=d=++me,d=Va[d]={}),d[a]=c;else return d&&d[a]}function mc(b,a,c){var d=la(b,"data"),e=z(c),g=!e&&z(a),f=g&&!X(a);d||f||la(b,"data",d={});if(e)d[a]=c;else if(g){if(f)return d&&d[a];
-E(d,a)}else return d}function Ib(b,a){return b.getAttribute?-1<(" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").indexOf(" "+a+" "):!1}function jb(b,a){a&&b.setAttribute&&q(a.split(" "),function(a){b.setAttribute("class",ba((" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").replace(" "+ba(a)+" "," ")))})}function kb(b,a){if(a&&b.setAttribute){var c=(" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ");q(a.split(" "),function(a){a=ba(a);-1===c.indexOf(" "+a+" ")&&
-(c+=a+" ")});b.setAttribute("class",ba(c))}}function Gb(b,a){if(a){a=a.nodeName||!z(a.length)||Da(a)?[a]:a;for(var c=0;c<a.length;c++)b.push(a[c])}}function nc(b,a){return lb(b,"$"+(a||"ngController")+"Controller")}function lb(b,a,c){b=y(b);9==b[0].nodeType&&(b=b.find("html"));for(a=L(a)?a:[a];b.length;){for(var d=b[0],e=0,g=a.length;e<g;e++)if((c=b.data(a[e]))!==s)return c;b=y(d.parentNode||11===d.nodeType&&d.host)}}function oc(b){for(var a=0,c=b.childNodes;a<c.length;a++)Ga(c[a]);for(;b.firstChild;)b.removeChild(b.firstChild)}
-function pc(b,a){var c=mb[a.toLowerCase()];return c&&qc[b.nodeName]&&c}function ne(b,a){var c=function(c,e){c.preventDefault||(c.preventDefault=function(){c.returnValue=!1});c.stopPropagation||(c.stopPropagation=function(){c.cancelBubble=!0});c.target||(c.target=c.srcElement||U);if(H(c.defaultPrevented)){var g=c.preventDefault;c.preventDefault=function(){c.defaultPrevented=!0;g.call(c)};c.defaultPrevented=!1}c.isDefaultPrevented=function(){return c.defaultPrevented||!1===c.returnValue};var f=Yb(a[e||
-c.type]||[]);q(f,function(a){a.call(b,c)});8>=S?(c.preventDefault=null,c.stopPropagation=null,c.isDefaultPrevented=null):(delete c.preventDefault,delete c.stopPropagation,delete c.isDefaultPrevented)};c.elem=b;return c}function Ha(b){var a=typeof b,c;"object"==a&&null!==b?"function"==typeof(c=b.$$hashKey)?c=b.$$hashKey():c===s&&(c=b.$$hashKey=cb()):c=b;return a+":"+c}function Wa(b){q(b,this.put,this)}function rc(b){var a,c;"function"==typeof b?(a=b.$inject)||(a=[],b.length&&(c=b.toString().replace(oe,
-""),c=c.match(pe),q(c[1].split(qe),function(b){b.replace(re,function(b,c,d){a.push(d)})})),b.$inject=a):L(b)?(c=b.length-1,Ra(b[c],"fn"),a=b.slice(0,c)):Ra(b,"fn",!0);return a}function dc(b){function a(a){return function(b,c){if(X(b))q(b,Vb(a));else return a(b,c)}}function c(a,b){Aa(a,"service");if(Q(b)||L(b))b=n.instantiate(b);if(!b.$get)throw Xa("pget",a);return l[a+h]=b}function d(a,b){return c(a,{$get:b})}function e(a){var b=[],c,d,g,h;q(a,function(a){if(!k.get(a)){k.put(a,!0);try{if(C(a))for(c=
-Sa(a),b=b.concat(e(c.requires)).concat(c._runBlocks),d=c._invokeQueue,g=0,h=d.length;g<h;g++){var f=d[g],m=n.get(f[0]);m[f[1]].apply(m,f[2])}else Q(a)?b.push(n.invoke(a)):L(a)?b.push(n.invoke(a)):Ra(a,"module")}catch(l){throw L(a)&&(a=a[a.length-1]),l.message&&(l.stack&&-1==l.stack.indexOf(l.message))&&(l=l.message+"\n"+l.stack),Xa("modulerr",a,l.stack||l.message||l);}}});return b}function g(a,b){function c(d){if(a.hasOwnProperty(d)){if(a[d]===f)throw Xa("cdep",m.join(" <- "));return a[d]}try{return m.unshift(d),
-a[d]=f,a[d]=b(d)}catch(e){throw a[d]===f&&delete a[d],e;}finally{m.shift()}}function d(a,b,e){var g=[],h=rc(a),f,m,k;m=0;for(f=h.length;m<f;m++){k=h[m];if("string"!==typeof k)throw Xa("itkn",k);g.push(e&&e.hasOwnProperty(k)?e[k]:c(k))}a.$inject||(a=a[f]);return a.apply(b,g)}return{invoke:d,instantiate:function(a,b){var c=function(){},e;c.prototype=(L(a)?a[a.length-1]:a).prototype;c=new c;e=d(a,c,b);return X(e)||Q(e)?e:c},get:c,annotate:rc,has:function(b){return l.hasOwnProperty(b+h)||a.hasOwnProperty(b)}}}
-var f={},h="Provider",m=[],k=new Wa,l={$provide:{provider:a(c),factory:a(d),service:a(function(a,b){return d(a,["$injector",function(a){return a.instantiate(b)}])}),value:a(function(a,b){return d(a,aa(b))}),constant:a(function(a,b){Aa(a,"constant");l[a]=b;p[a]=b}),decorator:function(a,b){var c=n.get(a+h),d=c.$get;c.$get=function(){var a=r.invoke(d,c);return r.invoke(b,null,{$delegate:a})}}}},n=l.$injector=g(l,function(){throw Xa("unpr",m.join(" <- "));}),p={},r=p.$injector=g(p,function(a){a=n.get(a+
-h);return r.invoke(a.$get,a)});q(e(b),function(a){r.invoke(a||w)});return r}function Kd(){var b=!0;this.disableAutoScrolling=function(){b=!1};this.$get=["$window","$location","$rootScope",function(a,c,d){function e(a){var b=null;q(a,function(a){b||"a"!==J(a.nodeName)||(b=a)});return b}function g(){var b=c.hash(),d;b?(d=f.getElementById(b))?d.scrollIntoView():(d=e(f.getElementsByName(b)))?d.scrollIntoView():"top"===b&&a.scrollTo(0,0):a.scrollTo(0,0)}var f=a.document;b&&d.$watch(function(){return c.hash()},
-function(){d.$evalAsync(g)});return g}]}function ge(){this.$get=["$$rAF","$timeout",function(b,a){return b.supported?function(a){return b(a)}:function(b){return a(b,0,!1)}}]}function se(b,a,c,d){function e(a){try{a.apply(null,ya.call(arguments,1))}finally{if(A--,0===A)for(;D.length;)try{D.pop()()}catch(b){c.error(b)}}}function g(a,b){(function T(){q(x,function(a){a()});t=b(T,a)})()}function f(){v=null;N!=h.url()&&(N=h.url(),q(ma,function(a){a(h.url())}))}var h=this,m=a[0],k=b.location,l=b.history,
-n=b.setTimeout,p=b.clearTimeout,r={};h.isMock=!1;var A=0,D=[];h.$$completeOutstandingRequest=e;h.$$incOutstandingRequestCount=function(){A++};h.notifyWhenNoOutstandingRequests=function(a){q(x,function(a){a()});0===A?a():D.push(a)};var x=[],t;h.addPollFn=function(a){H(t)&&g(100,n);x.push(a);return a};var N=k.href,B=a.find("base"),v=null;h.url=function(a,c){k!==b.location&&(k=b.location);l!==b.history&&(l=b.history);if(a){if(N!=a)return N=a,d.history?c?l.replaceState(null,"",a):(l.pushState(null,"",
-a),B.attr("href",B.attr("href"))):(v=a,c?k.replace(a):k.href=a),h}else return v||k.href.replace(/%27/g,"'")};var ma=[],K=!1;h.onUrlChange=function(a){if(!K){if(d.history)y(b).on("popstate",f);if(d.hashchange)y(b).on("hashchange",f);else h.addPollFn(f);K=!0}ma.push(a);return a};h.baseHref=function(){var a=B.attr("href");return a?a.replace(/^(https?\:)?\/\/[^\/]*/,""):""};var O={},da="",F=h.baseHref();h.cookies=function(a,b){var d,e,g,h;if(a)b===s?m.cookie=escape(a)+"=;path="+F+";expires=Thu, 01 Jan 1970 00:00:00 GMT":
-C(b)&&(d=(m.cookie=escape(a)+"="+escape(b)+";path="+F).length+1,4096<d&&c.warn("Cookie '"+a+"' possibly not set or overflowed because it was too large ("+d+" > 4096 bytes)!"));else{if(m.cookie!==da)for(da=m.cookie,d=da.split("; "),O={},g=0;g<d.length;g++)e=d[g],h=e.indexOf("="),0<h&&(a=unescape(e.substring(0,h)),O[a]===s&&(O[a]=unescape(e.substring(h+1))));return O}};h.defer=function(a,b){var c;A++;c=n(function(){delete r[c];e(a)},b||0);r[c]=!0;return c};h.defer.cancel=function(a){return r[a]?(delete r[a],
-p(a),e(w),!0):!1}}function Md(){this.$get=["$window","$log","$sniffer","$document",function(b,a,c,d){return new se(b,d,a,c)}]}function Nd(){this.$get=function(){function b(b,d){function e(a){a!=n&&(p?p==a&&(p=a.n):p=a,g(a.n,a.p),g(a,n),n=a,n.n=null)}function g(a,b){a!=b&&(a&&(a.p=b),b&&(b.n=a))}if(b in a)throw u("$cacheFactory")("iid",b);var f=0,h=E({},d,{id:b}),m={},k=d&&d.capacity||Number.MAX_VALUE,l={},n=null,p=null;return a[b]={put:function(a,b){if(k<Number.MAX_VALUE){var c=l[a]||(l[a]={key:a});
-e(c)}if(!H(b))return a in m||f++,m[a]=b,f>k&&this.remove(p.key),b},get:function(a){if(k<Number.MAX_VALUE){var b=l[a];if(!b)return;e(b)}return m[a]},remove:function(a){if(k<Number.MAX_VALUE){var b=l[a];if(!b)return;b==n&&(n=b.p);b==p&&(p=b.n);g(b.n,b.p);delete l[a]}delete m[a];f--},removeAll:function(){m={};f=0;l={};n=p=null},destroy:function(){l=h=m=null;delete a[b]},info:function(){return E({},h,{size:f})}}}var a={};b.info=function(){var b={};q(a,function(a,e){b[e]=a.info()});return b};b.get=function(b){return a[b]};
-return b}}function ce(){this.$get=["$cacheFactory",function(b){return b("templates")}]}function fc(b,a){var c={},d="Directive",e=/^\s*directive\:\s*([\d\w_\-]+)\s+(.*)$/,g=/(([\d\w_\-]+)(?:\:([^;]+))?;?)/,f=/^(on[a-z]+|formaction)$/;this.directive=function m(a,e){Aa(a,"directive");C(a)?(Ab(e,"directiveFactory"),c.hasOwnProperty(a)||(c[a]=[],b.factory(a+d,["$injector","$exceptionHandler",function(b,d){var e=[];q(c[a],function(c,g){try{var f=b.invoke(c);Q(f)?f={compile:aa(f)}:!f.compile&&f.link&&(f.compile=
-aa(f.link));f.priority=f.priority||0;f.index=g;f.name=f.name||a;f.require=f.require||f.controller&&f.name;f.restrict=f.restrict||"A";e.push(f)}catch(m){d(m)}});return e}])),c[a].push(e)):q(a,Vb(m));return this};this.aHrefSanitizationWhitelist=function(b){return z(b)?(a.aHrefSanitizationWhitelist(b),this):a.aHrefSanitizationWhitelist()};this.imgSrcSanitizationWhitelist=function(b){return z(b)?(a.imgSrcSanitizationWhitelist(b),this):a.imgSrcSanitizationWhitelist()};this.$get=["$injector","$interpolate",
-"$exceptionHandler","$http","$templateCache","$parse","$controller","$rootScope","$document","$sce","$animate","$$sanitizeUri",function(a,b,l,n,p,r,A,D,x,t,N,B){function v(a,b,c,d,e){a instanceof y||(a=y(a));q(a,function(b,c){3==b.nodeType&&b.nodeValue.match(/\S+/)&&(a[c]=y(b).wrap("<span></span>").parent()[0])});var g=K(a,b,a,c,d,e);ma(a,"ng-scope");return function(b,c,d){Ab(b,"scope");var e=c?Ia.clone.call(a):a;q(d,function(a,b){e.data("$"+b+"Controller",a)});d=0;for(var f=e.length;d<f;d++){var m=
-e[d].nodeType;1!==m&&9!==m||e.eq(d).data("$scope",b)}c&&c(e,b);g&&g(b,e,e);return e}}function ma(a,b){try{a.addClass(b)}catch(c){}}function K(a,b,c,d,e,g){function f(a,c,d,e){var g,k,l,r,n,p,A;g=c.length;var I=Array(g);for(n=0;n<g;n++)I[n]=c[n];A=n=0;for(p=m.length;n<p;A++)k=I[A],c=m[n++],g=m[n++],l=y(k),c?(c.scope?(r=a.$new(),l.data("$scope",r)):r=a,(l=c.transclude)||!e&&b?c(g,r,k,d,O(a,l||b)):c(g,r,k,d,e)):g&&g(a,k.childNodes,s,e)}for(var m=[],k,l,r,n,p=0;p<a.length;p++)k=new Jb,l=da(a[p],[],k,
-0===p?d:s,e),(g=l.length?fa(l,a[p],k,b,c,null,[],[],g):null)&&g.scope&&ma(y(a[p]),"ng-scope"),k=g&&g.terminal||!(r=a[p].childNodes)||!r.length?null:K(r,g?g.transclude:b),m.push(g,k),n=n||g||k,g=null;return n?f:null}function O(a,b){return function(c,d,e){var g=!1;c||(c=a.$new(),g=c.$$transcluded=!0);d=b(c,d,e);if(g)d.on("$destroy",fb(c,c.$destroy));return d}}function da(a,b,c,d,f){var m=c.$attr,k;switch(a.nodeType){case 1:T(b,na(Ja(a).toLowerCase()),"E",d,f);var l,r,n;k=a.attributes;for(var p=0,A=
-k&&k.length;p<A;p++){var x=!1,D=!1;l=k[p];if(!S||8<=S||l.specified){r=l.name;n=na(r);W.test(n)&&(r=hb(n.substr(6),"-"));var N=n.replace(/(Start|End)$/,"");n===N+"Start"&&(x=r,D=r.substr(0,r.length-5)+"end",r=r.substr(0,r.length-6));n=na(r.toLowerCase());m[n]=r;c[n]=l=ba(l.value);pc(a,n)&&(c[n]=!0);M(a,b,l,n);T(b,n,"A",d,f,x,D)}}a=a.className;if(C(a)&&""!==a)for(;k=g.exec(a);)n=na(k[2]),T(b,n,"C",d,f)&&(c[n]=ba(k[3])),a=a.substr(k.index+k[0].length);break;case 3:u(b,a.nodeValue);break;case 8:try{if(k=
-e.exec(a.nodeValue))n=na(k[1]),T(b,n,"M",d,f)&&(c[n]=ba(k[2]))}catch(t){}}b.sort(H);return b}function F(a,b,c){var d=[],e=0;if(b&&a.hasAttribute&&a.hasAttribute(b)){do{if(!a)throw ja("uterdir",b,c);1==a.nodeType&&(a.hasAttribute(b)&&e++,a.hasAttribute(c)&&e--);d.push(a);a=a.nextSibling}while(0<e)}else d.push(a);return y(d)}function R(a,b,c){return function(d,e,g,f,k){e=F(e[0],b,c);return a(d,e,g,f,k)}}function fa(a,c,d,e,g,f,m,n,p){function x(a,b,c,d){if(a){c&&(a=R(a,c,d));a.require=G.require;a.directiveName=
-u;if(O===G||G.$$isolateScope)a=tc(a,{isolateScope:!0});m.push(a)}if(b){c&&(b=R(b,c,d));b.require=G.require;b.directiveName=u;if(O===G||G.$$isolateScope)b=tc(b,{isolateScope:!0});n.push(b)}}function D(a,b,c,d){var e,g="data",f=!1;if(C(b)){for(;"^"==(e=b.charAt(0))||"?"==e;)b=b.substr(1),"^"==e&&(g="inheritedData"),f=f||"?"==e;e=null;d&&"data"===g&&(e=d[b]);e=e||c[g]("$"+b+"Controller");if(!e&&!f)throw ja("ctreq",b,a);}else L(b)&&(e=[],q(b,function(b){e.push(D(a,b,c,d))}));return e}function N(a,e,g,
-f,p){function x(a,b){var c;2>arguments.length&&(b=a,a=s);E&&(c=da);return p(a,b,c)}var t,I,v,B,R,F,da={},nb;t=c===g?d:Yb(d,new Jb(y(g),d.$attr));I=t.$$element;if(O){var T=/^\s*([@=&])(\??)\s*(\w*)\s*$/;f=y(g);F=e.$new(!0);!fa||fa!==O&&fa!==O.$$originalDirective?f.data("$isolateScopeNoTemplate",F):f.data("$isolateScope",F);ma(f,"ng-isolate-scope");q(O.scope,function(a,c){var d=a.match(T)||[],g=d[3]||c,f="?"==d[2],d=d[1],m,l,n,p;F.$$isolateBindings[c]=d+g;switch(d){case "@":t.$observe(g,function(a){F[c]=
-a});t.$$observers[g].$$scope=e;t[g]&&(F[c]=b(t[g])(e));break;case "=":if(f&&!t[g])break;l=r(t[g]);p=l.literal?xa:function(a,b){return a===b};n=l.assign||function(){m=F[c]=l(e);throw ja("nonassign",t[g],O.name);};m=F[c]=l(e);F.$watch(function(){var a=l(e);p(a,F[c])||(p(a,m)?n(e,a=F[c]):F[c]=a);return m=a},null,l.literal);break;case "&":l=r(t[g]);F[c]=function(a){return l(e,a)};break;default:throw ja("iscp",O.name,c,a);}})}nb=p&&x;K&&q(K,function(a){var b={$scope:a===O||a.$$isolateScope?F:e,$element:I,
-$attrs:t,$transclude:nb},c;R=a.controller;"@"==R&&(R=t[a.name]);c=A(R,b);da[a.name]=c;E||I.data("$"+a.name+"Controller",c);a.controllerAs&&(b.$scope[a.controllerAs]=c)});f=0;for(v=m.length;f<v;f++)try{B=m[f],B(B.isolateScope?F:e,I,t,B.require&&D(B.directiveName,B.require,I,da),nb)}catch(G){l(G,ia(I))}f=e;O&&(O.template||null===O.templateUrl)&&(f=F);a&&a(f,g.childNodes,s,p);for(f=n.length-1;0<=f;f--)try{B=n[f],B(B.isolateScope?F:e,I,t,B.require&&D(B.directiveName,B.require,I,da),nb)}catch(z){l(z,ia(I))}}
-p=p||{};for(var t=-Number.MAX_VALUE,B,K=p.controllerDirectives,O=p.newIsolateScopeDirective,fa=p.templateDirective,T=p.nonTlbTranscludeDirective,H=!1,E=p.hasElementTranscludeDirective,Z=d.$$element=y(c),G,u,V,Ya=e,P,M=0,S=a.length;M<S;M++){G=a[M];var ra=G.$$start,W=G.$$end;ra&&(Z=F(c,ra,W));V=s;if(t>G.priority)break;if(V=G.scope)B=B||G,G.templateUrl||(J("new/isolated scope",O,G,Z),X(V)&&(O=G));u=G.name;!G.templateUrl&&G.controller&&(V=G.controller,K=K||{},J("'"+u+"' controller",K[u],G,Z),K[u]=G);
-if(V=G.transclude)H=!0,G.$$tlb||(J("transclusion",T,G,Z),T=G),"element"==V?(E=!0,t=G.priority,V=F(c,ra,W),Z=d.$$element=y(U.createComment(" "+u+": "+d[u]+" ")),c=Z[0],ob(g,y(ya.call(V,0)),c),Ya=v(V,e,t,f&&f.name,{nonTlbTranscludeDirective:T})):(V=y(Hb(c)).contents(),Z.empty(),Ya=v(V,e));if(G.template)if(J("template",fa,G,Z),fa=G,V=Q(G.template)?G.template(Z,d):G.template,V=Y(V),G.replace){f=G;V=Fb.test(V)?y(ba(V)):[];c=V[0];if(1!=V.length||1!==c.nodeType)throw ja("tplrt",u,"");ob(g,Z,c);S={$attr:{}};
-V=da(c,[],S);var $=a.splice(M+1,a.length-(M+1));O&&sc(V);a=a.concat(V).concat($);z(d,S);S=a.length}else Z.html(V);if(G.templateUrl)J("template",fa,G,Z),fa=G,G.replace&&(f=G),N=w(a.splice(M,a.length-M),Z,d,g,Ya,m,n,{controllerDirectives:K,newIsolateScopeDirective:O,templateDirective:fa,nonTlbTranscludeDirective:T}),S=a.length;else if(G.compile)try{P=G.compile(Z,d,Ya),Q(P)?x(null,P,ra,W):P&&x(P.pre,P.post,ra,W)}catch(aa){l(aa,ia(Z))}G.terminal&&(N.terminal=!0,t=Math.max(t,G.priority))}N.scope=B&&!0===
-B.scope;N.transclude=H&&Ya;p.hasElementTranscludeDirective=E;return N}function sc(a){for(var b=0,c=a.length;b<c;b++)a[b]=Xb(a[b],{$$isolateScope:!0})}function T(b,e,g,f,k,r,n){if(e===k)return null;k=null;if(c.hasOwnProperty(e)){var p;e=a.get(e+d);for(var A=0,x=e.length;A<x;A++)try{p=e[A],(f===s||f>p.priority)&&-1!=p.restrict.indexOf(g)&&(r&&(p=Xb(p,{$$start:r,$$end:n})),b.push(p),k=p)}catch(D){l(D)}}return k}function z(a,b){var c=b.$attr,d=a.$attr,e=a.$$element;q(a,function(d,e){"$"!=e.charAt(0)&&
-(b[e]&&(d+=("style"===e?";":" ")+b[e]),a.$set(e,d,!0,c[e]))});q(b,function(b,g){"class"==g?(ma(e,b),a["class"]=(a["class"]?a["class"]+" ":"")+b):"style"==g?(e.attr("style",e.attr("style")+";"+b),a.style=(a.style?a.style+";":"")+b):"$"==g.charAt(0)||a.hasOwnProperty(g)||(a[g]=b,d[g]=c[g])})}function w(a,b,c,d,e,g,f,k){var m=[],l,r,A=b[0],x=a.shift(),D=E({},x,{templateUrl:null,transclude:null,replace:null,$$originalDirective:x}),N=Q(x.templateUrl)?x.templateUrl(b,c):x.templateUrl;b.empty();n.get(t.getTrustedResourceUrl(N),
-{cache:p}).success(function(n){var p,t;n=Y(n);if(x.replace){n=Fb.test(n)?y(ba(n)):[];p=n[0];if(1!=n.length||1!==p.nodeType)throw ja("tplrt",x.name,N);n={$attr:{}};ob(d,b,p);var v=da(p,[],n);X(x.scope)&&sc(v);a=v.concat(a);z(c,n)}else p=A,b.html(n);a.unshift(D);l=fa(a,p,c,e,b,x,g,f,k);q(d,function(a,c){a==p&&(d[c]=b[0])});for(r=K(b[0].childNodes,e);m.length;){n=m.shift();t=m.shift();var B=m.shift(),R=m.shift(),v=b[0];if(t!==A){var F=t.className;k.hasElementTranscludeDirective&&x.replace||(v=Hb(p));
-ob(B,y(t),v);ma(y(v),F)}t=l.transclude?O(n,l.transclude):R;l(r,n,v,d,t)}m=null}).error(function(a,b,c,d){throw ja("tpload",d.url);});return function(a,b,c,d,e){m?(m.push(b),m.push(c),m.push(d),m.push(e)):l(r,b,c,d,e)}}function H(a,b){var c=b.priority-a.priority;return 0!==c?c:a.name!==b.name?a.name<b.name?-1:1:a.index-b.index}function J(a,b,c,d){if(b)throw ja("multidir",b.name,c.name,a,ia(d));}function u(a,c){var d=b(c,!0);d&&a.push({priority:0,compile:aa(function(a,b){var c=b.parent(),e=c.data("$binding")||
-[];e.push(d);ma(c.data("$binding",e),"ng-binding");a.$watch(d,function(a){b[0].nodeValue=a})})})}function P(a,b){if("srcdoc"==b)return t.HTML;var c=Ja(a);if("xlinkHref"==b||"FORM"==c&&"action"==b||"IMG"!=c&&("src"==b||"ngSrc"==b))return t.RESOURCE_URL}function M(a,c,d,e){var g=b(d,!0);if(g){if("multiple"===e&&"SELECT"===Ja(a))throw ja("selmulti",ia(a));c.push({priority:100,compile:function(){return{pre:function(c,d,m){d=m.$$observers||(m.$$observers={});if(f.test(e))throw ja("nodomevents");if(g=b(m[e],
-!0,P(a,e)))m[e]=g(c),(d[e]||(d[e]=[])).$$inter=!0,(m.$$observers&&m.$$observers[e].$$scope||c).$watch(g,function(a,b){"class"===e&&a!=b?m.$updateClass(a,b):m.$set(e,a)})}}}})}}function ob(a,b,c){var d=b[0],e=b.length,g=d.parentNode,f,m;if(a)for(f=0,m=a.length;f<m;f++)if(a[f]==d){a[f++]=c;m=f+e-1;for(var k=a.length;f<k;f++,m++)m<k?a[f]=a[m]:delete a[f];a.length-=e-1;break}g&&g.replaceChild(c,d);a=U.createDocumentFragment();a.appendChild(d);c[y.expando]=d[y.expando];d=1;for(e=b.length;d<e;d++)g=b[d],
-y(g).remove(),a.appendChild(g),delete b[d];b[0]=c;b.length=1}function tc(a,b){return E(function(){return a.apply(null,arguments)},a,b)}var Jb=function(a,b){this.$$element=a;this.$attr=b||{}};Jb.prototype={$normalize:na,$addClass:function(a){a&&0<a.length&&N.addClass(this.$$element,a)},$removeClass:function(a){a&&0<a.length&&N.removeClass(this.$$element,a)},$updateClass:function(a,b){var c=uc(a,b),d=uc(b,a);0===c.length?N.removeClass(this.$$element,d):0===d.length?N.addClass(this.$$element,c):N.setClass(this.$$element,
-c,d)},$set:function(a,b,c,d){var e=pc(this.$$element[0],a);e&&(this.$$element.prop(a,b),d=e);this[a]=b;d?this.$attr[a]=d:(d=this.$attr[a])||(this.$attr[a]=d=hb(a,"-"));e=Ja(this.$$element);if("A"===e&&"href"===a||"IMG"===e&&"src"===a)this[a]=b=B(b,"src"===a);!1!==c&&(null===b||b===s?this.$$element.removeAttr(d):this.$$element.attr(d,b));(c=this.$$observers)&&q(c[a],function(a){try{a(b)}catch(c){l(c)}})},$observe:function(a,b){var c=this,d=c.$$observers||(c.$$observers={}),e=d[a]||(d[a]=[]);e.push(b);
-D.$evalAsync(function(){e.$$inter||b(c[a])});return b}};var Z=b.startSymbol(),ra=b.endSymbol(),Y="{{"==Z||"}}"==ra?Ea:function(a){return a.replace(/\{\{/g,Z).replace(/}}/g,ra)},W=/^ngAttr[A-Z]/;return v}]}function na(b){return Ta(b.replace(te,""))}function uc(b,a){var c="",d=b.split(/\s+/),e=a.split(/\s+/),g=0;a:for(;g<d.length;g++){for(var f=d[g],h=0;h<e.length;h++)if(f==e[h])continue a;c+=(0<c.length?" ":"")+f}return c}function Od(){var b={},a=/^(\S+)(\s+as\s+(\w+))?$/;this.register=function(a,
-d){Aa(a,"controller");X(a)?E(b,a):b[a]=d};this.$get=["$injector","$window",function(c,d){return function(e,g){var f,h,m;C(e)&&(f=e.match(a),h=f[1],m=f[3],e=b.hasOwnProperty(h)?b[h]:ec(g.$scope,h,!0)||ec(d,h,!0),Ra(e,h,!0));f=c.instantiate(e,g);if(m){if(!g||"object"!=typeof g.$scope)throw u("$controller")("noscp",h||e.name,m);g.$scope[m]=f}return f}}]}function Pd(){this.$get=["$window",function(b){return y(b.document)}]}function Qd(){this.$get=["$log",function(b){return function(a,c){b.error.apply(b,
-arguments)}}]}function vc(b){var a={},c,d,e;if(!b)return a;q(b.split("\n"),function(b){e=b.indexOf(":");c=J(ba(b.substr(0,e)));d=ba(b.substr(e+1));c&&(a[c]=a[c]?a[c]+(", "+d):d)});return a}function wc(b){var a=X(b)?b:s;return function(c){a||(a=vc(b));return c?a[J(c)]||null:a}}function xc(b,a,c){if(Q(c))return c(b,a);q(c,function(c){b=c(b,a)});return b}function Td(){var b=/^\s*(\[|\{[^\{])/,a=/[\}\]]\s*$/,c=/^\)\]\}',?\n/,d={"Content-Type":"application/json;charset=utf-8"},e=this.defaults={transformResponse:[function(d){C(d)&&
-(d=d.replace(c,""),b.test(d)&&a.test(d)&&(d=$b(d)));return d}],transformRequest:[function(a){return X(a)&&"[object File]"!==wa.call(a)&&"[object Blob]"!==wa.call(a)?qa(a):a}],headers:{common:{Accept:"application/json, text/plain, */*"},post:ca(d),put:ca(d),patch:ca(d)},xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN"},g=this.interceptors=[],f=this.responseInterceptors=[];this.$get=["$httpBackend","$browser","$cacheFactory","$rootScope","$q","$injector",function(a,b,c,d,n,p){function r(a){function c(a){var b=
-E({},a,{data:xc(a.data,a.headers,d.transformResponse)});return 200<=a.status&&300>a.status?b:n.reject(b)}var d={method:"get",transformRequest:e.transformRequest,transformResponse:e.transformResponse},g=function(a){function b(a){var c;q(a,function(b,d){Q(b)&&(c=b(),null!=c?a[d]=c:delete a[d])})}var c=e.headers,d=E({},a.headers),g,f,c=E({},c.common,c[J(a.method)]);b(c);b(d);a:for(g in c){a=J(g);for(f in d)if(J(f)===a)continue a;d[g]=c[g]}return d}(a);E(d,a);d.headers=g;d.method=Fa(d.method);(a=Kb(d.url)?
-b.cookies()[d.xsrfCookieName||e.xsrfCookieName]:s)&&(g[d.xsrfHeaderName||e.xsrfHeaderName]=a);var f=[function(a){g=a.headers;var b=xc(a.data,wc(g),a.transformRequest);H(a.data)&&q(g,function(a,b){"content-type"===J(b)&&delete g[b]});H(a.withCredentials)&&!H(e.withCredentials)&&(a.withCredentials=e.withCredentials);return A(a,b,g).then(c,c)},s],h=n.when(d);for(q(t,function(a){(a.request||a.requestError)&&f.unshift(a.request,a.requestError);(a.response||a.responseError)&&f.push(a.response,a.responseError)});f.length;){a=
-f.shift();var k=f.shift(),h=h.then(a,k)}h.success=function(a){h.then(function(b){a(b.data,b.status,b.headers,d)});return h};h.error=function(a){h.then(null,function(b){a(b.data,b.status,b.headers,d)});return h};return h}function A(b,c,g){function f(a,b,c,e){t&&(200<=a&&300>a?t.put(s,[a,b,vc(c),e]):t.remove(s));m(b,a,c,e);d.$$phase||d.$apply()}function m(a,c,d,e){c=Math.max(c,0);(200<=c&&300>c?p.resolve:p.reject)({data:a,status:c,headers:wc(d),config:b,statusText:e})}function k(){var a=eb(r.pendingRequests,
-b);-1!==a&&r.pendingRequests.splice(a,1)}var p=n.defer(),A=p.promise,t,q,s=D(b.url,b.params);r.pendingRequests.push(b);A.then(k,k);(b.cache||e.cache)&&(!1!==b.cache&&"GET"==b.method)&&(t=X(b.cache)?b.cache:X(e.cache)?e.cache:x);if(t)if(q=t.get(s),z(q)){if(q.then)return q.then(k,k),q;L(q)?m(q[1],q[0],ca(q[2]),q[3]):m(q,200,{},"OK")}else t.put(s,A);H(q)&&a(b.method,s,c,f,g,b.timeout,b.withCredentials,b.responseType);return A}function D(a,b){if(!b)return a;var c=[];Sc(b,function(a,b){null===a||H(a)||
-(L(a)||(a=[a]),q(a,function(a){X(a)&&(a=qa(a));c.push(za(b)+"="+za(a))}))});0<c.length&&(a+=(-1==a.indexOf("?")?"?":"&")+c.join("&"));return a}var x=c("$http"),t=[];q(g,function(a){t.unshift(C(a)?p.get(a):p.invoke(a))});q(f,function(a,b){var c=C(a)?p.get(a):p.invoke(a);t.splice(b,0,{response:function(a){return c(n.when(a))},responseError:function(a){return c(n.reject(a))}})});r.pendingRequests=[];(function(a){q(arguments,function(a){r[a]=function(b,c){return r(E(c||{},{method:a,url:b}))}})})("get",
-"delete","head","jsonp");(function(a){q(arguments,function(a){r[a]=function(b,c,d){return r(E(d||{},{method:a,url:b,data:c}))}})})("post","put");r.defaults=e;return r}]}function ue(b){if(8>=S&&(!b.match(/^(get|post|head|put|delete|options)$/i)||!P.XMLHttpRequest))return new P.ActiveXObject("Microsoft.XMLHTTP");if(P.XMLHttpRequest)return new P.XMLHttpRequest;throw u("$httpBackend")("noxhr");}function Ud(){this.$get=["$browser","$window","$document",function(b,a,c){return ve(b,ue,b.defer,a.angular.callbacks,
-c[0])}]}function ve(b,a,c,d,e){function g(a,b,c){var g=e.createElement("script"),f=null;g.type="text/javascript";g.src=a;g.async=!0;f=function(a){Ua(g,"load",f);Ua(g,"error",f);e.body.removeChild(g);g=null;var h=-1,A="unknown";a&&("load"!==a.type||d[b].called||(a={type:"error"}),A=a.type,h="error"===a.type?404:200);c&&c(h,A)};pb(g,"load",f);pb(g,"error",f);8>=S&&(g.onreadystatechange=function(){C(g.readyState)&&/loaded|complete/.test(g.readyState)&&(g.onreadystatechange=null,f({type:"load"}))});e.body.appendChild(g);
-return f}var f=-1;return function(e,m,k,l,n,p,r,A){function D(){t=f;B&&B();v&&v.abort()}function x(a,d,e,g,f){K&&c.cancel(K);B=v=null;0===d&&(d=e?200:"file"==sa(m).protocol?404:0);a(1223===d?204:d,e,g,f||"");b.$$completeOutstandingRequest(w)}var t;b.$$incOutstandingRequestCount();m=m||b.url();if("jsonp"==J(e)){var N="_"+(d.counter++).toString(36);d[N]=function(a){d[N].data=a;d[N].called=!0};var B=g(m.replace("JSON_CALLBACK","angular.callbacks."+N),N,function(a,b){x(l,a,d[N].data,"",b);d[N]=w})}else{var v=
-a(e);v.open(e,m,!0);q(n,function(a,b){z(a)&&v.setRequestHeader(b,a)});v.onreadystatechange=function(){if(v&&4==v.readyState){var a=null,b=null;t!==f&&(a=v.getAllResponseHeaders(),b="response"in v?v.response:v.responseText);x(l,t||v.status,b,a,v.statusText||"")}};r&&(v.withCredentials=!0);if(A)try{v.responseType=A}catch(s){if("json"!==A)throw s;}v.send(k||null)}if(0<p)var K=c(D,p);else p&&p.then&&p.then(D)}}function Rd(){var b="{{",a="}}";this.startSymbol=function(a){return a?(b=a,this):b};this.endSymbol=
-function(b){return b?(a=b,this):a};this.$get=["$parse","$exceptionHandler","$sce",function(c,d,e){function g(g,k,l){for(var n,p,r=0,A=[],D=g.length,x=!1,t=[];r<D;)-1!=(n=g.indexOf(b,r))&&-1!=(p=g.indexOf(a,n+f))?(r!=n&&A.push(g.substring(r,n)),A.push(r=c(x=g.substring(n+f,p))),r.exp=x,r=p+h,x=!0):(r!=D&&A.push(g.substring(r)),r=D);(D=A.length)||(A.push(""),D=1);if(l&&1<A.length)throw yc("noconcat",g);if(!k||x)return t.length=D,r=function(a){try{for(var b=0,c=D,f;b<c;b++){if("function"==typeof(f=A[b]))if(f=
-f(a),f=l?e.getTrusted(l,f):e.valueOf(f),null==f)f="";else switch(typeof f){case "string":break;case "number":f=""+f;break;default:f=qa(f)}t[b]=f}return t.join("")}catch(h){a=yc("interr",g,h.toString()),d(a)}},r.exp=g,r.parts=A,r}var f=b.length,h=a.length;g.startSymbol=function(){return b};g.endSymbol=function(){return a};return g}]}function Sd(){this.$get=["$rootScope","$window","$q",function(b,a,c){function d(d,f,h,m){var k=a.setInterval,l=a.clearInterval,n=c.defer(),p=n.promise,r=0,A=z(m)&&!m;h=
-z(h)?h:0;p.then(null,null,d);p.$$intervalId=k(function(){n.notify(r++);0<h&&r>=h&&(n.resolve(r),l(p.$$intervalId),delete e[p.$$intervalId]);A||b.$apply()},f);e[p.$$intervalId]=n;return p}var e={};d.cancel=function(a){return a&&a.$$intervalId in e?(e[a.$$intervalId].reject("canceled"),clearInterval(a.$$intervalId),delete e[a.$$intervalId],!0):!1};return d}]}function ad(){this.$get=function(){return{id:"en-us",NUMBER_FORMATS:{DECIMAL_SEP:".",GROUP_SEP:",",PATTERNS:[{minInt:1,minFrac:0,maxFrac:3,posPre:"",
-posSuf:"",negPre:"-",negSuf:"",gSize:3,lgSize:3},{minInt:1,minFrac:2,maxFrac:2,posPre:"\u00a4",posSuf:"",negPre:"(\u00a4",negSuf:")",gSize:3,lgSize:3}],CURRENCY_SYM:"$"},DATETIME_FORMATS:{MONTH:"January February March April May June July August September October November December".split(" "),SHORTMONTH:"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),DAY:"Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" "),SHORTDAY:"Sun Mon Tue Wed Thu Fri Sat".split(" "),AMPMS:["AM",
-"PM"],medium:"MMM d, y h:mm:ss a","short":"M/d/yy h:mm a",fullDate:"EEEE, MMMM d, y",longDate:"MMMM d, y",mediumDate:"MMM d, y",shortDate:"M/d/yy",mediumTime:"h:mm:ss a",shortTime:"h:mm a"},pluralCat:function(b){return 1===b?"one":"other"}}}}function Lb(b){b=b.split("/");for(var a=b.length;a--;)b[a]=gb(b[a]);return b.join("/")}function zc(b,a,c){b=sa(b,c);a.$$protocol=b.protocol;a.$$host=b.hostname;a.$$port=Y(b.port)||we[b.protocol]||null}function Ac(b,a,c){var d="/"!==b.charAt(0);d&&(b="/"+b);b=
-sa(b,c);a.$$path=decodeURIComponent(d&&"/"===b.pathname.charAt(0)?b.pathname.substring(1):b.pathname);a.$$search=bc(b.search);a.$$hash=decodeURIComponent(b.hash);a.$$path&&"/"!=a.$$path.charAt(0)&&(a.$$path="/"+a.$$path)}function oa(b,a){if(0===a.indexOf(b))return a.substr(b.length)}function Za(b){var a=b.indexOf("#");return-1==a?b:b.substr(0,a)}function Mb(b){return b.substr(0,Za(b).lastIndexOf("/")+1)}function Bc(b,a){this.$$html5=!0;a=a||"";var c=Mb(b);zc(b,this,b);this.$$parse=function(a){var e=
-oa(c,a);if(!C(e))throw Nb("ipthprfx",a,c);Ac(e,this,b);this.$$path||(this.$$path="/");this.$$compose()};this.$$compose=function(){var a=zb(this.$$search),b=this.$$hash?"#"+gb(this.$$hash):"";this.$$url=Lb(this.$$path)+(a?"?"+a:"")+b;this.$$absUrl=c+this.$$url.substr(1)};this.$$rewrite=function(d){var e;if((e=oa(b,d))!==s)return d=e,(e=oa(a,e))!==s?c+(oa("/",e)||e):b+d;if((e=oa(c,d))!==s)return c+e;if(c==d+"/")return c}}function Ob(b,a){var c=Mb(b);zc(b,this,b);this.$$parse=function(d){var e=oa(b,
-d)||oa(c,d),e="#"==e.charAt(0)?oa(a,e):this.$$html5?e:"";if(!C(e))throw Nb("ihshprfx",d,a);Ac(e,this,b);d=this.$$path;var g=/^\/[A-Z]:(\/.*)/;0===e.indexOf(b)&&(e=e.replace(b,""));g.exec(e)||(d=(e=g.exec(d))?e[1]:d);this.$$path=d;this.$$compose()};this.$$compose=function(){var c=zb(this.$$search),e=this.$$hash?"#"+gb(this.$$hash):"";this.$$url=Lb(this.$$path)+(c?"?"+c:"")+e;this.$$absUrl=b+(this.$$url?a+this.$$url:"")};this.$$rewrite=function(a){if(Za(b)==Za(a))return a}}function Pb(b,a){this.$$html5=
-!0;Ob.apply(this,arguments);var c=Mb(b);this.$$rewrite=function(d){var e;if(b==Za(d))return d;if(e=oa(c,d))return b+a+e;if(c===d+"/")return c};this.$$compose=function(){var c=zb(this.$$search),e=this.$$hash?"#"+gb(this.$$hash):"";this.$$url=Lb(this.$$path)+(c?"?"+c:"")+e;this.$$absUrl=b+a+this.$$url}}function qb(b){return function(){return this[b]}}function Cc(b,a){return function(c){if(H(c))return this[b];this[b]=a(c);this.$$compose();return this}}function Vd(){var b="",a=!1;this.hashPrefix=function(a){return z(a)?
-(b=a,this):b};this.html5Mode=function(b){return z(b)?(a=b,this):a};this.$get=["$rootScope","$browser","$sniffer","$rootElement",function(c,d,e,g){function f(a){c.$broadcast("$locationChangeSuccess",h.absUrl(),a)}var h,m,k=d.baseHref(),l=d.url(),n;a?(n=l.substring(0,l.indexOf("/",l.indexOf("//")+2))+(k||"/"),m=e.history?Bc:Pb):(n=Za(l),m=Ob);h=new m(n,"#"+b);h.$$parse(h.$$rewrite(l));g.on("click",function(a){if(!a.ctrlKey&&!a.metaKey&&2!=a.which){for(var e=y(a.target);"a"!==J(e[0].nodeName);)if(e[0]===
-g[0]||!(e=e.parent())[0])return;var f=e.prop("href");X(f)&&"[object SVGAnimatedString]"===f.toString()&&(f=sa(f.animVal).href);if(m===Pb){var k=e.attr("href")||e.attr("xlink:href");if(0>k.indexOf("://"))if(f="#"+b,"/"==k[0])f=n+f+k;else if("#"==k[0])f=n+f+(h.path()||"/")+k;else{for(var l=h.path().split("/"),k=k.split("/"),p=0;p<k.length;p++)"."!=k[p]&&(".."==k[p]?l.pop():k[p].length&&l.push(k[p]));f=n+f+l.join("/")}}l=h.$$rewrite(f);f&&(!e.attr("target")&&l&&!a.isDefaultPrevented())&&(a.preventDefault(),
-l!=d.url()&&(h.$$parse(l),c.$apply(),P.angular["ff-684208-preventDefault"]=!0))}});h.absUrl()!=l&&d.url(h.absUrl(),!0);d.onUrlChange(function(a){h.absUrl()!=a&&(c.$evalAsync(function(){var b=h.absUrl();h.$$parse(a);c.$broadcast("$locationChangeStart",a,b).defaultPrevented?(h.$$parse(b),d.url(b)):f(b)}),c.$$phase||c.$digest())});var p=0;c.$watch(function(){var a=d.url(),b=h.$$replace;p&&a==h.absUrl()||(p++,c.$evalAsync(function(){c.$broadcast("$locationChangeStart",h.absUrl(),a).defaultPrevented?h.$$parse(a):
-(d.url(h.absUrl(),b),f(a))}));h.$$replace=!1;return p});return h}]}function Wd(){var b=!0,a=this;this.debugEnabled=function(a){return z(a)?(b=a,this):b};this.$get=["$window",function(c){function d(a){a instanceof Error&&(a.stack?a=a.message&&-1===a.stack.indexOf(a.message)?"Error: "+a.message+"\n"+a.stack:a.stack:a.sourceURL&&(a=a.message+"\n"+a.sourceURL+":"+a.line));return a}function e(a){var b=c.console||{},e=b[a]||b.log||w;a=!1;try{a=!!e.apply}catch(m){}return a?function(){var a=[];q(arguments,
-function(b){a.push(d(b))});return e.apply(b,a)}:function(a,b){e(a,null==b?"":b)}}return{log:e("log"),info:e("info"),warn:e("warn"),error:e("error"),debug:function(){var c=e("debug");return function(){b&&c.apply(a,arguments)}}()}}]}function ga(b,a){if("constructor"===b)throw Ca("isecfld",a);return b}function $a(b,a){if(b){if(b.constructor===b)throw Ca("isecfn",a);if(b.document&&b.location&&b.alert&&b.setInterval)throw Ca("isecwindow",a);if(b.children&&(b.nodeName||b.prop&&b.attr&&b.find))throw Ca("isecdom",
-a);}return b}function rb(b,a,c,d,e){e=e||{};a=a.split(".");for(var g,f=0;1<a.length;f++){g=ga(a.shift(),d);var h=b[g];h||(h={},b[g]=h);b=h;b.then&&e.unwrapPromises&&(ta(d),"$$v"in b||function(a){a.then(function(b){a.$$v=b})}(b),b.$$v===s&&(b.$$v={}),b=b.$$v)}g=ga(a.shift(),d);return b[g]=c}function Dc(b,a,c,d,e,g,f){ga(b,g);ga(a,g);ga(c,g);ga(d,g);ga(e,g);return f.unwrapPromises?function(f,m){var k=m&&m.hasOwnProperty(b)?m:f,l;if(null==k)return k;(k=k[b])&&k.then&&(ta(g),"$$v"in k||(l=k,l.$$v=s,l.then(function(a){l.$$v=
-a})),k=k.$$v);if(!a)return k;if(null==k)return s;(k=k[a])&&k.then&&(ta(g),"$$v"in k||(l=k,l.$$v=s,l.then(function(a){l.$$v=a})),k=k.$$v);if(!c)return k;if(null==k)return s;(k=k[c])&&k.then&&(ta(g),"$$v"in k||(l=k,l.$$v=s,l.then(function(a){l.$$v=a})),k=k.$$v);if(!d)return k;if(null==k)return s;(k=k[d])&&k.then&&(ta(g),"$$v"in k||(l=k,l.$$v=s,l.then(function(a){l.$$v=a})),k=k.$$v);if(!e)return k;if(null==k)return s;(k=k[e])&&k.then&&(ta(g),"$$v"in k||(l=k,l.$$v=s,l.then(function(a){l.$$v=a})),k=k.$$v);
-return k}:function(g,f){var k=f&&f.hasOwnProperty(b)?f:g;if(null==k)return k;k=k[b];if(!a)return k;if(null==k)return s;k=k[a];if(!c)return k;if(null==k)return s;k=k[c];if(!d)return k;if(null==k)return s;k=k[d];return e?null==k?s:k=k[e]:k}}function xe(b,a){ga(b,a);return function(a,d){return null==a?s:(d&&d.hasOwnProperty(b)?d:a)[b]}}function ye(b,a,c){ga(b,c);ga(a,c);return function(c,e){if(null==c)return s;c=(e&&e.hasOwnProperty(b)?e:c)[b];return null==c?s:c[a]}}function Ec(b,a,c){if(Qb.hasOwnProperty(b))return Qb[b];
-var d=b.split("."),e=d.length,g;if(a.unwrapPromises||1!==e)if(a.unwrapPromises||2!==e)if(a.csp)g=6>e?Dc(d[0],d[1],d[2],d[3],d[4],c,a):function(b,g){var f=0,h;do h=Dc(d[f++],d[f++],d[f++],d[f++],d[f++],c,a)(b,g),g=s,b=h;while(f<e);return h};else{var f="var p;\n";q(d,function(b,d){ga(b,c);f+="if(s == null) return undefined;\ns="+(d?"s":'((k&&k.hasOwnProperty("'+b+'"))?k:s)')+'["'+b+'"];\n'+(a.unwrapPromises?'if (s && s.then) {\n pw("'+c.replace(/(["\r\n])/g,"\\$1")+'");\n if (!("$$v" in s)) {\n p=s;\n p.$$v = undefined;\n p.then(function(v) {p.$$v=v;});\n}\n s=s.$$v\n}\n':
-"")});var f=f+"return s;",h=new Function("s","k","pw",f);h.toString=aa(f);g=a.unwrapPromises?function(a,b){return h(a,b,ta)}:h}else g=ye(d[0],d[1],c);else g=xe(d[0],c);"hasOwnProperty"!==b&&(Qb[b]=g);return g}function Xd(){var b={},a={csp:!1,unwrapPromises:!1,logPromiseWarnings:!0};this.unwrapPromises=function(b){return z(b)?(a.unwrapPromises=!!b,this):a.unwrapPromises};this.logPromiseWarnings=function(b){return z(b)?(a.logPromiseWarnings=b,this):a.logPromiseWarnings};this.$get=["$filter","$sniffer",
-"$log",function(c,d,e){a.csp=d.csp;ta=function(b){a.logPromiseWarnings&&!Fc.hasOwnProperty(b)&&(Fc[b]=!0,e.warn("[$parse] Promise found in the expression `"+b+"`. Automatic unwrapping of promises in Angular expressions is deprecated."))};return function(d){var e;switch(typeof d){case "string":if(b.hasOwnProperty(d))return b[d];e=new Rb(a);e=(new ab(e,c,a)).parse(d,!1);"hasOwnProperty"!==d&&(b[d]=e);return e;case "function":return d;default:return w}}}]}function Zd(){this.$get=["$rootScope","$exceptionHandler",
-function(b,a){return ze(function(a){b.$evalAsync(a)},a)}]}function ze(b,a){function c(a){return a}function d(a){return f(a)}var e=function(){var f=[],k,l;return l={resolve:function(a){if(f){var c=f;f=s;k=g(a);c.length&&b(function(){for(var a,b=0,d=c.length;b<d;b++)a=c[b],k.then(a[0],a[1],a[2])})}},reject:function(a){l.resolve(h(a))},notify:function(a){if(f){var c=f;f.length&&b(function(){for(var b,d=0,e=c.length;d<e;d++)b=c[d],b[2](a)})}},promise:{then:function(b,g,h){var l=e(),D=function(d){try{l.resolve((Q(b)?
-b:c)(d))}catch(e){l.reject(e),a(e)}},x=function(b){try{l.resolve((Q(g)?g:d)(b))}catch(c){l.reject(c),a(c)}},t=function(b){try{l.notify((Q(h)?h:c)(b))}catch(d){a(d)}};f?f.push([D,x,t]):k.then(D,x,t);return l.promise},"catch":function(a){return this.then(null,a)},"finally":function(a){function b(a,c){var d=e();c?d.resolve(a):d.reject(a);return d.promise}function d(e,g){var f=null;try{f=(a||c)()}catch(h){return b(h,!1)}return f&&Q(f.then)?f.then(function(){return b(e,g)},function(a){return b(a,!1)}):
-b(e,g)}return this.then(function(a){return d(a,!0)},function(a){return d(a,!1)})}}}},g=function(a){return a&&Q(a.then)?a:{then:function(c){var d=e();b(function(){d.resolve(c(a))});return d.promise}}},f=function(a){var b=e();b.reject(a);return b.promise},h=function(c){return{then:function(g,f){var h=e();b(function(){try{h.resolve((Q(f)?f:d)(c))}catch(b){h.reject(b),a(b)}});return h.promise}}};return{defer:e,reject:f,when:function(h,k,l,n){var p=e(),r,A=function(b){try{return(Q(k)?k:c)(b)}catch(d){return a(d),
-f(d)}},D=function(b){try{return(Q(l)?l:d)(b)}catch(c){return a(c),f(c)}},x=function(b){try{return(Q(n)?n:c)(b)}catch(d){a(d)}};b(function(){g(h).then(function(a){r||(r=!0,p.resolve(g(a).then(A,D,x)))},function(a){r||(r=!0,p.resolve(D(a)))},function(a){r||p.notify(x(a))})});return p.promise},all:function(a){var b=e(),c=0,d=L(a)?[]:{};q(a,function(a,e){c++;g(a).then(function(a){d.hasOwnProperty(e)||(d[e]=a,--c||b.resolve(d))},function(a){d.hasOwnProperty(e)||b.reject(a)})});0===c&&b.resolve(d);return b.promise}}}
-function fe(){this.$get=["$window","$timeout",function(b,a){var c=b.requestAnimationFrame||b.webkitRequestAnimationFrame||b.mozRequestAnimationFrame,d=b.cancelAnimationFrame||b.webkitCancelAnimationFrame||b.mozCancelAnimationFrame||b.webkitCancelRequestAnimationFrame,e=!!c,g=e?function(a){var b=c(a);return function(){d(b)}}:function(b){var c=a(b,16.66,!1);return function(){a.cancel(c)}};g.supported=e;return g}]}function Yd(){var b=10,a=u("$rootScope"),c=null;this.digestTtl=function(a){arguments.length&&
-(b=a);return b};this.$get=["$injector","$exceptionHandler","$parse","$browser",function(d,e,g,f){function h(){this.$id=cb();this.$$phase=this.$parent=this.$$watchers=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=null;this["this"]=this.$root=this;this.$$destroyed=!1;this.$$asyncQueue=[];this.$$postDigestQueue=[];this.$$listeners={};this.$$listenerCount={};this.$$isolateBindings={}}function m(b){if(p.$$phase)throw a("inprog",p.$$phase);p.$$phase=b}function k(a,b){var c=g(a);
-Ra(c,b);return c}function l(a,b,c){do a.$$listenerCount[c]-=b,0===a.$$listenerCount[c]&&delete a.$$listenerCount[c];while(a=a.$parent)}function n(){}h.prototype={constructor:h,$new:function(a){a?(a=new h,a.$root=this.$root,a.$$asyncQueue=this.$$asyncQueue,a.$$postDigestQueue=this.$$postDigestQueue):(this.$$childScopeClass||(this.$$childScopeClass=function(){this.$$watchers=this.$$nextSibling=this.$$childHead=this.$$childTail=null;this.$$listeners={};this.$$listenerCount={};this.$id=cb();this.$$childScopeClass=
-null},this.$$childScopeClass.prototype=this),a=new this.$$childScopeClass);a["this"]=a;a.$parent=this;a.$$prevSibling=this.$$childTail;this.$$childHead?this.$$childTail=this.$$childTail.$$nextSibling=a:this.$$childHead=this.$$childTail=a;return a},$watch:function(a,b,d){var e=k(a,"watch"),g=this.$$watchers,f={fn:b,last:n,get:e,exp:a,eq:!!d};c=null;if(!Q(b)){var h=k(b||w,"listener");f.fn=function(a,b,c){h(c)}}if("string"==typeof a&&e.constant){var m=f.fn;f.fn=function(a,b,c){m.call(this,a,b,c);Na(g,
-f)}}g||(g=this.$$watchers=[]);g.unshift(f);return function(){Na(g,f);c=null}},$watchCollection:function(a,b){var c=this,d,e,f,h=1<b.length,k=0,m=g(a),l=[],n={},p=!0,q=0;return this.$watch(function(){d=m(c);var a,b;if(X(d))if(bb(d))for(e!==l&&(e=l,q=e.length=0,k++),a=d.length,q!==a&&(k++,e.length=q=a),b=0;b<a;b++)e[b]!==e[b]&&d[b]!==d[b]||e[b]===d[b]||(k++,e[b]=d[b]);else{e!==n&&(e=n={},q=0,k++);a=0;for(b in d)d.hasOwnProperty(b)&&(a++,e.hasOwnProperty(b)?e[b]!==d[b]&&(k++,e[b]=d[b]):(q++,e[b]=d[b],
-k++));if(q>a)for(b in k++,e)e.hasOwnProperty(b)&&!d.hasOwnProperty(b)&&(q--,delete e[b])}else e!==d&&(e=d,k++);return k},function(){p?(p=!1,b(d,d,c)):b(d,f,c);if(h)if(X(d))if(bb(d)){f=Array(d.length);for(var a=0;a<d.length;a++)f[a]=d[a]}else for(a in f={},d)Gc.call(d,a)&&(f[a]=d[a]);else f=d})},$digest:function(){var d,g,f,h,k=this.$$asyncQueue,l=this.$$postDigestQueue,q,v,s=b,K,O=[],y,F,R;m("$digest");c=null;do{v=!1;for(K=this;k.length;){try{R=k.shift(),R.scope.$eval(R.expression)}catch(z){p.$$phase=
-null,e(z)}c=null}a:do{if(h=K.$$watchers)for(q=h.length;q--;)try{if(d=h[q])if((g=d.get(K))!==(f=d.last)&&!(d.eq?xa(g,f):"number"==typeof g&&"number"==typeof f&&isNaN(g)&&isNaN(f)))v=!0,c=d,d.last=d.eq?ca(g):g,d.fn(g,f===n?g:f,K),5>s&&(y=4-s,O[y]||(O[y]=[]),F=Q(d.exp)?"fn: "+(d.exp.name||d.exp.toString()):d.exp,F+="; newVal: "+qa(g)+"; oldVal: "+qa(f),O[y].push(F));else if(d===c){v=!1;break a}}catch(C){p.$$phase=null,e(C)}if(!(h=K.$$childHead||K!==this&&K.$$nextSibling))for(;K!==this&&!(h=K.$$nextSibling);)K=
-K.$parent}while(K=h);if((v||k.length)&&!s--)throw p.$$phase=null,a("infdig",b,qa(O));}while(v||k.length);for(p.$$phase=null;l.length;)try{l.shift()()}catch(T){e(T)}},$destroy:function(){if(!this.$$destroyed){var a=this.$parent;this.$broadcast("$destroy");this.$$destroyed=!0;this!==p&&(q(this.$$listenerCount,fb(null,l,this)),a.$$childHead==this&&(a.$$childHead=this.$$nextSibling),a.$$childTail==this&&(a.$$childTail=this.$$prevSibling),this.$$prevSibling&&(this.$$prevSibling.$$nextSibling=this.$$nextSibling),
-this.$$nextSibling&&(this.$$nextSibling.$$prevSibling=this.$$prevSibling),this.$parent=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=this.$root=null,this.$$listeners={},this.$$watchers=this.$$asyncQueue=this.$$postDigestQueue=[],this.$destroy=this.$digest=this.$apply=w,this.$on=this.$watch=function(){return w})}},$eval:function(a,b){return g(a)(this,b)},$evalAsync:function(a){p.$$phase||p.$$asyncQueue.length||f.defer(function(){p.$$asyncQueue.length&&p.$digest()});this.$$asyncQueue.push({scope:this,
-expression:a})},$$postDigest:function(a){this.$$postDigestQueue.push(a)},$apply:function(a){try{return m("$apply"),this.$eval(a)}catch(b){e(b)}finally{p.$$phase=null;try{p.$digest()}catch(c){throw e(c),c;}}},$on:function(a,b){var c=this.$$listeners[a];c||(this.$$listeners[a]=c=[]);c.push(b);var d=this;do d.$$listenerCount[a]||(d.$$listenerCount[a]=0),d.$$listenerCount[a]++;while(d=d.$parent);var e=this;return function(){c[eb(c,b)]=null;l(e,1,a)}},$emit:function(a,b){var c=[],d,g=this,f=!1,h={name:a,
-targetScope:g,stopPropagation:function(){f=!0},preventDefault:function(){h.defaultPrevented=!0},defaultPrevented:!1},k=[h].concat(ya.call(arguments,1)),m,l;do{d=g.$$listeners[a]||c;h.currentScope=g;m=0;for(l=d.length;m<l;m++)if(d[m])try{d[m].apply(null,k)}catch(n){e(n)}else d.splice(m,1),m--,l--;if(f)break;g=g.$parent}while(g);return h},$broadcast:function(a,b){for(var c=this,d=this,g={name:a,targetScope:this,preventDefault:function(){g.defaultPrevented=!0},defaultPrevented:!1},f=[g].concat(ya.call(arguments,
-1)),h,k;c=d;){g.currentScope=c;d=c.$$listeners[a]||[];h=0;for(k=d.length;h<k;h++)if(d[h])try{d[h].apply(null,f)}catch(m){e(m)}else d.splice(h,1),h--,k--;if(!(d=c.$$listenerCount[a]&&c.$$childHead||c!==this&&c.$$nextSibling))for(;c!==this&&!(d=c.$$nextSibling);)c=c.$parent}return g}};var p=new h;return p}]}function bd(){var b=/^\s*(https?|ftp|mailto|tel|file):/,a=/^\s*(https?|ftp|file):|data:image\//;this.aHrefSanitizationWhitelist=function(a){return z(a)?(b=a,this):b};this.imgSrcSanitizationWhitelist=
-function(b){return z(b)?(a=b,this):a};this.$get=function(){return function(c,d){var e=d?a:b,g;if(!S||8<=S)if(g=sa(c).href,""!==g&&!g.match(e))return"unsafe:"+g;return c}}}function Ae(b){if("self"===b)return b;if(C(b)){if(-1<b.indexOf("***"))throw ua("iwcard",b);b=b.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g,"\\$1").replace(/\x08/g,"\\x08").replace("\\*\\*",".*").replace("\\*","[^:/.?&;]*");return RegExp("^"+b+"$")}if(db(b))return RegExp("^"+b.source+"$");throw ua("imatcher");}function Hc(b){var a=[];
-z(b)&&q(b,function(b){a.push(Ae(b))});return a}function ae(){this.SCE_CONTEXTS=ha;var b=["self"],a=[];this.resourceUrlWhitelist=function(a){arguments.length&&(b=Hc(a));return b};this.resourceUrlBlacklist=function(b){arguments.length&&(a=Hc(b));return a};this.$get=["$injector",function(c){function d(a){var b=function(a){this.$$unwrapTrustedValue=function(){return a}};a&&(b.prototype=new a);b.prototype.valueOf=function(){return this.$$unwrapTrustedValue()};b.prototype.toString=function(){return this.$$unwrapTrustedValue().toString()};
-return b}var e=function(a){throw ua("unsafe");};c.has("$sanitize")&&(e=c.get("$sanitize"));var g=d(),f={};f[ha.HTML]=d(g);f[ha.CSS]=d(g);f[ha.URL]=d(g);f[ha.JS]=d(g);f[ha.RESOURCE_URL]=d(f[ha.URL]);return{trustAs:function(a,b){var c=f.hasOwnProperty(a)?f[a]:null;if(!c)throw ua("icontext",a,b);if(null===b||b===s||""===b)return b;if("string"!==typeof b)throw ua("itype",a);return new c(b)},getTrusted:function(c,d){if(null===d||d===s||""===d)return d;var g=f.hasOwnProperty(c)?f[c]:null;if(g&&d instanceof
-g)return d.$$unwrapTrustedValue();if(c===ha.RESOURCE_URL){var g=sa(d.toString()),l,n,p=!1;l=0;for(n=b.length;l<n;l++)if("self"===b[l]?Kb(g):b[l].exec(g.href)){p=!0;break}if(p)for(l=0,n=a.length;l<n;l++)if("self"===a[l]?Kb(g):a[l].exec(g.href)){p=!1;break}if(p)return d;throw ua("insecurl",d.toString());}if(c===ha.HTML)return e(d);throw ua("unsafe");},valueOf:function(a){return a instanceof g?a.$$unwrapTrustedValue():a}}}]}function $d(){var b=!0;this.enabled=function(a){arguments.length&&(b=!!a);return b};
-this.$get=["$parse","$sniffer","$sceDelegate",function(a,c,d){if(b&&c.msie&&8>c.msieDocumentMode)throw ua("iequirks");var e=ca(ha);e.isEnabled=function(){return b};e.trustAs=d.trustAs;e.getTrusted=d.getTrusted;e.valueOf=d.valueOf;b||(e.trustAs=e.getTrusted=function(a,b){return b},e.valueOf=Ea);e.parseAs=function(b,c){var d=a(c);return d.literal&&d.constant?d:function(a,c){return e.getTrusted(b,d(a,c))}};var g=e.parseAs,f=e.getTrusted,h=e.trustAs;q(ha,function(a,b){var c=J(b);e[Ta("parse_as_"+c)]=
-function(b){return g(a,b)};e[Ta("get_trusted_"+c)]=function(b){return f(a,b)};e[Ta("trust_as_"+c)]=function(b){return h(a,b)}});return e}]}function be(){this.$get=["$window","$document",function(b,a){var c={},d=Y((/android (\d+)/.exec(J((b.navigator||{}).userAgent))||[])[1]),e=/Boxee/i.test((b.navigator||{}).userAgent),g=a[0]||{},f=g.documentMode,h,m=/^(Moz|webkit|O|ms)(?=[A-Z])/,k=g.body&&g.body.style,l=!1,n=!1;if(k){for(var p in k)if(l=m.exec(p)){h=l[0];h=h.substr(0,1).toUpperCase()+h.substr(1);
-break}h||(h="WebkitOpacity"in k&&"webkit");l=!!("transition"in k||h+"Transition"in k);n=!!("animation"in k||h+"Animation"in k);!d||l&&n||(l=C(g.body.style.webkitTransition),n=C(g.body.style.webkitAnimation))}return{history:!(!b.history||!b.history.pushState||4>d||e),hashchange:"onhashchange"in b&&(!f||7<f),hasEvent:function(a){if("input"==a&&9==S)return!1;if(H(c[a])){var b=g.createElement("div");c[a]="on"+a in b}return c[a]},csp:Zb(),vendorPrefix:h,transitions:l,animations:n,android:d,msie:S,msieDocumentMode:f}}]}
-function de(){this.$get=["$rootScope","$browser","$q","$exceptionHandler",function(b,a,c,d){function e(e,h,m){var k=c.defer(),l=k.promise,n=z(m)&&!m;h=a.defer(function(){try{k.resolve(e())}catch(a){k.reject(a),d(a)}finally{delete g[l.$$timeoutId]}n||b.$apply()},h);l.$$timeoutId=h;g[h]=k;return l}var g={};e.cancel=function(b){return b&&b.$$timeoutId in g?(g[b.$$timeoutId].reject("canceled"),delete g[b.$$timeoutId],a.defer.cancel(b.$$timeoutId)):!1};return e}]}function sa(b,a){var c=b;S&&(W.setAttribute("href",
-c),c=W.href);W.setAttribute("href",c);return{href:W.href,protocol:W.protocol?W.protocol.replace(/:$/,""):"",host:W.host,search:W.search?W.search.replace(/^\?/,""):"",hash:W.hash?W.hash.replace(/^#/,""):"",hostname:W.hostname,port:W.port,pathname:"/"===W.pathname.charAt(0)?W.pathname:"/"+W.pathname}}function Kb(b){b=C(b)?sa(b):b;return b.protocol===Ic.protocol&&b.host===Ic.host}function ee(){this.$get=aa(P)}function jc(b){function a(d,e){if(X(d)){var g={};q(d,function(b,c){g[c]=a(c,b)});return g}return b.factory(d+
-c,e)}var c="Filter";this.register=a;this.$get=["$injector",function(a){return function(b){return a.get(b+c)}}];a("currency",Jc);a("date",Kc);a("filter",Be);a("json",Ce);a("limitTo",De);a("lowercase",Ee);a("number",Lc);a("orderBy",Mc);a("uppercase",Fe)}function Be(){return function(b,a,c){if(!L(b))return b;var d=typeof c,e=[];e.check=function(a){for(var b=0;b<e.length;b++)if(!e[b](a))return!1;return!0};"function"!==d&&(c="boolean"===d&&c?function(a,b){return Qa.equals(a,b)}:function(a,b){if(a&&b&&
-"object"===typeof a&&"object"===typeof b){for(var d in a)if("$"!==d.charAt(0)&&Gc.call(a,d)&&c(a[d],b[d]))return!0;return!1}b=(""+b).toLowerCase();return-1<(""+a).toLowerCase().indexOf(b)});var g=function(a,b){if("string"==typeof b&&"!"===b.charAt(0))return!g(a,b.substr(1));switch(typeof a){case "boolean":case "number":case "string":return c(a,b);case "object":switch(typeof b){case "object":return c(a,b);default:for(var d in a)if("$"!==d.charAt(0)&&g(a[d],b))return!0}return!1;case "array":for(d=0;d<
-a.length;d++)if(g(a[d],b))return!0;return!1;default:return!1}};switch(typeof a){case "boolean":case "number":case "string":a={$:a};case "object":for(var f in a)(function(b){"undefined"!=typeof a[b]&&e.push(function(c){return g("$"==b?c:c&&c[b],a[b])})})(f);break;case "function":e.push(a);break;default:return b}d=[];for(f=0;f<b.length;f++){var h=b[f];e.check(h)&&d.push(h)}return d}}function Jc(b){var a=b.NUMBER_FORMATS;return function(b,d){H(d)&&(d=a.CURRENCY_SYM);return Nc(b,a.PATTERNS[1],a.GROUP_SEP,
-a.DECIMAL_SEP,2).replace(/\u00A4/g,d)}}function Lc(b){var a=b.NUMBER_FORMATS;return function(b,d){return Nc(b,a.PATTERNS[0],a.GROUP_SEP,a.DECIMAL_SEP,d)}}function Nc(b,a,c,d,e){if(null==b||!isFinite(b)||X(b))return"";var g=0>b;b=Math.abs(b);var f=b+"",h="",m=[],k=!1;if(-1!==f.indexOf("e")){var l=f.match(/([\d\.]+)e(-?)(\d+)/);l&&"-"==l[2]&&l[3]>e+1?f="0":(h=f,k=!0)}if(k)0<e&&(-1<b&&1>b)&&(h=b.toFixed(e));else{f=(f.split(Oc)[1]||"").length;H(e)&&(e=Math.min(Math.max(a.minFrac,f),a.maxFrac));f=Math.pow(10,
-e+1);b=Math.floor(b*f+5)/f;b=(""+b).split(Oc);f=b[0];b=b[1]||"";var l=0,n=a.lgSize,p=a.gSize;if(f.length>=n+p)for(l=f.length-n,k=0;k<l;k++)0===(l-k)%p&&0!==k&&(h+=c),h+=f.charAt(k);for(k=l;k<f.length;k++)0===(f.length-k)%n&&0!==k&&(h+=c),h+=f.charAt(k);for(;b.length<e;)b+="0";e&&"0"!==e&&(h+=d+b.substr(0,e))}m.push(g?a.negPre:a.posPre);m.push(h);m.push(g?a.negSuf:a.posSuf);return m.join("")}function Sb(b,a,c){var d="";0>b&&(d="-",b=-b);for(b=""+b;b.length<a;)b="0"+b;c&&(b=b.substr(b.length-a));return d+
-b}function $(b,a,c,d){c=c||0;return function(e){e=e["get"+b]();if(0<c||e>-c)e+=c;0===e&&-12==c&&(e=12);return Sb(e,a,d)}}function sb(b,a){return function(c,d){var e=c["get"+b](),g=Fa(a?"SHORT"+b:b);return d[g][e]}}function Kc(b){function a(a){var b;if(b=a.match(c)){a=new Date(0);var g=0,f=0,h=b[8]?a.setUTCFullYear:a.setFullYear,m=b[8]?a.setUTCHours:a.setHours;b[9]&&(g=Y(b[9]+b[10]),f=Y(b[9]+b[11]));h.call(a,Y(b[1]),Y(b[2])-1,Y(b[3]));g=Y(b[4]||0)-g;f=Y(b[5]||0)-f;h=Y(b[6]||0);b=Math.round(1E3*parseFloat("0."+
-(b[7]||0)));m.call(a,g,f,h,b)}return a}var c=/^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;return function(c,e){var g="",f=[],h,m;e=e||"mediumDate";e=b.DATETIME_FORMATS[e]||e;C(c)&&(c=Ge.test(c)?Y(c):a(c));yb(c)&&(c=new Date(c));if(!Ma(c))return c;for(;e;)(m=He.exec(e))?(f=f.concat(ya.call(m,1)),e=f.pop()):(f.push(e),e=null);q(f,function(a){h=Ie[a];g+=h?h(c,b.DATETIME_FORMATS):a.replace(/(^'|'$)/g,"").replace(/''/g,"'")});return g}}function Ce(){return function(b){return qa(b,
-!0)}}function De(){return function(b,a){if(!L(b)&&!C(b))return b;a=Infinity===Math.abs(Number(a))?Number(a):Y(a);if(C(b))return a?0<=a?b.slice(0,a):b.slice(a,b.length):"";var c=[],d,e;a>b.length?a=b.length:a<-b.length&&(a=-b.length);0<a?(d=0,e=a):(d=b.length+a,e=b.length);for(;d<e;d++)c.push(b[d]);return c}}function Mc(b){return function(a,c,d){function e(a,b){return Pa(b)?function(b,c){return a(c,b)}:a}function g(a,b){var c=typeof a,d=typeof b;return c==d?("string"==c&&(a=a.toLowerCase(),b=b.toLowerCase()),
-a===b?0:a<b?-1:1):c<d?-1:1}if(!L(a)||!c)return a;c=L(c)?c:[c];c=Uc(c,function(a){var c=!1,d=a||Ea;if(C(a)){if("+"==a.charAt(0)||"-"==a.charAt(0))c="-"==a.charAt(0),a=a.substring(1);d=b(a);if(d.constant){var f=d();return e(function(a,b){return g(a[f],b[f])},c)}}return e(function(a,b){return g(d(a),d(b))},c)});for(var f=[],h=0;h<a.length;h++)f.push(a[h]);return f.sort(e(function(a,b){for(var d=0;d<c.length;d++){var e=c[d](a,b);if(0!==e)return e}return 0},d))}}function va(b){Q(b)&&(b={link:b});b.restrict=
-b.restrict||"AC";return aa(b)}function Pc(b,a,c,d){function e(a,c){c=c?"-"+hb(c,"-"):"";d.removeClass(b,(a?tb:ub)+c);d.addClass(b,(a?ub:tb)+c)}var g=this,f=b.parent().controller("form")||vb,h=0,m=g.$error={},k=[];g.$name=a.name||a.ngForm;g.$dirty=!1;g.$pristine=!0;g.$valid=!0;g.$invalid=!1;f.$addControl(g);b.addClass(Ka);e(!0);g.$addControl=function(a){Aa(a.$name,"input");k.push(a);a.$name&&(g[a.$name]=a)};g.$removeControl=function(a){a.$name&&g[a.$name]===a&&delete g[a.$name];q(m,function(b,c){g.$setValidity(c,
-!0,a)});Na(k,a)};g.$setValidity=function(a,b,c){var d=m[a];if(b)d&&(Na(d,c),d.length||(h--,h||(e(b),g.$valid=!0,g.$invalid=!1),m[a]=!1,e(!0,a),f.$setValidity(a,!0,g)));else{h||e(b);if(d){if(-1!=eb(d,c))return}else m[a]=d=[],h++,e(!1,a),f.$setValidity(a,!1,g);d.push(c);g.$valid=!1;g.$invalid=!0}};g.$setDirty=function(){d.removeClass(b,Ka);d.addClass(b,wb);g.$dirty=!0;g.$pristine=!1;f.$setDirty()};g.$setPristine=function(){d.removeClass(b,wb);d.addClass(b,Ka);g.$dirty=!1;g.$pristine=!0;q(k,function(a){a.$setPristine()})}}
-function pa(b,a,c,d){b.$setValidity(a,c);return c?d:s}function Je(b,a,c){var d=c.prop("validity");X(d)&&b.$parsers.push(function(c){if(b.$error[a]||!(d.badInput||d.customError||d.typeMismatch)||d.valueMissing)return c;b.$setValidity(a,!1)})}function xb(b,a,c,d,e,g){var f=a.prop("validity"),h=a[0].placeholder,m={};if(!e.android){var k=!1;a.on("compositionstart",function(a){k=!0});a.on("compositionend",function(){k=!1;l()})}var l=function(e){if(!k){var g=a.val();if(S&&"input"===(e||m).type&&a[0].placeholder!==
-h)h=a[0].placeholder;else if(Pa(c.ngTrim||"T")&&(g=ba(g)),d.$viewValue!==g||f&&""===g&&!f.valueMissing)b.$$phase?d.$setViewValue(g):b.$apply(function(){d.$setViewValue(g)})}};if(e.hasEvent("input"))a.on("input",l);else{var n,p=function(){n||(n=g.defer(function(){l();n=null}))};a.on("keydown",function(a){a=a.keyCode;91===a||(15<a&&19>a||37<=a&&40>=a)||p()});if(e.hasEvent("paste"))a.on("paste cut",p)}a.on("change",l);d.$render=function(){a.val(d.$isEmpty(d.$viewValue)?"":d.$viewValue)};var r=c.ngPattern;
-r&&((e=r.match(/^\/(.*)\/([gim]*)$/))?(r=RegExp(e[1],e[2]),e=function(a){return pa(d,"pattern",d.$isEmpty(a)||r.test(a),a)}):e=function(c){var e=b.$eval(r);if(!e||!e.test)throw u("ngPattern")("noregexp",r,e,ia(a));return pa(d,"pattern",d.$isEmpty(c)||e.test(c),c)},d.$formatters.push(e),d.$parsers.push(e));if(c.ngMinlength){var q=Y(c.ngMinlength);e=function(a){return pa(d,"minlength",d.$isEmpty(a)||a.length>=q,a)};d.$parsers.push(e);d.$formatters.push(e)}if(c.ngMaxlength){var D=Y(c.ngMaxlength);e=
-function(a){return pa(d,"maxlength",d.$isEmpty(a)||a.length<=D,a)};d.$parsers.push(e);d.$formatters.push(e)}}function Tb(b,a){b="ngClass"+b;return["$animate",function(c){function d(a,b){var c=[],d=0;a:for(;d<a.length;d++){for(var e=a[d],l=0;l<b.length;l++)if(e==b[l])continue a;c.push(e)}return c}function e(a){if(!L(a)){if(C(a))return a.split(" ");if(X(a)){var b=[];q(a,function(a,c){a&&b.push(c)});return b}}return a}return{restrict:"AC",link:function(g,f,h){function m(a,b){var c=f.data("$classCounts")||
-{},d=[];q(a,function(a){if(0<b||c[a])c[a]=(c[a]||0)+b,c[a]===+(0<b)&&d.push(a)});f.data("$classCounts",c);return d.join(" ")}function k(b){if(!0===a||g.$index%2===a){var k=e(b||[]);if(!l){var r=m(k,1);h.$addClass(r)}else if(!xa(b,l)){var q=e(l),r=d(k,q),k=d(q,k),k=m(k,-1),r=m(r,1);0===r.length?c.removeClass(f,k):0===k.length?c.addClass(f,r):c.setClass(f,r,k)}}l=ca(b)}var l;g.$watch(h[b],k,!0);h.$observe("class",function(a){k(g.$eval(h[b]))});"ngClass"!==b&&g.$watch("$index",function(c,d){var f=c&
-1;if(f!==(d&1)){var k=e(g.$eval(h[b]));f===a?(f=m(k,1),h.$addClass(f)):(f=m(k,-1),h.$removeClass(f))}})}}}]}var J=function(b){return C(b)?b.toLowerCase():b},Gc=Object.prototype.hasOwnProperty,Fa=function(b){return C(b)?b.toUpperCase():b},S,y,Ba,ya=[].slice,Ke=[].push,wa=Object.prototype.toString,Oa=u("ng"),Qa=P.angular||(P.angular={}),Sa,Ja,ka=["0","0","0"];S=Y((/msie (\d+)/.exec(J(navigator.userAgent))||[])[1]);isNaN(S)&&(S=Y((/trident\/.*; rv:(\d+)/.exec(J(navigator.userAgent))||[])[1]));w.$inject=
-[];Ea.$inject=[];var ba=function(){return String.prototype.trim?function(b){return C(b)?b.trim():b}:function(b){return C(b)?b.replace(/^\s\s*/,"").replace(/\s\s*$/,""):b}}();Ja=9>S?function(b){b=b.nodeName?b:b[0];return b.scopeName&&"HTML"!=b.scopeName?Fa(b.scopeName+":"+b.nodeName):b.nodeName}:function(b){return b.nodeName?b.nodeName:b[0].nodeName};var Xc=/[A-Z]/g,$c={full:"1.2.17-build.178+sha.2406084",major:1,minor:2,dot:17,codeName:"snapshot"},Va=M.cache={},ib=M.expando="ng-"+(new Date).getTime(),
-me=1,pb=P.document.addEventListener?function(b,a,c){b.addEventListener(a,c,!1)}:function(b,a,c){b.attachEvent("on"+a,c)},Ua=P.document.removeEventListener?function(b,a,c){b.removeEventListener(a,c,!1)}:function(b,a,c){b.detachEvent("on"+a,c)};M._data=function(b){return this.cache[b[this.expando]]||{}};var he=/([\:\-\_]+(.))/g,ie=/^moz([A-Z])/,Eb=u("jqLite"),je=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,Fb=/<|&#?\w+;/,ke=/<([\w:]+)/,le=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ea=
-{option:[1,'<select multiple="multiple">',"</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ea.optgroup=ea.option;ea.tbody=ea.tfoot=ea.colgroup=ea.caption=ea.thead;ea.th=ea.td;var Ia=M.prototype={ready:function(b){function a(){c||(c=!0,b())}var c=!1;"complete"===U.readyState?setTimeout(a):(this.on("DOMContentLoaded",a),M(P).on("load",a))},toString:function(){var b=
-[];q(this,function(a){b.push(""+a)});return"["+b.join(", ")+"]"},eq:function(b){return 0<=b?y(this[b]):y(this[this.length+b])},length:0,push:Ke,sort:[].sort,splice:[].splice},mb={};q("multiple selected checked disabled readOnly required open".split(" "),function(b){mb[J(b)]=b});var qc={};q("input select option textarea button form details".split(" "),function(b){qc[Fa(b)]=!0});q({data:mc,inheritedData:lb,scope:function(b){return y(b).data("$scope")||lb(b.parentNode||b,["$isolateScope","$scope"])},
-isolateScope:function(b){return y(b).data("$isolateScope")||y(b).data("$isolateScopeNoTemplate")},controller:nc,injector:function(b){return lb(b,"$injector")},removeAttr:function(b,a){b.removeAttribute(a)},hasClass:Ib,css:function(b,a,c){a=Ta(a);if(z(c))b.style[a]=c;else{var d;8>=S&&(d=b.currentStyle&&b.currentStyle[a],""===d&&(d="auto"));d=d||b.style[a];8>=S&&(d=""===d?s:d);return d}},attr:function(b,a,c){var d=J(a);if(mb[d])if(z(c))c?(b[a]=!0,b.setAttribute(a,d)):(b[a]=!1,b.removeAttribute(d));
-else return b[a]||(b.attributes.getNamedItem(a)||w).specified?d:s;else if(z(c))b.setAttribute(a,c);else if(b.getAttribute)return b=b.getAttribute(a,2),null===b?s:b},prop:function(b,a,c){if(z(c))b[a]=c;else return b[a]},text:function(){function b(b,d){var e=a[b.nodeType];if(H(d))return e?b[e]:"";b[e]=d}var a=[];9>S?(a[1]="innerText",a[3]="nodeValue"):a[1]=a[3]="textContent";b.$dv="";return b}(),val:function(b,a){if(H(a)){if("SELECT"===Ja(b)&&b.multiple){var c=[];q(b.options,function(a){a.selected&&
-c.push(a.value||a.text)});return 0===c.length?null:c}return b.value}b.value=a},html:function(b,a){if(H(a))return b.innerHTML;for(var c=0,d=b.childNodes;c<d.length;c++)Ga(d[c]);b.innerHTML=a},empty:oc},function(b,a){M.prototype[a]=function(a,d){var e,g;if(b!==oc&&(2==b.length&&b!==Ib&&b!==nc?a:d)===s){if(X(a)){for(e=0;e<this.length;e++)if(b===mc)b(this[e],a);else for(g in a)b(this[e],g,a[g]);return this}e=b.$dv;g=e===s?Math.min(this.length,1):this.length;for(var f=0;f<g;f++){var h=b(this[f],a,d);e=
-e?e+h:h}return e}for(e=0;e<this.length;e++)b(this[e],a,d);return this}});q({removeData:kc,dealoc:Ga,on:function a(c,d,e,g){if(z(g))throw Eb("onargs");var f=la(c,"events"),h=la(c,"handle");f||la(c,"events",f={});h||la(c,"handle",h=ne(c,f));q(d.split(" "),function(d){var g=f[d];if(!g){if("mouseenter"==d||"mouseleave"==d){var l=U.body.contains||U.body.compareDocumentPosition?function(a,c){var d=9===a.nodeType?a.documentElement:a,e=c&&c.parentNode;return a===e||!!(e&&1===e.nodeType&&(d.contains?d.contains(e):
-a.compareDocumentPosition&&a.compareDocumentPosition(e)&16))}:function(a,c){if(c)for(;c=c.parentNode;)if(c===a)return!0;return!1};f[d]=[];a(c,{mouseleave:"mouseout",mouseenter:"mouseover"}[d],function(a){var c=a.relatedTarget;c&&(c===this||l(this,c))||h(a,d)})}else pb(c,d,h),f[d]=[];g=f[d]}g.push(e)})},off:lc,one:function(a,c,d){a=y(a);a.on(c,function g(){a.off(c,d);a.off(c,g)});a.on(c,d)},replaceWith:function(a,c){var d,e=a.parentNode;Ga(a);q(new M(c),function(c){d?e.insertBefore(c,d.nextSibling):
-e.replaceChild(c,a);d=c})},children:function(a){var c=[];q(a.childNodes,function(a){1===a.nodeType&&c.push(a)});return c},contents:function(a){return a.contentDocument||a.childNodes||[]},append:function(a,c){q(new M(c),function(c){1!==a.nodeType&&11!==a.nodeType||a.appendChild(c)})},prepend:function(a,c){if(1===a.nodeType){var d=a.firstChild;q(new M(c),function(c){a.insertBefore(c,d)})}},wrap:function(a,c){c=y(c)[0];var d=a.parentNode;d&&d.replaceChild(c,a);c.appendChild(a)},remove:function(a){Ga(a);
-var c=a.parentNode;c&&c.removeChild(a)},after:function(a,c){var d=a,e=a.parentNode;q(new M(c),function(a){e.insertBefore(a,d.nextSibling);d=a})},addClass:kb,removeClass:jb,toggleClass:function(a,c,d){c&&q(c.split(" "),function(c){var g=d;H(g)&&(g=!Ib(a,c));(g?kb:jb)(a,c)})},parent:function(a){return(a=a.parentNode)&&11!==a.nodeType?a:null},next:function(a){if(a.nextElementSibling)return a.nextElementSibling;for(a=a.nextSibling;null!=a&&1!==a.nodeType;)a=a.nextSibling;return a},find:function(a,c){return a.getElementsByTagName?
-a.getElementsByTagName(c):[]},clone:Hb,triggerHandler:function(a,c,d){c=(la(a,"events")||{})[c];d=d||[];var e=[{preventDefault:w,stopPropagation:w}];q(c,function(c){c.apply(a,e.concat(d))})}},function(a,c){M.prototype[c]=function(c,e,g){for(var f,h=0;h<this.length;h++)H(f)?(f=a(this[h],c,e,g),z(f)&&(f=y(f))):Gb(f,a(this[h],c,e,g));return z(f)?f:this};M.prototype.bind=M.prototype.on;M.prototype.unbind=M.prototype.off});Wa.prototype={put:function(a,c){this[Ha(a)]=c},get:function(a){return this[Ha(a)]},
-remove:function(a){var c=this[a=Ha(a)];delete this[a];return c}};var pe=/^function\s*[^\(]*\(\s*([^\)]*)\)/m,qe=/,/,re=/^\s*(_?)(\S+?)\1\s*$/,oe=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg,Xa=u("$injector"),Le=u("$animate"),Ld=["$provide",function(a){this.$$selectors={};this.register=function(c,d){var e=c+"-animation";if(c&&"."!=c.charAt(0))throw Le("notcsel",c);this.$$selectors[c.substr(1)]=e;a.factory(e,d)};this.classNameFilter=function(a){1===arguments.length&&(this.$$classNameFilter=a instanceof RegExp?
-a:null);return this.$$classNameFilter};this.$get=["$timeout","$$asyncCallback",function(a,d){return{enter:function(a,c,f,h){f?f.after(a):(c&&c[0]||(c=f.parent()),c.append(a));h&&d(h)},leave:function(a,c){a.remove();c&&d(c)},move:function(a,c,d,h){this.enter(a,c,d,h)},addClass:function(a,c,f){c=C(c)?c:L(c)?c.join(" "):"";q(a,function(a){kb(a,c)});f&&d(f)},removeClass:function(a,c,f){c=C(c)?c:L(c)?c.join(" "):"";q(a,function(a){jb(a,c)});f&&d(f)},setClass:function(a,c,f,h){q(a,function(a){kb(a,c);jb(a,
-f)});h&&d(h)},enabled:w}}]}],ja=u("$compile");fc.$inject=["$provide","$$sanitizeUriProvider"];var te=/^(x[\:\-_]|data[\:\-_])/i,yc=u("$interpolate"),Me=/^([^\?#]*)(\?([^#]*))?(#(.*))?$/,we={http:80,https:443,ftp:21},Nb=u("$location");Pb.prototype=Ob.prototype=Bc.prototype={$$html5:!1,$$replace:!1,absUrl:qb("$$absUrl"),url:function(a,c){if(H(a))return this.$$url;var d=Me.exec(a);d[1]&&this.path(decodeURIComponent(d[1]));(d[2]||d[1])&&this.search(d[3]||"");this.hash(d[5]||"",c);return this},protocol:qb("$$protocol"),
-host:qb("$$host"),port:qb("$$port"),path:Cc("$$path",function(a){return"/"==a.charAt(0)?a:"/"+a}),search:function(a,c){switch(arguments.length){case 0:return this.$$search;case 1:if(C(a))this.$$search=bc(a);else if(X(a))this.$$search=a;else throw Nb("isrcharg");break;default:H(c)||null===c?delete this.$$search[a]:this.$$search[a]=c}this.$$compose();return this},hash:Cc("$$hash",Ea),replace:function(){this.$$replace=!0;return this}};var Ca=u("$parse"),Fc={},ta,La={"null":function(){return null},"true":function(){return!0},
-"false":function(){return!1},undefined:w,"+":function(a,c,d,e){d=d(a,c);e=e(a,c);return z(d)?z(e)?d+e:d:z(e)?e:s},"-":function(a,c,d,e){d=d(a,c);e=e(a,c);return(z(d)?d:0)-(z(e)?e:0)},"*":function(a,c,d,e){return d(a,c)*e(a,c)},"/":function(a,c,d,e){return d(a,c)/e(a,c)},"%":function(a,c,d,e){return d(a,c)%e(a,c)},"^":function(a,c,d,e){return d(a,c)^e(a,c)},"=":w,"===":function(a,c,d,e){return d(a,c)===e(a,c)},"!==":function(a,c,d,e){return d(a,c)!==e(a,c)},"==":function(a,c,d,e){return d(a,c)==e(a,
-c)},"!=":function(a,c,d,e){return d(a,c)!=e(a,c)},"<":function(a,c,d,e){return d(a,c)<e(a,c)},">":function(a,c,d,e){return d(a,c)>e(a,c)},"<=":function(a,c,d,e){return d(a,c)<=e(a,c)},">=":function(a,c,d,e){return d(a,c)>=e(a,c)},"&&":function(a,c,d,e){return d(a,c)&&e(a,c)},"||":function(a,c,d,e){return d(a,c)||e(a,c)},"&":function(a,c,d,e){return d(a,c)&e(a,c)},"|":function(a,c,d,e){return e(a,c)(a,c,d(a,c))},"!":function(a,c,d){return!d(a,c)}},Ne={n:"\n",f:"\f",r:"\r",t:"\t",v:"\v","'":"'",'"':'"'},
-Rb=function(a){this.options=a};Rb.prototype={constructor:Rb,lex:function(a){this.text=a;this.index=0;this.ch=s;this.lastCh=":";this.tokens=[];var c;for(a=[];this.index<this.text.length;){this.ch=this.text.charAt(this.index);if(this.is("\"'"))this.readString(this.ch);else if(this.isNumber(this.ch)||this.is(".")&&this.isNumber(this.peek()))this.readNumber();else if(this.isIdent(this.ch))this.readIdent(),this.was("{,")&&("{"===a[0]&&(c=this.tokens[this.tokens.length-1]))&&(c.json=-1===c.text.indexOf("."));
-else if(this.is("(){}[].,;:?"))this.tokens.push({index:this.index,text:this.ch,json:this.was(":[,")&&this.is("{[")||this.is("}]:,")}),this.is("{[")&&a.unshift(this.ch),this.is("}]")&&a.shift(),this.index++;else if(this.isWhitespace(this.ch)){this.index++;continue}else{var d=this.ch+this.peek(),e=d+this.peek(2),g=La[this.ch],f=La[d],h=La[e];h?(this.tokens.push({index:this.index,text:e,fn:h}),this.index+=3):f?(this.tokens.push({index:this.index,text:d,fn:f}),this.index+=2):g?(this.tokens.push({index:this.index,
-text:this.ch,fn:g,json:this.was("[,:")&&this.is("+-")}),this.index+=1):this.throwError("Unexpected next character ",this.index,this.index+1)}this.lastCh=this.ch}return this.tokens},is:function(a){return-1!==a.indexOf(this.ch)},was:function(a){return-1!==a.indexOf(this.lastCh)},peek:function(a){a=a||1;return this.index+a<this.text.length?this.text.charAt(this.index+a):!1},isNumber:function(a){return"0"<=a&&"9">=a},isWhitespace:function(a){return" "===a||"\r"===a||"\t"===a||"\n"===a||"\v"===a||"\u00a0"===
-a},isIdent:function(a){return"a"<=a&&"z">=a||"A"<=a&&"Z">=a||"_"===a||"$"===a},isExpOperator:function(a){return"-"===a||"+"===a||this.isNumber(a)},throwError:function(a,c,d){d=d||this.index;c=z(c)?"s "+c+"-"+this.index+" ["+this.text.substring(c,d)+"]":" "+d;throw Ca("lexerr",a,c,this.text);},readNumber:function(){for(var a="",c=this.index;this.index<this.text.length;){var d=J(this.text.charAt(this.index));if("."==d||this.isNumber(d))a+=d;else{var e=this.peek();if("e"==d&&this.isExpOperator(e))a+=
-d;else if(this.isExpOperator(d)&&e&&this.isNumber(e)&&"e"==a.charAt(a.length-1))a+=d;else if(!this.isExpOperator(d)||e&&this.isNumber(e)||"e"!=a.charAt(a.length-1))break;else this.throwError("Invalid exponent")}this.index++}a*=1;this.tokens.push({index:c,text:a,json:!0,fn:function(){return a}})},readIdent:function(){for(var a=this,c="",d=this.index,e,g,f,h;this.index<this.text.length;){h=this.text.charAt(this.index);if("."===h||this.isIdent(h)||this.isNumber(h))"."===h&&(e=this.index),c+=h;else break;
-this.index++}if(e)for(g=this.index;g<this.text.length;){h=this.text.charAt(g);if("("===h){f=c.substr(e-d+1);c=c.substr(0,e-d);this.index=g;break}if(this.isWhitespace(h))g++;else break}d={index:d,text:c};if(La.hasOwnProperty(c))d.fn=La[c],d.json=La[c];else{var m=Ec(c,this.options,this.text);d.fn=E(function(a,c){return m(a,c)},{assign:function(d,e){return rb(d,c,e,a.text,a.options)}})}this.tokens.push(d);f&&(this.tokens.push({index:e,text:".",json:!1}),this.tokens.push({index:e+1,text:f,json:!1}))},
-readString:function(a){var c=this.index;this.index++;for(var d="",e=a,g=!1;this.index<this.text.length;){var f=this.text.charAt(this.index),e=e+f;if(g)"u"===f?(f=this.text.substring(this.index+1,this.index+5),f.match(/[\da-f]{4}/i)||this.throwError("Invalid unicode escape [\\u"+f+"]"),this.index+=4,d+=String.fromCharCode(parseInt(f,16))):d=(g=Ne[f])?d+g:d+f,g=!1;else if("\\"===f)g=!0;else{if(f===a){this.index++;this.tokens.push({index:c,text:e,string:d,json:!0,fn:function(){return d}});return}d+=
-f}this.index++}this.throwError("Unterminated quote",c)}};var ab=function(a,c,d){this.lexer=a;this.$filter=c;this.options=d};ab.ZERO=E(function(){return 0},{constant:!0});ab.prototype={constructor:ab,parse:function(a,c){this.text=a;this.json=c;this.tokens=this.lexer.lex(a);c&&(this.assignment=this.logicalOR,this.functionCall=this.fieldAccess=this.objectIndex=this.filterChain=function(){this.throwError("is not valid json",{text:a,index:0})});var d=c?this.primary():this.statements();0!==this.tokens.length&&
-this.throwError("is an unexpected token",this.tokens[0]);d.literal=!!d.literal;d.constant=!!d.constant;return d},primary:function(){var a;if(this.expect("("))a=this.filterChain(),this.consume(")");else if(this.expect("["))a=this.arrayDeclaration();else if(this.expect("{"))a=this.object();else{var c=this.expect();(a=c.fn)||this.throwError("not a primary expression",c);c.json&&(a.constant=!0,a.literal=!0)}for(var d;c=this.expect("(","[",".");)"("===c.text?(a=this.functionCall(a,d),d=null):"["===c.text?
-(d=a,a=this.objectIndex(a)):"."===c.text?(d=a,a=this.fieldAccess(a)):this.throwError("IMPOSSIBLE");return a},throwError:function(a,c){throw Ca("syntax",c.text,a,c.index+1,this.text,this.text.substring(c.index));},peekToken:function(){if(0===this.tokens.length)throw Ca("ueoe",this.text);return this.tokens[0]},peek:function(a,c,d,e){if(0<this.tokens.length){var g=this.tokens[0],f=g.text;if(f===a||f===c||f===d||f===e||!(a||c||d||e))return g}return!1},expect:function(a,c,d,e){return(a=this.peek(a,c,d,
-e))?(this.json&&!a.json&&this.throwError("is not valid json",a),this.tokens.shift(),a):!1},consume:function(a){this.expect(a)||this.throwError("is unexpected, expecting ["+a+"]",this.peek())},unaryFn:function(a,c){return E(function(d,e){return a(d,e,c)},{constant:c.constant})},ternaryFn:function(a,c,d){return E(function(e,g){return a(e,g)?c(e,g):d(e,g)},{constant:a.constant&&c.constant&&d.constant})},binaryFn:function(a,c,d){return E(function(e,g){return c(e,g,a,d)},{constant:a.constant&&d.constant})},
-statements:function(){for(var a=[];;)if(0<this.tokens.length&&!this.peek("}",")",";","]")&&a.push(this.filterChain()),!this.expect(";"))return 1===a.length?a[0]:function(c,d){for(var e,g=0;g<a.length;g++){var f=a[g];f&&(e=f(c,d))}return e}},filterChain:function(){for(var a=this.expression(),c;;)if(c=this.expect("|"))a=this.binaryFn(a,c.fn,this.filter());else return a},filter:function(){for(var a=this.expect(),c=this.$filter(a.text),d=[];;)if(a=this.expect(":"))d.push(this.expression());else{var e=
-function(a,e,h){h=[h];for(var m=0;m<d.length;m++)h.push(d[m](a,e));return c.apply(a,h)};return function(){return e}}},expression:function(){return this.assignment()},assignment:function(){var a=this.ternary(),c,d;return(d=this.expect("="))?(a.assign||this.throwError("implies assignment but ["+this.text.substring(0,d.index)+"] can not be assigned to",d),c=this.ternary(),function(d,g){return a.assign(d,c(d,g),g)}):a},ternary:function(){var a=this.logicalOR(),c,d;if(this.expect("?")){c=this.ternary();
-if(d=this.expect(":"))return this.ternaryFn(a,c,this.ternary());this.throwError("expected :",d)}else return a},logicalOR:function(){for(var a=this.logicalAND(),c;;)if(c=this.expect("||"))a=this.binaryFn(a,c.fn,this.logicalAND());else return a},logicalAND:function(){var a=this.equality(),c;if(c=this.expect("&&"))a=this.binaryFn(a,c.fn,this.logicalAND());return a},equality:function(){var a=this.relational(),c;if(c=this.expect("==","!=","===","!=="))a=this.binaryFn(a,c.fn,this.equality());return a},
-relational:function(){var a=this.additive(),c;if(c=this.expect("<",">","<=",">="))a=this.binaryFn(a,c.fn,this.relational());return a},additive:function(){for(var a=this.multiplicative(),c;c=this.expect("+","-");)a=this.binaryFn(a,c.fn,this.multiplicative());return a},multiplicative:function(){for(var a=this.unary(),c;c=this.expect("*","/","%");)a=this.binaryFn(a,c.fn,this.unary());return a},unary:function(){var a;return this.expect("+")?this.primary():(a=this.expect("-"))?this.binaryFn(ab.ZERO,a.fn,
-this.unary()):(a=this.expect("!"))?this.unaryFn(a.fn,this.unary()):this.primary()},fieldAccess:function(a){var c=this,d=this.expect().text,e=Ec(d,this.options,this.text);return E(function(c,d,h){return e(h||a(c,d))},{assign:function(e,f,h){return rb(a(e,h),d,f,c.text,c.options)}})},objectIndex:function(a){var c=this,d=this.expression();this.consume("]");return E(function(e,g){var f=a(e,g),h=d(e,g),m;if(!f)return s;(f=$a(f[h],c.text))&&(f.then&&c.options.unwrapPromises)&&(m=f,"$$v"in f||(m.$$v=s,m.then(function(a){m.$$v=
-a})),f=f.$$v);return f},{assign:function(e,g,f){var h=d(e,f);return $a(a(e,f),c.text)[h]=g}})},functionCall:function(a,c){var d=[];if(")"!==this.peekToken().text){do d.push(this.expression());while(this.expect(","))}this.consume(")");var e=this;return function(g,f){for(var h=[],m=c?c(g,f):g,k=0;k<d.length;k++)h.push(d[k](g,f));k=a(g,f,m)||w;$a(m,e.text);$a(k,e.text);h=k.apply?k.apply(m,h):k(h[0],h[1],h[2],h[3],h[4]);return $a(h,e.text)}},arrayDeclaration:function(){var a=[],c=!0;if("]"!==this.peekToken().text){do{if(this.peek("]"))break;
-var d=this.expression();a.push(d);d.constant||(c=!1)}while(this.expect(","))}this.consume("]");return E(function(c,d){for(var f=[],h=0;h<a.length;h++)f.push(a[h](c,d));return f},{literal:!0,constant:c})},object:function(){var a=[],c=!0;if("}"!==this.peekToken().text){do{if(this.peek("}"))break;var d=this.expect(),d=d.string||d.text;this.consume(":");var e=this.expression();a.push({key:d,value:e});e.constant||(c=!1)}while(this.expect(","))}this.consume("}");return E(function(c,d){for(var e={},m=0;m<
-a.length;m++){var k=a[m];e[k.key]=k.value(c,d)}return e},{literal:!0,constant:c})}};var Qb={},ua=u("$sce"),ha={HTML:"html",CSS:"css",URL:"url",RESOURCE_URL:"resourceUrl",JS:"js"},W=U.createElement("a"),Ic=sa(P.location.href,!0);jc.$inject=["$provide"];Jc.$inject=["$locale"];Lc.$inject=["$locale"];var Oc=".",Ie={yyyy:$("FullYear",4),yy:$("FullYear",2,0,!0),y:$("FullYear",1),MMMM:sb("Month"),MMM:sb("Month",!0),MM:$("Month",2,1),M:$("Month",1,1),dd:$("Date",2),d:$("Date",1),HH:$("Hours",2),H:$("Hours",
-1),hh:$("Hours",2,-12),h:$("Hours",1,-12),mm:$("Minutes",2),m:$("Minutes",1),ss:$("Seconds",2),s:$("Seconds",1),sss:$("Milliseconds",3),EEEE:sb("Day"),EEE:sb("Day",!0),a:function(a,c){return 12>a.getHours()?c.AMPMS[0]:c.AMPMS[1]},Z:function(a){a=-1*a.getTimezoneOffset();return a=(0<=a?"+":"")+(Sb(Math[0<a?"floor":"ceil"](a/60),2)+Sb(Math.abs(a%60),2))}},He=/((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z))(.*)/,Ge=/^\-?\d+$/;Kc.$inject=["$locale"];var Ee=aa(J),Fe=aa(Fa);Mc.$inject=
-["$parse"];var cd=aa({restrict:"E",compile:function(a,c){8>=S&&(c.href||c.name||c.$set("href",""),a.append(U.createComment("IE fix")));if(!c.href&&!c.xlinkHref&&!c.name)return function(a,c){var g="[object SVGAnimatedString]"===wa.call(c.prop("href"))?"xlink:href":"href";c.on("click",function(a){c.attr(g)||a.preventDefault()})}}}),Cb={};q(mb,function(a,c){if("multiple"!=a){var d=na("ng-"+c);Cb[d]=function(){return{priority:100,link:function(a,g,f){a.$watch(f[d],function(a){f.$set(c,!!a)})}}}}});q(["src",
-"srcset","href"],function(a){var c=na("ng-"+a);Cb[c]=function(){return{priority:99,link:function(d,e,g){var f=a,h=a;"href"===a&&"[object SVGAnimatedString]"===wa.call(e.prop("href"))&&(h="xlinkHref",g.$attr[h]="xlink:href",f=null);g.$observe(c,function(a){a&&(g.$set(h,a),S&&f&&e.prop(f,g[h]))})}}}});var vb={$addControl:w,$removeControl:w,$setValidity:w,$setDirty:w,$setPristine:w};Pc.$inject=["$element","$attrs","$scope","$animate"];var Qc=function(a){return["$timeout",function(c){return{name:"form",
-restrict:a?"EAC":"E",controller:Pc,compile:function(){return{pre:function(a,e,g,f){if(!g.action){var h=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1};pb(e[0],"submit",h);e.on("$destroy",function(){c(function(){Ua(e[0],"submit",h)},0,!1)})}var m=e.parent().controller("form"),k=g.name||g.ngForm;k&&rb(a,k,f,k);if(m)e.on("$destroy",function(){m.$removeControl(f);k&&rb(a,k,s,k);E(f,vb)})}}}}}]},dd=Qc(),qd=Qc(!0),Oe=/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/,
-Pe=/^[a-z0-9!#$%&'*+/=?^_`{|}~.-]+@[a-z0-9-]+(\.[a-z0-9-]+)*$/i,Qe=/^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/,Rc={text:xb,number:function(a,c,d,e,g,f){xb(a,c,d,e,g,f);e.$parsers.push(function(a){var c=e.$isEmpty(a);if(c||Qe.test(a))return e.$setValidity("number",!0),""===a?null:c?a:parseFloat(a);e.$setValidity("number",!1);return s});Je(e,"number",c);e.$formatters.push(function(a){return e.$isEmpty(a)?"":""+a});d.min&&(a=function(a){var c=parseFloat(d.min);return pa(e,"min",e.$isEmpty(a)||a>=c,a)},e.$parsers.push(a),
-e.$formatters.push(a));d.max&&(a=function(a){var c=parseFloat(d.max);return pa(e,"max",e.$isEmpty(a)||a<=c,a)},e.$parsers.push(a),e.$formatters.push(a));e.$formatters.push(function(a){return pa(e,"number",e.$isEmpty(a)||yb(a),a)})},url:function(a,c,d,e,g,f){xb(a,c,d,e,g,f);a=function(a){return pa(e,"url",e.$isEmpty(a)||Oe.test(a),a)};e.$formatters.push(a);e.$parsers.push(a)},email:function(a,c,d,e,g,f){xb(a,c,d,e,g,f);a=function(a){return pa(e,"email",e.$isEmpty(a)||Pe.test(a),a)};e.$formatters.push(a);
-e.$parsers.push(a)},radio:function(a,c,d,e){H(d.name)&&c.attr("name",cb());c.on("click",function(){c[0].checked&&a.$apply(function(){e.$setViewValue(d.value)})});e.$render=function(){c[0].checked=d.value==e.$viewValue};d.$observe("value",e.$render)},checkbox:function(a,c,d,e){var g=d.ngTrueValue,f=d.ngFalseValue;C(g)||(g=!0);C(f)||(f=!1);c.on("click",function(){a.$apply(function(){e.$setViewValue(c[0].checked)})});e.$render=function(){c[0].checked=e.$viewValue};e.$isEmpty=function(a){return a!==g};
-e.$formatters.push(function(a){return a===g});e.$parsers.push(function(a){return a?g:f})},hidden:w,button:w,submit:w,reset:w,file:w},gc=["$browser","$sniffer",function(a,c){return{restrict:"E",require:"?ngModel",link:function(d,e,g,f){f&&(Rc[J(g.type)]||Rc.text)(d,e,g,f,c,a)}}}],ub="ng-valid",tb="ng-invalid",Ka="ng-pristine",wb="ng-dirty",Re=["$scope","$exceptionHandler","$attrs","$element","$parse","$animate",function(a,c,d,e,g,f){function h(a,c){c=c?"-"+hb(c,"-"):"";f.removeClass(e,(a?tb:ub)+c);
-f.addClass(e,(a?ub:tb)+c)}this.$modelValue=this.$viewValue=Number.NaN;this.$parsers=[];this.$formatters=[];this.$viewChangeListeners=[];this.$pristine=!0;this.$dirty=!1;this.$valid=!0;this.$invalid=!1;this.$name=d.name;var m=g(d.ngModel),k=m.assign;if(!k)throw u("ngModel")("nonassign",d.ngModel,ia(e));this.$render=w;this.$isEmpty=function(a){return H(a)||""===a||null===a||a!==a};var l=e.inheritedData("$formController")||vb,n=0,p=this.$error={};e.addClass(Ka);h(!0);this.$setValidity=function(a,c){p[a]!==
-!c&&(c?(p[a]&&n--,n||(h(!0),this.$valid=!0,this.$invalid=!1)):(h(!1),this.$invalid=!0,this.$valid=!1,n++),p[a]=!c,h(c,a),l.$setValidity(a,c,this))};this.$setPristine=function(){this.$dirty=!1;this.$pristine=!0;f.removeClass(e,wb);f.addClass(e,Ka)};this.$setViewValue=function(d){this.$viewValue=d;this.$pristine&&(this.$dirty=!0,this.$pristine=!1,f.removeClass(e,Ka),f.addClass(e,wb),l.$setDirty());q(this.$parsers,function(a){d=a(d)});this.$modelValue!==d&&(this.$modelValue=d,k(a,d),q(this.$viewChangeListeners,
-function(a){try{a()}catch(d){c(d)}}))};var r=this;a.$watch(function(){var c=m(a);if(r.$modelValue!==c){var d=r.$formatters,e=d.length;for(r.$modelValue=c;e--;)c=d[e](c);r.$viewValue!==c&&(r.$viewValue=c,r.$render())}return c})}],Fd=function(){return{require:["ngModel","^?form"],controller:Re,link:function(a,c,d,e){var g=e[0],f=e[1]||vb;f.$addControl(g);a.$on("$destroy",function(){f.$removeControl(g)})}}},Hd=aa({require:"ngModel",link:function(a,c,d,e){e.$viewChangeListeners.push(function(){a.$eval(d.ngChange)})}}),
-hc=function(){return{require:"?ngModel",link:function(a,c,d,e){if(e){d.required=!0;var g=function(a){if(d.required&&e.$isEmpty(a))e.$setValidity("required",!1);else return e.$setValidity("required",!0),a};e.$formatters.push(g);e.$parsers.unshift(g);d.$observe("required",function(){g(e.$viewValue)})}}}},Gd=function(){return{require:"ngModel",link:function(a,c,d,e){var g=(a=/\/(.*)\//.exec(d.ngList))&&RegExp(a[1])||d.ngList||",";e.$parsers.push(function(a){if(!H(a)){var c=[];a&&q(a.split(g),function(a){a&&
-c.push(ba(a))});return c}});e.$formatters.push(function(a){return L(a)?a.join(", "):s});e.$isEmpty=function(a){return!a||!a.length}}}},Se=/^(true|false|\d+)$/,Id=function(){return{priority:100,compile:function(a,c){return Se.test(c.ngValue)?function(a,c,g){g.$set("value",a.$eval(g.ngValue))}:function(a,c,g){a.$watch(g.ngValue,function(a){g.$set("value",a)})}}}},id=va(function(a,c,d){c.addClass("ng-binding").data("$binding",d.ngBind);a.$watch(d.ngBind,function(a){c.text(a==s?"":a)})}),kd=["$interpolate",
-function(a){return function(c,d,e){c=a(d.attr(e.$attr.ngBindTemplate));d.addClass("ng-binding").data("$binding",c);e.$observe("ngBindTemplate",function(a){d.text(a)})}}],jd=["$sce","$parse",function(a,c){return function(d,e,g){e.addClass("ng-binding").data("$binding",g.ngBindHtml);var f=c(g.ngBindHtml);d.$watch(function(){return(f(d)||"").toString()},function(c){e.html(a.getTrustedHtml(f(d))||"")})}}],ld=Tb("",!0),nd=Tb("Odd",0),md=Tb("Even",1),od=va({compile:function(a,c){c.$set("ngCloak",s);a.removeClass("ng-cloak")}}),
-pd=[function(){return{scope:!0,controller:"@",priority:500}}],ic={};q("click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste".split(" "),function(a){var c=na("ng-"+a);ic[c]=["$parse",function(d){return{compile:function(e,g){var f=d(g[c]);return function(c,d,e){d.on(J(a),function(a){c.$apply(function(){f(c,{$event:a})})})}}}}]});var sd=["$animate",function(a){return{transclude:"element",priority:600,terminal:!0,restrict:"A",
-$$tlb:!0,link:function(c,d,e,g,f){var h,m,k;c.$watch(e.ngIf,function(g){Pa(g)?m||(m=c.$new(),f(m,function(c){c[c.length++]=U.createComment(" end ngIf: "+e.ngIf+" ");h={clone:c};a.enter(c,d.parent(),d)})):(k&&(k.remove(),k=null),m&&(m.$destroy(),m=null),h&&(k=Bb(h.clone),a.leave(k,function(){k=null}),h=null))})}}}],td=["$http","$templateCache","$anchorScroll","$animate","$sce",function(a,c,d,e,g){return{restrict:"ECA",priority:400,terminal:!0,transclude:"element",controller:Qa.noop,compile:function(f,
-h){var m=h.ngInclude||h.src,k=h.onload||"",l=h.autoscroll;return function(f,h,q,s,D){var x=0,t,y,B,v=function(){y&&(y.remove(),y=null);t&&(t.$destroy(),t=null);B&&(e.leave(B,function(){y=null}),y=B,B=null)};f.$watch(g.parseAsResourceUrl(m),function(g){var m=function(){!z(l)||l&&!f.$eval(l)||d()},q=++x;g?(a.get(g,{cache:c}).success(function(a){if(q===x){var c=f.$new();s.template=a;a=D(c,function(a){v();e.enter(a,null,h,m)});t=c;B=a;t.$emit("$includeContentLoaded");f.$eval(k)}}).error(function(){q===
-x&&v()}),f.$emit("$includeContentRequested")):(v(),s.template=null)})}}}}],Jd=["$compile",function(a){return{restrict:"ECA",priority:-400,require:"ngInclude",link:function(c,d,e,g){d.html(g.template);a(d.contents())(c)}}}],ud=va({priority:450,compile:function(){return{pre:function(a,c,d){a.$eval(d.ngInit)}}}}),vd=va({terminal:!0,priority:1E3}),wd=["$locale","$interpolate",function(a,c){var d=/{}/g;return{restrict:"EA",link:function(e,g,f){var h=f.count,m=f.$attr.when&&g.attr(f.$attr.when),k=f.offset||
-0,l=e.$eval(m)||{},n={},p=c.startSymbol(),r=c.endSymbol(),s=/^when(Minus)?(.+)$/;q(f,function(a,c){s.test(c)&&(l[J(c.replace("when","").replace("Minus","-"))]=g.attr(f.$attr[c]))});q(l,function(a,e){n[e]=c(a.replace(d,p+h+"-"+k+r))});e.$watch(function(){var c=parseFloat(e.$eval(h));if(isNaN(c))return"";c in l||(c=a.pluralCat(c-k));return n[c](e,g,!0)},function(a){g.text(a)})}}}],xd=["$parse","$animate",function(a,c){var d=u("ngRepeat");return{transclude:"element",priority:1E3,terminal:!0,$$tlb:!0,
-link:function(e,g,f,h,m){var k=f.ngRepeat,l=k.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?\s*$/),n,p,r,s,D,x,t={$id:Ha};if(!l)throw d("iexp",k);f=l[1];h=l[2];(l=l[3])?(n=a(l),p=function(a,c,d){x&&(t[x]=a);t[D]=c;t.$index=d;return n(e,t)}):(r=function(a,c){return Ha(c)},s=function(a){return a});l=f.match(/^(?:([\$\w]+)|\(([\$\w]+)\s*,\s*([\$\w]+)\))$/);if(!l)throw d("iidexp",f);D=l[3]||l[1];x=l[2];var z={};e.$watchCollection(h,function(a){var f,h,l=g[0],n,t={},F,R,C,w,T,u,
-E=[];if(bb(a))T=a,n=p||r;else{n=p||s;T=[];for(C in a)a.hasOwnProperty(C)&&"$"!=C.charAt(0)&&T.push(C);T.sort()}F=T.length;h=E.length=T.length;for(f=0;f<h;f++)if(C=a===T?f:T[f],w=a[C],w=n(C,w,f),Aa(w,"`track by` id"),z.hasOwnProperty(w))u=z[w],delete z[w],t[w]=u,E[f]=u;else{if(t.hasOwnProperty(w))throw q(E,function(a){a&&a.scope&&(z[a.id]=a)}),d("dupes",k,w);E[f]={id:w};t[w]=!1}for(C in z)z.hasOwnProperty(C)&&(u=z[C],f=Bb(u.clone),c.leave(f),q(f,function(a){a.$$NG_REMOVED=!0}),u.scope.$destroy());
-f=0;for(h=T.length;f<h;f++){C=a===T?f:T[f];w=a[C];u=E[f];E[f-1]&&(l=E[f-1].clone[E[f-1].clone.length-1]);if(u.scope){R=u.scope;n=l;do n=n.nextSibling;while(n&&n.$$NG_REMOVED);u.clone[0]!=n&&c.move(Bb(u.clone),null,y(l));l=u.clone[u.clone.length-1]}else R=e.$new();R[D]=w;x&&(R[x]=C);R.$index=f;R.$first=0===f;R.$last=f===F-1;R.$middle=!(R.$first||R.$last);R.$odd=!(R.$even=0===(f&1));u.scope||m(R,function(a){a[a.length++]=U.createComment(" end ngRepeat: "+k+" ");c.enter(a,null,y(l));l=a;u.scope=R;u.clone=
-a;t[u.id]=u})}z=t})}}}],yd=["$animate",function(a){return function(c,d,e){c.$watch(e.ngShow,function(c){a[Pa(c)?"removeClass":"addClass"](d,"ng-hide")})}}],rd=["$animate",function(a){return function(c,d,e){c.$watch(e.ngHide,function(c){a[Pa(c)?"addClass":"removeClass"](d,"ng-hide")})}}],zd=va(function(a,c,d){a.$watch(d.ngStyle,function(a,d){d&&a!==d&&q(d,function(a,d){c.css(d,"")});a&&c.css(a)},!0)}),Ad=["$animate",function(a){return{restrict:"EA",require:"ngSwitch",controller:["$scope",function(){this.cases=
-{}}],link:function(c,d,e,g){var f=[],h=[],m=[],k=[];c.$watch(e.ngSwitch||e.on,function(d){var n,p;n=0;for(p=m.length;n<p;++n)m[n].remove();n=m.length=0;for(p=k.length;n<p;++n){var r=h[n];k[n].$destroy();m[n]=r;a.leave(r,function(){m.splice(n,1)})}h.length=0;k.length=0;if(f=g.cases["!"+d]||g.cases["?"])c.$eval(e.change),q(f,function(d){var e=c.$new();k.push(e);d.transclude(e,function(c){var e=d.element;h.push(c);a.enter(c,e.parent(),e)})})})}}}],Bd=va({transclude:"element",priority:800,require:"^ngSwitch",
-link:function(a,c,d,e,g){e.cases["!"+d.ngSwitchWhen]=e.cases["!"+d.ngSwitchWhen]||[];e.cases["!"+d.ngSwitchWhen].push({transclude:g,element:c})}}),Cd=va({transclude:"element",priority:800,require:"^ngSwitch",link:function(a,c,d,e,g){e.cases["?"]=e.cases["?"]||[];e.cases["?"].push({transclude:g,element:c})}}),Ed=va({link:function(a,c,d,e,g){if(!g)throw u("ngTransclude")("orphan",ia(c));g(function(a){c.empty();c.append(a)})}}),ed=["$templateCache",function(a){return{restrict:"E",terminal:!0,compile:function(c,
-d){"text/ng-template"==d.type&&a.put(d.id,c[0].text)}}}],Te=u("ngOptions"),Dd=aa({terminal:!0}),fd=["$compile","$parse",function(a,c){var d=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,e={$setViewValue:w};return{restrict:"E",require:["select","?ngModel"],controller:["$element","$scope","$attrs",function(a,c,d){var m=this,k={},l=e,n;m.databound=
-d.ngModel;m.init=function(a,c,d){l=a;n=d};m.addOption=function(c){Aa(c,'"option value"');k[c]=!0;l.$viewValue==c&&(a.val(c),n.parent()&&n.remove())};m.removeOption=function(a){this.hasOption(a)&&(delete k[a],l.$viewValue==a&&this.renderUnknownOption(a))};m.renderUnknownOption=function(c){c="? "+Ha(c)+" ?";n.val(c);a.prepend(n);a.val(c);n.prop("selected",!0)};m.hasOption=function(a){return k.hasOwnProperty(a)};c.$on("$destroy",function(){m.renderUnknownOption=w})}],link:function(e,f,h,m){function k(a,
-c,d,e){d.$render=function(){var a=d.$viewValue;e.hasOption(a)?(w.parent()&&w.remove(),c.val(a),""===a&&x.prop("selected",!0)):H(a)&&x?c.val(""):e.renderUnknownOption(a)};c.on("change",function(){a.$apply(function(){w.parent()&&w.remove();d.$setViewValue(c.val())})})}function l(a,c,d){var e;d.$render=function(){var a=new Wa(d.$viewValue);q(c.find("option"),function(c){c.selected=z(a.get(c.value))})};a.$watch(function(){xa(e,d.$viewValue)||(e=ca(d.$viewValue),d.$render())});c.on("change",function(){a.$apply(function(){var a=
-[];q(c.find("option"),function(c){c.selected&&a.push(c.value)});d.$setViewValue(a)})})}function n(e,f,g){function h(){var a={"":[]},c=[""],d,k,s,u,v;u=g.$modelValue;v=y(e)||[];var A=n?Ub(v):v,E,I,B;I={};s=!1;var F,H;if(r)if(w&&L(u))for(s=new Wa([]),B=0;B<u.length;B++)I[m]=u[B],s.put(w(e,I),u[B]);else s=new Wa(u);for(B=0;E=A.length,B<E;B++){k=B;if(n){k=A[B];if("$"===k.charAt(0))continue;I[n]=k}I[m]=v[k];d=p(e,I)||"";(k=a[d])||(k=a[d]=[],c.push(d));r?d=z(s.remove(w?w(e,I):q(e,I))):(w?(d={},d[m]=u,d=
-w(e,d)===w(e,I)):d=u===q(e,I),s=s||d);F=l(e,I);F=z(F)?F:"";k.push({id:w?w(e,I):n?A[B]:B,label:F,selected:d})}r||(D||null===u?a[""].unshift({id:"",label:"",selected:!s}):s||a[""].unshift({id:"?",label:"",selected:!0}));I=0;for(A=c.length;I<A;I++){d=c[I];k=a[d];x.length<=I?(u={element:C.clone().attr("label",d),label:k.label},v=[u],x.push(v),f.append(u.element)):(v=x[I],u=v[0],u.label!=d&&u.element.attr("label",u.label=d));F=null;B=0;for(E=k.length;B<E;B++)s=k[B],(d=v[B+1])?(F=d.element,d.label!==s.label&&
-F.text(d.label=s.label),d.id!==s.id&&F.val(d.id=s.id),d.selected!==s.selected&&F.prop("selected",d.selected=s.selected)):(""===s.id&&D?H=D:(H=t.clone()).val(s.id).attr("selected",s.selected).text(s.label),v.push({element:H,label:s.label,id:s.id,selected:s.selected}),F?F.after(H):u.element.append(H),F=H);for(B++;v.length>B;)v.pop().element.remove()}for(;x.length>I;)x.pop()[0].element.remove()}var k;if(!(k=u.match(d)))throw Te("iexp",u,ia(f));var l=c(k[2]||k[1]),m=k[4]||k[6],n=k[5],p=c(k[3]||""),q=
-c(k[2]?k[1]:m),y=c(k[7]),w=k[8]?c(k[8]):null,x=[[{element:f,label:""}]];D&&(a(D)(e),D.removeClass("ng-scope"),D.remove());f.empty();f.on("change",function(){e.$apply(function(){var a,c=y(e)||[],d={},h,k,l,p,t,u,v;if(r)for(k=[],p=0,u=x.length;p<u;p++)for(a=x[p],l=1,t=a.length;l<t;l++){if((h=a[l].element)[0].selected){h=h.val();n&&(d[n]=h);if(w)for(v=0;v<c.length&&(d[m]=c[v],w(e,d)!=h);v++);else d[m]=c[h];k.push(q(e,d))}}else{h=f.val();if("?"==h)k=s;else if(""===h)k=null;else if(w)for(v=0;v<c.length;v++){if(d[m]=
-c[v],w(e,d)==h){k=q(e,d);break}}else d[m]=c[h],n&&(d[n]=h),k=q(e,d);1<x[0].length&&x[0][1].id!==h&&(x[0][1].selected=!1)}g.$setViewValue(k)})});g.$render=h;e.$watch(h)}if(m[1]){var p=m[0];m=m[1];var r=h.multiple,u=h.ngOptions,D=!1,x,t=y(U.createElement("option")),C=y(U.createElement("optgroup")),w=t.clone();h=0;for(var v=f.children(),E=v.length;h<E;h++)if(""===v[h].value){x=D=v.eq(h);break}p.init(m,D,w);r&&(m.$isEmpty=function(a){return!a||0===a.length});u?n(e,f,m):r?l(e,f,m):k(e,f,m,p)}}}}],hd=["$interpolate",
-function(a){var c={addOption:w,removeOption:w};return{restrict:"E",priority:100,compile:function(d,e){if(H(e.value)){var g=a(d.text(),!0);g||e.$set("value",d.text())}return function(a,d,e){var k=d.parent(),l=k.data("$selectController")||k.parent().data("$selectController");l&&l.databound?d.prop("selected",!1):l=c;g?a.$watch(g,function(a,c){e.$set("value",a);a!==c&&l.removeOption(c);l.addOption(a)}):l.addOption(e.value);d.on("$destroy",function(){l.removeOption(e.value)})}}}}],gd=aa({restrict:"E",
-terminal:!0});P.angular.bootstrap?console.log("WARNING: Tried to load angular more than once."):((Ba=P.jQuery)&&Ba.fn.on?(y=Ba,E(Ba.fn,{scope:Ia.scope,isolateScope:Ia.isolateScope,controller:Ia.controller,injector:Ia.injector,inheritedData:Ia.inheritedData}),Db("remove",!0,!0,!1),Db("empty",!1,!1,!1),Db("html",!1,!1,!0)):y=M,Qa.element=y,Zc(Qa),y(U).ready(function(){Wc(U,cc)}))})(window,document);!window.angular.$$csp()&&window.angular.element(document).find("head").prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide{display:none !important;}ng\\:form{display:block;}.ng-animate-block-transitions{transition:0s all!important;-webkit-transition:0s all!important;}</style>');
-//# sourceMappingURL=angular.min.js.map
+(function(w){'use strict';function oe(a){if(B(a))u(a.objectMaxDepth)&&(Mc.objectMaxDepth=Wb(a.objectMaxDepth)?a.objectMaxDepth:NaN);else return Mc}function Wb(a){return Y(a)&&0<a}function K(a,b){b=b||Error;return function(){var d=arguments[0],c;c="["+(a?a+":":"")+d+"] http://errors.angularjs.org/1.6.9/"+(a?a+"/":"")+d;for(d=1;d<arguments.length;d++){c=c+(1==d?"?":"&")+"p"+(d-1)+"=";var e=encodeURIComponent,f;f=arguments[d];f="function"==typeof f?f.toString().replace(/ \{[\s\S]*$/,""):"undefined"==
+typeof f?"undefined":"string"!=typeof f?JSON.stringify(f):f;c+=e(f)}return new b(c)}}function wa(a){if(null==a||Za(a))return!1;if(I(a)||E(a)||z&&a instanceof z)return!0;var b="length"in Object(a)&&a.length;return Y(b)&&(0<=b&&(b-1 in a||a instanceof Array)||"function"===typeof a.item)}function r(a,b,d){var c,e;if(a)if(C(a))for(c in a)"prototype"!==c&&"length"!==c&&"name"!==c&&a.hasOwnProperty(c)&&b.call(d,a[c],c,a);else if(I(a)||wa(a)){var f="object"!==typeof a;c=0;for(e=a.length;c<e;c++)(f||c in
+    a)&&b.call(d,a[c],c,a)}else if(a.forEach&&a.forEach!==r)a.forEach(b,d,a);else if(Nc(a))for(c in a)b.call(d,a[c],c,a);else if("function"===typeof a.hasOwnProperty)for(c in a)a.hasOwnProperty(c)&&b.call(d,a[c],c,a);else for(c in a)ra.call(a,c)&&b.call(d,a[c],c,a);return a}function Oc(a,b,d){for(var c=Object.keys(a).sort(),e=0;e<c.length;e++)b.call(d,a[c[e]],c[e]);return c}function Xb(a){return function(b,d){a(d,b)}}function pe(){return++qb}function Yb(a,b,d){for(var c=a.$$hashKey,e=0,f=b.length;e<f;++e){var g=
+    b[e];if(B(g)||C(g))for(var h=Object.keys(g),k=0,l=h.length;k<l;k++){var m=h[k],p=g[m];d&&B(p)?fa(p)?a[m]=new Date(p.valueOf()):$a(p)?a[m]=new RegExp(p):p.nodeName?a[m]=p.cloneNode(!0):Zb(p)?a[m]=p.clone():(B(a[m])||(a[m]=I(p)?[]:{}),Yb(a[m],[p],!0)):a[m]=p}}c?a.$$hashKey=c:delete a.$$hashKey;return a}function O(a){return Yb(a,xa.call(arguments,1),!1)}function qe(a){return Yb(a,xa.call(arguments,1),!0)}function Z(a){return parseInt(a,10)}function $b(a,b){return O(Object.create(a),b)}function D(){}
+    function ab(a){return a}function la(a){return function(){return a}}function ac(a){return C(a.toString)&&a.toString!==ia}function x(a){return"undefined"===typeof a}function u(a){return"undefined"!==typeof a}function B(a){return null!==a&&"object"===typeof a}function Nc(a){return null!==a&&"object"===typeof a&&!Pc(a)}function E(a){return"string"===typeof a}function Y(a){return"number"===typeof a}function fa(a){return"[object Date]"===ia.call(a)}function bc(a){switch(ia.call(a)){case "[object Error]":return!0;
+        case "[object Exception]":return!0;case "[object DOMException]":return!0;default:return a instanceof Error}}function C(a){return"function"===typeof a}function $a(a){return"[object RegExp]"===ia.call(a)}function Za(a){return a&&a.window===a}function bb(a){return a&&a.$evalAsync&&a.$watch}function Na(a){return"boolean"===typeof a}function re(a){return a&&Y(a.length)&&se.test(ia.call(a))}function Zb(a){return!(!a||!(a.nodeName||a.prop&&a.attr&&a.find))}function te(a){var b={};a=a.split(",");var d;for(d=
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   0;d<a.length;d++)b[a[d]]=!0;return b}function ya(a){return L(a.nodeName||a[0]&&a[0].nodeName)}function cb(a,b){var d=a.indexOf(b);0<=d&&a.splice(d,1);return d}function pa(a,b,d){function c(a,b,c){c--;if(0>c)return"...";var d=b.$$hashKey,g;if(I(a)){g=0;for(var f=a.length;g<f;g++)b.push(e(a[g],c))}else if(Nc(a))for(g in a)b[g]=e(a[g],c);else if(a&&"function"===typeof a.hasOwnProperty)for(g in a)a.hasOwnProperty(g)&&(b[g]=e(a[g],c));else for(g in a)ra.call(a,g)&&(b[g]=e(a[g],c));d?b.$$hashKey=d:delete b.$$hashKey;
+        return b}function e(a,b){if(!B(a))return a;var d=g.indexOf(a);if(-1!==d)return h[d];if(Za(a)||bb(a))throw qa("cpws");var d=!1,e=f(a);void 0===e&&(e=I(a)?[]:Object.create(Pc(a)),d=!0);g.push(a);h.push(e);return d?c(a,e,b):e}function f(a){switch(ia.call(a)){case "[object Int8Array]":case "[object Int16Array]":case "[object Int32Array]":case "[object Float32Array]":case "[object Float64Array]":case "[object Uint8Array]":case "[object Uint8ClampedArray]":case "[object Uint16Array]":case "[object Uint32Array]":return new a.constructor(e(a.buffer),
+        a.byteOffset,a.length);case "[object ArrayBuffer]":if(!a.slice){var b=new ArrayBuffer(a.byteLength);(new Uint8Array(b)).set(new Uint8Array(a));return b}return a.slice(0);case "[object Boolean]":case "[object Number]":case "[object String]":case "[object Date]":return new a.constructor(a.valueOf());case "[object RegExp]":return b=new RegExp(a.source,a.toString().match(/[^/]*$/)[0]),b.lastIndex=a.lastIndex,b;case "[object Blob]":return new a.constructor([a],{type:a.type})}if(C(a.cloneNode))return a.cloneNode(!0)}
+        var g=[],h=[];d=Wb(d)?d:NaN;if(b){if(re(b)||"[object ArrayBuffer]"===ia.call(b))throw qa("cpta");if(a===b)throw qa("cpi");I(b)?b.length=0:r(b,function(a,c){"$$hashKey"!==c&&delete b[c]});g.push(a);h.push(b);return c(a,b,d)}return e(a,d)}function cc(a,b){return a===b||a!==a&&b!==b}function sa(a,b){if(a===b)return!0;if(null===a||null===b)return!1;if(a!==a&&b!==b)return!0;var d=typeof a,c;if(d===typeof b&&"object"===d)if(I(a)){if(!I(b))return!1;if((d=a.length)===b.length){for(c=0;c<d;c++)if(!sa(a[c],
+        b[c]))return!1;return!0}}else{if(fa(a))return fa(b)?cc(a.getTime(),b.getTime()):!1;if($a(a))return $a(b)?a.toString()===b.toString():!1;if(bb(a)||bb(b)||Za(a)||Za(b)||I(b)||fa(b)||$a(b))return!1;d=S();for(c in a)if("$"!==c.charAt(0)&&!C(a[c])){if(!sa(a[c],b[c]))return!1;d[c]=!0}for(c in b)if(!(c in d)&&"$"!==c.charAt(0)&&u(b[c])&&!C(b[c]))return!1;return!0}return!1}function db(a,b,d){return a.concat(xa.call(b,d))}function Ra(a,b){var d=2<arguments.length?xa.call(arguments,2):[];return!C(b)||b instanceof
+    RegExp?b:d.length?function(){return arguments.length?b.apply(a,db(d,arguments,0)):b.apply(a,d)}:function(){return arguments.length?b.apply(a,arguments):b.call(a)}}function Qc(a,b){var d=b;"string"===typeof a&&"$"===a.charAt(0)&&"$"===a.charAt(1)?d=void 0:Za(b)?d="$WINDOW":b&&w.document===b?d="$DOCUMENT":bb(b)&&(d="$SCOPE");return d}function eb(a,b){if(!x(a))return Y(b)||(b=b?2:null),JSON.stringify(a,Qc,b)}function Rc(a){return E(a)?JSON.parse(a):a}function Sc(a,b){a=a.replace(ue,"");var d=Date.parse("Jan 01, 1970 00:00:00 "+
+        a)/6E4;return U(d)?b:d}function dc(a,b,d){d=d?-1:1;var c=a.getTimezoneOffset();b=Sc(b,c);d*=b-c;a=new Date(a.getTime());a.setMinutes(a.getMinutes()+d);return a}function za(a){a=z(a).clone().empty();var b=z("<div>").append(a).html();try{return a[0].nodeType===Oa?L(b):b.match(/^(<[^>]+>)/)[1].replace(/^<([\w-]+)/,function(a,b){return"<"+L(b)})}catch(d){return L(b)}}function Tc(a){try{return decodeURIComponent(a)}catch(b){}}function ec(a){var b={};r((a||"").split("&"),function(a){var c,e,f;a&&(e=a=a.replace(/\+/g,
+        "%20"),c=a.indexOf("="),-1!==c&&(e=a.substring(0,c),f=a.substring(c+1)),e=Tc(e),u(e)&&(f=u(f)?Tc(f):!0,ra.call(b,e)?I(b[e])?b[e].push(f):b[e]=[b[e],f]:b[e]=f))});return b}function fc(a){var b=[];r(a,function(a,c){I(a)?r(a,function(a){b.push(ja(c,!0)+(!0===a?"":"="+ja(a,!0)))}):b.push(ja(c,!0)+(!0===a?"":"="+ja(a,!0)))});return b.length?b.join("&"):""}function fb(a){return ja(a,!0).replace(/%26/gi,"&").replace(/%3D/gi,"=").replace(/%2B/gi,"+")}function ja(a,b){return encodeURIComponent(a).replace(/%40/gi,
+        "@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%3B/gi,";").replace(/%20/g,b?"%20":"+")}function ve(a,b){var d,c,e=Ha.length;for(c=0;c<e;++c)if(d=Ha[c]+b,E(d=a.getAttribute(d)))return d;return null}function we(a,b){var d,c,e={};r(Ha,function(b){b+="app";!d&&a.hasAttribute&&a.hasAttribute(b)&&(d=a,c=a.getAttribute(b))});r(Ha,function(b){b+="app";var e;!d&&(e=a.querySelector("["+b.replace(":","\\:")+"]"))&&(d=e,c=e.getAttribute(b))});d&&(xe?(e.strictDi=null!==ve(d,"strict-di"),
+        b(d,c?[c]:[],e)):w.console.error("AngularJS: disabling automatic bootstrap. <script> protocol indicates an extension, document.location.href does not match."))}function Uc(a,b,d){B(d)||(d={});d=O({strictDi:!1},d);var c=function(){a=z(a);if(a.injector()){var c=a[0]===w.document?"document":za(a);throw qa("btstrpd",c.replace(/</,"&lt;").replace(/>/,"&gt;"));}b=b||[];b.unshift(["$provide",function(b){b.value("$rootElement",a)}]);d.debugInfoEnabled&&b.push(["$compileProvider",function(a){a.debugInfoEnabled(!0)}]);
+        b.unshift("ng");c=gb(b,d.strictDi);c.invoke(["$rootScope","$rootElement","$compile","$injector",function(a,b,c,d){a.$apply(function(){b.data("$injector",d);c(b)(a)})}]);return c},e=/^NG_ENABLE_DEBUG_INFO!/,f=/^NG_DEFER_BOOTSTRAP!/;w&&e.test(w.name)&&(d.debugInfoEnabled=!0,w.name=w.name.replace(e,""));if(w&&!f.test(w.name))return c();w.name=w.name.replace(f,"");$.resumeBootstrap=function(a){r(a,function(a){b.push(a)});return c()};C($.resumeDeferredBootstrap)&&$.resumeDeferredBootstrap()}function ye(){w.name=
+        "NG_ENABLE_DEBUG_INFO!"+w.name;w.location.reload()}function ze(a){a=$.element(a).injector();if(!a)throw qa("test");return a.get("$$testability")}function Vc(a,b){b=b||"_";return a.replace(Ae,function(a,c){return(c?b:"")+a.toLowerCase()})}function Be(){var a;if(!Wc){var b=rb();(ma=x(b)?w.jQuery:b?w[b]:void 0)&&ma.fn.on?(z=ma,O(ma.fn,{scope:Sa.scope,isolateScope:Sa.isolateScope,controller:Sa.controller,injector:Sa.injector,inheritedData:Sa.inheritedData}),a=ma.cleanData,ma.cleanData=function(b){for(var c,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  e=0,f;null!=(f=b[e]);e++)(c=ma._data(f,"events"))&&c.$destroy&&ma(f).triggerHandler("$destroy");a(b)}):z=V;$.element=z;Wc=!0}}function hb(a,b,d){if(!a)throw qa("areq",b||"?",d||"required");return a}function sb(a,b,d){d&&I(a)&&(a=a[a.length-1]);hb(C(a),b,"not a function, got "+(a&&"object"===typeof a?a.constructor.name||"Object":typeof a));return a}function Ia(a,b){if("hasOwnProperty"===a)throw qa("badname",b);}function Xc(a,b,d){if(!b)return a;b=b.split(".");for(var c,e=a,f=b.length,g=0;g<f;g++)c=
+        b[g],a&&(a=(e=a)[c]);return!d&&C(a)?Ra(e,a):a}function tb(a){for(var b=a[0],d=a[a.length-1],c,e=1;b!==d&&(b=b.nextSibling);e++)if(c||a[e]!==b)c||(c=z(xa.call(a,0,e))),c.push(b);return c||a}function S(){return Object.create(null)}function gc(a){if(null==a)return"";switch(typeof a){case "string":break;case "number":a=""+a;break;default:a=!ac(a)||I(a)||fa(a)?eb(a):a.toString()}return a}function Ce(a){function b(a,b,c){return a[b]||(a[b]=c())}var d=K("$injector"),c=K("ng");a=b(a,"angular",Object);a.$$minErr=
+        a.$$minErr||K;return b(a,"module",function(){var a={};return function(f,g,h){var k={};if("hasOwnProperty"===f)throw c("badname","module");g&&a.hasOwnProperty(f)&&(a[f]=null);return b(a,f,function(){function a(b,c,d,g){g||(g=e);return function(){g[d||"push"]([b,c,arguments]);return v}}function b(a,c,d){d||(d=e);return function(b,e){e&&C(e)&&(e.$$moduleName=f);d.push([a,c,arguments]);return v}}if(!g)throw d("nomod",f);var e=[],n=[],F=[],s=a("$injector","invoke","push",n),v={_invokeQueue:e,_configBlocks:n,
+        _runBlocks:F,info:function(a){if(u(a)){if(!B(a))throw c("aobj","value");k=a;return this}return k},requires:g,name:f,provider:b("$provide","provider"),factory:b("$provide","factory"),service:b("$provide","service"),value:a("$provide","value"),constant:a("$provide","constant","unshift"),decorator:b("$provide","decorator",n),animation:b("$animateProvider","register"),filter:b("$filterProvider","register"),controller:b("$controllerProvider","register"),directive:b("$compileProvider","directive"),component:b("$compileProvider",
+            "component"),config:s,run:function(a){F.push(a);return this}};h&&s(h);return v})}})}function ka(a,b){if(I(a)){b=b||[];for(var d=0,c=a.length;d<c;d++)b[d]=a[d]}else if(B(a))for(d in b=b||{},a)if("$"!==d.charAt(0)||"$"!==d.charAt(1))b[d]=a[d];return b||a}function De(a,b){var d=[];Wb(b)&&(a=$.copy(a,null,b));return JSON.stringify(a,function(a,b){b=Qc(a,b);if(B(b)){if(0<=d.indexOf(b))return"...";d.push(b)}return b})}function Ee(a){O(a,{errorHandlingConfig:oe,bootstrap:Uc,copy:pa,extend:O,merge:qe,equals:sa,
+        element:z,forEach:r,injector:gb,noop:D,bind:Ra,toJson:eb,fromJson:Rc,identity:ab,isUndefined:x,isDefined:u,isString:E,isFunction:C,isObject:B,isNumber:Y,isElement:Zb,isArray:I,version:Fe,isDate:fa,lowercase:L,uppercase:ub,callbacks:{$$counter:0},getTestability:ze,reloadWithDebugInfo:ye,$$minErr:K,$$csp:Ja,$$encodeUriSegment:fb,$$encodeUriQuery:ja,$$stringify:gc});ic=Ce(w);ic("ng",["ngLocale"],["$provide",function(a){a.provider({$$sanitizeUri:Ge});a.provider("$compile",Yc).directive({a:He,input:Zc,
+        textarea:Zc,form:Ie,script:Je,select:Ke,option:Le,ngBind:Me,ngBindHtml:Ne,ngBindTemplate:Oe,ngClass:Pe,ngClassEven:Qe,ngClassOdd:Re,ngCloak:Se,ngController:Te,ngForm:Ue,ngHide:Ve,ngIf:We,ngInclude:Xe,ngInit:Ye,ngNonBindable:Ze,ngPluralize:$e,ngRepeat:af,ngShow:bf,ngStyle:cf,ngSwitch:df,ngSwitchWhen:ef,ngSwitchDefault:ff,ngOptions:gf,ngTransclude:hf,ngModel:jf,ngList:kf,ngChange:lf,pattern:$c,ngPattern:$c,required:ad,ngRequired:ad,minlength:bd,ngMinlength:bd,maxlength:cd,ngMaxlength:cd,ngValue:mf,
+        ngModelOptions:nf}).directive({ngInclude:of}).directive(vb).directive(dd);a.provider({$anchorScroll:pf,$animate:qf,$animateCss:rf,$$animateJs:sf,$$animateQueue:tf,$$AnimateRunner:uf,$$animateAsyncRun:vf,$browser:wf,$cacheFactory:xf,$controller:yf,$document:zf,$$isDocumentHidden:Af,$exceptionHandler:Bf,$filter:ed,$$forceReflow:Cf,$interpolate:Df,$interval:Ef,$http:Ff,$httpParamSerializer:Gf,$httpParamSerializerJQLike:Hf,$httpBackend:If,$xhrFactory:Jf,$jsonpCallbacks:Kf,$location:Lf,$log:Mf,$parse:Nf,
+        $rootScope:Of,$q:Pf,$$q:Qf,$sce:Rf,$sceDelegate:Sf,$sniffer:Tf,$templateCache:Uf,$templateRequest:Vf,$$testability:Wf,$timeout:Xf,$window:Yf,$$rAF:Zf,$$jqLite:$f,$$Map:ag,$$cookieReader:bg})}]).info({angularVersion:"1.6.9"})}function wb(a,b){return b.toUpperCase()}function xb(a){return a.replace(cg,wb)}function jc(a){a=a.nodeType;return 1===a||!a||9===a}function fd(a,b){var d,c,e=b.createDocumentFragment(),f=[];if(kc.test(a)){d=e.appendChild(b.createElement("div"));c=(dg.exec(a)||["",""])[1].toLowerCase();
+        c=aa[c]||aa._default;d.innerHTML=c[1]+a.replace(eg,"<$1></$2>")+c[2];for(c=c[0];c--;)d=d.lastChild;f=db(f,d.childNodes);d=e.firstChild;d.textContent=""}else f.push(b.createTextNode(a));e.textContent="";e.innerHTML="";r(f,function(a){e.appendChild(a)});return e}function V(a){if(a instanceof V)return a;var b;E(a)&&(a=Q(a),b=!0);if(!(this instanceof V)){if(b&&"<"!==a.charAt(0))throw lc("nosel");return new V(a)}if(b){b=w.document;var d;a=(d=fg.exec(a))?[b.createElement(d[1])]:(d=fd(a,b))?d.childNodes:
+        [];mc(this,a)}else C(a)?gd(a):mc(this,a)}function nc(a){return a.cloneNode(!0)}function yb(a,b){!b&&jc(a)&&z.cleanData([a]);a.querySelectorAll&&z.cleanData(a.querySelectorAll("*"))}function hd(a,b,d,c){if(u(c))throw lc("offargs");var e=(c=zb(a))&&c.events,f=c&&c.handle;if(f)if(b){var g=function(b){var c=e[b];u(d)&&cb(c||[],d);u(d)&&c&&0<c.length||(a.removeEventListener(b,f),delete e[b])};r(b.split(" "),function(a){g(a);Ab[a]&&g(Ab[a])})}else for(b in e)"$destroy"!==b&&a.removeEventListener(b,f),delete e[b]}
+    function oc(a,b){var d=a.ng339,c=d&&ib[d];c&&(b?delete c.data[b]:(c.handle&&(c.events.$destroy&&c.handle({},"$destroy"),hd(a)),delete ib[d],a.ng339=void 0))}function zb(a,b){var d=a.ng339,d=d&&ib[d];b&&!d&&(a.ng339=d=++gg,d=ib[d]={events:{},data:{},handle:void 0});return d}function pc(a,b,d){if(jc(a)){var c,e=u(d),f=!e&&b&&!B(b),g=!b;a=(a=zb(a,!f))&&a.data;if(e)a[xb(b)]=d;else{if(g)return a;if(f)return a&&a[xb(b)];for(c in b)a[xb(c)]=b[c]}}}function Bb(a,b){return a.getAttribute?-1<(" "+(a.getAttribute("class")||
+        "")+" ").replace(/[\n\t]/g," ").indexOf(" "+b+" "):!1}function Cb(a,b){if(b&&a.setAttribute){var d=(" "+(a.getAttribute("class")||"")+" ").replace(/[\n\t]/g," "),c=d;r(b.split(" "),function(a){a=Q(a);c=c.replace(" "+a+" "," ")});c!==d&&a.setAttribute("class",Q(c))}}function Db(a,b){if(b&&a.setAttribute){var d=(" "+(a.getAttribute("class")||"")+" ").replace(/[\n\t]/g," "),c=d;r(b.split(" "),function(a){a=Q(a);-1===c.indexOf(" "+a+" ")&&(c+=a+" ")});c!==d&&a.setAttribute("class",Q(c))}}function mc(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             b){if(b)if(b.nodeType)a[a.length++]=b;else{var d=b.length;if("number"===typeof d&&b.window!==b){if(d)for(var c=0;c<d;c++)a[a.length++]=b[c]}else a[a.length++]=b}}function id(a,b){return Eb(a,"$"+(b||"ngController")+"Controller")}function Eb(a,b,d){9===a.nodeType&&(a=a.documentElement);for(b=I(b)?b:[b];a;){for(var c=0,e=b.length;c<e;c++)if(u(d=z.data(a,b[c])))return d;a=a.parentNode||11===a.nodeType&&a.host}}function jd(a){for(yb(a,!0);a.firstChild;)a.removeChild(a.firstChild)}function Fb(a,b){b||
+    yb(a);var d=a.parentNode;d&&d.removeChild(a)}function hg(a,b){b=b||w;if("complete"===b.document.readyState)b.setTimeout(a);else z(b).on("load",a)}function gd(a){function b(){w.document.removeEventListener("DOMContentLoaded",b);w.removeEventListener("load",b);a()}"complete"===w.document.readyState?w.setTimeout(a):(w.document.addEventListener("DOMContentLoaded",b),w.addEventListener("load",b))}function kd(a,b){var d=Gb[b.toLowerCase()];return d&&ld[ya(a)]&&d}function ig(a,b){var d=function(c,d){c.isDefaultPrevented=
+        function(){return c.defaultPrevented};var f=b[d||c.type],g=f?f.length:0;if(g){if(x(c.immediatePropagationStopped)){var h=c.stopImmediatePropagation;c.stopImmediatePropagation=function(){c.immediatePropagationStopped=!0;c.stopPropagation&&c.stopPropagation();h&&h.call(c)}}c.isImmediatePropagationStopped=function(){return!0===c.immediatePropagationStopped};var k=f.specialHandlerWrapper||jg;1<g&&(f=ka(f));for(var l=0;l<g;l++)c.isImmediatePropagationStopped()||k(a,c,f[l])}};d.elem=a;return d}function jg(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 b,d){d.call(a,b)}function kg(a,b,d){var c=b.relatedTarget;c&&(c===a||lg.call(a,c))||d.call(a,b)}function $f(){this.$get=function(){return O(V,{hasClass:function(a,b){a.attr&&(a=a[0]);return Bb(a,b)},addClass:function(a,b){a.attr&&(a=a[0]);return Db(a,b)},removeClass:function(a,b){a.attr&&(a=a[0]);return Cb(a,b)}})}}function Pa(a,b){var d=a&&a.$$hashKey;if(d)return"function"===typeof d&&(d=a.$$hashKey()),d;d=typeof a;return d="function"===d||"object"===d&&null!==a?a.$$hashKey=d+":"+(b||pe)():d+":"+
+        a}function md(){this._keys=[];this._values=[];this._lastKey=NaN;this._lastIndex=-1}function nd(a){a=Function.prototype.toString.call(a).replace(mg,"");return a.match(ng)||a.match(og)}function pg(a){return(a=nd(a))?"function("+(a[1]||"").replace(/[\s\r\n]+/," ")+")":"fn"}function gb(a,b){function d(a){return function(b,c){if(B(b))r(b,Xb(a));else return a(b,c)}}function c(a,b){Ia(a,"service");if(C(b)||I(b))b=n.instantiate(b);if(!b.$get)throw Ba("pget",a);return p[a+"Provider"]=b}function e(a,b){return function(){var c=
+        v.invoke(b,this);if(x(c))throw Ba("undef",a);return c}}function f(a,b,d){return c(a,{$get:!1!==d?e(a,b):b})}function g(a){hb(x(a)||I(a),"modulesToLoad","not an array");var b=[],c;r(a,function(a){function d(a){var b,c;b=0;for(c=a.length;b<c;b++){var e=a[b],g=n.get(e[0]);g[e[1]].apply(g,e[2])}}if(!m.get(a)){m.set(a,!0);try{E(a)?(c=ic(a),v.modules[a]=c,b=b.concat(g(c.requires)).concat(c._runBlocks),d(c._invokeQueue),d(c._configBlocks)):C(a)?b.push(n.invoke(a)):I(a)?b.push(n.invoke(a)):sb(a,"module")}catch(e){throw I(a)&&
+    (a=a[a.length-1]),e.message&&e.stack&&-1===e.stack.indexOf(e.message)&&(e=e.message+"\n"+e.stack),Ba("modulerr",a,e.stack||e.message||e);}}});return b}function h(a,c){function d(b,e){if(a.hasOwnProperty(b)){if(a[b]===k)throw Ba("cdep",b+" <- "+l.join(" <- "));return a[b]}try{return l.unshift(b),a[b]=k,a[b]=c(b,e),a[b]}catch(g){throw a[b]===k&&delete a[b],g;}finally{l.shift()}}function e(a,c,g){var f=[];a=gb.$$annotate(a,b,g);for(var k=0,h=a.length;k<h;k++){var l=a[k];if("string"!==typeof l)throw Ba("itkn",
+        l);f.push(c&&c.hasOwnProperty(l)?c[l]:d(l,g))}return f}return{invoke:function(a,b,c,d){"string"===typeof c&&(d=c,c=null);c=e(a,c,d);I(a)&&(a=a[a.length-1]);d=a;if(Ca||"function"!==typeof d)d=!1;else{var g=d.$$ngIsClass;Na(g)||(g=d.$$ngIsClass=/^(?:class\b|constructor\()/.test(Function.prototype.toString.call(d)));d=g}return d?(c.unshift(null),new (Function.prototype.bind.apply(a,c))):a.apply(b,c)},instantiate:function(a,b,c){var d=I(a)?a[a.length-1]:a;a=e(a,b,c);a.unshift(null);return new (Function.prototype.bind.apply(d,
+            a))},get:d,annotate:gb.$$annotate,has:function(b){return p.hasOwnProperty(b+"Provider")||a.hasOwnProperty(b)}}}b=!0===b;var k={},l=[],m=new Hb,p={$provide:{provider:d(c),factory:d(f),service:d(function(a,b){return f(a,["$injector",function(a){return a.instantiate(b)}])}),value:d(function(a,b){return f(a,la(b),!1)}),constant:d(function(a,b){Ia(a,"constant");p[a]=b;F[a]=b}),decorator:function(a,b){var c=n.get(a+"Provider"),d=c.$get;c.$get=function(){var a=v.invoke(d,c);return v.invoke(b,null,{$delegate:a})}}}},
+        n=p.$injector=h(p,function(a,b){$.isString(b)&&l.push(b);throw Ba("unpr",l.join(" <- "));}),F={},s=h(F,function(a,b){var c=n.get(a+"Provider",b);return v.invoke(c.$get,c,void 0,a)}),v=s;p.$injectorProvider={$get:la(s)};v.modules=n.modules=S();var y=g(a),v=s.get("$injector");v.strictDi=b;r(y,function(a){a&&v.invoke(a)});v.loadNewModules=function(a){r(g(a),function(a){a&&v.invoke(a)})};return v}function pf(){var a=!0;this.disableAutoScrolling=function(){a=!1};this.$get=["$window","$location","$rootScope",
+        function(b,d,c){function e(a){var b=null;Array.prototype.some.call(a,function(a){if("a"===ya(a))return b=a,!0});return b}function f(a){if(a){a.scrollIntoView();var c;c=g.yOffset;C(c)?c=c():Zb(c)?(c=c[0],c="fixed"!==b.getComputedStyle(c).position?0:c.getBoundingClientRect().bottom):Y(c)||(c=0);c&&(a=a.getBoundingClientRect().top,b.scrollBy(0,a-c))}else b.scrollTo(0,0)}function g(a){a=E(a)?a:Y(a)?a.toString():d.hash();var b;a?(b=h.getElementById(a))?f(b):(b=e(h.getElementsByName(a)))?f(b):"top"===a&&
+            f(null):f(null)}var h=b.document;a&&c.$watch(function(){return d.hash()},function(a,b){a===b&&""===a||hg(function(){c.$evalAsync(g)})});return g}]}function jb(a,b){if(!a&&!b)return"";if(!a)return b;if(!b)return a;I(a)&&(a=a.join(" "));I(b)&&(b=b.join(" "));return a+" "+b}function qg(a){E(a)&&(a=a.split(" "));var b=S();r(a,function(a){a.length&&(b[a]=!0)});return b}function Ka(a){return B(a)?a:{}}function rg(a,b,d,c){function e(a){try{a.apply(null,xa.call(arguments,1))}finally{if(s--,0===s)for(;v.length;)try{v.pop()()}catch(b){d.error(b)}}}
+        function f(){A=null;h()}function g(){y=H();y=x(y)?null:y;sa(y,J)&&(y=J);t=J=y}function h(){var a=t;g();if(Aa!==k.url()||a!==y)Aa=k.url(),t=y,r(G,function(a){a(k.url(),y)})}var k=this,l=a.location,m=a.history,p=a.setTimeout,n=a.clearTimeout,F={};k.isMock=!1;var s=0,v=[];k.$$completeOutstandingRequest=e;k.$$incOutstandingRequestCount=function(){s++};k.notifyWhenNoOutstandingRequests=function(a){0===s?a():v.push(a)};var y,t,Aa=l.href,hc=b.find("base"),A=null,H=c.history?function(){try{return m.state}catch(a){}}:
+            D;g();k.url=function(b,d,e){x(e)&&(e=null);l!==a.location&&(l=a.location);m!==a.history&&(m=a.history);if(b){var f=t===e;if(Aa===b&&(!c.history||f))return k;var h=Aa&&La(Aa)===La(b);Aa=b;t=e;!c.history||h&&f?(h||(A=b),d?l.replace(b):h?(d=l,e=b.indexOf("#"),e=-1===e?"":b.substr(e),d.hash=e):l.href=b,l.href!==b&&(A=b)):(m[d?"replaceState":"pushState"](e,"",b),g());A&&(A=b);return k}return A||l.href.replace(/%27/g,"'")};k.state=function(){return y};var G=[],ba=!1,J=null;k.onUrlChange=function(b){if(!ba){if(c.history)z(a).on("popstate",
+            f);z(a).on("hashchange",f);ba=!0}G.push(b);return b};k.$$applicationDestroyed=function(){z(a).off("hashchange popstate",f)};k.$$checkUrlChange=h;k.baseHref=function(){var a=hc.attr("href");return a?a.replace(/^(https?:)?\/\/[^/]*/,""):""};k.defer=function(a,b){var c;s++;c=p(function(){delete F[c];e(a)},b||0);F[c]=!0;return c};k.defer.cancel=function(a){return F[a]?(delete F[a],n(a),e(D),!0):!1}}function wf(){this.$get=["$window","$log","$sniffer","$document",function(a,b,d,c){return new rg(a,c,b,
+        d)}]}function xf(){this.$get=function(){function a(a,c){function e(a){a!==p&&(n?n===a&&(n=a.n):n=a,f(a.n,a.p),f(a,p),p=a,p.n=null)}function f(a,b){a!==b&&(a&&(a.p=b),b&&(b.n=a))}if(a in b)throw K("$cacheFactory")("iid",a);var g=0,h=O({},c,{id:a}),k=S(),l=c&&c.capacity||Number.MAX_VALUE,m=S(),p=null,n=null;return b[a]={put:function(a,b){if(!x(b)){if(l<Number.MAX_VALUE){var c=m[a]||(m[a]={key:a});e(c)}a in k||g++;k[a]=b;g>l&&this.remove(n.key);return b}},get:function(a){if(l<Number.MAX_VALUE){var b=
+            m[a];if(!b)return;e(b)}return k[a]},remove:function(a){if(l<Number.MAX_VALUE){var b=m[a];if(!b)return;b===p&&(p=b.p);b===n&&(n=b.n);f(b.n,b.p);delete m[a]}a in k&&(delete k[a],g--)},removeAll:function(){k=S();g=0;m=S();p=n=null},destroy:function(){m=h=k=null;delete b[a]},info:function(){return O({},h,{size:g})}}}var b={};a.info=function(){var a={};r(b,function(b,e){a[e]=b.info()});return a};a.get=function(a){return b[a]};return a}}function Uf(){this.$get=["$cacheFactory",function(a){return a("templates")}]}
+    function Yc(a,b){function d(a,b,c){var d=/^\s*([@&<]|=(\*?))(\??)\s*([\w$]*)\s*$/,e=S();r(a,function(a,g){if(a in p)e[g]=p[a];else{var f=a.match(d);if(!f)throw ca("iscp",b,g,a,c?"controller bindings definition":"isolate scope definition");e[g]={mode:f[1][0],collection:"*"===f[2],optional:"?"===f[3],attrName:f[4]||g};f[4]&&(p[a]=e[g])}});return e}function c(a){var b=a.charAt(0);if(!b||b!==L(b))throw ca("baddir",a);if(a!==a.trim())throw ca("baddir",a);}function e(a){var b=a.require||a.controller&&a.name;
+        !I(b)&&B(b)&&r(b,function(a,c){var d=a.match(l);a.substring(d[0].length)||(b[c]=d[0]+c)});return b}var f={},g=/^\s*directive:\s*([\w-]+)\s+(.*)$/,h=/(([\w-]+)(?::([^;]+))?;?)/,k=te("ngSrc,ngSrcset,src,srcset"),l=/^(?:(\^\^?)?(\?)?(\^\^?)?)?/,m=/^(on[a-z]+|formaction)$/,p=S();this.directive=function hc(b,d){hb(b,"name");Ia(b,"directive");E(b)?(c(b),hb(d,"directiveFactory"),f.hasOwnProperty(b)||(f[b]=[],a.factory(b+"Directive",["$injector","$exceptionHandler",function(a,c){var d=[];r(f[b],function(g,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             f){try{var h=a.invoke(g);C(h)?h={compile:la(h)}:!h.compile&&h.link&&(h.compile=la(h.link));h.priority=h.priority||0;h.index=f;h.name=h.name||b;h.require=e(h);var k=h,l=h.restrict;if(l&&(!E(l)||!/[EACM]/.test(l)))throw ca("badrestrict",l,b);k.restrict=l||"EA";h.$$moduleName=g.$$moduleName;d.push(h)}catch(m){c(m)}});return d}])),f[b].push(d)):r(b,Xb(hc));return this};this.component=function A(a,b){function c(a){function e(b){return C(b)||I(b)?function(c,d){return a.invoke(b,this,{$element:c,$attrs:d})}:
+        b}var g=b.template||b.templateUrl?b.template:"",f={controller:d,controllerAs:sg(b.controller)||b.controllerAs||"$ctrl",template:e(g),templateUrl:e(b.templateUrl),transclude:b.transclude,scope:{},bindToController:b.bindings||{},restrict:"E",require:b.require};r(b,function(a,b){"$"===b.charAt(0)&&(f[b]=a)});return f}if(!E(a))return r(a,Xb(Ra(this,A))),this;var d=b.controller||function(){};r(b,function(a,b){"$"===b.charAt(0)&&(c[b]=a,C(d)&&(d[b]=a))});c.$inject=["$injector"];return this.directive(a,
+        c)};this.aHrefSanitizationWhitelist=function(a){return u(a)?(b.aHrefSanitizationWhitelist(a),this):b.aHrefSanitizationWhitelist()};this.imgSrcSanitizationWhitelist=function(a){return u(a)?(b.imgSrcSanitizationWhitelist(a),this):b.imgSrcSanitizationWhitelist()};var n=!0;this.debugInfoEnabled=function(a){return u(a)?(n=a,this):n};var F=!1;this.preAssignBindingsEnabled=function(a){return u(a)?(F=a,this):F};var s=!1;this.strictComponentBindingsEnabled=function(a){return u(a)?(s=a,this):s};var v=10;this.onChangesTtl=
+        function(a){return arguments.length?(v=a,this):v};var y=!0;this.commentDirectivesEnabled=function(a){return arguments.length?(y=a,this):y};var t=!0;this.cssClassDirectivesEnabled=function(a){return arguments.length?(t=a,this):t};this.$get=["$injector","$interpolate","$exceptionHandler","$templateRequest","$parse","$controller","$rootScope","$sce","$animate","$$sanitizeUri",function(a,b,c,e,p,R,M,T,P,q){function N(){try{if(!--Fa)throw ha=void 0,ca("infchng",v);M.$apply(function(){for(var a=[],b=0,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    c=ha.length;b<c;++b)try{ha[b]()}catch(d){a.push(d)}ha=void 0;if(a.length)throw a;})}finally{Fa++}}function qc(a,b){if(b){var c=Object.keys(b),d,e,g;d=0;for(e=c.length;d<e;d++)g=c[d],this[g]=b[g]}else this.$attr={};this.$$element=a}function Ta(a,b,c){Ba.innerHTML="<span "+b+">";b=Ba.firstChild.attributes;var d=b[0];b.removeNamedItem(d.name);d.value=c;a.attributes.setNamedItem(d)}function na(a,b){try{a.addClass(b)}catch(c){}}function da(a,b,c,d,e){a instanceof z||(a=z(a));var g=Ua(a,b,a,c,d,e);da.$$addScopeClass(a);
+        var f=null;return function(b,c,d){if(!a)throw ca("multilink");hb(b,"scope");e&&e.needsNewScope&&(b=b.$parent.$new());d=d||{};var h=d.parentBoundTranscludeFn,k=d.transcludeControllers;d=d.futureParentElement;h&&h.$$boundTransclude&&(h=h.$$boundTransclude);f||(f=(d=d&&d[0])?"foreignobject"!==ya(d)&&ia.call(d).match(/SVG/)?"svg":"html":"html");d="html"!==f?z(ka(f,z("<div>").append(a).html())):c?Sa.clone.call(a):a;if(k)for(var l in k)d.data("$"+l+"Controller",k[l].instance);da.$$addScopeInfo(d,b);c&&
+        c(d,b);g&&g(b,d,d,h);c||(a=g=null);return d}}function Ua(a,b,c,d,e,g){function f(a,c,d,e){var g,k,l,m,p,n,G;if(t)for(G=Array(c.length),m=0;m<h.length;m+=3)g=h[m],G[g]=c[g];else G=c;m=0;for(p=h.length;m<p;)k=G[h[m++]],c=h[m++],g=h[m++],c?(c.scope?(l=a.$new(),da.$$addScopeInfo(z(k),l)):l=a,n=c.transcludeOnThisElement?Ma(a,c.transclude,e):!c.templateOnThisElement&&e?e:!e&&b?Ma(a,b):null,c(g,l,k,d,n)):g&&g(a,k.childNodes,void 0,e)}for(var h=[],k=I(a)||a instanceof z,l,m,p,n,t,G=0;G<a.length;G++){l=new qc;
+        11===Ca&&Da(a,G,k);m=K(a[G],[],l,0===G?d:void 0,e);(g=m.length?Y(m,a[G],l,b,c,null,[],[],g):null)&&g.scope&&da.$$addScopeClass(l.$$element);l=g&&g.terminal||!(p=a[G].childNodes)||!p.length?null:Ua(p,g?(g.transcludeOnThisElement||!g.templateOnThisElement)&&g.transclude:b);if(g||l)h.push(G,g,l),n=!0,t=t||g;g=null}return n?f:null}function Da(a,b,c){var d=a[b],e=d.parentNode,g;if(d.nodeType===Oa)for(;;){g=e?d.nextSibling:a[b+1];if(!g||g.nodeType!==Oa)break;d.nodeValue+=g.nodeValue;g.parentNode&&g.parentNode.removeChild(g);
+        c&&g===a[b+1]&&a.splice(b+1,1)}}function Ma(a,b,c){function d(e,g,f,h,k){e||(e=a.$new(!1,k),e.$$transcluded=!0);return b(e,g,{parentBoundTranscludeFn:c,transcludeControllers:f,futureParentElement:h})}var e=d.$$slots=S(),g;for(g in b.$$slots)e[g]=b.$$slots[g]?Ma(a,b.$$slots[g],c):null;return d}function K(a,b,c,d,e){var g=c.$attr,f;switch(a.nodeType){case 1:f=ya(a);U(b,Ea(f),"E",d,e);for(var k,l,m,p,n=a.attributes,t=0,G=n&&n.length;t<G;t++){var H=!1,F=!1;k=n[t];l=k.name;m=k.value;k=Ea(l);(p=Pa.test(k))&&
+    (l=l.replace(od,"").substr(8).replace(/_(.)/g,function(a,b){return b.toUpperCase()}));(k=k.match(Qa))&&$(k[1])&&(H=l,F=l.substr(0,l.length-5)+"end",l=l.substr(0,l.length-6));k=Ea(l.toLowerCase());g[k]=l;if(p||!c.hasOwnProperty(k))c[k]=m,kd(a,k)&&(c[k]=!0);wa(a,b,m,k,p);U(b,k,"A",d,e,H,F)}"input"===f&&"hidden"===a.getAttribute("type")&&a.setAttribute("autocomplete","off");if(!La)break;g=a.className;B(g)&&(g=g.animVal);if(E(g)&&""!==g)for(;a=h.exec(g);)k=Ea(a[2]),U(b,k,"C",d,e)&&(c[k]=Q(a[3])),g=g.substr(a.index+
+        a[0].length);break;case Oa:oa(b,a.nodeValue);break;case 8:if(!Ka)break;rc(a,b,c,d,e)}b.sort(la);return b}function rc(a,b,c,d,e){try{var f=g.exec(a.nodeValue);if(f){var h=Ea(f[1]);U(b,h,"M",d,e)&&(c[h]=Q(f[2]))}}catch(k){}}function pd(a,b,c){var d=[],e=0;if(b&&a.hasAttribute&&a.hasAttribute(b)){do{if(!a)throw ca("uterdir",b,c);1===a.nodeType&&(a.hasAttribute(b)&&e++,a.hasAttribute(c)&&e--);d.push(a);a=a.nextSibling}while(0<e)}else d.push(a);return z(d)}function V(a,b,c){return function(d,e,g,f,h){e=
+        pd(e[0],b,c);return a(d,e,g,f,h)}}function W(a,b,c,d,e,g){var f;return a?da(b,c,d,e,g):function(){f||(f=da(b,c,d,e,g),b=c=g=null);return f.apply(this,arguments)}}function Y(a,b,d,e,g,f,h,k,l){function m(a,b,c,d){if(a){c&&(a=V(a,c,d));a.require=s.require;a.directiveName=R;if(J===s||s.$$isolateScope)a=ta(a,{isolateScope:!0});h.push(a)}if(b){c&&(b=V(b,c,d));b.require=s.require;b.directiveName=R;if(J===s||s.$$isolateScope)b=ta(b,{isolateScope:!0});k.push(b)}}function p(a,e,g,f,l){function m(a,b,c,d){var e;
+        bb(a)||(d=c,c=b,b=a,a=void 0);T&&(e=M);c||(c=T?ga.parent():ga);if(d){var g=l.$$slots[d];if(g)return g(a,b,e,c,N);if(x(g))throw ca("noslot",d,za(ga));}else return l(a,b,e,c,N)}var n,s,v,y,ba,M,R,ga;b===g?(f=d,ga=d.$$element):(ga=z(g),f=new qc(ga,d));ba=e;J?y=e.$new(!0):t&&(ba=e.$parent);l&&(R=m,R.$$boundTransclude=l,R.isSlotFilled=function(a){return!!l.$$slots[a]});H&&(M=ea(ga,f,R,H,y,e,J));J&&(da.$$addScopeInfo(ga,y,!0,!(A&&(A===J||A===J.$$originalDirective))),da.$$addScopeClass(ga,!0),y.$$isolateBindings=
+        J.$$isolateBindings,s=qa(e,f,y,y.$$isolateBindings,J),s.removeWatches&&y.$on("$destroy",s.removeWatches));for(n in M){s=H[n];v=M[n];var P=s.$$bindings.bindToController;if(F){v.bindingInfo=P?qa(ba,f,v.instance,P,s):{};var q=v();q!==v.instance&&(v.instance=q,ga.data("$"+s.name+"Controller",q),v.bindingInfo.removeWatches&&v.bindingInfo.removeWatches(),v.bindingInfo=qa(ba,f,v.instance,P,s))}else v.instance=v(),ga.data("$"+s.name+"Controller",v.instance),v.bindingInfo=qa(ba,f,v.instance,P,s)}r(H,function(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 b){var c=a.require;a.bindToController&&!I(c)&&B(c)&&O(M[b].instance,X(b,c,ga,M))});r(M,function(a){var b=a.instance;if(C(b.$onChanges))try{b.$onChanges(a.bindingInfo.initialChanges)}catch(d){c(d)}if(C(b.$onInit))try{b.$onInit()}catch(e){c(e)}C(b.$doCheck)&&(ba.$watch(function(){b.$doCheck()}),b.$doCheck());C(b.$onDestroy)&&ba.$on("$destroy",function(){b.$onDestroy()})});n=0;for(s=h.length;n<s;n++)v=h[n],va(v,v.isolateScope?y:e,ga,f,v.require&&X(v.directiveName,v.require,ga,M),R);var N=e;J&&(J.template||
+        null===J.templateUrl)&&(N=y);a&&a(N,g.childNodes,void 0,l);for(n=k.length-1;0<=n;n--)v=k[n],va(v,v.isolateScope?y:e,ga,f,v.require&&X(v.directiveName,v.require,ga,M),R);r(M,function(a){a=a.instance;C(a.$postLink)&&a.$postLink()})}l=l||{};for(var n=-Number.MAX_VALUE,t=l.newScopeDirective,H=l.controllerDirectives,J=l.newIsolateScopeDirective,A=l.templateDirective,y=l.nonTlbTranscludeDirective,ba=!1,M=!1,T=l.hasElementTranscludeDirective,v=d.$$element=z(b),s,R,P,q=e,N,u=!1,Ib=!1,w,Da=0,D=a.length;Da<
+    D;Da++){s=a[Da];var Ta=s.$$start,E=s.$$end;Ta&&(v=pd(b,Ta,E));P=void 0;if(n>s.priority)break;if(w=s.scope)s.templateUrl||(B(w)?(aa("new/isolated scope",J||t,s,v),J=s):aa("new/isolated scope",J,s,v)),t=t||s;R=s.name;if(!u&&(s.replace&&(s.templateUrl||s.template)||s.transclude&&!s.$$tlb)){for(w=Da+1;u=a[w++];)if(u.transclude&&!u.$$tlb||u.replace&&(u.templateUrl||u.template)){Ib=!0;break}u=!0}!s.templateUrl&&s.controller&&(H=H||S(),aa("'"+R+"' controller",H[R],s,v),H[R]=s);if(w=s.transclude)if(ba=!0,
+    s.$$tlb||(aa("transclusion",y,s,v),y=s),"element"===w)T=!0,n=s.priority,P=v,v=d.$$element=z(da.$$createComment(R,d[R])),b=v[0],ma(g,xa.call(P,0),b),P[0].$$parentNode=P[0].parentNode,q=W(Ib,P,e,n,f&&f.name,{nonTlbTranscludeDirective:y});else{var na=S();if(B(w)){P=[];var Ua=S(),Ma=S();r(w,function(a,b){var c="?"===a.charAt(0);a=c?a.substring(1):a;Ua[a]=b;na[b]=null;Ma[b]=c});r(v.contents(),function(a){var b=Ua[Ea(ya(a))];b?(Ma[b]=!0,na[b]=na[b]||[],na[b].push(a)):P.push(a)});r(Ma,function(a,b){if(!a)throw ca("reqslot",
+        b);});for(var L in na)na[L]&&(na[L]=W(Ib,na[L],e))}else P=z(nc(b)).contents();v.empty();q=W(Ib,P,e,void 0,void 0,{needsNewScope:s.$$isolateScope||s.$$newScope});q.$$slots=na}if(s.template)if(M=!0,aa("template",A,s,v),A=s,w=C(s.template)?s.template(v,d):s.template,w=Ia(w),s.replace){f=s;P=kc.test(w)?qd(ka(s.templateNamespace,Q(w))):[];b=P[0];if(1!==P.length||1!==b.nodeType)throw ca("tplrt",R,"");ma(g,v,b);D={$attr:{}};w=K(b,[],D);var rc=a.splice(Da+1,a.length-(Da+1));(J||t)&&Z(w,J,t);a=a.concat(w).concat(rc);
+        fa(d,D);D=a.length}else v.html(w);if(s.templateUrl)M=!0,aa("template",A,s,v),A=s,s.replace&&(f=s),p=ja(a.splice(Da,a.length-Da),v,d,g,ba&&q,h,k,{controllerDirectives:H,newScopeDirective:t!==s&&t,newIsolateScopeDirective:J,templateDirective:A,nonTlbTranscludeDirective:y}),D=a.length;else if(s.compile)try{N=s.compile(v,d,q);var U=s.$$originalDirective||s;C(N)?m(null,Ra(U,N),Ta,E):N&&m(Ra(U,N.pre),Ra(U,N.post),Ta,E)}catch($){c($,za(v))}s.terminal&&(p.terminal=!0,n=Math.max(n,s.priority))}p.scope=t&&
+        !0===t.scope;p.transcludeOnThisElement=ba;p.templateOnThisElement=M;p.transclude=q;l.hasElementTranscludeDirective=T;return p}function X(a,b,c,d){var e;if(E(b)){var g=b.match(l);b=b.substring(g[0].length);var f=g[1]||g[3],g="?"===g[2];"^^"===f?c=c.parent():e=(e=d&&d[b])&&e.instance;if(!e){var h="$"+b+"Controller";e=f?c.inheritedData(h):c.data(h)}if(!e&&!g)throw ca("ctreq",b,a);}else if(I(b))for(e=[],f=0,g=b.length;f<g;f++)e[f]=X(a,b[f],c,d);else B(b)&&(e={},r(b,function(b,g){e[g]=X(a,b,c,d)}));return e||
+        null}function ea(a,b,c,d,e,g,f){var h=S(),k;for(k in d){var l=d[k],m={$scope:l===f||l.$$isolateScope?e:g,$element:a,$attrs:b,$transclude:c},p=l.controller;"@"===p&&(p=b[l.name]);m=R(p,m,!0,l.controllerAs);h[l.name]=m;a.data("$"+l.name+"Controller",m.instance)}return h}function Z(a,b,c){for(var d=0,e=a.length;d<e;d++)a[d]=$b(a[d],{$$isolateScope:b,$$newScope:c})}function U(b,c,e,g,h,k,l){if(c===h)return null;var m=null;if(f.hasOwnProperty(c)){h=a.get(c+"Directive");for(var p=0,n=h.length;p<n;p++)if(c=
+        h[p],(x(g)||g>c.priority)&&-1!==c.restrict.indexOf(e)){k&&(c=$b(c,{$$start:k,$$end:l}));if(!c.$$bindings){var t=m=c,G=c.name,H={isolateScope:null,bindToController:null};B(t.scope)&&(!0===t.bindToController?(H.bindToController=d(t.scope,G,!0),H.isolateScope={}):H.isolateScope=d(t.scope,G,!1));B(t.bindToController)&&(H.bindToController=d(t.bindToController,G,!0));if(H.bindToController&&!t.controller)throw ca("noctrl",G);m=m.$$bindings=H;B(m.isolateScope)&&(c.$$isolateBindings=m.isolateScope)}b.push(c);
+        m=c}}return m}function $(b){if(f.hasOwnProperty(b))for(var c=a.get(b+"Directive"),d=0,e=c.length;d<e;d++)if(b=c[d],b.multiElement)return!0;return!1}function fa(a,b){var c=b.$attr,d=a.$attr;r(a,function(d,e){"$"!==e.charAt(0)&&(b[e]&&b[e]!==d&&(d=d.length?d+(("style"===e?";":" ")+b[e]):b[e]),a.$set(e,d,!0,c[e]))});r(b,function(b,e){a.hasOwnProperty(e)||"$"===e.charAt(0)||(a[e]=b,"class"!==e&&"style"!==e&&(d[e]=c[e]))})}function ja(a,b,d,g,f,h,k,l){var m=[],p,n,t=b[0],H=a.shift(),s=$b(H,{templateUrl:null,
+        transclude:null,replace:null,$$originalDirective:H}),F=C(H.templateUrl)?H.templateUrl(b,d):H.templateUrl,v=H.templateNamespace;b.empty();e(F).then(function(c){var e,G;c=Ia(c);if(H.replace){c=kc.test(c)?qd(ka(v,Q(c))):[];e=c[0];if(1!==c.length||1!==e.nodeType)throw ca("tplrt",H.name,F);c={$attr:{}};ma(g,b,e);var J=K(e,[],c);B(H.scope)&&Z(J,!0);a=J.concat(a);fa(d,c)}else e=t,b.html(c);a.unshift(s);p=Y(a,e,d,f,b,H,h,k,l);r(g,function(a,c){a===e&&(g[c]=b[0])});for(n=Ua(b[0].childNodes,f);m.length;){c=
+        m.shift();G=m.shift();var y=m.shift(),A=m.shift(),J=b[0];if(!c.$$destroyed){if(G!==t){var M=G.className;l.hasElementTranscludeDirective&&H.replace||(J=nc(e));ma(y,z(G),J);na(z(J),M)}G=p.transcludeOnThisElement?Ma(c,p.transclude,A):A;p(n,c,J,g,G)}}m=null}).catch(function(a){bc(a)&&c(a)});return function(a,b,c,d,e){a=e;b.$$destroyed||(m?m.push(b,c,d,a):(p.transcludeOnThisElement&&(a=Ma(b,p.transclude,e)),p(n,b,c,d,a)))}}function la(a,b){var c=b.priority-a.priority;return 0!==c?c:a.name!==b.name?a.name<
+    b.name?-1:1:a.index-b.index}function aa(a,b,c,d){function e(a){return a?" (module: "+a+")":""}if(b)throw ca("multidir",b.name,e(b.$$moduleName),c.name,e(c.$$moduleName),a,za(d));}function oa(a,c){var d=b(c,!0);d&&a.push({priority:0,compile:function(a){a=a.parent();var b=!!a.length;b&&da.$$addBindingClass(a);return function(a,c){var e=c.parent();b||da.$$addBindingClass(e);da.$$addBindingInfo(e,d.expressions);a.$watch(d,function(a){c[0].nodeValue=a})}}})}function ka(a,b){a=L(a||"html");switch(a){case "svg":case "math":var c=
+        w.document.createElement("div");c.innerHTML="<"+a+">"+b+"</"+a+">";return c.childNodes[0].childNodes;default:return b}}function ua(a,b){if("srcdoc"===b)return T.HTML;var c=ya(a);if("src"===b||"ngSrc"===b){if(-1===["img","video","audio","source","track"].indexOf(c))return T.RESOURCE_URL}else if("xlinkHref"===b||"form"===c&&"action"===b||"link"===c&&"href"===b)return T.RESOURCE_URL}function wa(a,c,d,e,g){var f=ua(a,e),h=k[e]||g,l=b(d,!g,f,h);if(l){if("multiple"===e&&"select"===ya(a))throw ca("selmulti",
+        za(a));if(m.test(e))throw ca("nodomevents");c.push({priority:100,compile:function(){return{pre:function(a,c,g){c=g.$$observers||(g.$$observers=S());var k=g[e];k!==d&&(l=k&&b(k,!0,f,h),d=k);l&&(g[e]=l(a),(c[e]||(c[e]=[])).$$inter=!0,(g.$$observers&&g.$$observers[e].$$scope||a).$watch(l,function(a,b){"class"===e&&a!==b?g.$updateClass(a,b):g.$set(e,a)}))}}}})}}function ma(a,b,c){var d=b[0],e=b.length,g=d.parentNode,f,h;if(a)for(f=0,h=a.length;f<h;f++)if(a[f]===d){a[f++]=c;h=f+e-1;for(var k=a.length;f<
+    k;f++,h++)h<k?a[f]=a[h]:delete a[f];a.length-=e-1;a.context===d&&(a.context=c);break}g&&g.replaceChild(c,d);a=w.document.createDocumentFragment();for(f=0;f<e;f++)a.appendChild(b[f]);z.hasData(d)&&(z.data(c,z.data(d)),z(d).off("$destroy"));z.cleanData(a.querySelectorAll("*"));for(f=1;f<e;f++)delete b[f];b[0]=c;b.length=1}function ta(a,b){return O(function(){return a.apply(null,arguments)},a,b)}function va(a,b,d,e,g,f){try{a(b,d,e,g,f)}catch(h){c(h,za(d))}}function pa(a,b){if(s)throw ca("missingattr",
+        a,b);}function qa(a,c,d,e,g){function f(b,c,e){C(d.$onChanges)&&!cc(c,e)&&(ha||(a.$$postDigest(N),ha=[]),m||(m={},ha.push(h)),m[b]&&(e=m[b].previousValue),m[b]=new Jb(e,c))}function h(){d.$onChanges(m);m=void 0}var k=[],l={},m;r(e,function(e,h){var m=e.attrName,n=e.optional,t,G,s,F;switch(e.mode){case "@":n||ra.call(c,m)||(pa(m,g.name),d[h]=c[m]=void 0);n=c.$observe(m,function(a){if(E(a)||Na(a))f(h,a,d[h]),d[h]=a});c.$$observers[m].$$scope=a;t=c[m];E(t)?d[h]=b(t)(a):Na(t)&&(d[h]=t);l[h]=new Jb(sc,
+        d[h]);k.push(n);break;case "=":if(!ra.call(c,m)){if(n)break;pa(m,g.name);c[m]=void 0}if(n&&!c[m])break;G=p(c[m]);F=G.literal?sa:cc;s=G.assign||function(){t=d[h]=G(a);throw ca("nonassign",c[m],m,g.name);};t=d[h]=G(a);n=function(b){F(b,d[h])||(F(b,t)?s(a,b=d[h]):d[h]=b);return t=b};n.$stateful=!0;n=e.collection?a.$watchCollection(c[m],n):a.$watch(p(c[m],n),null,G.literal);k.push(n);break;case "<":if(!ra.call(c,m)){if(n)break;pa(m,g.name);c[m]=void 0}if(n&&!c[m])break;G=p(c[m]);var v=G.literal,y=d[h]=
+        G(a);l[h]=new Jb(sc,d[h]);n=a.$watch(G,function(a,b){if(b===a){if(b===y||v&&sa(b,y))return;b=y}f(h,a,b);d[h]=a},v);k.push(n);break;case "&":n||ra.call(c,m)||pa(m,g.name);G=c.hasOwnProperty(m)?p(c[m]):D;if(G===D&&n)break;d[h]=function(b){return G(a,b)}}});return{initialChanges:l,removeWatches:k.length&&function(){for(var a=0,b=k.length;a<b;++a)k[a]()}}}var Ja=/^\w/,Ba=w.document.createElement("div"),Ka=y,La=t,Fa=v,ha;qc.prototype={$normalize:Ea,$addClass:function(a){a&&0<a.length&&P.addClass(this.$$element,
+            a)},$removeClass:function(a){a&&0<a.length&&P.removeClass(this.$$element,a)},$updateClass:function(a,b){var c=rd(a,b);c&&c.length&&P.addClass(this.$$element,c);(c=rd(b,a))&&c.length&&P.removeClass(this.$$element,c)},$set:function(a,b,d,e){var g=kd(this.$$element[0],a),f=sd[a],h=a;g?(this.$$element.prop(a,b),e=g):f&&(this[f]=b,h=f);this[a]=b;e?this.$attr[a]=e:(e=this.$attr[a])||(this.$attr[a]=e=Vc(a,"-"));g=ya(this.$$element);if("a"===g&&("href"===a||"xlinkHref"===a)||"img"===g&&"src"===a)this[a]=
+            b=q(b,"src"===a);else if("img"===g&&"srcset"===a&&u(b)){for(var g="",f=Q(b),k=/(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/,k=/\s/.test(f)?k:/(,)/,f=f.split(k),k=Math.floor(f.length/2),l=0;l<k;l++)var m=2*l,g=g+q(Q(f[m]),!0),g=g+(" "+Q(f[m+1]));f=Q(f[2*l]).split(/\s/);g+=q(Q(f[0]),!0);2===f.length&&(g+=" "+Q(f[1]));this[a]=b=g}!1!==d&&(null===b||x(b)?this.$$element.removeAttr(e):Ja.test(e)?this.$$element.attr(e,b):Ta(this.$$element[0],e,b));(a=this.$$observers)&&r(a[h],function(a){try{a(b)}catch(d){c(d)}})},
+        $observe:function(a,b){var c=this,d=c.$$observers||(c.$$observers=S()),e=d[a]||(d[a]=[]);e.push(b);M.$evalAsync(function(){e.$$inter||!c.hasOwnProperty(a)||x(c[a])||b(c[a])});return function(){cb(e,b)}}};var Ga=b.startSymbol(),Ha=b.endSymbol(),Ia="{{"===Ga&&"}}"===Ha?ab:function(a){return a.replace(/\{\{/g,Ga).replace(/}}/g,Ha)},Pa=/^ngAttr[A-Z]/,Qa=/^(.+)Start$/;da.$$addBindingInfo=n?function(a,b){var c=a.data("$binding")||[];I(b)?c=c.concat(b):c.push(b);a.data("$binding",c)}:D;da.$$addBindingClass=
+        n?function(a){na(a,"ng-binding")}:D;da.$$addScopeInfo=n?function(a,b,c,d){a.data(c?d?"$isolateScopeNoTemplate":"$isolateScope":"$scope",b)}:D;da.$$addScopeClass=n?function(a,b){na(a,b?"ng-isolate-scope":"ng-scope")}:D;da.$$createComment=function(a,b){var c="";n&&(c=" "+(a||"")+": ",b&&(c+=b+" "));return w.document.createComment(c)};return da}]}function Jb(a,b){this.previousValue=a;this.currentValue=b}function Ea(a){return a.replace(od,"").replace(tg,function(a,d,c){return c?d.toUpperCase():d})}function rd(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       b){var d="",c=a.split(/\s+/),e=b.split(/\s+/),f=0;a:for(;f<c.length;f++){for(var g=c[f],h=0;h<e.length;h++)if(g===e[h])continue a;d+=(0<d.length?" ":"")+g}return d}function qd(a){a=z(a);var b=a.length;if(1>=b)return a;for(;b--;){var d=a[b];(8===d.nodeType||d.nodeType===Oa&&""===d.nodeValue.trim())&&ug.call(a,b,1)}return a}function sg(a,b){if(b&&E(b))return b;if(E(a)){var d=td.exec(a);if(d)return d[3]}}function yf(){var a={},b=!1;this.has=function(b){return a.hasOwnProperty(b)};this.register=function(b,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                c){Ia(b,"controller");B(b)?O(a,b):a[b]=c};this.allowGlobals=function(){b=!0};this.$get=["$injector","$window",function(d,c){function e(a,b,c,d){if(!a||!B(a.$scope))throw K("$controller")("noscp",d,b);a.$scope[b]=c}return function(f,g,h,k){var l,m,p;h=!0===h;k&&E(k)&&(p=k);if(E(f)){k=f.match(td);if(!k)throw ud("ctrlfmt",f);m=k[1];p=p||k[3];f=a.hasOwnProperty(m)?a[m]:Xc(g.$scope,m,!0)||(b?Xc(c,m,!0):void 0);if(!f)throw ud("ctrlreg",m);sb(f,m,!0)}if(h)return h=(I(f)?f[f.length-1]:f).prototype,l=Object.create(h||
+        null),p&&e(g,p,l,m||f.name),O(function(){var a=d.invoke(f,l,g,m);a!==l&&(B(a)||C(a))&&(l=a,p&&e(g,p,l,m||f.name));return l},{instance:l,identifier:p});l=d.instantiate(f,g,m);p&&e(g,p,l,m||f.name);return l}}]}function zf(){this.$get=["$window",function(a){return z(a.document)}]}function Af(){this.$get=["$document","$rootScope",function(a,b){function d(){e=c.hidden}var c=a[0],e=c&&c.hidden;a.on("visibilitychange",d);b.$on("$destroy",function(){a.off("visibilitychange",d)});return function(){return e}}]}
+    function Bf(){this.$get=["$log",function(a){return function(b,d){a.error.apply(a,arguments)}}]}function tc(a){return B(a)?fa(a)?a.toISOString():eb(a):a}function Gf(){this.$get=function(){return function(a){if(!a)return"";var b=[];Oc(a,function(a,c){null===a||x(a)||C(a)||(I(a)?r(a,function(a){b.push(ja(c)+"="+ja(tc(a)))}):b.push(ja(c)+"="+ja(tc(a))))});return b.join("&")}}}function Hf(){this.$get=function(){return function(a){function b(a,e,f){null===a||x(a)||(I(a)?r(a,function(a,c){b(a,e+"["+(B(a)?
+        c:"")+"]")}):B(a)&&!fa(a)?Oc(a,function(a,c){b(a,e+(f?"":"[")+c+(f?"":"]"))}):d.push(ja(e)+"="+ja(tc(a))))}if(!a)return"";var d=[];b(a,"",!0);return d.join("&")}}}function uc(a,b){if(E(a)){var d=a.replace(vg,"").trim();if(d){var c=b("Content-Type"),c=c&&0===c.indexOf(vd),e;(e=c)||(e=(e=d.match(wg))&&xg[e[0]].test(d));if(e)try{a=Rc(d)}catch(f){if(!c)return a;throw Kb("baddata",a,f);}}}return a}function wd(a){var b=S(),d;E(a)?r(a.split("\n"),function(a){d=a.indexOf(":");var e=L(Q(a.substr(0,d)));a=
+        Q(a.substr(d+1));e&&(b[e]=b[e]?b[e]+", "+a:a)}):B(a)&&r(a,function(a,d){var f=L(d),g=Q(a);f&&(b[f]=b[f]?b[f]+", "+g:g)});return b}function xd(a){var b;return function(d){b||(b=wd(a));return d?(d=b[L(d)],void 0===d&&(d=null),d):b}}function yd(a,b,d,c){if(C(c))return c(a,b,d);r(c,function(c){a=c(a,b,d)});return a}function Ff(){var a=this.defaults={transformResponse:[uc],transformRequest:[function(a){return B(a)&&"[object File]"!==ia.call(a)&&"[object Blob]"!==ia.call(a)&&"[object FormData]"!==ia.call(a)?
+            eb(a):a}],headers:{common:{Accept:"application/json, text/plain, */*"},post:ka(vc),put:ka(vc),patch:ka(vc)},xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",paramSerializer:"$httpParamSerializer",jsonpCallbackParam:"callback"},b=!1;this.useApplyAsync=function(a){return u(a)?(b=!!a,this):b};var d=this.interceptors=[];this.$get=["$browser","$httpBackend","$$cookieReader","$cacheFactory","$rootScope","$q","$injector","$sce",function(c,e,f,g,h,k,l,m){function p(b){function d(a,b){for(var c=0,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              e=b.length;c<e;){var g=b[c++],f=b[c++];a=a.then(g,f)}b.length=0;return a}function e(a,b){var c,d={};r(a,function(a,e){C(a)?(c=a(b),null!=c&&(d[e]=c)):d[e]=a});return d}function g(a){var b=O({},a);b.data=yd(a.data,a.headers,a.status,f.transformResponse);a=a.status;return 200<=a&&300>a?b:k.reject(b)}if(!B(b))throw K("$http")("badreq",b);if(!E(m.valueOf(b.url)))throw K("$http")("badreq",b.url);var f=O({method:"get",transformRequest:a.transformRequest,transformResponse:a.transformResponse,paramSerializer:a.paramSerializer,
+        jsonpCallbackParam:a.jsonpCallbackParam},b);f.headers=function(b){var c=a.headers,d=O({},b.headers),g,f,h,c=O({},c.common,c[L(b.method)]);a:for(g in c){f=L(g);for(h in d)if(L(h)===f)continue a;d[g]=c[g]}return e(d,ka(b))}(b);f.method=ub(f.method);f.paramSerializer=E(f.paramSerializer)?l.get(f.paramSerializer):f.paramSerializer;c.$$incOutstandingRequestCount();var h=[],p=[];b=k.resolve(f);r(y,function(a){(a.request||a.requestError)&&h.unshift(a.request,a.requestError);(a.response||a.responseError)&&
+    p.push(a.response,a.responseError)});b=d(b,h);b=b.then(function(b){var c=b.headers,d=yd(b.data,xd(c),void 0,b.transformRequest);x(d)&&r(c,function(a,b){"content-type"===L(b)&&delete c[b]});x(b.withCredentials)&&!x(a.withCredentials)&&(b.withCredentials=a.withCredentials);return n(b,d).then(g,g)});b=d(b,p);return b=b.finally(function(){c.$$completeOutstandingRequest(D)})}function n(c,d){function g(a){if(a){var c={};r(a,function(a,d){c[d]=function(c){function d(){a(c)}b?h.$applyAsync(d):h.$$phase?d():
+        h.$apply(d)}});return c}}function l(a,c,d,e,g){function f(){n(c,a,d,e,g)}M&&(200<=a&&300>a?M.put(N,[a,c,wd(d),e,g]):M.remove(N));b?h.$applyAsync(f):(f(),h.$$phase||h.$apply())}function n(a,b,d,e,g){b=-1<=b?b:0;(200<=b&&300>b?J.resolve:J.reject)({data:a,status:b,headers:xd(d),config:c,statusText:e,xhrStatus:g})}function G(a){n(a.data,a.status,ka(a.headers()),a.statusText,a.xhrStatus)}function y(){var a=p.pendingRequests.indexOf(c);-1!==a&&p.pendingRequests.splice(a,1)}var J=k.defer(),R=J.promise,M,
+        T,P=c.headers,q="jsonp"===L(c.method),N=c.url;q?N=m.getTrustedResourceUrl(N):E(N)||(N=m.valueOf(N));N=F(N,c.paramSerializer(c.params));q&&(N=s(N,c.jsonpCallbackParam));p.pendingRequests.push(c);R.then(y,y);!c.cache&&!a.cache||!1===c.cache||"GET"!==c.method&&"JSONP"!==c.method||(M=B(c.cache)?c.cache:B(a.cache)?a.cache:v);M&&(T=M.get(N),u(T)?T&&C(T.then)?T.then(G,G):I(T)?n(T[1],T[0],ka(T[2]),T[3],T[4]):n(T,200,{},"OK","complete"):M.put(N,R));x(T)&&((T=zd(c.url)?f()[c.xsrfCookieName||a.xsrfCookieName]:
+        void 0)&&(P[c.xsrfHeaderName||a.xsrfHeaderName]=T),e(c.method,N,d,l,P,c.timeout,c.withCredentials,c.responseType,g(c.eventHandlers),g(c.uploadEventHandlers)));return R}function F(a,b){0<b.length&&(a+=(-1===a.indexOf("?")?"?":"&")+b);return a}function s(a,b){var c=a.split("?");if(2<c.length)throw Kb("badjsonp",a);c=ec(c[1]);r(c,function(c,d){if("JSON_CALLBACK"===c)throw Kb("badjsonp",a);if(d===b)throw Kb("badjsonp",b,a);});return a+=(-1===a.indexOf("?")?"?":"&")+b+"=JSON_CALLBACK"}var v=g("$http");
+        a.paramSerializer=E(a.paramSerializer)?l.get(a.paramSerializer):a.paramSerializer;var y=[];r(d,function(a){y.unshift(E(a)?l.get(a):l.invoke(a))});p.pendingRequests=[];(function(a){r(arguments,function(a){p[a]=function(b,c){return p(O({},c||{},{method:a,url:b}))}})})("get","delete","head","jsonp");(function(a){r(arguments,function(a){p[a]=function(b,c,d){return p(O({},d||{},{method:a,url:b,data:c}))}})})("post","put","patch");p.defaults=a;return p}]}function Jf(){this.$get=function(){return function(){return new w.XMLHttpRequest}}}
+    function If(){this.$get=["$browser","$jsonpCallbacks","$document","$xhrFactory",function(a,b,d,c){return yg(a,c,a.defer,b,d[0])}]}function yg(a,b,d,c,e){function f(a,b,d){a=a.replace("JSON_CALLBACK",b);var f=e.createElement("script"),m=null;f.type="text/javascript";f.src=a;f.async=!0;m=function(a){f.removeEventListener("load",m);f.removeEventListener("error",m);e.body.removeChild(f);f=null;var g=-1,F="unknown";a&&("load"!==a.type||c.wasCalled(b)||(a={type:"error"}),F=a.type,g="error"===a.type?404:
+        200);d&&d(g,F)};f.addEventListener("load",m);f.addEventListener("error",m);e.body.appendChild(f);return m}return function(e,h,k,l,m,p,n,F,s,v){function y(){q&&q();A&&A.abort()}function t(a,b,c,e,g,f){u(G)&&d.cancel(G);q=A=null;a(b,c,e,g,f)}h=h||a.url();if("jsonp"===L(e))var Aa=c.createCallback(h),q=f(h,Aa,function(a,b){var d=200===a&&c.getResponse(Aa);t(l,a,d,"",b,"complete");c.removeCallback(Aa)});else{var A=b(e,h);A.open(e,h,!0);r(m,function(a,b){u(a)&&A.setRequestHeader(b,a)});A.onload=function(){var a=
+        A.statusText||"",b="response"in A?A.response:A.responseText,c=1223===A.status?204:A.status;0===c&&(c=b?200:"file"===ta(h).protocol?404:0);t(l,c,b,A.getAllResponseHeaders(),a,"complete")};A.onerror=function(){t(l,-1,null,null,"","error")};A.onabort=function(){t(l,-1,null,null,"","abort")};A.ontimeout=function(){t(l,-1,null,null,"","timeout")};r(s,function(a,b){A.addEventListener(b,a)});r(v,function(a,b){A.upload.addEventListener(b,a)});n&&(A.withCredentials=!0);if(F)try{A.responseType=F}catch(H){if("json"!==
+        F)throw H;}A.send(x(k)?null:k)}if(0<p)var G=d(y,p);else p&&C(p.then)&&p.then(y)}}function Df(){var a="{{",b="}}";this.startSymbol=function(b){return b?(a=b,this):a};this.endSymbol=function(a){return a?(b=a,this):b};this.$get=["$parse","$exceptionHandler","$sce",function(d,c,e){function f(a){return"\\\\\\"+a}function g(c){return c.replace(p,a).replace(n,b)}function h(a,b,c,d){var e=a.$watch(function(a){e();return d(a)},b,c);return e}function k(f,k,p,n){function t(a){try{var b=a;a=p?e.getTrusted(p,
+        b):e.valueOf(b);return n&&!u(a)?a:gc(a)}catch(d){c(Fa.interr(f,d))}}if(!f.length||-1===f.indexOf(a)){var r;k||(k=g(f),r=la(k),r.exp=f,r.expressions=[],r.$$watchDelegate=h);return r}n=!!n;var q,A,H=0,G=[],ba=[];r=f.length;for(var J=[],R=[];H<r;)if(-1!==(q=f.indexOf(a,H))&&-1!==(A=f.indexOf(b,q+l)))H!==q&&J.push(g(f.substring(H,q))),H=f.substring(q+l,A),G.push(H),ba.push(d(H,t)),H=A+m,R.push(J.length),J.push("");else{H!==r&&J.push(g(f.substring(H)));break}p&&1<J.length&&Fa.throwNoconcat(f);if(!k||G.length){var M=
+        function(a){for(var b=0,c=G.length;b<c;b++){if(n&&x(a[b]))return;J[R[b]]=a[b]}return J.join("")};return O(function(a){var b=0,d=G.length,e=Array(d);try{for(;b<d;b++)e[b]=ba[b](a);return M(e)}catch(g){c(Fa.interr(f,g))}},{exp:f,expressions:G,$$watchDelegate:function(a,b){var c;return a.$watchGroup(ba,function(d,e){var g=M(d);b.call(this,g,d!==e?c:g,a);c=g})}})}}var l=a.length,m=b.length,p=new RegExp(a.replace(/./g,f),"g"),n=new RegExp(b.replace(/./g,f),"g");k.startSymbol=function(){return a};k.endSymbol=
+        function(){return b};return k}]}function Ef(){this.$get=["$rootScope","$window","$q","$$q","$browser",function(a,b,d,c,e){function f(f,k,l,m){function p(){n?f.apply(null,F):f(y)}var n=4<arguments.length,F=n?xa.call(arguments,4):[],s=b.setInterval,v=b.clearInterval,y=0,t=u(m)&&!m,r=(t?c:d).defer(),q=r.promise;l=u(l)?l:0;q.$$intervalId=s(function(){t?e.defer(p):a.$evalAsync(p);r.notify(y++);0<l&&y>=l&&(r.resolve(y),v(q.$$intervalId),delete g[q.$$intervalId]);t||a.$apply()},k);g[q.$$intervalId]=r;return q}
+        var g={};f.cancel=function(a){return a&&a.$$intervalId in g?(g[a.$$intervalId].promise.$$state.pur=!0,g[a.$$intervalId].reject("canceled"),b.clearInterval(a.$$intervalId),delete g[a.$$intervalId],!0):!1};return f}]}function wc(a){a=a.split("/");for(var b=a.length;b--;)a[b]=fb(a[b].replace(/%2F/g,"/"));return a.join("/")}function Ad(a,b){var d=ta(a);b.$$protocol=d.protocol;b.$$host=d.hostname;b.$$port=Z(d.port)||zg[d.protocol]||null}function Bd(a,b,d){if(Ag.test(a))throw kb("badpath",a);var c="/"!==
+        a.charAt(0);c&&(a="/"+a);a=ta(a);for(var c=(c&&"/"===a.pathname.charAt(0)?a.pathname.substring(1):a.pathname).split("/"),e=c.length;e--;)c[e]=decodeURIComponent(c[e]),d&&(c[e]=c[e].replace(/\//g,"%2F"));d=c.join("/");b.$$path=d;b.$$search=ec(a.search);b.$$hash=decodeURIComponent(a.hash);b.$$path&&"/"!==b.$$path.charAt(0)&&(b.$$path="/"+b.$$path)}function xc(a,b){return a.slice(0,b.length)===b}function ua(a,b){if(xc(b,a))return b.substr(a.length)}function La(a){var b=a.indexOf("#");return-1===b?a:
+        a.substr(0,b)}function lb(a){return a.replace(/(#.+)|#$/,"$1")}function yc(a,b,d){this.$$html5=!0;d=d||"";Ad(a,this);this.$$parse=function(a){var d=ua(b,a);if(!E(d))throw kb("ipthprfx",a,b);Bd(d,this,!0);this.$$path||(this.$$path="/");this.$$compose()};this.$$compose=function(){var a=fc(this.$$search),d=this.$$hash?"#"+fb(this.$$hash):"";this.$$url=wc(this.$$path)+(a?"?"+a:"")+d;this.$$absUrl=b+this.$$url.substr(1);this.$$urlUpdatedByLocation=!0};this.$$parseLinkUrl=function(c,e){if(e&&"#"===e[0])return this.hash(e.slice(1)),
+        !0;var f,g;u(f=ua(a,c))?(g=f,g=d&&u(f=ua(d,f))?b+(ua("/",f)||f):a+g):u(f=ua(b,c))?g=b+f:b===c+"/"&&(g=b);g&&this.$$parse(g);return!!g}}function zc(a,b,d){Ad(a,this);this.$$parse=function(c){var e=ua(a,c)||ua(b,c),f;x(e)||"#"!==e.charAt(0)?this.$$html5?f=e:(f="",x(e)&&(a=c,this.replace())):(f=ua(d,e),x(f)&&(f=e));Bd(f,this,!1);c=this.$$path;var e=a,g=/^\/[A-Z]:(\/.*)/;xc(f,e)&&(f=f.replace(e,""));g.exec(f)||(c=(f=g.exec(c))?f[1]:c);this.$$path=c;this.$$compose()};this.$$compose=function(){var b=fc(this.$$search),
+        e=this.$$hash?"#"+fb(this.$$hash):"";this.$$url=wc(this.$$path)+(b?"?"+b:"")+e;this.$$absUrl=a+(this.$$url?d+this.$$url:"");this.$$urlUpdatedByLocation=!0};this.$$parseLinkUrl=function(b,d){return La(a)===La(b)?(this.$$parse(b),!0):!1}}function Cd(a,b,d){this.$$html5=!0;zc.apply(this,arguments);this.$$parseLinkUrl=function(c,e){if(e&&"#"===e[0])return this.hash(e.slice(1)),!0;var f,g;a===La(c)?f=c:(g=ua(b,c))?f=a+d+g:b===c+"/"&&(f=b);f&&this.$$parse(f);return!!f};this.$$compose=function(){var b=fc(this.$$search),
+        e=this.$$hash?"#"+fb(this.$$hash):"";this.$$url=wc(this.$$path)+(b?"?"+b:"")+e;this.$$absUrl=a+d+this.$$url;this.$$urlUpdatedByLocation=!0}}function Lb(a){return function(){return this[a]}}function Dd(a,b){return function(d){if(x(d))return this[a];this[a]=b(d);this.$$compose();return this}}function Lf(){var a="!",b={enabled:!1,requireBase:!0,rewriteLinks:!0};this.hashPrefix=function(b){return u(b)?(a=b,this):a};this.html5Mode=function(a){if(Na(a))return b.enabled=a,this;if(B(a)){Na(a.enabled)&&(b.enabled=
+        a.enabled);Na(a.requireBase)&&(b.requireBase=a.requireBase);if(Na(a.rewriteLinks)||E(a.rewriteLinks))b.rewriteLinks=a.rewriteLinks;return this}return b};this.$get=["$rootScope","$browser","$sniffer","$rootElement","$window",function(d,c,e,f,g){function h(a,b,d){var e=l.url(),g=l.$$state;try{c.url(a,b,d),l.$$state=c.state()}catch(f){throw l.url(e),l.$$state=g,f;}}function k(a,b){d.$broadcast("$locationChangeSuccess",l.absUrl(),a,l.$$state,b)}var l,m;m=c.baseHref();var p=c.url(),n;if(b.enabled){if(!m&&
+        b.requireBase)throw kb("nobase");n=p.substring(0,p.indexOf("/",p.indexOf("//")+2))+(m||"/");m=e.history?yc:Cd}else n=La(p),m=zc;var F=n.substr(0,La(n).lastIndexOf("/")+1);l=new m(n,F,"#"+a);l.$$parseLinkUrl(p,p);l.$$state=c.state();var s=/^\s*(javascript|mailto):/i;f.on("click",function(a){var e=b.rewriteLinks;if(e&&!a.ctrlKey&&!a.metaKey&&!a.shiftKey&&2!==a.which&&2!==a.button){for(var h=z(a.target);"a"!==ya(h[0]);)if(h[0]===f[0]||!(h=h.parent())[0])return;if(!E(e)||!x(h.attr(e))){var e=h.prop("href"),
+        k=h.attr("href")||h.attr("xlink:href");B(e)&&"[object SVGAnimatedString]"===e.toString()&&(e=ta(e.animVal).href);s.test(e)||!e||h.attr("target")||a.isDefaultPrevented()||!l.$$parseLinkUrl(e,k)||(a.preventDefault(),l.absUrl()!==c.url()&&(d.$apply(),g.angular["ff-684208-preventDefault"]=!0))}}});lb(l.absUrl())!==lb(p)&&c.url(l.absUrl(),!0);var v=!0;c.onUrlChange(function(a,b){xc(a,F)?(d.$evalAsync(function(){var c=l.absUrl(),e=l.$$state,g;a=lb(a);l.$$parse(a);l.$$state=b;g=d.$broadcast("$locationChangeStart",
+        a,c,b,e).defaultPrevented;l.absUrl()===a&&(g?(l.$$parse(c),l.$$state=e,h(c,!1,e)):(v=!1,k(c,e)))}),d.$$phase||d.$digest()):g.location.href=a});d.$watch(function(){if(v||l.$$urlUpdatedByLocation){l.$$urlUpdatedByLocation=!1;var a=lb(c.url()),b=lb(l.absUrl()),g=c.state(),f=l.$$replace,m=a!==b||l.$$html5&&e.history&&g!==l.$$state;if(v||m)v=!1,d.$evalAsync(function(){var b=l.absUrl(),c=d.$broadcast("$locationChangeStart",b,a,l.$$state,g).defaultPrevented;l.absUrl()===b&&(c?(l.$$parse(a),l.$$state=g):
+        (m&&h(b,f,g===l.$$state?null:l.$$state),k(a,g)))})}l.$$replace=!1});return l}]}function Mf(){var a=!0,b=this;this.debugEnabled=function(b){return u(b)?(a=b,this):a};this.$get=["$window",function(d){function c(a){bc(a)&&(a.stack&&f?a=a.message&&-1===a.stack.indexOf(a.message)?"Error: "+a.message+"\n"+a.stack:a.stack:a.sourceURL&&(a=a.message+"\n"+a.sourceURL+":"+a.line));return a}function e(a){var b=d.console||{},e=b[a]||b.log||D;return function(){var a=[];r(arguments,function(b){a.push(c(b))});return Function.prototype.apply.call(e,
+        b,a)}}var f=Ca||/\bEdge\//.test(d.navigator&&d.navigator.userAgent);return{log:e("log"),info:e("info"),warn:e("warn"),error:e("error"),debug:function(){var c=e("debug");return function(){a&&c.apply(b,arguments)}}()}}]}function Bg(a){return a+""}function Cg(a,b){return"undefined"!==typeof a?a:b}function Ed(a,b){return"undefined"===typeof a?b:"undefined"===typeof b?a:a+b}function Dg(a,b){switch(a.type){case q.MemberExpression:if(a.computed)return!1;break;case q.UnaryExpression:return 1;case q.BinaryExpression:return"+"!==
+    a.operator?1:!1;case q.CallExpression:return!1}return void 0===b?Fd:b}function W(a,b,d){var c,e,f=a.isPure=Dg(a,d);switch(a.type){case q.Program:c=!0;r(a.body,function(a){W(a.expression,b,f);c=c&&a.expression.constant});a.constant=c;break;case q.Literal:a.constant=!0;a.toWatch=[];break;case q.UnaryExpression:W(a.argument,b,f);a.constant=a.argument.constant;a.toWatch=a.argument.toWatch;break;case q.BinaryExpression:W(a.left,b,f);W(a.right,b,f);a.constant=a.left.constant&&a.right.constant;a.toWatch=
+        a.left.toWatch.concat(a.right.toWatch);break;case q.LogicalExpression:W(a.left,b,f);W(a.right,b,f);a.constant=a.left.constant&&a.right.constant;a.toWatch=a.constant?[]:[a];break;case q.ConditionalExpression:W(a.test,b,f);W(a.alternate,b,f);W(a.consequent,b,f);a.constant=a.test.constant&&a.alternate.constant&&a.consequent.constant;a.toWatch=a.constant?[]:[a];break;case q.Identifier:a.constant=!1;a.toWatch=[a];break;case q.MemberExpression:W(a.object,b,f);a.computed&&W(a.property,b,f);a.constant=a.object.constant&&
+        (!a.computed||a.property.constant);a.toWatch=a.constant?[]:[a];break;case q.CallExpression:c=d=a.filter?!b(a.callee.name).$stateful:!1;e=[];r(a.arguments,function(a){W(a,b,f);c=c&&a.constant;e.push.apply(e,a.toWatch)});a.constant=c;a.toWatch=d?e:[a];break;case q.AssignmentExpression:W(a.left,b,f);W(a.right,b,f);a.constant=a.left.constant&&a.right.constant;a.toWatch=[a];break;case q.ArrayExpression:c=!0;e=[];r(a.elements,function(a){W(a,b,f);c=c&&a.constant;e.push.apply(e,a.toWatch)});a.constant=c;
+        a.toWatch=e;break;case q.ObjectExpression:c=!0;e=[];r(a.properties,function(a){W(a.value,b,f);c=c&&a.value.constant;e.push.apply(e,a.value.toWatch);a.computed&&(W(a.key,b,!1),c=c&&a.key.constant,e.push.apply(e,a.key.toWatch))});a.constant=c;a.toWatch=e;break;case q.ThisExpression:a.constant=!1;a.toWatch=[];break;case q.LocalsExpression:a.constant=!1,a.toWatch=[]}}function Gd(a){if(1===a.length){a=a[0].expression;var b=a.toWatch;return 1!==b.length?b:b[0]!==a?b:void 0}}function Hd(a){return a.type===
+        q.Identifier||a.type===q.MemberExpression}function Id(a){if(1===a.body.length&&Hd(a.body[0].expression))return{type:q.AssignmentExpression,left:a.body[0].expression,right:{type:q.NGValueParameter},operator:"="}}function Jd(a){this.$filter=a}function Kd(a){this.$filter=a}function Mb(a,b,d){this.ast=new q(a,d);this.astCompiler=d.csp?new Kd(b):new Jd(b)}function Ac(a){return C(a.valueOf)?a.valueOf():Eg.call(a)}function Nf(){var a=S(),b={"true":!0,"false":!1,"null":null,undefined:void 0},d,c;this.addLiteral=
+        function(a,c){b[a]=c};this.setIdentifierFns=function(a,b){d=a;c=b;return this};this.$get=["$filter",function(e){function f(b,c){var d,g;switch(typeof b){case "string":return g=b=b.trim(),d=a[g],d||(d=new Nb(n),d=(new Mb(d,e,n)).parse(b),d.constant?d.$$watchDelegate=m:d.oneTime?d.$$watchDelegate=d.literal?l:k:d.inputs&&(d.$$watchDelegate=h),a[g]=d),p(d,c);case "function":return p(b,c);default:return p(D,c)}}function g(a,b,c){return null==a||null==b?a===b:"object"!==typeof a||(a=Ac(a),"object"!==typeof a||
+    c)?a===b||a!==a&&b!==b:!1}function h(a,b,c,d,e){var f=d.inputs,h;if(1===f.length){var k=g,f=f[0];return a.$watch(function(a){var b=f(a);g(b,k,f.isPure)||(h=d(a,void 0,void 0,[b]),k=b&&Ac(b));return h},b,c,e)}for(var l=[],m=[],p=0,n=f.length;p<n;p++)l[p]=g,m[p]=null;return a.$watch(function(a){for(var b=!1,c=0,e=f.length;c<e;c++){var k=f[c](a);if(b||(b=!g(k,l[c],f[c].isPure)))m[c]=k,l[c]=k&&Ac(k)}b&&(h=d(a,void 0,void 0,m));return h},b,c,e)}function k(a,b,c,d,e){function g(a){return d(a)}function f(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           c,d){l=a;C(b)&&b(a,c,d);u(a)&&d.$$postDigest(function(){u(l)&&k()})}var k,l;return k=d.inputs?h(a,f,c,d,e):a.$watch(g,f,c)}function l(a,b,c,d){function e(a){var b=!0;r(a,function(a){u(a)||(b=!1)});return b}var g,f;return g=a.$watch(function(a){return d(a)},function(a,c,d){f=a;C(b)&&b(a,c,d);e(a)&&d.$$postDigest(function(){e(f)&&g()})},c)}function m(a,b,c,d){var e=a.$watch(function(a){e();return d(a)},b,c);return e}function p(a,b){if(!b)return a;var c=a.$$watchDelegate,d=!1,e=c!==l&&c!==k?function(c,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 e,g,f){g=d&&f?f[0]:a(c,e,g,f);return b(g,c,e)}:function(c,d,e,g){e=a(c,d,e,g);c=b(e,c,d);return u(e)?c:e},d=!a.inputs;c&&c!==h?(e.$$watchDelegate=c,e.inputs=a.inputs):b.$stateful||(e.$$watchDelegate=h,e.inputs=a.inputs?a.inputs:[a]);e.inputs&&(e.inputs=e.inputs.map(function(a){return a.isPure===Fd?function(b){return a(b)}:a}));return e}var n={csp:Ja().noUnsafeEval,literals:pa(b),isIdentifierStart:C(d)&&d,isIdentifierContinue:C(c)&&c};f.$$getAst=function(a){var b=new Nb(n);return(new Mb(b,e,n)).getAst(a).ast};
+        return f}]}function Pf(){var a=!0;this.$get=["$rootScope","$exceptionHandler",function(b,d){return Ld(function(a){b.$evalAsync(a)},d,a)}];this.errorOnUnhandledRejections=function(b){return u(b)?(a=b,this):a}}function Qf(){var a=!0;this.$get=["$browser","$exceptionHandler",function(b,d){return Ld(function(a){b.defer(a)},d,a)}];this.errorOnUnhandledRejections=function(b){return u(b)?(a=b,this):a}}function Ld(a,b,d){function c(){return new e}function e(){var a=this.promise=new f;this.resolve=function(b){k(a,
+        b)};this.reject=function(b){m(a,b)};this.notify=function(b){n(a,b)}}function f(){this.$$state={status:0}}function g(){for(;!u&&w.length;){var a=w.shift();if(!a.pur){a.pur=!0;var c=a.value,c="Possibly unhandled rejection: "+("function"===typeof c?c.toString().replace(/ \{[\s\S]*$/,""):x(c)?"undefined":"string"!==typeof c?De(c,void 0):c);bc(a.value)?b(a.value,c):b(c)}}}function h(c){!d||c.pending||2!==c.status||c.pur||(0===u&&0===w.length&&a(g),w.push(c));!c.processScheduled&&c.pending&&(c.processScheduled=
+        !0,++u,a(function(){var e,f,h;h=c.pending;c.processScheduled=!1;c.pending=void 0;try{for(var l=0,p=h.length;l<p;++l){c.pur=!0;f=h[l][0];e=h[l][c.status];try{C(e)?k(f,e(c.value)):1===c.status?k(f,c.value):m(f,c.value)}catch(n){m(f,n),n&&!0===n.$$passToExceptionHandler&&b(n)}}}finally{--u,d&&0===u&&a(g)}}))}function k(a,b){a.$$state.status||(b===a?p(a,t("qcycle",b)):l(a,b))}function l(a,b){function c(b){g||(g=!0,l(a,b))}function d(b){g||(g=!0,p(a,b))}function e(b){n(a,b)}var f,g=!1;try{if(B(b)||C(b))f=
+        b.then;C(f)?(a.$$state.status=-1,f.call(b,c,d,e)):(a.$$state.value=b,a.$$state.status=1,h(a.$$state))}catch(k){d(k)}}function m(a,b){a.$$state.status||p(a,b)}function p(a,b){a.$$state.value=b;a.$$state.status=2;h(a.$$state)}function n(c,d){var e=c.$$state.pending;0>=c.$$state.status&&e&&e.length&&a(function(){for(var a,c,g=0,f=e.length;g<f;g++){c=e[g][0];a=e[g][3];try{n(c,C(a)?a(d):d)}catch(h){b(h)}}})}function F(a){var b=new f;m(b,a);return b}function s(a,b,c){var d=null;try{C(c)&&(d=c())}catch(e){return F(e)}return d&&
+    C(d.then)?d.then(function(){return b(a)},F):b(a)}function v(a,b,c,d){var e=new f;k(e,a);return e.then(b,c,d)}function q(a){if(!C(a))throw t("norslvr",a);var b=new f;a(function(a){k(b,a)},function(a){m(b,a)});return b}var t=K("$q",TypeError),u=0,w=[];O(f.prototype,{then:function(a,b,c){if(x(a)&&x(b)&&x(c))return this;var d=new f;this.$$state.pending=this.$$state.pending||[];this.$$state.pending.push([d,a,b,c]);0<this.$$state.status&&h(this.$$state);return d},"catch":function(a){return this.then(null,
+            a)},"finally":function(a,b){return this.then(function(b){return s(b,A,a)},function(b){return s(b,F,a)},b)}});var A=v;q.prototype=f.prototype;q.defer=c;q.reject=F;q.when=v;q.resolve=A;q.all=function(a){var b=new f,c=0,d=I(a)?[]:{};r(a,function(a,e){c++;v(a).then(function(a){d[e]=a;--c||k(b,d)},function(a){m(b,a)})});0===c&&k(b,d);return b};q.race=function(a){var b=c();r(a,function(a){v(a).then(b.resolve,b.reject)});return b.promise};return q}function Zf(){this.$get=["$window","$timeout",function(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                b){var d=a.requestAnimationFrame||a.webkitRequestAnimationFrame,c=a.cancelAnimationFrame||a.webkitCancelAnimationFrame||a.webkitCancelRequestAnimationFrame,e=!!d,f=e?function(a){var b=d(a);return function(){c(b)}}:function(a){var c=b(a,16.66,!1);return function(){b.cancel(c)}};f.supported=e;return f}]}function Of(){function a(a){function b(){this.$$watchers=this.$$nextSibling=this.$$childHead=this.$$childTail=null;this.$$listeners={};this.$$listenerCount={};this.$$watchersCount=0;this.$id=++qb;this.$$ChildScope=
+        null}b.prototype=a;return b}var b=10,d=K("$rootScope"),c=null,e=null;this.digestTtl=function(a){arguments.length&&(b=a);return b};this.$get=["$exceptionHandler","$parse","$browser",function(f,g,h){function k(a){a.currentScope.$$destroyed=!0}function l(a){9===Ca&&(a.$$childHead&&l(a.$$childHead),a.$$nextSibling&&l(a.$$nextSibling));a.$parent=a.$$nextSibling=a.$$prevSibling=a.$$childHead=a.$$childTail=a.$root=a.$$watchers=null}function m(){this.$id=++qb;this.$$phase=this.$parent=this.$$watchers=this.$$nextSibling=
+        this.$$prevSibling=this.$$childHead=this.$$childTail=null;this.$root=this;this.$$destroyed=!1;this.$$listeners={};this.$$listenerCount={};this.$$watchersCount=0;this.$$isolateBindings=null}function p(a){if(t.$$phase)throw d("inprog",t.$$phase);t.$$phase=a}function n(a,b){do a.$$watchersCount+=b;while(a=a.$parent)}function F(a,b,c){do a.$$listenerCount[c]-=b,0===a.$$listenerCount[c]&&delete a.$$listenerCount[c];while(a=a.$parent)}function s(){}function v(){for(;A.length;)try{A.shift()()}catch(a){f(a)}e=
+        null}function q(){null===e&&(e=h.defer(function(){t.$apply(v)}))}m.prototype={constructor:m,$new:function(b,c){var d;c=c||this;b?(d=new m,d.$root=this.$root):(this.$$ChildScope||(this.$$ChildScope=a(this)),d=new this.$$ChildScope);d.$parent=c;d.$$prevSibling=c.$$childTail;c.$$childHead?(c.$$childTail.$$nextSibling=d,c.$$childTail=d):c.$$childHead=c.$$childTail=d;(b||c!==this)&&d.$on("$destroy",k);return d},$watch:function(a,b,d,e){var f=g(a);b=C(b)?b:D;if(f.$$watchDelegate)return f.$$watchDelegate(this,
+            b,d,f,a);var h=this,k=h.$$watchers,l={fn:b,last:s,get:f,exp:e||a,eq:!!d};c=null;k||(k=h.$$watchers=[],k.$$digestWatchIndex=-1);k.unshift(l);k.$$digestWatchIndex++;n(this,1);return function(){var a=cb(k,l);0<=a&&(n(h,-1),a<k.$$digestWatchIndex&&k.$$digestWatchIndex--);c=null}},$watchGroup:function(a,b){function c(){h=!1;k?(k=!1,b(e,e,g)):b(e,d,g)}var d=Array(a.length),e=Array(a.length),f=[],g=this,h=!1,k=!0;if(!a.length){var l=!0;g.$evalAsync(function(){l&&b(e,e,g)});return function(){l=!1}}if(1===
+            a.length)return this.$watch(a[0],function(a,c,f){e[0]=a;d[0]=c;b(e,a===c?e:d,f)});r(a,function(a,b){var k=g.$watch(a,function(a,f){e[b]=a;d[b]=f;h||(h=!0,g.$evalAsync(c))});f.push(k)});return function(){for(;f.length;)f.shift()()}},$watchCollection:function(a,b){function c(a){e=a;var b,d,g,h;if(!x(e)){if(B(e))if(wa(e))for(f!==p&&(f=p,t=f.length=0,l++),a=e.length,t!==a&&(l++,f.length=t=a),b=0;b<a;b++)h=f[b],g=e[b],d=h!==h&&g!==g,d||h===g||(l++,f[b]=g);else{f!==n&&(f=n={},t=0,l++);a=0;for(b in e)ra.call(e,
+            b)&&(a++,g=e[b],h=f[b],b in f?(d=h!==h&&g!==g,d||h===g||(l++,f[b]=g)):(t++,f[b]=g,l++));if(t>a)for(b in l++,f)ra.call(e,b)||(t--,delete f[b])}else f!==e&&(f=e,l++);return l}}c.$stateful=!0;var d=this,e,f,h,k=1<b.length,l=0,m=g(a,c),p=[],n={},s=!0,t=0;return this.$watch(m,function(){s?(s=!1,b(e,e,d)):b(e,h,d);if(k)if(B(e))if(wa(e)){h=Array(e.length);for(var a=0;a<e.length;a++)h[a]=e[a]}else for(a in h={},e)ra.call(e,a)&&(h[a]=e[a]);else h=e})},$digest:function(){var a,g,k,l,m,n,r,F=b,q,A=[],y,x;p("$digest");
+            h.$$checkUrlChange();this===t&&null!==e&&(h.defer.cancel(e),v());c=null;do{r=!1;q=this;for(n=0;n<u.length;n++){try{x=u[n],l=x.fn,l(x.scope,x.locals)}catch(z){f(z)}c=null}u.length=0;a:do{if(n=q.$$watchers)for(n.$$digestWatchIndex=n.length;n.$$digestWatchIndex--;)try{if(a=n[n.$$digestWatchIndex])if(m=a.get,(g=m(q))!==(k=a.last)&&!(a.eq?sa(g,k):U(g)&&U(k)))r=!0,c=a,a.last=a.eq?pa(g,null):g,l=a.fn,l(g,k===s?g:k,q),5>F&&(y=4-F,A[y]||(A[y]=[]),A[y].push({msg:C(a.exp)?"fn: "+(a.exp.name||a.exp.toString()):
+                    a.exp,newVal:g,oldVal:k}));else if(a===c){r=!1;break a}}catch(D){f(D)}if(!(n=q.$$watchersCount&&q.$$childHead||q!==this&&q.$$nextSibling))for(;q!==this&&!(n=q.$$nextSibling);)q=q.$parent}while(q=n);if((r||u.length)&&!F--)throw t.$$phase=null,d("infdig",b,A);}while(r||u.length);for(t.$$phase=null;H<w.length;)try{w[H++]()}catch(B){f(B)}w.length=H=0;h.$$checkUrlChange()},$destroy:function(){if(!this.$$destroyed){var a=this.$parent;this.$broadcast("$destroy");this.$$destroyed=!0;this===t&&h.$$applicationDestroyed();
+            n(this,-this.$$watchersCount);for(var b in this.$$listenerCount)F(this,this.$$listenerCount[b],b);a&&a.$$childHead===this&&(a.$$childHead=this.$$nextSibling);a&&a.$$childTail===this&&(a.$$childTail=this.$$prevSibling);this.$$prevSibling&&(this.$$prevSibling.$$nextSibling=this.$$nextSibling);this.$$nextSibling&&(this.$$nextSibling.$$prevSibling=this.$$prevSibling);this.$destroy=this.$digest=this.$apply=this.$evalAsync=this.$applyAsync=D;this.$on=this.$watch=this.$watchGroup=function(){return D};this.$$listeners=
+                {};this.$$nextSibling=null;l(this)}},$eval:function(a,b){return g(a)(this,b)},$evalAsync:function(a,b){t.$$phase||u.length||h.defer(function(){u.length&&t.$digest()});u.push({scope:this,fn:g(a),locals:b})},$$postDigest:function(a){w.push(a)},$apply:function(a){try{p("$apply");try{return this.$eval(a)}finally{t.$$phase=null}}catch(b){f(b)}finally{try{t.$digest()}catch(c){throw f(c),c;}}},$applyAsync:function(a){function b(){c.$eval(a)}var c=this;a&&A.push(b);a=g(a);q()},$on:function(a,b){var c=this.$$listeners[a];
+            c||(this.$$listeners[a]=c=[]);c.push(b);var d=this;do d.$$listenerCount[a]||(d.$$listenerCount[a]=0),d.$$listenerCount[a]++;while(d=d.$parent);var e=this;return function(){var d=c.indexOf(b);-1!==d&&(delete c[d],F(e,1,a))}},$emit:function(a,b){var c=[],d,e=this,g=!1,h={name:a,targetScope:e,stopPropagation:function(){g=!0},preventDefault:function(){h.defaultPrevented=!0},defaultPrevented:!1},k=db([h],arguments,1),l,m;do{d=e.$$listeners[a]||c;h.currentScope=e;l=0;for(m=d.length;l<m;l++)if(d[l])try{d[l].apply(null,
+            k)}catch(n){f(n)}else d.splice(l,1),l--,m--;if(g)break;e=e.$parent}while(e);h.currentScope=null;return h},$broadcast:function(a,b){var c=this,d=this,e={name:a,targetScope:this,preventDefault:function(){e.defaultPrevented=!0},defaultPrevented:!1};if(!this.$$listenerCount[a])return e;for(var g=db([e],arguments,1),h,k;c=d;){e.currentScope=c;d=c.$$listeners[a]||[];h=0;for(k=d.length;h<k;h++)if(d[h])try{d[h].apply(null,g)}catch(l){f(l)}else d.splice(h,1),h--,k--;if(!(d=c.$$listenerCount[a]&&c.$$childHead||
+            c!==this&&c.$$nextSibling))for(;c!==this&&!(d=c.$$nextSibling);)c=c.$parent}e.currentScope=null;return e}};var t=new m,u=t.$$asyncQueue=[],w=t.$$postDigestQueue=[],A=t.$$applyAsyncQueue=[],H=0;return t}]}function Ge(){var a=/^\s*(https?|s?ftp|mailto|tel|file):/,b=/^\s*((https?|ftp|file|blob):|data:image\/)/;this.aHrefSanitizationWhitelist=function(b){return u(b)?(a=b,this):a};this.imgSrcSanitizationWhitelist=function(a){return u(a)?(b=a,this):b};this.$get=function(){return function(d,c){var e=c?b:
+        a,f;f=ta(d&&d.trim()).href;return""===f||f.match(e)?d:"unsafe:"+f}}}function Fg(a){if("self"===a)return a;if(E(a)){if(-1<a.indexOf("***"))throw va("iwcard",a);a=Md(a).replace(/\\\*\\\*/g,".*").replace(/\\\*/g,"[^:/.?&;]*");return new RegExp("^"+a+"$")}if($a(a))return new RegExp("^"+a.source+"$");throw va("imatcher");}function Nd(a){var b=[];u(a)&&r(a,function(a){b.push(Fg(a))});return b}function Sf(){this.SCE_CONTEXTS=oa;var a=["self"],b=[];this.resourceUrlWhitelist=function(b){arguments.length&&
+    (a=Nd(b));return a};this.resourceUrlBlacklist=function(a){arguments.length&&(b=Nd(a));return b};this.$get=["$injector",function(d){function c(a,b){return"self"===a?zd(b):!!a.exec(b.href)}function e(a){var b=function(a){this.$$unwrapTrustedValue=function(){return a}};a&&(b.prototype=new a);b.prototype.valueOf=function(){return this.$$unwrapTrustedValue()};b.prototype.toString=function(){return this.$$unwrapTrustedValue().toString()};return b}var f=function(a){throw va("unsafe");};d.has("$sanitize")&&
+    (f=d.get("$sanitize"));var g=e(),h={};h[oa.HTML]=e(g);h[oa.CSS]=e(g);h[oa.URL]=e(g);h[oa.JS]=e(g);h[oa.RESOURCE_URL]=e(h[oa.URL]);return{trustAs:function(a,b){var c=h.hasOwnProperty(a)?h[a]:null;if(!c)throw va("icontext",a,b);if(null===b||x(b)||""===b)return b;if("string"!==typeof b)throw va("itype",a);return new c(b)},getTrusted:function(d,e){if(null===e||x(e)||""===e)return e;var g=h.hasOwnProperty(d)?h[d]:null;if(g&&e instanceof g)return e.$$unwrapTrustedValue();if(d===oa.RESOURCE_URL){var g=ta(e.toString()),
+            p,n,r=!1;p=0;for(n=a.length;p<n;p++)if(c(a[p],g)){r=!0;break}if(r)for(p=0,n=b.length;p<n;p++)if(c(b[p],g)){r=!1;break}if(r)return e;throw va("insecurl",e.toString());}if(d===oa.HTML)return f(e);throw va("unsafe");},valueOf:function(a){return a instanceof g?a.$$unwrapTrustedValue():a}}}]}function Rf(){var a=!0;this.enabled=function(b){arguments.length&&(a=!!b);return a};this.$get=["$parse","$sceDelegate",function(b,d){if(a&&8>Ca)throw va("iequirks");var c=ka(oa);c.isEnabled=function(){return a};c.trustAs=
+        d.trustAs;c.getTrusted=d.getTrusted;c.valueOf=d.valueOf;a||(c.trustAs=c.getTrusted=function(a,b){return b},c.valueOf=ab);c.parseAs=function(a,d){var e=b(d);return e.literal&&e.constant?e:b(d,function(b){return c.getTrusted(a,b)})};var e=c.parseAs,f=c.getTrusted,g=c.trustAs;r(oa,function(a,b){var d=L(b);c[("parse_as_"+d).replace(Bc,wb)]=function(b){return e(a,b)};c[("get_trusted_"+d).replace(Bc,wb)]=function(b){return f(a,b)};c[("trust_as_"+d).replace(Bc,wb)]=function(b){return g(a,b)}});return c}]}
+    function Tf(){this.$get=["$window","$document",function(a,b){var d={},c=!((!a.nw||!a.nw.process)&&a.chrome&&(a.chrome.app&&a.chrome.app.runtime||!a.chrome.app&&a.chrome.runtime&&a.chrome.runtime.id))&&a.history&&a.history.pushState,e=Z((/android (\d+)/.exec(L((a.navigator||{}).userAgent))||[])[1]),f=/Boxee/i.test((a.navigator||{}).userAgent),g=b[0]||{},h=g.body&&g.body.style,k=!1,l=!1;h&&(k=!!("transition"in h||"webkitTransition"in h),l=!!("animation"in h||"webkitAnimation"in h));return{history:!(!c||
+            4>e||f),hasEvent:function(a){if("input"===a&&Ca)return!1;if(x(d[a])){var b=g.createElement("div");d[a]="on"+a in b}return d[a]},csp:Ja(),transitions:k,animations:l,android:e}}]}function Vf(){var a;this.httpOptions=function(b){return b?(a=b,this):a};this.$get=["$exceptionHandler","$templateCache","$http","$q","$sce",function(b,d,c,e,f){function g(h,k){g.totalPendingRequests++;if(!E(h)||x(d.get(h)))h=f.getTrustedResourceUrl(h);var l=c.defaults&&c.defaults.transformResponse;I(l)?l=l.filter(function(a){return a!==
+        uc}):l===uc&&(l=null);return c.get(h,O({cache:d,transformResponse:l},a)).finally(function(){g.totalPendingRequests--}).then(function(a){d.put(h,a.data);return a.data},function(a){k||(a=Gg("tpload",h,a.status,a.statusText),b(a));return e.reject(a)})}g.totalPendingRequests=0;return g}]}function Wf(){this.$get=["$rootScope","$browser","$location",function(a,b,d){return{findBindings:function(a,b,d){a=a.getElementsByClassName("ng-binding");var g=[];r(a,function(a){var c=$.element(a).data("$binding");c&&
+        r(c,function(c){d?(new RegExp("(^|\\s)"+Md(b)+"(\\s|\\||$)")).test(c)&&g.push(a):-1!==c.indexOf(b)&&g.push(a)})});return g},findModels:function(a,b,d){for(var g=["ng-","data-ng-","ng\\:"],h=0;h<g.length;++h){var k=a.querySelectorAll("["+g[h]+"model"+(d?"=":"*=")+'"'+b+'"]');if(k.length)return k}},getLocation:function(){return d.url()},setLocation:function(b){b!==d.url()&&(d.url(b),a.$digest())},whenStable:function(a){b.notifyWhenNoOutstandingRequests(a)}}}]}function Xf(){this.$get=["$rootScope","$browser",
+        "$q","$$q","$exceptionHandler",function(a,b,d,c,e){function f(f,k,l){C(f)||(l=k,k=f,f=D);var m=xa.call(arguments,3),p=u(l)&&!l,n=(p?c:d).defer(),r=n.promise,s;s=b.defer(function(){try{n.resolve(f.apply(null,m))}catch(b){n.reject(b),e(b)}finally{delete g[r.$$timeoutId]}p||a.$apply()},k);r.$$timeoutId=s;g[s]=n;return r}var g={};f.cancel=function(a){return a&&a.$$timeoutId in g?(g[a.$$timeoutId].promise.$$state.pur=!0,g[a.$$timeoutId].reject("canceled"),delete g[a.$$timeoutId],b.defer.cancel(a.$$timeoutId)):
+            !1};return f}]}function ta(a){Ca&&(X.setAttribute("href",a),a=X.href);X.setAttribute("href",a);return{href:X.href,protocol:X.protocol?X.protocol.replace(/:$/,""):"",host:X.host,search:X.search?X.search.replace(/^\?/,""):"",hash:X.hash?X.hash.replace(/^#/,""):"",hostname:X.hostname,port:X.port,pathname:"/"===X.pathname.charAt(0)?X.pathname:"/"+X.pathname}}function zd(a){a=E(a)?ta(a):a;return a.protocol===Od.protocol&&a.host===Od.host}function Yf(){this.$get=la(w)}function Pd(a){function b(a){try{return decodeURIComponent(a)}catch(b){return a}}
+        var d=a[0]||{},c={},e="";return function(){var a,g,h,k,l;try{a=d.cookie||""}catch(m){a=""}if(a!==e)for(e=a,a=e.split("; "),c={},h=0;h<a.length;h++)g=a[h],k=g.indexOf("="),0<k&&(l=b(g.substring(0,k)),x(c[l])&&(c[l]=b(g.substring(k+1))));return c}}function bg(){this.$get=Pd}function ed(a){function b(d,c){if(B(d)){var e={};r(d,function(a,c){e[c]=b(c,a)});return e}return a.factory(d+"Filter",c)}this.register=b;this.$get=["$injector",function(a){return function(b){return a.get(b+"Filter")}}];b("currency",
+        Qd);b("date",Rd);b("filter",Hg);b("json",Ig);b("limitTo",Jg);b("lowercase",Kg);b("number",Sd);b("orderBy",Td);b("uppercase",Lg)}function Hg(){return function(a,b,d,c){if(!wa(a)){if(null==a)return a;throw K("filter")("notarray",a);}c=c||"$";var e;switch(Cc(b)){case "function":break;case "boolean":case "null":case "number":case "string":e=!0;case "object":b=Mg(b,d,c,e);break;default:return a}return Array.prototype.filter.call(a,b)}}function Mg(a,b,d,c){var e=B(a)&&d in a;!0===b?b=sa:C(b)||(b=function(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                b){if(x(a))return!1;if(null===a||null===b)return a===b;if(B(b)||B(a)&&!ac(a))return!1;a=L(""+a);b=L(""+b);return-1!==a.indexOf(b)});return function(f){return e&&!B(f)?ha(f,a[d],b,d,!1):ha(f,a,b,d,c)}}function ha(a,b,d,c,e,f){var g=Cc(a),h=Cc(b);if("string"===h&&"!"===b.charAt(0))return!ha(a,b.substring(1),d,c,e);if(I(a))return a.some(function(a){return ha(a,b,d,c,e)});switch(g){case "object":var k;if(e){for(k in a)if(k.charAt&&"$"!==k.charAt(0)&&ha(a[k],b,d,c,!0))return!0;return f?!1:ha(a,b,d,c,!1)}if("object"===
+        h){for(k in b)if(f=b[k],!C(f)&&!x(f)&&(g=k===c,!ha(g?a:a[k],f,d,c,g,g)))return!1;return!0}return d(a,b);case "function":return!1;default:return d(a,b)}}function Cc(a){return null===a?"null":typeof a}function Qd(a){var b=a.NUMBER_FORMATS;return function(a,c,e){x(c)&&(c=b.CURRENCY_SYM);x(e)&&(e=b.PATTERNS[1].maxFrac);var f=c?/\u00A4/g:/\s*\u00A4\s*/g;return null==a?a:Ud(a,b.PATTERNS[1],b.GROUP_SEP,b.DECIMAL_SEP,e).replace(f,c)}}function Sd(a){var b=a.NUMBER_FORMATS;return function(a,c){return null==
+    a?a:Ud(a,b.PATTERNS[0],b.GROUP_SEP,b.DECIMAL_SEP,c)}}function Ng(a){var b=0,d,c,e,f,g;-1<(c=a.indexOf(Vd))&&(a=a.replace(Vd,""));0<(e=a.search(/e/i))?(0>c&&(c=e),c+=+a.slice(e+1),a=a.substring(0,e)):0>c&&(c=a.length);for(e=0;a.charAt(e)===Dc;e++);if(e===(g=a.length))d=[0],c=1;else{for(g--;a.charAt(g)===Dc;)g--;c-=e;d=[];for(f=0;e<=g;e++,f++)d[f]=+a.charAt(e)}c>Wd&&(d=d.splice(0,Wd-1),b=c-1,c=1);return{d:d,e:b,i:c}}function Og(a,b,d,c){var e=a.d,f=e.length-a.i;b=x(b)?Math.min(Math.max(d,f),c):+b;d=
+        b+a.i;c=e[d];if(0<d){e.splice(Math.max(a.i,d));for(var g=d;g<e.length;g++)e[g]=0}else for(f=Math.max(0,f),a.i=1,e.length=Math.max(1,d=b+1),e[0]=0,g=1;g<d;g++)e[g]=0;if(5<=c)if(0>d-1){for(c=0;c>d;c--)e.unshift(0),a.i++;e.unshift(1);a.i++}else e[d-1]++;for(;f<Math.max(0,b);f++)e.push(0);if(b=e.reduceRight(function(a,b,c,d){b+=a;d[c]=b%10;return Math.floor(b/10)},0))e.unshift(b),a.i++}function Ud(a,b,d,c,e){if(!E(a)&&!Y(a)||isNaN(a))return"";var f=!isFinite(a),g=!1,h=Math.abs(a)+"",k="";if(f)k="\u221e";
+    else{g=Ng(h);Og(g,e,b.minFrac,b.maxFrac);k=g.d;h=g.i;e=g.e;f=[];for(g=k.reduce(function(a,b){return a&&!b},!0);0>h;)k.unshift(0),h++;0<h?f=k.splice(h,k.length):(f=k,k=[0]);h=[];for(k.length>=b.lgSize&&h.unshift(k.splice(-b.lgSize,k.length).join(""));k.length>b.gSize;)h.unshift(k.splice(-b.gSize,k.length).join(""));k.length&&h.unshift(k.join(""));k=h.join(d);f.length&&(k+=c+f.join(""));e&&(k+="e+"+e)}return 0>a&&!g?b.negPre+k+b.negSuf:b.posPre+k+b.posSuf}function Ob(a,b,d,c){var e="";if(0>a||c&&0>=
+        a)c?a=-a+1:(a=-a,e="-");for(a=""+a;a.length<b;)a=Dc+a;d&&(a=a.substr(a.length-b));return e+a}function ea(a,b,d,c,e){d=d||0;return function(f){f=f["get"+a]();if(0<d||f>-d)f+=d;0===f&&-12===d&&(f=12);return Ob(f,b,c,e)}}function mb(a,b,d){return function(c,e){var f=c["get"+a](),g=ub((d?"STANDALONE":"")+(b?"SHORT":"")+a);return e[g][f]}}function Xd(a){var b=(new Date(a,0,1)).getDay();return new Date(a,0,(4>=b?5:12)-b)}function Yd(a){return function(b){var d=Xd(b.getFullYear());b=+new Date(b.getFullYear(),
+        b.getMonth(),b.getDate()+(4-b.getDay()))-+d;b=1+Math.round(b/6048E5);return Ob(b,a)}}function Ec(a,b){return 0>=a.getFullYear()?b.ERAS[0]:b.ERAS[1]}function Rd(a){function b(a){var b;if(b=a.match(d)){a=new Date(0);var f=0,g=0,h=b[8]?a.setUTCFullYear:a.setFullYear,k=b[8]?a.setUTCHours:a.setHours;b[9]&&(f=Z(b[9]+b[10]),g=Z(b[9]+b[11]));h.call(a,Z(b[1]),Z(b[2])-1,Z(b[3]));f=Z(b[4]||0)-f;g=Z(b[5]||0)-g;h=Z(b[6]||0);b=Math.round(1E3*parseFloat("0."+(b[7]||0)));k.call(a,f,g,h,b)}return a}var d=/^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;
+        return function(c,d,f){var g="",h=[],k,l;d=d||"mediumDate";d=a.DATETIME_FORMATS[d]||d;E(c)&&(c=Pg.test(c)?Z(c):b(c));Y(c)&&(c=new Date(c));if(!fa(c)||!isFinite(c.getTime()))return c;for(;d;)(l=Qg.exec(d))?(h=db(h,l,1),d=h.pop()):(h.push(d),d=null);var m=c.getTimezoneOffset();f&&(m=Sc(f,m),c=dc(c,f,!0));r(h,function(b){k=Rg[b];g+=k?k(c,a.DATETIME_FORMATS,m):"''"===b?"'":b.replace(/(^'|'$)/g,"").replace(/''/g,"'")});return g}}function Ig(){return function(a,b){x(b)&&(b=2);return eb(a,b)}}function Jg(){return function(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 b,d){b=Infinity===Math.abs(Number(b))?Number(b):Z(b);if(U(b))return a;Y(a)&&(a=a.toString());if(!wa(a))return a;d=!d||isNaN(d)?0:Z(d);d=0>d?Math.max(0,a.length+d):d;return 0<=b?Fc(a,d,d+b):0===d?Fc(a,b,a.length):Fc(a,Math.max(0,d+b),d)}}function Fc(a,b,d){return E(a)?a.slice(b,d):xa.call(a,b,d)}function Td(a){function b(b){return b.map(function(b){var c=1,d=ab;if(C(b))d=b;else if(E(b)){if("+"===b.charAt(0)||"-"===b.charAt(0))c="-"===b.charAt(0)?-1:1,b=b.substring(1);if(""!==b&&(d=a(b),d.constant))var e=
+        d(),d=function(a){return a[e]}}return{get:d,descending:c}})}function d(a){switch(typeof a){case "number":case "boolean":case "string":return!0;default:return!1}}function c(a,b){var c=0,d=a.type,k=b.type;if(d===k){var k=a.value,l=b.value;"string"===d?(k=k.toLowerCase(),l=l.toLowerCase()):"object"===d&&(B(k)&&(k=a.index),B(l)&&(l=b.index));k!==l&&(c=k<l?-1:1)}else c=d<k?-1:1;return c}return function(a,f,g,h){if(null==a)return a;if(!wa(a))throw K("orderBy")("notarray",a);I(f)||(f=[f]);0===f.length&&
+    (f=["+"]);var k=b(f),l=g?-1:1,m=C(h)?h:c;a=Array.prototype.map.call(a,function(a,b){return{value:a,tieBreaker:{value:b,type:"number",index:b},predicateValues:k.map(function(c){var e=c.get(a);c=typeof e;if(null===e)c="string",e="null";else if("object"===c)a:{if(C(e.valueOf)&&(e=e.valueOf(),d(e)))break a;ac(e)&&(e=e.toString(),d(e))}return{value:e,type:c,index:b}})}});a.sort(function(a,b){for(var d=0,e=k.length;d<e;d++){var g=m(a.predicateValues[d],b.predicateValues[d]);if(g)return g*k[d].descending*
+        l}return(m(a.tieBreaker,b.tieBreaker)||c(a.tieBreaker,b.tieBreaker))*l});return a=a.map(function(a){return a.value})}}function Qa(a){C(a)&&(a={link:a});a.restrict=a.restrict||"AC";return la(a)}function Pb(a,b,d,c,e){this.$$controls=[];this.$error={};this.$$success={};this.$pending=void 0;this.$name=e(b.name||b.ngForm||"")(d);this.$dirty=!1;this.$valid=this.$pristine=!0;this.$submitted=this.$invalid=!1;this.$$parentForm=Qb;this.$$element=a;this.$$animate=c;Zd(this)}function Zd(a){a.$$classCache={};
+        a.$$classCache[$d]=!(a.$$classCache[nb]=a.$$element.hasClass(nb))}function ae(a){function b(a,b,c){c&&!a.$$classCache[b]?(a.$$animate.addClass(a.$$element,b),a.$$classCache[b]=!0):!c&&a.$$classCache[b]&&(a.$$animate.removeClass(a.$$element,b),a.$$classCache[b]=!1)}function d(a,c,d){c=c?"-"+Vc(c,"-"):"";b(a,nb+c,!0===d);b(a,$d+c,!1===d)}var c=a.set,e=a.unset;a.clazz.prototype.$setValidity=function(a,g,h){x(g)?(this.$pending||(this.$pending={}),c(this.$pending,a,h)):(this.$pending&&e(this.$pending,
+        a,h),be(this.$pending)&&(this.$pending=void 0));Na(g)?g?(e(this.$error,a,h),c(this.$$success,a,h)):(c(this.$error,a,h),e(this.$$success,a,h)):(e(this.$error,a,h),e(this.$$success,a,h));this.$pending?(b(this,"ng-pending",!0),this.$valid=this.$invalid=void 0,d(this,"",null)):(b(this,"ng-pending",!1),this.$valid=be(this.$error),this.$invalid=!this.$valid,d(this,"",this.$valid));g=this.$pending&&this.$pending[a]?void 0:this.$error[a]?!1:this.$$success[a]?!0:null;d(this,a,g);this.$$parentForm.$setValidity(a,
+        g,this)}}function be(a){if(a)for(var b in a)if(a.hasOwnProperty(b))return!1;return!0}function Gc(a){a.$formatters.push(function(b){return a.$isEmpty(b)?b:b.toString()})}function Va(a,b,d,c,e,f){var g=L(b[0].type);if(!e.android){var h=!1;b.on("compositionstart",function(){h=!0});b.on("compositionend",function(){h=!1;l()})}var k,l=function(a){k&&(f.defer.cancel(k),k=null);if(!h){var e=b.val();a=a&&a.type;"password"===g||d.ngTrim&&"false"===d.ngTrim||(e=Q(e));(c.$viewValue!==e||""===e&&c.$$hasNativeValidators)&&
+    c.$setViewValue(e,a)}};if(e.hasEvent("input"))b.on("input",l);else{var m=function(a,b,c){k||(k=f.defer(function(){k=null;b&&b.value===c||l(a)}))};b.on("keydown",function(a){var b=a.keyCode;91===b||15<b&&19>b||37<=b&&40>=b||m(a,this,this.value)});if(e.hasEvent("paste"))b.on("paste cut drop",m)}b.on("change",l);if(ce[g]&&c.$$hasNativeValidators&&g===d.type)b.on("keydown wheel mousedown",function(a){if(!k){var b=this.validity,c=b.badInput,d=b.typeMismatch;k=f.defer(function(){k=null;b.badInput===c&&
+    b.typeMismatch===d||l(a)})}});c.$render=function(){var a=c.$isEmpty(c.$viewValue)?"":c.$viewValue;b.val()!==a&&b.val(a)}}function Rb(a,b){return function(d,c){var e,f;if(fa(d))return d;if(E(d)){'"'===d.charAt(0)&&'"'===d.charAt(d.length-1)&&(d=d.substring(1,d.length-1));if(Sg.test(d))return new Date(d);a.lastIndex=0;if(e=a.exec(d))return e.shift(),f=c?{yyyy:c.getFullYear(),MM:c.getMonth()+1,dd:c.getDate(),HH:c.getHours(),mm:c.getMinutes(),ss:c.getSeconds(),sss:c.getMilliseconds()/1E3}:{yyyy:1970,
+        MM:1,dd:1,HH:0,mm:0,ss:0,sss:0},r(e,function(a,c){c<b.length&&(f[b[c]]=+a)}),new Date(f.yyyy,f.MM-1,f.dd,f.HH,f.mm,f.ss||0,1E3*f.sss||0)}return NaN}}function ob(a,b,d,c){return function(e,f,g,h,k,l,m){function p(a){return a&&!(a.getTime&&a.getTime()!==a.getTime())}function n(a){return u(a)&&!fa(a)?d(a)||void 0:a}Hc(e,f,g,h);Va(e,f,g,h,k,l);var r=h&&h.$options.getOption("timezone"),s;h.$$parserName=a;h.$parsers.push(function(a){if(h.$isEmpty(a))return null;if(b.test(a))return a=d(a,s),r&&(a=dc(a,r)),
+        a});h.$formatters.push(function(a){if(a&&!fa(a))throw pb("datefmt",a);if(p(a))return(s=a)&&r&&(s=dc(s,r,!0)),m("date")(a,c,r);s=null;return""});if(u(g.min)||g.ngMin){var q;h.$validators.min=function(a){return!p(a)||x(q)||d(a)>=q};g.$observe("min",function(a){q=n(a);h.$validate()})}if(u(g.max)||g.ngMax){var y;h.$validators.max=function(a){return!p(a)||x(y)||d(a)<=y};g.$observe("max",function(a){y=n(a);h.$validate()})}}}function Hc(a,b,d,c){(c.$$hasNativeValidators=B(b[0].validity))&&c.$parsers.push(function(a){var c=
+        b.prop("validity")||{};return c.badInput||c.typeMismatch?void 0:a})}function de(a){a.$$parserName="number";a.$parsers.push(function(b){if(a.$isEmpty(b))return null;if(Tg.test(b))return parseFloat(b)});a.$formatters.push(function(b){if(!a.$isEmpty(b)){if(!Y(b))throw pb("numfmt",b);b=b.toString()}return b})}function Wa(a){u(a)&&!Y(a)&&(a=parseFloat(a));return U(a)?void 0:a}function Ic(a){var b=a.toString(),d=b.indexOf(".");return-1===d?-1<a&&1>a&&(a=/e-(\d+)$/.exec(b))?Number(a[1]):0:b.length-d-1}function ee(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        b,d){a=Number(a);var c=(a|0)!==a,e=(b|0)!==b,f=(d|0)!==d;if(c||e||f){var g=c?Ic(a):0,h=e?Ic(b):0,k=f?Ic(d):0,g=Math.max(g,h,k),g=Math.pow(10,g);a*=g;b*=g;d*=g;c&&(a=Math.round(a));e&&(b=Math.round(b));f&&(d=Math.round(d))}return 0===(a-b)%d}function fe(a,b,d,c,e){if(u(c)){a=a(c);if(!a.constant)throw pb("constexpr",d,c);return a(b)}return e}function Jc(a,b){function d(a,b){if(!a||!a.length)return[];if(!b||!b.length)return a;var c=[],d=0;a:for(;d<a.length;d++){for(var e=a[d],f=0;f<b.length;f++)if(e===
+        b[f])continue a;c.push(e)}return c}function c(a){var b=a;I(a)?b=a.map(c).join(" "):B(a)&&(b=Object.keys(a).filter(function(b){return a[b]}).join(" "));return b}function e(a){var b=a;if(I(a))b=a.map(e);else if(B(a)){var c=!1,b=Object.keys(a).filter(function(b){b=a[b];!c&&x(b)&&(c=!0);return b});c&&b.push(void 0)}return b}a="ngClass"+a;var f;return["$parse",function(g){return{restrict:"AC",link:function(h,k,l){function m(a,b){var c=[];r(a,function(a){if(0<b||t[a])t[a]=(t[a]||0)+b,t[a]===+(0<b)&&c.push(a)});
+            return c.join(" ")}function p(a){if(a===b){var c=w,c=m(c&&c.split(" "),1);l.$addClass(c)}else c=w,c=m(c&&c.split(" "),-1),l.$removeClass(c);u=a}function n(a){a=c(a);a!==w&&q(a)}function q(a){if(u===b){var c=w&&w.split(" "),e=a&&a.split(" "),g=d(c,e),c=d(e,c),g=m(g,-1),c=m(c,1);l.$addClass(c);l.$removeClass(g)}w=a}var s=l[a].trim(),v=":"===s.charAt(0)&&":"===s.charAt(1),s=g(s,v?e:c),y=v?n:q,t=k.data("$classCounts"),u=!0,w;t||(t=S(),k.data("$classCounts",t));"ngClass"!==a&&(f||(f=g("$index",function(a){return a&
+            1})),h.$watch(f,p));h.$watch(s,y,v)}}}]}function Sb(a,b,d,c,e,f,g,h,k){this.$modelValue=this.$viewValue=Number.NaN;this.$$rawModelValue=void 0;this.$validators={};this.$asyncValidators={};this.$parsers=[];this.$formatters=[];this.$viewChangeListeners=[];this.$untouched=!0;this.$touched=!1;this.$pristine=!0;this.$dirty=!1;this.$valid=!0;this.$invalid=!1;this.$error={};this.$$success={};this.$pending=void 0;this.$name=k(d.name||"",!1)(a);this.$$parentForm=Qb;this.$options=Tb;this.$$updateEvents="";
+        this.$$updateEventHandler=this.$$updateEventHandler.bind(this);this.$$parsedNgModel=e(d.ngModel);this.$$parsedNgModelAssign=this.$$parsedNgModel.assign;this.$$ngModelGet=this.$$parsedNgModel;this.$$ngModelSet=this.$$parsedNgModelAssign;this.$$pendingDebounce=null;this.$$parserValid=void 0;this.$$currentValidationRunId=0;Object.defineProperty(this,"$$scope",{value:a});this.$$attr=d;this.$$element=c;this.$$animate=f;this.$$timeout=g;this.$$parse=e;this.$$q=h;this.$$exceptionHandler=b;Zd(this);Ug(this)}
+    function Ug(a){a.$$scope.$watch(function(b){b=a.$$ngModelGet(b);b===a.$modelValue||a.$modelValue!==a.$modelValue&&b!==b||a.$$setModelValue(b);return b})}function Kc(a){this.$$options=a}function ge(a,b){r(b,function(b,c){u(a[c])||(a[c]=b)})}function Ga(a,b){a.prop("selected",b);a.attr("selected",b)}var Mc={objectMaxDepth:5},Vg=/^\/(.+)\/([a-z]*)$/,ra=Object.prototype.hasOwnProperty,L=function(a){return E(a)?a.toLowerCase():a},ub=function(a){return E(a)?a.toUpperCase():a},Ca,z,ma,xa=[].slice,ug=[].splice,
+        Wg=[].push,ia=Object.prototype.toString,Pc=Object.getPrototypeOf,qa=K("ng"),$=w.angular||(w.angular={}),ic,qb=0;Ca=w.document.documentMode;var U=Number.isNaN||function(a){return a!==a};D.$inject=[];ab.$inject=[];var I=Array.isArray,se=/^\[object (?:Uint8|Uint8Clamped|Uint16|Uint32|Int8|Int16|Int32|Float32|Float64)Array]$/,Q=function(a){return E(a)?a.trim():a},Md=function(a){return a.replace(/([-()[\]{}+?*.$^|,:#<!\\])/g,"\\$1").replace(/\x08/g,"\\x08")},Ja=function(){if(!u(Ja.rules)){var a=w.document.querySelector("[ng-csp]")||
+        w.document.querySelector("[data-ng-csp]");if(a){var b=a.getAttribute("ng-csp")||a.getAttribute("data-ng-csp");Ja.rules={noUnsafeEval:!b||-1!==b.indexOf("no-unsafe-eval"),noInlineStyle:!b||-1!==b.indexOf("no-inline-style")}}else{a=Ja;try{new Function(""),b=!1}catch(d){b=!0}a.rules={noUnsafeEval:b,noInlineStyle:!1}}}return Ja.rules},rb=function(){if(u(rb.name_))return rb.name_;var a,b,d=Ha.length,c,e;for(b=0;b<d;++b)if(c=Ha[b],a=w.document.querySelector("["+c.replace(":","\\:")+"jq]")){e=a.getAttribute(c+
+        "jq");break}return rb.name_=e},ue=/:/g,Ha=["ng-","data-ng-","ng:","x-ng-"],xe=function(a){var b=a.currentScript;if(!b)return!0;if(!(b instanceof w.HTMLScriptElement||b instanceof w.SVGScriptElement))return!1;b=b.attributes;return[b.getNamedItem("src"),b.getNamedItem("href"),b.getNamedItem("xlink:href")].every(function(b){if(!b)return!0;if(!b.value)return!1;var c=a.createElement("a");c.href=b.value;if(a.location.origin===c.origin)return!0;switch(c.protocol){case "http:":case "https:":case "ftp:":case "blob:":case "file:":case "data:":return!0;
+        default:return!1}})}(w.document),Ae=/[A-Z]/g,Wc=!1,Oa=3,Fe={full:"1.6.9",major:1,minor:6,dot:9,codeName:"fiery-basilisk"};V.expando="ng339";var ib=V.cache={},gg=1;V._data=function(a){return this.cache[a[this.expando]]||{}};var cg=/-([a-z])/g,Xg=/^-ms-/,Ab={mouseleave:"mouseout",mouseenter:"mouseover"},lc=K("jqLite"),fg=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,kc=/<|&#?\w+;/,dg=/<([\w:-]+)/,eg=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,aa={option:[1,'<select multiple="multiple">',
+            "</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};aa.optgroup=aa.option;aa.tbody=aa.tfoot=aa.colgroup=aa.caption=aa.thead;aa.th=aa.td;var lg=w.Node.prototype.contains||function(a){return!!(this.compareDocumentPosition(a)&16)},Sa=V.prototype={ready:gd,toString:function(){var a=[];r(this,function(b){a.push(""+b)});return"["+a.join(", ")+"]"},
+        eq:function(a){return 0<=a?z(this[a]):z(this[this.length+a])},length:0,push:Wg,sort:[].sort,splice:[].splice},Gb={};r("multiple selected checked disabled readOnly required open".split(" "),function(a){Gb[L(a)]=a});var ld={};r("input select option textarea button form details".split(" "),function(a){ld[a]=!0});var sd={ngMinlength:"minlength",ngMaxlength:"maxlength",ngMin:"min",ngMax:"max",ngPattern:"pattern",ngStep:"step"};r({data:pc,removeData:oc,hasData:function(a){for(var b in ib[a.ng339])return!0;
+            return!1},cleanData:function(a){for(var b=0,d=a.length;b<d;b++)oc(a[b])}},function(a,b){V[b]=a});r({data:pc,inheritedData:Eb,scope:function(a){return z.data(a,"$scope")||Eb(a.parentNode||a,["$isolateScope","$scope"])},isolateScope:function(a){return z.data(a,"$isolateScope")||z.data(a,"$isolateScopeNoTemplate")},controller:id,injector:function(a){return Eb(a,"$injector")},removeAttr:function(a,b){a.removeAttribute(b)},hasClass:Bb,css:function(a,b,d){b=xb(b.replace(Xg,"ms-"));if(u(d))a.style[b]=d;
+        else return a.style[b]},attr:function(a,b,d){var c=a.nodeType;if(c!==Oa&&2!==c&&8!==c&&a.getAttribute){var c=L(b),e=Gb[c];if(u(d))null===d||!1===d&&e?a.removeAttribute(b):a.setAttribute(b,e?c:d);else return a=a.getAttribute(b),e&&null!==a&&(a=c),null===a?void 0:a}},prop:function(a,b,d){if(u(d))a[b]=d;else return a[b]},text:function(){function a(a,d){if(x(d)){var c=a.nodeType;return 1===c||c===Oa?a.textContent:""}a.textContent=d}a.$dv="";return a}(),val:function(a,b){if(x(b)){if(a.multiple&&"select"===
+            ya(a)){var d=[];r(a.options,function(a){a.selected&&d.push(a.value||a.text)});return d}return a.value}a.value=b},html:function(a,b){if(x(b))return a.innerHTML;yb(a,!0);a.innerHTML=b},empty:jd},function(a,b){V.prototype[b]=function(b,c){var e,f,g=this.length;if(a!==jd&&x(2===a.length&&a!==Bb&&a!==id?b:c)){if(B(b)){for(e=0;e<g;e++)if(a===pc)a(this[e],b);else for(f in b)a(this[e],f,b[f]);return this}e=a.$dv;g=x(e)?Math.min(g,1):g;for(f=0;f<g;f++){var h=a(this[f],b,c);e=e?e+h:h}return e}for(e=0;e<g;e++)a(this[e],
+        b,c);return this}});r({removeData:oc,on:function(a,b,d,c){if(u(c))throw lc("onargs");if(jc(a)){c=zb(a,!0);var e=c.events,f=c.handle;f||(f=c.handle=ig(a,e));c=0<=b.indexOf(" ")?b.split(" "):[b];for(var g=c.length,h=function(b,c,g){var h=e[b];h||(h=e[b]=[],h.specialHandlerWrapper=c,"$destroy"===b||g||a.addEventListener(b,f));h.push(d)};g--;)b=c[g],Ab[b]?(h(Ab[b],kg),h(b,void 0,!0)):h(b)}},off:hd,one:function(a,b,d){a=z(a);a.on(b,function e(){a.off(b,d);a.off(b,e)});a.on(b,d)},replaceWith:function(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            b){var d,c=a.parentNode;yb(a);r(new V(b),function(b){d?c.insertBefore(b,d.nextSibling):c.replaceChild(b,a);d=b})},children:function(a){var b=[];r(a.childNodes,function(a){1===a.nodeType&&b.push(a)});return b},contents:function(a){return a.contentDocument||a.childNodes||[]},append:function(a,b){var d=a.nodeType;if(1===d||11===d){b=new V(b);for(var d=0,c=b.length;d<c;d++)a.appendChild(b[d])}},prepend:function(a,b){if(1===a.nodeType){var d=a.firstChild;r(new V(b),function(b){a.insertBefore(b,d)})}},
+        wrap:function(a,b){var d=z(b).eq(0).clone()[0],c=a.parentNode;c&&c.replaceChild(d,a);d.appendChild(a)},remove:Fb,detach:function(a){Fb(a,!0)},after:function(a,b){var d=a,c=a.parentNode;if(c){b=new V(b);for(var e=0,f=b.length;e<f;e++){var g=b[e];c.insertBefore(g,d.nextSibling);d=g}}},addClass:Db,removeClass:Cb,toggleClass:function(a,b,d){b&&r(b.split(" "),function(b){var e=d;x(e)&&(e=!Bb(a,b));(e?Db:Cb)(a,b)})},parent:function(a){return(a=a.parentNode)&&11!==a.nodeType?a:null},next:function(a){return a.nextElementSibling},
+        find:function(a,b){return a.getElementsByTagName?a.getElementsByTagName(b):[]},clone:nc,triggerHandler:function(a,b,d){var c,e,f=b.type||b,g=zb(a);if(g=(g=g&&g.events)&&g[f])c={preventDefault:function(){this.defaultPrevented=!0},isDefaultPrevented:function(){return!0===this.defaultPrevented},stopImmediatePropagation:function(){this.immediatePropagationStopped=!0},isImmediatePropagationStopped:function(){return!0===this.immediatePropagationStopped},stopPropagation:D,type:f,target:a},b.type&&(c=O(c,
+            b)),b=ka(g),e=d?[c].concat(d):[c],r(b,function(b){c.isImmediatePropagationStopped()||b.apply(a,e)})}},function(a,b){V.prototype[b]=function(b,c,e){for(var f,g=0,h=this.length;g<h;g++)x(f)?(f=a(this[g],b,c,e),u(f)&&(f=z(f))):mc(f,a(this[g],b,c,e));return u(f)?f:this}});V.prototype.bind=V.prototype.on;V.prototype.unbind=V.prototype.off;var Yg=Object.create(null);md.prototype={_idx:function(a){if(a===this._lastKey)return this._lastIndex;this._lastKey=a;return this._lastIndex=this._keys.indexOf(a)},_transformKey:function(a){return U(a)?
+            Yg:a},get:function(a){a=this._transformKey(a);a=this._idx(a);if(-1!==a)return this._values[a]},set:function(a,b){a=this._transformKey(a);var d=this._idx(a);-1===d&&(d=this._lastIndex=this._keys.length);this._keys[d]=a;this._values[d]=b},delete:function(a){a=this._transformKey(a);a=this._idx(a);if(-1===a)return!1;this._keys.splice(a,1);this._values.splice(a,1);this._lastKey=NaN;this._lastIndex=-1;return!0}};var Hb=md,ag=[function(){this.$get=[function(){return Hb}]}],ng=/^([^(]+?)=>/,og=/^[^(]*\(\s*([^)]*)\)/m,
+        Zg=/,/,$g=/^\s*(_?)(\S+?)\1\s*$/,mg=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg,Ba=K("$injector");gb.$$annotate=function(a,b,d){var c;if("function"===typeof a){if(!(c=a.$inject)){c=[];if(a.length){if(b)throw E(d)&&d||(d=a.name||pg(a)),Ba("strictdi",d);b=nd(a);r(b[1].split(Zg),function(a){a.replace($g,function(a,b,d){c.push(d)})})}a.$inject=c}}else I(a)?(b=a.length-1,sb(a[b],"fn"),c=a.slice(0,b)):sb(a,"fn",!0);return c};var he=K("$animate"),sf=function(){this.$get=D},tf=function(){var a=new Hb,b=[];this.$get=
+        ["$$AnimateRunner","$rootScope",function(d,c){function e(a,b,c){var d=!1;b&&(b=E(b)?b.split(" "):I(b)?b:[],r(b,function(b){b&&(d=!0,a[b]=c)}));return d}function f(){r(b,function(b){var c=a.get(b);if(c){var d=qg(b.attr("class")),e="",f="";r(c,function(a,b){a!==!!d[b]&&(a?e+=(e.length?" ":"")+b:f+=(f.length?" ":"")+b)});r(b,function(a){e&&Db(a,e);f&&Cb(a,f)});a.delete(b)}});b.length=0}return{enabled:D,on:D,off:D,pin:D,push:function(g,h,k,l){l&&l();k=k||{};k.from&&g.css(k.from);k.to&&g.css(k.to);if(k.addClass||
+                k.removeClass)if(h=k.addClass,l=k.removeClass,k=a.get(g)||{},h=e(k,h,!0),l=e(k,l,!1),h||l)a.set(g,k),b.push(g),1===b.length&&c.$$postDigest(f);g=new d;g.complete();return g}}}]},qf=["$provide",function(a){var b=this,d=null,c=null;this.$$registeredAnimations=Object.create(null);this.register=function(c,d){if(c&&"."!==c.charAt(0))throw he("notcsel",c);var g=c+"-animation";b.$$registeredAnimations[c.substr(1)]=g;a.factory(g,d)};this.customFilter=function(a){1===arguments.length&&(c=C(a)?a:null);return c};
+        this.classNameFilter=function(a){if(1===arguments.length&&(d=a instanceof RegExp?a:null)&&/[(\s|\/)]ng-animate[(\s|\/)]/.test(d.toString()))throw d=null,he("nongcls","ng-animate");return d};this.$get=["$$animateQueue",function(a){function b(a,c,d){if(d){var e;a:{for(e=0;e<d.length;e++){var f=d[e];if(1===f.nodeType){e=f;break a}}e=void 0}!e||e.parentNode||e.previousElementSibling||(d=null)}d?d.after(a):c.prepend(a)}return{on:a.on,off:a.off,pin:a.pin,enabled:a.enabled,cancel:function(a){a.end&&a.end()},
+            enter:function(c,d,k,l){d=d&&z(d);k=k&&z(k);d=d||k.parent();b(c,d,k);return a.push(c,"enter",Ka(l))},move:function(c,d,k,l){d=d&&z(d);k=k&&z(k);d=d||k.parent();b(c,d,k);return a.push(c,"move",Ka(l))},leave:function(b,c){return a.push(b,"leave",Ka(c),function(){b.remove()})},addClass:function(b,c,d){d=Ka(d);d.addClass=jb(d.addclass,c);return a.push(b,"addClass",d)},removeClass:function(b,c,d){d=Ka(d);d.removeClass=jb(d.removeClass,c);return a.push(b,"removeClass",d)},setClass:function(b,c,d,f){f=Ka(f);
+                f.addClass=jb(f.addClass,c);f.removeClass=jb(f.removeClass,d);return a.push(b,"setClass",f)},animate:function(b,c,d,f,m){m=Ka(m);m.from=m.from?O(m.from,c):c;m.to=m.to?O(m.to,d):d;m.tempClasses=jb(m.tempClasses,f||"ng-inline-animate");return a.push(b,"animate",m)}}}]}],vf=function(){this.$get=["$$rAF",function(a){function b(b){d.push(b);1<d.length||a(function(){for(var a=0;a<d.length;a++)d[a]();d=[]})}var d=[];return function(){var a=!1;b(function(){a=!0});return function(d){a?d():b(d)}}}]},uf=function(){this.$get=
+        ["$q","$sniffer","$$animateAsyncRun","$$isDocumentHidden","$timeout",function(a,b,d,c,e){function f(a){this.setHost(a);var b=d();this._doneCallbacks=[];this._tick=function(a){c()?e(a,0,!1):b(a)};this._state=0}f.chain=function(a,b){function c(){if(d===a.length)b(!0);else a[d](function(a){!1===a?b(!1):(d++,c())})}var d=0;c()};f.all=function(a,b){function c(f){e=e&&f;++d===a.length&&b(e)}var d=0,e=!0;r(a,function(a){a.done(c)})};f.prototype={setHost:function(a){this.host=a||{}},done:function(a){2===
+            this._state?a():this._doneCallbacks.push(a)},progress:D,getPromise:function(){if(!this.promise){var b=this;this.promise=a(function(a,c){b.done(function(b){!1===b?c():a()})})}return this.promise},then:function(a,b){return this.getPromise().then(a,b)},"catch":function(a){return this.getPromise()["catch"](a)},"finally":function(a){return this.getPromise()["finally"](a)},pause:function(){this.host.pause&&this.host.pause()},resume:function(){this.host.resume&&this.host.resume()},end:function(){this.host.end&&
+            this.host.end();this._resolve(!0)},cancel:function(){this.host.cancel&&this.host.cancel();this._resolve(!1)},complete:function(a){var b=this;0===b._state&&(b._state=1,b._tick(function(){b._resolve(a)}))},_resolve:function(a){2!==this._state&&(r(this._doneCallbacks,function(b){b(a)}),this._doneCallbacks.length=0,this._state=2)}};return f}]},rf=function(){this.$get=["$$rAF","$q","$$AnimateRunner",function(a,b,d){return function(b,e){function f(){a(function(){g.addClass&&(b.addClass(g.addClass),g.addClass=
+        null);g.removeClass&&(b.removeClass(g.removeClass),g.removeClass=null);g.to&&(b.css(g.to),g.to=null);h||k.complete();h=!0});return k}var g=e||{};g.$$prepared||(g=pa(g));g.cleanupStyles&&(g.from=g.to=null);g.from&&(b.css(g.from),g.from=null);var h,k=new d;return{start:f,end:f}}}]},ca=K("$compile"),sc=new function(){};Yc.$inject=["$provide","$$sanitizeUriProvider"];Jb.prototype.isFirstChange=function(){return this.previousValue===sc};var od=/^((?:x|data)[:\-_])/i,tg=/[:\-_]+(.)/g,ud=K("$controller"),
+        td=/^(\S+)(\s+as\s+([\w$]+))?$/,Cf=function(){this.$get=["$document",function(a){return function(b){b?!b.nodeType&&b instanceof z&&(b=b[0]):b=a[0].body;return b.offsetWidth+1}}]},vd="application/json",vc={"Content-Type":vd+";charset=utf-8"},wg=/^\[|^\{(?!\{)/,xg={"[":/]$/,"{":/}$/},vg=/^\)]\}',?\n/,Kb=K("$http"),Fa=$.$interpolateMinErr=K("$interpolate");Fa.throwNoconcat=function(a){throw Fa("noconcat",a);};Fa.interr=function(a,b){return Fa("interr",a,b.toString())};var Kf=function(){this.$get=function(){function a(a){var b=
+        function(a){b.data=a;b.called=!0};b.id=a;return b}var b=$.callbacks,d={};return{createCallback:function(c){c="_"+(b.$$counter++).toString(36);var e="angular.callbacks."+c,f=a(c);d[e]=b[c]=f;return e},wasCalled:function(a){return d[a].called},getResponse:function(a){return d[a].data},removeCallback:function(a){delete b[d[a].id];delete d[a]}}}},ah=/^([^?#]*)(\?([^#]*))?(#(.*))?$/,zg={http:80,https:443,ftp:21},kb=K("$location"),Ag=/^\s*[\\/]{2,}/,bh={$$absUrl:"",$$html5:!1,$$replace:!1,absUrl:Lb("$$absUrl"),
+        url:function(a){if(x(a))return this.$$url;var b=ah.exec(a);(b[1]||""===a)&&this.path(decodeURIComponent(b[1]));(b[2]||b[1]||""===a)&&this.search(b[3]||"");this.hash(b[5]||"");return this},protocol:Lb("$$protocol"),host:Lb("$$host"),port:Lb("$$port"),path:Dd("$$path",function(a){a=null!==a?a.toString():"";return"/"===a.charAt(0)?a:"/"+a}),search:function(a,b){switch(arguments.length){case 0:return this.$$search;case 1:if(E(a)||Y(a))a=a.toString(),this.$$search=ec(a);else if(B(a))a=pa(a,{}),r(a,function(b,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   c){null==b&&delete a[c]}),this.$$search=a;else throw kb("isrcharg");break;default:x(b)||null===b?delete this.$$search[a]:this.$$search[a]=b}this.$$compose();return this},hash:Dd("$$hash",function(a){return null!==a?a.toString():""}),replace:function(){this.$$replace=!0;return this}};r([Cd,zc,yc],function(a){a.prototype=Object.create(bh);a.prototype.state=function(b){if(!arguments.length)return this.$$state;if(a!==yc||!this.$$html5)throw kb("nostate");this.$$state=x(b)?null:b;this.$$urlUpdatedByLocation=
+        !0;return this}});var Xa=K("$parse"),Eg={}.constructor.prototype.valueOf,Ub=S();r("+ - * / % === !== == != < > <= >= && || ! = |".split(" "),function(a){Ub[a]=!0});var ch={n:"\n",f:"\f",r:"\r",t:"\t",v:"\v","'":"'",'"':'"'},Nb=function(a){this.options=a};Nb.prototype={constructor:Nb,lex:function(a){this.text=a;this.index=0;for(this.tokens=[];this.index<this.text.length;)if(a=this.text.charAt(this.index),'"'===a||"'"===a)this.readString(a);else if(this.isNumber(a)||"."===a&&this.isNumber(this.peek()))this.readNumber();
+        else if(this.isIdentifierStart(this.peekMultichar()))this.readIdent();else if(this.is(a,"(){}[].,;:?"))this.tokens.push({index:this.index,text:a}),this.index++;else if(this.isWhitespace(a))this.index++;else{var b=a+this.peek(),d=b+this.peek(2),c=Ub[b],e=Ub[d];Ub[a]||c||e?(a=e?d:c?b:a,this.tokens.push({index:this.index,text:a,operator:!0}),this.index+=a.length):this.throwError("Unexpected next character ",this.index,this.index+1)}return this.tokens},is:function(a,b){return-1!==b.indexOf(a)},peek:function(a){a=
+            a||1;return this.index+a<this.text.length?this.text.charAt(this.index+a):!1},isNumber:function(a){return"0"<=a&&"9">=a&&"string"===typeof a},isWhitespace:function(a){return" "===a||"\r"===a||"\t"===a||"\n"===a||"\v"===a||"\u00a0"===a},isIdentifierStart:function(a){return this.options.isIdentifierStart?this.options.isIdentifierStart(a,this.codePointAt(a)):this.isValidIdentifierStart(a)},isValidIdentifierStart:function(a){return"a"<=a&&"z">=a||"A"<=a&&"Z">=a||"_"===a||"$"===a},isIdentifierContinue:function(a){return this.options.isIdentifierContinue?
+            this.options.isIdentifierContinue(a,this.codePointAt(a)):this.isValidIdentifierContinue(a)},isValidIdentifierContinue:function(a,b){return this.isValidIdentifierStart(a,b)||this.isNumber(a)},codePointAt:function(a){return 1===a.length?a.charCodeAt(0):(a.charCodeAt(0)<<10)+a.charCodeAt(1)-56613888},peekMultichar:function(){var a=this.text.charAt(this.index),b=this.peek();if(!b)return a;var d=a.charCodeAt(0),c=b.charCodeAt(0);return 55296<=d&&56319>=d&&56320<=c&&57343>=c?a+b:a},isExpOperator:function(a){return"-"===
+            a||"+"===a||this.isNumber(a)},throwError:function(a,b,d){d=d||this.index;b=u(b)?"s "+b+"-"+this.index+" ["+this.text.substring(b,d)+"]":" "+d;throw Xa("lexerr",a,b,this.text);},readNumber:function(){for(var a="",b=this.index;this.index<this.text.length;){var d=L(this.text.charAt(this.index));if("."===d||this.isNumber(d))a+=d;else{var c=this.peek();if("e"===d&&this.isExpOperator(c))a+=d;else if(this.isExpOperator(d)&&c&&this.isNumber(c)&&"e"===a.charAt(a.length-1))a+=d;else if(!this.isExpOperator(d)||
+            c&&this.isNumber(c)||"e"!==a.charAt(a.length-1))break;else this.throwError("Invalid exponent")}this.index++}this.tokens.push({index:b,text:a,constant:!0,value:Number(a)})},readIdent:function(){var a=this.index;for(this.index+=this.peekMultichar().length;this.index<this.text.length;){var b=this.peekMultichar();if(!this.isIdentifierContinue(b))break;this.index+=b.length}this.tokens.push({index:a,text:this.text.slice(a,this.index),identifier:!0})},readString:function(a){var b=this.index;this.index++;
+            for(var d="",c=a,e=!1;this.index<this.text.length;){var f=this.text.charAt(this.index),c=c+f;if(e)"u"===f?(e=this.text.substring(this.index+1,this.index+5),e.match(/[\da-f]{4}/i)||this.throwError("Invalid unicode escape [\\u"+e+"]"),this.index+=4,d+=String.fromCharCode(parseInt(e,16))):d+=ch[f]||f,e=!1;else if("\\"===f)e=!0;else{if(f===a){this.index++;this.tokens.push({index:b,text:c,constant:!0,value:d});return}d+=f}this.index++}this.throwError("Unterminated quote",b)}};var q=function(a,b){this.lexer=
+        a;this.options=b};q.Program="Program";q.ExpressionStatement="ExpressionStatement";q.AssignmentExpression="AssignmentExpression";q.ConditionalExpression="ConditionalExpression";q.LogicalExpression="LogicalExpression";q.BinaryExpression="BinaryExpression";q.UnaryExpression="UnaryExpression";q.CallExpression="CallExpression";q.MemberExpression="MemberExpression";q.Identifier="Identifier";q.Literal="Literal";q.ArrayExpression="ArrayExpression";q.Property="Property";q.ObjectExpression="ObjectExpression";
+    q.ThisExpression="ThisExpression";q.LocalsExpression="LocalsExpression";q.NGValueParameter="NGValueParameter";q.prototype={ast:function(a){this.text=a;this.tokens=this.lexer.lex(a);a=this.program();0!==this.tokens.length&&this.throwError("is an unexpected token",this.tokens[0]);return a},program:function(){for(var a=[];;)if(0<this.tokens.length&&!this.peek("}",")",";","]")&&a.push(this.expressionStatement()),!this.expect(";"))return{type:q.Program,body:a}},expressionStatement:function(){return{type:q.ExpressionStatement,
+            expression:this.filterChain()}},filterChain:function(){for(var a=this.expression();this.expect("|");)a=this.filter(a);return a},expression:function(){return this.assignment()},assignment:function(){var a=this.ternary();if(this.expect("=")){if(!Hd(a))throw Xa("lval");a={type:q.AssignmentExpression,left:a,right:this.assignment(),operator:"="}}return a},ternary:function(){var a=this.logicalOR(),b,d;return this.expect("?")&&(b=this.expression(),this.consume(":"))?(d=this.expression(),{type:q.ConditionalExpression,
+            test:a,alternate:b,consequent:d}):a},logicalOR:function(){for(var a=this.logicalAND();this.expect("||");)a={type:q.LogicalExpression,operator:"||",left:a,right:this.logicalAND()};return a},logicalAND:function(){for(var a=this.equality();this.expect("&&");)a={type:q.LogicalExpression,operator:"&&",left:a,right:this.equality()};return a},equality:function(){for(var a=this.relational(),b;b=this.expect("==","!=","===","!==");)a={type:q.BinaryExpression,operator:b.text,left:a,right:this.relational()};
+            return a},relational:function(){for(var a=this.additive(),b;b=this.expect("<",">","<=",">=");)a={type:q.BinaryExpression,operator:b.text,left:a,right:this.additive()};return a},additive:function(){for(var a=this.multiplicative(),b;b=this.expect("+","-");)a={type:q.BinaryExpression,operator:b.text,left:a,right:this.multiplicative()};return a},multiplicative:function(){for(var a=this.unary(),b;b=this.expect("*","/","%");)a={type:q.BinaryExpression,operator:b.text,left:a,right:this.unary()};return a},
+        unary:function(){var a;return(a=this.expect("+","-","!"))?{type:q.UnaryExpression,operator:a.text,prefix:!0,argument:this.unary()}:this.primary()},primary:function(){var a;this.expect("(")?(a=this.filterChain(),this.consume(")")):this.expect("[")?a=this.arrayDeclaration():this.expect("{")?a=this.object():this.selfReferential.hasOwnProperty(this.peek().text)?a=pa(this.selfReferential[this.consume().text]):this.options.literals.hasOwnProperty(this.peek().text)?a={type:q.Literal,value:this.options.literals[this.consume().text]}:
+            this.peek().identifier?a=this.identifier():this.peek().constant?a=this.constant():this.throwError("not a primary expression",this.peek());for(var b;b=this.expect("(","[",".");)"("===b.text?(a={type:q.CallExpression,callee:a,arguments:this.parseArguments()},this.consume(")")):"["===b.text?(a={type:q.MemberExpression,object:a,property:this.expression(),computed:!0},this.consume("]")):"."===b.text?a={type:q.MemberExpression,object:a,property:this.identifier(),computed:!1}:this.throwError("IMPOSSIBLE");
+            return a},filter:function(a){a=[a];for(var b={type:q.CallExpression,callee:this.identifier(),arguments:a,filter:!0};this.expect(":");)a.push(this.expression());return b},parseArguments:function(){var a=[];if(")"!==this.peekToken().text){do a.push(this.filterChain());while(this.expect(","))}return a},identifier:function(){var a=this.consume();a.identifier||this.throwError("is not a valid identifier",a);return{type:q.Identifier,name:a.text}},constant:function(){return{type:q.Literal,value:this.consume().value}},
+        arrayDeclaration:function(){var a=[];if("]"!==this.peekToken().text){do{if(this.peek("]"))break;a.push(this.expression())}while(this.expect(","))}this.consume("]");return{type:q.ArrayExpression,elements:a}},object:function(){var a=[],b;if("}"!==this.peekToken().text){do{if(this.peek("}"))break;b={type:q.Property,kind:"init"};this.peek().constant?(b.key=this.constant(),b.computed=!1,this.consume(":"),b.value=this.expression()):this.peek().identifier?(b.key=this.identifier(),b.computed=!1,this.peek(":")?
+            (this.consume(":"),b.value=this.expression()):b.value=b.key):this.peek("[")?(this.consume("["),b.key=this.expression(),this.consume("]"),b.computed=!0,this.consume(":"),b.value=this.expression()):this.throwError("invalid key",this.peek());a.push(b)}while(this.expect(","))}this.consume("}");return{type:q.ObjectExpression,properties:a}},throwError:function(a,b){throw Xa("syntax",b.text,a,b.index+1,this.text,this.text.substring(b.index));},consume:function(a){if(0===this.tokens.length)throw Xa("ueoe",
+            this.text);var b=this.expect(a);b||this.throwError("is unexpected, expecting ["+a+"]",this.peek());return b},peekToken:function(){if(0===this.tokens.length)throw Xa("ueoe",this.text);return this.tokens[0]},peek:function(a,b,d,c){return this.peekAhead(0,a,b,d,c)},peekAhead:function(a,b,d,c,e){if(this.tokens.length>a){a=this.tokens[a];var f=a.text;if(f===b||f===d||f===c||f===e||!(b||d||c||e))return a}return!1},expect:function(a,b,d,c){return(a=this.peek(a,b,d,c))?(this.tokens.shift(),a):!1},selfReferential:{"this":{type:q.ThisExpression},
+            $locals:{type:q.LocalsExpression}}};var Fd=2;Jd.prototype={compile:function(a){var b=this;this.state={nextId:0,filters:{},fn:{vars:[],body:[],own:{}},assign:{vars:[],body:[],own:{}},inputs:[]};W(a,b.$filter);var d="",c;this.stage="assign";if(c=Id(a))this.state.computing="assign",d=this.nextId(),this.recurse(c,d),this.return_(d),d="fn.assign="+this.generateFunction("assign","s,v,l");c=Gd(a.body);b.stage="inputs";r(c,function(a,c){var d="fn"+c;b.state[d]={vars:[],body:[],own:{}};b.state.computing=d;
+            var h=b.nextId();b.recurse(a,h);b.return_(h);b.state.inputs.push({name:d,isPure:a.isPure});a.watchId=c});this.state.computing="fn";this.stage="main";this.recurse(a);a='"'+this.USE+" "+this.STRICT+'";\n'+this.filterPrefix()+"var fn="+this.generateFunction("fn","s,l,a,i")+d+this.watchFns()+"return fn;";a=(new Function("$filter","getStringValue","ifDefined","plus",a))(this.$filter,Bg,Cg,Ed);this.state=this.stage=void 0;return a},USE:"use",STRICT:"strict",watchFns:function(){var a=[],b=this.state.inputs,
+            d=this;r(b,function(b){a.push("var "+b.name+"="+d.generateFunction(b.name,"s"));b.isPure&&a.push(b.name,".isPure="+JSON.stringify(b.isPure)+";")});b.length&&a.push("fn.inputs=["+b.map(function(a){return a.name}).join(",")+"];");return a.join("")},generateFunction:function(a,b){return"function("+b+"){"+this.varsPrefix(a)+this.body(a)+"};"},filterPrefix:function(){var a=[],b=this;r(this.state.filters,function(d,c){a.push(d+"=$filter("+b.escape(c)+")")});return a.length?"var "+a.join(",")+";":""},varsPrefix:function(a){return this.state[a].vars.length?
+            "var "+this.state[a].vars.join(",")+";":""},body:function(a){return this.state[a].body.join("")},recurse:function(a,b,d,c,e,f){var g,h,k=this,l,m,p;c=c||D;if(!f&&u(a.watchId))b=b||this.nextId(),this.if_("i",this.lazyAssign(b,this.computedMember("i",a.watchId)),this.lazyRecurse(a,b,d,c,e,!0));else switch(a.type){case q.Program:r(a.body,function(b,c){k.recurse(b.expression,void 0,void 0,function(a){h=a});c!==a.body.length-1?k.current().body.push(h,";"):k.return_(h)});break;case q.Literal:m=this.escape(a.value);
+            this.assign(b,m);c(b||m);break;case q.UnaryExpression:this.recurse(a.argument,void 0,void 0,function(a){h=a});m=a.operator+"("+this.ifDefined(h,0)+")";this.assign(b,m);c(m);break;case q.BinaryExpression:this.recurse(a.left,void 0,void 0,function(a){g=a});this.recurse(a.right,void 0,void 0,function(a){h=a});m="+"===a.operator?this.plus(g,h):"-"===a.operator?this.ifDefined(g,0)+a.operator+this.ifDefined(h,0):"("+g+")"+a.operator+"("+h+")";this.assign(b,m);c(m);break;case q.LogicalExpression:b=b||this.nextId();
+            k.recurse(a.left,b);k.if_("&&"===a.operator?b:k.not(b),k.lazyRecurse(a.right,b));c(b);break;case q.ConditionalExpression:b=b||this.nextId();k.recurse(a.test,b);k.if_(b,k.lazyRecurse(a.alternate,b),k.lazyRecurse(a.consequent,b));c(b);break;case q.Identifier:b=b||this.nextId();d&&(d.context="inputs"===k.stage?"s":this.assign(this.nextId(),this.getHasOwnProperty("l",a.name)+"?l:s"),d.computed=!1,d.name=a.name);k.if_("inputs"===k.stage||k.not(k.getHasOwnProperty("l",a.name)),function(){k.if_("inputs"===
+            k.stage||"s",function(){e&&1!==e&&k.if_(k.isNull(k.nonComputedMember("s",a.name)),k.lazyAssign(k.nonComputedMember("s",a.name),"{}"));k.assign(b,k.nonComputedMember("s",a.name))})},b&&k.lazyAssign(b,k.nonComputedMember("l",a.name)));c(b);break;case q.MemberExpression:g=d&&(d.context=this.nextId())||this.nextId();b=b||this.nextId();k.recurse(a.object,g,void 0,function(){k.if_(k.notNull(g),function(){a.computed?(h=k.nextId(),k.recurse(a.property,h),k.getStringValue(h),e&&1!==e&&k.if_(k.not(k.computedMember(g,
+            h)),k.lazyAssign(k.computedMember(g,h),"{}")),m=k.computedMember(g,h),k.assign(b,m),d&&(d.computed=!0,d.name=h)):(e&&1!==e&&k.if_(k.isNull(k.nonComputedMember(g,a.property.name)),k.lazyAssign(k.nonComputedMember(g,a.property.name),"{}")),m=k.nonComputedMember(g,a.property.name),k.assign(b,m),d&&(d.computed=!1,d.name=a.property.name))},function(){k.assign(b,"undefined")});c(b)},!!e);break;case q.CallExpression:b=b||this.nextId();a.filter?(h=k.filter(a.callee.name),l=[],r(a.arguments,function(a){var b=
+            k.nextId();k.recurse(a,b);l.push(b)}),m=h+"("+l.join(",")+")",k.assign(b,m),c(b)):(h=k.nextId(),g={},l=[],k.recurse(a.callee,h,g,function(){k.if_(k.notNull(h),function(){r(a.arguments,function(b){k.recurse(b,a.constant?void 0:k.nextId(),void 0,function(a){l.push(a)})});m=g.name?k.member(g.context,g.name,g.computed)+"("+l.join(",")+")":h+"("+l.join(",")+")";k.assign(b,m)},function(){k.assign(b,"undefined")});c(b)}));break;case q.AssignmentExpression:h=this.nextId();g={};this.recurse(a.left,void 0,
+            g,function(){k.if_(k.notNull(g.context),function(){k.recurse(a.right,h);m=k.member(g.context,g.name,g.computed)+a.operator+h;k.assign(b,m);c(b||m)})},1);break;case q.ArrayExpression:l=[];r(a.elements,function(b){k.recurse(b,a.constant?void 0:k.nextId(),void 0,function(a){l.push(a)})});m="["+l.join(",")+"]";this.assign(b,m);c(b||m);break;case q.ObjectExpression:l=[];p=!1;r(a.properties,function(a){a.computed&&(p=!0)});p?(b=b||this.nextId(),this.assign(b,"{}"),r(a.properties,function(a){a.computed?
+            (g=k.nextId(),k.recurse(a.key,g)):g=a.key.type===q.Identifier?a.key.name:""+a.key.value;h=k.nextId();k.recurse(a.value,h);k.assign(k.member(b,g,a.computed),h)})):(r(a.properties,function(b){k.recurse(b.value,a.constant?void 0:k.nextId(),void 0,function(a){l.push(k.escape(b.key.type===q.Identifier?b.key.name:""+b.key.value)+":"+a)})}),m="{"+l.join(",")+"}",this.assign(b,m));c(b||m);break;case q.ThisExpression:this.assign(b,"s");c(b||"s");break;case q.LocalsExpression:this.assign(b,"l");c(b||"l");break;
+            case q.NGValueParameter:this.assign(b,"v"),c(b||"v")}},getHasOwnProperty:function(a,b){var d=a+"."+b,c=this.current().own;c.hasOwnProperty(d)||(c[d]=this.nextId(!1,a+"&&("+this.escape(b)+" in "+a+")"));return c[d]},assign:function(a,b){if(a)return this.current().body.push(a,"=",b,";"),a},filter:function(a){this.state.filters.hasOwnProperty(a)||(this.state.filters[a]=this.nextId(!0));return this.state.filters[a]},ifDefined:function(a,b){return"ifDefined("+a+","+this.escape(b)+")"},plus:function(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               b){return"plus("+a+","+b+")"},return_:function(a){this.current().body.push("return ",a,";")},if_:function(a,b,d){if(!0===a)b();else{var c=this.current().body;c.push("if(",a,"){");b();c.push("}");d&&(c.push("else{"),d(),c.push("}"))}},not:function(a){return"!("+a+")"},isNull:function(a){return a+"==null"},notNull:function(a){return a+"!=null"},nonComputedMember:function(a,b){var d=/[^$_a-zA-Z0-9]/g;return/^[$_a-zA-Z][$_a-zA-Z0-9]*$/.test(b)?a+"."+b:a+'["'+b.replace(d,this.stringEscapeFn)+'"]'},computedMember:function(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         b){return a+"["+b+"]"},member:function(a,b,d){return d?this.computedMember(a,b):this.nonComputedMember(a,b)},getStringValue:function(a){this.assign(a,"getStringValue("+a+")")},lazyRecurse:function(a,b,d,c,e,f){var g=this;return function(){g.recurse(a,b,d,c,e,f)}},lazyAssign:function(a,b){var d=this;return function(){d.assign(a,b)}},stringEscapeRegex:/[^ a-zA-Z0-9]/g,stringEscapeFn:function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)},escape:function(a){if(E(a))return"'"+a.replace(this.stringEscapeRegex,
+            this.stringEscapeFn)+"'";if(Y(a))return a.toString();if(!0===a)return"true";if(!1===a)return"false";if(null===a)return"null";if("undefined"===typeof a)return"undefined";throw Xa("esc");},nextId:function(a,b){var d="v"+this.state.nextId++;a||this.current().vars.push(d+(b?"="+b:""));return d},current:function(){return this.state[this.state.computing]}};Kd.prototype={compile:function(a){var b=this;W(a,b.$filter);var d,c;if(d=Id(a))c=this.recurse(d);d=Gd(a.body);var e;d&&(e=[],r(d,function(a,c){var d=
+            b.recurse(a);d.isPure=a.isPure;a.input=d;e.push(d);a.watchId=c}));var f=[];r(a.body,function(a){f.push(b.recurse(a.expression))});a=0===a.body.length?D:1===a.body.length?f[0]:function(a,b){var c;r(f,function(d){c=d(a,b)});return c};c&&(a.assign=function(a,b,d){return c(a,d,b)});e&&(a.inputs=e);return a},recurse:function(a,b,d){var c,e,f=this,g;if(a.input)return this.inputs(a.input,a.watchId);switch(a.type){case q.Literal:return this.value(a.value,b);case q.UnaryExpression:return e=this.recurse(a.argument),
+            this["unary"+a.operator](e,b);case q.BinaryExpression:return c=this.recurse(a.left),e=this.recurse(a.right),this["binary"+a.operator](c,e,b);case q.LogicalExpression:return c=this.recurse(a.left),e=this.recurse(a.right),this["binary"+a.operator](c,e,b);case q.ConditionalExpression:return this["ternary?:"](this.recurse(a.test),this.recurse(a.alternate),this.recurse(a.consequent),b);case q.Identifier:return f.identifier(a.name,b,d);case q.MemberExpression:return c=this.recurse(a.object,!1,!!d),a.computed||
+        (e=a.property.name),a.computed&&(e=this.recurse(a.property)),a.computed?this.computedMember(c,e,b,d):this.nonComputedMember(c,e,b,d);case q.CallExpression:return g=[],r(a.arguments,function(a){g.push(f.recurse(a))}),a.filter&&(e=this.$filter(a.callee.name)),a.filter||(e=this.recurse(a.callee,!0)),a.filter?function(a,c,d,f){for(var p=[],n=0;n<g.length;++n)p.push(g[n](a,c,d,f));a=e.apply(void 0,p,f);return b?{context:void 0,name:void 0,value:a}:a}:function(a,c,d,f){var p=e(a,c,d,f),n;if(null!=p.value){n=
+            [];for(var r=0;r<g.length;++r)n.push(g[r](a,c,d,f));n=p.value.apply(p.context,n)}return b?{value:n}:n};case q.AssignmentExpression:return c=this.recurse(a.left,!0,1),e=this.recurse(a.right),function(a,d,f,g){var p=c(a,d,f,g);a=e(a,d,f,g);p.context[p.name]=a;return b?{value:a}:a};case q.ArrayExpression:return g=[],r(a.elements,function(a){g.push(f.recurse(a))}),function(a,c,d,e){for(var f=[],n=0;n<g.length;++n)f.push(g[n](a,c,d,e));return b?{value:f}:f};case q.ObjectExpression:return g=[],r(a.properties,
+            function(a){a.computed?g.push({key:f.recurse(a.key),computed:!0,value:f.recurse(a.value)}):g.push({key:a.key.type===q.Identifier?a.key.name:""+a.key.value,computed:!1,value:f.recurse(a.value)})}),function(a,c,d,e){for(var f={},n=0;n<g.length;++n)g[n].computed?f[g[n].key(a,c,d,e)]=g[n].value(a,c,d,e):f[g[n].key]=g[n].value(a,c,d,e);return b?{value:f}:f};case q.ThisExpression:return function(a){return b?{value:a}:a};case q.LocalsExpression:return function(a,c){return b?{value:c}:c};case q.NGValueParameter:return function(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         c,d){return b?{value:d}:d}}},"unary+":function(a,b){return function(d,c,e,f){d=a(d,c,e,f);d=u(d)?+d:0;return b?{value:d}:d}},"unary-":function(a,b){return function(d,c,e,f){d=a(d,c,e,f);d=u(d)?-d:-0;return b?{value:d}:d}},"unary!":function(a,b){return function(d,c,e,f){d=!a(d,c,e,f);return b?{value:d}:d}},"binary+":function(a,b,d){return function(c,e,f,g){var h=a(c,e,f,g);c=b(c,e,f,g);h=Ed(h,c);return d?{value:h}:h}},"binary-":function(a,b,d){return function(c,e,f,g){var h=a(c,e,f,g);c=b(c,e,f,g);
+            h=(u(h)?h:0)-(u(c)?c:0);return d?{value:h}:h}},"binary*":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)*b(c,e,f,g);return d?{value:c}:c}},"binary/":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)/b(c,e,f,g);return d?{value:c}:c}},"binary%":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)%b(c,e,f,g);return d?{value:c}:c}},"binary===":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)===b(c,e,f,g);return d?{value:c}:c}},"binary!==":function(a,b,d){return function(c,e,f,g){c=a(c,
+            e,f,g)!==b(c,e,f,g);return d?{value:c}:c}},"binary==":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)==b(c,e,f,g);return d?{value:c}:c}},"binary!=":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)!=b(c,e,f,g);return d?{value:c}:c}},"binary<":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)<b(c,e,f,g);return d?{value:c}:c}},"binary>":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)>b(c,e,f,g);return d?{value:c}:c}},"binary<=":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,
+            g)<=b(c,e,f,g);return d?{value:c}:c}},"binary>=":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)>=b(c,e,f,g);return d?{value:c}:c}},"binary&&":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)&&b(c,e,f,g);return d?{value:c}:c}},"binary||":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)||b(c,e,f,g);return d?{value:c}:c}},"ternary?:":function(a,b,d,c){return function(e,f,g,h){e=a(e,f,g,h)?b(e,f,g,h):d(e,f,g,h);return c?{value:e}:e}},value:function(a,b){return function(){return b?{context:void 0,
+            name:void 0,value:a}:a}},identifier:function(a,b,d){return function(c,e,f,g){c=e&&a in e?e:c;d&&1!==d&&c&&null==c[a]&&(c[a]={});e=c?c[a]:void 0;return b?{context:c,name:a,value:e}:e}},computedMember:function(a,b,d,c){return function(e,f,g,h){var k=a(e,f,g,h),l,m;null!=k&&(l=b(e,f,g,h),l+="",c&&1!==c&&k&&!k[l]&&(k[l]={}),m=k[l]);return d?{context:k,name:l,value:m}:m}},nonComputedMember:function(a,b,d,c){return function(e,f,g,h){e=a(e,f,g,h);c&&1!==c&&e&&null==e[b]&&(e[b]={});f=null!=e?e[b]:void 0;
+            return d?{context:e,name:b,value:f}:f}},inputs:function(a,b){return function(d,c,e,f){return f?f[b]:a(d,c,e)}}};Mb.prototype={constructor:Mb,parse:function(a){a=this.getAst(a);var b=this.astCompiler.compile(a.ast),d=a.ast;b.literal=0===d.body.length||1===d.body.length&&(d.body[0].expression.type===q.Literal||d.body[0].expression.type===q.ArrayExpression||d.body[0].expression.type===q.ObjectExpression);b.constant=a.ast.constant;b.oneTime=a.oneTime;return b},getAst:function(a){var b=!1;a=a.trim();":"===
+        a.charAt(0)&&":"===a.charAt(1)&&(b=!0,a=a.substring(2));return{ast:this.ast.ast(a),oneTime:b}}};var va=K("$sce"),oa={HTML:"html",CSS:"css",URL:"url",RESOURCE_URL:"resourceUrl",JS:"js"},Bc=/_([a-z])/g,Gg=K("$compile"),X=w.document.createElement("a"),Od=ta(w.location.href);Pd.$inject=["$document"];ed.$inject=["$provide"];var Wd=22,Vd=".",Dc="0";Qd.$inject=["$locale"];Sd.$inject=["$locale"];var Rg={yyyy:ea("FullYear",4,0,!1,!0),yy:ea("FullYear",2,0,!0,!0),y:ea("FullYear",1,0,!1,!0),MMMM:mb("Month"),
+        MMM:mb("Month",!0),MM:ea("Month",2,1),M:ea("Month",1,1),LLLL:mb("Month",!1,!0),dd:ea("Date",2),d:ea("Date",1),HH:ea("Hours",2),H:ea("Hours",1),hh:ea("Hours",2,-12),h:ea("Hours",1,-12),mm:ea("Minutes",2),m:ea("Minutes",1),ss:ea("Seconds",2),s:ea("Seconds",1),sss:ea("Milliseconds",3),EEEE:mb("Day"),EEE:mb("Day",!0),a:function(a,b){return 12>a.getHours()?b.AMPMS[0]:b.AMPMS[1]},Z:function(a,b,d){a=-1*d;return a=(0<=a?"+":"")+(Ob(Math[0<a?"floor":"ceil"](a/60),2)+Ob(Math.abs(a%60),2))},ww:Yd(2),w:Yd(1),
+        G:Ec,GG:Ec,GGG:Ec,GGGG:function(a,b){return 0>=a.getFullYear()?b.ERANAMES[0]:b.ERANAMES[1]}},Qg=/((?:[^yMLdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|L+|d+|H+|h+|m+|s+|a|Z|G+|w+))([\s\S]*)/,Pg=/^-?\d+$/;Rd.$inject=["$locale"];var Kg=la(L),Lg=la(ub);Td.$inject=["$parse"];var He=la({restrict:"E",compile:function(a,b){if(!b.href&&!b.xlinkHref)return function(a,b){if("a"===b[0].nodeName.toLowerCase()){var e="[object SVGAnimatedString]"===ia.call(b.prop("href"))?"xlink:href":"href";b.on("click",function(a){b.attr(e)||
+        a.preventDefault()})}}}}),vb={};r(Gb,function(a,b){function d(a,d,e){a.$watch(e[c],function(a){e.$set(b,!!a)})}if("multiple"!==a){var c=Ea("ng-"+b),e=d;"checked"===a&&(e=function(a,b,e){e.ngModel!==e[c]&&d(a,b,e)});vb[c]=function(){return{restrict:"A",priority:100,link:e}}}});r(sd,function(a,b){vb[b]=function(){return{priority:100,link:function(a,c,e){if("ngPattern"===b&&"/"===e.ngPattern.charAt(0)&&(c=e.ngPattern.match(Vg))){e.$set("ngPattern",new RegExp(c[1],c[2]));return}a.$watch(e[b],function(a){e.$set(b,
+            a)})}}}});r(["src","srcset","href"],function(a){var b=Ea("ng-"+a);vb[b]=function(){return{priority:99,link:function(d,c,e){var f=a,g=a;"href"===a&&"[object SVGAnimatedString]"===ia.call(c.prop("href"))&&(g="xlinkHref",e.$attr[g]="xlink:href",f=null);e.$observe(b,function(b){b?(e.$set(g,b),Ca&&f&&c.prop(f,e[g])):"href"===a&&e.$set(g,null)})}}}});var Qb={$addControl:D,$$renameControl:function(a,b){a.$name=b},$removeControl:D,$setValidity:D,$setDirty:D,$setPristine:D,$setSubmitted:D};Pb.$inject=["$element",
+        "$attrs","$scope","$animate","$interpolate"];Pb.prototype={$rollbackViewValue:function(){r(this.$$controls,function(a){a.$rollbackViewValue()})},$commitViewValue:function(){r(this.$$controls,function(a){a.$commitViewValue()})},$addControl:function(a){Ia(a.$name,"input");this.$$controls.push(a);a.$name&&(this[a.$name]=a);a.$$parentForm=this},$$renameControl:function(a,b){var d=a.$name;this[d]===a&&delete this[d];this[b]=a;a.$name=b},$removeControl:function(a){a.$name&&this[a.$name]===a&&delete this[a.$name];
+            r(this.$pending,function(b,d){this.$setValidity(d,null,a)},this);r(this.$error,function(b,d){this.$setValidity(d,null,a)},this);r(this.$$success,function(b,d){this.$setValidity(d,null,a)},this);cb(this.$$controls,a);a.$$parentForm=Qb},$setDirty:function(){this.$$animate.removeClass(this.$$element,Ya);this.$$animate.addClass(this.$$element,Vb);this.$dirty=!0;this.$pristine=!1;this.$$parentForm.$setDirty()},$setPristine:function(){this.$$animate.setClass(this.$$element,Ya,Vb+" ng-submitted");this.$dirty=
+            !1;this.$pristine=!0;this.$submitted=!1;r(this.$$controls,function(a){a.$setPristine()})},$setUntouched:function(){r(this.$$controls,function(a){a.$setUntouched()})},$setSubmitted:function(){this.$$animate.addClass(this.$$element,"ng-submitted");this.$submitted=!0;this.$$parentForm.$setSubmitted()}};ae({clazz:Pb,set:function(a,b,d){var c=a[b];c?-1===c.indexOf(d)&&c.push(d):a[b]=[d]},unset:function(a,b,d){var c=a[b];c&&(cb(c,d),0===c.length&&delete a[b])}});var ie=function(a){return["$timeout","$parse",
+            function(b,d){function c(a){return""===a?d('this[""]').assign:d(a).assign||D}return{name:"form",restrict:a?"EAC":"E",require:["form","^^?form"],controller:Pb,compile:function(d,f){d.addClass(Ya).addClass(nb);var g=f.name?"name":a&&f.ngForm?"ngForm":!1;return{pre:function(a,d,e,f){var p=f[0];if(!("action"in e)){var n=function(b){a.$apply(function(){p.$commitViewValue();p.$setSubmitted()});b.preventDefault()};d[0].addEventListener("submit",n);d.on("$destroy",function(){b(function(){d[0].removeEventListener("submit",
+                        n)},0,!1)})}(f[1]||p.$$parentForm).$addControl(p);var r=g?c(p.$name):D;g&&(r(a,p),e.$observe(g,function(b){p.$name!==b&&(r(a,void 0),p.$$parentForm.$$renameControl(p,b),r=c(p.$name),r(a,p))}));d.on("$destroy",function(){p.$$parentForm.$removeControl(p);r(a,void 0);O(p,Qb)})}}}}}]},Ie=ie(),Ue=ie(!0),Sg=/^\d{4,}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+(?:[+-][0-2]\d:[0-5]\d|Z)$/,dh=/^[a-z][a-z\d.+-]*:\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:/?#]+|\[[a-f\d:]+])(?::\d+)?(?:\/[^?#]*)?(?:\?[^#]*)?(?:#.*)?$/i,
+        eh=/^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+(\.[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$/,Tg=/^\s*(-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/,je=/^(\d{4,})-(\d{2})-(\d{2})$/,ke=/^(\d{4,})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,Lc=/^(\d{4,})-W(\d\d)$/,le=/^(\d{4,})-(\d\d)$/,me=/^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,ce=S();r(["date","datetime-local","month","time","week"],function(a){ce[a]=
+        !0});var ne={text:function(a,b,d,c,e,f){Va(a,b,d,c,e,f);Gc(c)},date:ob("date",je,Rb(je,["yyyy","MM","dd"]),"yyyy-MM-dd"),"datetime-local":ob("datetimelocal",ke,Rb(ke,"yyyy MM dd HH mm ss sss".split(" ")),"yyyy-MM-ddTHH:mm:ss.sss"),time:ob("time",me,Rb(me,["HH","mm","ss","sss"]),"HH:mm:ss.sss"),week:ob("week",Lc,function(a,b){if(fa(a))return a;if(E(a)){Lc.lastIndex=0;var d=Lc.exec(a);if(d){var c=+d[1],e=+d[2],f=d=0,g=0,h=0,k=Xd(c),e=7*(e-1);b&&(d=b.getHours(),f=b.getMinutes(),g=b.getSeconds(),h=b.getMilliseconds());
+                return new Date(c,0,k.getDate()+e,d,f,g,h)}}return NaN},"yyyy-Www"),month:ob("month",le,Rb(le,["yyyy","MM"]),"yyyy-MM"),number:function(a,b,d,c,e,f){Hc(a,b,d,c);de(c);Va(a,b,d,c,e,f);var g,h;if(u(d.min)||d.ngMin)c.$validators.min=function(a){return c.$isEmpty(a)||x(g)||a>=g},d.$observe("min",function(a){g=Wa(a);c.$validate()});if(u(d.max)||d.ngMax)c.$validators.max=function(a){return c.$isEmpty(a)||x(h)||a<=h},d.$observe("max",function(a){h=Wa(a);c.$validate()});if(u(d.step)||d.ngStep){var k;c.$validators.step=
+                function(a,b){return c.$isEmpty(b)||x(k)||ee(b,g||0,k)};d.$observe("step",function(a){k=Wa(a);c.$validate()})}},url:function(a,b,d,c,e,f){Va(a,b,d,c,e,f);Gc(c);c.$$parserName="url";c.$validators.url=function(a,b){var d=a||b;return c.$isEmpty(d)||dh.test(d)}},email:function(a,b,d,c,e,f){Va(a,b,d,c,e,f);Gc(c);c.$$parserName="email";c.$validators.email=function(a,b){var d=a||b;return c.$isEmpty(d)||eh.test(d)}},radio:function(a,b,d,c){var e=!d.ngTrim||"false"!==Q(d.ngTrim);x(d.name)&&b.attr("name",++qb);
+                b.on("click",function(a){var g;b[0].checked&&(g=d.value,e&&(g=Q(g)),c.$setViewValue(g,a&&a.type))});c.$render=function(){var a=d.value;e&&(a=Q(a));b[0].checked=a===c.$viewValue};d.$observe("value",c.$render)},range:function(a,b,d,c,e,f){function g(a,c){b.attr(a,d[a]);d.$observe(a,c)}function h(a){p=Wa(a);U(c.$modelValue)||(m?(a=b.val(),p>a&&(a=p,b.val(a)),c.$setViewValue(a)):c.$validate())}function k(a){n=Wa(a);U(c.$modelValue)||(m?(a=b.val(),n<a&&(b.val(n),a=n<p?p:n),c.$setViewValue(a)):c.$validate())}
+                function l(a){r=Wa(a);U(c.$modelValue)||(m&&c.$viewValue!==b.val()?c.$setViewValue(b.val()):c.$validate())}Hc(a,b,d,c);de(c);Va(a,b,d,c,e,f);var m=c.$$hasNativeValidators&&"range"===b[0].type,p=m?0:void 0,n=m?100:void 0,r=m?1:void 0,q=b[0].validity;a=u(d.min);e=u(d.max);f=u(d.step);var v=c.$render;c.$render=m&&u(q.rangeUnderflow)&&u(q.rangeOverflow)?function(){v();c.$setViewValue(b.val())}:v;a&&(c.$validators.min=m?function(){return!0}:function(a,b){return c.$isEmpty(b)||x(p)||b>=p},g("min",h));e&&
+                (c.$validators.max=m?function(){return!0}:function(a,b){return c.$isEmpty(b)||x(n)||b<=n},g("max",k));f&&(c.$validators.step=m?function(){return!q.stepMismatch}:function(a,b){return c.$isEmpty(b)||x(r)||ee(b,p||0,r)},g("step",l))},checkbox:function(a,b,d,c,e,f,g,h){var k=fe(h,a,"ngTrueValue",d.ngTrueValue,!0),l=fe(h,a,"ngFalseValue",d.ngFalseValue,!1);b.on("click",function(a){c.$setViewValue(b[0].checked,a&&a.type)});c.$render=function(){b[0].checked=c.$viewValue};c.$isEmpty=function(a){return!1===
+            a};c.$formatters.push(function(a){return sa(a,k)});c.$parsers.push(function(a){return a?k:l})},hidden:D,button:D,submit:D,reset:D,file:D},Zc=["$browser","$sniffer","$filter","$parse",function(a,b,d,c){return{restrict:"E",require:["?ngModel"],link:{pre:function(e,f,g,h){h[0]&&(ne[L(g.type)]||ne.text)(e,f,g,h[0],b,a,d,c)}}}}],fh=/^(true|false|\d+)$/,mf=function(){function a(a,d,c){var e=u(c)?c:9===Ca?"":null;a.prop("value",e);d.$set("value",c)}return{restrict:"A",priority:100,compile:function(b,d){return fh.test(d.ngValue)?
+            function(b,d,f){b=b.$eval(f.ngValue);a(d,f,b)}:function(b,d,f){b.$watch(f.ngValue,function(b){a(d,f,b)})}}}},Me=["$compile",function(a){return{restrict:"AC",compile:function(b){a.$$addBindingClass(b);return function(b,c,e){a.$$addBindingInfo(c,e.ngBind);c=c[0];b.$watch(e.ngBind,function(a){c.textContent=gc(a)})}}}}],Oe=["$interpolate","$compile",function(a,b){return{compile:function(d){b.$$addBindingClass(d);return function(c,d,f){c=a(d.attr(f.$attr.ngBindTemplate));b.$$addBindingInfo(d,c.expressions);
+                d=d[0];f.$observe("ngBindTemplate",function(a){d.textContent=x(a)?"":a})}}}}],Ne=["$sce","$parse","$compile",function(a,b,d){return{restrict:"A",compile:function(c,e){var f=b(e.ngBindHtml),g=b(e.ngBindHtml,function(b){return a.valueOf(b)});d.$$addBindingClass(c);return function(b,c,e){d.$$addBindingInfo(c,e.ngBindHtml);b.$watch(g,function(){var d=f(b);c.html(a.getTrustedHtml(d)||"")})}}}}],lf=la({restrict:"A",require:"ngModel",link:function(a,b,d,c){c.$viewChangeListeners.push(function(){a.$eval(d.ngChange)})}}),
+        Pe=Jc("",!0),Re=Jc("Odd",0),Qe=Jc("Even",1),Se=Qa({compile:function(a,b){b.$set("ngCloak",void 0);a.removeClass("ng-cloak")}}),Te=[function(){return{restrict:"A",scope:!0,controller:"@",priority:500}}],dd={},gh={blur:!0,focus:!0};r("click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste".split(" "),function(a){var b=Ea("ng-"+a);dd[b]=["$parse","$rootScope",function(d,c){return{restrict:"A",compile:function(e,f){var g=
+            d(f[b]);return function(b,d){d.on(a,function(d){var e=function(){g(b,{$event:d})};gh[a]&&c.$$phase?b.$evalAsync(e):b.$apply(e)})}}}}]});var We=["$animate","$compile",function(a,b){return{multiElement:!0,transclude:"element",priority:600,terminal:!0,restrict:"A",$$tlb:!0,link:function(d,c,e,f,g){var h,k,l;d.$watch(e.ngIf,function(d){d?k||g(function(d,f){k=f;d[d.length++]=b.$$createComment("end ngIf",e.ngIf);h={clone:d};a.enter(d,c.parent(),c)}):(l&&(l.remove(),l=null),k&&(k.$destroy(),k=null),h&&(l=
+            tb(h.clone),a.leave(l).done(function(a){!1!==a&&(l=null)}),h=null))})}}}],Xe=["$templateRequest","$anchorScroll","$animate",function(a,b,d){return{restrict:"ECA",priority:400,terminal:!0,transclude:"element",controller:$.noop,compile:function(c,e){var f=e.ngInclude||e.src,g=e.onload||"",h=e.autoscroll;return function(c,e,m,p,n){var r=0,q,v,y,t=function(){v&&(v.remove(),v=null);q&&(q.$destroy(),q=null);y&&(d.leave(y).done(function(a){!1!==a&&(v=null)}),v=y,y=null)};c.$watch(f,function(f){var m=function(a){!1===
+        a||!u(h)||h&&!c.$eval(h)||b()},v=++r;f?(a(f,!0).then(function(a){if(!c.$$destroyed&&v===r){var b=c.$new();p.template=a;a=n(b,function(a){t();d.enter(a,null,e).done(m)});q=b;y=a;q.$emit("$includeContentLoaded",f);c.$eval(g)}},function(){c.$$destroyed||v!==r||(t(),c.$emit("$includeContentError",f))}),c.$emit("$includeContentRequested",f)):(t(),p.template=null)})}}}}],of=["$compile",function(a){return{restrict:"ECA",priority:-400,require:"ngInclude",link:function(b,d,c,e){ia.call(d[0]).match(/SVG/)?
+            (d.empty(),a(fd(e.template,w.document).childNodes)(b,function(a){d.append(a)},{futureParentElement:d})):(d.html(e.template),a(d.contents())(b))}}}],Ye=Qa({priority:450,compile:function(){return{pre:function(a,b,d){a.$eval(d.ngInit)}}}}),kf=function(){return{restrict:"A",priority:100,require:"ngModel",link:function(a,b,d,c){var e=d.ngList||", ",f="false"!==d.ngTrim,g=f?Q(e):e;c.$parsers.push(function(a){if(!x(a)){var b=[];a&&r(a.split(g),function(a){a&&b.push(f?Q(a):a)});return b}});c.$formatters.push(function(a){if(I(a))return a.join(e)});
+            c.$isEmpty=function(a){return!a||!a.length}}}},nb="ng-valid",$d="ng-invalid",Ya="ng-pristine",Vb="ng-dirty",pb=K("ngModel");Sb.$inject="$scope $exceptionHandler $attrs $element $parse $animate $timeout $q $interpolate".split(" ");Sb.prototype={$$initGetterSetters:function(){if(this.$options.getOption("getterSetter")){var a=this.$$parse(this.$$attr.ngModel+"()"),b=this.$$parse(this.$$attr.ngModel+"($$$p)");this.$$ngModelGet=function(b){var c=this.$$parsedNgModel(b);C(c)&&(c=a(b));return c};this.$$ngModelSet=
+            function(a,c){C(this.$$parsedNgModel(a))?b(a,{$$$p:c}):this.$$parsedNgModelAssign(a,c)}}else if(!this.$$parsedNgModel.assign)throw pb("nonassign",this.$$attr.ngModel,za(this.$$element));},$render:D,$isEmpty:function(a){return x(a)||""===a||null===a||a!==a},$$updateEmptyClasses:function(a){this.$isEmpty(a)?(this.$$animate.removeClass(this.$$element,"ng-not-empty"),this.$$animate.addClass(this.$$element,"ng-empty")):(this.$$animate.removeClass(this.$$element,"ng-empty"),this.$$animate.addClass(this.$$element,
+            "ng-not-empty"))},$setPristine:function(){this.$dirty=!1;this.$pristine=!0;this.$$animate.removeClass(this.$$element,Vb);this.$$animate.addClass(this.$$element,Ya)},$setDirty:function(){this.$dirty=!0;this.$pristine=!1;this.$$animate.removeClass(this.$$element,Ya);this.$$animate.addClass(this.$$element,Vb);this.$$parentForm.$setDirty()},$setUntouched:function(){this.$touched=!1;this.$untouched=!0;this.$$animate.setClass(this.$$element,"ng-untouched","ng-touched")},$setTouched:function(){this.$touched=
+            !0;this.$untouched=!1;this.$$animate.setClass(this.$$element,"ng-touched","ng-untouched")},$rollbackViewValue:function(){this.$$timeout.cancel(this.$$pendingDebounce);this.$viewValue=this.$$lastCommittedViewValue;this.$render()},$validate:function(){if(!U(this.$modelValue)){var a=this.$$lastCommittedViewValue,b=this.$$rawModelValue,d=this.$valid,c=this.$modelValue,e=this.$options.getOption("allowInvalid"),f=this;this.$$runValidators(b,a,function(a){e||d===a||(f.$modelValue=a?b:void 0,f.$modelValue!==
+        c&&f.$$writeModelToScope())})}},$$runValidators:function(a,b,d){function c(){var c=!0;r(k.$validators,function(d,e){var g=Boolean(d(a,b));c=c&&g;f(e,g)});return c?!0:(r(k.$asyncValidators,function(a,b){f(b,null)}),!1)}function e(){var c=[],d=!0;r(k.$asyncValidators,function(e,g){var k=e(a,b);if(!k||!C(k.then))throw pb("nopromise",k);f(g,void 0);c.push(k.then(function(){f(g,!0)},function(){d=!1;f(g,!1)}))});c.length?k.$$q.all(c).then(function(){g(d)},D):g(!0)}function f(a,b){h===k.$$currentValidationRunId&&
+        k.$setValidity(a,b)}function g(a){h===k.$$currentValidationRunId&&d(a)}this.$$currentValidationRunId++;var h=this.$$currentValidationRunId,k=this;(function(){var a=k.$$parserName||"parse";if(x(k.$$parserValid))f(a,null);else return k.$$parserValid||(r(k.$validators,function(a,b){f(b,null)}),r(k.$asyncValidators,function(a,b){f(b,null)})),f(a,k.$$parserValid),k.$$parserValid;return!0})()?c()?e():g(!1):g(!1)},$commitViewValue:function(){var a=this.$viewValue;this.$$timeout.cancel(this.$$pendingDebounce);
+            if(this.$$lastCommittedViewValue!==a||""===a&&this.$$hasNativeValidators)this.$$updateEmptyClasses(a),this.$$lastCommittedViewValue=a,this.$pristine&&this.$setDirty(),this.$$parseAndValidate()},$$parseAndValidate:function(){var a=this.$$lastCommittedViewValue,b=this;if(this.$$parserValid=x(a)?void 0:!0)for(var d=0;d<this.$parsers.length;d++)if(a=this.$parsers[d](a),x(a)){this.$$parserValid=!1;break}U(this.$modelValue)&&(this.$modelValue=this.$$ngModelGet(this.$$scope));var c=this.$modelValue,e=this.$options.getOption("allowInvalid");
+            this.$$rawModelValue=a;e&&(this.$modelValue=a,b.$modelValue!==c&&b.$$writeModelToScope());this.$$runValidators(a,this.$$lastCommittedViewValue,function(d){e||(b.$modelValue=d?a:void 0,b.$modelValue!==c&&b.$$writeModelToScope())})},$$writeModelToScope:function(){this.$$ngModelSet(this.$$scope,this.$modelValue);r(this.$viewChangeListeners,function(a){try{a()}catch(b){this.$$exceptionHandler(b)}},this)},$setViewValue:function(a,b){this.$viewValue=a;this.$options.getOption("updateOnDefault")&&this.$$debounceViewValueCommit(b)},
+        $$debounceViewValueCommit:function(a){var b=this.$options.getOption("debounce");Y(b[a])?b=b[a]:Y(b["default"])&&(b=b["default"]);this.$$timeout.cancel(this.$$pendingDebounce);var d=this;0<b?this.$$pendingDebounce=this.$$timeout(function(){d.$commitViewValue()},b):this.$$scope.$root.$$phase?this.$commitViewValue():this.$$scope.$apply(function(){d.$commitViewValue()})},$overrideModelOptions:function(a){this.$options=this.$options.createChild(a);this.$$setUpdateOnEvents()},$processModelValue:function(){var a=
+            this.$$format();this.$viewValue!==a&&(this.$$updateEmptyClasses(a),this.$viewValue=this.$$lastCommittedViewValue=a,this.$render(),this.$$runValidators(this.$modelValue,this.$viewValue,D))},$$format:function(){for(var a=this.$formatters,b=a.length,d=this.$modelValue;b--;)d=a[b](d);return d},$$setModelValue:function(a){this.$modelValue=this.$$rawModelValue=a;this.$$parserValid=void 0;this.$processModelValue()},$$setUpdateOnEvents:function(){this.$$updateEvents&&this.$$element.off(this.$$updateEvents,
+            this.$$updateEventHandler);if(this.$$updateEvents=this.$options.getOption("updateOn"))this.$$element.on(this.$$updateEvents,this.$$updateEventHandler)},$$updateEventHandler:function(a){this.$$debounceViewValueCommit(a&&a.type)}};ae({clazz:Sb,set:function(a,b){a[b]=!0},unset:function(a,b){delete a[b]}});var jf=["$rootScope",function(a){return{restrict:"A",require:["ngModel","^?form","^?ngModelOptions"],controller:Sb,priority:1,compile:function(b){b.addClass(Ya).addClass("ng-untouched").addClass(nb);
+            return{pre:function(a,b,e,f){var g=f[0];b=f[1]||g.$$parentForm;if(f=f[2])g.$options=f.$options;g.$$initGetterSetters();b.$addControl(g);e.$observe("name",function(a){g.$name!==a&&g.$$parentForm.$$renameControl(g,a)});a.$on("$destroy",function(){g.$$parentForm.$removeControl(g)})},post:function(b,c,e,f){function g(){h.$setTouched()}var h=f[0];h.$$setUpdateOnEvents();c.on("blur",function(){h.$touched||(a.$$phase?b.$evalAsync(g):b.$apply(g))})}}}}}],Tb,hh=/(\s+|^)default(\s+|$)/;Kc.prototype={getOption:function(a){return this.$$options[a]},
+        createChild:function(a){var b=!1;a=O({},a);r(a,function(d,c){"$inherit"===d?"*"===c?b=!0:(a[c]=this.$$options[c],"updateOn"===c&&(a.updateOnDefault=this.$$options.updateOnDefault)):"updateOn"===c&&(a.updateOnDefault=!1,a[c]=Q(d.replace(hh,function(){a.updateOnDefault=!0;return" "})))},this);b&&(delete a["*"],ge(a,this.$$options));ge(a,Tb.$$options);return new Kc(a)}};Tb=new Kc({updateOn:"",updateOnDefault:!0,debounce:0,getterSetter:!1,allowInvalid:!1,timezone:null});var nf=function(){function a(a,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            d){this.$$attrs=a;this.$$scope=d}a.$inject=["$attrs","$scope"];a.prototype={$onInit:function(){var a=this.parentCtrl?this.parentCtrl.$options:Tb,d=this.$$scope.$eval(this.$$attrs.ngModelOptions);this.$options=a.createChild(d)}};return{restrict:"A",priority:10,require:{parentCtrl:"?^^ngModelOptions"},bindToController:!0,controller:a}},Ze=Qa({terminal:!0,priority:1E3}),ih=K("ngOptions"),jh=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([$\w][$\w]*)|(?:\(\s*([$\w][$\w]*)\s*,\s*([$\w][$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,
+        gf=["$compile","$document","$parse",function(a,b,d){function c(a,b,c){function e(a,b,c,d,f){this.selectValue=a;this.viewValue=b;this.label=c;this.group=d;this.disabled=f}function f(a){var b;if(!r&&wa(a))b=a;else{b=[];for(var c in a)a.hasOwnProperty(c)&&"$"!==c.charAt(0)&&b.push(c)}return b}var p=a.match(jh);if(!p)throw ih("iexp",a,za(b));var n=p[5]||p[7],r=p[6];a=/ as /.test(p[0])&&p[1];var q=p[9];b=d(p[2]?p[1]:n);var v=a&&d(a)||b,u=q&&d(q),t=q?function(a,b){return u(c,b)}:function(a){return Pa(a)},
+            w=function(a,b){return t(a,C(a,b))},x=d(p[2]||p[1]),A=d(p[3]||""),H=d(p[4]||""),G=d(p[8]),z={},C=r?function(a,b){z[r]=b;z[n]=a;return z}:function(a){z[n]=a;return z};return{trackBy:q,getTrackByValue:w,getWatchables:d(G,function(a){var b=[];a=a||[];for(var d=f(a),e=d.length,g=0;g<e;g++){var h=a===d?g:d[g],l=a[h],h=C(l,h),l=t(l,h);b.push(l);if(p[2]||p[1])l=x(c,h),b.push(l);p[4]&&(h=H(c,h),b.push(h))}return b}),getOptions:function(){for(var a=[],b={},d=G(c)||[],g=f(d),h=g.length,n=0;n<h;n++){var p=d===
+            g?n:g[n],r=C(d[p],p),u=v(c,r),p=t(u,r),y=x(c,r),F=A(c,r),r=H(c,r),u=new e(p,u,y,F,r);a.push(u);b[p]=u}return{items:a,selectValueMap:b,getOptionFromViewValue:function(a){return b[w(a)]},getViewValueFromOption:function(a){return q?pa(a.viewValue):a.viewValue}}}}}var e=w.document.createElement("option"),f=w.document.createElement("optgroup");return{restrict:"A",terminal:!0,require:["select","ngModel"],link:{pre:function(a,b,c,d){d[0].registerOption=D},post:function(d,h,k,l){function m(a){var b=(a=t.getOptionFromViewValue(a))&&
+                    a.element;b&&!b.selected&&(b.selected=!0);return a}function p(a,b){a.element=b;b.disabled=a.disabled;a.label!==b.label&&(b.label=a.label,b.textContent=a.label);b.value=a.selectValue}var n=l[0],q=l[1],s=k.multiple;l=0;for(var v=h.children(),y=v.length;l<y;l++)if(""===v[l].value){n.hasEmptyOption=!0;n.emptyOption=v.eq(l);break}h.empty();l=!!n.emptyOption;z(e.cloneNode(!1)).val("?");var t,w=c(k.ngOptions,h,d),x=b[0].createDocumentFragment();n.generateUnknownOptionValue=function(a){return"?"};s?(n.writeValue=
+                    function(a){if(t){var b=a&&a.map(m)||[];t.items.forEach(function(a){a.element.selected&&-1===Array.prototype.indexOf.call(b,a)&&(a.element.selected=!1)})}},n.readValue=function(){var a=h.val()||[],b=[];r(a,function(a){(a=t.selectValueMap[a])&&!a.disabled&&b.push(t.getViewValueFromOption(a))});return b},w.trackBy&&d.$watchCollection(function(){if(I(q.$viewValue))return q.$viewValue.map(function(a){return w.getTrackByValue(a)})},function(){q.$render()})):(n.writeValue=function(a){if(t){var b=h[0].options[h[0].selectedIndex],
+                    c=t.getOptionFromViewValue(a);b&&b.removeAttribute("selected");c?(h[0].value!==c.selectValue&&(n.removeUnknownOption(),h[0].value=c.selectValue,c.element.selected=!0),c.element.setAttribute("selected","selected")):n.selectUnknownOrEmptyOption(a)}},n.readValue=function(){var a=t.selectValueMap[h.val()];return a&&!a.disabled?(n.unselectEmptyOption(),n.removeUnknownOption(),t.getViewValueFromOption(a)):null},w.trackBy&&d.$watch(function(){return w.getTrackByValue(q.$viewValue)},function(){q.$render()}));
+                    l&&(a(n.emptyOption)(d),h.prepend(n.emptyOption),8===n.emptyOption[0].nodeType?(n.hasEmptyOption=!1,n.registerOption=function(a,b){""===b.val()&&(n.hasEmptyOption=!0,n.emptyOption=b,n.emptyOption.removeClass("ng-scope"),q.$render(),b.on("$destroy",function(){var a=n.$isEmptyOptionSelected();n.hasEmptyOption=!1;n.emptyOption=void 0;a&&q.$render()}))}):n.emptyOption.removeClass("ng-scope"));d.$watchCollection(w.getWatchables,function(){var a=t&&n.readValue();if(t)for(var b=t.items.length-1;0<=b;b--){var c=
+                        t.items[b];u(c.group)?Fb(c.element.parentNode):Fb(c.element)}t=w.getOptions();var d={};t.items.forEach(function(a){var b;if(u(a.group)){b=d[a.group];b||(b=f.cloneNode(!1),x.appendChild(b),b.label=null===a.group?"null":a.group,d[a.group]=b);var c=e.cloneNode(!1);b.appendChild(c);p(a,c)}else b=e.cloneNode(!1),x.appendChild(b),p(a,b)});h[0].appendChild(x);q.$render();q.$isEmpty(a)||(b=n.readValue(),(w.trackBy||s?sa(a,b):a===b)||(q.$setViewValue(b),q.$render()))})}}}}],$e=["$locale","$interpolate","$log",
+            function(a,b,d){var c=/{}/g,e=/^when(Minus)?(.+)$/;return{link:function(f,g,h){function k(a){g.text(a||"")}var l=h.count,m=h.$attr.when&&g.attr(h.$attr.when),p=h.offset||0,n=f.$eval(m)||{},q={},s=b.startSymbol(),v=b.endSymbol(),u=s+l+"-"+p+v,t=$.noop,w;r(h,function(a,b){var c=e.exec(b);c&&(c=(c[1]?"-":"")+L(c[2]),n[c]=g.attr(h.$attr[b]))});r(n,function(a,d){q[d]=b(a.replace(c,u))});f.$watch(l,function(b){var c=parseFloat(b),e=U(c);e||c in n||(c=a.pluralCat(c-p));c===w||e&&U(w)||(t(),e=q[c],x(e)?(null!=
+                b&&d.debug("ngPluralize: no rule defined for '"+c+"' in "+m),t=D,k()):t=f.$watch(e,k),w=c)})}}}],af=["$parse","$animate","$compile",function(a,b,d){var c=K("ngRepeat"),e=function(a,b,c,d,e,m,p){a[c]=d;e&&(a[e]=m);a.$index=b;a.$first=0===b;a.$last=b===p-1;a.$middle=!(a.$first||a.$last);a.$odd=!(a.$even=0===(b&1))};return{restrict:"A",multiElement:!0,transclude:"element",priority:1E3,terminal:!0,$$tlb:!0,compile:function(f,g){var h=g.ngRepeat,k=d.$$createComment("end ngRepeat",h),l=h.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+track\s+by\s+([\s\S]+?))?\s*$/);
+                if(!l)throw c("iexp",h);var m=l[1],p=l[2],n=l[3],q=l[4],l=m.match(/^(?:(\s*[$\w]+)|\(\s*([$\w]+)\s*,\s*([$\w]+)\s*\))$/);if(!l)throw c("iidexp",m);var s=l[3]||l[1],v=l[2];if(n&&(!/^[$a-zA-Z_][$a-zA-Z0-9_]*$/.test(n)||/^(null|undefined|this|\$index|\$first|\$middle|\$last|\$even|\$odd|\$parent|\$root|\$id)$/.test(n)))throw c("badident",n);var u,t,w,x,z={$id:Pa};q?u=a(q):(w=function(a,b){return Pa(b)},x=function(a){return a});return function(a,d,f,g,l){u&&(t=function(b,c,d){v&&(z[v]=b);z[s]=c;z.$index=
+                    d;return u(a,z)});var m=S();a.$watchCollection(p,function(f){var g,p,q=d[0],u,y=S(),z,F,C,A,D,B,E;n&&(a[n]=f);if(wa(f))D=f,p=t||w;else for(E in p=t||x,D=[],f)ra.call(f,E)&&"$"!==E.charAt(0)&&D.push(E);z=D.length;E=Array(z);for(g=0;g<z;g++)if(F=f===D?g:D[g],C=f[F],A=p(F,C,g),m[A])B=m[A],delete m[A],y[A]=B,E[g]=B;else{if(y[A])throw r(E,function(a){a&&a.scope&&(m[a.id]=a)}),c("dupes",h,A,C);E[g]={id:A,scope:void 0,clone:void 0};y[A]=!0}for(u in m){B=m[u];A=tb(B.clone);b.leave(A);if(A[0].parentNode)for(g=
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                0,p=A.length;g<p;g++)A[g].$$NG_REMOVED=!0;B.scope.$destroy()}for(g=0;g<z;g++)if(F=f===D?g:D[g],C=f[F],B=E[g],B.scope){u=q;do u=u.nextSibling;while(u&&u.$$NG_REMOVED);B.clone[0]!==u&&b.move(tb(B.clone),null,q);q=B.clone[B.clone.length-1];e(B.scope,g,s,C,v,F,z)}else l(function(a,c){B.scope=c;var d=k.cloneNode(!1);a[a.length++]=d;b.enter(a,null,q);q=d;B.clone=a;y[B.id]=B;e(B.scope,g,s,C,v,F,z)});m=y})}}}}],bf=["$animate",function(a){return{restrict:"A",multiElement:!0,link:function(b,d,c){b.$watch(c.ngShow,
+                function(b){a[b?"removeClass":"addClass"](d,"ng-hide",{tempClasses:"ng-hide-animate"})})}}}],Ve=["$animate",function(a){return{restrict:"A",multiElement:!0,link:function(b,d,c){b.$watch(c.ngHide,function(b){a[b?"addClass":"removeClass"](d,"ng-hide",{tempClasses:"ng-hide-animate"})})}}}],cf=Qa(function(a,b,d){a.$watch(d.ngStyle,function(a,d){d&&a!==d&&r(d,function(a,c){b.css(c,"")});a&&b.css(a)},!0)}),df=["$animate","$compile",function(a,b){return{require:"ngSwitch",controller:["$scope",function(){this.cases=
+                {}}],link:function(d,c,e,f){var g=[],h=[],k=[],l=[],m=function(a,b){return function(c){!1!==c&&a.splice(b,1)}};d.$watch(e.ngSwitch||e.on,function(c){for(var d,e;k.length;)a.cancel(k.pop());d=0;for(e=l.length;d<e;++d){var q=tb(h[d].clone);l[d].$destroy();(k[d]=a.leave(q)).done(m(k,d))}h.length=0;l.length=0;(g=f.cases["!"+c]||f.cases["?"])&&r(g,function(c){c.transclude(function(d,e){l.push(e);var f=c.element;d[d.length++]=b.$$createComment("end ngSwitchWhen");h.push({clone:d});a.enter(d,f.parent(),
+                f)})})})}}}],ef=Qa({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(a,b,d,c,e){a=d.ngSwitchWhen.split(d.ngSwitchWhenSeparator).sort().filter(function(a,b,c){return c[b-1]!==a});r(a,function(a){c.cases["!"+a]=c.cases["!"+a]||[];c.cases["!"+a].push({transclude:e,element:b})})}}),ff=Qa({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(a,b,d,c,e){c.cases["?"]=c.cases["?"]||[];c.cases["?"].push({transclude:e,element:b})}}),kh=K("ngTransclude"),
+        hf=["$compile",function(a){return{restrict:"EAC",compile:function(b){var d=a(b.contents());b.empty();return function(a,b,f,g,h){function k(){d(a,function(a){b.append(a)})}if(!h)throw kh("orphan",za(b));f.ngTransclude===f.$attr.ngTransclude&&(f.ngTransclude="");f=f.ngTransclude||f.ngTranscludeSlot;h(function(a,c){var d;if(d=a.length)a:{d=0;for(var f=a.length;d<f;d++){var g=a[d];if(g.nodeType!==Oa||g.nodeValue.trim()){d=!0;break a}}d=void 0}d?b.append(a):(k(),c.$destroy())},null,f);f&&!h.isSlotFilled(f)&&
+            k()}}}}],Je=["$templateCache",function(a){return{restrict:"E",terminal:!0,compile:function(b,d){"text/ng-template"===d.type&&a.put(d.id,b[0].text)}}}],lh={$setViewValue:D,$render:D},mh=["$element","$scope",function(a,b){function d(){g||(g=!0,b.$$postDigest(function(){g=!1;e.ngModelCtrl.$render()}))}function c(a){h||(h=!0,b.$$postDigest(function(){b.$$destroyed||(h=!1,e.ngModelCtrl.$setViewValue(e.readValue()),a&&e.ngModelCtrl.$render())}))}var e=this,f=new Hb;e.selectValueMap={};e.ngModelCtrl=lh;
+            e.multiple=!1;e.unknownOption=z(w.document.createElement("option"));e.hasEmptyOption=!1;e.emptyOption=void 0;e.renderUnknownOption=function(b){b=e.generateUnknownOptionValue(b);e.unknownOption.val(b);a.prepend(e.unknownOption);Ga(e.unknownOption,!0);a.val(b)};e.updateUnknownOption=function(b){b=e.generateUnknownOptionValue(b);e.unknownOption.val(b);Ga(e.unknownOption,!0);a.val(b)};e.generateUnknownOptionValue=function(a){return"? "+Pa(a)+" ?"};e.removeUnknownOption=function(){e.unknownOption.parent()&&
+            e.unknownOption.remove()};e.selectEmptyOption=function(){e.emptyOption&&(a.val(""),Ga(e.emptyOption,!0))};e.unselectEmptyOption=function(){e.hasEmptyOption&&Ga(e.emptyOption,!1)};b.$on("$destroy",function(){e.renderUnknownOption=D});e.readValue=function(){var b=a.val(),b=b in e.selectValueMap?e.selectValueMap[b]:b;return e.hasOption(b)?b:null};e.writeValue=function(b){var c=a[0].options[a[0].selectedIndex];c&&Ga(z(c),!1);e.hasOption(b)?(e.removeUnknownOption(),c=Pa(b),a.val(c in e.selectValueMap?
+                c:b),Ga(z(a[0].options[a[0].selectedIndex]),!0)):e.selectUnknownOrEmptyOption(b)};e.addOption=function(a,b){if(8!==b[0].nodeType){Ia(a,'"option value"');""===a&&(e.hasEmptyOption=!0,e.emptyOption=b);var c=f.get(a)||0;f.set(a,c+1);d()}};e.removeOption=function(a){var b=f.get(a);b&&(1===b?(f.delete(a),""===a&&(e.hasEmptyOption=!1,e.emptyOption=void 0)):f.set(a,b-1))};e.hasOption=function(a){return!!f.get(a)};e.$hasEmptyOption=function(){return e.hasEmptyOption};e.$isUnknownOptionSelected=function(){return a[0].options[0]===
+                e.unknownOption[0]};e.$isEmptyOptionSelected=function(){return e.hasEmptyOption&&a[0].options[a[0].selectedIndex]===e.emptyOption[0]};e.selectUnknownOrEmptyOption=function(a){null==a&&e.emptyOption?(e.removeUnknownOption(),e.selectEmptyOption()):e.unknownOption.parent().length?e.updateUnknownOption(a):e.renderUnknownOption(a)};var g=!1,h=!1;e.registerOption=function(a,b,f,g,h){if(f.$attr.ngValue){var q,r=NaN;f.$observe("value",function(a){var d,f=b.prop("selected");u(r)&&(e.removeOption(q),delete e.selectValueMap[r],
+                d=!0);r=Pa(a);q=a;e.selectValueMap[r]=a;e.addOption(a,b);b.attr("value",r);d&&f&&c()})}else g?f.$observe("value",function(a){e.readValue();var d,f=b.prop("selected");u(q)&&(e.removeOption(q),d=!0);q=a;e.addOption(a,b);d&&f&&c()}):h?a.$watch(h,function(a,d){f.$set("value",a);var g=b.prop("selected");d!==a&&e.removeOption(d);e.addOption(a,b);d&&g&&c()}):e.addOption(f.value,b);f.$observe("disabled",function(a){if("true"===a||a&&b.prop("selected"))e.multiple?c(!0):(e.ngModelCtrl.$setViewValue(null),e.ngModelCtrl.$render())});
+                b.on("$destroy",function(){var a=e.readValue(),b=f.value;e.removeOption(b);d();(e.multiple&&a&&-1!==a.indexOf(b)||a===b)&&c(!0)})}}],Ke=function(){return{restrict:"E",require:["select","?ngModel"],controller:mh,priority:1,link:{pre:function(a,b,d,c){var e=c[0],f=c[1];if(f){if(e.ngModelCtrl=f,b.on("change",function(){e.removeUnknownOption();a.$apply(function(){f.$setViewValue(e.readValue())})}),d.multiple){e.multiple=!0;e.readValue=function(){var a=[];r(b.find("option"),function(b){b.selected&&!b.disabled&&
+                (b=b.value,a.push(b in e.selectValueMap?e.selectValueMap[b]:b))});return a};e.writeValue=function(a){r(b.find("option"),function(b){var c=!!a&&(-1!==Array.prototype.indexOf.call(a,b.value)||-1!==Array.prototype.indexOf.call(a,e.selectValueMap[b.value]));c!==b.selected&&Ga(z(b),c)})};var g,h=NaN;a.$watch(function(){h!==f.$viewValue||sa(g,f.$viewValue)||(g=ka(f.$viewValue),f.$render());h=f.$viewValue});f.$isEmpty=function(a){return!a||0===a.length}}}else e.registerOption=D},post:function(a,b,d,c){var e=
+                    c[1];if(e){var f=c[0];e.$render=function(){f.writeValue(e.$viewValue)}}}}}},Le=["$interpolate",function(a){return{restrict:"E",priority:100,compile:function(b,d){var c,e;u(d.ngValue)||(u(d.value)?c=a(d.value,!0):(e=a(b.text(),!0))||d.$set("value",b.text()));return function(a,b,d){var k=b.parent();(k=k.data("$selectController")||k.parent().data("$selectController"))&&k.registerOption(a,b,d,c,e)}}}}],ad=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){c&&(d.required=!0,c.$validators.required=
+                function(a,b){return!d.required||!c.$isEmpty(b)},d.$observe("required",function(){c.$validate()}))}}},$c=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){if(c){var e,f=d.ngPattern||d.pattern;d.$observe("pattern",function(a){E(a)&&0<a.length&&(a=new RegExp("^"+a+"$"));if(a&&!a.test)throw K("ngPattern")("noregexp",f,a,za(b));e=a||void 0;c.$validate()});c.$validators.pattern=function(a,b){return c.$isEmpty(b)||x(e)||e.test(b)}}}}},cd=function(){return{restrict:"A",require:"?ngModel",
+            link:function(a,b,d,c){if(c){var e=-1;d.$observe("maxlength",function(a){a=Z(a);e=U(a)?-1:a;c.$validate()});c.$validators.maxlength=function(a,b){return 0>e||c.$isEmpty(b)||b.length<=e}}}}},bd=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){if(c){var e=0;d.$observe("minlength",function(a){e=Z(a)||0;c.$validate()});c.$validators.minlength=function(a,b){return c.$isEmpty(b)||b.length>=e}}}}};w.angular.bootstrap?w.console&&console.log("WARNING: Tried to load AngularJS more than once."):
+        (Be(),Ee($),$.module("ngLocale",[],["$provide",function(a){function b(a){a+="";var b=a.indexOf(".");return-1==b?0:a.length-b-1}a.value("$locale",{DATETIME_FORMATS:{AMPMS:["AM","PM"],DAY:"Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" "),ERANAMES:["Before Christ","Anno Domini"],ERAS:["BC","AD"],FIRSTDAYOFWEEK:6,MONTH:"January February March April May June July August September October November December".split(" "),SHORTDAY:"Sun Mon Tue Wed Thu Fri Sat".split(" "),SHORTMONTH:"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),
+                STANDALONEMONTH:"January February March April May June July August September October November December".split(" "),WEEKENDRANGE:[5,6],fullDate:"EEEE, MMMM d, y",longDate:"MMMM d, y",medium:"MMM d, y h:mm:ss a",mediumDate:"MMM d, y",mediumTime:"h:mm:ss a","short":"M/d/yy h:mm a",shortDate:"M/d/yy",shortTime:"h:mm a"},NUMBER_FORMATS:{CURRENCY_SYM:"$",DECIMAL_SEP:".",GROUP_SEP:",",PATTERNS:[{gSize:3,lgSize:3,maxFrac:3,minFrac:0,minInt:1,negPre:"-",negSuf:"",posPre:"",posSuf:""},{gSize:3,lgSize:3,maxFrac:2,
+                    minFrac:2,minInt:1,negPre:"-\u00a4",negSuf:"",posPre:"\u00a4",posSuf:""}]},id:"en-us",localeID:"en_US",pluralCat:function(a,c){var e=a|0,f=c;void 0===f&&(f=Math.min(b(a),3));Math.pow(10,f);return 1==e&&0==f?"one":"other"}})}]),z(function(){we(w.document,Uc)}))})(window);!window.angular.$$csp().noInlineStyle&&window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
+//# sourceMappingURL=angular.min.js.map
\ No newline at end of file
diff --git a/setup/pub/images/magento-logo.svg b/setup/pub/images/magento-logo.svg
index 6dcc79d33b294..e4f627809b627 100644
--- a/setup/pub/images/magento-logo.svg
+++ b/setup/pub/images/magento-logo.svg
@@ -1,18 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1 Tiny//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd'>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="214px" xml:space="preserve" height="62px" viewBox="0 0 214 62" baseProfile="tiny" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink">
-	<path d="m93.166 44.96l-1.809-23.096-9.17 23.221h-2.988l-9.17-23.221-1.767 23.096h-3.702l2.314-29.026h4.88l9.045 23.809 9.045-23.809h4.836l2.271 29.026h-3.785z" fill="#131108"/>
-	<path d="m112.94 44.96l-0.421-2.692c-1.597 1.639-3.785 3.112-7.066 3.112-3.619 0-5.889-2.188-5.889-5.596 0-5.006 4.29-6.981 12.663-7.867v-0.841c0-2.523-1.515-3.407-3.83-3.407-2.439 0-4.754 0.757-6.94 1.725l-0.505-3.238c2.398-0.969 4.67-1.682 7.783-1.682 4.88 0 7.236 1.976 7.236 6.435v14.051h-3.02zm-0.72-10.182c-7.406 0.715-8.963 2.735-8.963 4.796 0 1.642 1.095 2.693 2.989 2.693 2.187 0 4.291-1.095 5.974-2.82v-4.669z" fill="#131108"/>
-	<path d="m137.46 24.599l0.546 3.364-3.826 0.378c0.546 0.926 0.799 1.979 0.799 3.113 0 4.292-3.618 6.899-7.699 6.899-0.504 0-1.011-0.042-1.514-0.126-0.589 0.38-1.01 0.844-1.01 1.22 0 0.716 0.714 0.886 4.248 1.517l1.432 0.252c4.249 0.757 6.898 2.102 6.898 5.216 0 4.206-4.586 6.183-9.802 6.183s-9.381-1.64-9.381-5.173c0-2.062 1.431-3.66 4.248-5.174-0.882-0.631-1.26-1.348-1.26-2.104 0-0.969 0.756-1.936 2.103-2.734-2.229-1.095-3.744-3.238-3.744-5.974 0-4.332 3.616-6.981 7.697-6.981 2.019 0 3.786 0.587 5.175 1.682l5.08-1.558zm-15.73 22.547c0 1.599 2.06 2.775 5.972 2.775 3.913 0 6.099-1.345 6.099-3.027 0-1.222-0.924-2.061-3.784-2.566l-2.397-0.422c-1.095-0.208-1.682-0.336-2.481-0.502-2.36 1.177-3.41 2.356-3.41 3.742zm5.47-19.939c-2.522 0-4.081 1.936-4.081 4.375 0 2.313 1.6 4.12 4.081 4.12 2.566 0 4.165-1.892 4.165-4.29 0-2.397-1.68-4.205-4.16-4.205z" fill="#131108"/>
-	<path d="m155.3 35.325h-13.631c0.125 4.669 2.354 6.856 5.847 6.856 2.904 0 5.007-1.135 7.193-2.86l0.546 3.367c-2.144 1.682-4.709 2.691-8.031 2.691-5.219 0-9.299-3.155-9.299-10.519 0-6.435 3.787-10.388 8.835-10.388 5.846 0 8.54 4.5 8.54 10.052v0.801zm-8.58-7.908c-2.313 0-4.291 1.641-4.879 5.09h9.675c-0.47-3.239-1.9-5.09-4.8-5.09z" fill="#131108"/>
-	<path d="m171.07 44.96v-13.673c0-2.06-0.883-3.449-3.07-3.449-1.977 0-3.996 1.305-5.807 3.239v13.883h-3.743v-20.067h2.986l0.463 2.903c1.893-1.724 4.251-3.323 7.108-3.323 3.786 0 5.808 2.271 5.808 5.888v14.599h-3.75z" fill="#131108"/>
-	<path d="m185.88 45.298c-3.532 0-5.846-1.265-5.846-5.304v-11.946h-3.03v-3.156h3.03v-6.688l3.66-0.546v7.234h4.332l0.505 3.156h-4.837v11.273c0 1.643 0.675 2.651 2.776 2.651 0.673 0 1.262-0.041 1.724-0.127l0.506 3.196c-0.63 0.128-1.51 0.257-2.81 0.257z" fill="#131108"/>
-	<path d="m198.29 45.38c-5.342 0-9.213-3.827-9.213-10.434 0-6.605 3.871-10.473 9.213-10.473 5.383 0 9.339 3.868 9.339 10.473 0 6.607-3.96 10.434-9.34 10.434zm0-17.753c-3.617 0-5.426 3.113-5.426 7.319 0 4.125 1.892 7.321 5.426 7.321 3.702 0 5.553-3.114 5.553-7.321 0-4.122-1.93-7.319-5.55-7.319z" fill="#131108"/>
-		<path d="m210.28 27.897c-1.505 0-2.551-1.045-2.551-2.606 0-1.55 1.067-2.618 2.551-2.618 1.505 0 2.55 1.056 2.55 2.618 0 1.55-1.07 2.606-2.55 2.606zm0-4.92c-1.214 0-2.18 0.831-2.18 2.314 0 1.472 0.966 2.303 2.18 2.303 1.225 0 2.191-0.832 2.191-2.303 0-1.483-0.98-2.314-2.19-2.314zm0.75 3.708l-0.863-1.237h-0.281v1.191h-0.495v-2.888h0.878c0.606 0 1.01 0.303 1.01 0.843 0 0.416-0.225 0.686-0.585 0.798l0.833 1.18-0.5 0.113zm-0.76-2.484h-0.383v0.854h0.359c0.325 0 0.53-0.135 0.53-0.427 0-0.281-0.18-0.427-0.51-0.427z" fill="#131108"/>
-	<g fill="#E85D22">
-		<path d="m26.845 8.857"/>
-		<polygon points="53.692 15.5 53.692 46.5 46.021 50.929 46.021 19.929 26.845 8.857 7.67 19.928 7.67 50.929 0 46.5 0 15.5 26.845 0"/>
-		<polygon points="26.847 62 15.341 55.356 15.341 24.357 23.011 19.928 23.011 50.929 26.845 53.257 30.682 50.929 30.682 19.929 38.353 24.357 38.353 55.356"/>
-	</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 179.07329 60.13148"><defs><style>.a{fill:#f26322;}.b{fill:#4d4d4d;}</style></defs><title>Magento-an-Adobe-Company-logo-horizontal</title><polygon class="a" points="21.432 0 0 12.373 0 37.086 6.117 40.619 6.076 15.906 21.391 7.064 36.704 15.906 36.704 40.612 42.822 37.086 42.822 12.35 21.432 0"/><polygon class="a" points="24.47 40.618 21.412 42.39 18.341 40.631 18.341 15.906 12.225 19.438 12.235 44.15 21.407 49.448 30.587 44.15 30.587 19.438 24.47 15.906 24.47 40.618"/><path class="b" d="M56.83813,12.5216l8.41451,21.258h.06808L73.531,12.5216h3.20261V36.87914h-2.2145v-21.223H74.451q-.17069.57915-.37444,1.15831-.17213.477-.39291,1.05522c-.14685.38707-.27814.74983-.391,1.09023l-7.052,17.91925H64.23049L57.11044,18.95989q-.20422-.477-.40847-1.03869t-.3754-1.07272q-.20424-.61417-.40848-1.19235H55.85v21.223H53.73763V12.5216Z"/><path class="b" d="M83.16956,36.98155a5.18444,5.18444,0,0,1-1.82256-.92,4.32686,4.32686,0,0,1-1.20888-1.53274,4.88654,4.88654,0,0,1-.44348-2.14545,5.01721,5.01721,0,0,1,.57867-2.55586,4.4721,4.4721,0,0,1,1.56775-1.58429,7.91353,7.91353,0,0,1,2.29911-.90253,24.63306,24.63306,0,0,1,2.81067-.47655q1.29545-.13713,2.198-.28982a6.67488,6.67488,0,0,0,1.46466-.39194,1.74967,1.74967,0,0,0,.81694-.63021,1.93855,1.93855,0,0,0,.25578-1.07272V24.139A3.21282,3.21282,0,0,0,90.596,21.4645,4.92377,4.92377,0,0,0,87.4624,20.595q-4.7018,0-4.94056,3.91841H80.44447a5.74847,5.74847,0,0,1,1.89064-4.08861A7.50173,7.50173,0,0,1,87.4624,18.8921,7.336,7.336,0,0,1,92.02659,20.17a4.92221,4.92221,0,0,1,1.66986,4.17322v9.57282a1.80589,1.80589,0,0,0,.28983,1.1408,1.14194,1.14194,0,0,0,.86848.39194,2.038,2.038,0,0,0,.3579-.034c.12449-.02237.26648-.05738.425-.10212h.10309v1.53274a3.99429,3.99429,0,0,1-.57964.18771,3.60124,3.60124,0,0,1-.852.08558,2.69449,2.69449,0,0,1-1.8391-.59714,2.57739,2.57739,0,0,1-.74983-1.89064v-.37444h-.10212a10.28754,10.28754,0,0,1-.90252,1.05619,6.08059,6.08059,0,0,1-1.27794.98812,7.1451,7.1451,0,0,1-1.737.71482,8.46792,8.46792,0,0,1-2.24853.27232,8.161,8.161,0,0,1-2.28258-.30636m5.19537-1.8566a5.975,5.975,0,0,0,1.8566-1.17484,4.76767,4.76767,0,0,0,1.4987-3.44089V27.34065a7.29273,7.29273,0,0,1-2.06084.73233q-1.20936.2553-2.50432.426-1.12329.17068-2.07737.3579a5.243,5.243,0,0,0-1.65236.59617,3.05235,3.05235,0,0,0-1.10773,1.10677,3.58626,3.58626,0,0,0-.40847,1.82353,3.2604,3.2604,0,0,0,.32386,1.53274,2.77919,2.77919,0,0,0,.851.98714,3.34368,3.34368,0,0,0,1.24389.52907,7.139,7.139,0,0,0,1.4987.15269,6.55762,6.55762,0,0,0,2.53836-.46"/><path class="b" d="M99.3499,41.73412a4.68909,4.68909,0,0,1-2.0093-3.28722h2.04334a2.86247,2.86247,0,0,0,1.65236,2.197,7.52105,7.52105,0,0,0,3.28819.66425,5.69284,5.69284,0,0,0,4.17322-1.345,4.99842,4.99842,0,0,0,1.345-3.69667V33.47327h-.10212a7.27781,7.27781,0,0,1-2.28258,2.2816,6.2891,6.2891,0,0,1-3.30375.78388,7.37745,7.37745,0,0,1-3.13453-.64675,6.92683,6.92683,0,0,1-2.3847-1.806,8.09694,8.09694,0,0,1-1.51621-2.77664,11.4194,11.4194,0,0,1-.52809-3.55954,10.89083,10.89083,0,0,1,.6127-3.79878,8.46783,8.46783,0,0,1,1.63583-2.77663,6.74456,6.74456,0,0,1,2.40221-1.70294,7.447,7.447,0,0,1,2.91279-.57964,6.23565,6.23565,0,0,1,3.37183.83542,6.92287,6.92287,0,0,1,2.2145,2.26507h.10212V19.26721h2.07834V36.19836a6.77964,6.77964,0,0,1-1.63583,4.73535,7.75455,7.75455,0,0,1-5.89269,2.11238,8.36019,8.36019,0,0,1-5.04267-1.312m9.23243-8.90857a8.55521,8.55521,0,0,0,1.39658-5.10978,11.225,11.225,0,0,0-.34039-2.86222,6.23339,6.23339,0,0,0-1.05619-2.231,4.8341,4.8341,0,0,0-1.78853-1.44812,5.76685,5.76685,0,0,0-2.50334-.51059,4.78168,4.78168,0,0,0-4.07111,1.94121,8.46075,8.46075,0,0,0-1.44812,5.17883,10.779,10.779,0,0,0,.34039,2.77664,6.6521,6.6521,0,0,0,1.02215,2.2145,4.81441,4.81441,0,0,0,1.70294,1.46466,5.20818,5.20818,0,0,0,2.4197.52809,4.969,4.969,0,0,0,4.32592-1.94218"/><path class="b" d="M119.24391,36.62385a7.17983,7.17983,0,0,1-2.57239-1.94121,8.67267,8.67267,0,0,1-1.58331-2.9303,11.83376,11.83376,0,0,1-.54561-3.66166,11.20538,11.20538,0,0,1,.57964-3.66262,9.15057,9.15057,0,0,1,1.61736-2.92933,7.3041,7.3041,0,0,1,2.52182-1.94218,7.68893,7.68893,0,0,1,3.32126-.6983,7.26371,7.26371,0,0,1,3.55953.80041,6.669,6.669,0,0,1,2.35067,2.14643,8.80226,8.80226,0,0,1,1.27793,3.083,16.91087,16.91087,0,0,1,.37442,3.57705H116.72307a10.20565,10.20565,0,0,0,.426,2.77663,6.97713,6.97713,0,0,0,1.12427,2.231,5.10411,5.10411,0,0,0,1.8566,1.4987,5.94442,5.94442,0,0,0,2.623.5456,4.98891,4.98891,0,0,0,3.42434-1.07369,5.88046,5.88046,0,0,0,1.71948-2.87778H129.941a7.5058,7.5058,0,0,1-2.3847,4.18975,7.07155,7.07155,0,0,1-4.80343,1.56678,8.37716,8.37716,0,0,1-3.509-.69829M127.55631,24.36a5.98459,5.98459,0,0,0-.98811-1.97623,4.52056,4.52056,0,0,0-1.63486-1.311,5.35765,5.35765,0,0,0-2.35066-.47752,5.61864,5.61864,0,0,0-2.36816.47752,5.06368,5.06368,0,0,0-1.75448,1.311,6.54337,6.54337,0,0,0-1.1408,1.95969,9.6597,9.6597,0,0,0-.56214,2.45278h11.17364a9.30557,9.30557,0,0,0-.37443-2.43624"/><path class="b" d="M134.87924,19.26682v2.69105h.06807a7.23505,7.23505,0,0,1,2.33315-2.197,6.8045,6.8045,0,0,1,3.56051-.86849,5.8368,5.8368,0,0,1,4.03706,1.41312,5.17343,5.17343,0,0,1,1.58428,4.0711V36.87973h-2.11238V24.58084a3.71719,3.71719,0,0,0-1.07272-2.94683,4.33224,4.33224,0,0,0-2.94781-.93656,5.90068,5.90068,0,0,0-2.1114.3754,5.56743,5.56743,0,0,0-1.73795,1.03869,4.77387,4.77387,0,0,0-1.17485,1.58428,4.72061,4.72061,0,0,0-.426,2.00929V36.87973h-2.1124V19.26682Z"/><path class="b" d="M151.91191,36.28355a2.93417,2.93417,0,0,1-.92-2.43624V21.00477h-2.657v-1.738h2.657V13.85069h2.11239v5.41613h3.27068v1.738h-3.27068V33.50692a1.65111,1.65111,0,0,0,.426,1.312,1.94949,1.94949,0,0,0,1.277.35693,3.61925,3.61925,0,0,0,.76638-.08462,3.514,3.514,0,0,0,.63021-.1877h.10309v1.806a5.90754,5.90754,0,0,1-1.94219.30635,3.82424,3.82424,0,0,1-2.45277-.73233"/><path class="b" d="M162.625,36.62424a7.37783,7.37783,0,0,1-2.57142-1.94219,8.72758,8.72758,0,0,1-1.61833-2.92932,12.21028,12.21028,0,0,1,0-7.32429,8.74174,8.74174,0,0,1,1.61833-2.93029A7.38946,7.38946,0,0,1,162.625,19.556a8.10343,8.10343,0,0,1,3.42436-.69829,7.98376,7.98376,0,0,1,3.40588.69829,7.43133,7.43133,0,0,1,2.55585,1.94219,8.50888,8.50888,0,0,1,1.60083,2.93029,12.56344,12.56344,0,0,1,0,7.32429,8.51161,8.51161,0,0,1-1.60083,2.92932,7.4195,7.4195,0,0,1-2.55585,1.94219,7.96929,7.96929,0,0,1-3.40588.69829,8.08867,8.08867,0,0,1-3.42436-.69829m6.0133-1.65237a5.30977,5.30977,0,0,0,1.87312-1.60082,7.23411,7.23411,0,0,0,1.12426-2.38469,11.35618,11.35618,0,0,0,0-5.79155,7.21572,7.21572,0,0,0-1.12426-2.38469,5.29013,5.29013,0,0,0-1.87312-1.60082,6.11061,6.11061,0,0,0-5.19538,0,5.5025,5.5025,0,0,0-1.87411,1.60082,7.037,7.037,0,0,0-1.14079,2.38469,11.38462,11.38462,0,0,0,0,5.79155,7.05452,7.05452,0,0,0,1.14079,2.38469,5.81691,5.81691,0,0,0,7.06949,1.60082"/><path class="b" d="M176.85586,22.19069a2.1284,2.1284,0,0,1-2.21371-2.26492,2.21634,2.21634,0,1,1,4.43114,0,2.14565,2.14565,0,0,1-2.21743,2.26492m0-4.2762a1.8463,1.8463,0,0,0-1.8928,2.01128,1.90119,1.90119,0,1,0,3.79717,0,1.85428,1.85428,0,0,0-1.90437-2.01128m.65338,3.22135-.751-1.07325h-.24266v1.03463h-.4296V18.58836h.76256c.52629,0,.8771.26363.8771.73238a.6799.6799,0,0,1-.50839.69275l.72373,1.02463Zm-.66074-2.15649h-.333v.741h.312c.28255,0,.46008-.11708.46008-.371,0-.24422-.15811-.37-.43911-.37"/><path class="b" d="M56.01605,53.8,54.9537,56.78168a.11575.11575,0,0,1-.11831.08828h-1.0035c-.07867,0-.10809-.039-.08828-.1183l3.21708-8.95821c.01982-.05945.039-.12551.05885-.19938a2.24879,2.24879,0,0,0,.04444-.406.06529.06529,0,0,1,.07387-.07387h1.44669a.08244.08244,0,0,1,.08828.07387l3.4681,9.57856c.03.06906.00961.10329-.05885.10329H60.96026a.13273.13273,0,0,1-.1177-.07386L59.7652,53.8Zm3.40924-1.13622q-.118-.354-.33209-.97407-.2135-.61975-.44981-1.28395-.236-.66479-.44259-1.28394c-.13813-.41377-.24142-.74767-.31048-1.0041h-.01441q-.08828.35491-.25823.87858-.17025.52338-.38375,1.13622-.21438.61255-.44259,1.26954-.22971.65668-.43539,1.26172Z"/><path class="b" d="M63.39544,51.36484c0-.12791-.0024-.27024-.0072-.42818-.00481-.15674-.00961-.30988-.015-.457-.0048-.14773-.00961-.28525-.01441-.41377a2.64678,2.64678,0,0,0-.02222-.27985.07822.07822,0,0,1,.08828-.08888h.91522a.14145.14145,0,0,1,.13271.08888,1.53405,1.53405,0,0,1,.04444.29486q.01441.19188.04444.4426a3.09954,3.09954,0,0,1,2.258-.97407,3.028,3.028,0,0,1,.81913.1183,1.9399,1.9399,0,0,1,.7747.43539,2.34944,2.34944,0,0,1,.58312.87078,3.76544,3.76544,0,0,1,.2288,1.42388v4.3689a.09138.09138,0,0,1-.10329.10329H68.08864c-.06846,0-.1033-.039-.1033-.1183V52.51607a2.28923,2.28923,0,0,0-.36873-1.35781,1.31944,1.31944,0,0,0-1.15122-.51646,2.232,2.232,0,0,0-1.02572.236,2.5679,2.5679,0,0,0-.81913.66419v5.22467c0,.06906-.02943.10329-.08828.10329H63.48432c-.05945,0-.08888-.03423-.08888-.10329Z"/><path class="b" d="M76.05776,53.8l-1.06235,2.98166a.11574.11574,0,0,1-.11831.08828H73.87361c-.07867,0-.1081-.039-.08828-.1183l3.21707-8.95821c.01982-.05945.039-.12551.05886-.19938a2.24974,2.24974,0,0,0,.04444-.406.06529.06529,0,0,1,.07386-.07387h1.4467a.08242.08242,0,0,1,.08827.07387l3.4681,9.57856c.03.06906.00961.10329-.05885.10329H81.002a.13274.13274,0,0,1-.11771-.07386L79.80691,53.8ZM79.467,52.6638q-.118-.354-.3321-.97407-.2135-.61975-.4498-1.28395-.236-.66479-.4426-1.28394c-.13812-.41377-.24141-.74767-.31048-1.0041h-.01441q-.08827.35491-.25823.87858-.17025.52338-.38374,1.13622-.21439.61255-.4426,1.26954-.2297.65668-.43539,1.26172Z"/><path class="b" d="M86.52211,57.01769a4.36237,4.36237,0,0,1-1.43108-.2288,3.18223,3.18223,0,0,1-1.159-.69362,3.22815,3.22815,0,0,1-.77469-1.15123,4.21828,4.21828,0,0,1-.28046-1.60163,3.89269,3.89269,0,0,1,.28766-1.505,3.51871,3.51871,0,0,1,.81913-1.20287,3.79829,3.79829,0,0,1,1.26954-.79691,4.4664,4.4664,0,0,1,1.63826-.28826,3.83172,3.83172,0,0,1,.51646.02943q.20629.02971.41317.05945V46.37618A.07822.07822,0,0,1,87.91,46.2879H88.9723c.05886,0,.08888.02463.08888.07387v9.63741a2.39778,2.39778,0,0,0,.02943.36873.1037.1037,0,0,1-.07387.1033,5.609,5.609,0,0,1-1.25452.421A6.24619,6.24619,0,0,1,86.52211,57.01769Zm1.299-6.25759a1.79213,1.79213,0,0,0-.42818-.1111,3.72916,3.72916,0,0,0-.53087-.03663,3.04975,3.04975,0,0,0-1.13682.19938,2.44176,2.44176,0,0,0-.85576.5603,2.51242,2.51242,0,0,0-.54589.84916,2.85873,2.85873,0,0,0-.19217,1.06235,3.225,3.225,0,0,0,.20658,1.22509,2.20392,2.20392,0,0,0,.5609.81913,2.238,2.238,0,0,0,.80412.46482,2.98757,2.98757,0,0,0,.93744.14773,5.30729,5.30729,0,0,0,.61255-.03723,1.79256,1.79256,0,0,0,.5681-.15494Z"/><path class="b" d="M94.0048,49.54942a3.367,3.367,0,0,1,1.40165.28045,3.04715,3.04715,0,0,1,1.05575.7825,3.57864,3.57864,0,0,1,.6714,1.18065,4.775,4.775,0,0,1-.015,3.0105,3.49229,3.49229,0,0,1-.69362,1.18065,3.1081,3.1081,0,0,1-1.06235.76028A3.63586,3.63586,0,0,1,92.477,56.6928a3.05685,3.05685,0,0,1-1.05515-.85576,3.61278,3.61278,0,0,1-.61255-1.20288,4.7316,4.7316,0,0,1-.19937-1.3506,4.4214,4.4214,0,0,1,.236-1.46111,3.57928,3.57928,0,0,1,.6792-1.18786,3.11326,3.11326,0,0,1,1.07016-.79691A3.33517,3.33517,0,0,1,94.0048,49.54942Zm-.05945,1.063a1.89444,1.89444,0,0,0-.85577.19157,1.92937,1.92937,0,0,0-.657.53868,2.61525,2.61525,0,0,0-.42759.83415,3.54279,3.54279,0,0,0-.15493,1.07736,3.66655,3.66655,0,0,0,.14713,1.05514,2.76175,2.76175,0,0,0,.421.86358,1.91175,1.91175,0,0,0,.67861.57531,2.035,2.035,0,0,0,.93744.20658,1.96491,1.96491,0,0,0,.76748-.15493,1.84307,1.84307,0,0,0,.6642-.487,2.49873,2.49873,0,0,0,.472-.82634,3.52827,3.52827,0,0,0,.17716-1.18786,3.92545,3.92545,0,0,0-.12551-.99629,2.7098,2.7098,0,0,0-.38375-.85637,1.95032,1.95032,0,0,0-.6714-.60474A2.01331,2.01331,0,0,0,93.94535,50.61237Z"/><path class="b" d="M100.0408,46.2879a.306.306,0,0,1,.08107.00721c.01441.00541.02222.03243.02222.08107v3.4687a4.173,4.173,0,0,1,1.59382-.29546,3.58246,3.58246,0,0,1,1.38724.25823,3.09666,3.09666,0,0,1,1.063.72365,3.20021,3.20021,0,0,1,.67861,1.09177,3.89335,3.89335,0,0,1,.236,1.38,4.117,4.117,0,0,1-.34651,1.74876,3.82231,3.82231,0,0,1-.91522,1.25452,3.7297,3.7297,0,0,1-1.30616.76028,4.69867,4.69867,0,0,1-1.52.251,7.89894,7.89894,0,0,1-1.05515-.06665,4.98849,4.98849,0,0,1-.96686-.22881c-.05945-.00961-.08888-.05405-.08888-.13272V46.37618c0-.05885.03483-.08828.10329-.08828Zm3.8074,6.8185a2.56051,2.56051,0,0,0-.61975-1.80762,2.17677,2.17677,0,0,0-1.68271-.672,4.04312,4.04312,0,0,0-.79691.06666,3.23058,3.23058,0,0,0-.60474.18437V55.837a1.79408,1.79408,0,0,0,.44259.09548q.236.02253.53148.02222a3.01325,3.01325,0,0,0,1.02572-.17715,2.47409,2.47409,0,0,0,.87077-.53088,2.606,2.606,0,0,0,.60474-.893A3.168,3.168,0,0,0,103.8482,53.1064Z"/><path class="b" d="M107.49406,53.43129a3.19549,3.19549,0,0,0,.14713.98848,2.09051,2.09051,0,0,0,1.2323,1.32839,2.83109,2.83109,0,0,0,1.08517.19217,4.67893,4.67893,0,0,0,.95185-.09608,3.80289,3.80289,0,0,0,.893-.30267c.04924-.02943.07387-.00961.07387.05885v.84135a.15833.15833,0,0,1-.07387.14773,4.09138,4.09138,0,0,1-.87859.30988,5.25576,5.25576,0,0,1-1.20227.1183A3.73874,3.73874,0,0,1,108.0988,56.7a2.91958,2.91958,0,0,1-1.07016-.84075,3.42439,3.42439,0,0,1-.59033-1.18126,4.90632,4.90632,0,0,1-.18436-1.33559,4.77784,4.77784,0,0,1,.2216-1.46111,3.65843,3.65843,0,0,1,.642-1.21008,3.08964,3.08964,0,0,1,1.02572-.81913,3.02553,3.02553,0,0,1,1.37223-.30267,2.85068,2.85068,0,0,1,1.3434.28826,2.69551,2.69551,0,0,1,.88519.723,2.872,2.872,0,0,1,.49484.95906,3.5172,3.5172,0,0,1,.15494.99629c0,.18737-.00541.34471-.015.47262a1.534,1.534,0,0,1-.04444.29487c0,.05885-.03423.08828-.10329.08828a4.6844,4.6844,0,0,1-.59753.04444q-.43509.0153-.92243.015Zm2.75946-.91522q.5459,0,.73086-.00721a.87793.87793,0,0,0,.21379-.02222.18758.18758,0,0,0,.015-.08107V52.3245a2.183,2.183,0,0,0-.07386-.49484,1.6987,1.6987,0,0,0-.81193-1.06235,1.67106,1.67106,0,0,0-.85576-.19938,1.8819,1.8819,0,0,0-.80472.16214,1.81914,1.81914,0,0,0-.59033.43539,2.10609,2.10609,0,0,0-.38374.62756,2.88327,2.88327,0,0,0-.18437.72305Z"/><path class="b" d="M123.90493,56.58951q0,.13332-.07387.14773a3.03678,3.03678,0,0,1-.87018.221,9.606,9.606,0,0,1-1.1218.05945,6.05385,6.05385,0,0,1-1.82263-.28045,4.34791,4.34791,0,0,1-2.73064-2.45019,5.58386,5.58386,0,0,1-.43539-2.31687,5.42272,5.42272,0,0,1,.36873-2.02921,4.53276,4.53276,0,0,1,1.04073-1.57941,4.72052,4.72052,0,0,1,1.63106-1.02572,5.9251,5.9251,0,0,1,2.13971-.36873,7.70183,7.70183,0,0,1,1.19567.07327,2.76709,2.76709,0,0,1,.69362.19217.11466.11466,0,0,1,.07387.1177v.98909c0,.06906-.03483.09368-.1033.07386a4.12534,4.12534,0,0,0-1.88928-.3393,4.42133,4.42133,0,0,0-1.58662.27264,3.57637,3.57637,0,0,0-1.2323.7753,3.397,3.397,0,0,0-.79692,1.21729,4.36453,4.36453,0,0,0-.28045,1.60163,4.26707,4.26707,0,0,0,.38375,1.91811,3.45094,3.45094,0,0,0,.96686,1.21789,3.5879,3.5879,0,0,0,1.26173.63477,4.80043,4.80043,0,0,0,1.25452.18436,8.46656,8.46656,0,0,0,.99629-.05164,3.41056,3.41056,0,0,0,.84856-.2138c.05885-.0102.08828.00961.08828.05886Z"/><path class="b" d="M128.24441,49.54942a3.367,3.367,0,0,1,1.40165.28045,3.04711,3.04711,0,0,1,1.05574.7825,3.57864,3.57864,0,0,1,.6714,1.18065,4.77506,4.77506,0,0,1-.015,3.0105,3.49245,3.49245,0,0,1-.69362,1.18065,3.1081,3.1081,0,0,1-1.06235.76028,3.63588,3.63588,0,0,1-2.88558-.05165,3.05681,3.05681,0,0,1-1.05514-.85576,3.61259,3.61259,0,0,1-.61255-1.20288,4.73127,4.73127,0,0,1-.19938-1.3506,4.4214,4.4214,0,0,1,.236-1.46111,3.57931,3.57931,0,0,1,.67921-1.18786,3.11307,3.11307,0,0,1,1.07016-.79691A3.33517,3.33517,0,0,1,128.24441,49.54942Zm-.05946,1.063a1.8944,1.8944,0,0,0-.85576.19157,1.9294,1.9294,0,0,0-.657.53868,2.61523,2.61523,0,0,0-.42758.83415,3.54279,3.54279,0,0,0-.15494,1.07736,3.66655,3.66655,0,0,0,.14713,1.05514,2.76176,2.76176,0,0,0,.421.86358,1.91163,1.91163,0,0,0,.6786.57531,2.03506,2.03506,0,0,0,.93744.20658,1.96492,1.96492,0,0,0,.76749-.15493,1.843,1.843,0,0,0,.66419-.487,2.49838,2.49838,0,0,0,.472-.82634,3.528,3.528,0,0,0,.17716-1.18786,3.92545,3.92545,0,0,0-.12551-.99629,2.70978,2.70978,0,0,0-.38374-.85637,1.9505,1.9505,0,0,0-.6714-.60474A2.01335,2.01335,0,0,0,128.18495,50.61237Z"/><path class="b" d="M133.23306,56.87c-.05945,0-.08887-.03423-.08887-.10329V51.24714q0-.48734-.01442-.87078c-.01021-.25583-.02462-.45281-.04444-.59033a.07822.07822,0,0,1,.08828-.08888h.93023a.13273.13273,0,0,1,.11771.07387,2.41793,2.41793,0,0,1,.05164.32489c.015.13752.027.26543.03724.38374a3.15175,3.15175,0,0,1,2.21358-.93023,2.08207,2.08207,0,0,1,1.96315,1.07736,4.58846,4.58846,0,0,1,1.06235-.76748,2.97888,2.97888,0,0,1,1.40225-.30988,2.91332,2.91332,0,0,1,.83415.12551,1.96871,1.96871,0,0,1,.76749.4426,2.35258,2.35258,0,0,1,.5681.86357,3.73571,3.73571,0,0,1,.221,1.38724v4.41334c0,.05886-.03423.08828-.10329.08828H142.2213a.09114.09114,0,0,1-.10329-.10329V52.45722a2.22321,2.22321,0,0,0-.36213-1.28395,1.28407,1.28407,0,0,0-1.14342-.53147,2.20014,2.20014,0,0,0-1.0113.2288,2.71959,2.71959,0,0,0-.80412.627,3.28749,3.28749,0,0,1,.05164.406c.015.18257.02222.36153.02222.53868v4.32447a.09138.09138,0,0,1-.10329.10329h-1.03352a.09138.09138,0,0,1-.10329-.10329V52.41278a2.02372,2.02372,0,0,0-.37594-1.30617,1.33264,1.33264,0,0,0-1.09958-.46481,2.16377,2.16377,0,0,0-.93744.19937,3.1054,3.1054,0,0,0-.84856.627v5.31355a.078.078,0,0,1-.08828.08828Z"/><path class="b" d="M148.16841,49.54942a3.7728,3.7728,0,0,1,1.4539.266,3.12905,3.12905,0,0,1,1.08517.73025,3.17548,3.17548,0,0,1,.67861,1.10679,3.97,3.97,0,0,1,.236,1.38,4.01744,4.01744,0,0,1-.36152,1.75657,3.63794,3.63794,0,0,1-.95906,1.24672,4.03655,4.03655,0,0,1-1.35781.73806,5.01586,5.01586,0,0,1-1.54218.24381c-.16755,0-.30808-.0054-.421-.015s-.224-.02462-.33209-.04444v2.95224a.09123.09123,0,0,1-.07387.10329c-.08828.00961-.18917.01922-.30267.02943-.1129.00961-.2264.02222-.3393.03663-.11291.015-.21139.027-.29487.03723q-.1261.01441-.14052.01442-.07387,0-.07387-.08828V50.84838c0-.06846-.0024-.17-.00721-.30267s-.01261-.248-.02222-.34651a.05974.05974,0,0,1,.02943-.05945q.38375-.14684,1.09238-.36873A5.54961,5.54961,0,0,1,148.16841,49.54942Zm-.14713,1.07736a4.19213,4.19213,0,0,0-.72364.05946,3.48071,3.48071,0,0,0-.64918.17715v5.00308a1.81449,1.81449,0,0,0,.41316.07386c.14774.00961.29006.01441.42819.01441a3.34545,3.34545,0,0,0,1.04793-.16935,2.70564,2.70564,0,0,0,.92243-.51646,2.57376,2.57376,0,0,0,.65639-.88579,2.99471,2.99471,0,0,0,.251-1.27674,2.579,2.579,0,0,0-.61255-1.80762A2.22666,2.22666,0,0,0,148.02128,50.62678Z"/><path class="b" d="M158.234,55.61544V55.977a2.09429,2.09429,0,0,0,.02943.34711.05979.05979,0,0,1-.02943.05886,6.00124,6.00124,0,0,1-1.4539.50925,6.9604,6.9604,0,0,1-1.30617.12551,3.85578,3.85578,0,0,1-1.09237-.14773,2.59513,2.59513,0,0,1-.87078-.43539,1.97765,1.97765,0,0,1-.57531-.723,2.32883,2.32883,0,0,1-.20659-1.01131,1.89323,1.89323,0,0,1,.25823-1.0107,2.16417,2.16417,0,0,1,.70083-.70083,3.24349,3.24349,0,0,1,1.04073-.41377,5.96124,5.96124,0,0,1,1.29115-.13272q.41347,0,.657.00721.24321.00811.36152.02222v-.35371a1.93718,1.93718,0,0,0-.05885-.42819,1.25647,1.25647,0,0,0-.236-.47983,1.50152,1.50152,0,0,0-.502-.39815,1.88625,1.88625,0,0,0-.87078-.17,4.21382,4.21382,0,0,0-1.0107.1183,3.662,3.662,0,0,0-.86357.32429c-.06907.01982-.1033-.0048-.1033-.07386v-.90021a.13163.13163,0,0,1,.07387-.1177,4.345,4.345,0,0,1,.96626-.3249,5.26451,5.26451,0,0,1,1.129-.1183,3.03846,3.03846,0,0,1,1.21789.2216,2.21246,2.21246,0,0,1,.82634.59753,2.48678,2.48678,0,0,1,.47262.87859,3.633,3.633,0,0,1,.15494,1.07736Zm-1.19567-2.16974a3.56574,3.56574,0,0,0-.39875-.04384c-.15734-.00961-.34892-.015-.57532-.015a2.94006,2.94006,0,0,0-1.601.34711,1.09634,1.09634,0,0,0-.52427.96626,1.36586,1.36586,0,0,0,.08888.487,1.03106,1.03106,0,0,0,.30207.421,1.60324,1.60324,0,0,0,.54649.29487,2.61144,2.61144,0,0,0,.81913.1111,3.469,3.469,0,0,0,1.3428-.251Z"/><path class="b" d="M160.29986,51.36484c0-.12791-.0024-.27024-.00721-.42818-.0048-.15674-.00961-.30988-.015-.457-.00481-.14773-.00961-.28525-.01441-.41377a2.64953,2.64953,0,0,0-.02222-.27985.07821.07821,0,0,1,.08827-.08888h.91522a.14147.14147,0,0,1,.13272.08888,1.53485,1.53485,0,0,1,.04444.29486q.01442.19188.04444.4426a3.09953,3.09953,0,0,1,2.258-.97407,3.028,3.028,0,0,1,.81913.1183,1.93993,1.93993,0,0,1,.77469.43539,2.34932,2.34932,0,0,1,.58312.87078,3.76523,3.76523,0,0,1,.22881,1.42388v4.3689a.09138.09138,0,0,1-.10329.10329h-1.03353c-.06846,0-.10329-.039-.10329-.1183V52.51607a2.28923,2.28923,0,0,0-.36873-1.35781,1.31945,1.31945,0,0,0-1.15123-.51646,2.23206,2.23206,0,0,0-1.02572.236,2.568,2.568,0,0,0-.81913.66419v5.22467c0,.06906-.02942.10329-.08828.10329h-1.04793c-.05946,0-.08888-.03423-.08888-.10329Z"/><path class="b" d="M168.35846,49.69715a.10467.10467,0,0,1,.10329.07387q.45762,1.2251.80412,2.15472.34681.92964.59814,1.60884.25042.67921.40536,1.129.15493.4504.2288.70083.35492-1.01792.83415-2.35411.47922-1.335,1.15843-3.23929a.1336.1336,0,0,1,.11831-.07387H173.657c.06846,0,.08828.03483.05885.10329q-.41347,1.19538-.893,2.48683-.48012,1.29176-.99629,2.59792t-1.05514,2.59011q-.53868,1.28366-1.07016,2.46461a.19465.19465,0,0,1-.16214.10329l-1.10679.08828c-.05946,0-.07387-.039-.04444-.11771q.32429-.6792.70863-1.52776.38285-.84857.75247-1.73435a.21629.21629,0,0,0,0-.19157q-.08827-.22161-.26543-.64918-.17747-.42789-.406-.98909-.2288-.56029-.49424-1.21789-.26574-.65579-.53928-1.33559-.27294-.67831-.53868-1.3428-.26484-.6639-.487-1.23951c-.02942-.05945-.0048-.08888.07387-.08888Z"/></svg>
diff --git a/setup/pub/magento/setup/add-database.js b/setup/pub/magento/setup/add-database.js
index 125b67f950f1c..229c13d11e279 100644
--- a/setup/pub/magento/setup/add-database.js
+++ b/setup/pub/magento/setup/add-database.js
@@ -20,14 +20,14 @@ angular.module('add-database', ['ngStorage'])
 
         $scope.testConnection = function () {
             $http.post('index.php/database-check', $scope.db)
-                .success(function (data) {
-                    $scope.testConnection.result = data;
+                .then(function successCallback(resp) {
+                    $scope.testConnection.result = resp.data;
+
                     if ($scope.testConnection.result.success) {
                         $scope.nextState();
                     }
-                })
-                .error(function (data) {
-                    $scope.testConnection.failed = data;
+                }, function errorCallback(resp) {
+                    $scope.testConnection.failed = resp.data;
                 });
         };
 
diff --git a/setup/pub/magento/setup/app.js b/setup/pub/magento/setup/app.js
index e6514ea41c0bd..f0abd15d106c2 100644
--- a/setup/pub/magento/setup/app.js
+++ b/setup/pub/magento/setup/app.js
@@ -31,7 +31,8 @@ var app = angular.module(
         'home',
         'auth-dialog',
         'system-config',
-        'marketplace-credentials'
+        'marketplace-credentials',
+        'ngSanitize'
     ]);
 
 app.config(['$httpProvider', '$stateProvider', function ($httpProvider, $stateProvider) {
@@ -55,6 +56,9 @@ app.config(['$httpProvider', '$stateProvider', function ($httpProvider, $statePr
             return $delegate;
         });
     })
+    .config(['$locationProvider', function($locationProvider) {
+        $locationProvider.hashPrefix('');
+    }])
     .run(function ($rootScope, $state) {
         $rootScope.$state = $state;
     });
diff --git a/setup/pub/magento/setup/complete-backup.js b/setup/pub/magento/setup/complete-backup.js
index 9c3dd09798dac..db7f6fdf8a176 100644
--- a/setup/pub/magento/setup/complete-backup.js
+++ b/setup/pub/magento/setup/complete-backup.js
@@ -121,8 +121,7 @@ angular.module('complete-backup', ['ngStorage'])
         };
 
         $scope.disableMeintenanceMode = function() {
-            $http.post('index.php/maintenance/index', {'disable' : true}).success(function(data) {
-            });
+            $http.post('index.php/maintenance/index', {'disable' : true});
         };
         
         $scope.isCompleted = function() {
@@ -149,8 +148,9 @@ angular.module('complete-backup', ['ngStorage'])
         $scope.query = function(item) {
             if (!$rootScope.hasErrors) {
                 return $http.post(item.url, $scope.backupInfoPassed, {timeout: 3000000})
-                    .success(function(data) { item.process(data) })
-                    .error(function(data, status) {
+                    .then(function successCallback(resp) {
+                        item.process(resp.data);
+                    }, function errorCallback() {
                         item.fail();
                     });
             } else {
diff --git a/setup/pub/magento/setup/create-admin-account.js b/setup/pub/magento/setup/create-admin-account.js
index f6cbd154edfec..6e8807bb7a2ae 100644
--- a/setup/pub/magento/setup/create-admin-account.js
+++ b/setup/pub/magento/setup/create-admin-account.js
@@ -51,14 +51,14 @@ angular.module('create-admin-account', ['ngStorage'])
             $scope.validate();
             if ($scope.valid) {
                 $http.post('index.php/validate-admin-credentials', data)
-                    .success(function (data) {
-                        $scope.validateCredentials.result = data;
+                    .then(function successCallback(resp) {
+                        $scope.validateCredentials.result = resp.data;
+
                         if ($scope.validateCredentials.result.success) {
                             $scope.nextState();
                         }
-                    })
-                    .error(function (data) {
-                        $scope.validateCredentials.failed = data;
+                    }, function errorCallback(resp) {
+                        $scope.validateCredentials.failed = resp.data;
                     });
             }
         };
diff --git a/setup/pub/magento/setup/customize-your-store.js b/setup/pub/magento/setup/customize-your-store.js
index 7404ef67765e8..f14e8c1a88af1 100644
--- a/setup/pub/magento/setup/customize-your-store.js
+++ b/setup/pub/magento/setup/customize-your-store.js
@@ -31,10 +31,9 @@ angular.module('customize-your-store', ['ngStorage', 'ngSanitize'])
 
         if (!$localStorage.store) {
             $http.get('index.php/customize-your-store/default-time-zone',{'responseType' : 'json'})
-                .success(function (data) {
-                    $scope.store.timezone = data.defaultTimeZone;
-                })
-                .error(function (data) {
+                .then(function successCallback(resp) {
+                    $scope.store.timezone = resp.data.defaultTimeZone;
+                }, function errorCallback() {
                     $scope.store.timezone = 'UTC';
                 });
         }
@@ -48,9 +47,13 @@ angular.module('customize-your-store', ['ngStorage', 'ngSanitize'])
             $localStorage.store = $scope.store;
             $scope.loading = true;
             $http.post('index.php/modules/all-modules-valid', $scope.store)
-                .success(function (data) {
-                    $scope.checkModuleConstraints.result = data;
-                    if (($scope.checkModuleConstraints.result !== undefined) && ($scope.checkModuleConstraints.result.success)) {
+                .then(function successCallback(resp) {
+                    $scope.checkModuleConstraints.result = resp.data;
+
+                    if (
+                        $scope.checkModuleConstraints.result !== undefined &&
+                        $scope.checkModuleConstraints.result.success
+                    ) {
                         $scope.loading = false;
                         $scope.nextState();
                     } else {
@@ -61,17 +64,18 @@ angular.module('customize-your-store', ['ngStorage', 'ngSanitize'])
         };
 
         if (!$scope.store.loadedAllModules) {
-            $http.get('index.php/modules').success(function (data) {
-                $state.loadedModules = data;
+            $http.get('index.php/modules').then(function successCallback(resp) {
+                $state.loadedModules = resp.data;
                 $scope.store.showModulesControl = true;
-                if (data.error) {
+
+                if (resp.data.error) {
                     $scope.updateOnExpand($scope.store.advanced);
-                    $scope.store.errorMessage = $sce.trustAsHtml(data.error);
+                    $scope.store.errorMessage = $sce.trustAsHtml(resp.data.error);
                 }
             });
         }
 
-        $state.loadModules = function(){
+        $state.loadModules = function () {
             if(!$scope.store.loadedAllModules) {
                 var allModules = $scope.$state.loadedModules.modules;
                 for (var eachModule in allModules) {
@@ -120,8 +124,9 @@ angular.module('customize-your-store', ['ngStorage', 'ngSanitize'])
             var allParameters = {'allModules' : $scope.store.allModules, 'selectedModules' : $scope.store.selectedModules, 'module' : module, 'status' : moduleStatus};
 
             $http.post('index.php/modules/validate', allParameters)
-                .success(function (data) {
-                    $scope.checkModuleConstraints.result = data;
+                .then(function successCallback(resp) {
+                    $scope.checkModuleConstraints.result = resp.data;
+
                     if ((($scope.checkModuleConstraints.result.error !== undefined) && (!$scope.checkModuleConstraints.result.success))) {
                         $scope.store.errorMessage = $sce.trustAsHtml($scope.checkModuleConstraints.result.error);
                         if (moduleStatus) {
@@ -130,7 +135,7 @@ angular.module('customize-your-store', ['ngStorage', 'ngSanitize'])
                             $scope.store.selectedModules.push(module);
                         }
                     } else {
-                        $state.loadedModules = data;
+                        $state.loadedModules = resp.data;
                         $scope.store.errorMessage = false;
                         $scope.store.showError = false;
                         $scope.store.errorFlag = false;
diff --git a/setup/pub/magento/setup/data-option.js b/setup/pub/magento/setup/data-option.js
index 5eed528ec0993..16bde5d32fdea 100644
--- a/setup/pub/magento/setup/data-option.js
+++ b/setup/pub/magento/setup/data-option.js
@@ -13,9 +13,9 @@ angular.module('data-option', ['ngStorage'])
 
         if ($localStorage.componentType === 'magento2-module') {
             $http.post('index.php/data-option/hasUninstall', {'moduleName' : $localStorage.moduleName})
-                .success(function(data) {
-                    $scope.component.hasUninstall = data.hasUninstall;
-            });
+                .then(function successCallback(resp) {
+                    $scope.component.hasUninstall = resp.data.hasUninstall;
+                });
         }
 
         if ($localStorage.dataOption) {
diff --git a/setup/pub/magento/setup/extension-grid.js b/setup/pub/magento/setup/extension-grid.js
index 4f73304282bb0..416a767a483fa 100644
--- a/setup/pub/magento/setup/extension-grid.js
+++ b/setup/pub/magento/setup/extension-grid.js
@@ -14,7 +14,9 @@ angular.module('extension-grid', ['ngStorage'])
             $scope.syncError = false;
             $scope.currentPage = 1;
 
-            $http.get('index.php/extensionGrid/extensions').success(function (data) {
+            $http.get('index.php/extensionGrid/extensions').then(function successCallback(resp) {
+                var data = resp.data;
+
                 $scope.extensions = data.extensions;
                 $scope.total = data.total;
 
@@ -37,7 +39,7 @@ angular.module('extension-grid', ['ngStorage'])
                 }
                 $scope.availableUpdatePackages = data.lastSyncData.packages;
                 $scope.currentPage = 1;
-                $scope.rowLimit = 20;
+                $scope.rowLimit = '20';
                 $scope.numberOfPages = Math.ceil($scope.total / $scope.rowLimit);
                 $rootScope.extensionsProcessed = true;
             });
@@ -78,7 +80,9 @@ angular.module('extension-grid', ['ngStorage'])
 
             $scope.sync = function() {
                 $scope.isHiddenSpinner = false;
-                $http.get('index.php/extensionGrid/sync').success(function(data) {
+                $http.get('index.php/extensionGrid/sync').then(function successCallback(resp) {
+                    var data = resp.data;
+
                     if (typeof data.lastSyncData.lastSyncDate !== 'undefined') {
                         $scope.lastSyncDate = data.lastSyncData.lastSyncDate.date;
                         $scope.lastSyncTime = data.lastSyncData.lastSyncDate.time;
diff --git a/setup/pub/magento/setup/install-extension-grid.js b/setup/pub/magento/setup/install-extension-grid.js
index 46feae60aeb26..6a94d99df372d 100644
--- a/setup/pub/magento/setup/install-extension-grid.js
+++ b/setup/pub/magento/setup/install-extension-grid.js
@@ -8,7 +8,9 @@ angular.module('install-extension-grid', ['ngStorage', 'clickOut'])
     .controller('installExtensionGridController', ['$scope', '$http', '$localStorage', 'authService', 'paginationService', 'multipleChoiceService',
         function ($scope, $http, $localStorage, authService, paginationService, multipleChoiceService) {
 
-            $http.get('index.php/installExtensionGrid/extensions').success(function(data) {
+            $http.get('index.php/installExtensionGrid/extensions').then(function successCallback(resp) {
+                var data = resp.data;
+
                 $scope.error = false;
                 $scope.errorMessage = '';
                 $scope.multipleChoiceService = multipleChoiceService;
@@ -19,7 +21,7 @@ angular.module('install-extension-grid', ['ngStorage', 'clickOut'])
                 $scope.extensions = data.extensions;
                 $scope.total = data.total;
                 $scope.currentPage = 1;
-                $scope.rowLimit = 20;
+                $scope.rowLimit = '20';
                 $scope.numberOfPages = Math.ceil($scope.total / $scope.rowLimit);
             });
 
diff --git a/setup/pub/magento/setup/install.js b/setup/pub/magento/setup/install.js
index 942e0a1d25443..a9be01db23f47 100644
--- a/setup/pub/magento/setup/install.js
+++ b/setup/pub/magento/setup/install.js
@@ -75,13 +75,17 @@ angular.module('install', ['ngStorage'])
             $scope.isStarted = true;
             $scope.isInProgress = true;
             progress.post(data, function (response) {
+                response = response.data;
+
                 $scope.isInProgress = false;
+
                 if (response.success) {
                     $localStorage.config.encrypt.key = response.key;
                     $localStorage.messages = response.messages;
                     $scope.nextState();
                 } else {
                     $scope.displayFailure();
+
                     if (response.isSampleDataError) {
                         $scope.isSampleDataError = true;
                     }
@@ -105,10 +109,10 @@ angular.module('install', ['ngStorage'])
     .service('progress', ['$http', function ($http) {
         return {
             get: function (callback) {
-                $http.post('index.php/install/progress').then(callback);
+                $http.post('index.php/install/progress').then(callback, function errorCallback() {});
             },
             post: function (data, callback) {
-                $http.post('index.php/install/start', data).success(callback);
+                $http.post('index.php/install/start', data).then(callback, function errorCallback() {});
             }
         };
     }]);
diff --git a/setup/pub/magento/setup/main.js b/setup/pub/magento/setup/main.js
index d9d8b5145665a..d4fb0069fea33 100644
--- a/setup/pub/magento/setup/main.js
+++ b/setup/pub/magento/setup/main.js
@@ -40,11 +40,10 @@ main.controller('navigationController',
     function ($scope, $state, navigationService, $localStorage, $interval, $http) {
         $interval(
             function () {
-                $http.post('index.php/session/prolong')
-                    .success(function (result) {
-                    })
-                    .error(function (result) {
-                    });
+                $http.post('index.php/session/prolong').then(
+                    function successCallback() {},
+                    function errorCallback() {}
+                )
             },
             25000
         );
@@ -117,9 +116,11 @@ main.controller('navigationController',
         isLoadedStates: false,
         load: function () {
             var self = this;
-            return $http.get('index.php/navigation').success(function (data) {
-                var currentState = $location.path().replace('/', '');
-                var isCurrentStateFound = false;
+            return $http.get('index.php/navigation').then(function successCallback(resp) {
+                var data = resp.data,
+                    currentState = $location.path().replace('/', ''),
+                    isCurrentStateFound = false;
+
                 self.states = data.nav;
                 $localStorage.menu = data.menu;
                 self.titlesWithModuleName.forEach(function (value) {
@@ -184,34 +185,35 @@ main.controller('navigationController',
             },
             reset: function (context) {
                 return $http.post('index.php/marketplace/remove-credentials', [])
-                    .success(function (response) {
-                        if (response.success) {
+                    .then(function successCallback(response) {
+                        if (response.data.success) {
                             $localStorage.isMarketplaceAuthorized = $rootScope.isMarketplaceAuthorized = false;
                             context.success();
                         }
-                    })
-                    .error(function (data) {
-                    });
+                    }, function errorCallback() {});
             },
             checkAuth: function(context) {
                 return $http.post('index.php/marketplace/check-auth', [])
-                    .success(function (response) {
-                        if (response.success) {
+                    .then(function successCallback(response) {
+                        var data = response.data;
+
+                        if (data.success) {
                             $rootScope.isMarketplaceAuthorized  = $localStorage.isMarketplaceAuthorized = true;
-                            $localStorage.marketplaceUsername = response.data.username;
-                            context.success(response);
+                            $localStorage.marketplaceUsername = data.username;
+                            context.success(data);
                         } else {
                             $rootScope.isMarketplaceAuthorized  = $localStorage.isMarketplaceAuthorized = false;
-                            context.fail(response);
+                            context.fail(data);
                         }
-                    })
-                    .error(function() {
+                    }, function errorCallback() {
                         $rootScope.isMarketplaceAuthorized = $localStorage.isMarketplaceAuthorized = false;
                         context.error();
                     });
             },
             openAuthDialog: function(scope) {
-                return $http.get('index.php/marketplace/popup-auth').success(function (data) {
+                return $http.get('index.php/marketplace/popup-auth').then(function successCallback(response) {
+                    var data = response.data;
+
                     scope.isHiddenSpinner = true;
                     ngDialog.open({
                         scope: scope,
@@ -227,18 +229,19 @@ main.controller('navigationController',
             },
             saveAuthJson: function (context) {
                 return $http.post('index.php/marketplace/save-auth-json', context.user)
-                    .success(function (response) {
-                        $rootScope.isMarketplaceAuthorized = $localStorage.isMarketplaceAuthorized = response.success;
+                    .then(function successCallback(response) {
+                        var data = response.data;
+
+                        $rootScope.isMarketplaceAuthorized = $localStorage.isMarketplaceAuthorized = data.success;
                         $localStorage.marketplaceUsername = context.user.username;
-                        if (response.success) {
-                            context.success(response);
+                        if (data.success) {
+                            context.success(data);
                         } else {
-                            context.fail(response);
+                            context.fail(data);
                         }
-                    })
-                    .error(function (data) {
+                    }, function errorCallback(resp) {
                         $rootScope.isMarketplaceAuthorized = $localStorage.isMarketplaceAuthorized = false;
-                        context.error(data);
+                        context.error(resp.data);
                     });
             }
     };
diff --git a/setup/pub/magento/setup/marketplace-credentials.js b/setup/pub/magento/setup/marketplace-credentials.js
index c94fec1c563c9..a0d17c14d2a2a 100644
--- a/setup/pub/magento/setup/marketplace-credentials.js
+++ b/setup/pub/magento/setup/marketplace-credentials.js
@@ -41,16 +41,21 @@ angular.module('marketplace-credentials', ['ngStorage'])
 
             $scope.upgradeProcessError = false;
             if ($state.current.type == 'upgrade') {
+                $scope.isHiddenSpinner = false;
                 $http.get('index.php/select-version/installedSystemPackage', {'responseType' : 'json'})
-                    .success(function (data) {
+                    .then(function successCallback(resp) {
+                        var data = resp.data;
+
+                        $scope.isHiddenSpinner = true;
+
                         if (data.responseType == 'error') {
                             $scope.upgradeProcessError = true;
                             $scope.upgradeProcessErrorMessage = $sce.trustAsHtml(data.error);
                         } else {
                             $scope.checkAuth();
                         }
-                    })
-                    .error(function (data) {
+                    }, function errorCallback() {
+                        $scope.isHiddenSpinner = true;
                         $scope.upgradeProcessError = true;
                     });
             } else {
diff --git a/setup/pub/magento/setup/module-grid.js b/setup/pub/magento/setup/module-grid.js
index 694781a303303..3866c41716aee 100644
--- a/setup/pub/magento/setup/module-grid.js
+++ b/setup/pub/magento/setup/module-grid.js
@@ -8,11 +8,13 @@ angular.module('module-grid', ['ngStorage'])
     .controller('moduleGridController', ['$rootScope', '$scope', '$http', '$localStorage', '$state', 'titleService', 'paginationService',
         function ($rootScope, $scope, $http, $localStorage, $state, titleService, paginationService) {
             $rootScope.modulesProcessed = false;
-            $http.get('index.php/moduleGrid/modules').success(function(data) {
+            $http.get('index.php/moduleGrid/modules').then(function successCallback(resp) {
+                var data = resp.data;
+
                 $scope.modules = data.modules;
                 $scope.total = data.total;
                 $scope.currentPage = 1;
-                $scope.rowLimit = 20;
+                $scope.rowLimit = '20';
                 $scope.numberOfPages = Math.ceil($scope.total/$scope.rowLimit);
                 $rootScope.modulesProcessed = true;
             });
diff --git a/setup/pub/magento/setup/readiness-check.js b/setup/pub/magento/setup/readiness-check.js
index 23b5dac650a9a..fa9db13b24b88 100644
--- a/setup/pub/magento/setup/readiness-check.js
+++ b/setup/pub/magento/setup/readiness-check.js
@@ -313,18 +313,18 @@ angular.module('readiness-check', ['remove-dialog'])
                     item.url = item.url + '?type=' + item.params;
                 } else {
                     return $http.post(item.url, item.params)
-                        .success(function (data) {
-                            item.process(data)
-                        })
-                        .error(function (data, status) {
+                        .then(function successCallback(resp) {
+                            item.process(resp.data);
+                        }, function errorCallback() {
                             item.fail();
                         });
                 }
             }
             // setting 1 minute timeout to prevent system from timing out
             return $http.get(item.url, {timeout: 60000})
-                .success(function(data) { item.process(data) })
-                .error(function(data, status) {
+                .then(function successCallback(resp) {
+                    item.process(resp.data);
+                }, function errorCallback() {
                     item.fail();
                 });
         };
diff --git a/setup/pub/magento/setup/select-version.js b/setup/pub/magento/setup/select-version.js
index 32210d29dcbfe..aa4df0079b919 100644
--- a/setup/pub/magento/setup/select-version.js
+++ b/setup/pub/magento/setup/select-version.js
@@ -28,7 +28,9 @@ angular.module('select-version', ['ngStorage'])
         };
 
         $http.get('index.php/select-version/systemPackage', {'responseType' : 'json'})
-            .success(function (data) {
+            .then(function successCallback(resp) {
+                var data = resp.data;
+
                 if (data.responseType != 'error') {
                     $scope.upgradeProcessError = true;
 
@@ -70,8 +72,7 @@ angular.module('select-version', ['ngStorage'])
                     $scope.upgradeProcessErrorMessage = $sce.trustAsHtml(data.error);
                 }
                 $scope.upgradeProcessed = true;
-            })
-            .error(function (data) {
+            }, function errorCallback() {
                 $scope.upgradeProcessError = true;
             });
 
@@ -103,15 +104,17 @@ angular.module('select-version', ['ngStorage'])
                 $scope.updateComponents.no = false;
                 if (!$scope.componentsProcessed && !$scope.componentsProcessError) {
                     $scope.componentsReadyForNext = false;
-                    $http.get('index.php/other-components-grid/components', {'responseType': 'json'}).
-                        success(function (data) {
+                    $http.get('index.php/other-components-grid/components', {'responseType': 'json'})
+                        .then(function successCallback(resp) {
+                            var data = resp.data;
+
                             if (data.responseType != 'error') {
                                 $scope.components = data.components;
                                 $scope.displayComponents = data.components;
                                 $scope.totalForGrid = data.total;
                                 $scope.total = data.total;
                                 $scope.currentPage = 1;
-                                $scope.rowLimit = 20;
+                                $scope.rowLimit = '20';
                                 $scope.numberOfPages = Math.ceil(data.total/$scope.rowLimit);
                                 for (var i = 0; i < $scope.totalForGrid; i++) {
                                     $scope.packages.push({
@@ -124,8 +127,7 @@ angular.module('select-version', ['ngStorage'])
                                 $scope.componentsProcessError = true;
                             }
                             $scope.componentsProcessed = true;
-                        })
-                        .error(function (data) {
+                        }, function errorCallback() {
                             $scope.componentsProcessError = true;
                         });
                 }
diff --git a/setup/pub/magento/setup/start-updater.js b/setup/pub/magento/setup/start-updater.js
index 3633da066187d..1b6e2e515bf72 100644
--- a/setup/pub/magento/setup/start-updater.js
+++ b/setup/pub/magento/setup/start-updater.js
@@ -35,14 +35,15 @@ angular.module('start-updater', ['ngStorage'])
                 'dataOption': $localStorage.dataOption
             };
             $http.post('index.php/start-updater/update', payLoad)
-                .success(function (data) {
-                    if (data['success']) {
+                .then(function successCallback(resp) {
+                    var data = resp.data;
+
+                    if (data.success) {
                         $window.location.href = '../update/index.php';
                     } else {
-                        $scope.errorMessage = data['message'];
+                        $scope.errorMessage = data.message;
                     }
-                })
-                .error(function (data) {
+                }, function errorCallback() {
                     $scope.errorMessage = 'Something went wrong. Please try again.';
                 });
         };
diff --git a/setup/pub/magento/setup/system-config.js b/setup/pub/magento/setup/system-config.js
index 2956c837ee543..40b155076bc8f 100644
--- a/setup/pub/magento/setup/system-config.js
+++ b/setup/pub/magento/setup/system-config.js
@@ -7,6 +7,7 @@
 angular.module('system-config', ['ngStorage'])
     .controller('systemConfigController', ['$scope', '$state', '$http', '$localStorage', '$rootScope', 'authService',
         function ($scope, $state, $http, $localStorage, $rootScope, authService) {
+        $scope.isHiddenSpinner = false;
         $scope.user = {
             username : $localStorage.marketplaceUsername ? $localStorage.marketplaceUsername : '',
             password : '',
@@ -27,6 +28,8 @@ angular.module('system-config', ['ngStorage'])
                     $scope.isHiddenSpinner = true;
                 }
             });
+        } else {
+            $scope.isHiddenSpinner = true;
         }
 
         $scope.saveAuthJson = function () {
diff --git a/setup/pub/magento/setup/update-extension-grid.js b/setup/pub/magento/setup/update-extension-grid.js
index 71d8fbad5de3e..78af0d7faf31d 100644
--- a/setup/pub/magento/setup/update-extension-grid.js
+++ b/setup/pub/magento/setup/update-extension-grid.js
@@ -9,7 +9,9 @@ angular.module('update-extension-grid', ['ngStorage', 'clickOut'])
         function ($scope, $http, $localStorage, titleService, authService, paginationService, multipleChoiceService) {
             $scope.isHiddenSpinner = false;
 
-            $http.get('index.php/updateExtensionGrid/extensions').success(function(data) {
+            $http.get('index.php/updateExtensionGrid/extensions').then(function successCallback(resp) {
+                var data = resp.data;
+
                 $scope.error = false;
                 $scope.errorMessage = '';
                 $scope.extensionsVersions = {};
@@ -26,7 +28,7 @@ angular.module('update-extension-grid', ['ngStorage', 'clickOut'])
                 $scope.extensions = data.extensions;
                 $scope.total = data.total;
                 $scope.currentPage = 1;
-                $scope.rowLimit = 20;
+                $scope.rowLimit = '20';
                 $scope.numberOfPages = Math.ceil($scope.total / $scope.rowLimit);
                 $scope.isHiddenSpinner = true;
                 $localStorage.extensionsVersions = $scope.extensionsVersions;
@@ -36,7 +38,7 @@ angular.module('update-extension-grid', ['ngStorage', 'clickOut'])
 
             $scope.predicate = 'name';
             $scope.reverse = false;
-            $scope.order = function(predicate) {
+            $scope.order = function (predicate) {
                 $scope.reverse = ($scope.predicate === predicate) ? !$scope.reverse : false;
                 $scope.predicate = predicate;
             };
diff --git a/setup/pub/magento/setup/web-configuration.js b/setup/pub/magento/setup/web-configuration.js
index 1ad09ea986216..261cad9fe8404 100644
--- a/setup/pub/magento/setup/web-configuration.js
+++ b/setup/pub/magento/setup/web-configuration.js
@@ -124,22 +124,23 @@ angular.module('web-configuration', ['ngStorage'])
         $scope.validateUrl = function () {
             if (!$scope.webconfig.submitted) {
                 $http.post('index.php/url-check', $scope.config)
-                    .success(function (data) {
-                        $scope.validateUrl.result = data;
+                    .then(function successCallback(resp) {
+                        $scope.validateUrl.result = resp.data;
                         if ($scope.validateUrl.result.successUrl && $scope.validateUrl.result.successSecureUrl) {
                             $scope.nextState();
                         }
+
                         if (!$scope.validateUrl.result.successUrl) {
                             $scope.webconfig.submitted = true;
                             $scope.webconfig.base_url.$setValidity('url', false);
                         }
+
                         if (!$scope.validateUrl.result.successSecureUrl) {
                             $scope.webconfig.submitted = true;
                             $scope.webconfig.https.$setValidity('url', false);
                         }
-                    })
-                    .error(function (data) {
-                        $scope.validateUrl.failed = data;
+                    }, function errorCallback(resp) {
+                        $scope.validateUrl.failed = resp.data;
                     });
             }
         };
diff --git a/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php b/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php
index 420149c79e29a..3cd1dfb0ee4c9 100644
--- a/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php
@@ -843,10 +843,11 @@ private function getDescriptionClosure(
             $minAmountOfWordsDescription,
             $descriptionPrefix
         ) {
-            $count = $searchTerms === null
+            $countSearchTerms = is_array($searchTerms) ? count($searchTerms) : 0;
+            $count = !$searchTerms
                 ? 0
                 : round(
-                    $searchTerms[$index % count($searchTerms)]['count'] * (
+                    $searchTerms[$index % $countSearchTerms]['count'] * (
                         $configurableProductsCount / ($simpleProductsCount + $configurableProductsCount)
                     )
                 );
@@ -856,8 +857,8 @@ private function getDescriptionClosure(
                 $maxAmountOfWordsDescription,
                 $descriptionPrefix . '-' . $index
             ) .
-            ($index <= ($count * count($searchTerms)) ? ' ' .
-            $searchTerms[$index % count($searchTerms)]['term'] : '');
+            ($index <= ($count * $countSearchTerms) ? ' ' .
+            $searchTerms[$index % $countSearchTerms]['term'] : '');
         };
     }
 
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList.php b/setup/src/Magento/Setup/Model/ConfigOptionsList.php
index fa79139e73313..29a868b1f0eb2 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList.php
@@ -44,7 +44,8 @@ class ConfigOptionsList implements ConfigOptionsListInterface
     private $configOptionsListClasses = [
         \Magento\Setup\Model\ConfigOptionsList\Session::class,
         \Magento\Setup\Model\ConfigOptionsList\Cache::class,
-        \Magento\Setup\Model\ConfigOptionsList\PageCache::class
+        \Magento\Setup\Model\ConfigOptionsList\PageCache::class,
+        \Magento\Setup\Model\ConfigOptionsList\Lock::class,
     ];
 
     /**
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
index 04ec83a3d0ca2..8bdfd2b0a91a5 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php
@@ -27,12 +27,14 @@ class Cache implements ConfigOptionsListInterface
     const INPUT_KEY_CACHE_BACKEND_REDIS_DATABASE = 'cache-backend-redis-db';
     const INPUT_KEY_CACHE_BACKEND_REDIS_PORT = 'cache-backend-redis-port';
     const INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD = 'cache-backend-redis-password';
+    const INPUT_KEY_CACHE_ID_PREFIX = 'cache-id-prefix';
 
     const CONFIG_PATH_CACHE_BACKEND = 'cache/frontend/default/backend';
     const CONFIG_PATH_CACHE_BACKEND_SERVER = 'cache/frontend/default/backend_options/server';
     const CONFIG_PATH_CACHE_BACKEND_DATABASE = 'cache/frontend/default/backend_options/database';
     const CONFIG_PATH_CACHE_BACKEND_PORT = 'cache/frontend/default/backend_options/port';
     const CONFIG_PATH_CACHE_BACKEND_PASSWORD = 'cache/frontend/default/backend_options/password';
+    const CONFIG_PATH_CACHE_ID_PREFIX = 'cache/frontend/default/id_prefix';
 
     /**
      * @var array
@@ -112,6 +114,12 @@ public function getOptions()
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
                 self::CONFIG_PATH_CACHE_BACKEND_PASSWORD,
                 'Redis server password'
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_CACHE_ID_PREFIX,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_CACHE_ID_PREFIX,
+                'ID prefix for cache keys'
             )
         ];
     }
@@ -122,6 +130,11 @@ public function getOptions()
     public function createConfig(array $options, DeploymentConfig $deploymentConfig)
     {
         $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        if (isset($options[self::INPUT_KEY_CACHE_ID_PREFIX])) {
+            $configData->set(self::CONFIG_PATH_CACHE_ID_PREFIX, $options[self::INPUT_KEY_CACHE_ID_PREFIX]);
+        } else {
+            $configData->set(self::CONFIG_PATH_CACHE_ID_PREFIX, $this->generateCachePrefix());
+        }
 
         if (isset($options[self::INPUT_KEY_CACHE_BACKEND])) {
             if ($options[self::INPUT_KEY_CACHE_BACKEND] == self::INPUT_VALUE_CACHE_REDIS) {
@@ -241,4 +254,14 @@ private function getDefaultConfigValue($inputKey)
             return '';
         }
     }
+
+    /**
+     * Generate default cache ID prefix based on installation dir
+     *
+     * @return string
+     */
+    private function generateCachePrefix(): string
+    {
+        return substr(\md5(dirname(__DIR__, 6)), 0, 3) . '_';
+    }
 }
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
new file mode 100644
index 0000000000000..66f41128c46b1
--- /dev/null
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Lock.php
@@ -0,0 +1,342 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Setup\Model\ConfigOptionsList;
+
+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
+use Magento\Framework\Lock\LockBackendFactory;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Config\Data\ConfigData;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Setup\ConfigOptionsListInterface;
+use Magento\Framework\Setup\Option\SelectConfigOption;
+use Magento\Framework\Setup\Option\TextConfigOption;
+
+/**
+ * Deployment configuration options for locks
+ */
+class Lock implements ConfigOptionsListInterface
+{
+    /**
+     * The name of an option to set lock provider
+     *
+     * @const string
+     */
+    const INPUT_KEY_LOCK_PROVIDER = 'lock-provider';
+
+    /**
+     * The name of an option to set DB prefix
+     *
+     * @const string
+     */
+    const INPUT_KEY_LOCK_DB_PREFIX = 'lock-db-prefix';
+
+    /**
+     * The name of an option to set Zookeeper host
+     *
+     * @const string
+     */
+    const INPUT_KEY_LOCK_ZOOKEEPER_HOST = 'lock-zookeeper-host';
+
+    /**
+     * The name of an option to set Zookeeper path
+     *
+     * @const string
+     */
+    const INPUT_KEY_LOCK_ZOOKEEPER_PATH = 'lock-zookeeper-path';
+
+    /**
+     * The name of an option to set File path
+     *
+     * @const string
+     */
+    const INPUT_KEY_LOCK_FILE_PATH = 'lock-file-path';
+
+    /**
+     * The configuration path to save lock provider
+     *
+     * @const string
+     */
+    const CONFIG_PATH_LOCK_PROVIDER = 'lock/provider';
+
+    /**
+     * The configuration path to save DB prefix
+     *
+     * @const string
+     */
+    const CONFIG_PATH_LOCK_DB_PREFIX = 'lock/config/prefix';
+
+    /**
+     * The configuration path to save Zookeeper host
+     *
+     * @const string
+     */
+    const CONFIG_PATH_LOCK_ZOOKEEPER_HOST = 'lock/config/host';
+
+    /**
+     * The configuration path to save Zookeeper path
+     *
+     * @const string
+     */
+    const CONFIG_PATH_LOCK_ZOOKEEPER_PATH = 'lock/config/path';
+
+    /**
+     * The configuration path to save locks directory path
+     *
+     * @const string
+     */
+    const CONFIG_PATH_LOCK_FILE_PATH = 'lock/config/path';
+
+    /**
+     * The list of lock providers
+     *
+     * @var array
+     */
+    private $validLockProviders = [
+        LockBackendFactory::LOCK_DB,
+        LockBackendFactory::LOCK_ZOOKEEPER,
+        LockBackendFactory::LOCK_CACHE,
+        LockBackendFactory::LOCK_FILE,
+    ];
+
+    /**
+     * The mapping input keys with their configuration paths
+     *
+     * @var array
+     */
+    private $mappingInputKeyToConfigPath = [
+        LockBackendFactory::LOCK_DB => [
+            self::INPUT_KEY_LOCK_PROVIDER => self::CONFIG_PATH_LOCK_PROVIDER,
+            self::INPUT_KEY_LOCK_DB_PREFIX => self::CONFIG_PATH_LOCK_DB_PREFIX,
+        ],
+        LockBackendFactory::LOCK_ZOOKEEPER => [
+            self::INPUT_KEY_LOCK_PROVIDER => self::CONFIG_PATH_LOCK_PROVIDER,
+            self::INPUT_KEY_LOCK_ZOOKEEPER_HOST => self::CONFIG_PATH_LOCK_ZOOKEEPER_HOST,
+            self::INPUT_KEY_LOCK_ZOOKEEPER_PATH => self::CONFIG_PATH_LOCK_ZOOKEEPER_PATH,
+        ],
+        LockBackendFactory::LOCK_CACHE => [
+            self::INPUT_KEY_LOCK_PROVIDER => self::CONFIG_PATH_LOCK_PROVIDER,
+        ],
+        LockBackendFactory::LOCK_FILE => [
+            self::INPUT_KEY_LOCK_PROVIDER => self::CONFIG_PATH_LOCK_PROVIDER,
+            self::INPUT_KEY_LOCK_FILE_PATH => self::CONFIG_PATH_LOCK_FILE_PATH,
+        ],
+    ];
+
+    /**
+     * The list of default values
+     *
+     * @var array
+     */
+    private $defaultConfigValues = [
+        self::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_DB,
+        self::INPUT_KEY_LOCK_DB_PREFIX => null,
+        self::INPUT_KEY_LOCK_ZOOKEEPER_PATH => ZookeeperLock::DEFAULT_PATH,
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function getOptions()
+    {
+        return [
+            new SelectConfigOption(
+                self::INPUT_KEY_LOCK_PROVIDER,
+                SelectConfigOption::FRONTEND_WIZARD_SELECT,
+                $this->validLockProviders,
+                self::CONFIG_PATH_LOCK_PROVIDER,
+                'Lock provider name',
+                LockBackendFactory::LOCK_DB
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_LOCK_DB_PREFIX,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_LOCK_DB_PREFIX,
+                'Installation specific lock prefix to avoid lock conflicts'
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_LOCK_ZOOKEEPER_HOST,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_LOCK_ZOOKEEPER_HOST,
+                'Host and port to connect to Zookeeper cluster. For example: 127.0.0.1:2181'
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_LOCK_ZOOKEEPER_PATH,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_LOCK_ZOOKEEPER_PATH,
+                'The path where Zookeeper will save locks. The default path is: ' . ZookeeperLock::DEFAULT_PATH
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_LOCK_FILE_PATH,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_LOCK_FILE_PATH,
+                'The path where file locks will be saved.'
+            ),
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function createConfig(array $options, DeploymentConfig $deploymentConfig)
+    {
+        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        $configData->setOverrideWhenSave(true);
+        $lockProvider = $this->getLockProvider($options, $deploymentConfig);
+
+        $this->setDefaultConfiguration($configData, $deploymentConfig, $lockProvider);
+
+        foreach ($this->mappingInputKeyToConfigPath[$lockProvider] as $input => $path) {
+            if (isset($options[$input])) {
+                $configData->set($path, $options[$input]);
+            }
+        }
+
+        return $configData;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validate(array $options, DeploymentConfig $deploymentConfig)
+    {
+        $lockProvider = $this->getLockProvider($options, $deploymentConfig);
+        switch ($lockProvider) {
+            case LockBackendFactory::LOCK_ZOOKEEPER:
+                $errors = $this->validateZookeeperConfig($options, $deploymentConfig);
+                break;
+            case LockBackendFactory::LOCK_FILE:
+                $errors = $this->validateFileConfig($options, $deploymentConfig);
+                break;
+            case LockBackendFactory::LOCK_CACHE:
+            case LockBackendFactory::LOCK_DB:
+                $errors = [];
+                break;
+            default:
+                $errors[] = 'The lock provider ' . $lockProvider . ' does not exist.';
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Validates File locks configuration
+     *
+     * @param array $options
+     * @param DeploymentConfig $deploymentConfig
+     * @return array
+     */
+    private function validateFileConfig(array $options, DeploymentConfig $deploymentConfig): array
+    {
+        $errors = [];
+
+        $path = $options[self::INPUT_KEY_LOCK_FILE_PATH]
+            ?? $deploymentConfig->get(
+                self::CONFIG_PATH_LOCK_FILE_PATH,
+                $this->getDefaultValue(self::INPUT_KEY_LOCK_FILE_PATH)
+            );
+
+        if (!$path) {
+            $errors[] = 'The path needs to be a non-empty string.';
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Validates Zookeeper configuration
+     *
+     * @param array $options
+     * @param DeploymentConfig $deploymentConfig
+     * @return array
+     */
+    private function validateZookeeperConfig(array $options, DeploymentConfig $deploymentConfig): array
+    {
+        $errors = [];
+
+        if (!extension_loaded(LockBackendFactory::LOCK_ZOOKEEPER)) {
+            $errors[] = 'php extension Zookeeper is not installed.';
+        }
+
+        $host = $options[self::INPUT_KEY_LOCK_ZOOKEEPER_HOST]
+            ?? $deploymentConfig->get(
+                self::CONFIG_PATH_LOCK_ZOOKEEPER_HOST,
+                $this->getDefaultValue(self::INPUT_KEY_LOCK_ZOOKEEPER_HOST)
+            );
+        $path = $options[self::INPUT_KEY_LOCK_ZOOKEEPER_PATH]
+            ?? $deploymentConfig->get(
+                self::CONFIG_PATH_LOCK_ZOOKEEPER_PATH,
+                $this->getDefaultValue(self::INPUT_KEY_LOCK_ZOOKEEPER_PATH)
+            );
+
+        if (!$path) {
+            $errors[] = 'Zookeeper path needs to be a non-empty string.';
+        }
+
+        if (!$host) {
+            $errors[] = 'Zookeeper host is should be set.';
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Returns the name of lock provider
+     *
+     * @param array $options
+     * @param DeploymentConfig $deploymentConfig
+     * @return string
+     */
+    private function getLockProvider(array $options, DeploymentConfig $deploymentConfig): string
+    {
+        if (!isset($options[self::INPUT_KEY_LOCK_PROVIDER])) {
+            return (string) $deploymentConfig->get(
+                self::CONFIG_PATH_LOCK_PROVIDER,
+                $this->getDefaultValue(self::INPUT_KEY_LOCK_PROVIDER)
+            );
+        }
+
+        return (string) $options[self::INPUT_KEY_LOCK_PROVIDER];
+    }
+
+    /**
+     * Sets default configuration for locks
+     *
+     * @param ConfigData $configData
+     * @param DeploymentConfig $deploymentConfig
+     * @param string $lockProvider
+     * @return ConfigData
+     */
+    private function setDefaultConfiguration(
+        ConfigData $configData,
+        DeploymentConfig $deploymentConfig,
+        string $lockProvider
+    ) {
+        foreach ($this->mappingInputKeyToConfigPath[$lockProvider] as $input => $path) {
+            $configData->set($path, $deploymentConfig->get($path, $this->getDefaultValue($input)));
+        }
+
+        return $configData;
+    }
+
+    /**
+     * Returns default value by input key
+     *
+     * If default value is not set returns null
+     *
+     * @param string $inputKey
+     * @return mixed|null
+     */
+    private function getDefaultValue(string $inputKey)
+    {
+        if (isset($this->defaultConfigValues[$inputKey])) {
+            return $this->defaultConfigValues[$inputKey];
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
index 944c543495751..a0dd19034621b 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php
@@ -28,6 +28,7 @@ class PageCache implements ConfigOptionsListInterface
     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PORT = 'page-cache-redis-port';
     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_COMPRESS_DATA = 'page-cache-redis-compress-data';
     const INPUT_KEY_PAGE_CACHE_BACKEND_REDIS_PASSWORD = 'page-cache-redis-password';
+    const INPUT_KEY_PAGE_CACHE_ID_PREFIX = 'page-cache-id-prefix';
 
     const CONFIG_PATH_PAGE_CACHE_BACKEND = 'cache/frontend/page_cache/backend';
     const CONFIG_PATH_PAGE_CACHE_BACKEND_SERVER = 'cache/frontend/page_cache/backend_options/server';
@@ -35,6 +36,7 @@ class PageCache implements ConfigOptionsListInterface
     const CONFIG_PATH_PAGE_CACHE_BACKEND_PORT = 'cache/frontend/page_cache/backend_options/port';
     const CONFIG_PATH_PAGE_CACHE_BACKEND_COMPRESS_DATA = 'cache/frontend/page_cache/backend_options/compress_data';
     const CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD = 'cache/frontend/page_cache/backend_options/password';
+    const CONFIG_PATH_PAGE_CACHE_ID_PREFIX = 'cache/frontend/page_cache/id_prefix';
 
     /**
      * @var array
@@ -122,6 +124,12 @@ public function getOptions()
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
                 self::CONFIG_PATH_PAGE_CACHE_BACKEND_PASSWORD,
                 'Redis server password'
+            ),
+            new TextConfigOption(
+                self::INPUT_KEY_PAGE_CACHE_ID_PREFIX,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_PAGE_CACHE_ID_PREFIX,
+                'ID prefix for cache keys'
             )
         ];
     }
@@ -132,6 +140,11 @@ public function getOptions()
     public function createConfig(array $options, DeploymentConfig $deploymentConfig)
     {
         $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        if (isset($options[self::INPUT_KEY_PAGE_CACHE_ID_PREFIX])) {
+            $configData->set(self::CONFIG_PATH_PAGE_CACHE_ID_PREFIX, $options[self::INPUT_KEY_PAGE_CACHE_ID_PREFIX]);
+        } else {
+            $configData->set(self::CONFIG_PATH_PAGE_CACHE_ID_PREFIX, $this->generateCachePrefix());
+        }
 
         if (isset($options[self::INPUT_KEY_PAGE_CACHE_BACKEND])) {
             if ($options[self::INPUT_KEY_PAGE_CACHE_BACKEND] == self::INPUT_VALUE_PAGE_CACHE_REDIS) {
@@ -252,4 +265,14 @@ private function getDefaultConfigValue($inputKey)
             return '';
         }
     }
+
+    /**
+     * Generate default cache ID prefix based on installation dir
+     *
+     * @return string
+     */
+    private function generateCachePrefix(): string
+    {
+        return substr(\md5(dirname(__DIR__, 6)), 0, 3) . '_';
+    }
 }
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php
index 3b3fbf33a02e2..b5fbfd795363f 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php
@@ -124,7 +124,7 @@ class Session implements ConfigOptionsListInterface
     ];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function getOptions()
@@ -250,7 +250,7 @@ public function getOptions()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function createConfig(array $options, DeploymentConfig $deploymentConfig)
     {
@@ -281,7 +281,7 @@ public function createConfig(array $options, DeploymentConfig $deploymentConfig)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function validate(array $options, DeploymentConfig $deploymentConfig)
     {
@@ -301,7 +301,7 @@ public function validate(array $options, DeploymentConfig $deploymentConfig)
 
         if (isset($options[self::INPUT_KEY_SESSION_REDIS_LOG_LEVEL])) {
             $level = $options[self::INPUT_KEY_SESSION_REDIS_LOG_LEVEL];
-            if (($level < 0) or ($level > 7)) {
+            if (($level < 0) || ($level > 7)) {
                 $errors[] = "Invalid Redis log level '{$level}'. Valid range is 0-7, inclusive.";
             }
         }
diff --git a/setup/src/Magento/Setup/Model/DependencyReadinessCheck.php b/setup/src/Magento/Setup/Model/DependencyReadinessCheck.php
index 4adb3a6a49b0d..95912272dfa4c 100644
--- a/setup/src/Magento/Setup/Model/DependencyReadinessCheck.php
+++ b/setup/src/Magento/Setup/Model/DependencyReadinessCheck.php
@@ -17,6 +17,11 @@
  */
 class DependencyReadinessCheck
 {
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
     /**
      * @var ComposerJsonFinder
      */
@@ -49,18 +54,23 @@ class DependencyReadinessCheck
      * @param DirectoryList $directoryList
      * @param File $file
      * @param MagentoComposerApplicationFactory $composerAppFactory
+     * @param \Magento\Framework\Escaper|null $escaper
      */
     public function __construct(
         ComposerJsonFinder $composerJsonFinder,
         DirectoryList $directoryList,
         File $file,
-        MagentoComposerApplicationFactory $composerAppFactory
+        MagentoComposerApplicationFactory $composerAppFactory,
+        \Magento\Framework\Escaper $escaper = null
     ) {
         $this->composerJsonFinder = $composerJsonFinder;
         $this->directoryList = $directoryList;
         $this->file = $file;
         $this->requireUpdateDryRunCommand = $composerAppFactory->createRequireUpdateDryRunCommand();
         $this->magentoComposerApplication = $composerAppFactory->create();
+        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\Escaper::class
+        );
     }
 
     /**
@@ -91,7 +101,7 @@ public function runReadinessCheck(array $packages)
             $this->requireUpdateDryRunCommand->run($packages, $workingDir);
             return ['success' => true];
         } catch (\RuntimeException $e) {
-            $message = str_replace(PHP_EOL, '<br/>', htmlspecialchars($e->getMessage()));
+            $message = str_replace(PHP_EOL, '<br/>', $this->escaper->escapeHtml($e->getMessage()));
             return ['success' => false, 'error' => $message];
         }
     }
diff --git a/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php b/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php
index baeeec92a29c8..661d6bfc94048 100644
--- a/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php
+++ b/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php
@@ -170,7 +170,8 @@ public function generate($products, $fixtureMap)
                 ],
             ],
         ];
-        if (count($fixtureMap['website_ids'](1, 0)) === 1) {
+        $websiteIdsFixtures = $fixtureMap['website_ids'](1, 0);
+        if (is_array($websiteIdsFixtures) && count($websiteIdsFixtures) === 1) {
             // Get website id from fixture in case when one site is assigned per product
             $customTableMap['catalog_product_website'] = [
                 'fields' => [
diff --git a/setup/src/Magento/Setup/Model/UninstallDependencyCheck.php b/setup/src/Magento/Setup/Model/UninstallDependencyCheck.php
index 757ee99f7f1ba..aa5821f0fc74e 100644
--- a/setup/src/Magento/Setup/Model/UninstallDependencyCheck.php
+++ b/setup/src/Magento/Setup/Model/UninstallDependencyCheck.php
@@ -15,6 +15,11 @@
  */
 class UninstallDependencyCheck
 {
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
     /**
      * @var ComposerInformation
      */
@@ -38,15 +43,20 @@ class UninstallDependencyCheck
      * @param ComposerInformation $composerInfo
      * @param DependencyChecker $dependencyChecker
      * @param ThemeDependencyCheckerFactory $themeDependencyCheckerFactory
+     * @param \Magento\Framework\Escaper|null $escaper
      */
     public function __construct(
         ComposerInformation $composerInfo,
         DependencyChecker $dependencyChecker,
-        ThemeDependencyCheckerFactory $themeDependencyCheckerFactory
+        ThemeDependencyCheckerFactory $themeDependencyCheckerFactory,
+        \Magento\Framework\Escaper $escaper = null
     ) {
         $this->composerInfo = $composerInfo;
         $this->packageDependencyChecker = $dependencyChecker;
         $this->themeDependencyChecker = $themeDependencyCheckerFactory->create();
+        $this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\Escaper::class
+        );
     }
 
     /**
@@ -54,51 +64,62 @@ public function __construct(
      *
      * @param array $packages
      * @return array
-     * @throws \RuntimeException
      */
     public function runUninstallReadinessCheck(array $packages)
     {
         try {
-            $packagesAndTypes = $this->composerInfo->getRootRequiredPackageTypesByName();
-            $dependencies = $this->packageDependencyChecker->checkDependencies($packages, true);
-            $messages = [];
-            $themes = [];
-
-            foreach ($packages as $package) {
-                if (!isset($packagesAndTypes[$package])) {
-                    throw new \RuntimeException('Package ' . $package . ' not found in the system.');
-                }
+            return $this->checkForMissingDependencies($packages);
+        } catch (\RuntimeException $e) {
+            $message = str_replace(PHP_EOL, '<br/>', $this->escaper->escapeHtml($e->getMessage()));
+            return ['success' => false, 'error' => $message];
+        }
+    }
 
-                switch ($packagesAndTypes[$package]) {
-                    case ComposerInformation::METAPACKAGE_PACKAGE_TYPE:
-                        unset($dependencies[$package]);
-                        break;
-                    case ComposerInformation::THEME_PACKAGE_TYPE:
-                        $themes[] = $package;
-                        break;
-                }
+    /**
+     * Check for missing dependencies
+     *
+     * @param array $packages
+     * @return array
+     * @throws \RuntimeException
+     */
+    private function checkForMissingDependencies(array $packages)
+    {
+        $packagesAndTypes = $this->composerInfo->getRootRequiredPackageTypesByName();
+        $dependencies = $this->packageDependencyChecker->checkDependencies($packages, true);
+        $messages = [];
+        $themes = [];
 
-                if (!empty($dependencies[$package])) {
-                    $messages[] = $package . " has the following dependent package(s): "
-                        . implode(', ', $dependencies[$package]);
-                }
+        foreach ($packages as $package) {
+            if (!isset($packagesAndTypes[$package])) {
+                throw new \RuntimeException('Package ' . $package . ' not found in the system.');
             }
 
-            if (!empty($themes)) {
-                $messages = array_merge(
-                    $messages,
-                    $this->themeDependencyChecker->checkChildThemeByPackagesName($themes)
-                );
+            switch ($packagesAndTypes[$package]) {
+                case ComposerInformation::METAPACKAGE_PACKAGE_TYPE:
+                    unset($dependencies[$package]);
+                    break;
+                case ComposerInformation::THEME_PACKAGE_TYPE:
+                    $themes[] = $package;
+                    break;
             }
 
-            if (!empty($messages)) {
-                throw new \RuntimeException(implode(PHP_EOL, $messages));
+            if (!empty($dependencies[$package])) {
+                $messages[] = $package . " has the following dependent package(s): "
+                    . implode(', ', $dependencies[$package]);
             }
+        }
 
-            return ['success' => true];
-        } catch (\RuntimeException $e) {
-            $message = str_replace(PHP_EOL, '<br/>', htmlspecialchars($e->getMessage()));
-            return ['success' => false, 'error' => $message];
+        if (!empty($themes)) {
+            $messages = array_merge(
+                $messages,
+                $this->themeDependencyChecker->checkChildThemeByPackagesName($themes)
+            );
         }
+
+        if (!empty($messages)) {
+            throw new \RuntimeException(implode(PHP_EOL, $messages));
+        }
+
+        return ['success' => true];
     }
 }
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ApplicationCodeGenerator.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ApplicationCodeGenerator.php
index 76cd6a20bf669..07b9a7110e643 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ApplicationCodeGenerator.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/ApplicationCodeGenerator.php
@@ -74,7 +74,7 @@ public function doOperation()
                     $this->directoryScanner->scan($path, $this->data['filePatterns'], $this->data['excludePatterns'])
                 );
             }
-            $entities = $this->phpScanner->collectEntities($files['php']);
+            $entities = isset($files['php']) ? $this->phpScanner->collectEntities($files['php']) : [];
             foreach ($entities as $entityName) {
                 class_exists($entityName);
             }
diff --git a/setup/src/Magento/Setup/Module/I18n/Pack/Generator.php b/setup/src/Magento/Setup/Module/I18n/Pack/Generator.php
index 720fc351bea00..d1da0a16487a3 100644
--- a/setup/src/Magento/Setup/Module/I18n/Pack/Generator.php
+++ b/setup/src/Magento/Setup/Module/I18n/Pack/Generator.php
@@ -71,7 +71,8 @@ public function generate(
         $locale = $this->factory->createLocale($locale);
         $dictionary = $this->dictionaryLoader->load($dictionaryPath);
 
-        if (!count($dictionary->getPhrases())) {
+        $phrases = $dictionary->getPhrases();
+        if (!is_array($phrases) || !count($phrases)) {
             throw new \UnexpectedValueException('No phrases have been found by the specified path.');
         }
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
index 39b95953c6347..f351bca65f89b 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/CacheTest.php
@@ -28,6 +28,9 @@ class CacheTest extends \PHPUnit\Framework\TestCase
      */
     private $deploymentConfigMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->validatorMock = $this->createMock(RedisConnectionValidator::class);
@@ -39,7 +42,7 @@ protected function setUp()
     public function testGetOptions()
     {
         $options = $this->configOptionsList->getOptions();
-        $this->assertCount(5, $options);
+        $this->assertCount(6, $options);
 
         $this->assertArrayHasKey(0, $options);
         $this->assertInstanceOf(SelectConfigOption::class, $options[0]);
@@ -60,6 +63,10 @@ public function testGetOptions()
         $this->assertArrayHasKey(4, $options);
         $this->assertInstanceOf(TextConfigOption::class, $options[4]);
         $this->assertEquals('cache-backend-redis-password', $options[4]->getName());
+
+        $this->assertArrayHasKey(5, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[5]);
+        $this->assertEquals('cache-id-prefix', $options[5]->getName());
     }
 
     public function testCreateConfigCacheRedis()
@@ -76,7 +83,8 @@ public function testCreateConfigCacheRedis()
                             'port' => '',
                             'database' => '',
                             'password' => ''
-                        ]
+                        ],
+                        'id_prefix' => $this->expectedIdPrefix(),
                     ]
                 ]
             ]
@@ -99,7 +107,8 @@ public function testCreateConfigWithRedisConfig()
                             'port' => '1234',
                             'database' => '5',
                             'password' => ''
-                        ]
+                        ],
+                        'id_prefix' => $this->expectedIdPrefix(),
                     ]
                 ]
             ]
@@ -116,6 +125,48 @@ public function testCreateConfigWithRedisConfig()
         $this->assertEquals($expectedConfigData, $configData->getData());
     }
 
+    public function testCreateConfigWithFileCache()
+    {
+        $this->deploymentConfigMock->method('get')->willReturn('');
+
+        $expectedConfigData = [
+            'cache' => [
+                'frontend' => [
+                    'default' => [
+                        'id_prefix' => $this->expectedIdPrefix(),
+                    ]
+                ]
+            ]
+        ];
+
+        $configData = $this->configOptionsList->createConfig([], $this->deploymentConfigMock);
+
+        $this->assertEquals($expectedConfigData, $configData->getData());
+    }
+
+    public function testCreateConfigWithIdPrefix()
+    {
+        $this->deploymentConfigMock->method('get')->willReturn('');
+
+        $explicitPrefix = 'XXX_';
+        $expectedConfigData = [
+            'cache' => [
+                'frontend' => [
+                    'default' => [
+                        'id_prefix' => $explicitPrefix,
+                    ]
+                ]
+            ]
+        ];
+
+        $configData = $this->configOptionsList->createConfig(
+            ['cache-id-prefix' => $explicitPrefix],
+            $this->deploymentConfigMock
+        );
+
+        $this->assertEquals($expectedConfigData, $configData->getData());
+    }
+
     public function testValidateWithValidInput()
     {
         $options = [
@@ -142,4 +193,14 @@ public function testValidateWithInvalidInput()
         $this->assertCount(1, $errors);
         $this->assertEquals("Invalid cache handler 'clay-tablet'", $errors[0]);
     }
+
+    /**
+     * The default ID prefix, based on installation directory
+     *
+     * @return string
+     */
+    private function expectedIdPrefix(): string
+    {
+        return substr(\md5(dirname(__DIR__, 8)), 0, 3) . '_';
+    }
 }
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php
new file mode 100644
index 0000000000000..1a46bddf5f21a
--- /dev/null
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/LockTest.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Setup\Test\Unit\Model\ConfigOptionsList;
+
+use Magento\Setup\Model\ConfigOptionsList\Lock as LockConfigOptionsList;
+use Magento\Framework\Lock\Backend\Zookeeper as ZookeeperLock;
+use Magento\Framework\Lock\LockBackendFactory;
+use Magento\Framework\Config\Data\ConfigData;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Setup\Option\SelectConfigOption;
+use Magento\Framework\Setup\Option\TextConfigOption;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class LockTest extends TestCase
+{
+    /**
+     * @var DeploymentConfig|MockObject
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var LockConfigOptionsList
+     */
+    private $lockConfigOptionsList;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+        $this->lockConfigOptionsList = new LockConfigOptionsList();
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetOptions()
+    {
+        $options = $this->lockConfigOptionsList->getOptions();
+        $this->assertSame(5, count($options));
+
+        $this->assertArrayHasKey(0, $options);
+        $this->assertInstanceOf(SelectConfigOption::class, $options[0]);
+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER, $options[0]->getName());
+
+        $this->assertArrayHasKey(1, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[1]);
+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_DB_PREFIX, $options[1]->getName());
+
+        $this->assertArrayHasKey(2, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[2]);
+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_HOST, $options[2]->getName());
+
+        $this->assertArrayHasKey(3, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[3]);
+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_PATH, $options[3]->getName());
+
+        $this->assertArrayHasKey(4, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[4]);
+        $this->assertEquals(LockConfigOptionsList::INPUT_KEY_LOCK_FILE_PATH, $options[4]->getName());
+    }
+
+    /**
+     * @param array $options
+     * @param array $expectedResult
+     * @dataProvider createConfigDataProvider
+     */
+    public function testCreateConfig(array $options, array $expectedResult)
+    {
+        $this->deploymentConfigMock->expects($this->any())
+            ->method('get')
+            ->willReturnArgument(1);
+        $data = $this->lockConfigOptionsList->createConfig($options, $this->deploymentConfigMock);
+        $this->assertInstanceOf(ConfigData::class, $data);
+        $this->assertTrue($data->isOverrideWhenSave());
+        $this->assertSame($expectedResult, $data->getData());
+    }
+
+    /**
+     * @return array
+     */
+    public function createConfigDataProvider(): array
+    {
+        return [
+            'Check default values' => [
+                'options' => [],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_DB,
+                        'config' => [
+                            'prefix' => null,
+                        ],
+                    ],
+                ],
+            ],
+            'Check default value for cache lock' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_CACHE,
+                ],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_CACHE,
+                    ],
+                ],
+            ],
+            'Check default value for zookeeper lock' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_ZOOKEEPER,
+                ],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_ZOOKEEPER,
+                        'config' => [
+                            'host' => null,
+                            'path' => ZookeeperLock::DEFAULT_PATH,
+                        ],
+                    ],
+                ],
+            ],
+            'Check specific db lock options' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_DB,
+                    LockConfigOptionsList::INPUT_KEY_LOCK_DB_PREFIX => 'my_prefix'
+                ],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_DB,
+                        'config' => [
+                            'prefix' => 'my_prefix',
+                        ],
+                    ],
+                ],
+            ],
+            'Check specific zookeeper lock options' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_ZOOKEEPER,
+                    LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_HOST => '123.45.67.89:10',
+                    LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_PATH => '/some/path',
+                ],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_ZOOKEEPER,
+                        'config' => [
+                            'host' => '123.45.67.89:10',
+                            'path' => '/some/path',
+                        ],
+                    ],
+                ],
+            ],
+            'Check specific file lock options' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_FILE,
+                    LockConfigOptionsList::INPUT_KEY_LOCK_FILE_PATH => '/my/path'
+                ],
+                'expectedResult' => [
+                    'lock' => [
+                        'provider' => LockBackendFactory::LOCK_FILE,
+                        'config' => [
+                            'path' => '/my/path',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @param array $options
+     * @param array $expectedResult
+     * @dataProvider validateDataProvider
+     */
+    public function testValidate(array $options, array $expectedResult)
+    {
+        $this->deploymentConfigMock->expects($this->any())
+            ->method('get')
+            ->willReturnArgument(1);
+        $this->assertSame(
+            $expectedResult,
+            $this->lockConfigOptionsList->validate($options, $this->deploymentConfigMock)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function validateDataProvider(): array
+    {
+        return [
+            'Wrong lock provider' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => 'SomeProvider',
+                ],
+                'expectedResult' => [
+                    'The lock provider SomeProvider does not exist.',
+                ],
+            ],
+            'Empty host and path for Zookeeper' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_ZOOKEEPER,
+                    LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_HOST => '',
+                    LockConfigOptionsList::INPUT_KEY_LOCK_ZOOKEEPER_PATH => '',
+                ],
+                'expectedResult' => extension_loaded('zookeeper')
+                    ? [
+                        'Zookeeper path needs to be a non-empty string.',
+                        'Zookeeper host is should be set.',
+                    ]
+                    : [
+                        'php extension Zookeeper is not installed.',
+                        'Zookeeper path needs to be a non-empty string.',
+                        'Zookeeper host is should be set.',
+                    ],
+            ],
+            'Empty path for File lock' => [
+                'options' => [
+                    LockConfigOptionsList::INPUT_KEY_LOCK_PROVIDER => LockBackendFactory::LOCK_FILE,
+                    LockConfigOptionsList::INPUT_KEY_LOCK_FILE_PATH => '',
+                ],
+                'expectedResult' => [
+                    'The path needs to be a non-empty string.',
+                ],
+            ],
+        ];
+    }
+}
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
index ed0e567820ad1..0e7c851cb706b 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsList/PageCacheTest.php
@@ -28,6 +28,9 @@ class PageCacheTest extends \PHPUnit\Framework\TestCase
      */
     private $deploymentConfigMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->validatorMock = $this->createMock(RedisConnectionValidator::class, [], [], '', false);
@@ -39,7 +42,7 @@ protected function setUp()
     public function testGetOptions()
     {
         $options = $this->configList->getOptions();
-        $this->assertCount(6, $options);
+        $this->assertCount(7, $options);
 
         $this->assertArrayHasKey(0, $options);
         $this->assertInstanceOf(SelectConfigOption::class, $options[0]);
@@ -64,6 +67,10 @@ public function testGetOptions()
         $this->assertArrayHasKey(5, $options);
         $this->assertInstanceOf(TextConfigOption::class, $options[5]);
         $this->assertEquals('page-cache-redis-password', $options[5]->getName());
+
+        $this->assertArrayHasKey(6, $options);
+        $this->assertInstanceOf(TextConfigOption::class, $options[6]);
+        $this->assertEquals('page-cache-id-prefix', $options[6]->getName());
     }
 
     public function testCreateConfigWithRedis()
@@ -81,7 +88,8 @@ public function testCreateConfigWithRedis()
                             'database' => '',
                             'compress_data' => '',
                             'password' => ''
-                        ]
+                        ],
+                        'id_prefix' => $this->expectedIdPrefix(),
                     ]
                 ]
             ]
@@ -105,7 +113,8 @@ public function testCreateConfigWithRedisConfiguration()
                             'database' => '6',
                             'compress_data' => '1',
                             'password' => ''
-                        ]
+                        ],
+                        'id_prefix' => $this->expectedIdPrefix(),
                     ]
                 ]
             ]
@@ -124,6 +133,48 @@ public function testCreateConfigWithRedisConfiguration()
         $this->assertEquals($expectedConfigData, $configData->getData());
     }
 
+    public function testCreateConfigWithFileCache()
+    {
+        $this->deploymentConfigMock->method('get')->willReturn('');
+
+        $expectedConfigData = [
+            'cache' => [
+                'frontend' => [
+                    'page_cache' => [
+                        'id_prefix' => $this->expectedIdPrefix(),
+                    ]
+                ]
+            ]
+        ];
+
+        $configData = $this->configList->createConfig([], $this->deploymentConfigMock);
+
+        $this->assertEquals($expectedConfigData, $configData->getData());
+    }
+
+    public function testCreateConfigWithIdPrefix()
+    {
+        $this->deploymentConfigMock->method('get')->willReturn('');
+
+        $explicitPrefix = 'XXX_';
+        $expectedConfigData = [
+            'cache' => [
+                'frontend' => [
+                    'page_cache' => [
+                        'id_prefix' => $explicitPrefix,
+                    ]
+                ]
+            ]
+        ];
+
+        $configData = $this->configList->createConfig(
+            ['page-cache-id-prefix' => $explicitPrefix],
+            $this->deploymentConfigMock
+        );
+
+        $this->assertEquals($expectedConfigData, $configData->getData());
+    }
+
     public function testValidationWithValidData()
     {
         $this->validatorMock->expects($this->once())
@@ -151,4 +202,14 @@ public function testValidationWithInvalidData()
         $this->assertCount(1, $errors);
         $this->assertEquals('Invalid cache handler \'foobar\'', $errors[0]);
     }
+
+    /**
+     * The default ID prefix, based on installation directory
+     *
+     * @return string
+     */
+    private function expectedIdPrefix(): string
+    {
+        return substr(\md5(dirname(__DIR__, 8)), 0, 3) . '_';
+    }
 }
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
index f342a11493498..99ef82dd9d355 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
@@ -7,6 +7,7 @@
 namespace Magento\Setup\Test\Unit\Model;
 
 use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Setup\Model\ConfigOptionsList\Lock;
 use Magento\Setup\Model\ConfigGenerator;
 use Magento\Setup\Model\ConfigOptionsList;
 use Magento\Setup\Validator\DbValidator;
@@ -82,7 +83,7 @@ public function testCreateOptions()
         $this->generator->expects($this->once())->method('createXFrameConfig')->willReturn($configDataMock);
         $this->generator->expects($this->once())->method('createCacheHostsConfig')->willReturn($configDataMock);
 
-        $configData = $this->object->createConfig([], $this->deploymentConfig);
+        $configData = $this->object->createConfig([Lock::INPUT_KEY_LOCK_PROVIDER => 'db'], $this->deploymentConfig);
         $this->assertGreaterThanOrEqual(6, count($configData));
     }
 
@@ -96,7 +97,7 @@ public function testCreateOptionsWithOptionalNull()
         $this->generator->expects($this->once())->method('createXFrameConfig')->willReturn($configDataMock);
         $this->generator->expects($this->once())->method('createCacheHostsConfig')->willReturn($configDataMock);
 
-        $configData = $this->object->createConfig([], $this->deploymentConfig);
+        $configData = $this->object->createConfig([Lock::INPUT_KEY_LOCK_PROVIDER => 'db'], $this->deploymentConfig);
         $this->assertGreaterThanOrEqual(6, count($configData));
     }
 
@@ -109,7 +110,8 @@ public function testValidateSuccess()
             ConfigOptionsListConstants::INPUT_KEY_DB_NAME => 'name',
             ConfigOptionsListConstants::INPUT_KEY_DB_HOST => 'host',
             ConfigOptionsListConstants::INPUT_KEY_DB_USER => 'user',
-            ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD => 'pass'
+            ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD => 'pass',
+            Lock::INPUT_KEY_LOCK_PROVIDER => 'db'
         ];
         $this->prepareValidationMocks();
 
@@ -127,7 +129,8 @@ public function testValidateInvalidSessionHandler()
             ConfigOptionsListConstants::INPUT_KEY_DB_NAME => 'name',
             ConfigOptionsListConstants::INPUT_KEY_DB_HOST => 'host',
             ConfigOptionsListConstants::INPUT_KEY_DB_USER => 'user',
-            ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD => 'pass'
+            ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD => 'pass',
+            Lock::INPUT_KEY_LOCK_PROVIDER => 'db'
         ];
         $this->prepareValidationMocks();
 
@@ -141,7 +144,8 @@ public function testValidateEmptyEncryptionKey()
     {
         $options = [
             ConfigOptionsListConstants::INPUT_KEY_SKIP_DB_VALIDATION => true,
-            ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => ''
+            ConfigOptionsListConstants::INPUT_KEY_ENCRYPTION_KEY => '',
+            Lock::INPUT_KEY_LOCK_PROVIDER => 'db'
         ];
         $this->assertEquals(
             ['Invalid encryption key'],
@@ -167,7 +171,8 @@ public function testValidateCacheHosts($hosts, $expectedError)
     {
         $options = [
             ConfigOptionsListConstants::INPUT_KEY_SKIP_DB_VALIDATION => true,
-            ConfigOptionsListConstants::INPUT_KEY_CACHE_HOSTS => $hosts
+            ConfigOptionsListConstants::INPUT_KEY_CACHE_HOSTS => $hosts,
+            Lock::INPUT_KEY_LOCK_PROVIDER => 'db'
         ];
         $result = $this->object->validate($options, $this->deploymentConfig);
         if ($expectedError) {
diff --git a/setup/view/magento/setup/customize-your-store.phtml b/setup/view/magento/setup/customize-your-store.phtml
index 15cd53ca26cfd..97ecf38d5f490 100644
--- a/setup/view/magento/setup/customize-your-store.phtml
+++ b/setup/view/magento/setup/customize-your-store.phtml
@@ -178,7 +178,7 @@
             <p class="advanced-modules-select">
                 <input id="selectAll" type="checkbox"
                    class="form-el-checkbox"
-                   ng-model="store.selectAll"
+                   ng-checked="store.selectAll"
                    ng-click="toggleAllModules()">
                 <label class="form-label" for="selectAll">
                    Select All
diff --git a/setup/view/magento/setup/data-option.phtml b/setup/view/magento/setup/data-option.phtml
index cb31d96013f24..656b04876c414 100644
--- a/setup/view/magento/setup/data-option.phtml
+++ b/setup/view/magento/setup/data-option.phtml
@@ -43,7 +43,7 @@
                 value="false"
                 >
             <label class="form-label" for="keepData">
-                <b>Keep data</b>
+                <strong>Keep data</strong>
                 <br/><br/>
                 Note: You can see the associated data in your database,
                 however your customer will not see this in your online store.
@@ -59,7 +59,7 @@
                 value="true"
                 >
             <label class="form-label" for="removeData">
-                <b>Remove data</b>
+                <strong>Remove data</strong>
                 <br/><br/>
                 Did you back up first? Choosing to remove data means the data is unavailable unless you
                 recover it from a backup in the preceding step.
diff --git a/setup/view/magento/setup/extension-grid.phtml b/setup/view/magento/setup/extension-grid.phtml
index 47e5f7eec309b..4800d45e12d4f 100644
--- a/setup/view/magento/setup/extension-grid.phtml
+++ b/setup/view/magento/setup/extension-grid.phtml
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
+
 ?>
 <h2 class="page-title">{{$state.current.header}}</h2>
 
@@ -66,8 +69,8 @@
 
 <div class="row" ng-show="$root.isMarketplaceAuthorized && extensionsProcessed && total == 0">
     <label class="form-label not-found">
-        <b>You haven't purchased any extensions yet. Visit <a href="https://marketplace.magento.com">Marketplace</a> 
-            for purchasing extensions.</b><br/>
+        <strong>You haven't purchased any extensions yet. Visit <a href="https://marketplace.magento.com">Marketplace</a> 
+            for purchasing extensions.</strong><br/>
     </label>
 </div>
 <div class="admin__data-grid-outer-wrap"
diff --git a/setup/view/magento/setup/marketplace-credentials.phtml b/setup/view/magento/setup/marketplace-credentials.phtml
index 32ae512313610..8bd0bb0438d61 100644
--- a/setup/view/magento/setup/marketplace-credentials.phtml
+++ b/setup/view/magento/setup/marketplace-credentials.phtml
@@ -7,7 +7,7 @@
     <div class="sync-login-wrap">
         <div class="login-header" ng-show="showCredsForm || upgradeProcessError">
             <img class="logo-img"
-                 src="<?= $this->basePath() ?>/pub/images//magento-logo.svg" alt="Magento"/>
+                 src="<?= $this->basePath() ?>/pub/images//magento-logo.svg" alt="Magento" width="214"/>
             <span>Marketplace</span>
         </div>
         <div class="messages">
diff --git a/setup/view/magento/setup/module-grid.phtml b/setup/view/magento/setup/module-grid.phtml
index 5fe0447b7c791..3bf9377104df1 100644
--- a/setup/view/magento/setup/module-grid.phtml
+++ b/setup/view/magento/setup/module-grid.phtml
@@ -8,7 +8,7 @@
 
 <div class="row" ng-show="modulesProcessed && total == 0">
     <label class="form-label">
-        <b>We didn't find any modules at this time. Please try later.</b><br/>
+        <strong>We didn't find any modules at this time. Please try later.</strong><br/>
     </label>
 </div>
 <div class="admin__data-grid-outer-wrap" ng-show="modulesProcessed && total > 0">
diff --git a/setup/view/magento/setup/popupauth.phtml b/setup/view/magento/setup/popupauth.phtml
index 8b074abaa5f12..3ffca7ba49bab 100644
--- a/setup/view/magento/setup/popupauth.phtml
+++ b/setup/view/magento/setup/popupauth.phtml
@@ -17,7 +17,9 @@
                 <div class="sync-login-wrap">
                     <div class="login-header">
                         <img class="logo-img"
-                             src="<?= $this->basePath() ?>/pub/images//magento-logo.svg" alt="Magento"/>
+                             src="<?= $this->basePath() ?>/pub/images//magento-logo.svg"
+                             alt="Magento"
+                             width="214"/>
                         <span>Marketplace</span>
                     </div>
                     <div class="messages">
diff --git a/setup/view/magento/setup/select-version.phtml b/setup/view/magento/setup/select-version.phtml
index 920ab86252514..66264e46d50ad 100644
--- a/setup/view/magento/setup/select-version.phtml
+++ b/setup/view/magento/setup/select-version.phtml
@@ -128,7 +128,7 @@
     </div>
     <div class="row" ng-show="componentsProcessed && total == 0">
         <label class="form-label">
-            <b>We didn't find any components to upgrade. Click "Next" to continue.<br/>
+            <strong>We didn't find any components to upgrade. Click "Next" to continue.</strong><br/>
         </label>
     </div>
     <div class="admin__data-grid-outer-wrap" ng-show="componentsProcessed && total > 0">
diff --git a/setup/view/styles/lib/variables/_colors.less b/setup/view/styles/lib/variables/_colors.less
index 638490ac8673a..a72dc69ac7669 100644
--- a/setup/view/styles/lib/variables/_colors.less
+++ b/setup/view/styles/lib/variables/_colors.less
@@ -24,7 +24,7 @@
 @color-green-apple: #79a22e;
 @color-green-islamic: #090;
 @color-dark-brownie: #41362f;
-@color-brown-darkie: #41362f;
+@color-brown-darker: #41362f;
 @color-phoenix-down: #e04f00;
 @color-phoenix: #eb5202;
 @color-phoenix-almost-rise: #ef672f;